diff --git a/src/styles/filter-row/filter-row.scss b/src/styles/filter-row/filter-row.scss
index ab5d347..611d761 100644
--- a/src/styles/filter-row/filter-row.scss
+++ b/src/styles/filter-row/filter-row.scss
@@ -16,36 +16,36 @@ $border: var-get($theme, 'header-border-width') var-get($theme, 'header-border-s
     z-index: var(--z-index-base);
 	padding-inline-end: var(--scrollbar-offset);
 	position: relative;
-	
+
 	&:has([part~='active-state']) {
 		background: var-get($theme, 'filtering-row-background');
 		box-shadow: inset 0 rem(-1px) 0 0 var-get($theme, 'header-border-color');
 		margin-block-start: calc(var-get($theme, 'header-border-width') * -1);
 	}
-	
+
 	igc-chip {
 		// TODO FIX ON COMPONENT LEVEL
 		display: inline-flex;
 		margin: rem(4px);
 	}
-	
+
 	igc-input::part(input) {
 		border-inline-start: none;
 		padding-inline-start: 0;
 	}
-	
+
 	igc-input:focus::part(prefix),
 	igc-input:focus [slot="prefix"],
 	igc-input:focus::part(suffix),
 	igc-input:focus [slot="suffix"] {
 		border-color: var(--focused-border-color);
 	}
-	
+
 	igc-input [slot="prefix"],
 	igc-input [slot="suffix"] {
 		cursor: pointer;
 	}
-	
+
 	igc-input:hover::part(input),
 	igc-input:hover::part(prefix),
 	igc-input:hover [slot="prefix"],
@@ -85,7 +85,7 @@ $border: var-get($theme, 'header-border-width') var-get($theme, 'header-border-s
 
 [part~='filter-row-actions'] {
     padding-inline-end: $ig-cells-padding;
-	
+
 	igc-icon {
 		color: var-get($theme, 'sorted-header-icon-color');
 	}
diff --git a/src/styles/themes/shared/filtering-row/filtering-row.bootstrap.scss b/src/styles/themes/shared/filtering-row/filtering-row.bootstrap.scss
index 58f2660..c61ea74 100644
--- a/src/styles/themes/shared/filtering-row/filtering-row.bootstrap.scss
+++ b/src/styles/themes/shared/filtering-row/filtering-row.bootstrap.scss
@@ -1,37 +1,8 @@
 @use 'igniteui-theming' as *;
-@use '../../../themes/light/themes' as *;
-
-$theme: $bootstrap;
-
+@use './filtering-row.common';
 
 [part~='filter-row-input'] {
 	igc-input {
 		--ig-input-size: #{sizable(rem(26px), rem(34px), rem(44px))};
-		--border-border-radius: 0;
-		--input-prefix-background: transparent;
-		--input-prefix-background--filled: transparent;
-		--input-prefix-background--focused: transparent;
-		--input-suffix-background: transparent;
-		--input-suffix-background--filled: transparent;
-		--input-suffix-background--focused: transparent;
-		--idle-bottom-line-color: transparent;
-		--hover-bottom-line-color: transparent;
-		--focused-bottom-line-color: transparent;
-		--focused-secondary-color: transparent;
-		--hover-border-color: var(--ig-primary-500);
-		--focused-border-color: var(--ig-primary-500);
-		--border-background: transparent;
-		--search-background: var(--ig-input-search-background, transparent);
-		--box-background: transparent;
-		--box-background-hover: transparent;
-		--box-background-focus: transparent;
-		--box-border-radius: 0;
-		--search-border-radius: 0;
-		
-		&::part(container),
-		&::part(input) {
-			background: inherit;
-			color: inherit;
-		}
 	}
 }
diff --git a/src/styles/themes/shared/filtering-row/filtering-row.common.scss b/src/styles/themes/shared/filtering-row/filtering-row.common.scss
new file mode 100644
index 0000000..d41025a
--- /dev/null
+++ b/src/styles/themes/shared/filtering-row/filtering-row.common.scss
@@ -0,0 +1,35 @@
+@use 'igniteui-theming' as *;
+
+igc-input {
+	--border-border-radius: 0;
+	--input-prefix-background: transparent;
+	--input-prefix-background--filled: transparent;
+	--input-prefix-background--focused: transparent;
+	--input-suffix-background: transparent;
+	--input-suffix-background--filled: transparent;
+	--input-suffix-background--focused: transparent;
+	--idle-bottom-line-color: transparent;
+	--hover-bottom-line-color: transparent;
+	--focused-bottom-line-color: transparent;
+	--focused-secondary-color: transparent;
+	--hover-border-color: var(--ig-grid-accent-color, var(--ig-primary-500));
+	--focused-border-color: var(--ig-grid-accent-color, var(--ig-primary-500));
+	--border-background: transparent;
+	--search-background: var(--ig-input-search-background, transparent);
+	--box-background: transparent;
+	--box-background-hover: transparent;
+	--box-background-focus: transparent;
+	--box-border-radius: 0;
+	--search-border-radius: 0;
+
+	&::part(container),
+	&::part(input) {
+		background: inherit;
+		color: inherit;
+	}
+}
+
+igc-input[aria-expanded="true"]::part(prefix),
+igc-input[aria-expanded="true"] [slot="prefix"] {
+	color: var(--ig-grid-accent-color, var(--sorted-header-icon-color));
+}
diff --git a/src/styles/themes/shared/filtering-row/filtering-row.fluent.scss b/src/styles/themes/shared/filtering-row/filtering-row.fluent.scss
index 2a7d7e2..eae6b52 100644
--- a/src/styles/themes/shared/filtering-row/filtering-row.fluent.scss
+++ b/src/styles/themes/shared/filtering-row/filtering-row.fluent.scss
@@ -1,45 +1,16 @@
 @use 'igniteui-theming' as *;
-@use '../../../themes/light/themes' as *;
-
-$theme: $fluent;
-
+@use './filtering-row.common';
 
 [part~='filter-row-input'] {
 	igc-input {
 		--ig-input-size: #{sizable(rem(24px), rem(32px), rem(42px))};
-		--border-border-radius: 0;
-		--input-prefix-background: transparent;
-		--input-prefix-background--filled: transparent;
-		--input-prefix-background--focused: transparent;
-		--input-suffix-background: transparent;
-		--input-suffix-background--filled: transparent;
-		--input-suffix-background--focused: transparent;
-		--idle-bottom-line-color: transparent;
-		--hover-bottom-line-color: transparent;
-		--focused-bottom-line-color: transparent;
-		--focused-secondary-color: transparent;
-		--hover-border-color: var(--ig-primary-500);
-		--focused-border-color: var(--ig-primary-500);
-		--border-background: transparent;
-		--search-background: var(--ig-input-search-background, transparent);
-		--box-background: transparent;
-		--box-background-hover: transparent;
-		--box-background-focus: transparent;
-		--box-border-radius: 0;
-		--search-border-radius: 0;
-		
-		&::part(container),
-		&::part(input) {
-			background: inherit;
-			color: inherit;
-		}
 	}
-	
-	igc-input [slot="prefix"] {
+
+  igc-input [slot="prefix"] {
 		padding-inline-start: sizable(rem(4px), rem(6px));
 	}
-	
+
 	igc-input [slot="suffix"] {
-		padding-inline-end: sizable(rem(4px), rem(6px));;
-	}
+		padding-inline-end: sizable(rem(4px), rem(6px));
+  }
 }
diff --git a/src/styles/themes/shared/filtering-row/filtering-row.indigo.scss b/src/styles/themes/shared/filtering-row/filtering-row.indigo.scss
index f267484..9aa51c6 100644
--- a/src/styles/themes/shared/filtering-row/filtering-row.indigo.scss
+++ b/src/styles/themes/shared/filtering-row/filtering-row.indigo.scss
@@ -7,7 +7,7 @@ $theme: $indigo;
 	&:has([part~='active-state']) {
 		box-shadow: 0 rem(-1px) rem(5px) 0 rgb(0 0 0 / 12%);
 	}
-	
+
 	igc-chip {
 		--ig-chip-size: #{sizable(rem(20px), rem(24px), rem(24px))};
 	}
@@ -17,11 +17,11 @@ $theme: $indigo;
 	igc-input {
 		--size: #{sizable(rem(24px), rem(28px), rem(32px))};
 	}
-	
+
 	igc-input [slot='prefix'] {
 		padding-inline-start: sizable(rem(4px), rem(6px));
 	}
-	
+
 	igc-input [slot='suffix'] {
 		padding-inline-end: sizable(rem(4px), rem(6px));;
 	}
diff --git a/src/styles/themes/shared/filtering-row/filtering-row.material.scss b/src/styles/themes/shared/filtering-row/filtering-row.material.scss
index ff2acd9..b853270 100644
--- a/src/styles/themes/shared/filtering-row/filtering-row.material.scss
+++ b/src/styles/themes/shared/filtering-row/filtering-row.material.scss
@@ -1,4 +1,5 @@
 @use 'igniteui-theming' as *;
+@use './filtering-row.common';
 
 :host {
 	&:has([part~='active-state']) {
@@ -9,39 +10,13 @@
 [part~='filter-row-input'] {
 	igc-input {
 		--ig-input-size: #{sizable(rem(26px), rem(34px), rem(44px))};
-		--border-border-radius: 0;
-		--input-prefix-background: transparent;
-		--input-prefix-background--filled: transparent;
-		--input-prefix-background--focused: transparent;
-		--input-suffix-background: transparent;
-		--input-suffix-background--filled: transparent;
-		--input-suffix-background--focused: transparent;
-		--idle-bottom-line-color: transparent;
-		--hover-bottom-line-color: transparent;
-		--focused-bottom-line-color: transparent;
-		--focused-secondary-color: transparent;
-		--hover-border-color: var(--ig-primary-500);
-		--focused-border-color: var(--ig-primary-500);
-		--border-background: transparent;
-		--search-background: var(--ig-input-search-background, transparent);
-		--box-background: transparent;
-		--box-background-hover: transparent;
-		--box-background-focus: transparent;
-		--box-border-radius: 0;
-		--search-border-radius: 0;
-		
-		&::part(container),
-		&::part(input) {
-			background: inherit;
-			color: inherit;
-		}
 	}
-	
-	igc-input [slot="prefix"] {
+
+  igc-input [slot="prefix"] {
 		padding-inline-start: sizable(rem(4px), rem(6px));
 	}
-	
+
 	igc-input [slot="suffix"] {
-		padding-inline-end: sizable(rem(4px), rem(6px));;
-	}
+		padding-inline-end: sizable(rem(4px), rem(6px));
+  }
 }