diff --git a/resources/assets/stylesheets/scss/header.scss b/resources/assets/stylesheets/scss/header.scss
index b2f271538b756d38523642462d4a1e45521e68d2..74ee95e5140651d3d8cf416c7e13dd69466a372d 100644
--- a/resources/assets/stylesheets/scss/header.scss
+++ b/resources/assets/stylesheets/scss/header.scss
@@ -83,7 +83,6 @@
 
     #top-logo {
         flex: 0 1 auto;
-        margin: -13px 12px 0 20px;
 
         &.studip-logo {
             @include hide-text();
@@ -94,7 +93,6 @@
             background-position: left;
             display: block;
             width: 130px;
-            height: 81px;
             margin-right: 30px;
         }
     }
@@ -111,6 +109,7 @@
     align-items: stretch;
     justify-content: flex-start;
     flex-grow: 1;
+    background-color: var(--color--main-navigation-background);
 
     &.oversized {
         overflow: visible;
@@ -134,6 +133,7 @@
         color: var(--color--font-primary);
         height: 30px;
         padding: 10px 15px 5px 15px;
+        margin-bottom: 10px;
         max-height: 30px;
         overflow: hidden;
         background-color: var(--color--main-navigation-background);
@@ -159,7 +159,7 @@
     .tabs_wrapper {
         display: flex;
         flex-direction: row;
-        align-items: stretch;
+        align-items: center;
         justify-content: space-between;
         background-color: var(--color--main-navigation-background);
         font-size: 0.9em;
@@ -167,7 +167,7 @@
         min-height: 2.3em;
         border-bottom: 1px solid var(--color--main-navigation-border);
         padding-left: $page-margin;
-        padding-top: 10px;
+        padding-right: $page-margin;
     }
 
     #tabs {
diff --git a/resources/assets/stylesheets/scss/helpbar.scss b/resources/assets/stylesheets/scss/helpbar.scss
index 56903fdc1614ce672c5e126f4313c7fc26b53f13..f073190a90d3628cdfae7b5d33b4b169dcd9de09 100644
--- a/resources/assets/stylesheets/scss/helpbar.scss
+++ b/resources/assets/stylesheets/scss/helpbar.scss
@@ -13,12 +13,9 @@ $border-width: 4px;
     clear: both;
     height: 28px;
     position: relative;
-    top: 1px;
     min-width: 32px;
     right: 10px;
 
-    float: right;
-
     h2, h3 {
         border-bottom: 0;
         color: var(--white);
diff --git a/resources/assets/stylesheets/scss/responsive.scss b/resources/assets/stylesheets/scss/responsive.scss
index 2ceed4888c505396835ba1ae6e0f00c5d79fda0c..c2ca5c367fd34555d9aa8be3946e4e88041feca5 100644
--- a/resources/assets/stylesheets/scss/responsive.scss
+++ b/resources/assets/stylesheets/scss/responsive.scss
@@ -25,12 +25,14 @@ $sidebarOut: -330px;
 
 #non-responsive-toggle-fullscreen {
     margin-left: auto;
-    margin-right: 10px;
-    position: relative;
-    top: 2px;
+
+    button {
+        padding: 0;
+    }
 
     img {
         cursor: pointer;
+        vertical-align: middle;
     }
 }
 
diff --git a/resources/assets/stylesheets/scss/tabs.scss b/resources/assets/stylesheets/scss/tabs.scss
index b5c90aae6c19fecbbe71573def8c9ebd2b428426..ad0f5396af215d5f26ce4c66d94333c70128a4b4 100644
--- a/resources/assets/stylesheets/scss/tabs.scss
+++ b/resources/assets/stylesheets/scss/tabs.scss
@@ -7,7 +7,6 @@ div.clear
 // Common styles for both tab sets
 #tabs {
     line-height: 20px;
-    float: none;
     flex: 0 1 auto;
     margin: 0;