diff --git a/src/timelines/MediaAttachmentGrid.css b/src/timelines/MediaAttachmentGrid.css
index 880151a..34b22c9 100644
--- a/src/timelines/MediaAttachmentGrid.css
+++ b/src/timelines/MediaAttachmentGrid.css
@@ -1,7 +1,7 @@
 .MediaAttachmentGrid {
   /* Note: MeidaAttachmentGrid has hard-coded layout calcalation */
   margin-top: 1em;
-  margin-left: calc(var(--card-pad, 0) + var(--toot-avatar-size, 0) + 8px);
+  margin-left: var(--card-pad, 0);
   margin-right: var(--card-pad, 0);
   gap: 4px;
   contain: layout style;
@@ -33,4 +33,8 @@
     align-items: center;
     justify-content: center;
   }
+}
+
+:where(.thread-top, .thread-mid) > .MediaAttachmentGrid {
+  margin-left: calc(var(--card-pad, 0) + var(--toot-avatar-size, 0) + 8px);
 }
\ No newline at end of file
diff --git a/src/timelines/toots/TootContent.css b/src/timelines/toots/TootContent.css
index b45411c..86ed977 100644
--- a/src/timelines/toots/TootContent.css
+++ b/src/timelines/toots/TootContent.css
@@ -1,5 +1,5 @@
 .TootContent {
-  margin-left: calc(var(--card-pad, 0) + var(--toot-avatar-size, 0) + 8px);
+  margin-left: var(--card-pad, 0);
   margin-right: var(--card-pad, 0);
   line-height: 1.5;
 
@@ -29,4 +29,8 @@
       }
     }
   }
+}
+
+:where(.thread-top, .thread-mid) > .TootContent {
+  margin-left: calc(var(--card-pad, 0) + var(--toot-avatar-size, 0) + 8px);
 }
\ No newline at end of file