diff --git a/apps/web/res/css/_components.pcss b/apps/web/res/css/_components.pcss
index 9615dc52f9..723f8b0256 100644
--- a/apps/web/res/css/_components.pcss
+++ b/apps/web/res/css/_components.pcss
@@ -223,12 +223,10 @@
 @import "./views/messages/_CreateEvent.pcss";
 @import "./views/messages/_DisambiguatedProfile.pcss";
 @import "./views/messages/_LegacyCallEvent.pcss";
-@import "./views/messages/_MFileBody.pcss";
 @import "./views/messages/_MImageReplyBody.pcss";
 @import "./views/messages/_MLocationBody.pcss";
 @import "./views/messages/_MPollBody.pcss";
 @import "./views/messages/_MStickerBody.pcss";
-@import "./views/messages/_MediaBody.pcss";
 @import "./views/messages/_MessageActionBar.pcss";
 @import "./views/messages/_ReactionsRow.pcss";
 @import "./views/messages/_TextualEvent.pcss";
diff --git a/apps/web/res/css/views/audio_messages/_PlaybackContainer.pcss b/apps/web/res/css/views/audio_messages/_PlaybackContainer.pcss
index 087726a1f7..6aba6a150e 100644
--- a/apps/web/res/css/views/audio_messages/_PlaybackContainer.pcss
+++ b/apps/web/res/css/views/audio_messages/_PlaybackContainer.pcss
@@ -10,7 +10,7 @@ Please see LICENSE files in the repository root for full details.
 /* are shared amongst multiple voice message components. */
 
 /* Container for live recording and playback controls */
-.mx_MediaBody.mx_VoiceMessagePrimaryContainer {
+.mx_VoiceMessagePrimaryContainer {
     /* Match mx_MediaBody spacing, offsetting the waveform's 1px internal right padding. */
     padding: 6px 11px 6px 12px;
 
diff --git a/apps/web/res/css/views/messages/_MFileBody.pcss b/apps/web/res/css/views/messages/_MFileBody.pcss
deleted file mode 100644
index 783a58c63d..0000000000
--- a/apps/web/res/css/views/messages/_MFileBody.pcss
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2015-2021 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-.mx_MFileBody [data-type="download"] {
-    height: var(--cpd-space-9x);
-
-    & object {
-        margin-left: -16px;
-        padding-right: 4px;
-        margin-top: -4px;
-        vertical-align: middle;
-        pointer-events: none;
-    }
-}
-
-.mx_MFileBody [data-type="info"] {
-    svg {
-        color: $secondary-content !important;
-        background-color: $system !important;
-        border-radius: 20px !important;
-    }
-}
diff --git a/apps/web/res/css/views/messages/_MediaBody.pcss b/apps/web/res/css/views/messages/_MediaBody.pcss
deleted file mode 100644
index aadf220885..0000000000
--- a/apps/web/res/css/views/messages/_MediaBody.pcss
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2024 New Vector Ltd.
-Copyright 2021 The Matrix.org Foundation C.I.C.
-
-SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Commercial
-Please see LICENSE files in the repository root for full details.
-*/
-
-/* A "media body" is any file upload looking thing, apart from images and videos (they */
-/* have unique styles). */
-
-.mx_MediaBody {
-    background-color: $panels;
-    border-radius: 12px;
-    max-width: 243px; /* use max-width instead of width so it fits within right panels */
-
-    color: $secondary-content;
-    font: var(--cpd-font-body-md-regular);
-    line-height: $font-24px;
-}
-
-.mx_MAudioBody > .mx_MediaBody {
-    border-radius: var(--MBody-border-radius);
-}
diff --git a/apps/web/src/components/views/audio_messages/RecordingPlayback.tsx b/apps/web/src/components/views/audio_messages/RecordingPlayback.tsx
index 4f5c392d41..769e762263 100644
--- a/apps/web/src/components/views/audio_messages/RecordingPlayback.tsx
+++ b/apps/web/src/components/views/audio_messages/RecordingPlayback.tsx
@@ -7,6 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type ReactNode } from "react";
+import { MediaBody } from "@element-hq/web-shared-components";
 
 import PlayPauseButton from "./PlayPauseButton";
 import PlaybackClock from "./PlaybackClock";
@@ -74,8 +75,8 @@ export default class RecordingPlayback extends AudioPlayerBase<IProps> {
         }
 
         return (
-            <div
-                className="mx_MediaBody mx_VoiceMessagePrimaryContainer"
+            <MediaBody
+                className="mx_VoiceMessagePrimaryContainer"
                 onKeyDown={this.onKeyDown}
                 data-testid="recording-playback"
             >
@@ -85,7 +86,7 @@ export default class RecordingPlayback extends AudioPlayerBase<IProps> {
                     ref={this.playPauseRef}
                 />
                 {body}
-            </div>
+            </MediaBody>
         );
     }
 }
diff --git a/apps/web/src/components/views/rooms/VoiceRecordComposerTile.tsx b/apps/web/src/components/views/rooms/VoiceRecordComposerTile.tsx
index 17b5664e81..9b6bd6ec49 100644
--- a/apps/web/src/components/views/rooms/VoiceRecordComposerTile.tsx
+++ b/apps/web/src/components/views/rooms/VoiceRecordComposerTile.tsx
@@ -7,6 +7,7 @@ Please see LICENSE files in the repository root for full details.
 */
 
 import React, { type ReactNode } from "react";
+import { MediaBody } from "@element-hq/web-shared-components";
 import { type Room, type IEventRelation, type MatrixEvent } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import { DeleteIcon, StopSolidIcon } from "@vector-im/compound-design-tokens/assets/web/icons";
@@ -239,10 +240,10 @@ export default class VoiceRecordComposerTile extends React.PureComponent<IProps,
 
         // only other UI is the recording-in-progress UI
         return (
-            <div className="mx_MediaBody mx_VoiceMessagePrimaryContainer mx_VoiceRecordComposerTile_recording">
+            <MediaBody className="mx_VoiceMessagePrimaryContainer mx_VoiceRecordComposerTile_recording">
                 <LiveRecordingClock recorder={this.state.recorder} />
                 <LiveRecordingWaveform recorder={this.state.recorder} />
-            </div>
+            </MediaBody>
         );
     }
 
diff --git a/apps/web/test/unit-tests/components/views/messages/__snapshots__/MBodyFactory-test.tsx.snap b/apps/web/test/unit-tests/components/views/messages/__snapshots__/MBodyFactory-test.tsx.snap
index 40b956719c..671c1ce8d5 100644
--- a/apps/web/test/unit-tests/components/views/messages/__snapshots__/MBodyFactory-test.tsx.snap
+++ b/apps/web/test/unit-tests/components/views/messages/__snapshots__/MBodyFactory-test.tsx.snap
@@ -3,10 +3,10 @@
 exports[`MBodyFactory renderMBody fallback shows m.audio generic placeholder when showFileInfo is true 1`] = `
 <div>
   <span
-    class="_content_1t2mx_8 mx_MFileBody"
+    class="_content_bibip_8 mx_MFileBody"
   >
     <div
-      class="mx_MediaBody _mediaBody_rgndh_8"
+      class="mx_MediaBody _mediaBody_14jys_8"
       data-type="info"
     >
       <button
@@ -44,10 +44,10 @@ exports[`MBodyFactory renderMBody fallback shows m.audio generic placeholder whe
 exports[`MBodyFactory renderMBody fallback shows m.file generic placeholder when showFileInfo is true 1`] = `
 <div>
   <span
-    class="_content_1t2mx_8 mx_MFileBody"
+    class="_content_bibip_8 mx_MFileBody"
   >
     <div
-      class="mx_MediaBody _mediaBody_rgndh_8"
+      class="mx_MediaBody _mediaBody_14jys_8"
       data-type="info"
     >
       <button
@@ -82,7 +82,7 @@ exports[`MBodyFactory renderMBody fallback shows m.file generic placeholder when
 exports[`MBodyFactory renderMBody renders download button for m.file in file rendering type 1`] = `
 <div>
   <span
-    class="_content_1t2mx_8 mx_MFileBody"
+    class="_content_bibip_8 mx_MFileBody"
   >
     <div
       data-type="download"
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/default-auto.png
index db8f3f45ed..5065ea7827 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/default-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/default-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/has-error-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/has-error-auto.png
index 9401c14c29..e771b69164 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/has-error-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/has-error-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/no-media-name-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/no-media-name-auto.png
index dbbb26e314..8178eb3e84 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/no-media-name-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/no-media-name-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/no-size-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/no-size-auto.png
index 0cd0c7b801..1c6002d524 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/no-size-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.stories.tsx/no-size-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/audio-info-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/audio-info-auto.png
index 250aa6ae58..cb48427f3a 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/audio-info-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/audio-info-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/default-auto.png
index 68a9b76332..e35c56e138 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/default-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/default-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/export-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/export-auto.png
index d6bbab9911..ea784ea575 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/export-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/export-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/invalid-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/invalid-auto.png
index 110dc298de..4825f1ff70 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/invalid-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/invalid-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/long-filename-info-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/long-filename-info-auto.png
index 83a0cc72c3..8ab3d3d209 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/long-filename-info-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/long-filename-info-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/video-info-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/video-info-auto.png
index b044c076cb..5b8eca9587 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/video-info-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MFileBodyView/FileBodyView.stories.tsx/video-info-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/animated-preview-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/animated-preview-auto.png
index 996f5ec6d1..bb67defe4f 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/animated-preview-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/animated-preview-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/default-auto.png
index 62ea65c997..d89ea8ba0e 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/default-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/default-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/loading-with-blurhash-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/loading-with-blurhash-auto.png
index 9934c59d57..64733128ce 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/loading-with-blurhash-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/loading-with-blurhash-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/loading-with-spinner-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/loading-with-spinner-auto.png
index 6653fe161a..1a2ca5f66b 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/loading-with-spinner-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/loading-with-spinner-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/with-tooltip-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/with-tooltip-auto.png
index 866d94ddf9..c5958b2c82 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/with-tooltip-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.stories.tsx/with-tooltip-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MVideoBodyView/VideoBodyView.stories.tsx/ready-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MVideoBodyView/VideoBodyView.stories.tsx/ready-auto.png
index a7dec0f368..fad468be85 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MVideoBodyView/VideoBodyView.stories.tsx/ready-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/body/MVideoBodyView/VideoBodyView.stories.tsx/ready-auto.png differ
diff --git a/packages/shared-components/src/room/timeline/event-tile/EventTileView/TileErrorView/TileErrorView.test.tsx b/packages/shared-components/src/room/timeline/event-tile/EventTileView/TileErrorView/TileErrorView.test.tsx
index 9d21d641f1..58c6526690 100644
--- a/packages/shared-components/src/room/timeline/event-tile/EventTileView/TileErrorView/TileErrorView.test.tsx
+++ b/packages/shared-components/src/room/timeline/event-tile/EventTileView/TileErrorView/TileErrorView.test.tsx
@@ -29,7 +29,9 @@ describe("TileErrorView", () => {
     });
 
     it("renders the bubble layout variant", () => {
-        const { container } = render(<BubbleLayout />);
+        const { container } = render(<BubbleLayout />, {
+            presentation: { layout: "bubble" },
+        });
         expect(container).toMatchSnapshot();
     });
 
diff --git a/packages/shared-components/src/room/timeline/event-tile/EventTileView/TileErrorView/__snapshots__/TileErrorView.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/EventTileView/TileErrorView/__snapshots__/TileErrorView.test.tsx.snap
index 4d623a5d2b..d45ebe3332 100644
--- a/packages/shared-components/src/room/timeline/event-tile/EventTileView/TileErrorView/__snapshots__/TileErrorView.test.tsx.snap
+++ b/packages/shared-components/src/room/timeline/event-tile/EventTileView/TileErrorView/__snapshots__/TileErrorView.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`TileErrorView > renders the bubble layout variant 1`] = `
     <li
       class="TileErrorView-module_tileErrorView"
       data-event-density="default"
-      data-event-layout="group"
+      data-event-layout="bubble"
     >
       <div
         class="TileErrorView-module_line"
diff --git a/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.test.tsx b/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.test.tsx
index 4f96f33341..0885d88cb4 100644
--- a/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.test.tsx
+++ b/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.test.tsx
@@ -28,7 +28,9 @@ describe("UrlPreviewGroupView", () => {
         expect(container).toMatchSnapshot();
     });
     it("renders with compact density", () => {
-        const { container } = render(<WithCompactView />);
+        const { container } = render(<WithCompactView />, {
+            presentation: { density: "compact" },
+        });
         expect(container).toMatchSnapshot();
     });
 });
diff --git a/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/__snapshots__/UrlPreviewGroupView.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/__snapshots__/UrlPreviewGroupView.test.tsx.snap
index b5a80060c5..74f1df52fa 100644
--- a/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/__snapshots__/UrlPreviewGroupView.test.tsx.snap
+++ b/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/__snapshots__/UrlPreviewGroupView.test.tsx.snap
@@ -342,7 +342,7 @@ exports[`UrlPreviewGroupView > renders with compact density 1`] = `
 <div>
   <div
     class="UrlPreviewGroupView-module_wrapper"
-    data-event-density="default"
+    data-event-density="compact"
     data-event-layout="group"
   >
     <div
diff --git a/packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.module.css b/packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.module.css
index 1842cc90a1..905719eedf 100644
--- a/packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.module.css
+++ b/packages/shared-components/src/room/timeline/event-tile/body/AudioPlayerView/AudioPlayerView.module.css
@@ -7,7 +7,6 @@
 
 .audioPlayer {
     padding: var(--cpd-space-4x) var(--cpd-space-3x) var(--cpd-space-3x) var(--cpd-space-3x);
-    border-radius: 8px;
 }
 
 .mediaInfo {
diff --git a/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/FileBodyView.module.css b/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/FileBodyView.module.css
index 52434c133d..1f13afb53f 100644
--- a/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/FileBodyView.module.css
+++ b/packages/shared-components/src/room/timeline/event-tile/body/MFileBodyView/FileBodyView.module.css
@@ -39,6 +39,9 @@
             width: 16px;
             height: 16px;
             padding: var(--cpd-space-2x);
+            color: var(--cpd-color-text-secondary);
+            background-color: var(--cpd-color-bg-subtle-primary);
+            border-radius: 20px;
         }
 
         & span {
@@ -57,6 +60,7 @@
 
 .content [data-type="download"] {
     align-items: center;
+    height: var(--cpd-space-9x);
 
     & iframe {
         margin: 0;
diff --git a/packages/shared-components/src/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.module.css b/packages/shared-components/src/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.module.css
index 05d56d3987..dd5d82ad31 100644
--- a/packages/shared-components/src/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.module.css
+++ b/packages/shared-components/src/room/timeline/event-tile/body/MImageBodyView/ImageBodyView.module.css
@@ -23,7 +23,7 @@
     position: relative;
     overflow: hidden;
     contain: paint;
-    border-radius: var(--MBody-border-radius);
+    border-radius: 8px;
 }
 
 .placeholder {
@@ -70,7 +70,7 @@
     max-width: min(100%, 350px);
     overflow: hidden;
     padding: var(--cpd-space-1x);
-    border-radius: var(--MBody-border-radius);
+    border-radius: 8px;
     background-color: rgb(0 0 0 / 0.6);
     color: #fff;
     text-overflow: ellipsis;
diff --git a/packages/shared-components/src/room/timeline/event-tile/body/MVideoBodyView/VideoBodyView.module.css b/packages/shared-components/src/room/timeline/event-tile/body/MVideoBodyView/VideoBodyView.module.css
index 878514d7cd..cf9e2b1bc4 100644
--- a/packages/shared-components/src/room/timeline/event-tile/body/MVideoBodyView/VideoBodyView.module.css
+++ b/packages/shared-components/src/room/timeline/event-tile/body/MVideoBodyView/VideoBodyView.module.css
@@ -4,7 +4,7 @@
 
 .container {
     overflow: hidden;
-    border-radius: var(--MBody-border-radius);
+    border-radius: 8px;
 }
 
 .video {
diff --git a/packages/shared-components/src/room/timeline/event-tile/body/MediaBody/MediaBody.module.css b/packages/shared-components/src/room/timeline/event-tile/body/MediaBody/MediaBody.module.css
index 02f5810713..5ff54eb2e6 100644
--- a/packages/shared-components/src/room/timeline/event-tile/body/MediaBody/MediaBody.module.css
+++ b/packages/shared-components/src/room/timeline/event-tile/body/MediaBody/MediaBody.module.css
@@ -6,12 +6,13 @@
  */
 
 .mediaBody {
+    color: var(--cpd-color-text-secondary);
     background-color: var(--cpd-color-bg-subtle-secondary);
-    border-radius: 12px;
+    border-radius: 8px;
     max-width: 243px; /* use max-width instead of width so it fits within right panels */
 
-    font: var(--cpd-font-body-md-regular);
-    color: var(--cpd-color-text-secondary);
-
     padding: var(--cpd-space-1-5x) var(--cpd-space-3x);
+
+    font: var(--cpd-font-body-md-regular);
+    line-height: var(--cpd-font-size-heading-md);
 }
diff --git a/packages/shared-components/src/test/utils/index.tsx b/packages/shared-components/src/test/utils/index.tsx
index bcbd0820da..adbabad329 100644
--- a/packages/shared-components/src/test/utils/index.tsx
+++ b/packages/shared-components/src/test/utils/index.tsx
@@ -16,32 +16,49 @@ import React, { type ReactElement } from "react";
 import { render, type RenderOptions } from "@testing-library/react";
 import { TooltipProvider } from "@vector-im/compound-web";
 
-import { I18nApi, I18nContext } from "../..";
+import {
+    DEFAULT_EVENT_PRESENTATION,
+    EventPresentationProvider,
+    I18nApi,
+    I18nContext,
+    type EventPresentation,
+} from "../..";
 
-const wrapWithTooltipProvider = (Wrapper: RenderOptions["wrapper"]) => {
+type SharedRenderOptions = RenderOptions & {
+    presentation?: Partial<EventPresentation>;
+};
+
+const wrapWithTooltipProvider = (Wrapper: RenderOptions["wrapper"], presentation?: Partial<EventPresentation>) => {
     return ({ children }: { children: React.ReactNode }) => {
+        const resolvedPresentation: EventPresentation | undefined = presentation
+            ? { ...DEFAULT_EVENT_PRESENTATION, ...presentation }
+            : undefined;
+        const content = resolvedPresentation ? (
+            <EventPresentationProvider value={resolvedPresentation}>
+                <TooltipProvider>{children}</TooltipProvider>
+            </EventPresentationProvider>
+        ) : (
+            <TooltipProvider>{children}</TooltipProvider>
+        );
+
         if (Wrapper) {
             return (
                 <I18nContext.Provider value={new I18nApi()}>
-                    <Wrapper>
-                        <TooltipProvider>{children}</TooltipProvider>
-                    </Wrapper>
+                    <Wrapper>{content}</Wrapper>
                 </I18nContext.Provider>
             );
         } else {
-            return (
-                <I18nContext.Provider value={new I18nApi()}>
-                    <TooltipProvider>{children}</TooltipProvider>
-                </I18nContext.Provider>
-            );
+            return <I18nContext.Provider value={new I18nApi()}>{content}</I18nContext.Provider>;
         }
     };
 };
 
-const customRender = (ui: ReactElement, options: RenderOptions = {}): ReturnType<typeof render> => {
+const customRender = (ui: ReactElement, options: SharedRenderOptions = {}): ReturnType<typeof render> => {
+    const { presentation, wrapper, ...renderOptions } = options;
+
     return render(ui, {
-        ...options,
-        wrapper: wrapWithTooltipProvider(options?.wrapper) as RenderOptions["wrapper"],
+        ...renderOptions,
+        wrapper: wrapWithTooltipProvider(wrapper, presentation) as RenderOptions["wrapper"],
     }) as ReturnType<typeof render>;
 };