diff --git a/public/css/icinga/layout.less b/public/css/icinga/layout.less
index 7bd138e62..b186d7846 100644
--- a/public/css/icinga/layout.less
+++ b/public/css/icinga/layout.less
@@ -294,6 +294,10 @@ html.no-js .controls > .tabs {
       white-space: nowrap;
     }
 
+    .nav-item.no-icon > a {
+      padding-left: .75em;
+    }
+
     .nav-level-1 > .nav-item i {
       font-size: 1.5em;
       margin-right: .5em;
@@ -312,10 +316,12 @@ html.no-js .controls > .tabs {
     padding-left: 3.75em;
     width: 20em;
     position: fixed;
+    z-index: 1;
   }
 
   .search-input {
     font-size: 1.25em;
+    padding-right: .625em;
   }
 
   .search-reset {
diff --git a/public/css/icinga/menu.less b/public/css/icinga/menu.less
index 22ac01548..c1abaa822 100644
--- a/public/css/icinga/menu.less
+++ b/public/css/icinga/menu.less
@@ -66,7 +66,7 @@
   }
 
   &.no-icon > a {
-    padding-left: @icon-width;
+    padding-left: @icon-width + .75em;
   }
 
   > a {