diff --git a/apps/web/src/components/ProjectCloneToastCoordinator.tsx b/apps/web/src/components/ProjectCloneToastCoordinator.tsx
index 37003089c794d..f6c80158b89e9 100644
--- a/apps/web/src/components/ProjectCloneToastCoordinator.tsx
+++ b/apps/web/src/components/ProjectCloneToastCoordinator.tsx
@@ -117,6 +117,7 @@ function EnvironmentCloneToasts({ environmentId }: { environmentId: EnvironmentI
               );
             },
           },
+          actionVariant: "outline",
           data: { hideCopyButton: true },
         });
         if (tracked) {
diff --git a/apps/web/src/components/ProviderUpdatePrimaryNotification.tsx b/apps/web/src/components/ProviderUpdatePrimaryNotification.tsx
index 74040e171c5d5..2203d2a40b896 100644
--- a/apps/web/src/components/ProviderUpdatePrimaryNotification.tsx
+++ b/apps/web/src/components/ProviderUpdatePrimaryNotification.tsx
@@ -298,7 +298,7 @@ export function ProviderUpdatePrimaryNotification() {
               children: "Settings",
               onClick: openSettings,
             },
-      actionVariant: "outline",
+      actionVariant: oneClickProviders.length > 0 ? "default" : "outline",
       data: {
         leadingIcon:
           updateProviders.length === 1 ? (
@@ -312,7 +312,7 @@ export function ProviderUpdatePrimaryNotification() {
                 children: "Settings",
                 onClick: openSettings,
               },
-              secondaryActionVariant: "outline" as const,
+              secondaryActionVariant: "ghost" as const,
             }
           : {}),
       },
diff --git a/apps/web/src/components/ThreadTabGroupNameDialog.tsx b/apps/web/src/components/ThreadTabGroupNameDialog.tsx
index cdc1d6a50bb03..ca24a94829f82 100644
--- a/apps/web/src/components/ThreadTabGroupNameDialog.tsx
+++ b/apps/web/src/components/ThreadTabGroupNameDialog.tsx
@@ -69,7 +69,7 @@ function NameDialog({ initial }: { initial: string | null }) {
             />
           </DialogPanel>
           <DialogFooter>
-            <Button type="button" variant="ghost" onClick={() => finish(undefined)}>
+            <Button type="button" variant="outline" onClick={() => finish(undefined)}>
               Cancel
             </Button>
             <Button type="submit">Save</Button>
diff --git a/apps/web/src/components/chat/ChatOverlayHosts.tsx b/apps/web/src/components/chat/ChatOverlayHosts.tsx
index 94dad6e78f9df..d06f748e0681c 100644
--- a/apps/web/src/components/chat/ChatOverlayHosts.tsx
+++ b/apps/web/src/components/chat/ChatOverlayHosts.tsx
@@ -217,7 +217,7 @@ export function RevertConfirmHost(props: {
         </AlertDialogHeader>
         <AlertDialogFooter>
           <AlertDialogClose render={<Button variant="outline" />}>Cancel</AlertDialogClose>
-          <Button variant="destructive" onClick={() => confirm(true)}>
+          <Button variant="destructive-outline" onClick={() => confirm(true)}>
             Revert files too
           </Button>
           <Button onClick={() => confirm(false)}>Revert and keep changes</Button>
diff --git a/apps/web/src/components/chat/MessageCopyButton.tsx b/apps/web/src/components/chat/MessageCopyButton.tsx
index 361f9a6c2a5bc..3171fc5865d79 100644
--- a/apps/web/src/components/chat/MessageCopyButton.tsx
+++ b/apps/web/src/components/chat/MessageCopyButton.tsx
@@ -16,7 +16,6 @@ export const MessageCopyButton = memo(function MessageCopyButton({
   label = "Copy message",
   icon = Copy,
   extraFlavors,
-  size = "xs",
   variant = "outline",
   className,
 }: {
@@ -24,7 +23,6 @@ export const MessageCopyButton = memo(function MessageCopyButton({
   label?: string;
   icon?: typeof Copy;
   extraFlavors?: Readonly<Record<string, string>>;
-  size?: "xs" | "icon-xs";
   variant?: "outline" | "ghost";
   className?: string;
 }) {
@@ -46,7 +44,7 @@ export const MessageCopyButton = memo(function MessageCopyButton({
             onClick={() => copyToClipboard(text)}
             ref={ref}
             type="button"
-            size={size}
+            size="icon-xs"
             variant={variant === "ghost" ? "ghost-muted" : variant}
             className={className}
           />
diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsx
index 3906584dd1e46..dc0da3a1ff9b7 100644
--- a/apps/web/src/components/chat/MessagesTimeline.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.tsx
@@ -162,7 +162,6 @@ import {
   Code2Icon,
   XIcon,
   ZapIcon,
-  RotateCcwIcon,
   MessageSquareTextIcon,
 } from "lucide-react";
 import {
@@ -2645,7 +2644,7 @@ function RevertUserMessageButton({
         render={
           <Button
             type="button"
-            size="xs"
+            size="icon-xs"
             variant="ghost"
             disabled={activity.isRevertingCheckpoint || activity.isWorking}
             onClick={() => ctx.onRevertToTurnCount(turnCount, messageId)}
@@ -2673,7 +2672,7 @@ function ForkMessageButton({
         render={
           <Button
             type="button"
-            size="xs"
+            size="icon-xs"
             variant="ghost"
             onClick={() => onFork(messageId)}
             aria-label="Fork into new tab"
@@ -2848,7 +2847,7 @@ function AssistantForkButton({
         render={
           <Button
             type="button"
-            size="xs"
+            size="icon-xs"
             variant="ghost"
             disabled={busy}
             onClick={() => {
@@ -5667,43 +5666,37 @@ function WorkEntryLogRow(props: WorkEntryRowProps) {
           </span>
         }
         trailing={
-          <TimelineRowTimestamp
-            createdAt={workEntry.createdAt}
-            timestampFormat={timestampFormat}
-            alwaysVisible
-          />
+          // Matches the timestamp's size and centres on the first label line, since wrapLabel top-aligns the row.
+          <span className="flex min-h-6 shrink-0 items-center gap-2 text-xs">
+            {retryRunId !== null && onRetryWorkspacePreparation ? (
+              <InlineButton onClick={() => onRetryWorkspacePreparation(retryRunId)}>
+                Retry
+              </InlineButton>
+            ) : null}
+            <InlineButton
+              tone="muted"
+              render={
+                <Link
+                  to="/settings/diagnostics"
+                  search={{ machine: ctx.activeThreadEnvironmentId }}
+                />
+              }
+            >
+              View diagnostics
+            </InlineButton>
+            <TimelineRowTimestamp
+              createdAt={workEntry.createdAt}
+              timestampFormat={timestampFormat}
+              alwaysVisible
+            />
+          </span>
         }
       >
         {!warning ? (
-          <p className="ms-7 whitespace-pre-wrap break-words py-1 text-sm leading-relaxed text-foreground/80">
+          <p className="ms-7 whitespace-pre-wrap break-words px-0.5 py-1 text-sm leading-relaxed text-foreground/80">
             {failureItem.failure.message}
           </p>
         ) : null}
-        <div className="ms-7 flex flex-wrap gap-2 pb-1">
-          <Button
-            size="xs"
-            variant="outline"
-            render={
-              <Link
-                to="/settings/diagnostics"
-                search={{ machine: ctx.activeThreadEnvironmentId }}
-              />
-            }
-          >
-            View diagnostics
-          </Button>
-          {retryRunId !== null && onRetryWorkspacePreparation ? (
-            <Button
-              type="button"
-              size="xs"
-              variant="outline"
-              onClick={() => onRetryWorkspacePreparation(retryRunId)}
-            >
-              <RotateCcwIcon aria-hidden />
-              Retry
-            </Button>
-          ) : null}
-        </div>
       </WorkLogRow>
     );
   }
@@ -5900,9 +5893,7 @@ function WorkEntryLogRow(props: WorkEntryRowProps) {
       trailing={
         <>
           {createdThread ? (
-            <button
-              type="button"
-              className="shrink-0 rounded-sm text-sm text-primary hover:underline focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring"
+            <InlineButton
               aria-label={`Open ${createdThread.title ?? "created thread"}`}
               onClick={(event) => {
                 event.stopPropagation();
@@ -5911,7 +5902,7 @@ function WorkEntryLogRow(props: WorkEntryRowProps) {
               onKeyDown={stopRowToggle}
             >
               Open chat
-            </button>
+            </InlineButton>
           ) : null}
           {notifiedSubagentThreadId ? (
             <InlineButton
diff --git a/apps/web/src/components/chat/ProposedPlanCard.tsx b/apps/web/src/components/chat/ProposedPlanCard.tsx
index 4edbd103e3d6b..416dccc3df8b5 100644
--- a/apps/web/src/components/chat/ProposedPlanCard.tsx
+++ b/apps/web/src/components/chat/ProposedPlanCard.tsx
@@ -299,10 +299,10 @@ function SavePlanToWorkspaceForm({
         </label>
       </DialogPanel>
       <DialogFooter>
-        <Button variant="outline" size="sm" onClick={onCancel} disabled={saving}>
+        <Button variant="outline" onClick={onCancel} disabled={saving}>
           Cancel
         </Button>
-        <Button size="sm" onClick={() => onSave(savePath)} disabled={!canWriteFiles || saving}>
+        <Button onClick={() => onSave(savePath)} disabled={!canWriteFiles || saving}>
           {saving ? "Saving..." : "Save"}
         </Button>
       </DialogFooter>
diff --git a/apps/web/src/components/chat/SecretRequestCard.tsx b/apps/web/src/components/chat/SecretRequestCard.tsx
index 1c84c5f111cd2..7f9fb52d8e954 100644
--- a/apps/web/src/components/chat/SecretRequestCard.tsx
+++ b/apps/web/src/components/chat/SecretRequestCard.tsx
@@ -137,33 +137,27 @@ function PendingSecretRequestForm(props: {
             onChange={(event) => setSecret(event.currentTarget.value)}
           />
         </div>
-        <Button type="submit" disabled={submitting || secret.trim().length === 0}>
-          Save securely
-        </Button>
-      </div>
-      {error !== null ? (
-        <p id={errorId} role="alert" className="text-xs text-destructive">
-          {error}
-        </p>
-      ) : null}
-      <div className="flex min-w-0 items-center justify-between gap-2">
-        <p
-          id={privacyId}
-          className="flex min-w-0 items-center gap-1.5 text-xs text-muted-foreground"
-        >
-          <ShieldCheckIcon className="size-3.5 shrink-0" aria-hidden />
-          {SECRET_REQUEST_PRIVACY_NOTE}
-        </p>
         <Button
           type="button"
-          size="xs"
           variant="ghost-muted"
           disabled={submitting}
           onClick={() => void send({ type: "decline" })}
         >
           Decline
         </Button>
+        <Button type="submit" disabled={submitting || secret.trim().length === 0}>
+          Save securely
+        </Button>
       </div>
+      {error !== null ? (
+        <p id={errorId} role="alert" className="text-xs text-destructive">
+          {error}
+        </p>
+      ) : null}
+      <p id={privacyId} className="flex min-w-0 items-center gap-1.5 text-xs text-muted-foreground">
+        <ShieldCheckIcon className="size-3.5 shrink-0" aria-hidden />
+        {SECRET_REQUEST_PRIVACY_NOTE}
+      </p>
     </form>
   );
 }
diff --git a/apps/web/src/components/chat/ThreadDetailsPrRow.tsx b/apps/web/src/components/chat/ThreadDetailsPrRow.tsx
index 6b29ffa1f4eb8..992b124b9d935 100644
--- a/apps/web/src/components/chat/ThreadDetailsPrRow.tsx
+++ b/apps/web/src/components/chat/ThreadDetailsPrRow.tsx
@@ -462,11 +462,8 @@ export function ThreadDetailsPrRow({
               </AlertDialogDescription>
             </AlertDialogHeader>
             <AlertDialogFooter>
-              <AlertDialogClose render={<Button variant="outline" size="sm" />}>
-                Cancel
-              </AlertDialogClose>
+              <AlertDialogClose render={<Button variant="outline" />}>Cancel</AlertDialogClose>
               <Button
-                size="sm"
                 disabled={actionPending}
                 onClick={() => {
                   setConfirmingMerge(false);
diff --git a/apps/web/src/components/chat/ThreadLinkedCheckouts.tsx b/apps/web/src/components/chat/ThreadLinkedCheckouts.tsx
index 2bbf2c344ed55..5e28465f50c73 100644
--- a/apps/web/src/components/chat/ThreadLinkedCheckouts.tsx
+++ b/apps/web/src/components/chat/ThreadLinkedCheckouts.tsx
@@ -75,36 +75,35 @@ export function ThreadLinkedCheckouts(props: { environmentId: EnvironmentId; thr
                 <div className="truncate text-xs">{link.name}</div>
                 <div className="truncate text-muted-foreground text-xs">{detail}</div>
                 {missing ? (
-                  <div className="mt-1 flex items-center gap-1 text-warning text-xs">
-                    <span className="min-w-0 flex-1">Folder not found</span>
-                    <Button
-                      type="button"
-                      size="xs"
-                      variant="outline"
-                      onClick={() =>
-                        openCheckoutAttachPicker(threadRef, { relocateFrom: link.path })
-                      }
-                    >
-                      Locate
-                    </Button>
-                    <Button
-                      type="button"
-                      size="xs"
-                      variant="outline"
-                      onClick={() =>
-                        void unlink({
-                          environmentId: props.environmentId,
-                          input: { threadId: props.threadId, path: link.path },
-                        })
-                      }
-                    >
-                      Unlink
-                    </Button>
-                  </div>
+                  <div className="truncate text-warning text-xs">Folder not found</div>
                 ) : null}
               </div>
-              {missing ? null : (
-                <div className="flex opacity-0 group-hover:opacity-100">
+              {missing ? (
+                <div className="flex shrink-0 items-center gap-0.5">
+                  <Button
+                    type="button"
+                    size="xs"
+                    variant="ghost-muted"
+                    onClick={() => openCheckoutAttachPicker(threadRef, { relocateFrom: link.path })}
+                  >
+                    Locate
+                  </Button>
+                  <Button
+                    type="button"
+                    size="xs"
+                    variant="ghost-muted"
+                    onClick={() =>
+                      void unlink({
+                        environmentId: props.environmentId,
+                        input: { threadId: props.threadId, path: link.path },
+                      })
+                    }
+                  >
+                    Unlink
+                  </Button>
+                </div>
+              ) : (
+                <div className="flex opacity-0 group-focus-within:opacity-100 group-hover:opacity-100">
                   <Button
                     type="button"
                     size="icon-xs"
diff --git a/apps/web/src/components/chat/UsageLimitRecoveryBanner.tsx b/apps/web/src/components/chat/UsageLimitRecoveryBanner.tsx
index 9fe4b4d3f114f..fb0b1530071e1 100644
--- a/apps/web/src/components/chat/UsageLimitRecoveryBanner.tsx
+++ b/apps/web/src/components/chat/UsageLimitRecoveryBanner.tsx
@@ -70,7 +70,10 @@ function RecoveryActions({
   onResumeNow,
   continueElsewhere,
 }: RecoveryProps) {
-  const [pending, setPending] = useState(false);
+  const [pendingAction, setPendingAction] = useState<"resume-now" | "resume" | "snooze" | null>(
+    null,
+  );
+  const pending = pendingAction !== null;
   const [nowMs, setNowMs] = useState(() => Date.now());
   useEffect(() => {
     const delay = Date.parse(resetAt ?? "") - Math.max(nowMs, Date.now());
@@ -89,8 +92,12 @@ function RecoveryActions({
     resetAt !== null &&
     snoozedUntil !== null &&
     Date.parse(snoozedUntil) === Date.parse(resetAt);
-  async function run(action: () => Promise<void>, failureTitle: string) {
-    setPending(true);
+  async function run(
+    key: NonNullable<typeof pendingAction>,
+    action: () => Promise<void>,
+    failureTitle: string,
+  ) {
+    setPendingAction(key);
     try {
       await action();
     } catch (cause) {
@@ -100,7 +107,7 @@ function RecoveryActions({
         description: cause instanceof Error ? cause.message : "An error occurred.",
       });
     }
-    setPending(false);
+    setPendingAction(null);
   }
   function toggle(action: "resume" | "snooze") {
     if (resetAt === null) return;
@@ -114,6 +121,7 @@ function RecoveryActions({
       return;
     }
     void run(
+      action,
       () =>
         onChange({
           runId,
@@ -132,14 +140,18 @@ function RecoveryActions({
           size="xs"
           variant="ghost"
           disabled={pending}
-          onClick={() => void run(onResumeNow, "Could not resume thread")}
+          onClick={() => void run("resume-now", onResumeNow, "Could not resume thread")}
         >
           Resume now
         </Button>
       ) : null}
       {canSchedule ? (
         <Button size="xs" variant="ghost" disabled={pending} onClick={() => toggle("resume")}>
-          {pending ? "Saving..." : scheduled ? "Cancel auto-resume" : "Resume at reset"}
+          {pendingAction === "resume"
+            ? "Saving..."
+            : scheduled
+              ? "Cancel auto-resume"
+              : "Resume at reset"}
         </Button>
       ) : null}
       {canSchedule && !snoozed ? (
@@ -149,7 +161,7 @@ function RecoveryActions({
           disabled={pending || Date.parse(resetAt!) <= nowMs}
           onClick={() => toggle("snooze")}
         >
-          {pending ? "Saving..." : "Snooze until reset"}
+          {pendingAction === "snooze" ? "Saving..." : "Snooze until reset"}
         </Button>
       ) : null}
       {continueElsewhere ? (
diff --git a/apps/web/src/components/chat/WorktreeSetupCard.tsx b/apps/web/src/components/chat/WorktreeSetupCard.tsx
index 0bc01ea857136..e46c0b9378464 100644
--- a/apps/web/src/components/chat/WorktreeSetupCard.tsx
+++ b/apps/web/src/components/chat/WorktreeSetupCard.tsx
@@ -365,7 +365,9 @@ export function WorktreeSetupCard({
 
       {detailsOpen ? <SetupDetails snapshot={snapshot} /> : null}
 
-      <div className="mt-0.5 ml-[calc(--spacing(6)+2px-(--spacing(2)-1px))] flex flex-wrap items-center gap-0.5">
+      {/* Ghost xs buttons inset their leading icon by 6px, so ml-6.5 lines it up
+          with the ml-8 error, output and details above. */}
+      <div className="mt-0.5 ml-6.5 flex flex-wrap items-center gap-0.5">
         <Button
           type="button"
           size="xs"
diff --git a/apps/web/src/components/cloud/CloudEnvironmentConnectList.tsx b/apps/web/src/components/cloud/CloudEnvironmentConnectList.tsx
index 20510fc134323..7d54f27688a1e 100644
--- a/apps/web/src/components/cloud/CloudEnvironmentConnectList.tsx
+++ b/apps/web/src/components/cloud/CloudEnvironmentConnectList.tsx
@@ -287,18 +287,17 @@ export function CloudEnvironmentConnectRows({
     if (discoveryProblem !== null && !environmentsState.refreshing) {
       return (
         <div className={ITEM_ROW_CLASSNAME}>
-          <p className="text-sm font-medium text-destructive">
-            Could not load T3 Connect environments
-          </p>
-          <p className="mt-1 text-xs text-muted-foreground">{discoveryProblem}</p>
-          <Button
-            size="sm"
-            variant="outline"
-            className="mt-3"
-            onClick={() => void refreshRelayEnvironments()}
-          >
-            Try again
-          </Button>
+          <div className={ITEM_ROW_INNER_CLASSNAME}>
+            <div className="min-w-0">
+              <p className="text-sm font-medium text-destructive">
+                Could not load T3 Connect environments
+              </p>
+              <p className="mt-1 text-xs text-muted-foreground">{discoveryProblem}</p>
+            </div>
+            <Button size="sm" variant="outline" onClick={() => void refreshRelayEnvironments()}>
+              Try again
+            </Button>
+          </div>
         </div>
       );
     }
diff --git a/apps/web/src/components/diffs/DiffCommentAnnotation.tsx b/apps/web/src/components/diffs/DiffCommentAnnotation.tsx
index fb68d816f18ef..486ef9d6795bc 100644
--- a/apps/web/src/components/diffs/DiffCommentAnnotation.tsx
+++ b/apps/web/src/components/diffs/DiffCommentAnnotation.tsx
@@ -150,7 +150,7 @@ export function DiffCommentAnnotation({
           </TooltipTrigger>
           <TooltipPopup side="top">{shortcutHint}</TooltipPopup>
         </Tooltip>
-        <Button variant="ghost-muted" size="xs" onClick={onCancel}>
+        <Button variant="ghost" size="xs" onClick={onCancel}>
           Cancel
         </Button>
         {onComment ? (
diff --git a/apps/web/src/components/onboarding/WelcomeWizard.tsx b/apps/web/src/components/onboarding/WelcomeWizard.tsx
index 97724dc98ca18..30aaa299271df 100644
--- a/apps/web/src/components/onboarding/WelcomeWizard.tsx
+++ b/apps/web/src/components/onboarding/WelcomeWizard.tsx
@@ -435,7 +435,7 @@ function ConnectionStep({
           .
         </p>
         <Button
-          className="shrink-0 self-end"
+          className="shrink-0 self-end sm:self-auto"
           ref={continueRef}
           autoFocus={!expandPairingInitially}
           disabled={!ready || isPairing}
diff --git a/apps/web/src/components/projectScriptEditor.tsx b/apps/web/src/components/projectScriptEditor.tsx
index b3ea5301be830..7ab3c0e523971 100644
--- a/apps/web/src/components/projectScriptEditor.tsx
+++ b/apps/web/src/components/projectScriptEditor.tsx
@@ -429,7 +429,8 @@ function ProjectScriptEditorForm({
                       <Button
                         type="button"
                         variant="outline"
-                        className="size-9 shrink-0"
+                        size="icon"
+                        className="shrink-0"
                         aria-label="Choose icon"
                       />
                     }
@@ -554,7 +555,7 @@ function ProjectScriptEditorForm({
           <Button
             type="button"
             variant="destructive-outline"
-            className="mr-auto"
+            className="sm:mr-auto"
             disabled={isSaving || !canEditActions}
             onClick={() => onRequestDelete(name)}
           >
diff --git a/apps/web/src/components/pullRequest/PullRequestCommentForm.tsx b/apps/web/src/components/pullRequest/PullRequestCommentForm.tsx
index de1114fa985a6..98d2d82cd0902 100644
--- a/apps/web/src/components/pullRequest/PullRequestCommentForm.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestCommentForm.tsx
@@ -129,7 +129,6 @@ export function PullRequestCommentForm({
         )}
         <Button
           size="xs"
-          variant="outline"
           disabled={body.trim().length === 0 || submitting !== null || actionPending}
           onClick={() => void submit("comment")}
         >
diff --git a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
index d766ce75ded17..1dc889834b670 100644
--- a/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
@@ -2566,7 +2566,6 @@ export function PullRequestDetailPanel({
                         </Button>
                         <Button
                           size="xs"
-                          variant="outline"
                           disabled={
                             !canWriteSourceControl || titleSaving || titleDraft.trim().length === 0
                           }
diff --git a/apps/web/src/components/pullRequest/PullRequestMarkdownEditor.tsx b/apps/web/src/components/pullRequest/PullRequestMarkdownEditor.tsx
index c2b49d52b5c18..4cae13f79e1f4 100644
--- a/apps/web/src/components/pullRequest/PullRequestMarkdownEditor.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestMarkdownEditor.tsx
@@ -124,7 +124,6 @@ export function PullRequestMarkdownEditor({
         </Button>
         <Button
           size="xs"
-          variant="outline"
           disabled={!canWriteSourceControl || saving || (empty && !allowEmpty)}
           onClick={() => {
             if (
diff --git a/apps/web/src/components/pullRequest/PullRequestStackMenu.tsx b/apps/web/src/components/pullRequest/PullRequestStackMenu.tsx
index dd4dc73e77ad6..0b582180275e8 100644
--- a/apps/web/src/components/pullRequest/PullRequestStackMenu.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestStackMenu.tsx
@@ -202,7 +202,7 @@ export function PullRequestStackMenu({
             render={
               <span className="inline-flex">
                 <Button
-                  variant="default"
+                  variant="outline"
                   size="xs"
                   disabled={mergeDisabled}
                   onClick={() => setConfirmation("merge")}
diff --git a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
index a4de041d04618..de9c7eab08196 100644
--- a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
@@ -450,7 +450,7 @@ function ReviewThreadEntry({
                       ) : null}
                       {canResolve ? (
                         <Button
-                          size="xs"
+                          size="compact"
                           variant="outline"
                           className="ml-auto shrink-0"
                           disabled={pending}
diff --git a/apps/web/src/components/settings/AgentAccessSettings.tsx b/apps/web/src/components/settings/AgentAccessSettings.tsx
index e13c973628c31..fef7db97fd7e1 100644
--- a/apps/web/src/components/settings/AgentAccessSettings.tsx
+++ b/apps/web/src/components/settings/AgentAccessSettings.tsx
@@ -190,7 +190,7 @@ function CreateAgentTokenDialog() {
     >
       <DialogTrigger
         render={
-          <Button size="xs" variant="default">
+          <Button size="xs" variant="ghost-muted">
             <PlusIcon className="size-3" />
             Create token
           </Button>
diff --git a/apps/web/src/components/settings/CodexSetupSection.tsx b/apps/web/src/components/settings/CodexSetupSection.tsx
index caa2ec9138e4b..9945f46fe2713 100644
--- a/apps/web/src/components/settings/CodexSetupSection.tsx
+++ b/apps/web/src/components/settings/CodexSetupSection.tsx
@@ -908,6 +908,7 @@ function ManagedCodexSetup({
               </Button>
             ) : authenticated ? (
               <>
+                <ChatGptUsageButton />
                 <Button
                   size="sm"
                   variant="outline"
@@ -960,11 +961,6 @@ function ManagedCodexSetup({
           </div>
         }
       />
-      {authenticated ? (
-        <div className="flex justify-end px-3 py-1 sm:px-4">
-          <ChatGptUsageButton />
-        </div>
-      ) : null}
       {logoutWarning ? (
         <p role="alert" className="px-3 py-2 text-xs text-muted-foreground sm:px-4">
           {logoutWarning}
diff --git a/apps/web/src/components/settings/ConnectionsSettings.tsx b/apps/web/src/components/settings/ConnectionsSettings.tsx
index 9553be3b6cf75..6efb03ceeb6a8 100644
--- a/apps/web/src/components/settings/ConnectionsSettings.tsx
+++ b/apps/web/src/components/settings/ConnectionsSettings.tsx
@@ -808,14 +808,12 @@ const PairingLinkListRow = memo(function PairingLinkListRow({
                 ) : null}
               </DialogPanel>
               <DialogFooter variant="bare">
-                <Button variant="outline" onClick={() => setIsRevealDialogOpen(false)}>
-                  Done
-                </Button>
                 {canCopyToClipboard ? (
                   <Button variant="outline" onClick={handleCopyCode}>
                     Copy code
                   </Button>
                 ) : null}
+                <Button onClick={() => setIsRevealDialogOpen(false)}>Done</Button>
               </DialogFooter>
             </DialogPopup>
           </Dialog>
@@ -1091,7 +1089,7 @@ const AuthorizedClientsHeaderAction = memo(function AuthorizedClientsHeaderActio
       >
         <DialogTrigger
           render={
-            <Button size="xs" variant="default">
+            <Button size="xs" variant="ghost-muted">
               <PlusIcon className="size-3" />
               Create link
             </Button>
@@ -2854,15 +2852,6 @@ export function ConnectionsSettings() {
       ) : null}
       {renderRemoteFields()}
       {savedBackendError ? <p className="text-xs text-destructive">{savedBackendError}</p> : null}
-      <Button
-        variant="outline"
-        className="w-full"
-        disabled={isAddingSavedBackend}
-        onClick={() => void handleAddSavedBackend()}
-      >
-        <PlusIcon className="size-3.5" />
-        {isAddingSavedBackend ? "Adding…" : routeTarget ? "Add route" : "Add environment"}
-      </Button>
     </div>
   );
   const renderSshFields = () => (
@@ -2975,15 +2964,6 @@ export function ConnectionsSettings() {
             <AlertDescription>{savedBackendError ?? discoveredSshHostsError}</AlertDescription>
           </Alert>
         ) : null}
-        <Button
-          variant="outline"
-          className="w-full"
-          disabled={isAddingSavedBackend}
-          onClick={() => void handleAddSavedBackend()}
-        >
-          <PlusIcon className="size-3.5" />
-          {isAddingSavedBackend ? "Adding…" : routeTarget ? "Add route" : "Add environment"}
-        </Button>
       </div>
     </div>
   );
@@ -3915,6 +3895,24 @@ export function ConnectionsSettings() {
                     </AnimatedHeight>
                   </div>
                 </DialogPanel>
+                <DialogFooter>
+                  <DialogClose
+                    disabled={isAddingSavedBackend}
+                    render={<Button variant="outline" disabled={isAddingSavedBackend} />}
+                  >
+                    Cancel
+                  </DialogClose>
+                  <Button
+                    disabled={isAddingSavedBackend}
+                    onClick={() => void handleAddSavedBackend()}
+                  >
+                    {isAddingSavedBackend
+                      ? "Adding…"
+                      : routeTarget
+                        ? "Add route"
+                        : "Add environment"}
+                  </Button>
+                </DialogFooter>
               </DialogPopup>
             </Dialog>
           </div>
diff --git a/apps/web/src/components/settings/NotionSettings.tsx b/apps/web/src/components/settings/NotionSettings.tsx
index a071b9afd3fb0..3b09b61fa30b0 100644
--- a/apps/web/src/components/settings/NotionSettings.tsx
+++ b/apps/web/src/components/settings/NotionSettings.tsx
@@ -241,6 +241,19 @@ function NotionConnectionRows({
                   Change credentials
                 </Button>
               ) : null}
+              {editingCredentials ? (
+                <Button
+                  size="sm"
+                  variant="ghost"
+                  onClick={() => {
+                    setEditingCredentials(false);
+                    setClientIdDraft(null);
+                    setClientSecretDraft("");
+                  }}
+                >
+                  Cancel
+                </Button>
+              ) : null}
               <Button size="sm" disabled={pending || !canConnect} onClick={connect}>
                 {state.phase === "failed" ? "Reconnect Notion" : "Connect Notion"}
               </Button>
@@ -318,21 +331,6 @@ function NotionConnectionRows({
                 />
               </div>
             </div>
-            {editingCredentials ? (
-              <div className="flex justify-end">
-                <Button
-                  size="xs"
-                  variant="ghost"
-                  onClick={() => {
-                    setEditingCredentials(false);
-                    setClientIdDraft(null);
-                    setClientSecretDraft("");
-                  }}
-                >
-                  Cancel
-                </Button>
-              </div>
-            ) : null}
           </form>
         ) : null}
       </SettingsRow>
diff --git a/apps/web/src/components/settings/ResourceTelemetryDiagnostics.tsx b/apps/web/src/components/settings/ResourceTelemetryDiagnostics.tsx
index 04085b99fdf97..ab010bae60426 100644
--- a/apps/web/src/components/settings/ResourceTelemetryDiagnostics.tsx
+++ b/apps/web/src/components/settings/ResourceTelemetryDiagnostics.tsx
@@ -964,13 +964,13 @@ export function ResourceTelemetryDiagnostics({
               <TooltipTrigger
                 render={
                   <Button
-                    size="icon-micro"
-                    variant="ghost"
+                    size="icon-xs"
+                    variant="ghost-muted"
                     disabled={telemetry.isPending}
                     onClick={telemetry.refresh}
                     aria-label="Refresh resource telemetry"
                   >
-                    <RefreshIcon size="xs" refreshing={telemetry.isPending} />
+                    <RefreshIcon refreshing={telemetry.isPending} />
                   </Button>
                 }
               />
@@ -1213,13 +1213,13 @@ export function ResourceTelemetryDiagnostics({
           <div className="flex items-center gap-2">
             <HistoryWindowSelector selectedWindowMs={windowMs} onSelect={setWindowMs} />
             <Button
-              size="icon-micro"
-              variant="ghost"
+              size="icon-xs"
+              variant="ghost-muted"
               disabled={history.isPending}
               onClick={history.refresh}
               aria-label="Refresh resource history"
             >
-              <RefreshIcon size="xs" refreshing={history.isPending} />
+              <RefreshIcon refreshing={history.isPending} />
             </Button>
           </div>
         }
diff --git a/apps/web/src/components/settings/ThemeImportDialog.tsx b/apps/web/src/components/settings/ThemeImportDialog.tsx
index 671dee55b63db..3f9c62db1f05c 100644
--- a/apps/web/src/components/settings/ThemeImportDialog.tsx
+++ b/apps/web/src/components/settings/ThemeImportDialog.tsx
@@ -21,7 +21,15 @@ import {
 } from "../../vscodeThemeImport";
 import { Alert } from "../ui/alert";
 import { Button } from "../ui/button";
-import { Dialog, DialogHeader, DialogPanel, DialogPopup, DialogTitle } from "../ui/dialog";
+import {
+  Dialog,
+  DialogClose,
+  DialogFooter,
+  DialogHeader,
+  DialogPanel,
+  DialogPopup,
+  DialogTitle,
+} from "../ui/dialog";
 import { ThemeSearchSection } from "./ThemeSearchSection";
 
 /**
@@ -459,27 +467,11 @@ export function ThemeImportDialog({
             );
             if (conflicts) {
               return (
-                <div className="space-y-3">
-                  <div className="rounded-xl border border-border/70 bg-muted/20 p-3">
-                    <p className="text-sm font-medium">Already installed</p>
-                    <p className="mt-1 text-xs text-muted-foreground">
-                      {conflicts.map((theme) => theme.label).join(", ")}
-                    </p>
-                  </div>
-                  <div className="flex flex-wrap items-center gap-2">
-                    <Button size="sm" onClick={() => resolveConflicts("update")}>
-                      Update existing
-                    </Button>
-                    <Button size="sm" variant="outline" onClick={() => resolveConflicts("copy")}>
-                      Keep both
-                    </Button>
-                    <Button size="sm" variant="ghost" onClick={() => setConflicts(null)}>
-                      Back
-                    </Button>
-                    <Button size="sm" variant="ghost" onClick={() => onOpenChange(false)}>
-                      Cancel
-                    </Button>
-                  </div>
+                <div className="rounded-xl border border-border/70 bg-muted/20 p-3">
+                  <p className="text-sm font-medium">Already installed</p>
+                  <p className="mt-1 text-xs text-muted-foreground">
+                    {conflicts.map((theme) => theme.label).join(", ")}
+                  </p>
                 </div>
               );
             }
@@ -502,15 +494,6 @@ export function ThemeImportDialog({
                   {fileInput}
                 </div>
                 {editorSection()}
-                <div className="flex flex-col-reverse gap-2 sm:flex-row sm:justify-end">
-                  <Button variant="ghost" onClick={() => onOpenChange(false)}>
-                    Cancel
-                  </Button>
-                  <Button disabled={!json.trim() || isReading} onClick={handleSubmit}>
-                    <PlusIcon />
-                    Add theme
-                  </Button>
-                </div>
               </div>
             );
           })()}
@@ -521,6 +504,25 @@ export function ThemeImportDialog({
             </Alert>
           ) : null}
         </DialogPanel>
+        <DialogFooter>
+          <DialogClose render={<Button variant="outline" />}>Cancel</DialogClose>
+          {conflicts ? (
+            <>
+              <Button variant="ghost" onClick={() => setConflicts(null)}>
+                Back
+              </Button>
+              <Button variant="outline" onClick={() => resolveConflicts("copy")}>
+                Keep both
+              </Button>
+              <Button onClick={() => resolveConflicts("update")}>Update existing</Button>
+            </>
+          ) : (
+            <Button disabled={!json.trim() || isReading} onClick={handleSubmit}>
+              <PlusIcon />
+              Add theme
+            </Button>
+          )}
+        </DialogFooter>
       </DialogPopup>
     </Dialog>
   );
diff --git a/apps/web/src/components/settings/UsageProviderSettings.tsx b/apps/web/src/components/settings/UsageProviderSettings.tsx
index bab7ddd9c52a6..c94f59c8a7bf4 100644
--- a/apps/web/src/components/settings/UsageProviderSettings.tsx
+++ b/apps/web/src/components/settings/UsageProviderSettings.tsx
@@ -65,7 +65,7 @@ export function UsageProviderSettings({
         {...searchableSetting("usage-providers")}
         headerAction={
           !readOnly ? (
-            <Button size="xs" variant="outline" onClick={() => setAdding(true)}>
+            <Button size="xs" variant="ghost-muted" onClick={() => setAdding(true)}>
               <PlusIcon className="size-3" aria-hidden />
               Add hub
             </Button>
diff --git a/apps/web/src/components/usage/UsagePage.tsx b/apps/web/src/components/usage/UsagePage.tsx
index 398aea325a5e4..1808c3a6a2b5f 100644
--- a/apps/web/src/components/usage/UsagePage.tsx
+++ b/apps/web/src/components/usage/UsagePage.tsx
@@ -1273,8 +1273,8 @@ function CursorEnableLimits({
         />
         Cursor
       </h2>
-      <div className="flex flex-col items-start gap-3 rounded-lg border border-border/60 p-4">
-        <p className="text-xs text-muted-foreground">{CURSOR_KEYCHAIN_COPY}</p>
+      <div className="flex flex-wrap items-center justify-between gap-3 rounded-lg border border-border/60 p-4">
+        <p className="min-w-0 flex-1 text-xs text-muted-foreground">{CURSOR_KEYCHAIN_COPY}</p>
         <div className="flex flex-wrap gap-2">
           {environments.map((environment) => (
             <CursorEnableButton