diff --git a/semcore/core/src/theme/themes/highlights-dark.css b/semcore/core/src/theme/themes/highlights-dark.css
index 8e5b62a6f8..72d9294e01 100644
--- a/semcore/core/src/theme/themes/highlights-dark.css
+++ b/semcore/core/src/theme/themes/highlights-dark.css
@@ -1,36 +1,36 @@
 :root {
   /* Primary background for highlighted controls. */
-  --intergalactic-bg-primary-feature-highlight: rgba(30, 34, 49, 1);
+  --intergalactic-feature-highlight-bg-primary: rgba(30, 34, 49, 1);
   /* Primary background for hover and active (selected) state of highlighted controls. */
-  --intergalactic-bg-primary-feature-highlight-hover-active: linear-gradient(90deg, #f9f2ff, #e9f7ff);
+  --intergalactic-feature-highlight-bg-primary-hover-active: linear-gradient(90deg, #f9f2ff, #e9f7ff);
   /* Secondary background for the highlighted message. */
-  --intergalactic-bg-secondary-feature-highlight: linear-gradient(90deg, #f9f2ff, #e9f7ff);
+  --intergalactic-feature-highlight-bg-secondary: linear-gradient(90deg, #f9f2ff, #e9f7ff);
   /* Primary border for highlighted controls. */
-  --intergalactic-border-feature-highlight: linear-gradient(90deg, #c695ff, #2bb3ff);
+  --intergalactic-feature-highlight-border-primary: linear-gradient(90deg, #c695ff, #2bb3ff);
   /* Primary border for the active state of highlighted controls. */
-  --intergalactic-border-feature-highlight-active: linear-gradient(90deg, #ab6cfe, #008ff8);
+  --intergalactic-feature-highlight-border-primary-active: linear-gradient(90deg, #ab6cfe, #008ff8);
   /* Secondary border for highlighted controls. */
-  --intergalactic-border-feature-highlight-secondary: linear-gradient(90deg, #dcb8ff, #8ecdff);
+  --intergalactic-feature-highlight-border-secondary: linear-gradient(90deg, #dcb8ff, #8ecdff);
   /* Background of the highlighted primary control. */
-  --intergalactic-control-primary-feature-highlight: linear-gradient(90deg, #ab6cfe, #008ff8);
+  --intergalactic-feature-highlight-control-primary: linear-gradient(90deg, #ab6cfe, #008ff8);
   /* Hover state of the highlighted primary control. */
-  --intergalactic-control-primary-feature-highlight-hover: linear-gradient(90deg, #8649e1, #006dca);
+  --intergalactic-feature-highlight-control-primary-hover: linear-gradient(90deg, #8649e1, #006dca);
   /* Active (selected) state of the highlighted primary control. */
-  --intergalactic-control-primary-feature-highlight-active: linear-gradient(90deg, #5925ab, #044792);
+  --intergalactic-feature-highlight-control-primary-active: linear-gradient(90deg, #5925ab, #044792);
   /* Background of the highlighted secondary control. */
-  --intergalactic-control-secondary-feature-highlight: linear-gradient(90deg, #f9f2ff, #e9f7ff);
+  --intergalactic-feature-highlight-control-secondary: linear-gradient(90deg, #f9f2ff, #e9f7ff);
   /* Hover state of the highlighted secondary control. */
-  --intergalactic-control-secondary-feature-highlight-hover: linear-gradient(90deg, #f2e4ff, #d6edfe);
+  --intergalactic-feature-highlight-control-secondary-hover: linear-gradient(90deg, #f2e4ff, #d6edfe);
   /* Active (selected) state of the highlighted secondary control. */
-  --intergalactic-control-secondary-feature-highlight-active: linear-gradient(90deg, #edd9ff, #c4e5fe);
+  --intergalactic-feature-highlight-control-secondary-active: linear-gradient(90deg, #edd9ff, #c4e5fe);
   /* Text for highlighted features. */
-  --intergalactic-text-feature-highlight: linear-gradient(90deg, #8649e1, #006dca);
+  --intergalactic-feature-highlight-text: linear-gradient(90deg, #8649e1, #006dca);
   /* Text for hover and active states of highlighted features. */
-  --intergalactic-text-feature-highlight-hover-active: linear-gradient(90deg, #421983, #002b5f);
+  --intergalactic-feature-highlight-text-hover-active: linear-gradient(90deg, #421983, #002b5f);
   /* Primary highlighted icon. */
-  --intergalactic-icon-primary-feature-highlight: #8649e1;
+  --intergalactic-feature-highlight-icon-primary: #8649e1;
   /* Violet background color for the hover and active states of the primary highlighted icon. It’s created using a CSS filter with a brightness(0.8), applied to the violet-500 color. */
-  --intergalactic-icon-primary-feature-highlight-hover-active: #6B3AB4;
+  --intergalactic-feature-highlight-icon-primary-hover-active: #6B3AB4;
   /* Color for keyboard focus outline styles for highlighted controls. */
-  --intergalactic-keyboard-focus-feature-highlight-outline: linear-gradient(90deg, #ab6cfe, #008ff8);
+  --intergalactic-feature-highlight-keyboard-focus-outline: linear-gradient(90deg, #ab6cfe, #008ff8);
 }
\ No newline at end of file
diff --git a/semcore/core/src/theme/themes/highlights-dark.ts b/semcore/core/src/theme/themes/highlights-dark.ts
index b7c812a6fe..6524367205 100644
--- a/semcore/core/src/theme/themes/highlights-dark.ts
+++ b/semcore/core/src/theme/themes/highlights-dark.ts
@@ -1,19 +1,19 @@
 export default {
-  '--intergalactic-bg-primary-feature-highlight': 'rgba(30, 34, 49, 1)',
-  '--intergalactic-bg-primary-feature-highlight-hover-active': 'linear-gradient(90deg, #f9f2ff, #e9f7ff)',
-  '--intergalactic-bg-secondary-feature-highlight': 'linear-gradient(90deg, #f9f2ff, #e9f7ff)',
-  '--intergalactic-border-feature-highlight': 'linear-gradient(90deg, #c695ff, #2bb3ff)',
-  '--intergalactic-border-feature-highlight-active': 'linear-gradient(90deg, #ab6cfe, #008ff8)',
-  '--intergalactic-border-feature-highlight-secondary': 'linear-gradient(90deg, #dcb8ff, #8ecdff)',
-  '--intergalactic-control-primary-feature-highlight': 'linear-gradient(90deg, #ab6cfe, #008ff8)',
-  '--intergalactic-control-primary-feature-highlight-hover': 'linear-gradient(90deg, #8649e1, #006dca)',
-  '--intergalactic-control-primary-feature-highlight-active': 'linear-gradient(90deg, #5925ab, #044792)',
-  '--intergalactic-control-secondary-feature-highlight': 'linear-gradient(90deg, #f9f2ff, #e9f7ff)',
-  '--intergalactic-control-secondary-feature-highlight-hover': 'linear-gradient(90deg, #f2e4ff, #d6edfe)',
-  '--intergalactic-control-secondary-feature-highlight-active': 'linear-gradient(90deg, #edd9ff, #c4e5fe)',
-  '--intergalactic-text-feature-highlight': 'linear-gradient(90deg, #8649e1, #006dca)',
-  '--intergalactic-text-feature-highlight-hover-active': 'linear-gradient(90deg, #421983, #002b5f)',
-  '--intergalactic-icon-primary-feature-highlight': '#8649e1',
-  '--intergalactic-icon-primary-feature-highlight-hover-active': '#6B3AB4',
-  '--intergalactic-keyboard-focus-feature-highlight-outline': 'linear-gradient(90deg, #ab6cfe, #008ff8)',
+  '--intergalactic-feature-highlight-bg-primary': 'rgba(30, 34, 49, 1)',
+  '--intergalactic-feature-highlight-bg-primary-hover-active': 'linear-gradient(90deg, #f9f2ff, #e9f7ff)',
+  '--intergalactic-feature-highlight-bg-secondary': 'linear-gradient(90deg, #f9f2ff, #e9f7ff)',
+  '--intergalactic-feature-highlight-border-primary': 'linear-gradient(90deg, #c695ff, #2bb3ff)',
+  '--intergalactic-feature-highlight-border-primary-active': 'linear-gradient(90deg, #ab6cfe, #008ff8)',
+  '--intergalactic-feature-highlight-border-secondary': 'linear-gradient(90deg, #dcb8ff, #8ecdff)',
+  '--intergalactic-feature-highlight-control-primary': 'linear-gradient(90deg, #ab6cfe, #008ff8)',
+  '--intergalactic-feature-highlight-control-primary-hover': 'linear-gradient(90deg, #8649e1, #006dca)',
+  '--intergalactic-feature-highlight-control-primary-active': 'linear-gradient(90deg, #5925ab, #044792)',
+  '--intergalactic-feature-highlight-control-secondary': 'linear-gradient(90deg, #f9f2ff, #e9f7ff)',
+  '--intergalactic-feature-highlight-control-secondary-hover': 'linear-gradient(90deg, #f2e4ff, #d6edfe)',
+  '--intergalactic-feature-highlight-control-secondary-active': 'linear-gradient(90deg, #edd9ff, #c4e5fe)',
+  '--intergalactic-feature-highlight-text': 'linear-gradient(90deg, #8649e1, #006dca)',
+  '--intergalactic-feature-highlight-text-hover-active': 'linear-gradient(90deg, #421983, #002b5f)',
+  '--intergalactic-feature-highlight-icon-primary': '#8649e1',
+  '--intergalactic-feature-highlight-icon-primary-hover-active': '#6B3AB4',
+  '--intergalactic-feature-highlight-keyboard-focus-outline': 'linear-gradient(90deg, #ab6cfe, #008ff8)',
 };
diff --git a/semcore/core/src/theme/themes/highlights-light.css b/semcore/core/src/theme/themes/highlights-light.css
index fd991976f0..f738593fae 100644
--- a/semcore/core/src/theme/themes/highlights-light.css
+++ b/semcore/core/src/theme/themes/highlights-light.css
@@ -1,36 +1,36 @@
 :root {
   /* Primary background for highlighted controls. */
-  --intergalactic-bg-primary-feature-highlight: #ffffff;
+  --intergalactic-feature-highlight-bg-primary: #ffffff;
   /* Primary background for hover and active (selected) state of highlighted controls. */
-  --intergalactic-bg-primary-feature-highlight-hover-active: linear-gradient(90deg, #f9f2ff, #e9f7ff);
+  --intergalactic-feature-highlight-bg-primary-hover-active: linear-gradient(90deg, #f9f2ff, #e9f7ff);
   /* Secondary background for the highlighted message. */
-  --intergalactic-bg-secondary-feature-highlight: linear-gradient(90deg, #f9f2ff, #e9f7ff);
+  --intergalactic-feature-highlight-bg-secondary: linear-gradient(90deg, #f9f2ff, #e9f7ff);
   /* Primary border for highlighted controls. */
-  --intergalactic-border-feature-highlight: linear-gradient(90deg, #c695ff, #2bb3ff);
+  --intergalactic-feature-highlight-border-primary: linear-gradient(90deg, #c695ff, #2bb3ff);
   /* Primary border for the active state of highlighted controls. */
-  --intergalactic-border-feature-highlight-active: linear-gradient(90deg, #ab6cfe, #008ff8);
+  --intergalactic-feature-highlight-border-primary-active: linear-gradient(90deg, #ab6cfe, #008ff8);
   /* Secondary border for highlighted controls. */
-  --intergalactic-border-feature-highlight-secondary: linear-gradient(90deg, #dcb8ff, #8ecdff);
+  --intergalactic-feature-highlight-border-secondary: linear-gradient(90deg, #dcb8ff, #8ecdff);
   /* Background of the highlighted primary control. */
-  --intergalactic-control-primary-feature-highlight: linear-gradient(90deg, #ab6cfe, #008ff8);
+  --intergalactic-feature-highlight-control-primary: linear-gradient(90deg, #ab6cfe, #008ff8);
   /* Hover state of the highlighted primary control. */
-  --intergalactic-control-primary-feature-highlight-hover: linear-gradient(90deg, #8649e1, #006dca);
+  --intergalactic-feature-highlight-control-primary-hover: linear-gradient(90deg, #8649e1, #006dca);
   /* Active (selected) state of the highlighted primary control. */
-  --intergalactic-control-primary-feature-highlight-active: linear-gradient(90deg, #5925ab, #044792);
+  --intergalactic-feature-highlight-control-primary-active: linear-gradient(90deg, #5925ab, #044792);
   /* Background of the highlighted secondary control. */
-  --intergalactic-control-secondary-feature-highlight: linear-gradient(90deg, #f9f2ff, #e9f7ff);
+  --intergalactic-feature-highlight-control-secondary: linear-gradient(90deg, #f9f2ff, #e9f7ff);
   /* Hover state of the highlighted secondary control. */
-  --intergalactic-control-secondary-feature-highlight-hover: linear-gradient(90deg, #f2e4ff, #d6edfe);
+  --intergalactic-feature-highlight-control-secondary-hover: linear-gradient(90deg, #f2e4ff, #d6edfe);
   /* Active (selected) state of the highlighted secondary control. */
-  --intergalactic-control-secondary-feature-highlight-active: linear-gradient(90deg, #edd9ff, #c4e5fe);
+  --intergalactic-feature-highlight-control-secondary-active: linear-gradient(90deg, #edd9ff, #c4e5fe);
   /* Text for highlighted features. */
-  --intergalactic-text-feature-highlight: linear-gradient(90deg, #8649e1, #006dca);
+  --intergalactic-feature-highlight-text: linear-gradient(90deg, #8649e1, #006dca);
   /* Text for hover and active states of highlighted features. */
-  --intergalactic-text-feature-highlight-hover-active: linear-gradient(90deg, #421983, #002b5f);
+  --intergalactic-feature-highlight-text-hover-active: linear-gradient(90deg, #421983, #002b5f);
   /* Primary highlighted icon. */
-  --intergalactic-icon-primary-feature-highlight: #8649e1;
+  --intergalactic-feature-highlight-icon-primary: #8649e1;
   /* Violet background color for the hover and active states of the primary highlighted icon. It’s created using a CSS filter with a brightness(0.8), applied to the violet-500 color. */
-  --intergalactic-icon-primary-feature-highlight-hover-active: #6B3AB4;
+  --intergalactic-feature-highlight-icon-primary-hover-active: #6B3AB4;
   /* Color for keyboard focus outline styles for highlighted controls. */
-  --intergalactic-keyboard-focus-feature-highlight-outline: linear-gradient(90deg, #ab6cfe, #008ff8);
+  --intergalactic-feature-highlight-keyboard-focus-outline: linear-gradient(90deg, #ab6cfe, #008ff8);
 }
\ No newline at end of file
diff --git a/semcore/core/src/theme/themes/highlights-light.ts b/semcore/core/src/theme/themes/highlights-light.ts
index 3afa212be7..5a84f01076 100644
--- a/semcore/core/src/theme/themes/highlights-light.ts
+++ b/semcore/core/src/theme/themes/highlights-light.ts
@@ -1,19 +1,19 @@
 export default {
-  '--intergalactic-bg-primary-feature-highlight': '#ffffff',
-  '--intergalactic-bg-primary-feature-highlight-hover-active': 'linear-gradient(90deg, #f9f2ff, #e9f7ff)',
-  '--intergalactic-bg-secondary-feature-highlight': 'linear-gradient(90deg, #f9f2ff, #e9f7ff)',
-  '--intergalactic-border-feature-highlight': 'linear-gradient(90deg, #c695ff, #2bb3ff)',
-  '--intergalactic-border-feature-highlight-active': 'linear-gradient(90deg, #ab6cfe, #008ff8)',
-  '--intergalactic-border-feature-highlight-secondary': 'linear-gradient(90deg, #dcb8ff, #8ecdff)',
-  '--intergalactic-control-primary-feature-highlight': 'linear-gradient(90deg, #ab6cfe, #008ff8)',
-  '--intergalactic-control-primary-feature-highlight-hover': 'linear-gradient(90deg, #8649e1, #006dca)',
-  '--intergalactic-control-primary-feature-highlight-active': 'linear-gradient(90deg, #5925ab, #044792)',
-  '--intergalactic-control-secondary-feature-highlight': 'linear-gradient(90deg, #f9f2ff, #e9f7ff)',
-  '--intergalactic-control-secondary-feature-highlight-hover': 'linear-gradient(90deg, #f2e4ff, #d6edfe)',
-  '--intergalactic-control-secondary-feature-highlight-active': 'linear-gradient(90deg, #edd9ff, #c4e5fe)',
-  '--intergalactic-text-feature-highlight': 'linear-gradient(90deg, #8649e1, #006dca)',
-  '--intergalactic-text-feature-highlight-hover-active': 'linear-gradient(90deg, #421983, #002b5f)',
-  '--intergalactic-icon-primary-feature-highlight': '#8649e1',
-  '--intergalactic-icon-primary-feature-highlight-hover-active': '#6B3AB4',
-  '--intergalactic-keyboard-focus-feature-highlight-outline': 'linear-gradient(90deg, #ab6cfe, #008ff8)',
+  '--intergalactic-feature-highlight-bg-primary': '#ffffff',
+  '--intergalactic-feature-highlight-bg-primary-hover-active': 'linear-gradient(90deg, #f9f2ff, #e9f7ff)',
+  '--intergalactic-feature-highlight-bg-secondary': 'linear-gradient(90deg, #f9f2ff, #e9f7ff)',
+  '--intergalactic-feature-highlight-border-primary': 'linear-gradient(90deg, #c695ff, #2bb3ff)',
+  '--intergalactic-feature-highlight-border-primary-active': 'linear-gradient(90deg, #ab6cfe, #008ff8)',
+  '--intergalactic-feature-highlight-border-secondary': 'linear-gradient(90deg, #dcb8ff, #8ecdff)',
+  '--intergalactic-feature-highlight-control-primary': 'linear-gradient(90deg, #ab6cfe, #008ff8)',
+  '--intergalactic-feature-highlight-control-primary-hover': 'linear-gradient(90deg, #8649e1, #006dca)',
+  '--intergalactic-feature-highlight-control-primary-active': 'linear-gradient(90deg, #5925ab, #044792)',
+  '--intergalactic-feature-highlight-control-secondary': 'linear-gradient(90deg, #f9f2ff, #e9f7ff)',
+  '--intergalactic-feature-highlight-control-secondary-hover': 'linear-gradient(90deg, #f2e4ff, #d6edfe)',
+  '--intergalactic-feature-highlight-control-secondary-active': 'linear-gradient(90deg, #edd9ff, #c4e5fe)',
+  '--intergalactic-feature-highlight-text': 'linear-gradient(90deg, #8649e1, #006dca)',
+  '--intergalactic-feature-highlight-text-hover-active': 'linear-gradient(90deg, #421983, #002b5f)',
+  '--intergalactic-feature-highlight-icon-primary': '#8649e1',
+  '--intergalactic-feature-highlight-icon-primary-hover-active': '#6B3AB4',
+  '--intergalactic-feature-highlight-keyboard-focus-outline': 'linear-gradient(90deg, #ab6cfe, #008ff8)',
 };
diff --git a/semcore/date-picker/__tests__/month-range-picker.browser-test.tsx b/semcore/date-picker/__tests__/month-range-picker.browser-test.tsx
index b0e2957618..2b340a8d04 100644
--- a/semcore/date-picker/__tests__/month-range-picker.browser-test.tsx
+++ b/semcore/date-picker/__tests__/month-range-picker.browser-test.tsx
@@ -1,5 +1,5 @@
 import { expect, test } from '@semcore/testing-utils/playwright';
-import type { Page } from '@semcore/testing-utils/playwright';
+import type { Locator, Page } from '@semcore/testing-utils/playwright';
 import { loadPage } from '@semcore/testing-utils/shared/helpers';
 import { TAG } from '@semcore/testing-utils/shared/tags';
 
@@ -396,6 +396,23 @@ test.describe(`${TAG.FUNCTIONAL}`, () => {
         }
       };
 
+      /*
+        The number of Tab presses needed to reach the action buttons from a calendar cell
+        depends on the current date: when the focused cell belongs to the second (right) year
+        grid, the 'Next year' button is not in the tab path, when it belongs to the first one,
+        it is. So we tab until the expected button gets the focus instead of hardcoding a count.
+      */
+      const pressTabUntilFocused = async (locator: Locator, maxPresses = 10) => {
+        for (let i = 0; i < maxPresses; i++) {
+          await page.keyboard.press('Tab');
+          if (await locator.evaluate((node: Element) => node === document.activeElement)) {
+            return;
+          }
+        }
+
+        throw new Error(`Element is not focused after ${maxPresses} Tab presses`);
+      };
+
       await test.step('Open popper using Enter key', async () => {
         await pressTab(3);
         await page.keyboard.press('Enter');
@@ -527,7 +544,7 @@ test.describe(`${TAG.FUNCTIONAL}`, () => {
         await page.keyboard.press('ArrowRight');
         await page.keyboard.press('Space');
 
-        await pressTab(6);
+        await pressTabUntilFocused(locators.button(page, 'Apply'));
         await expect(locators.button(page, 'Apply')).toBeFocused();
 
         await page.keyboard.press('Enter');
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx
index f2a3757335..f990a3e6b7 100644
--- a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx
+++ b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx
@@ -3,44 +3,60 @@ import { expect, test } from '@semcore/testing-utils/playwright';
 import { loadPage } from '@semcore/testing-utils/shared/helpers';
 import { TAG } from '@semcore/testing-utils/shared/tags';
 
-// Helper to get ::before pseudo-element styles
-export const getBeforeStyles = async (el: Locator) => {
-  return el.evaluate((node) => {
-    const style = getComputedStyle(node, '::before');
-    return { backgroundImage: style.backgroundImage };
-  });
+// Helper to get outline styles of an element or of one of its pseudo-elements
+export const getOutlineStyles = async (el: Locator, pseudoElement: string | null = null) => {
+  return el.evaluate((node, pseudo) => {
+    const style = getComputedStyle(node, pseudo);
+    return {
+      outlineColor: style.outlineColor,
+      outlineStyle: style.outlineStyle,
+      outlineWidth: style.outlineWidth,
+    };
+  }, pseudoElement);
 };
 
 const featureHighlightTokens = {
-  focusOutline: '--intergalactic-keyboard-focus-feature-highlight-outline',
-  border: '--intergalactic-border-feature-highlight',
-  borderActive: '--intergalactic-border-feature-highlight-active',
+  focusOutline: '--intergalactic-feature-highlight-keyboard-focus-outline',
 };
 
-// Matches the CSS fallback gradients after the test bundle normalizes them.
-const cssVarBackgroundImageFallbacks: Record<string, string> = {
-  '--intergalactic-keyboard-focus-feature-highlight-outline': 'linear-gradient(90deg in oklch, #c08eff, oklch(0.58 0.168 278.2))',
-  '--intergalactic-border-feature-highlight': 'linear-gradient(90deg in oklch, #d2b3ff, oklch(0.82 0.088 272.1))',
-  '--intergalactic-border-feature-highlight-active': 'linear-gradient(90deg in oklch, #c08eff, oklch(0.74 0.117 274.1))',
+const cssVarColorFallbacks: Record<string, string> = {
+  '--intergalactic-feature-highlight-keyboard-focus-outline': 'oklch(0.82 0.15 170)',
 };
 
-const getCssVarBackgroundImage = async (page: Page, varName: string) => {
+const getCssVarColor = async (page: Page, varName: string) => {
   return page.evaluate(({ name, fallback }) => {
     const probe = document.createElement('div');
-    probe.style.backgroundImage = fallback ? `var(${name}, ${fallback})` : `var(${name})`;
+    probe.style.color = fallback ? `var(${name}, ${fallback})` : `var(${name})`;
     document.body.appendChild(probe);
-    const backgroundImage = getComputedStyle(probe).backgroundImage;
+    const color = getComputedStyle(probe).color;
     probe.remove();
-    return backgroundImage;
-  }, { name: varName, fallback: cssVarBackgroundImageFallbacks[varName] });
+    return color;
+  }, { name: varName, fallback: cssVarColorFallbacks[varName] });
+};
+
+const expectFeatureHighlightFocusOutline = async (
+  page: Page,
+  el: Locator,
+  pseudoElement: string | null = null,
+) => {
+  const outlineColor = await getCssVarColor(page, featureHighlightTokens.focusOutline);
+
+  await expect
+    .poll(async () => getOutlineStyles(el, pseudoElement))
+    .toEqual({ outlineColor, outlineStyle: 'solid', outlineWidth: '2px' });
 };
 
-const expectBackgroundImageToContainToken = async (
+// Non-highlighted neighbours keep the regular keyboard focus outline.
+const expectNoFeatureHighlightFocusOutline = async (
   page: Page,
-  backgroundImage: string,
-  varName: string,
+  el: Locator,
+  pseudoElement: string | null = null,
 ) => {
-  await expect(backgroundImage).toContain(await getCssVarBackgroundImage(page, varName));
+  const styles = await getOutlineStyles(el, pseudoElement);
+
+  expect(styles.outlineColor).not.toBe(
+    await getCssVarColor(page, featureHighlightTokens.focusOutline),
+  );
 };
 
 export const locators = {
@@ -52,7 +68,8 @@ export const locators = {
   input: (page: Page) => page.getByRole('textbox'),
   inputOutline: (page: Page) => page.locator('[class*="SOutline"]'),
   switch: (page: Page) => page.locator('[data-ui-name="SwitchFH"]'),
-  switchOutline: (page: Page) => page.locator('[class*="inAfterOutline"][data-ui-name="Box"]').first(),
+  // The focus outline is painted on the toggle that wraps the switch input.
+  switchToggle: (page: Page) => page.locator('[class*="SToggle"]').first(),
   radioGroup: (page: Page) => page.locator('[data-ui-name="RadioGroup"]'),
   radioMark: (page: Page) => page.locator('[data-ui-name="Value.RadioMark"]'),
   checkbox: (page: Page) => page.locator('[data-ui-name="CheckboxFH"]'),
@@ -109,12 +126,7 @@ test.describe(`${TAG.VISUAL} `, () => {
             await page.keyboard.press('Tab');
 
             await expect(button).toBeFocused();
-            const styles = await getBeforeStyles(button);
-            await expectBackgroundImageToContainToken(
-              page,
-              styles.backgroundImage,
-              featureHighlightTokens.focusOutline,
-            );
+            await expectFeatureHighlightFocusOutline(page, button);
             await expect(page).toHaveScreenshot();
           });
 
@@ -152,12 +164,8 @@ test.describe(`${TAG.VISUAL} `, () => {
 
             await page.keyboard.press('ArrowRight');
             await page.keyboard.press('ArrowLeft');
-            const styles = await getBeforeStyles(pills.nth(1));
-            await expectBackgroundImageToContainToken(
-              page,
-              styles.backgroundImage,
-              featureHighlightTokens.focusOutline,
-            );
+            await expect(pills.nth(1)).toBeFocused();
+            await expectFeatureHighlightFocusOutline(page, pills.nth(1));
             await expect(page).toHaveScreenshot();
           });
           await test.step('Verify Hover when not focused', async () => {
@@ -198,12 +206,8 @@ test.describe(`${TAG.VISUAL} `, () => {
         } else {
           await test.step('Verify focus style', async () => {
             await page.keyboard.press('Tab');
-            const styles = await getBeforeStyles(outline);
-            await expectBackgroundImageToContainToken(
-              page,
-              styles.backgroundImage,
-              featureHighlightTokens.focusOutline,
-            );
+            await expect(locators.input(page)).toBeFocused();
+            await expectFeatureHighlightFocusOutline(page, outline);
             await expect(page).toHaveScreenshot();
           });
         }
@@ -224,10 +228,10 @@ test.describe(`${TAG.VISUAL} `, () => {
     variables.forEach((item) => {
       test(`Verify Switch disabled=${item.disabled} size=${item.size}  checked=${item.checked} showBadge=${item.showBadge}`, {
         tag: [TAG.PRIORITY_HIGH, TAG.KEYBOARD, '@feature-highlight', '@switch', '@base-components', '@flex-box'],
-      }, async ({ page }) => {
+      }, async ({ page, browserName }) => {
         await loadPage(page, 'stories/components/feature-highlight/tests/examples/switch-fh.tsx', 'en', item);
 
-        const outline = locators.switchOutline(page);
+        const toggle = locators.switchToggle(page);
         if (item.disabled) {
           await test.step('Verify disabled state', async () => {
             await expect(page).toHaveScreenshot();
@@ -235,21 +239,17 @@ test.describe(`${TAG.VISUAL} `, () => {
         } else {
           await test.step('Verify focus and toggle', async () => {
             await page.keyboard.press('Tab');
-            const styles = await getBeforeStyles(outline);
-            await expectBackgroundImageToContainToken(
-              page,
-              styles.backgroundImage,
-              featureHighlightTokens.focusOutline,
-            );
+            // Webkit doesn't move focus to checkbox based controls with Tab,
+            // so the focus outline can only be verified in the other browsers.
+            if (browserName !== 'webkit') {
+              await expectFeatureHighlightFocusOutline(page, toggle);
+            }
             await expect(page).toHaveScreenshot();
 
             await page.keyboard.press('Space');
-            const stylesSelected = await getBeforeStyles(outline);
-            await expectBackgroundImageToContainToken(
-              page,
-              stylesSelected.backgroundImage,
-              featureHighlightTokens.focusOutline,
-            );
+            if (browserName !== 'webkit') {
+              await expectFeatureHighlightFocusOutline(page, toggle);
+            }
             await expect(page).toHaveScreenshot();
           });
         }
@@ -315,12 +315,8 @@ test.describe(`${TAG.VISUAL} `, () => {
             await tab.nth(1).hover();
             await expect(page).toHaveScreenshot();
 
-            const stylesFH = await getBeforeStyles(tab.nth(1));
-            await expectBackgroundImageToContainToken(
-              page,
-              stylesFH.backgroundImage,
-              featureHighlightTokens.focusOutline,
-            );
+            await expect(tab.nth(1)).toBeFocused();
+            await expectFeatureHighlightFocusOutline(page, tab.nth(1));
           });
         }
       });
@@ -352,26 +348,16 @@ test.describe(`${TAG.VISUAL} `, () => {
           if (browserName !== 'webkit') {
             await test.step('Verify focus and selection', async () => {
               await page.keyboard.press('Tab');
-              const styles = await getBeforeStyles(radioMark.first());
-              await expectBackgroundImageToContainToken(
-                page,
-                styles.backgroundImage,
-                featureHighlightTokens.focusOutline,
-              );
+              await expectFeatureHighlightFocusOutline(page, radioMark.first(), '::before');
               await expect(page).toHaveScreenshot();
 
               await page.keyboard.press('Space');
-              const stylesSelected = await getBeforeStyles(radioMark.first());
-              await expectBackgroundImageToContainToken(
-                page,
-                stylesSelected.backgroundImage,
-                featureHighlightTokens.focusOutline,
-              );
+              await expectFeatureHighlightFocusOutline(page, radioMark.first(), '::before');
               await expect(page).toHaveScreenshot();
 
+              // The second radio is a regular one, it keeps the default focus outline.
               await page.keyboard.press('ArrowDown');
-              const stylesSecond = await getBeforeStyles(radioMark.nth(1));
-              expect(stylesSecond.backgroundImage).toContain('none');
+              await expectNoFeatureHighlightFocusOutline(page, radioMark.nth(1), '::before');
             });
           }
         }
@@ -391,7 +377,7 @@ test.describe(`${TAG.VISUAL} `, () => {
     variables.forEach((item) => {
       test(`Verify Checkbox disabled = ${item.disabled} size = ${item.size} state = ${item.state} checked = ${item.checked} showBadge = ${item.showBadge}`, {
         tag: [TAG.PRIORITY_HIGH, TAG.KEYBOARD, '@feature-highlight', '@checkbox', '@base-components', '@flex-box', '@typography'],
-      }, async ({ page }) => {
+      }, async ({ page, browserName }) => {
         await loadPage(page, 'stories/components/feature-highlight/tests/examples/checkbox.tsx', 'en', item);
 
         const value = locators.checkboxMark(page);
@@ -403,26 +389,22 @@ test.describe(`${TAG.VISUAL} `, () => {
         } else {
           await test.step('Verify focus and toggle', async () => {
             await page.keyboard.press('Tab');
-            const styles = await getBeforeStyles(value.first());
-            await expectBackgroundImageToContainToken(
-              page,
-              styles.backgroundImage,
-              featureHighlightTokens.border,
-            );
+            // Webkit doesn't move focus to checkbox based controls with Tab,
+            // so the focus outline can only be verified in the other browsers.
+            if (browserName !== 'webkit') {
+              await expectFeatureHighlightFocusOutline(page, value.first(), '::before');
+            }
             await expect(page).toHaveScreenshot();
 
             await page.keyboard.press('Enter');
-            const stylesSelected = await getBeforeStyles(value.first());
-            await expectBackgroundImageToContainToken(
-              page,
-              stylesSelected.backgroundImage,
-              featureHighlightTokens.border,
-            );
+            if (browserName !== 'webkit') {
+              await expectFeatureHighlightFocusOutline(page, value.first(), '::before');
+            }
             await expect(page).toHaveScreenshot();
 
+            // The second checkbox is a regular one, it keeps the default focus outline.
             await page.keyboard.press('Tab');
-            const stylesSecond = await getBeforeStyles(value.nth(1));
-            expect(stylesSecond.backgroundImage).toContain('none');
+            await expectNoFeatureHighlightFocusOutline(page, value.nth(1), '::before');
           });
         }
       });
@@ -455,12 +437,7 @@ test.describe(`${TAG.VISUAL} `, () => {
           await test.step('Verify hover and focus styles', async () => {
             await page.keyboard.press('Tab');
             await trigger.hover();
-            const stylesEmpty = await getBeforeStyles(trigger.nth(0));
-            await expectBackgroundImageToContainToken(
-              page,
-              stylesEmpty.backgroundImage,
-              featureHighlightTokens.focusOutline,
-            );
+            await expectFeatureHighlightFocusOutline(page, trigger.nth(0));
             await expect(page).toHaveScreenshot();
           });
 
@@ -470,12 +447,7 @@ test.describe(`${TAG.VISUAL} `, () => {
             await page.keyboard.press('Enter');
             await options.first().waitFor({ state: 'hidden' });
 
-            const stylesSelected = await getBeforeStyles(trigger.nth(0));
-            await expectBackgroundImageToContainToken(
-              page,
-              stylesSelected.backgroundImage,
-              featureHighlightTokens.focusOutline,
-            );
+            await expectFeatureHighlightFocusOutline(page, trigger.nth(0));
             await expect(page).toHaveScreenshot();
           });
         }
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-BadgeFH-Verify-BasgeFH-Visual-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-BadgeFH-Verify-BasgeFH-Visual-1-chromium-linux.png
index c434b2afc4..dfc147f18b 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-BadgeFH-Verify-BasgeFH-Visual-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-BadgeFH-Verify-BasgeFH-Visual-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-BadgeFH-Verify-BasgeFH-Visual-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-BadgeFH-Verify-BasgeFH-Visual-1-firefox-linux.png
index 30c2332955..2ca4dda28a 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-BadgeFH-Verify-BasgeFH-Visual-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-BadgeFH-Verify-BasgeFH-Visual-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-BadgeFH-Verify-BasgeFH-Visual-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-BadgeFH-Verify-BasgeFH-Visual-1-webkit-linux.png
index 057ce133bd..16c967bccb 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-BadgeFH-Verify-BasgeFH-Visual-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-BadgeFH-Verify-BasgeFH-Visual-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--0ad84-active-true-loading-false-useBadge-undefined-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--0ad84-active-true-loading-false-useBadge-undefined-2-chromium-linux.png
index 0761da5c76..591eaf6064 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--0ad84-active-true-loading-false-useBadge-undefined-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--0ad84-active-true-loading-false-useBadge-undefined-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--0ad84-active-true-loading-false-useBadge-undefined-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--0ad84-active-true-loading-false-useBadge-undefined-2-firefox-linux.png
index 4d5be3ab43..47fb82c57f 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--0ad84-active-true-loading-false-useBadge-undefined-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--0ad84-active-true-loading-false-useBadge-undefined-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--0ad84-active-true-loading-false-useBadge-undefined-2-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--0ad84-active-true-loading-false-useBadge-undefined-2-webkit-linux.png
index 3586b0af06..3e411365df 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--0ad84-active-true-loading-false-useBadge-undefined-2-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--0ad84-active-true-loading-false-useBadge-undefined-2-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--326df-ctive-false-loading-false-useBadge-undefined-3-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--326df-ctive-false-loading-false-useBadge-undefined-3-chromium-linux.png
index 91e065ca0b..9e37392272 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--326df-ctive-false-loading-false-useBadge-undefined-3-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--326df-ctive-false-loading-false-useBadge-undefined-3-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--326df-ctive-false-loading-false-useBadge-undefined-3-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--326df-ctive-false-loading-false-useBadge-undefined-3-webkit-linux.png
index 65ecab0151..eb541c6b11 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--326df-ctive-false-loading-false-useBadge-undefined-3-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--326df-ctive-false-loading-false-useBadge-undefined-3-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--544fa-l-active-false-loading-false-useBadge-accent-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--544fa-l-active-false-loading-false-useBadge-accent-1-chromium-linux.png
index d0c9390f34..e6e5eaacb6 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--544fa-l-active-false-loading-false-useBadge-accent-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--544fa-l-active-false-loading-false-useBadge-accent-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--544fa-l-active-false-loading-false-useBadge-accent-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--544fa-l-active-false-loading-false-useBadge-accent-1-firefox-linux.png
index e220b1a796..2a55fcbd12 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--544fa-l-active-false-loading-false-useBadge-accent-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--544fa-l-active-false-loading-false-useBadge-accent-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--544fa-l-active-false-loading-false-useBadge-accent-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--544fa-l-active-false-loading-false-useBadge-accent-1-webkit-linux.png
index 21297fee87..ca3e9d2db5 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--544fa-l-active-false-loading-false-useBadge-accent-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--544fa-l-active-false-loading-false-useBadge-accent-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--75920-active-false-loading-true-useBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--75920-active-false-loading-true-useBadge-undefined-1-chromium-linux.png
index 777ae31bd4..59eb140f91 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--75920-active-false-loading-true-useBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--75920-active-false-loading-true-useBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--815e7-ctive-false-loading-false-useBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--815e7-ctive-false-loading-false-useBadge-undefined-1-chromium-linux.png
index a3cdd2be1a..93fe9bebd2 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--815e7-ctive-false-loading-false-useBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--815e7-ctive-false-loading-false-useBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--815e7-ctive-false-loading-false-useBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--815e7-ctive-false-loading-false-useBadge-undefined-1-firefox-linux.png
index 542273c45e..ab2dcd96e6 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--815e7-ctive-false-loading-false-useBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--815e7-ctive-false-loading-false-useBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--815e7-ctive-false-loading-false-useBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--815e7-ctive-false-loading-false-useBadge-undefined-1-webkit-linux.png
index 4493a35afa..07f51c8126 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--815e7-ctive-false-loading-false-useBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--815e7-ctive-false-loading-false-useBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ad838-active-true-loading-false-useBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ad838-active-true-loading-false-useBadge-undefined-1-chromium-linux.png
index 0e8926e8b0..a23563c0cf 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ad838-active-true-loading-false-useBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ad838-active-true-loading-false-useBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ad838-active-true-loading-false-useBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ad838-active-true-loading-false-useBadge-undefined-1-firefox-linux.png
index 65dff419ee..22f836e710 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ad838-active-true-loading-false-useBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ad838-active-true-loading-false-useBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ad838-active-true-loading-false-useBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ad838-active-true-loading-false-useBadge-undefined-1-webkit-linux.png
index 7e0cef9f55..d65a9a362c 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ad838-active-true-loading-false-useBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ad838-active-true-loading-false-useBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ed83c-ctive-false-loading-false-useBadge-undefined-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ed83c-ctive-false-loading-false-useBadge-undefined-2-chromium-linux.png
index f1ef178203..9e37392272 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ed83c-ctive-false-loading-false-useBadge-undefined-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ed83c-ctive-false-loading-false-useBadge-undefined-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ed83c-ctive-false-loading-false-useBadge-undefined-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ed83c-ctive-false-loading-false-useBadge-undefined-2-firefox-linux.png
index 1aa54587be..32f4063770 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ed83c-ctive-false-loading-false-useBadge-undefined-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ed83c-ctive-false-loading-false-useBadge-undefined-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ed83c-ctive-false-loading-false-useBadge-undefined-2-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ed83c-ctive-false-loading-false-useBadge-undefined-2-webkit-linux.png
index 00739d2bee..eb541c6b11 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ed83c-ctive-false-loading-false-useBadge-undefined-2-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-primary--ed83c-ctive-false-loading-false-useBadge-undefined-2-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-1ea8a-active-true-loading-false-useBadge-undefined-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-1ea8a-active-true-loading-false-useBadge-undefined-2-chromium-linux.png
index b90ac71402..f50d547286 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-1ea8a-active-true-loading-false-useBadge-undefined-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-1ea8a-active-true-loading-false-useBadge-undefined-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-1ea8a-active-true-loading-false-useBadge-undefined-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-1ea8a-active-true-loading-false-useBadge-undefined-2-firefox-linux.png
index 1838b860b1..9529c6226f 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-1ea8a-active-true-loading-false-useBadge-undefined-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-1ea8a-active-true-loading-false-useBadge-undefined-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-1ea8a-active-true-loading-false-useBadge-undefined-2-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-1ea8a-active-true-loading-false-useBadge-undefined-2-webkit-linux.png
index 7ff7317f03..7c77ce535f 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-1ea8a-active-true-loading-false-useBadge-undefined-2-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-1ea8a-active-true-loading-false-useBadge-undefined-2-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-2946b-m-active-false-loading-false-useBadge-accent-3-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-2946b-m-active-false-loading-false-useBadge-accent-3-chromium-linux.png
index ff82a07f4c..a657770774 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-2946b-m-active-false-loading-false-useBadge-accent-3-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-2946b-m-active-false-loading-false-useBadge-accent-3-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-2946b-m-active-false-loading-false-useBadge-accent-3-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-2946b-m-active-false-loading-false-useBadge-accent-3-webkit-linux.png
index 9ed29a0762..c7ac6efb4f 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-2946b-m-active-false-loading-false-useBadge-accent-3-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-2946b-m-active-false-loading-false-useBadge-accent-3-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-35d62--active-false-loading-false-useBadge-neutral-3-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-35d62--active-false-loading-false-useBadge-neutral-3-chromium-linux.png
index 089628c6e8..02087f5886 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-35d62--active-false-loading-false-useBadge-neutral-3-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-35d62--active-false-loading-false-useBadge-neutral-3-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-35d62--active-false-loading-false-useBadge-neutral-3-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-35d62--active-false-loading-false-useBadge-neutral-3-webkit-linux.png
index a94ea3674d..c6e6d3f315 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-35d62--active-false-loading-false-useBadge-neutral-3-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-35d62--active-false-loading-false-useBadge-neutral-3-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-4a2ef-m-active-false-loading-false-useBadge-accent-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-4a2ef-m-active-false-loading-false-useBadge-accent-2-chromium-linux.png
index 11373a7f5f..c6868bf5e6 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-4a2ef-m-active-false-loading-false-useBadge-accent-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-4a2ef-m-active-false-loading-false-useBadge-accent-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-4a2ef-m-active-false-loading-false-useBadge-accent-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-4a2ef-m-active-false-loading-false-useBadge-accent-2-firefox-linux.png
index ccb3ebe9e9..02e9ca649c 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-4a2ef-m-active-false-loading-false-useBadge-accent-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-4a2ef-m-active-false-loading-false-useBadge-accent-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-4a2ef-m-active-false-loading-false-useBadge-accent-2-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-4a2ef-m-active-false-loading-false-useBadge-accent-2-webkit-linux.png
index 3a97681ab7..de5fc39ffb 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-4a2ef-m-active-false-loading-false-useBadge-accent-2-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-4a2ef-m-active-false-loading-false-useBadge-accent-2-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-6893a-ctive-false-loading-false-useBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-6893a-ctive-false-loading-false-useBadge-undefined-1-chromium-linux.png
index 62e40ee36c..44adc8e37a 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-6893a-ctive-false-loading-false-useBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-6893a-ctive-false-loading-false-useBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-6893a-ctive-false-loading-false-useBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-6893a-ctive-false-loading-false-useBadge-undefined-1-firefox-linux.png
index 89a95c1129..19a8064fcb 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-6893a-ctive-false-loading-false-useBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-6893a-ctive-false-loading-false-useBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-6893a-ctive-false-loading-false-useBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-6893a-ctive-false-loading-false-useBadge-undefined-1-webkit-linux.png
index 51ac900d8e..1667978aeb 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-6893a-ctive-false-loading-false-useBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-6893a-ctive-false-loading-false-useBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-78151-m-active-false-loading-false-useBadge-accent-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-78151-m-active-false-loading-false-useBadge-accent-1-chromium-linux.png
index 7bae0f02f6..48421ed834 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-78151-m-active-false-loading-false-useBadge-accent-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-78151-m-active-false-loading-false-useBadge-accent-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-78151-m-active-false-loading-false-useBadge-accent-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-78151-m-active-false-loading-false-useBadge-accent-1-firefox-linux.png
index e464e2f1d0..1aa687fe1b 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-78151-m-active-false-loading-false-useBadge-accent-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-78151-m-active-false-loading-false-useBadge-accent-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-78151-m-active-false-loading-false-useBadge-accent-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-78151-m-active-false-loading-false-useBadge-accent-1-webkit-linux.png
index 32369a9bbb..449f5a8364 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-78151-m-active-false-loading-false-useBadge-accent-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-78151-m-active-false-loading-false-useBadge-accent-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-7c9a6-active-true-loading-false-useBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-7c9a6-active-true-loading-false-useBadge-undefined-1-chromium-linux.png
index fb22dd177c..14119fed25 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-7c9a6-active-true-loading-false-useBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-7c9a6-active-true-loading-false-useBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-7c9a6-active-true-loading-false-useBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-7c9a6-active-true-loading-false-useBadge-undefined-1-firefox-linux.png
index d01c85910c..ba8b62ca73 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-7c9a6-active-true-loading-false-useBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-7c9a6-active-true-loading-false-useBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-7c9a6-active-true-loading-false-useBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-7c9a6-active-true-loading-false-useBadge-undefined-1-webkit-linux.png
index 7deb506c4d..5f320ea4bb 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-7c9a6-active-true-loading-false-useBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-7c9a6-active-true-loading-false-useBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-be34e--active-false-loading-false-useBadge-neutral-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-be34e--active-false-loading-false-useBadge-neutral-1-chromium-linux.png
index cbaaa60d7e..d1f15b53d9 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-be34e--active-false-loading-false-useBadge-neutral-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-be34e--active-false-loading-false-useBadge-neutral-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-be34e--active-false-loading-false-useBadge-neutral-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-be34e--active-false-loading-false-useBadge-neutral-1-firefox-linux.png
index 500eaa8416..7430acfca6 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-be34e--active-false-loading-false-useBadge-neutral-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-be34e--active-false-loading-false-useBadge-neutral-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-be34e--active-false-loading-false-useBadge-neutral-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-be34e--active-false-loading-false-useBadge-neutral-1-webkit-linux.png
index cb9f902ac4..419e0ccdf3 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-be34e--active-false-loading-false-useBadge-neutral-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-be34e--active-false-loading-false-useBadge-neutral-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-ec6c1--active-false-loading-false-useBadge-neutral-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-ec6c1--active-false-loading-false-useBadge-neutral-2-chromium-linux.png
index 2e6eb368f3..e4dcff4131 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-ec6c1--active-false-loading-false-useBadge-neutral-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-ec6c1--active-false-loading-false-useBadge-neutral-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-ec6c1--active-false-loading-false-useBadge-neutral-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-ec6c1--active-false-loading-false-useBadge-neutral-2-firefox-linux.png
index d6632713f4..4c9331bc78 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-ec6c1--active-false-loading-false-useBadge-neutral-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-ec6c1--active-false-loading-false-useBadge-neutral-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-ec6c1--active-false-loading-false-useBadge-neutral-2-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-ec6c1--active-false-loading-false-useBadge-neutral-2-webkit-linux.png
index 074950f31d..d4788b1bc7 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-ec6c1--active-false-loading-false-useBadge-neutral-2-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-ButtonFH-Verify-Button-use-secondar-ec6c1--active-false-loading-false-useBadge-neutral-2-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--0dfe6-ate-normal-checked-false-showBadge-true-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--0dfe6-ate-normal-checked-false-showBadge-true-1-chromium-linux.png
index 886a8602da..0d8d8d39b3 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--0dfe6-ate-normal-checked-false-showBadge-true-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--0dfe6-ate-normal-checked-false-showBadge-true-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--0dfe6-ate-normal-checked-false-showBadge-true-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--0dfe6-ate-normal-checked-false-showBadge-true-1-firefox-linux.png
index 72ecf1d030..ddf61f7ac5 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--0dfe6-ate-normal-checked-false-showBadge-true-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--0dfe6-ate-normal-checked-false-showBadge-true-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--0dfe6-ate-normal-checked-false-showBadge-true-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--0dfe6-ate-normal-checked-false-showBadge-true-1-webkit-linux.png
index da76582637..f9c632ac25 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--0dfe6-ate-normal-checked-false-showBadge-true-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--0dfe6-ate-normal-checked-false-showBadge-true-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--20986-ate-normal-checked-false-showBadge-true-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--20986-ate-normal-checked-false-showBadge-true-1-chromium-linux.png
index e09bc6c87d..bfdf6903cd 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--20986-ate-normal-checked-false-showBadge-true-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--20986-ate-normal-checked-false-showBadge-true-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--20986-ate-normal-checked-false-showBadge-true-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--20986-ate-normal-checked-false-showBadge-true-1-firefox-linux.png
index a3f0eed4d0..3929a3ecc8 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--20986-ate-normal-checked-false-showBadge-true-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--20986-ate-normal-checked-false-showBadge-true-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--20986-ate-normal-checked-false-showBadge-true-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--20986-ate-normal-checked-false-showBadge-true-1-webkit-linux.png
index b6c274aa59..ced591d7d9 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--20986-ate-normal-checked-false-showBadge-true-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--20986-ate-normal-checked-false-showBadge-true-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4a39e-ate-normal-checked-false-showBadge-true-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4a39e-ate-normal-checked-false-showBadge-true-2-chromium-linux.png
index e09bc6c87d..bfdf6903cd 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4a39e-ate-normal-checked-false-showBadge-true-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4a39e-ate-normal-checked-false-showBadge-true-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4a39e-ate-normal-checked-false-showBadge-true-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4a39e-ate-normal-checked-false-showBadge-true-2-firefox-linux.png
index a3f0eed4d0..3929a3ecc8 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4a39e-ate-normal-checked-false-showBadge-true-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4a39e-ate-normal-checked-false-showBadge-true-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4a39e-ate-normal-checked-false-showBadge-true-2-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4a39e-ate-normal-checked-false-showBadge-true-2-webkit-linux.png
index b6c274aa59..ced591d7d9 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4a39e-ate-normal-checked-false-showBadge-true-2-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4a39e-ate-normal-checked-false-showBadge-true-2-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4de37--normal-checked-false-showBadge-undefined-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4de37--normal-checked-false-showBadge-undefined-2-chromium-linux.png
index b32e302687..d32168a1ef 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4de37--normal-checked-false-showBadge-undefined-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4de37--normal-checked-false-showBadge-undefined-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4de37--normal-checked-false-showBadge-undefined-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4de37--normal-checked-false-showBadge-undefined-2-firefox-linux.png
index 54b3afbfc4..648557853a 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4de37--normal-checked-false-showBadge-undefined-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4de37--normal-checked-false-showBadge-undefined-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4de37--normal-checked-false-showBadge-undefined-2-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4de37--normal-checked-false-showBadge-undefined-2-webkit-linux.png
index a2b79038ff..a383b3aed1 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4de37--normal-checked-false-showBadge-undefined-2-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--4de37--normal-checked-false-showBadge-undefined-2-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--b9475-invalid-checked-false-showBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--b9475-invalid-checked-false-showBadge-undefined-1-chromium-linux.png
index 065313a955..d1e9f96554 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--b9475-invalid-checked-false-showBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--b9475-invalid-checked-false-showBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--b9475-invalid-checked-false-showBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--b9475-invalid-checked-false-showBadge-undefined-1-firefox-linux.png
index 6e720aff7f..817ed975e2 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--b9475-invalid-checked-false-showBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--b9475-invalid-checked-false-showBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--b9475-invalid-checked-false-showBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--b9475-invalid-checked-false-showBadge-undefined-1-webkit-linux.png
index 189d1f638f..25652ff3a3 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--b9475-invalid-checked-false-showBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--b9475-invalid-checked-false-showBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--e06de--normal-checked-false-showBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--e06de--normal-checked-false-showBadge-undefined-1-chromium-linux.png
index b32e302687..d32168a1ef 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--e06de--normal-checked-false-showBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--e06de--normal-checked-false-showBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--e06de--normal-checked-false-showBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--e06de--normal-checked-false-showBadge-undefined-1-firefox-linux.png
index 54b3afbfc4..648557853a 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--e06de--normal-checked-false-showBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--e06de--normal-checked-false-showBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--e06de--normal-checked-false-showBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--e06de--normal-checked-false-showBadge-undefined-1-webkit-linux.png
index a2b79038ff..a383b3aed1 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--e06de--normal-checked-false-showBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--e06de--normal-checked-false-showBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--f71bb--normal-checked-false-showBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--f71bb--normal-checked-false-showBadge-undefined-1-chromium-linux.png
index c9262ed7ca..a494b66d6d 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--f71bb--normal-checked-false-showBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--f71bb--normal-checked-false-showBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--f71bb--normal-checked-false-showBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--f71bb--normal-checked-false-showBadge-undefined-1-firefox-linux.png
index 4f28435bdf..9c825e4a14 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--f71bb--normal-checked-false-showBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--f71bb--normal-checked-false-showBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--f71bb--normal-checked-false-showBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--f71bb--normal-checked-false-showBadge-undefined-1-webkit-linux.png
index f822cfa999..6d4349f4a6 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--f71bb--normal-checked-false-showBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-CheckboxFH-Verify-Checkbox-disabled--f71bb--normal-checked-false-showBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-1-chromium-linux.png
index 371b0921d6..adf98ed9da 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-1-firefox-linux.png
index 84fe6ca57e..8e6346cf6f 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-1-webkit-linux.png
index a7ea059d67..7a7942ef52 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-2-chromium-linux.png
index c5e43870e0..3565a9adc5 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-2-firefox-linux.png
index d4f3e12667..c188929bed 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-2-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-2-webkit-linux.png
index b003868b6c..c4fae14b66 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-2-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-DataTableFH-Verify-Data-table-styles-2-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-invalid-showBadge-true-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-invalid-showBadge-true-1-chromium-linux.png
index c797e47964..0442eb975a 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-invalid-showBadge-true-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-invalid-showBadge-true-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-invalid-showBadge-true-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-invalid-showBadge-true-1-firefox-linux.png
index a1829085ae..9d3e90e688 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-invalid-showBadge-true-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-invalid-showBadge-true-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-invalid-showBadge-true-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-invalid-showBadge-true-1-webkit-linux.png
index 8cd8e1f6eb..e10a36c710 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-invalid-showBadge-true-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-invalid-showBadge-true-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-normal-showBadge-true-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-normal-showBadge-true-1-chromium-linux.png
index cf25334538..ca08f842a6 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-normal-showBadge-true-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-normal-showBadge-true-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-normal-showBadge-true-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-normal-showBadge-true-1-firefox-linux.png
index 7cf4662f32..003d9e65bd 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-normal-showBadge-true-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-normal-showBadge-true-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-normal-showBadge-true-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-normal-showBadge-true-1-webkit-linux.png
index 85cf6cf96f..15dc84a951 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-normal-showBadge-true-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-l-state-normal-showBadge-true-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-normal-showBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-normal-showBadge-undefined-1-chromium-linux.png
index 441556d1ef..4ea160742f 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-normal-showBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-normal-showBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-normal-showBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-normal-showBadge-undefined-1-firefox-linux.png
index 4bb3f907e5..a071d27f91 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-normal-showBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-normal-showBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-normal-showBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-normal-showBadge-undefined-1-webkit-linux.png
index e0e1a08f2a..536b3c9404 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-normal-showBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-normal-showBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-valid-showBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-valid-showBadge-undefined-1-chromium-linux.png
index 779bd28cc3..3ab5d54800 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-valid-showBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-valid-showBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-valid-showBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-valid-showBadge-undefined-1-firefox-linux.png
index 0cb0743c41..9354d3800c 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-valid-showBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-valid-showBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-valid-showBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-valid-showBadge-undefined-1-webkit-linux.png
index 76e6b12a26..b8225cb4a7 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-valid-showBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-false-size-m-state-valid-showBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-true-size-m-state-normal-showBadge-true-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-true-size-m-state-normal-showBadge-true-1-chromium-linux.png
index b56a62fc78..a6bb96dd41 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-true-size-m-state-normal-showBadge-true-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-true-size-m-state-normal-showBadge-true-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-true-size-m-state-normal-showBadge-true-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-true-size-m-state-normal-showBadge-true-1-firefox-linux.png
index 40f3d817f4..736ec1c00c 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-true-size-m-state-normal-showBadge-true-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-true-size-m-state-normal-showBadge-true-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-true-size-m-state-normal-showBadge-true-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-true-size-m-state-normal-showBadge-true-1-webkit-linux.png
index 5e22301fce..a3249dc76e 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-true-size-m-state-normal-showBadge-true-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-InputFH-Verify-Input-disabled-true-size-m-state-normal-showBadge-true-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-advanced-mode-rendering-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-advanced-mode-rendering-1-chromium-linux.png
index e30dabe77d..653735167b 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-advanced-mode-rendering-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-advanced-mode-rendering-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-advanced-mode-rendering-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-advanced-mode-rendering-1-firefox-linux.png
index 0b4805ab3f..caa3f27a95 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-advanced-mode-rendering-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-advanced-mode-rendering-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-advanced-mode-rendering-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-advanced-mode-rendering-1-webkit-linux.png
index ff8f76bcba..12685e6cb7 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-advanced-mode-rendering-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-advanced-mode-rendering-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-false-showActions-false-iconType-ai-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-false-showActions-false-iconType-ai-1-chromium-linux.png
index aac261cf09..65e89e973b 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-false-showActions-false-iconType-ai-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-false-showActions-false-iconType-ai-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-false-showActions-false-iconType-ai-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-false-showActions-false-iconType-ai-1-firefox-linux.png
index e4a32de5f2..647b1e4c8e 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-false-showActions-false-iconType-ai-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-false-showActions-false-iconType-ai-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-false-showActions-false-iconType-ai-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-false-showActions-false-iconType-ai-1-webkit-linux.png
index 45d659b021..2ec37275fd 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-false-showActions-false-iconType-ai-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-false-showActions-false-iconType-ai-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-true-showActions-true-iconType-mail-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-true-showActions-true-iconType-mail-1-chromium-linux.png
index c1a5a7a6c2..a263115d7b 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-true-showActions-true-iconType-mail-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-true-showActions-true-iconType-mail-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-true-showActions-true-iconType-mail-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-true-showActions-true-iconType-mail-1-firefox-linux.png
index 51ce2fce87..939d19f6b4 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-true-showActions-true-iconType-mail-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-true-showActions-true-iconType-mail-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-true-showActions-true-iconType-mail-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-true-showActions-true-iconType-mail-1-webkit-linux.png
index 943f1559c2..3758b4c526 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-true-showActions-true-iconType-mail-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Notice-FH-Verify-Notice-showTitle-true-showActions-true-iconType-mail-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-1-chromium-linux.png
index f53977aafc..180553d38e 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-1-firefox-linux.png
index a61689f0cd..bcda0f0566 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-1-webkit-linux.png
index 38330993c3..f17e5d01e2 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-2-chromium-linux.png
index f53977aafc..77f0b9cb7c 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-2-firefox-linux.png
index a61689f0cd..bcda0f0566 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-2-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-2-webkit-linux.png
index 38330993c3..f17e5d01e2 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-2-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-l-showBadge-undefined-2-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-1-chromium-linux.png
index 0f3dcef566..3fcfed423c 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-1-firefox-linux.png
index c1764c6868..996819792d 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-1-webkit-linux.png
index be6b82b352..0145846814 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-2-chromium-linux.png
index 0f3dcef566..3fcfed423c 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-2-firefox-linux.png
index c1764c6868..996819792d 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-2-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-2-webkit-linux.png
index be6b82b352..0145846814 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-2-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-false-size-m-showBadge-true-2-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-l-showBadge-true-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-l-showBadge-true-1-chromium-linux.png
index 80c548bde5..db0942c14a 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-l-showBadge-true-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-l-showBadge-true-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-l-showBadge-true-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-l-showBadge-true-1-firefox-linux.png
index 6490b90221..f283bdacf0 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-l-showBadge-true-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-l-showBadge-true-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-l-showBadge-true-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-l-showBadge-true-1-webkit-linux.png
index c27828b01d..a5f5b476f0 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-l-showBadge-true-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-l-showBadge-true-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-m-showBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-m-showBadge-undefined-1-chromium-linux.png
index 11b576e682..3839f6995f 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-m-showBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-m-showBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-m-showBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-m-showBadge-undefined-1-firefox-linux.png
index 2c886f5409..42b3c06835 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-m-showBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-m-showBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-m-showBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-m-showBadge-undefined-1-webkit-linux.png
index 10e735a9e3..e0c54b7733 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-m-showBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-PillsFH-Verify-Pills-disabled-true-size-m-showBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-3697b-ate-normal-showBadge-undefined-showIcon-false-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-3697b-ate-normal-showBadge-undefined-showIcon-false-1-chromium-linux.png
index b4b33c660a..3353b99587 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-3697b-ate-normal-showBadge-undefined-showIcon-false-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-3697b-ate-normal-showBadge-undefined-showIcon-false-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-3697b-ate-normal-showBadge-undefined-showIcon-false-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-3697b-ate-normal-showBadge-undefined-showIcon-false-1-firefox-linux.png
index 7d2f058ce2..b55aa3ddd1 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-3697b-ate-normal-showBadge-undefined-showIcon-false-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-3697b-ate-normal-showBadge-undefined-showIcon-false-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-77408-nvalid-showBadge-undefined-showIcon-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-77408-nvalid-showBadge-undefined-showIcon-undefined-1-chromium-linux.png
index d0999459ee..2eb1bf7a07 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-77408-nvalid-showBadge-undefined-showIcon-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-77408-nvalid-showBadge-undefined-showIcon-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-77408-nvalid-showBadge-undefined-showIcon-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-77408-nvalid-showBadge-undefined-showIcon-undefined-1-firefox-linux.png
index c720d3cd5b..962976d0fe 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-77408-nvalid-showBadge-undefined-showIcon-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-77408-nvalid-showBadge-undefined-showIcon-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-77408-nvalid-showBadge-undefined-showIcon-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-77408-nvalid-showBadge-undefined-showIcon-undefined-1-webkit-linux.png
index 9003b00de9..e4a6679146 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-77408-nvalid-showBadge-undefined-showIcon-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-77408-nvalid-showBadge-undefined-showIcon-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-db627-ate-normal-showBadge-undefined-showIcon-false-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-db627-ate-normal-showBadge-undefined-showIcon-false-2-chromium-linux.png
index b4b33c660a..3353b99587 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-db627-ate-normal-showBadge-undefined-showIcon-false-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-db627-ate-normal-showBadge-undefined-showIcon-false-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-db627-ate-normal-showBadge-undefined-showIcon-false-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-db627-ate-normal-showBadge-undefined-showIcon-false-2-firefox-linux.png
index 7d2f058ce2..b55aa3ddd1 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-db627-ate-normal-showBadge-undefined-showIcon-false-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-s-db627-ate-normal-showBadge-undefined-showIcon-false-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-1-chromium-linux.png
index 0e5fe61001..b70686c97b 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-1-firefox-linux.png
index 93a57ced0e..58d04c8efe 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-2-chromium-linux.png
index 0e5fe61001..b70686c97b 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-2-firefox-linux.png
index 93a57ced0e..58d04c8efe 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-false-size-l-state-normal-showBadge-true-showIcon-undefined-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-si-39cc8-normal-showBadge-undefined-showIcon-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-si-39cc8-normal-showBadge-undefined-showIcon-undefined-1-chromium-linux.png
index 65be6e736d..e905888b8d 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-si-39cc8-normal-showBadge-undefined-showIcon-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-si-39cc8-normal-showBadge-undefined-showIcon-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-si-39cc8-normal-showBadge-undefined-showIcon-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-si-39cc8-normal-showBadge-undefined-showIcon-undefined-1-firefox-linux.png
index b6b7470a2f..b9aeb7ea50 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-si-39cc8-normal-showBadge-undefined-showIcon-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-si-39cc8-normal-showBadge-undefined-showIcon-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-si-39cc8-normal-showBadge-undefined-showIcon-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-si-39cc8-normal-showBadge-undefined-showIcon-undefined-1-webkit-linux.png
index f5df741a73..72e1f65008 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-si-39cc8-normal-showBadge-undefined-showIcon-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-si-39cc8-normal-showBadge-undefined-showIcon-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-size-m-state-invalid-showBadge-true-showIcon-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-size-m-state-invalid-showBadge-true-showIcon-undefined-1-chromium-linux.png
index 9de73b52a3..e7c8d364e3 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-size-m-state-invalid-showBadge-true-showIcon-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-size-m-state-invalid-showBadge-true-showIcon-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-size-m-state-invalid-showBadge-true-showIcon-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-size-m-state-invalid-showBadge-true-showIcon-undefined-1-firefox-linux.png
index 56f49d557a..b8e1b9d5b4 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-size-m-state-invalid-showBadge-true-showIcon-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-size-m-state-invalid-showBadge-true-showIcon-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-size-m-state-invalid-showBadge-true-showIcon-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-size-m-state-invalid-showBadge-true-showIcon-undefined-1-webkit-linux.png
index af9ac3a13b..fa3a356df1 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-size-m-state-invalid-showBadge-true-showIcon-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-RadioFH-Verify-Radio-disabled-true-size-m-state-invalid-showBadge-true-showIcon-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-invalid-showBadge-true-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-invalid-showBadge-true-1-chromium-linux.png
index da4cd1d038..d79bbd3576 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-invalid-showBadge-true-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-invalid-showBadge-true-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-invalid-showBadge-true-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-invalid-showBadge-true-1-firefox-linux.png
index 3baeabeb5e..e081404e6e 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-invalid-showBadge-true-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-invalid-showBadge-true-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-invalid-showBadge-true-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-invalid-showBadge-true-1-webkit-linux.png
index 9e23161b3d..c531497457 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-invalid-showBadge-true-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-invalid-showBadge-true-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-1-chromium-linux.png
index 6a0d72a9d1..6308f2b868 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-1-firefox-linux.png
index bc4b2c7a1c..9fd2b46828 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-1-webkit-linux.png
index 4d487e2086..82838f9c2f 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-2-chromium-linux.png
index 9c26bc028d..25968ed7eb 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-2-firefox-linux.png
index 7077c8cb08..59dd1261df 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-2-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-2-webkit-linux.png
index fc770bfab2..2c046793ad 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-2-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-l-state-normal-showBadge-undefined-2-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-1-chromium-linux.png
index 51a666e8ac..7ddc2785e0 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-1-firefox-linux.png
index 4b42aa9038..3dbe07c5a7 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-1-webkit-linux.png
index 3c31971c3b..a3ecc31ece 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-2-chromium-linux.png
index 3edcc3afef..1e096c0cf4 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-2-firefox-linux.png
index 7970ee8d66..783c491a3e 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-2-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-2-webkit-linux.png
index cacf02caad..006776a585 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-2-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-normal-showBadge-true-2-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-valid-showBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-valid-showBadge-undefined-1-chromium-linux.png
index 8f4bdc69fe..b79ae65e5a 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-valid-showBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-valid-showBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-valid-showBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-valid-showBadge-undefined-1-firefox-linux.png
index 652e8e4f5a..2c0533ae21 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-valid-showBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-valid-showBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-valid-showBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-valid-showBadge-undefined-1-webkit-linux.png
index b6be5ed3f1..9f401cf85d 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-valid-showBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-Select-FH-Verify-Select-disabled-false-size-m-state-valid-showBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-1-chromium-linux.png
index 88b915095c..4e4e656a09 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-1-firefox-linux.png
index 8945a2a612..acbdc45b15 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-1-webkit-linux.png
index 3ce53dcfd9..55eb7b3ecc 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-2-chromium-linux.png
index dbda2f56a1..257040acbf 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-2-firefox-linux.png
index 98f904af3c..4e8ced641c 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-2-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-2-webkit-linux.png
index 5fa0c45b47..b9f5fdf4b5 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-2-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-l-checked-undefined-showBadge-true-2-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-1-chromium-linux.png
index 9e43f2d5e3..9ede9a9088 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-1-firefox-linux.png
index 4deab4d5a0..0279197f41 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-1-webkit-linux.png
index bbf23cdd42..8a08b476aa 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-2-chromium-linux.png
index d9867985a8..0a003cc2de 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-2-firefox-linux.png
index 6592079997..01fb6cd067 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-2-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-2-webkit-linux.png
index 23c43e0218..50c5baf3cb 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-2-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-m-checked-undefined-showBadge-undefined-2-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-1-chromium-linux.png
index c8a2327102..23ca91bff9 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-1-firefox-linux.png
index 7d72cc7e71..57dd427ca0 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-1-webkit-linux.png
index 65755319d0..c6daf5f0dc 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-2-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-2-chromium-linux.png
index a7e206e7e5..4eae2d7e74 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-2-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-2-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-2-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-2-firefox-linux.png
index 13e288f976..60036654a2 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-2-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-2-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-2-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-2-webkit-linux.png
index 97bbeff653..83eaed6f13 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-2-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-false-size-xl-checked-undefined-showBadge-undefined-2-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-l-checked-true-showBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-l-checked-true-showBadge-undefined-1-chromium-linux.png
index 7f4222ef7d..cfc8f05e4e 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-l-checked-true-showBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-l-checked-true-showBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-l-checked-true-showBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-l-checked-true-showBadge-undefined-1-firefox-linux.png
index 932597d04b..a3bfef4124 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-l-checked-true-showBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-l-checked-true-showBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-l-checked-true-showBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-l-checked-true-showBadge-undefined-1-webkit-linux.png
index 9465f15344..e391e27565 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-l-checked-true-showBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-l-checked-true-showBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-m-checked-true-showBadge-true-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-m-checked-true-showBadge-true-1-chromium-linux.png
index 46b3b70003..0336dc433a 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-m-checked-true-showBadge-true-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-m-checked-true-showBadge-true-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-m-checked-true-showBadge-true-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-m-checked-true-showBadge-true-1-firefox-linux.png
index 7cc7db0364..87f3ebfe5a 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-m-checked-true-showBadge-true-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-m-checked-true-showBadge-true-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-m-checked-true-showBadge-true-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-m-checked-true-showBadge-true-1-webkit-linux.png
index 452501d5af..193c2de7d5 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-m-checked-true-showBadge-true-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-SwitchFH-Verify-Switch-disabled-true-size-m-checked-true-showBadge-true-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-l-showBadge-true-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-l-showBadge-true-1-chromium-linux.png
index efc4cd2d1d..32916906b9 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-l-showBadge-true-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-l-showBadge-true-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-l-showBadge-true-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-l-showBadge-true-1-firefox-linux.png
index 341031e8c8..9fa2c123d1 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-l-showBadge-true-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-l-showBadge-true-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-l-showBadge-true-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-l-showBadge-true-1-webkit-linux.png
index 458d3974f4..e117b5452d 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-l-showBadge-true-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-l-showBadge-true-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-m-showBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-m-showBadge-undefined-1-chromium-linux.png
index 8ea27427f2..774a022a2c 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-m-showBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-m-showBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-m-showBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-m-showBadge-undefined-1-firefox-linux.png
index bc3c14fb77..b59b0beb12 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-m-showBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-m-showBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-m-showBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-m-showBadge-undefined-1-webkit-linux.png
index bdf668cf89..084133050a 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-m-showBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-false-size-m-showBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-l-showBadge-true-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-l-showBadge-true-1-chromium-linux.png
index ed3dfcda3e..3fa0426f83 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-l-showBadge-true-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-l-showBadge-true-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-l-showBadge-true-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-l-showBadge-true-1-firefox-linux.png
index b3c0a8964d..754443c893 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-l-showBadge-true-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-l-showBadge-true-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-l-showBadge-true-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-l-showBadge-true-1-webkit-linux.png
index 10fd75b557..262334cdb2 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-l-showBadge-true-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-l-showBadge-true-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-m-showBadge-undefined-1-chromium-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-m-showBadge-undefined-1-chromium-linux.png
index 3eb2f84a83..efa9fc3a44 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-m-showBadge-undefined-1-chromium-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-m-showBadge-undefined-1-chromium-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-m-showBadge-undefined-1-firefox-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-m-showBadge-undefined-1-firefox-linux.png
index ccf1d173da..11faaef56c 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-m-showBadge-undefined-1-firefox-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-m-showBadge-undefined-1-firefox-linux.png differ
diff --git a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-m-showBadge-undefined-1-webkit-linux.png b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-m-showBadge-undefined-1-webkit-linux.png
index 98dc2cf094..4b219ac519 100644
Binary files a/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-m-showBadge-undefined-1-webkit-linux.png and b/semcore/feature-highlight/__tests__/feature-highlight.browser-test.tsx-snapshots/-visual-TablineFH-Verify-Tabline-disabled-true-size-m-showBadge-undefined-1-webkit-linux.png differ
diff --git a/semcore/feature-highlight/src/components/badge/badge.shadow.css b/semcore/feature-highlight/src/components/badge/badge.shadow.css
index 4a1a2b2165..c6ba747f24 100644
--- a/semcore/feature-highlight/src/components/badge/badge.shadow.css
+++ b/semcore/feature-highlight/src/components/badge/badge.shadow.css
@@ -17,7 +17,7 @@ SHighlightedBadge {
 }
 
 SHighlightedBadge[use='accent'] {
-  background-image: var(--intergalactic-control-primary-feature-highlight, linear-gradient(90deg in oklch, oklch(0.64 0.223 299.3), oklch(0.74 0.117 274.1)));
+  background-color: var(--intergalactic-feature-highlight-badge-accent, oklch(0.22 0.01 140));
 }
 
 SHighlightedBadge[bg] {
diff --git a/semcore/feature-highlight/src/components/button/button.shadow.css b/semcore/feature-highlight/src/components/button/button.shadow.css
index 0b1d8bf3df..1662f8f0ce 100644
--- a/semcore/feature-highlight/src/components/button/button.shadow.css
+++ b/semcore/feature-highlight/src/components/button/button.shadow.css
@@ -1,104 +1,39 @@
 SHighlightedButton[theme='primary-highlighted'] {
-  color: var(--intergalactic-text-primary-invert, oklch(0.999 0.001 180 / 0.949));
-  background-image: linear-gradient(90deg,
-  var(--intergalactic-violet-500, oklch(0.53 0.26 296)),
-  var(--intergalactic-blue-500, oklch(0.53 0.157 279.2)),
-  var(--intergalactic-violet-400, oklch(0.64 0.223 299.3)),
-  var(--intergalactic-blue-400, oklch(0.58 0.168 278.2)));
-  background-position-x: 99%;
-  background-size: 300%;
-  transition: background-position-x 0.3s cubic-bezier(0.22, 0.61, 0.36, 1);
+  color: var(--intergalactic-control-text-primary-invert, oklch(0.999 0.001 180 / 0.949));
+  background-color: var(--intergalactic-control-primary-info, oklch(0.23 0.01 140));
 
-  &:hover {
-    color: var(--intergalactic-text-primary-invert, oklch(0.999 0.001 180 / 0.949));
-    background-position-x: 1%;
-  }
-
-  &:active,
-  &[active] {
-    color: var(--intergalactic-text-primary-invert, oklch(0.999 0.001 180 / 0.949));
-    background-image: var(--intergalactic-control-primary-feature-highlight-active, linear-gradient(90deg in oklch, oklch(0.64 0.223 299.3), oklch(0.58 0.168 278.2)));
-    background-size: 100%;
+  [data-ui-name='SummaryAI'] {
+    color: var(--intergalactic-brand-tertiary, oklch(0.82 0.15 170));
   }
 
   &:focus-visible {
-    outline: none;
+    outline-color: var(--intergalactic-feature-highlight-keyboard-focus-outline, oklch(0.82 0.15 170));
+    outline-width: 2px;
   }
 }
 
 SHighlightedButton[theme='secondary-highlighted'] {
-  color: var(--intergalactic-icon-primary-feature-highlight, oklch(0.58 0.254 297.1));
-
-  background:
-    var(--intergalactic-control-secondary-feature-highlight, linear-gradient(90deg in oklch, oklch(0.97 0.019 303.4), oklch(0.969 0.016 267.7))) padding-box,
-    var(--intergalactic-border-feature-highlight-secondary, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.74 0.117 274.1))) border-box;
-  background-origin: border-box;
-  background-clip: padding-box, border-box;
+  color: var(--intergalactic-feature-highlight-text, oklch(0.1 0.03 137 / 0.899));
 
-  & SText {
-    background-color: var(--intergalactic-icon-primary-feature-highlight, oklch(0.58 0.254 297.1));
-    background-image: var(--intergalactic-text-feature-highlight, linear-gradient(90deg in oklch, oklch(0.53 0.26 296), oklch(0.53 0.157 279.2)));
-    background-clip: text;
-    -webkit-text-fill-color: transparent;
+  &:focus-visible {
+    outline-color: var(--intergalactic-feature-highlight-keyboard-focus-outline, oklch(0.82 0.15 170));
+    outline-width: 2px;
   }
 
-  &:hover {
-    background:
-      var(--intergalactic-control-secondary-feature-highlight-hover, linear-gradient(90deg in oklch, oklch(0.9 0.065 303), oklch(0.898 0.054 268.3))) padding-box,
-      var(--intergalactic-border-feature-highlight-secondary, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.74 0.117 274.1))) border-box;
-
-    color: var(--intergalactic-icon-primary-feature-highlight-hover-active, oklch(0.53 0.26 296));
+  background-color: var(--intergalactic-feature-highlight-control-secondary, oklch(0.166 0.031 175.8 / 0.097));
 
-    & SText {
-      background-color: var(--intergalactic-icon-primary-feature-highlight-hover-active, oklch(0.53 0.26 296));
-      background-image: var(--intergalactic-text-feature-highlight-hover-active, linear-gradient(90deg in oklch, oklch(0.53 0.26 296), oklch(0.53 0.157 279.2)));
-    }
+  &:hover {
+    background-color: var(--intergalactic-feature-highlight-control-secondary-hover, oklch(0.151 0.028 176.1 / 0.123));
   }
 
   &:active,
   &[active] {
-    background:
-      var(--intergalactic-control-secondary-feature-highlight-active, linear-gradient(90deg in oklch, oklch(0.9 0.065 303), oklch(0.898 0.054 268.3))) padding-box,
-      var(--intergalactic-border-feature-highlight-secondary, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.74 0.117 274.1))) border-box;
-
-    color: var(--intergalactic-icon-primary-feature-highlight-hover-active, oklch(0.53 0.26 296));
-
-    & SText {
-      background-color: var(--intergalactic-icon-primary-feature-highlight-hover-active, oklch(0.53 0.26 296));
-      background-image: var(--intergalactic-text-feature-highlight-hover-active, linear-gradient(90deg in oklch, oklch(0.53 0.26 296), oklch(0.53 0.157 279.2)));
-    }
-  }
-
-  &:focus-visible {
-    outline: none;
+    background-color: var(--intergalactic-feature-highlight-control-secondary-active, oklch(0.145 0.027 176.1 / 0.135));
   }
 }
 
 SHighlightedButton {
   position: relative;
-  /* isolation: isolate; */
-
-  &::before {
-    content: "";
-    position: absolute;
-    z-index: -1;
-    inset: 0;
-    margin: -5px;
-    padding: 2px;
-    border-radius: calc(var(--intergalactic-control-rounded, 6px) + 3px);
-
-    background-image: var(--intergalactic-keyboard-focus-feature-highlight-outline, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.58 0.168 278.2)));
-
-    mask: linear-gradient(0deg, #fff, #fff) content-box, linear-gradient(0deg, #fff, #fff);
-    mask-composite: exclude;
-
-    opacity: 0;
-    transform: scale(0.96);
-
-    transition:
-      opacity calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out,
-      transform calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out;
-  }
 
   &[neighborLocation='left']::before {
     border-top-left-radius: 0;
@@ -114,22 +49,3 @@ SHighlightedButton {
     border-radius: 0;
   }
 }
-
-SHighlightedButton:focus-visible::before {
-  opacity: 1;
-  transform: scale(1);
-}
-
-/* Firefox fallback */
-@supports not (-webkit-mask-composite: xor) {
-  SHighlightedButton:focus-visible {
-    outline: none;
-    box-shadow:
-      0 0 0 2px #ffffff,
-      0 0 0 4px #7078FC;
-  }
-
-  SHighlightedButton:focus-visible::before {
-    display: none;
-  }
-}
diff --git a/semcore/feature-highlight/src/components/checkbox/checkbox.shadow.css b/semcore/feature-highlight/src/components/checkbox/checkbox.shadow.css
index 823a6b2d00..ef36756f76 100644
--- a/semcore/feature-highlight/src/components/checkbox/checkbox.shadow.css
+++ b/semcore/feature-highlight/src/components/checkbox/checkbox.shadow.css
@@ -1,56 +1,7 @@
 SHighlightedCheckbox:not([state="invalid"]) {
-  [data-ui-name="Value.CheckMark"] {
-    position: relative;
-    transform: translate(0);
+  input[data-ui-name="CheckboxFH.Value"]:focus-visible + [data-ui-name="Value.CheckMark"]::before {
+    @mixin focus-outline-mixin;
 
-    border: 1px solid transparent;
-    border-radius: var(--intergalactic-addon-rounded, 4px);
-    background: linear-gradient(white, white) padding-box,
-      var(--intergalactic-border-feature-highlight, linear-gradient(90deg in oklch, oklch(0.82 0.118 303), oklch(0.82 0.088 272.1))) border-box;
-    background-origin: border-box;
-    background-clip: padding-box, border-box;
-  }
-
-  input[data-ui-name="CheckboxFH.Value"]:checked + [data-ui-name="Value.CheckMark"] {
-    border-color: transparent;
-    background: var(--intergalactic-border-feature-highlight-active, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.74 0.117 274.1))) padding-box, var(--intergalactic-border-feature-highlight-active, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.74 0.117 274.1))) border-box;
-  }
-
-  [data-ui-name="Value.CheckMark"]::before {
-    content: "";
-    position: absolute;
-    z-index: -1;
-    inset: 0;
-    margin: -5px;
-    padding: 1px;
-    border-width: 2px;
-    border-radius: calc(var(--intergalactic-addon-rounded, 4px) + 3px);
-    border-color: transparent;
-    pointer-events: none;
-    background: linear-gradient(white, white) padding-box, var(--intergalactic-border-feature-highlight, linear-gradient(90deg in oklch, oklch(0.82 0.118 303), oklch(0.82 0.088 272.1))) border-box;
-    mask: linear-gradient(0deg, #fff, #fff) content-box, linear-gradient(0deg, #fff, #fff);
-    mask-composite: exclude;
-
-    opacity: 0;
-    transform: scale(0.9);
-
-    transition:
-      opacity calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out,
-      transform calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out;
-  }
-
-  input[data-ui-name="CheckboxFH.Value"]:checked:not(:focus-visible)+[data-ui-name="Value.CheckMark"]::before {
-    opacity: 0;
-    transform: scale(0.9);
-  }
-
-  input[data-ui-name="CheckboxFH.Value"]:focus-visible+[data-ui-name="Value.CheckMark"]::before {
-    opacity: 1;
-    transform: scale(1);
-  }
-
-  input[data-ui-name="CheckboxFH.Value"]:checked:focus-visible+[data-ui-name="Value.CheckMark"]::before {
-    border-color: transparent;
-    background: linear-gradient(white, white) padding-box, var(--intergalactic-border-feature-highlight-active, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.74 0.117 274.1))) border-box;
+    outline-color: var(--intergalactic-feature-highlight-keyboard-focus-outline, oklch(0.82 0.15 170));
   }
 }
diff --git a/semcore/feature-highlight/src/components/input/Input.tsx b/semcore/feature-highlight/src/components/input/Input.tsx
index 9e6e46a5f4..f4dbd2cfb2 100644
--- a/semcore/feature-highlight/src/components/input/Input.tsx
+++ b/semcore/feature-highlight/src/components/input/Input.tsx
@@ -23,7 +23,7 @@ function HighlightAddon(props: Intergalactic.InternalTypings.InferComponentProps
   const { Children, children: hasChildren } = props;
   return (
     <Root render={Input.Addon}>
-      {hasChildren ? (<Children />) : (<SummaryAI color='--intergalactic-icon-primary-feature-highlight' />)}
+      {hasChildren ? (<Children />) : (<SummaryAI color='--intergalactic-feature-highlight-icon-primary' />)}
     </Root>
   );
 }
diff --git a/semcore/feature-highlight/src/components/input/input.shadow.css b/semcore/feature-highlight/src/components/input/input.shadow.css
index 7853c45600..ce4e77dc59 100644
--- a/semcore/feature-highlight/src/components/input/input.shadow.css
+++ b/semcore/feature-highlight/src/components/input/input.shadow.css
@@ -1,64 +1,11 @@
 SHighlightedInput[state='normal'] {
   SOutline {
-    background: linear-gradient(white, white) padding-box,
-      var(--intergalactic-border-feature-highlight, linear-gradient(90deg in oklch, oklch(0.82 0.118 303), oklch(0.82 0.088 272.1))) border-box;
-    background-origin: border-box;
-    background-clip: padding-box, border-box;
-    border-color: transparent;
-
-    &::before {
-      content: "";
-      position: absolute;
-      z-index: -1;
-      inset: 0;
-      margin: -3px;
-      padding: 3px;
-      border-radius: calc(var(--intergalactic-control-rounded, 6px) + 3px);
-
-      background-image: var(--intergalactic-keyboard-focus-feature-highlight-outline, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.58 0.168 278.2)));
-      mask: linear-gradient(0deg, #fff, #fff) content-box, linear-gradient(0deg, #fff, #fff);
-      mask-composite: exclude;
-
-      opacity: 0;
-
-      transition: opacity calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out;
-    }
+    border-color: var(--intergalactic-feature-highlight-border-primary, oklch(0.137 0.026 175.7 / 0.161));
   }
 
   &:has(SValue:focus-visible) SOutline {
-    outline: none;
-
-    &::before {
-      opacity: 1;
-    }
-  }
-
-  &[neighborLocation='left'] SOutline::before {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-
-  &[neighborLocation='right'] SOutline::before {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-
-  &[neighborLocation='both'] SOutline::before {
-    border-radius: 0;
-  }
-}
-
-/* Firefox fallback */
-@supports not (-webkit-mask-composite: xor) {
-  SHighlightedInput[state='normal']:has(SValue:focus-visible) SOutline {
-    outline: none;
-    border-color: #7078FC;
-    box-shadow:
-      0 0 0 0 #ffffff,
-      0 0 0 2px #7078FC;
-  }
-
-  SHighlightedInput[state='normal']:has(SValue:focus-visible) SOutline::before {
-    display: none;
+    outline-color: var(--intergalactic-feature-highlight-keyboard-focus-outline, oklch(0.82 0.15 170));
+    outline-width: 2px;
+    border-color: var(--intergalactic-feature-highlight-border-primary-active, oklch(0.22 0.01 140));
   }
 }
diff --git a/semcore/feature-highlight/src/components/notice/notice.shadow.css b/semcore/feature-highlight/src/components/notice/notice.shadow.css
index e07271d38b..6de973bddb 100644
--- a/semcore/feature-highlight/src/components/notice/notice.shadow.css
+++ b/semcore/feature-highlight/src/components/notice/notice.shadow.css
@@ -1,8 +1,9 @@
 SHighlightedNotice[beforeVisibility] {
-  background-image: var(--intergalactic-bg-secondary-feature-highlight, linear-gradient(90deg in oklch, oklch(0.97 0.019 303.4), oklch(0.929 0.037 268)));
+  background-color: var(--intergalactic-feature-highlight-bg-secondary, oklch(0.9 0.065 303));
   border-color: transparent;
   background-clip: padding-box;
   position: relative;
+  isolation: isolate;
 
   &:before {
     content: '';
@@ -13,11 +14,39 @@ SHighlightedNotice[beforeVisibility] {
     border-radius: inherit;
     visibility: var(--beforeVisibility);
 
-    background: var(--intergalactic-border-feature-highlight, linear-gradient(90deg in oklch, oklch(0.82 0.118 303), oklch(0.82 0.088 272.1))) border-box, var(--intergalactic-border-feature-highlight-active, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.74 0.117 274.1))) padding-box;
+    border-color: var(--intergalactic-feature-highlight-bg-secondary, oklch(0.9 0.065 303));
+  }
+
+  &:after {
+    content: '';
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    width: 112px;
+    z-index: 0;
+    border-top-right-radius: inherit;
+    border-bottom-right-radius: inherit;
+    pointer-events: none;
+    visibility: var(--beforeVisibility);
+    background-color: var(--intergalactic-brand-primary, oklch(0.74 0.17 303));
+    mask-image: url("data:image/svg+xml,%3Csvg%20preserveAspectRatio%3D%22none%22%20width%3D%22106.654%22%20height%3D%2272%22%20viewBox%3D%220%200%20106.654%2072%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%20%3Cg%3E%20%3Cpath%20d%3D%22M106.654%20-6.99427e-08C106.654%202.66667%20106.654%205.33333%20106.654%208C104.877%207.93333%20103.099%207.86667%20101.322%207.8C69.3267%206.6%2037.3316%205.39999%205.33643%204.19999C3.55891%204.13332%201.78141%204.06666%200.00390625%203.99999C1.78141%203.93332%203.55891%203.86666%205.33643%203.79999C37.3316%202.59999%2069.3267%201.4%20101.322%200.2C103.099%200.133333%20104.877%200.0666664%20106.654%20-6.99427e-08Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.654%208C106.654%2010.6667%20106.654%2013.3333%20106.654%2016C104.877%2015.9333%20103.099%2015.8667%20101.322%2015.8C69.3267%2014.6%2037.3316%2013.4%205.33643%2012.2C3.55891%2012.1333%201.78141%2012.0667%200.00390625%2012C1.78141%2011.9333%203.55891%2011.8667%205.33643%2011.8C37.3316%2010.6%2069.3267%209.4%20101.322%208.2C103.099%208.13333%20104.877%208.06667%20106.654%208Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.65%2016C106.65%2018.6667%20106.65%2021.3333%20106.65%2024C104.873%2023.9333%20103.095%2023.8667%20101.318%2023.8C69.3228%2022.6%2037.3277%2021.4%205.33253%2020.2C3.55501%2020.1333%201.77751%2020.0667%200%2020C1.77751%2019.9333%203.55501%2019.8667%205.33253%2019.8C37.3277%2018.6%2069.3228%2017.4%20101.318%2016.2C103.095%2016.1333%20104.873%2016.0667%20106.65%2016Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.65%2024C106.65%2026.6667%20106.65%2029.3333%20106.65%2032C104.873%2031.9333%20103.095%2031.8667%20101.318%2031.8C69.3228%2030.6%2037.3277%2029.4%205.33253%2028.2C3.55501%2028.1333%201.77751%2028.0667%200%2028C1.77751%2027.9333%203.55501%2027.8667%205.33253%2027.8C37.3277%2026.6%2069.3228%2025.4%20101.318%2024.2C103.095%2024.1333%20104.873%2024.0667%20106.65%2024Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.65%2032C106.65%2034.6667%20106.65%2037.3333%20106.65%2040C104.873%2039.9333%20103.095%2039.8667%20101.318%2039.8C69.3228%2038.6%2037.3277%2037.4%205.33253%2036.2C3.55501%2036.1333%201.77751%2036.0667%200%2036C1.77751%2035.9333%203.55501%2035.8667%205.33253%2035.8C37.3277%2034.6%2069.3228%2033.4%20101.318%2032.2C103.095%2032.1333%20104.873%2032.0667%20106.65%2032Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.65%2040C106.65%2042.6667%20106.65%2045.3333%20106.65%2048C104.873%2047.9333%20103.095%2047.8667%20101.318%2047.8C69.3228%2046.6%2037.3277%2045.4%205.33253%2044.2C3.55501%2044.1333%201.77751%2044.0667%200%2044C1.77751%2043.9333%203.55501%2043.8667%205.33253%2043.8C37.3277%2042.6%2069.3228%2041.4%20101.318%2040.2C103.095%2040.1333%20104.873%2040.0667%20106.65%2040Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.65%2048C106.65%2050.6667%20106.65%2053.3333%20106.65%2056C104.873%2055.9333%20103.095%2055.8667%20101.318%2055.8C69.3228%2054.6%2037.3277%2053.4%205.33253%2052.2C3.55501%2052.1333%201.77751%2052.0667%200%2052C1.77751%2051.9333%203.55501%2051.8667%205.33253%2051.8C37.3277%2050.6%2069.3228%2049.4%20101.318%2048.2C103.095%2048.1333%20104.873%2048.0667%20106.65%2048Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.654%2056C106.654%2058.6667%20106.654%2061.3333%20106.654%2064C104.877%2063.9333%20103.099%2063.8667%20101.322%2063.8C69.3267%2062.6%2037.3316%2061.4%205.33643%2060.2C3.55891%2060.1333%201.78141%2060.0667%200.00390625%2060C1.78141%2059.9333%203.55891%2059.8667%205.33643%2059.8C37.3316%2058.6%2069.3267%2057.4%20101.322%2056.2C103.099%2056.1333%20104.877%2056.0667%20106.654%2056Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.65%2064C106.65%2066.6667%20106.65%2069.3333%20106.65%2072C104.873%2071.9333%20103.095%2071.8667%20101.318%2071.8C69.3228%2070.6%2037.3277%2069.4%205.33253%2068.2C3.55501%2068.1333%201.77751%2068.0667%200%2068C1.77751%2067.9333%203.55501%2067.8667%205.33253%2067.8C37.3277%2066.6%2069.3228%2065.4%20101.318%2064.2C103.095%2064.1333%20104.873%2064.0667%20106.65%2064Z%22%20fill%3D%22black%22%2F%3E%20%3C%2Fg%3E%20%3C%2Fsvg%3E");
+    mask-size: 100% 100%;
+    mask-repeat: no-repeat;
+    -webkit-mask-image: url("data:image/svg+xml,%3Csvg%20preserveAspectRatio%3D%22none%22%20width%3D%22106.654%22%20height%3D%2272%22%20viewBox%3D%220%200%20106.654%2072%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%20%3Cg%3E%20%3Cpath%20d%3D%22M106.654%20-6.99427e-08C106.654%202.66667%20106.654%205.33333%20106.654%208C104.877%207.93333%20103.099%207.86667%20101.322%207.8C69.3267%206.6%2037.3316%205.39999%205.33643%204.19999C3.55891%204.13332%201.78141%204.06666%200.00390625%203.99999C1.78141%203.93332%203.55891%203.86666%205.33643%203.79999C37.3316%202.59999%2069.3267%201.4%20101.322%200.2C103.099%200.133333%20104.877%200.0666664%20106.654%20-6.99427e-08Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.654%208C106.654%2010.6667%20106.654%2013.3333%20106.654%2016C104.877%2015.9333%20103.099%2015.8667%20101.322%2015.8C69.3267%2014.6%2037.3316%2013.4%205.33643%2012.2C3.55891%2012.1333%201.78141%2012.0667%200.00390625%2012C1.78141%2011.9333%203.55891%2011.8667%205.33643%2011.8C37.3316%2010.6%2069.3267%209.4%20101.322%208.2C103.099%208.13333%20104.877%208.06667%20106.654%208Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.65%2016C106.65%2018.6667%20106.65%2021.3333%20106.65%2024C104.873%2023.9333%20103.095%2023.8667%20101.318%2023.8C69.3228%2022.6%2037.3277%2021.4%205.33253%2020.2C3.55501%2020.1333%201.77751%2020.0667%200%2020C1.77751%2019.9333%203.55501%2019.8667%205.33253%2019.8C37.3277%2018.6%2069.3228%2017.4%20101.318%2016.2C103.095%2016.1333%20104.873%2016.0667%20106.65%2016Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.65%2024C106.65%2026.6667%20106.65%2029.3333%20106.65%2032C104.873%2031.9333%20103.095%2031.8667%20101.318%2031.8C69.3228%2030.6%2037.3277%2029.4%205.33253%2028.2C3.55501%2028.1333%201.77751%2028.0667%200%2028C1.77751%2027.9333%203.55501%2027.8667%205.33253%2027.8C37.3277%2026.6%2069.3228%2025.4%20101.318%2024.2C103.095%2024.1333%20104.873%2024.0667%20106.65%2024Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.65%2032C106.65%2034.6667%20106.65%2037.3333%20106.65%2040C104.873%2039.9333%20103.095%2039.8667%20101.318%2039.8C69.3228%2038.6%2037.3277%2037.4%205.33253%2036.2C3.55501%2036.1333%201.77751%2036.0667%200%2036C1.77751%2035.9333%203.55501%2035.8667%205.33253%2035.8C37.3277%2034.6%2069.3228%2033.4%20101.318%2032.2C103.095%2032.1333%20104.873%2032.0667%20106.65%2032Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.65%2040C106.65%2042.6667%20106.65%2045.3333%20106.65%2048C104.873%2047.9333%20103.095%2047.8667%20101.318%2047.8C69.3228%2046.6%2037.3277%2045.4%205.33253%2044.2C3.55501%2044.1333%201.77751%2044.0667%200%2044C1.77751%2043.9333%203.55501%2043.8667%205.33253%2043.8C37.3277%2042.6%2069.3228%2041.4%20101.318%2040.2C103.095%2040.1333%20104.873%2040.0667%20106.65%2040Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.65%2048C106.65%2050.6667%20106.65%2053.3333%20106.65%2056C104.873%2055.9333%20103.095%2055.8667%20101.318%2055.8C69.3228%2054.6%2037.3277%2053.4%205.33253%2052.2C3.55501%2052.1333%201.77751%2052.0667%200%2052C1.77751%2051.9333%203.55501%2051.8667%205.33253%2051.8C37.3277%2050.6%2069.3228%2049.4%20101.318%2048.2C103.095%2048.1333%20104.873%2048.0667%20106.65%2048Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.654%2056C106.654%2058.6667%20106.654%2061.3333%20106.654%2064C104.877%2063.9333%20103.099%2063.8667%20101.322%2063.8C69.3267%2062.6%2037.3316%2061.4%205.33643%2060.2C3.55891%2060.1333%201.78141%2060.0667%200.00390625%2060C1.78141%2059.9333%203.55891%2059.8667%205.33643%2059.8C37.3316%2058.6%2069.3267%2057.4%20101.322%2056.2C103.099%2056.1333%20104.877%2056.0667%20106.654%2056Z%22%20fill%3D%22black%22%2F%3E%20%3Cpath%20d%3D%22M106.65%2064C106.65%2066.6667%20106.65%2069.3333%20106.65%2072C104.873%2071.9333%20103.095%2071.8667%20101.318%2071.8C69.3228%2070.6%2037.3277%2069.4%205.33253%2068.2C3.55501%2068.1333%201.77751%2068.0667%200%2068C1.77751%2067.9333%203.55501%2067.8667%205.33253%2067.8C37.3277%2066.6%2069.3228%2065.4%20101.318%2064.2C103.095%2064.1333%20104.873%2064.0667%20106.65%2064Z%22%20fill%3D%22black%22%2F%3E%20%3C%2Fg%3E%20%3C%2Fsvg%3E");
+    -webkit-mask-size: 100% 100%;
+    -webkit-mask-repeat: no-repeat;
+  }
+
+  & SLabel,
+  & SContent,
+  & SCloseIcon {
+    position: relative;
+    z-index: 1;
   }
 
   & SLabel {
-    color: var(--intergalactic-icon-primary-feature-highlight, oklch(0.58 0.254 297.1));
+    color: var(--intergalactic-feature-highlight-icon-primary, oklch(0.22 0.01 140));
   }
 
   & SCloseIcon {
diff --git a/semcore/feature-highlight/src/components/pills/Pills.tsx b/semcore/feature-highlight/src/components/pills/Pills.tsx
index 343f62ffd6..9ca439de49 100644
--- a/semcore/feature-highlight/src/components/pills/Pills.tsx
+++ b/semcore/feature-highlight/src/components/pills/Pills.tsx
@@ -64,7 +64,7 @@ function HighlightedItemAddon(
         ? (<Children />)
         : (
             <>
-              <SummaryAI color='--intergalactic-icon-primary-feature-highlight' />
+              <SummaryAI color='--intergalactic-feature-highlight-icon-primary' />
               <AnimatedSparkles show={clicked} count={animatedSparkleCount} />
             </>
           )}
diff --git a/semcore/feature-highlight/src/components/pills/pills.shadow.css b/semcore/feature-highlight/src/components/pills/pills.shadow.css
index 271f87ac69..f82ae09775 100644
--- a/semcore/feature-highlight/src/components/pills/pills.shadow.css
+++ b/semcore/feature-highlight/src/components/pills/pills.shadow.css
@@ -1,83 +1,6 @@
-SHighlightedPill {
-  border: 1px solid transparent;
-  background:
-    linear-gradient(white, white) padding-box, var(--intergalactic-border-feature-highlight, linear-gradient(90deg in oklch, oklch(0.82 0.118 303), oklch(0.82 0.088 272.1))) border-box;
-  background-origin: border-box;
-  background-clip: padding-box, border-box;
-  z-index: 1;
-  position: relative;
-
-  &::before {
-    content: "";
-    position: absolute;
-    z-index: -1;
-    inset: 0;
-    margin: -5px;
-    padding: 2px;
-    border-radius: calc(var(--intergalactic-control-rounded, 6px) + 3px);
-
-    background-image: var(--intergalactic-keyboard-focus-feature-highlight-outline, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.58 0.168 278.2)));
-    mask: linear-gradient(0deg, #fff, #fff) content-box, linear-gradient(0deg, #fff, #fff);
-    mask-composite: exclude;
-
-    opacity: 0;
-    transform: scale(0.96);
-
-    will-change: opacity, transform;
-
-    transition:
-      opacity calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out,
-      transform calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out;
-  }
-
-  &[neighborLocation='left']::before {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-
-  &[neighborLocation='right']::before {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-
-  &[neighborLocation='both']::before {
-    border-radius: 0;
-  }
-
-  &:hover {
-    background: var(--intergalactic-bg-primary-feature-highlight-hover-active, linear-gradient(90deg in oklch, oklch(0.97 0.019 303.4), oklch(0.929 0.037 268))) padding-box, var(--intergalactic-border-feature-highlight, linear-gradient(90deg in oklch, oklch(0.82 0.118 303), oklch(0.82 0.088 272.1))) border-box;
-  }
-
-  &[selected] {
-    background:
-      var(--intergalactic-bg-primary-feature-highlight-hover-active, linear-gradient(90deg in oklch, oklch(0.97 0.019 303.4), oklch(0.929 0.037 268))) padding-box, var(--intergalactic-control-primary-feature-highlight-hover, linear-gradient(90deg in oklch, oklch(0.64 0.223 299.3), oklch(0.74 0.117 274.1))) border-box;
-    background-origin: border-box;
-    background-clip: padding-box, border-box;
-    border-color: transparent;
-  }
-}
-
 SPills {
   SHighlightedPill:focus-visible {
-    outline: none;
-
-    &::before {
-      opacity: 1;
-      transform: scale(1);
-    }
-  }
-}
-
-/* Firefox fallback */
-@supports not (-webkit-mask-composite: xor) {
-  SHighlightedPill:focus-visible {
-    outline: none;
-    box-shadow:
-      0 0 0 2px #ffffff,
-      0 0 0 4px #7078FC;
-  }
-
-  SHighlightedPill:focus-visible::before {
-    display: none;
+    outline-color: var(--intergalactic-feature-highlight-keyboard-focus-outline, oklch(0.82 0.15 170));
+    outline-width: 2px;
   }
 }
diff --git a/semcore/feature-highlight/src/components/radio/radio.shadow.css b/semcore/feature-highlight/src/components/radio/radio.shadow.css
index 5386c68d3f..0895ca0302 100644
--- a/semcore/feature-highlight/src/components/radio/radio.shadow.css
+++ b/semcore/feature-highlight/src/components/radio/radio.shadow.css
@@ -1,77 +1,9 @@
-SHighlightedRadio {
-  position: relative;
-}
-
 SHighlightedRadio:not([state="invalid"]) {
-  [data-ui-name="Value.RadioMark"] {
-    border-radius: 50%;
-    background: var(--intergalactic-border-feature-highlight, linear-gradient(90deg in oklch, oklch(0.82 0.118 303), oklch(0.82 0.088 272.1)));
-  }
-
-  [data-ui-name="Value.RadioMark"]::before {
-    content: "";
-    position: absolute;
-    z-index: -1;
-    inset: 0;
-    margin: 0;
-    padding: 2px;
-    border-radius: 50%;
-    border-width: 0;
-    pointer-events: none;
-    background-image: var(--intergalactic-keyboard-focus-feature-highlight-outline, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.58 0.168 278.2)));
-
-    mask: linear-gradient(0deg, #fff, #fff) content-box, linear-gradient(0deg, #fff, #fff);
-    mask-composite: exclude;
-
-    opacity: 0;
-    transform: scale(0.9);
-
-    transition:
-      margin calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out,
-      opacity calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out,
-      transform calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out;
-  }
-
-  [data-ui-name="Value.RadioMark"]::after {
-    content: "";
-    position: absolute;
-    right: 0;
-    bottom: 0;
-    border-radius: 50%;
-    background: var(--intergalactic-bg-primary-neutral, oklch(1 0 0));
-    top: 50%;
-    left: 50%;
-    width: calc(100% - 2px);
-    height: calc(100% - 2px);
-
-    transition:
-      width calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out,
-      height calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out;
-  }
+  position: relative;
 
   input[data-ui-name="RadioFH.Value"]:focus-visible + [data-ui-name="Value.RadioMark"]::before {
-    margin: -4px;
-    opacity: 1;
-    transform: scale(1);
-    transition: inherit;
-  }
-}
-
-
-
-/* Firefox fallback */
-@supports not (-webkit-mask-composite: xor) {
-  SHighlightedRadio:not([state="invalid"]) input[data-ui-name="RadioFH.Value"]:focus-visible + [data-ui-name="Value.RadioMark"] {
-    outline: none;
-    box-shadow: 0 0 0 2px #ffffff,
-      0 0 0 4px #7078FC;
-  }
-
-  SHighlightedRadio:not([state="invalid"]) input[data-ui-name="RadioFH.Value"]:focus-visible + [data-ui-name="Value.RadioMark"]::before {
-    display: none;
-  }
+    @mixin focus-outline-mixin;
 
-  SHighlightedRadio:not([state="invalid"]) input[data-ui-name="RadioFH.Value"]:checked:focus-visible + [data-ui-name="Value.RadioMark"]::before {
-    display: none;
+    outline-color: var(--intergalactic-feature-highlight-keyboard-focus-outline, oklch(0.82 0.15 170));
   }
 }
diff --git a/semcore/feature-highlight/src/components/switch/switch.shadow.css b/semcore/feature-highlight/src/components/switch/switch.shadow.css
index 4db8d1c773..33edba6a0a 100644
--- a/semcore/feature-highlight/src/components/switch/switch.shadow.css
+++ b/semcore/feature-highlight/src/components/switch/switch.shadow.css
@@ -1,56 +1,3 @@
-SToggle {
-  position: relative;
-  transform: translate(0);
-
-  &::before {
-    content: "";
-    position: absolute;
-    z-index: -1;
-    inset: 0;
-    margin: 0;
-    padding: 2px;
-    border-radius: inherit;
-
-    background-image: var(--intergalactic-keyboard-focus-feature-highlight-outline, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.58 0.168 278.2)));
-    mask: linear-gradient(0deg, #fff, #fff) content-box, linear-gradient(0deg, #fff, #fff);
-    mask-composite: exclude;
-
-    opacity: 0;
-    transform: scale(0.96);
-    pointer-events: none;
-
-    transition:
-      opacity calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out,
-      transform calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out;
-  }
-}
-
-SToggle[checked] {
-  color: var(--intergalactic-control-primary-info, oklch(0.23 0.01 140));
-  background-image: var(--intergalactic-control-primary-feature-highlight, linear-gradient(90deg in oklch, oklch(0.64 0.223 299.3), oklch(0.74 0.117 274.1)));
-}
-
 SToggle:has(SInput:focus-visible) {
-  box-shadow: none;
-  outline: none;
-
-  &::before {
-    margin: -4px;
-    opacity: 1;
-    transform: scale(1);
-  }
-}
-
-/* Firefox fallback */
-@supports not (-webkit-mask-composite: xor) {
-  SToggle:has(SInput:focus-visible) {
-    outline: none;
-    box-shadow:
-      0 0 0 2px #ffffff,
-      0 0 0 4px #7078FC;
-  }
-
-  SToggle:has(SInput:focus-visible)::before {
-    display: none;
-  }
+  outline-color: var(--intergalactic-feature-highlight-keyboard-focus-outline, oklch(0.82 0.15 170));
 }
diff --git a/semcore/feature-highlight/src/components/tab-line/TabLine.tsx b/semcore/feature-highlight/src/components/tab-line/TabLine.tsx
index 61e7e6b145..9176025e8b 100644
--- a/semcore/feature-highlight/src/components/tab-line/TabLine.tsx
+++ b/semcore/feature-highlight/src/components/tab-line/TabLine.tsx
@@ -15,7 +15,10 @@ class TabLineFHRoot extends Component<
   static style = style;
 
   render() {
-    return (<Root render={TabLine} />);
+    const { styles } = this.asProps;
+    const STabLineFH = Root;
+
+    return sstyled(styles)(<STabLineFH render={TabLine} />);
   }
 }
 
@@ -67,7 +70,7 @@ function HighlightedAddon(
         ? (<Children />)
         : (
             <>
-              <SummaryAI color='--intergalactic-icon-primary-feature-highlight' />
+              <SummaryAI color='--intergalactic-feature-highlight-icon-primary' />
               <AnimatedSparkles show={clicked} count={animatedSparkleCount} />
             </>
           )}
diff --git a/semcore/feature-highlight/src/components/tab-line/tabLine.shadow.css b/semcore/feature-highlight/src/components/tab-line/tabLine.shadow.css
index f54465b645..d159c3ef24 100644
--- a/semcore/feature-highlight/src/components/tab-line/tabLine.shadow.css
+++ b/semcore/feature-highlight/src/components/tab-line/tabLine.shadow.css
@@ -1,46 +1,11 @@
-SHighlightedItem {
-  &:focus-visible {
-    outline: none;
-
-    &::before {
-      opacity: 1;
-      transform: scale(1);
+STabLineFH {
+  SHighlightedItem {
+    &:focus-visible {
+      outline-color: var(--intergalactic-feature-highlight-keyboard-focus-outline, oklch(0.82 0.15 170));
     }
   }
-
-  &::after {
-    opacity: 0;
-    transition: opacity calc(var(--intergalactic-duration-control, 200) * 1ms) ease-in-out;
-  }
-  &[selected]::after, &:hover:not(:focus-visible)::after {
-    opacity: 1;
-    background: var(--intergalactic-border-feature-highlight-active, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.74 0.117 274.1)));
-  }
-
-  &::before {
-    content: "";
-    position: absolute;
-    z-index: 0;
-    inset: 0;
-    height: auto;
-    width: calc(100% + 4px);
-    margin: -4px;
-    padding: 2px;
-    box-sizing: content-box;
-    background-image: var(--intergalactic-keyboard-focus-feature-highlight-outline, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.58 0.168 278.2)));
-
-    mask: linear-gradient(0deg, #fff, #fff) content-box, linear-gradient(0deg, #fff, #fff);
-    mask-composite: exclude;
-
-    opacity: 0;
-    transform: scale(0.96);
-
-    transition:
-      opacity calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out,
-      transform calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out;
-  }
 }
 
-SHighlightedCaret {
-  background: var(--intergalactic-border-feature-highlight-active, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.74 0.117 274.1)));
+SCaret {
+  background: var(--intergalactic-feature-highlight-border-primary-active, oklch(0.22 0.01 140));
 }
diff --git a/semcore/feature-highlight/src/inner-components/button-trigger/ButtonTrigger.tsx b/semcore/feature-highlight/src/inner-components/button-trigger/ButtonTrigger.tsx
index 51042dd6f6..9c1ea78913 100644
--- a/semcore/feature-highlight/src/inner-components/button-trigger/ButtonTrigger.tsx
+++ b/semcore/feature-highlight/src/inner-components/button-trigger/ButtonTrigger.tsx
@@ -32,7 +32,7 @@ function Addon(
       {hasChildren
         ? (<Children />)
         : (
-            <SummaryAI color='--intergalactic-icon-primary-feature-highlight' />
+            <SummaryAI color='--intergalactic-feature-highlight-icon-primary' />
           )}
     </SAddon>,
   );
diff --git a/semcore/feature-highlight/src/inner-components/button-trigger/buttonTrigger.shadow.css b/semcore/feature-highlight/src/inner-components/button-trigger/buttonTrigger.shadow.css
index 5db4558991..301608cc83 100644
--- a/semcore/feature-highlight/src/inner-components/button-trigger/buttonTrigger.shadow.css
+++ b/semcore/feature-highlight/src/inner-components/button-trigger/buttonTrigger.shadow.css
@@ -1,86 +1,12 @@
 SHighlightedButtonTrigger:not([state="invalid"]):not([state="valid"]) {
-  border: 1px solid transparent;
-  background:
-    linear-gradient(white, white) padding-box,
-    var(--intergalactic-border-feature-highlight, linear-gradient(90deg in oklch, oklch(0.82 0.118 303), oklch(0.82 0.088 272.1))) border-box;
-  background-origin: border-box;
-  background-clip: padding-box, border-box;
-  position: relative;
-  z-index: 1;
-
-  &::before {
-    content: "";
-    position: absolute;
-    z-index: -1;
-    inset: 0;
-    margin: -5px;
-    padding: 2px;
-    border-radius: calc(var(--intergalactic-control-rounded, 6px) + 3px);
-    background-image: var(--intergalactic-keyboard-focus-feature-highlight-outline, linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.58 0.168 278.2)));
-
-    mask: linear-gradient(0deg, #fff, #fff) content-box, linear-gradient(0deg, #fff, #fff);
-    mask-composite: exclude;
-
-    opacity: 0;
-    transform: scale(0.96);
-    pointer-events: none;
-
-    transition:
-      opacity calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out,
-      transform calc(var(--intergalactic-duration-extra-fast, 100) * 1ms) ease-in-out;
-  }
-
-  &:hover {
-    background: var(--intergalactic-bg-primary-feature-highlight-hover-active, linear-gradient(90deg in oklch, oklch(0.97 0.019 303.4), oklch(0.929 0.037 268))) padding-box,
-      var(--intergalactic-border-feature-highlight, linear-gradient(90deg in oklch, oklch(0.82 0.118 303), oklch(0.82 0.088 272.1))) border-box;
+  &:focus-visible {
+    border-color: var(--intergalactic-feature-highlight-border-primary-active, oklch(0.22 0.01 140));
+    outline-color: var(--intergalactic-feature-highlight-keyboard-focus-outline, oklch(0.82 0.15 170));
+    outline-width: 2px;
   }
 
   &:active,
   &[active] {
-    background:
-      linear-gradient(white, white) padding-box,
-      var(--intergalactic-control-primary-feature-highlight-hover, linear-gradient(90deg in oklch, oklch(0.64 0.223 299.3), oklch(0.74 0.117 274.1))) border-box;
-    background-origin: border-box;
-    background-clip: padding-box, border-box;
-    border-color: transparent;
-  }
-
-  &:focus-visible {
-    outline: none;
-    border-color: transparent;
-
-    &::before {
-      opacity: 1;
-      transform: scale(1);
-    }
-  }
-
-  &[neighborLocation='left']::before {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-
-  &[neighborLocation='right']::before {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-
-  &[neighborLocation='both']::before {
-    border-radius: 0;
-  }
-}
-
-/* Firefox fallback */
-@supports not (-webkit-mask-composite: xor) {
-
-  SHighlightedButtonTrigger:not([state="invalid"]):not([state="valid"]):focus-visible {
-    outline: none;
-    box-shadow:
-      0 0 0 2px #ffffff,
-      0 0 0 4px #7078FC;
-  }
-
-  SHighlightedButtonTrigger:not([state="invalid"]):not([state="valid"]):focus-visible::before {
-    display: none;
+    border-color: var(--intergalactic-feature-highlight-border-primary-active, oklch(0.22 0.01 140));
   }
 }
diff --git a/semcore/feature-highlight/src/inner-components/sparkle/style/sparkle.shadow.css b/semcore/feature-highlight/src/inner-components/sparkle/style/sparkle.shadow.css
index 2a2858b015..8b4d6749c3 100644
--- a/semcore/feature-highlight/src/inner-components/sparkle/style/sparkle.shadow.css
+++ b/semcore/feature-highlight/src/inner-components/sparkle/style/sparkle.shadow.css
@@ -2,7 +2,7 @@ SSparkle {
   position: absolute;
 
   & path {
-    fill: var(--intergalactic-icon-primary-feature-highlight, oklch(0.58 0.254 297.1));
+    fill: var(--intergalactic-feature-highlight-icon-primary, oklch(0.22 0.01 140));
   }
 }
 
diff --git a/semcore/feedback-form/__tests__/five-star-form.browser-test.tsx-snapshots/-visual-Verify-feedback-rating-notice-with-illustration-and-feature-highlight-notice-1-chromium-linux.png b/semcore/feedback-form/__tests__/five-star-form.browser-test.tsx-snapshots/-visual-Verify-feedback-rating-notice-with-illustration-and-feature-highlight-notice-1-chromium-linux.png
index cc37277ec3..6f6c43c69b 100644
Binary files a/semcore/feedback-form/__tests__/five-star-form.browser-test.tsx-snapshots/-visual-Verify-feedback-rating-notice-with-illustration-and-feature-highlight-notice-1-chromium-linux.png and b/semcore/feedback-form/__tests__/five-star-form.browser-test.tsx-snapshots/-visual-Verify-feedback-rating-notice-with-illustration-and-feature-highlight-notice-1-chromium-linux.png differ
diff --git a/semcore/feedback-form/__tests__/five-star-form.browser-test.tsx-snapshots/-visual-Verify-feedback-rating-notice-with-illustration-and-feature-highlight-notice-1-firefox-linux.png b/semcore/feedback-form/__tests__/five-star-form.browser-test.tsx-snapshots/-visual-Verify-feedback-rating-notice-with-illustration-and-feature-highlight-notice-1-firefox-linux.png
index eca861f073..e36b0268bd 100644
Binary files a/semcore/feedback-form/__tests__/five-star-form.browser-test.tsx-snapshots/-visual-Verify-feedback-rating-notice-with-illustration-and-feature-highlight-notice-1-firefox-linux.png and b/semcore/feedback-form/__tests__/five-star-form.browser-test.tsx-snapshots/-visual-Verify-feedback-rating-notice-with-illustration-and-feature-highlight-notice-1-firefox-linux.png differ
diff --git a/semcore/feedback-form/__tests__/five-star-form.browser-test.tsx-snapshots/-visual-Verify-feedback-rating-notice-with-illustration-and-feature-highlight-notice-1-webkit-linux.png b/semcore/feedback-form/__tests__/five-star-form.browser-test.tsx-snapshots/-visual-Verify-feedback-rating-notice-with-illustration-and-feature-highlight-notice-1-webkit-linux.png
index c312f6f308..2101543528 100644
Binary files a/semcore/feedback-form/__tests__/five-star-form.browser-test.tsx-snapshots/-visual-Verify-feedback-rating-notice-with-illustration-and-feature-highlight-notice-1-webkit-linux.png and b/semcore/feedback-form/__tests__/five-star-form.browser-test.tsx-snapshots/-visual-Verify-feedback-rating-notice-with-illustration-and-feature-highlight-notice-1-webkit-linux.png differ
diff --git a/stories/components/feature-highlight/advanced/examples/all-controls.tsx b/stories/components/feature-highlight/advanced/examples/all-controls.tsx
index 9dc5f1ca72..0618461907 100644
--- a/stories/components/feature-highlight/advanced/examples/all-controls.tsx
+++ b/stories/components/feature-highlight/advanced/examples/all-controls.tsx
@@ -87,7 +87,7 @@ const Demo = (props: ExampleButtonHihlightProps) => {
               <RadioFH.Value />
               <RadioFH.Text>
                 First option
-                <Box tag={SummaryAI} color='--intergalactic-icon-primary-feature-highlight' ml={2} style={{ verticalAlign: -3 }} />
+                <Box tag={SummaryAI} color='--intergalactic-feature-highlight-icon-primary' ml={2} style={{ verticalAlign: -3 }} />
               </RadioFH.Text>
               <RadioFH.AnimatedSparkles count={props.animatedSparkleCount} />
             </RadioFH>
@@ -99,7 +99,7 @@ const Demo = (props: ExampleButtonHihlightProps) => {
           <RadioFH.Value />
           <RadioFH.Text>
             First option
-            <Box tag={SummaryAI} color='--intergalactic-icon-primary-feature-highlight' ml={2} style={{ verticalAlign: -3 }} />
+            <Box tag={SummaryAI} color='--intergalactic-feature-highlight-icon-primary' ml={2} style={{ verticalAlign: -3 }} />
           </RadioFH.Text>
           <RadioFH.AnimatedSparkles count={props.animatedSparkleCount} />
         </RadioFH>
@@ -116,7 +116,7 @@ const Demo = (props: ExampleButtonHihlightProps) => {
                   First option
                   <Box
                     tag={SummaryAI}
-                    color='--intergalactic-icon-primary-feature-highlight'
+                    color='--intergalactic-feature-highlight-icon-primary'
                     ml={2}
                     style={{ verticalAlign: -3 }}
                   />
@@ -186,7 +186,7 @@ const columnsPrimary = [
     name: 'kd',
     children: (
       <>
-        <SummaryAI color='--intergalactic-icon-primary-feature-highlight' />
+        <SummaryAI color='--intergalactic-feature-highlight-icon-primary' />
         KD %
       </>
     ),
@@ -211,7 +211,7 @@ const columnsSecondary = [
     name: 'kd',
     children: (
       <>
-        <SummaryAI color='--intergalactic-icon-primary-feature-highlight' />
+        <SummaryAI color='--intergalactic-feature-highlight-icon-primary' />
         KD %
       </>
     ),
diff --git a/stories/components/feature-highlight/docs/examples/checkbox.tsx b/stories/components/feature-highlight/docs/examples/checkbox.tsx
index 52bfa57b46..dda86539af 100644
--- a/stories/components/feature-highlight/docs/examples/checkbox.tsx
+++ b/stories/components/feature-highlight/docs/examples/checkbox.tsx
@@ -21,7 +21,7 @@ const Demo = () => (
               First option
               <Box
                 tag={SummaryAI}
-                color='--intergalactic-icon-primary-feature-highlight'
+                color='--intergalactic-feature-highlight-icon-primary'
                 ml={2}
                 style={{ verticalAlign: -3 }}
               />
diff --git a/stories/components/feature-highlight/docs/examples/data-table.tsx b/stories/components/feature-highlight/docs/examples/data-table.tsx
index 7294504c76..04a4a383d7 100644
--- a/stories/components/feature-highlight/docs/examples/data-table.tsx
+++ b/stories/components/feature-highlight/docs/examples/data-table.tsx
@@ -29,7 +29,7 @@ const Demo = () => {
             name: 'kd',
             children: (
               <>
-                <SummaryAI color='--intergalactic-icon-primary-feature-highlight' />
+                <SummaryAI color='--intergalactic-feature-highlight-icon-primary' />
                 KD %
                 <ScreenReaderOnly>Powered by AI</ScreenReaderOnly>
               </>
@@ -61,7 +61,7 @@ const Demo = () => {
             name: 'kd',
             children: (
               <>
-                <SummaryAI color='--intergalactic-icon-primary-feature-highlight' />
+                <SummaryAI color='--intergalactic-feature-highlight-icon-primary' />
                 KD %
                 <ScreenReaderOnly>Powered by AI</ScreenReaderOnly>
               </>
diff --git a/stories/components/feature-highlight/docs/examples/radio.tsx b/stories/components/feature-highlight/docs/examples/radio.tsx
index 8e25d49036..e803e7ae0c 100644
--- a/stories/components/feature-highlight/docs/examples/radio.tsx
+++ b/stories/components/feature-highlight/docs/examples/radio.tsx
@@ -27,7 +27,7 @@ const Demo = () => (
             First option
             <Box
               tag={SummaryAI}
-              color='--intergalactic-icon-primary-feature-highlight'
+              color='--intergalactic-feature-highlight-icon-primary'
               ml={2}
               style={{ verticalAlign: -3 }}
             />
diff --git a/stories/components/feature-highlight/docs/examples/switch.tsx b/stories/components/feature-highlight/docs/examples/switch.tsx
index 3edd5b1f5a..d27758c389 100644
--- a/stories/components/feature-highlight/docs/examples/switch.tsx
+++ b/stories/components/feature-highlight/docs/examples/switch.tsx
@@ -13,7 +13,7 @@ const Demo = () => (
         Medium switch
         <Box
           tag={SummaryAI}
-          color='--intergalactic-icon-primary-feature-highlight'
+          color='--intergalactic-feature-highlight-icon-primary'
           ml={2}
           style={{ verticalAlign: 'middle' }}
         />
@@ -34,7 +34,7 @@ const Demo = () => (
         Large switch
         <Box
           tag={SummaryAI}
-          color='--intergalactic-icon-primary-feature-highlight'
+          color='--intergalactic-feature-highlight-icon-primary'
           ml={2}
           style={{ verticalAlign: -3 }}
         />
diff --git a/stories/components/feature-highlight/tests/examples/checkbox.tsx b/stories/components/feature-highlight/tests/examples/checkbox.tsx
index 718f749263..61feec133a 100644
--- a/stories/components/feature-highlight/tests/examples/checkbox.tsx
+++ b/stories/components/feature-highlight/tests/examples/checkbox.tsx
@@ -59,7 +59,7 @@ const Demo = (props: CheckboxFHAdvancedProps) => {
                 {showIcon && (
                   <Box
                     tag={SummaryAI}
-                    color='--intergalactic-icon-primary-feature-highlight'
+                    color='--intergalactic-feature-highlight-icon-primary'
                     ml={2}
                     style={{ verticalAlign: -3 }}
                   />
diff --git a/stories/components/feature-highlight/tests/examples/radio.tsx b/stories/components/feature-highlight/tests/examples/radio.tsx
index 8c54239e6f..6b2f26b41b 100644
--- a/stories/components/feature-highlight/tests/examples/radio.tsx
+++ b/stories/components/feature-highlight/tests/examples/radio.tsx
@@ -61,7 +61,7 @@ const Demo = (props: RadioFHAdvancedProps) => {
               {showIcon && (
                 <Box
                   tag={SummaryAI}
-                  color='--intergalactic-icon-primary-feature-highlight'
+                  color='--intergalactic-feature-highlight-icon-primary'
                   ml={2}
                   style={{ verticalAlign: -3 }}
                 />
diff --git a/stories/components/feature-highlight/tests/examples/switch-fh.tsx b/stories/components/feature-highlight/tests/examples/switch-fh.tsx
index 419ffd7e01..5ef6d26cb8 100644
--- a/stories/components/feature-highlight/tests/examples/switch-fh.tsx
+++ b/stories/components/feature-highlight/tests/examples/switch-fh.tsx
@@ -41,7 +41,7 @@ const Demo = (props: SwitchFHAdvancedProps) => {
           {showIcon && (
             <Box
               tag={SummaryAI}
-              color='--intergalactic-icon-primary-feature-highlight'
+              color='--intergalactic-feature-highlight-icon-primary'
               ml={2}
               style={{ verticalAlign: -3 }}
             />
diff --git a/tools/theme/src/theme.ts b/tools/theme/src/theme.ts
index 8e1d07ee1f..5977136482 100644
--- a/tools/theme/src/theme.ts
+++ b/tools/theme/src/theme.ts
@@ -644,6 +644,10 @@ export const theme: Theme = {
         value: gray.at(0.22),
         description: 'Secondary brand accent for paired brand treatments (secondary marks, duo-tone lockups).',
       },
+      brand_tertiary: {
+        value: green.at(0.82),
+        description: 'Tertiary brand accent for logos and branded surfaces.',
+      },
       brand_twitter: {
         value: '#1d9bf0',
         description: 'Official Twitter brand fill for logos and icons in approved placements; follow the platform brand rules for size and clear space.',
@@ -2337,77 +2341,81 @@ export const theme: Theme = {
     },
   },
   featureHighlight: {
-    'bg_primary_feature-highlight_DEFAULT': {
-      value: '{baseTokens.colors.gray.white}',
-      description: 'Primary background for highlighted controls.',
-    },
-    'bg_primary_feature-highlight_hover_active': {
-      value: 'linear-gradient(90deg in oklch, {baseTokens.colors.violet.50}, {baseTokens.colors.blue.75})',
-      description: 'Primary background for hover and active (selected) state of highlighted controls.',
-    },
-    'bg_secondary_feature-highlight': {
-      value: 'linear-gradient(90deg in oklch, {baseTokens.colors.violet.50}, {baseTokens.colors.blue.75})',
-      description: 'Secondary background for the highlighted message.',
-    },
-    'border_feature-highlight_DEFAULT': {
-      value: 'linear-gradient(90deg in oklch, {baseTokens.colors.violet.200}, {baseTokens.colors.blue.200})',
-      description: 'Primary border for highlighted controls.',
-    },
-    'border_feature-highlight_active': {
-      value: 'linear-gradient(90deg in oklch, {baseTokens.colors.violet.300}, {baseTokens.colors.blue.300})',
-      description: 'Primary border for the active state of highlighted controls.',
-    },
-    'border_feature-highlight_secondary': {
-      value: 'linear-gradient(90deg in oklch, {baseTokens.colors.violet.300}, {baseTokens.colors.blue.300})',
-      description: 'Secondary border for highlighted controls.',
-    },
-    'control_primary_feature-highlight_DEFAULT': {
-      value: 'linear-gradient(90deg in oklch, {baseTokens.colors.violet.400}, {baseTokens.colors.blue.300})',
-      description: 'Background of the highlighted primary control.',
-    },
-    'control_primary_feature-highlight_hover': {
-      value: 'linear-gradient(90deg in oklch, {baseTokens.colors.violet.400}, {baseTokens.colors.blue.300})',
-      description: 'Hover state of the highlighted primary control.',
-    },
-    'control_primary_feature-highlight_active': {
-      value: 'linear-gradient(90deg in oklch, {baseTokens.colors.violet.400}, {baseTokens.colors.blue.400})',
-      description: 'Active (selected) state of the highlighted primary control.',
-    },
-    'control_secondary_feature-highlight_DEFAULT': {
-      value: 'linear-gradient(90deg in oklch, {baseTokens.colors.violet.50}, {baseTokens.colors.blue.50})',
-      description: 'Background of the highlighted secondary control.',
-    },
-    'control_secondary_feature-highlight_hover': {
-      value: 'linear-gradient(90deg in oklch, {baseTokens.colors.violet.100}, {baseTokens.colors.blue.100})',
-      description: 'Hover state of the highlighted secondary control.',
-    },
-    'control_secondary_feature-highlight_active': {
-      value: 'linear-gradient(90deg in oklch, {baseTokens.colors.violet.100}, {baseTokens.colors.blue.100})',
-      description: 'Active (selected) state of the highlighted secondary control.',
-    },
-    'text_feature-highlight_DEFAULT': {
-      value: 'linear-gradient(90deg in oklch, {baseTokens.colors.violet.500}, {baseTokens.colors.blue.500})',
-      description: 'Text for highlighted features.',
-    },
-    'text_feature-highlight_hover_active': {
-      value: 'linear-gradient(90deg in oklch, {baseTokens.colors.violet.500}, {baseTokens.colors.blue.500})',
-      description: 'Text for hover and active states of highlighted features.',
-    },
-    'icon_primary_feature-highlight_DEFAULT': {
-      value: highlight.at(L_ICON_PRIMARY),
-      description: 'Primary highlighted icon.',
-    },
-    'icon_primary_feature-highlight_hover_active': {
-      value: highlight.at(L_ICON_PRIMARY_HOVER),
-      description: 'Violet background color for the hover and active states of the primary highlighted icon. It’s created using a CSS filter with a brightness(0.8), applied to the violet-500 color.',
-    },
-    'keyboard_focus_feature-highlight_DEFAULT': {
-      value: '3px solid {featureHighlight.keyboard.focus.feature-highlight.outline}',
-      description: 'Keyboard focus styles for highlighted controls.',
-    },
-    'keyboard_focus_feature-highlight_outline': {
-      value: 'linear-gradient(90deg in oklch, {baseTokens.colors.violet.300}, {baseTokens.colors.blue.400})',
-      description: 'Color for keyboard focus outline styles for highlighted controls.',
+    'feature-highlight': {
+      badge_accent: {
+        value: '{semanticTokens.colors.brand_secondary}',
+        description: 'Accent background for Badge.',
+      },
+      bg_primary_DEFAULT: {
+        value: '{semanticTokens.colors.bg_primary_neutral_DEFAULT}',
+        description: 'Primary background for highlighted controls.',
+      },
+      bg_primary_hover_active: {
+        value: '{semanticTokens.colors.bg_primary_neutral_hover}',
+        description: 'Primary background for hover and active (selected) state of highlighted controls.',
+      },
+      bg_secondary: {
+        value: '{baseTokens.colors.violet.100}',
+        description: 'Secondary background for the highlighted message.',
+      },
+      border_primary_DEFAULT: {
+        value: '{semanticTokens.colors.border_primary}',
+        description: 'Primary border for highlighted controls.',
+      },
+      border_primary_active: {
+        value: '{semanticTokens.colors.brand_secondary}',
+        description: 'Primary border for the active state of highlighted controls.',
+      },
+      border_secondary: {
+        value: '{semanticTokens.colors.border_secondary}',
+        description: 'Secondary border for highlighted controls.',
+      },
+      control_primary_DEFAULT: {
+        value: '{semanticTokens.colors.control_primary_info_DEFAULT}',
+        description: 'Background of the highlighted primary control.',
+      },
+      control_primary_hover: {
+        value: '{semanticTokens.colors.control_primary_info_hover}',
+        description: 'Hover state of the highlighted primary control.',
+      },
+      control_primary_active: {
+        value: '{semanticTokens.colors.control_primary_info_active}',
+        description: 'Active (selected) state of the highlighted primary control.',
+      },
+      control_secondary_DEFAULT: {
+        value: '{semanticTokens.colors.control_secondary_neutral_DEFAULT}',
+        description: 'Background of the highlighted secondary control.',
+      },
+      control_secondary_hover: {
+        value: '{semanticTokens.colors.control_secondary_neutral_hover}',
+        description: 'Hover state of the highlighted secondary control.',
+      },
+      control_secondary_active: {
+        value: '{semanticTokens.colors.control_secondary_neutral_active}',
+        description: 'Active (selected) state of the highlighted secondary control.',
+      },
+      text_DEFAULT: {
+        value: '{semanticTokens.colors.text_primary_DEFAULT}',
+        description: 'Text for highlighted features.',
+      },
+      text_hover_active: {
+        value: '{semanticTokens.colors.text_primary_DEFAULT}',
+        description: 'Text for hover and active states of highlighted features.',
+      },
+      icon_primary_DEFAULT: {
+        value: '{semanticTokens.colors.brand_secondary}',
+      },
+      icon_primary_hover_active: {
+        value: '{semanticTokens.colors.brand_secondary}',
+      },
+      keyboard_focus_DEFAULT: {
+        value: `3px solid ${colors.green['200'].value}`,
+        description: 'Keyboard focus styles for highlighted controls.',
+      },
+      keyboard_focus_outline: {
+        value: `${colors.green['200'].value}`,
+        description: 'Color for keyboard focus outline styles for highlighted controls.',
+      },
     },
   },
   deprecates: {
@@ -2426,11 +2434,64 @@ export const theme: Theme = {
       500: colors.blue['500'],
     },
     table: { td: { cell: { actions: { accordion: { value: '{semanticTokens.colors.table_td_cell_accordion}' } } } } },
-    keyboard: { focus: { outline: { invert: { value: '{semanticTokens.colors.keyboard_focus_invert_outline}' } } } },
+    keyboard: {
+      focus: {
+        'outline': { invert: { value: '{semanticTokens.colors.keyboard_focus_invert_outline}' } },
+        'feature-highlight': {
+          DEFAULT: { value: '{featureHighlight.feature-highlight.keyboard.focus.DEFAULT}' },
+          outline: { value: '{featureHighlight.feature-highlight.keyboard.focus.outline}' },
+        },
+      },
+    },
+    badge: {
+      'feature-highlight': {
+        accent: { value: '{featureHighlight.feature-highlight.badge.accent}' },
+      },
+    },
+    bg: {
+      primary: {
+        'feature-highlight': {
+          DEFAULT: { value: '{featureHighlight.feature-highlight.bg.primary.DEFAULT}' },
+          hover: { active: { value: '{featureHighlight.feature-highlight.bg.primary.hover.active}' } },
+        },
+      },
+      secondary: {
+        'feature-highlight': { value: '{featureHighlight.feature-highlight.bg.secondary}' },
+      },
+    },
     border: {
-      tooltip: { invert: { value: '{semanticTokens.colors.tooltip_border_invert}' } },
-      table: { accent: { value: '{semanticTokens.colors.table_border_accent}' } },
-      date: { picker: { range: { comparison: { value: '{semanticTokens.colors.date_picker_border_range_comparison}' } } } },
+      'tooltip': { invert: { value: '{semanticTokens.colors.tooltip_border_invert}' } },
+      'table': { accent: { value: '{semanticTokens.colors.table_border_accent}' } },
+      'date': { picker: { range: { comparison: { value: '{semanticTokens.colors.date_picker_border_range_comparison}' } } } },
+      'feature-highlight': {
+        DEFAULT: { value: '{featureHighlight.feature-highlight.border.primary.DEFAULT}' },
+        active: { value: '{featureHighlight.feature-highlight.border.primary.active}' },
+        secondary: { value: '{featureHighlight.feature-highlight.border.secondary}' },
+      },
+    },
+    control: {
+      primary: {
+        'feature-highlight': {
+          DEFAULT: { value: '{featureHighlight.feature-highlight.control.primary.DEFAULT}' },
+          hover: { value: '{featureHighlight.feature-highlight.control.primary.hover}' },
+          active: { value: '{featureHighlight.feature-highlight.control.primary.active}' },
+        },
+      },
+      secondary: {
+        'feature-highlight': {
+          DEFAULT: { value: '{featureHighlight.feature-highlight.control.secondary.DEFAULT}' },
+          hover: { value: '{featureHighlight.feature-highlight.control.secondary.hover}' },
+          active: { value: '{featureHighlight.feature-highlight.control.secondary.active}' },
+        },
+      },
+    },
+    icon: {
+      primary: {
+        'feature-highlight': {
+          DEFAULT: { value: '{featureHighlight.feature-highlight.icon.primary.DEFAULT}' },
+          hover: { active: { value: '{featureHighlight.feature-highlight.icon.primary.hover.active}' } },
+        },
+      },
     },
     tooltip: {
       default: { value: '{semanticTokens.colors.tooltip_bg_default}' },
@@ -2438,6 +2499,12 @@ export const theme: Theme = {
       warning: { value: '{semanticTokens.colors.tooltip_bg_warning}' },
     },
     feature: {
+      highlight: {
+        border: {
+          DEFAULT: { value: '{featureHighlight.feature-highlight.border.primary.DEFAULT}' },
+          active: { value: '{featureHighlight.feature-highlight.border.primary.active}' },
+        },
+      },
       popover: {
         bg: {
           DEFAULT: { value: '{semanticTokens.colors.feature_popover_bg_accent}' },
@@ -2473,7 +2540,7 @@ export const theme: Theme = {
       },
     },
     text: {
-      link: {
+      'link': {
         DEFAULT: { value: '{semanticTokens.colors.text_link_primary_DEFAULT}' },
         hover: { active: { value: '{semanticTokens.colors.text_link_primary_hover_active}' } },
         invert: {
@@ -2481,6 +2548,10 @@ export const theme: Theme = {
           hover: { value: '{semanticTokens.colors.text_link_primary_invert_hover_active}' },
         },
       },
+      'feature-highlight': {
+        DEFAULT: { value: '{featureHighlight.feature-highlight.text.DEFAULT}' },
+        hover: { active: { value: '{featureHighlight.feature-highlight.text.hover.active}' } },
+      },
     },
   },
 };
@@ -2595,7 +2666,9 @@ export type SemanticTokens = {
 export type Theme = {
   baseTokens: BaseTokens;
   semanticTokens: SemanticTokens;
-  featureHighlight: Record<FlattenPaths<FeatureHighlight>, Value>;
+  featureHighlight: {
+    'feature-highlight': Record<FlattenPaths<FeatureHighlight>, Value>;
+  };
   deprecates: Deprecates;
 };
 
@@ -3203,6 +3276,7 @@ type SemanticColors = {
   brand: {
     primary: Value;
     secondary: Value;
+    tertiary: Value;
     gradient: Value;
     pinterest: Value;
     instagram: Value;
@@ -3624,6 +3698,45 @@ type SemanticShadows = {
 };
 
 export type FeatureHighlight = {
+  badge: { accent: Value };
+  bg: {
+    primary: { DEFAULT: Value; hover: { active: Value } };
+    secondary: Value;
+  };
+  border: {
+    primary: { DEFAULT: Value; active: Value };
+    secondary: Value;
+  };
+  control: {
+    primary: { DEFAULT: Value; active: Value; hover: Value };
+    secondary: { DEFAULT: Value; active: Value; hover: Value };
+  };
+  text: { DEFAULT: Value; hover: { active: Value } };
+  icon: {
+    primary: { DEFAULT: Value; hover: { active: Value } };
+  };
+  keyboard: {
+    focus: {
+      DEFAULT: Value;
+      outline: Value;
+    };
+  };
+};
+
+type Deprecates = {
+  fs: { 50: Value };
+  violet: { 400: Value; 500: Value };
+  blue: { 400: Value; 500: Value };
+  table: { td: { cell: { actions: { accordion: Value } } } };
+  keyboard: {
+    focus: {
+      'outline': { invert: Value };
+      'feature-highlight': { DEFAULT: Value; outline: Value };
+    };
+  };
+  badge: {
+    'feature-highlight': { accent: Value };
+  };
   bg: {
     primary: {
       'feature-highlight': { DEFAULT: Value; hover: { active: Value } };
@@ -3633,6 +3746,9 @@ export type FeatureHighlight = {
     };
   };
   border: {
+    'tooltip': { invert: Value };
+    'table': { accent: Value };
+    'date': { picker: { range: { comparison: Value } } };
     'feature-highlight': { DEFAULT: Value; active: Value; secondary: Value };
   };
   control: {
@@ -3643,41 +3759,20 @@ export type FeatureHighlight = {
       'feature-highlight': { DEFAULT: Value; active: Value; hover: Value };
     };
   };
-  text: {
-    'feature-highlight': { DEFAULT: Value; hover: { active: Value } };
-  };
   icon: {
     primary: {
       'feature-highlight': { DEFAULT: Value; hover: { active: Value } };
     };
   };
-  keyboard: {
-    focus: {
-      'feature-highlight': {
-        DEFAULT: Value;
-        outline: Value;
-      };
-    };
-  };
-};
-
-type Deprecates = {
-  fs: { 50: Value };
-  violet: { 400: Value; 500: Value };
-  blue: { 400: Value; 500: Value };
-  table: { td: { cell: { actions: { accordion: Value } } } };
-  keyboard: { focus: { outline: { invert: Value } } };
-  border: {
-    tooltip: { invert: Value };
-    table: { accent: Value };
-    date: { picker: { range: { comparison: Value } } };
-  };
   tooltip: {
     default: Value;
     invert: Value;
     warning: Value;
   };
   feature: {
+    highlight: {
+      border: { DEFAULT: Value; active: Value };
+    };
     popover: {
       bg: { DEFAULT: Value };
       dot: {
@@ -3709,7 +3804,7 @@ type Deprecates = {
     };
   };
   text: {
-    link: {
+    'link': {
       DEFAULT: Value;
       hover: { active: Value };
       invert: {
@@ -3717,6 +3812,7 @@ type Deprecates = {
         hover: Value;
       };
     };
+    'feature-highlight': { DEFAULT: Value; hover: { active: Value } };
   };
 };
 
diff --git a/tools/theme/src/utils.ts b/tools/theme/src/utils.ts
index e35fd3b330..85f28062e5 100644
--- a/tools/theme/src/utils.ts
+++ b/tools/theme/src/utils.ts
@@ -45,9 +45,7 @@ export function getConfigValue(path: string[], config: Theme): string {
     const [group, subGroup, ...key] = path;
     pathToSearch = path[0] === 'baseTokens'
       ? path
-      : path[0] === 'featureHighlight'
-        ? [group, `${subGroup}_${key.join('_')}`]
-        : [group, subGroup, key.join('_')];
+      : [group, subGroup, key.join('_')];
     const valueObj = getByPath(config, pathToSearch);
 
     if ('value' in valueObj) {
diff --git a/website/docs/patterns/feature-highlight/feature-highlight.md b/website/docs/patterns/feature-highlight/feature-highlight.md
index 10f0acd9f3..5876834b7f 100644
--- a/website/docs/patterns/feature-highlight/feature-highlight.md
+++ b/website/docs/patterns/feature-highlight/feature-highlight.md
@@ -54,7 +54,7 @@ To highlight a [Checkbox](../../components/checkbox/checkbox), use the `Checkbox
 
 You can enable animation on click (`AnimatedSparkles` component). It's possible to change the number of animated sparkles (`count` prop).
 
-You can add more accent by displaying the `SummaryAI` icon with the `--intergalactic-icon-primary-feature-highlight` color after the text label.
+You can add more accent by displaying the `SummaryAI` icon with the `--intergalactic-feature-highlight-icon-primary` color after the text label.
 
 If the control's label doesn't mention the promotion, add an accessible description with `aria-describedby` and `ScreenReaderOnly`.
 
@@ -72,7 +72,7 @@ When using the `feature-highlight` tokens in the `color` property of icons and o
 
 ## DataTable
 
-To highlight a [table column](../../table-group/data-table/data-table), display the `SummaryAI` icon with the `--intergalactic-icon-primary-feature-highlight` color in the column header.
+To highlight a [table column](../../table-group/data-table/data-table), display the `SummaryAI` icon with the `--intergalactic-feature-highlight-icon-primary` color in the column header.
 
 If the column title doesn't mention the promotion, add a `ScreenReaderOnly` text to the column header.
 
@@ -140,7 +140,7 @@ To highlight a [Radio button](../../components/radio/radio), use the `RadioFH` c
 
 You can enable animation on click (`AnimatedSparkles` component). It's possible to change the number of animated sparkles (`count` prop).
 
-You can add more accent by displaying the `SummaryAI` icon with the `--intergalactic-icon-primary-feature-highlight` color after the text label.
+You can add more accent by displaying the `SummaryAI` icon with the `--intergalactic-feature-highlight-icon-primary` color after the text label.
 
 If the control's label doesn't mention the promotion, add an accessible description with `aria-describedby` and `ScreenReaderOnly`.
 
@@ -178,7 +178,7 @@ To highlight a [Switch](../../components/switch/switch), use the `SwitchFH` comp
 
 You can enable animation on click (`AnimatedSparkles` component). It's possible to change the number of animated sparkles (`count` prop).
 
-You can add more accent by displaying the `SummaryAI` icon with the `--intergalactic-icon-primary-feature-highlight` color after the text label.
+You can add more accent by displaying the `SummaryAI` icon with the `--intergalactic-feature-highlight-icon-primary` color after the text label.
 
 If the control's label doesn't mention the promotion, add an accessible description with `aria-describedby` and `ScreenReaderOnly`.
 
diff --git a/website/docs/style/design-tokens/base-tokens.json b/website/docs/style/design-tokens/base-tokens.json
index cde749424d..8bc0e85078 100644
--- a/website/docs/style/design-tokens/base-tokens.json
+++ b/website/docs/style/design-tokens/base-tokens.json
@@ -875,6 +875,30 @@
     "name": "--intergalactic-keyboard-focus-outline-invert",
     "value": "oklch(1 0 0 / 0.7)"
   },
+  {
+    "name": "--intergalactic-keyboard-focus-feature-highlight",
+    "value": "3px solid oklch(0.82 0.15 170)"
+  },
+  {
+    "name": "--intergalactic-keyboard-focus-feature-highlight-outline",
+    "value": "oklch(0.82 0.15 170)"
+  },
+  {
+    "name": "--intergalactic-badge-feature-highlight-accent",
+    "value": "oklch(0.22 0.01 140)"
+  },
+  {
+    "name": "--intergalactic-bg-primary-feature-highlight",
+    "value": "oklch(1 0 0)"
+  },
+  {
+    "name": "--intergalactic-bg-primary-feature-highlight-hover-active",
+    "value": "oklch(0.97 0.001 180)"
+  },
+  {
+    "name": "--intergalactic-bg-secondary-feature-highlight",
+    "value": "oklch(0.9 0.065 303)"
+  },
   {
     "name": "--intergalactic-border-tooltip-invert",
     "value": "oklch(0.4 0.004 140)"
@@ -887,6 +911,50 @@
     "name": "--intergalactic-border-date-picker-range-comparison",
     "value": "oklch(0.74 0.117 274.1)"
   },
+  {
+    "name": "--intergalactic-border-feature-highlight",
+    "value": "oklch(0.137 0.026 175.7 / 0.161)"
+  },
+  {
+    "name": "--intergalactic-border-feature-highlight-active",
+    "value": "oklch(0.22 0.01 140)"
+  },
+  {
+    "name": "--intergalactic-border-feature-highlight-secondary",
+    "value": "oklch(0.176 0.033 175.7 / 0.07)"
+  },
+  {
+    "name": "--intergalactic-control-primary-feature-highlight",
+    "value": "oklch(0.23 0.01 140)"
+  },
+  {
+    "name": "--intergalactic-control-primary-feature-highlight-hover",
+    "value": "oklch(0.32 0.007 140)"
+  },
+  {
+    "name": "--intergalactic-control-primary-feature-highlight-active",
+    "value": "oklch(0 0 140)"
+  },
+  {
+    "name": "--intergalactic-control-secondary-feature-highlight",
+    "value": "oklch(0.166 0.031 175.8 / 0.097)"
+  },
+  {
+    "name": "--intergalactic-control-secondary-feature-highlight-hover",
+    "value": "oklch(0.151 0.028 176.1 / 0.123)"
+  },
+  {
+    "name": "--intergalactic-control-secondary-feature-highlight-active",
+    "value": "oklch(0.145 0.027 176.1 / 0.135)"
+  },
+  {
+    "name": "--intergalactic-icon-primary-feature-highlight",
+    "value": "oklch(0.22 0.01 140)"
+  },
+  {
+    "name": "--intergalactic-icon-primary-feature-highlight-hover-active",
+    "value": "oklch(0.22 0.01 140)"
+  },
   {
     "name": "--intergalactic-tooltip-default",
     "value": "oklch(1 0 0)"
@@ -899,6 +967,14 @@
     "name": "--intergalactic-tooltip-warning",
     "value": "oklch(0.958 0.029 5.7)"
   },
+  {
+    "name": "--intergalactic-feature-highlight-border",
+    "value": "oklch(0.137 0.026 175.7 / 0.161)"
+  },
+  {
+    "name": "--intergalactic-feature-highlight-border-active",
+    "value": "oklch(0.22 0.01 140)"
+  },
   {
     "name": "--intergalactic-feature-popover-bg",
     "value": "oklch(0.92 0.052 303.1)"
@@ -966,5 +1042,13 @@
   {
     "name": "--intergalactic-text-link-invert-hover",
     "value": "oklch(0.999 0.001 180 / 0.949)"
+  },
+  {
+    "name": "--intergalactic-text-feature-highlight",
+    "value": "oklch(0.1 0.03 137 / 0.899)"
+  },
+  {
+    "name": "--intergalactic-text-feature-highlight-hover-active",
+    "value": "oklch(0.1 0.03 137 / 0.899)"
   }
 ]
diff --git a/website/docs/style/design-tokens/design-tokens.json b/website/docs/style/design-tokens/design-tokens.json
index 913d064488..9e288bee2b 100644
--- a/website/docs/style/design-tokens/design-tokens.json
+++ b/website/docs/style/design-tokens/design-tokens.json
@@ -233,7 +233,6 @@
       "d3-chart",
       "drag-and-drop",
       "dropdown",
-      "feature-highlight",
       "fullscreen-modal",
       "inline-input",
       "input",
@@ -629,7 +628,9 @@
     "name": "--intergalactic-brand-primary",
     "value": "oklch(0.74 0.17 303)",
     "description": "Primary brand accent for logos and branded surfaces.",
-    "components": []
+    "components": [
+      "feature-highlight"
+    ]
   },
   {
     "name": "--intergalactic-brand-secondary",
@@ -637,6 +638,14 @@
     "description": "Secondary brand accent for paired brand treatments (secondary marks, duo-tone lockups).",
     "components": []
   },
+  {
+    "name": "--intergalactic-brand-tertiary",
+    "value": "oklch(0.82 0.15 170)",
+    "description": "Tertiary brand accent for logos and branded surfaces.",
+    "components": [
+      "feature-highlight"
+    ]
+  },
   {
     "name": "--intergalactic-brand-twitter",
     "value": "#1d9bf0",
@@ -1560,7 +1569,8 @@
     "value": "oklch(0.999 0.001 180 / 0.949)",
     "description": "Inverted primary text color for form controls.",
     "components": [
-      "button"
+      "button",
+      "feature-highlight"
     ]
   },
   {
@@ -3182,7 +3192,6 @@
     "components": [
       "d3-chart",
       "date-picker",
-      "feature-highlight",
       "notice-bubble"
     ]
   },
@@ -3800,7 +3809,6 @@
     "components": [
       "button",
       "dropdown",
-      "feature-highlight",
       "select"
     ]
   },
@@ -3863,7 +3871,6 @@
       "bulk-textarea",
       "button",
       "dropdown-menu",
-      "feature-highlight",
       "inline-edit",
       "inline-input",
       "input",
@@ -3974,7 +3981,6 @@
       "carousel",
       "checkbox",
       "dropdown",
-      "feature-highlight",
       "feedback-form",
       "radio",
       "slider",
@@ -4041,140 +4047,132 @@
     "components": []
   },
   {
-    "name": "--intergalactic-bg-primary-feature-highlight",
-    "value": "#ffffff",
+    "name": "--intergalactic-feature-highlight-badge-accent",
+    "value": "oklch(0.22 0.01 140)",
+    "description": "Accent background for Badge.",
+    "components": [
+      "feature-highlight"
+    ]
+  },
+  {
+    "name": "--intergalactic-feature-highlight-bg-primary",
+    "value": "oklch(1 0 0)",
     "description": "Primary background for highlighted controls.",
     "components": []
   },
   {
-    "name": "--intergalactic-bg-primary-feature-highlight-hover-active",
-    "value": "linear-gradient(90deg in oklch, oklch(0.97 0.019 303.4), oklch(0.929 0.037 268))",
+    "name": "--intergalactic-feature-highlight-bg-primary-hover-active",
+    "value": "oklch(0.97 0.001 180)",
     "description": "Primary background for hover and active (selected) state of highlighted controls.",
-    "components": [
-      "feature-highlight"
-    ]
+    "components": []
   },
   {
-    "name": "--intergalactic-bg-secondary-feature-highlight",
-    "value": "linear-gradient(90deg in oklch, oklch(0.97 0.019 303.4), oklch(0.929 0.037 268))",
+    "name": "--intergalactic-feature-highlight-bg-secondary",
+    "value": "oklch(0.9 0.065 303)",
     "description": "Secondary background for the highlighted message.",
     "components": [
       "feature-highlight"
     ]
   },
   {
-    "name": "--intergalactic-border-feature-highlight",
-    "value": "linear-gradient(90deg in oklch, oklch(0.82 0.118 303), oklch(0.82 0.088 272.1))",
+    "name": "--intergalactic-feature-highlight-border-primary",
+    "value": "oklch(0.137 0.026 175.7 / 0.161)",
     "description": "Primary border for highlighted controls.",
     "components": [
       "feature-highlight"
     ]
   },
   {
-    "name": "--intergalactic-border-feature-highlight-active",
-    "value": "linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.74 0.117 274.1))",
+    "name": "--intergalactic-feature-highlight-border-primary-active",
+    "value": "oklch(0.22 0.01 140)",
     "description": "Primary border for the active state of highlighted controls.",
     "components": [
       "feature-highlight"
     ]
   },
   {
-    "name": "--intergalactic-border-feature-highlight-secondary",
-    "value": "linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.74 0.117 274.1))",
+    "name": "--intergalactic-feature-highlight-border-secondary",
+    "value": "oklch(0.176 0.033 175.7 / 0.07)",
     "description": "Secondary border for highlighted controls.",
-    "components": [
-      "feature-highlight"
-    ]
+    "components": []
   },
   {
-    "name": "--intergalactic-control-primary-feature-highlight",
-    "value": "linear-gradient(90deg in oklch, oklch(0.64 0.223 299.3), oklch(0.74 0.117 274.1))",
+    "name": "--intergalactic-feature-highlight-control-primary",
+    "value": "oklch(0.23 0.01 140)",
     "description": "Background of the highlighted primary control.",
-    "components": [
-      "feature-highlight"
-    ]
+    "components": []
   },
   {
-    "name": "--intergalactic-control-primary-feature-highlight-hover",
-    "value": "linear-gradient(90deg in oklch, oklch(0.64 0.223 299.3), oklch(0.74 0.117 274.1))",
+    "name": "--intergalactic-feature-highlight-control-primary-hover",
+    "value": "oklch(0.32 0.007 140)",
     "description": "Hover state of the highlighted primary control.",
-    "components": [
-      "feature-highlight"
-    ]
+    "components": []
   },
   {
-    "name": "--intergalactic-control-primary-feature-highlight-active",
-    "value": "linear-gradient(90deg in oklch, oklch(0.64 0.223 299.3), oklch(0.58 0.168 278.2))",
+    "name": "--intergalactic-feature-highlight-control-primary-active",
+    "value": "oklch(0 0 140)",
     "description": "Active (selected) state of the highlighted primary control.",
-    "components": [
-      "feature-highlight"
-    ]
+    "components": []
   },
   {
-    "name": "--intergalactic-control-secondary-feature-highlight",
-    "value": "linear-gradient(90deg in oklch, oklch(0.97 0.019 303.4), oklch(0.969 0.016 267.7))",
+    "name": "--intergalactic-feature-highlight-control-secondary",
+    "value": "oklch(0.166 0.031 175.8 / 0.097)",
     "description": "Background of the highlighted secondary control.",
     "components": [
       "feature-highlight"
     ]
   },
   {
-    "name": "--intergalactic-control-secondary-feature-highlight-hover",
-    "value": "linear-gradient(90deg in oklch, oklch(0.9 0.065 303), oklch(0.898 0.054 268.3))",
+    "name": "--intergalactic-feature-highlight-control-secondary-hover",
+    "value": "oklch(0.151 0.028 176.1 / 0.123)",
     "description": "Hover state of the highlighted secondary control.",
     "components": [
       "feature-highlight"
     ]
   },
   {
-    "name": "--intergalactic-control-secondary-feature-highlight-active",
-    "value": "linear-gradient(90deg in oklch, oklch(0.9 0.065 303), oklch(0.898 0.054 268.3))",
+    "name": "--intergalactic-feature-highlight-control-secondary-active",
+    "value": "oklch(0.145 0.027 176.1 / 0.135)",
     "description": "Active (selected) state of the highlighted secondary control.",
     "components": [
       "feature-highlight"
     ]
   },
   {
-    "name": "--intergalactic-text-feature-highlight",
-    "value": "linear-gradient(90deg in oklch, oklch(0.53 0.26 296), oklch(0.53 0.157 279.2))",
+    "name": "--intergalactic-feature-highlight-text",
+    "value": "oklch(0.1 0.03 137 / 0.899)",
     "description": "Text for highlighted features.",
     "components": [
       "feature-highlight"
     ]
   },
   {
-    "name": "--intergalactic-text-feature-highlight-hover-active",
-    "value": "linear-gradient(90deg in oklch, oklch(0.53 0.26 296), oklch(0.53 0.157 279.2))",
+    "name": "--intergalactic-feature-highlight-text-hover-active",
+    "value": "oklch(0.1 0.03 137 / 0.899)",
     "description": "Text for hover and active states of highlighted features.",
-    "components": [
-      "feature-highlight"
-    ]
+    "components": []
   },
   {
-    "name": "--intergalactic-icon-primary-feature-highlight",
-    "value": "oklch(0.58 0.254 297.1)",
-    "description": "Primary highlighted icon.",
+    "name": "--intergalactic-feature-highlight-icon-primary",
+    "value": "oklch(0.22 0.01 140)",
     "components": [
       "feature-highlight"
     ]
   },
   {
-    "name": "--intergalactic-icon-primary-feature-highlight-hover-active",
-    "value": "oklch(0.53 0.26 296)",
-    "description": "Violet background color for the hover and active states of the primary highlighted icon. It’s created using a CSS filter with a brightness(0.8), applied to the violet-500 color.",
-    "components": [
-      "feature-highlight"
-    ]
+    "name": "--intergalactic-feature-highlight-icon-primary-hover-active",
+    "value": "oklch(0.22 0.01 140)",
+    "components": []
   },
   {
-    "name": "--intergalactic-keyboard-focus-feature-highlight",
-    "value": "3px solid linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.58 0.168 278.2))",
+    "name": "--intergalactic-feature-highlight-keyboard-focus",
+    "value": "3px solid oklch(0.82 0.15 170)",
     "description": "Keyboard focus styles for highlighted controls.",
     "components": []
   },
   {
-    "name": "--intergalactic-keyboard-focus-feature-highlight-outline",
-    "value": "linear-gradient(90deg in oklch, oklch(0.74 0.17 303), oklch(0.58 0.168 278.2))",
+    "name": "--intergalactic-feature-highlight-keyboard-focus-outline",
+    "value": "oklch(0.82 0.15 170)",
     "description": "Color for keyboard focus outline styles for highlighted controls.",
     "components": [
       "feature-highlight"