diff --git a/components/login-modal.html b/components/login-modal.html
index fb9195c8..41ee6f9f 100644
--- a/components/login-modal.html
+++ b/components/login-modal.html
@@ -348,8 +348,7 @@
           <div data-nip46-handshake-panel class="space-y-6">
             <div class="flex flex-col items-center gap-6">
               <div
-                class="flex aspect-square w-full max-w-xs items-center justify-center rounded-2xl border border-border-strong bg-white p-6 shadow-sm"
-                style="background-color: white; color: black;"
+                class="flex aspect-square w-full max-w-xs items-center justify-center rounded-2xl border border-border-strong bg-white text-black p-6 shadow-sm"
                 data-nip46-qr
                 aria-hidden="true"
               >
diff --git a/js/ui/loginModalController.js b/js/ui/loginModalController.js
index 936f16c6..97a1a8bd 100644
--- a/js/ui/loginModalController.js
+++ b/js/ui/loginModalController.js
@@ -1299,8 +1299,21 @@ export default class LoginModalController {
         qrContainer.innerHTML = "";
         // Force high-contrast black-on-white for the QR code to ensure
         // it remains readable and scannable regardless of the application theme.
-        const qrLightColor = "#ffffff";
-        const qrDarkColor = "#000000";
+        // We resolve these from the unified token system to ensure consistency.
+        let qrLightColor = "#ffffff";
+        let qrDarkColor = "#000000";
+
+        if (this.window && typeof this.window.getComputedStyle === "function") {
+          try {
+            const style = this.window.getComputedStyle(this.document.documentElement);
+            const white = style.getPropertyValue("--color-white").trim();
+            const black = style.getPropertyValue("--color-black").trim();
+            if (white) qrLightColor = white;
+            if (black) qrDarkColor = black;
+          } catch (error) {
+            // Fallback to hardcoded values if style resolution fails
+          }
+        }
 
         if (uri) {
           try {