diff --git a/plinth/templates/menu.html b/plinth/templates/menu.html
index eef90b4fe..62db706c9 100644
--- a/plinth/templates/menu.html
+++ b/plinth/templates/menu.html
@@ -27,7 +27,7 @@
       <li>
         <a href="{{ item.url }}">
     {% endif %}
-          <span class="{{ item.icon }} glyphicon sidenav-icon"></span>
+          <span class="{{ item.icon }} glyphicon"></span>
           {{ item.label }}
         </a>
         {% if item.items %}
diff --git a/static/themes/default/css/plinth.css b/static/themes/default/css/plinth.css
index 9d7f0b7e8..5b93605c5 100644
--- a/static/themes/default/css/plinth.css
+++ b/static/themes/default/css/plinth.css
@@ -3,10 +3,6 @@ body {
   padding-bottom: 20px;
 }
 
-.sidebar-nav .nav li a {
-  padding: 2px 15px;
-}
-
 /* nav-header is deprecated in bootstrap 3.x, so replicate it here */
 .nav-header {
   text-transform: uppercase;
@@ -16,12 +12,9 @@ body {
   color: #999;
 }
 
-.nav-icon {
-  margin-right: 8px;
-}
-.sidenav-icon {
-  margin-right: 8px;
-  padding-right: 5px;
+.nav .glyphicon,
+.sidebar .glyphicon {
+  margin-right: 4px;
 }
 
 .navbar-brand img {