diff --git a/deme_django/cms/templates/authenticationmethod/loginmenuitem.html b/deme_django/cms/templates/authenticationmethod/loginmenuitem.html
index 00e11bc7..5a192801 100644
--- a/deme_django/cms/templates/authenticationmethod/loginmenuitem.html
+++ b/deme_django/cms/templates/authenticationmethod/loginmenuitem.html
@@ -1,9 +1,9 @@
 {% if can_login_as_anyone %}
-<li class="loginmenuitem"><a href="{% url item_type_url viewer="authenticationmethod",action="login" %}?redirect={{ redirect|urlencode }}">Login as</a></li>
+<li class="loginmenuitem"><a href="{% url item_type_url viewer="authenticationmethod",action="login" %}?redirect={{ redirect|urlencode }}"><i class="glyphicon glyphicon-user"></i> Login as</a></li>
 {% endif %}
 {% if cur_agent.is_anonymous %}
 {% else %}
-<li class="loginmenuitem"><a href="{{ cur_agent.get_absolute_url }}">My account</a></li>
-<li class="loginmenuitem"><a href="#" onclick="document.forms['logout_form'].submit(); return false;">Logout</a></li>
+<li class="loginmenuitem"><a href="{{ cur_agent.get_absolute_url }}"><i class="glyphicon glyphicon-cog"></i> My account</a></li>
+<li class="loginmenuitem"><a href="#" onclick="document.forms['logout_form'].submit(); return false;"><i class="glyphicon glyphicon-off"></i> Logout</a></li>
 <li><form name="logout_form" style="display: inline;" method="post" action="{% url item_type_url viewer="authenticationmethod",action="logout" %}?redirect={{ redirect|urlencode }}"></form></li>
 {% endif %}
diff --git a/deme_django/cms/templates/includes/adminbar.html b/deme_django/cms/templates/includes/adminbar.html
index cf2d4d42..6fa04ec8 100644
--- a/deme_django/cms/templates/includes/adminbar.html
+++ b/deme_django/cms/templates/includes/adminbar.html
@@ -14,7 +14,7 @@
 
   <ul class="nav pull-right actions-wrap">
     <li class="dropdown">
-      <a href="#" class="dropdown-toggle" data-toggle="dropdown">Actions <span class="caret"></span>
+      <a href="#" class="dropdown-toggle" data-toggle="dropdown" title="Actions">Actions <span class="caret"></span>
       </a>
       <ul class="dropdown-menu">
         {% actionsmenu %}
@@ -30,7 +30,12 @@
     <li><a href="#"><i class="glyphicon glyphicon-plus-sign"></i></a></li>
     <li><a href="#"><i class="glyphicon glyphicon-edit"></i></a></li>
     <li><a href="#"><i class="glyphicon glyphicon-comment"></i></a></li>
-    <li><a href="#"><i class="glyphicon glyphicon-user"></i></a></li>
+    <li class="dropdown">
+      <a href="#" class="dropdown-toggle" data-toggle="dropdown" title="Account"><i class="glyphicon glyphicon-user"></i></a>
+      <ul class="dropdown-menu login-menu">
+        {% login_menu %}
+      </ul>
+    </li>
     {% if item %}
     <li><a href="#" title="Toggle Metadata" class="metabar-toggle"><i class="glyphicon glyphicon-info-sign"></i></a></li>
     {% endif %}
@@ -51,12 +56,6 @@
             </script>
         </div>
 
-        <div style="float: left;">
-            <span style="text-size: larger; font-weight: bold;">Account:</span>
-            <br />
-            {% login_menu %}
-        </div>
-
     </div>
 
     <form method="get" action="{% url item_type_url viewer="item" %}" style="display: inline; border-bottom: 20px;">
diff --git a/deme_django/cms/templatetags/item_tags.py b/deme_django/cms/templatetags/item_tags.py
index 29399306..00b62b11 100644
--- a/deme_django/cms/templatetags/item_tags.py
+++ b/deme_django/cms/templatetags/item_tags.py
@@ -1886,24 +1886,7 @@ def render(self, context):
         else:
             login_menu_text = u'%s' % get_viewable_name(context, viewer.cur_agent)
 
-        result.append("""
-        <script type="text/javascript">
-        $(function(){
-            var menuContent = '<ul style="font-size: 85%%;">';
-            $.each($('#login_menu_link').next().children().filter('li.loginmenuitem'), function(i, val){
-                menuContent += '<li>' + $(val).html() + '</li>';
-            });
-            menuContent += '</ul>'
-            $('#login_menu_link').fgmenu({
-                content: menuContent,
-                showSpeed: 50,
-                fixedPosition: true,
-            });
-        });
-        </script>
-        <a href="#" class="fg-button fg-button-icon-right ui-widget ui-state-default ui-corner-all" id="login_menu_link"><span class="ui-icon ui-icon-triangle-1-s"></span>%s</a>
-        <ul style="display: none;">
-        """ % login_menu_text)
+        result.append("<li><span class='current-user'>%s</span></li>" % login_menu_text)
         for viewer_class in authentication_method_viewer_classes_with_loginmenuitem:
             viewer2 = viewer_class()
             if viewer.request.method == 'GET':
diff --git a/deme_django/modules/demeaccount/templates/demeaccount/loginmenuitem.html b/deme_django/modules/demeaccount/templates/demeaccount/loginmenuitem.html
index 12c3af07..3e256472 100644
--- a/deme_django/modules/demeaccount/templates/demeaccount/loginmenuitem.html
+++ b/deme_django/modules/demeaccount/templates/demeaccount/loginmenuitem.html
@@ -60,14 +60,14 @@
 
     {% if one_or_more %}
         {% if two_or_more %}
-        {% for account in auth_methods %} 
-        <li class="loginmenuitem"><a href="{% url item_url viewer="demeaccount",action="edit",noun=account.pk %}">Change password for {% viewable_name account %}</a></li>
+        {% for account in auth_methods %}
+        <li class="loginmenuitem"><a href="{% url item_url viewer="demeaccount",action="edit",noun=account.pk %}"><i class="glyphicon glyphicon-user"></i> Change password for {% viewable_name account %}</a></li>
         {% endfor %}
         {% else %}
-        {% for account in auth_methods %} 
-        <li class="loginmenuitem"><a href="{% url item_url viewer="demeaccount",action="edit",noun=account.pk %}">Change password</a></li>
+        {% for account in auth_methods %}
+        <li class="loginmenuitem"><a href="{% url item_url viewer="demeaccount",action="edit",noun=account.pk %}"><i class="glyphicon glyphicon-user"></i> Change password</a></li>
         {% endfor %}
         {% endif %}
-    {% endif %}    
+    {% endif %}
 
 {% endif %}
diff --git a/deme_django/static/css/deme.css b/deme_django/static/css/deme.css
index 7deda42f..f96d7e5a 100644
--- a/deme_django/static/css/deme.css
+++ b/deme_django/static/css/deme.css
@@ -4760,6 +4760,10 @@ you can use the generic selector below, but it's slower:
   background-image: none;
   border-right: 1px solid rgba(0, 0, 0, 0.15);
 }
+.adminbar .login-menu .current-user {
+  padding: 3px 20px;
+  font-weight: bold;
+}
 #overall-wrap {
   display: -webkit-box;
   /* OLD - iOS 6-, Safari 3.1-6 */
diff --git a/deme_django/static/less/deme/adminbar.less b/deme_django/static/less/deme/adminbar.less
index 2ebaa349..b66dda26 100644
--- a/deme_django/static/less/deme/adminbar.less
+++ b/deme_django/static/less/deme/adminbar.less
@@ -62,5 +62,11 @@
         }
       }
     }
+  } //.nav
+  .login-menu {
+    .current-user {
+      padding: 3px 20px;
+      font-weight: bold;
+    }
   }
 }
\ No newline at end of file