diff --git a/config/architecture-inventory.json b/config/architecture-inventory.json
index 88b7a64..ccd1323 100644
--- a/config/architecture-inventory.json
+++ b/config/architecture-inventory.json
@@ -458,8 +458,8 @@
     },
     {
       "path": "frontend/pages/screener/foundation.css",
-      "bytes": 103547,
-      "lines": 6576
+      "bytes": 103683,
+      "lines": 6582
     },
     {
       "path": "frontend/pages/heaven/page.js",
diff --git a/frontend/pages/mentor/foundation.css b/frontend/pages/mentor/foundation.css
index 355dcec..9c73f64 100644
--- a/frontend/pages/mentor/foundation.css
+++ b/frontend/pages/mentor/foundation.css
@@ -49,7 +49,7 @@ body[data-active-view="mentorView"] .app-page-context span {
   height: 100%;
   min-height: 0;
   flex-direction: column;
-  padding: var(--page-pad-y) 0 0;
+  padding: calc(var(--page-pad-y) + 40px) 0 0;
   color: var(--qp-text-1);
   font-family: "PingFang SC", "Microsoft YaHei", system-ui, sans-serif;
 }
diff --git a/frontend/pages/screener/foundation.css b/frontend/pages/screener/foundation.css
index ee3e02e..40478c6 100644
--- a/frontend/pages/screener/foundation.css
+++ b/frontend/pages/screener/foundation.css
@@ -2287,8 +2287,6 @@ body[data-active-view="screenerView"] .workspace-view {
   box-shadow: none;
 
   overflow: visible;
-
-  gap: 16px;
 }
 
 :where(#screenerView) .curated-library-pane {
@@ -2546,7 +2544,7 @@ body[data-active-view="screenerView"] .workspace-view {
 
   flex: 0 0 auto;
 
-  gap: 2px;
+  gap: 8px;
 
   margin: 0px;
 
@@ -2566,11 +2564,11 @@ body[data-active-view="screenerView"] .workspace-view {
 
   padding: 0 14px;
 
-  border: 0px;
+  border: 1px solid var(--control-border);
 
-  border-radius: 0;
+  border-radius: var(--radius-md);
 
-  background: transparent;
+  background: var(--control-surface);
 
   color: var(--r2-sub);
 
@@ -2586,15 +2584,19 @@ body[data-active-view="screenerView"] .workspace-view {
 }
 
 #screenerView .screener-mode-tabs button:hover {
-  background: var(--surface-hover);
+  border-color: var(--r2-blue-line);
+
+  background: var(--control-hover);
 
   color: var(--r2-ink);
 }
 
 #screenerView .screener-mode-tabs button.active {
-  background: transparent;
+  border-color: var(--scr-blue);
 
-  color: var(--scr-blue);
+  background: var(--scr-blue);
+
+  color: var(--on-action);
 
   font-weight: var(--font-weight-semibold);
 }
@@ -3135,7 +3137,11 @@ body[data-active-view="screenerView"] .workspace-view {
 }
 
 #screenerView .curated-screener-panel {
-  display: block;
+  display: flex;
+
+  flex-direction: column;
+
+  gap: 10px;
 }
 
 #screenerView .curated-workspace {
@@ -6184,7 +6190,7 @@ body[data-active-view="screenerView"] .workspace-view {
   background: var(--surface-muted);
 }
 
-:root[data-theme="dark"] #screenerView :is(.screener-mode-tabs, .screener-stepper, .regime-selector, .regime-option, .screener-results-view, .result-toolbar) {
+:root[data-theme="dark"] #screenerView :is(.screener-stepper, .regime-selector, .regime-option, .screener-results-view, .result-toolbar) {
   border-color: var(--border);
 
   background: var(--surface);
diff --git a/frontend/pages/sentiment/foundation.css b/frontend/pages/sentiment/foundation.css
index 8300c5d..4e47802 100644
--- a/frontend/pages/sentiment/foundation.css
+++ b/frontend/pages/sentiment/foundation.css
@@ -1596,7 +1596,7 @@
   background: var(--surface);
 }
 
-:root[data-theme="dark"] :is(.sentiment-cycle-toolbar, .tbl-tools) {
+:root[data-theme="dark"] :is(.tbl-tools) {
   border-color: var(--line-soft);
 
   background: var(--surface);
@@ -1610,7 +1610,7 @@
   color: var(--warning-color);
 }
 
-:root[data-theme="dark"] #sentimentCycleView :is(.sentiment-current-tag, .sentiment-auto-tag, .sentiment-detail-toolbar, .section-toolbar) {
+:root[data-theme="dark"] #sentimentCycleView :is(.sentiment-current-tag, .sentiment-auto-tag, .sentiment-detail-toolbar) {
   border-color: var(--border);
 
   background: var(--surface-muted);