diff --git a/src/ripcord.scss b/src/ripcord.scss
index b6d547f..0c496a2 100644
--- a/src/ripcord.scss
+++ b/src/ripcord.scss
@@ -33,7 +33,12 @@
   &:has(+ [class^="divider_"]),
   &:has(+ [class^="messageListItem_"] > [class*="groupStart_"]) {
     & > [class*="message_"] {
-      padding-bottom: 3px !important;
+      margin-bottom: 3px !important;
+
+      &[class*="groupStart_"] {
+        margin-bottom: 0 !important;
+        padding-bottom: 3px !important;
+      }
     }
   }
 
@@ -51,10 +56,13 @@
       margin: 0;
       padding-top: 3px;
       padding-right: 0 !important;
+      & > [class^="buttonContainer_"] {
+        top: 16px;
+      }
     }
 
     & > [class^="buttonContainer_"] {
-      top: 16px;
+      top: 0;
 
       & > [class^="buttons_"] {
         padding: 0;
@@ -74,6 +82,10 @@
     }
 
     & > [class^="contents_"] {
+      & > [class*="messageContent_"]:has(> [class^="attachment_"]) {
+        margin: 0;
+      }
+
       & > [class^="avatar_"] {
         left: 3px;
         width: 26px;
@@ -121,7 +133,16 @@
             top: 0;
           }
 
-          :is(.platform-icons-wrapper, .roleTags-wrapper) > svg {
+          .platform-icons-username {
+            margin-left: 2px;
+          }
+
+          :is(
+              .platform-icons-wrapper,
+              .roleTags-wrapper,
+              [class^="newMemberBadge_"]
+            )
+            > svg {
             width: 13px;
             height: 13px;
             margin: 0 !important;
@@ -175,6 +196,7 @@
       }
 
       [class*="timestampVisibleOnHover_"] {
+        opacity: 1;
         margin: 0;
         left: unset;
         right: 0;
@@ -340,6 +362,7 @@
 
           & > [class*="embedThumbnail_"] {
             margin: 0;
+            margin-left: 5px;
 
             [class^="imageWrapper_"] {
               width: 64px !important;
@@ -395,6 +418,7 @@
       top: 16px;
       color: var(--text-normal);
       opacity: 0.64;
+      height: 13px !important;
 
       &::before {
         margin: 0;
@@ -414,7 +438,7 @@
         margin-bottom: 13px;
       }
 
-      & > [class^="replyAvatar_"] {
+      & > :is([class^="replyAvatar_"], [class^="executedCommandAvatar_"]) {
         display: none;
       }
 
@@ -443,6 +467,14 @@
         }
       }
 
+      &[class*="executedCommand_"] {
+        .platform-icons-username {
+          top: 0 !important;
+          margin-right: 0 !important;
+          margin-left: 2px !important;
+        }
+      }
+
       & > [class^="repliedTextPreview_"] {
         margin: 0;
 
@@ -472,7 +504,7 @@
     height: 13px;
     top: 0 !important;
     margin-top: 0 !important;
-    margin-left: 2px !important;
+    margin-left: 4px !important;
 
     [class*="botText_"] {
       display: inline-flex;