diff --git a/apps/ui/src/App.tsx b/apps/ui/src/App.tsx
index 0d68de5b..8adf9fdf 100644
--- a/apps/ui/src/App.tsx
+++ b/apps/ui/src/App.tsx
@@ -1278,17 +1278,22 @@ export default function App() {
               </div>
 
               <div className="lg:col-span-8 flex flex-col">
-                <div className="bg-bg-surface-dark border border-border border-b-0 rounded-t-sm px-3 py-1.5 flex items-center justify-between">
-                  <div className="flex items-center">
-                    <span className={`w-2 h-2 rounded-full mr-2 ${isAnalyzing ? 'bg-accent animate-pulse' : audioUrl ? 'bg-success' : 'bg-border'}`}></span>
-                    <h3 className="text-[10px] font-mono text-text-secondary uppercase tracking-wider">Signal Monitor</h3>
-                  </div>
-                </div>
-
-                <div
+                {/* data-testid="signal-panel" lifted onto the DeviceRack so
+                    the testid wraps the title strip (containing the
+                    visible "Signal Monitor" text the
+                    tests/smoke/error-states.spec.ts:524 selector
+                    `signalPanel.getByText('Signal Monitor')` looks for).
+                    The inner bg-bg-card div preserves the palette
+                    contract the theme-shell smoke locks. */}
+                <DeviceRack
                   data-testid="signal-panel"
-                  className="flex-grow bg-bg-card border border-border rounded-b-sm p-4 relative flex flex-col"
+                  name="Signal Monitor"
+                  status={isAnalyzing ? 'active' : audioUrl ? 'success' : 'idle'}
+                  className="flex-grow flex flex-col"
                 >
+                  <div
+                    className="flex-grow bg-bg-card p-4 relative flex flex-col"
+                  >
                   {audioUrl && audioFile ? (
                     <div className="flex flex-col relative z-10 gap-4">
                       <WaveformPlayer audioUrl={audioUrl} audioFile={audioFile} onAudioElement={handleAudioElement} />
@@ -1310,6 +1315,7 @@ export default function App() {
                     <IdleValuePropPanel />
                   )}
                 </div>
+                </DeviceRack>
               </div>
             </section>
 
diff --git a/apps/ui/src/components/SpectrogramViewer.tsx b/apps/ui/src/components/SpectrogramViewer.tsx
index 656fb6d9..0c6376a3 100644
--- a/apps/ui/src/components/SpectrogramViewer.tsx
+++ b/apps/ui/src/components/SpectrogramViewer.tsx
@@ -276,7 +276,7 @@ export function SpectrogramViewer({
                 onClick={() => setActiveKind(spec.kind)}
                 className={`px-2 py-0.5 text-[10px] font-mono uppercase tracking-wide rounded-sm transition-colors ${
                   spec.kind === activeKind
-                    ? 'bg-blue-500/20 text-blue-400 border border-blue-500/30'
+                    ? 'bg-accent/20 text-accent border border-accent/30'
                     : 'text-text-secondary hover:text-text-primary border border-transparent'
                 }`}
               >