diff --git a/projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-component.scss b/projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-component.scss
index 5c0def5856a..512d2335b64 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-component.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-component.scss
@@ -14,10 +14,22 @@
         @extend %cbx-display !optional;
 
         &:hover {
+            @include e(label) {
+                @extend %cbx-label--hover !optional;
+            }
+
+            @include e(label, $m: before) {
+                 @extend %cbx-label--hover !optional;
+            }
+
             @include e(ripple) {
                 @extend %cbx-ripple--hover !optional;
             }
 
+            @include e(composite) {
+                @extend %cbx-composite--hover !optional;
+            }
+
             @include e(composite-mark) {
                 @extend %cbx-composite-mark--fluent !optional;
             }
@@ -60,30 +72,10 @@
             @extend %cbx-ripple !optional;
         }
 
-        @include m(bootstrap) {
-            @include e(composite) {
-                &:hover {
-                    @extend %cbx-composite--hover !optional;
-                }
-            }
-        }
-
         @include m(indigo) {
-            @include e(composite) {
-                &:hover {
-                    @extend %cbx-composite--hover !optional;
-                }
-            }
-
             @include e(composite-mark) {
                 @extend %cbx-composite-mark-indigo !optional;
             }
-
-            @include e(label) {
-                &:hover {
-                    @extend %cbx-label--hover !optional;
-                }
-            }
         }
 
         @include m(invalid) {
@@ -99,6 +91,10 @@
                 @extend %cbx-label--invalid !optional;
             }
 
+            @include e(label, $m: before) {
+                @extend %cbx-label--invalid !optional;
+            }
+
             &:hover {
                 @include e(ripple) {
                     @extend %cbx-ripple--hover !optional;
@@ -112,6 +108,14 @@
                 @include e(composite-mark) {
                     @extend %cbx-composite-mark--invalid--fluent !optional;
                 }
+
+                @include e(label) {
+                    @extend %cbx-label--invalid !optional;
+                }
+
+                @include e(label, $m: before) {
+                    @extend %cbx-label--invalid !optional;
+                }
             }
 
             &:active {
@@ -183,6 +187,12 @@
             @include e(ripple) {
                 @extend %cbx-ripple--focused-invalid !optional;
             }
+
+            &:hover {
+                @include e(ripple) {
+                    @extend %cbx-ripple--hover-invalid !optional;
+                }
+            }
         }
 
         @include mx(indigo, focused, invalid) {
@@ -239,11 +249,19 @@
                 @include e(composite) {
                     @extend %cbx-composite--x--hover !optional;
                 }
+
+                @include e(composite-mark) {
+                    @extend %cbx-composite-mark--in--fluent !optional;
+                }
             }
         }
 
         @include mx(material, disabled, indeterminate) {
-            @extend %igx-checkbox--disabled-indeterminate-material !optional;
+            @extend %igx-checkbox--disabled-indeterminate !optional;
+        }
+
+        @include mx(bootstrap, disabled, indeterminate) {
+            @extend %igx-checkbox--disabled-indeterminate !optional;
         }
 
         @include mx(fluent, disabled, indeterminate) {
@@ -251,7 +269,9 @@
         }
 
         @include mx(indigo, disabled, indeterminate) {
-            @extend %igx-checkbox--disabled-indeterminate-indigo !optional;
+            @include e(composite) {
+                @extend %igx-checkbox--disabled-indeterminate-indigo !optional;
+            }
         }
 
         @include mx(indigo, focused, indeterminate) {
@@ -324,6 +344,21 @@
                 @extend %cbx-ripple--focused !optional;
                 @extend %cbx-ripple--focused-checked !optional;
             }
+
+            &:hover {
+                @include e(ripple) {
+                    @extend %cbx-ripple--focused !optional;
+                    @extend %cbx-ripple--focused--hover-checked !optional;
+                }
+            }
+        }
+
+        @include mx(focused, invalid, checked) {
+            &:hover {
+                @include e(ripple) {
+                    @extend %cbx-ripple--hover-invalid !optional;
+                }
+            }
         }
 
         @include mx(focused, indeterminate) {
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-theme.scss
index 83dc5b45d3f..3bcf97b1d4d 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/checkbox/_checkbox-theme.scss
@@ -122,7 +122,9 @@
     }
 
     %cbx-composite--hover {
-        border-color: var-get($theme, 'empty-color-hover');
+        @if $variant == 'bootstrap' or $variant == 'indigo' {
+            border-color: var-get($theme, 'empty-color-hover');
+        }
     }
 
     %cbx-composite--x {
@@ -175,6 +177,7 @@
     %cbx-composite--x--disabled {
         @if $variant == 'material' or $variant == 'fluent' {
             background: var-get($theme, 'disabled-color');
+            border-color: var-get($theme, 'disabled-color');
         }
 
         @if $variant == 'indigo' or $variant == 'bootstrap' {
@@ -262,7 +265,7 @@
     }
 
     %igx-checkbox--disabled-indeterminate-indigo {
-        @extend %igx-checkbox--indeterminate-indigo;
+        @extend %cbx-composite--x--disabled;
 
         %cbx-composite-mark {
             rect {
@@ -291,6 +294,14 @@
                 z-index: 1;
             }
         }
+
+        &:hover {
+            %cbx-composite {
+                &::before {
+                    background: var-get($theme, 'fill-color-hover');
+                }
+            }
+        }
     }
 
     %igx-checkbox--disabled-indeterminate-fluent {
@@ -299,7 +310,7 @@
         }
 
         %cbx-composite--x--disabled {
-            background: transparent;
+            border-color: var-get($theme, 'disabled-color');
 
             &::before {
                 background: var-get($theme, 'disabled-color');
@@ -307,7 +318,7 @@
         }
     }
 
-    %igx-checkbox--disabled-indeterminate-material {
+    %igx-checkbox--disabled-indeterminate {
         %cbx-composite--x--disabled {
             border-color: var-get($theme, 'disabled-indeterminate-color');
             background: var-get($theme, 'disabled-indeterminate-color');
@@ -458,11 +469,11 @@
     }
 
     %cbx-ripple--hover-checked {
-        background: var-get($theme, 'fill-color');
+        background: var-get($theme, 'fill-color-hover');
     }
 
     %cbx-ripple--hover-invalid {
-        background: var-get($theme, 'error-color');
+        background: var-get($theme, 'error-color-hover');
     }
 
     %igx-checkbox--focused-indigo {
@@ -544,6 +555,10 @@
         background: var-get($theme, 'fill-color');
     }
 
+    %cbx-ripple--focused--hover-checked {
+        background: var-get($theme, 'fill-color-hover');
+    }
+
     %cbx-ripple--focused-invalid {
         background: var-get($theme, 'error-color');
     }