diff --git a/app/views/aspects/edit.html.haml b/app/views/aspects/edit.html.haml
index 0ea61a4eb..075c92557 100644
--- a/app/views/aspects/edit.html.haml
+++ b/app/views/aspects/edit.html.haml
@@ -11,14 +11,13 @@
       = t('contacts', :count =>@aspect_contacts_count)
 
       - if @aspect.contacts_visible
-        = link_to image_tag('icons/padlock-open.png', :height => 16, :width => 16, :id => "contact_visibility_padlock", :class => 'open'),
+        = link_to image_tag('icons/padlock-open.png', :height => 16, :width => 16, :id => "contact_visibility_padlock", :class => 'open', :title => t('.aspect_list_is_visible')),
           "aspects/#{@aspect.id}/toggle_contact_visibility", :remote => true
           
       - else
-        = link_to image_tag('icons/padlock-closed.png', :height => 16, :width => 16, :id => "contact_visibility_padlock"),
+        = link_to image_tag('icons/padlock-closed.png', :height => 16, :width => 16, :id => "contact_visibility_padlock", :title => t('.aspect_list_is_not_visible')),
           "aspects/#{@aspect.id}/toggle_contact_visibility", :remote => true
           
-      
     %h3#aspect_name_title
       %span.name= @aspect
       %span.tiny_text
diff --git a/app/views/aspects/toggle_contact_visibility.js b/app/views/aspects/toggle_contact_visibility.js.erb
similarity index 64%
rename from app/views/aspects/toggle_contact_visibility.js
rename to app/views/aspects/toggle_contact_visibility.js.erb
index 0f4c3cbcc..9598e4507 100644
--- a/app/views/aspects/toggle_contact_visibility.js
+++ b/app/views/aspects/toggle_contact_visibility.js.erb
@@ -4,8 +4,10 @@ $(document).ready(function() {
 
   if(padlockImg.hasClass('open')) {
     padlockImg.attr('src', 'images/icons/padlock-closed.png');
+    padlockImg.attr('title', "<%= t('aspects.edit.aspect_list_is_not_visible') %>");
   } else {
     padlockImg.attr('src', 'images/icons/padlock-open.png');
+    padlockImg.attr('title', "<%= t('aspects.edit..aspect_list_is_visible') %>");
   }
   padlockImg.toggleClass('open');
 
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index c75f8f3ae..121e8bbcb 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -169,7 +169,8 @@ en:
           add_existing: "Add an existing contact"
           done: "Done"
           rename: "rename"
-          make_aspect_list_visible: "make aspect list visible to others in aspect"
+          aspect_list_is_visible: "aspect list is visible to others in aspect"
+          aspect_list_is_not_visible: "aspect list is hidden to others in aspect"
       aspect_contacts:
           done_editing: "done editing"
       aspect_stream:
diff --git a/public/javascripts/aspect-edit-pane.js b/public/javascripts/aspect-edit-pane.js
index 97d37b67b..8e1900a9e 100644
--- a/public/javascripts/aspect-edit-pane.js
+++ b/public/javascripts/aspect-edit-pane.js
@@ -16,5 +16,4 @@ $(document).ready(function() {
   $(".edit_aspect").live('ajax:success', function(data, json, xhr) {
     toggleAspectTitle();
   });
-
 });