diff --git a/app/assets/images/icons/users.png b/app/assets/images/icons/users.png
new file mode 100644
index 0000000000000000000000000000000000000000..a6558de9792d85ab80a448c8db15df491becd06d
Binary files /dev/null and b/app/assets/images/icons/users.png differ
diff --git a/app/assets/javascripts/inbox.js b/app/assets/javascripts/inbox.js
index 60fcafd9181a3567cd9537410faf44bed62deb5d..507032aaa7af787bb5857392137ea0af557b31a3 100644
--- a/app/assets/javascripts/inbox.js
+++ b/app/assets/javascripts/inbox.js
@@ -99,6 +99,8 @@ $(document).ready(function(){
     },
     trigger: 'manual'
   });
+  
+  $('.participants_link > span').tooltip({placement: 'bottom'});
 
   $('.participants_link').click(function(e) {
     e.stopPropagation();
diff --git a/app/assets/stylesheets/application.css.sass b/app/assets/stylesheets/application.css.sass
index 2620237185134011577025a744175d7e5ea7c0ec..c4eae479c4dc4c0cf704ce3d571bfea9f83ba51f 100644
--- a/app/assets/stylesheets/application.css.sass
+++ b/app/assets/stylesheets/application.css.sass
@@ -2051,7 +2051,15 @@ ul#press_logos
     :color $blue
 
   .participants_link
-    :float left
+    :margin-top 5px
+    :clear right
+    :float right
+    :color #aaa
+    
+  .icons-users
+    :display block
+    :width 25px
+    :height 16px
 
   .conversation_participants_popover_content
     :display none
diff --git a/app/views/conversations/_conversation.haml b/app/views/conversations/_conversation.haml
index 9a165a43e51db735c9319ceee8a17cc0c4933870..49d17ccb33b1e84a7012aa695d22413c89f042a8 100644
--- a/app/views/conversations/_conversation.haml
+++ b/app/views/conversations/_conversation.haml
@@ -20,5 +20,5 @@
           - if authors[conversation.id].present?
             = authors[conversation.id].name
  
-          = link_to t('.participants'), '#', :class => 'participants_link', :"data-conversation-id" => conversation.id
+          = link_to content_tag(:span, nil, class: 'icons-users', title: t('.participants')), '#', :class => 'participants_link', "data-conversation-id" => conversation.id
           = render :partial => 'participants_popover', :locals => { :conversation => conversation }
diff --git a/features/conversations.feature b/features/conversations.feature
index bf69da0b1e1d714516ce8fe5346af585b5ecbe5c..6dd07ef41e6c1a5bd92f46f92744735dcf635430 100644
--- a/features/conversations.feature
+++ b/features/conversations.feature
@@ -14,7 +14,7 @@ Feature: private messages
     Given I send a message with subject "Greetings" and text "hello, alice!" to "Alice Awesome"
     Then I should see "Greetings" within "#conversation_inbox"
     And I should see "Greetings" within "#conversation_show"
-    And I follow "Participants"
+    And I click on selector "a.participants_link"
     Then I should see the participants popover
     And I should see "Alice Awesome" as part of the participants popover
     And I should see "Robert Grimm" as part of the participants popover