diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index 1bd6b836a0b..b9885750ae7 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -45,6 +45,11 @@ html {
 }
 
 body {
+  h1, h2, h3, h4, h5, h6 {
+    margin-top: 0;
+    margin-bottom: .5rem;
+  }
+
   background-attachment: fixed;
   background-size: cover;
   min-height: 100%;
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 127400ea6f7..aa739f782ab 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -44,7 +44,7 @@
 }
 
 // global styles for the cooked HTML content in posts (and preview)
-.cooked, .d-editor-preview, #banner-content {
+.cooked, .d-editor-preview {
   word-wrap: break-word;
   h1, h2, h3, h4, h5, h6 { margin: 30px 0 10px; }
   h1 { line-height: 1em; } /* normalize.css sets h1 font size but not line height */
diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss
index 1010ad70811..20e1ebc1ee6 100644
--- a/app/assets/stylesheets/desktop/discourse.scss
+++ b/app/assets/stylesheets/desktop/discourse.scss
@@ -144,10 +144,6 @@ body {
     font-family: Consolas, Menlo, Monaco, "Lucida Console", "Liberation Mono", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Courier New", monospace;
   }
 
-  h1, h2, h3, h4, h5, h6 {
-    margin: 0;
-  }
-
   /* page not found styles */
   h1.page-not-found {
     line-height: 30px;