diff --git a/apps/compliance-portal/index.html b/apps/compliance-portal/index.html
index 83ed320a3..a2c4ffedd 100644
--- a/apps/compliance-portal/index.html
+++ b/apps/compliance-portal/index.html
@@ -13,12 +13,15 @@
   </script>
 
   <script>
+    // FOUC guard: apply the OS preference before JS bundles load. Runtime
+    // overrides (and further system-preference changes) are owned by
+    // src/lib/displayMode/displayMode.ts once the app boots.
     (function () {
       if (!window.matchMedia) return;
-      var mq = window.matchMedia("(prefers-color-scheme: dark)");
-      var apply = function () { document.documentElement.classList.toggle("dark", mq.matches); };
-      apply();
-      mq.addEventListener("change", apply);
+      document.documentElement.classList.toggle(
+        "dark",
+        window.matchMedia("(prefers-color-scheme: dark)").matches,
+      );
     })();
   </script>
 
diff --git a/apps/compliance-portal/src/_locales/de-DE.json b/apps/compliance-portal/src/_locales/de-DE.json
index 7731eb4a7..87cb15da3 100644
--- a/apps/compliance-portal/src/_locales/de-DE.json
+++ b/apps/compliance-portal/src/_locales/de-DE.json
@@ -16,7 +16,9 @@
     "subscribe": "Aktualisierungen abonnieren",
     "subscribed": "Aktualisierungen abonniert",
     "signOut": "Abmelden",
-    "signOutFailed": "Abmelden nicht möglich"
+    "signOutFailed": "Abmelden nicht möglich",
+    "switchToDarkMode": "Zum dunklen Modus wechseln",
+    "switchToLightMode": "Zum hellen Modus wechseln"
   },
   "common": {
     "cancel": "Abbrechen",
diff --git a/apps/compliance-portal/src/_locales/en-US.json b/apps/compliance-portal/src/_locales/en-US.json
index 453cfa103..04a2e59da 100644
--- a/apps/compliance-portal/src/_locales/en-US.json
+++ b/apps/compliance-portal/src/_locales/en-US.json
@@ -16,7 +16,9 @@
     "subscribe": "Subscribe to updates",
     "subscribed": "Subscribed to updates",
     "signOut": "Sign out",
-    "signOutFailed": "Cannot sign out"
+    "signOutFailed": "Cannot sign out",
+    "switchToDarkMode": "Switch to dark mode",
+    "switchToLightMode": "Switch to light mode"
   },
   "locale": {
     "label": "Language",
diff --git a/apps/compliance-portal/src/_locales/es-ES.json b/apps/compliance-portal/src/_locales/es-ES.json
index 2f6f611bd..9f792e358 100644
--- a/apps/compliance-portal/src/_locales/es-ES.json
+++ b/apps/compliance-portal/src/_locales/es-ES.json
@@ -16,7 +16,9 @@
     "subscribe": "Suscribirse a las actualizaciones",
     "subscribed": "Suscrito a las actualizaciones",
     "signOut": "Cerrar sesión",
-    "signOutFailed": "No se puede cerrar sesión"
+    "signOutFailed": "No se puede cerrar sesión",
+    "switchToDarkMode": "Cambiar a modo oscuro",
+    "switchToLightMode": "Cambiar a modo claro"
   },
   "common": {
     "cancel": "Cancelar",
diff --git a/apps/compliance-portal/src/_locales/fr-FR.json b/apps/compliance-portal/src/_locales/fr-FR.json
index f504ad2ed..c03e76b59 100644
--- a/apps/compliance-portal/src/_locales/fr-FR.json
+++ b/apps/compliance-portal/src/_locales/fr-FR.json
@@ -16,7 +16,9 @@
     "subscribe": "S'abonner aux mises à jour",
     "subscribed": "Abonné aux mises à jour",
     "signOut": "Se déconnecter",
-    "signOutFailed": "Impossible de se déconnecter"
+    "signOutFailed": "Impossible de se déconnecter",
+    "switchToDarkMode": "Passer en mode sombre",
+    "switchToLightMode": "Passer en mode clair"
   },
   "common": {
     "cancel": "Annuler",
diff --git a/apps/compliance-portal/src/_locales/id-ID.json b/apps/compliance-portal/src/_locales/id-ID.json
index 144ac7860..7dd938dfd 100644
--- a/apps/compliance-portal/src/_locales/id-ID.json
+++ b/apps/compliance-portal/src/_locales/id-ID.json
@@ -16,7 +16,9 @@
     "subscribe": "Berlangganan pembaruan",
     "subscribed": "Sudah berlangganan pembaruan",
     "signOut": "Keluar",
-    "signOutFailed": "Tidak dapat keluar"
+    "signOutFailed": "Tidak dapat keluar",
+    "switchToDarkMode": "Beralih ke mode gelap",
+    "switchToLightMode": "Beralih ke mode terang"
   },
   "common": {
     "cancel": "Batal",
diff --git a/apps/compliance-portal/src/_locales/it-IT.json b/apps/compliance-portal/src/_locales/it-IT.json
index 29be537c5..a8baf0968 100644
--- a/apps/compliance-portal/src/_locales/it-IT.json
+++ b/apps/compliance-portal/src/_locales/it-IT.json
@@ -16,7 +16,9 @@
     "subscribe": "Iscriviti agli aggiornamenti",
     "subscribed": "Iscritto agli aggiornamenti",
     "signOut": "Esci",
-    "signOutFailed": "Impossibile uscire"
+    "signOutFailed": "Impossibile uscire",
+    "switchToDarkMode": "Passa alla modalità scura",
+    "switchToLightMode": "Passa alla modalità chiara"
   },
   "common": {
     "cancel": "Annulla",
diff --git a/apps/compliance-portal/src/_locales/ja-JP.json b/apps/compliance-portal/src/_locales/ja-JP.json
index 596679c21..e15eaf6c9 100644
--- a/apps/compliance-portal/src/_locales/ja-JP.json
+++ b/apps/compliance-portal/src/_locales/ja-JP.json
@@ -16,7 +16,9 @@
     "subscribe": "アップデートを購読",
     "subscribed": "アップデート購読中",
     "signOut": "サインアウト",
-    "signOutFailed": "サインアウトできません"
+    "signOutFailed": "サインアウトできません",
+    "switchToDarkMode": "ダークモードに切り替え",
+    "switchToLightMode": "ライトモードに切り替え"
   },
   "common": {
     "cancel": "キャンセル",
diff --git a/apps/compliance-portal/src/_locales/ko-KR.json b/apps/compliance-portal/src/_locales/ko-KR.json
index 9ac725e0a..fc07107fb 100644
--- a/apps/compliance-portal/src/_locales/ko-KR.json
+++ b/apps/compliance-portal/src/_locales/ko-KR.json
@@ -16,7 +16,9 @@
     "subscribe": "업데이트 구독",
     "subscribed": "업데이트 구독 중",
     "signOut": "로그아웃",
-    "signOutFailed": "로그아웃할 수 없습니다"
+    "signOutFailed": "로그아웃할 수 없습니다",
+    "switchToDarkMode": "다크 모드로 전환",
+    "switchToLightMode": "라이트 모드로 전환"
   },
   "common": {
     "cancel": "취소",
diff --git a/apps/compliance-portal/src/_locales/pl-PL.json b/apps/compliance-portal/src/_locales/pl-PL.json
index 5b500d7f9..e0203a311 100644
--- a/apps/compliance-portal/src/_locales/pl-PL.json
+++ b/apps/compliance-portal/src/_locales/pl-PL.json
@@ -16,7 +16,9 @@
     "subscribe": "Subskrybuj aktualizacje",
     "subscribed": "Subskrybowano aktualizacje",
     "signOut": "Wyloguj się",
-    "signOutFailed": "Nie można się wylogować"
+    "signOutFailed": "Nie można się wylogować",
+    "switchToDarkMode": "Przełącz na tryb ciemny",
+    "switchToLightMode": "Przełącz na tryb jasny"
   },
   "common": {
     "cancel": "Anuluj",
diff --git a/apps/compliance-portal/src/_locales/pt-PT.json b/apps/compliance-portal/src/_locales/pt-PT.json
index cf2e2a883..9bfa4ad45 100644
--- a/apps/compliance-portal/src/_locales/pt-PT.json
+++ b/apps/compliance-portal/src/_locales/pt-PT.json
@@ -16,7 +16,9 @@
     "subscribe": "Subscrever atualizações",
     "subscribed": "Subscrito às atualizações",
     "signOut": "Terminar sessão",
-    "signOutFailed": "Não é possível terminar a sessão"
+    "signOutFailed": "Não é possível terminar a sessão",
+    "switchToDarkMode": "Mudar para o modo escuro",
+    "switchToLightMode": "Mudar para o modo claro"
   },
   "common": {
     "cancel": "Cancelar",
diff --git a/apps/compliance-portal/src/_locales/tr-TR.json b/apps/compliance-portal/src/_locales/tr-TR.json
index 74918721d..b9892b765 100644
--- a/apps/compliance-portal/src/_locales/tr-TR.json
+++ b/apps/compliance-portal/src/_locales/tr-TR.json
@@ -16,7 +16,9 @@
     "subscribe": "Güncellemelere abone ol",
     "subscribed": "Güncellemelere abone olundu",
     "signOut": "Çıkış yap",
-    "signOutFailed": "Çıkış yapılamıyor"
+    "signOutFailed": "Çıkış yapılamıyor",
+    "switchToDarkMode": "Karanlık moda geç",
+    "switchToLightMode": "Aydınlık moda geç"
   },
   "common": {
     "cancel": "İptal",
diff --git a/apps/compliance-portal/src/_locales/uk-UA.json b/apps/compliance-portal/src/_locales/uk-UA.json
index 1904b71dc..1db13c4b2 100644
--- a/apps/compliance-portal/src/_locales/uk-UA.json
+++ b/apps/compliance-portal/src/_locales/uk-UA.json
@@ -16,7 +16,9 @@
     "subscribe": "Підписатися на оновлення",
     "subscribed": "Підписано на оновлення",
     "signOut": "Вийти",
-    "signOutFailed": "Не вдалося вийти"
+    "signOutFailed": "Не вдалося вийти",
+    "switchToDarkMode": "Перейти в темний режим",
+    "switchToLightMode": "Перейти у світлий режим"
   },
   "common": {
     "cancel": "Скасувати",
diff --git a/apps/compliance-portal/src/_locales/zh-CN.json b/apps/compliance-portal/src/_locales/zh-CN.json
index 9d8eb9012..ca0e71a04 100644
--- a/apps/compliance-portal/src/_locales/zh-CN.json
+++ b/apps/compliance-portal/src/_locales/zh-CN.json
@@ -16,7 +16,9 @@
     "subscribe": "订阅更新",
     "subscribed": "已订阅更新",
     "signOut": "退出登录",
-    "signOutFailed": "无法退出登录"
+    "signOutFailed": "无法退出登录",
+    "switchToDarkMode": "切换到深色模式",
+    "switchToLightMode": "切换到浅色模式"
   },
   "common": {
     "cancel": "取消",
diff --git a/apps/compliance-portal/src/components/TopBar/TopBarMobileNav.tsx b/apps/compliance-portal/src/components/TopBar/TopBarMobileNav.tsx
index d360604ec..0fa32ab1b 100644
--- a/apps/compliance-portal/src/components/TopBar/TopBarMobileNav.tsx
+++ b/apps/compliance-portal/src/components/TopBar/TopBarMobileNav.tsx
@@ -23,7 +23,9 @@ import {
   BellRingingIcon,
   ListIcon,
   LockSimpleIcon,
+  MoonIcon,
   SignOutIcon,
+  SunIcon,
   XIcon,
 } from "@phosphor-icons/react";
 import { Button } from "@probo/ui/src/v2/Button/Button";
@@ -45,6 +47,7 @@ import { useLocation } from "react-router";
 
 import { getSafeContinueUrl, redirectToInitiate } from "#/lib/auth/continueUrl";
 import { useSignOut } from "#/lib/auth/useSignOut";
+import { useDisplayMode } from "#/lib/displayMode/useDisplayMode";
 import { useLocalizedPath } from "#/lib/i18n/useLocale";
 import { useSubscribeDialog } from "#/lib/mailingList/subscribeDialogContext";
 
@@ -75,6 +78,7 @@ export function TopBarMobileNav({ identityKey }: TopBarMobileNavProps) {
   const { pathname } = useLocation();
   const { openSubscribe, isSubscribed, unsubscribe, isUnsubscribing } = useSubscribeDialog();
   const [signOut, isSigningOut] = useSignOut();
+  const { displayMode, toggleDisplayMode } = useDisplayMode();
   const [open, setOpen] = useState(false);
   // Select menus portal to body at z-3 by default; mount them on the drawer
   // popup so they stack inside the modal layer (z-5) instead of under it.
@@ -202,6 +206,20 @@ export function TopBarMobileNav({ identityKey }: TopBarMobileNavProps) {
                   >
                     {isSubscribed ? t("userMenu.subscribed") : t("userMenu.subscribe")}
                   </Button>
+                  <Button
+                    variant="ghost"
+                    color="gold"
+                    size={3}
+                    className="w-full justify-start"
+                    iconStart={displayMode === "dark" ? <SunIcon /> : <MoonIcon />}
+                    onClick={() => {
+                      toggleDisplayMode();
+                    }}
+                  >
+                    {displayMode === "dark"
+                      ? t("userMenu.switchToLightMode")
+                      : t("userMenu.switchToDarkMode")}
+                  </Button>
                   <Button
                     variant="ghost"
                     color="red"
diff --git a/apps/compliance-portal/src/components/TopBar/TopBarUserMenu.tsx b/apps/compliance-portal/src/components/TopBar/TopBarUserMenu.tsx
index c3daae9b0..c5ab1ce61 100644
--- a/apps/compliance-portal/src/components/TopBar/TopBarUserMenu.tsx
+++ b/apps/compliance-portal/src/components/TopBar/TopBarUserMenu.tsx
@@ -23,7 +23,9 @@ import {
   BellRingingIcon,
   CaretDownIcon,
   GlobeIcon,
+  MoonIcon,
   SignOutIcon,
+  SunIcon,
   UserIcon,
 } from "@phosphor-icons/react";
 import { Avatar } from "@probo/ui/src/v2/Avatar/Avatar";
@@ -42,6 +44,7 @@ import { useTranslation } from "react-i18next";
 import { graphql, useFragment } from "react-relay";
 
 import { useSignOut } from "#/lib/auth/useSignOut";
+import { useDisplayMode } from "#/lib/displayMode/useDisplayMode";
 import {
   URL_LOCALE_LABELS,
   URL_LOCALES,
@@ -70,6 +73,7 @@ export function TopBarUserMenu({ identityKey }: TopBarUserMenuProps) {
   const identity = useFragment(topBarUserMenuFragment, identityKey);
   const { openSubscribe, isSubscribed, unsubscribe, isUnsubscribing } = useSubscribeDialog();
   const [signOut, isSigningOut] = useSignOut();
+  const { displayMode, toggleDisplayMode } = useDisplayMode();
   const locale = useLocale();
   const [changeLocale, isChangingLocale] = useChangeLocale();
 
@@ -123,6 +127,14 @@ export function TopBarUserMenu({ identityKey }: TopBarUserMenuProps) {
         >
           {isSubscribed ? t("userMenu.subscribed") : t("userMenu.subscribe")}
         </DropdownItem>
+        <DropdownItem
+          iconStart={displayMode === "dark" ? <SunIcon /> : <MoonIcon />}
+          onClick={toggleDisplayMode}
+        >
+          {displayMode === "dark"
+            ? t("userMenu.switchToLightMode")
+            : t("userMenu.switchToDarkMode")}
+        </DropdownItem>
         <DropdownSubmenu>
           <DropdownSubmenuTrigger iconStart={<GlobeIcon />}>
             {t("locale.label")}
diff --git a/apps/compliance-portal/src/lib/displayMode/displayMode.ts b/apps/compliance-portal/src/lib/displayMode/displayMode.ts
new file mode 100644
index 000000000..e2039cc2a
--- /dev/null
+++ b/apps/compliance-portal/src/lib/displayMode/displayMode.ts
@@ -0,0 +1,87 @@
+// Copyright (c) 2026 Probo Inc <hello@probo.com>.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+export type DisplayMode = "light" | "dark";
+
+type Listener = () => void;
+
+// Tab-scoped override. Null means follow the OS preference. Never persisted.
+let override: DisplayMode | null = null;
+const listeners = new Set<Listener>();
+
+function getSystemDisplayMode(): DisplayMode {
+  if (typeof window === "undefined" || !window.matchMedia) {
+    return "light";
+  }
+  return window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
+}
+
+export function getDisplayMode(): DisplayMode {
+  return override ?? getSystemDisplayMode();
+}
+
+function applyDisplayMode(mode: DisplayMode): void {
+  if (typeof document === "undefined") {
+    return;
+  }
+  document.documentElement.classList.toggle("dark", mode === "dark");
+}
+
+function notify(): void {
+  for (const listener of listeners) {
+    listener();
+  }
+}
+
+export function setDisplayMode(mode: DisplayMode): void {
+  override = mode;
+  applyDisplayMode(mode);
+  notify();
+}
+
+export function toggleDisplayMode(): void {
+  setDisplayMode(getDisplayMode() === "dark" ? "light" : "dark");
+}
+
+export function subscribeDisplayMode(listener: Listener): () => void {
+  listeners.add(listener);
+  return () => {
+    listeners.delete(listener);
+  };
+}
+
+function initDisplayMode(): void {
+  if (typeof window === "undefined" || !window.matchMedia) {
+    return;
+  }
+
+  applyDisplayMode(getDisplayMode());
+
+  const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
+  mediaQuery.addEventListener("change", () => {
+    if (override != null) {
+      return;
+    }
+    applyDisplayMode(getDisplayMode());
+    notify();
+  });
+}
+
+initDisplayMode();
diff --git a/apps/compliance-portal/src/lib/displayMode/useDisplayMode.ts b/apps/compliance-portal/src/lib/displayMode/useDisplayMode.ts
new file mode 100644
index 000000000..7525cf567
--- /dev/null
+++ b/apps/compliance-portal/src/lib/displayMode/useDisplayMode.ts
@@ -0,0 +1,41 @@
+// Copyright (c) 2026 Probo Inc <hello@probo.com>.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+import { useSyncExternalStore } from "react";
+
+import {
+  type DisplayMode,
+  getDisplayMode,
+  subscribeDisplayMode,
+  toggleDisplayMode,
+} from "./displayMode";
+
+export function useDisplayMode(): {
+  displayMode: DisplayMode;
+  toggleDisplayMode: () => void;
+} {
+  const displayMode = useSyncExternalStore(
+    subscribeDisplayMode,
+    getDisplayMode,
+    () => "light" as const,
+  );
+
+  return { displayMode, toggleDisplayMode };
+}
diff --git a/apps/compliance-portal/src/lib/relay/resolvers/CompliancePortalLogoResolver.ts b/apps/compliance-portal/src/lib/relay/resolvers/CompliancePortalLogoResolver.ts
index 9adc53f3b..3e13aa4ec 100644
--- a/apps/compliance-portal/src/lib/relay/resolvers/CompliancePortalLogoResolver.ts
+++ b/apps/compliance-portal/src/lib/relay/resolvers/CompliancePortalLogoResolver.ts
@@ -21,23 +21,23 @@
 import { graphql } from "react-relay";
 import { type LiveState, readFragment } from "relay-runtime";
 
-import type { CompliancePortalLogoResolverFragment$key } from "./__generated__/CompliancePortalLogoResolverFragment.graphql";
+import {
+  getDisplayMode,
+  subscribeDisplayMode,
+} from "#/lib/displayMode/displayMode";
 
-function prefersDark(): boolean {
-  return typeof window !== "undefined"
-    && !!window.matchMedia
-    && window.matchMedia("(prefers-color-scheme: dark)").matches;
-}
+import type { CompliancePortalLogoResolverFragment$key } from "./__generated__/CompliancePortalLogoResolverFragment.graphql";
 
 /**
  * @relayField CompliancePortal.themedLogoUrl: String
  * @rootFragment CompliancePortalLogoResolverFragment
  * @live
  *
- * Resolves the compliance portal logo download URL for the current system color
- * scheme: the dark logo (falling back to the light one) when the OS prefers
- * dark, otherwise the light logo. Lives in the graph so consumers select a
- * single field instead of threading `useSystemTheme` through URL selection.
+ * Resolves the compliance portal logo download URL for the effective display
+ * mode (OS preference, or an in-tab override): the dark logo (falling back to
+ * the light one) in dark mode, otherwise the light logo. Lives in the graph so
+ * consumers select a single field instead of threading display-mode state
+ * through URL selection.
  */
 export function themedLogoUrl(
   key: CompliancePortalLogoResolverFragment$key,
@@ -59,11 +59,7 @@ export function themedLogoUrl(
   const darkUrl = data.darkLogo?.downloadUrl ?? lightUrl;
 
   return {
-    read: () => (prefersDark() ? darkUrl : lightUrl),
-    subscribe: (callback) => {
-      const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
-      mediaQuery.addEventListener("change", callback);
-      return () => mediaQuery.removeEventListener("change", callback);
-    },
+    read: () => (getDisplayMode() === "dark" ? darkUrl : lightUrl),
+    subscribe: subscribeDisplayMode,
   };
 }
diff --git a/apps/compliance-portal/src/lib/relay/resolvers/FrameworkLogoResolver.ts b/apps/compliance-portal/src/lib/relay/resolvers/FrameworkLogoResolver.ts
index 096308f6f..95888c1bc 100644
--- a/apps/compliance-portal/src/lib/relay/resolvers/FrameworkLogoResolver.ts
+++ b/apps/compliance-portal/src/lib/relay/resolvers/FrameworkLogoResolver.ts
@@ -21,23 +21,23 @@
 import { graphql } from "react-relay";
 import { type LiveState, readFragment } from "relay-runtime";
 
-import type { FrameworkLogoResolverFragment$key } from "./__generated__/FrameworkLogoResolverFragment.graphql";
+import {
+  getDisplayMode,
+  subscribeDisplayMode,
+} from "#/lib/displayMode/displayMode";
 
-function prefersDark(): boolean {
-  return typeof window !== "undefined"
-    && !!window.matchMedia
-    && window.matchMedia("(prefers-color-scheme: dark)").matches;
-}
+import type { FrameworkLogoResolverFragment$key } from "./__generated__/FrameworkLogoResolverFragment.graphql";
 
 /**
  * @relayField Framework.themedLogoUrl: String
  * @rootFragment FrameworkLogoResolverFragment
  * @live
  *
- * Resolves the framework logo download URL for the current system color scheme:
- * the dark logo (falling back to the light one) when the OS prefers dark,
- * otherwise the light logo. Lives in the graph so consumers select a single
- * field instead of threading `useSystemTheme` through URL selection.
+ * Resolves the framework logo download URL for the effective display mode (OS
+ * preference, or an in-tab override): the dark logo (falling back to the light
+ * one) in dark mode, otherwise the light logo. Lives in the graph so consumers
+ * select a single field instead of threading display-mode state through URL
+ * selection.
  */
 export function themedLogoUrl(
   key: FrameworkLogoResolverFragment$key,
@@ -59,11 +59,7 @@ export function themedLogoUrl(
   const darkUrl = data.darkLogo?.downloadUrl ?? lightUrl;
 
   return {
-    read: () => (prefersDark() ? darkUrl : lightUrl),
-    subscribe: (callback) => {
-      const mediaQuery = window.matchMedia("(prefers-color-scheme: dark)");
-      mediaQuery.addEventListener("change", callback);
-      return () => mediaQuery.removeEventListener("change", callback);
-    },
+    read: () => (getDisplayMode() === "dark" ? darkUrl : lightUrl),
+    subscribe: subscribeDisplayMode,
   };
 }
diff --git a/apps/compliance-portal/src/main.tsx b/apps/compliance-portal/src/main.tsx
index 6aa976569..a68e10aa6 100644
--- a/apps/compliance-portal/src/main.tsx
+++ b/apps/compliance-portal/src/main.tsx
@@ -21,6 +21,7 @@
 import { createRoot } from "react-dom/client";
 
 import "./index.css";
+import "#/lib/displayMode/displayMode";
 import "#/lib/i18n/i18n";
 
 import { App } from "./App";