diff --git a/docs/api/openapi.yaml b/docs/api/openapi.yaml
index b66a81c6c..e9dfaa516 100644
--- a/docs/api/openapi.yaml
+++ b/docs/api/openapi.yaml
@@ -83586,6 +83586,24 @@ components:
                   - weight
                 additionalProperties: false
             - type: "null"
+        device:
+          description: STRAIN only — present when no computed strain score exists in the window and the score is served from the
+            device's own DAY_STRAIN instead. `score` is then `value` as a 0–100 share of `scaleMax`. Absent when the
+            computed proxy is the source.
+          anyOf:
+            - type: object
+              properties:
+                value:
+                  type: number
+                  description: The device's latest day strain on its own scale.
+                scaleMax:
+                  type: number
+                  description: Top of the device scale (21 for WHOOP day strain).
+              required:
+                - value
+                - scaleMax
+              additionalProperties: false
+            - type: "null"
       required:
         - score
         - band
diff --git a/e2e/delegated-writes.spec.ts b/e2e/delegated-writes.spec.ts
index 68150fffc..5c7cfa565 100644
--- a/e2e/delegated-writes.spec.ts
+++ b/e2e/delegated-writes.spec.ts
@@ -221,7 +221,14 @@ test.describe("delegated writes", () => {
     // reads "Add") and then for a `value` input (the form opens on blood
     // pressure, which has three). Both were wrong from the day they were
     // written and nobody found out, because the whole file was skipping.
-    await page.locator('[data-slot="measurement-add"]').click();
+    // The owner's list may be empty, in which case its empty state carries
+    // the add action and the header drops its own.
+    await page
+      .locator(
+        '[data-slot="measurement-add"], [data-slot="measurement-add-first"]',
+      )
+      .first()
+      .click();
     await page.locator("#sys").fill("124");
     await page.locator("#dia").fill("78");
     await page.getByRole("button", { name: /^save$/i }).click();
diff --git a/e2e/dialog-horizontal-overflow.spec.ts b/e2e/dialog-horizontal-overflow.spec.ts
index 54267f858..95302437e 100644
--- a/e2e/dialog-horizontal-overflow.spec.ts
+++ b/e2e/dialog-horizontal-overflow.spec.ts
@@ -70,13 +70,15 @@ const DIALOGS: DialogCase[] = [
   {
     name: "measurements add",
     path: "/measurements",
-    trigger: /^add$/i,
+    // While a list is empty the header drops its add button and the empty
+    // state carries the action, so either one opens the dialog.
+    trigger: /^(add|add your first measurement)$/i,
     ready: '[data-slot="date-time-field"]',
   },
   {
     name: "mood add",
     path: "/mood",
-    trigger: /^add$/i,
+    trigger: /^(add|log your first mood)$/i,
     // The mood sheet opens on the five-face quick check; the timestamp row
     // (and everything else) appears once a face is picked. Measuring the
     // quick check alone would measure a sheet that has almost nothing in it.
@@ -92,7 +94,7 @@ const DIALOGS: DialogCase[] = [
   {
     name: "labs add",
     path: "/labs",
-    trigger: /^add$/i,
+    trigger: /^(add|add your first result)$/i,
     ready: '[data-slot="date-time-field"]',
   },
   // The labs sheet's footer holds three buttons (Cancel, Save & add another,
@@ -101,7 +103,7 @@ const DIALOGS: DialogCase[] = [
   {
     name: "labs add (German)",
     path: "/labs",
-    trigger: /^hinzufügen$/i,
+    trigger: /^(hinzufügen|ersten wert erfassen)$/i,
     ready: '[data-slot="date-time-field"]',
     locale: "de",
   },
diff --git a/e2e/measurement-flow.spec.ts b/e2e/measurement-flow.spec.ts
index 28b48c145..62e4d2137 100644
--- a/e2e/measurement-flow.spec.ts
+++ b/e2e/measurement-flow.spec.ts
@@ -135,7 +135,13 @@ test.describe("add measurement flow", () => {
     // v1.5 phase-5: the menu items now have distinct labels — the
     // measurement entry says "Measurement" / "Messung" instead of "Add",
     // so we can target it directly.
-    await page.getByRole("menuitem", { name: /measurement|messung/i }).click();
+    // The desktop rail opens a dropdown, the phone shell the capture sheet
+    // the bottom nav's plus opens; the measurement entry is in either.
+    await page
+      .getByRole("menuitem", { name: /measurement|messung/i })
+      .or(page.getByRole("button", { name: /^(measurement|messung)\b/i }))
+      .first()
+      .click();
 
     // Form should be visible inside the dialog. Switch type to WEIGHT
     // (combo-box defaults to BLOOD_PRESSURE).
diff --git a/e2e/mood-timestamp.spec.ts b/e2e/mood-timestamp.spec.ts
index 28daa3df8..f157aa674 100644
--- a/e2e/mood-timestamp.spec.ts
+++ b/e2e/mood-timestamp.spec.ts
@@ -32,7 +32,9 @@ test.describe("mood timestamp capture", () => {
     });
 
     await page.goto("/mood", { waitUntil: "domcontentloaded" });
-    await page.getByRole("button", { name: "Add", exact: true }).click();
+    // The list is mocked empty, so its empty state carries the add action
+    // (the header drops its own while there is nothing to list).
+    await page.getByRole("button", { name: "Log your first mood" }).click();
     await page.getByRole("radio", { name: "Amazing" }).click();
 
     const details = page.getByRole("button", { name: "Note & details" });
diff --git a/e2e/onboarding-tour-passthrough.spec.ts b/e2e/onboarding-tour-passthrough.spec.ts
index 003bd5e01..433797e8b 100644
--- a/e2e/onboarding-tour-passthrough.spec.ts
+++ b/e2e/onboarding-tour-passthrough.spec.ts
@@ -141,7 +141,10 @@ test.describe("v1.4.33 F2 — onboarding tour passes clicks through to the page"
     // so a naive "dim everything outside the spotlight rect" overlay
     // covers it. The fix makes the entire tour layer pointer-events:
     // none — every dim panel and the spotlight ring are visual only.
-    const quickAddButton = page.locator('[data-tour-id="dashboard-quick-add"]');
+    // One add button per shell carries the tour id; the other is hidden.
+    const quickAddButton = page
+      .locator('[data-tour-id="dashboard-quick-add"]')
+      .filter({ visible: true });
     await expect(quickAddButton).toBeVisible();
 
     // Forensic guard — at the quick-add button's centre, every element
@@ -153,9 +156,11 @@ test.describe("v1.4.33 F2 — onboarding tour passes clicks through to the page"
     // the stack is blocking, instead of just observing the symptom
     // ("button click did not toggle aria-expanded").
     const tourBlockers = await page.evaluate(() => {
-      const btn = document.querySelector<HTMLElement>(
-        '[data-tour-id="dashboard-quick-add"]',
-      );
+      const btn = [
+        ...document.querySelectorAll<HTMLElement>(
+          '[data-tour-id="dashboard-quick-add"]',
+        ),
+      ].find((el) => el.getClientRects().length > 0);
       if (!btn) return ["no-button"];
       const rect = btn.getBoundingClientRect();
       const x = rect.left + rect.width / 2;
@@ -192,7 +197,14 @@ test.describe("v1.4.33 F2 — onboarding tour passes clicks through to the page"
     await quickAddButton.click();
 
     await expect(quickAddButton).toHaveAttribute("aria-expanded", "true");
-    await expect(page.getByRole("menuitem").first()).toBeVisible();
+    // The desktop rail opens a dropdown; the phone shell opens the capture
+    // sheet the bottom nav's plus opens. Either proves the click landed.
+    await expect(
+      page
+        .getByRole("menuitem")
+        .or(page.locator('[role="dialog"][data-state="open"]'))
+        .first(),
+    ).toBeVisible();
 
     // The tour stays mounted — the click went to the underlying button,
     // not anything in the tour layer.
diff --git a/e2e/vaccinations.spec.ts b/e2e/vaccinations.spec.ts
index fbf2f2199..40b43f27c 100644
--- a/e2e/vaccinations.spec.ts
+++ b/e2e/vaccinations.spec.ts
@@ -84,11 +84,19 @@ async function captureDose(
     booster: "confirm" | "decline" | "none";
   },
 ): Promise<void> {
-  // The header Add renders whether or not the list is empty, so clicking it
-  // works in both states. click() auto-waits for the button to be actionable,
-  // which avoids racing an instant visibility read against the client render
-  // (an empty-state-only branch times out once a record already exists).
-  await page.locator('[data-slot="vaccination-add"]').first().click();
+  // While the Impfpass is empty its empty state carries the add action and
+  // the header drops its own, so wait for the list to settle (a record or
+  // the empty state) and click whichever add control is then on screen.
+  await expect(
+    page.locator('[data-vaccination-id], [data-slot="empty-state"]').first(),
+  ).toBeVisible();
+  await page
+    .locator(
+      '[data-slot="vaccination-add"], [data-slot="vaccination-add-empty"]',
+    )
+    .filter({ visible: true })
+    .first()
+    .click();
 
   await expect(page.locator('[data-slot="vaccination-form"]')).toBeVisible();
 
@@ -321,7 +329,12 @@ test.describe("vaccinations", () => {
     ).toBeVisible({ timeout: 15_000 });
     await expectNoSeriousAxe(page);
 
-    await page.locator('[data-slot="vaccination-add"]').first().click();
+    await page
+      .locator(
+        '[data-slot="vaccination-add"], [data-slot="vaccination-add-empty"]',
+      )
+      .last()
+      .click();
     await expect(page.locator('[data-slot="vaccination-form"]')).toBeVisible();
     await expectNoSeriousAxe(page);
   });
diff --git a/messages/de.json b/messages/de.json
index ee6731cd2..3b6b8a461 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -49,7 +49,9 @@
     "dismiss": "Schließen",
     "moreInfo": "Mehr Informationen",
     "durationHoursMinutes": "{hours} Std. {minutes} Min.",
-    "durationMinutes": "{minutes} Min."
+    "durationMinutes": "{minutes} Min.",
+    "durationClockMinutes": "{time} Min.",
+    "durationClockHours": "{time} Std."
   },
   "apiErrors": {
     "measurement": {
@@ -540,6 +542,11 @@
       "errorRateLimit": "Zu viele Versuche. Warte ein paar Minuten und versuche es erneut.",
       "errorFailed": "Das hat nicht geklappt. Versuche es gleich noch einmal.",
       "errorOffline": "Das hat den Server nicht erreicht. Prüfe deine Verbindung und versuche es erneut."
+    },
+    "inviteInvalid": {
+      "title": "Einladung ungültig",
+      "description": "Dieser Einladungslink ist unvollständig oder falsch kopiert. Bitte die Person, die dich eingeladen hat, um einen neuen Link.",
+      "toLogin": "Zur Anmeldung"
     }
   },
   "dashboard": {
@@ -2031,7 +2038,6 @@
         "bestand": "Bestand",
         "verlauf": "Verlauf",
         "injektion": "Injektion",
-        "api": "API",
         "erweitert": "Erweitert",
         "wirkung": "Wirkung"
       },
@@ -2503,7 +2509,8 @@
       "moodHeatmapEmpty": "Stimmungs-Heatmap, noch keine Tage erfasst.",
       "complianceHeatmap": "Heatmap zur Medikamenteneinnahme von {start} bis {end}, {days} aktive Tage.",
       "complianceHeatmapEmpty": "Heatmap zur Medikamenteneinnahme, noch keine aktiven Tage."
-    }
+    },
+    "medicationsEmptyAction": "Medikament anlegen"
   },
   "chart": {
     "overlay": {
@@ -4340,7 +4347,9 @@
           "method": "Ein nächtlicher 0–100-Belastungs-Proxy aus deiner herzfrequenzgewichteten Aktivitätslast (ein TRIMP-ähnliches Trainingsimpuls-Modell). Höher heißt ein anstrengenderer Tag.",
           "anchorPersonal": "An deine eigene jüngste Trainingstagslast angelehnt — bewertet relativ zu deiner typischen Anstrengung, sodass ein für dich wirklich harter Tag hoch ausfällt.",
           "anchorPopulation": "Gegen einen allgemeinen Referenzwert bewertet, während du noch Trainingsverlauf aufbaust; sobald genug vorhanden ist, wechselt die Bewertung auf deine eigene typische Anstrengung.",
-          "description": "Ein nächtlicher Aktivitätslast-Proxy aus deiner herzfrequenzgewichteten Anstrengung, relativ zu deiner typischen Anstrengung."
+          "description": "Ein nächtlicher Aktivitätslast-Proxy aus deiner herzfrequenzgewichteten Anstrengung, relativ zu deiner typischen Anstrengung.",
+          "deviceCaption": "Tagesbelastung deines Geräts: {value} von {max}",
+          "deviceSource": "Bis HealthLog nachts einen eigenen Wert berechnet hat, zeigt die Karte die Tagesbelastung deines Geräts, umgerechnet auf 0–100."
         },
         "WRIST_TEMPERATURE_BASELINE": {
           "method": "Deine typische nächtliche Handgelenkstemperatur ist der Median deiner nächtlichen Messwerte im Zeitraum, ± einer robusten Streuung (skalierte mittlere absolute Abweichung). Sie folgt DEINEN Werten — letzte Nacht wird als Abweichung von deiner eigenen Baseline gezeigt, nicht von einer Bevölkerungsnorm.",
@@ -4717,8 +4726,8 @@
       "emptyCta": "Gerät verbinden"
     },
     "intradayPulse": {
-      "title": "Der Verlauf deines Tages",
-      "caption": "Dein Puls über den Tag, gemittelt in 10-Minuten-Schritten.",
+      "title": "Puls über den Tag",
+      "caption": "Gemittelt in 10-Minuten-Schritten.",
       "hourlyNote": "Stündlicher Durchschnitt für diesen Tag — aktuelle Tage zeigen das volle 10-Minuten-Detail.",
       "empty": "Für diesen Tag noch nicht genug Pulswerte, um den Tagesverlauf zu zeigen.",
       "coverageOne": "Basierend auf 1 Messung über {hours}h.",
@@ -6007,9 +6016,9 @@
     "botToken": "Bot-Token",
     "chatId": "Chat-ID",
     "enableNotifications": "Benachrichtigungen aktivieren",
-    "telegramStep1": "1. Erstelle einen Bot über @BotFather in Telegram und kopiere den Token.",
-    "telegramStep2": "2. Sende /start an deinen Bot, um den Chat zu aktivieren.",
-    "telegramStep3": "3. Finde deine Chat-ID über @userinfobot oder die Bot-API.",
+    "telegramStep1": "Erstelle einen Bot über @BotFather in Telegram und kopiere den Token.",
+    "telegramStep2": "Sende /start an deinen Bot, um den Chat zu aktivieren.",
+    "telegramStep3": "Finde deine Chat-ID über @userinfobot oder die Bot-API.",
     "ntfy": "ntfy",
     "ntfyDescription": "Benachrichtigungen über ntfy (self-hosted oder ntfy.sh).",
     "ntfyEnable": "ntfy aktivieren",
@@ -6367,8 +6376,8 @@
     "whoop": "WHOOP",
     "whoopDescription": "Verbinde dein WHOOP-Band, um Erholung, Schlaf, Belastung und Workouts direkt in HealthLog zu synchronisieren.",
     "whoopCredentials": "API-Zugangsdaten",
-    "whoopClientId": "Client ID",
-    "whoopClientSecret": "Client Secret",
+    "whoopClientId": "Client-ID",
+    "whoopClientSecret": "Client-Secret",
     "whoopCredentialsSaved": "Zugangsdaten gespeichert",
     "whoopCredentialsSavedPlaceholder": "Gespeichert — neu eingeben zum Ersetzen",
     "whoopCredentialsSavedPlaceholderSecret": "Gespeichert — neu eingeben zum Ersetzen",
@@ -6780,8 +6789,8 @@
     "polarDescription": "Verbinde dein Polar-Konto, um Nightly-Recharge-Erholung, Schlafphasen, tägliche Aktivität und Trainingseinheiten zu synchronisieren.",
     "polarViewData": "Schlaf & Erholung ansehen",
     "polarCredentials": "API-Zugangsdaten",
-    "polarClientId": "Client ID",
-    "polarClientSecret": "Client Secret",
+    "polarClientId": "Client-ID",
+    "polarClientSecret": "Client-Secret",
     "polarCredentialsSaved": "Zugangsdaten gespeichert",
     "polarCredentialsSavedPlaceholder": "Gespeichert — neu eingeben zum Ersetzen",
     "polarSaveCredentials": "Speichern",
@@ -6809,8 +6818,8 @@
     "ouraDescription": "Verbinde dein Oura-Konto, um Readiness, Schlafphasen, Herzfrequenzvariabilität und tägliche Aktivität zu synchronisieren.",
     "ouraViewData": "Schlaf & Erholung ansehen",
     "ouraCredentials": "API-Zugangsdaten",
-    "ouraClientId": "Client ID",
-    "ouraClientSecret": "Client Secret",
+    "ouraClientId": "Client-ID",
+    "ouraClientSecret": "Client-Secret",
     "ouraCredentialsSaved": "Zugangsdaten gespeichert",
     "ouraCredentialsSavedPlaceholder": "Gespeichert — neu eingeben zum Ersetzen",
     "ouraSaveCredentials": "Speichern",
@@ -8047,14 +8056,6 @@
         "title": "Einnahme-Legende",
         "description": "Dokumentiere 300 eingenommene Medikamente."
       },
-      "overIntake1": {
-        "title": "Doppelt genommen",
-        "description": "Nimm mindestens einmal mehr ein als vorgesehen."
-      },
-      "skippedIntake1": {
-        "title": "Pause eingelegt",
-        "description": "Überspringe mindestens eine geplante Einnahme."
-      },
       "passkeyCreated1": {
         "title": "Passkey gesetzt",
         "description": "Erstelle deinen ersten Passkey."
@@ -8719,7 +8720,11 @@
     },
     "course": "Phase {n}",
     "courseRange": "{start} bis {end}",
-    "courseSince": "seit {start}"
+    "courseSince": "seit {start}",
+    "unavailable": {
+      "title": "Link abgelaufen oder ungültig",
+      "description": "Dieser Freigabelink ist abgelaufen, wurde zurückgezogen oder ist unvollständig. Bitte die Person, die ihn geteilt hat, um einen neuen Link."
+    }
   },
   "cycle": {
     "symptomCategory": {
@@ -9803,7 +9808,7 @@
     }
   },
   "illness": {
-    "title": "Krankheitstagebuch",
+    "title": "Krankheit",
     "subtitle": "Ein rückblickendes Protokoll deiner Krankheits- und Beschwerde-Episoden.",
     "settings": {
       "viewDescription": "Wähle, ob Episoden als Karten oder als kompakte Liste erscheinen.",
@@ -12260,7 +12265,8 @@
       "fewer": "Weniger anzeigen",
       "note": "Zusammengestellt aus deinen Einträgen, ohne Bewertung. Jedes Datum öffnet den ganzen Tag.",
       "report": "Arztbericht {date} bis heute"
-    }
+    },
+    "travel": "Unterwegs"
   },
   "timeline": {
     "title": "Zeitleiste",
@@ -12494,5 +12500,12 @@
       "title": "Lebensereignis löschen?",
       "body": "Titel und Notiz sind danach nicht mehr da."
     }
+  },
+  "aboutPage": {
+    "eyebrow": "Info",
+    "title": "Über HealthLog",
+    "lastUpdated": "Zuletzt aktualisiert: {date}",
+    "project": "Projekt",
+    "credits": "Danksagungen"
   }
 }
diff --git a/messages/en.json b/messages/en.json
index 06a2e9b36..7d80357c5 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -49,7 +49,9 @@
     "dismiss": "Dismiss",
     "moreInfo": "More information",
     "durationHoursMinutes": "{hours}h {minutes}m",
-    "durationMinutes": "{minutes}m"
+    "durationMinutes": "{minutes}m",
+    "durationClockMinutes": "{time} min",
+    "durationClockHours": "{time} h"
   },
   "apiErrors": {
     "measurement": {
@@ -540,6 +542,11 @@
       "errorRateLimit": "Too many attempts. Wait a few minutes and try again.",
       "errorFailed": "That did not work. Try again in a moment.",
       "errorOffline": "That did not reach the server. Check your connection and try again."
+    },
+    "inviteInvalid": {
+      "title": "Invitation invalid",
+      "description": "This invitation link is incomplete or was copied wrongly. Ask the person who invited you for a new link.",
+      "toLogin": "Go to sign in"
     }
   },
   "dashboard": {
@@ -2031,7 +2038,6 @@
         "bestand": "Supply",
         "verlauf": "History",
         "injektion": "Injection",
-        "api": "API",
         "erweitert": "Advanced",
         "wirkung": "Effect"
       },
@@ -2503,7 +2509,8 @@
       "moodHeatmapEmpty": "Mood heatmap, no days logged yet.",
       "complianceHeatmap": "Medication compliance heatmap from {start} to {end}, {days} active days.",
       "complianceHeatmapEmpty": "Medication compliance heatmap, no active days yet."
-    }
+    },
+    "medicationsEmptyAction": "Add a medication"
   },
   "chart": {
     "overlay": {
@@ -4340,7 +4347,9 @@
           "method": "A nightly 0–100 strain proxy from your heart-rate-weighted activity load (a TRIMP-style training-impulse model). Higher means a harder day.",
           "anchorPersonal": "Anchored to your own recent training-day load — scored relative to your typical effort, so a genuinely hard day for you reads high.",
           "anchorPopulation": "Scored against a general reference while you build training history; once you have enough it switches to your own typical effort.",
-          "description": "A nightly activity-load proxy from your heart-rate-weighted effort, relative to your typical effort."
+          "description": "A nightly activity-load proxy from your heart-rate-weighted effort, relative to your typical effort.",
+          "deviceCaption": "Your device's day strain: {value} of {max}",
+          "deviceSource": "Until HealthLog has computed its own value overnight, the card shows your device's day strain, rescaled to 0–100."
         },
         "WRIST_TEMPERATURE_BASELINE": {
           "method": "Your typical overnight wrist temperature is the median of your nightly readings over the window, ± a robust spread (median absolute deviation, scaled). It tracks YOUR readings — last night is shown as a deviation from your own baseline, not a population norm.",
@@ -4717,8 +4726,8 @@
       "emptyCta": "Connect a device"
     },
     "intradayPulse": {
-      "title": "Your day's shape",
-      "caption": "Your heart rate through the day, averaged in 10-minute steps.",
+      "title": "Pulse through the day",
+      "caption": "Averaged in 10-minute steps.",
       "hourlyNote": "Showing this day's hourly average — recent days show the full 10-minute detail.",
       "empty": "Not enough heart-rate readings for this day to show its shape yet.",
       "coverageOne": "Based on 1 reading across {hours}h.",
@@ -6007,9 +6016,9 @@
     "botToken": "Bot Token",
     "chatId": "Chat ID",
     "enableNotifications": "Enable notifications",
-    "telegramStep1": "1. Create a bot via @BotFather in Telegram and copy the token.",
-    "telegramStep2": "2. Send /start to your bot to activate the chat.",
-    "telegramStep3": "3. Find your Chat ID via @userinfobot or the Bot API.",
+    "telegramStep1": "Create a bot via @BotFather in Telegram and copy the token.",
+    "telegramStep2": "Send /start to your bot to activate the chat.",
+    "telegramStep3": "Find your Chat ID via @userinfobot or the Bot API.",
     "ntfy": "ntfy",
     "ntfyDescription": "Notifications via ntfy (self-hosted or ntfy.sh).",
     "ntfyEnable": "Enable ntfy",
@@ -8047,14 +8056,6 @@
         "title": "Intake legend",
         "description": "Record 300 taken medication events."
       },
-      "overIntake1": {
-        "title": "Double take",
-        "description": "Take medication at least once more than planned."
-      },
-      "skippedIntake1": {
-        "title": "Stepped back",
-        "description": "Skip at least one planned intake."
-      },
       "passkeyCreated1": {
         "title": "Passkey set up",
         "description": "Create your first passkey."
@@ -8719,7 +8720,11 @@
     },
     "course": "Course {n}",
     "courseRange": "{start} to {end}",
-    "courseSince": "since {start}"
+    "courseSince": "since {start}",
+    "unavailable": {
+      "title": "Link expired or invalid",
+      "description": "This share link has expired, was revoked, or is incomplete. Ask the person who shared it for a new link."
+    }
   },
   "cycle": {
     "symptomCategory": {
@@ -9803,7 +9808,7 @@
     }
   },
   "illness": {
-    "title": "Illness journal",
+    "title": "Illness",
     "subtitle": "A retrospective log of your illness and condition episodes.",
     "settings": {
       "viewDescription": "Choose whether episodes show as cards or as a compact list.",
@@ -12260,7 +12265,8 @@
       "fewer": "Show fewer",
       "note": "Compiled from your entries, without judgement. Every date opens the whole day.",
       "report": "Doctor report from {date} to today"
-    }
+    },
+    "travel": "Away"
   },
   "timeline": {
     "title": "Timeline",
@@ -12494,5 +12500,12 @@
       "title": "Delete this life event?",
       "body": "Its title and note will be gone."
     }
+  },
+  "aboutPage": {
+    "eyebrow": "About",
+    "title": "About HealthLog",
+    "lastUpdated": "Last updated: {date}",
+    "project": "Project",
+    "credits": "Credits"
   }
 }
diff --git a/messages/es.json b/messages/es.json
index ddf55c374..95ebf5cc3 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -49,7 +49,9 @@
     "dismiss": "Descartar",
     "moreInfo": "Más información",
     "durationHoursMinutes": "{hours} h {minutes} min",
-    "durationMinutes": "{minutes} min"
+    "durationMinutes": "{minutes} min",
+    "durationClockMinutes": "{time} min",
+    "durationClockHours": "{time} h"
   },
   "apiErrors": {
     "measurement": {
@@ -540,6 +542,11 @@
       "errorRateLimit": "Demasiados intentos. Espera unos minutos y vuelve a intentarlo.",
       "errorFailed": "No ha funcionado. Vuelve a intentarlo en un momento.",
       "errorOffline": "No se llegó al servidor. Comprueba tu conexión y vuelve a intentarlo."
+    },
+    "inviteInvalid": {
+      "title": "Invitación no válida",
+      "description": "Este enlace de invitación está incompleto o se copió mal. Pide un enlace nuevo a la persona que te invitó.",
+      "toLogin": "Ir a iniciar sesión"
     }
   },
   "dashboard": {
@@ -2031,7 +2038,6 @@
         "bestand": "Existencias",
         "verlauf": "Historial",
         "injektion": "Inyección",
-        "api": "API",
         "erweitert": "Avanzado",
         "wirkung": "Efecto"
       },
@@ -2503,7 +2509,8 @@
       "moodHeatmapEmpty": "Mapa de calor de estado de ánimo, aún no hay días registrados.",
       "complianceHeatmap": "Mapa de calor de cumplimiento de medicación de {start} a {end}, {days} días activos.",
       "complianceHeatmapEmpty": "Mapa de calor de cumplimiento de medicación, aún no hay días activos."
-    }
+    },
+    "medicationsEmptyAction": "Añadir un medicamento"
   },
   "chart": {
     "overlay": {
@@ -4340,7 +4347,9 @@
           "method": "Un indicador nocturno de esfuerzo de 0 a 100 a partir de tu carga de actividad ponderada por frecuencia cardíaca (un modelo de impulso de entrenamiento tipo TRIMP). Más alto significa un día más exigente.",
           "anchorPersonal": "Anclado a tu propia carga reciente de días de entrenamiento: se evalúa en relación con tu esfuerzo habitual, de modo que un día realmente duro para ti aparece alto.",
           "anchorPopulation": "Se evalúa frente a una referencia general mientras acumulas historial de entrenamiento; cuando tengas suficiente, pasa a tu propio esfuerzo habitual.",
-          "description": "Un indicador nocturno de carga de actividad a partir de tu esfuerzo ponderado por frecuencia cardíaca, relativo a tu esfuerzo habitual."
+          "description": "Un indicador nocturno de carga de actividad a partir de tu esfuerzo ponderado por frecuencia cardíaca, relativo a tu esfuerzo habitual.",
+          "deviceCaption": "Esfuerzo diario de tu dispositivo: {value} de {max}",
+          "deviceSource": "Hasta que HealthLog calcule su propio valor durante la noche, la tarjeta muestra el esfuerzo diario de tu dispositivo, convertido a 0–100."
         },
         "WRIST_TEMPERATURE_BASELINE": {
           "method": "Tu temperatura típica de muñeca durante la noche es la mediana de tus lecturas nocturnas en el periodo, ± una dispersión robusta (desviación absoluta de la mediana, escalada). Sigue TUS lecturas: la noche pasada se muestra como una desviación respecto a tu propia base, no a una norma poblacional.",
@@ -4717,8 +4726,8 @@
       "emptyCta": "Conectar un dispositivo"
     },
     "intradayPulse": {
-      "title": "La forma de tu día",
-      "caption": "Tu frecuencia cardíaca a lo largo del día, promediada en tramos de 10 minutos.",
+      "title": "Pulso a lo largo del día",
+      "caption": "Promediado en intervalos de 10 minutos.",
       "hourlyNote": "Mostrando el promedio por hora de este día — los días recientes muestran el detalle completo de 10 minutos.",
       "empty": "Aún no hay suficientes lecturas para este día para mostrar su forma.",
       "coverageOne": "Basado en 1 lectura a lo largo de {hours}h.",
@@ -6007,9 +6016,9 @@
     "botToken": "Token del bot",
     "chatId": "ID del chat",
     "enableNotifications": "Activar notificaciones",
-    "telegramStep1": "1. Crea un bot con @BotFather en Telegram y copia el token.",
-    "telegramStep2": "2. Envía /start a tu bot para activar el chat.",
-    "telegramStep3": "3. Obtén tu ID del chat con @userinfobot o la API del bot.",
+    "telegramStep1": "Crea un bot con @BotFather en Telegram y copia el token.",
+    "telegramStep2": "Envía /start a tu bot para activar el chat.",
+    "telegramStep3": "Obtén tu ID del chat con @userinfobot o la API del bot.",
     "ntfy": "ntfy",
     "ntfyDescription": "Notificaciones a través de ntfy (autoalojado o ntfy.sh).",
     "ntfyEnable": "Activar ntfy",
@@ -8047,14 +8056,6 @@
         "title": "Leyenda de las tomas",
         "description": "Registra 300 tomas de medicación."
       },
-      "overIntake1": {
-        "title": "Dosis doble",
-        "description": "Toma la medicación al menos una vez más de lo previsto."
-      },
-      "skippedIntake1": {
-        "title": "Un paso atrás",
-        "description": "Omite al menos una toma planificada."
-      },
       "passkeyCreated1": {
         "title": "Clave de acceso creada",
         "description": "Crea tu primera clave de acceso."
@@ -8719,7 +8720,11 @@
     },
     "course": "Tratamiento {n}",
     "courseRange": "del {start} al {end}",
-    "courseSince": "desde el {start}"
+    "courseSince": "desde el {start}",
+    "unavailable": {
+      "title": "Enlace caducado o no válido",
+      "description": "Este enlace para compartir ha caducado, se ha revocado o está incompleto. Pide un enlace nuevo a la persona que lo compartió."
+    }
   },
   "cycle": {
     "symptomCategory": {
@@ -9803,7 +9808,7 @@
     }
   },
   "illness": {
-    "title": "Diario de enfermedad",
+    "title": "Enfermedad",
     "subtitle": "Un registro retrospectivo de tus episodios de enfermedad y dolencias.",
     "settings": {
       "viewDescription": "Elige si los episodios se muestran como tarjetas o como lista compacta.",
@@ -12260,7 +12265,8 @@
       "fewer": "Mostrar menos",
       "note": "Reunido a partir de tus entradas, sin valoración. Cada fecha abre el día completo.",
       "report": "Informe médico del {date} hasta hoy"
-    }
+    },
+    "travel": "De viaje"
   },
   "timeline": {
     "title": "Cronología",
@@ -12494,5 +12500,12 @@
       "title": "¿Eliminar este acontecimiento vital?",
       "body": "Su título y su nota desaparecerán."
     }
+  },
+  "aboutPage": {
+    "eyebrow": "Información",
+    "title": "Acerca de HealthLog",
+    "lastUpdated": "Última actualización: {date}",
+    "project": "Proyecto",
+    "credits": "Créditos"
   }
 }
diff --git a/messages/fr.json b/messages/fr.json
index c1ff33246..9f6a7f002 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -49,7 +49,9 @@
     "dismiss": "Ignorer",
     "moreInfo": "Plus d'informations",
     "durationHoursMinutes": "{hours} h {minutes} min",
-    "durationMinutes": "{minutes} min"
+    "durationMinutes": "{minutes} min",
+    "durationClockMinutes": "{time} min",
+    "durationClockHours": "{time} h"
   },
   "apiErrors": {
     "measurement": {
@@ -540,6 +542,11 @@
       "errorRateLimit": "Trop de tentatives. Attendez quelques minutes puis réessayez.",
       "errorFailed": "Cela n'a pas fonctionné. Réessayez dans un instant.",
       "errorOffline": "Le serveur n'a pas été atteint. Vérifiez votre connexion et réessayez."
+    },
+    "inviteInvalid": {
+      "title": "Invitation invalide",
+      "description": "Ce lien d’invitation est incomplet ou a été mal copié. Demandez un nouveau lien à la personne qui vous a invité.",
+      "toLogin": "Aller à la connexion"
     }
   },
   "dashboard": {
@@ -2031,7 +2038,6 @@
         "bestand": "Stock",
         "verlauf": "Historique",
         "injektion": "Injection",
-        "api": "API",
         "erweitert": "Avancé",
         "wirkung": "Effet"
       },
@@ -2503,7 +2509,8 @@
       "moodHeatmapEmpty": "Carte thermique de l'humeur, aucun jour enregistré pour l'instant.",
       "complianceHeatmap": "Carte thermique d'observance des médicaments du {start} au {end}, {days} jours actifs.",
       "complianceHeatmapEmpty": "Carte thermique d'observance des médicaments, aucun jour actif pour l'instant."
-    }
+    },
+    "medicationsEmptyAction": "Ajouter un médicament"
   },
   "chart": {
     "overlay": {
@@ -4340,7 +4347,9 @@
           "method": "Un indice d’effort nocturne de 0 à 100 à partir de votre charge d’activité pondérée par la fréquence cardiaque (un modèle d’impulsion d’entraînement de type TRIMP). Plus élevé signifie une journée plus exigeante.",
           "anchorPersonal": "Calé sur votre propre charge récente des jours d’entraînement — évalué par rapport à votre effort habituel, de sorte qu’une journée vraiment difficile pour vous ressort élevée.",
           "anchorPopulation": "Évalué par rapport à une référence générale pendant que vous constituez votre historique d’entraînement ; dès que vous en avez assez, le calcul passe à votre propre effort habituel.",
-          "description": "Un indice de charge d’activité nocturne à partir de votre effort pondéré par la fréquence cardiaque, relatif à votre effort habituel."
+          "description": "Un indice de charge d’activité nocturne à partir de votre effort pondéré par la fréquence cardiaque, relatif à votre effort habituel.",
+          "deviceCaption": "Effort du jour de votre appareil : {value} sur {max}",
+          "deviceSource": "Tant que HealthLog n’a pas calculé sa propre valeur pendant la nuit, la carte affiche l’effort du jour de votre appareil, ramené sur 0–100."
         },
         "WRIST_TEMPERATURE_BASELINE": {
           "method": "Votre température nocturne typique au poignet est la médiane de vos relevés nocturnes sur la période, ± une dispersion robuste (écart absolu médian, mis à l’échelle). Elle suit VOS relevés — la nuit dernière est affichée comme un écart par rapport à votre propre référence, pas à une norme de population.",
@@ -4717,8 +4726,8 @@
       "emptyCta": "Connecter un appareil"
     },
     "intradayPulse": {
-      "title": "Le rythme de votre journée",
-      "caption": "Votre fréquence cardiaque au fil de la journée, moyennée par tranches de 10 minutes.",
+      "title": "Pouls au fil de la journée",
+      "caption": "Moyenné par tranches de 10 minutes.",
       "hourlyNote": "Moyenne horaire affichée pour cette journée — les jours récents affichent le détail complet par tranches de 10 minutes.",
       "empty": "Pas encore assez de mesures pour cette journée pour en afficher le rythme.",
       "coverageOne": "Basé sur 1 mesure sur {hours}h.",
@@ -6007,9 +6016,9 @@
     "botToken": "Jeton du bot",
     "chatId": "ID du chat",
     "enableNotifications": "Activer les notifications",
-    "telegramStep1": "1. Créez un bot via @BotFather dans Telegram et copiez le jeton.",
-    "telegramStep2": "2. Envoyez /start à votre bot pour activer le chat.",
-    "telegramStep3": "3. Trouvez votre ID de chat via @userinfobot ou l’API du bot.",
+    "telegramStep1": "Créez un bot via @BotFather dans Telegram et copiez le jeton.",
+    "telegramStep2": "Envoyez /start à votre bot pour activer le chat.",
+    "telegramStep3": "Trouvez votre ID de chat via @userinfobot ou l’API du bot.",
     "ntfy": "ntfy",
     "ntfyDescription": "Notifications via ntfy (auto-hébergé ou ntfy.sh).",
     "ntfyEnable": "Activer ntfy",
@@ -8047,14 +8056,6 @@
         "title": "Légende des prises",
         "description": "Enregistrez 300 prises de médicaments."
       },
-      "overIntake1": {
-        "title": "Double dose",
-        "description": "Prenez votre médicament au moins une fois de plus que prévu."
-      },
-      "skippedIntake1": {
-        "title": "Pause prise",
-        "description": "Sautez au moins une prise prévue."
-      },
       "passkeyCreated1": {
         "title": "Clé d’accès configurée",
         "description": "Créez votre première clé d’accès."
@@ -8719,7 +8720,11 @@
     },
     "course": "Traitement {n}",
     "courseRange": "du {start} au {end}",
-    "courseSince": "depuis le {start}"
+    "courseSince": "depuis le {start}",
+    "unavailable": {
+      "title": "Lien expiré ou invalide",
+      "description": "Ce lien de partage a expiré, a été révoqué ou est incomplet. Demandez un nouveau lien à la personne qui l’a partagé."
+    }
   },
   "cycle": {
     "symptomCategory": {
@@ -9803,7 +9808,7 @@
     }
   },
   "illness": {
-    "title": "Journal de maladie",
+    "title": "Maladie",
     "subtitle": "Un suivi rétrospectif de vos épisodes de maladie et d'affections.",
     "settings": {
       "viewDescription": "Choisis si les épisodes s'affichent en cartes ou en liste compacte.",
@@ -12260,7 +12265,8 @@
       "fewer": "Afficher moins",
       "note": "Établi à partir de vos entrées, sans évaluation. Chaque date ouvre la journée entière.",
       "report": "Rapport médical du {date} à aujourd’hui"
-    }
+    },
+    "travel": "En déplacement"
   },
   "timeline": {
     "title": "Chronologie",
@@ -12494,5 +12500,12 @@
       "title": "Supprimer cet événement de vie ?",
       "body": "Son titre et sa note disparaîtront."
     }
+  },
+  "aboutPage": {
+    "eyebrow": "À propos",
+    "title": "À propos de HealthLog",
+    "lastUpdated": "Dernière mise à jour : {date}",
+    "project": "Projet",
+    "credits": "Crédits"
   }
 }
diff --git a/messages/it.json b/messages/it.json
index d6cd9c4f4..bb050da28 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -49,7 +49,9 @@
     "dismiss": "Ignora",
     "moreInfo": "Maggiori informazioni",
     "durationHoursMinutes": "{hours} h {minutes} min",
-    "durationMinutes": "{minutes} min"
+    "durationMinutes": "{minutes} min",
+    "durationClockMinutes": "{time} min",
+    "durationClockHours": "{time} h"
   },
   "apiErrors": {
     "measurement": {
@@ -540,6 +542,11 @@
       "errorRateLimit": "Troppi tentativi. Attendi qualche minuto e riprova.",
       "errorFailed": "Non ha funzionato. Riprova tra un momento.",
       "errorOffline": "Il server non è stato raggiunto. Controlla la connessione e riprova."
+    },
+    "inviteInvalid": {
+      "title": "Invito non valido",
+      "description": "Questo link di invito è incompleto o è stato copiato male. Chiedi un nuovo link alla persona che ti ha invitato.",
+      "toLogin": "Vai all’accesso"
     }
   },
   "dashboard": {
@@ -2031,7 +2038,6 @@
         "bestand": "Scorta",
         "verlauf": "Cronologia",
         "injektion": "Iniezione",
-        "api": "API",
         "erweitert": "Avanzate",
         "wirkung": "Effetto"
       },
@@ -2503,7 +2509,8 @@
       "moodHeatmapEmpty": "Mappa di calore dell'umore, nessun giorno ancora registrato.",
       "complianceHeatmap": "Mappa di calore dell'aderenza ai farmaci dal {start} al {end}, {days} giorni attivi.",
       "complianceHeatmapEmpty": "Mappa di calore dell'aderenza ai farmaci, nessun giorno attivo."
-    }
+    },
+    "medicationsEmptyAction": "Aggiungi un farmaco"
   },
   "chart": {
     "overlay": {
@@ -4340,7 +4347,9 @@
           "method": "Un indicatore notturno di sforzo da 0 a 100 dal tuo carico di attività pesato sulla frequenza cardiaca (un modello di impulso d’allenamento tipo TRIMP). Più alto significa una giornata più impegnativa.",
           "anchorPersonal": "Ancorato al tuo carico recente nei giorni di allenamento — valutato rispetto al tuo sforzo abituale, così che una giornata davvero dura per te risulti alta.",
           "anchorPopulation": "Valutato rispetto a un riferimento generale mentre costruisci lo storico di allenamento; quando ne hai abbastanza passa al tuo sforzo abituale.",
-          "description": "Un indicatore notturno di carico di attività dal tuo sforzo pesato sulla frequenza cardiaca, relativo al tuo sforzo abituale."
+          "description": "Un indicatore notturno di carico di attività dal tuo sforzo pesato sulla frequenza cardiaca, relativo al tuo sforzo abituale.",
+          "deviceCaption": "Sforzo giornaliero del tuo dispositivo: {value} su {max}",
+          "deviceSource": "Finché HealthLog non ha calcolato un proprio valore durante la notte, la scheda mostra lo sforzo giornaliero del tuo dispositivo, riportato su 0–100."
         },
         "WRIST_TEMPERATURE_BASELINE": {
           "method": "La tua tipica temperatura notturna al polso è la mediana delle tue letture notturne nel periodo, ± una dispersione robusta (deviazione assoluta mediana, scalata). Segue le TUE letture — la notte scorsa è mostrata come scostamento dalla tua baseline, non da una norma di popolazione.",
@@ -4717,8 +4726,8 @@
       "emptyCta": "Collega un dispositivo"
     },
     "intradayPulse": {
-      "title": "L'andamento della tua giornata",
-      "caption": "La tua frequenza cardiaca durante il giorno, mediata in intervalli di 10 minuti.",
+      "title": "Battito nel corso della giornata",
+      "caption": "Media su intervalli di 10 minuti.",
       "hourlyNote": "Media oraria per questo giorno — i giorni recenti mostrano il dettaglio completo a 10 minuti.",
       "empty": "Non ci sono ancora abbastanza misurazioni per questo giorno per mostrarne l'andamento.",
       "coverageOne": "Basato su 1 misurazione in {hours}h.",
@@ -6007,9 +6016,9 @@
     "botToken": "Token del bot",
     "chatId": "ID chat",
     "enableNotifications": "Attiva le notifiche",
-    "telegramStep1": "1. Crea un bot tramite @BotFather su Telegram e copia il token.",
-    "telegramStep2": "2. Invia /start al tuo bot per attivare la chat.",
-    "telegramStep3": "3. Trova il tuo ID chat tramite @userinfobot o l’API del bot.",
+    "telegramStep1": "Crea un bot tramite @BotFather su Telegram e copia il token.",
+    "telegramStep2": "Invia /start al tuo bot per attivare la chat.",
+    "telegramStep3": "Trova il tuo ID chat tramite @userinfobot o l’API del bot.",
     "ntfy": "ntfy",
     "ntfyDescription": "Notifiche tramite ntfy (self-hosted o ntfy.sh).",
     "ntfyEnable": "Attiva ntfy",
@@ -8047,14 +8056,6 @@
         "title": "Leggenda delle assunzioni",
         "description": "Registra 300 assunzioni di farmaci."
       },
-      "overIntake1": {
-        "title": "Doppia dose",
-        "description": "Assumi il farmaco almeno una volta in più del previsto."
-      },
-      "skippedIntake1": {
-        "title": "Pausa presa",
-        "description": "Salta almeno un’assunzione pianificata."
-      },
       "passkeyCreated1": {
         "title": "Passkey configurata",
         "description": "Crea la tua prima passkey."
@@ -8719,7 +8720,11 @@
     },
     "course": "Ciclo {n}",
     "courseRange": "dal {start} al {end}",
-    "courseSince": "dal {start}"
+    "courseSince": "dal {start}",
+    "unavailable": {
+      "title": "Link scaduto o non valido",
+      "description": "Questo link di condivisione è scaduto, è stato revocato o è incompleto. Chiedi un nuovo link alla persona che lo ha condiviso."
+    }
   },
   "cycle": {
     "symptomCategory": {
@@ -9803,7 +9808,7 @@
     }
   },
   "illness": {
-    "title": "Diario delle malattie",
+    "title": "Malattia",
     "subtitle": "Un registro retrospettivo dei tuoi episodi di malattia e disturbi.",
     "settings": {
       "viewDescription": "Scegli se gli episodi appaiono come schede o come elenco compatto.",
@@ -12260,7 +12265,8 @@
       "fewer": "Mostra meno",
       "note": "Raccolto dalle tue voci, senza valutazioni. Ogni data apre l’intera giornata.",
       "report": "Referto medico dal {date} a oggi"
-    }
+    },
+    "travel": "In viaggio"
   },
   "timeline": {
     "title": "Cronologia",
@@ -12494,5 +12500,12 @@
       "title": "Eliminare questo evento di vita?",
       "body": "Titolo e nota non ci saranno più."
     }
+  },
+  "aboutPage": {
+    "eyebrow": "Informazioni",
+    "title": "Informazioni su HealthLog",
+    "lastUpdated": "Ultimo aggiornamento: {date}",
+    "project": "Progetto",
+    "credits": "Riconoscimenti"
   }
 }
diff --git a/messages/ko.json b/messages/ko.json
index 56aec5aa9..12d9c8af9 100644
--- a/messages/ko.json
+++ b/messages/ko.json
@@ -49,7 +49,9 @@
     "dismiss": "닫기",
     "moreInfo": "추가 정보",
     "durationHoursMinutes": "{hours}시간 {minutes}분",
-    "durationMinutes": "{minutes}분"
+    "durationMinutes": "{minutes}분",
+    "durationClockMinutes": "{time}분",
+    "durationClockHours": "{time}시간"
   },
   "apiErrors": {
     "measurement": {
@@ -540,6 +542,11 @@
       "errorRateLimit": "시도 횟수가 너무 많습니다. 몇 분 후 다시 시도하세요.",
       "errorFailed": "처리하지 못했습니다. 잠시 후 다시 시도하세요.",
       "errorOffline": "서버에 연결하지 못했습니다. 연결을 확인하고 다시 시도하세요."
+    },
+    "inviteInvalid": {
+      "title": "유효하지 않은 초대예요",
+      "description": "이 초대 링크가 불완전하거나 잘못 복사되었어요. 초대한 분께 새 링크를 요청해 주세요.",
+      "toLogin": "로그인으로 이동"
     }
   },
   "dashboard": {
@@ -2031,7 +2038,6 @@
         "bestand": "재고",
         "verlauf": "기록",
         "injektion": "주사",
-        "api": "API",
         "erweitert": "고급",
         "wirkung": "효과"
       },
@@ -2503,7 +2509,8 @@
     "days90Label": "90일",
     "days90Title": "최근 90일",
     "daysAllLabel": "전체",
-    "daysAllTitle": "전체 기간"
+    "daysAllTitle": "전체 기간",
+    "medicationsEmptyAction": "약 추가하기"
   },
   "chart": {
     "overlay": {
@@ -4340,7 +4347,9 @@
           "method": "심박수로 가중한 활동 부하(TRIMP 방식 훈련 자극 모델)로 매일 밤 내는 0–100 부하 지표예요. 높을수록 힘든 하루였다는 뜻이에요.",
           "anchorPersonal": "최근 운동한 날의 부하를 기준으로 삼아요 — 평소 강도와 비교해 점수를 매기니 나에게 정말 힘든 날이 높게 나와요.",
           "anchorPopulation": "운동 기록이 쌓이는 동안에는 일반 기준으로 점수를 매기고, 충분히 모이면 내 평소 강도 기준으로 바뀌어요.",
-          "description": "심박수로 가중한 운동 강도를 평소 강도와 비교해 매일 밤 계산하는 활동 부하 지표예요."
+          "description": "심박수로 가중한 운동 강도를 평소 강도와 비교해 매일 밤 계산하는 활동 부하 지표예요.",
+          "deviceCaption": "기기의 일일 부하: {max} 중 {value}",
+          "deviceSource": "HealthLog가 밤사이 자체 값을 계산하기 전까지는 기기의 일일 부하를 0–100으로 환산해 보여 줘요."
         },
         "WRIST_TEMPERATURE_BASELINE": {
           "method": "밤사이 손목 온도의 일반 범위는 해당 기간 야간 측정값의 중앙값에 견고한 산포(중앙절대편차를 보정한 값)를 더하고 뺀 구간이에요. 내 측정값을 따라가기 때문에, 지난밤은 인구 평균이 아니라 내 기준값에서 얼마나 벗어났는지로 보여줘요.",
@@ -4717,8 +4726,8 @@
       "emptyCta": "기기 연결"
     },
     "intradayPulse": {
-      "title": "하루의 흐름",
-      "caption": "10분 단위로 평균 낸 하루 동안의 심박수예요.",
+      "title": "하루 동안의 맥박",
+      "caption": "10분 단위로 평균했어요.",
       "hourlyNote": "이 날짜는 시간별 평균으로 보여줘요 — 최근 며칠은 10분 단위까지 자세히 볼 수 있어요.",
       "empty": "이 날짜는 심박수 측정값이 적어서 아직 흐름을 보여줄 수 없어요.",
       "coverageOne": "{hours}h 동안 모은 측정값 1개를 기준으로 했어요.",
@@ -6007,9 +6016,9 @@
     "botToken": "봇 토큰",
     "chatId": "채팅 ID",
     "enableNotifications": "알림 켜기",
-    "telegramStep1": "1. Telegram에서 @BotFather로 봇을 만들고 토큰을 복사하세요.",
-    "telegramStep2": "2. 봇에게 /start를 보내 채팅을 활성화하세요.",
-    "telegramStep3": "3. @userinfobot이나 Bot API로 채팅 ID를 확인하세요.",
+    "telegramStep1": "Telegram에서 @BotFather로 봇을 만들고 토큰을 복사하세요.",
+    "telegramStep2": "봇에게 /start를 보내 채팅을 활성화하세요.",
+    "telegramStep3": "@userinfobot이나 Bot API로 채팅 ID를 확인하세요.",
     "ntfy": "ntfy",
     "ntfyDescription": "ntfy(셀프 호스팅 또는 ntfy.sh)로 보내는 알림이에요.",
     "ntfyEnable": "ntfy 켜기",
@@ -8047,14 +8056,6 @@
         "title": "복용 전설",
         "description": "복용 기록 300회를 남겨요."
       },
-      "overIntake1": {
-        "title": "한 번 더",
-        "description": "계획보다 한 번 이상 더 복용해요."
-      },
-      "skippedIntake1": {
-        "title": "한 걸음 물러서기",
-        "description": "계획된 복용을 한 번 이상 건너뛰어요."
-      },
       "passkeyCreated1": {
         "title": "패스키 등록",
         "description": "첫 패스키를 만들어요."
@@ -8719,7 +8720,11 @@
     },
     "course": "복용 기간 {n}",
     "courseRange": "{start}부터 {end}까지",
-    "courseSince": "{start}부터"
+    "courseSince": "{start}부터",
+    "unavailable": {
+      "title": "링크가 만료되었거나 유효하지 않아요",
+      "description": "이 공유 링크는 만료되었거나 취소되었거나 불완전해요. 공유한 분께 새 링크를 요청해 주세요."
+    }
   },
   "cycle": {
     "symptomCategory": {
@@ -9803,7 +9808,7 @@
     }
   },
   "illness": {
-    "title": "아픈 날 일지",
+    "title": "아픈 날",
     "subtitle": "아픈 날과 컨디션 에피소드를 돌아보는 기록이에요.",
     "settings": {
       "viewDescription": "에피소드를 카드로 볼지 간단한 목록으로 볼지 선택하세요.",
@@ -12260,7 +12265,8 @@
       "fewer": "줄여 보기",
       "note": "평가 없이 기록에서 모았어요. 날짜를 누르면 그날 전체가 열려요.",
       "report": "{date}부터 오늘까지 진료 보고서"
-    }
+    },
+    "travel": "여행 중"
   },
   "timeline": {
     "title": "타임라인",
@@ -12494,5 +12500,12 @@
       "title": "이 삶의 사건을 삭제할까요?",
       "body": "제목과 메모가 사라져요."
     }
+  },
+  "aboutPage": {
+    "eyebrow": "정보",
+    "title": "HealthLog 정보",
+    "lastUpdated": "마지막 업데이트: {date}",
+    "project": "프로젝트",
+    "credits": "크레딧"
   }
 }
diff --git a/messages/pl.json b/messages/pl.json
index f0a04ad32..554000b27 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -49,7 +49,9 @@
     "dismiss": "Odrzuć",
     "moreInfo": "Więcej informacji",
     "durationHoursMinutes": "{hours} godz. {minutes} min",
-    "durationMinutes": "{minutes} min"
+    "durationMinutes": "{minutes} min",
+    "durationClockMinutes": "{time} min",
+    "durationClockHours": "{time} godz."
   },
   "apiErrors": {
     "measurement": {
@@ -540,6 +542,11 @@
       "errorRateLimit": "Zbyt wiele prób. Odczekaj kilka minut i spróbuj ponownie.",
       "errorFailed": "Nie udało się. Spróbuj ponownie za chwilę.",
       "errorOffline": "Nie udało się połączyć z serwerem. Sprawdź połączenie i spróbuj ponownie."
+    },
+    "inviteInvalid": {
+      "title": "Nieprawidłowe zaproszenie",
+      "description": "Ten link z zaproszeniem jest niekompletny lub został źle skopiowany. Poproś osobę, która cię zaprosiła, o nowy link.",
+      "toLogin": "Przejdź do logowania"
     }
   },
   "dashboard": {
@@ -2031,7 +2038,6 @@
         "bestand": "Zapas",
         "verlauf": "Historia",
         "injektion": "Iniekcja",
-        "api": "API",
         "erweitert": "Zaawansowane",
         "wirkung": "Działanie"
       },
@@ -2503,7 +2509,8 @@
       "moodHeatmapEmpty": "Mapa cieplna nastroju, brak zarejestrowanych dni.",
       "complianceHeatmap": "Mapa cieplna przyjmowania leków od {start} do {end}, {days} aktywnych dni.",
       "complianceHeatmapEmpty": "Mapa cieplna przyjmowania leków, brak aktywnych dni."
-    }
+    },
+    "medicationsEmptyAction": "Dodaj lek"
   },
   "chart": {
     "overlay": {
@@ -4340,7 +4347,9 @@
           "method": "Nocny wskaźnik obciążenia 0–100 na podstawie Twojego obciążenia aktywnością ważonego tętnem (model impulsu treningowego typu TRIMP). Wyższy oznacza cięższy dzień.",
           "anchorPersonal": "Zakotwiczony w Twoim własnym niedawnym obciążeniu z dni treningowych — oceniany względem Twojego typowego wysiłku, więc naprawdę ciężki dzień dla Ciebie wypada wysoko.",
           "anchorPopulation": "Oceniany względem ogólnego punktu odniesienia, gdy dopiero budujesz historię treningów; gdy zbierzesz jej wystarczająco, przełącza się na Twój własny typowy wysiłek.",
-          "description": "Nocny wskaźnik obciążenia aktywnością z Twojego wysiłku ważonego tętnem, względem Twojego typowego wysiłku."
+          "description": "Nocny wskaźnik obciążenia aktywnością z Twojego wysiłku ważonego tętnem, względem Twojego typowego wysiłku.",
+          "deviceCaption": "Dzienne obciążenie z Twojego urządzenia: {value} z {max}",
+          "deviceSource": "Dopóki HealthLog nie obliczy w nocy własnej wartości, karta pokazuje dzienne obciążenie z Twojego urządzenia, przeliczone na 0–100."
         },
         "WRIST_TEMPERATURE_BASELINE": {
           "method": "Twoja typowa nocna temperatura nadgarstka to mediana Twoich nocnych odczytów w danym okresie, ± solidny rozrzut (przeskalowane medianowe odchylenie bezwzględne). Śledzi TWOJE odczyty — ostatnia noc jest pokazana jako odchylenie od Twojej własnej bazy, a nie od normy populacyjnej.",
@@ -4717,8 +4726,8 @@
       "emptyCta": "Połącz urządzenie"
     },
     "intradayPulse": {
-      "title": "Przebieg Twojego dnia",
-      "caption": "Twoje tętno w ciągu dnia, uśrednione w 10-minutowych odcinkach.",
+      "title": "Tętno w ciągu dnia",
+      "caption": "Uśrednione w krokach co 10 minut.",
       "hourlyNote": "Pokazano średnią godzinową dla tego dnia — ostatnie dni pokazują pełny, 10-minutowy szczegół.",
       "empty": "Za mało pomiarów z tego dnia, aby pokazać jego przebieg.",
       "coverageOne": "Na podstawie 1 pomiaru w ciągu {hours}h.",
@@ -6007,9 +6016,9 @@
     "botToken": "Token bota",
     "chatId": "ID czatu",
     "enableNotifications": "Włącz powiadomienia",
-    "telegramStep1": "1. Utwórz bota przez @BotFather w Telegramie i skopiuj token.",
-    "telegramStep2": "2. Wyślij /start do swojego bota, aby aktywować czat.",
-    "telegramStep3": "3. Znajdź swoje ID czatu przez @userinfobot lub API bota.",
+    "telegramStep1": "Utwórz bota przez @BotFather w Telegramie i skopiuj token.",
+    "telegramStep2": "Wyślij /start do swojego bota, aby aktywować czat.",
+    "telegramStep3": "Znajdź swoje ID czatu przez @userinfobot lub API bota.",
     "ntfy": "ntfy",
     "ntfyDescription": "Powiadomienia przez ntfy (własny serwer lub ntfy.sh).",
     "ntfyEnable": "Włącz ntfy",
@@ -8047,14 +8056,6 @@
         "title": "Legenda przyjęć",
         "description": "Zarejestruj 300 przyjęć leków."
       },
-      "overIntake1": {
-        "title": "Podwójna dawka",
-        "description": "Przyjmij lek co najmniej raz więcej niż zaplanowano."
-      },
-      "skippedIntake1": {
-        "title": "Krok wstecz",
-        "description": "Pomiń co najmniej jedno zaplanowane przyjęcie."
-      },
       "passkeyCreated1": {
         "title": "Klucz dostępu ustawiony",
         "description": "Utwórz swój pierwszy klucz dostępu."
@@ -8719,7 +8720,11 @@
     },
     "course": "Kuracja {n}",
     "courseRange": "od {start} do {end}",
-    "courseSince": "od {start}"
+    "courseSince": "od {start}",
+    "unavailable": {
+      "title": "Link wygasł lub jest nieprawidłowy",
+      "description": "Ten link udostępniania wygasł, został cofnięty lub jest niekompletny. Poproś osobę, która go udostępniła, o nowy link."
+    }
   },
   "cycle": {
     "symptomCategory": {
@@ -9803,7 +9808,7 @@
     }
   },
   "illness": {
-    "title": "Dziennik chorób",
+    "title": "Choroba",
     "subtitle": "Retrospektywny zapis Twoich epizodów chorób i dolegliwości.",
     "settings": {
       "viewDescription": "Wybierz, czy epizody mają być wyświetlane jako karty czy zwarta lista.",
@@ -12260,7 +12265,8 @@
       "fewer": "Pokaż mniej",
       "note": "Zestawione z Twoich wpisów, bez oceny. Każda data otwiera cały dzień.",
       "report": "Raport lekarski od {date} do dziś"
-    }
+    },
+    "travel": "W podróży"
   },
   "timeline": {
     "title": "Oś czasu",
@@ -12494,5 +12500,12 @@
       "title": "Usunąć to wydarzenie życiowe?",
       "body": "Tytuł i notatka znikną."
     }
+  },
+  "aboutPage": {
+    "eyebrow": "Informacje",
+    "title": "O HealthLog",
+    "lastUpdated": "Ostatnia aktualizacja: {date}",
+    "project": "Projekt",
+    "credits": "Podziękowania"
   }
 }
diff --git a/src/__tests__/derived-wellness-value-contract.test.ts b/src/__tests__/derived-wellness-value-contract.test.ts
index 9034c98da..d58de8d62 100644
--- a/src/__tests__/derived-wellness-value-contract.test.ts
+++ b/src/__tests__/derived-wellness-value-contract.test.ts
@@ -112,4 +112,29 @@ describe("published WellnessScoreValue", () => {
       Object.keys(derived.value as unknown as Record<string, unknown>).sort(),
     );
   });
+
+  it("accepts the strain value served from the device's day strain", async () => {
+    findMany.mockImplementation(async (args: { where: { type: string } }) =>
+      args.where.type === "DAY_STRAIN"
+        ? [
+            {
+              value: 12.6,
+              measuredAt: new Date("2026-06-01T04:00:00Z"),
+              source: "WHOOP",
+            },
+          ]
+        : [],
+    );
+    const derived = await computeWellnessScore("STRAIN_SCORE", "u1", PROFILE, {
+      now: NOW,
+    });
+    expect(derived.status).toBe("ok");
+    if (derived.status !== "ok") return;
+    const parsed = wellnessScoreValue.safeParse(derived.value);
+    expect(parsed.error?.issues ?? []).toEqual([]);
+    expect(Object.keys(wellnessScoreValue.shape).sort()).toEqual(
+      Object.keys(derived.value as unknown as Record<string, unknown>).sort(),
+    );
+    findMany.mockReset();
+  });
 });
diff --git a/src/__tests__/session-surface-guard.test.ts b/src/__tests__/session-surface-guard.test.ts
index ff563f791..b06ac7b19 100644
--- a/src/__tests__/session-surface-guard.test.ts
+++ b/src/__tests__/session-surface-guard.test.ts
@@ -236,6 +236,9 @@ describe("S2 — the URL-token authentication set is frozen", () => {
     "app/c/[token]/d/[id]/route.ts": "serves a shared document's bytes",
     "app/c/[token]/fhir/route.ts": "serves the shared record as a FHIR bundle",
     "app/c/[token]/report.pdf/route.ts": "serves the shared record as a PDF",
+    // The segment's not-found page: the copy a dead link shows. It reads no
+    // token and resolves nothing; the page above decides, and answers 404.
+    "app/c/[token]/not-found.tsx": "renders the dead-link copy; reads no token",
     // The passphrase gate for the same token. Anonymous by design; mints the
     // token-scoped unlock cookie the view above checks.
     "app/api/c/[token]/unlock/route.ts": "verifies the share-link passphrase",
@@ -256,7 +259,7 @@ describe("S2 — the URL-token authentication set is frozen", () => {
     // Listed because it is a URL-token surface, with the reason being that
     // it authenticates nothing.
     "app/invite/[token]/page.tsx":
-      "validates the invite token's shape and redirects; no lookup",
+      "validates the invite token's shape and redirects, or says the link is invalid; no lookup",
     // v1.42 (#959) — the managed-profile handover link. The landing is the
     // invite landing's twin: a shape check on the `hlp_` segment and a
     // redirect, no lookup (the proxy normally answers it at the edge).
@@ -305,6 +308,7 @@ describe("S2 — the URL-token authentication set is frozen", () => {
       "app/api/withings/webhook/[token]/route.ts",
       "app/c/[token]/d/[id]/route.ts",
       "app/c/[token]/fhir/route.ts",
+      "app/c/[token]/not-found.tsx",
       "app/c/[token]/page.tsx",
       "app/c/[token]/report.pdf/route.ts",
       "app/claim/[token]/page.tsx",
diff --git a/src/app/about/page.tsx b/src/app/about/page.tsx
index 9d039b5e6..cbfe211f5 100644
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -1,6 +1,10 @@
 import type { Metadata } from "next";
 import Link from "next/link";
 
+import { resolveIntlLocale } from "@/lib/format-locale";
+import { resolveServerLocale } from "@/lib/i18n/server-locale";
+import { getServerTranslator } from "@/lib/i18n/server-translator";
+
 /**
  * v1.4.27 B3 — Public about / credits page.
  *
@@ -67,7 +71,17 @@ function Section({
   );
 }
 
-export default function AboutPage() {
+export default async function AboutPage() {
+  // The headings, the date and the sign-in link follow the reader's locale;
+  // the body is the attribution text the licences ask for and stays as
+  // written.
+  const locale = await resolveServerLocale();
+  const { t } = getServerTranslator(locale);
+  const lastUpdated = new Intl.DateTimeFormat(resolveIntlLocale(locale), {
+    dateStyle: "medium",
+    timeZone: "UTC",
+  }).format(new Date(`${LAST_UPDATED}T12:00:00Z`));
+
   return (
     <div className="bg-background text-foreground min-h-dvh">
       <header className="border-border/60 bg-background/80 sticky top-0 z-10 border-b pt-[env(safe-area-inset-top)] backdrop-blur">
@@ -82,7 +96,7 @@ export default function AboutPage() {
             href="/auth/login"
             className="text-muted-foreground hover:text-foreground inline-flex min-h-11 items-center text-sm"
           >
-            Sign in
+            {t("auth.login")}
           </Link>
         </div>
       </header>
@@ -99,17 +113,19 @@ export default function AboutPage() {
       >
         <div className="space-y-3">
           <p className="text-muted-foreground text-xs tracking-wider uppercase">
-            About
+            {t("aboutPage.eyebrow")}
           </p>
           <h1 className="text-3xl font-bold tracking-tight md:text-4xl">
-            About HealthLog
+            {t("aboutPage.title")}
           </h1>
           <p className="text-muted-foreground text-sm">
-            Last updated: {LAST_UPDATED}
+            <time dateTime={LAST_UPDATED}>
+              {t("aboutPage.lastUpdated", { date: lastUpdated })}
+            </time>
           </p>
         </div>
 
-        <Section id="project" title="Project">
+        <Section id="project" title={t("aboutPage.project")}>
           <p>
             HealthLog is an open-source, self-hostable personal-health-tracking
             application. The source code lives at{" "}
@@ -127,7 +143,7 @@ export default function AboutPage() {
           </p>
         </Section>
 
-        <Section id="credits" title="Credits">
+        <Section id="credits" title={t("aboutPage.credits")}>
           <p>
             HealthLog stands on a number of open-source libraries and public
             data sources. The list below covers the third-party assets that ship
diff --git a/src/app/achievements/__tests__/page.test.tsx b/src/app/achievements/__tests__/page.test.tsx
index e29878045..5f11c7a5b 100644
--- a/src/app/achievements/__tests__/page.test.tsx
+++ b/src/app/achievements/__tests__/page.test.tsx
@@ -132,8 +132,6 @@ const mockData = {
   ] satisfies AchievementProgress[],
   metrics: {
     totalTakenIntakes: 1,
-    overIntakeCount: 0,
-    skippedIntakeCount: 0,
     bmiGreenStreak: 0,
     bpGreenStreak: 0,
     pulseGreenStreak: 0,
diff --git a/src/app/admin/[section]/renderer.tsx b/src/app/admin/[section]/renderer.tsx
index 89cb04f39..d927a353e 100644
--- a/src/app/admin/[section]/renderer.tsx
+++ b/src/app/admin/[section]/renderer.tsx
@@ -36,6 +36,8 @@ import { ModuleAvailabilitySection } from "@/components/admin/module-availabilit
 import { RemindersSection } from "@/components/admin/reminders-section";
 import { ServicesSection } from "@/components/admin/services-section";
 import { SystemStatusSection } from "@/components/admin/system-status-section";
+import { RevealWhenSettled } from "@/components/ui/reveal-when-settled";
+import { Skeleton } from "@/components/ui/skeleton";
 import { MeasurementMaintenanceCard } from "@/components/admin/measurement-maintenance-card";
 import { InviteTokensSection } from "@/components/admin/invite-tokens-section";
 import { UserManagementSection } from "@/components/admin/user-management-section";
@@ -59,11 +61,18 @@ export function AdminSectionRenderer({
   switch (slug) {
     case "system-status":
       return (
-        <SectionFrame>
-          <SystemStatusSection />
-          {/* v1.42 — the table maintenance after the tombstone purge. */}
-          <MeasurementMaintenanceCard />
-        </SectionFrame>
+        // The status cards grow as their reads land (host metrics, workers,
+        // queues); revealed together so the maintenance card below is not
+        // pushed down the page three times while they load.
+        <RevealWhenSettled
+          fallback={<Skeleton className="h-[40rem] w-full rounded-xl" />}
+        >
+          <SectionFrame>
+            <SystemStatusSection />
+            {/* v1.42 — the table maintenance after the tombstone purge. */}
+            <MeasurementMaintenanceCard />
+          </SectionFrame>
+        </RevealWhenSettled>
       );
     case "general":
       return (
diff --git a/src/app/api/integrations/healthkit/__tests__/route.test.ts b/src/app/api/integrations/healthkit/__tests__/route.test.ts
index fd6b34138..f029d6a7f 100644
--- a/src/app/api/integrations/healthkit/__tests__/route.test.ts
+++ b/src/app/api/integrations/healthkit/__tests__/route.test.ts
@@ -287,6 +287,40 @@ describe("GET /api/integrations/healthkit — sync health", () => {
     expect((await read()).syncHealth.verdict).toBe("pending_first_sync");
   });
 
+  // The column only moves on a live batch. Rows that reached the account any
+  // other way (the export.zip import, a batch before the column existed) left
+  // it null, and the card said "waiting for first data" beside a four-digit
+  // record count. Arrival is a data question: any Apple Health row settles it.
+  it("is not pending when the per-type ledger records an arrival", async () => {
+    vi.mocked(prisma.user.findUnique).mockResolvedValue({
+      healthKitConfigJson: null,
+      healthKitLastSyncedAt: null,
+    } as never);
+    vi.mocked(prisma.healthKitTypeSync.findMany).mockResolvedValue([
+      {
+        type: "PULSE",
+        lastReceivedAt: ago(2 * DAY),
+        lastTrigger: null,
+        lastNewSampleAt: null,
+      },
+    ] as never);
+    expect((await read()).syncHealth.verdict).toBe("fresh");
+  });
+
+  it("is not pending when Apple Health rows exist without any sync stamp", async () => {
+    vi.mocked(prisma.user.findUnique).mockResolvedValue({
+      healthKitConfigJson: null,
+      healthKitLastSyncedAt: null,
+    } as never);
+    vi.mocked(listLiveMeasurementTypes).mockResolvedValue(["PULSE"]);
+    vi.mocked(prisma.$queryRaw).mockResolvedValue([
+      { type: "PULSE", last_seen: ago(DAY) },
+    ] as never);
+    const body = await read();
+    expect(body.syncHealth.verdict).toBe("fresh");
+    expect(body.metricFreshness.map((e) => e.stale)).toEqual([false]);
+  });
+
   it("flags one quiet metric inside an otherwise healthy connection", async () => {
     vi.mocked(prisma.user.findUnique).mockResolvedValue({
       healthKitConfigJson: null,
diff --git a/src/app/api/integrations/healthkit/route.ts b/src/app/api/integrations/healthkit/route.ts
index e104168ca..886e489ea 100644
--- a/src/app/api/integrations/healthkit/route.ts
+++ b/src/app/api/integrations/healthkit/route.ts
@@ -23,6 +23,7 @@ import { auditLog } from "@/lib/auth/audit";
 import { getAppleHealthSyncProgress } from "@/lib/integrations/apple-health-progress";
 import {
   getHealthKitTypeArrivals,
+  newestAppleHealthDataAt,
   withHealthKitArrivals,
 } from "@/lib/integrations/healthkit-type-sync";
 import { getSourceFreshness } from "@/lib/integrations/metric-freshness";
@@ -162,21 +163,9 @@ export const GET = apiHandler(async () => {
   // three-week-dead pipe rendered the same green as one that delivered an hour
   // ago. Fail-soft on the per-metric read — an honesty signal is never worth
   // 500-ing the config the iOS client needs.
-  // No `connected` hint: Apple Health has nothing to connect or disconnect, so
-  // "never delivered" resolves to `pending_first_sync`, not `disconnected`.
-  const syncHealth = resolveSyncVerdict({
-    configured: true,
-    lastDataAt: lastSyncedAt,
-    legacyLastSyncedAt: lastSyncedAt,
-    cadence: PUSH_CADENCE,
-  });
   // #1173 — when each type last ARRIVED and under which trigger, beside when
   // its newest sample was taken. Fail-soft to null, which leaves the entries
   // without arrival fields rather than reporting every type as never received.
-  const [samples, arrivals] = await Promise.all([
-    getSourceFreshness(user.id, "APPLE_HEALTH").catch(() => []),
-    getHealthKitTypeArrivals(user.id).catch(() => null),
-  ]);
   // Issue #778 — a first-run backfill used to be invisible from the web: the
   // card said "last sync 2 minutes ago" while giving no sense of how much had
   // arrived or how far back it reached. These two figures (row count + oldest
@@ -184,9 +173,23 @@ export const GET = apiHandler(async () => {
   // progress; the phone's queue and throttle state stay on the phone and are
   // not guessed at. Fail-soft for the same reason the freshness read is —
   // a progress line is never worth 500-ing the config the iOS client needs.
-  const syncProgress = await getAppleHealthSyncProgress(user.id).catch(
-    () => null,
-  );
+  const [samples, arrivals, syncProgress] = await Promise.all([
+    getSourceFreshness(user.id, "APPLE_HEALTH").catch(() => []),
+    getHealthKitTypeArrivals(user.id).catch(() => null),
+    getAppleHealthSyncProgress(user.id).catch(() => null),
+  ]);
+  // No `connected` hint: Apple Health has nothing to connect or disconnect, so
+  // "never delivered" resolves to `pending_first_sync`, not `disconnected`.
+  // "Delivered" is read off the data, not only off the user column: that
+  // column moves on a live batch alone, so rows from the export.zip import
+  // left it null and the card said "waiting for first data" beside a
+  // four-digit record count.
+  const syncHealth = resolveSyncVerdict({
+    configured: true,
+    lastDataAt: newestAppleHealthDataAt(lastSyncedAt, arrivals, samples),
+    legacyLastSyncedAt: lastSyncedAt,
+    cadence: PUSH_CADENCE,
+  });
 
   return apiSuccess({
     entries,
diff --git a/src/app/c/[token]/not-found.tsx b/src/app/c/[token]/not-found.tsx
new file mode 100644
index 000000000..9aa8e7138
--- /dev/null
+++ b/src/app/c/[token]/not-found.tsx
@@ -0,0 +1,40 @@
+import { LinkIcon } from "lucide-react";
+
+import { resolveShareViewLocale } from "@/lib/clinician-share/request-locale";
+import { getServerTranslator } from "@/lib/i18n/server-translator";
+
+/**
+ * What a practice sees when a shared link no longer opens: expired, revoked,
+ * mistyped. The page still answers 404 for every failure class alike (the
+ * share page's `notFound()`), so a probe learns nothing from it; what changes
+ * is the copy. The app's own 404 said "this page does not exist" and offered
+ * a dashboard the reader has no account for. This one says what happened in
+ * the reader's terms and what to do, and links nowhere.
+ */
+export default async function ClinicianShareNotFound() {
+  const locale = await resolveShareViewLocale();
+  const { t } = getServerTranslator(locale);
+
+  return (
+    <main
+      id="main-content"
+      data-slot="clinician-share-unavailable"
+      className="bg-background text-foreground flex min-h-dvh flex-col items-center justify-center gap-6 px-4 py-12 pt-[calc(env(safe-area-inset-top)+3rem)]"
+    >
+      <div
+        aria-hidden="true"
+        className="bg-muted text-muted-foreground flex size-14 items-center justify-center rounded-xl"
+      >
+        <LinkIcon className="size-6" />
+      </div>
+      <div className="max-w-md space-y-2 text-center">
+        <h1 className="text-2xl font-bold tracking-tight">
+          {t("clinicianView.unavailable.title")}
+        </h1>
+        <p className="text-foreground text-sm">
+          {t("clinicianView.unavailable.description")}
+        </p>
+      </div>
+    </main>
+  );
+}
diff --git a/src/app/coach/conversations/page.tsx b/src/app/coach/conversations/page.tsx
index 32f0e0ce8..c12927c9c 100644
--- a/src/app/coach/conversations/page.tsx
+++ b/src/app/coach/conversations/page.tsx
@@ -331,7 +331,7 @@ export default function CoachConversationsPage() {
       // ~50px on notched devices; restored to match exactly. v1.42 — the
       // shell now takes that inset above the top bar at every width, so
       // the desktop height subtracts it too, and `/coach/plans` matches.
-      className="bg-background -mx-4 -mt-6 -mb-20 flex h-[calc(100dvh-8rem-env(safe-area-inset-top,0px)-env(safe-area-inset-bottom,0px))] min-h-[32rem] flex-col overflow-hidden md:-mx-6 md:h-[calc(100dvh-4rem-env(safe-area-inset-top,0px))]"
+      className="bg-background shell-desktop:h-[calc(100dvh-4rem-env(safe-area-inset-top,0px))] -mx-4 -mt-6 -mb-20 flex h-[calc(100dvh-8rem-env(safe-area-inset-top,0px)-env(safe-area-inset-bottom,0px))] min-h-[32rem] flex-col overflow-hidden md:-mx-6"
     >
       <CoachConversationsBody readOnly={!coach.available} />
     </div>
diff --git a/src/app/coach/plans/page.tsx b/src/app/coach/plans/page.tsx
index b02fddcdc..4df3e06b7 100644
--- a/src/app/coach/plans/page.tsx
+++ b/src/app/coach/plans/page.tsx
@@ -296,7 +296,7 @@ export default function CoachPlansPage() {
       // mobile-only BottomNav band). The status-bar inset of an installed
       // app comes off as well, at every width: the shell takes it above
       // the top bar (`shell-safe-area`).
-      className="bg-background -mx-4 -mt-6 -mb-20 flex h-[calc(100dvh-8rem-env(safe-area-inset-top,0px)-env(safe-area-inset-bottom,0px))] min-h-[32rem] flex-col overflow-hidden md:-mx-6 md:h-[calc(100dvh-4rem-env(safe-area-inset-top,0px))]"
+      className="bg-background shell-desktop:h-[calc(100dvh-4rem-env(safe-area-inset-top,0px))] -mx-4 -mt-6 -mb-20 flex h-[calc(100dvh-8rem-env(safe-area-inset-top,0px)-env(safe-area-inset-bottom,0px))] min-h-[32rem] flex-col overflow-hidden md:-mx-6"
     >
       <CoachPlansBody readOnly={!coach.available} />
     </div>
diff --git a/src/app/globals.css b/src/app/globals.css
index 63361cc9f..9f8b8e3b3 100644
--- a/src/app/globals.css
+++ b/src/app/globals.css
@@ -58,6 +58,30 @@
   }
 }
 
+/*
+ * `shell-desktop:` / `shell-mobile:` — which app shell the viewport gets.
+ * The desktop rail (sidebar, no bottom nav) from `md` up, EXCEPT a touch
+ * screen at most 520 px tall: a phone held sideways is 844–932 px wide but
+ * only 390–430 px tall, and the rail plus the top bar left it a sliver of
+ * content and no thumb-reachable navigation. It keeps the phone shell (top
+ * bar, bottom nav, capture button) instead. Everything that switches
+ * between the two shells keys on these, never on a bare `md:`, so the bars
+ * cannot disagree about which shell is showing.
+ */
+@custom-variant shell-desktop {
+  @media (min-width: 48rem) and (pointer: fine),
+    (min-width: 48rem) and (pointer: none),
+    (min-width: 48rem) and (min-height: 521px) {
+    @slot;
+  }
+}
+
+@custom-variant shell-mobile {
+  @media (max-width: 47.98rem), (pointer: coarse) and (max-height: 520px) {
+    @slot;
+  }
+}
+
 @theme inline {
   /* Extra-small breakpoint (30rem / 480px) for the narrowest phones — the
      default scale starts at sm (640px), which leaves a gap between an iPhone SE
@@ -82,6 +106,9 @@
   --color-chart-1: var(--chart-1);
   --color-ring: var(--ring);
   --color-input: var(--input);
+  --color-switch-off: var(--switch-off);
+  --color-primary-disabled: var(--primary-disabled);
+  --color-primary-disabled-foreground: var(--primary-disabled-foreground);
   --color-input-focus: var(--input-focus);
   --color-border: var(--border);
   --color-destructive: var(--destructive);
@@ -268,6 +295,19 @@
   --destructive: #ff5555;
   --border: #44475a;
   --input: #44475a;
+  /* An off switch's track, and a disabled primary button. Dark keeps the
+   * look these had (input at 80 %, primary at half strength). */
+  --switch-off: color-mix(in oklab, var(--input) 80%, transparent);
+  --primary-disabled: color-mix(
+    in oklab,
+    var(--primary) 50%,
+    var(--background)
+  );
+  --primary-disabled-foreground: color-mix(
+    in oklab,
+    var(--primary-foreground) 70%,
+    var(--primary-disabled)
+  );
   /* Text-field focus border: a neutral, foreground-based tone, no colour
    * ring. ~5.2:1 on --background, ~6:1 on --card. */
   --input-focus: #9a9b9d;
@@ -399,6 +439,15 @@
   --success-foreground: #ffffff;
   --border: oklch(0.885 0.008 300);
   --input: oklch(0.87 0.009 300);
+  /* An off switch's track: the input grey sat at ~1.4:1 on the card, so an
+   * off switch all but vanished. ~3.5:1 on --card clears the 3:1 floor for
+   * a control boundary. */
+  --switch-off: oklch(0.62 0.012 295);
+  /* A disabled primary button: opacity-50 left white text on a washed
+   * violet at ~2:1. A pale violet fill with a dark violet label (~5.5:1)
+   * still reads as the primary action, and as unavailable. */
+  --primary-disabled: oklch(0.88 0.035 290);
+  --primary-disabled-foreground: oklch(0.44 0.06 290);
   /* Text-field focus border, neutral: ~4.2:1 on --background. */
   --input-focus: oklch(0.56 0.012 295);
   --ring: oklch(0.48 0.012 290); /* neutral: no purple focus frames anywhere */
diff --git a/src/app/insights/active-energy/page.tsx b/src/app/insights/active-energy/page.tsx
index 933931442..8bc6d5249 100644
--- a/src/app/insights/active-energy/page.tsx
+++ b/src/app/insights/active-energy/page.tsx
@@ -22,7 +22,7 @@ export default function InsightsActiveEnergyPage() {
       chartKey="activeEnergy"
       i18nPrefix="insights.activeEnergy"
       explainerMetric="activeEnergy"
-      color="var(--warning)"
+      color="var(--chart-5)"
       unit="kcal"
       yAxisUnit="kcal"
       emptyStateIcon={<Flame className="size-6" />}
diff --git a/src/app/insights/blood-pressure/page.tsx b/src/app/insights/blood-pressure/page.tsx
index 1a5782055..b8e921f9d 100644
--- a/src/app/insights/blood-pressure/page.tsx
+++ b/src/app/insights/blood-pressure/page.tsx
@@ -60,7 +60,7 @@ export default function InsightsBlutdruckPage() {
   // v1.12.8 — chart-reactive metric statistics. Blood pressure tracks BOTH
   // series at once: the single chart reports per-type visible-range stats and
   // each strip column reads its own half.
-  const { statsByType, onVisibleStats } = useChartDomainStats();
+  const { statsByType, statsSettled, onVisibleStats } = useChartDomainStats();
   const bpTargets = useBpTargetBand();
 
   if (isEmpty) {
@@ -101,10 +101,10 @@ export default function InsightsBlutdruckPage() {
         {
           min: bpTargets.diastolic.min,
           max: bpTargets.diastolic.max,
-          color: "var(--info)",
+          color: "var(--chart-4)",
           opacity: 0.21,
           label: t("charts.diastolic"),
-          textColor: "var(--info)",
+          textColor: "var(--chart-4)",
           lineOpacity: 0.24,
         },
       ]
@@ -142,6 +142,7 @@ export default function InsightsBlutdruckPage() {
               seriesLabel: t("charts.systolic"),
               icon: ArrowUpRight,
               windowStats: statsByType?.BLOOD_PRESSURE_SYS ?? null,
+              windowPending: !statsSettled,
             },
             {
               dataKey: "dia",
@@ -151,6 +152,7 @@ export default function InsightsBlutdruckPage() {
               seriesLabel: t("charts.diastolic"),
               icon: ArrowDownRight,
               windowStats: statsByType?.BLOOD_PRESSURE_DIA ?? null,
+              windowPending: !statsSettled,
             },
           ]}
         />
@@ -170,7 +172,7 @@ export default function InsightsBlutdruckPage() {
         types={["BLOOD_PRESSURE_SYS", "BLOOD_PRESSURE_DIA"]}
         title={t("charts.bloodPressure")}
         titleIcon={HeartPulse}
-        colors={["var(--chart-3)", "var(--info)"]}
+        colors={["var(--chart-3)", "var(--chart-4)"]}
         unit="mmHg"
         yAxisUnit="mmHg"
         targetZones={bpTargetZones}
diff --git a/src/app/insights/bmi/page.tsx b/src/app/insights/bmi/page.tsx
index cdc5ea3c6..f9692a6b6 100644
--- a/src/app/insights/bmi/page.tsx
+++ b/src/app/insights/bmi/page.tsx
@@ -86,7 +86,6 @@ export default function InsightsBmiPage() {
           icon={<Ruler className="size-6" />}
           title={t("insights.bmiEmptyTitle")}
           description={t("insights.bmiEmptyDescription")}
-          ctaSize="lg"
           action={
             <Button size="sm" asChild>
               <Link href="/settings/account">
@@ -117,7 +116,7 @@ export default function InsightsBmiPage() {
         chartKey="bmi"
         types={["WEIGHT"]}
         title={t("targets.bmi")}
-        colors={["var(--dracula-yellow)"]}
+        colors={["var(--chart-5)"]}
         unit="kg/m²"
         valueMode="bmi"
         valueBands={BMI_BANDS}
diff --git a/src/app/insights/body-fat/page.tsx b/src/app/insights/body-fat/page.tsx
index 1b8c3eab6..2d51b0478 100644
--- a/src/app/insights/body-fat/page.tsx
+++ b/src/app/insights/body-fat/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsBodyFatPage() {
       chartKey="bodyFat"
       i18nPrefix="insights.bodyFat"
       explainerMetric="bodyFat"
-      color="var(--warning)"
+      color="var(--chart-5)"
       unit="%"
       statIcon={Percent}
       emptyStateIcon={<Percent className="size-6" />}
diff --git a/src/app/insights/body-water/page.tsx b/src/app/insights/body-water/page.tsx
index 006cb963b..c978c8764 100644
--- a/src/app/insights/body-water/page.tsx
+++ b/src/app/insights/body-water/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsKoerperwasserPage() {
       chartKey="totalBodyWater"
       i18nPrefix="insights.totalBodyWater"
       explainerMetric="bodyWater"
-      color="var(--info)"
+      color="var(--chart-4)"
       emptyStateIcon={<Droplet className="size-6" />}
       emptyStateCtaType={null}
       captureType="TOTAL_BODY_WATER"
diff --git a/src/app/insights/bone-mass/page.tsx b/src/app/insights/bone-mass/page.tsx
index d5235de3d..fadeb392b 100644
--- a/src/app/insights/bone-mass/page.tsx
+++ b/src/app/insights/bone-mass/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsKnochenmassePage() {
       chartKey="boneMass"
       i18nPrefix="insights.boneMass"
       explainerMetric="boneMass"
-      color="var(--warning)"
+      color="var(--chart-5)"
       emptyStateIcon={<Bone className="size-6" />}
       emptyStateCtaType={null}
       captureType="BONE_MASS"
diff --git a/src/app/insights/breathing-disturbances/page.tsx b/src/app/insights/breathing-disturbances/page.tsx
index c9d62cb30..c5e1d8e7f 100644
--- a/src/app/insights/breathing-disturbances/page.tsx
+++ b/src/app/insights/breathing-disturbances/page.tsx
@@ -20,7 +20,7 @@ export default function InsightsBreathingDisturbancesPage() {
       chartKey="breathingDisturbances"
       i18nPrefix="insights.breathingDisturbances"
       explainerMetric="breathingDisturbances"
-      color="var(--info)"
+      color="var(--chart-4)"
       unitKey="insights.units.breathingEvents"
       emptyStateIcon={<Wind className="size-6" />}
       emptyStateCtaType={null}
diff --git a/src/app/insights/daylight/page.tsx b/src/app/insights/daylight/page.tsx
index 5cecb4509..b5bc04555 100644
--- a/src/app/insights/daylight/page.tsx
+++ b/src/app/insights/daylight/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsTageslichtPage() {
       chartKey="timeInDaylight"
       i18nPrefix="insights.timeInDaylight"
       explainerMetric="daylight"
-      color="var(--success)"
+      color="var(--chart-2)"
       unit="min"
       yAxisUnit="min"
       emptyStateIcon={<Sun className="size-6" />}
diff --git a/src/app/insights/double-support-time/page.tsx b/src/app/insights/double-support-time/page.tsx
index 9b7112851..c2d59baf9 100644
--- a/src/app/insights/double-support-time/page.tsx
+++ b/src/app/insights/double-support-time/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsDoppelstandphasePage() {
       chartKey="walkingDoubleSupport"
       i18nPrefix="insights.walkingDoubleSupport"
       explainerMetric="doubleSupportTime"
-      color="var(--success)"
+      color="var(--chart-2)"
       unit="%"
       yAxisUnit="%"
       emptyStateIcon={<Footprints className="size-6" />}
diff --git a/src/app/insights/falls/page.tsx b/src/app/insights/falls/page.tsx
index 157383c52..ef9c5b032 100644
--- a/src/app/insights/falls/page.tsx
+++ b/src/app/insights/falls/page.tsx
@@ -19,7 +19,7 @@ export default function InsightsFallsPage() {
       chartKey="fallCount"
       i18nPrefix="insights.falls"
       explainerMetric="falls"
-      color="var(--destructive)"
+      color="var(--chart-3)"
       unitKey="insights.units.falls"
       emptyStateIcon={<PersonStanding className="size-6" />}
       emptyStateCtaType={null}
diff --git a/src/app/insights/fat-mass/page.tsx b/src/app/insights/fat-mass/page.tsx
index 1ae453b10..a87f55762 100644
--- a/src/app/insights/fat-mass/page.tsx
+++ b/src/app/insights/fat-mass/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsFettmassePage() {
       chartKey="fatMass"
       i18nPrefix="insights.fatMass"
       explainerMetric="fatMass"
-      color="var(--warning)"
+      color="var(--chart-5)"
       emptyStateIcon={<Droplets className="size-6" />}
       emptyStateCtaType={null}
       coachPrefill="I haven't logged any fat mass yet — what does this metric tell me about my health, and how do I improve it?"
diff --git a/src/app/insights/flights-climbed/page.tsx b/src/app/insights/flights-climbed/page.tsx
index c76a259f0..8fdfc0777 100644
--- a/src/app/insights/flights-climbed/page.tsx
+++ b/src/app/insights/flights-climbed/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsStockwerkePage() {
       chartKey="flightsClimbed"
       i18nPrefix="insights.flightsClimbed"
       explainerMetric="flightsClimbed"
-      color="var(--success)"
+      color="var(--chart-2)"
       unitKey="insights.units.flights"
       emptyStateIcon={<TrendingUp className="size-6" />}
       emptyStateCtaType={null}
diff --git a/src/app/insights/grip-strength/page.tsx b/src/app/insights/grip-strength/page.tsx
index 52750739b..824482e3d 100644
--- a/src/app/insights/grip-strength/page.tsx
+++ b/src/app/insights/grip-strength/page.tsx
@@ -22,7 +22,7 @@ export default function InsightsGripStrengthPage() {
       insightMetric="GRIP_STRENGTH"
       chartKey="gripStrength"
       i18nPrefix="insights.gripStrength"
-      color="var(--success)"
+      color="var(--chart-2)"
       statIcon={Dumbbell}
       emptyStateIcon={<Dumbbell className="size-6" />}
       emptyStateCtaType="GRIP_STRENGTH"
diff --git a/src/app/insights/medications/page.tsx b/src/app/insights/medications/page.tsx
index e6492bf1c..8a7327dee 100644
--- a/src/app/insights/medications/page.tsx
+++ b/src/app/insights/medications/page.tsx
@@ -199,7 +199,6 @@ export default function InsightsMedikamentePage() {
           icon={<Pill className="size-6" />}
           title={t("insights.emptyState.medication.title")}
           description={t("insights.emptyState.medication.description")}
-          ctaSize="lg"
           action={
             <Button size="sm" asChild>
               <Link href="/medications">
diff --git a/src/app/insights/oxygen/page.tsx b/src/app/insights/oxygen/page.tsx
index d752f2b2a..e2d0ebcb0 100644
--- a/src/app/insights/oxygen/page.tsx
+++ b/src/app/insights/oxygen/page.tsx
@@ -23,7 +23,7 @@ export default function InsightsOxygenSaturationPage() {
       chartKey="oxygenSaturation"
       i18nPrefix="insights.oxygenSaturation"
       explainerMetric="oxygenSaturation"
-      color="var(--info)"
+      color="var(--chart-4)"
       unit="%"
       yAxisUnit="%"
       valueBands={[
diff --git a/src/app/insights/page-client.tsx b/src/app/insights/page-client.tsx
index 375088b05..5c3a146d2 100644
--- a/src/app/insights/page-client.tsx
+++ b/src/app/insights/page-client.tsx
@@ -408,7 +408,6 @@ export default function InsightsPageClient() {
         icon={<TrendingUp className="size-6" />}
         title={t("insights.emptyTitle")}
         description={t("insights.emptyDescription")}
-        ctaSize="lg"
         action={
           <Button size="sm" asChild>
             <Link href="/measurements">
@@ -624,7 +623,6 @@ export default function InsightsPageClient() {
           icon={<SlidersHorizontal className="size-6" />}
           title={t("insights.editMode.emptyTitle")}
           description={t("insights.editMode.emptyDescription")}
-          ctaSize="lg"
           action={
             <Button size="sm" asChild>
               <Link href="/settings/layout/insights">
diff --git a/src/app/insights/pain/page.tsx b/src/app/insights/pain/page.tsx
index b723c7872..eb4a2dd2d 100644
--- a/src/app/insights/pain/page.tsx
+++ b/src/app/insights/pain/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsPainPage() {
       insightMetric="PAIN_NRS"
       chartKey="painNrs"
       i18nPrefix="insights.pain"
-      color="var(--warning)"
+      color="var(--chart-5)"
       unit=""
       yAxisUnit="/10"
       statIcon={Activity}
diff --git a/src/app/insights/pulse-wave-velocity/page.tsx b/src/app/insights/pulse-wave-velocity/page.tsx
index e3460aeb7..751907c07 100644
--- a/src/app/insights/pulse-wave-velocity/page.tsx
+++ b/src/app/insights/pulse-wave-velocity/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsPulswellengeschwindigkeitPage() {
       chartKey="pulseWaveVelocity"
       i18nPrefix="insights.pulseWaveVelocity"
       explainerMetric="pulseWaveVelocity"
-      color="var(--destructive)"
+      color="var(--chart-3)"
       unit="m/s"
       yAxisUnit="m/s"
       emptyStateIcon={<Activity className="size-6" />}
diff --git a/src/app/insights/pulse/page.tsx b/src/app/insights/pulse/page.tsx
index 081748ee1..cb385cf7f 100644
--- a/src/app/insights/pulse/page.tsx
+++ b/src/app/insights/pulse/page.tsx
@@ -88,7 +88,7 @@ export default function InsightsPulsPage() {
 
   // v1.12.8 — visible-range stats shared between the pulse chart and the
   // strip (the VO2 chart-row below keeps its own full-range read).
-  const { statsByType, onVisibleStats } = useChartDomainStats();
+  const { statsByType, statsSettled, onVisibleStats } = useChartDomainStats();
 
   // v1.4.27 F17 — gate the sub-page on at least one pulse observation.
   // Brand-new accounts (no manual logs, no Apple-Health upload yet)
@@ -133,6 +133,7 @@ export default function InsightsPulsPage() {
           seriesLabel={t("insights.pulseSectionTitle")}
           icon={Heart}
           windowStats={statsByType?.PULSE ?? null}
+          windowPending={!statsSettled}
         />
       }
       coachReadStrip={
@@ -156,8 +157,8 @@ export default function InsightsPulsPage() {
         titleIcon={Heart}
         colors={
           hasRestingHr
-            ? ["var(--success)", "var(--destructive)"]
-            : ["var(--success)"]
+            ? ["var(--chart-2)", "var(--chart-3)"]
+            : ["var(--chart-2)"]
         }
         unit="bpm"
         compareBaseline={compareBaseline}
diff --git a/src/app/insights/respiratory-rate/page.tsx b/src/app/insights/respiratory-rate/page.tsx
index 90b47e650..7bb50a560 100644
--- a/src/app/insights/respiratory-rate/page.tsx
+++ b/src/app/insights/respiratory-rate/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsAtemfrequenzPage() {
       chartKey="respiratoryRate"
       i18nPrefix="insights.respiratoryRate"
       explainerMetric="respiratoryRate"
-      color="var(--info)"
+      color="var(--chart-4)"
       unitKey="insights.units.respiratoryRate"
       emptyStateIcon={<Wind className="size-6" />}
       emptyStateCtaType={null}
diff --git a/src/app/insights/resting-pulse/page.tsx b/src/app/insights/resting-pulse/page.tsx
index fa7efe387..920f8ea2f 100644
--- a/src/app/insights/resting-pulse/page.tsx
+++ b/src/app/insights/resting-pulse/page.tsx
@@ -25,7 +25,7 @@ export default function InsightsRestingHrPage() {
       chartKey="restingHr"
       i18nPrefix="insights.restingHr"
       explainerMetric="restingHr"
-      color="var(--destructive)"
+      color="var(--chart-3)"
       unit="bpm"
       yAxisUnit="bpm"
       emptyStateIcon={<Heart className="size-6" />}
diff --git a/src/app/insights/six-minute-walk/page.tsx b/src/app/insights/six-minute-walk/page.tsx
index 9c0e52e84..fcac5971e 100644
--- a/src/app/insights/six-minute-walk/page.tsx
+++ b/src/app/insights/six-minute-walk/page.tsx
@@ -20,7 +20,7 @@ export default function InsightsSixMinuteWalkPage() {
       chartKey="sixMinuteWalkDistance"
       i18nPrefix="insights.sixMinuteWalk"
       explainerMetric="sixMinuteWalk"
-      color="var(--success)"
+      color="var(--chart-2)"
       unit="m"
       yAxisUnit="m"
       emptyStateIcon={<Footprints className="size-6" />}
diff --git a/src/app/insights/skin-temperature/page.tsx b/src/app/insights/skin-temperature/page.tsx
index 065dc2bb8..03b1212b5 100644
--- a/src/app/insights/skin-temperature/page.tsx
+++ b/src/app/insights/skin-temperature/page.tsx
@@ -29,7 +29,7 @@ export default function InsightsHauttemperaturPage() {
       chartKey="skinTemperature"
       i18nPrefix="insights.skinTemperature"
       explainerMetric="skinTemperature"
-      color="var(--warning)"
+      color="var(--chart-5)"
       emptyStateIcon={<Thermometer className="size-6" />}
       emptyStateCtaType={null}
       coachPrefill="I haven't logged any skin temperature yet — what does this metric tell me about my health, and how do I improve it?"
@@ -38,7 +38,7 @@ export default function InsightsHauttemperaturPage() {
           type="BODY_TEMPERATURE_DEVIATION"
           title={t("measurements.typeBodyTemperatureDeviation")}
           icon={ThermometerSnowflake}
-          color="var(--info)"
+          color="var(--chart-4)"
           fractionDigits={2}
           sectionTitle={t("insights.bodyTempDeviation.title")}
           sectionIcon={ThermometerSnowflake}
diff --git a/src/app/insights/stair-ascent-speed/page.tsx b/src/app/insights/stair-ascent-speed/page.tsx
index a91043428..9bc75909a 100644
--- a/src/app/insights/stair-ascent-speed/page.tsx
+++ b/src/app/insights/stair-ascent-speed/page.tsx
@@ -20,7 +20,7 @@ export default function InsightsStairAscentSpeedPage() {
       chartKey="stairAscentSpeed"
       i18nPrefix="insights.stairAscentSpeed"
       explainerMetric="stairAscentSpeed"
-      color="var(--success)"
+      color="var(--chart-2)"
       unit="m/s"
       yAxisUnit="m/s"
       emptyStateIcon={<Gauge className="size-6" />}
diff --git a/src/app/insights/stair-descent-speed/page.tsx b/src/app/insights/stair-descent-speed/page.tsx
index 3dc31f478..aa70c09cd 100644
--- a/src/app/insights/stair-descent-speed/page.tsx
+++ b/src/app/insights/stair-descent-speed/page.tsx
@@ -20,7 +20,7 @@ export default function InsightsStairDescentSpeedPage() {
       chartKey="stairDescentSpeed"
       i18nPrefix="insights.stairDescentSpeed"
       explainerMetric="stairDescentSpeed"
-      color="var(--success)"
+      color="var(--chart-2)"
       unit="m/s"
       yAxisUnit="m/s"
       emptyStateIcon={<Gauge className="size-6" />}
diff --git a/src/app/insights/step-length/page.tsx b/src/app/insights/step-length/page.tsx
index d373f0f80..92ed90069 100644
--- a/src/app/insights/step-length/page.tsx
+++ b/src/app/insights/step-length/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsSchrittlaengePage() {
       chartKey="walkingStepLength"
       i18nPrefix="insights.walkingStepLength"
       explainerMetric="stepLength"
-      color="var(--success)"
+      color="var(--chart-2)"
       unit="m"
       yAxisUnit="m"
       emptyStateIcon={<Footprints className="size-6" />}
diff --git a/src/app/insights/steps/page.tsx b/src/app/insights/steps/page.tsx
index cbd8015d3..68447b07c 100644
--- a/src/app/insights/steps/page.tsx
+++ b/src/app/insights/steps/page.tsx
@@ -26,7 +26,7 @@ export default function InsightsStepsPage() {
       i18nPrefix="insights.steps"
       explainerMetric="steps"
       statIcon={Footprints}
-      color="var(--success)"
+      color="var(--chart-2)"
       unitKey="insights.units.steps"
       emptyStateIcon={<Footprints className="size-6" />}
       emptyStateCtaType={null}
diff --git a/src/app/insights/visceral-fat/page.tsx b/src/app/insights/visceral-fat/page.tsx
index fcefd0522..3f5521a4d 100644
--- a/src/app/insights/visceral-fat/page.tsx
+++ b/src/app/insights/visceral-fat/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsViszeralfettPage() {
       chartKey="visceralFat"
       i18nPrefix="insights.visceralFat"
       explainerMetric="visceralFat"
-      color="var(--warning)"
+      color="var(--chart-5)"
       unit=""
       yAxisUnit=""
       emptyStateIcon={<Droplets className="size-6" />}
diff --git a/src/app/insights/waist/page.tsx b/src/app/insights/waist/page.tsx
index 6c0d74bda..1079652c7 100644
--- a/src/app/insights/waist/page.tsx
+++ b/src/app/insights/waist/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsWaistPage() {
       insightMetric="WAIST_CIRCUMFERENCE"
       chartKey="waistCircumference"
       i18nPrefix="insights.waist"
-      color="var(--info)"
+      color="var(--chart-4)"
       statIcon={Ruler}
       emptyStateIcon={<Ruler className="size-6" />}
       emptyStateCtaType="WAIST_CIRCUMFERENCE"
diff --git a/src/app/insights/walking-asymmetry/page.tsx b/src/app/insights/walking-asymmetry/page.tsx
index cc870dc61..8afaef17d 100644
--- a/src/app/insights/walking-asymmetry/page.tsx
+++ b/src/app/insights/walking-asymmetry/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsGangasymmetriePage() {
       chartKey="walkingAsymmetry"
       i18nPrefix="insights.walkingAsymmetry"
       explainerMetric="walkingAsymmetry"
-      color="var(--success)"
+      color="var(--chart-2)"
       unit="%"
       yAxisUnit="%"
       emptyStateIcon={<Footprints className="size-6" />}
diff --git a/src/app/insights/walking-distance/page.tsx b/src/app/insights/walking-distance/page.tsx
index 26df9821e..3b04069ab 100644
--- a/src/app/insights/walking-distance/page.tsx
+++ b/src/app/insights/walking-distance/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsGehstreckePage() {
       chartKey="walkingRunningDistance"
       i18nPrefix="insights.walkingRunningDistance"
       explainerMetric="walkingDistance"
-      color="var(--success)"
+      color="var(--chart-2)"
       emptyStateIcon={<Footprints className="size-6" />}
       emptyStateCtaType={null}
       coachPrefill="I haven't logged any walking and running distance yet — what does this metric tell me about my health, and how do I improve it?"
diff --git a/src/app/insights/walking-heart-rate/page.tsx b/src/app/insights/walking-heart-rate/page.tsx
index 0340bfdd8..7eb63de5b 100644
--- a/src/app/insights/walking-heart-rate/page.tsx
+++ b/src/app/insights/walking-heart-rate/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsGehpulsPage() {
       chartKey="walkingHeartRateAverage"
       i18nPrefix="insights.walkingHeartRateAverage"
       explainerMetric="walkingHeartRate"
-      color="var(--destructive)"
+      color="var(--chart-3)"
       unit="bpm"
       yAxisUnit="bpm"
       emptyStateIcon={<HeartPulse className="size-6" />}
diff --git a/src/app/insights/walking-speed/page.tsx b/src/app/insights/walking-speed/page.tsx
index bdb43a22f..33453cbc4 100644
--- a/src/app/insights/walking-speed/page.tsx
+++ b/src/app/insights/walking-speed/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsGehgeschwindigkeitPage() {
       chartKey="walkingSpeed"
       i18nPrefix="insights.walkingSpeed"
       explainerMetric="walkingSpeed"
-      color="var(--success)"
+      color="var(--chart-2)"
       emptyStateIcon={<Gauge className="size-6" />}
       emptyStateCtaType={null}
       coachPrefill="I haven't logged any walking speed yet — what does this metric tell me about my health, and how do I improve it?"
diff --git a/src/app/insights/walking-steadiness/page.tsx b/src/app/insights/walking-steadiness/page.tsx
index 91bfa01ce..5e78873c5 100644
--- a/src/app/insights/walking-steadiness/page.tsx
+++ b/src/app/insights/walking-steadiness/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsGangstabilitaetPage() {
       chartKey="walkingSteadiness"
       i18nPrefix="insights.walkingSteadiness"
       explainerMetric="walkingSteadiness"
-      color="var(--success)"
+      color="var(--chart-2)"
       unit="%"
       yAxisUnit="%"
       emptyStateIcon={<Gauge className="size-6" />}
diff --git a/src/app/insights/weight/page.tsx b/src/app/insights/weight/page.tsx
index 8539072d5..c1a5c25ea 100644
--- a/src/app/insights/weight/page.tsx
+++ b/src/app/insights/weight/page.tsx
@@ -109,7 +109,7 @@ export default function InsightsGewichtPage() {
       : weightSummary;
 
   // v1.12.8 — visible-range stats shared between the chart and the strip.
-  const { statsByType, onVisibleStats } = useChartDomainStats();
+  const { statsByType, statsSettled, onVisibleStats } = useChartDomainStats();
 
   if (isEmpty) {
     return (
@@ -181,6 +181,7 @@ export default function InsightsGewichtPage() {
           seriesLabel={t("insights.weightSectionTitle")}
           icon={Scale}
           windowStats={statsByType?.WEIGHT ?? null}
+          windowPending={!statsSettled}
         />
       }
       coachReadStrip={<CoachReadStrip metricType="WEIGHT" unit={weightUnit} />}
diff --git a/src/app/insights/wrist-temperature/page.tsx b/src/app/insights/wrist-temperature/page.tsx
index 9acb07bd5..f496eb15e 100644
--- a/src/app/insights/wrist-temperature/page.tsx
+++ b/src/app/insights/wrist-temperature/page.tsx
@@ -21,7 +21,7 @@ export default function InsightsWristTemperaturePage() {
       chartKey="wristTemperature"
       i18nPrefix="insights.wristTemperature"
       explainerMetric="wristTemperature"
-      color="var(--warning)"
+      color="var(--chart-5)"
       emptyStateIcon={<Thermometer className="size-6" />}
       emptyStateCtaType={null}
       coachPrefill="I haven't logged any wrist-temperature data yet — what does this metric tell me about my health, and how do I improve it?"
diff --git a/src/app/invite/[token]/__tests__/page.test.tsx b/src/app/invite/[token]/__tests__/page.test.tsx
index 2615afd64..e0670167c 100644
--- a/src/app/invite/[token]/__tests__/page.test.tsx
+++ b/src/app/invite/[token]/__tests__/page.test.tsx
@@ -24,6 +24,11 @@ vi.mock("next/navigation", () => ({
   redirect: (href: string) => redirectMock(href),
 }));
 
+vi.mock("@/lib/i18n/server-locale", () => ({
+  resolveServerLocale: async () => "en",
+}));
+
+import { renderToStaticMarkup } from "react-dom/server";
 import InviteLandingPage from "../page";
 
 beforeEach(() => {
@@ -56,9 +61,10 @@ describe("<InviteLandingPage> universal-link landing", () => {
     expect(url.searchParams.get("invite")).toBe(VALID_TOKEN);
   });
 
-  it("drops a malformed token to plain register (no enumeration oracle)", async () => {
-    // Wrong prefix, wrong length, and outright garbage all land on the
-    // identical target — the page never reveals whether a token exists.
+  it("names a malformed link as invalid instead of opening registration", async () => {
+    // Wrong prefix, wrong length, and outright garbage all render the same
+    // invalid-invite state. The shape is public, so this reveals nothing
+    // about which well-formed tokens exist; those still go on to register.
     for (const bad of [
       "not-a-token",
       `hlk_${"a".repeat(64)}`,
@@ -66,8 +72,14 @@ describe("<InviteLandingPage> universal-link landing", () => {
       `hlv_${"G".repeat(64)}`,
     ]) {
       redirectMock.mockClear();
-      const href = await runRedirect(bad);
-      expect(href).toBe("/auth/register");
+      const node = await InviteLandingPage({
+        params: Promise.resolve({ token: bad }),
+      });
+      expect(redirectMock).not.toHaveBeenCalled();
+      const html = renderToStaticMarkup(node);
+      expect(html).toContain('data-slot="invite-invalid"');
+      expect(html).toContain("Invitation invalid");
+      expect(html).not.toContain("/auth/register");
     }
   });
 });
diff --git a/src/app/invite/[token]/page.tsx b/src/app/invite/[token]/page.tsx
index 236f6be7b..dfa4c14d8 100644
--- a/src/app/invite/[token]/page.tsx
+++ b/src/app/invite/[token]/page.tsx
@@ -1,6 +1,10 @@
+import Link from "next/link";
 import { redirect } from "next/navigation";
+import { MailX } from "lucide-react";
 
 import { looksLikeInviteToken } from "@/lib/auth/invite-token";
+import { resolveServerLocale } from "@/lib/i18n/server-locale";
+import { getServerTranslator } from "@/lib/i18n/server-translator";
 
 /**
  * v1.17.0 — invite universal-link landing (iOS #16).
@@ -41,7 +45,40 @@ export default async function InviteLandingPage({
     redirect(`/auth/register?invite=${encodeURIComponent(token)}`);
   }
 
-  // Malformed token: behave exactly like a visitor with no invite. No DB
-  // hit, no leak of whether any token exists.
-  redirect("/auth/register");
+  // Malformed token: say so. This used to fall through to the plain
+  // registration form, which on an open instance invited a stranger to sign
+  // up and on a closed one refused them without saying why. The shape check
+  // is public knowledge and needs no database, so naming a malformed link as
+  // invalid leaks nothing about which tokens exist: a well-formed unknown
+  // token still goes on to register, where the signup decides.
+  const locale = await resolveServerLocale();
+  const { t } = getServerTranslator(locale);
+  return (
+    <main
+      id="main-content"
+      data-slot="invite-invalid"
+      className="bg-background text-foreground flex min-h-dvh flex-col items-center justify-center gap-6 px-4 py-12 pt-[calc(env(safe-area-inset-top)+3rem)]"
+    >
+      <div
+        aria-hidden="true"
+        className="bg-muted text-muted-foreground flex size-14 items-center justify-center rounded-xl"
+      >
+        <MailX className="size-6" />
+      </div>
+      <div className="max-w-md space-y-2 text-center">
+        <h1 className="text-2xl font-bold tracking-tight">
+          {t("auth.inviteInvalid.title")}
+        </h1>
+        <p className="text-foreground text-sm">
+          {t("auth.inviteInvalid.description")}
+        </p>
+      </div>
+      <Link
+        href="/auth/login"
+        className="border-border hover:bg-accent inline-flex min-h-11 items-center justify-center rounded-md border px-4 text-sm font-medium transition-colors"
+      >
+        {t("auth.inviteInvalid.toLogin")}
+      </Link>
+    </main>
+  );
 }
diff --git a/src/app/labs/page.tsx b/src/app/labs/page.tsx
index 86faac75d..303e952c1 100644
--- a/src/app/labs/page.tsx
+++ b/src/app/labs/page.tsx
@@ -58,6 +58,7 @@ export default function LabsPage() {
   const queryClient = useQueryClient();
   const { t } = useTranslations();
   const [dialogOpen, setDialogOpen] = useState(false);
+  const [listEmpty, setListEmpty] = useState(false);
   // Sticky-footer slot element for the add-result sheet (filled by the
   // ResponsiveSheet `footer` ref so the form portals its action row there).
   const [addFooterEl, setAddFooterEl] = useState<HTMLDivElement | null>(null);
@@ -185,7 +186,9 @@ export default function LabsPage() {
                   </DropdownMenuItem>
                 </DropdownMenuContent>
               </DropdownMenu>
-            ) : canAddLab ? (
+            ) : canAddLab && !listEmpty ? (
+              // Hidden while the list is empty: its empty state carries the
+              // manual add then. The scan choice above has no such twin.
               <Button
                 onClick={() => setDialogOpen(true)}
                 className="min-h-11 sm:min-h-9"
@@ -263,7 +266,10 @@ export default function LabsPage() {
         />
       ) : null}
 
-      <LabList onAddFirst={() => setDialogOpen(true)} />
+      <LabList
+        onAddFirst={() => setDialogOpen(true)}
+        onEmptyChange={setListEmpty}
+      />
     </div>
   );
 }
diff --git a/src/app/measurements/page.tsx b/src/app/measurements/page.tsx
index 64e0d653a..13a017f4c 100644
--- a/src/app/measurements/page.tsx
+++ b/src/app/measurements/page.tsx
@@ -17,6 +17,8 @@ import { PageHeader } from "@/components/ui/page-header";
 import { PageAuthGate } from "@/components/ui/page-auth-gate";
 import { PullToRefreshIndicator } from "@/components/ui/pull-to-refresh-indicator";
 import { ResponsiveSheet } from "@/components/ui/responsive-sheet";
+import { RevealWhenSettled } from "@/components/ui/reveal-when-settled";
+import { Skeleton } from "@/components/ui/skeleton";
 import { Plus } from "lucide-react";
 import { useRouter, useSearchParams } from "next/navigation";
 import { useTranslations } from "@/lib/i18n/context";
@@ -65,6 +67,9 @@ export default function MeasurementsPage() {
     ? `${addParam}\u0000${returnToParam ?? ""}`
     : null;
   const [dialogOpen, setDialogOpen] = useState(() => initialAdd != null);
+  // The list's empty state carries the add action while there is nothing
+  // to list, so the header drops its own then.
+  const [listEmpty, setListEmpty] = useState(false);
   const [defaultType, setDefaultType] = useState<string | undefined>(
     () => initialAdd ?? undefined,
   );
@@ -149,7 +154,7 @@ export default function MeasurementsPage() {
         // admits, so this is the header action a delegate keeps. A read-only
         // delegate loses it entirely rather than meeting a disabled one.
         actions={
-          canAddMeasurement ? (
+          canAddMeasurement && !listEmpty ? (
             <Button
               data-slot="measurement-add"
               className="min-h-11 sm:min-h-9"
@@ -203,14 +208,22 @@ export default function MeasurementsPage() {
         />
       </ResponsiveSheet>
 
-      <MeasurementList
-        onAddFirst={() => {
-          setReturnTo(null);
-          setDialogOpen(true);
-        }}
-      />
+      {/* The list's height is the data's; the custom metrics sit below it.
+          Revealed together once both reads settle, so neither pushes the
+          other down the page while it loads. */}
+      <RevealWhenSettled
+        fallback={<Skeleton className="h-[28rem] w-full rounded-xl" />}
+      >
+        <MeasurementList
+          onEmptyChange={setListEmpty}
+          onAddFirst={() => {
+            setReturnTo(null);
+            setDialogOpen(true);
+          }}
+        />
 
-      <CustomMetricList />
+        <CustomMetricList />
+      </RevealWhenSettled>
     </div>
   );
 }
diff --git a/src/app/medications/page-client.tsx b/src/app/medications/page-client.tsx
index b37d4ef51..7fd88566d 100644
--- a/src/app/medications/page-client.tsx
+++ b/src/app/medications/page-client.tsx
@@ -521,6 +521,8 @@ export default function MedicationsPageClient() {
     ),
   });
 
+  const listEmpty = !isLoading && !isError && !medications?.length;
+
   return (
     <div className="space-y-6">
       <PullToRefreshIndicator {...pull} />
@@ -575,7 +577,9 @@ export default function MedicationsPageClient() {
               button's responsive tap-target floor (`min-h-11 sm:min-h-9`) so
               both primary "add" entry points clear the WCAG 2.5.5 44px mobile
               minimum identically. */}
-            {canAddMedication && (
+            {/* While the list is empty its empty state carries the one
+              add action; a second one in the header said it twice. */}
+            {canAddMedication && !listEmpty && (
               <DropdownMenu>
                 <DropdownMenuTrigger asChild>
                   <Button className="min-h-11 sm:min-h-9">
diff --git a/src/app/mood/page-client.tsx b/src/app/mood/page-client.tsx
index 05e41c7f3..4bf441c6b 100644
--- a/src/app/mood/page-client.tsx
+++ b/src/app/mood/page-client.tsx
@@ -28,6 +28,9 @@ export default function MoodPageClient() {
   const router = useRouter();
   const queryClient = useQueryClient();
   const [dialogOpen, setDialogOpen] = useState(false);
+  // The list's empty state carries the add action while there is nothing
+  // to list, so the header drops its own then.
+  const [listEmpty, setListEmpty] = useState(false);
   // v1.4.27 R4 RC2 — DOM-ref handle the form portals its action row
   // into. The ref lives on the `<ResponsiveSheet>` footer slot so the
   // Sheet branch can sticky-pin Save / Cancel above the keyboard.
@@ -109,7 +112,7 @@ export default function MoodPageClient() {
             )}
             {/* A mood entry is a MANAGE create: a WRITE delegate gets no add
                 path here, a guardian or a MANAGE delegate does. */}
-            {canAddMood && (
+            {canAddMood && !listEmpty && (
               <Button
                 onClick={() => setDialogOpen(true)}
                 className="min-h-11 sm:min-h-9"
@@ -136,7 +139,10 @@ export default function MoodPageClient() {
         />
       </ResponsiveSheet>
 
-      <MoodList onAddFirst={() => setDialogOpen(true)} />
+      <MoodList
+        onAddFirst={() => setDialogOpen(true)}
+        onEmptyChange={setListEmpty}
+      />
 
       {/* 2026-07-17 UX/IA audit M9 — mood tracking, the mental-wellbeing
           screeners, and the mood insights page form one mental-health
diff --git a/src/app/privacy/__tests__/page.test.tsx b/src/app/privacy/__tests__/page.test.tsx
index 8bef1084e..18805bd10 100644
--- a/src/app/privacy/__tests__/page.test.tsx
+++ b/src/app/privacy/__tests__/page.test.tsx
@@ -20,9 +20,10 @@ import PrivacyPage from "../page";
  *      enumerated verbatim by identifier. Drift from the iOS source
  *      (`HealthKitWireConverter.swift` + `HealthKitService.swift`)
  *      would be a compliance hole.
- *   4. The numbered section headings are all present (English form, so
- *      the scannable spine matches the in-app `Settings → Privacy`
- *      link target and the table of contents above each section).
+ *   4. The numbered section headings are all present, German first with
+ *      the English title beside it, so the scannable spine still matches
+ *      the in-app `Settings → Privacy` link target and the table of
+ *      contents.
  *   5. v1.4.40 SB-3 additions — consent receipt endpoint, TLS 1.3,
  *      operator email + deletion-route disclosure, retention windows.
  */
@@ -46,31 +47,53 @@ describe("<PrivacyPage>", () => {
   it("advertises the policy version + last-updated date", () => {
     const html = render();
     expect(html).toContain(`Policy version ${POLICY_VERSION}`);
-    expect(html).toContain(`Last updated: ${LAST_UPDATED}`);
-    expect(html).toContain(`Stand: ${LAST_UPDATED}`);
+    // Each language writes the date its own way, on its own line.
+    expect(html).toContain("Stand: 11. August 2026");
+    expect(html).toContain("Last updated: 11 August 2026");
+    expect(html).toContain(`dateTime="${LAST_UPDATED}"`);
     expect(html).toContain('data-slot="privacy-last-updated"');
   });
 
   it("renders the numbered section headings", () => {
     const html = render();
-    // 11 numbered sections — H2 headings carry the English form as the
-    // canonical scan spine, with the German title appearing inline in
-    // each section body. The TOC at the top mirrors both.
-    const expectedHeadings = [
-      "1. Overview",
-      "2. Data we collect",
-      "3. Why we collect each category",
-      "4. Third-party sub-processors",
-      "5. Data storage and retention",
-      "6. Your rights (GDPR Art. 15-22, DSGVO)",
-      "7. Medical-device boundary (EU MDR 2017/745, MDCG 2021-24)",
-      "8. Apple App Store privacy categories",
-      "9. Children",
-      "10. Changes to this policy",
-      "11. Contact",
+    // 11 numbered sections. The H2 leads in German, like the body under it,
+    // and carries the English title after it so the English table of
+    // contents and the in-app link target still scan the same spine.
+    const expectedHeadings: Array<[string, string]> = [
+      ["1. Überblick", "Overview"],
+      ["2. Erhobene Daten", "Data we collect"],
+      ["3. Zwecke der Verarbeitung", "Why we collect each category"],
+      [
+        "4. Auftragsverarbeiter und Drittanbieter",
+        "Third-party sub-processors",
+      ],
+      [
+        "5. Speicherung, Speicherdauer und Verschlüsselung",
+        "Data storage and retention",
+      ],
+      [
+        "6. Ihre Rechte (DSGVO Art. 15–22)",
+        "Your rights (GDPR Art. 15-22, DSGVO)",
+      ],
+      [
+        "7. Medizinprodukte-Grenze (EU-MDR 2017/745, MDCG 2021-24)",
+        "Medical-device boundary (EU MDR 2017/745, MDCG 2021-24)",
+      ],
+      [
+        "8. Apple-App-Store-Datenschutzkategorien",
+        "Apple App Store privacy categories",
+      ],
+      ["9. Kinder", "Children"],
+      ["10. Änderungen dieser Erklärung", "Changes to this policy"],
+      ["11. Kontakt", "Contact"],
     ];
-    for (const heading of expectedHeadings) {
-      expect(html, `missing H2 ${JSON.stringify(heading)}`).toContain(heading);
+    for (const [de, en] of expectedHeadings) {
+      expect(html, `missing H2 ${JSON.stringify(de)}`).toContain(
+        `<span lang="de">${de.replaceAll("&", "&amp;")}</span>`,
+      );
+      expect(html, `missing English title ${JSON.stringify(en)}`).toContain(
+        ` / ${en}`,
+      );
     }
   });
 
diff --git a/src/app/privacy/page.tsx b/src/app/privacy/page.tsx
index 4262f88c2..ebf9fc98f 100644
--- a/src/app/privacy/page.tsx
+++ b/src/app/privacy/page.tsx
@@ -38,6 +38,16 @@ export const dynamic = "force-dynamic";
 
 const POLICY_VERSION = "1.37.12";
 const LAST_UPDATED = "2026-08-11";
+const LAST_UPDATED_DATE = new Date(`${LAST_UPDATED}T12:00:00Z`);
+// The date as each language writes it, on the line that language reads.
+const LAST_UPDATED_DE = new Intl.DateTimeFormat("de-DE", {
+  dateStyle: "long",
+  timeZone: "UTC",
+}).format(LAST_UPDATED_DATE);
+const LAST_UPDATED_EN = new Intl.DateTimeFormat("en-GB", {
+  dateStyle: "long",
+  timeZone: "UTC",
+}).format(LAST_UPDATED_DATE);
 
 export const metadata: Metadata = {
   title: "Datenschutzerklärung / Privacy Policy — HealthLog",
@@ -67,8 +77,14 @@ function Section({
 }: SectionProps) {
   return (
     <section id={id} className="scroll-mt-28 space-y-4">
+      {/* German first, like the body under it; the English title rides
+          along so the scan spine still matches the English table of
+          contents and the in-app link target. */}
       <h2 className="text-xl font-semibold tracking-tight md:text-2xl">
-        {`${numberLabel}. ${titleEn}`}
+        <span lang="de">{`${numberLabel}. ${titleDe}`}</span>
+        <span className="text-muted-foreground" lang="en">
+          {` / ${titleEn}`}
+        </span>
       </h2>
       <div
         className="text-foreground space-y-3 text-sm leading-relaxed md:text-base"
@@ -76,7 +92,7 @@ function Section({
         lang="de"
       >
         <p className="text-foreground/80 text-xs font-medium tracking-wider uppercase">
-          Deutsch — {titleDe}
+          Deutsch
         </p>
         {bodyDe}
       </div>
@@ -166,7 +182,7 @@ function SubProcessor({
           rel="noopener noreferrer"
           className="text-primary underline underline-offset-2"
         >
-          Privacy policy / Datenschutzerklärung
+          Datenschutzerklärung / Privacy policy
         </a>
       </p>
     </li>
@@ -191,7 +207,7 @@ export default function PrivacyPage() {
             href="/auth/login"
             className="text-muted-foreground hover:text-foreground inline-flex min-h-11 items-center text-sm"
           >
-            Sign in
+            <span lang="de">Anmelden</span>
           </Link>
         </div>
       </header>
@@ -212,13 +228,20 @@ export default function PrivacyPage() {
             Policy version {POLICY_VERSION}
           </p>
           <h1 className="text-3xl font-bold tracking-tight md:text-4xl">
-            Datenschutzerklärung / Privacy Policy
+            <span lang="de">Datenschutzerklärung</span>{" "}
+            <span className="text-muted-foreground" lang="en">
+              / Privacy Policy
+            </span>
           </h1>
           <p
             className="text-muted-foreground text-sm"
             data-slot="privacy-last-updated"
           >
-            Last updated: {LAST_UPDATED} · Stand: {LAST_UPDATED}
+            <time dateTime={LAST_UPDATED}>
+              <span lang="de">Stand: {LAST_UPDATED_DE}</span>
+              {" · "}
+              <span lang="en">Last updated: {LAST_UPDATED_EN}</span>
+            </time>
           </p>
           <p className="text-muted-foreground text-sm" lang="de">
             Diese Erklärung ist deutsch-englisch geführt. Jeder Abschnitt
@@ -253,7 +276,7 @@ export default function PrivacyPage() {
                   className="hover:text-foreground hover:underline"
                   href="#intro"
                 >
-                  1. Overview / Überblick
+                  1. Überblick / Overview
                 </a>
               </li>
               <li>
@@ -261,7 +284,7 @@ export default function PrivacyPage() {
                   className="hover:text-foreground hover:underline"
                   href="#data-we-collect"
                 >
-                  2. Data we collect / Erhobene Daten
+                  2. Erhobene Daten / Data we collect
                 </a>
               </li>
               <li>
@@ -269,7 +292,7 @@ export default function PrivacyPage() {
                   className="hover:text-foreground hover:underline"
                   href="#purpose"
                 >
-                  3. Why we collect each category / Zwecke der Verarbeitung
+                  3. Zwecke der Verarbeitung / Why we collect each category
                 </a>
               </li>
               <li>
@@ -277,7 +300,7 @@ export default function PrivacyPage() {
                   className="hover:text-foreground hover:underline"
                   href="#sub-processors"
                 >
-                  4. Third-party sub-processors / Auftragsverarbeiter
+                  4. Auftragsverarbeiter / Third-party sub-processors
                 </a>
               </li>
               <li>
@@ -285,8 +308,8 @@ export default function PrivacyPage() {
                   className="hover:text-foreground hover:underline"
                   href="#storage"
                 >
-                  5. Data storage and retention / Speicherung &amp;
-                  Speicherdauer
+                  5. Speicherung &amp; Speicherdauer / Data storage and
+                  retention
                 </a>
               </li>
               <li>
@@ -294,7 +317,7 @@ export default function PrivacyPage() {
                   className="hover:text-foreground hover:underline"
                   href="#rights"
                 >
-                  6. Your rights (GDPR Art. 15-22, DSGVO) / Ihre Rechte
+                  6. Ihre Rechte / Your rights (GDPR Art. 15-22, DSGVO)
                 </a>
               </li>
               <li>
@@ -302,8 +325,8 @@ export default function PrivacyPage() {
                   className="hover:text-foreground hover:underline"
                   href="#medical-boundary"
                 >
-                  7. Medical-device boundary (EU MDR 2017/745, MDCG 2021-24) /
-                  Medizinprodukte-Grenze
+                  7. Medizinprodukte-Grenze / Medical-device boundary (EU MDR
+                  2017/745, MDCG 2021-24)
                 </a>
               </li>
               <li>
@@ -311,8 +334,8 @@ export default function PrivacyPage() {
                   className="hover:text-foreground hover:underline"
                   href="#apple-categories"
                 >
-                  8. Apple App Store privacy categories / Apple-App-Store-
-                  Datenschutzkategorien
+                  8. Apple-App-Store- Datenschutzkategorien / Apple App Store
+                  privacy categories
                 </a>
               </li>
               <li>
@@ -320,7 +343,7 @@ export default function PrivacyPage() {
                   className="hover:text-foreground hover:underline"
                   href="#children"
                 >
-                  9. Children / Kinder
+                  9. Kinder / Children
                 </a>
               </li>
               <li>
@@ -328,7 +351,7 @@ export default function PrivacyPage() {
                   className="hover:text-foreground hover:underline"
                   href="#changes"
                 >
-                  10. Changes to this policy / Änderungen
+                  10. Änderungen / Changes to this policy
                 </a>
               </li>
               <li>
@@ -336,7 +359,7 @@ export default function PrivacyPage() {
                   className="hover:text-foreground hover:underline"
                   href="#contact"
                 >
-                  11. Contact / Kontakt
+                  11. Kontakt / Contact
                 </a>
               </li>
             </ol>
diff --git a/src/components/admin/invite-tokens-section.tsx b/src/components/admin/invite-tokens-section.tsx
index 9047a519b..024cb742a 100644
--- a/src/components/admin/invite-tokens-section.tsx
+++ b/src/components/admin/invite-tokens-section.tsx
@@ -411,7 +411,7 @@ export function InviteTokensSection() {
                             type="button"
                             variant="ghost"
                             size="sm"
-                            className="text-destructive hover:text-destructive"
+                            className="text-muted-foreground hover:text-foreground"
                             aria-label={t("admin.invites.revokeAria")}
                             disabled={revoke.isPending}
                             onClick={() => setRevokeTarget(invite)}
@@ -479,7 +479,7 @@ export function InviteTokensSection() {
                         type="button"
                         variant="ghost"
                         size="sm"
-                        className="text-destructive hover:text-destructive"
+                        className="text-muted-foreground hover:text-foreground"
                         disabled={revoke.isPending}
                         onClick={() => setRevokeTarget(invite)}
                       >
diff --git a/src/components/admin/user-management-section.tsx b/src/components/admin/user-management-section.tsx
index 696231967..8c2f746c0 100644
--- a/src/components/admin/user-management-section.tsx
+++ b/src/components/admin/user-management-section.tsx
@@ -254,7 +254,7 @@ export function UserManagementSection() {
       <Button
         variant="ghost"
         size="sm"
-        className="text-destructive hover:text-destructive min-h-11 min-w-11 px-2 text-xs"
+        className="text-muted-foreground hover:text-foreground min-h-11 min-w-11 px-2 text-xs"
         onClick={() => setLogoutTarget(u)}
         disabled={u.id === currentUserId}
         title={
diff --git a/src/components/charts/chart-skeleton.tsx b/src/components/charts/chart-skeleton.tsx
index 6e1c0e7c3..2d10370cd 100644
--- a/src/components/charts/chart-skeleton.tsx
+++ b/src/components/charts/chart-skeleton.tsx
@@ -48,11 +48,51 @@ import { useTranslations } from "@/lib/i18n/context";
 
 const SLOW_HINT_DELAY_MS = 3_000;
 
+/**
+ * The footer a loaded `<HealthChart>` paints under its plot: the row of day
+ * dots and its caption on a day-linked chart, and the collapsed "show as
+ * table" disclosure. A loading shell without it was ~100 px shorter than the
+ * card it turned into (CLS on every metric page, the BMI page most visibly),
+ * so the shells reserve the same boxes: `h-3` rug, `mt-1` caption (two lines
+ * on a phone, one from `sm`), and the disclosure's `mt-3 border-t pt-3` frame
+ * around its `min-h-11` button.
+ */
+export function ChartFooterReserve({
+  dayLinks = false,
+  dataTable = false,
+}: {
+  dayLinks?: boolean;
+  dataTable?: boolean;
+}) {
+  if (!dayLinks && !dataTable) return null;
+  return (
+    <div aria-hidden="true" data-slot="chart-footer-reserve">
+      {dayLinks ? (
+        <>
+          <div className="h-3" />
+          <div className="mt-1 h-9 sm:h-4" />
+        </>
+      ) : null}
+      {dataTable ? (
+        <div className="border-border mt-3 border-t pt-3">
+          <div className="h-11" />
+        </div>
+      ) : null}
+    </div>
+  );
+}
+
 export function ChartSkeleton({
   className,
   mini = false,
+  dayLinks = false,
+  dataTable = false,
 }: {
   className?: string;
+  /** Reserve the day-dot row + caption a day-linked chart paints. */
+  dayLinks?: boolean;
+  /** Reserve the collapsed data-table disclosure. */
+  dataTable?: boolean;
   /**
    * When true, render the compact variant used inside the trends-row
    * chart slot (140 px band, lighter chrome). Defaults to false for
@@ -106,8 +146,9 @@ export function ChartSkeleton({
       {/* Header row — title + range tabs match the real chart's
           `mb-4 flex flex-col gap-2 sm:flex-row` chrome. */}
       <div className="mb-4 flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between">
-        <Skeleton className="h-4 w-32" />
-        <div className="flex items-center gap-2">
+        <Skeleton className="h-5 w-32" />
+        {/* The range tabs are 44 px tap targets, so the row is too. */}
+        <div className="flex h-11 items-center gap-2">
           <Skeleton className="h-6 w-12" />
           <Skeleton className="h-6 w-12" />
           <Skeleton className="h-6 w-12" />
@@ -118,6 +159,7 @@ export function ChartSkeleton({
       {/* Chart band — mirrors the same `h-[var(--chart-height,…)]`
           contract `health-chart.tsx` paints at line 1087-1089. */}
       <Skeleton className="h-[var(--chart-height,240px)] w-full md:h-[var(--chart-height-md,280px)]" />
+      <ChartFooterReserve dayLinks={dayLinks} dataTable={dataTable} />
 
       {showSlowHint && (
         <p
diff --git a/src/components/charts/health-chart-dynamic.tsx b/src/components/charts/health-chart-dynamic.tsx
index 9a5f37d72..dd30ee900 100644
--- a/src/components/charts/health-chart-dynamic.tsx
+++ b/src/components/charts/health-chart-dynamic.tsx
@@ -29,20 +29,46 @@ import { importWithRetry } from "@/lib/retry-import";
  * to ONE error card with a reload affordance instead of bubbling to the
  * route-level `error.tsx`.
  */
-const HealthChartLazy = dynamic(
-  () =>
-    importWithRetry(() => import("@/components/charts/chart-runtime")).then(
-      (mod) => ({ default: mod.HealthChart }),
-    ),
-  { ssr: false, loading: () => <ChartSkeleton /> },
-);
+const loadHealthChart = () =>
+  importWithRetry(() => import("@/components/charts/chart-runtime")).then(
+    (mod) => ({ default: mod.HealthChart }),
+  );
+
+// One lazy boundary per footer shape: `next/dynamic`'s loading slot gets no
+// props, so the shell that must match a day-linked chart with its data table
+// is its own boundary. All four resolve the same chunk.
+const HealthChartLazy = dynamic(loadHealthChart, {
+  ssr: false,
+  loading: () => <ChartSkeleton />,
+});
+const HealthChartLazyDay = dynamic(loadHealthChart, {
+  ssr: false,
+  loading: () => <ChartSkeleton dayLinks />,
+});
+const HealthChartLazyTable = dynamic(loadHealthChart, {
+  ssr: false,
+  loading: () => <ChartSkeleton dataTable />,
+});
+const HealthChartLazyDayTable = dynamic(loadHealthChart, {
+  ssr: false,
+  loading: () => <ChartSkeleton dayLinks dataTable />,
+});
 
 export function HealthChartDynamic(
   props: ComponentProps<typeof HealthChartLazy>,
 ): ReactElement {
+  const Lazy = props.mini
+    ? HealthChartLazy
+    : props.dayLinks
+      ? props.showDataTable
+        ? HealthChartLazyDayTable
+        : HealthChartLazyDay
+      : props.showDataTable
+        ? HealthChartLazyTable
+        : HealthChartLazy;
   return (
     <ChartErrorBoundary>
-      <HealthChartLazy {...props} />
+      <Lazy {...props} />
     </ChartErrorBoundary>
   );
 }
diff --git a/src/components/charts/health-chart.tsx b/src/components/charts/health-chart.tsx
index beedff5eb..82ff67e67 100644
--- a/src/components/charts/health-chart.tsx
+++ b/src/components/charts/health-chart.tsx
@@ -68,6 +68,7 @@ import { bucketCaptionKey } from "@/lib/charts/bucket-caption";
 import type { MeasurementType } from "@/generated/prisma/client";
 import { ChartOverlayControls } from "./chart-overlay-controls";
 import { ChartDataTable, type ChartDataTableColumn } from "./chart-data-table";
+import { ChartFooterReserve } from "./chart-skeleton";
 import { useChartOverlayPrefs } from "@/hooks/use-chart-overlay-prefs";
 import { useViewportWidth } from "@/hooks/use-viewport-width";
 import { computeTickPositions } from "@/lib/charts/x-axis-density";
@@ -1309,10 +1310,13 @@ export function HealthChart({
   // Report the visible-range stats up to the sub-page so the shared
   // `<MetricStatStrip>` can read them. Effect (not render-time call) so the
   // parent state update never fires during this component's render.
+  // Only once the read has settled: a report during the initial fetch would
+  // tell the strip "no window" and it would paint the full-range summary
+  // first. A failed read settles too, so the strip never waits forever.
   useEffect(() => {
-    if (mini) return;
-    onVisibleStats?.(visibleStatsByType);
-  }, [mini, visibleStatsByType, onVisibleStats]);
+    if (mini || isLoading) return;
+    onVisibleStats?.(isError ? null : visibleStatsByType);
+  }, [mini, isLoading, isError, visibleStatsByType, onVisibleStats]);
 
   // v1.4.16 phase B8 — comparison overlay.
   //
@@ -1942,7 +1946,15 @@ export function HealthChart({
         // card height never jumps when the data lands — the dashboard's
         // shared-reveal overlay and every insights mount stay
         // layout-shift-free.
-        <Skeleton className={`w-full ${chartHeightClass}`} />
+        <>
+          <Skeleton className={`w-full ${chartHeightClass}`} />
+          {mini ? null : (
+            <ChartFooterReserve
+              dayLinks={dayLinksActive}
+              dataTable={showDataTable}
+            />
+          )}
+        </>
       ) : isError ? (
         // v1.16.8 — a failed query paints as an ERROR with a retry
         // affordance, not as the "no data in this range" empty state.
diff --git a/src/components/charts/medication-compliance-chart.tsx b/src/components/charts/medication-compliance-chart.tsx
index 628ce42ce..6464c3d59 100644
--- a/src/components/charts/medication-compliance-chart.tsx
+++ b/src/components/charts/medication-compliance-chart.tsx
@@ -32,6 +32,7 @@
  * `findAllByType` reconciliation; the dashboard's `next/dynamic` for
  * the wrapper itself stays intact.
  */
+import Link from "next/link";
 import { useQuery } from "@tanstack/react-query";
 import { useEffect, useMemo, useState, useRef } from "react";
 import { queryKeys } from "@/lib/query-keys";
@@ -50,6 +51,8 @@ import { ComplianceInfoTip } from "@/components/medications/card-parts/complianc
 import { TileHeader } from "@/components/insights/tile-header";
 import { Button } from "@/components/ui/button";
 import { Skeleton } from "@/components/ui/skeleton";
+import { EmptyState } from "@/components/ui/empty-state";
+import { useRecordCapabilities } from "@/hooks/use-record-capabilities";
 import { useAuth } from "@/hooks/use-auth";
 import {
   useDateFormatPreference,
@@ -276,6 +279,22 @@ export function MedicationComplianceChart({
     enabled: isAuthenticated,
   });
 
+  // An empty compliance window means one of two things: no dose fell in it,
+  // or there is no medication at all. The second is not "no data in the
+  // chosen range" — it is a first step, so the tile offers it. The list
+  // read is the medications page's own cell (usually warm already).
+  const complianceEmpty = !isLoading && !isError && (data?.length ?? 0) === 0;
+  const medicationList = useQuery({
+    queryKey: queryKeys.medications(),
+    queryFn: () => apiGet<{ id: string }[]>("/api/medications"),
+    enabled: isAuthenticated && complianceEmpty,
+  });
+  const noMedications =
+    complianceEmpty &&
+    medicationList.isSuccess &&
+    (medicationList.data?.length ?? 0) === 0;
+  const { canWriteDomain } = useRecordCapabilities();
+
   // v1.16.0 — report the settled query to the dashboard's shared
   // reveal gate (see `onDataReady` prop doc).
   //
@@ -533,6 +552,24 @@ export function MedicationComplianceChart({
           actionContext={displayTitle}
           onAction={() => void refetch()}
         />
+      ) : !hasData && noMedications ? (
+        <EmptyState
+          variant="plain"
+          size="compact"
+          data-slot="medication-compliance-no-medications"
+          className="flex h-48 items-center justify-center"
+          icon={<Pill className="size-4" />}
+          title={t("medications.emptyTitle")}
+          action={
+            canWriteDomain("medications") ? (
+              <Button asChild size="sm">
+                <Link href="/medications/new">
+                  {t("charts.medicationsEmptyAction")}
+                </Link>
+              </Button>
+            ) : undefined
+          }
+        />
       ) : !hasData ? (
         <div className="text-muted-foreground flex h-48 items-center justify-center text-sm">
           {t("charts.noData")}
diff --git a/src/components/cycle/log-day-sheet.tsx b/src/components/cycle/log-day-sheet.tsx
index b15617d7a..94a273ec6 100644
--- a/src/components/cycle/log-day-sheet.tsx
+++ b/src/components/cycle/log-day-sheet.tsx
@@ -1465,7 +1465,7 @@ export function SymptomRow({
             onClick={() => setConfirmRemove(true)}
             disabled={deleteCustom.isPending}
             aria-label={t("cycle.symptom.custom.remove", { label })}
-            className="text-muted-foreground hover:text-destructive hover:bg-accent focus-visible:ring-ring/50 grid size-11 shrink-0 place-items-center rounded-md transition-colors focus-visible:ring-2 focus-visible:outline-none sm:size-9"
+            className="text-muted-foreground hover:text-foreground hover:bg-accent focus-visible:ring-ring/50 grid size-11 shrink-0 place-items-center rounded-md transition-colors focus-visible:ring-2 focus-visible:outline-none sm:size-9"
           >
             <X className="size-4" aria-hidden="true" />
           </button>
diff --git a/src/components/dashboard/__tests__/recent-workouts-tile.test.tsx b/src/components/dashboard/__tests__/recent-workouts-tile.test.tsx
index e57a6e70f..aa52aac42 100644
--- a/src/components/dashboard/__tests__/recent-workouts-tile.test.tsx
+++ b/src/components/dashboard/__tests__/recent-workouts-tile.test.tsx
@@ -146,6 +146,6 @@ describe("<RecentWorkoutsTile>", () => {
     expect(html).toContain("Running");
     expect(html).toContain("Cycling");
     expect(html).toContain("30m");
-    expect(html).toContain("1h 00m");
+    expect(html).toContain("1h 0m");
   });
 });
diff --git a/src/components/dashboard/dashboard-header.tsx b/src/components/dashboard/dashboard-header.tsx
index 1c7b2b481..7750d2184 100644
--- a/src/components/dashboard/dashboard-header.tsx
+++ b/src/components/dashboard/dashboard-header.tsx
@@ -10,7 +10,7 @@
  * Extracted from the dashboard page; the page owns the open-state the
  * dropdown items set via `onQuickEntry`.
  */
-import { useMemo } from "react";
+import { useMemo, useState } from "react";
 import Link from "next/link";
 import {
   Activity,
@@ -37,6 +37,7 @@ import { useRecordCapabilities } from "@/hooks/use-record-capabilities";
 import { hourInTz } from "@/lib/tz/format";
 import {
   CAPTURE_KIND_ORDER,
+  CapturePicker,
   visibleCaptureKinds,
 } from "@/components/layout/capture-picker";
 import type { QuickEntryDialog } from "@/components/dashboard/quick-entry-sheets";
@@ -49,6 +50,7 @@ export function DashboardHeader({
   const { t } = useTranslations();
   const { user } = useAuth();
   const mounted = useMounted();
+  const [captureOpen, setCaptureOpen] = useState(false);
   // The quick-add offers four kinds, and each one is asked about its own
   // section: a reading under `measurements`, a dose under `medications`, a
   // mood entry under `mind`, a workout in one's own record only. The coarse `canAdd` this used to gate the whole
@@ -149,6 +151,26 @@ export function DashboardHeader({
               </Link>
             </Button>
           )}
+          {/* On the phone shell the add button opens the same capture
+              picker sheet the bottom nav's plus opens: one way to add a
+              thing, not a dropdown here and a sheet one thumb below. */}
+          {canAddAnything && (
+            <Button
+              size="default"
+              className="shell-desktop:hidden min-h-11"
+              onClick={() => setCaptureOpen(true)}
+              aria-haspopup="dialog"
+              aria-expanded={captureOpen}
+              data-slot="dashboard-quick-add-capture"
+              data-tour-id="dashboard-quick-add"
+            >
+              <Plus className="h-4 w-4" />
+              {t("common.add")}
+            </Button>
+          )}
+          {canAddAnything && (
+            <CapturePicker open={captureOpen} onOpenChange={setCaptureOpen} />
+          )}
           {canAddAnything && (
             <DropdownMenu>
               <DropdownMenuTrigger asChild>
@@ -166,7 +188,7 @@ export function DashboardHeader({
                   + label keep the same visual contract. */}
                 <Button
                   size="default"
-                  className="min-h-11 sm:min-h-9"
+                  className="shell-mobile:hidden min-h-11 sm:min-h-9"
                   data-tour-id="dashboard-quick-add"
                 >
                   <Plus className="h-4 w-4" />
diff --git a/src/components/dashboard/recent-workouts-tile.tsx b/src/components/dashboard/recent-workouts-tile.tsx
index cf77c7eeb..60c094a15 100644
--- a/src/components/dashboard/recent-workouts-tile.tsx
+++ b/src/components/dashboard/recent-workouts-tile.tsx
@@ -3,6 +3,7 @@
 import Link from "next/link";
 import { Activity } from "lucide-react";
 
+import { formatDurationMinutes } from "@/lib/i18n/duration";
 import { useTranslations } from "@/lib/i18n/context";
 import { useWorkouts, type WorkoutListEntry } from "@/hooks/use-workouts";
 import { cn } from "@/lib/utils";
@@ -31,13 +32,6 @@ import { iconForSport } from "@/lib/workouts/sport-icons";
  * round-trip per session.
  */
 
-function formatDuration(seconds: number): string {
-  const h = Math.floor(seconds / 3600);
-  const m = Math.floor((seconds % 3600) / 60);
-  if (h > 0) return `${h}h ${m.toString().padStart(2, "0")}m`;
-  return `${m}m`;
-}
-
 function formatDayLabel(iso: string, locale: string): string {
   const d = new Date(iso);
   return getDateTimeFormat(locale, {
@@ -154,7 +148,10 @@ export function RecentWorkoutsTile() {
                       {formatDayLabel(workout.startedAt, locale)}
                     </span>
                     <span className="ml-1 shrink-0 text-xs font-medium tabular-nums">
-                      {formatDuration(workout.durationSec)}
+                      {formatDurationMinutes(
+                        Math.round(workout.durationSec / 60),
+                        t,
+                      )}
                     </span>
                   </Link>
                 </li>
diff --git a/src/components/data-list/delete-button.tsx b/src/components/data-list/delete-button.tsx
index c90311978..6d2f9fbfa 100644
--- a/src/components/data-list/delete-button.tsx
+++ b/src/components/data-list/delete-button.tsx
@@ -73,7 +73,7 @@ export function DeleteButton({
         <Button
           variant="ghost"
           size="icon-lg"
-          className={`text-destructive ${className}`}
+          className={`text-muted-foreground hover:text-foreground ${className}`}
           aria-label={confirmLabel ?? t("common.delete")}
           title={triggerTitle ?? confirmLabel ?? t("common.delete")}
         >
diff --git a/src/components/data-list/selection-action-bar.tsx b/src/components/data-list/selection-action-bar.tsx
index 5a275913a..9fe66f11c 100644
--- a/src/components/data-list/selection-action-bar.tsx
+++ b/src/components/data-list/selection-action-bar.tsx
@@ -82,7 +82,7 @@ export function SelectionActionBar({
       // an `sm:` drop sat the bar behind the still-visible nav 640-767px.
       // z-30 keeps the bar above page content without needing to beat the
       // (now-cleared) nav's z-50.
-      className="bg-card border-border sticky bottom-[calc(env(safe-area-inset-bottom,0px)+5rem)] z-30 mt-2 flex items-center justify-between gap-2 rounded-lg border p-2 shadow-lg md:bottom-4"
+      className="bg-card border-border shell-desktop:bottom-4 sticky bottom-[calc(env(safe-area-inset-bottom,0px)+5rem)] z-30 mt-2 flex items-center justify-between gap-2 rounded-lg border p-2 shadow-lg"
     >
       <div className="flex items-center gap-1">
         <Button
diff --git a/src/components/day/day-sections.tsx b/src/components/day/day-sections.tsx
index 767ab2414..6de9b09b9 100644
--- a/src/components/day/day-sections.tsx
+++ b/src/components/day/day-sections.tsx
@@ -161,6 +161,31 @@ const RUNNING_COLOR: Record<DayRunningKind, string> = {
   lifeEvent: "var(--chart-2)",
 };
 
+/**
+ * The server names a few records by a sentinel rather than by text it would
+ * have to translate: a cycle is titled "cycle", a trip "travel", a cycle
+ * day carries its flow level. They are worded here, in the reader's
+ * language; every other title is the record's own text.
+ */
+function dayTitle(title: string, t: (key: string) => string): string {
+  if (title === "cycle") return t("nav.cycle");
+  if (title === "travel") return t("day.travel");
+  return title;
+}
+
+const FLOW_LEVELS = new Set(["NONE", "SPOTTING", "LIGHT", "MEDIUM", "HEAVY"]);
+
+function dayMeta(
+  kind: string,
+  meta: string,
+  t: (key: string) => string,
+): string {
+  if (kind === "cycleDayLog" && FLOW_LEVELS.has(meta)) {
+    return `${t("cycle.flow.label")}: ${t(`cycle.flow.${meta}`)}`;
+  }
+  return meta;
+}
+
 export function DayRunning({ items }: { items: readonly DayRunningItem[] }) {
   const { t } = useTranslations();
   const fmt = useFormatters();
@@ -192,7 +217,7 @@ export function DayRunning({ items }: { items: readonly DayRunningItem[] }) {
               />
               <span className="min-w-0 flex-1">
                 <span className="block truncate text-sm font-medium">
-                  {item.title}
+                  {dayTitle(item.title, t)}
                 </span>
                 <span className="text-muted-foreground block truncate text-xs">
                   {parts.join(" · ")}
@@ -431,14 +456,16 @@ export function DayEvents({ events }: { events: readonly DayEvent[] }) {
                     data-slot="day-event-link"
                     className="focus-visible:ring-ring/50 block text-sm leading-5 font-medium after:absolute after:inset-0 after:rounded-md after:content-[''] focus-visible:outline-none focus-visible:after:ring-[3px] focus-visible:after:ring-inherit"
                   >
-                    {event.title}
+                    {dayTitle(event.title, t)}
                   </Link>
                 ) : (
-                  <p className="text-sm leading-5 font-medium">{event.title}</p>
+                  <p className="text-sm leading-5 font-medium">
+                    {dayTitle(event.title, t)}
+                  </p>
                 )}
                 {event.meta ? (
                   <p className="text-muted-foreground mt-0.5 text-xs">
-                    {event.meta}
+                    {dayMeta(event.kind, event.meta, t)}
                   </p>
                 ) : null}
                 {event.note ? (
diff --git a/src/components/day/day-view.tsx b/src/components/day/day-view.tsx
index 55e317a23..14ee0b7ac 100644
--- a/src/components/day/day-view.tsx
+++ b/src/components/day/day-view.tsx
@@ -276,7 +276,7 @@ export function DayView({
         data-slot="day-body"
         className={cn(
           "flex min-h-0 flex-1 flex-col overflow-x-clip overflow-y-auto overscroll-contain",
-          compact ? "gap-6 px-4 pt-0.5 pb-4" : "gap-6 px-6 pt-5 pb-6",
+          compact ? "gap-6 px-4 pt-0.5 pb-4" : "gap-6 px-6 pt-4 pb-6",
         )}
       >
         {/* What the day holds, as meta under the header. The line keeps its
diff --git a/src/components/documents/documents-view.tsx b/src/components/documents/documents-view.tsx
index ffe1b6457..dbecd0757 100644
--- a/src/components/documents/documents-view.tsx
+++ b/src/components/documents/documents-view.tsx
@@ -984,13 +984,16 @@ export function DocumentsView() {
                 <>
                   {/* Renders only with a connected Paperless-ngx or Papra. */}
                   <ImportFromSourceButton className="min-h-11 sm:min-h-9" />
-                  <Button
-                    className="min-h-11 sm:min-h-9"
-                    onClick={() => uploadInputRef.current?.click()}
-                  >
-                    <Upload className="size-4" aria-hidden />
-                    {t("documents.pageUpload")}
-                  </Button>
+                  {/* An empty vault's empty state carries the upload. */}
+                  {showEmpty && !isFiltered ? null : (
+                    <Button
+                      className="min-h-11 sm:min-h-9"
+                      onClick={() => uploadInputRef.current?.click()}
+                    >
+                      <Upload className="size-4" aria-hidden />
+                      {t("documents.pageUpload")}
+                    </Button>
+                  )}
                 </>
               ) : null}
             </div>
@@ -1072,7 +1075,6 @@ export function DocumentsView() {
           icon={<FolderOpen className="size-6" aria-hidden />}
           title={t("documents.empty.title")}
           description={t("documents.empty.description")}
-          ctaSize="lg"
           action={
             canManageDocuments ? (
               <Button
diff --git a/src/components/encounters/procedures-section.tsx b/src/components/encounters/procedures-section.tsx
index 5442340ca..d555b59ed 100644
--- a/src/components/encounters/procedures-section.tsx
+++ b/src/components/encounters/procedures-section.tsx
@@ -86,7 +86,12 @@ export function ProceduresSection({ enabled = true }: { enabled?: boolean }) {
         titleId="procedures-section-title"
         title={t("encounters.procedures.title")}
         description={t("encounters.procedures.description")}
-        actions={addButton}
+        // The empty state carries the add action while there is none.
+        actions={
+          !list.isPending && !list.isError && total === 0 && !filtered
+            ? null
+            : addButton
+        }
       />
 
       {list.isError ? (
@@ -106,7 +111,6 @@ export function ProceduresSection({ enabled = true }: { enabled?: boolean }) {
           title={t("encounters.procedures.emptyTitle")}
           description={t("encounters.procedures.emptyDescription")}
           action={addButton ?? undefined}
-          ctaSize="lg"
         />
       ) : (
         <div className="space-y-4">
diff --git a/src/components/encounters/visits-section.tsx b/src/components/encounters/visits-section.tsx
index 21aa16783..20b3c50e9 100644
--- a/src/components/encounters/visits-section.tsx
+++ b/src/components/encounters/visits-section.tsx
@@ -91,7 +91,9 @@ export function VisitsSection({ enabled = true }: { enabled?: boolean }) {
                 {t("practitioners.linkLabel")}
               </Link>
             </Button>
-            {addButton}
+            {/* The empty state carries the add action while there is no
+                visit. */}
+            {!list.isPending && !list.isError && empty ? null : addButton}
           </>
         }
       />
@@ -113,7 +115,6 @@ export function VisitsSection({ enabled = true }: { enabled?: boolean }) {
           title={t("encounters.emptyTitle")}
           description={t("encounters.emptyDescription")}
           action={addButton ?? undefined}
-          ctaSize="lg"
         />
       ) : (
         <div className="space-y-6">
diff --git a/src/components/illness/episode-menu.tsx b/src/components/illness/episode-menu.tsx
index e938f9336..6cfa233c5 100644
--- a/src/components/illness/episode-menu.tsx
+++ b/src/components/illness/episode-menu.tsx
@@ -106,7 +106,6 @@ export function EpisodeMenu({
           ) : null}
           <DropdownMenuSeparator />
           <DropdownMenuItem
-            variant="destructive"
             onSelect={(e) => {
               e.preventDefault();
               setConfirmOpen(true);
diff --git a/src/components/illness/illness-episode-detail.tsx b/src/components/illness/illness-episode-detail.tsx
index 6ce6e29cf..91e36a332 100644
--- a/src/components/illness/illness-episode-detail.tsx
+++ b/src/components/illness/illness-episode-detail.tsx
@@ -21,6 +21,7 @@ import { Card, CardContent } from "@/components/ui/card";
 import { QueryErrorCard } from "@/components/ui/query-error-card";
 import { PageHeader } from "@/components/ui/page-header";
 import { Skeleton } from "@/components/ui/skeleton";
+import { RevealWhenSettled } from "@/components/ui/reveal-when-settled";
 import { useTranslations, useFormatters } from "@/lib/i18n/context";
 import { bodySiteText } from "@/components/encounters/encounter-labels";
 import { canReadBodySites } from "@/hooks/use-body-sites";
@@ -154,49 +155,56 @@ export function IllnessEpisodeDetail({ episodeId }: { episodeId: string }) {
         }
       />
 
-      {episode?.note ? (
-        <Card>
-          <CardContent>
-            <p className="text-muted-foreground text-xs font-medium tracking-wide uppercase">
-              {t("illness.detail.note")}
-            </p>
-            <p className="text-foreground mt-1 text-sm whitespace-pre-wrap">
-              {episode.note}
-            </p>
-          </CardContent>
-        </Card>
-      ) : null}
+      {/* Every card below has a data-shaped height (the day timeline above
+          all). Revealed together once the reads settle, so none of them
+          pushes the rest down while the page loads. */}
+      <RevealWhenSettled
+        fallback={<Skeleton className="h-96 w-full rounded-xl" />}
+      >
+        {episode?.note ? (
+          <Card>
+            <CardContent>
+              <p className="text-muted-foreground text-xs font-medium tracking-wide uppercase">
+                {t("illness.detail.note")}
+              </p>
+              <p className="text-foreground mt-1 text-sm whitespace-pre-wrap">
+                {episode.note}
+              </p>
+            </CardContent>
+          </Card>
+        ) : null}
 
-      {/* The per-day timeline lives only on the detail surface — the list
-          rows stay clean summaries, so navigating here reveals genuinely new
-          content (today's logged symptoms / impact / fever). */}
-      {episode ? (
-        <IllnessDayTimeline
-          episodeId={episode.id}
-          onLogDay={() => setLogOpen(true)}
-        />
-      ) : null}
+        {/* The per-day timeline lives only on the detail surface — the list
+            rows stay clean summaries, so navigating here reveals genuinely new
+            content (today's logged symptoms / impact / fever). */}
+        {episode ? (
+          <IllnessDayTimeline
+            episodeId={episode.id}
+            onLogDay={() => setLogOpen(true)}
+          />
+        ) : null}
 
-      {/* v1.40 — the person's own symptoms filed against this episode or
-          logged while it ran. Renders nothing when there are none. */}
-      {episode ? <EpisodeSymptomsCard episode={episode} /> : null}
+        {/* v1.40 — the person's own symptoms filed against this episode or
+            logged while it ran. Renders nothing when there are none. */}
+        {episode ? <EpisodeSymptomsCard episode={episode} /> : null}
 
-      {isLoading ? (
-        <Skeleton className="h-40 w-full" />
-      ) : (
-        <IllnessCorrelationCard episodeId={episodeId} />
-      )}
+        {isLoading ? (
+          <Skeleton className="h-40 w-full" />
+        ) : (
+          <IllnessCorrelationCard episodeId={episodeId} />
+        )}
 
-      {/* Condition ⇄ documents linking, condition side: the episode's
-          linked documents plus link/upload entries into the vault. Renders
-          nothing when the documents module is off for this account. */}
-      {episode ? <EpisodeDocumentsCard episodeId={episode.id} /> : null}
+        {/* Condition ⇄ documents linking, condition side: the episode's
+            linked documents plus link/upload entries into the vault. Renders
+            nothing when the documents module is off for this account. */}
+        {episode ? <EpisodeDocumentsCard episodeId={episode.id} /> : null}
 
-      {/* Condition ⇄ visits linking, condition side ONLY. A visit never
-          suggests an episode: an episode spans weeks and a visit is a point,
-          so the reverse match would be wrong often enough to train the person
-          to ignore every suggestion in the product. */}
-      {episode ? <EpisodeVisitsCard episodeId={episode.id} /> : null}
+        {/* Condition ⇄ visits linking, condition side ONLY. A visit never
+            suggests an episode: an episode spans weeks and a visit is a point,
+            so the reverse match would be wrong often enough to train the person
+            to ignore every suggestion in the product. */}
+        {episode ? <EpisodeVisitsCard episodeId={episode.id} /> : null}
+      </RevealWhenSettled>
 
       {episode ? (
         <>
diff --git a/src/components/illness/illness-view.tsx b/src/components/illness/illness-view.tsx
index 0ef5b8f1f..4133f5ecf 100644
--- a/src/components/illness/illness-view.tsx
+++ b/src/components/illness/illness-view.tsx
@@ -432,7 +432,9 @@ export function IllnessView() {
             )}
             {/* v1.18.6 (MOD-02) — the add button reads "hinzufügen" like every
                 other module, not the bespoke "neue Episode". */}
-            {canAddEpisode && (
+            {/* Hidden while there is no episode: the empty state below
+                carries the add action then. */}
+            {canAddEpisode && (isLoading || isError || hasEpisodes) && (
               <Button
                 onClick={() => setNewOpen(true)}
                 className="min-h-11 sm:min-h-9"
@@ -500,7 +502,6 @@ export function IllnessView() {
             icon={<Stethoscope className="size-6" />}
             title={t("illness.empty.title")}
             description={t("illness.empty.body")}
-            ctaSize="lg"
             action={
               canAddEpisode ? (
                 <Button onClick={() => setNewOpen(true)}>
diff --git a/src/components/insights/__tests__/integer-metric-precision-guard.test.tsx b/src/components/insights/__tests__/integer-metric-precision-guard.test.tsx
index a6da4062a..357ad8ff8 100644
--- a/src/components/insights/__tests__/integer-metric-precision-guard.test.tsx
+++ b/src/components/insights/__tests__/integer-metric-precision-guard.test.tsx
@@ -50,6 +50,15 @@ vi.mock("@/hooks/use-insights-layout-prefs", () => ({
 // The coach-read strip paints nothing until it is client-mounted (React
 // #418). Force the mounted branch so the band sentence reaches the markup.
 vi.mock("@/hooks/use-mounted", () => ({ useMounted: () => true }));
+// The chart is stubbed, so it never reports its window; settle the strip so
+// it paints the summary this guard reads.
+vi.mock("@/hooks/use-chart-domain-stats", () => ({
+  useChartDomainStats: () => ({
+    statsByType: null,
+    statsSettled: true,
+    onVisibleStats: () => {},
+  }),
+}));
 
 const analyticsMock = vi.fn();
 vi.mock("@/hooks/use-insights-analytics", () => ({
diff --git a/src/components/insights/__tests__/layout-coach-fab.test.tsx b/src/components/insights/__tests__/layout-coach-fab.test.tsx
index 32be51f50..089094891 100644
--- a/src/components/insights/__tests__/layout-coach-fab.test.tsx
+++ b/src/components/insights/__tests__/layout-coach-fab.test.tsx
@@ -81,8 +81,10 @@ describe("<LayoutCoachFab>", () => {
     expect(html).toContain(
       "bottom-[calc(env(safe-area-inset-bottom,0px)+5rem)]",
     );
+    // The bottom offset follows the shell, not a width: a phone held
+    // sideways keeps the bottom nav, so the FAB keeps clearing it there.
     expect(html).toContain(
-      "md:bottom-[calc(env(safe-area-inset-bottom,0px)+2rem)]",
+      "shell-desktop:bottom-[calc(env(safe-area-inset-bottom,0px)+2rem)]",
     );
     expect(html).toContain('data-keyboard-hide=""');
     expect(html).not.toContain("md:bottom-6");
diff --git a/src/components/insights/__tests__/metric-stat-strip.test.tsx b/src/components/insights/__tests__/metric-stat-strip.test.tsx
index 051a28c65..4268af7e9 100644
--- a/src/components/insights/__tests__/metric-stat-strip.test.tsx
+++ b/src/components/insights/__tests__/metric-stat-strip.test.tsx
@@ -198,3 +198,30 @@ describe("<MetricStatStrip>", () => {
     });
   });
 });
+
+describe("<MetricStatStrip> waits for the chart's window", () => {
+  // The chart opens on a 30-day window. Painting the all-time summary until
+  // the chart reports, then swapping to the window, made every number jump
+  // a beat after the page loaded.
+  it("holds the cells while the chart's window is still pending", () => {
+    const html = render(
+      <MetricStatStrip summary={populated} unit="bpm" windowPending />,
+    );
+    expect(html).toContain('data-stat="min"');
+    expect(html).toContain('data-window-pending="true"');
+    expect(html).not.toContain("58.0 bpm");
+    expect(html).not.toContain("88.0 bpm");
+  });
+
+  it("paints the window's numbers once the chart reported", () => {
+    const html = render(
+      <MetricStatStrip
+        summary={populated}
+        unit="bpm"
+        windowStats={{ count: 5, min: 60, max: 80, median: 70, mean: 70 }}
+      />,
+    );
+    expect(html).toContain("60.0 bpm");
+    expect(html).not.toContain("58.0 bpm");
+  });
+});
diff --git a/src/components/insights/__tests__/workout-detail.test.tsx b/src/components/insights/__tests__/workout-detail.test.tsx
index 242331f7a..10adef82b 100644
--- a/src/components/insights/__tests__/workout-detail.test.tsx
+++ b/src/components/insights/__tests__/workout-detail.test.tsx
@@ -100,8 +100,8 @@ describe("<WorkoutDetailHeader>", () => {
   it("renders the sport label, source, and duration summary", () => {
     const html = render(<WorkoutDetailHeader workout={FIXTURE} />);
     expect(html).toContain("Running");
-    expect(html).toContain("APPLE_HEALTH");
-    expect(html).toContain("30m 00s");
+    expect(html).toContain("Apple Health");
+    expect(html).toContain("30:00 min");
     expect(html).toContain("5.20 km");
   });
 });
@@ -180,7 +180,7 @@ describe("<WorkoutDetailStats>", () => {
       );
       // 5200 m = 3.23 mi; 1800 s over it = 9:17 per mile; 12.5 m = 41.0 ft.
       expect(html).toContain("3.23 mi");
-      expect(html).toContain("9:17 /mi");
+      expect(html).toContain("9:17 min/mi");
       expect(html).toContain("41.0 ft");
       // The sport-average line: 5800 m = 3.60 mi.
       expect(html).toContain("3.60 mi");
@@ -196,7 +196,7 @@ describe("<WorkoutDetailStats>", () => {
   it("keeps kilometres, minutes per km and metres for a metric reader", () => {
     const html = render(<WorkoutDetailStats workout={FIXTURE} />);
     expect(html).toContain("5.20 km");
-    expect(html).toContain("5:46 /km");
+    expect(html).toContain("5:46 min/km");
     expect(html).toContain("12.5 m");
   });
 
@@ -365,7 +365,7 @@ describe("<WorkoutDetailSplits>", () => {
     expectSingleSectionHeading(html, "Splits");
     expect(html).toContain('data-slot="workout-detail-splits"');
     expect(html).toContain("5:00");
-    expect(html).toContain("4:48 /km");
+    expect(html).toContain("4:48 min/km");
   });
 });
 
diff --git a/src/components/insights/coach-panel/history-rail.tsx b/src/components/insights/coach-panel/history-rail.tsx
index 452ed291c..5cbf68e6c 100644
--- a/src/components/insights/coach-panel/history-rail.tsx
+++ b/src/components/insights/coach-panel/history-rail.tsx
@@ -340,7 +340,6 @@ function HistoryRow({
               {t("insights.coach.frame.rename")}
             </DropdownMenuItem>
             <DropdownMenuItem
-              variant="destructive"
               data-slot="coach-history-delete"
               onSelect={() => onDelete(c.id)}
             >
diff --git a/src/components/insights/derived/composite-score-anatomy.tsx b/src/components/insights/derived/composite-score-anatomy.tsx
index 7f6bee80d..d62b3035a 100644
--- a/src/components/insights/derived/composite-score-anatomy.tsx
+++ b/src/components/insights/derived/composite-score-anatomy.tsx
@@ -3,6 +3,7 @@
 import { Sparkles } from "lucide-react";
 
 import { useTranslations } from "@/lib/i18n/context";
+import { resolveIntlLocale } from "@/lib/format-locale";
 import { useDerivedMetric } from "./use-derived-metric";
 import { Skeleton } from "@/components/ui/skeleton";
 import { QueryErrorRow } from "@/components/ui/query-error-row";
@@ -109,7 +110,7 @@ export function CompositeScoreAnatomy({
   metric,
   className,
 }: CompositeScoreAnatomyProps) {
-  const { t } = useTranslations();
+  const { t, locale } = useTranslations();
 
   const query = useDerivedMetric<
     SleepScoreValue | ReadinessValue | WellnessScoreValue
@@ -135,7 +136,15 @@ export function CompositeScoreAnatomy({
   // the displayed framing honest per-score. `null` (RECOVERY / STRESS, or no
   // cache row yet) renders nothing.
   let anchorLine: string | null = null;
-  if (metric === "STRAIN_SCORE" && data?.status === "ok" && data.value) {
+  // Strain served from the device's own day strain (no computed proxy in the
+  // window): the card says so, and the course below charts that same series.
+  const deviceStrain =
+    metric === "STRAIN_SCORE" && data?.status === "ok" && data.value
+      ? ((data.value as WellnessScoreValue).device ?? null)
+      : null;
+  if (deviceStrain) {
+    anchorLine = t("insights.derived.composite.STRAIN_SCORE.deviceSource");
+  } else if (metric === "STRAIN_SCORE" && data?.status === "ok" && data.value) {
     const anchor = (data.value as WellnessScoreValue).anchor;
     if (anchor === "personal") {
       anchorLine = t("insights.derived.composite.STRAIN_SCORE.anchorPersonal");
@@ -150,7 +159,11 @@ export function CompositeScoreAnatomy({
   // above the method in warning colour is gone: it repeated on every score
   // page what the method and the page explainer already say, and read as an
   // alarm. The method copy closes the card on its own.
-  const method = (
+  // Served from the device, the proxy's method does not describe the number
+  // on the card; the device line does, on its own.
+  const method = deviceStrain ? (
+    anchorLine
+  ) : (
     <>
       {t(meta.methodKey)}
       {anchorLine ? <span className="mt-1 block">{anchorLine}</span> : null}
@@ -238,7 +251,15 @@ export function CompositeScoreAnatomy({
       // READINESS component keys verbatim. STRESS / STRAIN stay row-less.
       const v = data.value as WellnessScoreValue;
       score = v.score;
-      caption = t(`insights.derived.scoreRing.band.${v.band}`);
+      caption = v.device
+        ? t("insights.derived.composite.STRAIN_SCORE.deviceCaption", {
+            value: v.device.value.toLocaleString(resolveIntlLocale(locale), {
+              minimumFractionDigits: 1,
+              maximumFractionDigits: 1,
+            }),
+            max: v.device.scaleMax,
+          })
+        : t(`insights.derived.scoreRing.band.${v.band}`);
       if (metric === "RECOVERY_SCORE" && v.components) {
         contributors = v.components
           .map((c) => ({
@@ -275,7 +296,10 @@ export function CompositeScoreAnatomy({
     data.status !== "ok" ? null : metric === "RECOVERY_SCORE" ||
       metric === "STRESS_SCORE" ||
       metric === "STRAIN_SCORE" ? (
-      <ScoreHistoryChart type={metric} hue={METRIC_HUE[metric]} />
+      <ScoreHistoryChart
+        type={deviceStrain ? "DAY_STRAIN" : metric}
+        hue={METRIC_HUE[metric]}
+      />
     ) : series && series.length >= 2 ? (
       <ScoreHistoryCard
         series={series}
diff --git a/src/components/insights/derived/score-history.tsx b/src/components/insights/derived/score-history.tsx
index 59744484d..d4c22a5c9 100644
--- a/src/components/insights/derived/score-history.tsx
+++ b/src/components/insights/derived/score-history.tsx
@@ -33,8 +33,9 @@ export function ScoreHistoryChart({
   type,
   hue,
 }: {
-  /** The stored measurement type the score is written as. */
-  type: "RECOVERY_SCORE" | "STRESS_SCORE" | "STRAIN_SCORE";
+  /** The stored measurement type the score is written as — or, for a strain
+   *  score served from the device, the device's own `DAY_STRAIN`. */
+  type: "RECOVERY_SCORE" | "STRESS_SCORE" | "STRAIN_SCORE" | "DAY_STRAIN";
   hue: RingHue;
 }) {
   const { t } = useTranslations();
diff --git a/src/components/insights/healthkit-metric-page.tsx b/src/components/insights/healthkit-metric-page.tsx
index 9e023d7eb..d3eb28880 100644
--- a/src/components/insights/healthkit-metric-page.tsx
+++ b/src/components/insights/healthkit-metric-page.tsx
@@ -266,7 +266,7 @@ export function HealthKitMetricPage({
   // v1.12.8 — shared visible-range state. The chart reports the per-type
   // Min / Max / Median / Mean for the data under its active range tab; the
   // stat strip reads it back for this page's single series.
-  const { statsByType, onVisibleStats } = useChartDomainStats();
+  const { statsByType, statsSettled, onVisibleStats } = useChartDomainStats();
 
   // v1.17.0 — fallback-type swap. When the primary type has no rows but the
   // declared fallback does (HRV: SDNN empty, RMSSD present), key the chart,
@@ -446,6 +446,7 @@ export function HealthKitMetricPage({
           }
           icon={statIcon}
           windowStats={statsByType?.[effectiveType] ?? null}
+          windowPending={!statsSettled}
           medianLabel={statMedianLabel}
         />
       }
diff --git a/src/components/insights/intraday-pulse-chart.tsx b/src/components/insights/intraday-pulse-chart.tsx
index 42b7c0523..18726cc1f 100644
--- a/src/components/insights/intraday-pulse-chart.tsx
+++ b/src/components/insights/intraday-pulse-chart.tsx
@@ -86,6 +86,9 @@ const AXIS_TICKS = [0, 360, 720, 1080, 1440];
  * navigator still works from there, so "the day before" stays one tap away.
  * Absent, the view opens on today and keeps tracking it.
  */
+/** Fewest present buckets that make a course worth drawing across 24 h. */
+const MIN_BUCKETS_FOR_COURSE = 3;
+
 export function IntradayPulseChart({
   userTimezone,
   initialDateKey,
@@ -194,13 +197,10 @@ export function IntradayPulseChart({
   return (
     <div
       data-slot="intraday-pulse-chart"
-      // `.metric-accent` — the tension layer's identity edge on the CARD
-      // shell only (`--tile-stress`, the wellness vocabulary's autonomic
-      // hue, per the plan's §3.6 hue-family call); the chart inside stays
-      // untouched. The same hue marks the `tension_window` rail card, so
-      // the two S11 surfaces read as one family.
-      className="bg-card metric-accent space-y-1.5 rounded-xl border p-4 md:p-6"
-      style={{ "--tile-hue": "var(--tile-stress)" } as React.CSSProperties}
+      // A plain card, like every other chart card and the day view it
+      // opens into. The coloured identity edge it used to carry read as a
+      // warning stripe beside a workout.
+      className="bg-card space-y-1.5 rounded-xl border p-4 md:p-6"
     >
       <TileHeader
         icon={Activity}
@@ -258,7 +258,10 @@ export function IntradayPulseChart({
           onRetry={() => refetch()}
           className="border-0 bg-transparent shadow-none"
         />
-      ) : chartData.length === 0 ? (
+      ) : (data?.series?.length ?? 0) < MIN_BUCKETS_FOR_COURSE ? (
+        // A lone reading or two on a 24-hour axis drew a dot in an empty
+        // field and called it the course of the day. Below a handful of
+        // buckets the card says there is not enough for a course.
         <div className="text-muted-foreground flex h-44 items-center justify-center rounded-lg border border-dashed text-sm">
           {t("insights.intradayPulse.empty")}
         </div>
diff --git a/src/components/insights/layout-coach-fab.tsx b/src/components/insights/layout-coach-fab.tsx
index 5ba70ca9f..7d6bbae8e 100644
--- a/src/components/insights/layout-coach-fab.tsx
+++ b/src/components/insights/layout-coach-fab.tsx
@@ -246,7 +246,7 @@ export function LayoutCoachFab() {
           // phone held sideways (844 px, past `md`) has its notch on one
           // side, and an installed iPad its home indicator along the bottom.
           "fixed right-[calc(env(safe-area-inset-right,0px)+1.5rem)] z-40 size-14 rounded-full shadow-lg md:right-[calc(env(safe-area-inset-right,0px)+2rem)]",
-          "bottom-[calc(env(safe-area-inset-bottom,0px)+5rem)] md:bottom-[calc(env(safe-area-inset-bottom,0px)+2rem)]",
+          "shell-desktop:bottom-[calc(env(safe-area-inset-bottom,0px)+2rem)] bottom-[calc(env(safe-area-inset-bottom,0px)+5rem)]",
           // Dark glyph on the purple/pink gradient — white sat at
           // ≈2.3:1 against the gradient midpoint; the background token
           // reads ≈6.5:1.
diff --git a/src/components/insights/metric-empty-state.tsx b/src/components/insights/metric-empty-state.tsx
index b5d51ff35..c3777c3b5 100644
--- a/src/components/insights/metric-empty-state.tsx
+++ b/src/components/insights/metric-empty-state.tsx
@@ -11,7 +11,7 @@ import { EmptyState } from "@/components/ui/empty-state";
  *
  * Pre-fix, every sub-page repeated the same five-line incantation:
  *
- *   <EmptyState icon={…} title={…} description={…} ctaSize="lg" action={…} />
+ *   <EmptyState icon={…} title={…} description={…} action={…} />
  *   <CoachLaunchButton prefill={…} />
  *
  * The action slot was always a `<Button asChild><Link href="…">…</Link></Button>`
@@ -64,7 +64,6 @@ export function MetricEmptyState({
         icon={icon}
         title={title}
         description={description}
-        ctaSize="lg"
         action={cta}
       />
       <CoachLaunchButton prefill={coachPrefill ?? undefined} />
diff --git a/src/components/insights/metric-stat-strip.tsx b/src/components/insights/metric-stat-strip.tsx
index d9682e215..63d68803c 100644
--- a/src/components/insights/metric-stat-strip.tsx
+++ b/src/components/insights/metric-stat-strip.tsx
@@ -118,6 +118,13 @@ export interface MetricStatSeries {
    * `h1 → h2` outline under `SubPageShell` stays nested with no skipped level.
    */
   titleAs?: "h2";
+  /**
+   * The chart this strip reads has not reported its window yet. The cells
+   * hold their place instead of painting the full-range summary: the chart
+   * opens on a narrower window, so the all-time numbers would be replaced a
+   * beat later and every value would jump.
+   */
+  windowPending?: boolean;
 }
 
 type MetricStatStripProps = Partial<MetricStatSeries> & {
@@ -165,6 +172,7 @@ function SeriesBlock({
   medianLabel,
   description,
   titleAs,
+  windowPending = false,
 }: MetricStatSeries) {
   const { t } = useTranslations();
   const fmt = useFormatters();
@@ -181,6 +189,7 @@ function SeriesBlock({
   // chart's range tab is the single, visible selector for both.
   const windowed = windowStats != null && windowStats.count > 0;
   const source = windowed ? windowStats : summary;
+  const holding = windowPending && !windowed;
 
   const format = (value: number | null): string =>
     value === null ? "—" : `${fmt.number(value, fractionDigits)} ${unit}`;
@@ -205,6 +214,7 @@ function SeriesBlock({
       data-slot="metric-stat-series"
       data-series={dataKey}
       data-windowed={windowed ? "true" : undefined}
+      data-window-pending={holding ? "true" : undefined}
       className="space-y-1.5"
     >
       {seriesLabel ? (
@@ -228,9 +238,13 @@ function SeriesBlock({
             <p className="text-muted-foreground text-xs tracking-wide uppercase">
               {cell.label}
             </p>
-            <p className="text-base font-semibold tabular-nums">
-              {format(cell.value)}
-            </p>
+            {holding ? (
+              <Skeleton className="h-6 w-16" />
+            ) : (
+              <p className="text-base font-semibold tabular-nums">
+                {format(cell.value)}
+              </p>
+            )}
           </div>
         ))}
       </div>
@@ -249,6 +263,7 @@ export function MetricStatStrip({
   medianLabel,
   description,
   titleAs,
+  windowPending,
   series,
   groupLabel,
   pending = false,
@@ -318,6 +333,7 @@ export function MetricStatStrip({
           medianLabel={medianLabel}
           description={description}
           titleAs={titleAs}
+          windowPending={windowPending}
         />
       </CardContent>
     </Card>
diff --git a/src/components/insights/mood/mood-better-days.tsx b/src/components/insights/mood/mood-better-days.tsx
index 07b507214..55738c513 100644
--- a/src/components/insights/mood/mood-better-days.tsx
+++ b/src/components/insights/mood/mood-better-days.tsx
@@ -2,7 +2,7 @@
 
 import { ArrowDownRight, ArrowUpRight } from "lucide-react";
 
-import { useTranslations } from "@/lib/i18n/context";
+import { useFormatters, useTranslations } from "@/lib/i18n/context";
 import { moodTagIcon } from "@/components/mood/mood-tag-icons";
 import { cn } from "@/lib/utils";
 import type { MoodInfluenceConfidence } from "./mood-tag-influence";
@@ -70,6 +70,7 @@ export function MoodBetterDays({
   factors: MoodBetterDayFactor[];
 }) {
   const { t } = useTranslations();
+  const nf = useFormatters();
   if (factors.length === 0) return null;
 
   return (
@@ -108,9 +109,9 @@ export function MoodBetterDays({
           // metric factors show the correlation coefficient.
           const effectText =
             factor.source === "tag" && factor.delta != null
-              ? `${factor.delta >= 0 ? "+" : ""}${factor.delta.toFixed(1)}`
+              ? `${factor.delta >= 0 ? "+" : ""}${nf.number(factor.delta, 1)}`
               : factor.r != null
-                ? `r ${factor.r.toFixed(2)}`
+                ? `r ${nf.number(factor.r, 2)}`
                 : "";
 
           return (
diff --git a/src/components/insights/mood/mood-context-comparison.tsx b/src/components/insights/mood/mood-context-comparison.tsx
index 3df6ff9ba..4bcf8a63e 100644
--- a/src/components/insights/mood/mood-context-comparison.tsx
+++ b/src/components/insights/mood/mood-context-comparison.tsx
@@ -16,7 +16,7 @@
  * them; a second threshold in the presentation layer would be a second place
  * to get the statistics wrong.
  */
-import { useTranslations } from "@/lib/i18n/context";
+import { useFormatters, useTranslations } from "@/lib/i18n/context";
 import { contextValueLabelKey } from "@/lib/mood/context-vocabulary";
 import type { ContextComparisonRow } from "@/lib/insights/mood-context-crosstab";
 
@@ -26,6 +26,7 @@ export function MoodContextComparison({
   rows: ContextComparisonRow[];
 }) {
   const { t } = useTranslations();
+  const nf = useFormatters();
   if (rows.length === 0) return null;
 
   return (
@@ -50,8 +51,8 @@ export function MoodContextComparison({
                 {t("insights.mood.contextComparison.statement", {
                   label,
                   direction,
-                  withAvg: row.withAvg.toFixed(1),
-                  withoutAvg: row.withoutAvg.toFixed(1),
+                  withAvg: nf.number(row.withAvg, 1),
+                  withoutAvg: nf.number(row.withoutAvg, 1),
                 })}
               </p>
               {/* The counts ride with the statement, in the same block a
diff --git a/src/components/insights/mood/mood-correlation-cards.tsx b/src/components/insights/mood/mood-correlation-cards.tsx
index 804bf52ff..36c07db54 100644
--- a/src/components/insights/mood/mood-correlation-cards.tsx
+++ b/src/components/insights/mood/mood-correlation-cards.tsx
@@ -8,7 +8,7 @@ import { Card, CardContent, CardHeader } from "@/components/ui/card";
 import { TileHeader } from "@/components/insights/tile-header";
 import { EmptyState } from "@/components/ui/empty-state";
 import { Skeleton } from "@/components/ui/skeleton";
-import { useTranslations } from "@/lib/i18n/context";
+import { useFormatters, useTranslations } from "@/lib/i18n/context";
 import type { CorrelationResult } from "@/lib/analytics/correlations";
 import { MoodExplainerIcon } from "./mood-explainer-icon";
 
@@ -106,6 +106,7 @@ function MoodCorrelationCard({
   className?: string;
 }) {
   const { t } = useTranslations();
+  const nf = useFormatters();
   const hasResult = data.result != null;
 
   // Three different silences, and the reader deserves to know which one they
@@ -164,7 +165,7 @@ function MoodCorrelationCard({
                   label={t("insights.mood.correlation.sourceLabel")}
                   detail={t("insights.mood.correlation.source", {
                     n: data.n,
-                    r: data.result.r.toFixed(2),
+                    r: nf.number(data.result.r, 2),
                   })}
                 />
               </div>
@@ -179,7 +180,7 @@ function MoodCorrelationCard({
             label={t("insights.mood.correlation.sourceLabel")}
             detail={t("insights.mood.correlation.source", {
               n: data.n,
-              r: data.result.r.toFixed(2),
+              r: nf.number(data.result.r, 2),
             })}
           />
         ) : null}
diff --git a/src/components/insights/mood/mood-discovered-relations.tsx b/src/components/insights/mood/mood-discovered-relations.tsx
index 53bca5e81..4a9adf235 100644
--- a/src/components/insights/mood/mood-discovered-relations.tsx
+++ b/src/components/insights/mood/mood-discovered-relations.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useTranslations } from "@/lib/i18n/context";
+import { useFormatters, useTranslations } from "@/lib/i18n/context";
 import { MoodExplainerIcon } from "./mood-explainer-icon";
 import {
   PatternDismissButton,
@@ -94,6 +94,7 @@ export function MoodDiscoveredRelations({
   pairsTested: number;
 }) {
   const { t } = useTranslations();
+  const nf = useFormatters();
   const dismissal = usePatternDismissalOverrides();
 
   if (pairs.length === 0) return null;
@@ -169,8 +170,8 @@ export function MoodDiscoveredRelations({
                   label={t("insights.mood.discovery.statLabel")}
                   detail={t("insights.mood.discovery.stat", {
                     n: pair.n,
-                    r: pair.r.toFixed(2),
-                    q: pair.qValue.toFixed(3),
+                    r: nf.number(pair.r, 2),
+                    q: nf.number(pair.qValue, 3),
                   })}
                 />
               </span>
diff --git a/src/components/insights/mood/mood-factor-metric-crosstab.tsx b/src/components/insights/mood/mood-factor-metric-crosstab.tsx
index 65d1b5a4e..6cd598af6 100644
--- a/src/components/insights/mood/mood-factor-metric-crosstab.tsx
+++ b/src/components/insights/mood/mood-factor-metric-crosstab.tsx
@@ -1,6 +1,7 @@
 "use client";
 
-import { useTranslations } from "@/lib/i18n/context";
+import { useFormatters, useTranslations } from "@/lib/i18n/context";
+import type { Formatters } from "@/lib/format-locale";
 import { useUnitDisplay } from "@/hooks/use-unit-display";
 import { moodTagIcon } from "@/components/mood/mood-tag-icons";
 import { cn } from "@/lib/utils";
@@ -84,8 +85,12 @@ const CONFIDENCE_CLASS: Record<MoodInfluenceConfidence, string> = {
 };
 
 /** Whole numbers for steps; one decimal otherwise. */
-function fmt(value: number, display: MoodFactorCrosstabDisplay): string {
-  return display === "steps" ? Math.round(value).toString() : value.toFixed(1);
+function formatValue(
+  value: number,
+  display: MoodFactorCrosstabDisplay,
+  nf: Formatters,
+): string {
+  return display === "steps" ? nf.integer(value) : nf.number(value, 1);
 }
 
 export function MoodFactorMetricCrosstab({
@@ -94,6 +99,7 @@ export function MoodFactorMetricCrosstab({
   rows: MoodFactorMetricCrosstabRow[];
 }) {
   const { t } = useTranslations();
+  const nf = useFormatters();
   const unitDisplay = useUnitDisplay();
   const dismissal = usePatternDismissalOverrides();
   if (rows.length === 0) return null;
@@ -143,7 +149,7 @@ export function MoodFactorMetricCrosstab({
           // green/red would imply a health verdict the data doesn't support.
           // The sign prefix + `data-direction` carry the direction.
           const up = row.delta >= 0;
-          const deltaText = `${up ? "+" : ""}${fmt(conv(row.delta), row.display)} ${unit}`;
+          const deltaText = `${up ? "+" : ""}${formatValue(conv(row.delta), row.display, nf)} ${unit}`;
           return (
             <li
               key={`${row.metricKey}:${row.factor}`}
@@ -197,8 +203,8 @@ export function MoodFactorMetricCrosstab({
                   {
                     factor: factorLabel,
                     metric: metricLabel,
-                    lowAvg: fmt(conv(row.lowAvg), row.display),
-                    highAvg: fmt(conv(row.highAvg), row.display),
+                    lowAvg: formatValue(conv(row.lowAvg), row.display, nf),
+                    highAvg: formatValue(conv(row.highAvg), row.display, nf),
                     unit,
                     lowDays: row.lowDays,
                   },
diff --git a/src/components/insights/mood/mood-structured-tag-breakdown.tsx b/src/components/insights/mood/mood-structured-tag-breakdown.tsx
index 9753a140d..87ccbb809 100644
--- a/src/components/insights/mood/mood-structured-tag-breakdown.tsx
+++ b/src/components/insights/mood/mood-structured-tag-breakdown.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useTranslations } from "@/lib/i18n/context";
+import { useFormatters, useTranslations } from "@/lib/i18n/context";
 import { moodTagIcon } from "@/components/mood/mood-tag-icons";
 
 /**
@@ -28,10 +28,10 @@ export interface MoodStructuredTagRow {
 }
 
 function colorForScore(score: number): string {
-  if (score < 2) return "var(--dracula-red)";
-  if (score < 3) return "var(--dracula-orange)";
+  if (score < 2) return "var(--destructive)";
+  if (score < 3) return "var(--warning)";
   if (score < 3.5) return "var(--dracula-yellow)";
-  return "var(--dracula-green)";
+  return "var(--success)";
 }
 
 export function MoodStructuredTagBreakdown({
@@ -40,6 +40,7 @@ export function MoodStructuredTagBreakdown({
   tags: MoodStructuredTagRow[];
 }) {
   const { t } = useTranslations();
+  const nf = useFormatters();
   const maxCount = tags.reduce((m, row) => Math.max(m, row.count), 0) || 1;
 
   return (
@@ -74,7 +75,7 @@ export function MoodStructuredTagBreakdown({
               style={{ color: colorForScore(row.avgScore) }}
               title={t("insights.mood.tagAvgMood")}
             >
-              {row.avgScore.toFixed(1)}
+              {nf.number(row.avgScore, 1)}
             </span>
           </li>
         );
diff --git a/src/components/insights/mood/mood-tag-breakdown.tsx b/src/components/insights/mood/mood-tag-breakdown.tsx
index 2e4c3d5bc..53e63793e 100644
--- a/src/components/insights/mood/mood-tag-breakdown.tsx
+++ b/src/components/insights/mood/mood-tag-breakdown.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useTranslations } from "@/lib/i18n/context";
+import { useFormatters, useTranslations } from "@/lib/i18n/context";
 
 /**
  * v1.8.5 — tag / trigger breakdown.
@@ -30,6 +30,7 @@ function colorForScore(score: number): string {
 
 export function MoodTagBreakdown({ tags }: { tags: MoodTagRow[] }) {
   const { t } = useTranslations();
+  const nf = useFormatters();
   const maxCount = tags.reduce((m, row) => Math.max(m, row.count), 0) || 1;
 
   return (
@@ -61,7 +62,7 @@ export function MoodTagBreakdown({ tags }: { tags: MoodTagRow[] }) {
             style={{ color: colorForScore(row.avgScore) }}
             title={t("insights.mood.tagAvgMood")}
           >
-            {row.avgScore.toFixed(1)}
+            {nf.number(row.avgScore, 1)}
           </span>
         </li>
       ))}
diff --git a/src/components/insights/mood/mood-tag-influence.tsx b/src/components/insights/mood/mood-tag-influence.tsx
index 619c2d699..4db56866a 100644
--- a/src/components/insights/mood/mood-tag-influence.tsx
+++ b/src/components/insights/mood/mood-tag-influence.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useTranslations } from "@/lib/i18n/context";
+import { useFormatters, useTranslations } from "@/lib/i18n/context";
 import { moodTagIcon } from "@/components/mood/mood-tag-icons";
 import { cn } from "@/lib/utils";
 
@@ -62,6 +62,7 @@ function deltaColor(delta: number): string {
 
 export function MoodTagInfluence({ rows }: { rows: MoodTagInfluenceRow[] }) {
   const { t } = useTranslations();
+  const nf = useFormatters();
   if (rows.length === 0) return null;
 
   return (
@@ -71,7 +72,7 @@ export function MoodTagInfluence({ rows }: { rows: MoodTagInfluenceRow[] }) {
           const Icon = row.labelKey ? moodTagIcon(row.icon) : null;
           const label = row.label ?? (row.labelKey ? t(row.labelKey) : row.tag);
           const up = row.delta >= 0;
-          const deltaText = `${up ? "+" : ""}${row.delta.toFixed(1)}`;
+          const deltaText = `${up ? "+" : ""}${nf.number(row.delta, 1)}`;
           return (
             <li
               key={`${row.labelKey ?? "flat"}:${row.tag}`}
@@ -110,8 +111,8 @@ export function MoodTagInfluence({ rows }: { rows: MoodTagInfluenceRow[] }) {
               </div>
               <p className="text-muted-foreground text-xs">
                 {t("insights.mood.influence.detail", {
-                  withAvg: row.withAvg.toFixed(1),
-                  withoutAvg: row.withoutAvg.toFixed(1),
+                  withAvg: nf.number(row.withAvg, 1),
+                  withoutAvg: nf.number(row.withoutAvg, 1),
                   withDays: row.withDays,
                 })}
               </p>
diff --git a/src/components/insights/mood/mood-tag-metric-crosstab.tsx b/src/components/insights/mood/mood-tag-metric-crosstab.tsx
index 9263fbaee..60d926a38 100644
--- a/src/components/insights/mood/mood-tag-metric-crosstab.tsx
+++ b/src/components/insights/mood/mood-tag-metric-crosstab.tsx
@@ -1,6 +1,7 @@
 "use client";
 
-import { useTranslations } from "@/lib/i18n/context";
+import { useFormatters, useTranslations } from "@/lib/i18n/context";
+import type { Formatters } from "@/lib/format-locale";
 import { moodTagIcon } from "@/components/mood/mood-tag-icons";
 import { cn } from "@/lib/utils";
 import type { MoodInfluenceConfidence } from "./mood-tag-influence";
@@ -92,8 +93,12 @@ const CONFIDENCE_CLASS: Record<MoodInfluenceConfidence, string> = {
 };
 
 /** One decimal for hours/score, whole numbers for kcal. */
-function fmt(value: number, display: MoodCrosstabDisplay): string {
-  return display === "kcal" ? Math.round(value).toString() : value.toFixed(1);
+function formatValue(
+  value: number,
+  display: MoodCrosstabDisplay,
+  nf: Formatters,
+): string {
+  return display === "kcal" ? nf.integer(value) : nf.number(value, 1);
 }
 
 export function MoodTagMetricCrosstab({
@@ -102,6 +107,7 @@ export function MoodTagMetricCrosstab({
   rows: MoodTagMetricCrosstabRow[];
 }) {
   const { t } = useTranslations();
+  const nf = useFormatters();
   const dismissal = usePatternDismissalOverrides();
   if (rows.length === 0) return null;
 
@@ -135,7 +141,7 @@ export function MoodTagMetricCrosstab({
           );
           const unit = t(UNIT_KEY[row.display]);
           const up = row.delta >= 0;
-          const deltaText = `${up ? "+" : ""}${fmt(row.delta, row.display)} ${unit}`;
+          const deltaText = `${up ? "+" : ""}${formatValue(row.delta, row.display, nf)} ${unit}`;
           return (
             <li
               key={`${row.metricKey}:${row.tag}`}
@@ -187,8 +193,8 @@ export function MoodTagMetricCrosstab({
                     ? "insights.mood.crosstab.detailNextDay"
                     : "insights.mood.crosstab.detailSameDay",
                   {
-                    withAvg: fmt(row.withAvg, row.display),
-                    withoutAvg: fmt(row.withoutAvg, row.display),
+                    withAvg: formatValue(row.withAvg, row.display, nf),
+                    withoutAvg: formatValue(row.withoutAvg, row.display, nf),
                     unit,
                     withDays: row.withDays,
                   },
diff --git a/src/components/insights/mood/mood-time-of-day-chart.tsx b/src/components/insights/mood/mood-time-of-day-chart.tsx
index e1f96541a..0df704b99 100644
--- a/src/components/insights/mood/mood-time-of-day-chart.tsx
+++ b/src/components/insights/mood/mood-time-of-day-chart.tsx
@@ -11,7 +11,7 @@ import {
   YAxis,
 } from "recharts";
 
-import { useTranslations } from "@/lib/i18n/context";
+import { useFormatters, useTranslations } from "@/lib/i18n/context";
 
 /**
  * v1.9.0 — average mood per part of day.
@@ -62,6 +62,7 @@ export function MoodTimeOfDayChart({
   pattern: MoodTimeOfDayPattern;
 }) {
   const { t } = useTranslations();
+  const nf = useFormatters();
 
   const data = pattern.buckets.map((row) => ({
     bucket: row.bucket,
@@ -125,7 +126,7 @@ export function MoodTimeOfDayChart({
                   return [t("insights.mood.weekdayNoData"), ""];
                 }
                 return [
-                  `${payload.avgScore.toFixed(1)} (${payload.count})`,
+                  `${nf.number(payload.avgScore, 1)} (${payload.count})`,
                   t("insights.mood.timeOfDay.title"),
                 ];
               }}
diff --git a/src/components/insights/mood/mood-weekday-chart.tsx b/src/components/insights/mood/mood-weekday-chart.tsx
index a0d69225f..ef53ee877 100644
--- a/src/components/insights/mood/mood-weekday-chart.tsx
+++ b/src/components/insights/mood/mood-weekday-chart.tsx
@@ -12,7 +12,7 @@ import {
   YAxis,
 } from "recharts";
 
-import { useTranslations } from "@/lib/i18n/context";
+import { useFormatters, useTranslations } from "@/lib/i18n/context";
 
 /**
  * v1.8.5 — average mood per weekday (Monday-aligned).
@@ -50,6 +50,7 @@ function colorForScore(score: number): string {
 
 export function MoodWeekdayChart({ weekday }: { weekday: MoodWeekdayRow[] }) {
   const { t } = useTranslations();
+  const nf = useFormatters();
 
   const data = weekday.map((row) => ({
     weekday: row.weekday,
@@ -134,7 +135,7 @@ export function MoodWeekdayChart({ weekday }: { weekday: MoodWeekdayRow[] }) {
                   return [t("insights.mood.weekdayNoData"), ""];
                 }
                 return [
-                  `${payload.avgScore.toFixed(1)} (${payload.count})`,
+                  `${nf.number(payload.avgScore, 1)} (${payload.count})`,
                   t("insights.mood.weekdayTitle"),
                 ];
               }}
diff --git a/src/components/insights/recovery/recovery-metric-block.tsx b/src/components/insights/recovery/recovery-metric-block.tsx
index 262771972..6e7cc7aab 100644
--- a/src/components/insights/recovery/recovery-metric-block.tsx
+++ b/src/components/insights/recovery/recovery-metric-block.tsx
@@ -67,7 +67,7 @@ export function RecoveryMetricBlock({
 }: RecoveryMetricBlockProps) {
   const { user, isAuthenticated } = useAuth();
   const { compareBaseline } = useInsightsLayoutPrefs(isAuthenticated);
-  const { statsByType, onVisibleStats } = useChartDomainStats();
+  const { statsByType, statsSettled, onVisibleStats } = useChartDomainStats();
 
   return (
     <section data-slot={`recovery-block-${type}`} className="space-y-3">
@@ -86,6 +86,7 @@ export function RecoveryMetricBlock({
         titleAs="h2"
         description={explainer}
         windowStats={statsByType?.[type] ?? null}
+        windowPending={!statsSettled}
       />
 
       <HealthChartDynamic
diff --git a/src/components/insights/recovery/recovery-section.tsx b/src/components/insights/recovery/recovery-section.tsx
index 4f17160b8..6eeeb1a7a 100644
--- a/src/components/insights/recovery/recovery-section.tsx
+++ b/src/components/insights/recovery/recovery-section.tsx
@@ -89,7 +89,7 @@ export function RecoverySection() {
           title: t("measurements.typeAnsCharge"),
           explainer: t("insights.recovery.block.ansChargeExplainer"),
           icon: Battery,
-          color: "var(--success)",
+          color: "var(--chart-2)",
           unit: unitScore,
           fractionDigits: 1,
         },
@@ -105,7 +105,7 @@ export function RecoverySection() {
           title: t("measurements.typeDayStrain"),
           explainer: t("insights.recovery.block.dayStrainExplainer"),
           icon: Gauge,
-          color: "var(--warning)",
+          color: "var(--chart-5)",
           unit: unitScore,
           fractionDigits: 1,
         },
@@ -142,7 +142,7 @@ export function RecoverySection() {
           title: t("measurements.typeAverageHeartRate"),
           explainer: t("insights.recovery.block.averageHeartRateExplainer"),
           icon: Heart,
-          color: "var(--info)",
+          color: "var(--chart-4)",
           unit: unitBpm,
         },
         {
@@ -152,7 +152,7 @@ export function RecoverySection() {
           title: t("measurements.typeMaxHeartRate"),
           explainer: t("insights.recovery.block.maxHeartRateExplainer"),
           icon: HeartPulse,
-          color: "var(--destructive)",
+          color: "var(--chart-3)",
           unit: unitBpm,
         },
         {
@@ -162,7 +162,7 @@ export function RecoverySection() {
           title: t("measurements.typeEnergyExpenditureKj"),
           explainer: t("insights.recovery.block.energyExpenditureKjExplainer"),
           icon: Flame,
-          color: "var(--dracula-yellow)",
+          color: "var(--chart-5)",
           unit: unitKj,
         },
       ],
diff --git a/src/components/insights/sleep-duration-chart.tsx b/src/components/insights/sleep-duration-chart.tsx
index 15a00a960..6f07fb701 100644
--- a/src/components/insights/sleep-duration-chart.tsx
+++ b/src/components/insights/sleep-duration-chart.tsx
@@ -42,7 +42,7 @@ export function SleepDurationChart({
       chartKey="sleep"
       types={["SLEEP_DURATION"]}
       title={t("charts.sleep")}
-      colors={["var(--info)"]}
+      colors={["var(--chart-4)"]}
       unit="h"
       yAxisUnit="h"
       compareBaseline={compareBaseline}
diff --git a/src/components/insights/sleep/sleep-quality-section.tsx b/src/components/insights/sleep/sleep-quality-section.tsx
index b4f0e0a00..40f2c7577 100644
--- a/src/components/insights/sleep/sleep-quality-section.tsx
+++ b/src/components/insights/sleep/sleep-quality-section.tsx
@@ -64,28 +64,28 @@ export function SleepQualitySection({ enabled }: { enabled: boolean }) {
       type: "SLEEP_PERFORMANCE",
       title: t("measurements.typeSleepPerformance"),
       icon: Target,
-      color: "var(--info)",
+      color: "var(--chart-4)",
       unit: "%",
     },
     {
       type: "SLEEP_EFFICIENCY",
       title: t("measurements.typeSleepEfficiency"),
       icon: Gauge,
-      color: "var(--success)",
+      color: "var(--chart-2)",
       unit: "%",
     },
     {
       type: "SLEEP_CONSISTENCY",
       title: t("measurements.typeSleepConsistency"),
       icon: Repeat,
-      color: "var(--dracula-yellow)",
+      color: "var(--chart-5)",
       unit: "%",
     },
     {
       type: "SLEEP_NEED",
       title: t("measurements.typeSleepNeed"),
       icon: Waves,
-      color: "var(--warning)",
+      color: "var(--chart-5)",
       unit: t("insights.deviceScore.unitMinutes"),
     },
     {
diff --git a/src/components/insights/workout-detail/format.ts b/src/components/insights/workout-detail/format.ts
index 9dfb6eadd..6edc47c4b 100644
--- a/src/components/insights/workout-detail/format.ts
+++ b/src/components/insights/workout-detail/format.ts
@@ -17,14 +17,25 @@ import {
  * durations and distances identically.
  */
 
-export function formatDuration(seconds: number): string {
-  const h = Math.floor(seconds / 3600);
-  const m = Math.floor((seconds % 3600) / 60);
-  const s = seconds % 60;
-  if (h > 0) {
-    return `${h}h ${m.toString().padStart(2, "0")}m ${s.toString().padStart(2, "0")}s`;
-  }
-  return `${m}m ${s.toString().padStart(2, "0")}s`;
+/**
+ * A workout's length as a clock reading with its unit, the way a sports
+ * watch shows it: "38:00 Min." / "1:02:05 Std." in German, "38:00 min" /
+ * "1:02:05 h" in English. The old "38m 00s" was English in every locale.
+ */
+export function formatDuration(
+  seconds: number,
+  t: (key: string, params?: Record<string, string | number>) => string,
+): string {
+  const total = Math.max(0, Math.round(seconds));
+  const h = Math.floor(total / 3600);
+  const m = Math.floor((total % 3600) / 60);
+  const s = total % 60;
+  const ss = s.toString().padStart(2, "0");
+  return h > 0
+    ? t("common.durationClockHours", {
+        time: `${h}:${m.toString().padStart(2, "0")}:${ss}`,
+      })
+    : t("common.durationClockMinutes", { time: `${m}:${ss}` });
 }
 
 /** Compact "34 min" style duration for the sport-average comparison line. */
@@ -95,7 +106,7 @@ export function formatPace(
 }
 
 /**
- * "m:ss /km" from a seconds-per-unit value. The splits table passes "km"
+ * "m:ss min/km" from a seconds-per-unit value. The splits table passes "km"
  * explicitly: its rows are kilometre segments cut server-side, so their
  * pace is per kilometre whatever the preference.
  */
@@ -107,7 +118,7 @@ export function formatPaceSeconds(secPerUnit: number, unit: string): string {
     m += 1;
     s = 0;
   }
-  return `${m}:${s.toString().padStart(2, "0")} /${unit}`;
+  return `${m}:${s.toString().padStart(2, "0")} min/${unit}`;
 }
 
 export function formatDateRange(
diff --git a/src/components/insights/workout-detail/header.tsx b/src/components/insights/workout-detail/header.tsx
index 4a54a9bea..1e4200f0b 100644
--- a/src/components/insights/workout-detail/header.tsx
+++ b/src/components/insights/workout-detail/header.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { useTranslations, useTimeFormatPreference } from "@/lib/i18n/context";
+import { MEASUREMENT_SOURCE_LIST_LABEL_KEYS } from "@/lib/i18n/source-labels";
 import { iconForSport } from "@/lib/workouts/sport-icons";
 import type { WorkoutDetailPayload } from "@/hooks/use-workouts";
 import { useUnitDisplay } from "@/hooks/use-unit-display";
@@ -48,7 +49,15 @@ export function WorkoutDetailHeader({ workout }: WorkoutDetailHeaderProps) {
         {renderSportIconBadge(workout.sportType)}
         <div className="min-w-0 flex-1 space-y-1">
           <p className="text-muted-foreground text-xs tracking-wide uppercase">
-            {workout.source}
+            {MEASUREMENT_SOURCE_LIST_LABEL_KEYS[
+              workout.source as keyof typeof MEASUREMENT_SOURCE_LIST_LABEL_KEYS
+            ]
+              ? t(
+                  MEASUREMENT_SOURCE_LIST_LABEL_KEYS[
+                    workout.source as keyof typeof MEASUREMENT_SOURCE_LIST_LABEL_KEYS
+                  ],
+                )
+              : workout.source}
           </p>
           <h2 className="truncate text-lg font-semibold sm:text-xl">
             {sportName}
@@ -65,7 +74,7 @@ export function WorkoutDetailHeader({ workout }: WorkoutDetailHeaderProps) {
       </div>
       <div className="flex items-center gap-2 sm:flex-col sm:items-end sm:gap-0 sm:text-right">
         <span className="text-2xl font-semibold tabular-nums">
-          {formatDuration(workout.durationSec)}
+          {formatDuration(workout.durationSec, t)}
         </span>
         {workout.distanceM != null ? (
           <span className="text-muted-foreground text-xs tabular-nums">
diff --git a/src/components/insights/workout-detail/stats.tsx b/src/components/insights/workout-detail/stats.tsx
index 8d2ab065a..36002d3bd 100644
--- a/src/components/insights/workout-detail/stats.tsx
+++ b/src/components/insights/workout-detail/stats.tsx
@@ -93,7 +93,7 @@ export function WorkoutDetailStats({ workout }: WorkoutDetailStatsProps) {
   tiles.push({
     icon: <Timer className="size-4" />,
     label: t("insights.workouts.detail.statsDuration"),
-    value: formatDuration(workout.durationSec),
+    value: formatDuration(workout.durationSec, t),
   });
 
   if (workout.distanceM != null && workout.distanceM > 0) {
diff --git a/src/components/insights/workout-list.tsx b/src/components/insights/workout-list.tsx
index c39431619..913a19846 100644
--- a/src/components/insights/workout-list.tsx
+++ b/src/components/insights/workout-list.tsx
@@ -6,6 +6,7 @@ import { HeartPulse, Loader2, Map as MapIcon } from "lucide-react";
 
 import { cn } from "@/lib/utils";
 import { getNumberFormat, getDateTimeFormat } from "@/lib/intl/formatter-cache";
+import { formatDurationMinutes } from "@/lib/i18n/duration";
 import { useTranslations, useTimeFormatPreference } from "@/lib/i18n/context";
 import {
   hourCycleOptions,
@@ -29,13 +30,6 @@ import { formatDistance } from "@/components/insights/workout-detail/format";
  * lands here.
  */
 
-function formatDuration(seconds: number): string {
-  const h = Math.floor(seconds / 3600);
-  const m = Math.floor((seconds % 3600) / 60);
-  if (h > 0) return `${h}h ${m.toString().padStart(2, "0")}m`;
-  return `${m}m`;
-}
-
 function formatEnergy(kcal: number, locale: string): string {
   return getNumberFormat(locale, {
     maximumFractionDigits: 0,
@@ -143,7 +137,9 @@ export function WorkoutList({
                     />
                   ) : null}
                 </span>
-                <span className="text-muted-foreground truncate text-xs">
+                {/* Wraps rather than truncates, so the day it opens
+                    stays readable beside the stats column. */}
+                <span className="text-muted-foreground text-xs">
                   <DayLinkAt at={workout.startedAt} className="z-10">
                     {formatDate(workout.startedAt, locale, timeFormat)}
                   </DayLinkAt>
@@ -151,7 +147,10 @@ export function WorkoutList({
               </div>
               <div className="flex flex-col items-end gap-0.5 text-xs">
                 <span className="font-medium tabular-nums">
-                  {formatDuration(workout.durationSec)}
+                  {formatDurationMinutes(
+                    Math.round(workout.durationSec / 60),
+                    t,
+                  )}
                 </span>
                 <span className="text-muted-foreground flex flex-wrap justify-end gap-x-2 tabular-nums">
                   {workout.distanceM != null ? (
diff --git a/src/components/labs/lab-list.tsx b/src/components/labs/lab-list.tsx
index 668ca4813..934bb138a 100644
--- a/src/components/labs/lab-list.tsx
+++ b/src/components/labs/lab-list.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useRecordCapabilities } from "@/hooks/use-record-capabilities";
-import { useMemo } from "react";
+import { useMemo, useEffect } from "react";
 import Link from "next/link";
 import { useQuery } from "@tanstack/react-query";
 import { ChevronRight, FlaskConical } from "lucide-react";
@@ -136,7 +136,14 @@ const MOBILE_CELL = {
   notLinked: "max-lg:col-span-full max-lg:row-start-3",
 } as const;
 
-export function LabList({ onAddFirst }: { onAddFirst?: () => void } = {}) {
+export function LabList({
+  onAddFirst,
+  onEmptyChange,
+}: {
+  onAddFirst?: () => void;
+  /** Told whether the list is empty, so the page can drop its header add. */
+  onEmptyChange?: (empty: boolean) => void;
+} = {}) {
   const { t } = useTranslations();
   const labNumber = useLabNumber();
   const labDate = useLabDate();
@@ -196,6 +203,11 @@ export function LabList({ onAddFirst }: { onAddFirst?: () => void } = {}) {
   const shown = data?.results?.length ?? 0;
   const truncated = total > shown;
 
+  const listEmpty = !isLoading && !isError && groups.length === 0;
+  useEffect(() => {
+    onEmptyChange?.(listEmpty);
+  }, [listEmpty, onEmptyChange]);
+
   if (isLoading) {
     return (
       <div className="space-y-3" data-slot="lab-list-loading">
diff --git a/src/components/layout/auth-shell.tsx b/src/components/layout/auth-shell.tsx
index 35dc5b618..913e34cc2 100644
--- a/src/components/layout/auth-shell.tsx
+++ b/src/components/layout/auth-shell.tsx
@@ -458,7 +458,7 @@ export function AuthShell({
             error after the user already filled in a form. */}
         {demoMode ? <DemoBanner /> : null}
         <MaintainershipBanner />
-        <div className="flex min-h-0 flex-1 flex-col md:flex-row">
+        <div className="shell-desktop:flex-row flex min-h-0 flex-1 flex-col">
           <SidebarNav />
           {/* `min-w-0` lets the content column shrink below its children's
               intrinsic min width (e.g. the measurements table); without it
@@ -497,7 +497,7 @@ export function AuthShell({
               // for all of them at once instead of asking each new
               // absolutely-positioned child to remember its own wrapper.
               className={cn(
-                "relative flex-1 overflow-y-auto pb-[calc(4rem+env(safe-area-inset-bottom,0px))] md:pb-0",
+                "shell-desktop:pb-0 relative flex-1 overflow-y-auto pb-[calc(4rem+env(safe-area-inset-bottom,0px))]",
                 fullBleed ? "flex flex-col" : "[scrollbar-gutter:stable]",
               )}
             >
diff --git a/src/components/layout/bottom-nav.tsx b/src/components/layout/bottom-nav.tsx
index 82470be9a..fa1a3bbf4 100644
--- a/src/components/layout/bottom-nav.tsx
+++ b/src/components/layout/bottom-nav.tsx
@@ -208,7 +208,7 @@ export function BottomNav() {
         aria-label={t("nav.mobileNavigation")}
         data-slot="bottom-nav"
         data-keyboard-hide=""
-        className="bg-card border-border fixed bottom-0 left-0 z-50 min-h-16 w-full border-t pr-[env(safe-area-inset-right)] pb-[env(safe-area-inset-bottom)] pl-[env(safe-area-inset-left)] backdrop-blur-md md:hidden"
+        className="bg-card border-border shell-desktop:hidden fixed bottom-0 left-0 z-50 min-h-16 w-full border-t pr-[env(safe-area-inset-right)] pb-[env(safe-area-inset-bottom)] pl-[env(safe-area-inset-left)] backdrop-blur-md"
       >
         <div className="mx-auto flex h-16 max-w-lg items-stretch justify-around px-1">
           {primaryLeft.map(renderPrimary)}
@@ -274,7 +274,7 @@ export function BottomNav() {
           // The sheet auto-sizes to its content; padding-bottom respects
           // the iOS safe area so the inner buttons stay reachable above
           // the home-indicator on iPhone-X-class devices.
-          className="mx-auto max-w-md rounded-t-xl pb-[calc(env(safe-area-inset-bottom)+1rem)] md:hidden"
+          className="shell-desktop:hidden mx-auto max-w-md rounded-t-xl pb-[calc(env(safe-area-inset-bottom)+1rem)]"
           data-testid="bottom-nav-more-sheet"
         >
           <SheetHeader>
diff --git a/src/components/layout/module-disabled-notice.tsx b/src/components/layout/module-disabled-notice.tsx
index 84e5a35aa..3fb4373e0 100644
--- a/src/components/layout/module-disabled-notice.tsx
+++ b/src/components/layout/module-disabled-notice.tsx
@@ -88,7 +88,6 @@ export function ModuleDisabledNotice({
         icon={icon}
         title={t(copy.title, { module: moduleName })}
         description={t(copy.description, { module: moduleName })}
-        ctaSize="lg"
         action={state === "disabled" ? action : undefined}
       />
     </div>
diff --git a/src/components/layout/shared-record-unavailable.tsx b/src/components/layout/shared-record-unavailable.tsx
index aa9775faf..9e22ee107 100644
--- a/src/components/layout/shared-record-unavailable.tsx
+++ b/src/components/layout/shared-record-unavailable.tsx
@@ -36,7 +36,6 @@ export function SharedRecordUnavailable() {
         icon={<Lock className="size-6" />}
         title={t("recordSharing.unavailable.title")}
         description={t("recordSharing.unavailable.description")}
-        ctaSize="lg"
         action={
           <Button
             data-slot="shared-record-unavailable-leave"
diff --git a/src/components/layout/sidebar-nav.tsx b/src/components/layout/sidebar-nav.tsx
index 755adc995..88031141a 100644
--- a/src/components/layout/sidebar-nav.tsx
+++ b/src/components/layout/sidebar-nav.tsx
@@ -681,7 +681,7 @@ export function SidebarNav() {
       <aside
         aria-label={t("nav.sidebar")}
         className={cn(
-          "bg-sidebar border-sidebar-border relative hidden h-full flex-shrink-0 overflow-hidden border-r transition-[width] duration-200 motion-reduce:transition-none md:flex md:flex-col",
+          "bg-sidebar border-sidebar-border shell-desktop:flex shell-desktop:flex-col relative hidden h-full flex-shrink-0 overflow-hidden border-r transition-[width] duration-200 motion-reduce:transition-none",
           collapsed ? "w-16" : "w-64",
         )}
       >
diff --git a/src/components/layout/top-bar.tsx b/src/components/layout/top-bar.tsx
index a751fc9c1..b8f31017d 100644
--- a/src/components/layout/top-bar.tsx
+++ b/src/components/layout/top-bar.tsx
@@ -97,7 +97,10 @@ export function TopBar() {
       // inside its own 4rem, a 59 px inset left the bar a 5 px content box.
     >
       {/* Mobile logo */}
-      <Link href="/" className="flex min-h-11 items-center gap-2 md:hidden">
+      <Link
+        href="/"
+        className="shell-desktop:hidden flex min-h-11 items-center gap-2"
+      >
         <Logo className="text-primary" size={20} />
         <span className="font-bold tracking-tight">HealthLog</span>
       </Link>
@@ -105,7 +108,7 @@ export function TopBar() {
       {/* Desktop: the page's context, where a page gives one (the Coach's
           trail); otherwise an empty spacer. User controls are in the
           sidebar. */}
-      <TopBarContextOutlet className="hidden min-w-0 flex-1 items-center md:flex" />
+      <TopBarContextOutlet className="shell-desktop:flex hidden min-w-0 flex-1 items-center" />
 
       {/* Page-owned actions (the Coach's conversations toggle). `ml-auto`
           keeps them at the trailing edge, right before the mobile avatar
@@ -117,7 +120,7 @@ export function TopBar() {
       <TopBarActionsOutlet className="ml-auto flex shrink-0 items-center gap-1 empty:hidden md:-mr-3" />
 
       {/* Mobile-only auth section (desktop uses sidebar user section) */}
-      <div className="flex items-center gap-2 md:hidden">
+      <div className="shell-desktop:hidden flex items-center gap-2">
         {isLoading ? (
           <Skeleton className="bg-muted h-4 w-20 rounded" />
         ) : user ? (
diff --git a/src/components/measurement-reminders/vorsorge-section.tsx b/src/components/measurement-reminders/vorsorge-section.tsx
index 9a25f2ed9..cc5231a0b 100644
--- a/src/components/measurement-reminders/vorsorge-section.tsx
+++ b/src/components/measurement-reminders/vorsorge-section.tsx
@@ -456,7 +456,11 @@ export function VorsorgeSection({
           actions={
             <>
               {wrenchButton}
-              {addButton}
+              {/* The empty state carries the add action while there is
+                  nothing to list. */}
+              {!isLoading && !isError && (reminders?.length ?? 0) === 0
+                ? null
+                : addButton}
             </>
           }
         />
@@ -1002,7 +1006,6 @@ function VorsorgeCard({
         )}
         <DropdownMenuSeparator />
         <DropdownMenuItem
-          variant="destructive"
           disabled={busy}
           onSelect={() => setConfirmDelete(true)}
         >
diff --git a/src/components/measurements/measurement-list.tsx b/src/components/measurements/measurement-list.tsx
index 1521a11f7..032b28006 100644
--- a/src/components/measurements/measurement-list.tsx
+++ b/src/components/measurements/measurement-list.tsx
@@ -195,6 +195,11 @@ interface MeasurementListProps {
    * (fallback to the header CTA) instead of crashing.
    */
   onAddFirst?: () => void;
+  /**
+   * Told whether the unfiltered list is empty, so the page can drop its
+   * header add button while the empty state carries the add action.
+   */
+  onEmptyChange?: (empty: boolean) => void;
   /**
    * v1.8.5 — pin the list to a single `MeasurementType` and hide the
    * type selector. Used by the insights "all readings" subpage, which
@@ -286,6 +291,7 @@ function sourceBadgeClass(source: string): string {
 export function MeasurementList({
   onEdit,
   onAddFirst,
+  onEmptyChange,
   lockedType,
 }: MeasurementListProps) {
   const { t } = useTranslations();
@@ -660,6 +666,15 @@ export function MeasurementList({
     enabled: isAuthenticated,
   });
 
+  const listEmpty =
+    !isLoading &&
+    !isError &&
+    !data?.measurements?.length &&
+    (typeFilter === "ALL" || !!lockedType);
+  useEffect(() => {
+    onEmptyChange?.(listEmpty);
+  }, [listEmpty, onEmptyChange]);
+
   // v1.16.4 — deletes are soft (tombstones), so the success toast can
   // carry a real Undo: it POSTs the ids to `/api/measurements/restore`,
   // which clears `deletedAt` and re-fires the same dependent-key bundle.
@@ -1072,7 +1087,10 @@ export function MeasurementList({
                     {t("measurements.emptyResetFilter")}
                   </Button>
                 ) : onAddFirst && canAddMeasurement ? (
-                  <Button onClick={onAddFirst}>
+                  <Button
+                    onClick={onAddFirst}
+                    data-slot="measurement-add-first"
+                  >
                     <Plus className="h-4 w-4" />
                     {t("measurements.emptyAddFirst")}
                   </Button>
@@ -1420,7 +1438,7 @@ export function MeasurementList({
                       className="bg-card border-border data-[state=selected]:border-primary/60 data-[state=selected]:bg-primary/5"
                     >
                       <div className="flex items-center justify-between">
-                        <div className="flex items-center gap-2 overflow-hidden">
+                        <div className="flex min-w-0 flex-1 items-center gap-2">
                           {/* v1.15.13 — multi-select checkbox in a 44px tap
                             target; absent for synthetic grouped rows. */}
                           {!isGrouped && canManage && (
@@ -1457,7 +1475,7 @@ export function MeasurementList({
                               <Icon className="h-4 w-4" />
                             </button>
                           )}
-                          <div className="min-w-0">
+                          <div className="min-w-0 flex-1">
                             {/* v1.22 — metadata badges sit on the scale
                               token `text-xs` (12 px, the mobile legibility
                               baseline) instead of an arbitrary per-site
@@ -1485,23 +1503,14 @@ export function MeasurementList({
                                 their native decimal precision so
                                 "78.4 kg" no longer truncates to "78".
                                 v1.11.5 — sleep rows render TIME ASLEEP. */}
-                              {isSleep ? (
-                                formatDurationMinutes(m.value, t)
-                              ) : (
-                                <>
-                                  {isGrouped
-                                    ? fmt.integer(m.value)
-                                    : fmt.number(
-                                        rowDisplay(m).value,
-                                        rawDisplayFractionDigits(m.type),
-                                      )}{" "}
-                                  {measurementUnitLabel(
-                                    m.type,
-                                    isGrouped ? m.unit : rowDisplay(m).unit,
-                                    t,
-                                  )}
-                                </>
-                              )}
+                              {isSleep
+                                ? formatDurationMinutes(m.value, t)
+                                : isGrouped
+                                  ? fmt.integer(m.value)
+                                  : fmt.number(
+                                      rowDisplay(m).value,
+                                      rawDisplayFractionDigits(m.type),
+                                    )}
                             </span>
                             {isSleep ? (
                               <SleepNightCaption m={m} />
@@ -1514,19 +1523,45 @@ export function MeasurementList({
                                 </span>
                               )
                             )}
-                            <p className="text-muted-foreground truncate text-xs">
+                            {/* The meta line wraps rather than truncates:
+                              cut to "vor 9 Stunden…" it hid the day it
+                              opens and the source beside it. */}
+                            <p className="text-muted-foreground text-xs">
                               {/*
                               v1.4.43 QoL (L8) — see desktop
                               counterpart at the same `measuredAt`
                               site. Relative under 24 h, absolute
                               older.
                             */}
+                              {/* The unit is meta, and on a phone a long
+                                one ("Atemzüge/min") beside the value pushed
+                                the row's controls; it leads the meta line
+                                instead. Sleep reads as a duration. */}
+                              {isSleep ? null : (
+                                <span
+                                  data-slot="measurement-row-unit"
+                                  className="whitespace-nowrap"
+                                >
+                                  {measurementUnitLabel(
+                                    m.type,
+                                    isGrouped ? m.unit : rowDisplay(m).unit,
+                                    t,
+                                  )}
+                                  {" · "}
+                                </span>
+                              )}
                               {m.dayKey !== undefined ? (
-                                <DayLink date={m.dayKey}>
+                                <DayLink
+                                  date={m.dayKey}
+                                  className="whitespace-nowrap"
+                                >
                                   {formatDateOrRelative(m.measuredAt, t)}
                                 </DayLink>
                               ) : (
-                                <DayLinkAt at={m.measuredAt}>
+                                <DayLinkAt
+                                  at={m.measuredAt}
+                                  className="whitespace-nowrap"
+                                >
                                   {formatDateOrRelative(m.measuredAt, t)}
                                 </DayLinkAt>
                               )}
@@ -1770,7 +1805,6 @@ export function MeasurementList({
                       </DropdownMenuTrigger>
                       <DropdownMenuContent align="start">
                         <DropdownMenuItem
-                          variant="destructive"
                           onClick={() => setEditDeleteDialogOpen(true)}
                         >
                           <Trash2 className="mr-2 h-4 w-4" />
diff --git a/src/components/medications/detail/medication-detail-tabs.tsx b/src/components/medications/detail/medication-detail-tabs.tsx
index 63a134774..48afd80b7 100644
--- a/src/components/medications/detail/medication-detail-tabs.tsx
+++ b/src/components/medications/detail/medication-detail-tabs.tsx
@@ -193,7 +193,6 @@ const TAB_SLUGS = [
   "bestand",
   "verlauf",
   "injektion",
-  "api",
   "erweitert",
 ] as const;
 type TabSlug = (typeof TAB_SLUGS)[number];
@@ -208,9 +207,8 @@ const OWNER_ONLY_TABS: ReadonlySet<TabSlug> = new Set([
   // Schedule times are a MANAGE route, but the tab also carries the reminder
   // and notification settings, which resolve the caller.
   "zeitplan",
-  // Per-medication tokens: a credential surface, never delegated.
-  "api",
-  // Phase config, export and the token-adjacent rows resolve the caller.
+  // Phase config, export and the per-medication tokens (a credential
+  // surface, never delegated) resolve the caller.
   "erweitert",
 ]);
 
@@ -230,6 +228,9 @@ const MANAGE_TABS: ReadonlySet<TabSlug> = new Set(["bestand"]);
  */
 const LEGACY_TAB_SLUGS: Record<string, TabSlug> = {
   erinnerung: "zeitplan",
+  // The API tab folded back into Erweitert in v1.42: two tabs for the
+  // rarely-opened owner settings made a strip that could not fit a phone.
+  api: "erweitert",
 };
 
 function snapshotToWizardPayload(
@@ -524,7 +525,9 @@ export function MedicationDetailTabs({
         data-slot="medication-detail-tabs"
       >
         <TabsList
-          className="w-full justify-start"
+          // Six tabs do not fit a phone in one row; they sit in a three-up
+          // grid there instead of scrolling a label off the edge.
+          className="w-full justify-start max-sm:grid! max-sm:h-auto! max-sm:grid-cols-3"
           aria-label={t("medications.detail.shell.tablistLabel")}
         >
           {availableTabs.map((slug) => (
@@ -871,33 +874,9 @@ export function MedicationDetailTabs({
           </TabsContent>
         )}
 
-        {/* API — the external-ingest surface in its own tab: per-medication
-            tokens + the drug-coding identifiers external systems key on.
-            Pulled out of Erweitert so the destructive zone and the token
-            management stop sharing one surface. */}
-        <TabsContent value="api" className="space-y-4 pt-2">
-          <SettingsGroup
-            label={t("medications.detail.erweitert.group.externalApi")}
-            dataSlot="api-group-external-api"
-          >
-            <div className="py-3">
-              <ApiTokensRow
-                medicationId={id}
-                medicationName={medication.name}
-              />
-            </div>
-            <div className="py-3">
-              <DrugCodingRow
-                medicationId={id}
-                atcCode={medication.atcCode}
-                rxNormCode={medication.rxNormCode}
-              />
-            </div>
-          </SettingsGroup>
-        </TabsContent>
-
-        {/* ERWEITERT — Lifecycle → Daten → Gefahrenzone. The external-API
-            group moved to its own API tab. */}
+        {/* ERWEITERT — Lifecycle → Daten → external API → Gefahrenzone.
+            The API tab folded back in here (v1.42); its group stays
+            collapsed like the other two, and the danger zone stays last. */}
         <TabsContent value="erweitert" className="space-y-4 pt-2">
           <SettingsGroup
             label={t("medications.detail.erweitert.group.lifecycle")}
@@ -976,6 +955,27 @@ export function MedicationDetailTabs({
             </div>
           </SettingsGroup>
 
+          <SettingsGroup
+            label={t("medications.detail.erweitert.group.externalApi")}
+            dataSlot="api-group-external-api"
+            collapsible
+            defaultOpen={false}
+          >
+            <div className="py-3">
+              <ApiTokensRow
+                medicationId={id}
+                medicationName={medication.name}
+              />
+            </div>
+            <div className="py-3">
+              <DrugCodingRow
+                medicationId={id}
+                atcCode={medication.atcCode}
+                rxNormCode={medication.rxNormCode}
+              />
+            </div>
+          </SettingsGroup>
+
           <ComplianceGatedDangerZone
             medicationId={id}
             medicationName={medication.name}
diff --git a/src/components/medications/dose-history-ledger.tsx b/src/components/medications/dose-history-ledger.tsx
index deb5eff75..084bf9e2f 100644
--- a/src/components/medications/dose-history-ledger.tsx
+++ b/src/components/medications/dose-history-ledger.tsx
@@ -868,7 +868,6 @@ export function LedgerRowItem({
                   <DropdownMenuSeparator />
                   <DropdownMenuItem
                     onClick={() => onDelete(intake.id as string)}
-                    className="text-destructive focus:text-destructive"
                     data-slot="ledger-delete"
                   >
                     <Trash2 aria-hidden="true" className="mr-2 size-4" />
diff --git a/src/components/medications/medication-categories-sheet.tsx b/src/components/medications/medication-categories-sheet.tsx
index 17c53309f..94d944111 100644
--- a/src/components/medications/medication-categories-sheet.tsx
+++ b/src/components/medications/medication-categories-sheet.tsx
@@ -189,7 +189,7 @@ function CategoryRow({
         type="button"
         variant="ghost"
         size="icon"
-        className="text-destructive hover:text-destructive size-11 sm:size-9"
+        className="text-muted-foreground hover:text-foreground size-11 sm:size-9"
         onClick={() => onDelete(category)}
         aria-label={`${t("medications.category.custom.delete")}: ${category.label}`}
         title={t("medications.category.custom.delete")}
diff --git a/src/components/medications/scheduling/schedule-history-timeline.tsx b/src/components/medications/scheduling/schedule-history-timeline.tsx
index 0e6f04e37..40a402d88 100644
--- a/src/components/medications/scheduling/schedule-history-timeline.tsx
+++ b/src/components/medications/scheduling/schedule-history-timeline.tsx
@@ -239,7 +239,7 @@ export function ScheduleHistoryTimeline({
                         type="button"
                         variant="ghost"
                         size="icon"
-                        className="text-muted-foreground hover:text-destructive size-11 sm:size-8"
+                        className="text-muted-foreground hover:text-foreground size-11 sm:size-8"
                         aria-label={t(
                           "medications.detail.zeitplan.history.deleteAria",
                         )}
diff --git a/src/components/medications/sections/courses-section.tsx b/src/components/medications/sections/courses-section.tsx
index 56fc71fe7..a60d5959e 100644
--- a/src/components/medications/sections/courses-section.tsx
+++ b/src/components/medications/sections/courses-section.tsx
@@ -313,7 +313,7 @@ export function CoursesRow({
                     type="button"
                     variant="ghost"
                     size="icon"
-                    className="text-destructive hover:text-destructive size-11 sm:size-9"
+                    className="text-muted-foreground hover:text-foreground size-11 sm:size-9"
                     onClick={() => setDeleting(course)}
                     aria-label={t("medications.course.delete")}
                     title={t("medications.course.delete")}
diff --git a/src/components/medications/sections/inventory-section.tsx b/src/components/medications/sections/inventory-section.tsx
index 44750aa0d..f946a6481 100644
--- a/src/components/medications/sections/inventory-section.tsx
+++ b/src/components/medications/sections/inventory-section.tsx
@@ -243,7 +243,6 @@ export function InventorySection({
           icon={<PackageOpen className="size-6" />}
           title={t("medications.detail.bestand.empty")}
           description={t("medications.detail.bestand.emptyHelper")}
-          ctaSize="lg"
           action={
             <Button size="sm" onClick={() => setAddOpen(true)}>
               <Plus aria-hidden="true" className="h-4 w-4" />
diff --git a/src/components/medications/side-effects-section.tsx b/src/components/medications/side-effects-section.tsx
index ee1b71bb9..7df4d2477 100644
--- a/src/components/medications/side-effects-section.tsx
+++ b/src/components/medications/side-effects-section.tsx
@@ -352,7 +352,7 @@ export function SideEffectsSection({ medicationId }: SideEffectsSectionProps) {
                   <Button
                     variant="ghost"
                     size="icon"
-                    className="text-muted-foreground hover:text-destructive size-11 shrink-0"
+                    className="text-muted-foreground hover:text-foreground size-11 shrink-0"
                     aria-label={t("medications.sideEffects.deleteCta")}
                     onClick={() => setPendingDeleteId(row.id)}
                     disabled={deleteMutation.isPending}
diff --git a/src/components/medications/wizard/steps/step8-summary.tsx b/src/components/medications/wizard/steps/step8-summary.tsx
index d4ae10b58..0696d60a4 100644
--- a/src/components/medications/wizard/steps/step8-summary.tsx
+++ b/src/components/medications/wizard/steps/step8-summary.tsx
@@ -121,7 +121,7 @@ export function Step8Summary({
                   type="button"
                   variant="ghost"
                   size="sm"
-                  className="text-muted-foreground hover:text-destructive h-8 gap-1 px-2 text-xs"
+                  className="text-muted-foreground hover:text-foreground h-8 gap-1 px-2 text-xs"
                   onClick={() => onRemoveSchedule(index)}
                   disabled={!canRemove}
                   data-slot="wizard-schedule-remove"
diff --git a/src/components/mood/manage/archived-tags-card.tsx b/src/components/mood/manage/archived-tags-card.tsx
index 989fd401f..b0dd87f86 100644
--- a/src/components/mood/manage/archived-tags-card.tsx
+++ b/src/components/mood/manage/archived-tags-card.tsx
@@ -151,7 +151,7 @@ export function ArchivedTagsCard({ catalog }: ArchivedTagsCardProps) {
                   type="button"
                   variant="ghost"
                   size="icon"
-                  className="text-destructive hover:text-destructive size-11 sm:size-9"
+                  className="text-muted-foreground hover:text-foreground size-11 sm:size-9"
                   onClick={() => setPurgeTag(tag)}
                   aria-label={`${t("mood.manage.purgeAction")} — ${name}`}
                   title={t("mood.manage.purgeAction")}
diff --git a/src/components/mood/manage/tag-groups-card.tsx b/src/components/mood/manage/tag-groups-card.tsx
index 8406992f4..6d16c9c82 100644
--- a/src/components/mood/manage/tag-groups-card.tsx
+++ b/src/components/mood/manage/tag-groups-card.tsx
@@ -494,7 +494,7 @@ function SortableGroupRow({
               <Pencil className="mr-2 h-4 w-4" />
               {t("common.edit")}
             </DropdownMenuItem>
-            <DropdownMenuItem variant="destructive" onClick={onDelete}>
+            <DropdownMenuItem onClick={onDelete}>
               <Trash2 className="mr-2 h-4 w-4" />
               {t("common.delete")}
             </DropdownMenuItem>
diff --git a/src/components/mood/mood-list.tsx b/src/components/mood/mood-list.tsx
index 238292f77..eab8e9de8 100644
--- a/src/components/mood/mood-list.tsx
+++ b/src/components/mood/mood-list.tsx
@@ -174,9 +174,14 @@ interface MoodListProps {
    * rendering a no-op button.
    */
   onAddFirst?: () => void;
+  /**
+   * Told whether the unfiltered list is empty, so the page can drop its
+   * header add button while the empty state carries the add action.
+   */
+  onEmptyChange?: (empty: boolean) => void;
 }
 
-export function MoodList({ onAddFirst }: MoodListProps = {}) {
+export function MoodList({ onAddFirst, onEmptyChange }: MoodListProps = {}) {
   const { t } = useTranslations();
   const fmt = useFormatters();
   const { isAuthenticated } = useAuth();
@@ -362,6 +367,12 @@ export function MoodList({ onAddFirst }: MoodListProps = {}) {
     enabled: isAuthenticated,
   });
 
+  const listEmpty =
+    !isLoading && !isError && !data?.entries?.length && moodFilter === "ALL";
+  useEffect(() => {
+    onEmptyChange?.(listEmpty);
+  }, [listEmpty, onEmptyChange]);
+
   // v1.16.4 — deletes are soft (tombstones), so the success toast can
   // carry a real Undo: it POSTs the ids to `/api/mood-entries/restore`,
   // which clears `deletedAt` and re-fires the same dependent-key bundle.
@@ -1196,7 +1207,6 @@ export function MoodList({ onAddFirst }: MoodListProps = {}) {
                       </DropdownMenuTrigger>
                       <DropdownMenuContent align="start">
                         <DropdownMenuItem
-                          variant="destructive"
                           onClick={() => setEditDeleteDialogOpen(true)}
                         >
                           <Trash2 className="mr-2 h-4 w-4" />
diff --git a/src/components/onboarding/tour.tsx b/src/components/onboarding/tour.tsx
index 72276d6d0..efb2e6d55 100644
--- a/src/components/onboarding/tour.tsx
+++ b/src/components/onboarding/tour.tsx
@@ -102,12 +102,26 @@ interface SpotlightRect {
  * not in the DOM or has zero dimensions — caller renders a centred
  * tooltip in that case.
  */
+/**
+ * The rendered element carrying a tour id. A control can exist twice with the
+ * same id, one per shell (the dashboard's add button is a dropdown on the
+ * desktop rail and a sheet trigger on the phone shell), with the other one
+ * hidden; the stop anchors on the one that is actually laid out.
+ */
+function findTourTarget(targetId: string): HTMLElement | null {
+  const all = document.querySelectorAll<HTMLElement>(
+    `[data-tour-id="${CSS.escape(targetId)}"]`,
+  );
+  for (const el of all) {
+    if (el.getClientRects().length > 0) return el;
+  }
+  return all[0] ?? null;
+}
+
 function measureTarget(targetId: string | null): SpotlightRect | null {
   if (!targetId) return null;
   if (typeof document === "undefined") return null;
-  const el = document.querySelector<HTMLElement>(
-    `[data-tour-id="${CSS.escape(targetId)}"]`,
-  );
+  const el = findTourTarget(targetId);
   if (!el) return null;
   const rect = el.getBoundingClientRect();
   if (rect.width === 0 || rect.height === 0) return null;
@@ -356,11 +370,7 @@ export function OnboardingTour({
     const MAX_ATTEMPTS = 40;
     const settleAndMeasure = () => {
       if (cancelled) return;
-      const el = stop.targetId
-        ? document.querySelector<HTMLElement>(
-            `[data-tour-id="${CSS.escape(stop.targetId)}"]`,
-          )
-        : null;
+      const el = stop.targetId ? findTourTarget(stop.targetId) : null;
       if (el) {
         // Bring the anchor into view BEFORE measuring — anchors below the
         // fold positioned the popover under the viewport bottom otherwise.
diff --git a/src/components/practitioners/practitioner-list.tsx b/src/components/practitioners/practitioner-list.tsx
index 1c91a139e..7aa6524b0 100644
--- a/src/components/practitioners/practitioner-list.tsx
+++ b/src/components/practitioners/practitioner-list.tsx
@@ -152,7 +152,6 @@ export function PractitionerList({ enabled = true }: { enabled?: boolean }) {
               : "practitioners.emptyDescription",
           )}
           action={debounced ? undefined : (addButton ?? undefined)}
-          ctaSize="lg"
         />
       ) : (
         <div className="space-y-4" data-slot="practitioner-list">
diff --git a/src/components/settings/__tests__/score-section-saved-selection.test.tsx b/src/components/settings/__tests__/score-section-saved-selection.test.tsx
index 2e92203aa..91fc87c40 100644
--- a/src/components/settings/__tests__/score-section-saved-selection.test.tsx
+++ b/src/components/settings/__tests__/score-section-saved-selection.test.tsx
@@ -79,7 +79,10 @@ vi.mock("@tanstack/react-query", () => ({
     setQueryData: vi.fn(),
     getQueryData: vi.fn(),
     invalidateQueries: vi.fn(),
+    isFetching: () => 0,
   }),
+  // The section reveals once its reads settle; nothing is in flight here.
+  useIsFetching: () => 0,
 }));
 
 vi.mock("sonner", () => ({
diff --git a/src/components/settings/api-section.tsx b/src/components/settings/api-section.tsx
index 16d1afff2..c73749b12 100644
--- a/src/components/settings/api-section.tsx
+++ b/src/components/settings/api-section.tsx
@@ -579,7 +579,7 @@ function ApiTokensCard() {
                                 <Button
                                   variant="ghost"
                                   size="icon"
-                                  className="text-destructive h-9 w-9"
+                                  className="text-muted-foreground hover:text-foreground h-9 w-9"
                                   aria-label={t("settings.tokenRevokeAction")}
                                 >
                                   <Trash2 className="h-3.5 w-3.5" />
@@ -676,7 +676,7 @@ function ApiTokensCard() {
                         <AlertDialog>
                           <AlertDialogTrigger asChild>
                             <Button
-                              variant="destructive"
+                              variant="outline"
                               size="sm"
                               className="min-h-11 w-full"
                             >
diff --git a/src/components/settings/coach-reminders-section.tsx b/src/components/settings/coach-reminders-section.tsx
index 27b01e0f1..4156eac5c 100644
--- a/src/components/settings/coach-reminders-section.tsx
+++ b/src/components/settings/coach-reminders-section.tsx
@@ -149,7 +149,7 @@ export function CoachRemindersSection({
             slot="coach-reminder-delete"
             variant="ghost"
             size="sm"
-            className="text-muted-foreground hover:text-destructive min-h-9"
+            className="text-muted-foreground hover:text-foreground min-h-9"
             disabled={!isAuthenticated}
             pending={busy}
             ariaLabel={t("settings.ai.coachReminders.deleteAria")}
diff --git a/src/components/settings/insights-section.tsx b/src/components/settings/insights-section.tsx
index 2fa49fa9d..b9030ac43 100644
--- a/src/components/settings/insights-section.tsx
+++ b/src/components/settings/insights-section.tsx
@@ -2,6 +2,8 @@
 
 import { InsightsOverviewArrangeSection } from "@/components/settings/insights-overview-arrange-section";
 import { InsightsPillOrderSection } from "@/components/settings/insights-pill-order-section";
+import { RevealWhenSettled } from "@/components/ui/reveal-when-settled";
+import { Skeleton } from "@/components/ui/skeleton";
 
 /**
  * v1.15.18 — the "Insights" settings section (analogous to the Dashboard
@@ -20,9 +22,14 @@ import { InsightsPillOrderSection } from "@/components/settings/insights-pill-or
  */
 export function InsightsSection() {
   return (
-    <div className="space-y-6">
+    // The arrange list grows from its loading card to the full set of
+    // sections, which pushed the pill-order card below it down the page.
+    // Both reveal together once their reads settle.
+    <RevealWhenSettled
+      fallback={<Skeleton className="h-[28rem] w-full rounded-xl" />}
+    >
       <InsightsOverviewArrangeSection id="insights-overview-arrange" />
       <InsightsPillOrderSection id="insights-pill-order" />
-    </div>
+    </RevealWhenSettled>
   );
 }
diff --git a/src/components/settings/mcp-section.tsx b/src/components/settings/mcp-section.tsx
index 87d5dafc7..75ec5efc9 100644
--- a/src/components/settings/mcp-section.tsx
+++ b/src/components/settings/mcp-section.tsx
@@ -165,7 +165,7 @@ function McpConnectionsCard() {
                 <AlertDialog>
                   <AlertDialogTrigger asChild>
                     <Button
-                      variant="destructive"
+                      variant="outline"
                       size="sm"
                       className="min-h-11 w-full"
                     >
@@ -506,7 +506,7 @@ function McpTokensCard() {
                     <AlertDialog>
                       <AlertDialogTrigger asChild>
                         <Button
-                          variant="destructive"
+                          variant="outline"
                           size="sm"
                           className="min-h-11 w-full"
                         >
diff --git a/src/components/settings/score-section.tsx b/src/components/settings/score-section.tsx
index 18b8f90b0..88c2542f1 100644
--- a/src/components/settings/score-section.tsx
+++ b/src/components/settings/score-section.tsx
@@ -56,6 +56,7 @@ import { Gauge, Loader2 } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { QueryErrorCard } from "@/components/ui/query-error-card";
 import { QueryErrorRow } from "@/components/ui/query-error-row";
+import { RevealWhenSettled } from "@/components/ui/reveal-when-settled";
 import { Skeleton } from "@/components/ui/skeleton";
 import { SettingsCard } from "@/components/settings/settings-card";
 import { SettingsCardHeader } from "@/components/settings/_card-header";
@@ -319,194 +320,201 @@ export function ScoreSection() {
   const busy = saveMutation.isPending;
 
   return (
-    <div className="space-y-6" data-slot="score-section">
-      {showNotice && notice ? (
-        <ScoreChangeNotice
-          configVersion={configQuery.data?.version ?? 0}
-          changedAt={configQuery.data?.changedAt ?? null}
-          dismissing={dismissMutation.isPending}
-          onDismiss={() => dismissMutation.mutate(notice.itemKey)}
-        />
-      ) : null}
-
-      {showComposition && composition ? (
-        <ScoreCompositionNotice
-          left={composition.left}
-          joined={composition.joined}
-          dismissing={dismissCompositionMutation.isPending}
-          onDismiss={() =>
-            dismissCompositionMutation.mutate(composition.itemKey)
-          }
-        />
-      ) : null}
-
-      {configQuery.isError ? (
-        <QueryErrorCard
-          title={t("settings.sections.score.loadFailed")}
-          onRetry={() => void configQuery.refetch()}
-        />
-      ) : (
-        <SettingsCard
-          as="section"
-          data-slot="score-config-card"
-          aria-labelledby="score-config-title"
-        >
-          <SettingsCardHeader
-            icon={Gauge}
-            titleId="score-config-title"
-            title={t("settings.sections.score.card.title")}
-            description={t("settings.sections.score.card.description")}
+    // The two notices land with the score report, a slower read than the
+    // configuration, and arrived above the card it had already painted. The
+    // section reveals once both settle.
+    <RevealWhenSettled
+      fallback={<Skeleton className="h-[35rem] w-full rounded-xl" />}
+    >
+      <div className="space-y-6" data-slot="score-section">
+        {showNotice && notice ? (
+          <ScoreChangeNotice
+            configVersion={configQuery.data?.version ?? 0}
+            changedAt={configQuery.data?.changedAt ?? null}
+            dismissing={dismissMutation.isPending}
+            onDismiss={() => dismissMutation.mutate(notice.itemKey)}
           />
+        ) : null}
 
-          <div className="space-y-6">
-            {/* The sentence the whole feature exists for. Foreground, in
-                the body, because it is content and not a meta
-                description. */}
-            <p data-slot="score-config-three-axes" className="text-sm">
-              {t("settings.sections.score.threeAxes")}
-            </p>
+        {showComposition && composition ? (
+          <ScoreCompositionNotice
+            left={composition.left}
+            joined={composition.joined}
+            dismissing={dismissCompositionMutation.isPending}
+            onDismiss={() =>
+              dismissCompositionMutation.mutate(composition.itemKey)
+            }
+          />
+        ) : null}
 
-            {/* v1.38 — the breadth sentence. Three areas of health used to
-                be the price of a score, and the write refused anything
-                narrower; it is a recommendation now and one pillar saves.
-                The recommendation stays on the surface anyway, because a
-                one-area score is honest but thin and a person choosing
-                what counts should know that before they save, not after
-                the card tells them what it rests on. Content, so
-                foreground and in the body beside the sentence it
-                qualifies — not a muted footnote under the rows. */}
-            <p data-slot="score-config-recommendation" className="text-sm">
-              {t("settings.sections.score.recommendation")}
-            </p>
+        {configQuery.isError ? (
+          <QueryErrorCard
+            title={t("settings.sections.score.loadFailed")}
+            onRetry={() => void configQuery.refetch()}
+          />
+        ) : (
+          <SettingsCard
+            as="section"
+            data-slot="score-config-card"
+            aria-labelledby="score-config-title"
+          >
+            <SettingsCardHeader
+              icon={Gauge}
+              titleId="score-config-title"
+              title={t("settings.sections.score.card.title")}
+              description={t("settings.sections.score.card.description")}
+            />
 
-            {/* The starting points. Both name data; neither names a
-                person. A template that supplies a rationale for dropping a
-                pillar is the one shape the evidence rules out, so there is
-                none. */}
-            <div
-              data-slot="score-config-presets"
-              className="flex flex-wrap items-center gap-2"
-            >
-              <span className="text-muted-foreground text-xs">
-                {t("settings.sections.score.presets.label")}
-              </span>
-              <Button
-                type="button"
-                size="sm"
-                variant="outline"
-                disabled={busy}
-                data-slot="score-config-preset-all"
-                className="min-h-11 sm:min-h-9"
-                onClick={() => {
-                  setRefusal(null);
-                  setDraft([...SCORE_PILLAR_IDS]);
-                }}
-              >
-                {t("settings.sections.score.presets.all")}
-              </Button>
-              <Button
-                type="button"
-                size="sm"
-                variant="outline"
-                disabled={busy || !dirty}
-                data-slot="score-config-preset-current"
-                className="min-h-11 sm:min-h-9"
-                onClick={() => {
-                  setRefusal(null);
-                  setDraft([...serverSelection]);
-                }}
-              >
-                {t("settings.sections.score.presets.current")}
-              </Button>
-            </div>
-
-            {refusal ? (
-              <p
-                data-slot="score-config-refusal"
-                role="alert"
-                className="text-destructive text-sm"
-              >
-                {t(refusal)}
+            <div className="space-y-6">
+              {/* The sentence the whole feature exists for. Foreground, in
+                  the body, because it is content and not a meta
+                  description. */}
+              <p data-slot="score-config-three-axes" className="text-sm">
+                {t("settings.sections.score.threeAxes")}
               </p>
-            ) : null}
 
-            {analyticsQuery.isError ? (
-              <QueryErrorRow
-                slot="score-config-eligibility-error"
-                message={t("settings.sections.score.eligibilityFailed")}
-                onRetry={() => void analyticsQuery.refetch()}
-              />
-            ) : null}
+              {/* v1.38 — the breadth sentence. Three areas of health used to
+                  be the price of a score, and the write refused anything
+                  narrower; it is a recommendation now and one pillar saves.
+                  The recommendation stays on the surface anyway, because a
+                  one-area score is honest but thin and a person choosing
+                  what counts should know that before they save, not after
+                  the card tells them what it rests on. Content, so
+                  foreground and in the body beside the sentence it
+                  qualifies — not a muted footnote under the rows. */}
+              <p data-slot="score-config-recommendation" className="text-sm">
+                {t("settings.sections.score.recommendation")}
+              </p>
 
-            {configQuery.isLoading ? (
-              <div data-slot="score-config-loading" className="space-y-3">
-                <Skeleton className="h-4 w-32" />
-                <Skeleton className="h-11 w-full" />
-                <Skeleton className="h-11 w-full" />
-                <Skeleton className="h-11 w-full" />
-              </div>
-            ) : (
-              // One flat list of topics separated by hairline dividers, the
-              // way Anamnese lists its facts. The group headings are gone; the
-              // registry order (domain, then pillar) is preserved by flattening
-              // the groups in order, and each row keeps its `data-domain` for
-              // tests and e2e.
-              <div className="divide-border divide-y">
-                {groups.flatMap((group) =>
-                  group.rows.map((row) => (
-                    <ScorePillarRow
-                      key={row.id}
-                      row={row}
-                      pending={busy}
-                      onToggle={(next) => toggle(row.id, next)}
-                    />
-                  )),
-                )}
-              </div>
-            )}
-
-            {omitted.length > 0 ? (
-              <p
-                data-slot="score-config-omitted"
-                data-count={omitted.length}
-                className="text-muted-foreground text-xs"
+              {/* The starting points. Both name data; neither names a
+                  person. A template that supplies a rationale for dropping a
+                  pillar is the one shape the evidence rules out, so there is
+                  none. */}
+              <div
+                data-slot="score-config-presets"
+                className="flex flex-wrap items-center gap-2"
               >
-                {t("settings.sections.score.omitted", {
-                  count: omitted.length,
-                })}{" "}
-                <Link
-                  href="/settings/modules"
-                  data-slot="score-config-omitted-link"
-                  className="text-foreground underline underline-offset-2"
+                <span className="text-muted-foreground text-xs">
+                  {t("settings.sections.score.presets.label")}
+                </span>
+                <Button
+                  type="button"
+                  size="sm"
+                  variant="outline"
+                  disabled={busy}
+                  data-slot="score-config-preset-all"
+                  className="min-h-11 sm:min-h-9"
+                  onClick={() => {
+                    setRefusal(null);
+                    setDraft([...SCORE_PILLAR_IDS]);
+                  }}
                 >
-                  {t("settings.sections.score.omittedLink")}
-                </Link>
-              </p>
-            ) : null}
-          </div>
+                  {t("settings.sections.score.presets.all")}
+                </Button>
+                <Button
+                  type="button"
+                  size="sm"
+                  variant="outline"
+                  disabled={busy || !dirty}
+                  data-slot="score-config-preset-current"
+                  className="min-h-11 sm:min-h-9"
+                  onClick={() => {
+                    setRefusal(null);
+                    setDraft([...serverSelection]);
+                  }}
+                >
+                  {t("settings.sections.score.presets.current")}
+                </Button>
+              </div>
 
-          {/* Bottom-right, in its own row, like every other settings card
-              that saves a form. */}
-          <SettingsCardActions>
-            <Button
-              size="sm"
-              type="button"
-              onClick={() => saveMutation.mutate(draft)}
-              disabled={busy || !dirty || configQuery.isLoading}
-              data-slot="score-config-save"
-              className="min-h-11 sm:min-h-9"
-            >
-              {busy ? (
-                <Loader2
-                  aria-hidden="true"
-                  className="size-3.5 animate-spin motion-reduce:animate-none"
+              {refusal ? (
+                <p
+                  data-slot="score-config-refusal"
+                  role="alert"
+                  className="text-destructive text-sm"
+                >
+                  {t(refusal)}
+                </p>
+              ) : null}
+
+              {analyticsQuery.isError ? (
+                <QueryErrorRow
+                  slot="score-config-eligibility-error"
+                  message={t("settings.sections.score.eligibilityFailed")}
+                  onRetry={() => void analyticsQuery.refetch()}
                 />
               ) : null}
-              {t("settings.sections.score.save")}
-            </Button>
-          </SettingsCardActions>
-        </SettingsCard>
-      )}
-    </div>
+
+              {configQuery.isLoading ? (
+                <div data-slot="score-config-loading" className="space-y-3">
+                  <Skeleton className="h-4 w-32" />
+                  <Skeleton className="h-11 w-full" />
+                  <Skeleton className="h-11 w-full" />
+                  <Skeleton className="h-11 w-full" />
+                </div>
+              ) : (
+                // One flat list of topics separated by hairline dividers, the
+                // way Anamnese lists its facts. The group headings are gone; the
+                // registry order (domain, then pillar) is preserved by flattening
+                // the groups in order, and each row keeps its `data-domain` for
+                // tests and e2e.
+                <div className="divide-border divide-y">
+                  {groups.flatMap((group) =>
+                    group.rows.map((row) => (
+                      <ScorePillarRow
+                        key={row.id}
+                        row={row}
+                        pending={busy}
+                        onToggle={(next) => toggle(row.id, next)}
+                      />
+                    )),
+                  )}
+                </div>
+              )}
+
+              {omitted.length > 0 ? (
+                <p
+                  data-slot="score-config-omitted"
+                  data-count={omitted.length}
+                  className="text-muted-foreground text-xs"
+                >
+                  {t("settings.sections.score.omitted", {
+                    count: omitted.length,
+                  })}{" "}
+                  <Link
+                    href="/settings/modules"
+                    data-slot="score-config-omitted-link"
+                    className="text-foreground underline underline-offset-2"
+                  >
+                    {t("settings.sections.score.omittedLink")}
+                  </Link>
+                </p>
+              ) : null}
+            </div>
+
+            {/* Bottom-right, in its own row, like every other settings card
+                that saves a form. */}
+            <SettingsCardActions>
+              <Button
+                size="sm"
+                type="button"
+                onClick={() => saveMutation.mutate(draft)}
+                disabled={busy || !dirty || configQuery.isLoading}
+                data-slot="score-config-save"
+                className="min-h-11 sm:min-h-9"
+              >
+                {busy ? (
+                  <Loader2
+                    aria-hidden="true"
+                    className="size-3.5 animate-spin motion-reduce:animate-none"
+                  />
+                ) : null}
+                {t("settings.sections.score.save")}
+              </Button>
+            </SettingsCardActions>
+          </SettingsCard>
+        )}
+      </div>
+    </RevealWhenSettled>
   );
 }
diff --git a/src/components/settings/security-section/passkey-list-section.tsx b/src/components/settings/security-section/passkey-list-section.tsx
index ed6cd4b7b..94fa4b4cf 100644
--- a/src/components/settings/security-section/passkey-list-section.tsx
+++ b/src/components/settings/security-section/passkey-list-section.tsx
@@ -299,7 +299,7 @@ export function PasskeyListSection({
                             type="button"
                             variant="ghost"
                             size="icon"
-                            className="text-destructive min-h-11 min-w-11 sm:h-8 sm:min-h-0 sm:w-8 sm:min-w-0"
+                            className="text-muted-foreground hover:text-foreground min-h-11 min-w-11 sm:h-8 sm:min-h-0 sm:w-8 sm:min-w-0"
                             disabled={remove.isPending}
                             aria-label={t("settings.deletePasskey")}
                           >
diff --git a/src/components/settings/security-section/security-keys-card.tsx b/src/components/settings/security-section/security-keys-card.tsx
index 7dcb374f2..9d487d5b0 100644
--- a/src/components/settings/security-section/security-keys-card.tsx
+++ b/src/components/settings/security-section/security-keys-card.tsx
@@ -293,7 +293,7 @@ export function SecurityKeysCard({
                             type="button"
                             variant="ghost"
                             size="icon"
-                            className="text-destructive min-h-11 min-w-11 sm:h-8 sm:min-h-0 sm:w-8 sm:min-w-0"
+                            className="text-muted-foreground hover:text-foreground min-h-11 min-w-11 sm:h-8 sm:min-h-0 sm:w-8 sm:min-w-0"
                             disabled={remove.isPending}
                             aria-label={t("settings.security.keys.remove")}
                           >
diff --git a/src/components/settings/sharing-section.tsx b/src/components/settings/sharing-section.tsx
index c05674421..c39fe0b96 100644
--- a/src/components/settings/sharing-section.tsx
+++ b/src/components/settings/sharing-section.tsx
@@ -242,7 +242,7 @@ function ShareLinksCard() {
                     <AlertDialog>
                       <AlertDialogTrigger asChild>
                         <Button
-                          variant="destructive"
+                          variant="outline"
                           size="sm"
                           className="ml-auto flex min-h-11 w-fit sm:min-h-9"
                         >
diff --git a/src/components/symptoms/symptoms-section.tsx b/src/components/symptoms/symptoms-section.tsx
index 6807ca848..17fd7b0ef 100644
--- a/src/components/symptoms/symptoms-section.tsx
+++ b/src/components/symptoms/symptoms-section.tsx
@@ -223,7 +223,6 @@ function DefinitionMenu({
           </DropdownMenuItem>
           <DropdownMenuSeparator />
           <DropdownMenuItem
-            variant="destructive"
             onSelect={(e) => {
               e.preventDefault();
               setConfirmOpen(true);
@@ -301,7 +300,6 @@ export function SymptomEventMenu({
           </DropdownMenuItem>
           <DropdownMenuSeparator />
           <DropdownMenuItem
-            variant="destructive"
             onSelect={(e) => {
               e.preventDefault();
               setConfirmOpen(true);
diff --git a/src/components/ui/__tests__/reveal-when-settled.test.tsx b/src/components/ui/__tests__/reveal-when-settled.test.tsx
new file mode 100644
index 000000000..39037f967
--- /dev/null
+++ b/src/components/ui/__tests__/reveal-when-settled.test.tsx
@@ -0,0 +1,27 @@
+import { describe, expect, it } from "vitest";
+import { renderToStaticMarkup } from "react-dom/server";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+
+import { RevealWhenSettled } from "../reveal-when-settled";
+
+/**
+ * The body mounts at once (so its reads start) but stays out of layout until
+ * they settle; the fallback holds the place. Nothing inside a `display: none`
+ * box can register a layout shift, which is the point.
+ */
+describe("<RevealWhenSettled>", () => {
+  it("paints the fallback and keeps the mounted body out of layout", () => {
+    const html = renderToStaticMarkup(
+      <QueryClientProvider client={new QueryClient()}>
+        <RevealWhenSettled fallback={<div data-testid="fallback" />}>
+          <p data-testid="body">content</p>
+        </RevealWhenSettled>
+      </QueryClientProvider>,
+    );
+    expect(html).toContain('data-testid="fallback"');
+    expect(html).toContain('data-testid="body"');
+    expect(html).toMatch(
+      /data-slot="reveal-when-settled" data-revealed="false" aria-busy="true" class="hidden"/,
+    );
+  });
+});
diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index 07a1b5fb3..16fa2f862 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -34,7 +34,10 @@ const buttonVariants = cva(
   {
     variants: {
       variant: {
-        default: "bg-primary text-primary-foreground hover:bg-primary/90",
+        // Disabled keeps its label readable in both themes: a token pair
+        // rather than half opacity (white on a washed violet, ~2:1 light).
+        default:
+          "bg-primary text-primary-foreground hover:bg-primary/90 disabled:bg-primary-disabled disabled:text-primary-disabled-foreground disabled:opacity-100",
         destructive:
           "bg-destructive text-white hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
         outline:
diff --git a/src/components/ui/empty-state.tsx b/src/components/ui/empty-state.tsx
index 3f736a7ed..42704191e 100644
--- a/src/components/ui/empty-state.tsx
+++ b/src/components/ui/empty-state.tsx
@@ -36,16 +36,6 @@ export interface EmptyStateProps extends Omit<
    * Compact density for use inside tiles or table-row empty rows.
    */
   size?: "default" | "compact";
-  /**
-   * v1.4.27 MB7 / CF-36 — size hint for the inner action wrapper.
-   *
-   * `"default"` keeps the legacy inline-tight CTA. `"lg"` adds a
-   * `[&_button]:min-h-11 [&_a]:min-h-11` selector so the inner button
-   * or `asChild` link meets the 44 px floor on mobile, and lifts the
-   * wrapper to `w-full sm:w-auto` so the CTA fills the column at
-   * narrow viewports and centres at `sm+`.
-   */
-  ctaSize?: "default" | "lg";
 }
 
 function EmptyState({
@@ -55,7 +45,6 @@ function EmptyState({
   action,
   variant = "card",
   size = "default",
-  ctaSize = "default",
   className,
   ...props
 }: EmptyStateProps) {
@@ -97,17 +86,12 @@ function EmptyState({
       </div>
       {action ? (
         <div
-          className={cn(
-            "mt-1",
-            // v1.4.27 MB7 / CF-36 — when `ctaSize === "lg"` the wrapper
-            // lifts to full-width on mobile and constrains the inner
-            // `<Button>` / `asChild` `<Link>` to the 44 px tap floor.
-            // The selectors target the wrapper's immediate child so
-            // existing CTAs that pass a plain `<Button>` (no class
-            // overrides) pick up the lift automatically.
-            ctaSize === "lg" &&
-              "w-full sm:w-auto [&>a]:min-h-11 [&>a]:w-full sm:[&>a]:w-auto [&>button]:min-h-11 [&>button]:w-full sm:[&>button]:w-auto",
-          )}
+          // One shape for every empty state's action: centred under the
+          // copy at its own width, never stretched edge to edge, and on the
+          // 44 px tap floor (back to the compact 36 px under a mouse). A
+          // per-call-site "lg" variant used to stretch some CTAs full width
+          // on a phone and leave others compact, side by side in the app.
+          className="mt-1 [&>a]:min-h-11 pointer-fine:[&>a]:min-h-9 [&>button]:min-h-11 pointer-fine:[&>button]:min-h-9"
         >
           {action}
         </div>
@@ -135,7 +119,7 @@ function EmptyState({
       role="status"
       aria-live="polite"
       className={cn(
-        "border-border bg-card rounded-lg border border-dashed",
+        "border-border bg-card rounded-xl border border-dashed",
         className,
       )}
       {...props}
diff --git a/src/components/ui/page-header.tsx b/src/components/ui/page-header.tsx
index 1efd6b16a..7b52036e7 100644
--- a/src/components/ui/page-header.tsx
+++ b/src/components/ui/page-header.tsx
@@ -27,9 +27,9 @@ import { cn } from "@/lib/utils";
  * they drifted apart from every module page in the first place.
  */
 /**
- * A one-word German title ("Krankheitstagebuch") is wider than the column a
- * phone leaves beside the actions, and without a break opportunity it ran
- * underneath them. `hyphens-auto` breaks it by the page's `lang`; the
+ * A long one-word German title (the illness page was once
+ * "Krankheitstagebuch") is wider than the column a phone leaves beside the
+ * actions, and without a break opportunity it ran underneath them. `hyphens-auto` breaks it by the page's `lang`; the
  * `wrap-break-word` floor covers a word the hyphenation dictionary does not.
  */
 const HEADING_CLASS =
diff --git a/src/components/ui/reveal-when-settled.tsx b/src/components/ui/reveal-when-settled.tsx
new file mode 100644
index 000000000..ac98626ea
--- /dev/null
+++ b/src/components/ui/reveal-when-settled.tsx
@@ -0,0 +1,79 @@
+"use client";
+
+import { useEffect, useState, type ReactNode } from "react";
+import { useIsFetching, useQueryClient } from "@tanstack/react-query";
+
+/**
+ * Holds a page body out of layout until its first reads have settled, then
+ * shows it in one step.
+ *
+ * Some bodies stack several cards whose final height depends on data — a
+ * day-by-day timeline, a paginated list, a card that turns out empty. Each
+ * resolving on its own pushed everything beneath it down the page a few
+ * times in the first few hundred milliseconds (CLS well above 0.1 at
+ * desktop width). A skeleton cannot know a list's real length; this does
+ * not need to.
+ *
+ * The children mount immediately, so their queries start at once; they sit
+ * in a `hidden` container (out of layout, so nothing in it can shift) while
+ * the `fallback` holds the place. The body reveals when no query is in
+ * flight for two frames running, or after `maxWaitMs` at the latest, so a
+ * slow or polling read elsewhere in the app can delay it but never strand
+ * it. Revealing is latched: a later background refetch does not hide the
+ * body again.
+ */
+export function RevealWhenSettled({
+  children,
+  fallback,
+  maxWaitMs = 2000,
+  className = "space-y-6",
+}: {
+  children: ReactNode;
+  /** The body's own rhythm: the wrapper is the one child of the page's
+   *  stack, so the gap between the cards it holds is set here. */
+  className?: string;
+  /** The placeholder painted until the body reveals. */
+  fallback: ReactNode;
+  maxWaitMs?: number;
+}) {
+  const queryClient = useQueryClient();
+  const fetching = useIsFetching();
+  const [revealed, setRevealed] = useState(false);
+
+  useEffect(() => {
+    if (revealed || fetching > 0) return;
+    // Two frames: the children's query observers subscribe in their own
+    // effects, so a count of zero on the first pass can simply mean nothing
+    // has started yet.
+    let second = 0;
+    const first = requestAnimationFrame(() => {
+      second = requestAnimationFrame(() => {
+        if (queryClient.isFetching() === 0) setRevealed(true);
+      });
+    });
+    return () => {
+      cancelAnimationFrame(first);
+      cancelAnimationFrame(second);
+    };
+  }, [fetching, revealed, queryClient]);
+
+  useEffect(() => {
+    if (revealed) return;
+    const timer = setTimeout(() => setRevealed(true), maxWaitMs);
+    return () => clearTimeout(timer);
+  }, [revealed, maxWaitMs]);
+
+  return (
+    <>
+      {revealed ? null : fallback}
+      <div
+        data-slot="reveal-when-settled"
+        data-revealed={revealed ? "true" : "false"}
+        aria-busy={revealed ? undefined : true}
+        className={revealed ? className : "hidden"}
+      >
+        {children}
+      </div>
+    </>
+  );
+}
diff --git a/src/components/ui/switch.tsx b/src/components/ui/switch.tsx
index daff86a60..cef45ddef 100644
--- a/src/components/ui/switch.tsx
+++ b/src/components/ui/switch.tsx
@@ -25,7 +25,7 @@ function Switch({
         // without disturbing layout. v1.4.43 W10 design-M1 — `-13px` (not
         // `-12px`) takes the 18.4 px track + 26 px padding to 44.4 px and
         // closes the 1.6 px vertical short fall to spec-strict 2.5.5.
-        "peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-input focus-visible:border-ring focus-visible:ring-ring/50 dark:data-[state=unchecked]:bg-input/80 group/switch relative inline-flex shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none before:absolute before:inset-[-13px] before:content-[''] focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-[1.15rem] data-[size=default]:w-8 data-[size=sm]:h-3.5 data-[size=sm]:w-6",
+        "peer data-[state=checked]:bg-primary data-[state=unchecked]:bg-switch-off focus-visible:border-ring focus-visible:ring-ring/50 group/switch relative inline-flex shrink-0 items-center rounded-full border border-transparent shadow-xs transition-all outline-none before:absolute before:inset-[-13px] before:content-[''] focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-[1.15rem] data-[size=default]:w-8 data-[size=sm]:h-3.5 data-[size=sm]:w-6",
         className,
       )}
       {...props}
diff --git a/src/components/vaccinations/vaccinations-view.tsx b/src/components/vaccinations/vaccinations-view.tsx
index 31e3493b8..af9c4ced8 100644
--- a/src/components/vaccinations/vaccinations-view.tsx
+++ b/src/components/vaccinations/vaccinations-view.tsx
@@ -104,7 +104,11 @@ export function VaccinationsView() {
           </span>
         }
         description={t("vaccinations.subtitle")}
-        actions={addButton}
+        // The empty state carries the add action while the Impfpass is
+        // empty; the header offers it once there is a list to add to.
+        actions={
+          !isLoading && !isError && records.length === 0 ? null : addButton
+        }
       />
 
       <VaccinationSheet
diff --git a/src/components/workouts/delete-workout-button.tsx b/src/components/workouts/delete-workout-button.tsx
index 904ea6280..adfdcb303 100644
--- a/src/components/workouts/delete-workout-button.tsx
+++ b/src/components/workouts/delete-workout-button.tsx
@@ -99,7 +99,7 @@ export function DeleteWorkoutButton({
         title={t("insights.workouts.manual.deleteLabel")}
         onClick={() => setOpen(true)}
         className={cn(
-          "text-muted-foreground hover:text-destructive relative size-10",
+          "text-muted-foreground hover:text-foreground relative size-10",
           "before:absolute before:-inset-1.5 before:content-['']",
         )}
       >
diff --git a/src/hooks/use-chart-domain-stats.ts b/src/hooks/use-chart-domain-stats.ts
index a243d0b65..1d59e44a5 100644
--- a/src/hooks/use-chart-domain-stats.ts
+++ b/src/hooks/use-chart-domain-stats.ts
@@ -31,6 +31,12 @@ export interface ChartDomainStats {
    * falls back to the full-range summary for that series.
    */
   statsByType: Record<string, MetricWindowStats> | null;
+  /**
+   * False until the chart has settled and reported once (even an empty
+   * window). The strip holds its cells until then rather than painting the
+   * full-range summary and swapping to the chart's window a beat later.
+   */
+  statsSettled: boolean;
   /** Stable callback handed to `<HealthChart onVisibleStats>`. */
   onVisibleStats: (stats: Record<string, MetricWindowStats> | null) => void;
 }
@@ -40,10 +46,12 @@ export function useChartDomainStats(): ChartDomainStats {
     string,
     MetricWindowStats
   > | null>(null);
+  const [statsSettled, setStatsSettled] = useState(false);
   const lastRef = useRef<string>("null");
 
   const onVisibleStats = useCallback(
     (stats: Record<string, MetricWindowStats> | null) => {
+      setStatsSettled(true);
       // Cheap shallow signature so an identical window (a re-render that
       // recomputes the same slice) doesn't re-set state and re-render the
       // strip.
@@ -57,6 +65,7 @@ export function useChartDomainStats(): ChartDomainStats {
 
   return {
     statsByType,
+    statsSettled,
     onVisibleStats,
   };
 }
diff --git a/src/lib/__tests__/achievements-no-insults.test.ts b/src/lib/__tests__/achievements-no-insults.test.ts
index 9c6e30423..38c8e4419 100644
--- a/src/lib/__tests__/achievements-no-insults.test.ts
+++ b/src/lib/__tests__/achievements-no-insults.test.ts
@@ -41,17 +41,14 @@ describe("achievement titles", () => {
     expect(offending).toEqual([]);
   });
 
+  // The two badges those titles belonged to rewarded a doubled and a
+  // skipped dose. They are gone; their keys must not drift back in.
   test.each([
     ["en", enMessages as unknown as MessagesShape],
     ["de", deMessages as unknown as MessagesShape],
-  ] as const)(
-    "%s overIntake1/skippedIntake1 are translated, not the literal English shipped before",
-    (_locale, bundle) => {
-      const badges = bundle.achievements?.badges ?? {};
-      expect(badges.overIntake1?.title).toBeDefined();
-      expect(badges.skippedIntake1?.title).toBeDefined();
-      expect(badges.overIntake1?.title).not.toBe("Idiot");
-      expect(badges.skippedIntake1?.title).not.toBe("Lazy Boy");
-    },
-  );
+  ] as const)("%s ships no dosing badge copy", (_locale, bundle) => {
+    const badges = bundle.achievements?.badges ?? {};
+    expect(badges).not.toHaveProperty("overIntake1");
+    expect(badges).not.toHaveProperty("skippedIntake1");
+  });
 });
diff --git a/src/lib/gamification/__tests__/achievements.test.ts b/src/lib/gamification/__tests__/achievements.test.ts
index 215f22bac..b42dcfdd0 100644
--- a/src/lib/gamification/__tests__/achievements.test.ts
+++ b/src/lib/gamification/__tests__/achievements.test.ts
@@ -13,8 +13,6 @@ import {
 
 const FULL_METRICS: AchievementMetrics = {
   totalTakenIntakes: 1000,
-  overIntakeCount: 1000,
-  skippedIntakeCount: 1000,
   bmiGreenStreak: 1000,
   bpGreenStreak: 1000,
   pulseGreenStreak: 1000,
@@ -79,8 +77,8 @@ describe("gamification achievements", () => {
     ).toBe(3);
   });
 
-  it("ships the expanded definition list (63 total — v1.4.18 + v1.16.1 care routine)", () => {
-    expect(ACHIEVEMENT_DEFINITIONS).toHaveLength(63);
+  it("ships the expanded definition list (61 total — v1.4.18 + v1.16.1 care routine, minus the two dosing badges)", () => {
+    expect(ACHIEVEMENT_DEFINITIONS).toHaveLength(61);
   });
 
   it("includes mood and hidden categories in the render order", () => {
@@ -91,8 +89,8 @@ describe("gamification achievements", () => {
   it("evaluates unlocked achievements and points when all metrics maxed", () => {
     const result = evaluateAchievementsWithCompletionDates(FULL_METRICS, {});
 
-    expect(result.summary.unlockedCount).toBe(63);
-    expect(result.summary.totalCount).toBe(63);
+    expect(result.summary.unlockedCount).toBe(61);
+    expect(result.summary.totalCount).toBe(61);
     expect(result.summary.nextAchievement).toBeNull();
     expect(result.summary.earnedPoints).toBe(result.summary.totalPoints);
   });
@@ -227,3 +225,27 @@ describe("bridgeFrozenStreakGaps (Rest Mode streak-freeze)", () => {
     expect(calculateLongestStreak(bridged)).toBe(1);
   });
 });
+
+describe("dosing is never rewarded", () => {
+  // A badge for a dose taken twice or a dose skipped rewards over- or
+  // under-dosing. Neither behaviour is an achievement.
+  it("ships no badge for a doubled or a skipped dose", () => {
+    const ids = ACHIEVEMENT_DEFINITIONS.map((d) => d.id);
+    expect(ids).not.toContain("over-intake-1");
+    expect(ids).not.toContain("skipped-intake-1");
+    const metrics = ACHIEVEMENT_DEFINITIONS.map((d) => String(d.metric));
+    expect(metrics).not.toContain("overIntakeCount");
+    expect(metrics).not.toContain("skippedIntakeCount");
+  });
+
+  it("ignores an unlock row persisted for a retired badge", () => {
+    const result = evaluateAchievementsWithCompletionDates(ZERO_METRICS, {
+      "over-intake-1": new Date("2026-03-01T08:00:00Z"),
+      "skipped-intake-1": new Date("2026-03-02T08:00:00Z"),
+    });
+    const ids = result.achievements.map((a) => a.id);
+    expect(ids).not.toContain("over-intake-1");
+    expect(ids).not.toContain("skipped-intake-1");
+    expect(result.summary.unlockedCount).toBe(0);
+  });
+});
diff --git a/src/lib/gamification/achievements-result.ts b/src/lib/gamification/achievements-result.ts
index be9578b71..1685916c1 100644
--- a/src/lib/gamification/achievements-result.ts
+++ b/src/lib/gamification/achievements-result.ts
@@ -370,115 +370,6 @@ function getOnTimePerfectDaySeries(
   return toDaySeries(perfectDays);
 }
 
-function parseDaysOfWeek(daysOfWeek: string | null): Set<number> | null {
-  if (!daysOfWeek) return null;
-
-  const values = daysOfWeek
-    .split(",")
-    .map((value) => Number(value.trim()))
-    .filter((value) => Number.isInteger(value) && value >= 0 && value <= 6);
-
-  return values.length > 0 ? new Set(values) : null;
-}
-
-function getExpectedIntakesForDay(
-  schedules: MedicationScheduleRecord[],
-  dayKey: string,
-): number {
-  if (schedules.length === 0) return 0;
-  if (!/^\d{4}-\d{2}-\d{2}$/.test(dayKey)) return 0;
-
-  const day = dayKeyToDate(dayKey).getUTCDay();
-  let expected = 0;
-
-  for (const schedule of schedules) {
-    const allowedDays = parseDaysOfWeek(schedule.daysOfWeek);
-    if (!allowedDays || allowedDays.has(day)) {
-      expected += 1;
-    }
-  }
-
-  return expected;
-}
-
-function getIntakeIssueMetrics(
-  intakeEvents: IntakeEventRecord[],
-  schedulesByMedicationId: Map<string, MedicationScheduleRecord[]>,
-  tz: string,
-) {
-  const skippedIntakeDates = intakeEvents
-    .filter((event) => event.skipped)
-    .map((event) => event.scheduledFor)
-    .sort((a, b) => a.getTime() - b.getTime());
-
-  const eventsByMedicationDay = new Map<
-    string,
-    Map<string, IntakeEventRecord[]>
-  >();
-
-  for (const event of intakeEvents) {
-    if (!event.medicationId || Number.isNaN(event.scheduledFor.getTime())) {
-      continue;
-    }
-
-    const dayKey = userDayKey(event.scheduledFor, tz);
-    const byDay = eventsByMedicationDay.get(event.medicationId) ?? new Map();
-    const list = byDay.get(dayKey) ?? [];
-    list.push(event);
-    byDay.set(dayKey, list);
-    eventsByMedicationDay.set(event.medicationId, byDay);
-  }
-
-  let overIntakeCount = 0;
-  const overIntakeDates: Date[] = [];
-
-  for (const [medicationId, dayMap] of eventsByMedicationDay.entries()) {
-    const schedules = schedulesByMedicationId.get(medicationId) ?? [];
-
-    for (const [dayKey, events] of dayMap.entries()) {
-      const expectedCount = getExpectedIntakesForDay(schedules, dayKey);
-
-      if (expectedCount <= 0) {
-        continue;
-      }
-
-      const takenEvents = events
-        .filter((event) => !event.skipped && event.takenAt !== null)
-        .sort((a, b) => {
-          const aTime = (a.takenAt ?? a.scheduledFor).getTime();
-          const bTime = (b.takenAt ?? b.scheduledFor).getTime();
-          return aTime - bTime;
-        });
-
-      const excessCount = Math.max(0, takenEvents.length - expectedCount);
-      if (excessCount === 0) {
-        continue;
-      }
-
-      overIntakeCount += excessCount;
-
-      for (
-        let index = takenEvents.length - excessCount;
-        index < takenEvents.length;
-        index++
-      ) {
-        const event = takenEvents[index];
-        if (!event) continue;
-        overIntakeDates.push(event.takenAt ?? event.scheduledFor);
-      }
-    }
-  }
-
-  overIntakeDates.sort((a, b) => a.getTime() - b.getTime());
-
-  return {
-    skippedIntakeCount: skippedIntakeDates.length,
-    skippedIntakeDates,
-    overIntakeCount,
-    overIntakeDates,
-  };
-}
-
 function getCompliance80DaySeries(
   intakeEvents: IntakeEventRecord[],
   startDate: Date,
@@ -748,12 +639,6 @@ export async function buildAchievementsResult(
   const schedulesByMedicationId = new Map(
     medications.map((med) => [med.id, med.schedules]),
   );
-  const intakeIssueMetrics = getIntakeIssueMetrics(
-    intakeEvents,
-    schedulesByMedicationId,
-    tz,
-  );
-
   const takenIntakeDates = intakeEvents
     .filter((event) => !event.skipped && event.takenAt !== null)
     .map((event) => event.takenAt as Date);
@@ -850,8 +735,6 @@ export async function buildAchievementsResult(
 
   const metrics = {
     totalTakenIntakes: takenIntakeDates.length,
-    overIntakeCount: intakeIssueMetrics.overIntakeCount,
-    skippedIntakeCount: intakeIssueMetrics.skippedIntakeCount,
     // v1.18.1 P4 — every day-streak runs through `freeze(...)` so an active
     // or past illness episode bridges (does not break) the run across the
     // days the user was unwell.
@@ -917,24 +800,6 @@ export async function buildAchievementsResult(
       continue;
     }
 
-    if (definition.metric === "overIntakeCount") {
-      const completedAt = findCountCompletionDate(
-        intakeIssueMetrics.overIntakeDates,
-        definition.target,
-      );
-      if (completedAt) completionDates[definition.id] = completedAt;
-      continue;
-    }
-
-    if (definition.metric === "skippedIntakeCount") {
-      const completedAt = findCountCompletionDate(
-        intakeIssueMetrics.skippedIntakeDates,
-        definition.target,
-      );
-      if (completedAt) completionDates[definition.id] = completedAt;
-      continue;
-    }
-
     if (definition.metric === "loginDayStreak") {
       const completedAt = findStreakCompletionDate(
         loginDaySeries.dayKeys,
diff --git a/src/lib/gamification/achievements.ts b/src/lib/gamification/achievements.ts
index 1e2862333..a526fa146 100644
--- a/src/lib/gamification/achievements.ts
+++ b/src/lib/gamification/achievements.ts
@@ -2,8 +2,6 @@ export const GAMIFICATION_ROLLOUT_AT = new Date("2026-02-20T00:00:00.000Z");
 
 export type AchievementMetricKey =
   | "totalTakenIntakes"
-  | "overIntakeCount"
-  | "skippedIntakeCount"
   | "bmiGreenStreak"
   | "bpGreenStreak"
   | "pulseGreenStreak"
@@ -117,8 +115,6 @@ export interface EarnabilityFlags {
 function categoryForMetric(metric: AchievementMetricKey): AchievementCategory {
   switch (metric) {
     case "totalTakenIntakes":
-    case "overIntakeCount":
-    case "skippedIntakeCount":
     case "onTimePerfectDayStreak":
     case "compliance80DayStreak":
     case "missFreeDayStreak":
@@ -172,8 +168,6 @@ export const ACHIEVEMENT_CATEGORY_ORDER: readonly AchievementCategory[] = [
 
 export interface AchievementMetrics {
   totalTakenIntakes: number;
-  overIntakeCount: number;
-  skippedIntakeCount: number;
   bmiGreenStreak: number;
   bpGreenStreak: number;
   pulseGreenStreak: number;
@@ -319,26 +313,6 @@ export const ACHIEVEMENT_DEFINITIONS: AchievementDefinition[] = [
     tDescription: "achievements.badges.intakeTotal300.description",
     format: "count",
   }),
-  define({
-    id: "over-intake-1",
-    metric: "overIntakeCount",
-    target: 1,
-    points: 0,
-    icon: "AlertTriangle",
-    tTitle: "achievements.badges.overIntake1.title",
-    tDescription: "achievements.badges.overIntake1.description",
-    format: "count",
-  }),
-  define({
-    id: "skipped-intake-1",
-    metric: "skippedIntakeCount",
-    target: 1,
-    points: 0,
-    icon: "SkipForward",
-    tTitle: "achievements.badges.skippedIntake1.title",
-    tDescription: "achievements.badges.skippedIntake1.description",
-    format: "count",
-  }),
   define({
     id: "passkey-created-1",
     metric: "passkeyCreatedCount",
@@ -897,8 +871,6 @@ function isEarnable(
 ): boolean {
   switch (metric) {
     case "totalTakenIntakes":
-    case "overIntakeCount":
-    case "skippedIntakeCount":
     case "onTimePerfectDayStreak":
     case "compliance80DayStreak":
     case "missFreeDayStreak":
diff --git a/src/lib/insights/derived/__tests__/wellness-scores.test.ts b/src/lib/insights/derived/__tests__/wellness-scores.test.ts
index e7106d71a..6340f98b0 100644
--- a/src/lib/insights/derived/__tests__/wellness-scores.test.ts
+++ b/src/lib/insights/derived/__tests__/wellness-scores.test.ts
@@ -313,3 +313,76 @@ describe("computeWellnessScore", () => {
     expect(where.source).toBe("COMPUTED");
   });
 });
+
+describe("computeWellnessScore — strain reads the device's day strain", () => {
+  // `/insights/recovery` charts the band's own DAY_STRAIN. The strain page
+  // must not call the same account "not enough data": with no computed proxy
+  // in the window it serves the device's day strain, on the device's scale.
+  function byType(rows: Record<string, unknown[]>) {
+    findMany.mockImplementation(
+      async (args: { where: { type: string } }) => rows[args.where.type] ?? [],
+    );
+  }
+
+  it("falls back to DAY_STRAIN when no computed strain score exists", async () => {
+    byType({
+      STRAIN_SCORE: [],
+      DAY_STRAIN: [
+        {
+          value: 10.5,
+          measuredAt: new Date("2026-06-02T04:00:00Z"),
+          source: "WHOOP",
+        },
+        {
+          value: 14.7,
+          measuredAt: new Date("2026-06-01T04:00:00Z"),
+          source: "WHOOP",
+        },
+      ],
+    });
+    const r = await computeWellnessScore("STRAIN_SCORE", "u1", PROFILE, {
+      now: NOW,
+    });
+    expect(r.status).toBe("ok");
+    if (r.status !== "ok") return;
+    const v = r.value as WellnessScoreValue;
+    expect(v.device).toEqual({ value: 10.5, scaleMax: 21 });
+    expect(v.score).toBe(50);
+    expect(v.daysInWindow).toBe(2);
+    expect(r.provenance.inputs).toEqual(["DAY_STRAIN"]);
+  });
+
+  it("keeps the computed proxy when one exists", async () => {
+    byType({
+      STRAIN_SCORE: [
+        {
+          value: 64,
+          measuredAt: new Date("2026-06-01T12:00:00Z"),
+          source: "COMPUTED",
+        },
+      ],
+      DAY_STRAIN: [
+        {
+          value: 10.5,
+          measuredAt: new Date("2026-06-02T04:00:00Z"),
+          source: "WHOOP",
+        },
+      ],
+    });
+    const r = await computeWellnessScore("STRAIN_SCORE", "u1", PROFILE, {
+      now: NOW,
+    });
+    expect(r.status).toBe("ok");
+    if (r.status !== "ok") return;
+    expect(r.value.score).toBe(64);
+    expect(r.value.device ?? null).toBeNull();
+  });
+
+  it("stays insufficient with neither", async () => {
+    byType({});
+    const r = await computeWellnessScore("STRAIN_SCORE", "u1", PROFILE, {
+      now: NOW,
+    });
+    expect(r.status).toBe("insufficient");
+  });
+});
diff --git a/src/lib/insights/derived/wellness-scores.ts b/src/lib/insights/derived/wellness-scores.ts
index 4e0830d4b..e41f66f0e 100644
--- a/src/lib/insights/derived/wellness-scores.ts
+++ b/src/lib/insights/derived/wellness-scores.ts
@@ -68,8 +68,24 @@ export interface WellnessScoreValue {
    * non-breaking).
    */
   components?: ReadinessComponent[] | null;
+  /**
+   * STRAIN only — set when the score is the device's own day strain rather
+   * than the server's computed proxy: no proxy row exists in the window, but
+   * the band delivered `DAY_STRAIN` (WHOOP's 0–21 scale). `value` is the
+   * device's latest reading on its own scale; `score` is that reading as a
+   * share of `scaleMax`, so the ring and the band keep their 0–100 contract.
+   * Absent whenever the computed proxy is the source.
+   */
+  device?: { value: number; scaleMax: number } | null;
 }
 
+/**
+ * The device-native day-strain scale. WHOOP reports cycle strain on 0–21;
+ * the ingest validation (`DAY_STRAIN: { min: 0, max: 21 }`) pins the same
+ * bound, so a stored reading can never exceed it.
+ */
+export const DEVICE_STRAIN_SCALE_MAX = 21;
+
 /** The three persisted score types this engine serves. */
 export const WELLNESS_SCORE_TYPES = {
   RECOVERY_SCORE: "RECOVERY_SCORE",
@@ -176,6 +192,26 @@ export async function computeWellnessScore(
       )
     : rawRows;
 
+  // STRAIN has a second, device-native source: the band's own DAY_STRAIN,
+  // which `/insights/recovery` charts. Without a computed proxy in the window
+  // the strain page reads that same series instead of reporting "not enough
+  // data" for an account the recovery page shows weeks of strain for.
+  if (rows.length === 0 && type === "STRAIN_SCORE") {
+    const deviceRows = await prisma.measurement.findMany({
+      where: {
+        userId,
+        type: "DAY_STRAIN",
+        deletedAt: null,
+        measuredAt: { gte: cutoff, lte: now },
+      },
+      select: { value: true, measuredAt: true, source: true },
+      orderBy: { measuredAt: "desc" },
+    });
+    if (deviceRows.length > 0) {
+      return buildDeviceStrain(deviceRows, windowDays, computedAt);
+    }
+  }
+
   if (rows.length === 0) {
     return buildInsufficient<WellnessScoreValue>({
       coverage: {
@@ -251,6 +287,7 @@ export async function computeWellnessScore(
         .reverse(),
       anchor,
       components,
+      device: null,
     },
     coverage: {
       requiredInputs: 1,
@@ -270,3 +307,55 @@ export async function computeWellnessScore(
     },
   });
 }
+
+/** A device day-strain reading as a 0–100 share of the device scale. */
+function deviceStrainShare(value: number): number {
+  const clamped = Math.min(Math.max(value, 0), DEVICE_STRAIN_SCALE_MAX);
+  return Math.round((clamped / DEVICE_STRAIN_SCALE_MAX) * 100);
+}
+
+function buildDeviceStrain(
+  rows: { value: number; measuredAt: Date }[],
+  windowDays: number,
+  computedAt: string,
+): Derived<WellnessScoreValue> {
+  const latest = rows[0];
+  const score = deviceStrainShare(latest.value);
+  const prior = rows.slice(1).map((r) => deviceStrainShare(r.value));
+  const trendDelta =
+    prior.length > 0
+      ? Math.round(score - prior.reduce((s, v) => s + v, 0) / prior.length)
+      : null;
+  return buildOk<WellnessScoreValue>({
+    value: {
+      score,
+      band: bandWellnessScore("STRAIN_SCORE", score),
+      trendDelta,
+      daysInWindow: rows.length,
+      asOf: latest.measuredAt.toISOString(),
+      series: rows
+        .slice(0, SPARKLINE_MAX_POINTS)
+        .map((r) => deviceStrainShare(r.value))
+        .reverse(),
+      anchor: null,
+      components: null,
+      device: {
+        value: Math.round(latest.value * 10) / 10,
+        scaleMax: DEVICE_STRAIN_SCALE_MAX,
+      },
+    },
+    coverage: {
+      requiredInputs: 1,
+      presentInputs: 1,
+      historyDays: rows.length,
+      missing: [],
+    },
+    confidence: { score: 90, band: "high" },
+    provenance: {
+      inputs: ["DAY_STRAIN"],
+      source: "DAY",
+      windowDays,
+      computedAt,
+    },
+  });
+}
diff --git a/src/lib/integrations/healthkit-type-sync.ts b/src/lib/integrations/healthkit-type-sync.ts
index 1945b8131..20570d0b0 100644
--- a/src/lib/integrations/healthkit-type-sync.ts
+++ b/src/lib/integrations/healthkit-type-sync.ts
@@ -131,6 +131,32 @@ export async function getHealthKitTypeArrivals(
   return out;
 }
 
+/**
+ * The newest instant Apple Health data is known to have reached the account:
+ * the live-batch stamp, the per-type arrival ledger, or — for rows that came
+ * any other way, such as the export.zip import — the newest stored sample.
+ * Null only when none of the three holds anything, which is the one case the
+ * status may honestly call "waiting for first data".
+ */
+export function newestAppleHealthDataAt(
+  lastSyncedAt: string | null,
+  arrivals: Map<string, HealthKitTypeArrivalRecord> | null,
+  samples: readonly { lastSeenAt: string }[],
+): string | null {
+  let newest: number | null = null;
+  const consider = (value: string | null | undefined) => {
+    if (!value) return;
+    const ms = Date.parse(value);
+    if (Number.isFinite(ms) && (newest === null || ms > newest)) newest = ms;
+  };
+  consider(lastSyncedAt);
+  for (const arrival of arrivals?.values() ?? []) {
+    consider(arrival.lastReceivedAt);
+  }
+  for (const sample of samples) consider(sample.lastSeenAt);
+  return newest === null ? null : new Date(newest).toISOString();
+}
+
 /** A freshness entry with the arrival facts beside the newest sample. */
 export interface HealthKitFreshnessEntry extends MetricFreshnessEntry {
   /** When a live sync last carried this type; null when none has. */
diff --git a/src/lib/openapi/routes/insights/schemas.ts b/src/lib/openapi/routes/insights/schemas.ts
index 3ba65922d..b35e7febb 100644
--- a/src/lib/openapi/routes/insights/schemas.ts
+++ b/src/lib/openapi/routes/insights/schemas.ts
@@ -254,6 +254,20 @@ export const wellnessScoreValue = z
       .describe(
         "RECOVERY only, and only when the canonical value is the server's computed proxy — a device-native recovery percentage is not our blend and carries no decomposition.",
       ),
+    device: z
+      .object({
+        value: z
+          .number()
+          .describe("The device's latest day strain on its own scale."),
+        scaleMax: z
+          .number()
+          .describe("Top of the device scale (21 for WHOOP day strain)."),
+      })
+      .nullable()
+      .optional()
+      .describe(
+        "STRAIN only — present when no computed strain score exists in the window and the score is served from the device's own DAY_STRAIN instead. `score` is then `value` as a 0–100 share of `scaleMax`. Absent when the computed proxy is the source.",
+      ),
   })
   .meta({ id: "WellnessScoreValue" });