diff --git a/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap b/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap
index 185a8c83e7..aefe35f1dc 100644
--- a/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap
+++ b/test/unit-tests/async-components/structures/__snapshots__/ErrorView-test.tsx.snap
@@ -6,7 +6,7 @@ exports[`<ErrorView /> 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"
@@ -40,7 +40,7 @@ exports[`<UnsupportedBrowserView /> 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"
@@ -51,12 +51,12 @@ exports[`<UnsupportedBrowserView /> should match snapshot 1`] = `
       <h1
         class="_typography_6v6n8_153 _font-heading-md-semibold_6v6n8_112"
       >
-        Element does not support this browser
+        HealthChat does not support this browser
       </h1>
       <p
         class="_typography_6v6n8_153 _font-body-lg-regular_6v6n8_69"
       >
-        Element uses some browser features which are not available in your current browser. Try updating this browser if you're not using the latest version and try again.
+        HealthChat uses some browser features which are not available in your current browser. Try updating this browser if you're not using the latest version and try again.
       </p>
       <p
         class="_typography_6v6n8_153 _font-body-lg-regular_6v6n8_69"
@@ -136,84 +136,14 @@ exports[`<UnsupportedBrowserView /> should match snapshot 1`] = `
     <h2
       class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93"
     >
-      Use Element Desktop instead
-    </h2>
-    <div
-      class="_flex_4dswl_9 mx_ErrorView_flexContainer"
-      style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-4x); --mx-flex-wrap: nowrap;"
-    >
-      <a
-        class="_button_187yx_8 _has-icon_187yx_57"
-        data-kind="secondary"
-        data-size="lg"
-        href="https://packages.element.io/desktop/install/macos/Element.dmg"
-        role="link"
-        tabindex="0"
-      >
-        <div
-          aria-hidden="true"
-          height="20"
-          width="20"
-        />
-        Mac
-      </a>
-      <a
-        class="_button_187yx_8 _has-icon_187yx_57"
-        data-kind="secondary"
-        data-size="lg"
-        href="https://packages.element.io/desktop/install/win32/x64/Element%20Setup.exe"
-        role="link"
-        tabindex="0"
-      >
-        <div
-          aria-hidden="true"
-          height="20"
-          width="20"
-        />
-        Windows (64-bit)
-      </a>
-      <a
-        class="_button_187yx_8 _has-icon_187yx_57"
-        data-kind="secondary"
-        data-size="lg"
-        href="https://packages.element.io/desktop/install/win32/arm64/Element%20Setup.exe"
-        role="link"
-        tabindex="0"
-      >
-        <div
-          aria-hidden="true"
-          height="20"
-          width="20"
-        />
-        Windows (ARM 64-bit)
-      </a>
-      <a
-        class="_button_187yx_8 _has-icon_187yx_57"
-        data-kind="secondary"
-        data-size="lg"
-        href="https://element.io/download#linux"
-        role="link"
-        tabindex="0"
-      >
-        <div
-          aria-hidden="true"
-          height="20"
-          width="20"
-        />
-        Linux
-      </a>
-    </div>
-    <h2
-      class="_typography_6v6n8_153 _font-heading-sm-semibold_6v6n8_93"
-    >
-      Or use our mobile app
+      Use HealthChat on mobile instead
     </h2>
     <div
       class="_flex_4dswl_9 mx_ErrorView_flexContainer"
       style="--mx-flex-display: flex; --mx-flex-direction: row; --mx-flex-align: start; --mx-flex-justify: start; --mx-flex-gap: var(--cpd-space-6x); --mx-flex-wrap: nowrap;"
     >
       <a
-        href="https://apps.apple.com/app/vector/id1083446067"
+        href="https://apps.apple.com/ch/app/healthchat/id6743060078"
         rel="noreferrer noopener"
         target="_blank"
       >
@@ -224,7 +154,7 @@ exports[`<UnsupportedBrowserView /> should match snapshot 1`] = `
         />
       </a>
       <a
-        href="https://play.google.com/store/apps/details?id=im.vector.app"
+        href="https://play.google.com/store/apps/details?id=ch.healthchat.element"
         rel="noreferrer noopener"
         target="_blank"
       >
@@ -234,17 +164,6 @@ exports[`<UnsupportedBrowserView /> should match snapshot 1`] = `
           src="themes/element/img/download/google.svg"
         />
       </a>
-      <a
-        href="https://f-droid.org/repository/browse/?fdid=im.vector.app"
-        rel="noreferrer noopener"
-        target="_blank"
-      >
-        <img
-          alt="F-Droid"
-          height="64"
-          src="themes/element/img/download/fdroid.svg"
-        />
-      </a>
     </div>
   </div>
 </DocumentFragment>
diff --git a/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap
index d5ed4f79ce..0cbb3b97cf 100644
--- a/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/MatrixChat-test.tsx.snap
@@ -263,7 +263,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/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap b/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
index ff0d232455..64c9e526f1 100644
--- a/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
+++ b/test/unit-tests/components/structures/__snapshots__/RoomView-test.tsx.snap
@@ -1030,7 +1030,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"
@@ -1259,7 +1259,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"
@@ -1569,7 +1569,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"
@@ -2044,7 +2044,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"
@@ -2519,7 +2519,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"
@@ -2733,7 +2733,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"
@@ -3248,7 +3248,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/test/unit-tests/components/views/auth/__snapshots__/AuthHeaderLogo-test.tsx.snap b/test/unit-tests/components/views/auth/__snapshots__/AuthHeaderLogo-test.tsx.snap
index ad52706d2d..3d2f50c3e3 100644
--- a/test/unit-tests/components/views/auth/__snapshots__/AuthHeaderLogo-test.tsx.snap
+++ b/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/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap b/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap
index 0de553d401..56a28d0a77 100644
--- a/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap
+++ b/test/unit-tests/components/views/rooms/__snapshots__/RoomPreviewBar-test.tsx.snap
@@ -238,7 +238,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>
 `;
@@ -283,7 +283,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>
 `;
@@ -296,7 +296,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/test/unit-tests/components/views/settings/__snapshots__/EventIndexPanel-test.tsx.snap b/test/unit-tests/components/views/settings/__snapshots__/EventIndexPanel-test.tsx.snap
index aab56e28f7..d753221afe 100644
--- a/test/unit-tests/components/views/settings/__snapshots__/EventIndexPanel-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/__snapshots__/EventIndexPanel-test.tsx.snap
@@ -23,14 +23,14 @@ exports[`<EventIndexPanel /> when event indexing is not supported renders link t
     class="mx_SettingsSubsection_text"
   >
     <span>
-      Element can't securely cache encrypted messages locally while running in a web browser. Use 
+      HealthChat can't securely cache encrypted messages locally while running in a web browser. Use 
       <a
         class="mx_ExternalLink"
         href="https://element.io/download"
         rel="noreferrer noopener"
         target="_blank"
       >
-        Element Desktop
+        HealthChat Desktop
         <i
           class="mx_ExternalLink_icon"
         />
@@ -47,7 +47,7 @@ exports[`<EventIndexPanel /> when event indexing is supported but not installed
     class="mx_SettingsSubsection_text"
   >
     <span>
-      Element is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom Element Desktop with 
+      HealthChat is missing some components required for securely caching encrypted messages locally. If you'd like to experiment with this feature, build a custom HealthChat Desktop with 
       <a
         class="mx_ExternalLink"
         href="https://github.com/vector-im/element-desktop/blob/develop/docs/native-node-modules.md#adding-seshat-for-search-in-e2e-encrypted-rooms"
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap
index 72330ab38e..c118c796ef 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/LoginWithQRFlow-test.tsx.snap
+++ b/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/test/unit-tests/components/views/settings/encryption/__snapshots__/DeleteKeyStoragePanel-test.tsx.snap b/test/unit-tests/components/views/settings/encryption/__snapshots__/DeleteKeyStoragePanel-test.tsx.snap
index d82823b1e3..62528067c3 100644
--- a/test/unit-tests/components/views/settings/encryption/__snapshots__/DeleteKeyStoragePanel-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/encryption/__snapshots__/DeleteKeyStoragePanel-test.tsx.snap
@@ -125,7 +125,7 @@ exports[`<DeleteKeyStoragePanel /> should match snapshot 1`] = `
               d="M6.293 6.293a1 1 0 0 1 1.414 0L12 10.586l4.293-4.293a1 1 0 1 1 1.414 1.414L13.414 12l4.293 4.293a1 1 0 0 1-1.414 1.414L12 13.414l-4.293 4.293a1 1 0 0 1-1.414-1.414L10.586 12 6.293 7.707a1 1 0 0 1 0-1.414"
             />
           </svg>
-          You will lose access to your encrypted messages if you are signed out of Element everywhere
+          You will lose access to your encrypted messages if you are signed out of HealthChat everywhere
         </li>
       </ul>
     </div>
diff --git a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AppearanceUserSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AppearanceUserSettingsTab-test.tsx.snap
index 5ad2eb43f7..e63d1f4888 100644
--- a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AppearanceUserSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/AppearanceUserSettingsTab-test.tsx.snap
@@ -179,7 +179,6 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                         class="_container_1qhtc_10"
                       >
                         <input
-                          checked=""
                           class="_input_1qhtc_18"
                           id="radix-_r_3_"
                           name="layout"
@@ -319,6 +318,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                         class="_container_1qhtc_10"
                       >
                         <input
+                          checked=""
                           class="_input_1qhtc_18"
                           id="radix-_r_c_"
                           name="layout"
@@ -601,6 +601,7 @@ exports[`AppearanceUserSettingsTab should render 1`] = `
                       <input
                         aria-describedby="radix-_r_v_"
                         class="_input_udcm8_24"
+                        disabled=""
                         id="radix-_r_u_"
                         name="compactLayout"
                         role="switch"
diff --git a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/MjolnirUserSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/MjolnirUserSettingsTab-test.tsx.snap
index 7f4e8104d8..50aa8aa691 100644
--- a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/MjolnirUserSettingsTab-test.tsx.snap
+++ b/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/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap
index 146277e9f2..2a6d38494a 100644
--- a/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap
@@ -137,14 +137,14 @@ exports[`<SecurityUserSettingsTab /> renders security section 1`] = `
                 class="mx_SettingsSubsection_text"
               >
                 <span>
-                  Element can't securely cache encrypted messages locally while running in a web browser. Use 
+                  HealthChat can't securely cache encrypted messages locally while running in a web browser. Use 
                   <a
                     class="mx_ExternalLink"
                     href="https://element.io/download"
                     rel="noreferrer noopener"
                     target="_blank"
                   >
-                    Element Desktop
+                    HealthChat Desktop
                     <i
                       class="mx_ExternalLink_icon"
                     />
diff --git a/test/unit-tests/utils/__snapshots__/AutoDiscoveryUtils-test.tsx.snap b/test/unit-tests/utils/__snapshots__/AutoDiscoveryUtils-test.tsx.snap
index 8556db8ba8..5ae8658729 100644
--- a/test/unit-tests/utils/__snapshots__/AutoDiscoveryUtils-test.tsx.snap
+++ b/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/test/unit-tests/utils/exportUtils/__snapshots__/HTMLExport-test.ts.snap b/test/unit-tests/utils/exportUtils/__snapshots__/HTMLExport-test.ts.snap
index 550d25ea7d..987177ad7e 100644
--- a/test/unit-tests/utils/exportUtils/__snapshots__/HTMLExport-test.ts.snap
+++ b/test/unit-tests/utils/exportUtils/__snapshots__/HTMLExport-test.ts.snap
@@ -79,6 +79,6 @@ exports[`HTMLExport should export 1`] = `
         </html>"
 `;
 
-exports[`HTMLExport should have an SDK-branded destination file name 1`] = `"Element - My  Test  Room Welcome - Chat Export - 2022-11-17T16-58-32.517Z.zip"`;
+exports[`HTMLExport should have an SDK-branded destination file name 1`] = `"HealthChat - My  Test  Room Welcome - Chat Export - 2022-11-17T16-58-32.517Z.zip"`;
 
 exports[`HTMLExport should have an SDK-branded destination file name 2`] = `"BrandedChatWithSlashesForFun - My  Test  Room Welcome - Chat Export - 2022-11-17T16-58-32.517Z.zip"`;
diff --git a/test/unit-tests/vector/__snapshots__/init-test.ts.snap b/test/unit-tests/vector/__snapshots__/init-test.ts.snap
index b441bfa55f..e462267fc8 100644
--- a/test/unit-tests/vector/__snapshots__/init-test.ts.snap
+++ b/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"