diff --git a/src/ui/desktop/DesktopApp.tsx b/src/ui/desktop/DesktopApp.tsx
index d5c38610..478d4592 100644
--- a/src/ui/desktop/DesktopApp.tsx
+++ b/src/ui/desktop/DesktopApp.tsx
@@ -35,6 +35,12 @@ function AppContent() {
   const [rightSidebarOpen, setRightSidebarOpen] = useState(false);
   const [rightSidebarWidth, setRightSidebarWidth] = useState(400);
 
+  const isDarkMode =
+    theme === "dark" ||
+    (theme === "system" &&
+      window.matchMedia("(prefers-color-scheme: dark)").matches);
+  const lineColor = isDarkMode ? "#151517" : "#f9f9f9";
+
   const lastShiftPressTime = useRef(0);
 
   // DEBUG: Theme toggle - double-tap left Alt/Option to toggle light/dark mode
@@ -194,14 +200,15 @@ function AppContent() {
   if (authLoading) {
     return (
       <div
-        className="h-screen w-screen flex items-center justify-center bg-deepest"
+        className="h-screen w-screen flex items-center justify-center"
         style={{
+          background: "var(--bg-elevated)",
           backgroundImage: `repeating-linear-gradient(
             225deg,
             transparent,
             transparent 35px,
-            var(--border-subtle) 35px,
-            var(--border-subtle) 37px
+            ${lineColor} 35px,
+            ${lineColor} 37px
           )`,
         }}
       >
@@ -310,16 +317,17 @@ function AppContent() {
 
       {isTransitioning && (
         <div
-          className={`fixed inset-0 bg-deepest z-[20000] transition-opacity duration-700 ${
+          className={`fixed inset-0 z-[20000] transition-opacity duration-700 ${
             transitionPhase === "fadeOut" ? "opacity-100" : "opacity-0"
           }`}
           style={{
+            background: "var(--bg-elevated)",
             backgroundImage: `repeating-linear-gradient(
               45deg,
               transparent,
               transparent 35px,
-              var(--border-subtle) 35px,
-              var(--border-subtle) 37px
+              ${lineColor} 35px,
+              ${lineColor} 37px
             )`,
           }}
         >
diff --git a/src/ui/desktop/authentication/Auth.tsx b/src/ui/desktop/authentication/Auth.tsx
index 58e8e088..444a7fab 100644
--- a/src/ui/desktop/authentication/Auth.tsx
+++ b/src/ui/desktop/authentication/Auth.tsx
@@ -75,6 +75,12 @@ export function Auth({
   const { t } = useTranslation();
   const { theme, setTheme } = useTheme();
 
+  const isDarkMode =
+    theme === "dark" ||
+    (theme === "system" &&
+      window.matchMedia("(prefers-color-scheme: dark)").matches);
+  const lineColor = isDarkMode ? "#151517" : "#f9f9f9";
+
   const isInElectronWebView = () => {
     if ((window as ExtendedWindow).IS_ELECTRON_WEBVIEW) {
       return true;
@@ -771,7 +777,17 @@ export function Auth({
   if (dbHealthChecking && !dbConnectionFailed) {
     return (
       <div
-        className={`fixed inset-0 flex items-center justify-center bg-canvas ${className || ""}`}
+        className={`fixed inset-0 flex items-center justify-center ${className || ""}`}
+        style={{
+          background: "var(--bg-elevated)",
+          backgroundImage: `repeating-linear-gradient(
+            45deg,
+            transparent,
+            transparent 35px,
+            ${lineColor} 35px,
+            ${lineColor} 37px
+          )`,
+        }}
         {...props}
       >
         <div className="w-[420px] max-w-full p-6 flex flex-col bg-elevated border-2 border-edge rounded-md overflow-y-auto thin-scrollbar my-2 animate-in fade-in zoom-in-95 duration-300">
@@ -791,7 +807,17 @@ export function Auth({
   if (dbConnectionFailed) {
     return (
       <div
-        className={`fixed inset-0 flex items-center justify-center bg-canvas ${className || ""}`}
+        className={`fixed inset-0 flex items-center justify-center ${className || ""}`}
+        style={{
+          background: "var(--bg-elevated)",
+          backgroundImage: `repeating-linear-gradient(
+            45deg,
+            transparent,
+            transparent 35px,
+            ${lineColor} 35px,
+            ${lineColor} 37px
+          )`,
+        }}
         {...props}
       >
         <div
@@ -827,11 +853,17 @@ export function Auth({
                 size="icon"
                 className="h-8 w-8"
                 onClick={() => {
-                  const isDark = theme === "dark" || (theme === "system" && window.matchMedia("(prefers-color-scheme: dark)").matches);
+                  const isDark =
+                    theme === "dark" ||
+                    (theme === "system" &&
+                      window.matchMedia("(prefers-color-scheme: dark)")
+                        .matches);
                   setTheme(isDark ? "light" : "dark");
                 }}
               >
-                {(theme === "dark" || (theme === "system" && window.matchMedia("(prefers-color-scheme: dark)").matches)) ? (
+                {theme === "dark" ||
+                (theme === "system" &&
+                  window.matchMedia("(prefers-color-scheme: dark)").matches) ? (
                   <Moon className="w-4 h-4" />
                 ) : (
                   <Sun className="w-4 h-4" />
@@ -880,8 +912,8 @@ export function Auth({
               45deg,
               transparent,
               transparent 35px,
-              rgba(128, 128, 128, 0.05) 35px,
-              rgba(128, 128, 128, 0.05) 37px
+              ${lineColor} 35px,
+              ${lineColor} 37px
             )`,
           }}
         >
@@ -1376,11 +1408,20 @@ export function Auth({
                               size="icon"
                               className="h-8 w-8"
                               onClick={() => {
-                                const isDark = theme === "dark" || (theme === "system" && window.matchMedia("(prefers-color-scheme: dark)").matches);
+                                const isDark =
+                                  theme === "dark" ||
+                                  (theme === "system" &&
+                                    window.matchMedia(
+                                      "(prefers-color-scheme: dark)",
+                                    ).matches);
                                 setTheme(isDark ? "light" : "dark");
                               }}
                             >
-                              {(theme === "dark" || (theme === "system" && window.matchMedia("(prefers-color-scheme: dark)").matches)) ? (
+                              {theme === "dark" ||
+                              (theme === "system" &&
+                                window.matchMedia(
+                                  "(prefers-color-scheme: dark)",
+                                ).matches) ? (
                                 <Moon className="w-4 h-4" />
                               ) : (
                                 <Sun className="w-4 h-4" />