diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml
index 492cedf6..de275559 100644
--- a/app/views/issues/_show.html.haml
+++ b/app/views/issues/_show.html.haml
@@ -3,7 +3,9 @@
     .icon
   .right
     - if issue.notes.any?
-      %span.btn.small.disabled.padded= pluralize issue.notes.count, 'note'
+      %span.btn.small.disabled.padded
+        %i.icon-comment
+        = issue.notes.count
     - if can? current_user, :modify_issue, issue
       - if issue.closed
         = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put,  :class => "btn small padded", :remote => true
diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml
index 794e927c..37108cca 100644
--- a/app/views/merge_requests/_merge_request.html.haml
+++ b/app/views/merge_requests/_merge_request.html.haml
@@ -7,7 +7,9 @@
             %i.icon-ok
             = "MERGED"
       - if merge_request.notes.any?
-        %span.btn.small.disabled.padded= pluralize merge_request.notes.count, 'note'
+        %span.btn.small.disabled.padded
+          %i.icon-comment
+          = merge_request.notes.count
       %span.btn.small.disabled.padded
         = merge_request.source_branch
         →