diff --git a/apps/web/playwright/snapshots/messages/messages.spec.ts/preview-basic-linux.png b/apps/web/playwright/snapshots/messages/messages.spec.ts/preview-basic-linux.png
index 533dcefac0..bcffc0f006 100644
Binary files a/apps/web/playwright/snapshots/messages/messages.spec.ts/preview-basic-linux.png and b/apps/web/playwright/snapshots/messages/messages.spec.ts/preview-basic-linux.png differ
diff --git a/apps/web/playwright/snapshots/messages/messages.spec.ts/preview-with-thumb-linux.png b/apps/web/playwright/snapshots/messages/messages.spec.ts/preview-with-thumb-linux.png
index 4fa2257b8e..331cdce227 100644
Binary files a/apps/web/playwright/snapshots/messages/messages.spec.ts/preview-with-thumb-linux.png and b/apps/web/playwright/snapshots/messages/messages.spec.ts/preview-with-thumb-linux.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/article-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/article-auto.png
index dafd9b9153..62b95a412e 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/article-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/article-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/default-auto.png
index 6a59f242b6..cc4c3d462e 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/default-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/default-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/social-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/social-auto.png
index 11d08d7769..0892965155 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/social-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/social-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/social-with-image-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/social-with-image-auto.png
index 7f3a24cf77..f07f8771cd 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/social-with-image-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/social-with-image-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/title-and-description-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/title-and-description-auto.png
index ef8aee3bab..4e6699454d 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/title-and-description-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/title-and-description-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/title-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/title-auto.png
index cb3dd92c58..8f8349d0ce 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/title-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/title-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/video-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/video-auto.png
index 7c35430753..7384ce7933 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/video-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/video-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/with-site-icon-and-description-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/with-site-icon-and-description-auto.png
new file mode 100644
index 0000000000..48d75f6f6e
Binary files /dev/null and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/with-site-icon-and-description-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/with-site-icon-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/with-site-icon-auto.png
index 76b36b0fae..fad25359e6 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/with-site-icon-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/with-site-icon-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/with-tooltip-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/with-tooltip-auto.png
index 51afc9566d..9af701fdcd 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/with-tooltip-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/with-tooltip-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/with-very-long-text-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/with-very-long-text-auto.png
index 18e18f2ae9..b9f46eaafa 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/with-very-long-text-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx/with-very-long-text-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/default-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/default-auto.png
index 05fdf3a21a..cc5a3aa9b4 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/default-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/default-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/multiple-previews-hidden-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/multiple-previews-hidden-auto.png
index cae49c6843..72ac6f5d4e 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/multiple-previews-hidden-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/multiple-previews-hidden-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/multiple-previews-visible-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/multiple-previews-visible-auto.png
index d65086e61b..44caec29d1 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/multiple-previews-visible-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/multiple-previews-visible-auto.png differ
diff --git a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/with-compact-view-auto.png b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/with-compact-view-auto.png
index ae34652cf0..859bbe3869 100644
Binary files a/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/with-compact-view-auto.png and b/packages/shared-components/__vis__/linux/__baselines__/room/timeline/event-tile/UrlPreviewGroupView/UrlPreviewGroupView.stories.tsx/with-compact-view-auto.png differ
diff --git a/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx b/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx
index 6fc8eeab6d..dceaecc1df 100644
--- a/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx
+++ b/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.stories.tsx
@@ -73,9 +73,16 @@ TitleAndDescription.args = {
     link: "https://matrix.org",
     siteName: "matrix.org",
 };
-
 export const WithSiteIcon = Template.bind({});
 WithSiteIcon.args = {
+    title: "A simple title",
+    link: "https://matrix.org",
+    siteName: "matrix.org",
+    siteIcon: imageFile,
+};
+
+export const WithSiteIconAndDescription = Template.bind({});
+WithSiteIconAndDescription.args = {
     title: "A simple title",
     description: "A simple description with a link to https://matrix.org",
     link: "https://matrix.org",
diff --git a/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.tsx b/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.tsx
index fd6225bc63..cea4477e29 100644
--- a/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.tsx
+++ b/packages/shared-components/src/room/timeline/event-tile/UrlPreviewGroupView/LinkPreview/LinkPreview.tsx
@@ -47,7 +47,7 @@ function LinkTitle({
 function LinkSiteName({ siteIcon, siteName }: { siteIcon?: string; siteName: string }): JSX.Element {
     return (
         <div className={styles.siteName}>
-            <Avatar size="16px" name={siteName} id={siteName} src={siteIcon} />
+            {siteIcon && <Avatar size="16px" name={siteName} id={siteName} src={siteIcon} />}
             <Text as="span" size="sm" weight="regular">
                 {siteName}
             </Text>
@@ -67,12 +67,14 @@ function LinkPreviewInline({
 }: Omit<LinkPreviewProps, "image" | "description" | "author" | "onImageClick">): JSX.Element {
     return (
         <div className={classNames(styles.container, styles.inline)}>
-            <div className={styles.siteAvatar}>
-                <Avatar type="square" size="48px" name={title} id={title} src={siteIcon} />
-            </div>
+            {siteIcon && (
+                <div className={styles.siteAvatar}>
+                    <Avatar type="square" size="48px" name={title} id={title} src={siteIcon} />
+                </div>
+            )}
             <div className={classNames(styles.textContent, styles.inline)}>
                 <LinkTitle title={title} showTooltipOnLink={showTooltipOnLink} link={link} />
-                {siteName && <LinkSiteName siteName={siteName} siteIcon={siteIcon} />}
+                {siteName && <LinkSiteName siteName={siteName} />}
             </div>
         </div>
     );
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 6fc9eea2ee..9b3d7fe547 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
@@ -52,16 +52,6 @@ exports[`LinkPreview > renders a playable preview that can be opened with a clic
       <div
         class="siteName"
       >
-        <span
-          aria-label="blog.example.org"
-          class="_avatar_zysgz_8 _avatar-imageless_zysgz_55"
-          data-color="5"
-          data-type="round"
-          role="img"
-          style="--cpd-avatar-size: 16px;"
-        >
-          b
-        </span>
         <span
           class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
         >
@@ -107,16 +97,6 @@ exports[`LinkPreview > renders a preview 1`] = `
       <div
         class="siteName"
       >
-        <span
-          aria-label="Site name"
-          class="_avatar_zysgz_8 _avatar-imageless_zysgz_55"
-          data-color="3"
-          data-type="round"
-          role="img"
-          style="--cpd-avatar-size: 16px;"
-        >
-          S
-        </span>
         <span
           class="_typography_6v6n8_153 _font-body-sm-regular_6v6n8_31"
         >
@@ -133,20 +113,6 @@ exports[`LinkPreview > renders a preview with just a title 1`] = `
   <div
     class="container inline"
   >
-    <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 inline"
     >
@@ -161,16 +127,6 @@ exports[`LinkPreview > renders a preview with just a title 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"
         >
@@ -214,16 +170,6 @@ 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 5151720e0d..c0e282b07e 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
@@ -40,16 +40,6 @@ exports[`UrlPreviewGroupView > renders a single preview 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"
             >
@@ -128,16 +118,6 @@ exports[`UrlPreviewGroupView > renders multiple previews 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"
             >
@@ -178,16 +158,6 @@ exports[`UrlPreviewGroupView > renders multiple previews 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"
             >
@@ -228,16 +198,6 @@ exports[`UrlPreviewGroupView > renders multiple previews 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"
             >
@@ -325,16 +285,6 @@ exports[`UrlPreviewGroupView > renders multiple previews which are hidden 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"
             >
@@ -422,16 +372,6 @@ exports[`UrlPreviewGroupView > renders with a compact view 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"
             >
@@ -472,16 +412,6 @@ exports[`UrlPreviewGroupView > renders with a compact view 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"
             >
@@ -522,16 +452,6 @@ exports[`UrlPreviewGroupView > renders with a compact view 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"
             >