diff --git a/res/css/views/right_panel/_TimelineCard.scss b/res/css/views/right_panel/_TimelineCard.scss
index 34debbb6fc..447933a39f 100644
--- a/res/css/views/right_panel/_TimelineCard.scss
+++ b/res/css/views/right_panel/_TimelineCard.scss
@@ -68,21 +68,48 @@ limitations under the License.
             margin-left: 36px;
             margin-right: 8px;
         }
+
+        .mx_ThreadInfo {
+            margin-left: 36px;
+            margin-right: 0;
+            max-width: min(calc(100% - 36px), 600px);
+        }
+
+        .mx_EventTile_avatar {
+            top: 12px;
+            left: -3px;
+        }
+
+        .mx_MessageTimestamp {
+            right: -4px;
+            left: auto;
+        }
+
+        .mx_EventTile_msgOption {
+            margin-right: 2px;
+        }
+
+        &.mx_EventTile_info {
+            .mx_EventTile_line {
+                padding-left: 36px;
+            }
+
+            .mx_EventTile_avatar {
+                left: 18px;
+            }
+        }
     }
 
-    .mx_EventTile:not([data-layout="bubble"]) .mx_ThreadInfo {
-        margin-left: 36px;
-        margin-right: 0;
-        max-width: min(calc(100% - 36px), 600px);
-    }
+    .mx_GroupLayout {
+        .mx_EventTile {
+            > .mx_DisambiguatedProfile {
+                margin-left: 36px;
+            }
 
-    .mx_GroupLayout .mx_EventTile > .mx_DisambiguatedProfile {
-        margin-left: 36px;
-    }
-
-    .mx_EventTile:not([data-layout="bubble"]) .mx_EventTile_avatar {
-        top: 12px;
-        left: -3px;
+            .mx_EventTile_line {
+                padding-bottom: 8px;
+            }
+        }
     }
 
     .mx_CallEvent_wrapper {
@@ -93,36 +120,15 @@ limitations under the License.
         }
     }
 
-    .mx_EventTile:not([data-layout="bubble"]) .mx_MessageTimestamp {
-        right: -4px;
-        left: auto;
-    }
-
-    .mx_EventTile:not([data-layout="bubble"]) .mx_EventTile_msgOption {
-        margin-right: 2px;
-    }
-
     .mx_GenericEventListSummary:not([data-layout=bubble]) .mx_EventTile_line,
     .mx_GenericEventListSummary:not([data-layout=bubble]) > .mx_GenericEventListSummary_unstyledList > .mx_EventTile_info .mx_EventTile_avatar ~ .mx_EventTile_line {
         padding-left: 36px;
     }
 
-    .mx_GroupLayout .mx_EventTile .mx_EventTile_line {
-        padding-bottom: 8px;
-    }
-
     .mx_EventTile_readAvatars {
         top: -10px;
     }
 
-    .mx_EventTile:not([data-layout="bubble"]).mx_EventTile_info .mx_EventTile_line {
-        padding-left: 36px;
-    }
-
-    .mx_EventTile:not([data-layout="bubble"]).mx_EventTile_info .mx_EventTile_avatar {
-        left: 18px;
-    }
-
     .mx_WhoIsTypingTile {
         margin-left: -12px; // undo padding on the message list
     }