diff --git a/src/components/primitives/Button.tsx b/src/components/primitives/Button.tsx
index ab775796..859c58b5 100644
--- a/src/components/primitives/Button.tsx
+++ b/src/components/primitives/Button.tsx
@@ -17,7 +17,7 @@ export const buttonStyles = tv(
         hype: "text-main-1 bg-accent-11 active:bg-accent-10",
       },
       size: {
-        xs: "px-sm py-xs gap-sm text-xs",
+        xs: "px-sm py-sm gap-sm text-xs",
         sm: "px-sm py-md gap-sm text-sm",
         md: "px-md py-md gap-sm text-base",
         lg: "px-lg py-lg gap-sm text-lg",
diff --git a/src/components/primitives/Tabs.tsx b/src/components/primitives/Tabs.tsx
index be4fa7b3..83cc675b 100644
--- a/src/components/primitives/Tabs.tsx
+++ b/src/components/primitives/Tabs.tsx
@@ -147,6 +147,8 @@ export default function Tabs({ look, size, to, theme, className, tabs = [], ...p
       <Container>
         <Group className={mergeClass(line(), "gap-xl*2 items-center w-full")}>
           {tabs.map(tab => {
+            const relativeUrl = tab.link.split("?")[0];
+
             return (
               <>
                 {tab.link ? (
@@ -154,7 +156,12 @@ export default function Tabs({ look, size, to, theme, className, tabs = [], ...p
                     <Link
                       to={tab.link}
                       style={themeVars}
-                      className={mergeClass(styleProps, base(), className, location.pathname === tab.link && active())}>
+                      className={mergeClass(
+                        styleProps,
+                        base(),
+                        className,
+                        location.pathname === relativeUrl && active(),
+                      )}>
                       {tab.label}
                     </Link>
                   </EventBlocker>
@@ -162,7 +169,7 @@ export default function Tabs({ look, size, to, theme, className, tabs = [], ...p
                   <button
                     key={tab.key}
                     style={themeVars}
-                    className={mergeClass(styleProps, base(), className, location.pathname === tab.link && active())}
+                    className={mergeClass(styleProps, base(), className, location.pathname === relativeUrl && active())}
                     type="button"
                     {...props}>
                     {tab.label}