diff --git a/.gitignore b/.gitignore
index e57e0d8bd..8d7082d5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,9 @@ yarn-error.log*
 *.tsbuildinfo
 next-env.d.ts
 
+# local UI sandbox (throwaway preview harness — never commit)
+/src/app/sandbox/
+
 # config
 .local*config*.json
 .test-config.json
@@ -53,4 +56,6 @@ playwright-report*.zip
 /public/ironrdp-pkg/
 /public/netbird.wasm
 .idea
-src/.local-config*
\ No newline at end of file
+src/.local-config*
+# local mock data (throwaway preview — never commit)
+/src/utils/mockData.ts
diff --git a/src/app/(dashboard)/(cloud)/integrations/page.tsx b/src/app/(dashboard)/(cloud)/integrations/page.tsx
index d33e956dc..9c3f1053d 100644
--- a/src/app/(dashboard)/(cloud)/integrations/page.tsx
+++ b/src/app/(dashboard)/(cloud)/integrations/page.tsx
@@ -60,7 +60,7 @@ export default function Integrations() {
             (!isNetBirdCloud() && (permission?.settings?.read ?? false))
           }
         >
-          <div className={"border-l border-nb-gray-930 w-full"}>
+          <div className={"w-full"}>
             <IdentityProviderTab />
             <SSOTab />
             <EventStreamingTab />
diff --git a/src/app/(dashboard)/agent-network/configuration/page.tsx b/src/app/(dashboard)/agent-network/configuration/page.tsx
index 2d32b87b6..0f47d2d15 100644
--- a/src/app/(dashboard)/agent-network/configuration/page.tsx
+++ b/src/app/(dashboard)/agent-network/configuration/page.tsx
@@ -87,7 +87,7 @@ export default function AgentNetworkConfigurationPage() {
           <GroupsProvider>
             <PeersProvider>
               <AIProvidersProvider>
-                <div className={"border-l border-nb-gray-930 w-full"}>
+                <div className={"w-full"}>
                   <Tabs.Content
                     value={TAB_BUDGET_SETTINGS}
                     className={"w-full"}
diff --git a/src/app/(dashboard)/control-center/page.tsx b/src/app/(dashboard)/control-center/page.tsx
index d6de229a1..51462080a 100644
--- a/src/app/(dashboard)/control-center/page.tsx
+++ b/src/app/(dashboard)/control-center/page.tsx
@@ -15,6 +15,11 @@ import React, { useState } from "react";
 import { useSWRConfig } from "swr";
 import GroupsProvider from "@/contexts/GroupsProvider";
 import PeersProvider from "@/contexts/PeersProvider";
+import { useTheme } from "@/contexts/ThemeProvider";
+import {
+  canvasBackground,
+  canvasDotColor,
+} from "@/modules/control-center/utils/canvas-theme";
 import PoliciesProvider from "@/contexts/PoliciesProvider";
 import { Network } from "@/interfaces/Network";
 import PageContainer from "@/layouts/PageContainer";
@@ -105,6 +110,8 @@ const PRO_OPTIONS = { hideAttribution: true };
 const DEFAULT_VIEWPORT = { x: 0, y: 0, zoom: EMPTY_STATE_ZOOM };
 
 function ControlCenterCanvas() {
+  const { resolvedTheme } = useTheme();
+  const isLight = resolvedTheme === "light";
   const canvas = useCanvasState();
   const ui = useControlCenterUI();
   const draft = useDraft();
@@ -283,7 +290,7 @@ function ControlCenterCanvas() {
         onInit={stableOnInit}
         maxZoom={DEFAULT_MAX_ZOOM}
         minZoom={DEFAULT_MIN_ZOOM}
-        colorMode={"dark"}
+        colorMode={isLight ? "light" : "dark"}
         panOnDrag={canInteract}
         panOnScroll={draft.isSelectMode && !emptyState}
         zoomOnScroll={canInteract}
@@ -297,7 +304,11 @@ function ControlCenterCanvas() {
         selectionOnDrag={draft.isSelectMode && !emptyState}
         selectionMode={SelectionMode.Partial}
       >
-        <Background bgColor={"#181a1d"} gap={20} color={"#717171"} />
+        <Background
+          bgColor={canvasBackground(resolvedTheme)}
+          gap={20}
+          color={canvasDotColor(resolvedTheme)}
+        />
         <CanvasContextMenu onOpenChange={setContextMenuOpen} />
         <NodeContextMenu
           position={nodeContextMenuPos}
diff --git a/src/app/(dashboard)/group/page.tsx b/src/app/(dashboard)/group/page.tsx
index 0a6dde707..d1a0d593e 100644
--- a/src/app/(dashboard)/group/page.tsx
+++ b/src/app/(dashboard)/group/page.tsx
@@ -115,7 +115,7 @@ const GroupDetailsName = () => {
             >
               <div
                 className={cn(
-                  "flex h-8 w-8 items-center justify-center gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 rounded-md cursor-pointer",
+                  "flex h-8 w-8 items-center justify-center gap-2 text-nb-gray-300 hover:text-nb-gray-100 transition-all hover:bg-nb-gray-800/60 rounded-md cursor-pointer",
                   !isAllowedToRename &&
                     "opacity-40 cursor-not-allowed pointer-events-none",
                 )}
diff --git a/src/app/(dashboard)/peer/page.tsx b/src/app/(dashboard)/peer/page.tsx
index 54c4eb9d7..edcbd63af 100644
--- a/src/app/(dashboard)/peer/page.tsx
+++ b/src/app/(dashboard)/peer/page.tsx
@@ -257,7 +257,7 @@ const PeerHeader = () => {
                   <ModalTrigger>
                     <div
                       className={
-                        "flex h-8 w-8 items-center justify-center gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 rounded-md cursor-pointer"
+                        "flex h-8 w-8 items-center justify-center gap-2 text-nb-gray-400 hover:text-nb-gray-100 transition-all hover:bg-nb-gray-800/60 rounded-md cursor-pointer"
                       }
                     >
                       <PencilIcon size={16} />
@@ -741,7 +741,7 @@ function EditableValue({
       <span>{value}</span>
       {canEdit && (
         <button
-          className="flex w-7 h-7 items-center justify-center gap-2 text-nb-gray-400 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 rounded-md cursor-pointer"
+          className="flex w-7 h-7 items-center justify-center gap-2 text-nb-gray-400 hover:text-nb-gray-100 transition-all hover:bg-nb-gray-800/60 rounded-md cursor-pointer"
           onClick={(e) => {
             e.stopPropagation();
             onEdit();
diff --git a/src/app/(dashboard)/settings/page.tsx b/src/app/(dashboard)/settings/page.tsx
index da88495f9..a6f5909e0 100644
--- a/src/app/(dashboard)/settings/page.tsx
+++ b/src/app/(dashboard)/settings/page.tsx
@@ -107,7 +107,7 @@ export default function NetBirdSettings() {
           page={"Settings"}
           hasAccess={permission?.billing?.read || permission?.settings?.read}
         >
-          <div className={"border-l border-nb-gray-930 w-full"}>
+          <div className={"w-full"}>
             {account && <AuthenticationTab account={account} />}
             {permission.setup_keys.read && <SetupKeysTab />}
             {account?.settings?.embedded_idp_enabled &&
diff --git a/src/app/(dashboard)/team/user/page.tsx b/src/app/(dashboard)/team/user/page.tsx
index cc118bbc9..1ad9ee427 100644
--- a/src/app/(dashboard)/team/user/page.tsx
+++ b/src/app/(dashboard)/team/user/page.tsx
@@ -183,7 +183,7 @@ function UserOverview({ user, initialGroups }: Readonly<Props>) {
             <div className={"flex items-center gap-3"}>
               <div
                 className={
-                  "w-10 h-10 rounded-full relative flex items-center justify-center text-white uppercase text-md font-medium bg-nb-gray-900"
+                  "w-10 h-10 rounded-full relative flex items-center justify-center text-nb-gray-100 uppercase text-md font-medium bg-nb-gray-900"
                 }
                 style={
                   isServiceUser
diff --git a/src/app/globals.css b/src/app/globals.css
index 9f28b1be7..ee2abf519 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -5,6 +5,69 @@
 :root {
     --toasts-before: 0;
     --lift: 1;
+
+    /* nb-gray INVERTED ramp (light mode) — space-separated RGB channels.
+       High stops are surfaces (near-white), low stops are text (near-black).
+       DEFAULT (the app background) sits slightly below white so white
+       inputs, buttons and cards stand in front of it.
+       The ramp is pure neutral (R = G = B) and matches the desktop client's
+       light ramp (netbirdio/netbird#7344) so both UIs share one palette. */
+    --nb-gray-DEFAULT: 243 243 243;
+    --nb-gray-50: 26 26 26;
+    --nb-gray-100: 33 33 33;
+    --nb-gray-200: 50 50 50;
+    --nb-gray-250: 58 58 58;
+    --nb-gray-300: 77 77 77;
+    --nb-gray-350: 92 92 92;
+    --nb-gray-400: 108 108 108;
+    --nb-gray-500: 135 135 135;
+    --nb-gray-600: 154 154 154;
+    --nb-gray-700: 209 209 209;
+    --nb-gray-800: 226 226 226;
+    --nb-gray-850: 234 234 234;
+    --nb-gray-900: 238 238 238;
+    --nb-gray-910: 240 240 240;
+    --nb-gray-920: 243 243 243;
+    --nb-gray-925: 245 245 245;
+    --nb-gray-930: 246 246 246;
+    --nb-gray-935: 248 248 248;
+    --nb-gray-940: 250 250 250;
+    --nb-gray-950: 252 252 252;
+    --nb-gray-960: 255 255 255;
+
+    /* Loading-skeleton colours, consumed by ThemeProvider's SkeletonTheme. */
+    --skeleton-base: 238 238 238;
+    --skeleton-highlight: 247 247 247;
+}
+
+.dark {
+    /* nb-gray ORIGINAL ramp (dark mode) */
+    --nb-gray-DEFAULT: 24 26 29;
+    --nb-gray-50: 244 246 247;
+    --nb-gray-100: 228 231 233;
+    --nb-gray-200: 203 210 214;
+    --nb-gray-250: 183 192 198;
+    --nb-gray-300: 163 173 181;
+    --nb-gray-350: 143 156 168;
+    --nb-gray-400: 124 137 148;
+    --nb-gray-500: 97 110 121;
+    --nb-gray-600: 83 93 103;
+    --nb-gray-700: 71 78 87;
+    --nb-gray-800: 63 68 75;
+    --nb-gray-850: 54 59 64;
+    --nb-gray-900: 46 50 56;
+    --nb-gray-910: 43 47 51;
+    --nb-gray-920: 37 40 45;
+    --nb-gray-925: 30 33 35;
+    --nb-gray-930: 37 40 44;
+    --nb-gray-935: 31 33 36;
+    --nb-gray-940: 28 30 33;
+    --nb-gray-950: 24 26 29;
+    --nb-gray-960: 22 24 27;
+
+    /* Dark skeletons keep their existing nb-gray-920 / nb-gray-850 values. */
+    --skeleton-base: 37 40 45;
+    --skeleton-highlight: 54 59 64;
 }
 
 html{
@@ -12,13 +75,13 @@ html{
 }
 
 h1 {
-    @apply text-2xl font-medium text-gray-700 dark:text-nb-gray-100 my-1;
+    @apply text-2xl font-medium text-nb-gray-100 my-1;
 }
 h2 {
-    @apply text-xl font-medium text-gray-700 dark:text-nb-gray-100 my-1;
+    @apply text-xl font-medium text-nb-gray-100 my-1;
 }
 p {
-    @apply font-light tracking-wide text-gray-700 dark:text-zinc-50 text-sm;
+    @apply font-light tracking-wide text-nb-gray-200 text-sm;
 }
 
 .p-default {
@@ -95,7 +158,7 @@ p {
 }
 
 .timescape input:focus {
-    @apply bg-nb-gray-700 text-white rounded py-1 px-0.5 border-0 outline-0;
+    @apply bg-nb-gray-700 text-nb-gray-50 rounded py-1 px-0.5 border-0 outline-0;
 }
 
 .timescape .separator {
diff --git a/src/app/invite/page.tsx b/src/app/invite/page.tsx
index 175afd344..47383ed29 100644
--- a/src/app/invite/page.tsx
+++ b/src/app/invite/page.tsx
@@ -111,7 +111,7 @@ function InviteAcceptContent() {
                 <Clock className="w-8 h-8 text-yellow-500" />
               </div>
             </div>
-            <h1 className="text-2xl font-semibold text-white mb-2">
+            <h1 className="text-2xl font-semibold dark:text-white text-nb-gray-900 mb-2">
               Too Many Requests
             </h1>
             <Paragraph className="text-nb-gray-400 text-base">
@@ -138,7 +138,7 @@ function InviteAcceptContent() {
               <AlertCircle className="w-8 h-8 text-red-500" />
             </div>
           </div>
-          <h1 className="text-2xl font-semibold text-white mb-2">
+          <h1 className="text-2xl font-semibold dark:text-white text-nb-gray-900 mb-2">
             Invalid Invite
           </h1>
           <Paragraph className="text-nb-gray-400 text-base">
@@ -166,7 +166,7 @@ function InviteAcceptContent() {
               <CheckCircle2 className="w-8 h-8 text-green-500" />
             </div>
           </div>
-          <h1 className="text-2xl font-semibold text-white mb-2">
+          <h1 className="text-2xl font-semibold dark:text-white text-nb-gray-900 mb-2">
             Account Created!
           </h1>
           <Paragraph className="text-nb-gray-400">
@@ -194,7 +194,7 @@ function InviteAcceptContent() {
               <AlertCircle className="w-8 h-8 text-yellow-500" />
             </div>
           </div>
-          <h1 className="text-2xl font-semibold text-white mb-2">
+          <h1 className="text-2xl font-semibold dark:text-white text-nb-gray-900 mb-2">
             Invite Expired
           </h1>
           <Paragraph className="text-nb-gray-400">
@@ -221,7 +221,7 @@ function InviteAcceptContent() {
         </div>
 
         <div className="text-center mb-8">
-          <h1 className="text-2xl font-semibold text-white mb-2">
+          <h1 className="text-2xl font-semibold dark:text-white text-nb-gray-900 mb-2">
             Welcome to NetBird
           </h1>
           <p className="dark:text-nb-gray-400 text-nb-gray-500 text-base">
@@ -235,7 +235,7 @@ function InviteAcceptContent() {
               <User2 className="w-5 h-5 text-nb-gray-400" />
             </div>
             <div>
-              <div className="text-white font-medium">{inviteInfo.name}</div>
+              <div className="dark:text-white text-nb-gray-900 font-medium">{inviteInfo.name}</div>
               <div className="text-nb-gray-400 text-sm flex items-center gap-1">
                 <Mail className="w-3 h-3" />
                 {inviteInfo.email}
diff --git a/src/assets/netbird-full-light.svg b/src/assets/netbird-full-light.svg
new file mode 100644
index 000000000..3457b50c6
--- /dev/null
+++ b/src/assets/netbird-full-light.svg
@@ -0,0 +1,19 @@
+<svg width="133" height="23" viewBox="0 0 133 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_0_3)">
+<path d="M46.9438 7.5013C48.1229 8.64688 48.7082 10.3025 48.7082 12.4683V21.6663H46.1411V12.8362C46.1411 11.2809 45.7481 10.0851 44.9704 9.26566C44.1928 8.43783 43.1308 8.0281 41.7846 8.0281C40.4383 8.0281 39.3345 8.45455 38.5234 9.30747C37.7123 10.1604 37.3109 11.4063 37.3109 13.0369V21.6663H34.7188V6.06305H37.3109V8.28732C37.821 7.49294 38.5234 6.87416 39.4014 6.43934C40.2878 6.00452 41.2578 5.78711 42.3197 5.78711C44.2179 5.78711 45.7565 6.36408 46.9355 7.50966L46.9438 7.5013Z" fill="#1f2124"/>
+<path d="M67.1048 14.8344H54.6288C54.7208 16.373 55.2476 17.5771 56.2092 18.4384C57.1708 19.2997 58.3331 19.7345 59.6961 19.7345C60.8166 19.7345 61.7531 19.4753 62.4973 18.9485C63.2499 18.4301 63.7767 17.7277 64.0777 16.858H66.8706C66.4525 18.3548 65.6163 19.5756 64.3621 20.5205C63.1078 21.4571 61.5525 21.9337 59.6878 21.9337C58.2077 21.9337 56.8865 21.5992 55.7159 20.9386C54.5452 20.278 53.6337 19.3331 52.9648 18.1039C52.2958 16.8831 51.9697 15.4616 51.9697 13.8477C51.9697 12.2339 52.2958 10.8207 52.9397 9.60825C53.5836 8.39578 54.495 7.45924 55.6573 6.80702C56.828 6.15479 58.1659 5.82031 59.6878 5.82031C61.2096 5.82031 62.4806 6.14643 63.6178 6.79029C64.7551 7.43416 65.6331 8.32052 66.2518 9.44938C66.8706 10.5782 67.18 11.8576 67.18 13.2791C67.18 13.7725 67.1549 14.2909 67.0964 14.8428L67.1048 14.8344ZM63.8603 10.1769C63.4255 9.4661 62.8318 8.92258 62.0793 8.55465C61.3267 8.18673 60.4989 8.00277 59.5874 8.00277C58.2746 8.00277 57.1625 8.42086 56.2427 9.25705C55.3228 10.0932 54.796 11.2472 54.6623 12.7356H64.5126C64.5126 11.7489 64.2952 10.896 63.8603 10.1852V10.1769Z" fill="#1f2124"/>
+<path d="M73.7695 8.20355V17.4016C73.7695 18.1626 73.9284 18.6977 74.2545 19.0071C74.5806 19.3165 75.1409 19.4754 75.9352 19.4754H77.8418V21.6662H75.5088C74.0622 21.6662 72.9835 21.3317 72.2644 20.6711C71.5452 20.0105 71.1857 18.9151 71.1857 17.3933V8.19519H69.1621V6.0629H71.1857V2.13281H73.7779V6.0629H77.8501V8.19519H73.7779L73.7695 8.20355Z" fill="#1f2124"/>
+<path d="M85.9022 6.68902C86.9307 6.10369 88.093 5.80266 89.4058 5.80266C90.8106 5.80266 92.0732 6.13714 93.1937 6.79773C94.3142 7.46668 95.2006 8.39485 95.8444 9.59896C96.4883 10.8031 96.8144 12.2079 96.8144 13.7966C96.8144 15.3854 96.4883 16.7818 95.8444 18.011C95.2006 19.2486 94.3142 20.2018 93.1854 20.8875C92.0565 21.5732 90.7939 21.916 89.4141 21.916C88.0344 21.916 86.8805 21.6234 85.8687 21.0297C84.8569 20.4443 84.0876 19.6918 83.5775 18.7803V21.6568H80.9854V0.601562H83.5775V8.97182C84.1127 8.04365 84.8904 7.28272 85.9105 6.69738L85.9022 6.68902ZM93.4529 10.7362C92.9763 9.86654 92.3408 9.19759 91.5297 8.74605C90.7186 8.29451 89.8322 8.06037 88.8706 8.06037C87.909 8.06037 87.0394 8.29451 86.2366 8.75441C85.4255 9.22268 84.7817 9.89163 84.2967 10.778C83.8117 11.6643 83.5692 12.6845 83.5692 13.8384C83.5692 14.9924 83.8117 16.046 84.2967 16.9323C84.7817 17.8187 85.4255 18.4877 86.2366 18.9559C87.0394 19.4242 87.9174 19.65 88.8706 19.65C89.8239 19.65 90.727 19.4158 91.5297 18.9559C92.3324 18.4877 92.9763 17.8187 93.4529 16.9323C93.9296 16.046 94.1637 15.0091 94.1637 13.8134C94.1637 12.6176 93.9296 11.6142 93.4529 10.7362Z" fill="#1f2124"/>
+<path d="M100.318 3.01864C99.9749 2.67581 99.8076 2.25771 99.8076 1.76436C99.8076 1.27101 99.9749 0.852913 100.318 0.510076C100.661 0.167238 101.079 0 101.572 0C102.065 0 102.45 0.167238 102.784 0.510076C103.119 0.852913 103.286 1.27101 103.286 1.76436C103.286 2.25771 103.119 2.67581 102.784 3.01864C102.45 3.36148 102.049 3.52872 101.572 3.52872C101.095 3.52872 100.661 3.36148 100.318 3.01864ZM102.826 6.06237V21.6657H100.234V6.06237H102.826Z" fill="#1f2124"/>
+<path d="M111.773 6.52155C112.617 6.0282 113.646 5.77734 114.867 5.77734V8.45315H114.181C111.28 8.45315 109.825 10.0252 109.825 13.1776V21.6649H107.232V6.06165H109.825V8.5953C110.276 7.70058 110.928 7.00654 111.773 6.51319V6.52155Z" fill="#1f2124"/>
+<path d="M117.861 9.60732C118.505 8.40321 119.391 7.46668 120.52 6.80609C121.649 6.1455 122.92 5.81102 124.325 5.81102C125.537 5.81102 126.666 6.09533 127.711 6.64721C128.757 7.20746 129.551 7.94331 130.103 8.85475V0.601562H132.72V21.6735H130.103V18.7385C129.593 19.6667 128.832 20.436 127.828 21.0297C126.825 21.6317 125.646 21.9244 124.3 21.9244C122.953 21.9244 121.657 21.5816 120.528 20.8959C119.4 20.2102 118.513 19.257 117.869 18.0194C117.226 16.7818 116.899 15.377 116.899 13.805C116.899 12.233 117.226 10.8114 117.869 9.60732H117.861ZM129.392 10.7613C128.915 9.89163 128.28 9.22268 127.469 8.75441C126.658 8.28614 125.771 8.06037 124.81 8.06037C123.848 8.06037 122.962 8.28614 122.159 8.74605C121.356 9.20595 120.729 9.86654 120.253 10.7362C119.776 11.6058 119.542 12.6343 119.542 13.8134C119.542 14.9924 119.776 16.046 120.253 16.9323C120.729 17.8187 121.365 18.4877 122.159 18.9559C122.953 19.4242 123.84 19.65 124.81 19.65C125.78 19.65 126.666 19.4158 127.469 18.9559C128.272 18.4877 128.915 17.8187 129.392 16.9323C129.869 16.046 130.103 15.0175 130.103 13.8384C130.103 12.6594 129.869 11.6393 129.392 10.7613Z" fill="#1f2124"/>
+<path d="M21.4651 0.568359C17.8193 0.902835 16.0047 3.00167 15.3191 4.06363L4.66602 22.5183H17.5182L30.1949 0.568359H21.4651Z" fill="#F68330"/>
+<path d="M17.5265 22.5187L0 3.9302C0 3.9302 19.8177 -1.39633 21.7493 15.2188L17.5265 22.5187Z" fill="#F68330"/>
+<path d="M14.9255 4.75055L9.54883 14.0657L17.5177 22.5196L21.7405 15.2029C21.0715 9.49174 18.287 6.37276 14.9255 4.74219" fill="#F35E32"/>
+</g>
+<defs>
+<clipPath id="clip0_0_3">
+<rect width="132.72" height="22.5186" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/src/cloud/traffic-events/table/TrafficEventsDetailRow.tsx b/src/cloud/traffic-events/table/TrafficEventsDetailRow.tsx
index a174a96e7..bf4b7820a 100644
--- a/src/cloud/traffic-events/table/TrafficEventsDetailRow.tsx
+++ b/src/cloud/traffic-events/table/TrafficEventsDetailRow.tsx
@@ -143,7 +143,7 @@ const PolicyListItem = ({
         <Link href={`/access-control?id=${policy?.id}`}>
           <span
             className={
-              "flex gap-1 underline underline-offset-4 decoration-dotted text-nb-gray-100 hover:text-white"
+              "flex gap-1 underline underline-offset-4 decoration-dotted text-nb-gray-100 hover:text-nb-gray-50"
             }
           >
             {policy?.name}
diff --git a/src/components/Badge.tsx b/src/components/Badge.tsx
index bd4951673..dea6990f2 100644
--- a/src/components/Badge.tsx
+++ b/src/components/Badge.tsx
@@ -17,21 +17,43 @@ const variants = cva("", {
       blue: [
         "bg-sky-100 border-sky-500 text-sky-800 border border-transparent",
       ],
-      blueDark: ["bg-sky-900 border-sky-500 text-white border"],
-      "blue-darker": ["bg-sky-900 border-sky-500 text-white border"],
-      red: ["bg-red-950/40 border-red-500 border text-red-500"],
-      purple: ["bg-purple-950/50 border-purple-500 border text-purple-500"],
-      yellow: ["bg-yellow-950 border-yellow-500 border text-yellow-400"],
-      gray: ["bg-nb-gray-930/60 border-nb-gray-800/40 text-nb-gray-300 border"],
-      lightGray: ["bg-nb-gray-910  text-nb-gray-200 border border-nb-gray-900"],
+      blueDark: [
+        "bg-sky-100 border-sky-500 text-sky-800 border dark:bg-sky-900 dark:text-white",
+      ],
+      "blue-darker": [
+        "bg-sky-100 border-sky-500 text-sky-800 border dark:bg-sky-900 dark:text-white",
+      ],
+      red: [
+        "bg-red-100 border-red-500 border text-red-700 dark:bg-red-950/40 dark:text-red-500",
+      ],
+      purple: [
+        "bg-purple-100 border-purple-500 border text-purple-700 dark:bg-purple-950/50 dark:text-purple-500",
+      ],
+      yellow: [
+        "bg-yellow-100 border-yellow-500 border text-yellow-700 dark:bg-yellow-950 dark:text-yellow-400",
+      ],
+      gray: [
+        "bg-white border-nb-gray-700 text-nb-gray-300 border",
+        "dark:bg-nb-gray-930/60 dark:border-nb-gray-800/40",
+      ],
+      lightGray: [
+        "bg-white border-nb-gray-700 text-nb-gray-200 border",
+        "dark:bg-nb-gray-910 dark:border-nb-gray-900",
+      ],
       grayer: [
-        "bg-nb-gray-900/40 border-nb-gray-800/40 text-nb-gray-300 border",
+        "bg-white border-nb-gray-700 text-nb-gray-300 border",
+        "dark:bg-nb-gray-900/40 dark:border-nb-gray-800/40",
       ],
       "gray-ghost": [
-        "bg-nb-gray-900 border-nb-gray-800 text-nb-gray-300 border border-nb-gray-800/50",
+        "bg-white border-nb-gray-700 text-nb-gray-300 border",
+        "dark:bg-nb-gray-900 dark:border-nb-gray-800/50",
+      ],
+      green: [
+        "bg-green-100 border-green-500 border text-green-700 dark:bg-green-950 dark:text-green-400",
+      ],
+      netbird: [
+        "bg-netbird-100 border-netbird-500 border text-netbird-700 dark:bg-netbird-950 dark:text-netbird-500",
       ],
-      green: ["bg-green-950 border-green-500 border text-green-400"],
-      netbird: ["bg-netbird-950 border-netbird-500 border text-netbird-500"],
     },
     size: {
       default: "text-[0.75rem] py-1.5 px-3",
@@ -40,17 +62,21 @@ const variants = cva("", {
     hover: {
       none: [],
       blue: ["hover:bg-sky-200"],
-      purple: ["hover:bg-purple-950/40"],
-      yellow: ["hover:bg-yellow-950/40"],
-      blueDark: ["hover:bg-sky-800"],
-      "blue-darker": ["hover:bg-sky-800"],
-      red: ["hover:bg-red-950/40"],
-      gray: ["hover:bg-nb-gray-900"],
-      lightGray: ["hover:bg-nb-gray-900"],
-      grayer: ["hover:bg-nb-gray-900"],
-      "gray-ghost": ["hover:bg-nb-gray-800 cursor-pointer"],
-      green: ["hover:bg-green-950/50"],
-      netbird: ["hover:bg-netbird-950/50"],
+      purple: ["hover:bg-purple-200 dark:hover:bg-purple-950/40"],
+      yellow: ["hover:bg-yellow-200 dark:hover:bg-yellow-950/40"],
+      blueDark: ["hover:bg-sky-200 dark:hover:bg-sky-800"],
+      "blue-darker": ["hover:bg-sky-200 dark:hover:bg-sky-800"],
+      red: ["hover:bg-red-200 dark:hover:bg-red-950/40"],
+      /* Light mode hovers bg-neutral-100 to match Button's secondary variant —
+         white-based chips and buttons sit side by side in table rows. */
+      gray: ["hover:bg-neutral-100 dark:hover:bg-nb-gray-900"],
+      lightGray: ["hover:bg-neutral-100 dark:hover:bg-nb-gray-900"],
+      grayer: ["hover:bg-neutral-100 dark:hover:bg-nb-gray-900"],
+      "gray-ghost": [
+        "hover:bg-neutral-100 dark:hover:bg-nb-gray-800 cursor-pointer",
+      ],
+      green: ["hover:bg-green-200 dark:hover:bg-green-950/50"],
+      netbird: ["hover:bg-netbird-200 dark:hover:bg-netbird-950/50"],
     },
   },
 });
diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index 143a2b7cb..a83bc8c54 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -24,65 +24,65 @@ export const buttonVariants = cva(
     variants: {
       variant: {
         default: [
-          "bg-white hover:text-black focus:ring-zinc-200/50  hover:bg-gray-100 border-gray-200 text-gray-900",
+          "bg-white hover:text-black focus:ring-neutral-200/50  hover:bg-neutral-100 border-nb-gray-700 text-neutral-900",
           "dark:focus:ring-zinc-800/50 dark:bg-nb-gray dark:text-gray-400 dark:border-gray-700/30 dark:hover:text-white dark:hover:bg-zinc-800/50",
         ],
         primary: [
+          "border-transparent",
           "dark:focus:ring-netbird-600/50 dark:ring-offset-neutral-950/50 enabled:dark:bg-netbird disabled:dark:bg-nb-gray-910 dark:text-gray-100 enabled:dark:hover:text-white enabled:dark:hover:bg-netbird-500/80",
           "enabled:bg-netbird enabled:text-white enabled:focus:ring-netbird-400/50 enabled:hover:bg-netbird-500",
         ],
         secondary: [
-          "bg-white hover:text-black focus:ring-zinc-200/50 hover:bg-gray-100 border-gray-200 text-gray-900",
+          "bg-white hover:text-black focus:ring-neutral-200/50 hover:bg-neutral-100 border-nb-gray-700 text-neutral-900",
           "dark:ring-offset-neutral-950/50 dark:focus:ring-neutral-500/20  ",
           "dark:bg-nb-gray-920 dark:text-gray-400 dark:border-gray-700/40 dark:hover:text-white dark:hover:bg-nb-gray-910",
         ],
         secondaryLighter: [
-          "bg-white hover:text-black focus:ring-zinc-200/50 hover:bg-gray-100 border-gray-200 text-gray-900",
+          "bg-white hover:text-black focus:ring-neutral-200/50 hover:bg-neutral-100 border-nb-gray-700 text-neutral-900",
           "dark:ring-offset-neutral-950/50 dark:focus:ring-neutral-500/20  ",
           "dark:bg-nb-gray-900/70 dark:text-gray-400 dark:border-gray-700/70 dark:hover:text-white dark:hover:bg-nb-gray-800/60",
         ],
         input: [
-          "bg-white hover:text-black focus:ring-zinc-200/50 hover:bg-gray-100 border-neutral-200 text-gray-900",
+          "bg-white hover:text-black focus:ring-neutral-200/50 hover:bg-neutral-100 border-nb-gray-700 text-neutral-900",
           "dark:ring-offset-neutral-950/50 dark:focus:ring-neutral-500/20  ",
           "dark:bg-nb-gray-900  dark:text-gray-400  dark:border-nb-gray-700 dark:hover:bg-nb-gray-900/80",
         ],
         dropdown: [
-          "bg-white hover:text-black focus:ring-zinc-200/50 hover:bg-gray-100 border-neutral-200 text-gray-900",
+          "bg-white hover:text-black focus:ring-neutral-200/50 hover:bg-neutral-100 border-nb-gray-700 text-neutral-900",
           "dark:ring-offset-neutral-950/50 dark:focus:ring-neutral-500/20  ",
           "dark:bg-nb-gray-900/40 dark:text-gray-400 dark:border-nb-gray-900 dark:hover:bg-nb-gray-900/50",
         ],
         dotted: [
-          "bg-white hover:text-black focus:ring-zinc-200/50 hover:bg-gray-100 border-gray-200 text-gray-900 border-dashed",
+          "bg-white hover:text-black focus:ring-neutral-200/50 hover:bg-neutral-100 border-nb-gray-700 text-neutral-900 border-dashed",
           "dark:ring-offset-neutral-950/50 dark:focus:ring-neutral-500/20  ",
           "dark:bg-nb-gray-900/30 dark:text-gray-400 dark:border-gray-500/40 dark:hover:text-white dark:hover:bg-nb-gray-900/50",
         ],
         tertiary: [
-          "bg-white hover:text-black focus:ring-zinc-200/50  hover:bg-gray-100 border-gray-200 text-gray-900",
+          "bg-white hover:text-black focus:ring-neutral-200/50  hover:bg-neutral-100 border-nb-gray-700 text-neutral-900",
           "dark:focus:ring-zinc-800/50 dark:bg-white dark:text-gray-800 dark:border-gray-700/40 dark:hover:bg-neutral-200 disabled:dark:bg-nb-gray-920 disabled:dark:text-nb-gray-300",
         ],
         white: [
-          "focus:ring-white/50 bg-white text-gray-800 border-white outline-none hover:bg-neutral-200 disabled:dark:bg-nb-gray-920 disabled:dark:text-nb-gray-300",
+          "focus:ring-white/50 bg-white text-neutral-800 border-white outline-none hover:bg-neutral-200 disabled:dark:bg-nb-gray-920 disabled:dark:text-nb-gray-300",
           "disabled:dark:bg-nb-gray-900 disabled:dark:text-nb-gray-300 disabled:dark:border-nb-gray-900",
         ],
         outline: [
-          "bg-white hover:text-black focus:ring-zinc-200/50  hover:bg-gray-100 border-gray-200 text-gray-900",
+          "bg-white hover:text-black focus:ring-neutral-200/50  hover:bg-neutral-100 border-nb-gray-700 text-neutral-900",
           "dark:focus:ring-zinc-800/50 dark:bg-transparent dark:text-netbird dark:border-netbird dark:hover:bg-nb-gray-900/30",
         ],
         "danger-outline": [
-          "", // TODO - add danger button styles for light mode
-          "enabled:dark:focus:ring-red-800/20 enabled:dark:focus:bg-red-950/40 enabled:hover:dark:bg-red-950/50 enabled:dark:hover:border-red-800/50 dark:bg-transparent dark:text-red-500",
-          "",
+          "bg-transparent text-red-600 border-red-300 hover:bg-red-50 hover:border-red-400 focus:ring-red-500/30",
+          "enabled:dark:focus:ring-red-800/20 enabled:dark:focus:bg-red-950/40 enabled:hover:dark:bg-red-950/50 enabled:dark:hover:border-red-800/50 dark:bg-transparent dark:text-red-500 dark:border-transparent",
         ],
         "danger-text": [
-          "dark:bg-transparent dark:text-red-500 dark:hover:text-red-600 dark:border-transparent !px-0 !shadow-none !py-0 focus:ring-red-500/30 dark:ring-offset-neutral-950/50 rounded-sm",
+          "bg-transparent text-red-600 hover:text-red-700 dark:text-red-500 dark:hover:text-red-600 border-transparent !px-0 !shadow-none !py-0 focus:ring-red-500/30 ring-offset-nb-gray-950/50 rounded-sm",
         ],
         "default-outline": [
-          "dark:ring-offset-nb-gray-950/50 dark:focus:ring-nb-gray-500/20",
-          "dark:bg-transparent dark:text-nb-gray-400 dark:border-transparent dark:hover:text-white dark:hover:bg-nb-gray-900/30 dark:hover:border-nb-gray-800/50",
-          "data-[state=open]:dark:text-white data-[state=open]:dark:bg-nb-gray-900/30 data-[state=open]:dark:border-nb-gray-800/50",
+          "ring-offset-nb-gray-950/50 focus:ring-nb-gray-500/20",
+          "bg-transparent text-nb-gray-400 border-transparent hover:text-nb-gray-50 hover:bg-nb-gray-900/30 hover:border-nb-gray-800/50",
+          "data-[state=open]:text-nb-gray-50 data-[state=open]:bg-nb-gray-900/30 data-[state=open]:border-nb-gray-800/50",
         ],
         danger: [
-          "", // TODO - add danger button styles for light mode
+          "enabled:bg-red-600 enabled:text-white enabled:hover:bg-red-700 enabled:focus:bg-red-700 enabled:focus:ring-red-400/50 border-red-600 disabled:bg-red-300 disabled:text-white",
           "dark:focus:ring-red-700/20 dark:focus:bg-red-700 hover:dark:bg-red-700 dark:hover:border-red-800/50 dark:bg-red-600 dark:text-red-100",
         ],
       },
@@ -98,8 +98,11 @@ export const buttonVariants = cva(
         false: "",
       },
       border: {
-        0: "border",
-        1: "border border-transparent",
+        0: "border-0",
+        /* No border-transparent here: it compiles after the variants' border
+           colors and would override them, leaving light mode outline-less.
+           Variants without a border color set border-transparent themselves. */
+        1: "border",
         2: "border border-t-0 border-b-0",
       },
     },
diff --git a/src/components/Callout.tsx b/src/components/Callout.tsx
index e5a327585..801999d6d 100644
--- a/src/components/Callout.tsx
+++ b/src/components/Callout.tsx
@@ -20,10 +20,12 @@ export const calloutVariants = cva(
     variants: {
       variant: {
         default: "bg-nb-gray-900/60 border-nb-gray-800/80 text-nb-gray-300",
-        warning: "bg-netbird-500/10 border-netbird-400/20 text-netbird-150",
-        info: "bg-sky-400/10 border-sky-400/20 text-sky-100",
-        success: "bg-green-400/15 border-green-400/20 text-green-100",
-        error: "bg-red-500/10 border-red-400/20 text-red-100",
+        warning:
+          "bg-netbird-500/10 border-netbird-400/20 text-netbird-700 dark:text-netbird-150",
+        info: "bg-sky-400/10 border-sky-400/20 text-sky-700 dark:text-sky-100",
+        success:
+          "bg-green-400/15 border-green-400/20 text-green-700 dark:text-green-100",
+        error: "bg-red-500/10 border-red-400/20 text-red-700 dark:text-red-100",
       },
     },
   },
diff --git a/src/components/Checkbox.tsx b/src/components/Checkbox.tsx
index 02bf7745c..63dd729b9 100644
--- a/src/components/Checkbox.tsx
+++ b/src/components/Checkbox.tsx
@@ -35,12 +35,12 @@ const Checkbox = React.forwardRef<
       ref={ref}
       className={cn(
         variants({ variant }),
-        "border-neutral-900",
+        "border-nb-gray-700",
         "peer h-5 w-5 shrink-0 rounded-[4px] border",
         "ring-offset-white focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-950 focus-visible:ring-offset-2",
-        "disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-neutral-900 data-[state=checked]:text-neutral-50 ",
+        "disabled:cursor-not-allowed disabled:opacity-50 data-[state=checked]:bg-netbird data-[state=checked]:border-netbird data-[state=checked]:text-neutral-50 ",
         "disabled:data-[state=unchecked]:border-dashed dark:disabled:data-[state=unchecked]:border-nb-gray-700",
-        "data-[state=indeterminate]:bg-neutral-900 data-[state=indeterminate]:text-neutral-50",
+        "data-[state=indeterminate]:bg-netbird data-[state=indeterminate]:border-netbird data-[state=indeterminate]:text-neutral-50",
         className,
       )}
       {...props}
diff --git a/src/components/Code.tsx b/src/components/Code.tsx
index ff7c928d1..8fb8292aa 100644
--- a/src/components/Code.tsx
+++ b/src/components/Code.tsx
@@ -44,7 +44,7 @@ export default function Code({
             : "bg-gray-50  border-neutral-200 dark:border-nb-gray-700 hover:dark:bg-nb-gray-900/80 dark:bg-nb-gray-900",
           dark
             ? "text-nb-gray-300 hover:text-nb-gray-300"
-            : "dark:text-nb-gray-200 hover:dark:text-nb-gray-200",
+            : "text-nb-gray-200 hover:text-nb-gray-200",
           "overflow-x-auto relative z-0 w-full",
           className,
         )}
diff --git a/src/components/Command.tsx b/src/components/Command.tsx
index 7c353ea81..dd6669554 100644
--- a/src/components/Command.tsx
+++ b/src/components/Command.tsx
@@ -117,7 +117,7 @@ const CommandItem = React.forwardRef<
     ref={ref}
     className={cn(
       "text-xs flex justify-between py-2 px-3 cursor-pointer items-center rounded-md",
-      "bg-transparent dark:aria-selected:bg-nb-gray-910 group/command-item",
+      "bg-transparent aria-selected:bg-nb-gray-910 group/command-item",
       className,
     )}
     {...props}
diff --git a/src/components/DatePickerWithRange.tsx b/src/components/DatePickerWithRange.tsx
index 794d761b6..e7ab72abf 100644
--- a/src/components/DatePickerWithRange.tsx
+++ b/src/components/DatePickerWithRange.tsx
@@ -220,7 +220,7 @@ function CalendarButton({
       className={cn(
         "py-1.5 leading-none px-2.5 rounded-md text-center text-xs transition-all flex gap-2",
         active
-          ? "bg-nb-gray-800 text-white"
+          ? "bg-nb-gray-800 text-nb-gray-100"
           : "bg-transparent text-nb-gray-300 hover:bg-nb-gray-900 hover:text-nb-gray-100",
       )}
       onClick={onClick}
diff --git a/src/components/DropdownMenu.tsx b/src/components/DropdownMenu.tsx
index 5fa0a8200..51f659194 100644
--- a/src/components/DropdownMenu.tsx
+++ b/src/components/DropdownMenu.tsx
@@ -83,7 +83,7 @@ const menuItemVariants = cva("", {
       default:
         "dark:focus:bg-nb-gray-900 dark:focus:text-gray-50 dark:text-nb-gray-300 dark:data-[state=open]:bg-nb-gray-900 dark:data-[state=open]:text-gray-50",
       danger:
-        "dark:focus:bg-red-900/20 dark:focus:text-red-500 dark:text-red-500",
+        "text-red-600 focus:bg-red-50 focus:text-red-600 dark:text-red-500 dark:focus:bg-red-900/20 dark:focus:text-red-500",
     },
   },
 });
diff --git a/src/components/FullTooltip.tsx b/src/components/FullTooltip.tsx
index c67d81b4d..5799dd79e 100644
--- a/src/components/FullTooltip.tsx
+++ b/src/components/FullTooltip.tsx
@@ -74,7 +74,7 @@ export default function FullTooltip({
               <div
                 className={cn(
                   isAction ? "cursor-pointer" : "cursor-default",
-                  "inline-flex items-center gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 py-2 px-3 rounded-md",
+                  "inline-flex items-center gap-2 text-nb-gray-300 hover:text-nb-gray-100 transition-all hover:bg-nb-gray-800/60 py-2 px-3 rounded-md",
                   className,
                 )}
               >
@@ -95,7 +95,7 @@ export default function FullTooltip({
             align={align}
             side={side}
           >
-            <div className={"text-neutral-300 flex flex-col gap-1"}>
+            <div className={"text-nb-gray-300 flex flex-col gap-1"}>
               {content}
             </div>
           </TooltipContent>
diff --git a/src/components/HelpText.tsx b/src/components/HelpText.tsx
index 87555949a..b6737f5d1 100644
--- a/src/components/HelpText.tsx
+++ b/src/components/HelpText.tsx
@@ -14,7 +14,7 @@ export default function HelpText({
   return (
     <span
       className={cn(
-        "text-[.8rem] dark:text-nb-gray-300 block font-light tracking-wide",
+        "text-[.8rem] text-nb-gray-300 block font-light tracking-wide",
         margin && "mb-2",
         className,
       )}
diff --git a/src/components/InlineLink.tsx b/src/components/InlineLink.tsx
index 1b8373816..4af8afe50 100644
--- a/src/components/InlineLink.tsx
+++ b/src/components/InlineLink.tsx
@@ -26,9 +26,9 @@ export const linkVariants = cva(
       variant: {
         default: "text-netbird hover:underline font-normal",
         faded: "text-nb-gray-400 hover:text-nb-gray-300 hover:underline",
-        white: "text-nb-gray-100 hover:text-white hover:underline",
+        white: "text-nb-gray-100 hover:text-nb-gray-100 hover:underline",
         dashed:
-          "text-nb-gray-100/90 underline font-normal decoration-dashed hover:text-white",
+          "text-nb-gray-100/90 underline font-normal decoration-dashed hover:text-nb-gray-100",
       },
     },
   },
diff --git a/src/components/Input.tsx b/src/components/Input.tsx
index 142bb7aa5..d5fa4de6c 100644
--- a/src/components/Input.tsx
+++ b/src/components/Input.tsx
@@ -26,7 +26,7 @@ const inputVariants = cva("", {
   variants: {
     variant: {
       default: [
-        "dark:bg-nb-gray-900 dark:placeholder:text-neutral-400/70 placeholder:text-neutral-500 border-neutral-200 dark:border-nb-gray-700",
+        "dark:bg-nb-gray-900 dark:placeholder:text-neutral-400/70 placeholder:text-neutral-500 border-neutral-300 dark:border-nb-gray-700",
         "ring-offset-neutral-200/20 dark:ring-offset-neutral-950/50 dark:focus-visible:ring-neutral-500/20 focus-visible:ring-neutral-300/10",
       ],
       darker: [
@@ -34,13 +34,13 @@ const inputVariants = cva("", {
         "ring-offset-neutral-200/20 dark:ring-offset-neutral-950/50 dark:focus-visible:ring-neutral-500/20 focus-visible:ring-neutral-300/10",
       ],
       error: [
-        "dark:bg-nb-gray-900 dark:placeholder:text-neutral-400/70 placeholder:text-neutral-500 border-neutral-200 dark:border-red-500 text-red-500",
+        "dark:bg-nb-gray-900 dark:placeholder:text-neutral-400/70 placeholder:text-neutral-500 border-neutral-300 dark:border-red-500 text-red-500",
         "ring-offset-red-500/10 dark:ring-offset-red-500/10 dark:focus-visible:ring-red-500/10 focus-visible:ring-red-500/10",
       ],
     },
     prefixSuffixVariant: {
       default: [
-        "dark:bg-nb-gray-900 border-neutral-200 dark:border-nb-gray-700 text-nb-gray-300",
+        "dark:bg-nb-gray-900 border-neutral-300 dark:border-nb-gray-700 text-nb-gray-300",
       ],
       error: [
         "dark:bg-nb-gray-900 border-red-500 text-nb-gray-300 text-red-500",
@@ -77,7 +77,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
         <button
           type="button"
           onClick={() => setShowPassword(!showPassword)}
-          className={"hover:text-white transition-all"}
+          className={"hover:text-nb-gray-100 transition-all"}
           aria-label={"Toggle password visibility"}
         >
           {showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
@@ -107,7 +107,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
 
           <div
             className={cn(
-              "absolute left-0 top-0 h-full flex items-center text-xs dark:text-nb-gray-300 pl-3 leading-[0]",
+              "absolute left-0 top-0 h-full flex items-center text-xs text-nb-gray-300 pl-3 leading-[0]",
               props.disabled && "opacity-40",
             )}
           >
@@ -135,7 +135,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
 
           <div
             className={cn(
-              "absolute right-0 top-0 h-full flex items-center text-xs dark:text-nb-gray-300 pr-4 leading-[0] select-none",
+              "absolute right-0 top-0 h-full flex items-center text-xs text-nb-gray-300 pr-4 leading-[0] select-none",
               props.disabled && "opacity-30",
             )}
           >
diff --git a/src/components/Label.tsx b/src/components/Label.tsx
index cac9dc205..5fcc6f78e 100644
--- a/src/components/Label.tsx
+++ b/src/components/Label.tsx
@@ -6,7 +6,7 @@ import { cva, type VariantProps } from "class-variance-authority";
 import * as React from "react";
 
 const labelVariants = cva(
-  "text-sm font-medium tracking-wider leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 mb-1.5 inline-block dark:text-nb-gray-200 flex items-center gap-2",
+  "text-sm font-medium tracking-wider leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 mb-1.5 inline-block text-nb-gray-200 flex items-center gap-2",
 );
 
 type LabelProps = React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root> &
diff --git a/src/components/NetBirdLogo.tsx b/src/components/NetBirdLogo.tsx
index 8e1ac9306..0ac814f5a 100644
--- a/src/components/NetBirdLogo.tsx
+++ b/src/components/NetBirdLogo.tsx
@@ -3,6 +3,7 @@ import Image from "next/image";
 import * as React from "react";
 import NetBirdLogoMark from "@/assets/netbird.svg";
 import NetBirdLogoFull from "@/assets/netbird-full.svg";
+import NetBirdLogoFullLight from "@/assets/netbird-full-light.svg";
 
 type Props = {
   size?: "default" | "large";
@@ -23,18 +24,29 @@ const sizes = {
 export const NetBirdLogo = ({ size = "default", mobile = true }: Props) => {
   return (
     <>
-      <Image
-        src={NetBirdLogoFull}
-        height={sizes[size].desktop}
-        alt={"NetBird Logo"}
-        className={cn(mobile && "hidden md:block")}
-      />
+      {/* Full wordmark — hidden on mobile screens when `mobile` is set.
+          Inner images toggle by theme: dark-text variant in light mode,
+          light-text variant in dark mode. */}
+      <span className={cn("relative", mobile && "hidden md:block")}>
+        <Image
+          src={NetBirdLogoFullLight}
+          height={sizes[size].desktop}
+          alt={"NetBird Logo"}
+          className={"block dark:hidden"}
+        />
+        <Image
+          src={NetBirdLogoFull}
+          height={sizes[size].desktop}
+          alt={"NetBird Logo"}
+          className={"hidden dark:block"}
+        />
+      </span>
       {mobile && (
         <Image
           src={NetBirdLogoMark}
           width={sizes[size].mobile}
           alt={"NetBird Logo"}
-          className={cn(mobile && "md:hidden ml-4")}
+          className={cn("md:hidden ml-4")}
         />
       )}
     </>
diff --git a/src/components/NetworkRouteSelector.tsx b/src/components/NetworkRouteSelector.tsx
index 01cfb0644..3d28fdd12 100644
--- a/src/components/NetworkRouteSelector.tsx
+++ b/src/components/NetworkRouteSelector.tsx
@@ -109,7 +109,7 @@ export function NetworkRouteSelector({
             {value ? (
               <div
                 className={
-                  "flex items-center justify-between text-sm text-white w-full pr-4 pl-1 gap-2"
+                  "flex items-center justify-between text-sm text-nb-gray-100 w-full pr-4 pl-1 gap-2"
                 }
               >
                 <div className={"flex items-center gap-2.5 text-sm"}>
@@ -135,7 +135,7 @@ export function NetworkRouteSelector({
         </button>
       </PopoverTrigger>
       <PopoverContent
-        className="w-full p-0 shadow-sm  shadow-nb-gray-950"
+        className="w-full p-0 shadow-sm  dark:shadow-nb-gray-950"
         style={{
           width: width,
         }}
diff --git a/src/components/Notification.tsx b/src/components/Notification.tsx
index b36541c77..268066552 100644
--- a/src/components/Notification.tsx
+++ b/src/components/Notification.tsx
@@ -197,12 +197,14 @@ export default function Notification<T>({
                 : "success"
             }
             className={classNames(
-              "h-8 w-8  shadow-sm text-white flex items-center justify-center rounded-md shrink-0",
+              "h-8 w-8  shadow-sm flex items-center justify-center rounded-md shrink-0",
               loading
-                ? "bg-nb-gray-900"
+                ? "bg-nb-gray-900 text-nb-gray-100"
                 : error
-                ? "bg-red-500"
-                : backgroundColor || "bg-green-500",
+                ? "bg-red-500 text-white"
+                : backgroundColor
+                ? `${backgroundColor} text-white`
+                : "bg-green-100 text-green-700 dark:bg-green-500 dark:text-white",
             )}
           >
             {loading ? (
diff --git a/src/components/Paragraph.tsx b/src/components/Paragraph.tsx
index aefcdfb7c..e2b699d23 100644
--- a/src/components/Paragraph.tsx
+++ b/src/components/Paragraph.tsx
@@ -9,7 +9,7 @@ export default function Paragraph({ children, className }: Props) {
   return (
     <p
       className={cn(
-        "dark:text-gray-400 text-nb-gray-500 text-base flex flex-wrap gap-x-1.5",
+        "dark:text-gray-400 text-nb-gray-400 text-base flex flex-wrap gap-x-1.5",
         className,
       )}
     >
diff --git a/src/components/PeerGroupSelector.tsx b/src/components/PeerGroupSelector.tsx
index f8417d7c1..e51a4652e 100644
--- a/src/components/PeerGroupSelector.tsx
+++ b/src/components/PeerGroupSelector.tsx
@@ -598,7 +598,7 @@ export function PeerGroupSelector({
         )}
       </PopoverTrigger>
       <PopoverContent
-        className="w-full p-0 shadow-sm shadow-nb-gray-950"
+        className="w-full p-0 shadow-sm dark:shadow-nb-gray-950"
         style={{
           width: popoverWidth === "auto" ? width : popoverWidth,
         }}
diff --git a/src/components/PeerSelector.tsx b/src/components/PeerSelector.tsx
index b8e51fd8f..4689da3b6 100644
--- a/src/components/PeerSelector.tsx
+++ b/src/components/PeerSelector.tsx
@@ -110,7 +110,7 @@ export function PeerSelector({
             {value ? (
               <div
                 className={
-                  "flex items-center justify-between text-sm text-white w-full pr-4 pl-1"
+                  "flex items-center justify-between text-sm text-nb-gray-100 w-full pr-4 pl-1"
                 }
               >
                 <div className={"flex items-center gap-2.5 text-sm"}>
@@ -135,7 +135,7 @@ export function PeerSelector({
       </PopoverTrigger>
       <PopoverContent
         hideWhenDetached={false}
-        className="w-full p-0 shadow-sm shadow-nb-gray-950"
+        className="w-full p-0 shadow-sm dark:shadow-nb-gray-950"
         style={{
           width: width,
         }}
@@ -200,7 +200,7 @@ export function PeerSelector({
                       className={cn(
                         "flex items-center gap-2.5 text-sm",
                         value && value.id == option.id
-                          ? "text-white"
+                          ? "text-nb-gray-100"
                           : "text-nb-gray-300",
                       )}
                     >
@@ -230,7 +230,7 @@ export function PeerSelector({
                       className={cn(
                         "font-medium flex items-center gap-1 font-mono text-[10px]",
                         value && value.id == option.id
-                          ? "text-white"
+                          ? "text-nb-gray-100"
                           : "text-nb-gray-300",
                         !isSupported && "opacity-50",
                       )}
diff --git a/src/components/PinCodeInput.tsx b/src/components/PinCodeInput.tsx
index 436ca4c40..083787325 100644
--- a/src/components/PinCodeInput.tsx
+++ b/src/components/PinCodeInput.tsx
@@ -108,8 +108,8 @@ const PinCodeInput = forwardRef<PinCodeInputRef, Props>(function PinCodeInput(
           disabled={disabled}
           className={cn(
             "w-[42px] h-[42px] text-center text-sm rounded-md",
-            "dark:bg-nb-gray-900 border dark:border-nb-gray-700",
-            "dark:placeholder:text-neutral-400/70",
+            "bg-nb-gray-900 border border-nb-gray-700",
+            "placeholder:text-nb-gray-400/70",
             "focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2",
             "ring-offset-neutral-200/20 dark:ring-offset-neutral-950/50 dark:focus-visible:ring-neutral-500/20",
             "disabled:cursor-not-allowed disabled:opacity-40",
diff --git a/src/components/Popover.tsx b/src/components/Popover.tsx
index f5c251388..08116f36d 100644
--- a/src/components/Popover.tsx
+++ b/src/components/Popover.tsx
@@ -11,11 +11,11 @@ export const popoverVariants = cva([], {
   variants: {
     variant: {
       lighter: [
-        "rounded-md border border-neutral-200 bg-white px-5 py-3 text-sm text-neutral-950 shadow-md",
+        "rounded-md border border-neutral-300 bg-white px-5 py-3 text-sm text-neutral-950 shadow-md",
         "dark:border-nb-gray-800 dark:bg-nb-gray-920 dark:text-neutral-50",
       ],
       dark: [
-        "rounded-md border border-neutral-200 bg-white px-5 py-3 text-sm text-neutral-950 shadow-md",
+        "rounded-md border border-neutral-300 bg-white px-5 py-3 text-sm text-neutral-950 shadow-md",
         "dark:border-nb-gray-900 dark:bg-nb-gray-940 dark:text-gray-50",
       ],
     },
diff --git a/src/components/PortSelector.tsx b/src/components/PortSelector.tsx
index 159c399cd..84d375dba 100644
--- a/src/components/PortSelector.tsx
+++ b/src/components/PortSelector.tsx
@@ -160,7 +160,7 @@ export function PortSelector({
           </button>
         </PopoverTrigger>
         <PopoverContent
-          className="w-full p-0 shadow-sm  shadow-nb-gray-950"
+          className="w-full p-0 shadow-sm  dark:shadow-nb-gray-950"
           style={{
             width: popoverWidth === "auto" ? width : popoverWidth,
           }}
@@ -323,7 +323,7 @@ export function PortSelector({
       {portRanges?.length > 0 && (
         <Callout variant={"info"} className={"mt-4"}>
           Port ranges requires NetBird client{" "}
-          <span className={"text-white font-normal"}>v0.48</span> or higher.
+          <span className={"text-nb-gray-100 font-normal"}>v0.48</span> or higher.
         </Callout>
       )}
     </>
diff --git a/src/components/RadioGroup.tsx b/src/components/RadioGroup.tsx
index 083045f04..115380ee4 100644
--- a/src/components/RadioGroup.tsx
+++ b/src/components/RadioGroup.tsx
@@ -46,9 +46,9 @@ export const RadioGroupItem = ({
           variant === "default" &&
             "text-nb-gray-500 hover:text-nb-gray-400 data-[state=checked]:bg-nb-gray-600 data-[state=checked]:text-nb-gray-100",
           variant === "red" &&
-            "text-nb-gray-500 hover:text-nb-gray-400 data-[state=checked]:bg-red-800 data-[state=checked]:text-red-200",
+            "text-nb-gray-500 hover:text-nb-gray-400 data-[state=checked]:bg-red-100 data-[state=checked]:text-red-700 dark:data-[state=checked]:bg-red-800 dark:data-[state=checked]:text-red-200",
           variant === "green" &&
-            "text-nb-gray-500 hover:text-nb-gray-400 data-[state=checked]:bg-green-800 data-[state=checked]:text-green-200",
+            "text-nb-gray-500 hover:text-nb-gray-400 data-[state=checked]:bg-green-100 data-[state=checked]:text-green-700 dark:data-[state=checked]:bg-green-800 dark:data-[state=checked]:text-green-200",
           "cursor-pointer relative transition-all w-full py-1.5 px-5 rounded-md h-full flex items-center text-sm gap-1 text-center justify-center",
         )}
       >
diff --git a/src/components/Separator.tsx b/src/components/Separator.tsx
index 6daa2c00a..988e801d5 100644
--- a/src/components/Separator.tsx
+++ b/src/components/Separator.tsx
@@ -1,3 +1,3 @@
 export default function Separator() {
-  return <span className={"h-[1px] w-full bg-zinc-700/40 block"}></span>;
+  return <span className={"h-[1px] w-full bg-nb-gray-800/40 block"}></span>;
 }
diff --git a/src/components/SquareIcon.tsx b/src/components/SquareIcon.tsx
index dd3a125ee..4e7fcd725 100644
--- a/src/components/SquareIcon.tsx
+++ b/src/components/SquareIcon.tsx
@@ -7,15 +7,21 @@ const iconVariant = cva(
   {
     variants: {
       color: {
-        netbird: "bg-netbird-950 border-netbird text-netbird",
-        blue: "bg-sky-950 border-sky-500 text-sky-100",
-        "blue-darker": "bg-sky-950 border-sky-500 text-sky-500",
-        red: "bg-red-950 border-red-500 text-red-500",
+        netbird:
+          "bg-netbird-100 border-netbird text-netbird-700 dark:bg-netbird-950 dark:text-netbird",
+        blue: "bg-sky-100 border-sky-500 text-sky-700 dark:bg-sky-950 dark:text-sky-100",
+        "blue-darker":
+          "bg-sky-100 border-sky-500 text-sky-700 dark:bg-sky-950 dark:text-sky-500",
+        red: "bg-red-100 border-red-500 text-red-700 dark:bg-red-950 dark:text-red-500",
         gray: "bg-nb-gray-930 border-nb-gray-800 text-gray-500",
-        green: "bg-green-950 border-green-500 text-green-500",
-        purple: "bg-purple-950 border-purple-500 text-purple-500",
-        indigo: "bg-indigo-950 border-indigo-500 text-indigo-500",
-        yellow: "bg-yellow-950 border-yellow-400 text-yellow-400",
+        green:
+          "bg-green-100 border-green-500 text-green-700 dark:bg-green-950 dark:text-green-500",
+        purple:
+          "bg-purple-100 border-purple-500 text-purple-700 dark:bg-purple-950 dark:text-purple-500",
+        indigo:
+          "bg-indigo-100 border-indigo-500 text-indigo-700 dark:bg-indigo-950 dark:text-indigo-500",
+        yellow:
+          "bg-yellow-100 border-yellow-400 text-yellow-700 dark:bg-yellow-950 dark:text-yellow-400",
       },
       size: {
         small: "w-8 h-8",
diff --git a/src/components/Steps.tsx b/src/components/Steps.tsx
index 5d18afef1..905853bb3 100644
--- a/src/components/Steps.tsx
+++ b/src/components/Steps.tsx
@@ -50,7 +50,7 @@ const Step = ({
       {line && (
         <span
           className={cn(
-            "bg-nb-gray-100 dark:bg-nb-gray-800  z-0 transition-all",
+            "bg-neutral-200 dark:bg-nb-gray-800  z-0 transition-all",
             horizontal
               ? "w-full h-[2px] absolute mt-[16px] transform translate-x-1/2"
               : "h-full w-[2px] absolute left-0 ml-[18px]",
@@ -62,7 +62,7 @@ const Step = ({
         className={cn(
           "h-[34px] w-[34px] shrink-0 rounded-full  flex items-center justify-center font-medium text-xs relative z-0 border-4  transition-all",
           "dark:bg-nb-gray-900 dark:text-nb-gray-400 dark:border-nb-gray dark:group-hover:bg-nb-gray-800",
-          "bg-nb-gray-100 text-nb-gray-400 border-white group-hover:bg-nb-gray-200 step-circle",
+          "bg-neutral-200 text-nb-gray-400 border-white group-hover:bg-neutral-300 step-circle",
           "[.stepper-bg-variant]:border-nb-gray-940",
         )}
       >
diff --git a/src/components/Tabs.tsx b/src/components/Tabs.tsx
index 8a2aefd3e..56f13c1bc 100644
--- a/src/components/Tabs.tsx
+++ b/src/components/Tabs.tsx
@@ -63,7 +63,7 @@ const TabsList = React.forwardRef<
       >
         <span
           className={
-            "absolute left-0 dark:bg-nb-gray-900 bg-nb-gray-100 w-full h-[1px] bottom-0 z-0"
+            "absolute left-0 dark:bg-nb-gray-900 bg-neutral-200 w-full h-[1px] bottom-0 z-0"
           }
         />
         <ScrollArea>
@@ -103,7 +103,7 @@ const TabsTrigger = React.forwardRef<
             "absolute w-full h-[1px] left-0 right-0 bottom-[0px] transition-all",
             currentValue === props.value
               ? "bg-netbird text-netbird"
-              : "dark:bg-nb-gray-900 bg-nb-gray-100 group-hover/trigger:dark:bg-nb-gray-700 group-hover/trigger:bg-nb-gray-200",
+              : "dark:bg-nb-gray-900 bg-neutral-200 group-hover/trigger:dark:bg-nb-gray-700 group-hover/trigger:bg-neutral-300",
           )}
         ></motion.div>
 
diff --git a/src/components/Textarea.tsx b/src/components/Textarea.tsx
index 34ecf7745..942798015 100644
--- a/src/components/Textarea.tsx
+++ b/src/components/Textarea.tsx
@@ -17,11 +17,11 @@ const inputVariants = cva("", {
   variants: {
     variant: {
       default: [
-        "dark:bg-nb-gray-900 dark:placeholder:text-neutral-400/70 placeholder:text-neutral-500 border-neutral-200 dark:border-nb-gray-700",
+        "dark:bg-nb-gray-900 dark:placeholder:text-neutral-400/70 placeholder:text-neutral-500 border-neutral-300 dark:border-nb-gray-700",
         "ring-offset-neutral-200/20 dark:ring-offset-neutral-950/50 dark:focus-visible:ring-neutral-500/20 focus-visible:ring-neutral-300/10",
       ],
       darker: [
-        "dark:bg-nb-gray-900/40 dark:placeholder:text-neutral-400/70 placeholder:text-neutral-500 border-neutral-200 dark:border-nb-gray-900",
+        "dark:bg-nb-gray-900/40 dark:placeholder:text-neutral-400/70 placeholder:text-neutral-500 border-neutral-300 dark:border-nb-gray-900",
         "ring-offset-neutral-200/20 dark:ring-offset-neutral-950/50 dark:focus-visible:ring-neutral-500/20 focus-visible:ring-neutral-300/10",
       ],
       error: [
diff --git a/src/components/ToggleSwitch.tsx b/src/components/ToggleSwitch.tsx
index 526b802b5..b111b7ff1 100644
--- a/src/components/ToggleSwitch.tsx
+++ b/src/components/ToggleSwitch.tsx
@@ -16,7 +16,7 @@ const switchVariants = cva("", {
     variant: {
       default: [
         "dark:data-[state=checked]:bg-netbird dark:data-[state=unchecked]:bg-nb-gray-700",
-        "data-[state=checked]:bg-neutral-900 data-[state=unchecked]:bg-neutral-200",
+        "data-[state=checked]:bg-netbird data-[state=unchecked]:bg-neutral-200",
       ],
       "red-green": [
         "dark:data-[state=checked]:bg-red-600 dark:data-[state=unchecked]:bg-nb-gray-700",
diff --git a/src/components/Tooltip.tsx b/src/components/Tooltip.tsx
index b34b590de..f8525b078 100644
--- a/src/components/Tooltip.tsx
+++ b/src/components/Tooltip.tsx
@@ -23,13 +23,13 @@ export const tooltipVariants = cva(
       variant: {
         default: [
           "bg-nb-gray-940",
-          "text-neutral-50",
-          "border-neutral-200 border-nb-gray-930",
+          "text-nb-gray-50",
+          "border-nb-gray-930",
         ],
         lighter: [
           "bg-nb-gray-920",
-          "text-neutral-50",
-          "border-neutral-200 border-nb-gray-900",
+          "text-nb-gray-50",
+          "border-nb-gray-900",
         ],
       },
     },
diff --git a/src/components/UserSelector.tsx b/src/components/UserSelector.tsx
index 7c762117b..dada740b6 100644
--- a/src/components/UserSelector.tsx
+++ b/src/components/UserSelector.tsx
@@ -106,7 +106,7 @@ export function UserSelector({
       </PopoverTrigger>
       <PopoverContent
         hideWhenDetached={false}
-        className="w-full p-0 shadow-sm shadow-nb-gray-950"
+        className="w-full p-0 shadow-sm dark:shadow-nb-gray-950"
         style={{
           width: width,
         }}
diff --git a/src/components/VerticalTabs.tsx b/src/components/VerticalTabs.tsx
index 600a16892..7346e06ec 100644
--- a/src/components/VerticalTabs.tsx
+++ b/src/components/VerticalTabs.tsx
@@ -51,7 +51,8 @@ function List({ children }: { children: React.ReactNode }) {
     <Tabs.List
       className={cn(
         "px-4 py-4 whitespace-nowrap overflow-y-hidden shrink-0 no-scrollbar",
-        "lg:h-full items-start bg-nb-gray border-b-0 border-nb-gray-930",
+        "lg:h-full items-start bg-nb-gray",
+        "border-b lg:border-b-0 lg:border-r border-nb-gray-800",
         "flex lg:flex-col lg:gap-1",
       )}
       style={{
diff --git a/src/components/modal/Modal.tsx b/src/components/modal/Modal.tsx
index 2634845bf..0ffd8d7d5 100644
--- a/src/components/modal/Modal.tsx
+++ b/src/components/modal/Modal.tsx
@@ -70,7 +70,7 @@ const ModalContent = React.forwardRef<
         <DialogPrimitive.Content
           ref={ref}
           className={cn(
-            "mx-auto relative top-0 z-[52] grid w-full focus:outline-0 border border-neutral-200 bg-white py-6 dark:shadow-lg shadow-sm duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1  data-[state=open]:slide-in-from-left-1 sm:rounded-lg md:w-full dark:border-nb-gray-900 dark:bg-nb-gray",
+            "mx-auto relative top-0 z-[52] grid w-full focus:outline-0 border border-nb-gray-600 dark:border-nb-gray-900 bg-white py-6 dark:shadow-lg shadow-sm duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1  data-[state=open]:slide-in-from-left-1 sm:rounded-lg md:w-full dark:bg-nb-gray",
             className,
             maxWidthClass,
           )}
@@ -135,7 +135,7 @@ const SidebarModalContent = React.forwardRef<
           <DialogPrimitive.Content
             ref={ref}
             className={cn(
-              "ml-auto mt-auto relative bottom-0 z-[52] grid w-full border border-zinc-700/40 bg-white py-6 dark:shadow-lg shadow-sm duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0  data-[state=closed]:slide-out-to-left-1  data-[state=open]:slide-in-from-left-1 md:w-full dark:border-nb-gray-900 dark:bg-nb-gray",
+              "ml-auto mt-auto relative bottom-0 z-[52] grid w-full border border-nb-gray-600 dark:border-nb-gray-900 bg-white py-6 dark:shadow-lg shadow-sm duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0  data-[state=closed]:slide-out-to-left-1  data-[state=open]:slide-in-from-left-1 md:w-full dark:bg-nb-gray",
               "border-t-0 border-r-0 border-b-0 shadow-2xl",
               className,
               maxWidthClass,
@@ -179,8 +179,11 @@ const ModalFooter = ({
 }: React.HTMLAttributes<HTMLDivElement> & ModalFooterProps) => (
   <div
     className={cn(
-      "dark:border-nb-gray-800/70 border-nb-gray-100",
+      "dark:border-nb-gray-800/70 border-nb-gray-800",
       separator && "border-t",
+      // Tinted footer (light mode only): bleed over the modal's bottom
+      // padding so the band reaches the rounded bottom edge.
+      "bg-nb-gray dark:bg-transparent -mb-6 pb-6 sm:rounded-b-lg",
     )}
   >
     <div
diff --git a/src/components/select/SelectDropdown.tsx b/src/components/select/SelectDropdown.tsx
index 944b84dd7..8978b39ee 100644
--- a/src/components/select/SelectDropdown.tsx
+++ b/src/components/select/SelectDropdown.tsx
@@ -230,7 +230,7 @@ export function SelectDropdown({
       </PopoverTrigger>
       <PopoverContent
         className={cn(
-          "p-0 shadow-sm shadow-nb-gray-950 focus:outline-none",
+          "p-0 shadow-sm dark:shadow-nb-gray-950 focus:outline-none",
           popoverWidth !== "content" && "w-full",
         )}
         style={{
diff --git a/src/components/table/DataTableFilter.tsx b/src/components/table/DataTableFilter.tsx
index 856f43538..92acea4cd 100644
--- a/src/components/table/DataTableFilter.tsx
+++ b/src/components/table/DataTableFilter.tsx
@@ -188,7 +188,7 @@ export function DataTableFilter<TData>({
         <Button variant={"secondary"} disabled={disabled}>
           <FilterIcon size={15} className={"shrink-0"} />
           <span>
-            <span className={"text-white"}>
+            <span className={"text-nb-gray-100"}>
               {activeFiltersCount > 0 && activeFiltersCount}
             </span>
             {activeFiltersCount > 0 ? ` Filter(s)` : "Filter"}
@@ -197,7 +197,7 @@ export function DataTableFilter<TData>({
       </PopoverTrigger>
       <PopoverContent
         hideWhenDetached={false}
-        className="w-full p-0 shadow-sm shadow-nb-gray-950"
+        className="w-full p-0 shadow-sm dark:shadow-nb-gray-950"
         style={{
           width: "400px",
         }}
diff --git a/src/components/table/DataTableHeader.tsx b/src/components/table/DataTableHeader.tsx
index 91aeb876a..799db310e 100644
--- a/src/components/table/DataTableHeader.tsx
+++ b/src/components/table/DataTableHeader.tsx
@@ -47,9 +47,9 @@ export default function DataTableHeader({
       <div
         onClick={sorting ? handleSort : undefined}
         className={cn(
-          "flex items-center whitespace-nowrap gap-2 dark:text-gray-400 transition-all select-none text-xs tracking-wide",
+          "flex items-center whitespace-nowrap gap-2 dark:text-gray-400 text-gray-500 transition-all select-none text-xs tracking-wide",
           sorting &&
-            "cursor-pointer dark:hover:text-gray-300 hover:text-nb-gray",
+            "cursor-pointer dark:hover:text-gray-300 hover:text-nb-gray-100",
           center && "justify-center w-full",
           className,
         )}
diff --git a/src/components/table/DataTableMultiSelectPopup.tsx b/src/components/table/DataTableMultiSelectPopup.tsx
index 0575f0005..ad4854f53 100644
--- a/src/components/table/DataTableMultiSelectPopup.tsx
+++ b/src/components/table/DataTableMultiSelectPopup.tsx
@@ -60,7 +60,7 @@ export function DataTableMultiSelectPopup<T>({
                         <MonitorSmartphoneIcon size={16} className={""} />
                       )}
                       <span>
-                        <span className={"font-medium text-white"}>
+                        <span className={"font-medium text-nb-gray-100"}>
                           {count}
                         </span>{" "}
                         {label}
diff --git a/src/components/table/DataTablePagination.tsx b/src/components/table/DataTablePagination.tsx
index 31ae4e57a..733a983d6 100644
--- a/src/components/table/DataTablePagination.tsx
+++ b/src/components/table/DataTablePagination.tsx
@@ -40,10 +40,10 @@ export function DataTablePagination<TData>({
       >
         <div className="text-nb-gray-400">
           Showing{" "}
-          <span className={"font-medium text-white"}>
+          <span className={"font-medium text-nb-gray-100"}>
             {showingFrom} to {showingTo}
           </span>{" "}
-          of <span className={"font-medium text-white"}>{totalRows}</span>{" "}
+          of <span className={"font-medium text-nb-gray-100"}>{totalRows}</span>{" "}
           {text}
         </div>
         {pageCount > 1 && (
diff --git a/src/components/table/DataTableRefreshButton.tsx b/src/components/table/DataTableRefreshButton.tsx
index 18d5256ab..27b527453 100644
--- a/src/components/table/DataTableRefreshButton.tsx
+++ b/src/components/table/DataTableRefreshButton.tsx
@@ -56,7 +56,7 @@ export default function DataTableRefreshButton({ onClick, isDisabled }: Props) {
           if (hovered) event.preventDefault();
         }}
       >
-        <span className={"text-xs text-neutral-300"}>
+        <span className={"text-xs text-nb-gray-300"}>
           {disabled ? "You can refresh it again in 5 seconds" : "Refresh"}
         </span>
       </TooltipContent>
diff --git a/src/components/table/DataTableResetFilterButton.tsx b/src/components/table/DataTableResetFilterButton.tsx
index 339beec07..cc9f1dd09 100644
--- a/src/components/table/DataTableResetFilterButton.tsx
+++ b/src/components/table/DataTableResetFilterButton.tsx
@@ -52,7 +52,7 @@ export default function DataTableResetFilterButton<TData>({
             if (hovered) event.preventDefault();
           }}
         >
-          <span className={"text-xs text-neutral-300"}>
+          <span className={"text-xs text-nb-gray-300"}>
             Reset Filters & Search
           </span>
         </TooltipContent>
diff --git a/src/components/table/DataTableRowsPerPage.tsx b/src/components/table/DataTableRowsPerPage.tsx
index 1dfaed257..c2d3566fc 100644
--- a/src/components/table/DataTableRowsPerPage.tsx
+++ b/src/components/table/DataTableRowsPerPage.tsx
@@ -33,7 +33,7 @@ export function DataTableRowsPerPage<TData>({
           >
             <RowsIcon size={15} className={"text-nb-gray-300 shrink-0"} />
             <div>
-              <span className={"text-white"}>
+              <span className={"text-nb-gray-100"}>
                 {table.getState().pagination.pageSize}
               </span>
               <span className={"text-nb-gray-300"}> rows per page</span>
@@ -57,16 +57,16 @@ export function DataTableRowsPerPage<TData>({
                   <div
                     className={cn(
                       "cursor-pointer",
-                      "flex gap-2 px-2 py-1.5 my-1 mx-1 rounded-md items-center hover:dark:bg-nb-gray-800 text-nb-gray-400 hover:text-white",
+                      "flex gap-2 px-2 py-1.5 my-1 mx-1 rounded-md items-center hover:bg-gray-100 dark:hover:bg-nb-gray-800 text-nb-gray-400 hover:text-nb-gray-100",
                       table.getState().pagination.pageSize === val
-                        ? "text-white"
+                        ? "text-nb-gray-100"
                         : "",
                     )}
                   >
                     <Check
                       size={15}
                       className={cn(
-                        "text-white shrink-0",
+                        "text-nb-gray-100 shrink-0",
                         table.getState().pagination.pageSize === val
                           ? "opacity-100"
                           : "opacity-0",
diff --git a/src/components/table/Table.tsx b/src/components/table/Table.tsx
index ac0b0cb3e..c84c88f1a 100644
--- a/src/components/table/Table.tsx
+++ b/src/components/table/Table.tsx
@@ -104,7 +104,7 @@ const TableRow = React.forwardRef<
       " transition-colors group/table-row data-[state=selected]:bg-neutral-100 dark:data-[state=selected]:bg-nb-gray-930/70",
       "dark:data-[state=selected]:border-nb-gray-900",
       minimal
-        ? "dark:hover:bg-nb-gray-910/[15%]"
+        ? "hover:bg-nb-gray-910/[15%]"
         : "border-b dark:border-zinc-700/40 dark:hover:bg-nb-gray-940 hover:bg-neutral-100/50",
       className,
     )}
@@ -128,7 +128,7 @@ const TableHead = React.forwardRef<
       "h-12 px-4 text-left align-middle uppercase font-medium  [&:has([role=checkbox])]:pr-0 w-auto",
       minimal
         ? "px-6"
-        : "text-neutral-500 dark:text-nb-gray-400 dark:bg-nb-gray-900",
+        : "text-nb-gray-500 dark:text-nb-gray-400 bg-nb-gray-900",
       inset && "first:pl-[52px]",
       className,
     )}
diff --git a/src/components/table/TableFilters.tsx b/src/components/table/TableFilters.tsx
index 8548f432e..b0a77aee0 100644
--- a/src/components/table/TableFilters.tsx
+++ b/src/components/table/TableFilters.tsx
@@ -66,6 +66,7 @@ export function TableFiltersButton<TData>({
         <Button
           variant={"secondary"}
           disabled={disabled}
+          border={0}
           data-testid={"table-filters-button"}
         >
           <FilterIcon size={16} className={"shrink-0"} />
@@ -85,7 +86,7 @@ export function TableFiltersButton<TData>({
         </Button>
       </PopoverTrigger>
       <PopoverContent
-        className={"w-[280px] p-0 shadow-sm shadow-nb-gray-950"}
+        className={"w-[280px] p-0 shadow-sm dark:shadow-nb-gray-950"}
         align={"start"}
         sideOffset={7}
       >
@@ -99,7 +100,7 @@ export function TableFiltersButton<TData>({
               <button
                 aria-label={"Back"}
                 className={
-                  "flex items-center justify-center w-7 h-7 -ml-1 shrink-0 text-nb-gray-400 hover:text-white hover:bg-nb-gray-900 rounded transition-colors"
+                  "flex items-center justify-center w-7 h-7 -ml-1 shrink-0 text-nb-gray-400 hover:text-nb-gray-100 hover:bg-nb-gray-900 rounded transition-colors"
                 }
                 onClick={() => setActiveFilterId(null)}
               >
@@ -210,8 +211,8 @@ function FilterChip<TData>({ def, text, table }: FilterChipProps<TData>) {
     <Popover open={open} onOpenChange={setOpen}>
       <div
         className={cn(
-          "flex items-stretch h-8 rounded-md border border-nb-gray-900",
-          "bg-nb-gray-930/40 text-sm text-nb-gray-200 overflow-hidden",
+          "flex items-stretch h-8 rounded-md border border-nb-gray-800 dark:border-nb-gray-900",
+          "bg-white dark:bg-nb-gray-930/40 text-sm text-nb-gray-200 overflow-hidden",
           "hover:border-nb-gray-700 transition-colors",
         )}
       >
@@ -230,8 +231,8 @@ function FilterChip<TData>({ def, text, table }: FilterChipProps<TData>) {
           aria-label={`Remove ${def.label} filter`}
           className={cn(
             "flex items-center justify-center px-2",
-            "border-l border-nb-gray-900",
-            "text-nb-gray-400 hover:bg-nb-gray-900 hover:text-white transition-colors",
+            "border-l border-nb-gray-800 dark:border-nb-gray-900",
+            "text-nb-gray-400 hover:bg-nb-gray-900 hover:text-nb-gray-100 transition-colors",
           )}
           onClick={(e) => {
             e.stopPropagation();
@@ -243,7 +244,7 @@ function FilterChip<TData>({ def, text, table }: FilterChipProps<TData>) {
         </button>
       </div>
       <PopoverContent
-        className={"w-[280px] p-0 shadow-sm shadow-nb-gray-950"}
+        className={"w-[280px] p-0 shadow-sm dark:shadow-nb-gray-950"}
         align={"start"}
         sideOffset={6}
       >
diff --git a/src/components/table/filters/CheckboxListPicker.tsx b/src/components/table/filters/CheckboxListPicker.tsx
index 44717a3eb..e488ea666 100644
--- a/src/components/table/filters/CheckboxListPicker.tsx
+++ b/src/components/table/filters/CheckboxListPicker.tsx
@@ -45,8 +45,8 @@ export function CheckboxListPicker<V extends string | number>({
             tabIndex={0}
             className={cn(
               "flex items-center gap-2.5 px-2 py-1.5 rounded text-sm transition-colors cursor-pointer",
-              "text-nb-gray-300 hover:bg-nb-gray-900 hover:text-white",
-              isSelected && "text-white",
+              "text-nb-gray-300 hover:bg-nb-gray-900 hover:text-nb-gray-100",
+              isSelected && "text-nb-gray-100",
             )}
             onClick={() => toggle(option.value)}
             onKeyDown={(e) => {
diff --git a/src/components/table/filters/RadioPicker.tsx b/src/components/table/filters/RadioPicker.tsx
index dc40573ce..22a4bd33b 100644
--- a/src/components/table/filters/RadioPicker.tsx
+++ b/src/components/table/filters/RadioPicker.tsx
@@ -33,13 +33,14 @@ export function RadioPicker<V>({
         return (
           <button
             key={option.label}
+            type={"button"}
             data-testid={`radio-option-${option.label
               .replace(/\s+/g, "-")
               .toLowerCase()}`}
             className={cn(
               "flex items-center gap-2.5 px-2 py-1.5 rounded text-sm transition-colors",
-              "text-nb-gray-300 hover:bg-nb-gray-900 hover:text-white",
-              selected && "text-white",
+              "text-nb-gray-300 hover:bg-nb-gray-900 hover:text-nb-gray-100",
+              selected && "text-nb-gray-100",
             )}
             onClick={() => {
               onChange(option.value);
@@ -49,7 +50,7 @@ export function RadioPicker<V>({
             <CheckIcon
               size={14}
               className={cn(
-                "shrink-0 text-white",
+                "shrink-0 text-nb-gray-100",
                 selected ? "opacity-100" : "opacity-0",
               )}
             />
diff --git a/src/components/table/filters/StatusPicker.tsx b/src/components/table/filters/StatusPicker.tsx
index bb859fad4..a79a8cdff 100644
--- a/src/components/table/filters/StatusPicker.tsx
+++ b/src/components/table/filters/StatusPicker.tsx
@@ -34,10 +34,11 @@ export function StatusPicker({ value, onChange, close }: Props) {
         return (
           <button
             key={option.label}
+            type={"button"}
             className={cn(
               "flex items-center gap-2.5 px-2 py-1.5 rounded text-sm transition-colors",
-              "text-nb-gray-300 hover:bg-nb-gray-900 hover:text-white",
-              selected && "text-white",
+              "text-nb-gray-300 hover:bg-nb-gray-900 hover:text-nb-gray-100",
+              selected && "text-nb-gray-100",
             )}
             onClick={() => {
               onChange(option.value);
@@ -47,7 +48,7 @@ export function StatusPicker({ value, onChange, close }: Props) {
             <CheckIcon
               size={14}
               className={cn(
-                "shrink-0 text-white",
+                "shrink-0 text-nb-gray-100",
                 selected ? "opacity-100" : "opacity-0",
               )}
             />
diff --git a/src/components/ui/AnnouncementBanner.tsx b/src/components/ui/AnnouncementBanner.tsx
index 3fca3fbc8..40a42ca6d 100644
--- a/src/components/ui/AnnouncementBanner.tsx
+++ b/src/components/ui/AnnouncementBanner.tsx
@@ -11,23 +11,26 @@ const variants = cva(
     variants: {
       variant: {
         default:
-          "bg-nb-gray-900/50 border-nb-gray-800/30 border-b text-nb-gray-200",
+          "bg-neutral-100 border-neutral-200 text-neutral-700 dark:bg-nb-gray-900/50 dark:border-nb-gray-800/30 dark:text-nb-gray-200 border-b",
         important:
-          "from-netbird to-netbird-400 bg-gradient-to-b text-black font-normal",
+          "bg-netbird-100 text-neutral-800 font-normal dark:bg-gradient-to-b dark:from-netbird dark:to-netbird-400 dark:text-black",
       },
       tagBadge: {
-        default: "bg-nb-gray-200/10 text-nb-gray-100 font-medium",
-        important: "bg-nb-gray-900 text-nb-gray-200 font-medium",
+        default:
+          "bg-neutral-200 text-neutral-700 dark:bg-nb-gray-200/10 dark:text-nb-gray-100 font-medium",
+        important:
+          "bg-neutral-700 text-neutral-50 font-medium dark:bg-nb-gray-900 dark:text-nb-gray-200",
       },
       closeButton: {
         default:
-          "bg-nb-gray-900 rounded-md p-1 text-nb-gray-300 hover:bg-nb-gray-800",
+          "bg-neutral-200 text-neutral-600 hover:bg-neutral-300 dark:bg-nb-gray-900 dark:text-nb-gray-300 dark:hover:bg-nb-gray-800 rounded-md p-1",
         important:
-          "bg-netbird rounded-md p-1 text-nb-gray-900 hover:bg-nb-gray-900 hover:text-nb-gray-200",
+          "rounded-md p-1 bg-netbird-300/60 text-netbird-900 hover:bg-netbird-300 dark:bg-netbird dark:text-black dark:hover:bg-nb-gray-900 dark:hover:text-nb-gray-200",
       },
       inlineLink: {
-        default: "text-nb-blue-400 hover:underline",
-        important: "!text-black underline hover:opacity-80",
+        default: "text-nb-blue-500 dark:text-nb-blue-400 hover:underline",
+        important:
+          "!text-netbird-900 dark:!text-black underline hover:opacity-80",
       },
     },
   },
diff --git a/src/components/ui/DarkModeToggle.tsx b/src/components/ui/DarkModeToggle.tsx
index 1b2da762b..b4c83713b 100644
--- a/src/components/ui/DarkModeToggle.tsx
+++ b/src/components/ui/DarkModeToggle.tsx
@@ -1,65 +1,52 @@
 "use client";
 
-import Button from "@components/Button";
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from "@components/DropdownMenu";
+import { cn } from "@utils/helpers";
 import { MonitorIcon, MoonIcon, SunIcon } from "lucide-react";
-import { useEffect, useState } from "react";
-import { useTheme } from "@/contexts/ThemeProvider";
+import { type Theme, useTheme } from "@/contexts/ThemeProvider";
 
-export default function DarkModeToggle() {
-  const [mounted, setMounted] = useState(false);
-  const { setTheme } = useTheme();
+const OPTIONS: {
+  value: Theme;
+  label: string;
+  icon: typeof SunIcon;
+}[] = [
+  { value: "light", label: "Light", icon: SunIcon },
+  { value: "dark", label: "Dark", icon: MoonIcon },
+  { value: "system", label: "System", icon: MonitorIcon },
+];
 
-  useEffect(() => {
-    setMounted(true);
-  }, []);
+/* Segmented theme switcher rendered as a footer row inside the
+   profile dropdown. Plain buttons (not DropdownMenuItem) so picking
+   a theme doesn't close the menu. */
+export default function DarkModeToggle() {
+  const { theme, setTheme } = useTheme();
 
-  return mounted ? (
-    <DropdownMenu modal={false}>
-      <DropdownMenuTrigger asChild>
-        <Button className={"!px-3"} variant={"default"}>
-          <div>
-            <SunIcon
-              size={16}
-              className={"scale-100 dark:scale-0 dark:absolute relative"}
-            />
-            <MoonIcon
-              size={16}
-              className={"scale-0 dark:scale-100 absolute dark:relative"}
-            />
-          </div>
-        </Button>
-      </DropdownMenuTrigger>
-      <DropdownMenuContent side={"bottom"} align={"end"}>
-        <DropdownMenuItem
-          onClick={() => setTheme("light")}
-          className={"flex gap-2"}
-          disabled={true}
-        >
-          <SunIcon size={16} />
-          Light
-        </DropdownMenuItem>
-        <DropdownMenuItem
-          onClick={() => setTheme("dark")}
-          className={"flex gap-2"}
-        >
-          <MoonIcon size={16} />
-          Dark
-        </DropdownMenuItem>
-        <DropdownMenuItem
-          disabled={true}
-          onClick={() => setTheme("system")}
-          className={"flex gap-2"}
-        >
-          <MonitorIcon size={16} />
-          System
-        </DropdownMenuItem>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  ) : null;
+  return (
+    <div
+      className={
+        "flex items-center justify-between gap-3 pl-3 pr-2 py-1.5 text-sm"
+      }
+    >
+      <span className={"text-nb-gray-300"}>Theme</span>
+      <div className={"flex items-center gap-1"}>
+        {OPTIONS.map(({ value, label, icon: Icon }) => (
+          <button
+            key={value}
+            type={"button"}
+            title={label}
+            aria-label={`${label} theme`}
+            aria-pressed={theme === value}
+            onClick={() => setTheme(value)}
+            className={cn(
+              "p-1.5 rounded-md transition-colors",
+              theme === value
+                ? "bg-nb-gray-900 text-nb-gray-100"
+                : "text-nb-gray-400 hover:bg-nb-gray-900 hover:text-nb-gray-100",
+            )}
+          >
+            <Icon size={14} />
+          </button>
+        ))}
+      </div>
+    </div>
+  );
 }
diff --git a/src/components/ui/GetStartedTest.tsx b/src/components/ui/GetStartedTest.tsx
index f5192a431..922178507 100644
--- a/src/components/ui/GetStartedTest.tsx
+++ b/src/components/ui/GetStartedTest.tsx
@@ -35,7 +35,7 @@ export default function GetStartedTest({
           <>
             <div
               className={
-                "absolute z-20 bg-gradient-to-b  dark:to-nb-gray-950 dark:from-nb-gray-950/40 w-full h-full"
+                "absolute z-20 bg-gradient-to-b to-nb-gray-940 from-nb-gray-940/40 dark:to-nb-gray-950 dark:from-nb-gray-950/40 w-full h-full"
               }
             ></div>
             <div
diff --git a/src/components/ui/GroupBadgeWithEditPeers.tsx b/src/components/ui/GroupBadgeWithEditPeers.tsx
index 0c050f499..d9f57916c 100644
--- a/src/components/ui/GroupBadgeWithEditPeers.tsx
+++ b/src/components/ui/GroupBadgeWithEditPeers.tsx
@@ -84,7 +84,7 @@ export default function GroupBadgeWithEditPeers({
             {isNew && showNewBadge && (
               <span
                 className={
-                  "text-[7px] relative -top-[0px] leading-[0] bg-green-900 border border-green-500/20 py-1.5 px-1 rounded-[3px] text-green-400"
+                  "text-[7px] relative -top-[0px] leading-[0] bg-green-100 border border-green-500/20 py-1.5 px-1 rounded-[3px] text-green-700 dark:bg-green-900 dark:text-green-400"
                 }
               >
                 NEW
diff --git a/src/components/ui/HelpAndSupportButton.tsx b/src/components/ui/HelpAndSupportButton.tsx
index b9b95673d..ffee549d4 100644
--- a/src/components/ui/HelpAndSupportButton.tsx
+++ b/src/components/ui/HelpAndSupportButton.tsx
@@ -39,7 +39,7 @@ export default function HelpAndSupportButton() {
           variant={"default-outline"}
           className={cn(
             "!rounded-full h-[38px] w-[38px] !p-0",
-            dropdownOpen && "text-white",
+            dropdownOpen && "text-nb-gray-100",
           )}
         >
           <CircleQuestionMark size={18} />
diff --git a/src/components/ui/LoginExpiredBadge.tsx b/src/components/ui/LoginExpiredBadge.tsx
index 874438018..5b07a5a2e 100644
--- a/src/components/ui/LoginExpiredBadge.tsx
+++ b/src/components/ui/LoginExpiredBadge.tsx
@@ -15,7 +15,7 @@ export default function LoginExpiredBadge({ loginExpired }: Props) {
         </Badge>
       </TooltipTrigger>
       <TooltipContent>
-        <div className={"text-neutral-300 text-xs leading-1.5"}>
+        <div className={"text-nb-gray-300 text-xs leading-1.5"}>
           This peer is offline and needs to be <br />
           re-authenticated because its login has expired.
         </div>
diff --git a/src/components/ui/MultipleGroups.tsx b/src/components/ui/MultipleGroups.tsx
index e739f50c1..ab5a2ee0e 100644
--- a/src/components/ui/MultipleGroups.tsx
+++ b/src/components/ui/MultipleGroups.tsx
@@ -80,7 +80,9 @@ export default function MultipleGroups({
                 useHover={true}
                 className={cn(
                   "px-3 gap-2 whitespace-nowrap",
-                  permission.groups.update ? "group-hover:bg-nb-gray-800" : "",
+                  permission.groups.update
+                    ? "group-hover:bg-gray-100 dark:group-hover:bg-nb-gray-800"
+                    : "",
                 )}
               >
                 {orderedGroups.length} Groups
@@ -94,7 +96,7 @@ export default function MultipleGroups({
                     showNewBadge={true}
                     className={
                       permission.groups.update
-                        ? "group-hover:bg-nb-gray-800"
+                        ? "group-hover:bg-gray-100 dark:group-hover:bg-nb-gray-800"
                         : ""
                     }
                   />
@@ -108,7 +110,7 @@ export default function MultipleGroups({
                     showNewBadge={true}
                     className={
                       permission.groups.update
-                        ? "group-hover:bg-nb-gray-800"
+                        ? "group-hover:bg-gray-100 dark:group-hover:bg-nb-gray-800"
                         : ""
                     }
                   />
@@ -120,7 +122,7 @@ export default function MultipleGroups({
                     className={cn(
                       "px-3 gap-2 whitespace-nowrap",
                       permission.groups.update
-                        ? "group-hover:bg-nb-gray-800"
+                        ? "group-hover:bg-gray-100 dark:group-hover:bg-nb-gray-800"
                         : "",
                     )}
                   >
diff --git a/src/components/ui/SmallBadge.tsx b/src/components/ui/SmallBadge.tsx
index de7ec0196..f9fa1c6db 100644
--- a/src/components/ui/SmallBadge.tsx
+++ b/src/components/ui/SmallBadge.tsx
@@ -5,12 +5,15 @@ import * as React from "react";
 const smallBadgeVariants = cva("", {
   variants: {
     variant: {
-      green: "bg-green-900 border border-green-500/20 text-green-400",
-      blue: "bg-blue-900 border border-blue-500/20 text-blue-400",
+      green:
+        "bg-green-100 border border-green-300 text-green-700 dark:bg-green-900 dark:border-green-500/20 dark:text-green-400",
+      blue: "bg-blue-100 border border-blue-300 text-blue-700 dark:bg-blue-900 dark:border-blue-500/20 dark:text-blue-400",
       white: "bg-white/20 border border-white/10 text-white",
-      sky: "bg-sky-900 border border-sky-500/20 text-white",
-      netbird: "bg-netbird-900 border border-netbird-400 text-netbird-300",
-      yellow: "bg-yellow-900 border border-yellow-500/20 text-yellow-400",
+      sky: "bg-sky-100 border border-sky-300 text-sky-700 dark:bg-sky-900 dark:border-sky-500/20 dark:text-white",
+      netbird:
+        "bg-netbird-100 border border-netbird-400 text-netbird-700 dark:bg-netbird-900 dark:text-netbird-300",
+      yellow:
+        "bg-yellow-100 border border-yellow-400 text-yellow-700 dark:bg-yellow-900 dark:border-yellow-500/20 dark:text-yellow-400",
     },
     size: {
       default:
diff --git a/src/components/ui/TruncatedText.tsx b/src/components/ui/TruncatedText.tsx
index 7a61d4153..64f17aaed 100644
--- a/src/components/ui/TruncatedText.tsx
+++ b/src/components/ui/TruncatedText.tsx
@@ -119,7 +119,7 @@ export default function TruncatedText({
         className={cn(className, "px-3 py-1.5")}
       >
         {tooltipContent ?? (
-          <div className="text-neutral-300 flex flex-col gap-1">
+          <div className="text-nb-gray-300 flex flex-col gap-1">
             <div className="max-w-xs break-all whitespace-normal text-xs">
               {text}
             </div>
diff --git a/src/components/ui/UserDropdown.tsx b/src/components/ui/UserDropdown.tsx
index 1ebea567e..c398a0bb5 100644
--- a/src/components/ui/UserDropdown.tsx
+++ b/src/components/ui/UserDropdown.tsx
@@ -9,6 +9,7 @@ import {
   DropdownMenuShortcut,
   DropdownMenuTrigger,
 } from "@components/DropdownMenu";
+import DarkModeToggle from "@components/ui/DarkModeToggle";
 import { Modal } from "@components/modal/Modal";
 import TextWithTooltip from "@components/ui/TextWithTooltip";
 import { UserAvatar } from "@components/ui/UserAvatar";
@@ -125,6 +126,10 @@ export default function UserDropdown() {
               )}
             </DropdownMenuShortcut>
           </DropdownMenuItem>
+
+          <DropdownMenuSeparator />
+
+          <DarkModeToggle />
         </DropdownMenuContent>
       </DropdownMenu>
     </>
diff --git a/src/contexts/ThemeProvider.tsx b/src/contexts/ThemeProvider.tsx
index 38dd6e37a..0f7a30f0a 100644
--- a/src/contexts/ThemeProvider.tsx
+++ b/src/contexts/ThemeProvider.tsx
@@ -1,108 +1,179 @@
 "use client";
 
 import "react-loading-skeleton/dist/skeleton.css";
-import React, { useCallback, useContext, useEffect, useState } from "react";
+import * as React from "react";
 import { SkeletonTheme } from "react-loading-skeleton";
 
-export type Theme = "dark" | "light" | "system";
-export type ResolvedTheme = Exclude<Theme, "system">;
+export type Theme = "light" | "dark" | "system";
 
-const STORAGE_KEY = "netbird-theme";
-const DEFAULT_THEME: ResolvedTheme = "dark";
-const THEME_CLASSES: ResolvedTheme[] = ["dark", "light"];
-const SKELETON_COLORS: Record<
-  ResolvedTheme,
-  { base: string; highlight: string }
-> = {
-  dark: { base: "#25282d", highlight: "#33373e" },
-  light: { base: "#e4e7e9", highlight: "#f4f6f7" },
+type ResolvedTheme = "light" | "dark";
+
+type ThemeContextValue = {
+  theme: Theme;
+  resolvedTheme: ResolvedTheme;
+  setTheme: (theme: Theme) => void;
 };
 
-type Props = {
-  children: React.ReactNode;
+const STORAGE_KEY = "netbird-theme";
+const DEFAULT_THEME: Theme = "dark";
+const SYSTEM_QUERY = "(prefers-color-scheme: dark)";
+
+const ThemeContext = React.createContext<ThemeContextValue | null>(null);
+
+/* Production fallback when useTheme is called outside ThemeProvider —
+   in development the same misuse throws instead. */
+const FALLBACK_CONTEXT: ThemeContextValue = {
+  theme: DEFAULT_THEME,
+  resolvedTheme: "dark",
+  setTheme: () => undefined,
 };
 
-const ThemeContext = React.createContext(
-  {} as {
-    theme: Theme;
-    setTheme: (theme: Theme) => void;
-  },
-);
+/* Both inputs are exposed as external stores so the server render and the
+   hydration pass agree on DEFAULT_THEME (the html element ships with the
+   `dark` class), and React then re-renders with the real client value.
+   Reading localStorage / matchMedia in a useState initializer instead made
+   the first client render disagree with the server HTML — e.g.
+   DarkModeToggle's aria-pressed — and trip hydration warnings. */
 
-function isTheme(value: string | null): value is Theme {
-  return value === "dark" || value === "light" || value === "system";
-}
+const isTheme = (value: unknown): value is Theme =>
+  value === "light" || value === "dark" || value === "system";
 
-function systemTheme(): ResolvedTheme {
-  return window.matchMedia("(prefers-color-scheme: light)").matches
-    ? "light"
-    : "dark";
-}
+/* Fallback when localStorage is unavailable (e.g. blocked by browser
+   settings): the choice still applies for the session, it just won't persist. */
+let sessionTheme: Theme | null = null;
+const themeListeners = new Set<() => void>();
 
-function resolveTheme(theme: Theme): ResolvedTheme {
-  return theme === "system" ? systemTheme() : theme;
-}
+const getStoredTheme = (): Theme => {
+  if (sessionTheme) return sessionTheme;
+  try {
+    const stored = localStorage.getItem(STORAGE_KEY);
+    if (isTheme(stored)) return stored;
+  } catch {
+    // fall through to the default
+  }
+  return DEFAULT_THEME;
+};
+
+const getServerTheme = (): Theme => DEFAULT_THEME;
+
+const subscribeTheme = (onChange: () => void) => {
+  themeListeners.add(onChange);
+  // Follow changes made in another tab as well.
+  window.addEventListener("storage", onChange);
+  return () => {
+    themeListeners.delete(onChange);
+    window.removeEventListener("storage", onChange);
+  };
+};
 
-// storedTheme reads the persisted preference. Access to localStorage can throw
-// when the browser blocks storage, in which case we fall back to the default.
-function storedTheme(): Theme {
-  if (typeof window === "undefined") return DEFAULT_THEME;
+const writeTheme = (next: Theme) => {
   try {
-    const stored = window.localStorage.getItem(STORAGE_KEY);
-    return isTheme(stored) ? stored : DEFAULT_THEME;
+    localStorage.setItem(STORAGE_KEY, next);
+    sessionTheme = null;
   } catch {
-    return DEFAULT_THEME;
+    sessionTheme = next;
   }
-}
+  themeListeners.forEach((listener) => listener());
+};
 
-export function ThemeProvider({ children }: Props) {
-  // The theme class ships on <html> in the static export, so the initial paint
-  // never flashes. Reading storage here only matters when the stored preference
-  // differs from that default.
-  const [theme, setThemeState] = useState<Theme>(storedTheme);
-  // Tracked separately so "system" keeps the skeleton palette in step with the
-  // OS preference, which can change while the app is open.
-  const [resolvedTheme, setResolvedTheme] =
-    useState<ResolvedTheme>(DEFAULT_THEME);
-
-  const setTheme = useCallback((next: Theme) => {
-    setThemeState(next);
-    try {
-      window.localStorage.setItem(STORAGE_KEY, next);
-    } catch {
-      // Preference is not persisted when storage is unavailable.
-    }
-  }, []);
-
-  useEffect(() => {
-    const apply = () => {
-      const resolved = resolveTheme(theme);
-      const root = document.documentElement;
-      root.classList.remove(...THEME_CLASSES.filter((c) => c !== resolved));
-      root.classList.add(resolved);
-      root.style.colorScheme = resolved;
-      setResolvedTheme(resolved);
-    };
+const getSystemTheme = (): ResolvedTheme =>
+  window.matchMedia(SYSTEM_QUERY).matches ? "dark" : "light";
+
+const getServerSystemTheme = (): ResolvedTheme => "dark";
 
+const subscribeSystemTheme = (onChange: () => void) => {
+  const media = window.matchMedia(SYSTEM_QUERY);
+  media.addEventListener("change", onChange);
+  return () => media.removeEventListener("change", onChange);
+};
+
+/* Suspends CSS transitions for one frame so the whole page switches
+   theme at once instead of elements fading at different speeds. */
+const withTransitionsDisabled = (apply: () => void) => {
+  const style = document.createElement("style");
+  style.appendChild(
+    document.createTextNode(
+      "*,*::before,*::after{transition:none!important}",
+    ),
+  );
+  document.head.appendChild(style);
+  try {
     apply();
+  } finally {
+    window.getComputedStyle(document.documentElement);
+    setTimeout(() => style.remove(), 1);
+  }
+};
 
-    if (theme !== "system") return;
+/**
+ * Wraps the skeleton loader theme so its colors follow the active theme.
+ * The colours come from the `--skeleton-base` / `--skeleton-highlight`
+ * tokens in globals.css, which `:root` (light) and `.dark` each define, so
+ * they flip with the `.dark` class like the rest of the nb-gray ramp and
+ * stay in step with the desktop client's skeleton tokens.
+ */
+function ThemedSkeleton({ children }: { children: React.ReactNode }) {
+  return (
+    <SkeletonTheme
+      baseColor={"rgb(var(--skeleton-base))"}
+      highlightColor={"rgb(var(--skeleton-highlight))"}
+    >
+      {children}
+    </SkeletonTheme>
+  );
+}
 
-    const query = window.matchMedia("(prefers-color-scheme: light)");
-    query.addEventListener("change", apply);
-    return () => query.removeEventListener("change", apply);
-  }, [theme]);
+export function ThemeProvider({ children }: { children: React.ReactNode }) {
+  const theme = React.useSyncExternalStore(
+    subscribeTheme,
+    getStoredTheme,
+    getServerTheme,
+  );
+  const systemTheme = React.useSyncExternalStore(
+    subscribeSystemTheme,
+    getSystemTheme,
+    getServerSystemTheme,
+  );
+
+  const resolvedTheme = theme === "system" ? systemTheme : theme;
+
+  React.useEffect(() => {
+    const root = document.documentElement;
+    // The pre-paint script in AppLayout usually has this right already;
+    // skip the transition freeze when nothing needs to change.
+    if (
+      root.classList.contains("dark") === (resolvedTheme === "dark") &&
+      root.style.colorScheme === resolvedTheme
+    ) {
+      return;
+    }
+    withTransitionsDisabled(() => {
+      root.classList.toggle("dark", resolvedTheme === "dark");
+      root.style.colorScheme = resolvedTheme;
+    });
+  }, [resolvedTheme]);
+
+  const setTheme = React.useCallback((next: Theme) => writeTheme(next), []);
+
+  const value = React.useMemo(
+    () => ({ theme, resolvedTheme, setTheme }),
+    [theme, resolvedTheme, setTheme],
+  );
 
   return (
-    <ThemeContext.Provider value={{ theme, setTheme }}>
-      <SkeletonTheme
-        baseColor={SKELETON_COLORS[resolvedTheme].base}
-        highlightColor={SKELETON_COLORS[resolvedTheme].highlight}
-      >
-        {children}
-      </SkeletonTheme>
+    <ThemeContext.Provider value={value}>
+      <ThemedSkeleton>{children}</ThemedSkeleton>
     </ThemeContext.Provider>
   );
 }
 
-export const useTheme = () => useContext(ThemeContext);
+export const useTheme = (): ThemeContextValue => {
+  const ctx = React.useContext(ThemeContext);
+  if (!ctx) {
+    if (process.env.NODE_ENV !== "production") {
+      throw new Error("useTheme must be used within a ThemeProvider");
+    }
+    return FALLBACK_CONTEXT;
+  }
+  return ctx;
+};
diff --git a/src/layouts/AppLayout.tsx b/src/layouts/AppLayout.tsx
index 8582abfbc..981607701 100644
--- a/src/layouts/AppLayout.tsx
+++ b/src/layouts/AppLayout.tsx
@@ -43,8 +43,24 @@ export default function AppLayout({
   useSignupSource();
 
   return (
-    <html lang="en" className="dark" style={{ colorScheme: "dark" }}>
+    // suppressHydrationWarning: the pre-paint script below rewrites this
+    // element's class and color-scheme before React hydrates it.
+    <html
+      lang="en"
+      className="dark"
+      style={{ colorScheme: "dark" }}
+      suppressHydrationWarning
+    >
       <head>
+        {/* Set the theme class and color-scheme before first paint to avoid
+            a flash. Mirrors ThemeProvider (storageKey "netbird-theme", default
+            "dark", system-aware) — required because the provider only applies
+            them in an effect, after hydration. */}
+        <script
+          dangerouslySetInnerHTML={{
+            __html: `(function(){var r=document.documentElement;try{var t=localStorage.getItem('netbird-theme')||'dark';var d=t==='dark'||(t==='system'&&window.matchMedia('(prefers-color-scheme: dark)').matches);r.classList[d?'add':'remove']('dark');r.style.colorScheme=d?'dark':'light';}catch(e){r.classList.add('dark');r.style.colorScheme='dark';}})();`,
+          }}
+        />
         <GoogleTagManagerHeadScript />
       </head>
       <body className={cn(inter.className)}>
diff --git a/src/layouts/Header.tsx b/src/layouts/Header.tsx
index 87f0f09dd..9ca781bc6 100644
--- a/src/layouts/Header.tsx
+++ b/src/layouts/Header.tsx
@@ -94,7 +94,7 @@ const ToggleCollapsableNavigationButton = () => {
         onClick={toggleNavigation}
         data-navbar-colappse-toggle
         className={cn(
-          "h-10 w-10 hover:text-white flex items-center justify-center text-nb-gray-300 transition-all ml-2",
+          "h-10 w-10 hover:text-nb-gray-50 flex items-center justify-center text-nb-gray-300 transition-all ml-2",
           "hidden md:block",
         )}
       >
diff --git a/src/modules/access-control/AccessControlModal.tsx b/src/modules/access-control/AccessControlModal.tsx
index 8ec1355aa..6b74e7053 100644
--- a/src/modules/access-control/AccessControlModal.tsx
+++ b/src/modules/access-control/AccessControlModal.tsx
@@ -327,8 +327,8 @@ export function AccessControlModalContent({
                 <HelpText className={"max-w-sm"}>
                   Allow only specified network protocols. To change traffic
                   direction and ports, select{" "}
-                  <b className={"text-white"}>TCP</b> or{" "}
-                  <b className={"text-white"}>UDP</b> protocol.
+                  <b className={"text-nb-gray-100"}>TCP</b> or{" "}
+                  <b className={"text-nb-gray-100"}>UDP</b> protocol.
                 </HelpText>
               </div>
               <Select
diff --git a/src/modules/access-control/ssh/SSHUsernameSelector.tsx b/src/modules/access-control/ssh/SSHUsernameSelector.tsx
index 3b601e73c..83853d02f 100644
--- a/src/modules/access-control/ssh/SSHUsernameSelector.tsx
+++ b/src/modules/access-control/ssh/SSHUsernameSelector.tsx
@@ -116,7 +116,7 @@ export function SSHUsernameSelector({
           </button>
         </PopoverTrigger>
         <PopoverContent
-          className="w-full p-0 shadow-sm  shadow-nb-gray-950"
+          className="w-full p-0 shadow-sm  dark:shadow-nb-gray-950"
           style={{
             width: popoverWidth === "auto" ? width : popoverWidth,
           }}
diff --git a/src/modules/access-control/table/AccessControlDirectionCell.tsx b/src/modules/access-control/table/AccessControlDirectionCell.tsx
index 42ce9faf7..073d178a5 100644
--- a/src/modules/access-control/table/AccessControlDirectionCell.tsx
+++ b/src/modules/access-control/table/AccessControlDirectionCell.tsx
@@ -27,7 +27,7 @@ export default function AccessControlDirectionCell({
           <LongArrowBidirectionalIcon
             size={60}
             autoHeight={true}
-            className={"fill-green-500"}
+            className={"fill-green-600 dark:fill-green-500"}
           />
         </Badge>
       ) : (
@@ -35,7 +35,7 @@ export default function AccessControlDirectionCell({
           <LongArrowLeftIcon
             size={60}
             autoHeight={true}
-            className={"fill-sky-400 rotate-180"}
+            className={"fill-sky-600 dark:fill-sky-400 rotate-180"}
           />
         </Badge>
       )}
diff --git a/src/modules/activity/ActivityEntryRow.tsx b/src/modules/activity/ActivityEntryRow.tsx
index 5a10a045f..87a07cf5e 100644
--- a/src/modules/activity/ActivityEntryRow.tsx
+++ b/src/modules/activity/ActivityEntryRow.tsx
@@ -60,17 +60,21 @@ export const ActivityEntryRow = ({ event }: { event: ActivityEvent }) => {
 
       <div
         className={cn(
-          "w-10 h-10 shrink-0 relative rounded-full border-0 bg-nb-gray-900 border-nb-gray-800 flex items-center justify-center uppercase text-sm font-medium text-nb-gray-300",
+          "w-10 h-10 shrink-0 relative rounded-full border-0 bg-nb-gray-800 dark:bg-nb-gray-900 border-nb-gray-800 flex items-center justify-center uppercase text-sm font-medium text-nb-gray-300",
         )}
       >
         <ActivityTypeIcon code={event.activity_code} />
         <div
           className={cn(
             "w-6 h-6 absolute -right-1 -bottom-1 bg-nb-gray-930 rounded-full flex items-center justify-center border-4 border-nb-gray-950",
-            color == "red" && "bg-red-950 text-red-500 ",
-            color == "green" && "bg-green-950 text-green-400 ",
-            color == "blue-darker" && "bg-sky-950 text-sky-500 ",
-            color == "netbird" && "bg-netbird-950 text-netbird-500",
+            color == "red" &&
+              "bg-red-100 text-red-700 dark:bg-red-950 dark:text-red-500 ",
+            color == "green" &&
+              "bg-green-100 text-green-700 dark:bg-green-950 dark:text-green-400 ",
+            color == "blue-darker" &&
+              "bg-sky-100 text-sky-700 dark:bg-sky-950 dark:text-sky-500 ",
+            color == "netbird" &&
+              "bg-netbird-100 text-netbird-700 dark:bg-netbird-950 dark:text-netbird-500",
           )}
         >
           {color && ActionIcons[color as ActionColor]}
@@ -83,7 +87,7 @@ export const ActivityEntryRow = ({ event }: { event: ActivityEvent }) => {
             <div className={"flex items-center gap-2"}>
               <div
                 className={
-                  "w-4 h-4 rounded-full flex items-center justify-center text-white uppercase text-[9px] font-medium bg-nb-gray-900"
+                  "w-4 h-4 rounded-full flex items-center justify-center text-neutral-700 dark:text-white uppercase text-[9px] font-medium bg-nb-gray-900"
                 }
                 style={{
                   color: generateColorFromUser(user),
@@ -126,7 +130,7 @@ export const ActivityEntryRow = ({ event }: { event: ActivityEvent }) => {
 
         <Card
           className={
-            "w-full relative bg-nb-gray-925 text-sm text-nb-gray-300 flex flex-col px-4 pt-3 pb-3"
+            "w-full relative bg-white dark:bg-nb-gray-925 border-nb-gray-800 dark:border-nb-gray-900 text-sm text-nb-gray-300 flex flex-col px-4 pt-3 pb-3"
           }
         >
           <div className={"flex gap-4"}>
@@ -148,7 +152,7 @@ function VerticalLine() {
   return (
     <div
       className={
-        "absolute left-0 top-0 translate-y-12 h-[56%] bg-nb-gray-900/50 w-[2px] ml-[20px] z-0"
+        "absolute left-0 top-0 translate-y-12 h-[56%] bg-nb-gray-700 dark:bg-nb-gray-900/50 w-[2px] ml-[20px] z-0"
       }
     ></div>
   );
diff --git a/src/modules/activity/ActivityEventCodeSelector.tsx b/src/modules/activity/ActivityEventCodeSelector.tsx
index f6c2c76d2..5bbd35339 100644
--- a/src/modules/activity/ActivityEventCodeSelector.tsx
+++ b/src/modules/activity/ActivityEventCodeSelector.tsx
@@ -92,7 +92,7 @@ export function ActivityEventCodeSelector({
         </Button>
       </PopoverTrigger>
       <PopoverContent
-        className="w-full p-0 shadow-sm  shadow-nb-gray-950"
+        className="w-full p-0 shadow-sm  dark:shadow-nb-gray-950"
         style={{
           width: popoverWidth === "auto" ? width : popoverWidth,
         }}
diff --git a/src/modules/activity/UsersDropdownSelector.tsx b/src/modules/activity/UsersDropdownSelector.tsx
index 48e57a523..341c0b577 100644
--- a/src/modules/activity/UsersDropdownSelector.tsx
+++ b/src/modules/activity/UsersDropdownSelector.tsx
@@ -113,7 +113,7 @@ export function UsersDropdownSelector({
               <React.Fragment>
                 <div
                   className={
-                    "w-5 h-5 rounded-full flex items-center justify-center text-white uppercase text-[9px] font-medium bg-nb-gray-900"
+                    "w-5 h-5 rounded-full flex items-center justify-center text-neutral-700 dark:text-white uppercase text-[9px] font-medium bg-nb-gray-900"
                   }
                   style={{
                     color:
@@ -153,7 +153,7 @@ export function UsersDropdownSelector({
         </Button>
       </PopoverTrigger>
       <PopoverContent
-        className="w-full p-0 shadow-sm  shadow-nb-gray-950 min-w-[300px]"
+        className="w-full p-0 shadow-sm  dark:shadow-nb-gray-950 min-w-[300px]"
         style={{
           width: popoverWidth === "auto" ? width : popoverWidth,
         }}
diff --git a/src/modules/agent-network/AgentOverviewPanel.tsx b/src/modules/agent-network/AgentOverviewPanel.tsx
index 378be19d0..34ff03be0 100644
--- a/src/modules/agent-network/AgentOverviewPanel.tsx
+++ b/src/modules/agent-network/AgentOverviewPanel.tsx
@@ -25,6 +25,7 @@ import { useMemo, useState } from "react";
 import { Bar } from "react-chartjs-2";
 import AgentNetworkIcon from "@/assets/icons/AgentNetworkIcon";
 import { useGroups } from "@/contexts/GroupsProvider";
+import { useTheme } from "@/contexts/ThemeProvider";
 import { useUsers } from "@/contexts/UsersProvider";
 import {
   AccessLogFilterId,
@@ -465,6 +466,13 @@ function ConsumptionByDayChart({
   daily: DayBucket[];
   metric: Metric;
 }) {
+  const { resolvedTheme } = useTheme();
+  const isLight = resolvedTheme === "light";
+  // Chart.js paints to a canvas and parses colours itself, so CSS variables
+  // can't be used here. Light mirrors nb-gray-400 from the light ramp; dark
+  // keeps its existing values. Grid lines are a faint tint of the text colour.
+  const axisText = isLight ? "#6c6c6c" : "#9ca3af";
+  const gridLine = isLight ? "rgba(0,0,0,0.06)" : "rgba(255,255,255,0.04)";
   const labels = daily.map((d) => dayjs(d.key).format("MMM D"));
 
   const data =
@@ -508,7 +516,7 @@ function ConsumptionByDayChart({
           legend: {
             display: metric === "tokens",
             position: "bottom",
-            labels: { color: "#9ca3af" },
+            labels: { color: axisText },
           },
           tooltip: {
             callbacks: {
@@ -543,20 +551,20 @@ function ConsumptionByDayChart({
         scales: {
           x: {
             stacked: metric === "tokens",
-            ticks: { color: "#9ca3af", maxRotation: 0, autoSkip: true },
-            grid: { color: "rgba(255,255,255,0.04)" },
+            ticks: { color: axisText, maxRotation: 0, autoSkip: true },
+            grid: { color: gridLine },
           },
           y: {
             stacked: metric === "tokens",
             beginAtZero: true,
             ticks: {
-              color: "#9ca3af",
+              color: axisText,
               callback: (value) =>
                 metric === "cost"
                   ? `$${Number(value).toFixed(2)}`
                   : Number(value).toLocaleString(),
             },
-            grid: { color: "rgba(255,255,255,0.04)" },
+            grid: { color: gridLine },
           },
         },
       }}
diff --git a/src/modules/agent-network/EndpointBadge.tsx b/src/modules/agent-network/EndpointBadge.tsx
index a19e6ceab..4d212aa96 100644
--- a/src/modules/agent-network/EndpointBadge.tsx
+++ b/src/modules/agent-network/EndpointBadge.tsx
@@ -54,7 +54,7 @@ export default function EndpointBadge({
       <button
         type={"button"}
         className={
-          "inline-flex items-center gap-1.5 rounded-md border border-nb-gray-700 bg-nb-gray-800/60 px-2.5 py-1.5 text-[11px] font-medium text-nb-gray-200 hover:bg-nb-gray-800 hover:text-white transition-colors shrink-0"
+          "inline-flex items-center gap-1.5 rounded-md border border-nb-gray-700 bg-nb-gray-800/60 px-2.5 py-1.5 text-[11px] font-medium text-nb-gray-300 dark:text-nb-gray-200 hover:bg-nb-gray-800 dark:hover:text-white transition-colors shrink-0"
         }
         onClick={() => copy("Endpoint copied to clipboard")}
         aria-label={"Copy endpoint"}
diff --git a/src/modules/common-table-rows/ActiveInactiveRow.tsx b/src/modules/common-table-rows/ActiveInactiveRow.tsx
index e256b0d2d..dc18f471c 100644
--- a/src/modules/common-table-rows/ActiveInactiveRow.tsx
+++ b/src/modules/common-table-rows/ActiveInactiveRow.tsx
@@ -27,7 +27,7 @@ export default function ActiveInactiveRow({
   return (
     <div
       className={cn(
-        "gap-3 dark:text-neutral-300 text-neutral-500 min-w-0",
+        "gap-3 text-nb-gray-300 min-w-0",
         className,
       )}
       data-testid={dataTestId}
diff --git a/src/modules/common-table-rows/ExpirationDateRow.tsx b/src/modules/common-table-rows/ExpirationDateRow.tsx
index df0910474..abc14e6fd 100644
--- a/src/modules/common-table-rows/ExpirationDateRow.tsx
+++ b/src/modules/common-table-rows/ExpirationDateRow.tsx
@@ -8,7 +8,7 @@ export default function ExpirationDateRow({ date }: Props) {
   return (
     <div
       className={
-        "flex items-center whitespace-nowrap gap-2 dark:text-neutral-300 text-neutral-500 transition-all  py-2 px-3 rounded-md"
+        "flex items-center whitespace-nowrap gap-2 text-nb-gray-300 transition-all  py-2 px-3 rounded-md"
       }
     >
       <Calendar size={14} />
diff --git a/src/modules/common-table-rows/LastTimeRow.tsx b/src/modules/common-table-rows/LastTimeRow.tsx
index 0373e5802..0982b1894 100644
--- a/src/modules/common-table-rows/LastTimeRow.tsx
+++ b/src/modules/common-table-rows/LastTimeRow.tsx
@@ -26,7 +26,7 @@ export default function LastTimeRow({
         <TooltipTrigger>
           <div
             className={
-              "flex items-center whitespace-nowrap gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 py-2 px-3 rounded-md cursor-default"
+              "flex items-center whitespace-nowrap gap-2 text-nb-gray-300 hover:text-nb-gray-100 transition-all hover:bg-nb-gray-800/60 py-2 px-3 rounded-md cursor-default"
             }
           >
             <>
@@ -37,9 +37,9 @@ export default function LastTimeRow({
           </div>
         </TooltipTrigger>
         <TooltipContent>
-          <div className={"text-neutral-300 flex flex-col gap-1"}>
+          <div className={"text-nb-gray-300 flex flex-col gap-1"}>
             <span className={"text-xs"}>{text}</span>
-            <span className={"text-neutral-200"}>
+            <span className={"text-nb-gray-200"}>
               {dayjs(date).format("D MMMM, YYYY [at] h:mm A")}
             </span>
           </div>
diff --git a/src/modules/control-center/draft/ControlCenterComponentsPanel.tsx b/src/modules/control-center/draft/ControlCenterComponentsPanel.tsx
index 414e7454f..fd59f0124 100644
--- a/src/modules/control-center/draft/ControlCenterComponentsPanel.tsx
+++ b/src/modules/control-center/draft/ControlCenterComponentsPanel.tsx
@@ -1251,7 +1251,8 @@ const PanelContent = React.memo(
               onClick={onClose}
               className={cn(
                 "shrink-0 px-1.5 py-0.5 rounded border border-nb-gray-900 bg-nb-gray-920",
-                "shadow-[0_2px_0_0_#1e2123,inset_0_1px_0_0_rgba(255,255,255,0.05)]",
+                "shadow-[0_2px_0_0_rgb(var(--nb-gray-700)),inset_0_1px_0_0_rgba(255,255,255,0.6)]",
+                "dark:shadow-[0_2px_0_0_rgb(var(--nb-gray-925)),inset_0_1px_0_0_rgba(255,255,255,0.05)]",
                 "text-[8px] font-medium tracking-wide text-nb-gray-350",
                 "hover:bg-nb-gray-910 hover:text-nb-gray-200 transition-colors",
               )}
diff --git a/src/modules/control-center/edges/AnimatedLine.tsx b/src/modules/control-center/edges/AnimatedLine.tsx
index 8956ca831..d7c56c350 100644
--- a/src/modules/control-center/edges/AnimatedLine.tsx
+++ b/src/modules/control-center/edges/AnimatedLine.tsx
@@ -1,6 +1,8 @@
 import { Edge, getSimpleBezierPath, Position } from "@xyflow/react";
 import React from "react";
+import { useTheme } from "@/contexts/ThemeProvider";
 import { useEdgeNodeRect } from "@/modules/control-center/utils/edge-helper";
+import { canvasBackground } from "@/modules/control-center/utils/canvas-theme";
 
 type AnimatedLineProps = Edge<
   {
@@ -13,6 +15,7 @@ type AnimatedLineProps = Edge<
 function AnimatedLine({ source, target, data }: AnimatedLineProps) {
   const sourceRect = useEdgeNodeRect(source);
   const targetRect = useEdgeNodeRect(target);
+  const { resolvedTheme } = useTheme();
   if (!sourceRect || !targetRect) return null;
 
   const color = data?.color || "#0e9f6e";
@@ -66,11 +69,12 @@ function AnimatedLine({ source, target, data }: AnimatedLineProps) {
               alignItems: "center",
               justifyContent: "center",
               boxSizing: "border-box",
-              background: "#181a1d",
+              // Hides the dashed edge under the label, so it must match the canvas.
+              background: canvasBackground(resolvedTheme),
               borderRadius: 4,
             }}
             className={
-              "flex items-center justify-center gap-1 select-none pointer-events-none z-10 text-green-50"
+              "flex items-center justify-center gap-1 select-none pointer-events-none z-10 text-green-700 dark:text-green-50"
             }
           >
             <div className={"whitespace-nowrap"}>{label}</div>
diff --git a/src/modules/control-center/edges/ConnectionLine.test.tsx b/src/modules/control-center/edges/ConnectionLine.test.tsx
new file mode 100644
index 000000000..6bea75316
--- /dev/null
+++ b/src/modules/control-center/edges/ConnectionLine.test.tsx
@@ -0,0 +1,55 @@
+import { cleanup, render } from "@testing-library/react";
+import { Position } from "@xyflow/react";
+import { afterEach, describe, expect, it, vi } from "vitest";
+
+// Only useConnection needs a canvas store; everything else is pure.
+// vi.hoisted runs before imports, so Position.Right is spelled literally.
+const connectionState = vi.hoisted(() => ({
+  fromHandle: { id: "handle-1", position: "right" } as {
+    id: string | null;
+    position: Position;
+  } | null,
+}));
+vi.mock("@xyflow/react", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("@xyflow/react")>()),
+  useConnection: () => ({
+    fromHandle: connectionState.fromHandle,
+    toHandle: null,
+  }),
+}));
+
+const { ConnectionLine } = await import("./ConnectionLine");
+
+afterEach(cleanup);
+
+const renderLine = () => {
+  const { container } = render(
+    <svg>
+      <ConnectionLine
+        {...({
+          fromX: 0,
+          fromY: 0,
+          toX: 100,
+          toY: 50,
+        } as Parameters<typeof ConnectionLine>[0])}
+      />
+    </svg>,
+  );
+  return container.querySelector("path");
+};
+
+describe("ConnectionLine", () => {
+  it("uses the theme-flipping ramp token and the shared dash animation", () => {
+    const path = renderLine();
+    // nb-gray-50 is near-white in dark and near-black in light, so one token
+    // keeps the drag preview visible on both canvases.
+    expect(path?.classList.contains("stroke-nb-gray-50")).toBe(true);
+    expect(path?.classList.contains("cc-animated-edge")).toBe(true);
+    expect(path?.getAttribute("stroke")).toBeNull();
+  });
+
+  it("renders nothing until a source handle exists", () => {
+    connectionState.fromHandle = null;
+    expect(renderLine()).toBeNull();
+  });
+});
diff --git a/src/modules/control-center/edges/ConnectionLine.tsx b/src/modules/control-center/edges/ConnectionLine.tsx
index 41235ee64..b19014451 100644
--- a/src/modules/control-center/edges/ConnectionLine.tsx
+++ b/src/modules/control-center/edges/ConnectionLine.tsx
@@ -27,10 +27,10 @@ export const ConnectionLine = ({
       <g style={{ pointerEvents: "none" }}>
         <path
           fill="none"
-          stroke="#fff"
           strokeWidth={2}
           strokeDasharray="5, 5"
           style={{ opacity: 0.6 }}
+          className="cc-animated-edge stroke-nb-gray-50"
           d={edgePath}
         />
       </g>
diff --git a/src/modules/control-center/edges/DirectionIn.test.tsx b/src/modules/control-center/edges/DirectionIn.test.tsx
new file mode 100644
index 000000000..c73bcbaf1
--- /dev/null
+++ b/src/modules/control-center/edges/DirectionIn.test.tsx
@@ -0,0 +1,79 @@
+import { cleanup, render } from "@testing-library/react";
+import { Position } from "@xyflow/react";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+
+// Mocked rather than wrapped in the real ThemeProvider: the provider reads
+// window.matchMedia, which jsdom does not implement.
+const themeState = vi.hoisted(() => ({
+  resolvedTheme: "dark" as "light" | "dark",
+}));
+vi.mock("@/contexts/ThemeProvider", () => ({
+  useTheme: () => ({
+    theme: themeState.resolvedTheme,
+    resolvedTheme: themeState.resolvedTheme,
+    setTheme: () => undefined,
+  }),
+}));
+
+const { DirectionIn } = await import("./DirectionIn");
+
+afterEach(cleanup);
+beforeEach(() => {
+  themeState.resolvedTheme = "dark";
+});
+
+const edgeProps = {
+  id: "edge-1",
+  source: "policy-1",
+  target: "peer-1",
+  sourceX: 0,
+  sourceY: 0,
+  targetX: 100,
+  targetY: 0,
+  sourcePosition: Position.Right,
+  targetPosition: Position.Left,
+};
+
+const renderEdge = (data: {
+  enabled: boolean;
+  type?: "smoothstep" | "straight" | "bezier";
+}) => {
+  const { container } = render(
+    <svg>
+      <DirectionIn
+        {...(edgeProps as unknown as Parameters<typeof DirectionIn>[0])}
+        data={{ type: "straight", ...data }}
+      />
+    </svg>,
+  );
+  return container.querySelector("path");
+};
+
+describe("DirectionIn", () => {
+  it("strokes enabled edges green (same in both themes) and animates them", () => {
+    const path = renderEdge({ enabled: true });
+    // jsdom normalizes the #0e9f6e literal to rgb() form.
+    expect(path?.style.stroke).toBe("rgb(14, 159, 110)");
+    expect(path?.classList.contains("cc-animated-edge")).toBe(true);
+
+    themeState.resolvedTheme = "light";
+    cleanup();
+    const lightPath = renderEdge({ enabled: true });
+    expect(lightPath?.style.stroke).toBe("rgb(14, 159, 110)");
+  });
+
+  // Disabled edges must stay on the theme-flipping ramp tokens (and inline —
+  // xyflow's .react-flow__edge-path would override a stroke-* utility).
+  it("strokes disabled edges with the dark ramp token in dark mode", () => {
+    const path = renderEdge({ enabled: false });
+    expect(path?.style.stroke).toBe("rgb(var(--nb-gray-400))");
+    expect(path?.style.opacity).toBe("0.6");
+    expect(path?.classList.contains("cc-animated-edge")).toBe(false);
+  });
+
+  it("strokes disabled edges with the light ramp token in light mode", () => {
+    themeState.resolvedTheme = "light";
+    const path = renderEdge({ enabled: false });
+    expect(path?.style.stroke).toBe("rgb(var(--nb-gray-700))");
+  });
+});
diff --git a/src/modules/control-center/edges/DirectionIn.tsx b/src/modules/control-center/edges/DirectionIn.tsx
index 4d77de28e..54bf72c30 100644
--- a/src/modules/control-center/edges/DirectionIn.tsx
+++ b/src/modules/control-center/edges/DirectionIn.tsx
@@ -5,6 +5,7 @@ import {
   getSmoothStepPath,
   getStraightPath,
 } from "@xyflow/react";
+import { useTheme } from "@/contexts/ThemeProvider";
 import React from "react";
 
 type Props = {
@@ -25,6 +26,7 @@ export function DirectionIn({
   data,
 }: Props) {
   const { enabled, type = "straight" } = data;
+  const { resolvedTheme } = useTheme();
 
   const getPath = () => {
     switch (type) {
@@ -74,7 +76,14 @@ export function DirectionIn({
       style={{
         opacity: enabled ? 1 : 0.6,
         strokeWidth: 2,
-        stroke: enabled ? "#0e9f6e" : "#787878",
+        /* Green is intentionally identical in both themes; the neutral uses
+           ramp tokens inline — xyflow's .react-flow__edge-path sets stroke
+           and loads after the Tailwind utilities. */
+        stroke: enabled
+          ? "#0e9f6e"
+          : resolvedTheme === "light"
+          ? "rgb(var(--nb-gray-700))"
+          : "rgb(var(--nb-gray-400))",
         strokeDasharray: "5, 5",
       }}
       className={enabled ? "cc-animated-edge" : undefined}
diff --git a/src/modules/control-center/edges/SimpleConnection.test.tsx b/src/modules/control-center/edges/SimpleConnection.test.tsx
index 8a0802baa..14d4e2f10 100644
--- a/src/modules/control-center/edges/SimpleConnection.test.tsx
+++ b/src/modules/control-center/edges/SimpleConnection.test.tsx
@@ -1,6 +1,6 @@
 import { cleanup, render } from "@testing-library/react";
 import { Position } from "@xyflow/react";
-import { afterEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 // The source node lookup: select-user-node carries no data.enabled, so the
 // helper's fallback reads false.
@@ -8,9 +8,25 @@ vi.mock("@/modules/control-center/utils/helpers", () => ({
   useSourceGroupEnabled: () => false,
 }));
 
+// Mocked rather than wrapped in the real ThemeProvider: the provider reads
+// window.matchMedia, which jsdom does not implement.
+const themeState = vi.hoisted(() => ({
+  resolvedTheme: "dark" as "light" | "dark",
+}));
+vi.mock("@/contexts/ThemeProvider", () => ({
+  useTheme: () => ({
+    theme: themeState.resolvedTheme,
+    resolvedTheme: themeState.resolvedTheme,
+    setTheme: () => undefined,
+  }),
+}));
+
 const { SimpleConnection } = await import("./SimpleConnection");
 
 afterEach(cleanup);
+beforeEach(() => {
+  themeState.resolvedTheme = "dark";
+});
 
 const edgeProps = {
   id: "edge-1",
@@ -51,4 +67,17 @@ describe("SimpleConnection", () => {
     const path = renderEdge(undefined);
     expect(path?.style.opacity).toBe("0.6");
   });
+
+  // The stroke must stay on the theme-flipping ramp tokens (and inline —
+  // xyflow's .react-flow__edge-path would override a stroke-* utility).
+  it("strokes with the dark ramp token in dark mode", () => {
+    const path = renderEdge({ enabled: true });
+    expect(path?.style.stroke).toBe("rgb(var(--nb-gray-400))");
+  });
+
+  it("strokes with the light ramp token in light mode", () => {
+    themeState.resolvedTheme = "light";
+    const path = renderEdge({ enabled: true });
+    expect(path?.style.stroke).toBe("rgb(var(--nb-gray-700))");
+  });
 });
diff --git a/src/modules/control-center/edges/SimpleConnection.tsx b/src/modules/control-center/edges/SimpleConnection.tsx
index 7c6e640ff..e34142c8b 100644
--- a/src/modules/control-center/edges/SimpleConnection.tsx
+++ b/src/modules/control-center/edges/SimpleConnection.tsx
@@ -1,4 +1,5 @@
 import { BaseEdge, type EdgeProps, getSimpleBezierPath } from "@xyflow/react";
+import { useTheme } from "@/contexts/ThemeProvider";
 import React from "react";
 import { useSourceGroupEnabled } from "@/modules/control-center/utils/helpers";
 
@@ -32,6 +33,7 @@ export function SimpleConnection({
   // their source node carries none, and the node lookup would default to false.
   const nodeEnabled = useSourceGroupEnabled(source);
   const enabled = data?.enabled ?? nodeEnabled;
+  const { resolvedTheme } = useTheme();
 
   return (
     <BaseEdge
@@ -39,7 +41,12 @@ export function SimpleConnection({
       path={edgePath}
       style={{
         strokeWidth: 1.5,
-        stroke: "#7d7d7d",
+        /* Inline (not a stroke-* utility): xyflow's .react-flow__edge-path
+           sets stroke and loads after the Tailwind utilities. */
+        stroke:
+          resolvedTheme === "light"
+            ? "rgb(var(--nb-gray-700))"
+            : "rgb(var(--nb-gray-400))",
         strokeDasharray: "0, 0",
         opacity: enabled ? 1 : 0.6,
       }}
diff --git a/src/modules/control-center/edges/SmartEdge.tsx b/src/modules/control-center/edges/SmartEdge.tsx
index 7c610cd86..a2ed815b6 100644
--- a/src/modules/control-center/edges/SmartEdge.tsx
+++ b/src/modules/control-center/edges/SmartEdge.tsx
@@ -5,6 +5,7 @@ import {
   Position,
 } from "@xyflow/react";
 import { useEdgeNodeRect } from "@/modules/control-center/utils/edge-helper";
+import { useTheme } from "@/contexts/ThemeProvider";
 import React from "react";
 import type { Policy } from "@/interfaces/Policy";
 
@@ -21,10 +22,18 @@ export function SmartEdge({ id, source, target, data }: Props) {
   // Value-equality subscriptions so unrelated edges don't re-render on drag.
   const sourceRect = useEdgeNodeRect(source);
   const targetRect = useEdgeNodeRect(target);
+  const { resolvedTheme } = useTheme();
 
   if (!sourceRect || !targetRect) return null;
 
   const enabled = data?.enabled ?? true;
+  // Disabled edges use the same ramp tokens as DirectionIn / SimpleConnection
+  // so draft and live canvases agree. Inline (not a stroke-* utility) because
+  // xyflow's .react-flow__edge-path rule would override the utility.
+  const disabledStroke =
+    resolvedTheme === "light"
+      ? "rgb(var(--nb-gray-700))"
+      : "rgb(var(--nb-gray-400))";
   const bidirectional = data?.policy?.rules?.[0]?.bidirectional ?? false;
 
   const sPos = sourceRect;
@@ -90,7 +99,7 @@ export function SmartEdge({ id, source, target, data }: Props) {
           style={{
             opacity: enabled ? 1 : 0.6,
             strokeWidth: 2,
-            stroke: enabled ? "#0e9f6e" : "#787878",
+            stroke: enabled ? "#0e9f6e" : disabledStroke,
             strokeDasharray: "5, 5",
           }}
           className={enabled ? "cc-animated-edge" : undefined}
@@ -101,7 +110,7 @@ export function SmartEdge({ id, source, target, data }: Props) {
           style={{
             opacity: enabled ? 1 : 0.6,
             strokeWidth: 2,
-            stroke: enabled ? "#0e9f6e" : "#787878",
+            stroke: enabled ? "#0e9f6e" : disabledStroke,
             strokeDasharray: "5, 5",
           }}
           className={enabled ? "cc-animated-edge" : undefined}
@@ -126,7 +135,7 @@ export function SmartEdge({ id, source, target, data }: Props) {
       style={{
         opacity: enabled ? 1 : 0.6,
         strokeWidth: 2,
-        stroke: enabled ? "#0ea5e9" : "#787878",
+        stroke: enabled ? "#0ea5e9" : disabledStroke,
         strokeDasharray: "5, 5",
       }}
       className={enabled ? "cc-animated-edge" : undefined}
diff --git a/src/modules/control-center/header/ControlCenterHeader.tsx b/src/modules/control-center/header/ControlCenterHeader.tsx
index b15d4a3cd..6b46552af 100644
--- a/src/modules/control-center/header/ControlCenterHeader.tsx
+++ b/src/modules/control-center/header/ControlCenterHeader.tsx
@@ -109,7 +109,7 @@ function NetworkActionsMenu({
           type={"button"}
           aria-label={"Network actions"}
           className={
-            "flex items-center justify-center h-[40px] px-4 shrink-0 rounded-r-md border border-l-0 border-gray-700/40 bg-nb-gray-920 text-gray-400 hover:text-white hover:bg-nb-gray-910 transition-colors"
+            "flex items-center justify-center h-[40px] px-4 shrink-0 rounded-r-md border border-l-0 border-gray-700/40 bg-nb-gray-920 text-gray-400 hover:text-nb-gray-50 hover:bg-nb-gray-910 transition-colors"
           }
         >
           <MoreVerticalIcon size={14} />
@@ -156,7 +156,7 @@ function AddResourceButton({ networkNodeId }: { networkNodeId: string }) {
       className={cn(
         "flex items-center gap-1.5 h-[40px] px-3.5 shrink-0 rounded-md text-xs whitespace-nowrap outline-none",
         "bg-nb-gray-920 border border-gray-700/40 text-gray-400",
-        "hover:text-white hover:bg-nb-gray-910 transition-colors",
+        "hover:text-nb-gray-50 hover:bg-nb-gray-910 transition-colors",
       )}
     >
       <CirclePlusIcon size={14} className={"shrink-0"} />
diff --git a/src/modules/control-center/menus/CanvasContextMenu.tsx b/src/modules/control-center/menus/CanvasContextMenu.tsx
index fa6307c19..59970ab69 100644
--- a/src/modules/control-center/menus/CanvasContextMenu.tsx
+++ b/src/modules/control-center/menus/CanvasContextMenu.tsx
@@ -252,7 +252,7 @@ export const CanvasContextMenu = ({ onOpenChange }: CanvasContextMenuProps) => {
   }, [handleContextMenu, close]);
 
   const menuItemClass =
-    "flex w-full items-center gap-3 rounded-md px-3 py-1.5 text-sm text-nb-gray-300 transition-colors hover:bg-nb-gray-900 hover:text-gray-50 cursor-pointer";
+    "flex w-full items-center gap-3 rounded-md px-3 py-1.5 text-sm text-nb-gray-300 transition-colors hover:bg-nb-gray-900 hover:text-nb-gray-50 cursor-pointer";
 
   const renderShortcut = (shortcut?: React.ReactNode) =>
     shortcut ? (
diff --git a/src/modules/control-center/menus/NodeContextMenu.tsx b/src/modules/control-center/menus/NodeContextMenu.tsx
index 61f374166..dc16865a1 100644
--- a/src/modules/control-center/menus/NodeContextMenu.tsx
+++ b/src/modules/control-center/menus/NodeContextMenu.tsx
@@ -1250,7 +1250,7 @@ export const NodeContextMenu = ({
                   "flex w-full items-center gap-3 rounded-md px-3 py-1.5 text-sm transition-colors cursor-pointer",
                   item.danger
                     ? "text-red-500 hover:bg-red-900/20 hover:text-red-500"
-                    : "text-nb-gray-300 hover:bg-nb-gray-900 hover:text-gray-50",
+                    : "text-nb-gray-300 hover:bg-nb-gray-900 hover:text-nb-gray-50",
                 )}
               >
                 {item.icon}
diff --git a/src/modules/control-center/nodes/SelectGroupNode.tsx b/src/modules/control-center/nodes/SelectGroupNode.tsx
index 285b40993..10682bc8d 100644
--- a/src/modules/control-center/nodes/SelectGroupNode.tsx
+++ b/src/modules/control-center/nodes/SelectGroupNode.tsx
@@ -115,7 +115,7 @@ export const SelectGroupNode = ({ data, id }: NodeProps) => {
           height: 20,
           width: "1px",
           border: "none",
-          backgroundColor: "#3f444b",
+          backgroundColor: "rgb(var(--nb-gray-800))",
           borderRadius: "0px 4px 4px 0px",
           right: -2,
         }}
diff --git a/src/modules/control-center/nodes/SelectPeerNode.tsx b/src/modules/control-center/nodes/SelectPeerNode.tsx
index ef8510d9f..464d9498d 100644
--- a/src/modules/control-center/nodes/SelectPeerNode.tsx
+++ b/src/modules/control-center/nodes/SelectPeerNode.tsx
@@ -99,7 +99,7 @@ export const SelectPeerNode = ({ data, id }: PeerNodeProps) => {
           height: 20,
           width: "1px",
           border: "none",
-          backgroundColor: "#3f444b",
+          backgroundColor: "rgb(var(--nb-gray-800))",
           borderRadius: "0px 4px 4px 0px",
           right: -2,
         }}
diff --git a/src/modules/control-center/nodes/SelectUserNode.tsx b/src/modules/control-center/nodes/SelectUserNode.tsx
index 777c77eda..3f5f35c10 100644
--- a/src/modules/control-center/nodes/SelectUserNode.tsx
+++ b/src/modules/control-center/nodes/SelectUserNode.tsx
@@ -118,7 +118,7 @@ export const SelectUserNode = ({ data, id }: UserNodeProps) => {
           height: 20,
           width: "1px",
           border: "none",
-          backgroundColor: "#3f444b",
+          backgroundColor: "rgb(var(--nb-gray-800))",
           borderRadius: "0px 4px 4px 0px",
           right: -2,
         }}
@@ -144,7 +144,7 @@ export const SelectedUser = ({
     <div className={cn("flex items-center justify-center gap-2.5", className)}>
       <div
         className={
-          "w-8 h-8 rounded-full relative flex items-center justify-center text-white uppercase text-md font-medium bg-nb-gray-850"
+          "w-8 h-8 rounded-full relative flex items-center justify-center text-neutral-700 dark:text-white uppercase text-md font-medium bg-nb-gray-850"
         }
         style={{
           color: generateColorFromUser(user),
diff --git a/src/modules/control-center/panels/DestinationGroupPanel.tsx b/src/modules/control-center/panels/DestinationGroupPanel.tsx
index 54fda6568..af08c2f1a 100644
--- a/src/modules/control-center/panels/DestinationGroupPanel.tsx
+++ b/src/modules/control-center/panels/DestinationGroupPanel.tsx
@@ -971,7 +971,8 @@ export const DestinationGroupPanel = ({
             className={cn(
               "shrink-0 px-1.5 py-0.5 rounded border border-nb-gray-900 bg-nb-gray-920",
               // Keycap: 2px "side" below + faint highlight on top.
-              "shadow-[0_2px_0_0_#1e2123,inset_0_1px_0_0_rgba(255,255,255,0.05)]",
+              "shadow-[0_2px_0_0_rgb(var(--nb-gray-700)),inset_0_1px_0_0_rgba(255,255,255,0.6)]",
+              "dark:shadow-[0_2px_0_0_rgb(var(--nb-gray-925)),inset_0_1px_0_0_rgba(255,255,255,0.05)]",
               "text-[8px] font-medium tracking-wide text-nb-gray-350",
               "hover:bg-nb-gray-910 hover:text-nb-gray-200 transition-colors",
             )}
diff --git a/src/modules/control-center/panels/PeerGroupsPanel.tsx b/src/modules/control-center/panels/PeerGroupsPanel.tsx
index 1203f3c10..bbdc734a3 100644
--- a/src/modules/control-center/panels/PeerGroupsPanel.tsx
+++ b/src/modules/control-center/panels/PeerGroupsPanel.tsx
@@ -320,7 +320,7 @@ export const PeerGroupsPanel = ({ peerId, onClose }: PeerGroupsPanelProps) => {
           <button
             onClick={() => void requestClose()}
             className={
-              "shrink-0 px-1.5 py-0.5 rounded border border-nb-gray-900 bg-nb-gray-920 shadow-[0_2px_0_0_#1e2123,inset_0_1px_0_0_rgba(255,255,255,0.05)] text-[8px] font-medium tracking-wide text-nb-gray-350 hover:bg-nb-gray-910 hover:text-nb-gray-200 transition-colors"
+              "shrink-0 px-1.5 py-0.5 rounded border border-nb-gray-900 bg-nb-gray-920 shadow-[0_2px_0_0_rgb(var(--nb-gray-700)),inset_0_1px_0_0_rgba(255,255,255,0.6)] dark:shadow-[0_2px_0_0_rgb(var(--nb-gray-925)),inset_0_1px_0_0_rgba(255,255,255,0.05)] text-[8px] font-medium tracking-wide text-nb-gray-350 hover:bg-nb-gray-910 hover:text-nb-gray-200 transition-colors"
             }
           >
             ESC
diff --git a/src/modules/control-center/panels/RoutingPeersBar.tsx b/src/modules/control-center/panels/RoutingPeersBar.tsx
index 1c17f9027..306e5953e 100644
--- a/src/modules/control-center/panels/RoutingPeersBar.tsx
+++ b/src/modules/control-center/panels/RoutingPeersBar.tsx
@@ -173,7 +173,7 @@ export const RoutingPeersBar = ({
             }}
             className={cn(
               "flex items-center gap-2 pl-3.5 pr-3 text-xs text-gray-400 whitespace-nowrap outline-none",
-              "hover:text-white hover:bg-nb-gray-910 transition-colors",
+              "hover:text-nb-gray-50 hover:bg-nb-gray-910 transition-colors",
             )}
           >
             <RoutingPeersIndicator
@@ -283,7 +283,7 @@ export const RoutingPeersBar = ({
           className={cn(
             "flex items-center gap-1.5 px-3 text-xs whitespace-nowrap outline-none",
             "border-l border-gray-700/40 text-gray-400",
-            "hover:text-white hover:bg-nb-gray-910 transition-colors",
+            "hover:text-nb-gray-50 hover:bg-nb-gray-910 transition-colors",
           )}
         >
           <CirclePlusIcon size={12} className={"shrink-0"} />
diff --git a/src/modules/control-center/user/ControlCenterCurrentUserBadge.tsx b/src/modules/control-center/user/ControlCenterCurrentUserBadge.tsx
index cf316e74b..dc77c795d 100644
--- a/src/modules/control-center/user/ControlCenterCurrentUserBadge.tsx
+++ b/src/modules/control-center/user/ControlCenterCurrentUserBadge.tsx
@@ -32,7 +32,7 @@ export const ControlCenterCurrentUserBadge = ({ userId }: Props) => {
         <div className={cn("flex items-center justify-center gap-2.5")}>
           <div
             className={
-              "w-6 h-6 rounded-full relative flex items-center justify-center text-white uppercase text-md font-medium bg-nb-gray-900"
+              "w-6 h-6 rounded-full relative flex items-center justify-center text-neutral-700 dark:text-white uppercase text-md font-medium bg-nb-gray-900"
             }
             style={{
               color: generateColorFromUser(user),
diff --git a/src/modules/control-center/utils/canvas-theme.ts b/src/modules/control-center/utils/canvas-theme.ts
new file mode 100644
index 000000000..79cb1c999
--- /dev/null
+++ b/src/modules/control-center/utils/canvas-theme.ts
@@ -0,0 +1,19 @@
+/**
+ * Control Center canvas colours, keyed by the resolved theme.
+ *
+ * Both backgrounds are nb-gray ramp tokens, so they follow globals.css, but
+ * the stops differ per theme on purpose: in light the canvas sits one stop
+ * above the app background so it reads as a raised surface, while in dark it
+ * matches the app background. The dark dot grid is a fixed neutral that is
+ * not on the (cool) dark ramp; light uses the ramp stop of the same weight.
+ *
+ * Anything drawn over an edge to mask it (AnimatedLine's label pill) must use
+ * canvasBackground so it stays invisible against the canvas.
+ */
+export type ResolvedTheme = "light" | "dark";
+
+export const canvasBackground = (theme: ResolvedTheme): string =>
+  theme === "light" ? "rgb(var(--nb-gray-940))" : "rgb(var(--nb-gray-950))";
+
+export const canvasDotColor = (theme: ResolvedTheme): string =>
+  theme === "light" ? "rgb(var(--nb-gray-600))" : "#717171";
diff --git a/src/modules/dns/nameservers/NameserverTemplateModal.tsx b/src/modules/dns/nameservers/NameserverTemplateModal.tsx
index 2e7fedec4..3b189c147 100644
--- a/src/modules/dns/nameservers/NameserverTemplateModal.tsx
+++ b/src/modules/dns/nameservers/NameserverTemplateModal.tsx
@@ -142,7 +142,7 @@ function NameserverTemplate({
       <div
         className={cn(
           "w-1/4",
-          "bg-gradient-to-b h-full flex items-center justify-center from-white to-nb-gray-200 overflow-hidden p-4 border-r border-nb-gray-800",
+          "bg-gradient-to-b h-full flex items-center justify-center from-nb-gray-800 to-white dark:from-white dark:to-nb-gray-200 overflow-hidden p-4 border-r border-nb-gray-800",
         )}
       >
         {src && <Image src={src} alt={title} width={100} />}
diff --git a/src/modules/dns/nameservers/table/NameserverNameCell.tsx b/src/modules/dns/nameservers/table/NameserverNameCell.tsx
index 235922c77..1f62154ec 100644
--- a/src/modules/dns/nameservers/table/NameserverNameCell.tsx
+++ b/src/modules/dns/nameservers/table/NameserverNameCell.tsx
@@ -11,7 +11,7 @@ export default function NameserverNameCell({ ns }: Props) {
     <div className={"flex min-w-[270px] max-w-[270px]"}>
       <div
         className={
-          "flex items-center gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 py-2 px-3 rounded-md cursor-pointer"
+          "flex items-center gap-2 text-nb-gray-300 hover:text-nb-gray-100 transition-all hover:bg-nb-gray-800/60 py-2 px-3 rounded-md cursor-pointer"
         }
         data-testid="nameserver-name-cell"
       >
diff --git a/src/modules/dns/zones/records/DNSRecordContentCell.tsx b/src/modules/dns/zones/records/DNSRecordContentCell.tsx
index 7e04974d8..6c57b0d33 100644
--- a/src/modules/dns/zones/records/DNSRecordContentCell.tsx
+++ b/src/modules/dns/zones/records/DNSRecordContentCell.tsx
@@ -8,7 +8,7 @@ type Props = {
 
 export const DNSRecordContentCell = ({ record }: Props) => {
   return (
-    <div className="flex flex-col gap-0 dark:text-neutral-300 text-neutral-500 font-light truncate font-mono">
+    <div className="flex flex-col gap-0 text-nb-gray-300 font-light truncate font-mono">
       <CopyToClipboardText>
         <span className={"font-normal truncate text-[0.82rem]"}>
           {record.content}
diff --git a/src/modules/dns/zones/records/DNSRecordNameCell.tsx b/src/modules/dns/zones/records/DNSRecordNameCell.tsx
index 3eed5c780..0b0e38f9f 100644
--- a/src/modules/dns/zones/records/DNSRecordNameCell.tsx
+++ b/src/modules/dns/zones/records/DNSRecordNameCell.tsx
@@ -8,7 +8,7 @@ type Props = {
 
 export const DNSRecordNameCell = ({ record }: Props) => {
   return (
-    <div className="flex flex-col gap-0 dark:text-neutral-300 text-neutral-500 font-light truncate">
+    <div className="flex flex-col gap-0 text-nb-gray-300 font-light truncate">
       <CopyToClipboardText>
         <span className={"font-normal truncate"}>{record.name}</span>
       </CopyToClipboardText>
diff --git a/src/modules/dns/zones/records/DNSRecordTimeToLiveCell.tsx b/src/modules/dns/zones/records/DNSRecordTimeToLiveCell.tsx
index 0dccd9bfc..c44a6055d 100644
--- a/src/modules/dns/zones/records/DNSRecordTimeToLiveCell.tsx
+++ b/src/modules/dns/zones/records/DNSRecordTimeToLiveCell.tsx
@@ -11,7 +11,7 @@ export const DNSRecordTimeToLiveCell = ({ record }: Props) => {
   return (
     <div
       className={
-        "flex items-center whitespace-nowrap gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all py-2 px-3 rounded-md"
+        "flex items-center whitespace-nowrap gap-2 text-nb-gray-300 hover:text-nb-gray-100 transition-all py-2 px-3 rounded-md"
       }
     >
       <ClockIcon size={14} />
diff --git a/src/modules/groups/AssignPeerToGroupModal.tsx b/src/modules/groups/AssignPeerToGroupModal.tsx
index c7ed807bb..16b91c4e2 100644
--- a/src/modules/groups/AssignPeerToGroupModal.tsx
+++ b/src/modules/groups/AssignPeerToGroupModal.tsx
@@ -231,7 +231,7 @@ export const AssignGroupToPeerModalContent = ({
                   {groupName !== "All" && (
                     <button
                       className={
-                        "flex items-center gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 py-2 px-3 rounded-md cursor-pointer"
+                        "flex items-center gap-2 text-nb-gray-300 hover:text-nb-gray-100 transition-all hover:bg-nb-gray-800/60 py-2 px-3 rounded-md cursor-pointer"
                       }
                       onClick={() => setGroupNameModal(true)}
                     >
diff --git a/src/modules/groups/GroupFilterSelector.tsx b/src/modules/groups/GroupFilterSelector.tsx
index 8b219f377..b34935f8a 100644
--- a/src/modules/groups/GroupFilterSelector.tsx
+++ b/src/modules/groups/GroupFilterSelector.tsx
@@ -77,7 +77,7 @@ export function GroupFilterSelector({
         </Button>
       </PopoverTrigger>
       <PopoverContent
-        className="w-full p-0 shadow-sm  shadow-nb-gray-950"
+        className="w-full p-0 shadow-sm  dark:shadow-nb-gray-950"
         style={{
           width: popoverWidth === "auto" ? width : popoverWidth,
         }}
diff --git a/src/modules/groups/SingleGroupSelector.tsx b/src/modules/groups/SingleGroupSelector.tsx
index c570a5964..75a35af05 100644
--- a/src/modules/groups/SingleGroupSelector.tsx
+++ b/src/modules/groups/SingleGroupSelector.tsx
@@ -60,7 +60,7 @@ export const SingleGroupSelector = ({
       </div>
       <PopoverContent
         hideWhenDetached={false}
-        className={cn("w-full p-0 m-0 shadow-sm shadow-nb-gray-950")}
+        className={cn("w-full p-0 m-0 shadow-sm dark:shadow-nb-gray-950")}
         style={{
           width: popoverWidth + "px",
         }}
diff --git a/src/modules/groups/table/GroupsNameCell.tsx b/src/modules/groups/table/GroupsNameCell.tsx
index dd212d8ce..426782e24 100644
--- a/src/modules/groups/table/GroupsNameCell.tsx
+++ b/src/modules/groups/table/GroupsNameCell.tsx
@@ -15,7 +15,7 @@ export default function GroupsNameCell({ active, group }: Readonly<Props>) {
     <div className={""}>
       <div
         className={
-          "inline-flex items-center justify-start text-neutral-300 gap-2.5 py-2 px-3 pr-4 hover:bg-nb-gray-800/60 cursor-pointer rounded-md"
+          "inline-flex items-center justify-start text-nb-gray-300 gap-2.5 py-2 px-3 pr-4 hover:bg-nb-gray-800/60 cursor-pointer rounded-md"
         }
         onClick={() => router.push("/group?id=" + group.id)}
       >
diff --git a/src/modules/instance-setup/InstanceSetupWizard.tsx b/src/modules/instance-setup/InstanceSetupWizard.tsx
index 5176cfb5a..031446594 100644
--- a/src/modules/instance-setup/InstanceSetupWizard.tsx
+++ b/src/modules/instance-setup/InstanceSetupWizard.tsx
@@ -170,7 +170,7 @@ export default function InstanceSetupWizard() {
             }
           >
             You are being redirected to login in{" "}
-            <span className={"text-white font-medium"}>{countdown}s</span>...
+            <span className={"text-nb-gray-100 font-medium"}>{countdown}s</span>...
           </div>
           <div className={"flex items-center justify-center mt-4"}>
             <Button
diff --git a/src/modules/networks/misc/NetworkInformationSquare.tsx b/src/modules/networks/misc/NetworkInformationSquare.tsx
index 69ff61925..9bec8fbd0 100644
--- a/src/modules/networks/misc/NetworkInformationSquare.tsx
+++ b/src/modules/networks/misc/NetworkInformationSquare.tsx
@@ -21,9 +21,9 @@ export const NetworkInformationSquare = ({
   return (
     <button
       className={cn(
-        "flex w-full min-w-0 items-center max-w-[450px] gap-4 dark:text-neutral-300 text-neutral-500 transition-all group/network rounded-md",
+        "flex w-full min-w-0 items-center max-w-[450px] gap-4 text-nb-gray-300 transition-all group/network rounded-md",
         onClick
-          ? "hover:text-neutral-100 hover:bg-nb-gray-900/60 cursor-pointer py-2 pl-3 pr-14 relative"
+          ? "hover:text-nb-gray-100 hover:bg-nb-gray-900/60 cursor-pointer py-2 pl-3 pr-14 relative"
           : "cursor-default",
       )}
       onClick={onClick}
diff --git a/src/modules/networks/resources/NetworkResourceModal.tsx b/src/modules/networks/resources/NetworkResourceModal.tsx
index 418331929..bed96d37b 100644
--- a/src/modules/networks/resources/NetworkResourceModal.tsx
+++ b/src/modules/networks/resources/NetworkResourceModal.tsx
@@ -384,7 +384,7 @@ export function ResourceModalContent({
                       {groupPolicyCount > 0 && (
                         <Callout variant={"info"} className={"mt-3"}>
                           Your selected resource groups are used in{" "}
-                          <span className="text-white font-medium">
+                          <span className="text-sky-900 dark:text-white font-medium">
                             {groupPolicyCount} Access Control{" "}
                             {groupPolicyCount === 1 ? "Policy" : "Policies"}
                           </span>
diff --git a/src/modules/networks/resources/ResourceNameCell.tsx b/src/modules/networks/resources/ResourceNameCell.tsx
index 01490fcb4..b9d2b8c63 100644
--- a/src/modules/networks/resources/ResourceNameCell.tsx
+++ b/src/modules/networks/resources/ResourceNameCell.tsx
@@ -35,8 +35,8 @@ export default function ResourceNameCell({ resource }: Readonly<Props>) {
       </div>
       <div
         className={cn(
-          "flex flex-col gap-0 text-neutral-300  font-light truncate",
-          "group-hover:text-neutral-100 text-left",
+          "flex flex-col gap-0 text-nb-gray-300  font-light truncate",
+          "group-hover:text-nb-gray-100 text-left",
         )}
       >
         <TextWithTooltip
diff --git a/src/modules/onboarding/OnboardingDevices.tsx b/src/modules/onboarding/OnboardingDevices.tsx
index de8483dc1..34b868e31 100644
--- a/src/modules/onboarding/OnboardingDevices.tsx
+++ b/src/modules/onboarding/OnboardingDevices.tsx
@@ -94,7 +94,6 @@ export const OnboardingDevices = ({
                 : "bg-nb-gray-600",
             )}
             height={"30px"}
-            bg={"#1c1d21"}
             config={["4px", "4px", "8px", "7.5px"]}
           />
         )}
@@ -110,7 +109,6 @@ export const OnboardingDevices = ({
                 : "bg-nb-gray-600",
             )}
             height={firstDevice && firstRoutingPeer ? "65px" : "25px"}
-            bg={"#1c1d21"}
           />
         )}
         <DeviceCard device={firstDevice} />
@@ -159,10 +157,12 @@ export const WaitingForDevice = ({
   );
 };
 
+// `bg` paints the gaps between dashes, so it must match the surface the line
+// sits on (the bg-nb-gray-940 cards above) in both themes.
 const Line = ({
   className,
   height = "100%",
-  bg = "#1c1d21",
+  bg = "rgb(var(--nb-gray-940))",
   config = ["2px", "3px", "6px", "8.2px"],
 }: {
   className?: string;
diff --git a/src/modules/onboarding/agent-network/OnboardingAgentProvider.tsx b/src/modules/onboarding/agent-network/OnboardingAgentProvider.tsx
index 1f717a3a7..c1a256b26 100644
--- a/src/modules/onboarding/agent-network/OnboardingAgentProvider.tsx
+++ b/src/modules/onboarding/agent-network/OnboardingAgentProvider.tsx
@@ -104,7 +104,7 @@ const EndpointPanel = ({
         <button
           type={"button"}
           className={
-            "inline-flex items-center gap-1.5 rounded-md border border-nb-gray-700 bg-nb-gray-800/60 px-2.5 py-1.5 text-[11px] font-medium text-nb-gray-200 hover:bg-nb-gray-800 hover:text-white transition-colors shrink-0"
+            "inline-flex items-center gap-1.5 rounded-md border border-nb-gray-700 bg-nb-gray-800/60 px-2.5 py-1.5 text-[11px] font-medium text-nb-gray-300 dark:text-nb-gray-200 hover:bg-nb-gray-800 dark:hover:text-white transition-colors shrink-0"
           }
           onClick={() => copy("Endpoint copied to clipboard")}
           aria-label={"Copy endpoint"}
diff --git a/src/modules/onboarding/networks/OnboardingTestResource.tsx b/src/modules/onboarding/networks/OnboardingTestResource.tsx
index 4298bd924..8551beb10 100644
--- a/src/modules/onboarding/networks/OnboardingTestResource.tsx
+++ b/src/modules/onboarding/networks/OnboardingTestResource.tsx
@@ -59,7 +59,7 @@ export const OnboardingTestResource = ({
         <Steps.Step step={1}>
           <p className={"!text-nb-gray-300"}>
             Open your command line and run this command from{" "}
-            <span className={cn(device && "text-white")}>
+            <span className={cn(device && "text-nb-gray-100")}>
               {device?.name || "your device"}
             </span>{" "}
             to ping your resource.
diff --git a/src/modules/onboarding/p2p/OnboardingTestP2P.tsx b/src/modules/onboarding/p2p/OnboardingTestP2P.tsx
index dbcfaa526..9e42e5eab 100644
--- a/src/modules/onboarding/p2p/OnboardingTestP2P.tsx
+++ b/src/modules/onboarding/p2p/OnboardingTestP2P.tsx
@@ -42,8 +42,8 @@ export const OnboardingTestP2P = ({
         <Steps.Step step={1}>
           <p className={"!text-nb-gray-300"}>
             Run this command from{" "}
-            <span className={"text-white"}>{firstDevice?.name}</span> to ping{" "}
-            <span className={"text-white"}>{secondDevice?.name}</span>.
+            <span className={"text-nb-gray-100"}>{firstDevice?.name}</span> to ping{" "}
+            <span className={"text-nb-gray-100"}>{secondDevice?.name}</span>.
             You should receive a response if the connection is working.
           </p>
           <Code message={"Command has been copied successfully"}>
diff --git a/src/modules/peer/AddRouteDropdownButton.tsx b/src/modules/peer/AddRouteDropdownButton.tsx
index 72407f58f..87612b2fd 100644
--- a/src/modules/peer/AddRouteDropdownButton.tsx
+++ b/src/modules/peer/AddRouteDropdownButton.tsx
@@ -61,7 +61,9 @@ export default function AddRouteDropdownButton() {
                 size={"small"}
               />
               <div className={"flex flex-col text-left"}>
-                <div className={"text-left text-white"}>New Network Route</div>
+                <div className={"text-left text-nb-gray-100"}>
+                  New Network Route
+                </div>
                 <div className={"text-xs"}>
                   Create a new network route with this peer
                 </div>
@@ -83,7 +85,7 @@ export default function AddRouteDropdownButton() {
                 size={"small"}
               />
               <div className={"flex flex-col text-left"}>
-                <div className={"text-left text-white"}>Existing Network</div>
+                <div className={"text-left text-nb-gray-100"}>Existing Network</div>
                 <div className={"text-xs"}>
                   Add this peer to an existing network
                 </div>
diff --git a/src/modules/peer/RemoteJobDropdownButton.tsx b/src/modules/peer/RemoteJobDropdownButton.tsx
index 5c10d9a1f..5cda1b124 100644
--- a/src/modules/peer/RemoteJobDropdownButton.tsx
+++ b/src/modules/peer/RemoteJobDropdownButton.tsx
@@ -53,7 +53,7 @@ export const RemoteJobDropdownButton = () => {
               >
                 <div>
                   Peer{" "}
-                  <span className={"text-white font-medium"}>{peer.name}</span>{" "}
+                  <span className={"text-nb-gray-100 font-medium"}>{peer.name}</span>{" "}
                   is currently offline. Please connect the peer to run remote
                   jobs.
                 </div>
@@ -73,7 +73,7 @@ export const RemoteJobDropdownButton = () => {
                 size={"small"}
               />
               <div className={"flex flex-col text-left"}>
-                <div className={"text-left text-white"}>Debug Bundle</div>
+                <div className={"text-left text-nb-gray-100"}>Debug Bundle</div>
                 <div className={"text-xs"}>
                   Collect debug information for troubleshooting
                 </div>
diff --git a/src/modules/peers/PeerActionCell.tsx b/src/modules/peers/PeerActionCell.tsx
index 095cd1747..6fd0c8969 100644
--- a/src/modules/peers/PeerActionCell.tsx
+++ b/src/modules/peers/PeerActionCell.tsx
@@ -199,7 +199,7 @@ export default function PeerActionCell() {
             e.preventDefault();
           }}
         >
-          <Button variant={"secondary"} className={"!px-3"}>
+          <Button variant={"secondary"} className={"!px-3"} border={0}>
             <MoreVertical size={16} className={"shrink-0"} />
           </Button>
         </DropdownMenuTrigger>
diff --git a/src/modules/peers/PeerAddressCell.tsx b/src/modules/peers/PeerAddressCell.tsx
index c6babf416..3bebb1ef5 100644
--- a/src/modules/peers/PeerAddressCell.tsx
+++ b/src/modules/peers/PeerAddressCell.tsx
@@ -54,7 +54,7 @@ export default function PeerAddressCell({ peer }: Props) {
             <RoundedFlag country={peer.country_code} size={12} />
           )}
         </div>
-        <div className="flex flex-col gap-0 dark:text-neutral-300 text-neutral-500 font-light truncate">
+        <div className="flex flex-col gap-0 text-nb-gray-300 font-light truncate">
           <CopyToClipboardText
             message={"DNS label has been copied to your clipboard"}
             textToCopy={peer.dns_label}
@@ -65,7 +65,7 @@ export default function PeerAddressCell({ peer }: Props) {
             message={"IP address has been copied to your clipboard"}
           >
             <span
-              className={"dark:text-nb-gray-400 font-mono font-thin text-xs"}
+              className={"text-nb-gray-400 font-mono font-thin text-xs"}
             >
               {peer.ip}
             </span>
diff --git a/src/modules/peers/PeerConnectButton.tsx b/src/modules/peers/PeerConnectButton.tsx
index 5717ea33b..743295791 100644
--- a/src/modules/peers/PeerConnectButton.tsx
+++ b/src/modules/peers/PeerConnectButton.tsx
@@ -63,7 +63,7 @@ const ConnectButton = ({ disabled }: { disabled?: boolean }) => {
   return (
     <button
       className={cn(
-        "flex gap-2 items-center text-sm text-nb-gray-300 hover:text-white disabled:cursor-not-allowed enabled:cursor-pointer enabled:hover:bg-nb-gray-800/60 rounded-md py-2 px-3 disabled:text-nb-gray-700",
+        "flex gap-2 items-center text-sm text-nb-gray-300 hover:text-nb-gray-100 disabled:cursor-not-allowed enabled:cursor-pointer enabled:hover:bg-nb-gray-800/60 rounded-md py-2 px-3 disabled:text-nb-gray-700",
         // group data state open
         "group-data-[state=open]:bg-nb-gray-800/30",
       )}
diff --git a/src/modules/peers/PeerLastSeenCell.tsx b/src/modules/peers/PeerLastSeenCell.tsx
index da1e3c58c..d930f43b7 100644
--- a/src/modules/peers/PeerLastSeenCell.tsx
+++ b/src/modules/peers/PeerLastSeenCell.tsx
@@ -12,7 +12,7 @@ export default function PeerLastSeenCell({ peer }: Props) {
   ) : (
     <div
       className={
-        "flex items-center whitespace-nowrap gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all py-2 px-3 rounded-md"
+        "flex items-center whitespace-nowrap gap-2 text-nb-gray-300 hover:text-nb-gray-100 transition-all py-2 px-3 rounded-md"
       }
     >
       <>
diff --git a/src/modules/peers/PeerMultiSelect.tsx b/src/modules/peers/PeerMultiSelect.tsx
index 291b78aaf..6a407a2a3 100644
--- a/src/modules/peers/PeerMultiSelect.tsx
+++ b/src/modules/peers/PeerMultiSelect.tsx
@@ -447,7 +447,7 @@ const PeerGroupMassAssignmentContent = ({
                 <div className={"flex gap-2 items-center"}>
                   <MonitorSmartphoneIcon size={16} className={""} />
                   <span>
-                    <span className={"font-medium text-white"}>
+                    <span className={"font-medium text-nb-gray-100"}>
                       {peerCount}
                     </span>{" "}
                     Peer(s) selected
diff --git a/src/modules/peers/PeerNameCell.tsx b/src/modules/peers/PeerNameCell.tsx
index 06d941d3d..c422058ef 100644
--- a/src/modules/peers/PeerNameCell.tsx
+++ b/src/modules/peers/PeerNameCell.tsx
@@ -31,9 +31,9 @@ export default function PeerNameCell({ peer, linkToPeer = true }: Props) {
     <div>
       <div
         className={cn(
-          "flex items-center max-w-[280px] gap-2 dark:text-neutral-300 text-neutral-500 transition-all py-2 px-3 rounded-md ",
+          "flex items-center max-w-[280px] gap-2 text-nb-gray-300 transition-all py-2 px-3 rounded-md ",
           linkToPeer &&
-            "hover:text-neutral-100 hover:bg-nb-gray-900/60 cursor-pointer",
+            "hover:text-nb-gray-100 hover:bg-nb-gray-900/60 cursor-pointer",
         )}
         data-testid="peer-name-cell"
         aria-label={`View details of peer ${peer.name}`}
diff --git a/src/modules/peers/PeerOSCell.tsx b/src/modules/peers/PeerOSCell.tsx
index 598d4d85a..23b574dde 100644
--- a/src/modules/peers/PeerOSCell.tsx
+++ b/src/modules/peers/PeerOSCell.tsx
@@ -26,7 +26,7 @@ export function PeerOSCell({ os, serial }: Readonly<Props>) {
         <TooltipTrigger>
           <div
             className={
-              "flex items-center gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 py-2 px-3 rounded-md"
+              "flex items-center gap-2 text-nb-gray-300 hover:text-nb-gray-100 transition-all hover:bg-nb-gray-800/60 py-2 px-3 rounded-md"
             }
           >
             <div
diff --git a/src/modules/peers/PeerVersionCell.tsx b/src/modules/peers/PeerVersionCell.tsx
index 6daffb64f..97659d137 100644
--- a/src/modules/peers/PeerVersionCell.tsx
+++ b/src/modules/peers/PeerVersionCell.tsx
@@ -52,7 +52,7 @@ export default function PeerVersionCell({
         <TooltipProvider>
           <Tooltip delayDuration={10}>
             <TooltipTrigger>
-              <div className="flex gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all rounded-md items-center">
+              <div className="flex gap-2 text-nb-gray-300 hover:text-nb-gray-100 transition-all rounded-md items-center">
                 <MemoizedNetBirdIcon />
                 {version == "development" ? "dev" : version}
                 <div className={"relative"}>
@@ -77,7 +77,7 @@ export default function PeerVersionCell({
 
               <div
                 className={
-                  "text-neutral-300 flex flex-col gap-1 max-w-[300px] text-xs mt-1"
+                  "text-nb-gray-300 flex flex-col gap-1 max-w-[300px] text-xs mt-1"
                 }
               >
                 A new version of Netbird is available. Please update your client
@@ -95,7 +95,7 @@ export default function PeerVersionCell({
           </Tooltip>
         </TooltipProvider>
       ) : (
-        <div className="inline-flex gap-2 dark:text-neutral-300 text-neutral-500 items-center">
+        <div className="inline-flex gap-2 text-nb-gray-300 items-center">
           <MemoizedNetBirdIcon />
           {version == "development" ? "dev" : version}
         </div>
@@ -114,7 +114,7 @@ export default function PeerVersionCell({
         >
           <div
             className={
-              "flex items-center gap-2 text-neutral-300 whitespace-nowrap"
+              "flex items-center gap-2 text-nb-gray-300 whitespace-nowrap"
             }
           >
             <PeerOperatingSystemIcon os={os} />
diff --git a/src/modules/posture-checks/checks/PostureCheckOperatingSystem.tsx b/src/modules/posture-checks/checks/PostureCheckOperatingSystem.tsx
index 558dc4668..18b1e66a5 100644
--- a/src/modules/posture-checks/checks/PostureCheckOperatingSystem.tsx
+++ b/src/modules/posture-checks/checks/PostureCheckOperatingSystem.tsx
@@ -64,7 +64,7 @@ export const PostureCheckOperatingSystem = ({
       description={
         "Restrict access in your network based on the operating system."
       }
-      iconClass={"bg-gradient-to-tr from-nb-gray-500 to-nb-gray-300"}
+      iconClass={"bg-gradient-to-tr from-[#616E79] to-[#7C8994]"}
       active={value !== undefined}
       onReset={() => onChange(undefined)}
     >
diff --git a/src/modules/posture-checks/checks/PostureCheckProcess.tsx b/src/modules/posture-checks/checks/PostureCheckProcess.tsx
index f592c13c9..26e333669 100644
--- a/src/modules/posture-checks/checks/PostureCheckProcess.tsx
+++ b/src/modules/posture-checks/checks/PostureCheckProcess.tsx
@@ -41,7 +41,7 @@ export const PostureCheckProcess = ({ value, onChange, disabled }: Props) => {
         "Restrict access in your network based on running processes of a peer."
       }
       icon={<ServerCogIcon size={18} />}
-      iconClass={"bg-gradient-to-tr from-nb-gray-500 to-nb-gray-300"}
+      iconClass={"bg-gradient-to-tr from-[#616E79] to-[#7C8994]"}
       modalWidthClass={"max-w-xl"}
       onReset={() => onChange(undefined)}
     >
diff --git a/src/modules/posture-checks/checks/tooltips/GeoLocationTooltip.tsx b/src/modules/posture-checks/checks/tooltips/GeoLocationTooltip.tsx
index 08e79194c..cf4e08a28 100644
--- a/src/modules/posture-checks/checks/tooltips/GeoLocationTooltip.tsx
+++ b/src/modules/posture-checks/checks/tooltips/GeoLocationTooltip.tsx
@@ -21,7 +21,7 @@ export const GeoLocationTooltip = ({ children, check }: Props) => {
       content={
         <div
           className={
-            "text-neutral-300 flex flex-col items-start text-sm gap-1 justify-start min-w-[200px]"
+            "text-nb-gray-300 flex flex-col items-start text-sm gap-1 justify-start min-w-[200px]"
           }
         >
           <div className={"px-4 pt-3"}>
diff --git a/src/modules/posture-checks/checks/tooltips/NetBirdVersionTooltip.tsx b/src/modules/posture-checks/checks/tooltips/NetBirdVersionTooltip.tsx
index 6589f5758..85df31535 100644
--- a/src/modules/posture-checks/checks/tooltips/NetBirdVersionTooltip.tsx
+++ b/src/modules/posture-checks/checks/tooltips/NetBirdVersionTooltip.tsx
@@ -12,7 +12,7 @@ export const NetBirdVersionTooltip = ({ version, children }: Props) => {
       className={"w-full"}
       interactive={false}
       content={
-        <div className={"text-neutral-300 flex items-center text-sm gap-1"}>
+        <div className={"text-nb-gray-300 flex items-center text-sm gap-1"}>
           <span className={""}>Min. Client Version</span>
 
           <span
diff --git a/src/modules/posture-checks/checks/tooltips/PeerNetworkRangeTooltip.tsx b/src/modules/posture-checks/checks/tooltips/PeerNetworkRangeTooltip.tsx
index 0cc7937e8..7fcb292a7 100644
--- a/src/modules/posture-checks/checks/tooltips/PeerNetworkRangeTooltip.tsx
+++ b/src/modules/posture-checks/checks/tooltips/PeerNetworkRangeTooltip.tsx
@@ -17,7 +17,7 @@ export const PeerNetworkRangeTooltip = ({ check, children }: Props) => {
       contentClassName={"p-0"}
       content={
         <div
-          className={"text-neutral-300 text-sm max-w-xs flex flex-col gap-1"}
+          className={"text-nb-gray-300 text-sm max-w-xs flex flex-col gap-1"}
         >
           <div className={"px-4 pt-3"}>
             {check.action == "allow" ? (
diff --git a/src/modules/posture-checks/checks/tooltips/ProcessTooltip.tsx b/src/modules/posture-checks/checks/tooltips/ProcessTooltip.tsx
index dc46bc52e..93c78dc57 100644
--- a/src/modules/posture-checks/checks/tooltips/ProcessTooltip.tsx
+++ b/src/modules/posture-checks/checks/tooltips/ProcessTooltip.tsx
@@ -21,7 +21,7 @@ export const ProcessTooltip = ({ check, children }: Props) => {
       content={
         <div
           className={
-            "text-neutral-300 text-sm max-w-xs flex flex-col gap-1 min-w-0"
+            "text-nb-gray-300 text-sm max-w-xs flex flex-col gap-1 min-w-0"
           }
         >
           <div className={"px-4 pt-3"}>
diff --git a/src/modules/posture-checks/table/cells/PostureCheckChecksCell.tsx b/src/modules/posture-checks/table/cells/PostureCheckChecksCell.tsx
index 6e845cd7d..9aab3c89d 100644
--- a/src/modules/posture-checks/table/cells/PostureCheckChecksCell.tsx
+++ b/src/modules/posture-checks/table/cells/PostureCheckChecksCell.tsx
@@ -32,7 +32,7 @@ export const PostureCheckChecksCell = ({
           className,
         )}
       >
-        <div className={"flex -space-x-2 "}>
+        <div className={"flex -space-x-2 text-white"}>
           {check.checks.nb_version_check && (
             <NetBirdVersionTooltip
               version={check.checks.nb_version_check.min_version}
@@ -63,7 +63,7 @@ export const PostureCheckChecksCell = ({
             <OperatingSystemTooltip check={check.checks.os_version_check}>
               <div
                 className={cn(
-                  "bg-gradient-to-tr from-nb-gray-500 to-nb-gray-300 h-8 w-8 rounded-full flex items-center justify-center relative z-[8] hover:scale-[1.1] transition-all",
+                  "bg-gradient-to-tr from-[#616E79] to-[#7C8994] h-8 w-8 rounded-full flex items-center justify-center relative z-[8] hover:scale-[1.1] transition-all",
                 )}
               >
                 <Disc3Icon size={14} />
@@ -89,7 +89,7 @@ export const PostureCheckChecksCell = ({
             <ProcessTooltip check={check.checks.process_check}>
               <div
                 className={cn(
-                  "bg-gradient-to-tr from-nb-gray-500 to-nb-gray-300 h-8 w-8 rounded-full flex items-center justify-center relative z-[8] hover:scale-[1.1] transition-all",
+                  "bg-gradient-to-tr from-[#616E79] to-[#7C8994] h-8 w-8 rounded-full flex items-center justify-center relative z-[8] hover:scale-[1.1] transition-all",
                 )}
               >
                 <ServerCogIcon size={14} />
diff --git a/src/modules/posture-checks/ui/PostureCheckCard.tsx b/src/modules/posture-checks/ui/PostureCheckCard.tsx
index e058e7fec..a283e166b 100644
--- a/src/modules/posture-checks/ui/PostureCheckCard.tsx
+++ b/src/modules/posture-checks/ui/PostureCheckCard.tsx
@@ -69,7 +69,7 @@ export const PostureCheckCard = ({
         <div className={"flex gap-4 items-center w-full px-4 py-3"}>
           <div
             className={cn(
-              "h-9 w-9 shrink-0  shadow-xl  rounded-md flex items-center justify-center select-none",
+              "h-9 w-9 shrink-0  shadow-xl  rounded-md flex items-center justify-center select-none text-white",
               iconClass,
             )}
           >
@@ -95,7 +95,7 @@ export const PostureCheckCard = ({
               className={cn(
                 "text-[10px] rounded-full px-1 py-1 flex items-center gap-1 w-[50px] justify-center uppercase font-medium",
                 active
-                  ? "text-green-400 bg-green-900 hover:bg-green-800 transition-all hover:text-green-200"
+                  ? "text-green-700 bg-green-100 hover:bg-green-200 hover:text-green-800 transition-all dark:text-green-400 dark:bg-green-900 dark:hover:bg-green-800 dark:hover:text-green-200"
                   : "text-nb-gray-400 bg-nb-gray-900",
               )}
               onClick={(e) => {
@@ -129,7 +129,7 @@ export const PostureCheckCard = ({
           <div className={"flex gap-4 items-center px-8 pb-5"}>
             <div
               className={cn(
-                "h-9 w-9 shrink-0  shadow-xl  rounded-md flex items-center justify-center select-none",
+                "h-9 w-9 shrink-0  shadow-xl  rounded-md flex items-center justify-center select-none text-white",
                 iconClass,
               )}
             >
diff --git a/src/modules/posture-checks/ui/PostureCheckIcons.tsx b/src/modules/posture-checks/ui/PostureCheckIcons.tsx
index 052102418..1424d59a7 100644
--- a/src/modules/posture-checks/ui/PostureCheckIcons.tsx
+++ b/src/modules/posture-checks/ui/PostureCheckIcons.tsx
@@ -39,7 +39,7 @@ export const PostureCheckIcons = () => {
         </div>
       </Circle>
       <Circle className={"z-[1] top-2 "}>
-        <FaWindows className={"text-white text-md"} />
+        <FaWindows className={"text-nb-gray-100 text-md"} />
       </Circle>
     </div>
   );
diff --git a/src/modules/remote-access/rdp/RDPCertificateModal.tsx b/src/modules/remote-access/rdp/RDPCertificateModal.tsx
index c9d057d6d..f899594a9 100644
--- a/src/modules/remote-access/rdp/RDPCertificateModal.tsx
+++ b/src/modules/remote-access/rdp/RDPCertificateModal.tsx
@@ -70,11 +70,11 @@ export const RDPCertificateModal = ({
             />
             <div className={"font-normal text-sm text-nb-gray-200"}>
               Always trust{" "}
-              <span className={"text-white font-medium"}>
+              <span className={"text-nb-gray-100 font-medium"}>
                 {'"' + certificate?.issuer?.replace("CN=", "") + '"'}
               </span>{" "}
               when connecting to{" "}
-              <span className={"text-white font-medium"}>
+              <span className={"text-nb-gray-100 font-medium"}>
                 {'"' + hostname + '"'}
               </span>
             </div>
diff --git a/src/modules/remote-access/ssh/Terminal.tsx b/src/modules/remote-access/ssh/Terminal.tsx
index fbfb15d2c..7490b035e 100644
--- a/src/modules/remote-access/ssh/Terminal.tsx
+++ b/src/modules/remote-access/ssh/Terminal.tsx
@@ -2,14 +2,24 @@
 
 import "@xterm/xterm/css/xterm.css";
 import { cn } from "@utils/helpers";
-import { useCallback, useEffect, useRef } from "react";
+import { useTheme } from "@/contexts/ThemeProvider";
+import { useCallback, useEffect, useMemo, useRef } from "react";
+
+const DARK_TERMINAL_THEME = {
+  background: "#181a1d",
+  foreground: "#e4e7e9",
+  cursor: "#e4e7e9",
+  selectionBackground: "#3a3f44",
+};
+
+const LIGHT_TERMINAL_THEME = {
+  background: "#ffffff",
+  foreground: "#1a1a1a",
+  cursor: "#1a1a1a",
+  selectionBackground: "#d4d4d4",
+};
 
 const TERMINAL_OPTIONS = {
-  theme: {
-    background: "#181a1d",
-    foreground: "#e4e7e9",
-    cursor: "#e4e7e9",
-  },
   fontFamily: 'Monaco, Menlo, "Ubuntu Mono", monospace',
   fontSize: 13,
   cursorBlink: true,
@@ -20,6 +30,7 @@ const TERMINAL_OPTIONS = {
 
 interface TerminalWithCore {
   _core?: { _isDisposed: boolean };
+  options: { theme?: Record<string, string> };
   dispose(): void;
   write(data: string | Uint8Array): void;
   writeln(data: string): void;
@@ -43,12 +54,26 @@ export const Terminal = ({
   onClose,
   className = "",
 }: SSHTerminalWrapperProps) => {
+  const { resolvedTheme } = useTheme();
   const terminalRef = useRef<HTMLDivElement>(null);
   const terminalInstanceRef = useRef<{
     terminal: TerminalWithCore;
     fitAddon: any;
   } | null>(null);
   const handlersSetRef = useRef(false);
+  // Guards the async setup so a re-run (e.g. from a prop change) can't start
+  // a second terminal while the first is still awaiting its imports.
+  const initializingRef = useRef(false);
+
+  const terminalTheme = useMemo(
+    () =>
+      resolvedTheme === "light" ? LIGHT_TERMINAL_THEME : DARK_TERMINAL_THEME,
+    [resolvedTheme],
+  );
+  // Read by initializeTerminal so a theme change doesn't recreate the
+  // callback chain (and with it the terminal); the effect below keeps a
+  // running terminal in sync instead.
+  const terminalThemeRef = useRef(terminalTheme);
 
   const fitTerminal = useCallback(() => {
     if (terminalInstanceRef.current?.fitAddon) {
@@ -62,7 +87,10 @@ export const Terminal = ({
     const { Terminal: XTerminal } = await import("@xterm/xterm");
     const { FitAddon } = await import("@xterm/addon-fit");
 
-    const terminal = new XTerminal(TERMINAL_OPTIONS);
+    const terminal = new XTerminal({
+      ...TERMINAL_OPTIONS,
+      theme: terminalThemeRef.current,
+    });
 
     const fitAddon = new FitAddon();
     terminal.loadAddon(fitAddon);
@@ -93,9 +121,15 @@ export const Terminal = ({
   }, [fitTerminal]);
 
   const setupSSHHandlers = useCallback(async () => {
-    if (!session || handlersSetRef.current) return;
-
-    const terminal = await initializeTerminal();
+    if (!session || handlersSetRef.current || initializingRef.current) return;
+
+    initializingRef.current = true;
+    let terminal: TerminalWithCore | undefined;
+    try {
+      terminal = await initializeTerminal();
+    } finally {
+      initializingRef.current = false;
+    }
     if (!terminal) return;
 
     handlersSetRef.current = true;
@@ -149,6 +183,16 @@ export const Terminal = ({
     setupSSHHandlers().then();
   }, [setupSSHHandlers]);
 
+  // Apply theme changes to an already-running terminal, and remember the
+  // latest theme for one that is still initializing.
+  useEffect(() => {
+    terminalThemeRef.current = terminalTheme;
+    const terminal = terminalInstanceRef.current?.terminal;
+    if (terminal && !terminal._core?._isDisposed) {
+      terminal.options.theme = terminalTheme;
+    }
+  }, [terminalTheme]);
+
   // Cleanup on unmount
   useEffect(() => {
     return () => {
diff --git a/src/modules/reverse-proxy/ReverseProxyCrowdSecIPReputation.tsx b/src/modules/reverse-proxy/ReverseProxyCrowdSecIPReputation.tsx
index a66eee3b1..b123a2da6 100644
--- a/src/modules/reverse-proxy/ReverseProxyCrowdSecIPReputation.tsx
+++ b/src/modules/reverse-proxy/ReverseProxyCrowdSecIPReputation.tsx
@@ -69,8 +69,8 @@ export const ReverseProxyCrowdSecIPReputation = ({
           <Label>CrowdSec IP Reputation</Label>
           <HelpText>
             Detect malicious IPs with CrowdSec.{" "}
-            <b className={"text-white"}>Enforce</b> to block them or{" "}
-            <b className={"text-white"}>Observe</b> to only log without
+            <b className={"text-nb-gray-100"}>Enforce</b> to block them or{" "}
+            <b className={"text-nb-gray-100"}>Observe</b> to only log without
             blocking.
           </HelpText>
         </div>
diff --git a/src/modules/reverse-proxy/clusters/ClusterCloudDeploy.tsx b/src/modules/reverse-proxy/clusters/ClusterCloudDeploy.tsx
index 6dfae9747..0796d43ea 100644
--- a/src/modules/reverse-proxy/clusters/ClusterCloudDeploy.tsx
+++ b/src/modules/reverse-proxy/clusters/ClusterCloudDeploy.tsx
@@ -311,7 +311,10 @@ const DeploySuccess = ({
   return (
     <div className={"flex flex-col gap-4"}>
       <Callout variant={"info"}>
-        {resourceLabel} <span className={"text-white font-medium"}>{name}</span>{" "}
+        {resourceLabel}{" "}
+        <span className={"text-sky-900 dark:text-white font-medium"}>
+          {name}
+        </span>{" "}
         was created
         {ip ? (
           <>
diff --git a/src/modules/reverse-proxy/clusters/ClusterTypeIndicator.tsx b/src/modules/reverse-proxy/clusters/ClusterTypeIndicator.tsx
index 10cd2cdfb..7c54e52b9 100644
--- a/src/modules/reverse-proxy/clusters/ClusterTypeIndicator.tsx
+++ b/src/modules/reverse-proxy/clusters/ClusterTypeIndicator.tsx
@@ -19,7 +19,7 @@ export const ClusterTypeIndicator = ({ cluster }: Props) => {
       <FullTooltip
         content={
           <div className={"text-xs max-w-xs"}>
-            <span className={"font-medium text-white"}>Account cluster.</span>{" "}
+            <span className={"font-medium text-nb-gray-100"}>Account cluster.</span>{" "}
             Self-hosted on your own infrastructure — you operate the proxy
             nodes and control where traffic terminates.
           </div>
@@ -33,7 +33,7 @@ export const ClusterTypeIndicator = ({ cluster }: Props) => {
     <FullTooltip
       content={
         <div className={"text-xs max-w-xs"}>
-          <span className={"font-medium text-white"}>Shared cluster.</span>{" "}
+          <span className={"font-medium text-nb-gray-100"}>Shared cluster.</span>{" "}
           Deployed at the server level and available to every account on this
           instance.
         </div>
diff --git a/src/modules/reverse-proxy/clusters/ClustersFeaturesCell.tsx b/src/modules/reverse-proxy/clusters/ClustersFeaturesCell.tsx
index 567127c17..791b4e68e 100644
--- a/src/modules/reverse-proxy/clusters/ClustersFeaturesCell.tsx
+++ b/src/modules/reverse-proxy/clusters/ClustersFeaturesCell.tsx
@@ -55,9 +55,9 @@ export default function ClustersFeaturesCell({ cluster }: Readonly<Props>) {
         <>
           Lets you publish services that are only reachable from peers in your
           NetBird network. Required for{" "}
-          <span className={"font-medium text-white"}>NetBird-Only Access</span>{" "}
+          <span className={"font-medium text-nb-gray-100"}>NetBird-Only Access</span>{" "}
           and{" "}
-          <span className={"font-medium text-white"}>Proxy Cluster</span>{" "}
+          <span className={"font-medium text-nb-gray-100"}>Proxy Cluster</span>{" "}
           target types.
         </>
       ),
@@ -76,7 +76,7 @@ export default function ClustersFeaturesCell({ cluster }: Readonly<Props>) {
           key={f.key}
           content={
             <div className={"text-xs max-w-xs"}>
-              <div className={"font-medium text-white"}>{f.label}</div>
+              <div className={"font-medium text-nb-gray-100"}>{f.label}</div>
               <div className={"text-nb-gray-300 mt-1"}>{f.description}</div>
             </div>
           }
diff --git a/src/modules/reverse-proxy/clusters/ClustersModal.tsx b/src/modules/reverse-proxy/clusters/ClustersModal.tsx
index 9c6805092..4b3eae936 100644
--- a/src/modules/reverse-proxy/clusters/ClustersModal.tsx
+++ b/src/modules/reverse-proxy/clusters/ClustersModal.tsx
@@ -386,16 +386,16 @@ spec:
                   the following requirements:
                   <ul className={"list-disc pl-4 mt-2 flex flex-col gap-1"}>
                     <li>
-                      <span className={"text-white font-medium"}>
+                      <span className={"text-sky-900 dark:text-white font-medium"}>
                         Publicly accessible IP address
                       </span>
                     </li>
                     <li>
-                      <span className={"text-white font-medium"}>Docker</span>{" "}
+                      <span className={"text-sky-900 dark:text-white font-medium"}>Docker</span>{" "}
                       installed and running
                     </li>
                     <li>
-                      <span className={"text-white font-medium"}>
+                      <span className={"text-sky-900 dark:text-white font-medium"}>
                         Port 80 and 443
                       </span>{" "}
                       open and not in use
diff --git a/src/modules/reverse-proxy/events/ReverseProxyEventsRequestCell.tsx b/src/modules/reverse-proxy/events/ReverseProxyEventsRequestCell.tsx
index 3d32c1ba2..dd2c40e2a 100644
--- a/src/modules/reverse-proxy/events/ReverseProxyEventsRequestCell.tsx
+++ b/src/modules/reverse-proxy/events/ReverseProxyEventsRequestCell.tsx
@@ -45,7 +45,7 @@ export const ReverseProxyEventsUrlCell = ({ event, service }: Props) => {
       side={"top"}
       sideOffset={10}
       tooltipContent={
-        <div className="max-w-sm break-all whitespace-normal text-xs text-neutral-300">
+        <div className="max-w-sm break-all whitespace-normal text-xs text-nb-gray-300">
           {fullUrl}
         </div>
       }
diff --git a/src/modules/reverse-proxy/events/ReverseProxyEventsTimeCell.tsx b/src/modules/reverse-proxy/events/ReverseProxyEventsTimeCell.tsx
index 43ebf4cca..628f3666f 100644
--- a/src/modules/reverse-proxy/events/ReverseProxyEventsTimeCell.tsx
+++ b/src/modules/reverse-proxy/events/ReverseProxyEventsTimeCell.tsx
@@ -19,7 +19,7 @@ export const ReverseProxyEventsTimeCell = ({ timestamp, className }: Props) => {
         <div
           className={cn(
             "flex-col flex whitespace-nowrap",
-            "dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 py-2 px-3 rounded-md cursor-default",
+            "text-nb-gray-300 hover:text-nb-gray-100 py-2 px-3 rounded-md cursor-default",
           )}
         >
           <span className={"text-nb-gray-200 flex gap-2 items-center"}>
diff --git a/src/modules/reverse-proxy/events/ReverseProxyEventsUserCell.tsx b/src/modules/reverse-proxy/events/ReverseProxyEventsUserCell.tsx
index 7573e2ce0..5f16ab4a4 100644
--- a/src/modules/reverse-proxy/events/ReverseProxyEventsUserCell.tsx
+++ b/src/modules/reverse-proxy/events/ReverseProxyEventsUserCell.tsx
@@ -70,7 +70,7 @@ export const ReverseProxyEventsUserCell = ({ event }: Props) => {
     <div className={"flex items-center gap-2 py-2 px-3"}>
       <div
         className={
-          "w-8 h-8 rounded-full flex items-center justify-center text-white uppercase text-xs font-medium bg-nb-gray-900 shrink-0"
+          "w-8 h-8 rounded-full flex items-center justify-center text-neutral-700 dark:text-white uppercase text-xs font-medium bg-nb-gray-900 shrink-0"
         }
         style={{
           color: generateColorFromUser(identityForColor),
diff --git a/src/modules/reverse-proxy/table/ReverseProxyDestinationCell.tsx b/src/modules/reverse-proxy/table/ReverseProxyDestinationCell.tsx
index b4992853f..63975d65a 100644
--- a/src/modules/reverse-proxy/table/ReverseProxyDestinationCell.tsx
+++ b/src/modules/reverse-proxy/table/ReverseProxyDestinationCell.tsx
@@ -17,7 +17,7 @@ export default function ReverseProxyDestinationCell({
   return (
     <div
       className={cn(
-        "flex items-center gap-2 text-neutral-300 font-light truncate",
+        "flex items-center gap-2 text-nb-gray-300 font-light truncate",
         !target.enabled && "opacity-30",
       )}
     >
diff --git a/src/modules/reverse-proxy/targets/ReverseProxyTargetModal.tsx b/src/modules/reverse-proxy/targets/ReverseProxyTargetModal.tsx
index cba9987d4..e448fe257 100644
--- a/src/modules/reverse-proxy/targets/ReverseProxyTargetModal.tsx
+++ b/src/modules/reverse-proxy/targets/ReverseProxyTargetModal.tsx
@@ -355,22 +355,22 @@ export default function ReverseProxyTargetModal({
                             <div className="text-xs max-w-xs flex flex-col gap-2">
                               <div>
                                 When disabled, a request to e.g.,{" "}
-                                <span className="font-mono text-white">
+                                <span className="font-mono text-nb-gray-100">
                                   {targetPath}/users
                                 </span>{" "}
                                 is forwarded as{" "}
-                                <span className="font-mono text-white">
+                                <span className="font-mono text-nb-gray-100">
                                   /users
                                 </span>
                                 .
                               </div>
                               <div>
                                 When enabled, a request to e.g.,{" "}
-                                <span className="font-mono text-white">
+                                <span className="font-mono text-nb-gray-100">
                                   {targetPath}/users
                                 </span>{" "}
                                 is forwarded as{" "}
-                                <span className="font-mono text-white">
+                                <span className="font-mono text-nb-gray-100">
                                   {targetPath}/users
                                 </span>
                                 .
diff --git a/src/modules/reverse-proxy/targets/ReverseProxyTargetSelector.tsx b/src/modules/reverse-proxy/targets/ReverseProxyTargetSelector.tsx
index 240f5c8b3..1ff440a43 100644
--- a/src/modules/reverse-proxy/targets/ReverseProxyTargetSelector.tsx
+++ b/src/modules/reverse-proxy/targets/ReverseProxyTargetSelector.tsx
@@ -91,7 +91,7 @@ export default function ReverseProxyTargetSelector({
               className={"max-w-sm"}
               content={
                 <>
-                  A <span className={"text-white font-medium"}>peer</span> is a
+                  A <span className={"text-nb-gray-100 font-medium"}>peer</span> is a
                   machine (e.g., laptop, server, container) running NetBird.
                   Select a peer if your service runs directly on it.
                   <span className={"mt-1 block"}>
@@ -112,7 +112,7 @@ export default function ReverseProxyTargetSelector({
               className={"max-w-sm"}
               content={
                 <>
-                  A <span className={"text-white font-medium"}>resource</span>{" "}
+                  A <span className={"text-nb-gray-100 font-medium"}>resource</span>{" "}
                   is a destination (IP, subnet, or domain) that can&apos;t run
                   NetBird directly. Resources are part of a network and are
                   reached through a routing peer that forwards traffic to them.
@@ -134,7 +134,7 @@ export default function ReverseProxyTargetSelector({
                   className={"max-w-sm"}
                   content={
                     <>
-                      A <span className={"text-white font-medium"}>
+                      A <span className={"text-nb-gray-100 font-medium"}>
                         proxy cluster
                       </span>{" "}
                       forwards inbound traffic to an upstream the proxy reaches
diff --git a/src/modules/settings/ClientSettingsTab.tsx b/src/modules/settings/ClientSettingsTab.tsx
index 6d71ab41b..755c323dc 100644
--- a/src/modules/settings/ClientSettingsTab.tsx
+++ b/src/modules/settings/ClientSettingsTab.tsx
@@ -275,7 +275,7 @@ function ClientSettingsTabContent({ account }: Readonly<Props>) {
               Configure how NetBird clients receive update notifications. When
               enabled, users will be prompted to install the selected version.
               This requires at least NetBird{" "}
-              <span className={"text-white font-medium"}>v0.61.0</span>.{" "}
+              <span className={"text-nb-gray-100 font-medium"}>v0.61.0</span>.{" "}
               <InlineLink
                 href={"https://docs.netbird.io/manage/peers/auto-update"}
                 target={"_blank"}
@@ -349,7 +349,7 @@ function ClientSettingsTabContent({ account }: Readonly<Props>) {
               <HelpText>
                 Allow peers to expose local services through the NetBird reverse
                 proxy using the CLI. <br /> This requires at least NetBird{" "}
-                <span className={"text-white font-medium"}>v0.66.0</span>.{" "}
+                <span className={"text-nb-gray-100 font-medium"}>v0.66.0</span>.{" "}
                 <InlineLink
                   href={
                     "https://docs.netbird.io/manage/reverse-proxy/expose-from-cli"
diff --git a/src/modules/settings/DangerZoneTab.tsx b/src/modules/settings/DangerZoneTab.tsx
index 1db8e7dd9..e41827730 100644
--- a/src/modules/settings/DangerZoneTab.tsx
+++ b/src/modules/settings/DangerZoneTab.tsx
@@ -85,14 +85,14 @@ export default function DangerZoneTab({ account }: Props) {
         <div className={"gap-6 mt-6 max-w-lg"}>
           <Card
             className={
-              "w-full flex flex-col gap-2 border-red-600 bg-red-950/50"
+              "w-full flex flex-col gap-2 border-red-300 bg-red-50 dark:border-red-600 dark:bg-red-950/50"
             }
           >
             <div className={"px-8 py-6"}>
-              <p className={"text-xl font-medium mb-2 !text-red-50"}>
+              <p className={"text-xl font-medium mb-2 !text-red-900 dark:!text-red-50"}>
                 Delete NetBird account
               </p>
-              <p className={"!text-red-50/80"}>
+              <p className={"!text-red-900/80 dark:!text-red-50/80"}>
                 Before proceeding to delete your Netbird account, please be
                 aware that this action is irreversible. Once your account is
                 deleted, you will permanently lose access to all associated
diff --git a/src/modules/settings/GroupsSettings.tsx b/src/modules/settings/GroupsSettings.tsx
index af8c068bf..2fc5b9939 100644
--- a/src/modules/settings/GroupsSettings.tsx
+++ b/src/modules/settings/GroupsSettings.tsx
@@ -90,7 +90,7 @@ export default function GroupsSettings({ account }: Props) {
           children: (
             <div
               className={
-                "flex gap-2 items-center text-xs bg-netbird-950 px-4 justify-center py-3 rounded-md border border-netbird-500 text-netbird-200"
+                "flex gap-2 items-center text-xs bg-netbird-100 px-4 justify-center py-3 rounded-md border border-netbird-500 text-netbird-700 dark:bg-netbird-950 dark:text-netbird-200"
               }
             >
               <AlertCircle size={14} />
@@ -301,7 +301,7 @@ export default function GroupsSettings({ account }: Props) {
                     {jwtAllowGroupsWarning && (
                       <div
                         className={
-                          "flex gap-2 items-center text-xs bg-netbird-950 px-4 justify-center py-3 rounded-md border border-netbird-500 text-netbird-200"
+                          "flex gap-2 items-center text-xs bg-netbird-100 px-4 justify-center py-3 rounded-md border border-netbird-500 text-netbird-700 dark:bg-netbird-950 dark:text-netbird-200"
                         }
                       >
                         <AlertCircle size={14} />
diff --git a/src/modules/users/UserInvitesTable.tsx b/src/modules/users/UserInvitesTable.tsx
index 2378b7638..cbe9f51b8 100644
--- a/src/modules/users/UserInvitesTable.tsx
+++ b/src/modules/users/UserInvitesTable.tsx
@@ -87,7 +87,7 @@ function InviteNameCell({ invite }: { invite: UserInvite }) {
     >
       <div
         className={
-          "w-10 h-10 rounded-full relative flex items-center justify-center text-white uppercase text-md font-medium bg-nb-gray-900"
+          "w-10 h-10 rounded-full relative flex items-center justify-center text-neutral-700 dark:text-white uppercase text-md font-medium bg-nb-gray-900"
         }
         style={{
           color: generateColorFromString(invite.name || invite.email),
diff --git a/src/modules/users/UserRoleSelector.tsx b/src/modules/users/UserRoleSelector.tsx
index ddcc2e58a..371c77f5e 100644
--- a/src/modules/users/UserRoleSelector.tsx
+++ b/src/modules/users/UserRoleSelector.tsx
@@ -338,7 +338,7 @@ export function UserRoleSelector({
         )}
       </PopoverTrigger>
       <PopoverContent
-        className="w-full p-0 shadow-sm shadow-nb-gray-950"
+        className="w-full p-0 shadow-sm dark:shadow-nb-gray-950"
         style={{
           width: popoverWidth === "auto" ? width : popoverWidth,
           // The tab row needs more room than the trigger usually offers.
diff --git a/src/modules/users/table-cells/ServiceUserNameCell.tsx b/src/modules/users/table-cells/ServiceUserNameCell.tsx
index 1a3ffe215..0f2af0ced 100644
--- a/src/modules/users/table-cells/ServiceUserNameCell.tsx
+++ b/src/modules/users/table-cells/ServiceUserNameCell.tsx
@@ -12,7 +12,7 @@ export default function ServiceUserNameCell({ user }: Readonly<Props>) {
     <div className={cn("flex gap-4 px-2 py-1 items-center")}>
       <div
         className={
-          "w-8 h-8 rounded-full relative flex items-center justify-center text-white uppercase text-md font-medium bg-nb-gray-900"
+          "w-8 h-8 rounded-full relative flex items-center justify-center text-nb-gray-100 uppercase text-md font-medium bg-nb-gray-900"
         }
       >
         <IconSettings2 size={14} />
diff --git a/src/modules/users/table-cells/UserNameCell.tsx b/src/modules/users/table-cells/UserNameCell.tsx
index c88d9a8f2..757d2b52e 100644
--- a/src/modules/users/table-cells/UserNameCell.tsx
+++ b/src/modules/users/table-cells/UserNameCell.tsx
@@ -63,7 +63,7 @@ export default function UserNameCell({ user }: Readonly<Props>) {
     >
       <div
         className={
-          "w-10 h-10 rounded-full relative flex items-center justify-center text-white uppercase text-md font-medium bg-nb-gray-900"
+          "w-10 h-10 rounded-full relative flex items-center justify-center text-neutral-700 dark:text-white uppercase text-md font-medium bg-nb-gray-900"
         }
         style={{
           color: generateColorFromUser(user),
@@ -102,7 +102,7 @@ export default function UserNameCell({ user }: Readonly<Props>) {
           {isCurrent && (
             <span
               className={
-                "bg-sky-900 border border-sky-700 text-sky-200 rounded-full text-[9px] uppercase tracking-wider px-2 py-2 leading-[0]"
+                "bg-sky-100 border border-sky-700 text-sky-800 dark:bg-sky-900 dark:text-sky-200 rounded-full text-[9px] uppercase tracking-wider px-2 py-2 leading-[0]"
               }
             >
               You
diff --git a/src/modules/users/table-cells/UserStatusCell.tsx b/src/modules/users/table-cells/UserStatusCell.tsx
index 85271b62a..7528a29c9 100644
--- a/src/modules/users/table-cells/UserStatusCell.tsx
+++ b/src/modules/users/table-cells/UserStatusCell.tsx
@@ -68,7 +68,7 @@ export default function UserStatusCell({ user }: Readonly<Props>) {
       <div>
         This user needs admin approval before joining your organization. To
         disable approvals, turn off{" "}
-        <span className={"font-medium text-white"}>
+        <span className={"font-medium text-nb-gray-100"}>
           {"'User Approval Required'"}
         </span>{" "}
         in{" "}
diff --git a/tailwind.config.ts b/tailwind.config.ts
index 11d29274b..0cb15a467 100644
--- a/tailwind.config.ts
+++ b/tailwind.config.ts
@@ -105,29 +105,33 @@ const config: Config = {
           800: "#99154B",
           900: "#751A3D",
         },
+        // nb-gray is theme-aware: channels are defined as CSS variables in
+        // globals.css (:root = inverted light ramp, .dark = original dark ramp).
+        // The `rgb(var(...) / <alpha-value>)` form keeps opacity modifiers
+        // (e.g. `bg-nb-gray-900/80`) working.
         "nb-gray": {
-          DEFAULT: "#181A1D",
-          "50": "#f4f6f7",
-          "100": "#e4e7e9",
-          "200": "#cbd2d6",
-          "250": "#b7c0c6",
-          "300": "#a3adb5",
-          "350": "#8f9ca8",
-          "400": "#7c8994",
-          "500": "#616e79",
-          "600": "#535d67",
-          "700": "#474e57",
-          "800": "#3f444b",
-          "850": "#363b40",
-          "900": "#2e3238",
-          "910": "#2b2f33",
-          "920": "#25282d",
-          "925": "#1e2123",
-          "930": "#25282c",
-          "935": "#1f2124",
-          "940": "#1c1e21",
-          "950": "#181a1d",
-          "960": "#16181b",
+          DEFAULT: "rgb(var(--nb-gray-DEFAULT) / <alpha-value>)",
+          "50": "rgb(var(--nb-gray-50) / <alpha-value>)",
+          "100": "rgb(var(--nb-gray-100) / <alpha-value>)",
+          "200": "rgb(var(--nb-gray-200) / <alpha-value>)",
+          "250": "rgb(var(--nb-gray-250) / <alpha-value>)",
+          "300": "rgb(var(--nb-gray-300) / <alpha-value>)",
+          "350": "rgb(var(--nb-gray-350) / <alpha-value>)",
+          "400": "rgb(var(--nb-gray-400) / <alpha-value>)",
+          "500": "rgb(var(--nb-gray-500) / <alpha-value>)",
+          "600": "rgb(var(--nb-gray-600) / <alpha-value>)",
+          "700": "rgb(var(--nb-gray-700) / <alpha-value>)",
+          "800": "rgb(var(--nb-gray-800) / <alpha-value>)",
+          "850": "rgb(var(--nb-gray-850) / <alpha-value>)",
+          "900": "rgb(var(--nb-gray-900) / <alpha-value>)",
+          "910": "rgb(var(--nb-gray-910) / <alpha-value>)",
+          "920": "rgb(var(--nb-gray-920) / <alpha-value>)",
+          "925": "rgb(var(--nb-gray-925) / <alpha-value>)",
+          "930": "rgb(var(--nb-gray-930) / <alpha-value>)",
+          "935": "rgb(var(--nb-gray-935) / <alpha-value>)",
+          "940": "rgb(var(--nb-gray-940) / <alpha-value>)",
+          "950": "rgb(var(--nb-gray-950) / <alpha-value>)",
+          "960": "rgb(var(--nb-gray-960) / <alpha-value>)",
         },
 
         netbird: {