diff --git a/seahub/templates/home_base.html b/seahub/templates/home_base.html
index 38e3b0f54f..c2e7ab8f2e 100644
--- a/seahub/templates/home_base.html
+++ b/seahub/templates/home_base.html
@@ -8,23 +8,23 @@
         <h3 class="hd">{% trans "Files" %}</h3>
         <ul class="side-tabnav-tabs">
             {% if user.permissions.can_add_repo %}
-            <li class="tab"><a href="{{ SITE_ROOT }}#my-libs/" class="ellipsis" title="{% trans "My Libraries" %}"><span class="sf2-icon-user"></span>{% trans "My Libraries" %}</a></li>
+            <li class="tab"><a href="{{ SITE_ROOT }}#my-libs/" class="ellipsis" title="{% trans "My Libraries" %}"><span class="sf2-icon-user" aria-hidden="true"></span>{% trans "My Libraries" %}</a></li>
             {% endif %}
-            <li class="tab"><a href="{{ SITE_ROOT }}#shared-libs/" class="ellipsis" title="{% trans "Shared to me" %}"><span class="sf2-icon-share"></span>{% trans "Shared to me" %}</a></li>
+            <li class="tab"><a href="{{ SITE_ROOT }}#shared-libs/" class="ellipsis" title="{% trans "Shared with me" %}"><span class="sf2-icon-share" aria-hidden="true"></span>{% trans "Shared with me" %}</a></li>
             {% if user.permissions.can_view_org %}
-            <li class="tab"><a href="{{ SITE_ROOT }}#org/"><span class="sf2-icon-organization"></span>{% trans "Organization" %}</a></li>
+            <li class="tab"><a href="{{ SITE_ROOT }}#org/" class="ellipsis" title="{% trans "Shared with all" %}"><span class="sf2-icon-organization" aria-hidden="true"></span>{% trans "Shared with all" %}</a></li>
             {% endif %}
 
 
             <li class="tab" id="group-nav">
-                <a href="#"><span class="sf2-icon-group"></span>{% trans "Groups" %}<span class="toggle-icon icon-caret-left fright"></span></a>
+                <a href="#" class="ellipsis" title="{% trans "Shared with groups" %}"><span class="toggle-icon icon-caret-left fright" aria-hidden="true"></span><span class="sf2-icon-group" aria-hidden="true"></span>{% trans "Shared with groups" %}</a>
                 <ul class="grp-list hide">
                     <li>
-                        <a href="{% url 'group_list' %}"><span class="sharp">#</span>{% trans "All Groups" %}</a>
+                        <a href="{% url 'group_list' %}"><span class="sharp" aria-hidden="true">#</span>{% trans "All Groups" %}</a>
                     </li>
                     {% for grp in grps %}
                     <li>
-                        <a class="ellipsis" href="{{SITE_ROOT}}#group/{{ grp.id }}/" title="{{ grp.group_name }}"><span class="sharp">#</span>{{ grp.group_name }}</a>
+                        <a class="ellipsis" href="{{SITE_ROOT}}#group/{{ grp.id }}/" title="{{ grp.group_name }}"><span class="sharp" aria-hidden="true">#</span>{{ grp.group_name }}</a>
                     </li>
                     {% endfor %}
                 </ul>
@@ -35,25 +35,25 @@
             <h3 class="fleft">{% trans "Tools" %}</h3>
         </div>
         <ul class="side-tabnav-tabs">
-            <li class="tab"><a href="{{ SITE_ROOT }}#starred/"><span class="sf2-icon-star"></span>{% trans "Favorites" %}</a></li>
+            <li class="tab"><a href="{{ SITE_ROOT }}#starred/"><span class="sf2-icon-star" aria-hidden="true"></span>{% trans "Favorites" %}</a></li>
             {% if events_enabled %}
-            <li class="tab"><a href="{{ SITE_ROOT }}#activities/"><span class="sf2-icon-clock"></span>{% trans "Activities" %}</a></li>
+            <li class="tab"><a href="{{ SITE_ROOT }}#activities/"><span class="sf2-icon-clock" aria-hidden="true"></span>{% trans "Activities" %}</a></li>
             {% endif %}
             {% for mod in request.user.mods_enabled %}
             {% if mod == 'personal wiki' %}
-            <li class="tab {% block cur_personal_wiki %}{% endblock %}"><a href="{% url 'personal_wiki' %}"><span class="sf2-icon-wiki"></span>{% trans "Personal Wiki" %}</a></li>
+            <li class="tab {% block cur_personal_wiki %}{% endblock %}"><a href="{% url 'personal_wiki' %}"><span class="sf2-icon-wiki" aria-hidden="true"></span>{% trans "Personal Wiki" %}</a></li>
             {% endif %}
             {% endfor %}
-            <li class="tab"><a href="{{ SITE_ROOT }}#devices/" class="ellipsis" title="{% trans "Linked Devices" %}"><span class="sf2-icon-monitor"></span>{% trans "Linked Devices" %}</a></li>
+            <li class="tab"><a href="{{ SITE_ROOT }}#devices/" class="ellipsis" title="{% trans "Linked Devices" %}"><span class="sf2-icon-monitor" aria-hidden="true"></span>{% trans "Linked Devices" %}</a></li>
         </ul>
 
         <h3 class="hd">{% trans "Share Admin" %}</h3>
         <ul class="side-tabnav-tabs">
             {% if user.permissions.can_add_repo %}
-            <li class="tab {% block cur_share_libs %}{% endblock %}"><a href="{{ SITE_ROOT }}#share-admin-libs/"><span class="sf2-icon-library"></span>{% trans "Libraries" %}</a></li>
-            <li class="tab {% block cur_share_folders %}{% endblock %}"><a href="{{ SITE_ROOT }}#share-admin-folders/"><span class="sf2-icon-folder"></span>{% trans "Folders" %}</a></li>
+            <li class="tab {% block cur_share_libs %}{% endblock %}"><a href="{{ SITE_ROOT }}#share-admin-libs/"><span class="sf2-icon-library" aria-hidden="true"></span>{% trans "Libraries" %}</a></li>
+            <li class="tab {% block cur_share_folders %}{% endblock %}"><a href="{{ SITE_ROOT }}#share-admin-folders/"><span class="sf2-icon-folder" aria-hidden="true"></span>{% trans "Folders" %}</a></li>
             {% endif %}
-            <li class="tab {% block cur_share_links %}{% endblock %}"><a href="{{ SITE_ROOT }}#share-admin-share-links/"><span class="sf2-icon-link"></span>{% trans "Links" %}</a></li>
+            <li class="tab {% block cur_share_links %}{% endblock %}"><a href="{{ SITE_ROOT }}#share-admin-share-links/"><span class="sf2-icon-link" aria-hidden="true"></span>{% trans "Links" %}</a></li>
         </ul>
 
         {% endblock %}
diff --git a/seahub/templates/js/templates.html b/seahub/templates/js/templates.html
index 49cdd69d62..60f41abd64 100644
--- a/seahub/templates/js/templates.html
+++ b/seahub/templates/js/templates.html
@@ -618,18 +618,18 @@
         {% endif %}
 
         <li class="tab<% if (cur_tab == 'shared') { %> tab-cur<% } %>">
-            <a href="{{ SITE_ROOT }}#shared-libs/" class="ellipsis" title="{% trans "Shared to me" %}"><span aria-hidden="true" class="sf2-icon-share"></span>{% trans "Shared to me" %}</a>
+            <a href="{{ SITE_ROOT }}#shared-libs/" class="ellipsis" title="{% trans "Shared with me" %}"><span aria-hidden="true" class="sf2-icon-share"></span>{% trans "Shared with me" %}</a>
         </li>
 
         {% if user.permissions.can_view_org %}
         <li class="tab<% if (cur_tab == 'org') { %> tab-cur<% } %>">
-            <a href="{{ SITE_ROOT }}#org/"><span aria-hidden="true" class="sf2-icon-organization"></span>{% trans "Organization" context "This is a label in navigation, meaning the public area for all registered users to share libraries." %}</a>
+            <a href="{{ SITE_ROOT }}#org/" class="ellipsis" title="{% trans "Shared with all" %}"><span aria-hidden="true" class="sf2-icon-organization"></span>{% trans "Shared with all" %}</a>
         </li>
         {% endif %}
 
         <% if (cur_tab == 'group') { %>
         <li class="tab" id="group-nav">
-            <a href="#"><span aria-hidden="true" class="sf2-icon-group"></span>{% trans "Groups" %}<span aria-hidden="true" class="toggle-icon icon-caret-down fright"></span></a>
+            <a href="#" class="ellipsis" title="{% trans "Shared with groups" %}"><span aria-hidden="true" class="toggle-icon icon-caret-down fright"></span><span aria-hidden="true" class="sf2-icon-group"></span>{% trans "Shared with groups" %}</a>
             <ul class="grp-list">
                 <li<% if (cur_group_tab == 'groups') { %> class="tab-cur"<% }%>><a href="{% url 'group_list' %}"><span class="sharp" aria-hidden="true">#</span>{% trans "All Groups" %}</a></li>
                 <% for (var i = 0, len = groups.length; i < len; i++) { %>
@@ -646,10 +646,10 @@
         <% } else { %>
         <li class="tab" id="group-nav">
             <% if (show_group_list) { %>
-            <a href="#"><span aria-hidden="true" class="sf2-icon-group"></span>{% trans "Groups" %}<span class="toggle-icon icon-caret-down fright"></span></a>
+            <a href="#" class="ellipsis" title="{% trans "Shared with groups" %}"><span class="toggle-icon icon-caret-down fright" aria-hidden="true"></span><span aria-hidden="true" class="sf2-icon-group"></span>{% trans "Shared with groups" %}</a>
             <ul class="grp-list">
             <% } else { %>
-            <a href="#"><span aria-hidden="true" class="sf2-icon-group"></span>{% trans "Groups" %}<span class="toggle-icon icon-caret-left fright"></span></a>
+            <a href="#" class="ellipsis" title="{% trans "Shared with groups" %}"><span class="toggle-icon icon-caret-left fright" aria-hidden="true"></span><span aria-hidden="true" class="sf2-icon-group"></span>{% trans "Shared with groups" %}</a>
             <ul class="grp-list hide">
             <% } %>
                 <li>
diff --git a/seahub/templates/libraries.html b/seahub/templates/libraries.html
index a8a949ecb7..4e3801fba1 100644
--- a/seahub/templates/libraries.html
+++ b/seahub/templates/libraries.html
@@ -26,13 +26,14 @@
 </script>
 
 <script type="text/template" id="repos-shared-to-me-tmpl">
-    <h3 class="hd">{% trans "Shared to me" %}</h3>
+    <h3 class="hd">{% trans "Shared with me" %}</h3>
     <table class="hide">
         <thead></thead>
         <tbody></tbody>
     </table>
     <div class="empty-tips hide">
-        <h2 class="alc">{% trans "No library is shared to you" %}</h2>
+        <h2 class="alc">{% trans "No library is shared to you personally" %}</h2>
+        <p>{% blocktrans %}No library is shared to you personally. You can find more shared libraries at "Shared with groups".{% endblocktrans %}</p>
     </div>
     <span class="loading-icon loading-tip"></span>
     <p class="error error-tip hide"></p>
@@ -40,7 +41,7 @@
 
 <script type="text/template" id="organization-repos-tmpl">
     <div class="hd">{# no 'ovhd' as there is a .dropdown-menu in it #}
-        <h3 class="fleft">{% trans "Organization" context "This is a label in navigation, meaning the public area for all registered users to share libraries." %}</h3>
+        <h3 class="fleft">{% trans "Shared with all" %}</h3>
         {% if can_add_pub_repo %}
         <div class="fright sf-dropdown js-add-pub-lib-dropdown">
             <button class="btn-white sf-dropdown-toggle"><span aria-hidden="true" class="icon-plus-square add vam"></span><span class="vam">{% trans "Add Library"%}</span></button>