diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml
index bd541a011..a5c20d407 100644
--- a/app/views/shared/_publisher.html.haml
+++ b/app/views/shared/_publisher.html.haml
@@ -5,6 +5,8 @@
 :javascript
   $(function() {
     $(".question_mark").tipsy({trigger: 'hover', gravity: 'w'});
+    $(".service_icon").tipsy({trigger: 'hover', gravity: 'w'});
+    $(".public_icon").tipsy({trigger: 'hover', gravity: 'w'});
   });
 
 #publisher{:class => ((aspect == :profile)? 'mention_popup' : nil )}
@@ -43,13 +45,14 @@
 
         .public_toggle
           %span#publisher_service_icons
-            = link_to (image_tag "icons/monotone_wrench_settings.png"), "#question_mark_pane", :class => 'question_mark', :rel => 'facebox', :title => t('shared.public_explain.manage')
+            = t("shared.publisher.click_to_share_with")
             - if aspect == :all || :profile
               = status.hidden_field( :public)
               = image_tag "icons/globe.png", :title => t('.public'), :class => 'public_icon dim', :width => 16, :height => 16
             - if current_user.services
               - for service in current_user.services
-                = image_tag "social_media_logos/#{service.provider}-16x16.png", :title => service.provider, :class => "service_icon dim", :id =>"#{service.provider}"
+                = image_tag "social_media_logos/#{service.provider}-16x16.png", :title => service.provider.titleize, :class => "service_icon dim", :id =>"#{service.provider}"
+            = link_to (image_tag "icons/monotone_wrench_settings.png"), "#question_mark_pane", :class => 'question_mark', :rel => 'facebox', :title => t('shared.public_explain.manage')
           = status.submit t('.share'), :disable_with => t('.posting'), :class => 'button', :tabindex => 2
 
           .facebox_content
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index eaae01dd2..e680fdfd4 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -526,6 +526,7 @@ en:
       whats_on_your_mind: "what's on your mind?"
       publishing_to: "publishing to: "
       public: "Public"
+      click_to_share_with: "Click to share with: "
     add_contact:
       enter_a_diaspora_username: "Enter a Diaspora username:"
       your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"