diff --git a/src/styles/main.css b/src/styles/main.css
index bf9bae6ba..78085b38f 100644
--- a/src/styles/main.css
+++ b/src/styles/main.css
@@ -123,7 +123,7 @@
 
 .workspace-branch-static-button {
   border: 1px solid var(--border-muted);
-  background: rgba(12, 16, 26, 0.94);
+  background: var(--surface-card-strong);
   color: var(--text-stronger);
   border-radius: 999px;
   padding: 2px 10px;
@@ -138,7 +138,7 @@
 .workspace-branch-static-button:hover {
   color: var(--text-stronger);
   border-color: var(--border-strong);
-  background: rgba(18, 22, 32, 0.98);
+  background: var(--surface-control-hover);
 }
 
 .worktree-info-popover {
@@ -148,7 +148,7 @@
   min-width: 280px;
   max-width: min(360px, 80vw);
   z-index: 12;
-  background: rgba(12, 16, 26, 0.94);
+  background: var(--surface-command);
   border: 1px solid var(--border-muted);
   border-radius: 10px;
   padding: 10px;
@@ -281,7 +281,7 @@
   min-width: 220px;
   max-width: 320px;
   z-index: 10;
-  background: rgba(12, 16, 26, 0.94);
+  background: var(--surface-command);
   border: 1px solid var(--border-muted);
   border-radius: 10px;
   padding: 6px;
diff --git a/src/styles/sidebar.css b/src/styles/sidebar.css
index 3af96eb6d..96b86da50 100644
--- a/src/styles/sidebar.css
+++ b/src/styles/sidebar.css
@@ -250,7 +250,7 @@
 .workspace-add-menu {
   position: fixed;
   isolation: isolate;
-  background: rgba(12, 16, 26, 0.94);
+  background: var(--surface-command);
   border: 1px solid var(--border-muted);
   border-radius: 10px;
   padding: 6px;