diff --git a/src/__integ__/__snapshots__/themes.test.ts.snap b/src/__integ__/__snapshots__/themes.test.ts.snap
index 2fba8215fc..269fa3ddac 100644
--- a/src/__integ__/__snapshots__/themes.test.ts.snap
+++ b/src/__integ__/__snapshots__/themes.test.ts.snap
@@ -11,7 +11,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "compact" 1`] =
   "border-divider-list-width": "1px",
   "border-divider-section-width": "1px",
   "border-dropdown-virtual-offset-width": "0px",
-  "border-field-width": "1px",
   "border-invalid-width": "4px",
   "border-item-width": "1px",
   "border-line-chart-dash-array": "3 5",
@@ -41,6 +40,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "compact" 1`] =
   "border-radius-token": "2px",
   "border-radius-tutorial-panel-item": "2px",
   "border-table-sticky-width": "0px",
+  "border-width-alert": "1px",
+  "border-width-field": "1px",
   "color-background-avatar-default": "#545b64",
   "color-background-avatar-gen-ai": "radial-gradient(circle farthest-corner at top left,rgba(0, 150, 250, 1) -25%,rgba(0, 150, 250, 0) 55%),radial-gradient(circle farthest-corner at top right, rgba(216, 178, 255, 1) -10%, rgba(115, 0, 229, 1) 50%)",
   "color-background-badge-icon": "#d13212",
@@ -453,7 +454,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "compact" 1`] =
   "color-transparent": "transparent",
   "font-box-value-large-weight": "300",
   "font-button-letter-spacing": "0.25px",
-  "font-button-weight": "700",
   "font-chart-detail-size": "14px",
   "font-display-label-weight": "400",
   "font-expandable-heading-size": "14px",
@@ -479,6 +479,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "compact" 1`] =
   "font-tabs-line-height": "22px",
   "font-tabs-size": "14px",
   "font-wayfinding-link-active-weight": "700",
+  "font-weight-button": "700",
   "font-weight-heading-l": "700",
   "font-weight-heading-m": "400",
   "font-weight-heading-s": "700",
@@ -668,7 +669,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "dark" 1`] = `
   "border-divider-list-width": "1px",
   "border-divider-section-width": "1px",
   "border-dropdown-virtual-offset-width": "0px",
-  "border-field-width": "1px",
   "border-invalid-width": "4px",
   "border-item-width": "1px",
   "border-line-chart-dash-array": "3 5",
@@ -698,6 +698,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "dark" 1`] = `
   "border-radius-token": "2px",
   "border-radius-tutorial-panel-item": "2px",
   "border-table-sticky-width": "0px",
+  "border-width-alert": "1px",
+  "border-width-field": "1px",
   "color-background-avatar-default": "#545b64",
   "color-background-avatar-gen-ai": "radial-gradient(circle farthest-corner at top left,rgba(0, 150, 250, 1) -25%,rgba(0, 150, 250, 0) 55%),radial-gradient(circle farthest-corner at top right, rgba(216, 178, 255, 1) -10%, rgba(115, 0, 229, 1) 50%)",
   "color-background-badge-icon": "#ff5d64",
@@ -1110,7 +1112,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "dark" 1`] = `
   "color-transparent": "transparent",
   "font-box-value-large-weight": "300",
   "font-button-letter-spacing": "0.25px",
-  "font-button-weight": "700",
   "font-chart-detail-size": "14px",
   "font-display-label-weight": "400",
   "font-expandable-heading-size": "14px",
@@ -1136,6 +1137,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "dark" 1`] = `
   "font-tabs-line-height": "22px",
   "font-tabs-size": "14px",
   "font-wayfinding-link-active-weight": "700",
+  "font-weight-button": "700",
   "font-weight-heading-l": "700",
   "font-weight-heading-m": "400",
   "font-weight-heading-s": "700",
@@ -1325,7 +1327,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "light" 1`] = `
   "border-divider-list-width": "1px",
   "border-divider-section-width": "1px",
   "border-dropdown-virtual-offset-width": "0px",
-  "border-field-width": "1px",
   "border-invalid-width": "4px",
   "border-item-width": "1px",
   "border-line-chart-dash-array": "3 5",
@@ -1355,6 +1356,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "light" 1`] = `
   "border-radius-token": "2px",
   "border-radius-tutorial-panel-item": "2px",
   "border-table-sticky-width": "0px",
+  "border-width-alert": "1px",
+  "border-width-field": "1px",
   "color-background-avatar-default": "#545b64",
   "color-background-avatar-gen-ai": "radial-gradient(circle farthest-corner at top left,rgba(0, 150, 250, 1) -25%,rgba(0, 150, 250, 0) 55%),radial-gradient(circle farthest-corner at top right, rgba(216, 178, 255, 1) -10%, rgba(115, 0, 229, 1) 50%)",
   "color-background-badge-icon": "#d13212",
@@ -1767,7 +1770,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "light" 1`] = `
   "color-transparent": "transparent",
   "font-box-value-large-weight": "300",
   "font-button-letter-spacing": "0.25px",
-  "font-button-weight": "700",
   "font-chart-detail-size": "14px",
   "font-display-label-weight": "400",
   "font-expandable-heading-size": "14px",
@@ -1793,6 +1795,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "light" 1`] = `
   "font-tabs-line-height": "22px",
   "font-tabs-size": "14px",
   "font-wayfinding-link-active-weight": "700",
+  "font-weight-button": "700",
   "font-weight-heading-l": "700",
   "font-weight-heading-m": "400",
   "font-weight-heading-s": "700",
@@ -1982,7 +1985,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "reduced-motion"
   "border-divider-list-width": "1px",
   "border-divider-section-width": "1px",
   "border-dropdown-virtual-offset-width": "0px",
-  "border-field-width": "1px",
   "border-invalid-width": "4px",
   "border-item-width": "1px",
   "border-line-chart-dash-array": "3 5",
@@ -2012,6 +2014,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "reduced-motion"
   "border-radius-token": "2px",
   "border-radius-tutorial-panel-item": "2px",
   "border-table-sticky-width": "0px",
+  "border-width-alert": "1px",
+  "border-width-field": "1px",
   "color-background-avatar-default": "#545b64",
   "color-background-avatar-gen-ai": "radial-gradient(circle farthest-corner at top left,rgba(0, 150, 250, 1) -25%,rgba(0, 150, 250, 0) 55%),radial-gradient(circle farthest-corner at top right, rgba(216, 178, 255, 1) -10%, rgba(115, 0, 229, 1) 50%)",
   "color-background-badge-icon": "#d13212",
@@ -2424,7 +2428,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "reduced-motion"
   "color-transparent": "transparent",
   "font-box-value-large-weight": "300",
   "font-button-letter-spacing": "0.25px",
-  "font-button-weight": "700",
   "font-chart-detail-size": "14px",
   "font-display-label-weight": "400",
   "font-expandable-heading-size": "14px",
@@ -2450,6 +2453,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "reduced-motion"
   "font-tabs-line-height": "22px",
   "font-tabs-size": "14px",
   "font-wayfinding-link-active-weight": "700",
+  "font-weight-button": "700",
   "font-weight-heading-l": "700",
   "font-weight-heading-m": "400",
   "font-weight-heading-s": "700",
@@ -2639,7 +2643,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh"
   "border-divider-list-width": "1px",
   "border-divider-section-width": "1px",
   "border-dropdown-virtual-offset-width": "2px",
-  "border-field-width": "2px",
   "border-invalid-width": "8px",
   "border-item-width": "2px",
   "border-line-chart-dash-array": "3 5",
@@ -2669,6 +2672,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh"
   "border-radius-token": "8px",
   "border-radius-tutorial-panel-item": "8px",
   "border-table-sticky-width": "1px",
+  "border-width-alert": "2px",
+  "border-width-field": "2px",
   "color-background-avatar-default": "#424650",
   "color-background-avatar-gen-ai": "radial-gradient(circle farthest-corner at top left,rgba(0, 150, 250, 1) -25%,rgba(0, 150, 250, 0) 55%),radial-gradient(circle farthest-corner at top right, rgba(216, 178, 255, 1) -10%, rgba(115, 0, 229, 1) 50%)",
   "color-background-badge-icon": "#db0000",
@@ -3081,7 +3086,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh"
   "color-transparent": "transparent",
   "font-box-value-large-weight": "700",
   "font-button-letter-spacing": "0.005em",
-  "font-button-weight": "700",
   "font-chart-detail-size": "12px",
   "font-display-label-weight": "700",
   "font-expandable-heading-size": "16px",
@@ -3107,6 +3111,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh"
   "font-tabs-line-height": "20px",
   "font-tabs-size": "16px",
   "font-wayfinding-link-active-weight": "700",
+  "font-weight-button": "700",
   "font-weight-heading-l": "700",
   "font-weight-heading-m": "700",
   "font-weight-heading-s": "700",
@@ -3296,7 +3301,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "border-divider-list-width": "1px",
   "border-divider-section-width": "1px",
   "border-dropdown-virtual-offset-width": "2px",
-  "border-field-width": "2px",
   "border-invalid-width": "8px",
   "border-item-width": "2px",
   "border-line-chart-dash-array": "3 5",
@@ -3326,6 +3330,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "border-radius-token": "8px",
   "border-radius-tutorial-panel-item": "8px",
   "border-table-sticky-width": "1px",
+  "border-width-alert": "2px",
+  "border-width-field": "2px",
   "color-background-avatar-default": "#424650",
   "color-background-avatar-gen-ai": "radial-gradient(circle farthest-corner at top left,rgba(0, 150, 250, 1) -25%,rgba(0, 150, 250, 0) 55%),radial-gradient(circle farthest-corner at top right, rgba(216, 178, 255, 1) -10%, rgba(115, 0, 229, 1) 50%)",
   "color-background-badge-icon": "#db0000",
@@ -3738,7 +3744,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "color-transparent": "transparent",
   "font-box-value-large-weight": "700",
   "font-button-letter-spacing": "0.005em",
-  "font-button-weight": "700",
   "font-chart-detail-size": "12px",
   "font-display-label-weight": "700",
   "font-expandable-heading-size": "16px",
@@ -3764,6 +3769,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "font-tabs-line-height": "20px",
   "font-tabs-size": "16px",
   "font-wayfinding-link-active-weight": "700",
+  "font-weight-button": "700",
   "font-weight-heading-l": "700",
   "font-weight-heading-m": "700",
   "font-weight-heading-s": "700",
@@ -3953,7 +3959,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "border-divider-list-width": "1px",
   "border-divider-section-width": "1px",
   "border-dropdown-virtual-offset-width": "2px",
-  "border-field-width": "2px",
   "border-invalid-width": "8px",
   "border-item-width": "2px",
   "border-line-chart-dash-array": "3 5",
@@ -3983,6 +3988,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "border-radius-token": "8px",
   "border-radius-tutorial-panel-item": "8px",
   "border-table-sticky-width": "1px",
+  "border-width-alert": "2px",
+  "border-width-field": "2px",
   "color-background-avatar-default": "#424650",
   "color-background-avatar-gen-ai": "radial-gradient(circle farthest-corner at top left,rgba(0, 150, 250, 1) -25%,rgba(0, 150, 250, 0) 55%),radial-gradient(circle farthest-corner at top right, rgba(216, 178, 255, 1) -10%, rgba(115, 0, 229, 1) 50%)",
   "color-background-badge-icon": "#ff7a7a",
@@ -4395,7 +4402,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "color-transparent": "transparent",
   "font-box-value-large-weight": "700",
   "font-button-letter-spacing": "0.005em",
-  "font-button-weight": "700",
   "font-chart-detail-size": "12px",
   "font-display-label-weight": "700",
   "font-expandable-heading-size": "16px",
@@ -4421,6 +4427,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "font-tabs-line-height": "20px",
   "font-tabs-size": "16px",
   "font-wayfinding-link-active-weight": "700",
+  "font-weight-button": "700",
   "font-weight-heading-l": "700",
   "font-weight-heading-m": "700",
   "font-weight-heading-s": "700",
@@ -4610,7 +4617,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "border-divider-list-width": "1px",
   "border-divider-section-width": "1px",
   "border-dropdown-virtual-offset-width": "2px",
-  "border-field-width": "2px",
   "border-invalid-width": "8px",
   "border-item-width": "2px",
   "border-line-chart-dash-array": "3 5",
@@ -4640,6 +4646,8 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "border-radius-token": "8px",
   "border-radius-tutorial-panel-item": "8px",
   "border-table-sticky-width": "1px",
+  "border-width-alert": "2px",
+  "border-width-field": "2px",
   "color-background-avatar-default": "#424650",
   "color-background-avatar-gen-ai": "radial-gradient(circle farthest-corner at top left,rgba(0, 150, 250, 1) -25%,rgba(0, 150, 250, 0) 55%),radial-gradient(circle farthest-corner at top right, rgba(216, 178, 255, 1) -10%, rgba(115, 0, 229, 1) 50%)",
   "color-background-badge-icon": "#ff7a7a",
@@ -5052,7 +5060,6 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "color-transparent": "transparent",
   "font-box-value-large-weight": "700",
   "font-button-letter-spacing": "0.005em",
-  "font-button-weight": "700",
   "font-chart-detail-size": "12px",
   "font-display-label-weight": "700",
   "font-expandable-heading-size": "16px",
@@ -5078,6 +5085,7 @@ exports[`CSS Custom Properties match previous snapshot for mode "visual-refresh-
   "font-tabs-line-height": "20px",
   "font-tabs-size": "16px",
   "font-wayfinding-link-active-weight": "700",
+  "font-weight-button": "700",
   "font-weight-heading-l": "700",
   "font-weight-heading-m": "700",
   "font-weight-heading-s": "700",