diff --git a/app/assets/stylesheets/comments.css b/app/assets/stylesheets/comments.css
index b58156f36..80968184e 100644
--- a/app/assets/stylesheets/comments.css
+++ b/app/assets/stylesheets/comments.css
@@ -51,12 +51,14 @@
     padding-inline-end: var(--reaction-size);
     text-align: start;
 
-    :first-child {
-      margin-block-start: 0;
-    }
+    .action-text-content {
+      > action-text-attachment:first-child figure {
+        margin-block-start: 0.5ch;
+      }
 
-    :last-child {
-      margin-block-end: 0;
+      > :last-child {
+        margin-block-end: 0;
+      }
     }
   }
 
diff --git a/app/assets/stylesheets/rich-text-content.css b/app/assets/stylesheets/rich-text-content.css
index 38c7722e2..2d465c935 100644
--- a/app/assets/stylesheets/rich-text-content.css
+++ b/app/assets/stylesheets/rich-text-content.css
@@ -62,7 +62,7 @@
     /* Links should hug media contained within */
     a:has(img),
     a:has(video) {
-      display: inline-block;
+      inline-size: fit-content;
     }
 
     /* Avoid extra space due to empty paragraphs */
@@ -263,7 +263,7 @@
       display: flex;
       flex-wrap: wrap;
       justify-content: center;
-      margin-block-start: var(--block-space-half);
+      margin-block-start: 0.5ch;
     }
   }