diff --git a/.github/workflows/build-healthchat.yaml b/.github/workflows/build-healthchat.yaml
index 6a2a2b060e..b754ebf0dd 100644
--- a/.github/workflows/build-healthchat.yaml
+++ b/.github/workflows/build-healthchat.yaml
@@ -168,7 +168,7 @@ jobs:
               uses: docker/build-push-action@v6
               with:
                   context: .
-                  file: ./Dockerfile
+                  file: ./apps/web/Dockerfile
                   push: ${{ env.DOCKER_PUSH }}
                   tags: ${{ steps.metadata.outputs.tags }}
                   labels: ${{ steps.metadata.outputs.labels }}
diff --git a/apps/web/src/SdkConfig.ts b/apps/web/src/SdkConfig.ts
index dd67f09b52..652c64c739 100644
--- a/apps/web/src/SdkConfig.ts
+++ b/apps/web/src/SdkConfig.ts
@@ -19,7 +19,7 @@ export const DEFAULTS: DeepReadonly<IConfigOptions> = {
     brand: "HealthChat",
     branding: {
         logo_link_url: "https://element.io",
-        auth_header_logo_url: "themes/element/img/logos/element-logo.svg",
+        auth_header_logo_url: "themes/element/img/logos/element-logo.png",
         welcome_background_url: "themes/element/img/backgrounds/lake.jpg",
     },
     help_url: "https://element.io/help",
diff --git a/apps/web/src/components/views/dialogs/UserSettingsDialog.tsx b/apps/web/src/components/views/dialogs/UserSettingsDialog.tsx
index 70c545d51f..24db8573bb 100644
--- a/apps/web/src/components/views/dialogs/UserSettingsDialog.tsx
+++ b/apps/web/src/components/views/dialogs/UserSettingsDialog.tsx
@@ -10,7 +10,6 @@ Please see LICENSE files in the repository root for full details.
 import { ClientEvent, type MatrixEvent } from "matrix-js-sdk/src/matrix";
 import { Toast } from "@vector-im/compound-web";
 import React, { type JSX, useState } from "react";
-import UserProfileIcon from "@vector-im/compound-design-tokens/assets/web/icons/user-profile";
 import DevicesIcon from "@vector-im/compound-design-tokens/assets/web/icons/devices";
 import VisibilityOnIcon from "@vector-im/compound-design-tokens/assets/web/icons/visibility-on";
 import NotificationsIcon from "@vector-im/compound-design-tokens/assets/web/icons/notifications";
@@ -19,16 +18,13 @@ import KeyboardIcon from "@vector-im/compound-design-tokens/assets/web/icons/key
 import KeyIcon from "@vector-im/compound-design-tokens/assets/web/icons/key";
 import SidebarIcon from "@vector-im/compound-design-tokens/assets/web/icons/sidebar";
 import MicOnIcon from "@vector-im/compound-design-tokens/assets/web/icons/mic-on";
-import LockIcon from "@vector-im/compound-design-tokens/assets/web/icons/lock";
 import BlockIcon from "@vector-im/compound-design-tokens/assets/web/icons/block";
 
 import TabbedView, { Tab, useActiveTabWithDefault } from "../../structures/TabbedView";
-import { _t, _td, type TranslationKey } from "../../../languageHandler";
-import AccountUserSettingsTab from "../settings/tabs/user/AccountUserSettingsTab";
+import { _t, _td } from "../../../languageHandler";
 import { useModuleSettingsTabs } from "../../../modules/ExtrasApi";
 import { ModuleApi } from "../../../modules/Api";
 import AppearanceUserSettingsTab from "../settings/tabs/user/AppearanceUserSettingsTab";
-import SecurityUserSettingsTab from "../settings/tabs/user/SecurityUserSettingsTab";
 import NotificationUserSettingsTab from "../settings/tabs/user/NotificationUserSettingsTab";
 import PreferencesUserSettingsTab from "../settings/tabs/user/PreferencesUserSettingsTab";
 import VoiceUserSettingsTab from "../settings/tabs/user/VoiceUserSettingsTab";
@@ -135,7 +131,7 @@ export default function UserSettingsDialog(props: IProps): JSX.Element {
                 new Tab(
                     moduleTab.key as UserTab,
                     moduleTab.label as TranslationKey,
-                    moduleTab.icon,
+                    moduleTab.icon as JSX.Element | null,
                     moduleTab.body(),
                 ),
             );
@@ -258,7 +254,7 @@ export default function UserSettingsDialog(props: IProps): JSX.Element {
             );
         }
         // JP: Disable help tab for now
-/*        tabs.push(
+        /*        tabs.push(
             new Tab(
                 UserTab.Help,
                 _td("setting|help_about|title"),