diff --git a/public/css/icinga/layout.less b/public/css/icinga/layout.less
index ef918020c..2b17ecb8a 100644
--- a/public/css/icinga/layout.less
+++ b/public/css/icinga/layout.less
@@ -43,6 +43,7 @@
   width: 16em;
   position: fixed;
   left: 0;
+  margin-top: -3em;
 }
 
 #header-logo {
@@ -176,7 +177,9 @@
 // Display tabs if JS is disabled
 html.no-js .controls > .tabs {
   background-color: @icinga-blue;
-  margin-top: 0;
+  margin-left: -1 * @gutter;
+  margin-right: -1 * @gutter;
+  margin-top: -1 * @gutter;
 }
 
 // Dashboard grid
diff --git a/public/js/icinga/ui.js b/public/js/icinga/ui.js
index e6a8161f9..31195351e 100644
--- a/public/js/icinga/ui.js
+++ b/public/js/icinga/ui.js
@@ -625,6 +625,9 @@
                         this.mobileMenu = true;
                     }
                 } else {
+                    $headerLogo.css({
+                        top: $header.css('height')
+                    });
                     $main.css({
                         top: $header.css('height')
                     });