diff --git a/res/css/structures/_FilePanel.scss b/res/css/structures/_FilePanel.scss
index 634ce9604cc..f8d6469568d 100644
--- a/res/css/structures/_FilePanel.scss
+++ b/res/css/structures/_FilePanel.scss
@@ -55,10 +55,6 @@ limitations under the License.
     }
 }
 
-.mx_FilePanel .mx_EventTile .mx_MImageBody {
-    margin-right: 0px;
-}
-
 .mx_FilePanel .mx_EventTile .mx_MFileBody {
     line-height: 2.4rem;
 }
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index d531f3932b4..ca1ff4feedb 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -72,6 +72,13 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
         gap: $spacing-4;
     }
 
+    &[data-layout=irc],
+    &[data-layout=group] {
+        .mx_MImageBody {
+            margin-right: 34px;
+        }
+    }
+
     &[data-layout=group] {
         > .mx_DisambiguatedProfile {
             line-height: $font-20px;
@@ -275,8 +282,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
     }
 
     .mx_MImageBody {
-        margin-right: 34px;
-
         .mx_MImageBody_thumbnail_container {
             justify-content: flex-start;
             min-height: $font-44px;