diff --git a/public/js/compare/templates.js b/public/js/compare/templates.js
index 95d4c6e..fe92c80 100644
--- a/public/js/compare/templates.js
+++ b/public/js/compare/templates.js
@@ -128,14 +128,19 @@ function pageXrayTemplate(d) {
   html += '<caption class="sr-only">Page X-ray comparison: ' +
           h(config.har1.label) + ' versus ' + h(config.har2.label) + '</caption>';
   html += '<thead><tr>';
-  html += '<th class="tabletext tableXrayMetric" scope="col">Metric ' +
-            '<button onclick="regenerate(true);" class="submit submit-smaller" ' +
-                    'aria-label="Swap HAR1 and HAR2">Switch</button> ' +
-            '<button id="diffOnlyToggle" type="button" ' +
-                    'onclick="toggleDiffOnly(this);" ' +
-                    'class="chip-toggle" ' +
-                    'aria-pressed="' + diffOnlyPressed + '">' +
-              'Only differences</button></th>';
+  html += '<th class="tabletext tableXrayMetric" scope="col">' +
+            '<div class="tableXrayMetric-stack">' +
+              '<span class="tableXrayMetric-label">Metric</span>' +
+              '<span class="tableXrayMetric-actions">' +
+                '<button onclick="regenerate(true);" class="submit submit-smaller" ' +
+                        'aria-label="Swap HAR1 and HAR2">Switch</button>' +
+                '<button id="diffOnlyToggle" type="button" ' +
+                        'onclick="toggleDiffOnly(this);" ' +
+                        'class="chip-toggle" ' +
+                        'aria-pressed="' + diffOnlyPressed + '">' +
+                  'Only differences</button>' +
+              '</span>' +
+            '</div></th>';
   html += '<th class="tableXrayHarMetric" scope="col">' + h(config.har1.label) +
             '<input type="file" id="har1upload" class="inputfile"/>' +
             '<label for="har1upload">Upload</label></th>';
diff --git a/src/css/buttons.css b/src/css/buttons.css
index ace96b8..9c0acd4 100644
--- a/src/css/buttons.css
+++ b/src/css/buttons.css
@@ -54,7 +54,11 @@
   align-items: center;
   gap: 4px;
   padding: 2px 8px;
-  margin: 0;
+  /* Small left margin so the button doesn't sit flush against the
+     preceding label text (e.g. "Metric Switch", "CPU time spent by
+     category [arrow]"). Doesn't apply inside flex parents thanks to
+     `gap` taking over there. */
+  margin: 0 0 0 8px;
   font-size: 0.8rem;
   font-weight: var(--font-weight-medium);
   vertical-align: middle;
diff --git a/src/css/elements.css b/src/css/elements.css
index 8a53a06..db733c9 100644
--- a/src/css/elements.css
+++ b/src/css/elements.css
@@ -200,6 +200,14 @@ hr {
 }
 
 .card-title {
+  /* Flex container so inline action chips (e.g. "Side by side" on
+     the Waterfall card) sit at a sensible distance from the title
+     text and align vertically to the middle — not the baseline of
+     a smaller chip against a larger h3. */
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 14px;
   margin: 0 0 12px 0;
   font-size: 1.125rem;
   font-weight: var(--font-weight-semibold);
diff --git a/src/css/page-xray.css b/src/css/page-xray.css
index f2484ac..bfc52d1 100644
--- a/src/css/page-xray.css
+++ b/src/css/page-xray.css
@@ -65,6 +65,35 @@
 }
 
 .tableXrayMetric    { width: 22%; text-align: left; }
+
+/*
+ * Metric column header — "Metric" label sits on top of a row of
+ * action chips (Switch + Only differences). Stacking with flex
+ * keeps the chips aligned consistently with each other and with the
+ * column's left edge (which is where the row labels below sit),
+ * instead of relying on inline-wrap and ending up indented.
+ */
+.tableXrayMetric-stack {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 6px;
+}
+.tableXrayMetric-actions {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 8px;
+  /* Negative margin so the button's visible text edge lines up with
+     the metric labels below ("URL", "Date", …) — the button's own
+     border + padding would otherwise indent the text by ~9px. */
+  margin-left: -9px;
+}
+.tableXrayMetric-actions .chip-toggle,
+.tableXrayMetric-actions .submit-smaller {
+  /* `gap` handles spacing — strip the default left margins. */
+  margin-left: 0;
+}
 .tableXrayHarMetric,
 .tableXrayHar2Metric { width: 31%; }
 .tableXrayDiff      { width: 16%; text-align: right; padding-right: 12px; color: var(--color-text-muted); font-weight: var(--font-weight-medium); }
@@ -101,7 +130,11 @@
   display: inline-flex;
   align-items: center;
   padding: 4px 10px;
-  margin-left: 4px;
+  /* Visually separate from any preceding button or text. Reset to 0
+     inside a flex parent (e.g. .card-title) where `gap` already
+     handles the spacing. */
+  margin-left: 12px;
+  vertical-align: middle;
   background: var(--color-surface);
   color: var(--color-text-secondary);
   border: 1px solid var(--color-border);
@@ -112,6 +145,9 @@
   transition: background var(--motion-fast), color var(--motion-fast),
               border-color var(--motion-fast);
 }
+.card-title > .chip-toggle {
+  margin-left: 0;
+}
 .chip-toggle:hover,
 .chip-toggle:focus-visible {
   background: var(--color-blue-tint);
@@ -213,6 +249,10 @@
     display: inline-flex;
     align-items: center;
     padding: 6px 14px;
+    /* Keep the chip away from the HAR1 / HAR2 column label text it
+       sits next to. */
+    margin-left: 10px;
+    vertical-align: middle;
     background: var(--color-surface);
     color: var(--color-text-secondary);
     border: 1px solid var(--color-border);