diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss
index d472ae41207..78e721198ce 100644
--- a/app/assets/stylesheets/common/base/compose.scss
+++ b/app/assets/stylesheets/common/base/compose.scss
@@ -359,10 +359,6 @@
   }
 }
 
-.cooked > *:first-child {
-  margin-top: 0;
-}
-
 .autocomplete {
   z-index: z("composer", "dropdown") + 1;
   position: absolute;
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 173f307dc32..71f7fd146ab 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -81,6 +81,11 @@ $quote-share-maxwidth: 150px;
 .d-editor-preview {
   word-wrap: break-word;
   line-height: $line-height-large;
+
+  > *:first-child {
+    margin-top: 0;
+  }
+
   h1,
   h2,
   h3,
diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss
index 3e7a645f4a8..73ff05bf8d1 100644
--- a/app/assets/stylesheets/common/d-editor.scss
+++ b/app/assets/stylesheets/common/d-editor.scss
@@ -137,10 +137,6 @@
   color: var(--primary-medium) !important;
 }
 
-.d-editor-preview > *:first-child {
-  margin-top: 0;
-}
-
 .hide-preview .d-editor-preview-wrapper {
   display: none;
   flex: 0;
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index c315f546374..7ee3455445d 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -15,11 +15,6 @@
 }
 
 .topic-body {
-  // this ensures consistent top margin on topic posts even if the first line of a post
-  // is a top-margin-less element like a list or image.
-  .regular {
-    margin-top: 15px;
-  }
   padding: 0;
   &:first-of-type {
     border-top: none;
@@ -573,7 +568,7 @@ blockquote {
   padding: 12px 0 0 0;
   .topic-meta-data,
   .cooked {
-    padding: 0 $topic-body-width-padding 0.25em $topic-body-width-padding;
+    padding: 1em $topic-body-width-padding 0.25em $topic-body-width-padding;
   }
   .group-request {
     padding: 0.5em $topic-body-width-padding 0 $topic-body-width-padding;