diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index c638900e3..96f9b4bdf 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -530,12 +530,6 @@ body > header,
 
   .top-bar {
     @include background-with-text-contrast($main-header, [main-header, brand]);
-    padding-bottom: $topbar-padding;
-    padding-top: $topbar-padding;
-
-    h1 {
-      line-height: $line-height;
-    }
   }
 }
 
@@ -550,6 +544,8 @@ body > header,
 .top-bar {
   align-items: center;
   display: flex;
+  padding-bottom: $topbar-padding;
+  padding-top: $topbar-padding;
 
   @include breakpoint(small only) {
     flex-direction: row-reverse;
@@ -570,6 +566,7 @@ body > header,
 
   h1 {
     flex-grow: 1;
+    line-height: $line-height;
     margin-bottom: 0;
 
     a img {
diff --git a/app/assets/stylesheets/layout/admin_header.scss b/app/assets/stylesheets/layout/admin_header.scss
index fbd1a9d15..105aa3f35 100644
--- a/app/assets/stylesheets/layout/admin_header.scss
+++ b/app/assets/stylesheets/layout/admin_header.scss
@@ -15,8 +15,6 @@
   }
 
   .top-bar {
-    padding-top: $line-height / 2;
-
     @include breakpoint(small only) {
 
       .account-menu {
@@ -39,16 +37,16 @@
       }
     }
 
+    @include breakpoint(medium) {
+      padding-bottom: 0.8rem;
+      padding-top: 0.8rem;
+    }
+
     [class^="icon-"] {
       font-size: $base-font-size;
     }
 
     h1 {
-      margin-top: $line-height / 2;
-
-      @include breakpoint(medium) {
-        margin-top: 0;
-      }
 
       small {
         color: inherit;
@@ -61,7 +59,6 @@
         font-family: "Lato" !important;
         font-size: rem-calc(24);
         font-weight: lighter;
-        line-height: 1;
       }
     }
   }