diff --git a/pages/theming/themed-stroke-width.page.tsx b/pages/theming/themed-stroke-width.page.tsx
index b794609c4f..86e296da6b 100644
--- a/pages/theming/themed-stroke-width.page.tsx
+++ b/pages/theming/themed-stroke-width.page.tsx
@@ -18,6 +18,8 @@ import {
   SelectProps,
   SpaceBetween,
   StatusIndicator,
+  Tabs,
+  TabsProps,
 } from '~components';
 import Icon, { IconProps } from '~components/icon';
 import icons from '~components/icon/generated/icons';
@@ -45,6 +47,34 @@ const createStrokeHandler = (setter: (value: string) => void) => {
   };
 };
 
+function TabsExample() {
+  const tabs: TabsProps.Tab[] = [
+    {
+      id: 'first',
+      label: 'First tab',
+      content: 'First tab content area',
+      dismissible: true,
+      dismissLabel: 'Dismiss first tab',
+    },
+    {
+      id: 'second',
+      label: 'Second tab',
+      content: 'Second tab content area',
+      dismissible: true,
+      dismissLabel: 'Dismiss second tab',
+    },
+    { id: 'third', label: 'Third tab', content: 'Third tab content area' },
+    { id: 'fourth', label: 'Fourth tab', disabled: true, content: 'Fourth tab content area' },
+  ];
+
+  return (
+    <SpaceBetween size="l">
+      <Tabs tabs={tabs} />
+      <Tabs tabs={tabs} variant="container" />
+    </SpaceBetween>
+  );
+}
+
 export default function ThemedStrokeWidthPage() {
   const [themed, setThemed] = useState<boolean>(false);
   const [strokeSmall, setStrokeSmall] = useState<string>('2');
@@ -74,6 +104,11 @@ export default function ThemedStrokeWidthPage() {
           borderWidthIconBig: strokeBig ? `${strokeBig}px` : '1.5px',
           borderWidthIconLarge: strokeLarge ? `${strokeLarge}px` : '2px',
           borderRadiusButton: '8px',
+          fontSizeTabs: '14px',
+          lineHeightTabs: '16px',
+          fontWeightTabs: '700',
+          fontWeightTabsDisabled: '700',
+          spaceTabsVertical: { comfortable: '2px', compact: '0px' },
         },
       };
 
@@ -269,6 +304,10 @@ export default function ThemedStrokeWidthPage() {
               <StatusIndicator type="warning">Warning</StatusIndicator>
               <StatusIndicator type="info">Info</StatusIndicator>
             </SpaceBetween>
+
+            <div>
+              <TabsExample />
+            </div>
             <IconProvider
               icons={{
                 'status-positive': (
diff --git a/src/__integ__/__snapshots__/themes.test.ts.snap b/src/__integ__/__snapshots__/themes.test.ts.snap
index 96299f6266..ec42aa5a5d 100644
--- a/src/__integ__/__snapshots__/themes.test.ts.snap
+++ b/src/__integ__/__snapshots__/themes.test.ts.snap
@@ -597,11 +597,9 @@ exports[`CSS Custom Properties match previous snapshot for mode "compact" 1`] =
   "font-size-heading-s": "16px",
   "font-size-heading-xl": "28px",
   "font-size-heading-xs": "16px",
+  "font-size-tabs": "14px",
   "font-smoothing-moz-osx": "auto",
   "font-smoothing-webkit": "auto",
-  "font-tabs-disabled-weight": "400",
-  "font-tabs-line-height": "22px",
-  "font-tabs-size": "14px",
   "font-wayfinding-link-active-weight": "700",
   "font-weight-alert-header": "700",
   "font-weight-button": "700",
@@ -612,6 +610,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "compact" 1`] =
   "font-weight-heading-xl": "400",
   "font-weight-heading-xs": "400",
   "font-weight-heavy": "700",
+  "font-weight-tabs": "700",
+  "font-weight-tabs-disabled": "400",
   "letter-spacing-body-s": "normal",
   "letter-spacing-display-l": "normal",
   "letter-spacing-heading-l": "normal",
@@ -627,6 +627,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "compact" 1`] =
   "line-height-heading-s": "20px",
   "line-height-heading-xl": "36px",
   "line-height-heading-xs": "20px",
+  "line-height-tabs": "22px",
   "motion-duration-avatar-gen-ai-gradient": "3600ms",
   "motion-duration-avatar-loading-dots": "1200ms",
   "motion-duration-complex": "270ms",
@@ -784,6 +785,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "compact" 1`] =
   "space-table-horizontal": "0px",
   "space-tabs-content-top": "12px",
   "space-tabs-focus-outline-gutter": "0px",
+  "space-tabs-vertical": "4px",
   "space-tile-gutter": "16px",
   "space-tree-view-indentation": "24px",
   "space-xl": "24px",
@@ -1392,11 +1394,9 @@ exports[`CSS Custom Properties match previous snapshot for mode "dark" 1`] = `
   "font-size-heading-s": "16px",
   "font-size-heading-xl": "28px",
   "font-size-heading-xs": "16px",
+  "font-size-tabs": "14px",
   "font-smoothing-moz-osx": "auto",
   "font-smoothing-webkit": "auto",
-  "font-tabs-disabled-weight": "400",
-  "font-tabs-line-height": "22px",
-  "font-tabs-size": "14px",
   "font-wayfinding-link-active-weight": "700",
   "font-weight-alert-header": "700",
   "font-weight-button": "700",
@@ -1407,6 +1407,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "dark" 1`] = `
   "font-weight-heading-xl": "400",
   "font-weight-heading-xs": "400",
   "font-weight-heavy": "700",
+  "font-weight-tabs": "700",
+  "font-weight-tabs-disabled": "400",
   "letter-spacing-body-s": "normal",
   "letter-spacing-display-l": "normal",
   "letter-spacing-heading-l": "normal",
@@ -1422,6 +1424,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "dark" 1`] = `
   "line-height-heading-s": "20px",
   "line-height-heading-xl": "36px",
   "line-height-heading-xs": "20px",
+  "line-height-tabs": "22px",
   "motion-duration-avatar-gen-ai-gradient": "3600ms",
   "motion-duration-avatar-loading-dots": "1200ms",
   "motion-duration-complex": "270ms",
@@ -1579,6 +1582,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "dark" 1`] = `
   "space-table-horizontal": "0px",
   "space-tabs-content-top": "16px",
   "space-tabs-focus-outline-gutter": "0px",
+  "space-tabs-vertical": "8px",
   "space-tile-gutter": "24px",
   "space-tree-view-indentation": "24px",
   "space-xl": "24px",
@@ -2187,11 +2191,9 @@ exports[`CSS Custom Properties match previous snapshot for mode "light" 1`] = `
   "font-size-heading-s": "16px",
   "font-size-heading-xl": "28px",
   "font-size-heading-xs": "16px",
+  "font-size-tabs": "14px",
   "font-smoothing-moz-osx": "auto",
   "font-smoothing-webkit": "auto",
-  "font-tabs-disabled-weight": "400",
-  "font-tabs-line-height": "22px",
-  "font-tabs-size": "14px",
   "font-wayfinding-link-active-weight": "700",
   "font-weight-alert-header": "700",
   "font-weight-button": "700",
@@ -2202,6 +2204,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "light" 1`] = `
   "font-weight-heading-xl": "400",
   "font-weight-heading-xs": "400",
   "font-weight-heavy": "700",
+  "font-weight-tabs": "700",
+  "font-weight-tabs-disabled": "400",
   "letter-spacing-body-s": "normal",
   "letter-spacing-display-l": "normal",
   "letter-spacing-heading-l": "normal",
@@ -2217,6 +2221,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "light" 1`] = `
   "line-height-heading-s": "20px",
   "line-height-heading-xl": "36px",
   "line-height-heading-xs": "20px",
+  "line-height-tabs": "22px",
   "motion-duration-avatar-gen-ai-gradient": "3600ms",
   "motion-duration-avatar-loading-dots": "1200ms",
   "motion-duration-complex": "270ms",
@@ -2374,6 +2379,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "light" 1`] = `
   "space-table-horizontal": "0px",
   "space-tabs-content-top": "16px",
   "space-tabs-focus-outline-gutter": "0px",
+  "space-tabs-vertical": "8px",
   "space-tile-gutter": "24px",
   "space-tree-view-indentation": "24px",
   "space-xl": "24px",
@@ -2982,11 +2988,9 @@ exports[`CSS Custom Properties match previous snapshot for mode "reduced-motion"
   "font-size-heading-s": "16px",
   "font-size-heading-xl": "28px",
   "font-size-heading-xs": "16px",
+  "font-size-tabs": "14px",
   "font-smoothing-moz-osx": "auto",
   "font-smoothing-webkit": "auto",
-  "font-tabs-disabled-weight": "400",
-  "font-tabs-line-height": "22px",
-  "font-tabs-size": "14px",
   "font-wayfinding-link-active-weight": "700",
   "font-weight-alert-header": "700",
   "font-weight-button": "700",
@@ -2997,6 +3001,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "reduced-motion"
   "font-weight-heading-xl": "400",
   "font-weight-heading-xs": "400",
   "font-weight-heavy": "700",
+  "font-weight-tabs": "700",
+  "font-weight-tabs-disabled": "400",
   "letter-spacing-body-s": "normal",
   "letter-spacing-display-l": "normal",
   "letter-spacing-heading-l": "normal",
@@ -3012,6 +3018,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "reduced-motion"
   "line-height-heading-s": "20px",
   "line-height-heading-xl": "36px",
   "line-height-heading-xs": "20px",
+  "line-height-tabs": "22px",
   "motion-duration-avatar-gen-ai-gradient": "0ms",
   "motion-duration-avatar-loading-dots": "0ms",
   "motion-duration-complex": "0ms",
@@ -3169,6 +3176,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "reduced-motion"
   "space-table-horizontal": "0px",
   "space-tabs-content-top": "16px",
   "space-tabs-focus-outline-gutter": "0px",
+  "space-tabs-vertical": "8px",
   "space-tile-gutter": "24px",
   "space-tree-view-indentation": "24px",
   "space-xl": "24px",
@@ -3777,11 +3785,9 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh"
   "font-size-heading-s": "16px",
   "font-size-heading-xl": "24px",
   "font-size-heading-xs": "14px",
+  "font-size-tabs": "16px",
   "font-smoothing-moz-osx": "grayscale",
   "font-smoothing-webkit": "antialiased",
-  "font-tabs-disabled-weight": "700",
-  "font-tabs-line-height": "20px",
-  "font-tabs-size": "16px",
   "font-wayfinding-link-active-weight": "700",
   "font-weight-alert-header": "700",
   "font-weight-button": "700",
@@ -3792,6 +3798,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh"
   "font-weight-heading-xl": "700",
   "font-weight-heading-xs": "700",
   "font-weight-heavy": "700",
+  "font-weight-tabs": "700",
+  "font-weight-tabs-disabled": "700",
   "letter-spacing-body-s": "0.005em",
   "letter-spacing-display-l": "-0.03em",
   "letter-spacing-heading-l": "-0.015em",
@@ -3807,6 +3815,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh"
   "line-height-heading-s": "20px",
   "line-height-heading-xl": "30px",
   "line-height-heading-xs": "18px",
+  "line-height-tabs": "20px",
   "motion-duration-avatar-gen-ai-gradient": "3600ms",
   "motion-duration-avatar-loading-dots": "1200ms",
   "motion-duration-complex": "250ms",
@@ -3964,6 +3973,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh"
   "space-table-horizontal": "20px",
   "space-tabs-content-top": "12px",
   "space-tabs-focus-outline-gutter": "-8px",
+  "space-tabs-vertical": "8px",
   "space-tile-gutter": "24px",
   "space-tree-view-indentation": "24px",
   "space-xl": "24px",
@@ -4572,11 +4582,9 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "font-size-heading-s": "16px",
   "font-size-heading-xl": "24px",
   "font-size-heading-xs": "14px",
+  "font-size-tabs": "16px",
   "font-smoothing-moz-osx": "grayscale",
   "font-smoothing-webkit": "antialiased",
-  "font-tabs-disabled-weight": "700",
-  "font-tabs-line-height": "20px",
-  "font-tabs-size": "16px",
   "font-wayfinding-link-active-weight": "700",
   "font-weight-alert-header": "700",
   "font-weight-button": "700",
@@ -4587,6 +4595,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "font-weight-heading-xl": "700",
   "font-weight-heading-xs": "700",
   "font-weight-heavy": "700",
+  "font-weight-tabs": "700",
+  "font-weight-tabs-disabled": "700",
   "letter-spacing-body-s": "0.005em",
   "letter-spacing-display-l": "-0.03em",
   "letter-spacing-heading-l": "-0.015em",
@@ -4602,6 +4612,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "line-height-heading-s": "20px",
   "line-height-heading-xl": "30px",
   "line-height-heading-xs": "18px",
+  "line-height-tabs": "20px",
   "motion-duration-avatar-gen-ai-gradient": "3600ms",
   "motion-duration-avatar-loading-dots": "1200ms",
   "motion-duration-complex": "250ms",
@@ -4759,6 +4770,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "space-table-horizontal": "20px",
   "space-tabs-content-top": "8px",
   "space-tabs-focus-outline-gutter": "-8px",
+  "space-tabs-vertical": "4px",
   "space-tile-gutter": "16px",
   "space-tree-view-indentation": "24px",
   "space-xl": "24px",
@@ -5367,11 +5379,9 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "font-size-heading-s": "16px",
   "font-size-heading-xl": "24px",
   "font-size-heading-xs": "14px",
+  "font-size-tabs": "16px",
   "font-smoothing-moz-osx": "grayscale",
   "font-smoothing-webkit": "antialiased",
-  "font-tabs-disabled-weight": "700",
-  "font-tabs-line-height": "20px",
-  "font-tabs-size": "16px",
   "font-wayfinding-link-active-weight": "700",
   "font-weight-alert-header": "700",
   "font-weight-button": "700",
@@ -5382,6 +5392,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "font-weight-heading-xl": "700",
   "font-weight-heading-xs": "700",
   "font-weight-heavy": "700",
+  "font-weight-tabs": "700",
+  "font-weight-tabs-disabled": "700",
   "letter-spacing-body-s": "0.005em",
   "letter-spacing-display-l": "-0.03em",
   "letter-spacing-heading-l": "-0.015em",
@@ -5397,6 +5409,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "line-height-heading-s": "20px",
   "line-height-heading-xl": "30px",
   "line-height-heading-xs": "18px",
+  "line-height-tabs": "20px",
   "motion-duration-avatar-gen-ai-gradient": "3600ms",
   "motion-duration-avatar-loading-dots": "1200ms",
   "motion-duration-complex": "250ms",
@@ -5554,6 +5567,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "space-table-horizontal": "20px",
   "space-tabs-content-top": "12px",
   "space-tabs-focus-outline-gutter": "-8px",
+  "space-tabs-vertical": "8px",
   "space-tile-gutter": "24px",
   "space-tree-view-indentation": "24px",
   "space-xl": "24px",
@@ -6162,11 +6176,9 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "font-size-heading-s": "16px",
   "font-size-heading-xl": "24px",
   "font-size-heading-xs": "14px",
+  "font-size-tabs": "16px",
   "font-smoothing-moz-osx": "grayscale",
   "font-smoothing-webkit": "antialiased",
-  "font-tabs-disabled-weight": "700",
-  "font-tabs-line-height": "20px",
-  "font-tabs-size": "16px",
   "font-wayfinding-link-active-weight": "700",
   "font-weight-alert-header": "700",
   "font-weight-button": "700",
@@ -6177,6 +6189,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "font-weight-heading-xl": "700",
   "font-weight-heading-xs": "700",
   "font-weight-heavy": "700",
+  "font-weight-tabs": "700",
+  "font-weight-tabs-disabled": "700",
   "letter-spacing-body-s": "0.005em",
   "letter-spacing-display-l": "-0.03em",
   "letter-spacing-heading-l": "-0.015em",
@@ -6192,6 +6206,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "line-height-heading-s": "20px",
   "line-height-heading-xl": "30px",
   "line-height-heading-xs": "18px",
+  "line-height-tabs": "20px",
   "motion-duration-avatar-gen-ai-gradient": "3600ms",
   "motion-duration-avatar-loading-dots": "1200ms",
   "motion-duration-complex": "250ms",
@@ -6349,6 +6364,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "space-table-horizontal": "20px",
   "space-tabs-content-top": "12px",
   "space-tabs-focus-outline-gutter": "-8px",
+  "space-tabs-vertical": "8px",
   "space-tile-gutter": "24px",
   "space-tree-view-indentation": "24px",
   "space-xl": "24px",
diff --git a/src/__tests__/snapshot-tests/__snapshots__/design-tokens.test.ts.snap b/src/__tests__/snapshot-tests/__snapshots__/design-tokens.test.ts.snap
index b5f01f2e0a..04589e8be3 100644
--- a/src/__tests__/snapshot-tests/__snapshots__/design-tokens.test.ts.snap
+++ b/src/__tests__/snapshot-tests/__snapshots__/design-tokens.test.ts.snap
@@ -2479,6 +2479,10 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default font size for h5s.",
           "$value": "16px",
         },
+        "font-size-tabs": {
+          "$description": "The default font size for tabs.",
+          "$value": "14px",
+        },
         "font-weight-alert-header": {
           "$description": "The default font weight for alert header text.",
           "$value": "700",
@@ -2511,6 +2515,14 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default font weight for h5s.",
           "$value": "400",
         },
+        "font-weight-tabs": {
+          "$description": "The default font weight for tabs.",
+          "$value": "700",
+        },
+        "font-weight-tabs-disabled": {
+          "$description": "The default font weight for disabled tabs.",
+          "$value": "400",
+        },
         "letter-spacing-display-l": {
           "$description": "The default letter spacing for large display text.",
           "$value": "normal",
@@ -2567,6 +2579,10 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default line height for h5s.",
           "$value": "20px",
         },
+        "line-height-tabs": {
+          "$description": "The default line height for tabs.",
+          "$value": "22px",
+        },
         "motion-duration-avatar-gen-ai-gradient": {
           "$description": "The duration for gradient motion of gen-ai avatars.",
           "$value": {
@@ -2847,6 +2863,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "compact": "2px",
           },
         },
+        "space-tabs-vertical": {
+          "$description": "The vertical padding inside tabs.",
+          "$value": {
+            "comfortable": "8px",
+            "compact": "4px",
+          },
+        },
         "space-tree-view-indentation": {
           "$description": "The indentation of tree view items.",
           "$value": {
@@ -5332,6 +5355,10 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default font size for h5s.",
           "$value": "16px",
         },
+        "font-size-tabs": {
+          "$description": "The default font size for tabs.",
+          "$value": "14px",
+        },
         "font-weight-alert-header": {
           "$description": "The default font weight for alert header text.",
           "$value": "700",
@@ -5364,6 +5391,14 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default font weight for h5s.",
           "$value": "400",
         },
+        "font-weight-tabs": {
+          "$description": "The default font weight for tabs.",
+          "$value": "700",
+        },
+        "font-weight-tabs-disabled": {
+          "$description": "The default font weight for disabled tabs.",
+          "$value": "400",
+        },
         "letter-spacing-display-l": {
           "$description": "The default letter spacing for large display text.",
           "$value": "normal",
@@ -5420,6 +5455,10 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default line height for h5s.",
           "$value": "20px",
         },
+        "line-height-tabs": {
+          "$description": "The default line height for tabs.",
+          "$value": "22px",
+        },
         "motion-duration-avatar-gen-ai-gradient": {
           "$description": "The duration for gradient motion of gen-ai avatars.",
           "$value": {
@@ -5700,6 +5739,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "compact": "2px",
           },
         },
+        "space-tabs-vertical": {
+          "$description": "The vertical padding inside tabs.",
+          "$value": {
+            "comfortable": "8px",
+            "compact": "4px",
+          },
+        },
         "space-tree-view-indentation": {
           "$description": "The indentation of tree view items.",
           "$value": {
@@ -8185,6 +8231,10 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default font size for h5s.",
           "$value": "16px",
         },
+        "font-size-tabs": {
+          "$description": "The default font size for tabs.",
+          "$value": "14px",
+        },
         "font-weight-alert-header": {
           "$description": "The default font weight for alert header text.",
           "$value": "700",
@@ -8217,6 +8267,14 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default font weight for h5s.",
           "$value": "400",
         },
+        "font-weight-tabs": {
+          "$description": "The default font weight for tabs.",
+          "$value": "700",
+        },
+        "font-weight-tabs-disabled": {
+          "$description": "The default font weight for disabled tabs.",
+          "$value": "400",
+        },
         "letter-spacing-display-l": {
           "$description": "The default letter spacing for large display text.",
           "$value": "normal",
@@ -8273,6 +8331,10 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default line height for h5s.",
           "$value": "20px",
         },
+        "line-height-tabs": {
+          "$description": "The default line height for tabs.",
+          "$value": "22px",
+        },
         "motion-duration-avatar-gen-ai-gradient": {
           "$description": "The duration for gradient motion of gen-ai avatars.",
           "$value": {
@@ -8553,6 +8615,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "compact": "2px",
           },
         },
+        "space-tabs-vertical": {
+          "$description": "The vertical padding inside tabs.",
+          "$value": {
+            "comfortable": "4px",
+            "compact": "4px",
+          },
+        },
         "space-tree-view-indentation": {
           "$description": "The indentation of tree view items.",
           "$value": {
@@ -11038,6 +11107,10 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default font size for h5s.",
           "$value": "16px",
         },
+        "font-size-tabs": {
+          "$description": "The default font size for tabs.",
+          "$value": "14px",
+        },
         "font-weight-alert-header": {
           "$description": "The default font weight for alert header text.",
           "$value": "700",
@@ -11070,6 +11143,14 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default font weight for h5s.",
           "$value": "400",
         },
+        "font-weight-tabs": {
+          "$description": "The default font weight for tabs.",
+          "$value": "700",
+        },
+        "font-weight-tabs-disabled": {
+          "$description": "The default font weight for disabled tabs.",
+          "$value": "400",
+        },
         "letter-spacing-display-l": {
           "$description": "The default letter spacing for large display text.",
           "$value": "normal",
@@ -11126,6 +11207,10 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default line height for h5s.",
           "$value": "20px",
         },
+        "line-height-tabs": {
+          "$description": "The default line height for tabs.",
+          "$value": "22px",
+        },
         "motion-duration-avatar-gen-ai-gradient": {
           "$description": "The duration for gradient motion of gen-ai avatars.",
           "$value": {
@@ -11406,6 +11491,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "compact": "2px",
           },
         },
+        "space-tabs-vertical": {
+          "$description": "The vertical padding inside tabs.",
+          "$value": {
+            "comfortable": "8px",
+            "compact": "4px",
+          },
+        },
         "space-tree-view-indentation": {
           "$description": "The indentation of tree view items.",
           "$value": {
@@ -13891,6 +13983,10 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default font size for h5s.",
           "$value": "16px",
         },
+        "font-size-tabs": {
+          "$description": "The default font size for tabs.",
+          "$value": "14px",
+        },
         "font-weight-alert-header": {
           "$description": "The default font weight for alert header text.",
           "$value": "700",
@@ -13923,6 +14019,14 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default font weight for h5s.",
           "$value": "400",
         },
+        "font-weight-tabs": {
+          "$description": "The default font weight for tabs.",
+          "$value": "700",
+        },
+        "font-weight-tabs-disabled": {
+          "$description": "The default font weight for disabled tabs.",
+          "$value": "400",
+        },
         "letter-spacing-display-l": {
           "$description": "The default letter spacing for large display text.",
           "$value": "normal",
@@ -13979,6 +14083,10 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default line height for h5s.",
           "$value": "20px",
         },
+        "line-height-tabs": {
+          "$description": "The default line height for tabs.",
+          "$value": "22px",
+        },
         "motion-duration-avatar-gen-ai-gradient": {
           "$description": "The duration for gradient motion of gen-ai avatars.",
           "$value": {
@@ -14259,6 +14367,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "compact": "2px",
           },
         },
+        "space-tabs-vertical": {
+          "$description": "The vertical padding inside tabs.",
+          "$value": {
+            "comfortable": "8px",
+            "compact": "4px",
+          },
+        },
         "space-tree-view-indentation": {
           "$description": "The indentation of tree view items.",
           "$value": {
@@ -16744,6 +16859,10 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default font size for h5s.",
           "$value": "16px",
         },
+        "font-size-tabs": {
+          "$description": "The default font size for tabs.",
+          "$value": "14px",
+        },
         "font-weight-alert-header": {
           "$description": "The default font weight for alert header text.",
           "$value": "700",
@@ -16776,6 +16895,14 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default font weight for h5s.",
           "$value": "400",
         },
+        "font-weight-tabs": {
+          "$description": "The default font weight for tabs.",
+          "$value": "700",
+        },
+        "font-weight-tabs-disabled": {
+          "$description": "The default font weight for disabled tabs.",
+          "$value": "400",
+        },
         "letter-spacing-display-l": {
           "$description": "The default letter spacing for large display text.",
           "$value": "normal",
@@ -16832,6 +16959,10 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
           "$description": "The default line height for h5s.",
           "$value": "20px",
         },
+        "line-height-tabs": {
+          "$description": "The default line height for tabs.",
+          "$value": "22px",
+        },
         "motion-duration-avatar-gen-ai-gradient": {
           "$description": "The duration for gradient motion of gen-ai avatars.",
           "$value": {
@@ -17112,6 +17243,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
             "compact": "2px",
           },
         },
+        "space-tabs-vertical": {
+          "$description": "The vertical padding inside tabs.",
+          "$value": {
+            "comfortable": "8px",
+            "compact": "4px",
+          },
+        },
         "space-tree-view-indentation": {
           "$description": "The indentation of tree view items.",
           "$value": {
@@ -19597,6 +19735,10 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
       "$description": "The default font size for h5s.",
       "$value": "16px",
     },
+    "font-size-tabs": {
+      "$description": "The default font size for tabs.",
+      "$value": "14px",
+    },
     "font-weight-alert-header": {
       "$description": "The default font weight for alert header text.",
       "$value": "700",
@@ -19629,6 +19771,14 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
       "$description": "The default font weight for h5s.",
       "$value": "400",
     },
+    "font-weight-tabs": {
+      "$description": "The default font weight for tabs.",
+      "$value": "700",
+    },
+    "font-weight-tabs-disabled": {
+      "$description": "The default font weight for disabled tabs.",
+      "$value": "400",
+    },
     "letter-spacing-display-l": {
       "$description": "The default letter spacing for large display text.",
       "$value": "normal",
@@ -19685,6 +19835,10 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
       "$description": "The default line height for h5s.",
       "$value": "20px",
     },
+    "line-height-tabs": {
+      "$description": "The default line height for tabs.",
+      "$value": "22px",
+    },
     "motion-duration-avatar-gen-ai-gradient": {
       "$description": "The duration for gradient motion of gen-ai avatars.",
       "$value": {
@@ -19965,6 +20119,13 @@ exports[`Design tokens artifacts Design tokens JSON for classic matches the snap
         "compact": "2px",
       },
     },
+    "space-tabs-vertical": {
+      "$description": "The vertical padding inside tabs.",
+      "$value": {
+        "comfortable": "8px",
+        "compact": "4px",
+      },
+    },
     "space-tree-view-indentation": {
       "$description": "The indentation of tree view items.",
       "$value": {
@@ -22455,6 +22616,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font size for h5s.",
           "$value": "14px",
         },
+        "font-size-tabs": {
+          "$description": "The default font size for tabs.",
+          "$value": "16px",
+        },
         "font-weight-alert-header": {
           "$description": "The default font weight for alert header text.",
           "$value": "700",
@@ -22487,6 +22652,14 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font weight for h5s.",
           "$value": "700",
         },
+        "font-weight-tabs": {
+          "$description": "The default font weight for tabs.",
+          "$value": "700",
+        },
+        "font-weight-tabs-disabled": {
+          "$description": "The default font weight for disabled tabs.",
+          "$value": "700",
+        },
         "letter-spacing-display-l": {
           "$description": "The default letter spacing for large display text.",
           "$value": "-0.03em",
@@ -22543,6 +22716,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default line height for h5s.",
           "$value": "18px",
         },
+        "line-height-tabs": {
+          "$description": "The default line height for tabs.",
+          "$value": "20px",
+        },
         "motion-duration-avatar-gen-ai-gradient": {
           "$description": "The duration for gradient motion of gen-ai avatars.",
           "$value": {
@@ -22823,6 +23000,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "compact": "2px",
           },
         },
+        "space-tabs-vertical": {
+          "$description": "The vertical padding inside tabs.",
+          "$value": {
+            "comfortable": "8px",
+            "compact": "4px",
+          },
+        },
         "space-tree-view-indentation": {
           "$description": "The indentation of tree view items.",
           "$value": {
@@ -25308,6 +25492,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font size for h5s.",
           "$value": "14px",
         },
+        "font-size-tabs": {
+          "$description": "The default font size for tabs.",
+          "$value": "16px",
+        },
         "font-weight-alert-header": {
           "$description": "The default font weight for alert header text.",
           "$value": "700",
@@ -25340,6 +25528,14 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font weight for h5s.",
           "$value": "700",
         },
+        "font-weight-tabs": {
+          "$description": "The default font weight for tabs.",
+          "$value": "700",
+        },
+        "font-weight-tabs-disabled": {
+          "$description": "The default font weight for disabled tabs.",
+          "$value": "700",
+        },
         "letter-spacing-display-l": {
           "$description": "The default letter spacing for large display text.",
           "$value": "-0.03em",
@@ -25396,6 +25592,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default line height for h5s.",
           "$value": "18px",
         },
+        "line-height-tabs": {
+          "$description": "The default line height for tabs.",
+          "$value": "20px",
+        },
         "motion-duration-avatar-gen-ai-gradient": {
           "$description": "The duration for gradient motion of gen-ai avatars.",
           "$value": {
@@ -25676,6 +25876,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "compact": "2px",
           },
         },
+        "space-tabs-vertical": {
+          "$description": "The vertical padding inside tabs.",
+          "$value": {
+            "comfortable": "8px",
+            "compact": "4px",
+          },
+        },
         "space-tree-view-indentation": {
           "$description": "The indentation of tree view items.",
           "$value": {
@@ -28161,6 +28368,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font size for h5s.",
           "$value": "14px",
         },
+        "font-size-tabs": {
+          "$description": "The default font size for tabs.",
+          "$value": "16px",
+        },
         "font-weight-alert-header": {
           "$description": "The default font weight for alert header text.",
           "$value": "700",
@@ -28193,6 +28404,14 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font weight for h5s.",
           "$value": "700",
         },
+        "font-weight-tabs": {
+          "$description": "The default font weight for tabs.",
+          "$value": "700",
+        },
+        "font-weight-tabs-disabled": {
+          "$description": "The default font weight for disabled tabs.",
+          "$value": "700",
+        },
         "letter-spacing-display-l": {
           "$description": "The default letter spacing for large display text.",
           "$value": "-0.03em",
@@ -28249,6 +28468,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default line height for h5s.",
           "$value": "18px",
         },
+        "line-height-tabs": {
+          "$description": "The default line height for tabs.",
+          "$value": "20px",
+        },
         "motion-duration-avatar-gen-ai-gradient": {
           "$description": "The duration for gradient motion of gen-ai avatars.",
           "$value": {
@@ -28529,6 +28752,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "compact": "2px",
           },
         },
+        "space-tabs-vertical": {
+          "$description": "The vertical padding inside tabs.",
+          "$value": {
+            "comfortable": "8px",
+            "compact": "4px",
+          },
+        },
         "space-tree-view-indentation": {
           "$description": "The indentation of tree view items.",
           "$value": {
@@ -31014,6 +31244,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font size for h5s.",
           "$value": "14px",
         },
+        "font-size-tabs": {
+          "$description": "The default font size for tabs.",
+          "$value": "16px",
+        },
         "font-weight-alert-header": {
           "$description": "The default font weight for alert header text.",
           "$value": "700",
@@ -31046,6 +31280,14 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font weight for h5s.",
           "$value": "700",
         },
+        "font-weight-tabs": {
+          "$description": "The default font weight for tabs.",
+          "$value": "700",
+        },
+        "font-weight-tabs-disabled": {
+          "$description": "The default font weight for disabled tabs.",
+          "$value": "700",
+        },
         "letter-spacing-display-l": {
           "$description": "The default letter spacing for large display text.",
           "$value": "-0.03em",
@@ -31102,6 +31344,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default line height for h5s.",
           "$value": "18px",
         },
+        "line-height-tabs": {
+          "$description": "The default line height for tabs.",
+          "$value": "20px",
+        },
         "motion-duration-avatar-gen-ai-gradient": {
           "$description": "The duration for gradient motion of gen-ai avatars.",
           "$value": {
@@ -31382,6 +31628,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "compact": "2px",
           },
         },
+        "space-tabs-vertical": {
+          "$description": "The vertical padding inside tabs.",
+          "$value": {
+            "comfortable": "4px",
+            "compact": "4px",
+          },
+        },
         "space-tree-view-indentation": {
           "$description": "The indentation of tree view items.",
           "$value": {
@@ -33867,6 +34120,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font size for h5s.",
           "$value": "14px",
         },
+        "font-size-tabs": {
+          "$description": "The default font size for tabs.",
+          "$value": "16px",
+        },
         "font-weight-alert-header": {
           "$description": "The default font weight for alert header text.",
           "$value": "700",
@@ -33899,6 +34156,14 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font weight for h5s.",
           "$value": "700",
         },
+        "font-weight-tabs": {
+          "$description": "The default font weight for tabs.",
+          "$value": "700",
+        },
+        "font-weight-tabs-disabled": {
+          "$description": "The default font weight for disabled tabs.",
+          "$value": "700",
+        },
         "letter-spacing-display-l": {
           "$description": "The default letter spacing for large display text.",
           "$value": "-0.03em",
@@ -33955,6 +34220,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default line height for h5s.",
           "$value": "18px",
         },
+        "line-height-tabs": {
+          "$description": "The default line height for tabs.",
+          "$value": "20px",
+        },
         "motion-duration-avatar-gen-ai-gradient": {
           "$description": "The duration for gradient motion of gen-ai avatars.",
           "$value": {
@@ -34235,6 +34504,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "compact": "2px",
           },
         },
+        "space-tabs-vertical": {
+          "$description": "The vertical padding inside tabs.",
+          "$value": {
+            "comfortable": "8px",
+            "compact": "4px",
+          },
+        },
         "space-tree-view-indentation": {
           "$description": "The indentation of tree view items.",
           "$value": {
@@ -36720,6 +36996,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font size for h5s.",
           "$value": "14px",
         },
+        "font-size-tabs": {
+          "$description": "The default font size for tabs.",
+          "$value": "16px",
+        },
         "font-weight-alert-header": {
           "$description": "The default font weight for alert header text.",
           "$value": "700",
@@ -36752,6 +37032,14 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font weight for h5s.",
           "$value": "700",
         },
+        "font-weight-tabs": {
+          "$description": "The default font weight for tabs.",
+          "$value": "700",
+        },
+        "font-weight-tabs-disabled": {
+          "$description": "The default font weight for disabled tabs.",
+          "$value": "700",
+        },
         "letter-spacing-display-l": {
           "$description": "The default letter spacing for large display text.",
           "$value": "-0.03em",
@@ -36808,6 +37096,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default line height for h5s.",
           "$value": "18px",
         },
+        "line-height-tabs": {
+          "$description": "The default line height for tabs.",
+          "$value": "20px",
+        },
         "motion-duration-avatar-gen-ai-gradient": {
           "$description": "The duration for gradient motion of gen-ai avatars.",
           "$value": {
@@ -37088,6 +37380,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "compact": "2px",
           },
         },
+        "space-tabs-vertical": {
+          "$description": "The vertical padding inside tabs.",
+          "$value": {
+            "comfortable": "8px",
+            "compact": "4px",
+          },
+        },
         "space-tree-view-indentation": {
           "$description": "The indentation of tree view items.",
           "$value": {
@@ -39573,6 +39872,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font size for h5s.",
           "$value": "14px",
         },
+        "font-size-tabs": {
+          "$description": "The default font size for tabs.",
+          "$value": "16px",
+        },
         "font-weight-alert-header": {
           "$description": "The default font weight for alert header text.",
           "$value": "700",
@@ -39605,6 +39908,14 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font weight for h5s.",
           "$value": "700",
         },
+        "font-weight-tabs": {
+          "$description": "The default font weight for tabs.",
+          "$value": "700",
+        },
+        "font-weight-tabs-disabled": {
+          "$description": "The default font weight for disabled tabs.",
+          "$value": "700",
+        },
         "letter-spacing-display-l": {
           "$description": "The default letter spacing for large display text.",
           "$value": "-0.03em",
@@ -39661,6 +39972,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default line height for h5s.",
           "$value": "18px",
         },
+        "line-height-tabs": {
+          "$description": "The default line height for tabs.",
+          "$value": "20px",
+        },
         "motion-duration-avatar-gen-ai-gradient": {
           "$description": "The duration for gradient motion of gen-ai avatars.",
           "$value": {
@@ -39941,6 +40256,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "compact": "2px",
           },
         },
+        "space-tabs-vertical": {
+          "$description": "The vertical padding inside tabs.",
+          "$value": {
+            "comfortable": "8px",
+            "compact": "4px",
+          },
+        },
         "space-tree-view-indentation": {
           "$description": "The indentation of tree view items.",
           "$value": {
@@ -42426,6 +42748,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font size for h5s.",
           "$value": "14px",
         },
+        "font-size-tabs": {
+          "$description": "The default font size for tabs.",
+          "$value": "16px",
+        },
         "font-weight-alert-header": {
           "$description": "The default font weight for alert header text.",
           "$value": "700",
@@ -42458,6 +42784,14 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default font weight for h5s.",
           "$value": "700",
         },
+        "font-weight-tabs": {
+          "$description": "The default font weight for tabs.",
+          "$value": "700",
+        },
+        "font-weight-tabs-disabled": {
+          "$description": "The default font weight for disabled tabs.",
+          "$value": "700",
+        },
         "letter-spacing-display-l": {
           "$description": "The default letter spacing for large display text.",
           "$value": "-0.03em",
@@ -42514,6 +42848,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
           "$description": "The default line height for h5s.",
           "$value": "18px",
         },
+        "line-height-tabs": {
+          "$description": "The default line height for tabs.",
+          "$value": "20px",
+        },
         "motion-duration-avatar-gen-ai-gradient": {
           "$description": "The duration for gradient motion of gen-ai avatars.",
           "$value": {
@@ -42794,6 +43132,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
             "compact": "2px",
           },
         },
+        "space-tabs-vertical": {
+          "$description": "The vertical padding inside tabs.",
+          "$value": {
+            "comfortable": "8px",
+            "compact": "4px",
+          },
+        },
         "space-tree-view-indentation": {
           "$description": "The indentation of tree view items.",
           "$value": {
@@ -45279,6 +45624,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
       "$description": "The default font size for h5s.",
       "$value": "14px",
     },
+    "font-size-tabs": {
+      "$description": "The default font size for tabs.",
+      "$value": "16px",
+    },
     "font-weight-alert-header": {
       "$description": "The default font weight for alert header text.",
       "$value": "700",
@@ -45311,6 +45660,14 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
       "$description": "The default font weight for h5s.",
       "$value": "700",
     },
+    "font-weight-tabs": {
+      "$description": "The default font weight for tabs.",
+      "$value": "700",
+    },
+    "font-weight-tabs-disabled": {
+      "$description": "The default font weight for disabled tabs.",
+      "$value": "700",
+    },
     "letter-spacing-display-l": {
       "$description": "The default letter spacing for large display text.",
       "$value": "-0.03em",
@@ -45367,6 +45724,10 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
       "$description": "The default line height for h5s.",
       "$value": "18px",
     },
+    "line-height-tabs": {
+      "$description": "The default line height for tabs.",
+      "$value": "20px",
+    },
     "motion-duration-avatar-gen-ai-gradient": {
       "$description": "The duration for gradient motion of gen-ai avatars.",
       "$value": {
@@ -45647,6 +46008,13 @@ exports[`Design tokens artifacts Design tokens JSON for visual-refresh matches t
         "compact": "2px",
       },
     },
+    "space-tabs-vertical": {
+      "$description": "The vertical padding inside tabs.",
+      "$value": {
+        "comfortable": "8px",
+        "compact": "4px",
+      },
+    },
     "space-tree-view-indentation": {
       "$description": "The indentation of tree view items.",
       "$value": {
diff --git a/src/tabs/tab-header-bar.scss b/src/tabs/tab-header-bar.scss
index 94df13fa33..86f233dee9 100644
--- a/src/tabs/tab-header-bar.scss
+++ b/src/tabs/tab-header-bar.scss
@@ -98,7 +98,7 @@ $label-horizontal-spacing: awsui.$space-xs;
   display: flex;
   align-items: center;
   padding-inline: $label-horizontal-spacing;
-  padding-block: awsui.$space-scaled-2x-xxs;
+  padding-block: awsui.$space-tabs-vertical;
   text-align: start;
   position: relative;
 
@@ -198,9 +198,9 @@ $label-horizontal-spacing: awsui.$space-xs;
   border-block: awsui.$border-divider-section-width solid var(#{custom-props.$styleBorderColorDefault}, transparent);
   border-inline: awsui.$border-divider-section-width solid var(#{custom-props.$styleBorderColorDefault}, transparent);
 
-  font-size: awsui.$font-tabs-size;
-  line-height: awsui.$font-tabs-line-height;
-  font-weight: awsui.$font-wayfinding-link-active-weight;
+  font-size: awsui.$font-size-tabs;
+  line-height: awsui.$line-height-tabs;
+  font-weight: awsui.$font-weight-tabs;
   color: var(#{custom-props.$styleColorDefault}, awsui.$color-text-interactive-default);
   background-color: var(#{custom-props.$styleBackgroundDefault}, transparent);
 
@@ -272,7 +272,7 @@ $label-horizontal-spacing: awsui.$space-xs;
     color: var(#{custom-props.$styleColorDisabled}, awsui.$color-text-interactive-disabled);
     border-color: var(#{custom-props.$styleBorderColorDisabled}, transparent);
     background-color: var(#{custom-props.$styleBackgroundDisabled}, transparent);
-    font-weight: awsui.$font-tabs-disabled-weight;
+    font-weight: awsui.$font-weight-tabs-disabled;
   }
 }
 
diff --git a/style-dictionary/classic/typography.ts b/style-dictionary/classic/typography.ts
index 7d1756f376..345399f01a 100644
--- a/style-dictionary/classic/typography.ts
+++ b/style-dictionary/classic/typography.ts
@@ -27,9 +27,9 @@ const tokens: StyleDictionary.TypographyDictionary = {
   fontSizeHeadingXs: '16px',
   fontSmoothingMozOsx: 'auto',
   fontSmoothingWebkit: 'auto',
-  fontTabsDisabledWeight: '400',
-  fontTabsLineHeight: '{lineHeightBodyM}',
-  fontTabsSize: '{fontSizeBodyM}',
+  fontSizeTabs: '{fontSizeBodyM}',
+  fontWeightTabsDisabled: '400',
+  lineHeightTabs: '{lineHeightBodyM}',
   fontWeightHeadingXl: '400',
   fontWeightHeadingL: '{fontWeightHeavy}',
   fontWeightHeadingM: '400',
diff --git a/style-dictionary/utils/token-names.ts b/style-dictionary/utils/token-names.ts
index 882666205d..53cfeae8f8 100644
--- a/style-dictionary/utils/token-names.ts
+++ b/style-dictionary/utils/token-names.ts
@@ -804,9 +804,9 @@ export type TypographyTokenName =
   | 'fontSizeHeadingXs'
   | 'fontSmoothingMozOsx'
   | 'fontSmoothingWebkit'
-  | 'fontTabsDisabledWeight'
-  | 'fontTabsLineHeight'
-  | 'fontTabsSize'
+  | 'fontSizeTabs'
+  | 'fontWeightTabs'
+  | 'fontWeightTabsDisabled'
   | 'fontWayfindingLinkActiveWeight'
   | 'fontWeightButton'
   | 'fontWeightAlertHeader'
@@ -831,7 +831,8 @@ export type TypographyTokenName =
   | 'lineHeightHeadingL'
   | 'lineHeightHeadingM'
   | 'lineHeightHeadingS'
-  | 'lineHeightHeadingXs';
+  | 'lineHeightHeadingXs'
+  | 'lineHeightTabs';
 export type BordersTokenName =
   | 'borderActiveWidth'
   | 'borderCodeEditorStatusDividerWidth'
@@ -1005,6 +1006,7 @@ export type SpacingTokenName =
   | 'spaceTableHeaderFocusOutlineGutter'
   | 'spaceTabsContentTop'
   | 'spaceTabsFocusOutlineGutter'
+  | 'spaceTabsVertical'
   | 'spaceTableContentBottom'
   | 'spaceTableEmbeddedHeaderTop'
   | 'spaceTableFooterHorizontal'
diff --git a/style-dictionary/visual-refresh/metadata/spacing.ts b/style-dictionary/visual-refresh/metadata/spacing.ts
index db64ef6575..d3eef269ce 100644
--- a/style-dictionary/visual-refresh/metadata/spacing.ts
+++ b/style-dictionary/visual-refresh/metadata/spacing.ts
@@ -144,6 +144,11 @@ const metadata: StyleDictionary.MetadataIndex = {
     public: true,
     themeable: false,
   },
+  spaceTabsVertical: {
+    description: 'The vertical padding inside tabs.',
+    public: true,
+    themeable: true,
+  },
   spaceTreeViewIndentation: {
     description: 'The indentation of tree view items.',
     public: true,
diff --git a/style-dictionary/visual-refresh/metadata/typography.ts b/style-dictionary/visual-refresh/metadata/typography.ts
index 085f5ee99d..58d9afd798 100644
--- a/style-dictionary/visual-refresh/metadata/typography.ts
+++ b/style-dictionary/visual-refresh/metadata/typography.ts
@@ -114,6 +114,21 @@ const metadata: StyleDictionary.MetadataIndex = {
     themeable: true,
     public: true,
   },
+  fontSizeTabs: {
+    description: 'The default font size for tabs.',
+    themeable: true,
+    public: true,
+  },
+  fontWeightTabs: {
+    description: 'The default font weight for tabs.',
+    themeable: true,
+    public: true,
+  },
+  fontWeightTabsDisabled: {
+    description: 'The default font weight for disabled tabs.',
+    themeable: true,
+    public: true,
+  },
   letterSpacingBodyS: {
     description: 'The default letter spacing for small body text.',
   },
@@ -187,6 +202,11 @@ const metadata: StyleDictionary.MetadataIndex = {
     themeable: true,
     public: true,
   },
+  lineHeightTabs: {
+    description: 'The default line height for tabs.',
+    themeable: true,
+    public: true,
+  },
 };
 
 export default metadata;
diff --git a/style-dictionary/visual-refresh/spacing.ts b/style-dictionary/visual-refresh/spacing.ts
index 122419d2a8..7be60fee61 100644
--- a/style-dictionary/visual-refresh/spacing.ts
+++ b/style-dictionary/visual-refresh/spacing.ts
@@ -61,6 +61,7 @@ const tokens: StyleDictionary.SpacingDictionary = {
   spaceSegmentedControlFocusOutlineGutter: '6px',
   spaceTabsContentTop: '{spaceScaledS}',
   spaceTabsFocusOutlineGutter: '-8px',
+  spaceTabsVertical: '{spaceScaledXs}',
   spaceTableContentBottom: '{spaceXxs}',
   spaceTableEmbeddedHeaderTop: '0px',
   spaceTableFooterHorizontal: '{spaceTableHeaderHorizontal}',
diff --git a/style-dictionary/visual-refresh/typography.ts b/style-dictionary/visual-refresh/typography.ts
index 42b7e2c195..3dea6d7a43 100644
--- a/style-dictionary/visual-refresh/typography.ts
+++ b/style-dictionary/visual-refresh/typography.ts
@@ -28,9 +28,10 @@ export const tokens: StyleDictionary.TypographyDictionary = {
   fontSizeHeadingXs: '14px',
   fontSmoothingMozOsx: 'grayscale',
   fontSmoothingWebkit: 'antialiased',
-  fontTabsDisabledWeight: '{fontWayfindingLinkActiveWeight}',
-  fontTabsLineHeight: '{lineHeightHeadingS}',
-  fontTabsSize: '{fontSizeHeadingS}',
+  fontSizeTabs: '{fontSizeHeadingS}',
+  fontWeightTabs: '700',
+  fontWeightTabsDisabled: '{fontWayfindingLinkActiveWeight}',
+  lineHeightTabs: '{lineHeightHeadingS}',
   fontWayfindingLinkActiveWeight: '700',
   fontWeightButton: '700',
   fontWeightAlertHeader: '700',