diff --git a/ui/suite/css/chat-agent-mode.css b/ui/suite/css/chat-agent-mode.css
index 7faba1b..0725f8a 100644
--- a/ui/suite/css/chat-agent-mode.css
+++ b/ui/suite/css/chat-agent-mode.css
@@ -108,7 +108,7 @@
     display: none;
     grid-row: 1 / -1;
     grid-column: 1;
-    background: #f8f8f8;
+    background: var(--surface);
     border-right: 1px solid var(--border);
     flex-direction: column;
     z-index: 50;
@@ -252,7 +252,7 @@
     align-items: center;
     gap: 8px;
     padding: 8px 12px;
-    background: #f8f8f8;
+    background: var(--surface);
     border-bottom: 1px solid var(--border);
     font-family: 'Fira Code', monospace;
     font-size: 12px;
@@ -287,7 +287,7 @@
     align-items: center;
     justify-content: center;
     height: 100%;
-    color: #ccc;
+    color: var(--text-muted);
     font-family: 'Fira Code', monospace;
     font-size: 13px;
 }
@@ -358,7 +358,7 @@
     border-top: 1px solid var(--border);
     border-left: 1px solid var(--border);
     padding: 12px 16px;
-    background: #f8f8f8;
+    background: var(--surface);
     flex-direction: column;
     gap: 8px;
 }
@@ -474,7 +474,7 @@
     align-items: center;
     justify-content: space-between;
     padding: 8px 16px;
-    background: #f8f8f8;
+    background: var(--surface);
     border-top: 1px solid var(--border);
 }
 
diff --git a/ui/suite/desktop.html b/ui/suite/desktop.html
index 779ea27..d0b28cd 100644
--- a/ui/suite/desktop.html
+++ b/ui/suite/desktop.html
@@ -29,7 +29,7 @@
             background: var(--bg, #ffffff);
             color: var(--text, #333333);
             overflow: hidden;
-            height: 100vh;
+            height: 100%;
             width: 100vw;
             margin: 0;
             padding: 0;
@@ -50,7 +50,7 @@
         /* Left Sidebar */
         .sidebar {
             width: 51px;
-            height: 100vh;
+            height: 100%;
             background: var(--bg-secondary, #f8f8f8);
             border-right: 1px solid var(--border-color, #f0f1f2);
             display: flex;
@@ -242,8 +242,8 @@
         /* Bottom Taskbar */
         .toolbar {
             height: 50px;
-            background: var(--bg-secondary, white);
-            border-top: 1px solid var(--border-color, #f0f1f2);
+            background: var(--surface);
+            border-top: 1px solid var(--border);
             display: flex;
             align-items: center;
             padding: 0 8px;
diff --git a/ui/suite/partials/desktop-inner.html b/ui/suite/partials/desktop-inner.html
index fd75368..5bc7803 100644
--- a/ui/suite/partials/desktop-inner.html
+++ b/ui/suite/partials/desktop-inner.html
@@ -31,7 +31,7 @@
     /* Left Sidebar */
     .sidebar {
         width: 51px;
-        height: 100vh;
+        height: 100%;
         background: var(--surface);
         border-right: 1px solid var(--border);
         display: flex;