@gov-design-system-ce/components 4.2.6 → 4.2.7

package/dist/core/core.css

@@ -7,23 +7,33 @@
 /* stylelint-enable */
 /* stylelint-disable */
 /* stylelint-enable */
-/* Converts hex value to rgb colors value */ /* Generates CSS3 var */ /* stylelint-disable order/order */
+/* Converts hex value to rgb colors value */
+/* Generates CSS3 var */
+/* stylelint-disable order/order */
 /* stylelint-enable order/order */
 /* stylelint-disable order/order */
 /* stylelint-enable order/order */
-/* Variables - breakpoints */ /* Variables - Colors */ /* Variables - Sizes */ /* Variables - General */ /* Variables - Typography */ /* Variables - Forms */ /* Variables - shadows */ /* Variables - z-index */ /* stylelint-disable order/order */
+/* Variables - breakpoints */
+/* Variables - Colors */
+/* Variables - Sizes */
+/* Variables - General */
+/* Variables - Typography */
+/* Variables - Forms */
+/* Variables - shadows */
+/* Variables - z-index */
+/* stylelint-disable order/order */
 /* stylelint-enable order/order */
-gov-tabs__list, .gov-tabs__list, gov-pagination__list, .gov-pagination__list, gov-form-multi-select__list, .gov-form-multi-select__list, gov-breadcrumbs ul, .gov-breadcrumbs ul {
+gov-breadcrumbs ul, .gov-breadcrumbs ul, gov-form-multi-select__list, .gov-form-multi-select__list, gov-pagination__list, .gov-pagination__list, gov-tabs__list, .gov-tabs__list {
   margin: 0;
   padding: 0;
 }
 
-gov-tabs__list > gov-tabs__item, gov-tabs__list > .gov-tabs__item, .gov-tabs__list > gov-tabs__item, .gov-tabs__list > .gov-tabs__item, gov-pagination__list gov-pagination__item, gov-pagination__list .gov-pagination__item, .gov-pagination__list gov-pagination__item, .gov-pagination__list .gov-pagination__item, gov-form-multi-select__list > gov-form-multi-select__item, gov-form-multi-select__list > .gov-form-multi-select__item, .gov-form-multi-select__list > gov-form-multi-select__item, .gov-form-multi-select__list > .gov-form-multi-select__item, gov-breadcrumbs li, .gov-breadcrumbs li {
+gov-breadcrumbs li, .gov-breadcrumbs li, gov-form-multi-select__list > gov-form-multi-select__item, gov-form-multi-select__list > .gov-form-multi-select__item, .gov-form-multi-select__list > gov-form-multi-select__item, .gov-form-multi-select__list > .gov-form-multi-select__item, gov-pagination__list gov-pagination__item, gov-pagination__list .gov-pagination__item, .gov-pagination__list gov-pagination__item, .gov-pagination__list .gov-pagination__item, gov-tabs__list > gov-tabs__item, gov-tabs__list > .gov-tabs__item, .gov-tabs__list > gov-tabs__item, .gov-tabs__list > .gov-tabs__item {
   margin: 0;
   padding: 0;
   background: none;
 }
-gov-tabs__list > gov-tabs__item::before, gov-tabs__list > .gov-tabs__item::before, .gov-tabs__list > gov-tabs__item::before, .gov-tabs__list > .gov-tabs__item::before, gov-pagination__list gov-pagination__item::before, gov-pagination__list .gov-pagination__item::before, .gov-pagination__list gov-pagination__item::before, .gov-pagination__list .gov-pagination__item::before, gov-form-multi-select__list > gov-form-multi-select__item::before, gov-form-multi-select__list > .gov-form-multi-select__item::before, .gov-form-multi-select__list > gov-form-multi-select__item::before, .gov-form-multi-select__list > .gov-form-multi-select__item::before, gov-breadcrumbs li::before, .gov-breadcrumbs li::before {
+gov-breadcrumbs li::before, .gov-breadcrumbs li::before, gov-form-multi-select__list > gov-form-multi-select__item::before, gov-form-multi-select__list > .gov-form-multi-select__item::before, .gov-form-multi-select__list > gov-form-multi-select__item::before, .gov-form-multi-select__list > .gov-form-multi-select__item::before, gov-pagination__list gov-pagination__item::before, gov-pagination__list .gov-pagination__item::before, .gov-pagination__list gov-pagination__item::before, .gov-pagination__list .gov-pagination__item::before, gov-tabs__list > gov-tabs__item::before, gov-tabs__list > .gov-tabs__item::before, .gov-tabs__list > gov-tabs__item::before, .gov-tabs__list > .gov-tabs__item::before {
   display: none;
 }
 
@@ -43,7 +53,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 100;
   font-style: italic;
   font-display: auto;
-  src: local("Roboto Thin Italic"), local("Roboto-ThinItalic"), url("/playground/build/assets/fonts/roboto-thin-italic-ext.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Thin Italic"), local("Roboto-ThinItalic"), url("/playground/build/assets/fonts/roboto-thin-italic-ext.woff2?v=0.1") format("woff2");
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -52,7 +62,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 100;
   font-style: italic;
   font-display: auto;
-  src: local("Roboto Thin Italic"), local("Roboto-ThinItalic"), url("/playground/build/assets/fonts/roboto-thin-italic.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Thin Italic"), local("Roboto-ThinItalic"), url("/playground/build/assets/fonts/roboto-thin-italic.woff2?v=0.1") format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* latin-ext */
@@ -61,7 +71,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 300;
   font-style: italic;
   font-display: auto;
-  src: local("Roboto Light Italic"), local("Roboto-LightItalic"), url("/playground/build/assets/fonts/roboto-light-italic-ext.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Light Italic"), local("Roboto-LightItalic"), url("/playground/build/assets/fonts/roboto-light-italic-ext.woff2?v=0.1") format("woff2");
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -70,7 +80,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 300;
   font-style: italic;
   font-display: auto;
-  src: local("Roboto Light Italic"), local("Roboto-LightItalic"), url("/playground/build/assets/fonts/roboto-light-italic.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Light Italic"), local("Roboto-LightItalic"), url("/playground/build/assets/fonts/roboto-light-italic.woff2?v=0.1") format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* latin-ext */
@@ -79,7 +89,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 400;
   font-style: italic;
   font-display: auto;
-  src: local("Roboto Italic"), local("Roboto-Italic"), url("/playground/build/assets/fonts/roboto-italic-ext.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Italic"), local("Roboto-Italic"), url("/playground/build/assets/fonts/roboto-italic-ext.woff2?v=0.1") format("woff2");
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -88,7 +98,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 400;
   font-style: italic;
   font-display: auto;
-  src: local("Roboto Italic"), local("Roboto-Italic"), url("/playground/build/assets/fonts/roboto-italic.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Italic"), local("Roboto-Italic"), url("/playground/build/assets/fonts/roboto-italic.woff2?v=0.1") format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* latin-ext */
@@ -97,7 +107,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 500;
   font-style: italic;
   font-display: auto;
-  src: local("Roboto Medium Italic"), local("Roboto-MediumItalic"), url("/playground/build/assets/fonts/roboto-medium-italic-ext.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Medium Italic"), local("Roboto-MediumItalic"), url("/playground/build/assets/fonts/roboto-medium-italic-ext.woff2?v=0.1") format("woff2");
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -106,7 +116,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 500;
   font-style: italic;
   font-display: auto;
-  src: local("Roboto Medium Italic"), local("Roboto-MediumItalic"), url("/playground/build/assets/fonts/roboto-medium-italic.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Medium Italic"), local("Roboto-MediumItalic"), url("/playground/build/assets/fonts/roboto-medium-italic.woff2?v=0.1") format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* latin-ext */
@@ -115,7 +125,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 700;
   font-style: italic;
   font-display: auto;
-  src: local("Roboto Bold Italic"), local("Roboto-BoldItalic"), url("/playground/build/assets/fonts/roboto-bold-italic-ext.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Bold Italic"), local("Roboto-BoldItalic"), url("/playground/build/assets/fonts/roboto-bold-italic-ext.woff2?v=0.1") format("woff2");
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -124,7 +134,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 700;
   font-style: italic;
   font-display: auto;
-  src: local("Roboto Bold Italic"), local("Roboto-BoldItalic"), url("/playground/build/assets/fonts/roboto-bold-italic.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Bold Italic"), local("Roboto-BoldItalic"), url("/playground/build/assets/fonts/roboto-bold-italic.woff2?v=0.1") format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* latin-ext */
@@ -133,7 +143,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 100;
   font-style: normal;
   font-display: auto;
-  src: local("Roboto Thin"), local("Roboto-Thin"), url("/playground/build/assets/fonts/roboto-thin-ext.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Thin"), local("Roboto-Thin"), url("/playground/build/assets/fonts/roboto-thin-ext.woff2?v=0.1") format("woff2");
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -142,7 +152,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 100;
   font-style: normal;
   font-display: auto;
-  src: local("Roboto Thin"), local("Roboto-Thin"), url("/playground/build/assets/fonts/roboto-thin.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Thin"), local("Roboto-Thin"), url("/playground/build/assets/fonts/roboto-thin.woff2?v=0.1") format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* latin-ext */
@@ -151,7 +161,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 300;
   font-style: normal;
   font-display: auto;
-  src: local("Roboto Light"), local("Roboto-Light"), url("/playground/build/assets/fonts/roboto-light-ext.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Light"), local("Roboto-Light"), url("/playground/build/assets/fonts/roboto-light-ext.woff2?v=0.1") format("woff2");
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -160,7 +170,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 300;
   font-style: normal;
   font-display: auto;
-  src: local("Roboto Light"), local("Roboto-Light"), url("/playground/build/assets/fonts/roboto-light.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Light"), local("Roboto-Light"), url("/playground/build/assets/fonts/roboto-light.woff2?v=0.1") format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* latin-ext */
@@ -169,7 +179,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 400;
   font-style: normal;
   font-display: auto;
-  src: local("Roboto"), local("Roboto-Regular"), url("/playground/build/assets/fonts/roboto-regular-ext.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto"), local("Roboto-Regular"), url("/playground/build/assets/fonts/roboto-regular-ext.woff2?v=0.1") format("woff2");
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -178,7 +188,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 400;
   font-style: normal;
   font-display: auto;
-  src: local("Roboto"), local("Roboto-Regular"), url("/playground/build/assets/fonts/roboto-regular.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto"), local("Roboto-Regular"), url("/playground/build/assets/fonts/roboto-regular.woff2?v=0.1") format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* latin-ext */
@@ -187,7 +197,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 500;
   font-style: normal;
   font-display: auto;
-  src: local("Roboto Medium"), local("Roboto-Medium"), url("/playground/build/assets/fonts/roboto-medium-ext.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Medium"), local("Roboto-Medium"), url("/playground/build/assets/fonts/roboto-medium-ext.woff2?v=0.1") format("woff2");
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -196,7 +206,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 500;
   font-style: normal;
   font-display: auto;
-  src: local("Roboto Medium"), local("Roboto-Medium"), url("/playground/build/assets/fonts/roboto-medium.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Medium"), local("Roboto-Medium"), url("/playground/build/assets/fonts/roboto-medium.woff2?v=0.1") format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 /* latin-ext */
@@ -205,7 +215,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 700;
   font-style: normal;
   font-display: auto;
-  src: local("Roboto Bold"), local("Roboto-Bold"), url("/playground/build/assets/fonts/roboto-bold-ext.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Bold"), local("Roboto-Bold"), url("/playground/build/assets/fonts/roboto-bold-ext.woff2?v=0.1") format("woff2");
   unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
 }
 /* latin */
@@ -214,7 +224,7 @@ gov-tile__link::before, .gov-tile__link::before {
   font-weight: 700;
   font-style: normal;
   font-display: auto;
-  src: local("Roboto Bold"), local("Roboto-Bold"), url("/playground/build/assets/fonts/roboto-bold.woff2?v=4.0.0") format("woff2");
+  src: local("Roboto Bold"), local("Roboto-Bold"), url("/playground/build/assets/fonts/roboto-bold.woff2?v=0.1") format("woff2");
   unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
 body {
@@ -230,11 +240,21 @@ body {
 /* stylelint-enable */
 /* stylelint-disable */
 /* stylelint-enable */
-/* Converts hex value to rgb colors value */ /* Generates CSS3 var */ /* stylelint-disable order/order */
+/* Converts hex value to rgb colors value */
+/* Generates CSS3 var */
+/* stylelint-disable order/order */
 /* stylelint-enable order/order */
 /* stylelint-disable order/order */
 /* stylelint-enable order/order */
-/* Variables - breakpoints */ /* Variables - Colors */ /* Variables - Sizes */ /* Variables - General */ /* Variables - Typography */ /* Variables - Forms */ /* Variables - shadows */ /* Variables - z-index */ /* stylelint-disable order/order */
+/* Variables - breakpoints */
+/* Variables - Colors */
+/* Variables - Sizes */
+/* Variables - General */
+/* Variables - Typography */
+/* Variables - Forms */
+/* Variables - shadows */
+/* Variables - z-index */
+/* stylelint-disable order/order */
 /* stylelint-enable order/order */
 gov-tabs__list, .gov-tabs__list, gov-pagination__list, .gov-pagination__list, gov-form-multi-select__list, .gov-form-multi-select__list, gov-breadcrumbs ul, .gov-breadcrumbs ul {
   margin: 0;
@@ -294,6 +314,7 @@ gov-tile__link::before, .gov-tile__link::before {
   --border-neutral: var(--color-neutral-700);
   --border-primary: var(--color-primary-600);
   --border-secondary: var(--color-secondary-600);
+  --border-secondary-bold: var(--color-secondary-800);
   --border-subtle: var(--color-neutral-300);
   --border-subtlest: var(--color-neutral-100);
   --border-success: var(--color-success-600);
@@ -346,6 +367,7 @@ gov-tile__link::before, .gov-tile__link::before {
   --icon-on-bold-black: var(--color-neutral-1000);
   --icon-on-bold-white: var(--color-neutral-0);
   --icon-on-subtle: var(--color-primary-600);
+  --icon-on-subtle-fixed-bg: var(--color-primary-600);
   --interactive-active: var(--color-primary-600);
   --interactive-disabled: var(--color-neutral-200);
   --interactive-error: var(--color-error-600);
@@ -360,6 +382,9 @@ gov-tile__link::before, .gov-tile__link::before {
   --interactive-timer-success-subtle: var(--color-success-200);
   --interactive-timer-warning-solid: var(--color-warning-500);
   --interactive-timer-warning-subtle: var(--color-warning-200);
+  --photo-overlay-active: rgb(0 0 0 / 0.4);
+  --photo-overlay-disabled: rgb(255 255 255 / 0.8);
+  --photo-overlay-hover: rgb(0 0 0 / 0.2);
   --status-error: var(--color-error-600);
   --status-focus: var(--color-focus-600);
   --status-success: var(--color-success-600);
@@ -415,6 +440,7 @@ gov-tile__link::before, .gov-tile__link::before {
     --border-neutral: var(--color-neutral-700);
     --border-primary: var(--color-primary-600);
     --border-secondary: var(--color-secondary-600);
+    --border-secondary-bold: var(--color-secondary-800);
     --border-subtle: var(--color-neutral-300);
     --border-subtlest: var(--color-neutral-100);
     --border-success: var(--color-success-600);
@@ -467,6 +493,7 @@ gov-tile__link::before, .gov-tile__link::before {
     --icon-on-bold-black: var(--color-neutral-1000);
     --icon-on-bold-white: var(--color-neutral-0);
     --icon-on-subtle: var(--color-primary-600);
+    --icon-on-subtle-fixed-bg: var(--color-primary-600);
     --interactive-active: var(--color-primary-600);
     --interactive-disabled: var(--color-neutral-200);
     --interactive-error: var(--color-error-600);
@@ -481,6 +508,9 @@ gov-tile__link::before, .gov-tile__link::before {
     --interactive-timer-success-subtle: var(--color-success-200);
     --interactive-timer-warning-solid: var(--color-warning-500);
     --interactive-timer-warning-subtle: var(--color-warning-200);
+    --photo-overlay-active: rgb(0 0 0 / 0.4);
+    --photo-overlay-disabled: rgb(255 255 255 / 0.8);
+    --photo-overlay-hover: rgb(0 0 0 / 0.2);
     --status-error: var(--color-error-600);
     --status-focus: var(--color-focus-600);
     --status-success: var(--color-success-600);
@@ -536,6 +566,7 @@ gov-tile__link::before, .gov-tile__link::before {
   --border-neutral: var(--color-neutral-200);
   --border-primary: var(--color-primary-600);
   --border-secondary: var(--color-secondary-600);
+  --border-secondary-bold: var(--color-secondary-800);
   --border-subtle: var(--color-neutral-600);
   --border-subtlest: var(--color-neutral-900);
   --border-success: var(--color-success-600);
@@ -588,6 +619,7 @@ gov-tile__link::before, .gov-tile__link::before {
   --icon-on-bold-black: var(--color-neutral-1000);
   --icon-on-bold-white: var(--color-neutral-0);
   --icon-on-subtle: var(--color-primary-100);
+  --icon-on-subtle-fixed-bg: var(--color-primary-600);
   --interactive-active: var(--color-primary-600);
   --interactive-disabled: var(--color-neutral-800);
   --interactive-error: var(--color-error-600);
@@ -602,6 +634,9 @@ gov-tile__link::before, .gov-tile__link::before {
   --interactive-timer-success-subtle: var(--color-success-800);
   --interactive-timer-warning-solid: var(--color-warning-400);
   --interactive-timer-warning-subtle: var(--color-warning-900);
+  --photo-overlay-active: rgb(255 255 255 / 0.4);
+  --photo-overlay-disabled: rgb(0 0 0 / 0.8);
+  --photo-overlay-hover: rgb(255 255 255 / 0.2);
   --status-error: var(--color-error-600);
   --status-focus: var(--color-focus-300);
   --status-success: var(--color-success-600);
@@ -657,6 +692,7 @@ gov-tile__link::before, .gov-tile__link::before {
     --border-neutral: var(--color-neutral-200);
     --border-primary: var(--color-primary-600);
     --border-secondary: var(--color-secondary-600);
+    --border-secondary-bold: var(--color-secondary-800);
     --border-subtle: var(--color-neutral-600);
     --border-subtlest: var(--color-neutral-900);
     --border-success: var(--color-success-600);
@@ -709,6 +745,7 @@ gov-tile__link::before, .gov-tile__link::before {
     --icon-on-bold-black: var(--color-neutral-1000);
     --icon-on-bold-white: var(--color-neutral-0);
     --icon-on-subtle: var(--color-primary-100);
+    --icon-on-subtle-fixed-bg: var(--color-primary-600);
     --interactive-active: var(--color-primary-600);
     --interactive-disabled: var(--color-neutral-800);
     --interactive-error: var(--color-error-600);
@@ -723,6 +760,9 @@ gov-tile__link::before, .gov-tile__link::before {
     --interactive-timer-success-subtle: var(--color-success-800);
     --interactive-timer-warning-solid: var(--color-warning-400);
     --interactive-timer-warning-subtle: var(--color-warning-900);
+    --photo-overlay-active: rgb(255 255 255 / 0.4);
+    --photo-overlay-disabled: rgb(0 0 0 / 0.8);
+    --photo-overlay-hover: rgb(255 255 255 / 0.2);
     --status-error: var(--color-error-600);
     --status-focus: var(--color-focus-300);
     --status-success: var(--color-success-600);
@@ -1339,7 +1379,7 @@ ul .gov-list__item:before, .gov-list > li:before,
 ul ul > li:before, .gov-list ul > li:before {
   content: "○";
 }
-ul ul > li:before ul > li:before, .gov-list ul > li:before ul > li:before {
+ul ul > li ul > li:before, .gov-list ul > li ul > li:before {
   content: "■";
 }
 
@@ -1865,7 +1905,7 @@ gov-accordion-item__title, .gov-accordion-item__title {
   flex-direction: column;
   margin-right: auto;
 }
-gov-accordion-item *[slot=label], .gov-accordion-item *[slot=label] {
+gov-accordion-item__title *[slot=label], .gov-accordion-item__title *[slot=label] {
   margin-top: 0;
   margin-bottom: 0;
   display: inline-block;
@@ -1894,7 +1934,7 @@ gov-accordion-item:last-child:before, .gov-accordion-item:last-child:before {
     background-color: var(--button-outlined-primary-hover);
   }
 }
-gov-accordion-item:active > details > summary, .gov-accordion-item:active > details > summary {
+gov-accordion-item > details > summary:active, .gov-accordion-item > details > summary:active {
   background-color: var(--button-outlined-primary-active);
 }
 gov-accordion-item[disabled=""] details *, gov-accordion-item[disabled=true i] details *, gov-accordion-item[disabled="1"] details *, .gov-accordion-item[disabled=""] details *, .gov-accordion-item[disabled=true i] details *, .gov-accordion-item[disabled="1"] details * {
@@ -1925,8 +1965,8 @@ gov-accordion-item[size=xs] *[slot=icon], .gov-accordion-item[size=xs] *[slot=ic
   width: var(--icon-size, var(--icon-size-xs));
   height: var(--icon-size, var(--icon-size-xs));
 }
-gov-accordion-item[size=xs] *[slot=label],
-gov-accordion-item[size=xs] *[slot=annotation], .gov-accordion-item[size=xs] *[slot=label],
+gov-accordion-item[size=xs] .gov-accordion-item__title *[slot=label],
+gov-accordion-item[size=xs] *[slot=annotation], .gov-accordion-item[size=xs] .gov-accordion-item__title *[slot=label],
 .gov-accordion-item[size=xs] *[slot=annotation] {
   font-size: var(--font-size-body-xs);
   line-height: 150%;
@@ -1959,8 +1999,8 @@ gov-accordion-item[size=s] *[slot=icon], .gov-accordion-item[size=s] *[slot=icon
   width: var(--icon-size, var(--icon-size-s));
   height: var(--icon-size, var(--icon-size-s));
 }
-gov-accordion-item[size=s] *[slot=label],
-gov-accordion-item[size=s] *[slot=annotation], .gov-accordion-item[size=s] *[slot=label],
+gov-accordion-item[size=s] .gov-accordion-item__title *[slot=label],
+gov-accordion-item[size=s] *[slot=annotation], .gov-accordion-item[size=s] .gov-accordion-item__title *[slot=label],
 .gov-accordion-item[size=s] *[slot=annotation] {
   font-size: var(--font-size-body-s);
   line-height: 150%;
@@ -1993,8 +2033,8 @@ gov-accordion-item[size=m] *[slot=icon], .gov-accordion-item[size=m] *[slot=icon
   width: var(--icon-size, var(--icon-size-m));
   height: var(--icon-size, var(--icon-size-m));
 }
-gov-accordion-item[size=m] *[slot=label],
-gov-accordion-item[size=m] *[slot=annotation], .gov-accordion-item[size=m] *[slot=label],
+gov-accordion-item[size=m] .gov-accordion-item__title *[slot=label],
+gov-accordion-item[size=m] *[slot=annotation], .gov-accordion-item[size=m] .gov-accordion-item__title *[slot=label],
 .gov-accordion-item[size=m] *[slot=annotation] {
   font-size: var(--font-size-body-m);
   line-height: 150%;
@@ -2027,8 +2067,8 @@ gov-accordion-item[size=l] *[slot=icon], .gov-accordion-item[size=l] *[slot=icon
   width: var(--icon-size, var(--icon-size-l));
   height: var(--icon-size, var(--icon-size-l));
 }
-gov-accordion-item[size=l] *[slot=label],
-gov-accordion-item[size=l] *[slot=annotation], .gov-accordion-item[size=l] *[slot=label],
+gov-accordion-item[size=l] .gov-accordion-item__title *[slot=label],
+gov-accordion-item[size=l] *[slot=annotation], .gov-accordion-item[size=l] .gov-accordion-item__title *[slot=label],
 .gov-accordion-item[size=l] *[slot=annotation] {
   font-size: var(--font-size-body-l);
   line-height: 150%;
@@ -2061,8 +2101,8 @@ gov-accordion-item[size=xl] *[slot=icon], .gov-accordion-item[size=xl] *[slot=ic
   width: var(--icon-size, var(--icon-size-xl));
   height: var(--icon-size, var(--icon-size-xl));
 }
-gov-accordion-item[size=xl] *[slot=label],
-gov-accordion-item[size=xl] *[slot=annotation], .gov-accordion-item[size=xl] *[slot=label],
+gov-accordion-item[size=xl] .gov-accordion-item__title *[slot=label],
+gov-accordion-item[size=xl] *[slot=annotation], .gov-accordion-item[size=xl] .gov-accordion-item__title *[slot=label],
 .gov-accordion-item[size=xl] *[slot=annotation] {
   font-size: var(--font-size-body-xl);
   line-height: 150%;
@@ -3202,10 +3242,10 @@ gov-button, .gov-button {
   /* Variables - Buttons */
   height: var(--height, var(--height-component-m));
   box-sizing: border-box;
-  display: inline-flex;
+  display: inline-block;
   align-content: center;
-  flex-wrap: wrap;
   white-space: nowrap;
+  text-align: center;
   max-width: -moz-max-content;
   max-width: max-content;
   margin-top: 0;
@@ -3223,8 +3263,8 @@ gov-button, gov-button .element, .gov-button, .gov-button .element {
   padding: var(--padding-y, var(--spacing-none)) var(--padding-x, var(--spacing-m));
 }
 gov-button .element, .gov-button .element {
-  height: calc(var(--height, var(--height-component-m)) - var(--border-width, 0.0625rem) * 2);
-  margin: var(--padding-y, var(--spacing-none)) calc(-1 * var(--padding-x, var(--spacing-m)));
+  height: var(--height, var(--height-component-m));
+  margin: var(--padding-y, var(--spacing-none)) calc(-1 * var(--padding-x, var(--spacing-m)) - var(--border-width, 0.0625rem));
 }
 gov-button gov-icon, gov-button .gov-icon, .gov-button gov-icon, .gov-button .gov-icon {
   width: var(--icon-size, var(--icon-size-m));
@@ -3238,11 +3278,11 @@ gov-button[loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]):
   padding-right: var(--padding-x, var(--spacing-m));
 }
 gov-button[loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, gov-button[loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, gov-button[loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, .gov-button[loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, .gov-button[loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, .gov-button[loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element {
-  margin: 0 calc(-1 * (var(--padding-x, var(--spacing-m)) * 3 + var(--icon-size, var(--icon-size-m))) / 2);
+  margin: 0 calc(-1 * (var(--padding-x, var(--spacing-m)) * 3 + var(--icon-size, var(--icon-size-m))) / 2 - var(--border-width, 0.0625rem));
 }
 gov-button[loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), gov-button[loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), gov-button[loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), gov-button[loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), gov-button[loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), gov-button[loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), .gov-button[loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), .gov-button[loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), .gov-button[loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), .gov-button[loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), .gov-button[loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), .gov-button[loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)) {
-  margin-left: calc(-1 * var(--padding-x, var(--spacing-m)));
-  margin-right: calc(-1 * var(--padding-x, var(--spacing-m)));
+  margin-left: calc(-1 * var(--padding-x, var(--spacing-m)) - var(--border-width, 0.0625rem));
+  margin-right: calc(-1 * var(--padding-x, var(--spacing-m)) - var(--border-width, 0.0625rem));
 }
 gov-button[loading=true i]:not([type=link]), gov-button[loading="1"]:not([type=link]), gov-button[icon-start]:not([type=link]), .gov-button[loading=true i]:not([type=link]), .gov-button[loading="1"]:not([type=link]), .gov-button[icon-start]:not([type=link]) {
   padding-left: calc(var(--padding-x, var(--spacing-m)) * 2 + var(--icon-size, var(--icon-size-m)));
@@ -3294,6 +3334,8 @@ gov-button .element, .gov-button .element {
   -webkit-appearance: none;
      -moz-appearance: none;
           appearance: none;
+  position: relative;
+  top: calc(-1 * var(--border-width, 0.0625rem));
   font-family: var(--font-family-primary, var(--font-family));
   border-radius: var(--border-radius, var(--corner-radius-s));
   transition: none;
@@ -3313,10 +3355,6 @@ gov-button gov-icon, gov-button .gov-icon, .gov-button gov-icon, .gov-button .go
   flex: 0 0 auto;
   color: inherit;
 }
-gov-button[loading]:has(.element), gov-button[icon-start]:has(.element), .gov-button[loading]:has(.element), .gov-button[icon-start]:has(.element) {
-  display: inline-block;
-  text-align: center;
-}
 gov-button[disabled=""], gov-button[disabled=true i], gov-button[disabled="1"], .gov-button[disabled=""], .gov-button[disabled=true i], .gov-button[disabled="1"] {
   cursor: not-allowed;
 }
@@ -4138,8 +4176,8 @@ gov-button[size=xs], gov-button[size=xs] .element, .gov-button[size=xs], .gov-bu
   padding: var(--padding-y, var(--spacing-none)) var(--padding-x, var(--spacing-s));
 }
 gov-button[size=xs] .element, .gov-button[size=xs] .element {
-  height: calc(var(--height, var(--height-component-xs)) - var(--border-width, 0.0625rem) * 2);
-  margin: var(--padding-y, var(--spacing-none)) calc(-1 * var(--padding-x, var(--spacing-s)));
+  height: var(--height, var(--height-component-xs));
+  margin: var(--padding-y, var(--spacing-none)) calc(-1 * var(--padding-x, var(--spacing-s)) - var(--border-width, 0.0625rem));
 }
 gov-button[size=xs] gov-icon, gov-button[size=xs] .gov-icon, .gov-button[size=xs] gov-icon, .gov-button[size=xs] .gov-icon {
   width: var(--icon-size, var(--icon-size-xs));
@@ -4153,11 +4191,11 @@ gov-button[size=xs][loading="0"]:not([expanded]):not([expanded-mobile]):not([typ
   padding-right: var(--padding-x, var(--spacing-s));
 }
 gov-button[size=xs][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, gov-button[size=xs][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, gov-button[size=xs][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, .gov-button[size=xs][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, .gov-button[size=xs][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, .gov-button[size=xs][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element {
-  margin: 0 calc(-1 * (var(--padding-x, var(--spacing-s)) * 3 + var(--icon-size, var(--icon-size-xs))) / 2);
+  margin: 0 calc(-1 * (var(--padding-x, var(--spacing-s)) * 3 + var(--icon-size, var(--icon-size-xs))) / 2 - var(--border-width, 0.0625rem));
 }
 gov-button[size=xs][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), gov-button[size=xs][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), gov-button[size=xs][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), gov-button[size=xs][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), gov-button[size=xs][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), gov-button[size=xs][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), .gov-button[size=xs][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), .gov-button[size=xs][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), .gov-button[size=xs][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), .gov-button[size=xs][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), .gov-button[size=xs][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), .gov-button[size=xs][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)) {
-  margin-left: calc(-1 * var(--padding-x, var(--spacing-s)));
-  margin-right: calc(-1 * var(--padding-x, var(--spacing-s)));
+  margin-left: calc(-1 * var(--padding-x, var(--spacing-s)) - var(--border-width, 0.0625rem));
+  margin-right: calc(-1 * var(--padding-x, var(--spacing-s)) - var(--border-width, 0.0625rem));
 }
 gov-button[size=xs][loading=true i]:not([type=link]), gov-button[size=xs][loading="1"]:not([type=link]), gov-button[size=xs][icon-start]:not([type=link]), .gov-button[size=xs][loading=true i]:not([type=link]), .gov-button[size=xs][loading="1"]:not([type=link]), .gov-button[size=xs][icon-start]:not([type=link]) {
   padding-left: calc(var(--padding-x, var(--spacing-s)) * 2 + var(--icon-size, var(--icon-size-xs)));
@@ -4195,8 +4233,8 @@ gov-button[size=s], gov-button[size=s] .element, .gov-button[size=s], .gov-butto
   padding: var(--padding-y, var(--spacing-none)) var(--padding-x, var(--spacing-s-nudge));
 }
 gov-button[size=s] .element, .gov-button[size=s] .element {
-  height: calc(var(--height, var(--height-component-s)) - var(--border-width, 0.0625rem) * 2);
-  margin: var(--padding-y, var(--spacing-none)) calc(-1 * var(--padding-x, var(--spacing-s-nudge)));
+  height: var(--height, var(--height-component-s));
+  margin: var(--padding-y, var(--spacing-none)) calc(-1 * var(--padding-x, var(--spacing-s-nudge)) - var(--border-width, 0.0625rem));
 }
 gov-button[size=s] gov-icon, gov-button[size=s] .gov-icon, .gov-button[size=s] gov-icon, .gov-button[size=s] .gov-icon {
   width: var(--icon-size, var(--icon-size-s));
@@ -4210,11 +4248,11 @@ gov-button[size=s][loading="0"]:not([expanded]):not([expanded-mobile]):not([type
   padding-right: var(--padding-x, var(--spacing-s-nudge));
 }
 gov-button[size=s][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, gov-button[size=s][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, gov-button[size=s][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, .gov-button[size=s][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, .gov-button[size=s][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, .gov-button[size=s][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element {
-  margin: 0 calc(-1 * (var(--padding-x, var(--spacing-s-nudge)) * 3 + var(--icon-size, var(--icon-size-s))) / 2);
+  margin: 0 calc(-1 * (var(--padding-x, var(--spacing-s-nudge)) * 3 + var(--icon-size, var(--icon-size-s))) / 2 - var(--border-width, 0.0625rem));
 }
 gov-button[size=s][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), gov-button[size=s][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), gov-button[size=s][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), gov-button[size=s][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), gov-button[size=s][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), gov-button[size=s][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), .gov-button[size=s][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), .gov-button[size=s][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), .gov-button[size=s][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), .gov-button[size=s][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), .gov-button[size=s][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), .gov-button[size=s][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)) {
-  margin-left: calc(-1 * var(--padding-x, var(--spacing-s-nudge)));
-  margin-right: calc(-1 * var(--padding-x, var(--spacing-s-nudge)));
+  margin-left: calc(-1 * var(--padding-x, var(--spacing-s-nudge)) - var(--border-width, 0.0625rem));
+  margin-right: calc(-1 * var(--padding-x, var(--spacing-s-nudge)) - var(--border-width, 0.0625rem));
 }
 gov-button[size=s][loading=true i]:not([type=link]), gov-button[size=s][loading="1"]:not([type=link]), gov-button[size=s][icon-start]:not([type=link]), .gov-button[size=s][loading=true i]:not([type=link]), .gov-button[size=s][loading="1"]:not([type=link]), .gov-button[size=s][icon-start]:not([type=link]) {
   padding-left: calc(var(--padding-x, var(--spacing-s-nudge)) * 2 + var(--icon-size, var(--icon-size-s)));
@@ -4252,8 +4290,8 @@ gov-button[size=l], gov-button[size=l] .element, .gov-button[size=l], .gov-butto
   padding: var(--padding-y, var(--spacing-none)) var(--padding-x, var(--spacing-m-nudge));
 }
 gov-button[size=l] .element, .gov-button[size=l] .element {
-  height: calc(var(--height, var(--height-component-l)) - var(--border-width, 0.0625rem) * 2);
-  margin: var(--padding-y, var(--spacing-none)) calc(-1 * var(--padding-x, var(--spacing-m-nudge)));
+  height: var(--height, var(--height-component-l));
+  margin: var(--padding-y, var(--spacing-none)) calc(-1 * var(--padding-x, var(--spacing-m-nudge)) - var(--border-width, 0.0625rem));
 }
 gov-button[size=l] gov-icon, gov-button[size=l] .gov-icon, .gov-button[size=l] gov-icon, .gov-button[size=l] .gov-icon {
   width: var(--icon-size, var(--icon-size-l));
@@ -4267,11 +4305,11 @@ gov-button[size=l][loading="0"]:not([expanded]):not([expanded-mobile]):not([type
   padding-right: var(--padding-x, var(--spacing-m-nudge));
 }
 gov-button[size=l][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, gov-button[size=l][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, gov-button[size=l][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, .gov-button[size=l][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, .gov-button[size=l][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, .gov-button[size=l][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element {
-  margin: 0 calc(-1 * (var(--padding-x, var(--spacing-m-nudge)) * 3 + var(--icon-size, var(--icon-size-l))) / 2);
+  margin: 0 calc(-1 * (var(--padding-x, var(--spacing-m-nudge)) * 3 + var(--icon-size, var(--icon-size-l))) / 2 - var(--border-width, 0.0625rem));
 }
 gov-button[size=l][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), gov-button[size=l][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), gov-button[size=l][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), gov-button[size=l][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), gov-button[size=l][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), gov-button[size=l][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), .gov-button[size=l][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), .gov-button[size=l][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), .gov-button[size=l][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), .gov-button[size=l][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), .gov-button[size=l][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), .gov-button[size=l][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)) {
-  margin-left: calc(-1 * var(--padding-x, var(--spacing-m-nudge)));
-  margin-right: calc(-1 * var(--padding-x, var(--spacing-m-nudge)));
+  margin-left: calc(-1 * var(--padding-x, var(--spacing-m-nudge)) - var(--border-width, 0.0625rem));
+  margin-right: calc(-1 * var(--padding-x, var(--spacing-m-nudge)) - var(--border-width, 0.0625rem));
 }
 gov-button[size=l][loading=true i]:not([type=link]), gov-button[size=l][loading="1"]:not([type=link]), gov-button[size=l][icon-start]:not([type=link]), .gov-button[size=l][loading=true i]:not([type=link]), .gov-button[size=l][loading="1"]:not([type=link]), .gov-button[size=l][icon-start]:not([type=link]) {
   padding-left: calc(var(--padding-x, var(--spacing-m-nudge)) * 2 + var(--icon-size, var(--icon-size-l)));
@@ -4309,8 +4347,8 @@ gov-button[size=xl], gov-button[size=xl] .element, .gov-button[size=xl], .gov-bu
   padding: var(--padding-y, var(--spacing-none)) var(--padding-x, var(--spacing-l));
 }
 gov-button[size=xl] .element, .gov-button[size=xl] .element {
-  height: calc(var(--height, var(--height-component-xl)) - var(--border-width, 0.0625rem) * 2);
-  margin: var(--padding-y, var(--spacing-none)) calc(-1 * var(--padding-x, var(--spacing-l)));
+  height: var(--height, var(--height-component-xl));
+  margin: var(--padding-y, var(--spacing-none)) calc(-1 * var(--padding-x, var(--spacing-l)) - var(--border-width, 0.0625rem));
 }
 gov-button[size=xl] gov-icon, gov-button[size=xl] .gov-icon, .gov-button[size=xl] gov-icon, .gov-button[size=xl] .gov-icon {
   width: var(--icon-size, var(--icon-size-xl));
@@ -4324,11 +4362,11 @@ gov-button[size=xl][loading="0"]:not([expanded]):not([expanded-mobile]):not([typ
   padding-right: var(--padding-x, var(--spacing-l));
 }
 gov-button[size=xl][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, gov-button[size=xl][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, gov-button[size=xl][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, .gov-button[size=xl][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, .gov-button[size=xl][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element, .gov-button[size=xl][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element {
-  margin: 0 calc(-1 * (var(--padding-x, var(--spacing-l)) * 3 + var(--icon-size, var(--icon-size-xl))) / 2);
+  margin: 0 calc(-1 * (var(--padding-x, var(--spacing-l)) * 3 + var(--icon-size, var(--icon-size-xl))) / 2 - var(--border-width, 0.0625rem));
 }
 gov-button[size=xl][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), gov-button[size=xl][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), gov-button[size=xl][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), gov-button[size=xl][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), gov-button[size=xl][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), gov-button[size=xl][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), .gov-button[size=xl][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), .gov-button[size=xl][loading="0"]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), .gov-button[size=xl][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), .gov-button[size=xl][loading=false i]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)), .gov-button[size=xl][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(gov-icon:not(.gov-spin-animation)), .gov-button[size=xl][loading=""]:not([expanded]):not([expanded-mobile]):not([type=link]) .element:has(.gov-icon:not(.gov-spin-animation)) {
-  margin-left: calc(-1 * var(--padding-x, var(--spacing-l)));
-  margin-right: calc(-1 * var(--padding-x, var(--spacing-l)));
+  margin-left: calc(-1 * var(--padding-x, var(--spacing-l)) - var(--border-width, 0.0625rem));
+  margin-right: calc(-1 * var(--padding-x, var(--spacing-l)) - var(--border-width, 0.0625rem));
 }
 gov-button[size=xl][loading=true i]:not([type=link]), gov-button[size=xl][loading="1"]:not([type=link]), gov-button[size=xl][icon-start]:not([type=link]), .gov-button[size=xl][loading=true i]:not([type=link]), .gov-button[size=xl][loading="1"]:not([type=link]), .gov-button[size=xl][icon-start]:not([type=link]) {
   padding-left: calc(var(--padding-x, var(--spacing-l)) * 2 + var(--icon-size, var(--icon-size-xl)));
@@ -4369,8 +4407,8 @@ gov-button[expanded=""], gov-button[expanded=true i], gov-button[expanded="1"],
   justify-content: center;
 }
 gov-button[expanded=""] .element, gov-button[expanded=true i] .element, gov-button[expanded="1"] .element, .gov-button[expanded=""] .element, .gov-button[expanded=true i] .element, .gov-button[expanded="1"] .element {
-  width: 100%;
-  margin: 0;
+  width: calc(100% + 2 * var(--border-width, 0.0625rem));
+  margin: 0 calc(-1 * var(--border-width, 0.0625rem));
 }
 @media (max-width: 29.99em) {
   gov-button[expanded-mobile=""], gov-button[expanded-mobile=true i], gov-button[expanded-mobile="1"], .gov-button[expanded-mobile=""], .gov-button[expanded-mobile=true i], .gov-button[expanded-mobile="1"] {
@@ -4380,8 +4418,8 @@ gov-button[expanded=""] .element, gov-button[expanded=true i] .element, gov-butt
     justify-content: center;
   }
   gov-button[expanded-mobile=""] .element, gov-button[expanded-mobile=true i] .element, gov-button[expanded-mobile="1"] .element, .gov-button[expanded-mobile=""] .element, .gov-button[expanded-mobile=true i] .element, .gov-button[expanded-mobile="1"] .element {
-    width: 100%;
-    margin: 0;
+    width: calc(100% + 2 * var(--border-width, 0.0625rem));
+    margin: 0 calc(-1 * var(--border-width, 0.0625rem));
   }
 }
 gov-button[type=link], .gov-button[type=link] {
@@ -4421,7 +4459,6 @@ gov-dropdown__list, .gov-dropdown__list {
   z-index: 100;
 }
 gov-dropdown ul, .gov-dropdown ul {
-  display: none;
   padding: var(--spacing-2xs) 0;
   margin: 0 !important;
   border-radius: var(--border-radius, var(--corner-radius-s));
@@ -4447,9 +4484,6 @@ gov-dropdown[position=right] .gov-dropdown__list, .gov-dropdown[position=right]
   right: 0;
   left: initial;
 }
-gov-dropdown[open] ul, .gov-dropdown[open] ul {
-  display: block;
-}
 
 /* Card */
 gov-card, .gov-card {
@@ -4551,10 +4585,11 @@ gov-card:not([hydrated]), .gov-card:not([hydrated]) {
   padding: var(--spacing-l);
 }
 @media not all and (pointer: coarse) {
-  gov-card:has(> a):hover, .gov-card:has(> a):hover {
+  gov-card[clickable=""]:hover, gov-card[clickable=true i]:hover, gov-card[clickable="1"]:hover, .gov-card[clickable=""]:hover, .gov-card[clickable=true i]:hover, .gov-card[clickable="1"]:hover {
     box-shadow: 0 0.25rem 0.75rem 0 rgba(0, 0, 0, 0.2);
     transform: translateY(-2px);
     transition: all 150ms ease-in-out;
+    cursor: pointer;
   }
 }
 gov-card[direction=horizontal] .gov-card__inner, gov-card[direction=horizontal]:not([hydrated]), .gov-card[direction=horizontal] .gov-card__inner, .gov-card[direction=horizontal]:not([hydrated]) {
@@ -4635,7 +4670,8 @@ gov-card[collapsible=""][open=""] .gov-card__arrow, gov-card[collapsible=""][ope
 
 /* Chip */
 gov-chip, .gov-chip {
-  /* Variables - Chips */ /* Variables - Buttons */
+  /* Variables - Chips */
+  /* Variables - Buttons */
   margin: 0;
   padding: 0;
   font-family: var(--font-family-primary, var(--font-family));
@@ -6039,6 +6075,7 @@ gov-dialog, .gov-dialog {
   /* Variables - Dialog */
   display: none;
   visibility: hidden;
+  padding: var(--spacing-s);
 }
 gov-dialog__dialog, .gov-dialog__dialog {
   z-index: 101;
@@ -6050,14 +6087,22 @@ gov-dialog__dialog, .gov-dialog__dialog {
   align-items: center;
   width: 100%;
   max-width: var(--max-width, 52.5rem);
-  height: 100%;
-  padding: var(--spacing-s);
+  max-height: 100%;
+  padding: 0;
   color: inherit;
   border: none;
   background: transparent;
   transform: translate(-50%, -50%);
   pointer-events: none;
 }
+gov-dialog__dialog:focus, .gov-dialog__dialog:focus {
+  outline: none;
+}
+gov-dialog__dialog:focus-visible, .gov-dialog__dialog:focus-visible {
+  border-radius: var(--outline-border-radius, var(--corner-radius-xs-nudge));
+  outline: var(--outline-width, 0.125rem) solid var(--status-focus);
+  outline-offset: 0;
+}
 gov-dialog__inner, .gov-dialog__inner {
   position: relative;
   display: flex;
@@ -6122,9 +6167,6 @@ gov-dialog__footer, .gov-dialog__footer {
   padding: var(--spacing-s-nudge);
   border-top: var(--border-width, 0.0625rem) solid var(--border-color, var(--border-subtlest));
 }
-gov-dialog__dialog:focus gov-dialog__inner, gov-dialog__dialog:focus .gov-dialog__inner, .gov-dialog__dialog:focus gov-dialog__inner, .gov-dialog__dialog:focus .gov-dialog__inner {
-  outline: var(--outline-width, 0.125rem) solid var(--status-focus);
-}
 gov-dialog[open=""], gov-dialog[open=true i], gov-dialog[open="1"], .gov-dialog[open=""], .gov-dialog[open=true i], .gov-dialog[open="1"] {
   display: block;
 }
@@ -6371,6 +6413,9 @@ gov-error-code__content p, .gov-error-code__content p {
   line-height: 150%;
   font-weight: 400;
 }
+gov-error-code__content > *, .gov-error-code__content > * {
+  text-align: center;
+}
 gov-error-code *[slot=headline], .gov-error-code *[slot=headline] {
   font-size: var(--font-size-headline-l);
   line-height: 150%;
@@ -6679,7 +6724,8 @@ gov-flex[responsive=false i][align-self=anchor-center], gov-flex[responsive="0"]
 
 /* Autocomplete */
 gov-form-autocomplete, .gov-form-autocomplete {
-  /* Variables - Form Autocomplete */ /* Variables - Form input */
+  /* Variables - Form Autocomplete */
+  /* Variables - Form input */
   position: relative;
   display: block;
   width: 100%;
@@ -6890,7 +6936,6 @@ gov-form-checkbox, .gov-form-checkbox {
   margin-bottom: 0;
   position: relative;
   display: inline-block;
-  cursor: pointer;
 }
 gov-form-checkbox *, .gov-form-checkbox * {
   margin-top: 0;
@@ -6923,6 +6968,7 @@ gov-form-checkbox input + span:before, .gov-form-checkbox input + span:before {
 }
 gov-form-checkbox *[slot=label], .gov-form-checkbox *[slot=label] {
   margin-bottom: 0;
+  cursor: pointer;
 }
 gov-form-checkbox *[slot=label] *, .gov-form-checkbox *[slot=label] * {
   position: relative;
@@ -6948,6 +6994,17 @@ gov-form-checkbox input:focus-visible + span, .gov-form-checkbox input:focus-vis
   outline: var(--outline-width, 0.125rem) solid var(--status-focus);
   outline-offset: var(--outline-offset, 0.125rem);
 }
+gov-form-checkbox label input:focus-visible + span, .gov-form-checkbox label input:focus-visible + span {
+  outline: none;
+}
+gov-form-checkbox label input:focus, .gov-form-checkbox label input:focus {
+  outline: none;
+}
+gov-form-checkbox label input:focus-visible, .gov-form-checkbox label input:focus-visible {
+  border-radius: var(--outline-border-radius, var(--corner-radius-xs-nudge));
+  outline: var(--outline-width, 0.125rem) solid var(--status-focus);
+  outline-offset: var(--outline-offset, 0.125rem);
+}
 gov-form-checkbox input:checked + span:before,
 gov-form-checkbox input:indeterminate + span:before, .gov-form-checkbox input:checked + span:before,
 .gov-form-checkbox input:indeterminate + span:before {
@@ -7008,7 +7065,7 @@ gov-form-checkbox[size=xs], .gov-form-checkbox[size=xs] {
 }
 gov-form-checkbox[size=xs] input, .gov-form-checkbox[size=xs] input {
   top: calc(var(--padding-ver, var(--spacing-multiline-vertical-padding-xs)) + (var(--height, var(--height-component-xs)) - var(--indicator-size, var(--height-s-nudge)) - var(--padding-ver, var(--spacing-multiline-vertical-padding-xs)) * 2) / 2);
-  width: calc(var(--indicator-size, var(--height-s-nudge)) + var(--gap, var(--spacing-xs-nudge)));
+  width: var(--indicator-size, var(--height-s-nudge));
   height: var(--indicator-size, var(--height-s-nudge));
 }
 gov-form-checkbox[size=xs] input + span, .gov-form-checkbox[size=xs] input + span {
@@ -7016,12 +7073,13 @@ gov-form-checkbox[size=xs] input + span, .gov-form-checkbox[size=xs] input + spa
   min-height: var(--indicator-size, var(--height-s-nudge));
 }
 gov-form-checkbox[size=xs] *[slot=label], .gov-form-checkbox[size=xs] *[slot=label] {
-  padding-left: calc(var(--indicator-size, var(--height-s-nudge)) + var(--gap, var(--spacing-xs-nudge)));
+  padding-left: var(--indicator-size, var(--height-s-nudge));
 }
 gov-form-checkbox[size=xs] *[slot=label] label, .gov-form-checkbox[size=xs] *[slot=label] label {
   font-size: var(--font-size-body-xs);
   line-height: 150%;
   font-weight: 400;
+  padding-left: var(--gap, var(--spacing-xs-nudge));
 }
 gov-form-checkbox[size=xs] input + span:before, .gov-form-checkbox[size=xs] input + span:before {
   top: calc((var(--height, var(--height-component-xs)) - var(--indicator-size, var(--height-s-nudge)) - var(--padding-ver, var(--spacing-multiline-vertical-padding-xs)) * 2) / 2);
@@ -7048,7 +7106,7 @@ gov-form-checkbox[size=s], .gov-form-checkbox[size=s] {
 }
 gov-form-checkbox[size=s] input, .gov-form-checkbox[size=s] input {
   top: calc(var(--padding-ver, var(--spacing-multiline-vertical-padding-s)) + (var(--height, var(--height-component-s)) - var(--indicator-size, var(--height-m)) - var(--padding-ver, var(--spacing-multiline-vertical-padding-s)) * 2) / 2);
-  width: calc(var(--indicator-size, var(--height-m)) + var(--gap, var(--spacing-s)));
+  width: var(--indicator-size, var(--height-m));
   height: var(--indicator-size, var(--height-m));
 }
 gov-form-checkbox[size=s] input + span, .gov-form-checkbox[size=s] input + span {
@@ -7056,12 +7114,13 @@ gov-form-checkbox[size=s] input + span, .gov-form-checkbox[size=s] input + span
   min-height: var(--indicator-size, var(--height-m));
 }
 gov-form-checkbox[size=s] *[slot=label], .gov-form-checkbox[size=s] *[slot=label] {
-  padding-left: calc(var(--indicator-size, var(--height-m)) + var(--gap, var(--spacing-s)));
+  padding-left: var(--indicator-size, var(--height-m));
 }
 gov-form-checkbox[size=s] *[slot=label] label, .gov-form-checkbox[size=s] *[slot=label] label {
   font-size: var(--font-size-body-s);
   line-height: 150%;
   font-weight: 400;
+  padding-left: var(--gap, var(--spacing-s));
 }
 gov-form-checkbox[size=s] input + span:before, .gov-form-checkbox[size=s] input + span:before {
   top: calc((var(--height, var(--height-component-s)) - var(--indicator-size, var(--height-m)) - var(--padding-ver, var(--spacing-multiline-vertical-padding-s)) * 2) / 2);
@@ -7088,7 +7147,7 @@ gov-form-checkbox[size=m], .gov-form-checkbox[size=m] {
 }
 gov-form-checkbox[size=m] input, .gov-form-checkbox[size=m] input {
   top: calc(var(--padding-ver, var(--spacing-multiline-vertical-padding-m)) + (var(--height, var(--height-component-m)) - var(--indicator-size, var(--height-m-nudge)) - var(--padding-ver, var(--spacing-multiline-vertical-padding-m)) * 2) / 2);
-  width: calc(var(--indicator-size, var(--height-m-nudge)) + var(--gap, var(--spacing-s-nudge)));
+  width: var(--indicator-size, var(--height-m-nudge));
   height: var(--indicator-size, var(--height-m-nudge));
 }
 gov-form-checkbox[size=m] input + span, .gov-form-checkbox[size=m] input + span {
@@ -7096,12 +7155,13 @@ gov-form-checkbox[size=m] input + span, .gov-form-checkbox[size=m] input + span
   min-height: var(--indicator-size, var(--height-m-nudge));
 }
 gov-form-checkbox[size=m] *[slot=label], .gov-form-checkbox[size=m] *[slot=label] {
-  padding-left: calc(var(--indicator-size, var(--height-m-nudge)) + var(--gap, var(--spacing-s-nudge)));
+  padding-left: var(--indicator-size, var(--height-m-nudge));
 }
 gov-form-checkbox[size=m] *[slot=label] label, .gov-form-checkbox[size=m] *[slot=label] label {
   font-size: var(--font-size-body-m);
   line-height: 150%;
   font-weight: 400;
+  padding-left: var(--gap, var(--spacing-s-nudge));
 }
 gov-form-checkbox[size=m] input + span:before, .gov-form-checkbox[size=m] input + span:before {
   top: calc((var(--height, var(--height-component-m)) - var(--indicator-size, var(--height-m-nudge)) - var(--padding-ver, var(--spacing-multiline-vertical-padding-m)) * 2) / 2);
@@ -7128,7 +7188,7 @@ gov-form-checkbox[size=l], .gov-form-checkbox[size=l] {
 }
 gov-form-checkbox[size=l] input, .gov-form-checkbox[size=l] input {
   top: calc(var(--padding-ver, var(--spacing-multiline-vertical-padding-l)) + (var(--height, var(--height-component-l)) - var(--indicator-size, var(--height-l)) - var(--padding-ver, var(--spacing-multiline-vertical-padding-l)) * 2) / 2);
-  width: calc(var(--indicator-size, var(--height-l)) + var(--gap, var(--spacing-m)));
+  width: var(--indicator-size, var(--height-l));
   height: var(--indicator-size, var(--height-l));
 }
 gov-form-checkbox[size=l] input + span, .gov-form-checkbox[size=l] input + span {
@@ -7136,12 +7196,13 @@ gov-form-checkbox[size=l] input + span, .gov-form-checkbox[size=l] input + span
   min-height: var(--indicator-size, var(--height-l));
 }
 gov-form-checkbox[size=l] *[slot=label], .gov-form-checkbox[size=l] *[slot=label] {
-  padding-left: calc(var(--indicator-size, var(--height-l)) + var(--gap, var(--spacing-m)));
+  padding-left: var(--indicator-size, var(--height-l));
 }
 gov-form-checkbox[size=l] *[slot=label] label, .gov-form-checkbox[size=l] *[slot=label] label {
   font-size: var(--font-size-body-l);
   line-height: 150%;
   font-weight: 400;
+  padding-left: var(--gap, var(--spacing-m));
 }
 gov-form-checkbox[size=l] input + span:before, .gov-form-checkbox[size=l] input + span:before {
   top: calc((var(--height, var(--height-component-l)) - var(--indicator-size, var(--height-l)) - var(--padding-ver, var(--spacing-multiline-vertical-padding-l)) * 2) / 2);
@@ -7168,7 +7229,7 @@ gov-form-checkbox[size=xl], .gov-form-checkbox[size=xl] {
 }
 gov-form-checkbox[size=xl] input, .gov-form-checkbox[size=xl] input {
   top: calc(var(--padding-ver, var(--spacing-multiline-vertical-padding-xl)) + (var(--height, var(--height-component-xl)) - var(--indicator-size, var(--height-xl)) - var(--padding-ver, var(--spacing-multiline-vertical-padding-xl)) * 2) / 2);
-  width: calc(var(--indicator-size, var(--height-xl)) + var(--gap, var(--spacing-m-nudge)));
+  width: var(--indicator-size, var(--height-xl));
   height: var(--indicator-size, var(--height-xl));
 }
 gov-form-checkbox[size=xl] input + span, .gov-form-checkbox[size=xl] input + span {
@@ -7176,12 +7237,13 @@ gov-form-checkbox[size=xl] input + span, .gov-form-checkbox[size=xl] input + spa
   min-height: var(--indicator-size, var(--height-xl));
 }
 gov-form-checkbox[size=xl] *[slot=label], .gov-form-checkbox[size=xl] *[slot=label] {
-  padding-left: calc(var(--indicator-size, var(--height-xl)) + var(--gap, var(--spacing-m-nudge)));
+  padding-left: var(--indicator-size, var(--height-xl));
 }
 gov-form-checkbox[size=xl] *[slot=label] label, .gov-form-checkbox[size=xl] *[slot=label] label {
   font-size: var(--font-size-body-xl);
   line-height: 150%;
   font-weight: 400;
+  padding-left: var(--gap, var(--spacing-m-nudge));
 }
 gov-form-checkbox[size=xl] input + span:before, .gov-form-checkbox[size=xl] input + span:before {
   top: calc((var(--height, var(--height-component-xl)) - var(--indicator-size, var(--height-xl)) - var(--padding-ver, var(--spacing-multiline-vertical-padding-xl)) * 2) / 2);
@@ -7202,7 +7264,9 @@ gov-form-checkbox[size=xl][no-label=""], gov-form-checkbox[size=xl][no-label=tru
 
 /* Form Control */
 gov-form-control, .gov-form-control {
-  /* Variables - Form label */ /* Variables - Form checkbox & radio */ /* Variables - Form switch */
+  /* Variables - Form label */
+  /* Variables - Form checkbox & radio */
+  /* Variables - Form switch */
 }
 gov-form-control *, .gov-form-control * {
   margin-top: 0;
@@ -7264,16 +7328,12 @@ gov-form-file, .gov-form-file {
   display: block;
   color: var(--text-primary);
 }
-gov-form-file *, .gov-form-file * {
-  margin-top: 0;
-  margin-bottom: 0;
-}
 gov-form-file__area, .gov-form-file__area {
   display: flex;
   flex-direction: column;
   gap: var(--spacing-s);
 }
-gov-form-file__input, .gov-form-file__input {
+gov-form-file__input, gov-form-file__input-focus, .gov-form-file__input, .gov-form-file__input-focus {
   position: absolute;
   top: 0;
   right: 0;
@@ -7281,9 +7341,20 @@ gov-form-file__input, .gov-form-file__input {
   left: 0;
   width: 100%;
   height: 100%;
-  opacity: 0.0001;
   cursor: pointer;
 }
+gov-form-file__input-focus, .gov-form-file__input-focus {
+  z-index: 0;
+}
+gov-form-file__input, .gov-form-file__input {
+  z-index: 1;
+  opacity: 0.0001;
+}
+gov-form-file__input:focus-visible + .gov-form-file__input-focus, .gov-form-file__input:focus-visible + .gov-form-file__input-focus {
+  border-radius: var(--border-radius, var(--corner-radius-s));
+  outline: var(--outline-width, 0.125rem) solid var(--status-focus);
+  outline-offset: 0;
+}
 gov-form-file__attachments, .gov-form-file__attachments {
   margin-top: var(--spacing-xs);
   text-align: left;
@@ -7292,376 +7363,376 @@ gov-form-file__note, .gov-form-file__note {
   color: var(--text-secondary);
 }
 @media not all and (pointer: coarse) {
-  gov-form-file:hover__area gov-button[type=solid][color=primary],
-  gov-form-file:hover__area .gov-button[type=solid][color=primary], .gov-form-file:hover__area gov-button[type=solid][color=primary],
-  .gov-form-file:hover__area .gov-button[type=solid][color=primary] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=primary],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=primary], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=primary],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=primary] {
     background-color: var(--hover-background, var(--button-solid-primary-hover));
     color: var(--hover-color, var(--text-white-fixed));
   }
-  gov-form-file:hover__area gov-button[type=solid][color=primary][disabled=""], gov-form-file:hover__area gov-button[type=solid][color=primary][disabled=true i], gov-form-file:hover__area gov-button[type=solid][color=primary][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=solid][color=primary][disabled=""],
-  gov-form-file:hover__area .gov-button[type=solid][color=primary][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=solid][color=primary][disabled="1"], .gov-form-file:hover__area gov-button[type=solid][color=primary][disabled=""], .gov-form-file:hover__area gov-button[type=solid][color=primary][disabled=true i], .gov-form-file:hover__area gov-button[type=solid][color=primary][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=solid][color=primary][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=solid][color=primary][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=solid][color=primary][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=primary][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=primary][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=primary][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=primary][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=primary][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=primary][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=primary][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=primary][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=primary][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=primary][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=primary][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=primary][disabled="1"] {
     background-color: var(--disabled-background, var(--button-solid-disabled));
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=outlined][color=primary],
-  gov-form-file:hover__area .gov-button[type=outlined][color=primary], .gov-form-file:hover__area gov-button[type=outlined][color=primary],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=primary] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=primary],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=primary], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=primary],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=primary] {
     background-color: var(--hover-background, var(--button-outlined-primary-hover));
     color: var(--hover-color, var(--text-primary-color));
   }
-  gov-form-file:hover__area gov-button[type=outlined][color=primary][disabled=""], gov-form-file:hover__area gov-button[type=outlined][color=primary][disabled=true i], gov-form-file:hover__area gov-button[type=outlined][color=primary][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=outlined][color=primary][disabled=""],
-  gov-form-file:hover__area .gov-button[type=outlined][color=primary][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=outlined][color=primary][disabled="1"], .gov-form-file:hover__area gov-button[type=outlined][color=primary][disabled=""], .gov-form-file:hover__area gov-button[type=outlined][color=primary][disabled=true i], .gov-form-file:hover__area gov-button[type=outlined][color=primary][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=primary][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=primary][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=primary][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=primary][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=primary][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=primary][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=primary][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=primary][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=primary][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=primary][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=primary][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=primary][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=primary][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=primary][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=primary][disabled="1"] {
     background-color: var(--disabled-background, transparent);
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=base][color=primary],
-  gov-form-file:hover__area .gov-button[type=base][color=primary], .gov-form-file:hover__area gov-button[type=base][color=primary],
-  .gov-form-file:hover__area .gov-button[type=base][color=primary] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=primary],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=primary], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=primary],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=primary] {
     background-color: var(--hover-background, var(--button-outlined-primary-hover));
     color: var(--hover-color, var(--text-primary-color));
   }
-  gov-form-file:hover__area gov-button[type=base][color=primary][disabled=""], gov-form-file:hover__area gov-button[type=base][color=primary][disabled=true i], gov-form-file:hover__area gov-button[type=base][color=primary][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=base][color=primary][disabled=""],
-  gov-form-file:hover__area .gov-button[type=base][color=primary][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=base][color=primary][disabled="1"], .gov-form-file:hover__area gov-button[type=base][color=primary][disabled=""], .gov-form-file:hover__area gov-button[type=base][color=primary][disabled=true i], .gov-form-file:hover__area gov-button[type=base][color=primary][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=base][color=primary][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=base][color=primary][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=base][color=primary][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=primary][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=primary][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=primary][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=primary][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=primary][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=primary][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=primary][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=primary][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=primary][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=primary][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=primary][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=primary][disabled="1"] {
     background-color: var(--disabled-background, transparent);
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=link][color=primary],
-  gov-form-file:hover__area .gov-button[type=link][color=primary], .gov-form-file:hover__area gov-button[type=link][color=primary],
-  .gov-form-file:hover__area .gov-button[type=link][color=primary] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=primary],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=primary], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=primary],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=primary] {
     color: var(--hover-color, var(--text-primary-color));
   }
-  gov-form-file:hover__area gov-button[type=link][color=primary][disabled=""], gov-form-file:hover__area gov-button[type=link][color=primary][disabled=true i], gov-form-file:hover__area gov-button[type=link][color=primary][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=link][color=primary][disabled=""],
-  gov-form-file:hover__area .gov-button[type=link][color=primary][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=link][color=primary][disabled="1"], .gov-form-file:hover__area gov-button[type=link][color=primary][disabled=""], .gov-form-file:hover__area gov-button[type=link][color=primary][disabled=true i], .gov-form-file:hover__area gov-button[type=link][color=primary][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=link][color=primary][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=link][color=primary][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=link][color=primary][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=primary][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=primary][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=primary][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=primary][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=primary][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=primary][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=primary][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=primary][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=primary][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=primary][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=primary][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=primary][disabled="1"] {
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=solid][color=secondary],
-  gov-form-file:hover__area .gov-button[type=solid][color=secondary], .gov-form-file:hover__area gov-button[type=solid][color=secondary],
-  .gov-form-file:hover__area .gov-button[type=solid][color=secondary] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=secondary],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=secondary], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=secondary],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=secondary] {
     background-color: var(--hover-background, var(--button-solid-secondary-hover));
     color: var(--hover-color, var(--text-black-fixed));
   }
-  gov-form-file:hover__area gov-button[type=solid][color=secondary][disabled=""], gov-form-file:hover__area gov-button[type=solid][color=secondary][disabled=true i], gov-form-file:hover__area gov-button[type=solid][color=secondary][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=solid][color=secondary][disabled=""],
-  gov-form-file:hover__area .gov-button[type=solid][color=secondary][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=solid][color=secondary][disabled="1"], .gov-form-file:hover__area gov-button[type=solid][color=secondary][disabled=""], .gov-form-file:hover__area gov-button[type=solid][color=secondary][disabled=true i], .gov-form-file:hover__area gov-button[type=solid][color=secondary][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=solid][color=secondary][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=solid][color=secondary][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=solid][color=secondary][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=secondary][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=secondary][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=secondary][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=secondary][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=secondary][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=secondary][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=secondary][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=secondary][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=secondary][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=secondary][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=secondary][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=secondary][disabled="1"] {
     background-color: var(--disabled-background, var(--button-solid-disabled));
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=outlined][color=secondary],
-  gov-form-file:hover__area .gov-button[type=outlined][color=secondary], .gov-form-file:hover__area gov-button[type=outlined][color=secondary],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=secondary] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=secondary],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=secondary], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=secondary],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=secondary] {
     background-color: var(--hover-background, var(--button-outlined-secondary-hover));
     color: var(--hover-color, var(--text-primary));
   }
-  gov-form-file:hover__area gov-button[type=outlined][color=secondary][disabled=""], gov-form-file:hover__area gov-button[type=outlined][color=secondary][disabled=true i], gov-form-file:hover__area gov-button[type=outlined][color=secondary][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=outlined][color=secondary][disabled=""],
-  gov-form-file:hover__area .gov-button[type=outlined][color=secondary][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=outlined][color=secondary][disabled="1"], .gov-form-file:hover__area gov-button[type=outlined][color=secondary][disabled=""], .gov-form-file:hover__area gov-button[type=outlined][color=secondary][disabled=true i], .gov-form-file:hover__area gov-button[type=outlined][color=secondary][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=secondary][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=secondary][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=secondary][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=secondary][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=secondary][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=secondary][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=secondary][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=secondary][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=secondary][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=secondary][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=secondary][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=secondary][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=secondary][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=secondary][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=secondary][disabled="1"] {
     background-color: var(--disabled-background, transparent);
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=base][color=secondary],
-  gov-form-file:hover__area .gov-button[type=base][color=secondary], .gov-form-file:hover__area gov-button[type=base][color=secondary],
-  .gov-form-file:hover__area .gov-button[type=base][color=secondary] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=secondary],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=secondary], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=secondary],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=secondary] {
     background-color: var(--hover-background, var(--button-outlined-secondary-hover));
     color: var(--hover-color, var(--text-primary));
   }
-  gov-form-file:hover__area gov-button[type=base][color=secondary][disabled=""], gov-form-file:hover__area gov-button[type=base][color=secondary][disabled=true i], gov-form-file:hover__area gov-button[type=base][color=secondary][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=base][color=secondary][disabled=""],
-  gov-form-file:hover__area .gov-button[type=base][color=secondary][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=base][color=secondary][disabled="1"], .gov-form-file:hover__area gov-button[type=base][color=secondary][disabled=""], .gov-form-file:hover__area gov-button[type=base][color=secondary][disabled=true i], .gov-form-file:hover__area gov-button[type=base][color=secondary][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=base][color=secondary][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=base][color=secondary][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=base][color=secondary][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=secondary][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=secondary][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=secondary][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=secondary][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=secondary][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=secondary][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=secondary][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=secondary][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=secondary][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=secondary][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=secondary][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=secondary][disabled="1"] {
     background-color: var(--disabled-background, transparent);
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=link][color=secondary],
-  gov-form-file:hover__area .gov-button[type=link][color=secondary], .gov-form-file:hover__area gov-button[type=link][color=secondary],
-  .gov-form-file:hover__area .gov-button[type=link][color=secondary] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=secondary],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=secondary], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=secondary],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=secondary] {
     color: var(--hover-color, var(--text-primary));
   }
-  gov-form-file:hover__area gov-button[type=link][color=secondary][disabled=""], gov-form-file:hover__area gov-button[type=link][color=secondary][disabled=true i], gov-form-file:hover__area gov-button[type=link][color=secondary][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=link][color=secondary][disabled=""],
-  gov-form-file:hover__area .gov-button[type=link][color=secondary][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=link][color=secondary][disabled="1"], .gov-form-file:hover__area gov-button[type=link][color=secondary][disabled=""], .gov-form-file:hover__area gov-button[type=link][color=secondary][disabled=true i], .gov-form-file:hover__area gov-button[type=link][color=secondary][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=link][color=secondary][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=link][color=secondary][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=link][color=secondary][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=secondary][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=secondary][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=secondary][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=secondary][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=secondary][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=secondary][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=secondary][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=secondary][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=secondary][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=secondary][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=secondary][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=secondary][disabled="1"] {
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=solid][color=neutral],
-  gov-form-file:hover__area .gov-button[type=solid][color=neutral], .gov-form-file:hover__area gov-button[type=solid][color=neutral],
-  .gov-form-file:hover__area .gov-button[type=solid][color=neutral] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=neutral],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=neutral], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=neutral],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=neutral] {
     background-color: var(--hover-background, var(--button-solid-neutral-hover));
     color: var(--hover-color, var(--text-white-fixed));
   }
-  gov-form-file:hover__area gov-button[type=solid][color=neutral][disabled=""], gov-form-file:hover__area gov-button[type=solid][color=neutral][disabled=true i], gov-form-file:hover__area gov-button[type=solid][color=neutral][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=solid][color=neutral][disabled=""],
-  gov-form-file:hover__area .gov-button[type=solid][color=neutral][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=solid][color=neutral][disabled="1"], .gov-form-file:hover__area gov-button[type=solid][color=neutral][disabled=""], .gov-form-file:hover__area gov-button[type=solid][color=neutral][disabled=true i], .gov-form-file:hover__area gov-button[type=solid][color=neutral][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=solid][color=neutral][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=solid][color=neutral][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=solid][color=neutral][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=neutral][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=neutral][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=neutral][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=neutral][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=neutral][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=neutral][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=neutral][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=neutral][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=neutral][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=neutral][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=neutral][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=neutral][disabled="1"] {
     background-color: var(--disabled-background, var(--button-solid-disabled));
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=outlined][color=neutral],
-  gov-form-file:hover__area .gov-button[type=outlined][color=neutral], .gov-form-file:hover__area gov-button[type=outlined][color=neutral],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=neutral] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=neutral],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=neutral], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=neutral],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=neutral] {
     background-color: var(--hover-background, var(--button-outlined-neutral-hover));
     color: var(--hover-color, var(--text-primary));
   }
-  gov-form-file:hover__area gov-button[type=outlined][color=neutral][disabled=""], gov-form-file:hover__area gov-button[type=outlined][color=neutral][disabled=true i], gov-form-file:hover__area gov-button[type=outlined][color=neutral][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=outlined][color=neutral][disabled=""],
-  gov-form-file:hover__area .gov-button[type=outlined][color=neutral][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=outlined][color=neutral][disabled="1"], .gov-form-file:hover__area gov-button[type=outlined][color=neutral][disabled=""], .gov-form-file:hover__area gov-button[type=outlined][color=neutral][disabled=true i], .gov-form-file:hover__area gov-button[type=outlined][color=neutral][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=neutral][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=neutral][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=neutral][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=neutral][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=neutral][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=neutral][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=neutral][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=neutral][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=neutral][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=neutral][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=neutral][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=neutral][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=neutral][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=neutral][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=neutral][disabled="1"] {
     background-color: var(--disabled-background, transparent);
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=base][color=neutral],
-  gov-form-file:hover__area .gov-button[type=base][color=neutral], .gov-form-file:hover__area gov-button[type=base][color=neutral],
-  .gov-form-file:hover__area .gov-button[type=base][color=neutral] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=neutral],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=neutral], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=neutral],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=neutral] {
     background-color: var(--hover-background, var(--button-outlined-neutral-hover));
     color: var(--hover-color, var(--text-primary));
   }
-  gov-form-file:hover__area gov-button[type=base][color=neutral][disabled=""], gov-form-file:hover__area gov-button[type=base][color=neutral][disabled=true i], gov-form-file:hover__area gov-button[type=base][color=neutral][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=base][color=neutral][disabled=""],
-  gov-form-file:hover__area .gov-button[type=base][color=neutral][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=base][color=neutral][disabled="1"], .gov-form-file:hover__area gov-button[type=base][color=neutral][disabled=""], .gov-form-file:hover__area gov-button[type=base][color=neutral][disabled=true i], .gov-form-file:hover__area gov-button[type=base][color=neutral][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=base][color=neutral][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=base][color=neutral][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=base][color=neutral][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=neutral][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=neutral][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=neutral][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=neutral][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=neutral][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=neutral][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=neutral][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=neutral][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=neutral][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=neutral][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=neutral][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=neutral][disabled="1"] {
     background-color: var(--disabled-background, transparent);
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=link][color=neutral],
-  gov-form-file:hover__area .gov-button[type=link][color=neutral], .gov-form-file:hover__area gov-button[type=link][color=neutral],
-  .gov-form-file:hover__area .gov-button[type=link][color=neutral] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=neutral],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=neutral], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=neutral],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=neutral] {
     color: var(--hover-color, var(--text-primary));
   }
-  gov-form-file:hover__area gov-button[type=link][color=neutral][disabled=""], gov-form-file:hover__area gov-button[type=link][color=neutral][disabled=true i], gov-form-file:hover__area gov-button[type=link][color=neutral][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=link][color=neutral][disabled=""],
-  gov-form-file:hover__area .gov-button[type=link][color=neutral][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=link][color=neutral][disabled="1"], .gov-form-file:hover__area gov-button[type=link][color=neutral][disabled=""], .gov-form-file:hover__area gov-button[type=link][color=neutral][disabled=true i], .gov-form-file:hover__area gov-button[type=link][color=neutral][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=link][color=neutral][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=link][color=neutral][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=link][color=neutral][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=neutral][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=neutral][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=neutral][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=neutral][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=neutral][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=neutral][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=neutral][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=neutral][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=neutral][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=neutral][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=neutral][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=neutral][disabled="1"] {
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=solid][color=error],
-  gov-form-file:hover__area .gov-button[type=solid][color=error], .gov-form-file:hover__area gov-button[type=solid][color=error],
-  .gov-form-file:hover__area .gov-button[type=solid][color=error] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=error],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=error], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=error],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=error] {
     background-color: var(--hover-background, var(--button-solid-error-hover));
     color: var(--hover-color, var(--text-white-fixed));
   }
-  gov-form-file:hover__area gov-button[type=solid][color=error][disabled=""], gov-form-file:hover__area gov-button[type=solid][color=error][disabled=true i], gov-form-file:hover__area gov-button[type=solid][color=error][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=solid][color=error][disabled=""],
-  gov-form-file:hover__area .gov-button[type=solid][color=error][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=solid][color=error][disabled="1"], .gov-form-file:hover__area gov-button[type=solid][color=error][disabled=""], .gov-form-file:hover__area gov-button[type=solid][color=error][disabled=true i], .gov-form-file:hover__area gov-button[type=solid][color=error][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=solid][color=error][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=solid][color=error][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=solid][color=error][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=error][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=error][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=error][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=error][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=error][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=error][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=error][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=error][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=error][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=error][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=error][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=error][disabled="1"] {
     background-color: var(--disabled-background, var(--button-solid-disabled));
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=outlined][color=error],
-  gov-form-file:hover__area .gov-button[type=outlined][color=error], .gov-form-file:hover__area gov-button[type=outlined][color=error],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=error] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=error],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=error], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=error],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=error] {
     background-color: var(--hover-background, var(--button-outlined-error-hover));
     color: var(--hover-color, var(--text-status-error));
   }
-  gov-form-file:hover__area gov-button[type=outlined][color=error][disabled=""], gov-form-file:hover__area gov-button[type=outlined][color=error][disabled=true i], gov-form-file:hover__area gov-button[type=outlined][color=error][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=outlined][color=error][disabled=""],
-  gov-form-file:hover__area .gov-button[type=outlined][color=error][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=outlined][color=error][disabled="1"], .gov-form-file:hover__area gov-button[type=outlined][color=error][disabled=""], .gov-form-file:hover__area gov-button[type=outlined][color=error][disabled=true i], .gov-form-file:hover__area gov-button[type=outlined][color=error][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=error][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=error][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=error][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=error][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=error][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=error][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=error][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=error][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=error][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=error][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=error][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=error][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=error][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=error][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=error][disabled="1"] {
     background-color: var(--disabled-background, transparent);
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=base][color=error],
-  gov-form-file:hover__area .gov-button[type=base][color=error], .gov-form-file:hover__area gov-button[type=base][color=error],
-  .gov-form-file:hover__area .gov-button[type=base][color=error] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=error],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=error], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=error],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=error] {
     background-color: var(--hover-background, var(--button-outlined-error-hover));
     color: var(--hover-color, var(--text-status-error));
   }
-  gov-form-file:hover__area gov-button[type=base][color=error][disabled=""], gov-form-file:hover__area gov-button[type=base][color=error][disabled=true i], gov-form-file:hover__area gov-button[type=base][color=error][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=base][color=error][disabled=""],
-  gov-form-file:hover__area .gov-button[type=base][color=error][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=base][color=error][disabled="1"], .gov-form-file:hover__area gov-button[type=base][color=error][disabled=""], .gov-form-file:hover__area gov-button[type=base][color=error][disabled=true i], .gov-form-file:hover__area gov-button[type=base][color=error][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=base][color=error][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=base][color=error][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=base][color=error][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=error][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=error][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=error][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=error][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=error][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=error][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=error][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=error][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=error][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=error][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=error][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=error][disabled="1"] {
     background-color: var(--disabled-background, transparent);
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=link][color=error],
-  gov-form-file:hover__area .gov-button[type=link][color=error], .gov-form-file:hover__area gov-button[type=link][color=error],
-  .gov-form-file:hover__area .gov-button[type=link][color=error] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=error],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=error], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=error],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=error] {
     color: var(--hover-color, var(--text-status-error));
   }
-  gov-form-file:hover__area gov-button[type=link][color=error][disabled=""], gov-form-file:hover__area gov-button[type=link][color=error][disabled=true i], gov-form-file:hover__area gov-button[type=link][color=error][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=link][color=error][disabled=""],
-  gov-form-file:hover__area .gov-button[type=link][color=error][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=link][color=error][disabled="1"], .gov-form-file:hover__area gov-button[type=link][color=error][disabled=""], .gov-form-file:hover__area gov-button[type=link][color=error][disabled=true i], .gov-form-file:hover__area gov-button[type=link][color=error][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=link][color=error][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=link][color=error][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=link][color=error][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=error][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=error][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=error][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=error][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=error][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=error][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=error][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=error][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=error][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=error][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=error][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=error][disabled="1"] {
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=solid][color=success],
-  gov-form-file:hover__area .gov-button[type=solid][color=success], .gov-form-file:hover__area gov-button[type=solid][color=success],
-  .gov-form-file:hover__area .gov-button[type=solid][color=success] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=success],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=success], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=success],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=success] {
     background-color: var(--hover-background, var(--button-solid-success-hover));
     color: var(--hover-color, var(--text-white-fixed));
   }
-  gov-form-file:hover__area gov-button[type=solid][color=success][disabled=""], gov-form-file:hover__area gov-button[type=solid][color=success][disabled=true i], gov-form-file:hover__area gov-button[type=solid][color=success][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=solid][color=success][disabled=""],
-  gov-form-file:hover__area .gov-button[type=solid][color=success][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=solid][color=success][disabled="1"], .gov-form-file:hover__area gov-button[type=solid][color=success][disabled=""], .gov-form-file:hover__area gov-button[type=solid][color=success][disabled=true i], .gov-form-file:hover__area gov-button[type=solid][color=success][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=solid][color=success][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=solid][color=success][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=solid][color=success][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=success][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=success][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=success][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=success][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=success][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=success][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=success][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=success][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=success][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=success][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=success][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=success][disabled="1"] {
     background-color: var(--disabled-background, var(--button-solid-disabled));
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=outlined][color=success],
-  gov-form-file:hover__area .gov-button[type=outlined][color=success], .gov-form-file:hover__area gov-button[type=outlined][color=success],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=success] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=success],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=success], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=success],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=success] {
     background-color: var(--hover-background, var(--button-outlined-success-hover));
     color: var(--hover-color, var(--text-status-success));
   }
-  gov-form-file:hover__area gov-button[type=outlined][color=success][disabled=""], gov-form-file:hover__area gov-button[type=outlined][color=success][disabled=true i], gov-form-file:hover__area gov-button[type=outlined][color=success][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=outlined][color=success][disabled=""],
-  gov-form-file:hover__area .gov-button[type=outlined][color=success][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=outlined][color=success][disabled="1"], .gov-form-file:hover__area gov-button[type=outlined][color=success][disabled=""], .gov-form-file:hover__area gov-button[type=outlined][color=success][disabled=true i], .gov-form-file:hover__area gov-button[type=outlined][color=success][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=success][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=success][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=success][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=success][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=success][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=success][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=success][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=success][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=success][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=success][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=success][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=success][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=success][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=success][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=success][disabled="1"] {
     background-color: var(--disabled-background, transparent);
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=base][color=success],
-  gov-form-file:hover__area .gov-button[type=base][color=success], .gov-form-file:hover__area gov-button[type=base][color=success],
-  .gov-form-file:hover__area .gov-button[type=base][color=success] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=success],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=success], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=success],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=success] {
     background-color: var(--hover-background, var(--button-outlined-success-hover));
     color: var(--hover-color, var(--text-status-success));
   }
-  gov-form-file:hover__area gov-button[type=base][color=success][disabled=""], gov-form-file:hover__area gov-button[type=base][color=success][disabled=true i], gov-form-file:hover__area gov-button[type=base][color=success][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=base][color=success][disabled=""],
-  gov-form-file:hover__area .gov-button[type=base][color=success][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=base][color=success][disabled="1"], .gov-form-file:hover__area gov-button[type=base][color=success][disabled=""], .gov-form-file:hover__area gov-button[type=base][color=success][disabled=true i], .gov-form-file:hover__area gov-button[type=base][color=success][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=base][color=success][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=base][color=success][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=base][color=success][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=success][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=success][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=success][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=success][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=success][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=success][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=success][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=success][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=success][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=success][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=success][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=success][disabled="1"] {
     background-color: var(--disabled-background, transparent);
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=link][color=success],
-  gov-form-file:hover__area .gov-button[type=link][color=success], .gov-form-file:hover__area gov-button[type=link][color=success],
-  .gov-form-file:hover__area .gov-button[type=link][color=success] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=success],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=success], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=success],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=success] {
     color: var(--hover-color, var(--text-status-success));
   }
-  gov-form-file:hover__area gov-button[type=link][color=success][disabled=""], gov-form-file:hover__area gov-button[type=link][color=success][disabled=true i], gov-form-file:hover__area gov-button[type=link][color=success][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=link][color=success][disabled=""],
-  gov-form-file:hover__area .gov-button[type=link][color=success][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=link][color=success][disabled="1"], .gov-form-file:hover__area gov-button[type=link][color=success][disabled=""], .gov-form-file:hover__area gov-button[type=link][color=success][disabled=true i], .gov-form-file:hover__area gov-button[type=link][color=success][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=link][color=success][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=link][color=success][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=link][color=success][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=success][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=success][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=success][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=success][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=success][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=success][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=success][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=success][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=success][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=success][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=success][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=success][disabled="1"] {
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=solid][color=warning],
-  gov-form-file:hover__area .gov-button[type=solid][color=warning], .gov-form-file:hover__area gov-button[type=solid][color=warning],
-  .gov-form-file:hover__area .gov-button[type=solid][color=warning] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=warning],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=warning], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=warning],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=warning] {
     background-color: var(--hover-background, var(--button-solid-warning-hover));
     color: var(--hover-color, var(--text-black-fixed));
   }
-  gov-form-file:hover__area gov-button[type=solid][color=warning][disabled=""], gov-form-file:hover__area gov-button[type=solid][color=warning][disabled=true i], gov-form-file:hover__area gov-button[type=solid][color=warning][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=solid][color=warning][disabled=""],
-  gov-form-file:hover__area .gov-button[type=solid][color=warning][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=solid][color=warning][disabled="1"], .gov-form-file:hover__area gov-button[type=solid][color=warning][disabled=""], .gov-form-file:hover__area gov-button[type=solid][color=warning][disabled=true i], .gov-form-file:hover__area gov-button[type=solid][color=warning][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=solid][color=warning][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=solid][color=warning][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=solid][color=warning][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=warning][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=warning][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=warning][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=warning][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=warning][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=warning][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=warning][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=warning][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=solid][color=warning][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=warning][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=warning][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=solid][color=warning][disabled="1"] {
     background-color: var(--disabled-background, var(--button-solid-disabled));
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=outlined][color=warning],
-  gov-form-file:hover__area .gov-button[type=outlined][color=warning], .gov-form-file:hover__area gov-button[type=outlined][color=warning],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=warning] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=warning],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=warning], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=warning],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=warning] {
     background-color: var(--hover-background, var(--button-outlined-warning-hover));
     color: var(--hover-color, var(--text-status-warning));
   }
-  gov-form-file:hover__area gov-button[type=outlined][color=warning][disabled=""], gov-form-file:hover__area gov-button[type=outlined][color=warning][disabled=true i], gov-form-file:hover__area gov-button[type=outlined][color=warning][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=outlined][color=warning][disabled=""],
-  gov-form-file:hover__area .gov-button[type=outlined][color=warning][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=outlined][color=warning][disabled="1"], .gov-form-file:hover__area gov-button[type=outlined][color=warning][disabled=""], .gov-form-file:hover__area gov-button[type=outlined][color=warning][disabled=true i], .gov-form-file:hover__area gov-button[type=outlined][color=warning][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=warning][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=warning][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=outlined][color=warning][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=warning][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=warning][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=warning][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=warning][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=warning][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=warning][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=warning][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=warning][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=outlined][color=warning][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=warning][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=warning][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=outlined][color=warning][disabled="1"] {
     background-color: var(--disabled-background, transparent);
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=base][color=warning],
-  gov-form-file:hover__area .gov-button[type=base][color=warning], .gov-form-file:hover__area gov-button[type=base][color=warning],
-  .gov-form-file:hover__area .gov-button[type=base][color=warning] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=warning],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=warning], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=warning],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=warning] {
     background-color: var(--hover-background, var(--button-outlined-warning-hover));
     color: var(--hover-color, var(--text-status-warning));
   }
-  gov-form-file:hover__area gov-button[type=base][color=warning][disabled=""], gov-form-file:hover__area gov-button[type=base][color=warning][disabled=true i], gov-form-file:hover__area gov-button[type=base][color=warning][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=base][color=warning][disabled=""],
-  gov-form-file:hover__area .gov-button[type=base][color=warning][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=base][color=warning][disabled="1"], .gov-form-file:hover__area gov-button[type=base][color=warning][disabled=""], .gov-form-file:hover__area gov-button[type=base][color=warning][disabled=true i], .gov-form-file:hover__area gov-button[type=base][color=warning][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=base][color=warning][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=base][color=warning][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=base][color=warning][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=warning][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=warning][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=warning][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=warning][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=warning][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=warning][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=warning][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=warning][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=base][color=warning][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=warning][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=warning][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=base][color=warning][disabled="1"] {
     background-color: var(--disabled-background, transparent);
     color: var(--disabled-color, var(--text-disabled));
   }
-  gov-form-file:hover__area gov-button[type=link][color=warning],
-  gov-form-file:hover__area .gov-button[type=link][color=warning], .gov-form-file:hover__area gov-button[type=link][color=warning],
-  .gov-form-file:hover__area .gov-button[type=link][color=warning] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=warning],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=warning], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=warning],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=warning] {
     color: var(--hover-color, var(--text-status-warning));
   }
-  gov-form-file:hover__area gov-button[type=link][color=warning][disabled=""], gov-form-file:hover__area gov-button[type=link][color=warning][disabled=true i], gov-form-file:hover__area gov-button[type=link][color=warning][disabled="1"],
-  gov-form-file:hover__area .gov-button[type=link][color=warning][disabled=""],
-  gov-form-file:hover__area .gov-button[type=link][color=warning][disabled=true i],
-  gov-form-file:hover__area .gov-button[type=link][color=warning][disabled="1"], .gov-form-file:hover__area gov-button[type=link][color=warning][disabled=""], .gov-form-file:hover__area gov-button[type=link][color=warning][disabled=true i], .gov-form-file:hover__area gov-button[type=link][color=warning][disabled="1"],
-  .gov-form-file:hover__area .gov-button[type=link][color=warning][disabled=""],
-  .gov-form-file:hover__area .gov-button[type=link][color=warning][disabled=true i],
-  .gov-form-file:hover__area .gov-button[type=link][color=warning][disabled="1"] {
+  gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=warning][disabled=""], gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=warning][disabled=true i], gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=warning][disabled="1"],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=warning][disabled=""],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=warning][disabled=true i],
+  gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=warning][disabled="1"], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=warning][disabled=""], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=warning][disabled=true i], .gov-form-file__input:hover .gov-form-file__area gov-button[type=link][color=warning][disabled="1"],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=warning][disabled=""],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=warning][disabled=true i],
+  .gov-form-file__input:hover .gov-form-file__area .gov-button[type=link][color=warning][disabled="1"] {
     color: var(--disabled-color, var(--text-disabled));
   }
 }
@@ -8289,7 +8360,9 @@ gov-form-message[size=xl], gov-form-message[size=xl] .gov-form-message__content,
 
 /* Multiselect */
 gov-form-multi-select, .gov-form-multi-select {
-  /* Variables - Form multiselect */ /* Variables - Buttons */ /* Variables - Form input */
+  /* Variables - Form multiselect */
+  /* Variables - Buttons */
+  /* Variables - Form input */
   margin-top: 0;
   margin-bottom: 0;
   display: flex;
@@ -8658,7 +8731,6 @@ gov-form-radio, .gov-form-radio {
   margin-bottom: 0;
   position: relative;
   display: inline-flex;
-  cursor: pointer;
 }
 gov-form-radio *, .gov-form-radio * {
   margin-top: 0;
@@ -8687,6 +8759,9 @@ gov-form-radio input + span, .gov-form-radio input + span {
   position: relative;
   display: block;
 }
+gov-form-radio *[slot=label], .gov-form-radio *[slot=label] {
+  cursor: pointer;
+}
 gov-form-radio input:focus-visible, .gov-form-radio input:focus-visible {
   outline: none;
 }
@@ -8725,12 +8800,13 @@ gov-form-radio[size=xs], .gov-form-radio[size=xs] {
   padding: var(--padding-ver, var(--spacing-multiline-vertical-padding-xs)) 0;
 }
 gov-form-radio[size=xs] *[slot=label], .gov-form-radio[size=xs] *[slot=label] {
-  padding-left: calc(var(--indicator-size, var(--height-s-nudge)) + var(--gap, var(--spacing-xs-nudge)));
+  padding-left: var(--indicator-size, var(--height-s-nudge));
 }
 gov-form-radio[size=xs] *[slot=label] label, .gov-form-radio[size=xs] *[slot=label] label {
   font-size: var(--font-size-body-xs);
   line-height: 150%;
   font-weight: 400;
+  padding-left: var(--gap, var(--spacing-xs-nudge));
 }
 gov-form-radio[size=xs] input, .gov-form-radio[size=xs] input {
   border-width: var(--radio-space, var(--spacing-2xs));
@@ -8754,12 +8830,13 @@ gov-form-radio[size=s], .gov-form-radio[size=s] {
   padding: var(--padding-ver, var(--spacing-multiline-vertical-padding-s)) 0;
 }
 gov-form-radio[size=s] *[slot=label], .gov-form-radio[size=s] *[slot=label] {
-  padding-left: calc(var(--indicator-size, var(--height-m)) + var(--gap, var(--spacing-s)));
+  padding-left: var(--indicator-size, var(--height-m));
 }
 gov-form-radio[size=s] *[slot=label] label, .gov-form-radio[size=s] *[slot=label] label {
   font-size: var(--font-size-body-s);
   line-height: 150%;
   font-weight: 400;
+  padding-left: var(--gap, var(--spacing-s));
 }
 gov-form-radio[size=s] input, .gov-form-radio[size=s] input {
   border-width: var(--radio-space, var(--spacing-multiline-vertical-padding-xs));
@@ -8783,12 +8860,13 @@ gov-form-radio[size=m], .gov-form-radio[size=m] {
   padding: var(--padding-ver, var(--spacing-multiline-vertical-padding-m)) 0;
 }
 gov-form-radio[size=m] *[slot=label], .gov-form-radio[size=m] *[slot=label] {
-  padding-left: calc(var(--indicator-size, var(--height-m-nudge)) + var(--gap, var(--spacing-s-nudge)));
+  padding-left: var(--indicator-size, var(--height-m-nudge));
 }
 gov-form-radio[size=m] *[slot=label] label, .gov-form-radio[size=m] *[slot=label] label {
   font-size: var(--font-size-body-m);
   line-height: 150%;
   font-weight: 400;
+  padding-left: var(--gap, var(--spacing-s-nudge));
 }
 gov-form-radio[size=m] input, .gov-form-radio[size=m] input {
   border-width: var(--radio-space, var(--spacing-xs));
@@ -8812,12 +8890,13 @@ gov-form-radio[size=l], .gov-form-radio[size=l] {
   padding: var(--padding-ver, var(--spacing-multiline-vertical-padding-l)) 0;
 }
 gov-form-radio[size=l] *[slot=label], .gov-form-radio[size=l] *[slot=label] {
-  padding-left: calc(var(--indicator-size, var(--height-l)) + var(--gap, var(--spacing-m)));
+  padding-left: var(--indicator-size, var(--height-l));
 }
 gov-form-radio[size=l] *[slot=label] label, .gov-form-radio[size=l] *[slot=label] label {
   font-size: var(--font-size-body-l);
   line-height: 150%;
   font-weight: 400;
+  padding-left: var(--gap, var(--spacing-m));
 }
 gov-form-radio[size=l] input, .gov-form-radio[size=l] input {
   border-width: var(--radio-space, var(--spacing-multiline-vertical-padding-s));
@@ -8841,12 +8920,13 @@ gov-form-radio[size=xl], .gov-form-radio[size=xl] {
   padding: var(--padding-ver, var(--spacing-multiline-vertical-padding-xl)) 0;
 }
 gov-form-radio[size=xl] *[slot=label], .gov-form-radio[size=xl] *[slot=label] {
-  padding-left: calc(var(--indicator-size, var(--height-xl)) + var(--gap, var(--spacing-m-nudge)));
+  padding-left: var(--indicator-size, var(--height-xl));
 }
 gov-form-radio[size=xl] *[slot=label] label, .gov-form-radio[size=xl] *[slot=label] label {
   font-size: var(--font-size-body-xl);
   line-height: 150%;
   font-weight: 400;
+  padding-left: var(--gap, var(--spacing-m-nudge));
 }
 gov-form-radio[size=xl] input, .gov-form-radio[size=xl] input {
   border-width: var(--radio-space, var(--spacing-xs-nudge));
@@ -8871,47 +8951,47 @@ gov-form-range, .gov-form-range {
   gap: var(--spacing-xs-nudge);
   width: 100%;
 }
-gov-form-range[size=m] input[type=range], .gov-form-range[size=m] input[type=range] {
+gov-form-range input[type=range], .gov-form-range input[type=range] {
   height: calc(var(--thumb-size) + var(--focus-space, 0.25rem));
 }
-gov-form-range[size=m] input[type=range]::-webkit-slider-runnable-track, .gov-form-range[size=m] input[type=range]::-webkit-slider-runnable-track {
+gov-form-range input[type=range]::-webkit-slider-runnable-track, .gov-form-range input[type=range]::-webkit-slider-runnable-track {
   height: var(--height, var(--height-s));
 }
-gov-form-range[size=m] input[type=range]::-webkit-slider-thumb, .gov-form-range[size=m] input[type=range]::-webkit-slider-thumb {
+gov-form-range input[type=range]::-webkit-slider-thumb, .gov-form-range input[type=range]::-webkit-slider-thumb {
   width: var(--thumb-size);
   height: var(--thumb-size);
   margin-top: calc(var(--thumb-size) / -2 + var(--height, var(--height-s)) / 2);
 }
-gov-form-range[size=m] input[type=range]::-moz-range-track, .gov-form-range[size=m] input[type=range]::-moz-range-track {
+gov-form-range input[type=range]::-moz-range-track, .gov-form-range input[type=range]::-moz-range-track {
   height: var(--height, var(--height-s));
 }
-gov-form-range[size=m] input[type=range]::-moz-range-thumb, .gov-form-range[size=m] input[type=range]::-moz-range-thumb {
+gov-form-range input[type=range]::-moz-range-thumb, .gov-form-range input[type=range]::-moz-range-thumb {
   width: var(--thumb-size);
   height: var(--thumb-size);
   margin-top: calc(var(--thumb-size) / -2 + var(--height, var(--height-s)) / 2);
 }
-gov-form-range[size=m] .gov-form-range--fill, .gov-form-range[size=m] .gov-form-range--fill {
+gov-form-range .gov-form-range--fill, .gov-form-range .gov-form-range--fill {
   top: calc(var(--thumb-size) / 2 + var(--height, var(--height-s)) / -2 + var(--focus-space, 0.25rem) / 2);
   block-size: var(--height, var(--height-s));
 }
-gov-form-range[size=m][tooltip] .gov-form-range--fill, .gov-form-range[size=m][tooltip] .gov-form-range--fill {
+gov-form-range[tooltip] .gov-form-range--fill, .gov-form-range[tooltip] .gov-form-range--fill {
   top: calc(var(--spacing-s) * 2 + var(--tooltip-padding-top, 2.1875rem) + var(--thumb-size) / 2 + var(--height, var(--height-s)) / -2 + var(--focus-space, 0.25rem) / 2);
 }
-gov-form-range[size=m] .gov-form-range--input, .gov-form-range[size=m] .gov-form-range--input {
+gov-form-range .gov-form-range--input, .gov-form-range .gov-form-range--input {
   width: var(--input-width, 4.125rem);
   margin-top: calc(var(--height, var(--height-s)) * -1);
 }
-gov-form-range[size=m]:not(.hydrated):before, .gov-form-range[size=m]:not(.hydrated):before {
+gov-form-range:not(.hydrated):before, .gov-form-range:not(.hydrated):before {
   height: calc(var(--thumb-size) + var(--focus-space, 0.25rem));
 }
-gov-form-range[size=m]:not(.hydrated):after, .gov-form-range[size=m]:not(.hydrated):after {
+gov-form-range:not(.hydrated):after, .gov-form-range:not(.hydrated):after {
   top: calc(var(--thumb-size) / 2 + var(--height, var(--height-s)) / -2 + var(--focus-space, 0.25rem) / 2);
   height: var(--height, var(--height-s));
 }
-gov-form-range[size=m]:not(.hydrated)[tooltip]:before, .gov-form-range[size=m]:not(.hydrated)[tooltip]:before {
+gov-form-range:not(.hydrated)[tooltip]:before, .gov-form-range:not(.hydrated)[tooltip]:before {
   height: calc(var(--thumb-size) + var(--focus-space, 0.25rem) + var(--spacing-s) * 2 + var(--tooltip-padding-top, 2.1875rem));
 }
-gov-form-range[size=m]:not(.hydrated)[tooltip]:after, .gov-form-range[size=m]:not(.hydrated)[tooltip]:after {
+gov-form-range:not(.hydrated)[tooltip]:after, .gov-form-range:not(.hydrated)[tooltip]:after {
   top: calc(var(--thumb-size) / 2 + var(--height, var(--height-s)) / -2 + var(--focus-space, 0.25rem) / 2 + var(--spacing-s) * 2 + var(--tooltip-padding-top, 2.1875rem));
 }
 gov-form-range:has(.gov-form-range--input), .gov-form-range:has(.gov-form-range--input) {
@@ -9122,47 +9202,47 @@ gov-form-range[disabled=""] .gov-form-range--fill, gov-form-range[disabled=true
 gov-form-range[size=s], .gov-form-range[size=s] {
   --thumb-size: 1.125rem;
 }
-gov-form-range[size=s][size=s] input[type=range], .gov-form-range[size=s][size=s] input[type=range] {
+gov-form-range[size=s] input[type=range], .gov-form-range[size=s] input[type=range] {
   height: calc(var(--thumb-size) + var(--focus-space, 0.25rem));
 }
-gov-form-range[size=s][size=s] input[type=range]::-webkit-slider-runnable-track, .gov-form-range[size=s][size=s] input[type=range]::-webkit-slider-runnable-track {
+gov-form-range[size=s] input[type=range]::-webkit-slider-runnable-track, .gov-form-range[size=s] input[type=range]::-webkit-slider-runnable-track {
   height: var(--height, var(--height-xs-nudge));
 }
-gov-form-range[size=s][size=s] input[type=range]::-webkit-slider-thumb, .gov-form-range[size=s][size=s] input[type=range]::-webkit-slider-thumb {
+gov-form-range[size=s] input[type=range]::-webkit-slider-thumb, .gov-form-range[size=s] input[type=range]::-webkit-slider-thumb {
   width: var(--thumb-size);
   height: var(--thumb-size);
   margin-top: calc(var(--thumb-size) / -2 + var(--height, var(--height-xs-nudge)) / 2);
 }
-gov-form-range[size=s][size=s] input[type=range]::-moz-range-track, .gov-form-range[size=s][size=s] input[type=range]::-moz-range-track {
+gov-form-range[size=s] input[type=range]::-moz-range-track, .gov-form-range[size=s] input[type=range]::-moz-range-track {
   height: var(--height, var(--height-xs-nudge));
 }
-gov-form-range[size=s][size=s] input[type=range]::-moz-range-thumb, .gov-form-range[size=s][size=s] input[type=range]::-moz-range-thumb {
+gov-form-range[size=s] input[type=range]::-moz-range-thumb, .gov-form-range[size=s] input[type=range]::-moz-range-thumb {
   width: var(--thumb-size);
   height: var(--thumb-size);
   margin-top: calc(var(--thumb-size) / -2 + var(--height, var(--height-xs-nudge)) / 2);
 }
-gov-form-range[size=s][size=s] .gov-form-range--fill, .gov-form-range[size=s][size=s] .gov-form-range--fill {
+gov-form-range[size=s] .gov-form-range--fill, .gov-form-range[size=s] .gov-form-range--fill {
   top: calc(var(--thumb-size) / 2 + var(--height, var(--height-xs-nudge)) / -2 + var(--focus-space, 0.25rem) / 2);
   block-size: var(--height, var(--height-xs-nudge));
 }
-gov-form-range[size=s][size=s][tooltip] .gov-form-range--fill, .gov-form-range[size=s][size=s][tooltip] .gov-form-range--fill {
+gov-form-range[size=s][tooltip] .gov-form-range--fill, .gov-form-range[size=s][tooltip] .gov-form-range--fill {
   top: calc(var(--spacing-s) * 2 + var(--tooltip-padding-top, 2.1875rem) + var(--thumb-size) / 2 + var(--height, var(--height-xs-nudge)) / -2 + var(--focus-space, 0.25rem) / 2);
 }
-gov-form-range[size=s][size=s] .gov-form-range--input, .gov-form-range[size=s][size=s] .gov-form-range--input {
+gov-form-range[size=s] .gov-form-range--input, .gov-form-range[size=s] .gov-form-range--input {
   width: var(--input-width, 3.25rem);
   margin-top: calc(var(--height, var(--height-xs-nudge)) * -1);
 }
-gov-form-range[size=s][size=s]:not(.hydrated):before, .gov-form-range[size=s][size=s]:not(.hydrated):before {
+gov-form-range[size=s]:not(.hydrated):before, .gov-form-range[size=s]:not(.hydrated):before {
   height: calc(var(--thumb-size) + var(--focus-space, 0.25rem));
 }
-gov-form-range[size=s][size=s]:not(.hydrated):after, .gov-form-range[size=s][size=s]:not(.hydrated):after {
+gov-form-range[size=s]:not(.hydrated):after, .gov-form-range[size=s]:not(.hydrated):after {
   top: calc(var(--thumb-size) / 2 + var(--height, var(--height-xs-nudge)) / -2 + var(--focus-space, 0.25rem) / 2);
   height: var(--height, var(--height-xs-nudge));
 }
-gov-form-range[size=s][size=s]:not(.hydrated)[tooltip]:before, .gov-form-range[size=s][size=s]:not(.hydrated)[tooltip]:before {
+gov-form-range[size=s]:not(.hydrated)[tooltip]:before, .gov-form-range[size=s]:not(.hydrated)[tooltip]:before {
   height: calc(var(--thumb-size) + var(--focus-space, 0.25rem) + var(--spacing-s) * 2 + var(--tooltip-padding-top, 2.1875rem));
 }
-gov-form-range[size=s][size=s]:not(.hydrated)[tooltip]:after, .gov-form-range[size=s][size=s]:not(.hydrated)[tooltip]:after {
+gov-form-range[size=s]:not(.hydrated)[tooltip]:after, .gov-form-range[size=s]:not(.hydrated)[tooltip]:after {
   top: calc(var(--thumb-size) / 2 + var(--height, var(--height-xs-nudge)) / -2 + var(--focus-space, 0.25rem) / 2 + var(--spacing-s) * 2 + var(--tooltip-padding-top, 2.1875rem));
 }
 gov-form-range[size=m], .gov-form-range[size=m] {
@@ -9171,47 +9251,47 @@ gov-form-range[size=m], .gov-form-range[size=m] {
 gov-form-range[size=l], .gov-form-range[size=l] {
   --thumb-size: 1.625rem;
 }
-gov-form-range[size=l][size=l] input[type=range], .gov-form-range[size=l][size=l] input[type=range] {
+gov-form-range[size=l] input[type=range], .gov-form-range[size=l] input[type=range] {
   height: calc(var(--thumb-size) + var(--focus-space, 0.25rem));
 }
-gov-form-range[size=l][size=l] input[type=range]::-webkit-slider-runnable-track, .gov-form-range[size=l][size=l] input[type=range]::-webkit-slider-runnable-track {
+gov-form-range[size=l] input[type=range]::-webkit-slider-runnable-track, .gov-form-range[size=l] input[type=range]::-webkit-slider-runnable-track {
   height: var(--height, var(--height-s-nudge));
 }
-gov-form-range[size=l][size=l] input[type=range]::-webkit-slider-thumb, .gov-form-range[size=l][size=l] input[type=range]::-webkit-slider-thumb {
+gov-form-range[size=l] input[type=range]::-webkit-slider-thumb, .gov-form-range[size=l] input[type=range]::-webkit-slider-thumb {
   width: var(--thumb-size);
   height: var(--thumb-size);
   margin-top: calc(var(--thumb-size) / -2 + var(--height, var(--height-s-nudge)) / 2);
 }
-gov-form-range[size=l][size=l] input[type=range]::-moz-range-track, .gov-form-range[size=l][size=l] input[type=range]::-moz-range-track {
+gov-form-range[size=l] input[type=range]::-moz-range-track, .gov-form-range[size=l] input[type=range]::-moz-range-track {
   height: var(--height, var(--height-s-nudge));
 }
-gov-form-range[size=l][size=l] input[type=range]::-moz-range-thumb, .gov-form-range[size=l][size=l] input[type=range]::-moz-range-thumb {
+gov-form-range[size=l] input[type=range]::-moz-range-thumb, .gov-form-range[size=l] input[type=range]::-moz-range-thumb {
   width: var(--thumb-size);
   height: var(--thumb-size);
   margin-top: calc(var(--thumb-size) / -2 + var(--height, var(--height-s-nudge)) / 2);
 }
-gov-form-range[size=l][size=l] .gov-form-range--fill, .gov-form-range[size=l][size=l] .gov-form-range--fill {
+gov-form-range[size=l] .gov-form-range--fill, .gov-form-range[size=l] .gov-form-range--fill {
   top: calc(var(--thumb-size) / 2 + var(--height, var(--height-s-nudge)) / -2 + var(--focus-space, 0.25rem) / 2);
   block-size: var(--height, var(--height-s-nudge));
 }
-gov-form-range[size=l][size=l][tooltip] .gov-form-range--fill, .gov-form-range[size=l][size=l][tooltip] .gov-form-range--fill {
+gov-form-range[size=l][tooltip] .gov-form-range--fill, .gov-form-range[size=l][tooltip] .gov-form-range--fill {
   top: calc(var(--spacing-s) * 2 + var(--tooltip-padding-top, 2.1875rem) + var(--thumb-size) / 2 + var(--height, var(--height-s-nudge)) / -2 + var(--focus-space, 0.25rem) / 2);
 }
-gov-form-range[size=l][size=l] .gov-form-range--input, .gov-form-range[size=l][size=l] .gov-form-range--input {
+gov-form-range[size=l] .gov-form-range--input, .gov-form-range[size=l] .gov-form-range--input {
   width: var(--input-width, 4.875rem);
   margin-top: calc(var(--height, var(--height-s-nudge)) * -1);
 }
-gov-form-range[size=l][size=l]:not(.hydrated):before, .gov-form-range[size=l][size=l]:not(.hydrated):before {
+gov-form-range[size=l]:not(.hydrated):before, .gov-form-range[size=l]:not(.hydrated):before {
   height: calc(var(--thumb-size) + var(--focus-space, 0.25rem));
 }
-gov-form-range[size=l][size=l]:not(.hydrated):after, .gov-form-range[size=l][size=l]:not(.hydrated):after {
+gov-form-range[size=l]:not(.hydrated):after, .gov-form-range[size=l]:not(.hydrated):after {
   top: calc(var(--thumb-size) / 2 + var(--height, var(--height-s-nudge)) / -2 + var(--focus-space, 0.25rem) / 2);
   height: var(--height, var(--height-s-nudge));
 }
-gov-form-range[size=l][size=l]:not(.hydrated)[tooltip]:before, .gov-form-range[size=l][size=l]:not(.hydrated)[tooltip]:before {
+gov-form-range[size=l]:not(.hydrated)[tooltip]:before, .gov-form-range[size=l]:not(.hydrated)[tooltip]:before {
   height: calc(var(--thumb-size) + var(--focus-space, 0.25rem) + var(--spacing-s) * 2 + var(--tooltip-padding-top, 2.1875rem));
 }
-gov-form-range[size=l][size=l]:not(.hydrated)[tooltip]:after, .gov-form-range[size=l][size=l]:not(.hydrated)[tooltip]:after {
+gov-form-range[size=l]:not(.hydrated)[tooltip]:after, .gov-form-range[size=l]:not(.hydrated)[tooltip]:after {
   top: calc(var(--thumb-size) / 2 + var(--height, var(--height-s-nudge)) / -2 + var(--focus-space, 0.25rem) / 2 + var(--spacing-s) * 2 + var(--tooltip-padding-top, 2.1875rem));
 }
 
@@ -9560,12 +9640,12 @@ gov-form-select option:not([selected]) {
 
 /* Switch */
 gov-form-switch, .gov-form-switch {
-  /* Variables - Form switch */ /* Variables - Form checkbox & radio */
+  /* Variables - Form switch */
+  /* Variables - Form checkbox & radio */
   margin-top: 0;
   margin-bottom: 0;
   position: relative;
   display: inline-block;
-  cursor: pointer;
 }
 gov-form-switch *, .gov-form-switch * {
   margin-top: 0;
@@ -9582,14 +9662,11 @@ gov-form-switch__input, .gov-form-switch__input {
   cursor: pointer;
 }
 gov-form-switch input + span, .gov-form-switch input + span {
-  position: relative;
   display: flex;
 }
 gov-form-switch__indicator, .gov-form-switch__indicator {
-  content: "";
   position: absolute;
   display: block;
-  top: 0;
   left: 0;
   border: var(--border-width, 0.0625rem) solid var(--border, var(--interactive-inactive));
   border-radius: var(--corner-radius-l);
@@ -9613,6 +9690,7 @@ gov-form-switch__indicator gov-icon, gov-form-switch__indicator .gov-icon, .gov-
 }
 gov-form-switch *[slot=label], .gov-form-switch *[slot=label] {
   margin-bottom: 0;
+  cursor: pointer;
 }
 gov-form-switch *[slot=label] *, .gov-form-switch *[slot=label] * {
   position: relative;
@@ -9627,6 +9705,17 @@ gov-form-switch input:focus-visible + span, .gov-form-switch input:focus-visible
   outline: var(--outline-width, 0.125rem) solid var(--status-focus);
   outline-offset: var(--outline-offset, 0.125rem);
 }
+gov-form-switch__no-label input:focus-visible + span, .gov-form-switch__no-label input:focus-visible + span {
+  outline: none;
+}
+gov-form-switch__no-label input:focus, .gov-form-switch__no-label input:focus {
+  outline: none;
+}
+gov-form-switch__no-label input:focus-visible, .gov-form-switch__no-label input:focus-visible {
+  border-radius: var(--outline-border-radius, var(--corner-radius-xs-nudge));
+  outline: var(--outline-width, 0.125rem) solid var(--status-focus);
+  outline-offset: var(--outline-offset, 0.125rem);
+}
 gov-form-switch__input:checked + span gov-form-switch__indicator, gov-form-switch__input:checked + span .gov-form-switch__indicator, .gov-form-switch__input:checked + span gov-form-switch__indicator, .gov-form-switch__input:checked + span .gov-form-switch__indicator {
   border-color: var(--bg-checked, var(--interactive-active));
   background-color: var(--bg-checked, var(--interactive-active));
@@ -9637,7 +9726,7 @@ gov-form-switch[invalid=""] *[slot=label], gov-form-switch[invalid=""] *[slot=la
 }
 gov-form-switch[invalid=""] .gov-form-switch__indicator, gov-form-switch[invalid=true i] .gov-form-switch__indicator, gov-form-switch[invalid="1"] .gov-form-switch__indicator, .gov-form-switch[invalid=""] .gov-form-switch__indicator, .gov-form-switch[invalid=true i] .gov-form-switch__indicator, .gov-form-switch[invalid="1"] .gov-form-switch__indicator {
   border-color: var(--error-border, var(--interactive-error));
-  background-color: var(--error-bg, var(--icon-on-bold-white));
+  background-color: var(--error-bg, var(--background-neutral-subtlest));
   color: var(--error-color, var(--interactive-error));
 }
 gov-form-switch[invalid=""] .gov-form-switch__input:checked + span .gov-form-switch__indicator, gov-form-switch[invalid=true i] .gov-form-switch__input:checked + span .gov-form-switch__indicator, gov-form-switch[invalid="1"] .gov-form-switch__input:checked + span .gov-form-switch__indicator, .gov-form-switch[invalid=""] .gov-form-switch__input:checked + span .gov-form-switch__indicator, .gov-form-switch[invalid=true i] .gov-form-switch__input:checked + span .gov-form-switch__indicator, .gov-form-switch[invalid="1"] .gov-form-switch__input:checked + span .gov-form-switch__indicator {
@@ -9665,24 +9754,36 @@ gov-form-switch[disabled=""] .gov-form-switch__input:checked + span .gov-form-sw
   color: var(--disabled-checked, var(--interactive-disabled));
 }
 gov-form-switch[size=xs], .gov-form-switch[size=xs] {
-  min-height: var(--height, var(--height-component-xs));
+  font-size: var(--font-size-body-xs);
+  line-height: 150%;
+  font-weight: 400;
+  min-height: calc(var(--height, var(--height-component-xs)) - 2 * (var(--padding-ver, var(--spacing-multiline-vertical-padding-xs))));
   padding: var(--padding-ver, var(--spacing-multiline-vertical-padding-xs)) 0;
 }
 gov-form-switch[size=xs] *[slot=label], .gov-form-switch[size=xs] *[slot=label] {
-  padding-left: calc(var(--indicator-width, var(--height-l)) + var(--gap, var(--spacing-xs-nudge)));
+  padding-left: var(--indicator-width, var(--height-l));
   margin-bottom: 0;
 }
 gov-form-switch[size=xs] *[slot=label] label, .gov-form-switch[size=xs] *[slot=label] label {
   font-size: var(--font-size-body-xs);
   line-height: 150%;
   font-weight: 400;
+  padding-left: var(--gap, var(--spacing-xs-nudge));
+}
+gov-form-switch[size=xs].gov-form-switch__no-label, .gov-form-switch[size=xs].gov-form-switch__no-label {
+  width: var(--indicator-width, var(--height-l));
+  height: calc(var(--indicator-width, var(--height-l)) * 0.6 + var(--padding-ver, var(--spacing-multiline-vertical-padding-xs)) * 2);
+}
+gov-form-switch[size=xs].gov-form-switch__no-label .gov-form-switch__input, .gov-form-switch[size=xs].gov-form-switch__no-label .gov-form-switch__input {
+  height: calc(var(--indicator-width, var(--height-l)) * 0.6);
 }
 gov-form-switch[size=xs] .gov-form-switch__input, .gov-form-switch[size=xs] .gov-form-switch__input {
+  top: calc(var(--padding-ver, var(--spacing-multiline-vertical-padding-xs)) + (var(--height, var(--height-component-xs)) - var(--indicator-width, var(--height-l)) * 0.6 - var(--padding-ver, var(--spacing-multiline-vertical-padding-xs)) * 2) / 2);
   width: var(--indicator-width, var(--height-l));
   height: calc(var(--indicator-width, var(--height-l)) * 0.6);
-  top: var(--padding-ver, var(--spacing-multiline-vertical-padding-xs));
 }
 gov-form-switch[size=xs] .gov-form-switch__indicator, .gov-form-switch[size=xs] .gov-form-switch__indicator {
+  top: calc(var(--padding-ver, var(--spacing-multiline-vertical-padding-xs)) + (var(--height, var(--height-component-xs)) - var(--indicator-width, var(--height-l)) * 0.6 - var(--padding-ver, var(--spacing-multiline-vertical-padding-xs)) * 2) / 2);
   width: var(--indicator-width, var(--height-l));
   height: calc(var(--indicator-width, var(--height-l)) * 0.6);
 }
@@ -9696,10 +9797,10 @@ gov-form-switch[size=xs] .gov-form-switch__indicator .gov-icon, .gov-form-switch
   top: calc((var(--indicator-width, var(--height-l)) * 0.6 - var(--border-width, 0.0625rem) * 2 - var(--gap, var(--spacing-xs-nudge))) / 2);
   left: calc((var(--indicator-width, var(--height-l)) * 0.6 - var(--border-width, 0.0625rem) * 2 - var(--gap, var(--spacing-xs-nudge))) / 2);
 }
-gov-form-switch[size=xs] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator:before, .gov-form-switch[size=xs] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator:before {
+gov-form-switch[size=xs][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator:before, gov-form-switch[size=xs][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator:before, gov-form-switch[size=xs][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator:before, .gov-form-switch[size=xs][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator:before, .gov-form-switch[size=xs][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator:before, .gov-form-switch[size=xs][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator:before {
   left: calc(var(--indicator-width, var(--height-l)) - var(--indicator-width, var(--height-l)) * 0.6);
 }
-gov-form-switch[size=xs] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=xs] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator .gov-icon {
+gov-form-switch[size=xs][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, gov-form-switch[size=xs][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, gov-form-switch[size=xs][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=xs][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=xs][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=xs][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon {
   left: calc(var(--indicator-width, var(--height-l)) - (var(--indicator-width, var(--height-l)) * 0.6 - (var(--indicator-width, var(--height-l)) * 0.6 - var(--border-width, 0.0625rem) * 2 - var(--gap, var(--spacing-xs-nudge))) / 2));
 }
 gov-form-switch[size=xs] label .gov-form-switch__input, .gov-form-switch[size=xs] label .gov-form-switch__input {
@@ -9709,24 +9810,36 @@ gov-form-switch[size=xs][no-label=""], gov-form-switch[size=xs][no-label=true i]
   width: var(--indicator-width, var(--height-l));
 }
 gov-form-switch[size=s], .gov-form-switch[size=s] {
-  min-height: var(--height, var(--height-component-s));
+  font-size: var(--font-size-body-s);
+  line-height: 150%;
+  font-weight: 400;
+  min-height: calc(var(--height, var(--height-component-s)) - 2 * (var(--padding-ver, var(--spacing-multiline-vertical-padding-s))));
   padding: var(--padding-ver, var(--spacing-multiline-vertical-padding-s)) 0;
 }
 gov-form-switch[size=s] *[slot=label], .gov-form-switch[size=s] *[slot=label] {
-  padding-left: calc(var(--indicator-width, var(--height-xl)) + var(--gap, var(--spacing-s)));
+  padding-left: var(--indicator-width, var(--height-xl));
   margin-bottom: 0;
 }
 gov-form-switch[size=s] *[slot=label] label, .gov-form-switch[size=s] *[slot=label] label {
   font-size: var(--font-size-body-s);
   line-height: 150%;
   font-weight: 400;
+  padding-left: var(--gap, var(--spacing-s));
+}
+gov-form-switch[size=s].gov-form-switch__no-label, .gov-form-switch[size=s].gov-form-switch__no-label {
+  width: var(--indicator-width, var(--height-xl));
+  height: calc(var(--indicator-width, var(--height-xl)) * 0.6 + var(--padding-ver, var(--spacing-multiline-vertical-padding-s)) * 2);
+}
+gov-form-switch[size=s].gov-form-switch__no-label .gov-form-switch__input, .gov-form-switch[size=s].gov-form-switch__no-label .gov-form-switch__input {
+  height: calc(var(--indicator-width, var(--height-xl)) * 0.6);
 }
 gov-form-switch[size=s] .gov-form-switch__input, .gov-form-switch[size=s] .gov-form-switch__input {
+  top: calc(var(--padding-ver, var(--spacing-multiline-vertical-padding-s)) + (var(--height, var(--height-component-s)) - var(--indicator-width, var(--height-xl)) * 0.6 - var(--padding-ver, var(--spacing-multiline-vertical-padding-s)) * 2) / 2);
   width: var(--indicator-width, var(--height-xl));
   height: calc(var(--indicator-width, var(--height-xl)) * 0.6);
-  top: var(--padding-ver, var(--spacing-multiline-vertical-padding-s));
 }
 gov-form-switch[size=s] .gov-form-switch__indicator, .gov-form-switch[size=s] .gov-form-switch__indicator {
+  top: calc(var(--padding-ver, var(--spacing-multiline-vertical-padding-s)) + (var(--height, var(--height-component-s)) - var(--indicator-width, var(--height-xl)) * 0.6 - var(--padding-ver, var(--spacing-multiline-vertical-padding-s)) * 2) / 2);
   width: var(--indicator-width, var(--height-xl));
   height: calc(var(--indicator-width, var(--height-xl)) * 0.6);
 }
@@ -9740,10 +9853,10 @@ gov-form-switch[size=s] .gov-form-switch__indicator .gov-icon, .gov-form-switch[
   top: calc((var(--indicator-width, var(--height-xl)) * 0.6 - var(--border-width, 0.0625rem) * 2 - var(--gap, var(--spacing-s))) / 2);
   left: calc((var(--indicator-width, var(--height-xl)) * 0.6 - var(--border-width, 0.0625rem) * 2 - var(--gap, var(--spacing-s))) / 2);
 }
-gov-form-switch[size=s] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator:before, .gov-form-switch[size=s] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator:before {
+gov-form-switch[size=s][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator:before, gov-form-switch[size=s][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator:before, gov-form-switch[size=s][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator:before, .gov-form-switch[size=s][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator:before, .gov-form-switch[size=s][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator:before, .gov-form-switch[size=s][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator:before {
   left: calc(var(--indicator-width, var(--height-xl)) - var(--indicator-width, var(--height-xl)) * 0.6);
 }
-gov-form-switch[size=s] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=s] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator .gov-icon {
+gov-form-switch[size=s][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, gov-form-switch[size=s][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, gov-form-switch[size=s][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=s][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=s][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=s][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon {
   left: calc(var(--indicator-width, var(--height-xl)) - (var(--indicator-width, var(--height-xl)) * 0.6 - (var(--indicator-width, var(--height-xl)) * 0.6 - var(--border-width, 0.0625rem) * 2 - var(--gap, var(--spacing-s))) / 2));
 }
 gov-form-switch[size=s] label .gov-form-switch__input, .gov-form-switch[size=s] label .gov-form-switch__input {
@@ -9753,24 +9866,36 @@ gov-form-switch[size=s][no-label=""], gov-form-switch[size=s][no-label=true i],
   width: var(--indicator-width, var(--height-xl));
 }
 gov-form-switch[size=m], .gov-form-switch[size=m] {
-  min-height: var(--height, var(--height-component-m));
+  font-size: var(--font-size-body-m);
+  line-height: 150%;
+  font-weight: 400;
+  min-height: calc(var(--height, var(--height-component-m)) - 2 * (var(--padding-ver, var(--spacing-multiline-vertical-padding-m))));
   padding: var(--padding-ver, var(--spacing-multiline-vertical-padding-m)) 0;
 }
 gov-form-switch[size=m] *[slot=label], .gov-form-switch[size=m] *[slot=label] {
-  padding-left: calc(var(--indicator-width, var(--height-2xl)) + var(--gap, var(--spacing-s-nudge)));
+  padding-left: var(--indicator-width, var(--height-2xl));
   margin-bottom: 0;
 }
 gov-form-switch[size=m] *[slot=label] label, .gov-form-switch[size=m] *[slot=label] label {
   font-size: var(--font-size-body-m);
   line-height: 150%;
   font-weight: 400;
+  padding-left: var(--gap, var(--spacing-s-nudge));
+}
+gov-form-switch[size=m].gov-form-switch__no-label, .gov-form-switch[size=m].gov-form-switch__no-label {
+  width: var(--indicator-width, var(--height-2xl));
+  height: calc(var(--indicator-width, var(--height-2xl)) * 0.6 + var(--padding-ver, var(--spacing-multiline-vertical-padding-m)) * 2);
+}
+gov-form-switch[size=m].gov-form-switch__no-label .gov-form-switch__input, .gov-form-switch[size=m].gov-form-switch__no-label .gov-form-switch__input {
+  height: calc(var(--indicator-width, var(--height-2xl)) * 0.6);
 }
 gov-form-switch[size=m] .gov-form-switch__input, .gov-form-switch[size=m] .gov-form-switch__input {
+  top: calc(var(--padding-ver, var(--spacing-multiline-vertical-padding-m)) + (var(--height, var(--height-component-m)) - var(--indicator-width, var(--height-2xl)) * 0.6 - var(--padding-ver, var(--spacing-multiline-vertical-padding-m)) * 2) / 2);
   width: var(--indicator-width, var(--height-2xl));
   height: calc(var(--indicator-width, var(--height-2xl)) * 0.6);
-  top: var(--padding-ver, var(--spacing-multiline-vertical-padding-m));
 }
 gov-form-switch[size=m] .gov-form-switch__indicator, .gov-form-switch[size=m] .gov-form-switch__indicator {
+  top: calc(var(--padding-ver, var(--spacing-multiline-vertical-padding-m)) + (var(--height, var(--height-component-m)) - var(--indicator-width, var(--height-2xl)) * 0.6 - var(--padding-ver, var(--spacing-multiline-vertical-padding-m)) * 2) / 2);
   width: var(--indicator-width, var(--height-2xl));
   height: calc(var(--indicator-width, var(--height-2xl)) * 0.6);
 }
@@ -9784,10 +9909,10 @@ gov-form-switch[size=m] .gov-form-switch__indicator .gov-icon, .gov-form-switch[
   top: calc((var(--indicator-width, var(--height-2xl)) * 0.6 - var(--border-width, 0.0625rem) * 2 - var(--gap, var(--spacing-s-nudge))) / 2);
   left: calc((var(--indicator-width, var(--height-2xl)) * 0.6 - var(--border-width, 0.0625rem) * 2 - var(--gap, var(--spacing-s-nudge))) / 2);
 }
-gov-form-switch[size=m] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator:before, .gov-form-switch[size=m] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator:before {
+gov-form-switch[size=m][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator:before, gov-form-switch[size=m][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator:before, gov-form-switch[size=m][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator:before, .gov-form-switch[size=m][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator:before, .gov-form-switch[size=m][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator:before, .gov-form-switch[size=m][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator:before {
   left: calc(var(--indicator-width, var(--height-2xl)) - var(--indicator-width, var(--height-2xl)) * 0.6);
 }
-gov-form-switch[size=m] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=m] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator .gov-icon {
+gov-form-switch[size=m][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, gov-form-switch[size=m][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, gov-form-switch[size=m][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=m][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=m][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=m][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon {
   left: calc(var(--indicator-width, var(--height-2xl)) - (var(--indicator-width, var(--height-2xl)) * 0.6 - (var(--indicator-width, var(--height-2xl)) * 0.6 - var(--border-width, 0.0625rem) * 2 - var(--gap, var(--spacing-s-nudge))) / 2));
 }
 gov-form-switch[size=m] label .gov-form-switch__input, .gov-form-switch[size=m] label .gov-form-switch__input {
@@ -9797,24 +9922,36 @@ gov-form-switch[size=m][no-label=""], gov-form-switch[size=m][no-label=true i],
   width: var(--indicator-width, var(--height-2xl));
 }
 gov-form-switch[size=l], .gov-form-switch[size=l] {
-  min-height: var(--height, var(--height-component-l));
+  font-size: var(--font-size-body-l);
+  line-height: 150%;
+  font-weight: 400;
+  min-height: calc(var(--height, var(--height-component-l)) - 2 * (var(--padding-ver, var(--spacing-multiline-vertical-padding-l))));
   padding: var(--padding-ver, var(--spacing-multiline-vertical-padding-l)) 0;
 }
 gov-form-switch[size=l] *[slot=label], .gov-form-switch[size=l] *[slot=label] {
-  padding-left: calc(var(--indicator-width, var(--height-3xl)) + var(--gap, var(--spacing-m)));
+  padding-left: var(--indicator-width, var(--height-3xl));
   margin-bottom: 0;
 }
 gov-form-switch[size=l] *[slot=label] label, .gov-form-switch[size=l] *[slot=label] label {
   font-size: var(--font-size-body-l);
   line-height: 150%;
   font-weight: 400;
+  padding-left: var(--gap, var(--spacing-m));
+}
+gov-form-switch[size=l].gov-form-switch__no-label, .gov-form-switch[size=l].gov-form-switch__no-label {
+  width: var(--indicator-width, var(--height-3xl));
+  height: calc(var(--indicator-width, var(--height-3xl)) * 0.6 + var(--padding-ver, var(--spacing-multiline-vertical-padding-l)) * 2);
+}
+gov-form-switch[size=l].gov-form-switch__no-label .gov-form-switch__input, .gov-form-switch[size=l].gov-form-switch__no-label .gov-form-switch__input {
+  height: calc(var(--indicator-width, var(--height-3xl)) * 0.6);
 }
 gov-form-switch[size=l] .gov-form-switch__input, .gov-form-switch[size=l] .gov-form-switch__input {
+  top: calc(var(--padding-ver, var(--spacing-multiline-vertical-padding-l)) + (var(--height, var(--height-component-l)) - var(--indicator-width, var(--height-3xl)) * 0.6 - var(--padding-ver, var(--spacing-multiline-vertical-padding-l)) * 2) / 2);
   width: var(--indicator-width, var(--height-3xl));
   height: calc(var(--indicator-width, var(--height-3xl)) * 0.6);
-  top: var(--padding-ver, var(--spacing-multiline-vertical-padding-l));
 }
 gov-form-switch[size=l] .gov-form-switch__indicator, .gov-form-switch[size=l] .gov-form-switch__indicator {
+  top: calc(var(--padding-ver, var(--spacing-multiline-vertical-padding-l)) + (var(--height, var(--height-component-l)) - var(--indicator-width, var(--height-3xl)) * 0.6 - var(--padding-ver, var(--spacing-multiline-vertical-padding-l)) * 2) / 2);
   width: var(--indicator-width, var(--height-3xl));
   height: calc(var(--indicator-width, var(--height-3xl)) * 0.6);
 }
@@ -9828,10 +9965,10 @@ gov-form-switch[size=l] .gov-form-switch__indicator .gov-icon, .gov-form-switch[
   top: calc((var(--indicator-width, var(--height-3xl)) * 0.6 - var(--border-width, 0.0625rem) * 2 - var(--gap, var(--spacing-m))) / 2);
   left: calc((var(--indicator-width, var(--height-3xl)) * 0.6 - var(--border-width, 0.0625rem) * 2 - var(--gap, var(--spacing-m))) / 2);
 }
-gov-form-switch[size=l] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator:before, .gov-form-switch[size=l] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator:before {
+gov-form-switch[size=l][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator:before, gov-form-switch[size=l][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator:before, gov-form-switch[size=l][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator:before, .gov-form-switch[size=l][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator:before, .gov-form-switch[size=l][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator:before, .gov-form-switch[size=l][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator:before {
   left: calc(var(--indicator-width, var(--height-3xl)) - var(--indicator-width, var(--height-3xl)) * 0.6);
 }
-gov-form-switch[size=l] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=l] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator .gov-icon {
+gov-form-switch[size=l][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, gov-form-switch[size=l][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, gov-form-switch[size=l][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=l][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=l][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=l][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon {
   left: calc(var(--indicator-width, var(--height-3xl)) - (var(--indicator-width, var(--height-3xl)) * 0.6 - (var(--indicator-width, var(--height-3xl)) * 0.6 - var(--border-width, 0.0625rem) * 2 - var(--gap, var(--spacing-m))) / 2));
 }
 gov-form-switch[size=l] label .gov-form-switch__input, .gov-form-switch[size=l] label .gov-form-switch__input {
@@ -9841,24 +9978,36 @@ gov-form-switch[size=l][no-label=""], gov-form-switch[size=l][no-label=true i],
   width: var(--indicator-width, var(--height-3xl));
 }
 gov-form-switch[size=xl], .gov-form-switch[size=xl] {
-  min-height: var(--height, var(--height-component-xl));
+  font-size: var(--font-size-body-xl);
+  line-height: 150%;
+  font-weight: 400;
+  min-height: calc(var(--height, var(--height-component-xl)) - 2 * (var(--padding-ver, var(--spacing-multiline-vertical-padding-xl))));
   padding: var(--padding-ver, var(--spacing-multiline-vertical-padding-xl)) 0;
 }
 gov-form-switch[size=xl] *[slot=label], .gov-form-switch[size=xl] *[slot=label] {
-  padding-left: calc(var(--indicator-width, var(--height-4xl)) + var(--gap, var(--spacing-m-nudge)));
+  padding-left: var(--indicator-width, var(--height-4xl));
   margin-bottom: 0;
 }
 gov-form-switch[size=xl] *[slot=label] label, .gov-form-switch[size=xl] *[slot=label] label {
   font-size: var(--font-size-body-xl);
   line-height: 150%;
   font-weight: 400;
+  padding-left: var(--gap, var(--spacing-m-nudge));
+}
+gov-form-switch[size=xl].gov-form-switch__no-label, .gov-form-switch[size=xl].gov-form-switch__no-label {
+  width: var(--indicator-width, var(--height-4xl));
+  height: calc(var(--indicator-width, var(--height-4xl)) * 0.6 + var(--padding-ver, var(--spacing-multiline-vertical-padding-xl)) * 2);
+}
+gov-form-switch[size=xl].gov-form-switch__no-label .gov-form-switch__input, .gov-form-switch[size=xl].gov-form-switch__no-label .gov-form-switch__input {
+  height: calc(var(--indicator-width, var(--height-4xl)) * 0.6);
 }
 gov-form-switch[size=xl] .gov-form-switch__input, .gov-form-switch[size=xl] .gov-form-switch__input {
+  top: calc(var(--padding-ver, var(--spacing-multiline-vertical-padding-xl)) + (var(--height, var(--height-component-xl)) - var(--indicator-width, var(--height-4xl)) * 0.6 - var(--padding-ver, var(--spacing-multiline-vertical-padding-xl)) * 2) / 2);
   width: var(--indicator-width, var(--height-4xl));
   height: calc(var(--indicator-width, var(--height-4xl)) * 0.6);
-  top: var(--padding-ver, var(--spacing-multiline-vertical-padding-xl));
 }
 gov-form-switch[size=xl] .gov-form-switch__indicator, .gov-form-switch[size=xl] .gov-form-switch__indicator {
+  top: calc(var(--padding-ver, var(--spacing-multiline-vertical-padding-xl)) + (var(--height, var(--height-component-xl)) - var(--indicator-width, var(--height-4xl)) * 0.6 - var(--padding-ver, var(--spacing-multiline-vertical-padding-xl)) * 2) / 2);
   width: var(--indicator-width, var(--height-4xl));
   height: calc(var(--indicator-width, var(--height-4xl)) * 0.6);
 }
@@ -9872,10 +10021,10 @@ gov-form-switch[size=xl] .gov-form-switch__indicator .gov-icon, .gov-form-switch
   top: calc((var(--indicator-width, var(--height-4xl)) * 0.6 - var(--border-width, 0.0625rem) * 2 - var(--gap, var(--spacing-m-nudge))) / 2);
   left: calc((var(--indicator-width, var(--height-4xl)) * 0.6 - var(--border-width, 0.0625rem) * 2 - var(--gap, var(--spacing-m-nudge))) / 2);
 }
-gov-form-switch[size=xl] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator:before, .gov-form-switch[size=xl] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator:before {
+gov-form-switch[size=xl][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator:before, gov-form-switch[size=xl][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator:before, gov-form-switch[size=xl][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator:before, .gov-form-switch[size=xl][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator:before, .gov-form-switch[size=xl][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator:before, .gov-form-switch[size=xl][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator:before {
   left: calc(var(--indicator-width, var(--height-4xl)) - var(--indicator-width, var(--height-4xl)) * 0.6);
 }
-gov-form-switch[size=xl] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=xl] .gov-form-switch__input[aria-checked] + span .gov-form-switch__indicator .gov-icon {
+gov-form-switch[size=xl][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, gov-form-switch[size=xl][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, gov-form-switch[size=xl][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=xl][checked=""] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=xl][checked=true i] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon, .gov-form-switch[size=xl][checked="1"] .gov-form-switch__input + span .gov-form-switch__indicator .gov-icon {
   left: calc(var(--indicator-width, var(--height-4xl)) - (var(--indicator-width, var(--height-4xl)) * 0.6 - (var(--indicator-width, var(--height-4xl)) * 0.6 - var(--border-width, 0.0625rem) * 2 - var(--gap, var(--spacing-m-nudge))) / 2));
 }
 gov-form-switch[size=xl] label .gov-form-switch__input, .gov-form-switch[size=xl] label .gov-form-switch__input {
@@ -10350,7 +10499,8 @@ gov-icon[size="5xl"], .gov-icon[size="5xl"] {
 
 /* Infobar */
 gov-infobar, .gov-infobar {
-  /* Variables - Toast Message */ /* Variables - Buttons */
+  /* Variables - Toast Message */
+  /* Variables - Buttons */
   margin-top: 0;
   margin-bottom: 0;
   position: relative;
@@ -11109,7 +11259,8 @@ gov-message[color=warning][type=subtle] a, .gov-message[color=warning][type=subt
 
 /* Pagination */
 gov-pagination, .gov-pagination {
-  /* Variables - Pagination */ /* Variables - Buttons */
+  /* Variables - Pagination */
+  /* Variables - Buttons */
   margin-top: 0;
   margin-bottom: 0;
   display: contents;
@@ -11564,7 +11715,8 @@ gov-stepper[size=l]:not([hydrated]) *[slot=annotation], .gov-stepper[size=l]:not
 
 /* Stepper - Item */
 gov-stepper-item, .gov-stepper-item {
-  /* Variables - Wizard */ /* Variables - Stepper */
+  /* Variables - Wizard */
+  /* Variables - Stepper */
   margin-top: 0;
   margin-bottom: 0;
   position: relative;
@@ -11803,21 +11955,41 @@ gov-tabs, .gov-tabs {
 gov-tabs__tabs, .gov-tabs__tabs {
   margin-bottom: var(--spacing-m-nudge);
   overflow-x: auto;
+  scrollbar-width: thin;
+  scrollbar-color: transparent transparent;
 }
 gov-tabs__tabs::-webkit-scrollbar, .gov-tabs__tabs::-webkit-scrollbar {
-  width: var(--height-s);
-  height: var(--height-s);
-  scrollbar-color: var(--background-neutral-disabled) transparent;
+  width: var(--height-m);
+  height: var(--height-m);
 }
 gov-tabs__tabs::-webkit-scrollbar-thumb, .gov-tabs__tabs::-webkit-scrollbar-thumb {
   border-radius: var(--height-l);
-  background: var(--background-neutral-disabled);
+  background: transparent;
   border: 2px solid transparent;
   background-clip: content-box;
 }
 gov-tabs__tabs::-webkit-scrollbar-track, .gov-tabs__tabs::-webkit-scrollbar-track {
   background: transparent;
 }
+@media not all and (pointer: coarse) {
+  gov-tabs__tabs:hover, .gov-tabs__tabs:hover {
+    scrollbar-width: thin;
+    scrollbar-color: var(--background-neutral-disabled) transparent;
+  }
+  gov-tabs__tabs:hover::-webkit-scrollbar, .gov-tabs__tabs:hover::-webkit-scrollbar {
+    width: var(--height-m);
+    height: var(--height-m);
+  }
+  gov-tabs__tabs:hover::-webkit-scrollbar-thumb, .gov-tabs__tabs:hover::-webkit-scrollbar-thumb {
+    border-radius: var(--height-l);
+    background: var(--background-neutral-disabled);
+    border: 2px solid transparent;
+    background-clip: content-box;
+  }
+  gov-tabs__tabs:hover::-webkit-scrollbar-track, .gov-tabs__tabs:hover::-webkit-scrollbar-track {
+    background: transparent;
+  }
+}
 gov-tabs__list, .gov-tabs__list {
   display: flex;
 }
@@ -12461,7 +12633,8 @@ gov-tag[expanded=""] .element, gov-tag[expanded=true i] .element, gov-tag[expand
 
 /* Theme switch */
 gov-theme-switch, .gov-theme-switch {
-  /* Variables - Form switch */ /* Variables - Form checkbox & radio */
+  /* Variables - Form switch */
+  /* Variables - Form checkbox & radio */
   margin-top: 0;
   margin-bottom: 0;
   position: relative;
@@ -12486,7 +12659,7 @@ gov-theme-switch button, .gov-theme-switch button {
      -moz-appearance: none;
           appearance: none;
   padding: 0;
-  color: var(--form-label-color, var(--text-primary));
+  color: var(--label-color, var(--text-primary));
 }
 gov-theme-switch button:focus, .gov-theme-switch button:focus {
   outline: none;
@@ -12562,7 +12735,7 @@ gov-theme-switch[theme=dark] .gov-theme-switch__indicator:before, .gov-theme-swi
   transition: left 150ms linear;
 }
 gov-theme-switch[theme=dark] .gov-theme-switch__icon-dark, .gov-theme-switch[theme=dark] .gov-theme-switch__icon-dark {
-  color: var(--icon-checked, var(--icon-on-subtle));
+  color: var(--icon-checked, var(--icon-on-subtle-fixed-bg));
   visibility: visible;
   opacity: 1;
   transition: opacity 150ms linear;