diff --git a/frontend/src/components/ApiTokensSection.tsx b/frontend/src/components/ApiTokensSection.tsx
index e7a28afb..5e87f080 100644
--- a/frontend/src/components/ApiTokensSection.tsx
+++ b/frontend/src/components/ApiTokensSection.tsx
@@ -5,7 +5,7 @@ import { Label } from '@/components/ui/label';
 import { Badge } from '@/components/ui/badge';
 import { Skeleton } from '@/components/ui/skeleton';
 import { Combobox } from '@/components/ui/combobox';
-import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger } from '@/components/ui/alert-dialog';
+import { ConfirmModal } from '@/components/ui/modal';
 import { toast } from '@/components/ui/toast-store';
 import { apiFetch } from '@/lib/api';
 import { copyToClipboard } from '@/lib/clipboard';
@@ -60,6 +60,7 @@ export function ApiTokensSection() {
     const [creating, setCreating] = useState(false);
     const [showForm, setShowForm] = useState(false);
     const [newToken, setNewToken] = useState<{ id: number; token: string } | null>(null);
+    const [revokeTarget, setRevokeTarget] = useState<ApiTokenListItem | null>(null);
 
     const [formName, setFormName] = useState('');
     const [formScope, setFormScope] = useState('read-only');
@@ -244,27 +245,14 @@ export function ApiTokensSection() {
                                     {SCOPE_LABELS[token.scope] || token.scope}
                                 </Badge>
                             </div>
-                            <AlertDialog>
-                                <AlertDialogTrigger asChild>
-                                    <Button variant="ghost" size="sm" className="text-destructive/60 hover:bg-destructive hover:text-destructive-foreground shrink-0">
-                                        <Trash2 className="w-4 h-4" strokeWidth={1.5} />
-                                    </Button>
-                                </AlertDialogTrigger>
-                                <AlertDialogContent>
-                                    <AlertDialogHeader>
-                                        <AlertDialogTitle>Revoke API token?</AlertDialogTitle>
-                                        <AlertDialogDescription>
-                                            Revoking <strong>{token.name}</strong> will immediately invalidate it. Any pipelines or scripts using this token will stop working.
-                                        </AlertDialogDescription>
-                                    </AlertDialogHeader>
-                                    <AlertDialogFooter>
-                                        <AlertDialogCancel>Cancel</AlertDialogCancel>
-                                        <AlertDialogAction onClick={() => handleRevoke(token.id)} className="bg-destructive text-destructive-foreground hover:bg-destructive/90">
-                                            Revoke
-                                        </AlertDialogAction>
-                                    </AlertDialogFooter>
-                                </AlertDialogContent>
-                            </AlertDialog>
+                            <Button
+                                variant="ghost"
+                                size="sm"
+                                className="text-destructive/60 hover:bg-destructive hover:text-destructive-foreground shrink-0"
+                                onClick={() => setRevokeTarget(token)}
+                            >
+                                <Trash2 className="w-4 h-4" strokeWidth={1.5} />
+                            </Button>
                         </div>
                         <div className="flex items-center gap-4 text-xs text-muted-foreground tabular-nums">
                             <span className="flex items-center gap-1">
@@ -282,6 +270,26 @@ export function ApiTokensSection() {
                         </div>
                     </div>
                 ))}
+
+                <ConfirmModal
+                    open={revokeTarget !== null}
+                    onOpenChange={(open) => { if (!open) setRevokeTarget(null); }}
+                    variant="destructive"
+                    kicker="API TOKEN · REVOKE · IRREVERSIBLE"
+                    title="Revoke API token"
+                    confirmLabel="Revoke"
+                    onConfirm={() => {
+                        if (revokeTarget) {
+                            const id = revokeTarget.id;
+                            setRevokeTarget(null);
+                            handleRevoke(id);
+                        }
+                    }}
+                >
+                    <p className="text-sm text-stat-subtitle">
+                        Invalidates <span className="font-medium text-stat-value">{revokeTarget?.name}</span> immediately. Any pipelines or scripts using this token will stop working.
+                    </p>
+                </ConfirmModal>
             </div>
           </CapabilityGate>
         </AdmiralGate>
diff --git a/frontend/src/components/RegistriesSection.tsx b/frontend/src/components/RegistriesSection.tsx
index c99b97e7..2dca79d3 100644
--- a/frontend/src/components/RegistriesSection.tsx
+++ b/frontend/src/components/RegistriesSection.tsx
@@ -5,7 +5,7 @@ import { Label } from '@/components/ui/label';
 import { Badge } from '@/components/ui/badge';
 import { Skeleton } from '@/components/ui/skeleton';
 import { Combobox } from '@/components/ui/combobox';
-import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger } from '@/components/ui/alert-dialog';
+import { ConfirmModal } from '@/components/ui/modal';
 import { toast } from '@/components/ui/toast-store';
 import { apiFetch } from '@/lib/api';
 import { AdmiralGate } from './AdmiralGate';
@@ -95,6 +95,7 @@ export function RegistriesSection() {
     const [editingId, setEditingId] = useState<number | null>(null);
     const [testingId, setTestingId] = useState<number | null>(null);
     const [testingForm, setTestingForm] = useState(false);
+    const [deleteRegistry, setDeleteRegistry] = useState<RegistryItem | null>(null);
 
     const [formName, setFormName] = useState('');
     const [formUrl, setFormUrl] = useState('');
@@ -422,32 +423,15 @@ export function RegistriesSection() {
                                 <Button variant="ghost" size="sm" onClick={() => startEdit(reg)} title="Edit">
                                     <Pencil className="w-4 h-4" strokeWidth={1.5} />
                                 </Button>
-                                <AlertDialog>
-                                    <AlertDialogTrigger asChild>
-                                        <Button
-                                            variant="ghost"
-                                            size="sm"
-                                            className="text-destructive/60 hover:bg-destructive hover:text-destructive-foreground"
-                                            title="Delete"
-                                        >
-                                            <Trash2 className="w-4 h-4" strokeWidth={1.5} />
-                                        </Button>
-                                    </AlertDialogTrigger>
-                                    <AlertDialogContent>
-                                        <AlertDialogHeader>
-                                            <AlertDialogTitle>Delete registry?</AlertDialogTitle>
-                                            <AlertDialogDescription>
-                                                Deleting <strong>{reg.name}</strong> will remove its stored credentials. Stacks using images from this registry will fail to pull until credentials are re-added.
-                                            </AlertDialogDescription>
-                                        </AlertDialogHeader>
-                                        <AlertDialogFooter>
-                                            <AlertDialogCancel>Cancel</AlertDialogCancel>
-                                            <AlertDialogAction onClick={() => handleDelete(reg.id)} className="bg-destructive text-destructive-foreground hover:bg-destructive/90">
-                                                Delete
-                                            </AlertDialogAction>
-                                        </AlertDialogFooter>
-                                    </AlertDialogContent>
-                                </AlertDialog>
+                                <Button
+                                    variant="ghost"
+                                    size="sm"
+                                    className="text-destructive/60 hover:bg-destructive hover:text-destructive-foreground"
+                                    title="Delete"
+                                    onClick={() => setDeleteRegistry(reg)}
+                                >
+                                    <Trash2 className="w-4 h-4" strokeWidth={1.5} />
+                                </Button>
                             </div>
                         </div>
                         <div className="flex items-center gap-4 text-xs text-stat-subtitle">
@@ -468,6 +452,26 @@ export function RegistriesSection() {
                         </div>
                     </div>
                 ))}
+
+                <ConfirmModal
+                    open={deleteRegistry !== null}
+                    onOpenChange={(open) => { if (!open) setDeleteRegistry(null); }}
+                    variant="destructive"
+                    kicker="REGISTRY · DELETE · IRREVERSIBLE"
+                    title="Delete registry"
+                    confirmLabel="Delete"
+                    onConfirm={() => {
+                        if (deleteRegistry) {
+                            const id = deleteRegistry.id;
+                            setDeleteRegistry(null);
+                            handleDelete(id);
+                        }
+                    }}
+                >
+                    <p className="text-sm text-stat-subtitle">
+                        Removes <span className="font-medium text-stat-value">{deleteRegistry?.name}</span> and its stored credentials. Stacks using images from this registry will fail to pull until credentials are re-added.
+                    </p>
+                </ConfirmModal>
             </div>
           </CapabilityGate>
         </AdmiralGate>
diff --git a/frontend/src/components/settings/CloudBackupSection.tsx b/frontend/src/components/settings/CloudBackupSection.tsx
index 1c4efc37..3704f215 100644
--- a/frontend/src/components/settings/CloudBackupSection.tsx
+++ b/frontend/src/components/settings/CloudBackupSection.tsx
@@ -5,21 +5,12 @@ import { Label } from '@/components/ui/label';
 import { Skeleton } from '@/components/ui/skeleton';
 import { Combobox } from '@/components/ui/combobox';
 import { TogglePill } from '@/components/ui/toggle-pill';
-import {
-    AlertDialog,
-    AlertDialogAction,
-    AlertDialogCancel,
-    AlertDialogContent,
-    AlertDialogDescription,
-    AlertDialogFooter,
-    AlertDialogHeader,
-    AlertDialogTitle,
-} from '@/components/ui/alert-dialog';
+import { ConfirmModal } from '@/components/ui/modal';
 import { toast } from '@/components/ui/toast-store';
 import { apiFetch } from '@/lib/api';
 import { formatBytes } from '@/lib/utils';
 import { AdmiralGate } from '@/components/AdmiralGate';
-import { Cloud, CloudOff, RefreshCw, CheckCircle2, AlertCircle, Loader2, Trash2, Download } from 'lucide-react';
+import { Cloud, CloudOff, RefreshCw, CheckCircle2, Loader2, Trash2, Download } from 'lucide-react';
 import { SettingsPrimaryButton } from './SettingsActions';
 import { useMastheadStats } from './MastheadStatsContext';
 
@@ -521,25 +512,19 @@ export function CloudBackupSection() {
                     </div>
                 )}
 
-                <AlertDialog open={!!deleteKey} onOpenChange={open => !open && setDeleteKey(null)}>
-                    <AlertDialogContent>
-                        <AlertDialogHeader>
-                            <AlertDialogTitle className="flex items-center gap-2">
-                                <AlertCircle className="w-4 h-4 text-destructive" strokeWidth={1.5} />
-                                Delete cloud snapshot?
-                            </AlertDialogTitle>
-                            <AlertDialogDescription>
-                                This permanently removes the archive from your bucket. The local SQLite copy is unaffected.
-                            </AlertDialogDescription>
-                        </AlertDialogHeader>
-                        <AlertDialogFooter>
-                            <AlertDialogCancel>Cancel</AlertDialogCancel>
-                            <AlertDialogAction onClick={confirmDelete} className="bg-destructive text-destructive-foreground hover:bg-destructive/90">
-                                Delete
-                            </AlertDialogAction>
-                        </AlertDialogFooter>
-                    </AlertDialogContent>
-                </AlertDialog>
+                <ConfirmModal
+                    open={!!deleteKey}
+                    onOpenChange={open => !open && setDeleteKey(null)}
+                    variant="destructive"
+                    kicker="CLOUD · DELETE · IRREVERSIBLE"
+                    title="Delete cloud snapshot"
+                    confirmLabel="Delete"
+                    onConfirm={confirmDelete}
+                >
+                    <p className="text-sm text-stat-subtitle">
+                        Permanently removes the archive from your bucket. The local SQLite copy is unaffected.
+                    </p>
+                </ConfirmModal>
             </div>
         </AdmiralGate>
     );
diff --git a/frontend/src/components/settings/UsersSection.tsx b/frontend/src/components/settings/UsersSection.tsx
index 14a14df3..064f6280 100644
--- a/frontend/src/components/settings/UsersSection.tsx
+++ b/frontend/src/components/settings/UsersSection.tsx
@@ -5,10 +5,7 @@ import { Label } from '@/components/ui/label';
 import { Badge } from '@/components/ui/badge';
 import { Skeleton } from '@/components/ui/skeleton';
 import { Combobox } from '@/components/ui/combobox';
-import {
-    AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent,
-    AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, AlertDialogTrigger,
-} from '@/components/ui/alert-dialog';
+import { ConfirmModal } from '@/components/ui/modal';
 import { toast } from '@/components/ui/toast-store';
 import { apiFetch } from '@/lib/api';
 import { useAuth, type UserRole } from '@/context/AuthContext';
@@ -53,6 +50,10 @@ export function UsersSection() {
     const [formConfirmPassword, setFormConfirmPassword] = useState('');
     const [formRole, setFormRole] = useState<UserRole>('viewer');
 
+    // Per-row destructive confirms
+    const [resetMfaTarget, setResetMfaTarget] = useState<UserItem | null>(null);
+    const [deleteTarget, setDeleteTarget] = useState<UserItem | null>(null);
+
     const fetchUsers = async () => {
         try {
             const res = await apiFetch('/users', { localOnly: true });
@@ -455,45 +456,23 @@ export function UsersSection() {
                                                         <Pencil className="w-3.5 h-3.5" strokeWidth={1.5} />
                                                     </Button>
                                                     {u.mfaEnabled && (
-                                                        <AlertDialog>
-                                                            <AlertDialogTrigger asChild>
-                                                                <Button variant="ghost" size="sm" title="Reset 2FA">
-                                                                    <ShieldOff className="w-3.5 h-3.5 text-warning" strokeWidth={1.5} />
-                                                                </Button>
-                                                            </AlertDialogTrigger>
-                                                            <AlertDialogContent>
-                                                                <AlertDialogHeader>
-                                                                    <AlertDialogTitle>Reset two-factor authentication for "{u.username}"?</AlertDialogTitle>
-                                                                    <AlertDialogDescription>
-                                                                        This removes the user's authenticator enrolment and backup codes. They will sign in with just their password on their next login and can re-enrol from their account settings. Use this when a user has lost access to their authenticator.
-                                                                    </AlertDialogDescription>
-                                                                </AlertDialogHeader>
-                                                                <AlertDialogFooter>
-                                                                    <AlertDialogCancel>Cancel</AlertDialogCancel>
-                                                                    <AlertDialogAction onClick={() => handleResetMfa(u.id, u.username)}>Reset 2FA</AlertDialogAction>
-                                                                </AlertDialogFooter>
-                                                            </AlertDialogContent>
-                                                        </AlertDialog>
+                                                        <Button
+                                                            variant="ghost"
+                                                            size="sm"
+                                                            title="Reset 2FA"
+                                                            onClick={() => setResetMfaTarget(u)}
+                                                        >
+                                                            <ShieldOff className="w-3.5 h-3.5 text-warning" strokeWidth={1.5} />
+                                                        </Button>
                                                     )}
-                                                    <AlertDialog>
-                                                        <AlertDialogTrigger asChild>
-                                                            <Button variant="ghost" size="sm" disabled={isSelf}>
-                                                                <Trash2 className="w-3.5 h-3.5 text-destructive" strokeWidth={1.5} />
-                                                            </Button>
-                                                        </AlertDialogTrigger>
-                                                        <AlertDialogContent>
-                                                            <AlertDialogHeader>
-                                                                <AlertDialogTitle>Delete user "{u.username}"?</AlertDialogTitle>
-                                                                <AlertDialogDescription>
-                                                                    This action cannot be undone. The user will lose access immediately.
-                                                                </AlertDialogDescription>
-                                                            </AlertDialogHeader>
-                                                            <AlertDialogFooter>
-                                                                <AlertDialogCancel>Cancel</AlertDialogCancel>
-                                                                <AlertDialogAction onClick={() => handleDelete(u.id)}>Delete</AlertDialogAction>
-                                                            </AlertDialogFooter>
-                                                        </AlertDialogContent>
-                                                    </AlertDialog>
+                                                    <Button
+                                                        variant="ghost"
+                                                        size="sm"
+                                                        disabled={isSelf}
+                                                        onClick={() => setDeleteTarget(u)}
+                                                    >
+                                                        <Trash2 className="w-3.5 h-3.5 text-destructive" strokeWidth={1.5} />
+                                                    </Button>
                                                 </div>
                                             </td>
                                         </tr>
@@ -503,6 +482,45 @@ export function UsersSection() {
                         </table>
                     </div>
                 )}
+
+                <ConfirmModal
+                    open={resetMfaTarget !== null}
+                    onOpenChange={(open) => { if (!open) setResetMfaTarget(null); }}
+                    kicker="USERS · RESET 2FA"
+                    title={`Reset 2FA for ${resetMfaTarget?.username ?? ''}`}
+                    confirmLabel="Reset 2FA"
+                    onConfirm={() => {
+                        if (resetMfaTarget) {
+                            const user = resetMfaTarget;
+                            setResetMfaTarget(null);
+                            handleResetMfa(user.id, user.username);
+                        }
+                    }}
+                >
+                    <p className="text-sm text-stat-subtitle">
+                        Removes the user's authenticator enrolment and backup codes. They will sign in with just their password on their next login and can re-enrol from their account settings. Use this when a user has lost access to their authenticator.
+                    </p>
+                </ConfirmModal>
+
+                <ConfirmModal
+                    open={deleteTarget !== null}
+                    onOpenChange={(open) => { if (!open) setDeleteTarget(null); }}
+                    variant="destructive"
+                    kicker="USERS · DELETE · IRREVERSIBLE"
+                    title={`Delete user "${deleteTarget?.username ?? ''}"`}
+                    confirmLabel="Delete"
+                    onConfirm={() => {
+                        if (deleteTarget) {
+                            const id = deleteTarget.id;
+                            setDeleteTarget(null);
+                            handleDelete(id);
+                        }
+                    }}
+                >
+                    <p className="text-sm text-stat-subtitle">
+                        Removes the user immediately. They lose access right away.
+                    </p>
+                </ConfirmModal>
             </div>
           </CapabilityGate>
         </PaidGate>