diff --git a/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/__snapshots__/LinkPreview.test.tsx.snap b/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/__snapshots__/LinkPreview.test.tsx.snap
index b88520fe75..6fc9eea2ee 100644
--- a/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/__snapshots__/LinkPreview.test.tsx.snap
+++ b/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/__snapshots__/LinkPreview.test.tsx.snap
@@ -148,7 +148,7 @@ exports[`LinkPreview > renders a preview with just a title 1`] = `
       </span>
     </div>
     <div
-      class="textContent"
+      class="textContent inline"
     >
       <a
         class="_typography_6v6n8_153 _font-body-lg-semibold_6v6n8_74 title"
@@ -158,12 +158,19 @@ exports[`LinkPreview > renders a preview with just a title 1`] = `
       >
         A simple title
       </a>
-      <p
-        class="_typography_6v6n8_153 _font-body-md-regular_6v6n8_50 container description"
-      />
       <div
         class="siteName"
       >
+        <span
+          aria-label="matrix.org"
+          class="_avatar_zysgz_8 _avatar-imageless_zysgz_55"
+          data-color="4"
+          data-type="round"
+          role="img"
+          style="--cpd-avatar-size: 16px;"
+        >
+          m
+        </span>
         <span
           class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
         >
@@ -178,22 +185,8 @@ exports[`LinkPreview > renders a preview with just a title 1`] = `
 exports[`LinkPreview > renders a preview with just a title and description 1`] = `
 <div>
   <div
-    class="container inline"
+    class="container"
   >
-    <div
-      class="siteAvatar"
-    >
-      <span
-        aria-label="A simple title"
-        class="_avatar_zysgz_8 _avatar-imageless_zysgz_55"
-        data-color="6"
-        data-type="square"
-        role="img"
-        style="--cpd-avatar-size: 48px;"
-      >
-        A
-      </span>
-    </div>
     <div
       class="textContent"
     >
@@ -221,6 +214,16 @@ exports[`LinkPreview > renders a preview with just a title and description 1`] =
       <div
         class="siteName"
       >
+        <span
+          aria-label="matrix.org"
+          class="_avatar_zysgz_8 _avatar-imageless_zysgz_55"
+          data-color="4"
+          data-type="round"
+          role="img"
+          style="--cpd-avatar-size: 16px;"
+        >
+          m
+        </span>
         <span
           class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
         >
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 18d1cd0eeb..5151720e0d 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
@@ -37,6 +37,25 @@ exports[`UrlPreviewGroupView > renders a single preview 1`] = `
           >
             A simple description
           </p>
+          <div
+            class="siteName"
+          >
+            <span
+              aria-label="matrix.org"
+              class="_avatar_zysgz_8 _avatar-imageless_zysgz_55"
+              data-color="4"
+              data-type="round"
+              role="img"
+              style="--cpd-avatar-size: 16px;"
+            >
+              m
+            </span>
+            <span
+              class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
+            >
+              matrix.org
+            </span>
+          </div>
         </div>
       </div>
     </div>
@@ -106,6 +125,25 @@ exports[`UrlPreviewGroupView > renders multiple previews 1`] = `
           >
             A regular square image.
           </p>
+          <div
+            class="siteName"
+          >
+            <span
+              aria-label="matrix.org"
+              class="_avatar_zysgz_8 _avatar-imageless_zysgz_55"
+              data-color="4"
+              data-type="round"
+              role="img"
+              style="--cpd-avatar-size: 16px;"
+            >
+              m
+            </span>
+            <span
+              class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
+            >
+              matrix.org
+            </span>
+          </div>
         </div>
       </div>
       <div
@@ -137,6 +175,25 @@ exports[`UrlPreviewGroupView > renders multiple previews 1`] = `
           >
             This one has a taller image which should crop nicely.
           </p>
+          <div
+            class="siteName"
+          >
+            <span
+              aria-label="matrix.org"
+              class="_avatar_zysgz_8 _avatar-imageless_zysgz_55"
+              data-color="4"
+              data-type="round"
+              role="img"
+              style="--cpd-avatar-size: 16px;"
+            >
+              m
+            </span>
+            <span
+              class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
+            >
+              matrix.org
+            </span>
+          </div>
         </div>
       </div>
       <div
@@ -168,6 +225,25 @@ exports[`UrlPreviewGroupView > renders multiple previews 1`] = `
           >
             One more description
           </p>
+          <div
+            class="siteName"
+          >
+            <span
+              aria-label="matrix.org"
+              class="_avatar_zysgz_8 _avatar-imageless_zysgz_55"
+              data-color="4"
+              data-type="round"
+              role="img"
+              style="--cpd-avatar-size: 16px;"
+            >
+              m
+            </span>
+            <span
+              class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
+            >
+              matrix.org
+            </span>
+          </div>
         </div>
       </div>
       <button
@@ -246,6 +322,25 @@ exports[`UrlPreviewGroupView > renders multiple previews which are hidden 1`] =
           >
             A simple description
           </p>
+          <div
+            class="siteName"
+          >
+            <span
+              aria-label="matrix.org"
+              class="_avatar_zysgz_8 _avatar-imageless_zysgz_55"
+              data-color="4"
+              data-type="round"
+              role="img"
+              style="--cpd-avatar-size: 16px;"
+            >
+              m
+            </span>
+            <span
+              class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
+            >
+              matrix.org
+            </span>
+          </div>
         </div>
       </div>
       <button
@@ -324,6 +419,25 @@ exports[`UrlPreviewGroupView > renders with a compact view 1`] = `
           >
             A regular square image.
           </p>
+          <div
+            class="siteName"
+          >
+            <span
+              aria-label="matrix.org"
+              class="_avatar_zysgz_8 _avatar-imageless_zysgz_55"
+              data-color="4"
+              data-type="round"
+              role="img"
+              style="--cpd-avatar-size: 16px;"
+            >
+              m
+            </span>
+            <span
+              class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
+            >
+              matrix.org
+            </span>
+          </div>
         </div>
       </div>
       <div
@@ -355,6 +469,25 @@ exports[`UrlPreviewGroupView > renders with a compact view 1`] = `
           >
             This one has a taller image which should crop nicely.
           </p>
+          <div
+            class="siteName"
+          >
+            <span
+              aria-label="matrix.org"
+              class="_avatar_zysgz_8 _avatar-imageless_zysgz_55"
+              data-color="4"
+              data-type="round"
+              role="img"
+              style="--cpd-avatar-size: 16px;"
+            >
+              m
+            </span>
+            <span
+              class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
+            >
+              matrix.org
+            </span>
+          </div>
         </div>
       </div>
       <div
@@ -386,6 +519,25 @@ exports[`UrlPreviewGroupView > renders with a compact view 1`] = `
           >
             One more description
           </p>
+          <div
+            class="siteName"
+          >
+            <span
+              aria-label="matrix.org"
+              class="_avatar_zysgz_8 _avatar-imageless_zysgz_55"
+              data-color="4"
+              data-type="round"
+              role="img"
+              style="--cpd-avatar-size: 16px;"
+            >
+              m
+            </span>
+            <span
+              class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
+            >
+              matrix.org
+            </span>
+          </div>
         </div>
       </div>
       <button