diff --git a/framework/core/ember/app/styles/flarum/hero.less b/framework/core/ember/app/styles/flarum/hero.less
index 6627e7c32..a6d3815c9 100644
--- a/framework/core/ember/app/styles/flarum/hero.less
+++ b/framework/core/ember/app/styles/flarum/hero.less
@@ -1,4 +1,5 @@
 .hero {
+  margin-top: -1px;
   background: @fl-body-hero-bg;
   text-align: center;
   padding: 20px 0;
diff --git a/framework/core/ember/app/styles/flarum/index.less b/framework/core/ember/app/styles/flarum/index.less
index 43081e161..c0d9d7851 100644
--- a/framework/core/ember/app/styles/flarum/index.less
+++ b/framework/core/ember/app/styles/flarum/index.less
@@ -152,11 +152,12 @@
       position: fixed;
       z-index: @zindex-pane;
       overflow: auto;
-      top: 56px;
+      top: @header-height;
       bottom: 0;
       width: @index-pane-width;
       background: @fl-body-bg;
       padding-bottom: 200px;
+      border-top: 1px solid @fl-body-control-bg;
       .box-shadow(2px 2px 6px -2px @fl-shadow-color);
       .transition(left 0.2s);
 
diff --git a/framework/core/ember/app/styles/flarum/layout.less b/framework/core/ember/app/styles/flarum/layout.less
index b9b42edb2..2e79d771f 100644
--- a/framework/core/ember/app/styles/flarum/layout.less
+++ b/framework/core/ember/app/styles/flarum/layout.less
@@ -39,9 +39,9 @@ body {
 .global-page:before {
   content: " ";
   .toolbar();
+  border-bottom: 0;
 
   .scrolled & {
-    border-bottom: 0;
     .box-shadow(0 2px 6px @fl-shadow-color);
   }
 
@@ -306,6 +306,10 @@ body {
 // ------------------------------------
 // Content Area
 
+.global-content {
+  border-top: 1px solid @fl-body-control-bg;
+}
+
 // On phones, the content area overlays the drawer, so we must give it a
 // background and min-height so it cannot be seen through. When the drawer is
 // meant to be open, we slide the content to the right to reveal the drawer.
@@ -316,7 +320,7 @@ body {
     width: 100%;
     min-height: 100vh;
     padding-bottom: 15px;
-    padding-top: @mobile-header-height;
+    margin-top: @mobile-header-height;
     .box-shadow(0 0 6px @fl-shadow-color);
     .transition(margin-left 0.2s);
 
@@ -328,7 +332,7 @@ body {
 
 @media @tablet, @desktop, @desktop-hd {
   .global-content {
-    padding-top: @header-height;
+    margin-top: @header-height;
   }
 }