diff --git a/plinth/templates/base.html b/plinth/templates/base.html
index e83228719..7990bf876 100644
--- a/plinth/templates/base.html
+++ b/plinth/templates/base.html
@@ -73,7 +73,7 @@
                 <a href="{{ item.url }}">
             {% endif %}
 
-                <span class="{{ item.icon }} glyphicon glyphicon-white nav-icon"></span>
+                <span class="{{ item.icon }} glyphicon nav-icon"></span>
                 {{ item.label }}
               </a>
             </li>
@@ -82,7 +82,7 @@
 
         {% if user.is_authenticated %}
           <p class="navbar-text pull-right">
-            <i class="glyphicon glyphicon-user glyphicon-white nav-icon"></i>
+            <i class="glyphicon glyphicon-user nav-icon"></i>
             Logged in as <a href="#">{{ user.username }}</a>.
             <a href="{% url 'lib:logout' %}" title="Log out">
               Log out</a>.
@@ -90,7 +90,7 @@
         {% else %}
           <p class="navbar-text pull-right">
             Not logged in.
-            <i class="glyphicon glyphicon-user glyphicon-white nav-icon"></i>
+            <i class="glyphicon glyphicon-user nav-icon"></i>
             <a href="{% url 'lib:login' %}" title="Log in">
               Log in</a>.
           </p>
diff --git a/plinth/templates/menu.html b/plinth/templates/menu.html
index fd106e891..eef90b4fe 100644
--- a/plinth/templates/menu.html
+++ b/plinth/templates/menu.html
@@ -18,18 +18,16 @@
 {% endcomment %}
 
 <ul class="nav nav-pills nav-stacked">
-  <li class="nav-header">Menu</li>
   {% for item in menu.items %}
 
     {% if item.url in active_menu_urls %}
       <li class="active">
         <a href="{{ item.url }}" class="active">
-          <span class="{{ item.icon }} glyphicon glyphicon-white sidenav-icon"></span>
     {% else %}
       <li>
         <a href="{{ item.url }}">
-          <span class="{{ item.icon }} glyphicon sidenav-icon"></span>
     {% endif %}
+          <span class="{{ item.icon }} glyphicon sidenav-icon"></span>
           {{ item.label }}
         </a>
         {% if item.items %}