diff --git a/packages/web/src/scss/components/Select/_Select.scss b/packages/web/src/scss/components/Select/_Select.scss
index 38adcae391..f785846653 100644
--- a/packages/web/src/scss/components/Select/_Select.scss
+++ b/packages/web/src/scss/components/Select/_Select.scss
@@ -5,7 +5,6 @@
 @use '../../theme/form-fields' as form-fields-theme;
 @use '../../tools/form-fields' as form-fields-tools;
 @use '../../tools/reset';
-@use 'theme';
 
 $_field-name: 'Select';
 
@@ -39,7 +38,7 @@ $_field-name: 'Select';
     align-items: center;
     justify-content: center;
     aspect-ratio: 1;
-    color: theme.$icon-color-default;
+    color: form-fields-theme.$box-field-input-color-default;
     pointer-events: none;
 }
 
@@ -90,7 +89,7 @@ $_field-name: 'Select';
 }
 
 :is(.Select--disabled, .Select.is-disabled) .Select__icon {
-    color: theme.$icon-color-disabled;
+    color: form-fields-theme.$input-color-disabled;
 }
 
 :is(.Select--disabled, .Select.is-disabled) > :is(.Select__validationText, [data-spirit-element='validation_text']) {
diff --git a/packages/web/src/scss/components/Select/_theme.scss b/packages/web/src/scss/components/Select/_theme.scss
deleted file mode 100644
index 4551a50de0..0000000000
--- a/packages/web/src/scss/components/Select/_theme.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@use '@tokens' as tokens;
-
-$icon-color-default: tokens.$action-unselected-default;
-$icon-color-disabled: tokens.$action-unselected-disabled;
diff --git a/packages/web/src/scss/components/index.scss b/packages/web/src/scss/components/index.scss
index ed022369a2..d366e8d54d 100644
--- a/packages/web/src/scss/components/index.scss
+++ b/packages/web/src/scss/components/index.scss
@@ -24,8 +24,7 @@
 @forward 'ProductLogo';
 @forward 'Radio';
 @forward 'ScrollView';
-
-// @forward 'Select';
+@forward 'Select';
 @forward 'Stack';
 @forward 'Tabs';
 @forward 'Tag';
diff --git a/tests/e2e/demo-components-compare.spec.ts b/tests/e2e/demo-components-compare.spec.ts
index a701176483..da9354d346 100644
--- a/tests/e2e/demo-components-compare.spec.ts
+++ b/tests/e2e/demo-components-compare.spec.ts
@@ -16,7 +16,6 @@ const IGNORED_TESTS: string[] = [
   'Item',
   'Link',
   'Pill',
-  'Select',
   'Spinner',
   'Stack',
   'Text',
diff --git a/tests/e2e/demo-components-compare.spec.ts-snapshots/select-chromium-linux.png b/tests/e2e/demo-components-compare.spec.ts-snapshots/select-chromium-linux.png
index 0e916fdf9c..f4d584bcd8 100644
Binary files a/tests/e2e/demo-components-compare.spec.ts-snapshots/select-chromium-linux.png and b/tests/e2e/demo-components-compare.spec.ts-snapshots/select-chromium-linux.png differ