diff --git a/packages/core/src/components/category-filter/category-filter.tsx b/packages/core/src/components/category-filter/category-filter.tsx
index 6ae05b1d3f4..5669d37c7d1 100644
--- a/packages/core/src/components/category-filter/category-filter.tsx
+++ b/packages/core/src/components/category-filter/category-filter.tsx
@@ -581,7 +581,7 @@ export class CategoryFilter {
           'reset-button': true,
           'hide-reset-button': !this.filterTokens.length && !this.category,
         }}
-        variant="Secondary"
+        variant="Primary"
         ghost
         oval
         icon="clear"
diff --git a/packages/core/src/components/filter-chip/filter-chip.scss b/packages/core/src/components/filter-chip/filter-chip.scss
index 4138dedf70b..fff86ee9163 100644
--- a/packages/core/src/components/filter-chip/filter-chip.scss
+++ b/packages/core/src/components/filter-chip/filter-chip.scss
@@ -17,28 +17,35 @@
   justify-content: space-between;
   height: $large-space;
   padding-left: $small-space;
-  border: var(--theme-focus--border-thickness) solid transparent;
+  border: var(--theme-focus--border-thickness) solid var(--theme-chip-primary-outline--border-color);
   border-radius: $x-large-space;
-  background-color: var(--theme-chip--background);
-  color: var(--theme-chip--color);
+  background-color: var(--theme-color-ghost);
+  color: var(--theme-chip-primary-outline--color);
 
   @include hover {
-    background-color: var(--theme-chip--background--hover);
+    background-color: var(--theme-color-ghost-primary--hover);
+    border-color: var(--theme-chip-primary-outline--border-color--hover);
+    color: var(--theme-chip-primary-outline--color--hover);
   }
 
   @include active {
-    background-color: var(--theme-chip--background--active);
+    background-color: var(--theme-color-ghost-primary--active);
+    border-color: var(--theme-chip-primary-outline--border-color--active);
+    color: var(--theme-chip-primary-outline--color--active);
   }
 
   @include focus-visible {
-    border-color: #199fff;
+    outline: var(--theme-color-focus-bdr) solid var(--theme-focus--border-thickness);
+    outline-offset: -0.125rem;
   }
 
   .slot-container {
     @include ellipsis;
 
     :host-context(.disabled) {
-      color: var(--theme-chip--color-diabled);
+      background-color: var(--theme-color-ghost);
+      border-color: var(--theme-color-component-4);
+      color: var(--theme-color-weak-text);
     }
   }
 
diff --git a/packages/core/src/components/filter-chip/filter-chip.tsx b/packages/core/src/components/filter-chip/filter-chip.tsx
index fe461247b0e..c639c681509 100644
--- a/packages/core/src/components/filter-chip/filter-chip.tsx
+++ b/packages/core/src/components/filter-chip/filter-chip.tsx
@@ -49,7 +49,7 @@ export class FilterChip {
         </div>
         <button
           disabled={this.disabled}
-          class="btn btn-invisible-secondary btn-oval"
+          class="btn btn-invisible-primary btn-oval"
           onClick={(e) => this.onCloseClick(e)}
         >
           <ix-icon name="close-small" size="16"></ix-icon>
diff --git a/packages/core/src/tests/category-filter/category-filter.e2e.ts-snapshots/category-filter-categories-1-chromium---theme-classic-dark-linux.png b/packages/core/src/tests/category-filter/category-filter.e2e.ts-snapshots/category-filter-categories-1-chromium---theme-classic-dark-linux.png
index 1e25e3e983c..c900e677a13 100644
Binary files a/packages/core/src/tests/category-filter/category-filter.e2e.ts-snapshots/category-filter-categories-1-chromium---theme-classic-dark-linux.png and b/packages/core/src/tests/category-filter/category-filter.e2e.ts-snapshots/category-filter-categories-1-chromium---theme-classic-dark-linux.png differ
diff --git a/packages/core/src/tests/category-filter/category-filter.e2e.ts-snapshots/category-filter-categories-1-chromium---theme-classic-light-linux.png b/packages/core/src/tests/category-filter/category-filter.e2e.ts-snapshots/category-filter-categories-1-chromium---theme-classic-light-linux.png
index b97561f83bc..f5547810564 100644
Binary files a/packages/core/src/tests/category-filter/category-filter.e2e.ts-snapshots/category-filter-categories-1-chromium---theme-classic-light-linux.png and b/packages/core/src/tests/category-filter/category-filter.e2e.ts-snapshots/category-filter-categories-1-chromium---theme-classic-light-linux.png differ
diff --git a/packages/core/src/tests/chip/chip.e2e.ts-snapshots/chip-basic-1-chromium---theme-classic-dark-linux.png b/packages/core/src/tests/chip/chip.e2e.ts-snapshots/chip-basic-1-chromium---theme-classic-dark-linux.png
index 3b660e5c18d..7b638242890 100644
Binary files a/packages/core/src/tests/chip/chip.e2e.ts-snapshots/chip-basic-1-chromium---theme-classic-dark-linux.png and b/packages/core/src/tests/chip/chip.e2e.ts-snapshots/chip-basic-1-chromium---theme-classic-dark-linux.png differ
diff --git a/packages/core/src/tests/chip/chip.e2e.ts-snapshots/chip-basic-1-chromium---theme-classic-light-linux.png b/packages/core/src/tests/chip/chip.e2e.ts-snapshots/chip-basic-1-chromium---theme-classic-light-linux.png
index 358c04a82dc..3c381bb60f7 100644
Binary files a/packages/core/src/tests/chip/chip.e2e.ts-snapshots/chip-basic-1-chromium---theme-classic-light-linux.png and b/packages/core/src/tests/chip/chip.e2e.ts-snapshots/chip-basic-1-chromium---theme-classic-light-linux.png differ
diff --git a/packages/core/src/tests/counter-pill/counter-pill.e2e.ts-snapshots/counter-pill-basic-1-chromium---theme-classic-dark-linux.png b/packages/core/src/tests/counter-pill/counter-pill.e2e.ts-snapshots/counter-pill-basic-1-chromium---theme-classic-dark-linux.png
index dfbef2fa621..b059dbed999 100644
Binary files a/packages/core/src/tests/counter-pill/counter-pill.e2e.ts-snapshots/counter-pill-basic-1-chromium---theme-classic-dark-linux.png and b/packages/core/src/tests/counter-pill/counter-pill.e2e.ts-snapshots/counter-pill-basic-1-chromium---theme-classic-dark-linux.png differ
diff --git a/packages/core/src/tests/counter-pill/counter-pill.e2e.ts-snapshots/counter-pill-basic-1-chromium---theme-classic-light-linux.png b/packages/core/src/tests/counter-pill/counter-pill.e2e.ts-snapshots/counter-pill-basic-1-chromium---theme-classic-light-linux.png
index f057b302e84..6ccf21fed68 100644
Binary files a/packages/core/src/tests/counter-pill/counter-pill.e2e.ts-snapshots/counter-pill-basic-1-chromium---theme-classic-light-linux.png and b/packages/core/src/tests/counter-pill/counter-pill.e2e.ts-snapshots/counter-pill-basic-1-chromium---theme-classic-light-linux.png differ
diff --git a/packages/core/src/tests/pill/pill.e2e.ts-snapshots/pill-basic-1-chromium---theme-classic-dark-linux.png b/packages/core/src/tests/pill/pill.e2e.ts-snapshots/pill-basic-1-chromium---theme-classic-dark-linux.png
index 30957d1c0f9..b652abba863 100644
Binary files a/packages/core/src/tests/pill/pill.e2e.ts-snapshots/pill-basic-1-chromium---theme-classic-dark-linux.png and b/packages/core/src/tests/pill/pill.e2e.ts-snapshots/pill-basic-1-chromium---theme-classic-dark-linux.png differ
diff --git a/packages/core/src/tests/pill/pill.e2e.ts-snapshots/pill-basic-1-chromium---theme-classic-light-linux.png b/packages/core/src/tests/pill/pill.e2e.ts-snapshots/pill-basic-1-chromium---theme-classic-light-linux.png
index 715aaa7081d..7a544793a9b 100644
Binary files a/packages/core/src/tests/pill/pill.e2e.ts-snapshots/pill-basic-1-chromium---theme-classic-light-linux.png and b/packages/core/src/tests/pill/pill.e2e.ts-snapshots/pill-basic-1-chromium---theme-classic-light-linux.png differ
diff --git a/packages/core/src/tests/select/select.e2e.ts-snapshots/select-mode-multiple-overflow-scroll-down-1-chromium---theme-classic-dark-linux.png b/packages/core/src/tests/select/select.e2e.ts-snapshots/select-mode-multiple-overflow-scroll-down-1-chromium---theme-classic-dark-linux.png
index 2d652a84c37..9c17fb39d26 100644
Binary files a/packages/core/src/tests/select/select.e2e.ts-snapshots/select-mode-multiple-overflow-scroll-down-1-chromium---theme-classic-dark-linux.png and b/packages/core/src/tests/select/select.e2e.ts-snapshots/select-mode-multiple-overflow-scroll-down-1-chromium---theme-classic-dark-linux.png differ
diff --git a/packages/core/src/tests/select/select.e2e.ts-snapshots/select-mode-multiple-overflow-scroll-down-1-chromium---theme-classic-light-linux.png b/packages/core/src/tests/select/select.e2e.ts-snapshots/select-mode-multiple-overflow-scroll-down-1-chromium---theme-classic-light-linux.png
index 927233dc886..775b67da04c 100644
Binary files a/packages/core/src/tests/select/select.e2e.ts-snapshots/select-mode-multiple-overflow-scroll-down-1-chromium---theme-classic-light-linux.png and b/packages/core/src/tests/select/select.e2e.ts-snapshots/select-mode-multiple-overflow-scroll-down-1-chromium---theme-classic-light-linux.png differ