diff --git a/frontend/src/components/ui/badge.tsx b/frontend/src/components/ui/badge.tsx
index dc0aced..9b3966c 100644
--- a/frontend/src/components/ui/badge.tsx
+++ b/frontend/src/components/ui/badge.tsx
@@ -10,8 +10,8 @@ function Badge({ className, color, children, ...props }: BadgeProps) {
   return (
     <span
       className={cn(
-        'inline-flex items-center rounded-md px-1.5 py-0.5 text-xs font-medium border',
-        !color && 'border-border bg-elevated text-text-secondary',
+        'inline-flex items-center rounded-sm px-1.5 py-0.5 text-xs font-medium border',
+        !color && 'border-border-default bg-elevated text-text-secondary',
         className,
       )}
       style={style}
diff --git a/frontend/src/components/ui/card.tsx b/frontend/src/components/ui/card.tsx
index f6c3a7b..eb74a8e 100644
--- a/frontend/src/components/ui/card.tsx
+++ b/frontend/src/components/ui/card.tsx
@@ -6,7 +6,7 @@ const Card = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElemen
     <div
       ref={ref}
       className={cn(
-        'rounded-lg border border-border bg-panel text-text-primary',
+        'rounded-sm border border-border-default bg-panel text-text-primary',
         className,
       )}
       {...props}