diff --git a/res/css/views/right_panel/_TimelineCard.scss b/res/css/views/right_panel/_TimelineCard.scss
index dd766790ee..ac982bf0fd 100644
--- a/res/css/views/right_panel/_TimelineCard.scss
+++ b/res/css/views/right_panel/_TimelineCard.scss
@@ -38,6 +38,29 @@ limitations under the License.
                 position: absolute; // for IRC layout
                 left: -3px;
             }
+
+            .mx_EventTile_msgOption {
+                margin-inline-end: 0;
+            }
+
+            .mx_DisambiguatedProfile,
+            .mx_ReactionsRow,
+            .mx_ThreadSummary {
+                margin-inline-start: var(--BaseCard_EventTile-spacing-inline);
+            }
+
+            .mx_ReplyTile .mx_DisambiguatedProfile {
+                margin-inline-start: 0;
+            }
+
+            .mx_ReactionsRow {
+                margin-inline-end: $spacing-8; // See: var(--ThreadView_group_spacing-end) for ReactionsRow on _EventTile.scss
+            }
+
+            .mx_ThreadSummary {
+                margin-inline-end: 0;
+                max-width: min(calc(100% - 36px), 600px);
+            }
         }
 
         &[data-layout=bubble] {
@@ -65,36 +88,12 @@ limitations under the License.
                 }
             }
 
-            .mx_DisambiguatedProfile,
-            .mx_ReactionsRow,
-            .mx_ThreadSummary {
-                margin-inline-start: var(--BaseCard_EventTile-spacing-inline);
-            }
-
-            .mx_ReplyTile .mx_DisambiguatedProfile {
-                margin-inline-start: 0;
-            }
-
-            .mx_ReactionsRow {
-                margin-inline-end: $spacing-8; // See: var(--ThreadView_group_spacing-end) for ReactionsRow on _EventTile.scss
-            }
-
-            .mx_ThreadSummary {
-                margin-right: 0;
-                max-width: min(calc(100% - 36px), 600px);
-            }
-
             .mx_MessageTimestamp {
                 position: absolute; // for modern layout and IRC layout
                 inset-inline-start: auto;
                 inset-inline-end: 0;
             }
 
-            .mx_EventTile_msgOption {
-                // Override mx_EventTile_msgOption of mx_EventTile:not([data-layout="bubble"])
-                margin-inline-end: 0;
-            }
-
             &.mx_EventTile_info {
                 .mx_EventTile_avatar {
                     left: 18px;
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 768eeb5e85..f16702050c 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -120,6 +120,10 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
             inset: 6px 0 0 44px;
         }
 
+        .mx_EventTile_msgOption {
+            margin-right: 10px;
+        }
+
         .mx_ThreadSummary,
         .mx_ThreadSummaryIcon {
             margin-left: $left-gutter;
@@ -260,8 +264,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
            Replaces margin-top: -6px. This interacts better with a read
            marker being in between. Content overflows. */
         height: 1px;
-
-        margin-right: 10px;
     }
 
     .mx_EventTile_msgOption a {