From 44f9138d1e71827b34c4a2812ab7f2d802a6ddc6 Mon Sep 17 00:00:00 2001
From: Said Turksever <asturksever@gmail.com>
Date: Fri, 30 Oct 2026 13:05:33 +0000
Subject: [PATCH] Keep panel titles inside their cards and scope the hover

Collapsed Recent Imagery (English) and Data Layers (Portuguese) pushed
their toggles out of the card. Collapsed rail launchers now drop the
divider and pack closer, translated collapsed titles use compact type,
and any title that still does not fit ends in an ellipsis.

The hover now matches the dock trays' hover rather than their pinned
look, only on pointers that can hover, and recolours only the hovered
panel's own header, so Radio and body labels keep their colours.

The cyber theme keeps main's gutters and Display toggle size, the dock
and rails share --dock-label-* tokens, and the dimmed open Context title
rule is gone.
---
 changelog.d/1466-panel-chrome-consistency.md |   7 +-
 docs/CURRENT-STATE.md                        |   2 +-
 src/contextTabKeyboard.test.mjs              |   8 +-
 src/ui/railPanelChrome.test.mjs              | 193 ++++++++++++++++++
 src/ui/styles/command-dock-trays.css         |   8 +-
 src/ui/styles/controls.css                   | 194 ++++++++++++-------
 src/ui/styles/foundation.css                 |   5 +
 src/ui/styles/layers.css                     |  22 +--
 8 files changed, 345 insertions(+), 94 deletions(-)
 create mode 100644 src/ui/railPanelChrome.test.mjs

diff --git a/changelog.d/1466-panel-chrome-consistency.md b/changelog.d/1466-panel-chrome-consistency.md
index 64aefd607..c7f1f28a1 100644
--- a/changelog.d/1466-panel-chrome-consistency.md
+++ b/changelog.d/1466-panel-chrome-consistency.md
@@ -1,4 +1,5 @@
 - Give the side panels one look. Every panel title now uses the command dock's
-  label type in a brighter colour, collapsed or open; a panel lights up with a
-  blue edge and an accent title on hover, as the dock does; and every collapse
-  button sits the same distance from its panel's edge (asturksever, #1466).
+  label type in a brighter colour; a panel's edge and title light up on hover,
+  as the dock's trays do; and in the default theme each collapse button sits
+  19px from its panel's edge (plus the scrollbar's width in an open, scrolling
+  panel where the system always shows scrollbars) (asturksever, #1466).
diff --git a/docs/CURRENT-STATE.md b/docs/CURRENT-STATE.md
index 966bb3878..73c984471 100644
--- a/docs/CURRENT-STATE.md
+++ b/docs/CURRENT-STATE.md
@@ -4797,7 +4797,7 @@ silently demoting every later lookup for the session.
 - If a civilian or military aircraft is already tracked when `CONTACTS` becomes operational, that source-owned track is adopted as the Context subject before nearest-contact autofocus. Context rechecks the tracker after its dependencies settle, so a newer selection wins, while an explicit clear during activation prevents fallback from silently selecting a replacement. Cockpit entry remains unavailable until that Context transaction has settled, so its camera takeover cannot clear Cesium tracking before adoption. Adoption does not recreate tracking or transfer camera ownership; it initializes the normal 250 km ring, history, proximity results, and Cockpit Previous/Next state for the original aircraft.
 - `SEARCH NEARBY SITES` retains the bounded OSM results and makes one user-initiated, view-biased Google Maps Places text search for “military installation.” Google results are source-stamped, deduplicated against OSM by rounded location/name, and remain mapped context rather than operational claims. If Places is unavailable or the API is not enabled for the supplied key, OSM context remains available. A view across the antimeridian is searched around its own centre, with a radius from its real width.
 - The Context header holds only its title and collapse control. It no longer carries a Radio shortcut or a compact Radio player: Radio is the `RADIO` section inside the panel, with its own disclosure and the single `ENABLE` power control. Cockpit keeps its own compact Radio utility.
-- Context is set for reading in every theme: mode, standby and action labels are 10 px, and the panel draws no glow halo. Outside Cyber, the two modes form one segmented control, the standby guidance is plain left-aligned text rather than a dashed placeholder, and the expanded panel's section titles use `--text-secondary`. Cyber keeps its separately framed mode buttons, its red panel titles, and in layout-focus a framed, centred standby card over its radar art.
+- Context is set for reading in every theme: mode, standby and action labels are 10 px, and the panel draws no glow halo. Outside Cyber, the two modes form one segmented control, the standby guidance is plain left-aligned text rather than a dashed placeholder, and the panel's section titles share the side panels' dock-label colour. Cyber keeps its separately framed mode buttons, its red panel titles, and in layout-focus a framed, centred standby card over its radar art.
 - The expanded desktop header omits the redundant `ON` label; the active mode button carries state. Expanded Contact results also omit the duplicate `GLOBAL CONTEXT` / `CONTEXT ONLY` status row and begin with the selected subject and its 250 km scope. Global Context does not fabricate a selected-entity model preview: the provisional hand-authored aircraft wireframe was removed because it was not geometry extracted from the selected entity's actual asset.
 - Dependency ownership is reversible: disabling Global Context releases only dependencies it enabled, while user-enabled layers remain on. This also removes the Military-layer suppression handoff when Global Context owned Military, allowing an already-enabled civilian Flights layer to resume its normal mixed rendering. If OpenSky is unavailable and has no last-good cache, Flights requests a capped 250 nm adsb.lol point snapshot around the current view anchor and labels that provenance explicitly; it never relabels military-feed rows as civilian data. If both inputs fail, Flights remains `UNKNOWN`.
 - Space Missions is replay-isolated: Rocket Launches and Satellites are the only Data Layers permitted while the mode is active. Direct UI and voice entry capture the same pre-entry snapshot; internal dependency and restoration enables do not create a user-owned Context session. Entry waits for incompatible layers to shut down, direct incompatible enables are blocked before lifecycle work, and the entry gate remains active through the complete Rocket Launches enable. A newer same-target ON request takes ownership of the pending entry without releasing its isolation snapshot, including when it arrives while the prior request is awaiting the adoption guard. A caller abort, resource cancellation, newer OFF, or layer teardown waits for exact manager settlement and restores that snapshot without resurrecting Rocket Launches. If an abort lands after only part of a restore settles, Context completes the same exact target without the stale caller signal and then replays newer explicit layer intent. Dedicated Voice Context cancellation reports a stable cancelled result plus the current Context state; generic layer visibility additionally exposes manager phase, reason, successor, and lifecycle details. Once an exact voice visibility intent commits, a newer voice turn cannot relabel it as cancelled while Context settlement completes; pre-commit aborts remain cancellable and final lifecycle mismatches remain failures. Clear Selected Layers reserves its complete captured OFF set before sequential teardown; a newer absolute request of any origin supersedes only its layer reservation and remains authoritative. A rejected layer teardown retains the truthful enabled state, rolls already-stopped siblings back to the captured pre-entry set, and aborts replay; rapid exit/re-entry serializes the full Satellite enabled-state and parameter restore before a new snapshot is taken. Contacts remains additive and restores user-enabled layers normally.
diff --git a/src/contextTabKeyboard.test.mjs b/src/contextTabKeyboard.test.mjs
index ca44d4c25..528341dd4 100644
--- a/src/contextTabKeyboard.test.mjs
+++ b/src/contextTabKeyboard.test.mjs
@@ -172,10 +172,10 @@ test('Context reads as one segmented control with legible type and no halo', ()
   assert.ok(px(standby, 'font') >= 10, 'standby guidance must stay at least 10px');
   assert.doesNotMatch(standby, /dashed/);
   assert.ok(px(rule('.global-context-actions .panel-layer-toggle'), 'font-size') >= 10);
-  // Default theme only, expanded only: Cyber keeps its red titles and the
-  // collapsed launcher matches its sibling launchers.
-  assert.match(
+  // The shared rail title colour (brighter than --text-secondary) keeps the
+  // open Context title legible; no Context-only rule dims it again.
+  assert.equal(
     rule(":root:not([data-ui-theme='cyber']) #global-context-panel:not(.collapsed) .panel-title"),
-    /color:\s*var\(--text-secondary\)/,
+    '',
   );
 });
diff --git a/src/ui/railPanelChrome.test.mjs b/src/ui/railPanelChrome.test.mjs
new file mode 100644
index 000000000..bfcd7845e
--- /dev/null
+++ b/src/ui/railPanelChrome.test.mjs
@@ -0,0 +1,193 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { readStylesheet } from '../testSupport/readStylesheet.mjs';
+
+const css = readStylesheet(new URL('../../style.css', import.meta.url));
+const clean = (selector) =>
+  selector
+    .replace(/\/\*[\s\S]*?\*\//g, '')
+    .replace(/\s+/g, ' ')
+    .trim();
+const rules = [...css.matchAll(/([^{}]+)\{([^{}]*)\}/g)].map(
+  ([, selector, body]) => ({ selector: clean(selector), body }),
+);
+const railRules = rules.filter(({ selector }) =>
+  selector.includes('#left-panel-stack, #right-context-rail'),
+);
+const hoverBlock =
+  css.match(
+    /@media \(hover: hover\) and \(pointer: fine\) \{((?:[^{}]*\{[^{}]*\})*)\s*\}/g,
+  ) || [];
+
+test('a side panel lights up on hover only where a pointer can hover', () => {
+  const lit = railRules.filter(({ selector }) => selector.includes(':hover'));
+  assert.ok(lit.length > 0, 'the rail hover rule is missing');
+  for (const { selector } of lit) {
+    assert.ok(
+      hoverBlock.some((block) => clean(block).includes(selector)),
+      `${selector} must sit inside @media (hover: hover) and (pointer: fine)`,
+    );
+  }
+});
+
+test('hover matches the dock tray hover, not its pinned look', () => {
+  const [hover] = railRules.filter(({ selector }) =>
+    selector.endsWith(':hover'),
+  );
+  assert.ok(hover, 'the rail surface hover rule is missing');
+  assert.match(hover.body, /border-color:\s*var\(--glass-border-hover\)/);
+  assert.doesNotMatch(hover.body, /box-shadow/);
+  assert.match(hover.body, /--rail-label-hover:\s*var\(--accent\)/);
+  // A low-specificity list: no ID or state selector inside it lifts the rule.
+  assert.match(hover.selector, /:where\(/);
+});
+
+test('hover recolours only the hovered panel header, never nested sections', () => {
+  for (const { selector } of railRules) {
+    assert.ok(
+      !/\.radio-panel-inner/.test(selector),
+      `Radio sits inside Context and must not light up as its own panel: ${selector}`,
+    );
+    assert.doesNotMatch(
+      selector,
+      /:hover\s+:is\(/,
+      'a descendant colour list would reach labels in the panel body',
+    );
+  }
+  const colour = railRules.find(
+    ({ body }) => /--rail-label-hover/.test(body) && /color:/.test(body),
+  );
+  assert.ok(colour, 'the rail title colour rule is missing');
+  assert.match(colour.selector, /\.panel-header > \.panel-title/);
+  const radio = rules.find(({ selector }) => selector === '#radio-panel');
+  assert.match(radio?.body || '', /--rail-label-hover:\s*initial/);
+});
+
+test('no later rule dims the open Context title below its siblings', () => {
+  const dimmed = rules.filter(
+    ({ selector, body }) =>
+      /#global-context-panel:not\(\.collapsed\) \.panel-title$/.test(
+        selector,
+      ) && /color:/.test(body),
+  );
+  assert.deepEqual(dimmed, []);
+});
+
+test('collapsed launchers on both rails keep titles inside the card', () => {
+  const ellipsis = railRules.find(
+    ({ selector, body }) =>
+      selector.endsWith(
+        ':is(.panel-header > .panel-title, .pp-header-label)',
+      ) && /text-overflow:\s*ellipsis/.test(body),
+  );
+  assert.ok(
+    ellipsis,
+    'rail titles must end in an ellipsis rather than overflow',
+  );
+  assert.match(ellipsis.body, /min-width:\s*0/);
+
+  const translated = rules.find(
+    ({ selector }) =>
+      selector.startsWith("html:not([lang='en'])") &&
+      selector.includes('#left-panel-stack, #right-context-rail') &&
+      selector.includes('.panel-collapsible.collapsed'),
+  );
+  assert.ok(translated, 'translated collapsed titles must fit on both rails');
+  assert.match(translated.body, /font-size:\s*8px/);
+});
+
+test('the default theme geometry change leaves cyber gutters alone', () => {
+  for (const surface of ['.data-panel-inner', '.global-context-panel-inner']) {
+    const base = rules.find(
+      ({ selector, body }) => selector === surface && /padding:/.test(body),
+    );
+    assert.match(base?.body || '', /padding:\s*14px 16px 12px/, surface);
+  }
+  const display = rules.find(
+    ({ selector }) =>
+      selector === '#pp-toggles > .pp-header-row .pp-collapse-btn',
+  );
+  assert.match(display?.body || '', /font-size:\s*12px/);
+});
+
+test('rail titles and dock labels share one set of label tokens', () => {
+  // command-dock-trays.css sets the dock's label type; earlier dock rules
+  // for the same selector are overridden by it.
+  const dock = rules.find(
+    ({ selector, body }) =>
+      selector ===
+        '#command-dock .panel-title, #command-dock .location-toolbar-label' &&
+      /--dock-label-/.test(body),
+  );
+  const rail = railRules.find(({ body }) =>
+    /--dock-label-font-size/.test(body),
+  );
+  for (const body of [dock?.body, rail?.body]) {
+    assert.match(body || '', /font-size:\s*var\(--dock-label-font-size\)/);
+    assert.match(
+      body || '',
+      /letter-spacing:\s*var\(--dock-label-letter-spacing\)/,
+    );
+  }
+});
+
+test('default theme overrides never reach the cyber theme', () => {
+  const notCyber = ":root:not([data-ui-theme='cyber'])";
+  const padding = rules.find(
+    ({ selector, body }) =>
+      selector.endsWith(
+        ':is(.data-panel-inner, .global-context-panel-inner)',
+      ) && /padding-left:\s*14px/.test(body),
+  );
+  assert.ok(
+    padding?.selector.startsWith(notCyber),
+    'the 14px gutters must skip cyber',
+  );
+  const display = rules.find(
+    ({ selector, body }) =>
+      selector.endsWith('#pp-toggles > .pp-header-row .pp-collapse-btn') &&
+      /font-size:\s*13px/.test(body),
+  );
+  assert.ok(
+    display?.selector.startsWith(notCyber),
+    "Display's 22px toggle must skip cyber",
+  );
+  // Cyber draws its title marker at left: -8px; a clip on the title would cut it.
+  for (const { selector, body } of rules) {
+    if (!/\.panel-title/.test(selector) || !/overflow:\s*hidden/.test(body))
+      continue;
+    if (!/#left-panel-stack|#right-context-rail/.test(selector)) continue;
+    assert.ok(
+      selector.startsWith(notCyber),
+      `${selector} clips the cyber title marker`,
+    );
+  }
+});
+
+test('launcher compaction and header colour stay on the rail panels themselves', () => {
+  const compact = railRules.filter(({ selector }) =>
+    /\.collapsed > \[class\$='-panel-inner'\] > \.panel-header/.test(selector),
+  );
+  assert.equal(compact.length, 3);
+  for (const { selector } of compact) {
+    // Each launcher is a direct child of its rail: Radio, nested inside
+    // Context, is not a launcher. The header must not itself be required to
+    // be a rail child.
+    assert.match(
+      selector,
+      /#right-context-rail\) > \.panel-collapsible\.collapsed > \[class\$='-panel-inner'\] > \.panel-header/,
+    );
+    assert.match(
+      selector,
+      /#right-context-rail\) > #pp-toggles\.collapsed > \.pp-header-row/,
+    );
+  }
+  const colour = railRules.find(({ body }) =>
+    /--rail-label-hover, /.test(body),
+  );
+  assert.match(
+    colour.selector,
+    /:is\(\.panel-header, \.pp-header-row\) > \.panel-collapse-btn/,
+  );
+  assert.doesNotMatch(colour.selector, /, \.panel-collapse-btn\)/);
+});
diff --git a/src/ui/styles/command-dock-trays.css b/src/ui/styles/command-dock-trays.css
index e3607a8ce..ecc6bc432 100644
--- a/src/ui/styles/command-dock-trays.css
+++ b/src/ui/styles/command-dock-trays.css
@@ -17,10 +17,10 @@
   display: inline-flex;
   align-items: center;
   gap: 0.42rem;
-  color: rgba(206, 232, 239, 0.72);
-  font-size: 0.58rem;
-  font-weight: 500;
-  letter-spacing: 0.13rem;
+  color: var(--dock-label-color);
+  font-size: var(--dock-label-font-size);
+  font-weight: var(--dock-label-font-weight);
+  letter-spacing: var(--dock-label-letter-spacing);
 }
 
 #command-dock .dock-label-icon {
diff --git a/src/ui/styles/controls.css b/src/ui/styles/controls.css
index 58f756039..936f095df 100644
--- a/src/ui/styles/controls.css
+++ b/src/ui/styles/controls.css
@@ -86,28 +86,92 @@
 :is(#left-panel-stack, #right-context-rail)
   :is(.panel-header > .panel-title, .pp-header-label) {
   font-family: var(--font-mono);
-  font-size: 0.58rem;
-  font-weight: 500;
-  letter-spacing: 0.13rem;
+  font-size: var(--dock-label-font-size);
+  font-weight: var(--dock-label-font-weight);
+  letter-spacing: var(--dock-label-letter-spacing);
   text-transform: uppercase;
 }
 
+/* A hovered panel sets --rail-label-hover on itself (see below); its own
+   header picks it up. Radio sits inside Context and keeps its own colour. */
+:root:not([data-ui-theme='cyber'])
+  :is(#left-panel-stack, #right-context-rail)
+  :is(
+    .panel-header > .panel-title,
+    .pp-header-label,
+    :is(.panel-header, .pp-header-row) > .panel-collapse-btn
+  ) {
+  color: var(--rail-label-hover, var(--dock-label-color));
+}
+
+#radio-panel {
+  --rail-label-hover: initial;
+}
+
+/* A title never pushes its toggle out of the card: one that does not fit
+   ends in an ellipsis. Cyber draws a marker left of the title, which a clip
+   would cut, and keeps its own header layout. */
+:root:not([data-ui-theme='cyber'])
+  :is(#left-panel-stack, #right-context-rail)
+  :is(.panel-header > .panel-title, .pp-header-label) {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/* A collapsed launcher is 176px wide and its divider has no room to draw,
+   so the header drops it and packs closer. English titles such as Recent
+   Imagery then fit whole. Only the rail's own launchers: Radio, nested in
+   Context, keeps its divider. */
+:root:not([data-ui-theme='cyber'])
+  :is(#left-panel-stack, #right-context-rail)
+  > .panel-collapsible.collapsed
+  > [class$='-panel-inner']
+  > .panel-header,
+:root:not([data-ui-theme='cyber'])
+  :is(#left-panel-stack, #right-context-rail)
+  > #pp-toggles.collapsed
+  > .pp-header-row {
+  gap: 8px;
+}
+
 :root:not([data-ui-theme='cyber'])
   :is(#left-panel-stack, #right-context-rail)
-  :is(.panel-header > .panel-title, .pp-header-label, .panel-collapse-btn) {
-  color: rgba(206, 232, 239, 0.72);
+  > .panel-collapsible.collapsed
+  > [class$='-panel-inner']
+  > .panel-header
+  > .panel-divider,
+:root:not([data-ui-theme='cyber'])
+  :is(#left-panel-stack, #right-context-rail)
+  > #pp-toggles.collapsed
+  > .pp-header-row
+  > .panel-divider {
+  display: none;
 }
 
-/* A longer translated title in a collapsed rail launcher tightens its
-   tracking rather than pushing the disclosure button out of the card. */
+:root:not([data-ui-theme='cyber'])
+  :is(#left-panel-stack, #right-context-rail)
+  > .panel-collapsible.collapsed
+  > [class$='-panel-inner']
+  > .panel-header
+  > .panel-collapse-btn,
+:root:not([data-ui-theme='cyber'])
+  :is(#left-panel-stack, #right-context-rail)
+  > #pp-toggles.collapsed
+  > .pp-header-row
+  > .panel-collapse-btn {
+  margin-left: auto;
+}
+
+/* Translated titles run longer (Aktuelle Bilddaten), so a collapsed rail
+   launcher sets them in compact type rather than pushing the disclosure
+   button out of the card or cutting the word short. */
 html:not([lang='en'])
-  #right-context-rail
+  :is(#left-panel-stack, #right-context-rail)
   .panel-collapsible.collapsed
   .panel-title {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  letter-spacing: 1.5px;
+  font-size: 8px;
+  letter-spacing: 1px;
 }
 
 .panel-divider {
@@ -141,64 +205,42 @@ html:not([lang='en'])
   background: rgba(255, 255, 255, 0.07);
 }
 
-/* A side panel answers the pointer as the command dock does: a blue edge,
-   a soft glow and an accent title. */
-:root:not([data-ui-theme='cyber'])
-  :is(#left-panel-stack, #right-context-rail)
-  :is(
-    .data-panel-inner,
-    .scene-panel-inner,
-    .cctv-panel-inner,
-    .radio-panel-inner,
-    .weather-panel-inner,
-    .recent-imagery-panel-inner,
-    .street-level-panel-inner,
-    .global-context-panel-inner,
-    #pp-toggles:not(.collapsed),
-    #pp-toggles.collapsed > .pp-header-row
-  ) {
-  transition:
-    border-color 160ms ease,
-    box-shadow 160ms ease;
-}
+/* A side panel answers the pointer as the command dock's trays do: a
+   brighter edge and an accent title and toggle. Touch screens have no hover,
+   so a tap must not leave a panel lit. */
+@media (hover: hover) and (pointer: fine) {
+  :root:not([data-ui-theme='cyber'])
+    :is(#left-panel-stack, #right-context-rail)
+    :where(
+      .data-panel-inner,
+      .scene-panel-inner,
+      .cctv-panel-inner,
+      .weather-panel-inner,
+      .recent-imagery-panel-inner,
+      .street-level-panel-inner,
+      .global-context-panel-inner,
+      #pp-toggles:not(.collapsed),
+      #pp-toggles.collapsed > .pp-header-row
+    ) {
+    transition: border-color var(--transition-fast);
+  }
 
-:root:not([data-ui-theme='cyber'])
-  :is(#left-panel-stack, #right-context-rail)
-  :is(
-    .data-panel-inner,
-    .scene-panel-inner,
-    .cctv-panel-inner,
-    .radio-panel-inner,
-    .weather-panel-inner,
-    .recent-imagery-panel-inner,
-    .street-level-panel-inner,
-    .global-context-panel-inner,
-    #pp-toggles:not(.collapsed),
-    #pp-toggles.collapsed > .pp-header-row
-  ):hover {
-  border-color: rgba(0, 212, 255, 0.55);
-  box-shadow:
-    0 8px 32px rgba(0, 0, 0, 0.5),
-    0 0 0 1px rgba(0, 212, 255, 0.08) inset,
-    0 0 1rem rgba(0, 212, 255, 0.12);
-}
-
-:root:not([data-ui-theme='cyber'])
-  :is(#left-panel-stack, #right-context-rail)
-  :is(
-    .data-panel-inner,
-    .scene-panel-inner,
-    .cctv-panel-inner,
-    .radio-panel-inner,
-    .weather-panel-inner,
-    .recent-imagery-panel-inner,
-    .street-level-panel-inner,
-    .global-context-panel-inner,
-    #pp-toggles:not(.collapsed),
-    #pp-toggles.collapsed > .pp-header-row
-  ):hover
-  :is(.panel-title, .pp-header-label, .panel-collapse-btn) {
-  color: var(--accent);
+  :root:not([data-ui-theme='cyber'])
+    :is(#left-panel-stack, #right-context-rail)
+    :where(
+      .data-panel-inner,
+      .scene-panel-inner,
+      .cctv-panel-inner,
+      .weather-panel-inner,
+      .recent-imagery-panel-inner,
+      .street-level-panel-inner,
+      .global-context-panel-inner,
+      #pp-toggles:not(.collapsed),
+      #pp-toggles.collapsed > .pp-header-row
+    ):hover {
+    --rail-label-hover: var(--accent);
+    border-color: var(--glass-border-hover);
+  }
 }
 
 /* ── Button Grid ──────────────────────────────── */
@@ -521,11 +563,21 @@ html:not([lang='en'])
 }
 
 #pp-toggles > .pp-header-row .pp-collapse-btn {
+  width: 20px;
+  height: 20px;
+  border-radius: 6px;
+  font-size: 12px;
+  padding: 0;
+}
+
+/* In the default theme Display's toggle matches the other panels' 22px. */
+:root:not([data-ui-theme='cyber'])
+  #pp-toggles
+  > .pp-header-row
+  .pp-collapse-btn {
   width: 22px;
   height: 22px;
-  border-radius: 6px;
   font-size: 13px;
-  padding: 0;
 }
 
 #pp-toggles.collapsed {
diff --git a/src/ui/styles/foundation.css b/src/ui/styles/foundation.css
index 2c2006094..185b256af 100644
--- a/src/ui/styles/foundation.css
+++ b/src/ui/styles/foundation.css
@@ -21,6 +21,11 @@
   --panel-radius: 16px;
   --btn-radius: 10px;
   --transition-fast: 150ms cubic-bezier(0.4, 0, 0.2, 1);
+  /* Label type shared by the command dock and the side panel titles. */
+  --dock-label-color: rgba(206, 232, 239, 0.72);
+  --dock-label-font-size: 0.58rem;
+  --dock-label-font-weight: 500;
+  --dock-label-letter-spacing: 0.13rem;
   --transition-smooth: 300ms cubic-bezier(0.4, 0, 0.2, 1);
   --left-stack-x: 52px;
   --right-rail-x: 52px;
diff --git a/src/ui/styles/layers.css b/src/ui/styles/layers.css
index a51bdc052..0f8ed5522 100644
--- a/src/ui/styles/layers.css
+++ b/src/ui/styles/layers.css
@@ -58,7 +58,7 @@
   background: var(--glass-bg);
   border: 1px solid var(--glass-border);
   border-radius: var(--panel-radius);
-  padding: 14px 14px 12px;
+  padding: 14px 16px 12px;
   backdrop-filter: blur(24px) saturate(1.4);
   -webkit-backdrop-filter: blur(24px) saturate(1.4);
   box-shadow:
@@ -253,8 +253,6 @@
 }
 #right-context-rail #global-context-panel.collapsed .panel-header {
   margin: 0;
-  /* Room for the radio button between the title and the toggle. */
-  gap: 8px;
 }
 #right-context-rail.layout-focus {
   height: var(--right-stack-max-height);
@@ -991,19 +989,12 @@
 #global-context-panel .panel-glow {
   display: none;
 }
-/* Expanded, its section titles (Context, Radio) stay legible over bright
-   imagery. Cyber keeps its own red titles; collapsed launchers match siblings. */
-:root:not([data-ui-theme='cyber'])
-  #global-context-panel:not(.collapsed)
-  .panel-title {
-  color: var(--text-secondary);
-}
 .global-context-panel-inner {
   position: relative;
   display: flex;
   min-height: 0;
   flex-direction: column;
-  padding: 14px 14px 12px;
+  padding: 14px 16px 12px;
   border: 1px solid var(--glass-border);
   border-radius: var(--panel-radius);
   background: var(--glass-bg);
@@ -1013,6 +1004,15 @@
   backdrop-filter: blur(24px) saturate(1.4);
   -webkit-backdrop-filter: blur(24px) saturate(1.4);
 }
+
+/* Data Layers and Context share the 14px side padding of the other default
+   theme panels, so every title and toggle sits 19px from its edge. Cyber
+   keeps its own gutters. */
+:root:not([data-ui-theme='cyber'])
+  :is(.data-panel-inner, .global-context-panel-inner) {
+  padding-right: 14px;
+  padding-left: 14px;
+}
 .global-context-actions {
   display: grid;
   grid-template-columns: minmax(0, 1fr) minmax(0, 1fr);