diff --git a/app/assets/stylesheets/comments.scss b/app/assets/stylesheets/comments.scss
index d82150f91..f47e0bae4 100644
--- a/app/assets/stylesheets/comments.scss
+++ b/app/assets/stylesheets/comments.scss
@@ -85,6 +85,10 @@
 
   .media {
     margin: 0 0 2px;
+
+    &:not(.display-avatars) .entypo-heart {
+      display: none;
+    }
   }
 
   .expand-likes {
diff --git a/app/assets/stylesheets/single-post-view.scss b/app/assets/stylesheets/single-post-view.scss
index d0ffde15c..843cc33f0 100644
--- a/app/assets/stylesheets/single-post-view.scss
+++ b/app/assets/stylesheets/single-post-view.scss
@@ -166,11 +166,15 @@
     font-size: 12px;
     line-height: 16px;
 
-    .bd,
-    .entypo-heart {
-      display: inline-block;
-    }
-
+    .bd { display: inline-block; }
     img { display: inline; }
   }
+
+  .display-avatars .entypo-heart {
+    display: inline-block;
+    font-size: 16px;
+    line-height: 18px;
+    margin-right: 5px;
+    vertical-align: top;
+  }
 }
diff --git a/app/assets/templates/likes-info_tpl.jst.hbs b/app/assets/templates/likes-info_tpl.jst.hbs
index ff5346657..4aa193b6a 100644
--- a/app/assets/templates/likes-info_tpl.jst.hbs
+++ b/app/assets/templates/likes-info_tpl.jst.hbs
@@ -1,6 +1,6 @@
 {{#if likesCount}}
   <div class="comment">
-    <div class="media">
+    <div class="media{{#if displayAvatars}} display-avatars{{/if}}">
       <i class="entypo-heart"></i>
 
       <div class="bd">
@@ -8,9 +8,7 @@
           <a href="#" class="expand-likes gray">
             {{t "stream.likes" count=likesCount}}
           </a>
-
         {{else}}
-
           {{#each likes}}
             {{#linkToAuthor author}}
               {{{personImage this 'small' 'micro'}}}
diff --git a/features/desktop/comments.feature b/features/desktop/comments.feature
index 748a7cb57..9e655e56c 100644
--- a/features/desktop/comments.feature
+++ b/features/desktop/comments.feature
@@ -91,7 +91,7 @@ Feature: commenting
     When "alice@alice.alice" has commented "That's cool" on "Look at this dog"
     And I am on "alice@alice.alice"'s page
     And I like the comment "That's cool"
-    Then I should see a heart within comment "That's cool"
+    Then I should see a like within comment "That's cool"
 
     When I expand likes within comment "That's cool"
     Then I should see a micro avatar within comment "That's cool"
diff --git a/features/step_definitions/comment_steps.rb b/features/step_definitions/comment_steps.rb
index e2587830d..a6fbb4979 100644
--- a/features/step_definitions/comment_steps.rb
+++ b/features/step_definitions/comment_steps.rb
@@ -51,10 +51,10 @@ Then /^I like the comment "([^"]*)"$/ do |comment_text|
   find(id: comment_guid).click_link("Like")
 end
 
-Then /^I should see a heart within comment "([^"]*)"$/ do |comment_text|
+Then /^I should see a like within comment "([^"]*)"$/ do |comment_text|
   comment_guid = Comment.find_by(text: comment_text).guid
   block = find(id: comment_guid)
-  expect(block).to have_css(".entypo-heart")
+  expect(block).to have_css(".expand-likes")
 end
 
 When /^I expand likes within comment "([^"]*)"$/ do |comment_text|