diff --git a/apps/emdash-desktop/src/renderer/features/browser/browser-start-page.tsx b/apps/emdash-desktop/src/renderer/features/browser/browser-start-page.tsx
index 065d653651..99d2c81ff4 100644
--- a/apps/emdash-desktop/src/renderer/features/browser/browser-start-page.tsx
+++ b/apps/emdash-desktop/src/renderer/features/browser/browser-start-page.tsx
@@ -23,7 +23,7 @@ export function BrowserStartPage({
                 <button
                   key={url}
                   type="button"
-                  className="group focus-visible:ring-ring/50 flex min-h-16 w-full items-center gap-3 rounded-lg border border-border bg-background px-4 py-3 text-left transition-colors hover:border-border hover:bg-background-secondary focus-visible:ring-3 focus-visible:outline-none"
+                  className="group flex min-h-16 w-full items-center gap-3 rounded-lg border border-border bg-background px-4 py-3 text-left transition-colors hover:border-border hover:bg-background-secondary focus-visible:ring-3 focus-visible:ring-ring/50 focus-visible:outline-none"
                   onClick={() => onOpenUrl(url)}
                 >
                   <span className="flex size-9 shrink-0 items-center justify-center rounded-md border border-border bg-background-secondary text-foreground-info">
diff --git a/apps/emdash-desktop/src/renderer/features/mcp/components/McpModal.tsx b/apps/emdash-desktop/src/renderer/features/mcp/components/McpModal.tsx
index 3c843eda5b..71372a5dd8 100644
--- a/apps/emdash-desktop/src/renderer/features/mcp/components/McpModal.tsx
+++ b/apps/emdash-desktop/src/renderer/features/mcp/components/McpModal.tsx
@@ -197,7 +197,7 @@ export const McpModal: React.FC<McpModalProps> = ({
                             disabled={isCatalog}
                             placeholder={'-y\nmy-mcp-server'}
                             rows={3}
-                            className="border-input placeholder:text-muted-foreground focus-visible:ring-ring flex w-full rounded-md border bg-background px-3 py-2 text-sm ring-offset-background focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
+                            className="border-input placeholder:text-muted-foreground flex w-full rounded-md border bg-background px-3 py-2 text-sm ring-offset-background focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-50"
                           />
                         </Field>
                       )}
diff --git a/apps/emdash-desktop/src/renderer/features/onboarding/sign-in-step.tsx b/apps/emdash-desktop/src/renderer/features/onboarding/sign-in-step.tsx
index 9bce857634..9ae605f5c2 100644
--- a/apps/emdash-desktop/src/renderer/features/onboarding/sign-in-step.tsx
+++ b/apps/emdash-desktop/src/renderer/features/onboarding/sign-in-step.tsx
@@ -59,7 +59,7 @@ export function SignInStep({ onComplete }: { onComplete: () => void }) {
                 <User className="h-7 w-7 text-foreground-muted" />
               </div>
             )}
-            <CheckCircle className="text-primary absolute -right-1 -bottom-1 h-5 w-5 fill-background" />
+            <CheckCircle className="absolute -right-1 -bottom-1 h-5 w-5 fill-background text-primary" />
           </div>
           <div className="flex flex-col items-center justify-center gap-1">
             <h1 className="text-center text-xl">Connected as @{user.username}</h1>
diff --git a/apps/emdash-desktop/src/renderer/features/projects/components/add-project-modal/remote-directory-selector.tsx b/apps/emdash-desktop/src/renderer/features/projects/components/add-project-modal/remote-directory-selector.tsx
index 093689aa9f..f896886d55 100644
--- a/apps/emdash-desktop/src/renderer/features/projects/components/add-project-modal/remote-directory-selector.tsx
+++ b/apps/emdash-desktop/src/renderer/features/projects/components/add-project-modal/remote-directory-selector.tsx
@@ -330,7 +330,7 @@ export function RemoteDirectorySelector({
                 <FileCode className="text-muted-foreground h-4 w-4 shrink-0" />
               )}
               <span className="min-w-0 flex-1 truncate">{entry.name}</span>
-              {isSelectedPath && <Check className="text-primary h-4 w-4 shrink-0" />}
+              {isSelectedPath && <Check className="h-4 w-4 shrink-0 text-primary" />}
               {entry.type === 'file' && (
                 <span className="text-muted-foreground text-xs">
                   {(entry.size / 1024).toFixed(1)} KB
diff --git a/apps/emdash-desktop/src/renderer/features/settings/components/IntegrationDetailSidebar.tsx b/apps/emdash-desktop/src/renderer/features/settings/components/IntegrationDetailSidebar.tsx
index a81d8a4004..623f4ab907 100644
--- a/apps/emdash-desktop/src/renderer/features/settings/components/IntegrationDetailSidebar.tsx
+++ b/apps/emdash-desktop/src/renderer/features/settings/components/IntegrationDetailSidebar.tsx
@@ -139,7 +139,7 @@ function AddAccountCard({
       type="button"
       onClick={integration.onConnect}
       disabled={integration.isMutating}
-      className="focus-visible:ring-ring flex w-full items-center gap-3 rounded-lg border border-dashed border-border/70 p-3 text-left transition-colors hover:border-border hover:bg-background-1 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-background focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-60"
+      className="flex w-full items-center gap-3 rounded-lg border border-dashed border-border/70 p-3 text-left transition-colors hover:border-border hover:bg-background-1 focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-60"
       aria-label={`Add ${integration.name} account`}
     >
       <div className="flex h-9 w-9 shrink-0 items-center justify-center">
diff --git a/apps/emdash-desktop/src/renderer/features/settings/components/IntegrationRow.tsx b/apps/emdash-desktop/src/renderer/features/settings/components/IntegrationRow.tsx
index c28dad2878..2582fe471f 100644
--- a/apps/emdash-desktop/src/renderer/features/settings/components/IntegrationRow.tsx
+++ b/apps/emdash-desktop/src/renderer/features/settings/components/IntegrationRow.tsx
@@ -162,7 +162,7 @@ const IntegrationRow: React.FC<IntegrationRowProps> = ({
           <button
             type="button"
             onClick={onNameClick}
-            className="group focus-visible:ring-ring flex items-center gap-1 text-sm font-medium text-foreground transition focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-background focus-visible:outline-none"
+            className="group flex items-center gap-1 text-sm font-medium text-foreground transition focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background focus-visible:outline-none"
           >
             <span>{name}</span>
             <span className="text-muted-foreground text-xs transition group-hover:text-foreground/80">
diff --git a/apps/emdash-desktop/src/renderer/features/settings/components/UpdateCard.tsx b/apps/emdash-desktop/src/renderer/features/settings/components/UpdateCard.tsx
index 1ded4d6b15..2a0d9bad39 100644
--- a/apps/emdash-desktop/src/renderer/features/settings/components/UpdateCard.tsx
+++ b/apps/emdash-desktop/src/renderer/features/settings/components/UpdateCard.tsx
@@ -53,7 +53,7 @@ export const UpdateCard = observer(function UpdateCard(): React.JSX.Element {
       {update.state.status === 'downloading' && downloadProgress && (
         <div className="bg-muted h-1.5 w-full overflow-hidden rounded-full">
           <div
-            className="bg-primary h-full transition-all duration-300 ease-out"
+            className="h-full bg-primary transition-all duration-300 ease-out"
             style={{ width: `${downloadProgress.percent || 0}%` }}
           />
         </div>
diff --git a/apps/emdash-desktop/src/renderer/features/tasks/task-config/existing-workspace-picker.tsx b/apps/emdash-desktop/src/renderer/features/tasks/task-config/existing-workspace-picker.tsx
index 757dbf94b4..6dc805edd0 100644
--- a/apps/emdash-desktop/src/renderer/features/tasks/task-config/existing-workspace-picker.tsx
+++ b/apps/emdash-desktop/src/renderer/features/tasks/task-config/existing-workspace-picker.tsx
@@ -124,7 +124,7 @@ export function ExistingWorkspacePicker({
       }}
       isItemEqualToValue={(a: ProjectWorkspace, b: ProjectWorkspace) => a.id === b.id}
     >
-      <ComboboxTrigger className="data-popup-open:border-ring flex w-full items-center justify-between gap-2 rounded-lg border border-border px-2.5 py-2 text-sm transition-colors outline-none hover:bg-background-2">
+      <ComboboxTrigger className="flex w-full items-center justify-between gap-2 rounded-lg border border-border px-2.5 py-2 text-sm transition-colors outline-none hover:bg-background-2 data-popup-open:border-ring">
         {selected ? (
           <WorkspaceItemContent ws={selected} />
         ) : (
diff --git a/apps/emdash-desktop/src/renderer/lib/components/add-ssh-conn-modal.tsx b/apps/emdash-desktop/src/renderer/lib/components/add-ssh-conn-modal.tsx
index 8a012330c6..dad127745e 100644
--- a/apps/emdash-desktop/src/renderer/lib/components/add-ssh-conn-modal.tsx
+++ b/apps/emdash-desktop/src/renderer/lib/components/add-ssh-conn-modal.tsx
@@ -76,7 +76,7 @@ function FieldInfoTooltip({ label, children }: { label: string; children: ReactN
         render={
           <button
             type="button"
-            className="focus-visible:ring-primary/30 relative inline-flex size-4 shrink-0 items-center justify-center rounded-full text-foreground-passive transition-colors before:absolute before:-inset-2.5 before:content-[''] hover:text-foreground focus-visible:ring-2 focus-visible:outline-none"
+            className="relative inline-flex size-4 shrink-0 items-center justify-center rounded-full text-foreground-passive transition-colors before:absolute before:-inset-2.5 before:content-[''] hover:text-foreground focus-visible:ring-2 focus-visible:ring-primary/30 focus-visible:outline-none"
             aria-label={`About ${label}`}
           >
             <InfoIcon className="size-3.5" aria-hidden="true" />
diff --git a/apps/emdash-desktop/src/renderer/lib/components/feedback-modal/feedback-modal.tsx b/apps/emdash-desktop/src/renderer/lib/components/feedback-modal/feedback-modal.tsx
index 25b60001a0..639f1942d8 100644
--- a/apps/emdash-desktop/src/renderer/lib/components/feedback-modal/feedback-modal.tsx
+++ b/apps/emdash-desktop/src/renderer/lib/components/feedback-modal/feedback-modal.tsx
@@ -131,8 +131,8 @@ export function FeedbackModal({ onSuccess, blurb }: Props) {
       onDragLeave={handleDragLeave}
     >
       {isDraggingOver && (
-        <div className="border-primary bg-primary/5 absolute inset-0 z-10 flex items-center justify-center rounded-xl border-2 border-dashed">
-          <div className="text-primary flex flex-col items-center gap-1">
+        <div className="absolute inset-0 z-10 flex items-center justify-center rounded-xl border-2 border-dashed border-primary bg-primary/5">
+          <div className="flex flex-col items-center gap-1 text-primary">
             <ImageIcon className="size-6" />
             <span className="text-xs font-medium">Drop image here</span>
           </div>
diff --git a/apps/emdash-desktop/src/renderer/lib/components/github-device-flow-modal.tsx b/apps/emdash-desktop/src/renderer/lib/components/github-device-flow-modal.tsx
index 50db8560bc..a015600468 100644
--- a/apps/emdash-desktop/src/renderer/lib/components/github-device-flow-modal.tsx
+++ b/apps/emdash-desktop/src/renderer/lib/components/github-device-flow-modal.tsx
@@ -284,7 +284,7 @@ export function GithubDeviceFlowModal({ onSuccess, onClose, onError }: GithubDev
               type="button"
               onClick={() => copyToClipboard(userCode)}
               disabled={!userCode}
-              className="focus-visible:border-ring focus-visible:ring-ring/50 rounded-lg border border-border bg-background/60 p-4 text-left transition-colors hover:border-border-1 hover:bg-background-1 focus-visible:ring-3 focus-visible:outline-none disabled:pointer-events-none"
+              className="rounded-lg border border-border bg-background/60 p-4 text-left transition-colors hover:border-border-1 hover:bg-background-1 focus-visible:border-ring focus-visible:ring-3 focus-visible:ring-ring/50 focus-visible:outline-none disabled:pointer-events-none"
               aria-label={copied ? 'Code copied' : 'Copy authorization code'}
             >
               {userCode ? (