diff --git a/package-lock.json b/package-lock.json
index f1d0ed3ea4..65dfe15657 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,7 +37,7 @@
         "husky": "^9.1.7",
         "ig-typedoc-theme": "^7.0.1",
         "igniteui-i18n-resources": "^1.0.4",
-        "igniteui-theming": "^25.1.0",
+        "igniteui-theming": "^25.2.0",
         "keep-a-changelog": "^3.0.2",
         "lint-staged": "^16.4.0",
         "lit-analyzer": "^2.0.3",
@@ -8654,13 +8654,13 @@
       }
     },
     "node_modules/igniteui-theming": {
-      "version": "25.1.0",
-      "resolved": "https://registry.npmjs.org/igniteui-theming/-/igniteui-theming-25.1.0.tgz",
-      "integrity": "sha512-qM55JURFepSLjU0cl1g8J7E05BXxTp7aQ6oUu4j5ZBZEhKAGCaxZZdMtBSkcKcyghjwkDvurpihzjdnvv76YAg==",
+      "version": "25.2.0",
+      "resolved": "https://registry.npmjs.org/igniteui-theming/-/igniteui-theming-25.2.0.tgz",
+      "integrity": "sha512-bXRN379/vL05cDQl12jLABXALo+cXdD9zeYTlwURoEq1GrCkriYQnSqgwWmD/UdN/9Jc2MaMbsuXuYRZq5F71w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@modelcontextprotocol/sdk": "^1.25.0",
+        "@modelcontextprotocol/sdk": "^1.28.0",
         "sass-embedded": "~1.92.1",
         "zod": "^3.25.76"
       },
diff --git a/package.json b/package.json
index b0ee0adb6a..ee9fd7747d 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "husky": "^9.1.7",
     "ig-typedoc-theme": "^7.0.1",
     "igniteui-i18n-resources": "^1.0.4",
-    "igniteui-theming": "^25.1.0",
+    "igniteui-theming": "^25.2.0",
     "keep-a-changelog": "^3.0.2",
     "lint-staged": "^16.4.0",
     "lit-analyzer": "^2.0.3",
diff --git a/src/components/button-group/themes/shared/button/button.bootstrap.scss b/src/components/button-group/themes/shared/button/button.bootstrap.scss
index 4b1905cbaa..e22e01befa 100644
--- a/src/components/button-group/themes/shared/button/button.bootstrap.scss
+++ b/src/components/button-group/themes/shared/button/button.bootstrap.scss
@@ -11,52 +11,15 @@ $group-item-border-thickness: rem(1px);
         min-height: $bootstrap-flat-btn-size;
         border-width: $group-item-border-thickness;
         padding-block: pad-block(rem(2px), rem(4px), rem(7px));
-
-        &::before {
-            position: absolute;
-            pointer-events: none;
-            width: 100%;
-            height: 100%;
-            z-index: -1;
-        }
     }
 
     [part='toggle focused'] {
         box-shadow: 0 0 0 rem(4px) var-get($theme, 'idle-shadow-color');
-        z-index: 1;
     }
 }
 
-[part~='toggle']:active {
-    background: var-get($theme, 'item-hover-background');
-    color: var-get($theme, 'item-hover-text-color');
-    border-color: var-get($theme, 'item-hover-border-color');
-
-    &::before {
-        content: '';
-        background: var-get($theme, 'item-focused-background');
-    }
-
-    ::slotted(igc-icon) {
-        color: var-get($theme, 'item-hover-icon-color');
-    }
-}
 
 :host([selected]) {
-    [part~='toggle']:active {
-        background: var-get($theme, 'item-selected-hover-background');
-        color: var-get($theme, 'item-selected-hover-text-color');
-        border-color: var-get($theme, 'item-selected-hover-border-color');
-
-        ::slotted(igc-icon) {
-            color: var-get($theme, 'item-selected-hover-icon-color');
-        }
-        
-        &::before {
-            background: var-get($theme, 'item-selected-focus-background');
-        }
-    }
-
     [part='toggle focused'] {
         box-shadow: 0 0 0 rem(4px) var-get($theme, 'selected-shadow-color');
     }
diff --git a/src/components/button-group/themes/shared/button/button.common.scss b/src/components/button-group/themes/shared/button/button.common.scss
index fb65275dd1..46e14c1529 100644
--- a/src/components/button-group/themes/shared/button/button.common.scss
+++ b/src/components/button-group/themes/shared/button/button.common.scss
@@ -29,34 +29,83 @@ $theme: $material;
         padding-inline: pad-inline(rem(8px), rem(12px), rem(16px));
         padding-block: pad-block(rem(1px), rem(4px), rem(6px));
         border-color: var-get($theme, 'item-border-color');
+
+        ::slotted(igc-icon) {
+            color: var-get($theme, 'item-icon-color');
+        }
     }
 
-    ::slotted(igc-icon) {
-        color: var-get($theme, 'item-icon-color');
+    [part='toggle focused'] {
+        z-index: 2;
+        color: var-get($theme, 'item-focused-text-color');
+        background: var-get($theme, 'item-focused-background');
+        border-color: var-get($theme, 'item-focused-border-color');
+
+        ::slotted(igc-icon) {
+            color: var-get($theme, 'item-focused-text-color');
+        }
     }
 }
 
 :host(:hover) {
     [part~='toggle'] {
+        z-index: 1;
         color: var-get($theme, 'item-hover-text-color');
         background: var-get($theme, 'item-hover-background');
         border-color: var-get($theme, 'item-hover-border-color');
+
+        ::slotted(igc-icon) {
+            color: var-get($theme, 'item-hover-icon-color');
+        }
+    }
+
+    [part='toggle focused'] {
+        z-index: 2;
+        background: var-get($theme, 'item-focused-hover-background');
+        border-color: var-get($theme, 'item-focused-hover-border-color');
+        color: var-get($theme, 'item-focused-hover-text-color');
+
+        ::slotted(igc-icon) {
+            color: var-get($theme, 'item-focused-hover-text-color');
+        }
     }
+}
+
+:host(:active) [part~='toggle'],
+[part~='toggle']:active {
+    background: var-get($theme, 'item-active-background');
+    border-color: var-get($theme, 'item-active-border-color');
+    color: var-get($theme, 'item-hover-text-color');
 
     ::slotted(igc-icon) {
         color: var-get($theme, 'item-hover-icon-color');
     }
 }
 
+:host(:active) [part='toggle-focused'],
+[part='toggle focused']:active {
+    color: var-get($theme, 'item-focused-hover-text-color');
+
+    ::slotted(igc-icon) {
+        color: var-get($theme, 'item-focused-hover-text-color');
+    }
+}
+
 :host([selected]) {
     [part~='toggle'] {
         color: var-get($theme, 'item-selected-text-color');
         background: var-get($theme, 'item-selected-background');
         border-color: var-get($theme, 'item-selected-border-color');
+        z-index: 2;
+
+        ::slotted(igc-icon) {
+            color: var-get($theme, 'item-selected-icon-color');
+        }
     }
 
-    ::slotted(igc-icon) {
-        color: var-get($theme, 'item-selected-icon-color');
+    [part='toggle focused'] {
+        background: var-get($theme, 'item-selected-focus-background');
+        border-color: var-get($theme, 'item-selected-hover-border-color');
     }
 }
 
@@ -65,13 +114,29 @@ $theme: $material;
         color: var-get($theme, 'item-selected-hover-text-color');
         background: var-get($theme, 'item-selected-hover-background');
         border-color: var-get($theme, 'item-selected-hover-border-color');
+
+        ::slotted(igc-icon) {
+            color: var-get($theme, 'item-selected-hover-icon-color');
+        }
     }
 
-    ::slotted(igc-icon) {
-        color: var-get($theme, 'item-selected-hover-icon-color');
+    [part='toggle focused'] {
+        background: var-get($theme, 'item-selected-focus-hover-background');
+        border-color: var-get($theme, 'item-selected-border-color');
     }
 }
 
+:host([selected]:active) [part~='toggle'],
+:host([selected]) [part~='toggle']:active {
+        background: var-get($theme, 'item-selected-active-background');
+        color: var-get($theme, 'item-selected-hover-text-color');
+        border-color: var-get($theme, 'item-selected-active-border-color');
+
+        ::slotted(igc-icon) {
+            color: var-get($theme, 'item-selected-hover-icon-color');
+        }
+}
+
 :host([disabled]),
 :host(:disabled) {
     @include disabled();
@@ -85,12 +150,12 @@ $theme: $material;
 :host([selected]:disabled),
 :host([selected][disabled]) {
     [part~='toggle'] {
-        &::before {
-            position: absolute;
-            content: '';
-            inset: 0;
-            z-index: 3;
-            background: var-get($theme, 'disabled-selected-background');
-        }
+        color: var-get($theme, 'disabled-selected-text-color');
+        background: var-get($theme, 'disabled-selected-background');
+        border-color: var-get($theme, 'disabled-selected-border-color');
+    }
+
+    ::slotted(igc-icon) {
+        color: var-get($theme, 'disabled-selected-icon-color');
     }
 }
diff --git a/src/components/button-group/themes/shared/button/button.fluent.scss b/src/components/button-group/themes/shared/button/button.fluent.scss
index 4dbcdfefb0..cdf77271d7 100644
--- a/src/components/button-group/themes/shared/button/button.fluent.scss
+++ b/src/components/button-group/themes/shared/button/button.fluent.scss
@@ -12,7 +12,7 @@ $outline-btn-indent: rem(2px);
     }
 
     [part='toggle focused'] {
-        background: var-get($theme, 'item-background');
+        border-color: var-get($theme, 'item-border-color');
 
         &::after {
             content: '';
@@ -26,49 +26,3 @@ $outline-btn-indent: rem(2px);
         }
     }
 }
-
-:host(:hover) {
-    [part='toggle focused'] {
-        background: var-get($theme, 'item-hover-background');
-    }
-}
-
-[part~='toggle']:active {
-    background: var-get($theme, 'item-focused-background');
-}
-
-[part='toggle focused'] {
-    &:active {
-        background: var-get($theme, 'item-focused-background');
-    }
-}
-
-:host([selected]:hover) {
-    [part~='toggle'] {
-        background: var-get($theme, 'item-selected-background');
-
-        &::before {
-            content: '';
-            position: absolute;
-            pointer-events: none;
-            width: 100%;
-            height: 100%;
-            z-index: -1;
-            background: var-get($theme, 'item-selected-hover-background');
-        }
-    }
-}
-
-:host([selected]) {
-    [part~='toggle']:active {
-        background: var-get($theme, 'item-selected-focus-background');
-    }
-
-    [part='toggle focused'] {
-        background: var-get($theme, 'item-selected-background');
-
-        &:active {
-            background: var-get($theme, 'item-selected-focus-background');
-        }
-    }
-}
diff --git a/src/components/button-group/themes/shared/button/button.indigo.scss b/src/components/button-group/themes/shared/button/button.indigo.scss
index 3d59107485..11cd49a83c 100644
--- a/src/components/button-group/themes/shared/button/button.indigo.scss
+++ b/src/components/button-group/themes/shared/button/button.indigo.scss
@@ -20,72 +20,34 @@ $group-item-border-thickness: rem(1px);
     }
 
     [part='toggle focused'] {
-        z-index: 2;
         box-shadow: 0 0 0 rem(3px) var-get($theme, 'idle-shadow-color');
-        border-color: var-get($theme, 'item-border-color');
-        color: var-get($theme, 'item-focused-text-color');
-    }
-}
-
-:host(:hover) {
-    [part~='toggle'] {
-        z-index: 1;
-    }
 
-    [part='toggle focused'] {
-        border-color: var-get($theme, 'item-hover-border-color');
-        color: var-get($theme, 'item-hover-text-color');
+        ::slotted(igc-icon) {
+            color: var-get($theme, 'item-icon-color');
+        }
     }
 }
 
-[part~='toggle']:active {
-    color: var-get($theme, 'item-hover-text-color');
-    background: var-get($theme, 'item-hover-background');
-    border-color: var-get($theme, 'item-hover-border-color');
-    z-index: 2;
-
+:host(:hover) [part='toggle focused'],
+[part='toggle focused']:active {
     ::slotted(igc-icon) {
         color: var-get($theme, 'item-hover-icon-color');
     }
 }
 
-:host([selected]:hover) {
-    [part='toggle focused'] {
-        border-color: var-get($theme, 'item-selected-hover-border-color');
-    }
+:host([selected]) [part='toggle focused'] {
+    box-shadow: 0 0 0 rem(3px) var-get($theme, 'selected-shadow-color');
+    border-color: var-get($theme, 'item-selected-border-color');
 }
 
-:host([selected]) {
-    [part='toggle focused'] {
-        box-shadow: 0 0 0 rem(3px) var-get($theme, 'selected-shadow-color');
-        border-color: var-get($theme, 'item-selected-border-color');
-        color: var-get($theme, 'item-selected-hover-text-color');
-    }
-
-    [part~='toggle']:active {
-        color: var-get($theme, 'item-selected-hover-text-color');
-        background: var-get($theme, 'item-selected-hover-background');
-        border-color: var-get($theme, 'item-selected-hover-border-color');
-
-        ::slotted(igc-icon) {
-            color: var-get($theme, 'item-selected-hover-icon-color');
-        }
-    }
+:host([selected]:hover) [part='toggle focused'],
+:host([selected]) [part='toggle focused']:active {
+    border-color: var-get($theme, 'item-selected-hover-border-color');
 }
 
 :host([selected]:disabled),
 :host([selected][disabled]) {
     [part~='toggle'] {
-        color: var-get($theme, 'disabled-selected-text-color');
-        background: var-get($theme, 'disabled-selected-background');
         border: none;
-
-        &::before {
-            display: none;
-        }
-    }
-
-    ::slotted(igc-icon) {
-        color: var-get($theme, 'disabled-selected-icon-color');
     }
 }
diff --git a/src/components/button-group/themes/shared/button/button.material.scss b/src/components/button-group/themes/shared/button/button.material.scss
index e9be82e5aa..a8470064cd 100644
--- a/src/components/button-group/themes/shared/button/button.material.scss
+++ b/src/components/button-group/themes/shared/button/button.material.scss
@@ -3,102 +3,10 @@
 
 $theme: $material;
 
-:host {
-    [part~='toggle']::before {
-        position: absolute;
-        pointer-events: none;
-        width: 100%;
-        height: 100%;
-        z-index: -1;
-    }
-
-    [part='toggle focused'] {
-        color: var-get($theme, 'item-hover-text-color');
-        border-color: var-get($theme, 'item-hover-border-color');
-
-        ::slotted(igc-icon) {
-            color: var-get($theme, 'item-hover-icon-color');
-        }
-
-        &::before {
-            content: '';
-            background: var-get($theme, 'item-hover-background');
-        }
-    }
-}
-
-:host(:hover) {
-    [part~='toggle'] {
-        background: var-get($theme, 'item-background');
-
-        &::before {
-            content: '';
-            background: var-get($theme, 'item-hover-background');
-        }
-    }
-
-    [part='toggle focused'] {
-        &::before {
-            background: var-get($theme, 'item-focused-hover-background');
-        }
-    }
-}
-
-[part~='toggle']:active {
-    color: var-get($theme, 'item-hover-text-color');
-    border-color: var-get($theme, 'item-hover-border-color');
-
-    &::before {
-        content: '';
-        background: var-get($theme, 'item-focused-background');
-    }
+:host([selected]) [part='toggle focused'] {
+    color: var-get($theme, 'item-selected-hover-text-color');
 
     ::slotted(igc-icon) {
-        color: var-get($theme, 'item-hover-icon-color');
-    }
-}
-
-:host([selected]) {
-    [part~='toggle']:active {
-        background: var-get($theme, 'item-selected-background');
-        color: var-get($theme, 'item-selected-hover-text-color');
-        border-color: var-get($theme, 'item-selected-border-color');
-
-        ::slotted(igc-icon) {
-            color: var-get($theme, 'item-selected-hover-icon-color');
-        }
-        
-        &::before {
-            background: var-get($theme, 'item-selected-focus-background');
-        }
-    }
-
-    [part='toggle focused'] {
-        color: var-get($theme, 'item-selected-hover-text-color');
-        border-color: var-get($theme, 'item-selected-hover-border-color');
-
-        ::slotted(igc-icon) {
-            color: var-get($theme, 'item-selected-hover-icon-color');
-        }
-
-        &::before {
-            background: var-get($theme, 'item-selected-hover-background');
-        }
-    }
-}
-
-:host([selected]:hover) {
-    [part~='toggle'] {
-        background: var-get($theme, 'item-selected-background');
-
-        &::before {
-            background: var-get($theme, 'item-selected-hover-background');
-        }
-    }
-
-    [part='toggle focused'] {
-        &::before {
-            background: var-get($theme, 'item-selected-focus-hover-background');
-        }
+        color: var-get($theme, 'item-selected-hover-icon-color');
     }
 }