diff --git a/www/sass/_likers.scss b/www/sass/_likers.scss
new file mode 100644
index 00000000..af4f173b
--- /dev/null
+++ b/www/sass/_likers.scss
@@ -0,0 +1,4 @@
+.likers {
+    font-size: 12px;
+    color: $dark-grey;
+}
diff --git a/www/sass/blocks/_mini-like.scss b/www/sass/blocks/_mini-like.scss
index 1997ecd6..3eecf8c8 100644
--- a/www/sass/blocks/_mini-like.scss
+++ b/www/sass/blocks/_mini-like.scss
@@ -4,14 +4,10 @@
     }
 }
 
-.like-button {
-    @include border-radius(9px);
-    @include badge();
-    padding: 2px 9px;
-    color: white;
-    background-color: lighten($like-color, 30%);
+.like-icon {
+    color: $dark-grey;
 }
 
-.like-button-liked {
-    background-color: $like-color;
+.like-button {
+    color: $dark-grey;
 }
diff --git a/www/sass/main.scss b/www/sass/main.scss
index 01293214..d4b126d4 100644
--- a/www/sass/main.scss
+++ b/www/sass/main.scss
@@ -57,3 +57,4 @@
 @import 'feed/item';
 
 @import 'comment';
+@import 'likers';
diff --git a/www/templates/like.html b/www/templates/like.html
index 76a08d7e..6b0eef91 100644
--- a/www/templates/like.html
+++ b/www/templates/like.html
@@ -1,18 +1,10 @@
-<% if (obj.list.length || !my) { %>
-    <% if (currentUser && !my) { %>
-      <% if (meGusta) { %>
-        <a class="pull-self" href="#"><!--
-   --><% } else { %>
-        <a class="push-self" href="#"><!--
-   --><% } %><!--
- --><% } %><!--
-
- --><span class="like-button <%- (obj.meGusta || my) ? 'like-button-liked' : '' %>" data-toggle="tooltip" title="<%= list.slice(0, 10).join(', ') %><%= (list.length <= 10) ? '' : ' and ' + (list.length - 10) + ' more' %>">
-      <i class="<%- (obj.meGusta || my) ? 'icon-thumbs-up' : 'icon-thumbs-up-alt' %>"></i>
-      <%= list.length %>
-  </span><!--
-
- --><% if (currentUser && !my) { %><!--
-   --></a>
-    <% } %>
+<span class="like-button">
+<% if (currentUser && !my) { %>
+  &bull;
+  <% if (_.contains(list,currentUser)) { %>
+    <a class="pull-self" href="#">Unlike</a>
+  <% } else { %>
+    <a class="push-self" href="#">Like</a>
+  <% } %>
 <% } %>
+</span>
\ No newline at end of file
diff --git a/www/templates/partials.html b/www/templates/partials.html
index f46a29a0..ff88f1db 100644
--- a/www/templates/partials.html
+++ b/www/templates/partials.html
@@ -5,6 +5,30 @@
   <script type="text/template" class="upic-small"><a href="/player/<%- login %>"><img src="/api/user/<%- login %>/pic?s=small" alt="<%- login %>" title="<%- login %>" class="upic-small"/></a></script>
   <script type="text/template" class="upic-normal"><img src="/api/user/<%- login %>/pic?s=normal" class="upic-normal"/></script>
 
+  <script type="text/template" class="likers">
+
+    <% if (list && list.length) { %>
+      <div class="likers">
+        <% var meGusta = _.contains(list, currentUser); %>
+        <% var topLikes = _.without(list, currentUser).slice(0, 3); %>
+        <% var otherLikes = _.without(list, currentUser).slice(3); %>
+        <span class="like-icon">
+          <i class="<%- meGusta ? 'icon-thumbs-up' : 'icon-thumbs-up-alt' %>"></i>
+        </span>
+
+        Liked by
+        <% if (meGusta) { %>you<% } %><!--
+     --><% _.each(topLikes, function(t, index) { %><!--
+       --><% if (index > 0 || meGusta) { %>, <% } %>
+          <%= partial.user({login: t}) %><!--
+     --><% }) %><!--
+     --><% if (otherLikes.length) { %>
+          and <%- otherLikes.length %> more<!--
+     --><% } %>.
+      </div>
+    <% } %>
+  </script>
+
   <script type="text/template" class="quest-labels">
     <span class="quest-tags">
     <% if (obj.showRealm) { %>
diff --git a/www/templates/quest/big.html b/www/templates/quest/big.html
index b3418134..4e150913 100644
--- a/www/templates/quest/big.html
+++ b/www/templates/quest/big.html
@@ -84,13 +84,14 @@
         <button class="quest-join btn btn-primary">Take</button>
       </div>
     <% } %>
-
-
     <footer class="object-bottom-line">
+
       <div class="quest-big-tags">
         <%= partial.quest_labels(obj) %>
       </div>
 
+<<<<<<< HEAD
+
       <a href="/realm/<%- realm %>/quest/<%- _id %>" class="time-anchor"><time class="timeago" datetime="<%= new Date(ts * 1000).toISOString() %>">
           <%= new Date(ts * 1000).toISOString() %>
       </time></a>
diff --git a/www/templates/quest/feed.html b/www/templates/quest/feed.html
index 8ca824f7..02e14af2 100644
--- a/www/templates/quest/feed.html
+++ b/www/templates/quest/feed.html
@@ -95,6 +95,8 @@
         <%= partial.quest_labels(obj) %>
       </div>
 
+      <%= partial.likers({list: likes, currentUser: currentUser, partial: partial}) %>
+
       <a href="/realm/<%- realm %>/quest/<%- _id %>" class="time-anchor"><time class="timeago" datetime="<%= new Date(ts * 1000).toISOString() %>">
           <%= new Date(ts * 1000).toISOString() %>
       </time></a>