diff --git a/projects/igniteui-angular/src/lib/core/styles/components/combo/_combo-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/combo/_combo-theme.scss
index 6b0f7cf4657..65504e5425d 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/combo/_combo-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/combo/_combo-theme.scss
@@ -190,19 +190,11 @@
         %igx-combo__toggle-button {
             color: var-get($theme, 'toggle-button-foreground-focus');
             background: var-get($theme, 'toggle-button-background-focus');
-
-            &:focus {
-                color: color($color: 'secondary');
-            }
         }
 
         %igx-combo__clear-button {
             color: var-get($theme, 'clear-button-foreground-focus');
             background: var-get($theme, 'clear-button-background-focus');
-
-            &:focus {
-                color: color($color: 'secondary');
-            }
         }
     }
 
@@ -233,13 +225,29 @@
     }
 
     .igx-input-group.igx-input-group--focused:not(.igx-input-group--box) {
-        @if $variant != 'fluent' {
+        @if $variant == 'material' {
             %igx-combo__toggle-button {
                 background: var-get($theme, 'toggle-button-background-focus--border');
             }
         }
     }
 
+    %form-group-bundle:not(%form-group-bundle--disabled) {
+        %igx-combo__clear-button:focus-visible,
+        %igx-combo__toggle-button:focus-visible {
+            color: color($color: 'secondary');
+            background: var-get($theme, 'toggle-button-background');
+        }
+    }
+
+    //.igx-input-group:not(.igx-input-group--box) {
+    //    %igx-combo__toggle-button:focus {
+    //        @if $variant == 'material' {
+    //            background: var-get($theme, 'toggle-button-background-focus--border');
+    //        }
+    //    }
+    //}
+
     .igx-input-group--disabled {
         %igx-combo__toggle-button {
             background: var-get($theme, 'toggle-button-background-disabled') !important;
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/select/_select-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/select/_select-theme.scss
index 07a5faf511b..da21ed41e7b 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/select/_select-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/select/_select-theme.scss
@@ -62,7 +62,7 @@
     }
 
     .igx-input-group.igx-input-group--focused:not(.igx-input-group--box) {
-        @if $variant != 'fluent' and $variant != 'material' {
+        @if $variant == 'material' {
             %igx-select__toggle-button {
                 background: var-get($theme, 'toggle-button-background-focus--border');
             }