diff --git a/static/src/components/panels/ToolApprovalPanel.vue b/static/src/components/panels/ToolApprovalPanel.vue
index 82b6c10..ca9b1c4 100644
--- a/static/src/components/panels/ToolApprovalPanel.vue
+++ b/static/src/components/panels/ToolApprovalPanel.vue
@@ -257,6 +257,7 @@ const parseFinalMessage = (text: string) => {
   font-size: 13px;
   font-weight: 600;
   margin-bottom: 8px;
+  color: var(--text-primary);
 }
 
 .auto-approval-block__content {
@@ -265,6 +266,7 @@ const parseFinalMessage = (text: string) => {
   line-height: 1.5;
   white-space: pre-wrap;
   word-break: break-word;
+  color: var(--text-secondary);
 }
 
 .auto-approval-block__final {
@@ -276,6 +278,7 @@ const parseFinalMessage = (text: string) => {
 .auto-approval-block__decision {
   font-weight: 700;
   margin-bottom: 4px;
+  color: var(--text-primary);
 }
 
 .auto-approval-block__decision--approved {
@@ -289,6 +292,7 @@ const parseFinalMessage = (text: string) => {
 .auto-approval-block__reason {
   white-space: pre-wrap;
   word-break: break-word;
+  color: var(--text-secondary);
 }
 
 .tool-approval-panel.is-goal-approval-mode .auto-approval-block {
diff --git a/static/src/styles/components/overlays/_overlays.scss b/static/src/styles/components/overlays/_overlays.scss
index 384970c..91cb51c 100644
--- a/static/src/styles/components/overlays/_overlays.scss
+++ b/static/src/styles/components/overlays/_overlays.scss
@@ -1994,6 +1994,7 @@
   font-size: 16px;
   font-weight: 600;
   margin-bottom: 12px;
+  color: var(--text-primary);
 }
 
 .confirm-message {
@@ -2037,7 +2038,7 @@
 .confirm-button--primary {
   background: var(--claude-accent);
   border-color: var(--claude-accent-strong);
-  color: var(--text-primary);
+  color: var(--on-accent);
 }
 
 .confirm-button--danger {
diff --git a/static/src/styles/components/panels/_right-panel.scss b/static/src/styles/components/panels/_right-panel.scss
index 1eb7afe..b075910 100644
--- a/static/src/styles/components/panels/_right-panel.scss
+++ b/static/src/styles/components/panels/_right-panel.scss
@@ -605,6 +605,7 @@ body[data-theme='dark'] .git-change-file__open-icon {
     white-space: pre-wrap;
     word-break: break-word;
     background: var(--theme-surface-muted);
+    color: var(--text-primary);
     scrollbar-width: none;
     -ms-overflow-style: none;
 }
@@ -616,6 +617,7 @@ body[data-theme='dark'] .git-change-file__open-icon {
 
 .approval-diff {
     margin-top: 12px;
+    color: var(--text-primary);
     font-family: 'Monaco', 'Menlo', 'Consolas', monospace;
     font-size: 12px;
     line-height: 1.5;
@@ -648,12 +650,14 @@ body[data-theme='dark'] .git-change-file__open-icon {
 
 .approval-kv strong {
     white-space: nowrap;
+    color: var(--text-primary);
 }
 
 .approval-value {
     white-space: normal;
     overflow-wrap: anywhere;
     word-break: break-word;
+    color: var(--text-primary);
 }
 
 .approval-note {
@@ -665,16 +669,19 @@ body[data-theme='dark'] .git-change-file__open-icon {
 .approval-lines--old {
     background: color-mix(in srgb, var(--claude-warning) 18%, transparent);
     border: 1px solid color-mix(in srgb, var(--claude-warning) 50%, transparent);
+    color: var(--text-primary);
 }
 
 .approval-lines--new {
     background: color-mix(in srgb, var(--claude-success) 18%, transparent);
     border: 1px solid color-mix(in srgb, var(--claude-success) 50%, transparent);
+    color: var(--text-primary);
 }
 
 .approval-lines--cmd,
 .approval-lines--generic {
     background: var(--theme-surface-muted);
+    color: var(--text-primary);
 }
 
 .tool-approval-panel .diff-line {