diff --git a/apps/web/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap b/apps/web/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap
index 0cdb605a9c..80f5c9116c 100644
--- a/apps/web/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap
+++ b/apps/web/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap
@@ -327,7 +327,7 @@ exports[`<MatrixChat /> with a soft-logged-out session should show the soft-logo
           >
             <img
               alt="Element"
-              src="themes/element/img/logos/element-logo.svg"
+              src="themes/element/img/logos/element-logo.png"
             />
           </aside>
           <div
diff --git a/apps/web/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap b/apps/web/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
index 8fb8a9489b..782aadee5a 100644
--- a/apps/web/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
+++ b/apps/web/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
@@ -1138,7 +1138,7 @@ exports[`RoomView should hide the composer when hideComposer=true 1`] = `
     >
       <div
         class="mx_RoomView_body mx_MainSplit_timeline"
-        data-layout="group"
+        data-layout="bubble"
       >
         <header
           class="_flex_4dswl_9 mx_RoomHeader light-panel"
@@ -1373,7 +1373,7 @@ exports[`RoomView should hide the header when hideHeader=true 1`] = `
     >
       <div
         class="mx_RoomView_body mx_MainSplit_timeline"
-        data-layout="group"
+        data-layout="bubble"
       >
         <div
           class="mx_AutoHideScrollbar mx_AuxPanel"
@@ -1692,7 +1692,7 @@ exports[`RoomView should hide the pinned message banner when hidePinnedMessageBa
     >
       <div
         class="mx_RoomView_body mx_MainSplit_timeline"
-        data-layout="group"
+        data-layout="bubble"
       >
         <header
           class="_flex_4dswl_9 mx_RoomHeader light-panel"
@@ -2176,7 +2176,7 @@ exports[`RoomView should hide the right panel when hideRightPanel=true 1`] = `
     >
       <div
         class="mx_RoomView_body mx_MainSplit_timeline"
-        data-layout="group"
+        data-layout="bubble"
       >
         <header
           class="_flex_4dswl_9 mx_RoomHeader light-panel"
@@ -2660,7 +2660,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
     >
       <div
         class="mx_RoomView_body mx_MainSplit_timeline"
-        data-layout="group"
+        data-layout="bubble"
       >
         <header
           class="_flex_4dswl_9 mx_RoomHeader light-panel"
@@ -2880,7 +2880,7 @@ exports[`RoomView should not display the timeline when the room encryption is lo
     >
       <div
         class="mx_RoomView_body mx_MainSplit_timeline"
-        data-layout="group"
+        data-layout="bubble"
       >
         <header
           class="_flex_4dswl_9 mx_RoomHeader light-panel"
@@ -3422,7 +3422,7 @@ exports[`RoomView video rooms should render joined video room view 1`] = `
     >
       <div
         class="mx_RoomView_body mx_MainSplit_call"
-        data-layout="group"
+        data-layout="bubble"
       >
         <header
           class="_flex_4dswl_9 mx_RoomHeader light-panel"
diff --git a/apps/web/test/unit-tests/components/views/auth/__snapshots__/AuthHeaderLogo-test.tsx.snap b/apps/web/test/unit-tests/components/views/auth/__snapshots__/AuthHeaderLogo-test.tsx.snap
index ad52706d2d..3d2f50c3e3 100644
--- a/apps/web/test/unit-tests/components/views/auth/__snapshots__/AuthHeaderLogo-test.tsx.snap
+++ b/apps/web/test/unit-tests/components/views/auth/__snapshots__/AuthHeaderLogo-test.tsx.snap
@@ -7,7 +7,7 @@ exports[`<AuthHeaderLogo /> should match snapshot 1`] = `
   >
     <img
       alt="Element"
-      src="themes/element/img/logos/element-logo.svg"
+      src="themes/element/img/logos/element-logo.png"
     />
   </aside>
 </DocumentFragment>
diff --git a/apps/web/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap b/apps/web/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap
index 0a30004ba5..a7db2af81a 100644
--- a/apps/web/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap
+++ b/apps/web/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap
@@ -247,7 +247,7 @@ exports[`<RoomPreviewBar /> with an invite with an invited email when client has
     This invite to RoomPreviewBar-test-room was sent to test@test.com
   </h3>
   <p>
-    Share this email in Settings to receive invites directly in Element.
+    Share this email in Settings to receive invites directly in HealthChat.
   </p>
 </div>
 `;
@@ -305,7 +305,7 @@ exports[`<RoomPreviewBar /> with an invite with an invited email when client has
     This invite to RoomPreviewBar-test-room was sent to test@test.com
   </h3>
   <p>
-    Use an identity server in Settings to receive invites directly in Element.
+    Use an identity server in Settings to receive invites directly in HealthChat.
   </p>
 </div>
 `;
@@ -318,7 +318,7 @@ exports[`<RoomPreviewBar /> with an invite with an invited email when invitedEma
     This invite to RoomPreviewBar-test-room was sent to test@test.com which is not associated with your account
   </h3>
   <p>
-    Link this email with your account in Settings to receive invites directly in Element.
+    Link this email with your account in Settings to receive invites directly in HealthChat.
   </p>
 </div>
 `;
diff --git a/apps/web/test/unit-tests/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap b/apps/web/test/unit-tests/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap
index 63eb09fca7..3ad3d69cfa 100644
--- a/apps/web/test/unit-tests/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap
+++ b/apps/web/test/unit-tests/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap
@@ -824,7 +824,7 @@ exports[`<LoginWithQRFlow /> renders QR code 1`] = `
       </div>
       <ol>
         <li>
-          Open Element on your other device
+          Open HealthChat on your other device
         </li>
         <li>
           <span>
diff --git a/apps/web/test/unit-tests/components/views/settings/tabs/user/__snapshots__/MjolnirUserSettingsTab-test.tsx.snap b/apps/web/test/unit-tests/components/views/settings/tabs/user/__snapshots__/MjolnirUserSettingsTab-test.tsx.snap
index f427c0f92d..ebfd838b7a 100644
--- a/apps/web/test/unit-tests/components/views/settings/tabs/user/__snapshots__/MjolnirUserSettingsTab-test.tsx.snap
+++ b/apps/web/test/unit-tests/components/views/settings/tabs/user/__snapshots__/MjolnirUserSettingsTab-test.tsx.snap
@@ -24,7 +24,7 @@ exports[`<MjolnirUserSettingsTab /> renders correctly when user has no ignored u
             </strong>
             <p>
               <span>
-                Add users and servers you want to ignore here. Use asterisks to have Element match any characters. For example, 
+                Add users and servers you want to ignore here. Use asterisks to have HealthChat match any characters. For example, 
                 <code>
                   @bot:*
                 </code>
diff --git a/apps/web/test/unit-tests/utils/__snapshots__/AutoDiscoveryUtils-test.tsx.snap b/apps/web/test/unit-tests/utils/__snapshots__/AutoDiscoveryUtils-test.tsx.snap
index 8556db8ba8..5ae8658729 100644
--- a/apps/web/test/unit-tests/utils/__snapshots__/AutoDiscoveryUtils-test.tsx.snap
+++ b/apps/web/test/unit-tests/utils/__snapshots__/AutoDiscoveryUtils-test.tsx.snap
@@ -4,11 +4,11 @@ exports[`AutoDiscoveryUtils authComponentStateForError should return expected er
 {
   "serverDeadError": <div>
     <strong>
-      Your Element is misconfigured
+      Your HealthChat is misconfigured
     </strong>
     <div>
       <span>
-        Ask your Element admin to check 
+        Ask your HealthChat admin to check 
         <a
           href="https://github.com/vector-im/element-web/blob/master/docs/config.md"
           rel="noreferrer noopener"
diff --git a/apps/web/test/unit-tests/vector/__snapshots__/init-test.ts.snap b/apps/web/test/unit-tests/vector/__snapshots__/init-test.ts.snap
index 7c5f97eb53..875d36c733 100644
--- a/apps/web/test/unit-tests/vector/__snapshots__/init-test.ts.snap
+++ b/apps/web/test/unit-tests/vector/__snapshots__/init-test.ts.snap
@@ -8,7 +8,7 @@ exports[`showError should match snapshot 1`] = `
     class="mx_ErrorView cpd-theme-light"
   >
     <img
-      alt="Element"
+      alt="HealthChat"
       class="mx_ErrorView_logo"
       height="160"
       src="themes/element/img/logos/element-app-logo.png"