diff --git a/package-lock.json b/package-lock.json
index cdae18e3989..63bc7201c61 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
         "@types/source-map": "0.5.2",
         "fflate": "^0.7.3",
         "hammerjs": "^2.0.8",
-        "igniteui-theming": "^3.0.6",
+        "igniteui-theming": "^3.1.0",
         "igniteui-trial-watermark": "^2.0.0",
         "lodash-es": "^4.17.21",
         "rxjs": "^6.6.7",
@@ -12382,9 +12382,9 @@
       }
     },
     "node_modules/igniteui-theming": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/igniteui-theming/-/igniteui-theming-3.0.6.tgz",
-      "integrity": "sha512-4nZN7iqp8+H9EgWWHVqXgwUekxxVn/2Bnhfy5UhP3Tn4hXoTR1RqgjgMUSmcxvAmLGwhQNFB3GlESso5YQbs2w==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/igniteui-theming/-/igniteui-theming-3.1.0.tgz",
+      "integrity": "sha512-7FtztYXu45h7AyKgNFQuMA1wPQ5UhZTDqsAmGoOTLvrhLELe0ar1Ikq487IByDsOnyl6jhv1I4ruA7DfsFTJQw==",
       "peerDependencies": {
         "sass": "^1.58.1"
       }
diff --git a/package.json b/package.json
index 35999f8d44b..cd8c76cb0e0 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "@types/source-map": "0.5.2",
     "fflate": "^0.7.3",
     "hammerjs": "^2.0.8",
-    "igniteui-theming": "^3.0.6",
+    "igniteui-theming": "^3.1.0",
     "igniteui-trial-watermark": "^2.0.0",
     "lodash-es": "^4.17.21",
     "rxjs": "^6.6.7",
diff --git a/projects/igniteui-angular/package.json b/projects/igniteui-angular/package.json
index 375d7f9f074..1fd7b50d698 100644
--- a/projects/igniteui-angular/package.json
+++ b/projects/igniteui-angular/package.json
@@ -76,7 +76,7 @@
         "igniteui-trial-watermark": "^1.0.3",
         "lodash-es": "^4.17.21",
         "uuid": "^9.0.0",
-        "igniteui-theming": "^3.0.6",
+        "igniteui-theming": "^3.1.0",
         "@igniteui/material-icons-extended": "^3.0.0"
     },
     "peerDependencies": {
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/action-strip/_action-strip-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/action-strip/_action-strip-theme.scss
index 906d7512636..32777dc66e8 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/action-strip/_action-strip-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/action-strip/_action-strip-theme.scss
@@ -48,7 +48,7 @@
     }
 
     @if not($actions-border-radius) {
-        $actions-border-radius: border-radius(map.get($theme, 'actions-border-radius')...);
+        $actions-border-radius: map.get($theme, 'actions-border-radius');
     }
 
     @return extend($theme, (
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss
index f346c446b62..3e182142caf 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/button-group/_button-group-theme.scss
@@ -132,10 +132,6 @@
         $shadow: elevation($elevation);
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         selector: $selector,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/button/_button-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/button/_button-theme.scss
index 146c77ba709..09975e09396 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/button/_button-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/button/_button-theme.scss
@@ -167,10 +167,6 @@
             $_active-shadow: elevation($active-elevation);
         }
 
-        @if not($_border-radius) {
-            $_border-radius: border-radius(map.get($_schema, 'border-radius')...);
-        }
-
         $themes: map.merge($themes, (
             $_name: extend( digest-schema($_schema), (
                 name: $name,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-theme.scss
index 43fef81bb5e..406f68a7ad6 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/calendar/_calendar-theme.scss
@@ -323,18 +323,6 @@
         $week-number-color: text-contrast($week-number-background);
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
-    @if not($month-border-radius) {
-        $month-border-radius: border-radius(map.get($theme, 'month-border-radius')...);
-    }
-
-    @if not($date-border-radius) {
-        $date-border-radius: border-radius(map.get($theme, 'date-border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         selector: $selector,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/card/_card-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/card/_card-theme.scss
index bfed16deb50..b445e852f8a 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/card/_card-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/card/_card-theme.scss
@@ -88,10 +88,6 @@
         $hover-shadow: elevation($hover-elevation);
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         background: $background,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/carousel/_carousel-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/carousel/_carousel-theme.scss
index e1c6d9aeb30..aed4e184c11 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/carousel/_carousel-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/carousel/_carousel-theme.scss
@@ -89,10 +89,6 @@
         }
     }
 
-    @if not($border-radius){
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
 
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 1844783983d..c26bf86afc6 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
@@ -67,14 +67,6 @@
     $theme: digest-schema($checkbox-schema);
     $meta: map.get($theme, '_meta');
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
-    @if not($border-radius-ripple) {
-        $border-radius-ripple: border-radius(map.get($theme, 'border-radius-ripple')...);
-    }
-
     @return extend($theme, (
         name: $name,
         label-color: $label-color,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/chip/_chip-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/chip/_chip-theme.scss
index 208c590d086..e625c74212e 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/chip/_chip-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/chip/_chip-theme.scss
@@ -203,10 +203,6 @@
         $ghost-shadow: elevation($ghost-elevation);
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         selector: $selector,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/dialog/_dialog-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/dialog/_dialog-theme.scss
index e7b115fab51..7ced3e55367 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/dialog/_dialog-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/dialog/_dialog-theme.scss
@@ -65,10 +65,6 @@
         $shadow: elevation($elevation);
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         selector: $selector,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/drop-down/_drop-down-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/drop-down/_drop-down-theme.scss
index 45bb4a5a298..ece9ffca52a 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/drop-down/_drop-down-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/drop-down/_drop-down-theme.scss
@@ -152,14 +152,6 @@
         $shadow: elevation($elevation);
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
-    @if not($item-border-radius) {
-        $item-border-radius: border-radius(map.get($theme, 'item-border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         selector: $selector,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/expansion-panel/_expansion-panel-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/expansion-panel/_expansion-panel-theme.scss
index 950a803df8e..b388d846f29 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/expansion-panel/_expansion-panel-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/expansion-panel/_expansion-panel-theme.scss
@@ -71,10 +71,6 @@
         $body-color: text-contrast($body-background);
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         header-background: $header-background,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss
index ca561f59fcd..60454f49d66 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss
@@ -455,7 +455,7 @@
     }
 
     @if not($drop-area-border-radius) {
-        $drop-area-border-radius: border-radius(map.get($theme, 'drop-area-border-radius')...);
+        $drop-area-border-radius: map.get($theme, 'drop-area-border-radius');
     }
 
     @return extend($theme, (
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss
index 1abc9cec64a..ac731b11050 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/input/_input-group-theme.scss
@@ -206,15 +206,15 @@
     }
 
     @if not($box-border-radius) {
-        $box-border-radius: border-radius(map.get($theme, 'box-border-radius')...);
+        $box-border-radius: map.get($theme, 'box-border-radius');
     }
 
     @if not($border-border-radius) {
-        $border-border-radius: border-radius(map.get($theme, 'border-border-radius')...);
+        $border-border-radius: map.get($theme, 'border-border-radius');
     }
 
     @if not($search-border-radius) {
-        $search-border-radius: border-radius(map.get($theme, 'search-border-radius')...);
+        $search-border-radius: map.get($theme, 'search-border-radius');
     }
 
     @return extend($theme, (
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/list/_list-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/list/_list-theme.scss
index 3f52604ab3f..092f09466d0 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/list/_list-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/list/_list-theme.scss
@@ -202,14 +202,6 @@
         $item-subtitle-color-active: $item-text-color-active;
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
-    @if not($item-border-radius) {
-        $item-border-radius: border-radius(map.get($theme, 'item-border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         border-radius: $border-radius,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss
index d662520c8a3..6c92b85fdb5 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/navdrawer/_navdrawer-theme.scss
@@ -113,14 +113,6 @@
         $shadow: elevation($elevation);
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
-    @if not($item-border-radius) {
-        $item-border-radius: border-radius(map.get($theme, 'item-border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         border-radius: $border-radius,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-theme.scss
index f3caa90ca8e..425d1504a7c 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/progress/_progress-theme.scss
@@ -55,7 +55,7 @@
     $meta: map.get($theme, '_meta');
 
     @if not($track-border-radius) {
-        $track-border-radius: border-radius(map.get($theme, 'track-border-radius')...);
+        $track-border-radius: map.get($theme, 'track-border-radius');
     }
 
     @return extend($theme, (
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/snackbar/_snackbar-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/snackbar/_snackbar-theme.scss
index 84284761262..5bf7ddfea87 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/snackbar/_snackbar-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/snackbar/_snackbar-theme.scss
@@ -59,10 +59,6 @@
         $shadow: elevation($elevation);
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         border-radius: $border-radius,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/splitter/_splitter-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/splitter/_splitter-theme.scss
index 19bfe302c48..3619ece5bd8 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/splitter/_splitter-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/splitter/_splitter-theme.scss
@@ -53,10 +53,6 @@
         $expander-color: text-contrast($bar-color);
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         bar-color: $bar-color,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/stepper/_stepper-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/stepper/_stepper-theme.scss
index 160e4b3eb9b..b27c7cd3383 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/stepper/_stepper-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/stepper/_stepper-theme.scss
@@ -230,11 +230,11 @@
     }
 
     @if not($border-radius-indicator) {
-        $border-radius-indicator: border-radius(map.get($theme, 'border-radius-indicator')...);
+        $border-radius-indicator: map.get($theme, 'border-radius-indicator');
     }
 
     @if not($border-radius-step-header) {
-        $border-radius-step-header: border-radius(map.get($theme, 'border-radius-step-header')...);
+        $border-radius-step-header: map.get($theme, 'border-radius-step-header');
     }
 
     @return extend($theme, (
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/switch/_switch-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/switch/_switch-theme.scss
index ecae1b6a3d6..d4e65d30619 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/switch/_switch-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/switch/_switch-theme.scss
@@ -117,15 +117,15 @@
     }
 
     @if not($border-radius-track) {
-        $border-radius-track: border-radius(map.get($theme, 'border-radius-track')...);
+        $border-radius-track: map.get($theme, 'border-radius-track');
     }
 
     @if not($border-radius-thumb) {
-        $border-radius-thumb: border-radius(map.get($theme, 'border-radius-thumb')...);
+        $border-radius-thumb: map.get($theme, 'border-radius-thumb');
     }
 
     @if not($border-radius-ripple) {
-        $border-radius-ripple: border-radius(map.get($theme, 'border-radius-ripple')...);
+        $border-radius-ripple: map.get($theme, 'border-radius-ripple');
     }
 
     @return extend($theme, (
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/tabs/_tabs-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/tabs/_tabs-theme.scss
index 36cdc46bb31..56a0298c4cd 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/tabs/_tabs-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/tabs/_tabs-theme.scss
@@ -164,10 +164,6 @@
         $tab-ripple-color: text-contrast($item-background);
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         item-text-color: $item-text-color,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/time-picker/_time-picker-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/time-picker/_time-picker-theme.scss
index afb318eb4ba..aea0cdc548f 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/time-picker/_time-picker-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/time-picker/_time-picker-theme.scss
@@ -109,14 +109,6 @@
         $dropdown-shadow: elevation($elevation);
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
-    @if not($active-item-border-radius) {
-        $active-item-border-radius: border-radius(map.get($theme, 'active-item-border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         selector: $selector,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/toast/_toast-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/toast/_toast-theme.scss
index c148827721c..1d863ae9817 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/toast/_toast-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/toast/_toast-theme.scss
@@ -55,10 +55,6 @@
         $text-color: text-contrast($background);
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         background: $background,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/tooltip/_tooltip-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/tooltip/_tooltip-theme.scss
index 710fb35a7be..cb8fe265e2f 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/tooltip/_tooltip-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/tooltip/_tooltip-theme.scss
@@ -46,10 +46,6 @@
         $text-color: text-contrast($background);
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         selector: $selector,
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/watermark/_watermark-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/watermark/_watermark-theme.scss
index 15ef781bca8..611c1118c36 100644
--- a/projects/igniteui-angular/src/lib/core/styles/components/watermark/_watermark-theme.scss
+++ b/projects/igniteui-angular/src/lib/core/styles/components/watermark/_watermark-theme.scss
@@ -48,10 +48,6 @@
         $color: text-contrast($link-background);
     }
 
-    @if not($border-radius) {
-        $border-radius: border-radius(map.get($theme, 'border-radius')...);
-    }
-
     @return extend($theme, (
         name: $name,
         selector: 'igc-trial-watermark',