diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss
index f8d6469568..e2129e24dd 100644
--- a/res/css/structures/_FilePanel.scss
+++ b/res/css/structures/_FilePanel.scss
@@ -92,8 +92,6 @@ limitations under the License.
 .mx_FilePanel .mx_EventTile .mx_DisambiguatedProfile {
     flex: 1 1 auto;
     line-height: initial;
-    padding: 0px;
-    font-size: $font-14px;
     opacity: 1.0;
     color: $event-timestamp-color;
 }
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 4e294ed9a3..a6f244c636 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -72,6 +72,14 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
         }
     }
 
+    .mx_DisambiguatedProfile {
+        color: $primary-content;
+        font-size: $font-14px;
+        display: inline-block;
+        padding-bottom: 0px;
+        padding-top: 0px;
+    }
+
     .mx_ReactionsRow {
         display: flex;
         flex-flow: wrap;
@@ -194,14 +202,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
         padding-top: 0px !important;
     }
 
-    .mx_DisambiguatedProfile {
-        color: $primary-content;
-        font-size: $font-14px;
-        display: inline-block;
-        padding-bottom: 0px;
-        padding-top: 0px;
-    }
-
     &.mx_EventTile_isEditing .mx_MessageTimestamp {
         visibility: hidden;
     }
diff --git a/res/css/views/rooms/_IRCLayout.scss b/res/css/views/rooms/_IRCLayout.scss
index 183fe7a1fb..1e43132ba5 100644
--- a/res/css/views/rooms/_IRCLayout.scss
+++ b/res/css/views/rooms/_IRCLayout.scss
@@ -75,6 +75,46 @@ $irc-line-height: $font-18px;
             }
         }
 
+        .mx_DisambiguatedProfile {
+            width: var(--name-width);
+            margin-inline-end: 0; // override mx_EventTile > *
+            order: 2;
+            flex-shrink: 0;
+
+            > .mx_DisambiguatedProfile_displayName {
+                width: 100%;
+                text-align: end;
+                overflow: hidden;
+                text-overflow: ellipsis;
+            }
+
+            > .mx_DisambiguatedProfile_mxid {
+                visibility: collapse;
+                // Override the inherited margin.
+                margin-left: 0;
+                padding: 0 5px;
+            }
+
+            &:hover {
+                overflow: visible;
+                z-index: 10;
+
+                > .mx_DisambiguatedProfile_displayName {
+                    overflow: visible;
+                    display: inline;
+                    background-color: $event-selected-color;
+                    border-radius: 8px 0 0 8px;
+                    padding-right: 8px;
+                }
+
+                > .mx_DisambiguatedProfile_mxid {
+                    visibility: visible;
+                    opacity: 1;
+                    background-color: $event-selected-color;
+                }
+            }
+        }
+
         .mx_MessageTimestamp {
             font-size: $font-10px;
             text-align: right;
@@ -147,49 +187,6 @@ $irc-line-height: $font-18px;
         border-left: 0;
     }
 
-    .mx_DisambiguatedProfile {
-        width: var(--name-width);
-        margin-inline-end: 0; // override mx_EventTile > *
-        display: flex;
-        order: 2;
-        flex-shrink: 0;
-        justify-content: flex-start;
-        align-items: center;
-
-        > .mx_DisambiguatedProfile_displayName {
-            width: 100%;
-            text-align: end;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
-
-        > .mx_DisambiguatedProfile_mxid {
-            visibility: collapse;
-            // Override the inherited margin.
-            margin-left: 0;
-            padding: 0 5px;
-        }
-    }
-
-    .mx_DisambiguatedProfile:hover {
-        overflow: visible;
-        z-index: 10;
-
-        > .mx_DisambiguatedProfile_displayName {
-            overflow: visible;
-            display: inline;
-            background-color: $event-selected-color;
-            border-radius: 8px 0 0 8px;
-            padding-right: 8px;
-        }
-
-        > .mx_DisambiguatedProfile_mxid {
-            visibility: visible;
-            opacity: 1;
-            background-color: $event-selected-color;
-        }
-    }
-
     .mx_ReplyChain {
         margin: 0;
         .mx_DisambiguatedProfile {
diff --git a/res/css/views/rooms/_ReplyTile.scss b/res/css/views/rooms/_ReplyTile.scss
index 3c78265813..ddc2f4f8aa 100644
--- a/res/css/views/rooms/_ReplyTile.scss
+++ b/res/css/views/rooms/_ReplyTile.scss
@@ -102,11 +102,6 @@ limitations under the License.
     }
 
     .mx_DisambiguatedProfile {
-        font-size: $font-14px;
         line-height: $font-17px;
-
-        display: inline-block; // anti-zalgo, with overflow hidden
-        padding: 0;
-        margin: 0;
     }
 }