diff --git a/framework/core/js/forum/src/components/CommentPost.js b/framework/core/js/forum/src/components/CommentPost.js
index ce78119bb..f7ce0533d 100644
--- a/framework/core/js/forum/src/components/CommentPost.js
+++ b/framework/core/js/forum/src/components/CommentPost.js
@@ -109,8 +109,8 @@ export default class CommentPost extends Post {
     return {
       className: classList({
         'CommentPost': true,
-        'hidden': post.isHidden(),
-        'edited': post.isEdited(),
+        'Post--hidden': post.isHidden(),
+        'Post--edited': post.isEdited(),
         'revealContent': this.revealContent,
         'editing': this.isEditing()
       })
diff --git a/framework/core/less/forum/ActivityPage.less b/framework/core/less/forum/ActivityPage.less
index 4fb657272..875d8d3a2 100644
--- a/framework/core/less/forum/ActivityPage.less
+++ b/framework/core/less/forum/ActivityPage.less
@@ -13,11 +13,15 @@
   > li {
     border-bottom: 1px solid @control-bg;
   }
+
+  .Post {
+    padding-top: 10px;
+  }
 }
 .PostsUserPage-discussion {
   font-weight: bold;
   margin-top: 15px;
-  margin-bottom: -15px;
+  margin-bottom: 10px;
   position: relative;
   z-index: 1;
 
diff --git a/framework/core/less/forum/Post.less b/framework/core/less/forum/Post.less
index ecd1d3aa4..8e6378858 100644
--- a/framework/core/less/forum/Post.less
+++ b/framework/core/less/forum/Post.less
@@ -2,10 +2,12 @@
 // Posts
 
 .Post {
-  padding: 30px 0;
+  padding: 30px 20px;
+  margin: -1px -20px;
   transition: 0.2s box-shadow, top 0.2s, opacity 0.2s;
   position: relative;
   top: 0;
+  border-radius: @border-radius;
 
   &.editing {
     top: 5px;
@@ -141,7 +143,7 @@
   }
 }
 
-.Post.hidden {
+.Post--hidden {
   .Post-header, .Post-header a, .Post-user h3, .Post-user h3 a {
     color: @muted-more-color;
   }
@@ -328,7 +330,7 @@
 
 @media @tablet-up {
   .Post {
-    padding-left: 90px;
+    padding-left: 20px + 90px;
 
     .Post-controls {
       opacity: 0;