diff --git a/messages/de.json b/messages/de.json
index f6f5cad7d..722d99e3b 100644
--- a/messages/de.json
+++ b/messages/de.json
@@ -8844,6 +8844,7 @@
       "saveError": "Lebensstil-Kontext konnte nicht gespeichert werden",
       "loadError": "Lebensstil-Kontext konnte nicht geladen werden",
       "remove": "{kind} entfernen",
+      "removeShort": "Entfernen",
       "removeConfirmTitle": "{kind} entfernen?",
       "removeConfirmDescription": "Der aktuelle Wert gilt danach als nicht erfasst. Der datierte Verlauf bleibt erhalten.",
       "removedToast": "{kind} aus dem aktuellen Lebensstil-Kontext entfernt",
diff --git a/messages/en.json b/messages/en.json
index c4ca0124b..7afbc0765 100644
--- a/messages/en.json
+++ b/messages/en.json
@@ -8844,6 +8844,7 @@
       "saveError": "Could not save lifestyle context",
       "loadError": "Could not load lifestyle context",
       "remove": "Remove {kind}",
+      "removeShort": "Remove",
       "removeConfirmTitle": "Remove {kind}?",
       "removeConfirmDescription": "The current value will become not recorded. Its dated history will be retained.",
       "removedToast": "{kind} removed from current lifestyle context",
diff --git a/messages/es.json b/messages/es.json
index cae29080d..8f6a2f6b1 100644
--- a/messages/es.json
+++ b/messages/es.json
@@ -8844,6 +8844,7 @@
       "saveError": "No se pudo guardar el contexto del estilo de vida",
       "loadError": "No se pudo cargar el contexto del estilo de vida",
       "remove": "Eliminar {kind}",
+      "removeShort": "Quitar",
       "removeConfirmTitle": "¿Eliminar {kind}?",
       "removeConfirmDescription": "El valor actual pasará a constar como no registrado. Se conservará su historial fechado.",
       "removedToast": "{kind} eliminado del contexto actual del estilo de vida",
diff --git a/messages/fr.json b/messages/fr.json
index f7904933b..f26b406aa 100644
--- a/messages/fr.json
+++ b/messages/fr.json
@@ -8844,6 +8844,7 @@
       "saveError": "Impossible d'enregistrer le contexte du mode de vie",
       "loadError": "Impossible de charger le contexte du mode de vie",
       "remove": "Supprimer : {kind}",
+      "removeShort": "Supprimer",
       "removeConfirmTitle": "Supprimer : {kind} ?",
       "removeConfirmDescription": "La valeur actuelle sera considérée comme non renseignée. Son historique daté sera conservé.",
       "removedToast": "{kind} supprimé du contexte actuel du mode de vie",
diff --git a/messages/it.json b/messages/it.json
index a45b72862..7175278a8 100644
--- a/messages/it.json
+++ b/messages/it.json
@@ -8844,6 +8844,7 @@
       "saveError": "Impossibile salvare il contesto dello stile di vita",
       "loadError": "Impossibile caricare il contesto dello stile di vita",
       "remove": "Rimuovi {kind}",
+      "removeShort": "Rimuovi",
       "removeConfirmTitle": "Rimuovere {kind}?",
       "removeConfirmDescription": "Il valore attuale risulterà non registrato. La cronologia datata verrà conservata.",
       "removedToast": "{kind} rimosso dal contesto attuale dello stile di vita",
diff --git a/messages/pl.json b/messages/pl.json
index d39b0a380..972357d82 100644
--- a/messages/pl.json
+++ b/messages/pl.json
@@ -8844,6 +8844,7 @@
       "saveError": "Nie udało się zapisać kontekstu stylu życia",
       "loadError": "Nie udało się wczytać kontekstu stylu życia",
       "remove": "Usuń: {kind}",
+      "removeShort": "Usuń",
       "removeConfirmTitle": "Usunąć: {kind}?",
       "removeConfirmDescription": "Bieżąca wartość zmieni się na brak danych. Historia z datami zostanie zachowana.",
       "removedToast": "Usunięto {kind} z bieżącego kontekstu stylu życia",
diff --git a/src/components/records/__tests__/health-profile-facts-manager.test.tsx b/src/components/records/__tests__/health-profile-facts-manager.test.tsx
index 54641b031..47dff67c2 100644
--- a/src/components/records/__tests__/health-profile-facts-manager.test.tsx
+++ b/src/components/records/__tests__/health-profile-facts-manager.test.tsx
@@ -114,7 +114,12 @@ describe("health-profile fact removal control", () => {
       .filter(
         (props) =>
           props.type === "button" &&
-          props.variant === "outline" &&
+          // The Save control is the entry's PRIMARY action, so it carries the
+          // default variant. Matching on `variant === "outline"` used to be the
+          // discriminator and silently stopped matching anything when the
+          // action row was rebuilt — the button was still there, the selector
+          // was not.
+          props.variant === undefined &&
           typeof props.onClick === "function",
       )
       .map((props) => {
@@ -132,12 +137,18 @@ describe("health-profile fact removal control", () => {
     const { html } = render();
 
     expect(confirmButtons).toHaveLength(1);
+    // The visible label is short — three entries side by side each carrying
+    // their own field name read as one run of words — but the ACCESSIBLE name
+    // still says which entry it removes, and so does the dialog it opens.
     expect(confirmButtons[0]).toMatchObject({
       slot: "health-profile-fact-remove-SMOKING_STATUS",
-      label: "Remove Smoking status",
+      label: "Remove",
+      ariaLabel: "Remove Smoking status",
+      confirmLabel: "Remove Smoking status",
+      title: "Remove Smoking status?",
       body: "The current value will become not recorded. Its dated history will be retained.",
     });
-    expect(html).toContain("Remove Smoking status");
+    expect(html).toContain("Remove");
     expect(apiDelete).not.toHaveBeenCalled();
   });
 
@@ -173,7 +184,7 @@ describe("health-profile fact removal control", () => {
     const saveButton = renderedButtons.find(
       (props) =>
         props.type === "button" &&
-        props.variant === "outline" &&
+        props.variant === undefined &&
         typeof props.onClick === "function",
     );
 
@@ -207,7 +218,7 @@ describe("health-profile fact removal control", () => {
     const saveButton = renderedButtons.find(
       (props) =>
         props.type === "button" &&
-        props.variant === "outline" &&
+        props.variant === undefined &&
         typeof props.onClick === "function",
     );
 
diff --git a/src/components/records/health-profile-facts-manager.tsx b/src/components/records/health-profile-facts-manager.tsx
index a5cc6e2b4..c08a3eada 100644
--- a/src/components/records/health-profile-facts-manager.tsx
+++ b/src/components/records/health-profile-facts-manager.tsx
@@ -228,26 +228,21 @@ export function HealthProfileFactsManager() {
                   ))}
                 </SelectContent>
               </Select>
-              <div className="space-y-2">
-                <Button
-                  type="button"
-                  size="sm"
-                  variant="outline"
-                  className="min-h-11 w-full sm:min-h-9"
-                  disabled={disabled || !dirty || !value}
-                  onClick={() => save.mutate({ kind, value, current })}
-                >
-                  {save.isPending && save.variables?.kind === kind && (
-                    <Loader2
-                      className="size-4 animate-spin motion-reduce:animate-none"
-                      aria-hidden
-                    />
-                  )}
-                  {t("records.profileFacts.save")}
-                </Button>
+              {/* One action row per entry (UI-STANDARDS §11 + the action-row
+                  rule): right-aligned, primary last, the quiet destructive
+                  beside it. Two full-width stacked blocks — a grey disabled
+                  slab over a red-outlined one — carried the same visual weight
+                  as the field they belong to and ran into each other when
+                  scanned, which is what "Save" directly above "Remove smoking
+                  status" read as. */}
+              <div className="flex items-center justify-end gap-2 pt-1">
                 {current ? (
                   <ConfirmButton
-                    label={t("records.profileFacts.remove", {
+                    // Short label inside the row; the full phrase stays the
+                    // accessible name, because "Remove" on its own is
+                    // ambiguous once three of them are on screen.
+                    label={t("records.profileFacts.removeShort")}
+                    ariaLabel={t("records.profileFacts.remove", {
                       kind: t(KIND_LABEL[kind]),
                     })}
                     title={t("records.profileFacts.removeConfirmTitle", {
@@ -262,12 +257,28 @@ export function HealthProfileFactsManager() {
                       remove.isPending && remove.variables?.id === current.id
                     }
                     disabled={disabled}
+                    variant="ghost"
                     size="sm"
-                    className="text-destructive min-h-11 w-full sm:min-h-9"
+                    className="text-destructive min-h-11 sm:min-h-9"
                     icon={<Trash2 className="size-4" aria-hidden />}
                     slot={`health-profile-fact-remove-${kind}`}
                   />
                 ) : null}
+                <Button
+                  type="button"
+                  size="sm"
+                  className="min-h-11 sm:min-h-9"
+                  disabled={disabled || !dirty || !value}
+                  onClick={() => save.mutate({ kind, value, current })}
+                >
+                  {save.isPending && save.variables?.kind === kind && (
+                    <Loader2
+                      className="size-4 animate-spin motion-reduce:animate-none"
+                      aria-hidden
+                    />
+                  )}
+                  {t("records.profileFacts.save")}
+                </Button>
               </div>
             </div>
           );