diff --git a/apps/ui/package-lock.json b/apps/ui/package-lock.json
index 52cc0bcb..1edabd73 100644
--- a/apps/ui/package-lock.json
+++ b/apps/ui/package-lock.json
@@ -362,7 +362,6 @@
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -379,7 +378,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -396,7 +394,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -413,7 +410,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -430,7 +426,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -447,7 +442,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -464,7 +458,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -481,7 +474,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -498,7 +490,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -515,7 +506,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -532,7 +522,6 @@
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -549,7 +538,6 @@
       "cpu": [
         "loong64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -566,7 +554,6 @@
       "cpu": [
         "mips64el"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -583,7 +570,6 @@
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -600,7 +586,6 @@
       "cpu": [
         "riscv64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -617,7 +602,6 @@
       "cpu": [
         "s390x"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -634,7 +618,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -651,7 +634,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -668,7 +650,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -685,7 +666,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -702,7 +682,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -719,7 +698,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -736,7 +714,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -753,7 +730,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -770,7 +746,6 @@
       "cpu": [
         "ia32"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -787,7 +762,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
diff --git a/apps/ui/src/App.tsx b/apps/ui/src/App.tsx
index 4859d781..fa553aaf 100644
--- a/apps/ui/src/App.tsx
+++ b/apps/ui/src/App.tsx
@@ -6,6 +6,7 @@ import { AnalysisStatusPanel } from './components/AnalysisStatusPanel';
 import { DiagnosticLog } from './components/DiagnosticLog';
 import { FileUpload } from './components/FileUpload';
 import { WaveformPlayer } from './components/WaveformPlayer';
+import { Button, Checkbox, DeviceRack, Panel } from './components/ui';
 // Audit Finding #5: IdleValuePropPanel now occupies the Signal Monitor area
 // when no file is selected. It tells the producer what ASA does and what to
 // expect in 30s / 5min.
@@ -1016,14 +1017,13 @@ export default function App() {
           <main className="space-y-5">
             <section className="grid grid-cols-1 lg:grid-cols-12 gap-3 md:gap-4">
               <div className="lg:col-span-4 flex flex-col gap-4">
-                <div className="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">
-                    <span className="w-2 h-2 bg-accent rounded-full mr-2"></span>
-                    <h3 className="text-[10px] font-mono text-text-secondary uppercase tracking-wider">Input Source</h3>
-                  </div>
+                <DeviceRack
+                  name="Input Source"
+                  status={audioFile ? (isAnalyzing ? 'active' : 'success') : 'idle'}
+                >
                   <div
                     data-testid="input-panel"
-                    className="bg-bg-card border border-border rounded-b-sm p-4 flex flex-col min-h-[220px]"
+                    className="flex flex-col min-h-[220px]"
                   >
                     {showInputCollapsed && audioFile ? (
                       // Audit N9: compact post-analysis summary. Replaces the
@@ -1054,20 +1054,21 @@ export default function App() {
                           </p>
                         </div>
                         <div className="flex items-center gap-2">
-                          <button
-                            type="button"
+                          <Button
+                            variant="secondary"
+                            size="md"
                             onClick={handleFileClear}
-                            className="flex-1 text-[10px] font-mono uppercase tracking-wider text-text-secondary border border-border bg-bg-panel hover:border-accent/40 hover:text-text-primary px-2 py-2 rounded-sm transition-colors"
+                            className="flex-1"
                           >
                             ↺ Analyze new file
-                          </button>
-                          <button
-                            type="button"
+                          </Button>
+                          <Button
+                            variant="secondary"
+                            size="md"
                             onClick={() => setInputManuallyExpanded(true)}
-                            className="text-[10px] font-mono uppercase tracking-wider text-text-secondary border border-border bg-bg-panel hover:border-accent/40 hover:text-text-primary px-2 py-2 rounded-sm transition-colors"
                           >
                             Adjust settings
-                          </button>
+                          </Button>
                         </div>
                       </div>
                     ) : (
@@ -1079,13 +1080,13 @@ export default function App() {
                             <p className="text-[10px] font-mono uppercase tracking-wider text-text-secondary">
                               Editing analysis settings
                             </p>
-                            <button
-                              type="button"
+                            <Button
+                              variant="secondary"
+                              size="sm"
                               onClick={() => setInputManuallyExpanded(false)}
-                              className="text-[10px] font-mono uppercase tracking-wider text-text-secondary border border-border bg-bg-panel hover:border-accent/40 hover:text-text-primary px-2 py-1 rounded-sm transition-colors"
                             >
                               Hide
-                            </button>
+                            </Button>
                           </div>
                         )}
                     <FileUpload
@@ -1121,20 +1122,21 @@ export default function App() {
                       </div>
                     </div>
                     <label
-                      className={`mt-4 rounded-sm border px-3 py-3 transition-colors cursor-pointer ${
+                      htmlFor="pitch-note-toggle"
+                      className={`mt-4 rounded-sm border px-3 py-3 transition-colors cursor-pointer block ${
                         pitchNoteTranslationRequested
                           ? 'border-accent bg-accent/10 text-accent'
                           : 'border-border bg-bg-panel text-text-secondary'
                       } ${isAnalyzing ? 'opacity-50 cursor-not-allowed' : ''}`}
                     >
                       <div className="flex items-start gap-3">
-                        <input
-                          type="checkbox"
+                        <Checkbox
+                          id="pitch-note-toggle"
                           checked={pitchNoteTranslationRequested}
-                          onChange={(e) => setPitchNoteTranslationRequested(e.target.checked)}
+                          onCheckedChange={(checked) => setPitchNoteTranslationRequested(checked === true)}
                           disabled={isAnalyzing}
                           aria-label="PITCH/NOTE TRANSLATION"
-                          className="mt-0.5 h-4 w-4 accent-accent"
+                          className="mt-0.5"
                         />
                         <div className="space-y-1">
                           <p className="text-[10px] font-mono uppercase tracking-wider">STEM PITCH/NOTE TRANSLATION</p>
@@ -1146,20 +1148,21 @@ export default function App() {
                       </div>
                     </label>
                     <label
-                      className={`mt-3 rounded-sm border px-3 py-3 transition-colors cursor-pointer ${
+                      htmlFor="interpretation-toggle"
+                      className={`mt-3 rounded-sm border px-3 py-3 transition-colors cursor-pointer block ${
                         interpretationRequested && phase2ConfigEnabled
                           ? 'border-accent bg-accent/10 text-accent'
                           : 'border-border bg-bg-panel text-text-secondary'
                       } ${isAnalyzing || !phase2ConfigEnabled ? 'opacity-50 cursor-not-allowed' : ''}`}
                     >
                       <div className="flex items-start gap-3">
-                        <input
-                          type="checkbox"
+                        <Checkbox
+                          id="interpretation-toggle"
                           checked={interpretationRequested}
-                          onChange={(e) => handleInterpretationRequestedChange(e.target.checked)}
+                          onCheckedChange={(checked) => handleInterpretationRequestedChange(checked === true)}
                           disabled={isAnalyzing || !phase2ConfigEnabled}
                           aria-label="AI INTERPRETATION"
-                          className="mt-0.5 h-4 w-4 accent-accent"
+                          className="mt-0.5"
                         />
                         <div className="space-y-1">
                           <div className="flex flex-wrap items-center gap-2">
@@ -1238,25 +1241,24 @@ export default function App() {
                           transition={{ duration: 0.3, ease: 'easeOut', delay: 0.1 }}
                           className="mt-4 flex justify-end"
                         >
-                          <motion.button
+                          <Button
+                            variant="primary"
+                            size="lg"
+                            ledIndicator
+                            leadingIcon={<Play className="w-3 h-3 fill-current" />}
                             onClick={handleStartAnalysis}
                             disabled={isAnalyzeDisabled}
-                            whileHover={isAnalyzeDisabled ? {} : { scale: 1.02 }}
-                            whileTap={isAnalyzeDisabled ? {} : { scale: 0.98 }}
-                            className="group relative bg-bg-panel border border-accent/60 hover:bg-accent hover:border-accent text-accent hover:text-bg-app shadow-[0_0_10px_rgba(255,136,0,0.15)] hover:shadow-[0_0_18px_rgba(255,136,0,0.4)] disabled:opacity-40 disabled:shadow-none disabled:border-border disabled:text-text-secondary disabled:cursor-not-allowed font-bold py-2.5 px-7 rounded-sm flex items-center transition-all duration-200 uppercase tracking-wider font-mono text-xs"
                             title={estimateWrongService ? 'Point the UI at the Sonic Analyzer backend to enable analysis.' : undefined}
                           >
-                            <span className="w-1.5 h-1.5 rounded-full bg-accent group-hover:bg-bg-app/50 group-disabled:bg-border mr-3 animate-pulse" />
-                            <Play className="w-3 h-3 mr-2 fill-current" />
                             Run Analysis
-                          </motion.button>
+                          </Button>
                         </motion.div>
                       </>
                     )}
                       </>
                     )}
                   </div>
-                </div>
+                </DeviceRack>
               </div>
 
               <div className="lg:col-span-8 flex flex-col">
diff --git a/apps/ui/src/components/AnalysisResults.tsx b/apps/ui/src/components/AnalysisResults.tsx
index 56c9a528..a5a3d33d 100644
--- a/apps/ui/src/components/AnalysisResults.tsx
+++ b/apps/ui/src/components/AnalysisResults.tsx
@@ -38,6 +38,7 @@ import {
   StatusBadge,
   TokenBadgeList,
 } from './MeasurementPrimitives';
+import { Button, DeviceRack, MetricTile, SectionHeader } from './ui';
 import { PhaseSourceBadge } from './PhaseSourceBadge';
 import { StickyNav, type StickyNavSection } from './StickyNav';
 import { CitationBlock, CitationHeadline } from './CitationBlock';
@@ -840,176 +841,175 @@ export function AnalysisResults({
       data-testid="analysis-results-root"
       className="space-y-12"
     >
-      <div className="flex flex-col md:flex-row md:items-center justify-between gap-6 pb-6 border-b border-border relative">
-        <div>
-          <h1
-            data-text-role="page-title"
-            className={textRoleClassName('page-title', 'flex items-center')}
-          >
-            <Activity className="w-6 h-6 mr-3 text-accent" />
-            {formatDisplayText('Analysis Results', 'title')}
-          </h1>
-          {headerSubtitle && (
-            <p
-              data-text-role="meta"
-              className={textRoleClassName('meta', 'mt-1 opacity-70')}
-              data-testid="analysis-results-subtitle"
-            >
-              {headerSubtitle}
-            </p>
-          )}
-        </div>
-        <div className="flex items-center gap-3">
-          <button
-            onClick={handleExportJSON}
-            data-testid="analysis-export-json"
-            className="flex items-center gap-2 px-4 py-2 bg-bg-panel border border-border rounded text-xs font-mono uppercase tracking-wider hover:bg-bg-card-hover hover:border-accent/50 transition-all group"
-          >
-            <FileJson className="w-3 h-3 text-text-secondary group-hover:text-accent" />
-            <span>Download data</span>
-          </button>
-          <button
-            onClick={handleExportMD}
-            data-testid="analysis-export-markdown"
-            className="flex items-center gap-2 px-4 py-2 bg-accent/10 border border-accent/50 text-accent rounded text-xs font-mono uppercase tracking-wider hover:bg-accent/20 transition-all shadow-[0_0_10px_rgba(255,85,0,0.1)]"
+      <div className="flex flex-col gap-2 pb-6 border-b border-border relative">
+        <SectionHeader
+          size="lg"
+          variant="inline"
+          eyebrow="ASA Results"
+          titleRole="page-title"
+          ledTone="accent"
+          title={formatDisplayText('Analysis Results', 'title')}
+          action={
+            <>
+              <Button
+                variant="secondary"
+                size="md"
+                leadingIcon={<FileJson className="w-3 h-3" />}
+                onClick={handleExportJSON}
+                data-testid="analysis-export-json"
+              >
+                Download data
+              </Button>
+              <Button
+                variant="primary"
+                size="md"
+                leadingIcon={<FileText className="w-3 h-3" />}
+                onClick={handleExportMD}
+                data-testid="analysis-export-markdown"
+              >
+                Download report
+              </Button>
+            </>
+          }
+        />
+        {headerSubtitle && (
+          <p
+            data-text-role="meta"
+            data-testid="analysis-results-subtitle"
+            className={textRoleClassName('meta', 'opacity-70 pl-4')}
           >
-            <FileText className="w-3 h-3" />
-            <span>Download report</span>
-          </button>
-        </div>
+            {headerSubtitle}
+          </p>
+        )}
       </div>
 
       <StickyNav sections={navSections} />
 
-      <div className="grid grid-cols-2 md:grid-cols-4 gap-3">
-        {/* TEMPO */}
-        <AccentMetricCard
-          label={
-            <span className="flex items-center gap-1.5">
-              <Activity className="w-3.5 h-3.5 text-accent/60" />
-              <span>TEMPO</span>
-            </span>
-          }
-          value={finalBpm}
-          unit="BPM"
-          headerRight={<PhaseSourceBadge source="measured" />}
-          footer={
-            <div className="space-y-2">
-              {/* Audit Finding #4: `SCORE 0.86` badge retired in favor of the
-                  canonical band pill — same vocabulary as Key, Character, and
-                  every other confidence surface. */}
-              <ConfidenceBandBadge variant="compact" confidence={phase1.bpmConfidence} />
-              {phase1.bpmSource && (
-                <span className="block text-[8px] font-mono uppercase tracking-wide text-text-secondary/50">
-                  {phase1.bpmSource.replace(/_/g, ' ')}
-                </span>
-              )}
-            </div>
-          }
-        />
-
-        {/* KEY SIG */}
-        <AccentMetricCard
-          label={
-            <span className="flex items-center gap-1.5">
-              <Music className="w-3.5 h-3.5 text-accent/60" />
-              <span>KEY SIG</span>
-            </span>
-          }
-          value={<span className="truncate block">{finalKey}</span>}
-          headerRight={
-            <div className="flex items-center gap-1">
-              <PhaseSourceBadge source="measured" />
-              {lowConfidenceIndicator(keyIsApproximate)}
-            </div>
-          }
-          footer={
-            <div className="space-y-1.5">
-              <MetricBar
-                value={phase1.keyConfidence}
-                color="var(--color-accent)"
-                glow
-              />
-              {/* Audit Finding #4: `CONF 62%` text replaced with the canonical
-                  band pill so every confidence reads in the same vocabulary. */}
-              <ConfidenceBandBadge variant="compact" confidence={phase1.keyConfidence} />
-            </div>
-          }
-        />
-
-        {/* METER */}
-        <AccentMetricCard
-          label={
-            <span className="flex items-center gap-1.5">
-              <Clock className="w-3.5 h-3.5 text-accent/60" />
-              <span>METER</span>
-            </span>
-          }
-          value={phase1.timeSignature}
-          footer={<StatusBadge label={meterStatusLabel(phase1)} tone="muted" compact />}
-        />
-
-        {/* CHARACTER — genre primary, characteristic pills secondary */}
-        {phase1.genreDetail ? (
-          <AccentMetricCard
-            label={
-              <span className="flex items-center gap-1.5">
-                <Disc className="w-3.5 h-3.5 text-accent/60" />
-                <span>CHARACTER</span>
-              </span>
-            }
-            value={<span className="truncate block capitalize text-[1.5rem]">{phase1.genreDetail.genre}</span>}
+      <DeviceRack name="Measurement Summary" density="dense" status="success">
+        <div className="grid grid-cols-2 md:grid-cols-4 gap-3">
+          {/* TEMPO */}
+          <MetricTile
+            size="lg"
+            accent="accent"
+            icon={<Activity className="w-3.5 h-3.5 text-accent/60" />}
+            label="TEMPO"
+            value={finalBpm}
+            unit="BPM"
             headerRight={<PhaseSourceBadge source="measured" />}
             footer={
               <div className="space-y-2">
-                <TokenBadgeList
-                  items={[
-                    { label: phase1.genreDetail.genreFamily, tone: 'accent' },
-                    ...(phase1.genreDetail.secondaryGenre
-                      ? [{ label: phase1.genreDetail.secondaryGenre, tone: 'muted' as const }]
-                      : []),
-                  ]}
-                />
+                {/* Audit Finding #4: `SCORE 0.86` badge retired in favor of the
+                    canonical band pill — same vocabulary as Key, Character, and
+                    every other confidence surface. */}
+                <ConfidenceBandBadge variant="compact" confidence={phase1.bpmConfidence} />
+                {phase1.bpmSource && (
+                  <span className="block text-[8px] font-mono uppercase tracking-wide text-text-secondary/50">
+                    {phase1.bpmSource.replace(/_/g, ' ')}
+                  </span>
+                )}
+              </div>
+            }
+          />
+
+          {/* KEY SIG */}
+          <MetricTile
+            size="lg"
+            accent="accent"
+            icon={<Music className="w-3.5 h-3.5 text-accent/60" />}
+            label="KEY SIG"
+            value={<span className="truncate block">{finalKey}</span>}
+            headerRight={
+              <div className="flex items-center gap-1">
+                <PhaseSourceBadge source="measured" />
+                {lowConfidenceIndicator(keyIsApproximate)}
+              </div>
+            }
+            footer={
+              <div className="space-y-1.5">
                 <MetricBar
-                  value={phase1.genreDetail.confidence}
+                  value={phase1.keyConfidence}
                   color="var(--color-accent)"
                   glow
                 />
-                {/* Audit Finding #4: `CONF X%` replaced with the canonical
-                    band pill — same vocabulary across every confidence. */}
-                <ConfidenceBandBadge
-                  variant="compact"
-                  confidence={phase1.genreDetail.confidence}
-                />
+                {/* Audit Finding #4: `CONF 62%` text replaced with the canonical
+                    band pill so every confidence reads in the same vocabulary. */}
+                <ConfidenceBandBadge variant="compact" confidence={phase1.keyConfidence} />
               </div>
             }
           />
-        ) : (
-          <AccentMetricCard
-            label={
-              <span className="flex items-center gap-1.5">
-                <Disc className="w-3.5 h-3.5 text-accent/60" />
-                <span>CHARACTER</span>
-              </span>
-            }
-            value={<span className="text-base font-mono uppercase tracking-wide text-text-secondary/60">SCANNING...</span>}
-            footer={
-              characteristicPills.length > 0 ? (
-                <div className="w-full flex flex-wrap gap-1">
-                  {characteristicPills.map((item, idx) => (
-                    <span
-                      key={`${item.name}-${idx}`}
-                      className={`inline-flex items-center px-2 py-1 rounded-sm border text-[9px] font-mono uppercase tracking-wide ${characteristicPillClass(item.confidence)}`}
-                    >
-                      {shortenCharacteristicName(item.name)}
-                    </span>
-                  ))}
-                </div>
-              ) : undefined
-            }
+
+          {/* METER */}
+          <MetricTile
+            size="lg"
+            accent="accent"
+            icon={<Clock className="w-3.5 h-3.5 text-accent/60" />}
+            label="METER"
+            value={phase1.timeSignature}
+            footer={<StatusBadge label={meterStatusLabel(phase1)} tone="muted" compact />}
           />
-        )}
-      </div>
+
+          {/* CHARACTER — genre primary, characteristic pills secondary */}
+          {phase1.genreDetail ? (
+            <MetricTile
+              size="lg"
+              accent="accent"
+              icon={<Disc className="w-3.5 h-3.5 text-accent/60" />}
+              label="CHARACTER"
+              value={<span className="truncate block capitalize">{phase1.genreDetail.genre}</span>}
+              headerRight={<PhaseSourceBadge source="measured" />}
+              footer={
+                <div className="space-y-2">
+                  <TokenBadgeList
+                    items={[
+                      { label: phase1.genreDetail.genreFamily, tone: 'accent' },
+                      ...(phase1.genreDetail.secondaryGenre
+                        ? [{ label: phase1.genreDetail.secondaryGenre, tone: 'muted' as const }]
+                        : []),
+                    ]}
+                  />
+                  <MetricBar
+                    value={phase1.genreDetail.confidence}
+                    color="var(--color-accent)"
+                    glow
+                  />
+                  {/* Audit Finding #4: `CONF X%` replaced with the canonical
+                      band pill — same vocabulary across every confidence. */}
+                  <ConfidenceBandBadge
+                    variant="compact"
+                    confidence={phase1.genreDetail.confidence}
+                  />
+                </div>
+              }
+            />
+          ) : (
+            <MetricTile
+              size="lg"
+              accent="accent"
+              icon={<Disc className="w-3.5 h-3.5 text-accent/60" />}
+              label="CHARACTER"
+              value={
+                <span className="text-base font-mono uppercase tracking-wide text-text-secondary/60">
+                  SCANNING...
+                </span>
+              }
+              footer={
+                characteristicPills.length > 0 ? (
+                  <div className="w-full flex flex-wrap gap-1">
+                    {characteristicPills.map((item, idx) => (
+                      <span
+                        key={`${item.name}-${idx}`}
+                        className={`inline-flex items-center px-2 py-1 rounded-sm border text-[9px] font-mono uppercase tracking-wide ${characteristicPillClass(item.confidence)}`}
+                      >
+                        {shortenCharacteristicName(item.name)}
+                      </span>
+                    ))}
+                  </div>
+                ) : undefined
+              }
+            />
+          )}
+        </div>
+      </DeviceRack>
 
       {/* Audit Finding #1: MeasurementDashboard was here at the top of the
           results scroll, ahead of Style / Sonic Elements / Mix Chain / Patches.
diff --git a/apps/ui/src/components/FileUpload.tsx b/apps/ui/src/components/FileUpload.tsx
index 8b8fc26a..da9e3a1a 100644
--- a/apps/ui/src/components/FileUpload.tsx
+++ b/apps/ui/src/components/FileUpload.tsx
@@ -2,6 +2,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { UploadCloud, FileAudio, X, AlertTriangle } from 'lucide-react';
 
 import { isSupportedAudioFile } from '../services/audioFile';
+import { Button, Panel, Pill } from './ui';
 
 interface FileUploadProps {
   onFileSelect: (file: File) => void;
@@ -139,24 +140,26 @@ export function FileUpload({
           </div>
           <p className="text-sm font-bold mb-1 tracking-wide text-text-primary">Drop Audio Here</p>
           <p className="text-[10px] text-text-secondary font-mono uppercase tracking-wider">or click to browse</p>
-          <div className="mt-4 flex gap-2">
-             {['MP3', 'WAV', 'FLAC', 'AIFF'].map(fmt => (
-               <span key={fmt} className="text-[9px] font-mono text-text-secondary border border-border px-1.5 py-0.5 rounded-sm bg-bg-panel opacity-60">
-                 {fmt}
-               </span>
-             ))}
+          <div className="mt-4 flex gap-1.5">
+            {['MP3', 'WAV', 'FLAC', 'AIFF'].map((fmt) => (
+              <Pill key={fmt} tone="neutral" variant="outline" size="xs">
+                {fmt}
+              </Pill>
+            ))}
+          </div>
+          <div className="mt-4">
+            <Button
+              variant="secondary"
+              size="md"
+              onClick={(event) => {
+                event.stopPropagation();
+                void onLoadDemoTrack();
+              }}
+              disabled={isLoading || isDemoLoading}
+            >
+              {isDemoLoading ? 'Loading Demo...' : 'Load Demo Track'}
+            </Button>
           </div>
-          <button
-            type="button"
-            onClick={(event) => {
-              event.stopPropagation();
-              void onLoadDemoTrack();
-            }}
-            disabled={isLoading || isDemoLoading}
-            className="mt-4 rounded-sm border border-border bg-bg-panel px-3 py-1.5 text-[10px] font-mono uppercase tracking-wider text-text-secondary transition-colors hover:border-accent/40 hover:text-accent disabled:opacity-50 disabled:cursor-not-allowed"
-          >
-            {isDemoLoading ? 'Loading Demo...' : 'Load Demo Track'}
-          </button>
           {fileError && (
             <div className="mt-3 flex items-center gap-2 text-error text-[10px] font-mono uppercase tracking-wider" role="alert">
               <AlertTriangle className="w-3.5 h-3.5 shrink-0" />
@@ -165,36 +168,45 @@ export function FileUpload({
           )}
         </div>
       ) : (
-        <div className="bg-bg-card border border-border rounded-sm p-4 flex items-center justify-between relative overflow-hidden group">
-          <div className="absolute left-0 top-0 bottom-0 w-1 bg-accent"></div>
-          <div className="flex items-center space-x-4 pl-2">
-            <div className="bg-bg-panel p-2 rounded-sm border border-border">
-              <FileAudio className="w-6 h-6 text-accent" />
-            </div>
-            <div>
-              <p className="font-bold text-sm tracking-tight truncate max-w-[200px] md:max-w-xs">{selectedFile.name}</p>
-              <p className="text-[10px] text-text-secondary font-mono uppercase tracking-wider flex items-center mt-1">
-                <span className="w-1.5 h-1.5 rounded-full bg-success mr-2"></span>
-                Ready • {(selectedFile.size / (1024 * 1024)).toFixed(2)} MB
-              </p>
-              {fileSizeWarning && (
-                <p className="text-[10px] text-warning font-mono uppercase tracking-wider flex items-center mt-1">
-                  <AlertTriangle className="w-3 h-3 shrink-0 mr-1.5" />
-                  {fileSizeWarning}
+        <Panel variant="surface" padding="md" className="relative overflow-hidden group">
+          {/* Accent stripe down the left edge — the same Live device-on
+              affordance used elsewhere. */}
+          <div className="absolute left-0 top-0 bottom-0 w-1 bg-accent" aria-hidden />
+          <div className="flex items-center justify-between gap-3 pl-2">
+            <div className="flex items-center gap-3 min-w-0">
+              <div className="bg-bg-panel p-2 rounded-sm border border-border shrink-0">
+                <FileAudio className="w-6 h-6 text-accent" />
+              </div>
+              <div className="min-w-0">
+                <p className="font-bold text-sm tracking-tight truncate max-w-[200px] md:max-w-xs">
+                  {selectedFile.name}
                 </p>
-              )}
+                <p className="text-[10px] text-text-secondary font-mono uppercase tracking-wider flex items-center mt-1">
+                  <span className="w-1.5 h-1.5 rounded-full bg-success mr-2" aria-hidden />
+                  Ready • {(selectedFile.size / (1024 * 1024)).toFixed(2)} MB
+                </p>
+                {fileSizeWarning && (
+                  <p className="text-[10px] text-warning font-mono uppercase tracking-wider flex items-center mt-1">
+                    <AlertTriangle className="w-3 h-3 shrink-0 mr-1.5" />
+                    {fileSizeWarning}
+                  </p>
+                )}
+              </div>
             </div>
+            {!isLoading && (
+              <Button
+                variant="ghost"
+                size="sm"
+                iconOnly
+                onClick={clearFile}
+                title="Remove File"
+                aria-label="Remove File"
+              >
+                <X className="w-4 h-4" />
+              </Button>
+            )}
           </div>
-          {!isLoading && (
-            <button
-              onClick={clearFile}
-              className="p-1.5 hover:bg-bg-panel rounded-sm border border-transparent hover:border-border transition-all group/btn"
-              title="Remove File"
-            >
-              <X className="w-4 h-4 text-text-secondary group-hover/btn:text-error" />
-            </button>
-          )}
-        </div>
+        </Panel>
       )}
     </div>
   );