diff --git a/res/css/views/right_panel/_BaseCard.scss b/res/css/views/right_panel/_BaseCard.scss
index 0ef7db404df..52dd99562c3 100644
--- a/res/css/views/right_panel/_BaseCard.scss
+++ b/res/css/views/right_panel/_BaseCard.scss
@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 .mx_BaseCard {
+    --BaseCard_EventTile_line-padding-block: 2px;
+
     padding: 0 8px;
     overflow: hidden;
     display: flex;
diff --git a/res/css/views/right_panel/_ThreadPanel.scss b/res/css/views/right_panel/_ThreadPanel.scss
index 67d5f15c38b..4d7c00bff11 100644
--- a/res/css/views/right_panel/_ThreadPanel.scss
+++ b/res/css/views/right_panel/_ThreadPanel.scss
@@ -201,12 +201,6 @@ limitations under the License.
         }
     }
 
-    .mx_EventTile:not([data-layout=bubble]) {
-        .mx_EventTile_e2eIcon {
-            left: 8px;
-        }
-    }
-
     .mx_MessageComposer {
         background-color: $background;
         border-radius: 8px;
diff --git a/res/css/views/right_panel/_TimelineCard.scss b/res/css/views/right_panel/_TimelineCard.scss
index 13dd5af6af0..d184efad5c0 100644
--- a/res/css/views/right_panel/_TimelineCard.scss
+++ b/res/css/views/right_panel/_TimelineCard.scss
@@ -57,6 +57,12 @@ limitations under the License.
         .mx_EventTile_line {
             padding-inline-start: $left-gutter;
             padding-inline-end: 36px;
+            padding-top: var(--BaseCard_EventTile_line-padding-block);
+            padding-bottom: var(--BaseCard_EventTile_line-padding-block);
+
+            .mx_EventTile_e2eIcon {
+                inset-inline-start: 8px;
+            }
         }
 
         .mx_DisambiguatedProfile,
@@ -109,10 +115,6 @@ limitations under the License.
             > .mx_DisambiguatedProfile {
                 margin-left: 36px;
             }
-
-            .mx_EventTile_line {
-                padding-bottom: 8px;
-            }
         }
     }
 
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 60f72600bf5..99db86d53c5 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -869,6 +869,11 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
 
         &:not([data-layout=bubble]) {
             padding-top: $spacing-16;
+
+            .mx_EventTile_line {
+                padding-top: var(--BaseCard_EventTile_line-padding-block);
+                padding-bottom: var(--BaseCard_EventTile_line-padding-block);
+            }
         }
     }
 
@@ -980,13 +985,4 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
         padding-right: 11px; // align with right edge of input
         margin-right: 0; // align with right edge of background
     }
-
-    .mx_GroupLayout {
-        .mx_EventTile {
-            .mx_EventTile_line {
-                padding-top: 2px;
-                padding-bottom: 2px;
-            }
-        }
-    }
 }