diff --git a/app/templates/base.html.j2 b/app/templates/base.html.j2
index a4ccc77e..dbf2b158 100644
--- a/app/templates/base.html.j2
+++ b/app/templates/base.html.j2
@@ -72,11 +72,11 @@
       </div>
       <ul id="nav-account-dropdown" class="dropdown-content">
         {% if current_user.is_authenticated %}
-        <li><a href="{{ url_for('auth.edit_profile') }}"><i class="material-icons">edit_profile</i>Edit Profile</a></li>
-        <li><a href="{{ url_for('auth.logout') }}"><i class="material-icons">chevron_left</i>Log out</a></li>
+        <li><a href="{{ url_for('auth.edit_profile') }}"><i class="material-icons">settings</i>Settings</a></li>
+        <li><a href="{{ url_for('auth.logout') }}"><i class="material-icons">power_settings_new</i>Log out</a></li>
         {% else %}
-        <li><a href="{{ url_for('auth.login') }}"><i class="material-icons">chevron_right</i>Log in</a></li>
-        <li><a href="{{ url_for('auth.register') }}"><i class="material-icons">chevron_right</i>Register</a></li>
+        <li><a href="{{ url_for('auth.login') }}"><i class="material-icons">person</i>Log in</a></li>
+        <li><a href="{{ url_for('auth.register') }}"><i class="material-icons">person_add</i>Register</a></li>
         {% endif %}
       </ul>
       <div class="navbar-fixed">
@@ -112,6 +112,17 @@
         <li><a class="subheader">Administration</a></li>
         <li><a href="{{ url_for('admin.for_admins_only') }}"><i class="material-icons">build</i>Administration tools</a></li>
         {% endif %}
+        <div class="hide-on-large-only">
+          <li><div class="divider"></div></li>
+          <li><a class="subheader">Account</a></li>
+          {% if current_user.is_authenticated %}
+          <li><a href="{{ url_for('auth.edit_profile') }}"><i class="material-icons">settings</i>Settings</a></li>
+          <li><a href="{{ url_for('auth.logout') }}"><i class="material-icons">power_settings_new</i>Log out</a></li>
+          {% else %}
+          <li><a href="{{ url_for('auth.login') }}"><i class="material-icons">person</i>Log in</a></li>
+          <li><a href="{{ url_for('auth.register') }}"><i class="material-icons">person_add</i>Register</a></li>
+          {% endif %}
+        </div>
       </ul>
     </header>