diff --git a/media/mailman_django/default/css/icons.css b/media/mailman_django/default/css/icons.css
index 3df1ae5..3ad574f 100644
--- a/media/mailman_django/default/css/icons.css
+++ b/media/mailman_django/default/css/icons.css
@@ -45,3 +45,11 @@
     {background-image: url(../img/tango/emblems/account-delete.svg);} 
     
 /** Settings **/
+
+/** user_settings - membership_settings **/
+
+.mm_user_settings a
+    {background-image: url(../img/tango/TODO-blueuser_with_editPen);} 
+    
+.mm_user_subscriptions a
+    {background-image: url(../img/tango/TODO-blueuser_with_editlist_icon);} 
diff --git a/templates/mailman-django/user_settings.html b/templates/mailman-django/user_settings.html
index 7686ad7..34fe30a 100644
--- a/templates/mailman-django/user_settings.html
+++ b/templates/mailman-django/user_settings.html
@@ -29,17 +29,27 @@
         {% endif %}
     </div>
 {% endblock %}
+
+{% block actionButtonsList %}
+    <ul class="mm_actionButtons">
+        <li class="mm_user_settings"><a href="{% url user_settings %}">{% trans "My Account" %}</a></li>
+        <li class="mm_user_subscriptions"><a href="{% url membership_settings %}">{% trans "All my Subscriptions" %}</a></li>
+    </ul>    
+{% endblock %}
+
 {% block smallBoxLeft %}
     {% if membership_lists %}
         {% for list in membership_lists %}
         <div class="mm_box mm_smallBox {% cycle 'mm_clear' '' %}">
-            <div class="mm_boxHeader">{{ list.real_name }} {% if not list.settings.advertised %}(non-public){% endif %}</div>
+            <div class="mm_boxHeader">
+                <a href="{% url list_summary fqdn_listname=list.fqdn_listname%}">
+                    {{ list.real_name }} {% if not list.settings.advertised %}(non-public){% endif %}
+                </a>
+            </div>
             <ul>
                 <li><a href="{% url membership_settings fqdn_listname=list.fqdn_listname%}"> My Membership</li>
-                <li><a href="#TODO"> 
-                <!--url subscriptions fqdn_listname=list.fqdn_listname-->
-                My Subscription</li>
-                <li><a href="{% url list_summary fqdn_listname=list.fqdn_listname%}"> List Summary</li>
+                <li><a href="{% url membership_settings fqdn_listname=list.fqdn_listname %}"> 
+                My Subscription</a></li>
             </ul>
         </div>
         {% endfor %}