diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx
index a9325b7f..72e543e3 100644
--- a/src/components/ui/button.tsx
+++ b/src/components/ui/button.tsx
@@ -364,7 +364,7 @@ const buttonVariants = cva(
         xxs: 'rounded-md text-label-xs',
         xs: 'rounded-md text-label-xs',
         sm: 'rounded-md text-label-sm',
-        md: 'rounded-md text-label-md',
+        md: 'rounded-md text-label-sm',
         lg: 'rounded-md text-label-lg',
       },
       /**
@@ -440,7 +440,7 @@ const buttonVariants = cva(
         size: 'md',
         layout: 'text',
         class:
-          'box-border min-h-[32px] gap-2 px-4 py-0 font-medium [&_svg:not([class*="size-"])]:size-[24px]',
+          'box-border min-h-[32px] gap-2 px-2 py-0 font-medium [&_svg:not([class*="size-"])]:size-[18px]',
       },
       {
         size: 'lg',
diff --git a/src/components/ui/popover.tsx b/src/components/ui/popover.tsx
index d6f2d0b5..c5df70ae 100644
--- a/src/components/ui/popover.tsx
+++ b/src/components/ui/popover.tsx
@@ -274,7 +274,7 @@ const PopoverContent = React.forwardRef<
           onOpenAutoFocus={handleOpenAutoFocus}
           onInteractOutside={handleInteractOutside}
           className={cn(
-            'text-ds-text-neutral-default-default rounded-lg bg-ds-bg-neutral-default-default shadow-md relative z-50 min-w-[8rem] overflow-hidden border border-solid border-transparent',
+            'text-ds-text-neutral-default-default rounded-xl bg-ds-bg-neutral-subtle-default shadow-soft border-ds-border-neutral-subtle-disabled relative z-50 min-w-[8rem] overflow-hidden border border-solid',
             'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[--radix-popover-content-transform-origin]',
             'data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1',
             'w-[var(--radix-popover-trigger-width)]',
diff --git a/src/components/ui/tabs.tsx b/src/components/ui/tabs.tsx
index 903e28a0..443716b9 100644
--- a/src/components/ui/tabs.tsx
+++ b/src/components/ui/tabs.tsx
@@ -277,7 +277,7 @@ const TabsContent = React.forwardRef<
           animate={{ opacity: 1 }}
           exit={{ opacity: 0 }}
           transition={{ duration: 0.2 }}
-          className="gap-4 flex flex-col"
+          className="gap-4 min-h-0 min-w-0 flex flex-1 flex-col"
         >
           {children}
         </motion.div>