diff --git a/frontend/src/components/ui/button.tsx b/frontend/src/components/ui/button.tsx
index a2dbd68..f039373 100644
--- a/frontend/src/components/ui/button.tsx
+++ b/frontend/src/components/ui/button.tsx
@@ -4,17 +4,17 @@ import { cva, type VariantProps } from 'class-variance-authority'
 import { cn } from '@/lib/utils'
 
 const buttonVariants = cva(
-  'inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:pointer-events-none disabled:opacity-50',
+  'inline-flex items-center justify-center gap-1.5 whitespace-nowrap font-medium transition-[background-color,border-color,color] duration-[50ms] ease-linear focus-visible:outline-2 focus-visible:outline-accent focus-visible:outline-offset-2 disabled:pointer-events-none disabled:text-text-muted disabled:border-border-subtle',
   {
     variants: {
       variant: {
-        default: 'bg-[hsl(var(--accent-soft))] text-accent hover:bg-accent/20',
-        solid: 'bg-accent text-white hover:bg-accent',
-        destructive: 'bg-error/15 text-error hover:bg-error/20',
+        default: 'bg-accent text-background active:brightness-90 rounded-[var(--radius-control)]',
+        solid: 'bg-accent text-background active:brightness-90 rounded-[var(--radius-control)]',
+        destructive: 'bg-error/15 text-error hover:bg-error/20 active:bg-error/25 rounded-[var(--radius-control)]',
         outline:
-          'border border-border bg-transparent text-text-secondary hover:bg-elevated hover:text-text-primary',
-        secondary: 'bg-elevated text-text-secondary hover:text-text-primary',
-        ghost: 'text-text-secondary hover:bg-elevated hover:text-text-primary',
+          'border border-border-default bg-transparent text-text-secondary hover:border-accent active:bg-elevated rounded-[var(--radius-control)]',
+        secondary: 'bg-elevated text-text-secondary hover:text-text-primary active:brightness-95 rounded-[var(--radius-control)]',
+        ghost: 'text-text-secondary hover:bg-elevated hover:text-text-primary active:bg-elevated rounded-[var(--radius-control)]',
         link: 'text-accent underline-offset-4 hover:underline',
       },
       size: {
diff --git a/frontend/src/components/ui/input.tsx b/frontend/src/components/ui/input.tsx
index 43e32d9..489da73 100644
--- a/frontend/src/components/ui/input.tsx
+++ b/frontend/src/components/ui/input.tsx
@@ -9,7 +9,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
       <input
         type={type}
         className={cn(
-          'flex h-8 w-full rounded-md border border-border bg-elevated/50 px-3 py-1 text-sm text-text-primary placeholder:text-text-muted transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium focus:border-accent focus:outline-none disabled:cursor-not-allowed disabled:opacity-50',
+          'flex h-8 w-full rounded-[var(--radius-control)] border border-border-default bg-panel px-2.5 py-1.5 text-xs text-text-primary placeholder:text-text-muted transition-[border-color] duration-[50ms] ease-linear file:border-0 file:bg-transparent file:text-xs file:font-medium focus-visible:outline-2 focus-visible:outline-accent focus-visible:outline-offset-2 disabled:cursor-not-allowed disabled:text-text-muted disabled:border-border-subtle',
           className,
         )}
         ref={ref}
diff --git a/frontend/src/components/ui/tabs.tsx b/frontend/src/components/ui/tabs.tsx
index 1363446..7abdfa4 100644
--- a/frontend/src/components/ui/tabs.tsx
+++ b/frontend/src/components/ui/tabs.tsx
@@ -26,7 +26,7 @@ const TabsTrigger = React.forwardRef<
   <TabsPrimitive.Trigger
     ref={ref}
     className={cn(
-      'inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium transition-all focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-[hsl(var(--accent-soft))] data-[state=active]:text-accent data-[state=active]:font-semibold data-[state=inactive]:text-text-muted data-[state=inactive]:hover:text-text-secondary',
+      'inline-flex items-center justify-center whitespace-nowrap px-3 py-1.5 text-xs font-medium transition-[background-color,border-color,color] duration-[50ms] ease-linear focus-visible:outline-none disabled:pointer-events-none disabled:text-text-muted data-[state=active]:border-b-2 data-[state=active]:border-accent data-[state=active]:text-text-primary data-[state=active]:font-medium data-[state=active]:bg-accent-soft/50 data-[state=inactive]:text-text-secondary data-[state=inactive]:hover:text-text-primary',
       className,
     )}
     {...props}