diff --git a/src/material/button-toggle/_m2-button-toggle.scss b/src/material/button-toggle/_m2-button-toggle.scss
index 79e062581b5b..19e46a6544ef 100644
--- a/src/material/button-toggle/_m2-button-toggle.scss
+++ b/src/material/button-toggle/_m2-button-toggle.scss
@@ -1,6 +1,5 @@
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m2-utils';
 @use '../core/tokens/m3-utils';
 
@@ -70,7 +69,8 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $density-scale: theming.clamp-density(inspection.get-theme-density($theme), -4);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -4);
   $size-scale: (
     0: 48px,
     -1: 44px,
diff --git a/src/material/button-toggle/_m3-button-toggle.scss b/src/material/button-toggle/_m3-button-toggle.scss
index 75aa278f885f..d7190903d501 100644
--- a/src/material/button-toggle/_m3-button-toggle.scss
+++ b/src/material/button-toggle/_m3-button-toggle.scss
@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-button-toggle.
@@ -56,7 +55,7 @@
       button-toggle-legacy-state-layer-color: null,
       button-toggle-legacy-text-color: null,
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 
   @return $tokens;
diff --git a/src/material/button/_icon-button-theme.scss b/src/material/button/_icon-button-theme.scss
index 62163661b1aa..805fdaece563 100644
--- a/src/material/button/_icon-button-theme.scss
+++ b/src/material/button/_icon-button-theme.scss
@@ -3,7 +3,9 @@
 @use './m2-icon-button';
 @use './m3-icon-button';
 @use '../core/tokens/token-utils';
+@use '../core/tokens/m2-utils';
 @use '../core/theming/inspection';
+@use '../core/theming/theming';
 
 @mixin base($theme) {
   $tokens: m2-icon-button.get-unthemable-tokens();
@@ -60,7 +62,8 @@
     @include token-utils.values(map.get(m3-icon-button.get-tokens($theme), density));
   } @else {
     $icon-size: 24px;
-    $density-scale: inspection.get-theme-density($theme);
+    $system: m2-utils.get-system($theme);
+    $density-scale: theming.clamp-density(map.get($system, density-scale), -5);
     $size-map: (
       0: 48px,
       -1: 44px,
diff --git a/src/material/button/_m2-button.scss b/src/material/button/_m2-button.scss
index 881f94898587..d2c96fcb3303 100644
--- a/src/material/button/_m2-button.scss
+++ b/src/material/button/_m2-button.scss
@@ -176,8 +176,8 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $density-scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
-  $scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
+  $system: m2-utils.get-system($theme);
+  $scale: theming.clamp-density(map.get($system, density-scale), -3);
   $sizes: (
     0: 36px,
     -1: 32px,
diff --git a/src/material/button/_m2-fab.scss b/src/material/button/_m2-fab.scss
index 2e429c0717bc..b965ec092a00 100644
--- a/src/material/button/_m2-fab.scss
+++ b/src/material/button/_m2-fab.scss
@@ -93,7 +93,8 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $density-scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -3);
 
   @return (
     fab-small-touch-target-display: if($density-scale < -1, none, block),
diff --git a/src/material/button/_m2-icon-button.scss b/src/material/button/_m2-icon-button.scss
index 18cb0a168879..10e1262e32d7 100644
--- a/src/material/button/_m2-icon-button.scss
+++ b/src/material/button/_m2-icon-button.scss
@@ -51,10 +51,11 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme, $exclude: ()) {
-  $scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -3);
 
   $tokens: (
-    icon-button-touch-target-display: if($scale < -1, none, block),
+    icon-button-touch-target-display: if($density-scale < -1, none, block),
     icon-button-state-layer-size: map.get((
       0: 48px,
       -1: 44px,
@@ -62,7 +63,7 @@
       -3: 36px,
       -4: 32px,
       -5: 28px,
-    ), $scale)
+    ), $density-scale)
   );
 
   @each $token in $exclude {
diff --git a/src/material/button/_m3-button.scss b/src/material/button/_m3-button.scss
index 5a08f1bcc106..a3dea1acc855 100644
--- a/src/material/button/_m3-button.scss
+++ b/src/material/button/_m3-button.scss
@@ -4,7 +4,6 @@
 @use '../core/tokens/m3';
 @use '../core/style/elevation';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 
 
 /// Generates custom tokens for the button.
@@ -141,7 +140,7 @@
       button-tonal-label-text-tracking: map.get($system, label-large-tracking),
       button-tonal-label-text-weight: map.get($system, label-large-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 
diff --git a/src/material/button/_m3-fab.scss b/src/material/button/_m3-fab.scss
index a768b7acb1b9..08f1f6b73668 100644
--- a/src/material/button/_m3-fab.scss
+++ b/src/material/button/_m3-fab.scss
@@ -3,7 +3,6 @@
 @use '../core/tokens/m3-utils';
 @use '../core/style/elevation';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-fab.
@@ -72,7 +71,7 @@
       fab-extended-label-text-tracking: map.get($system, label-large-tracking),
       fab-extended-label-text-weight: map.get($system, label-large-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 
   @return $tokens;
diff --git a/src/material/button/_m3-icon-button.scss b/src/material/button/_m3-icon-button.scss
index 092e83d1b7a2..7767c2fb8d4c 100644
--- a/src/material/button/_m3-icon-button.scss
+++ b/src/material/button/_m3-icon-button.scss
@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-icon-button.
@@ -35,7 +34,7 @@
       icon-button-state-layer-color: map.get($system, on-surface-variant),
     ),
     typography: (),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 
   @return $tokens;
diff --git a/src/material/checkbox/_m2-checkbox.scss b/src/material/checkbox/_m2-checkbox.scss
index 20b39a2e2a60..5a67e551e9d7 100644
--- a/src/material/checkbox/_m2-checkbox.scss
+++ b/src/material/checkbox/_m2-checkbox.scss
@@ -69,15 +69,16 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -3);
 
   @return (
-    checkbox-touch-target-display: if($scale < -1, none, block),
+    checkbox-touch-target-display: if($density-scale < -1, none, block),
     checkbox-state-layer-size: map.get((
       0: 40px,
       -1: 36px,
       -2: 32px,
       -3: 28px,
-    ), $scale)
+    ), $density-scale)
   );
 }
diff --git a/src/material/checkbox/_m3-checkbox.scss b/src/material/checkbox/_m3-checkbox.scss
index 42e6102e509b..9d5f4bbeb452 100644
--- a/src/material/checkbox/_m3-checkbox.scss
+++ b/src/material/checkbox/_m3-checkbox.scss
@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates custom tokens for mat-checkbox.
@@ -52,7 +51,7 @@
       checkbox-label-text-tracking: map.get($system, body-medium-tracking),
       checkbox-label-text-weight: map.get($system, body-medium-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 
diff --git a/src/material/chips/_m2-chip.scss b/src/material/chips/_m2-chip.scss
index 2cb64f86de30..7eaae5e49bb9 100644
--- a/src/material/chips/_m2-chip.scss
+++ b/src/material/chips/_m2-chip.scss
@@ -1,5 +1,4 @@
 @use 'sass:map';
-@use '../core/theming/inspection';
 @use '../core/theming/theming';
 @use '../core/tokens/m2-utils';
 @use '../core/tokens/m3-utils';
@@ -84,7 +83,9 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $scale: theming.clamp-density(inspection.get-theme-density($theme), -2);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -2);
+
   @return (
     // The height of the chip.
     chip-container-height: map.get(
@@ -93,7 +94,7 @@
           -1: 28px,
           -2: 24px,
         ),
-        $scale
+        $density-scale
     )
   );
 }
diff --git a/src/material/chips/_m3-chip.scss b/src/material/chips/_m3-chip.scss
index 92776aa1757a..23cc387aa05a 100644
--- a/src/material/chips/_m3-chip.scss
+++ b/src/material/chips/_m3-chip.scss
@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-chip.
@@ -67,7 +66,7 @@
       chip-label-text-tracking: map.get($system, label-large-tracking),
       chip-label-text-weight: map.get($system, label-large-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 
diff --git a/src/material/core/m2/_theming.scss b/src/material/core/m2/_theming.scss
index 541d01636267..96d234c8e05f 100644
--- a/src/material/core/m2/_theming.scss
+++ b/src/material/core/m2/_theming.scss
@@ -114,7 +114,7 @@
   @return $theme;
 }
 
-@function _define-system($primary, $accent, $warn, $is-dark, $typography) {
+@function _define-system($primary, $accent, $warn, $is-dark, $typography, $density-scale) {
   $palettes: (
     primary: $primary,
     accent: $accent,
@@ -128,7 +128,7 @@
   $sys-state: m2.md-sys-state-values();
   $sys-typography: m2.md-sys-typescale-values($typography);
 
-  $system: ();
+  $system: (density-scale: $density-scale);
   @each $map in ($sys-color, $sys-state, $sys-typography) {
     $system: map.merge($system, $map);
   }
@@ -188,7 +188,9 @@
         $accent: $accent,
         $warn: $warn,
         $is-dark: $is-dark,
-        $typography: ());
+        $typography: (),
+        $density-scale: 0
+    );
     $theme: map.set($theme, _mat-system, $system);
     @return $theme;
   }
@@ -216,7 +218,9 @@
       $accent: map.get($result, accent) or map.get($result, color, accent) or (),
       $warn: map.get($result, warn) or map.get($result, color, warn) or (),
       $is-dark: $is-dark,
-      $typography: map.get($result, typography) or ());
+      $typography: map.get($result, typography) or (),
+      $density-scale: map.get($result, density),
+  );
   $theme: map.set($theme, _mat-system, $system);
   @return $theme;
 }
diff --git a/src/material/core/theming/_definition.scss b/src/material/core/theming/_definition.scss
index 952aee73433a..da0e5013316f 100644
--- a/src/material/core/theming/_definition.scss
+++ b/src/material/core/theming/_definition.scss
@@ -90,7 +90,9 @@ $theme-version: 1;
     ),
     m3-tokens.get-sys-typeface($typography, $typography-system-variables-prefix),
   );
-  $system: ();
+  $system: (
+    density-scale: $density-scale,
+  );
   @each $sys-map in $system-maps {
     $system: map.merge($system, $sys-map);
   }
diff --git a/src/material/core/tokens/_m2-utils.scss b/src/material/core/tokens/_m2-utils.scss
index c5a84f585c40..f3af536395df 100644
--- a/src/material/core/tokens/_m2-utils.scss
+++ b/src/material/core/tokens/_m2-utils.scss
@@ -1,16 +1,24 @@
 @use 'sass:map';
+@use 'sass:meta';
 @use './m2';
 
 // Gets the theme's system values as a flat map.
 @function get-system($theme) {
-  $system: map.get($theme, _mat-system);
-  @if $system {
-    @return $system;
+  @if meta.type-of($theme) == map {
+    $system: map.get($theme, _mat-system);
+    @if $system {
+      @return $system;
+    }
+
+    // If the $theme is a typography-config, convert it to a system map.
+    @if map.has-key($theme, body-1) {
+      @return m2.md-sys-typescale-values($theme);
+    }
   }
 
-  // If the $theme is a typography-config, convert it to a system map.
-  @if map.has-key($theme, body-1) {
-    @return m2.md-sys-typescale-values($theme);
+  // If the $theme is a density scale, convert it to a system map.
+  @if meta.type-of($theme) == 'number' or $theme == minimum or $theme == maximum {
+    @return (density-scale: $theme);
   }
 
   @return ();
diff --git a/src/material/core/tokens/m3/_theme.scss b/src/material/core/tokens/m3/_theme.scss
index b037b7cf97f0..66a8c8975f4d 100644
--- a/src/material/core/tokens/m3/_theme.scss
+++ b/src/material/core/tokens/m3/_theme.scss
@@ -28,7 +28,7 @@ $_sys-maps: (
   ),
 );
 
-$_system: ();
+$_system: (density-scale: 0);
 @each $sys-map in $_sys-maps {
   $_system: map.merge($_system, _create-system-app-vars-map($sys-map));
 }
diff --git a/src/material/expansion/_m2-expansion.scss b/src/material/expansion/_m2-expansion.scss
index b18a3c44b8ec..feb5427f5ce5 100644
--- a/src/material/expansion/_m2-expansion.scss
+++ b/src/material/expansion/_m2-expansion.scss
@@ -1,6 +1,5 @@
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m2-utils';
 @use '../core/tokens/m3-utils';
 @use '../core/style/elevation';
@@ -59,7 +58,8 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -3);
   $collapsed-scale: (
     0: 48px,
     -1: 44px,
@@ -74,7 +74,7 @@
   );
 
   @return (
-    expansion-header-collapsed-state-height: map.get($collapsed-scale, $scale),
-    expansion-header-expanded-state-height: map.get($expanded-scale, $scale),
+    expansion-header-collapsed-state-height: map.get($collapsed-scale, $density-scale),
+    expansion-header-expanded-state-height: map.get($expanded-scale, $density-scale),
   );
 }
diff --git a/src/material/expansion/_m3-expansion.scss b/src/material/expansion/_m3-expansion.scss
index 6821974822d2..4ae185f87754 100644
--- a/src/material/expansion/_m3-expansion.scss
+++ b/src/material/expansion/_m3-expansion.scss
@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 @use '../core/style/elevation';
 
@@ -46,7 +45,7 @@ $prefix: (mat, expansion);
       expansion-header-text-tracking: map.get($system, title-medium-tracking),
       expansion-header-text-weight: map.get($system, title-medium-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 
diff --git a/src/material/form-field/_m2-form-field.scss b/src/material/form-field/_m2-form-field.scss
index affdb7b9c222..0afb982dc228 100644
--- a/src/material/form-field/_m2-form-field.scss
+++ b/src/material/form-field/_m2-form-field.scss
@@ -172,7 +172,8 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $density-scale: theming.clamp-density(inspection.get-theme-density($theme), -5);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -5);
   $size-scale: (
     0: 56px,
     -1: 52px,
diff --git a/src/material/form-field/_m3-form-field.scss b/src/material/form-field/_m3-form-field.scss
index 7df57eab1149..7d6b1bbfd36b 100644
--- a/src/material/form-field/_m3-form-field.scss
+++ b/src/material/form-field/_m3-form-field.scss
@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
@@ -117,7 +116,7 @@ $prefix: (mat, form-field);
       form-field-filled-label-text-weight: map.get($system, body-large-weight),
       form-field-outlined-label-text-populated-size: null,
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 
diff --git a/src/material/list/_list-theme.scss b/src/material/list/_list-theme.scss
index d1b47f683c34..63fcc239faed 100644
--- a/src/material/list/_list-theme.scss
+++ b/src/material/list/_list-theme.scss
@@ -8,6 +8,7 @@
 @use './m2-list';
 @use './m3-list';
 @use '../core/tokens/m2-utils';
+@use '../core/theming/theming';
 
 @mixin base($theme) {
   $tokens: m2-list.get-unthemable-tokens();
@@ -98,7 +99,8 @@
   @include token-utils.values($tokens);
 
   @if inspection.get-theme-version($theme) != 1 {
-    $density-scale: inspection.get-theme-density($theme);
+    $system: m2-utils.get-system($theme);
+    $density-scale: theming.clamp-density(map.get($system, density-scale), -5);
 
     .mdc-list-item__start,
     .mdc-list-item__end {
diff --git a/src/material/list/_m2-list.scss b/src/material/list/_m2-list.scss
index 062600bac2c8..1a8086592fca 100644
--- a/src/material/list/_m2-list.scss
+++ b/src/material/list/_m2-list.scss
@@ -1,6 +1,6 @@
-@use '../core/theming/inspection';
 @use 'sass:map';
 @use '../core/tokens/m2-utils';
+@use '../core/theming/theming';
 
 // Tokens that can't be configured through Angular Material's current theming API,
 // but may be in a future version of the theming API.
@@ -73,7 +73,8 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $scale: inspection.get-theme-density($theme);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -5);
 
   @return (
     list-list-item-leading-icon-start-space: 16px,
@@ -85,7 +86,7 @@
       -3: 36px,
       -4: 32px,
       -5: 24px,
-    ), $scale),
+    ), $density-scale),
     list-list-item-two-line-container-height: map.get((
       0: 64px,
       -1: 60px,
@@ -93,7 +94,7 @@
       -3: 52px,
       -4: 48px,
       -5: 48px,
-    ), $scale),
+    ), $density-scale),
     list-list-item-three-line-container-height: map.get((
       0: 88px,
       -1: 84px,
@@ -101,6 +102,6 @@
       -3: 76px,
       -4: 72px,
       -5: 56px,
-    ), $scale),
+    ), $density-scale),
   );
 }
diff --git a/src/material/list/_m3-list.scss b/src/material/list/_m3-list.scss
index d23e154502f2..68deaf0eb7c1 100644
--- a/src/material/list/_m3-list.scss
+++ b/src/material/list/_m3-list.scss
@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-list.
@@ -72,7 +71,7 @@
       list-list-item-trailing-supporting-text-tracking: map.get($system, label-small-tracking),
       list-list-item-trailing-supporting-text-weight: map.get($system, label-small-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 
diff --git a/src/material/paginator/_m2-paginator.scss b/src/material/paginator/_m2-paginator.scss
index 88054819f388..e4d114a6b040 100644
--- a/src/material/paginator/_m2-paginator.scss
+++ b/src/material/paginator/_m2-paginator.scss
@@ -1,7 +1,6 @@
 @use 'sass:math';
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m2-utils';
 @use '../core/tokens/m3-utils';
 
@@ -38,7 +37,8 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $density-scale: theming.clamp-density(inspection.get-theme-density($theme), -5);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -5);
   $size-scale: (
     0: 56px,
     -1: 52px,
diff --git a/src/material/paginator/_m3-paginator.scss b/src/material/paginator/_m3-paginator.scss
index 81d1ca322f3c..6d6660d5bd9a 100644
--- a/src/material/paginator/_m3-paginator.scss
+++ b/src/material/paginator/_m3-paginator.scss
@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-paginator.
@@ -25,7 +24,7 @@
       paginator-container-text-weight: map.get($system, body-small-weight),
       paginator-select-trigger-text-size: map.get($system, body-small-size),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 
diff --git a/src/material/radio/_m2-radio.scss b/src/material/radio/_m2-radio.scss
index 9778e6c0528c..f8c0bb5bd262 100644
--- a/src/material/radio/_m2-radio.scss
+++ b/src/material/radio/_m2-radio.scss
@@ -57,7 +57,8 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -3);
 
   @return (
     // The diameter of the radio's ripple.
@@ -66,7 +67,7 @@
       -1: 36px,
       -2: 32px,
       -3: 28px,
-    ), $scale),
-    radio-touch-target-display: if($scale < -1, none, block)
+    ), $density-scale),
+    radio-touch-target-display: if($density-scale < -1, none, block)
   );
 }
diff --git a/src/material/radio/_m3-radio.scss b/src/material/radio/_m3-radio.scss
index fa317bb3ed5c..ab4e3e607856 100644
--- a/src/material/radio/_m3-radio.scss
+++ b/src/material/radio/_m3-radio.scss
@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-radio.
@@ -41,7 +40,7 @@
       radio-label-text-tracking: map.get($system, body-medium-tracking),
       radio-label-text-weight: map.get($system, body-medium-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 
   // Temporary removal where color variants previously did not include the
diff --git a/src/material/select/_m2-select.scss b/src/material/select/_m2-select.scss
index 84a2878e1640..e94b7ee2214e 100644
--- a/src/material/select/_m2-select.scss
+++ b/src/material/select/_m2-select.scss
@@ -1,5 +1,4 @@
 @use 'sass:map';
-@use '../core/theming/inspection';
 @use '../core/theming/theming';
 @use '../core/style/elevation';
 @use '../core/tokens/m2-utils';
@@ -45,7 +44,8 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $density-scale: theming.clamp-density(inspection.get-theme-density($theme), -2);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -2);
 
   @return (
     select-arrow-transform: map.get((
diff --git a/src/material/select/_m3-select.scss b/src/material/select/_m3-select.scss
index 2baddde4f906..de5199f7b1a8 100644
--- a/src/material/select/_m3-select.scss
+++ b/src/material/select/_m3-select.scss
@@ -3,7 +3,6 @@
 @use '../core/style/elevation';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
@@ -40,7 +39,7 @@ $prefix: (mat, select);
       select-trigger-text-tracking: map.get($system, body-large-tracking),
       select-trigger-text-weight: map.get($system, body-large-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 
diff --git a/src/material/slide-toggle/_m2-slide-toggle.scss b/src/material/slide-toggle/_m2-slide-toggle.scss
index cbab6010a1c9..999114984aab 100644
--- a/src/material/slide-toggle/_m2-slide-toggle.scss
+++ b/src/material/slide-toggle/_m2-slide-toggle.scss
@@ -1,5 +1,4 @@
 @use '../core/style/elevation';
-@use '../core/theming/inspection';
 @use '../core/theming/theming';
 @use 'sass:map';
 @use '../core/tokens/m2-utils';
@@ -132,7 +131,8 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -3);
 
   @return (
     // The diameter of the handle ripple.
@@ -141,6 +141,6 @@
       -1: 36px,
       -2: 32px,
       -3: 28px,
-    ), $scale)
+    ), $density-scale)
   );
 }
diff --git a/src/material/stepper/_m2-stepper.scss b/src/material/stepper/_m2-stepper.scss
index 9ddbe00ee47f..4fd95c5b19e1 100644
--- a/src/material/stepper/_m2-stepper.scss
+++ b/src/material/stepper/_m2-stepper.scss
@@ -1,6 +1,5 @@
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m2-utils';
 @use '../core/tokens/m3-utils';
 
@@ -49,7 +48,8 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $scale: theming.clamp-density(inspection.get-theme-density($theme), -4);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -4);
   $height-config: (
     0: 72px,
     -1: 68px,
@@ -59,7 +59,7 @@
   );
 
   @return (
-    stepper-header-height: map.get($height-config, $scale),
+    stepper-header-height: map.get($height-config, $density-scale),
   );
 }
 
diff --git a/src/material/stepper/_m3-stepper.scss b/src/material/stepper/_m3-stepper.scss
index d93ba1136d47..433352c141f1 100644
--- a/src/material/stepper/_m3-stepper.scss
+++ b/src/material/stepper/_m3-stepper.scss
@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
@@ -52,7 +51,7 @@ $prefix: (mat, stepper);
       stepper-header-selected-state-label-text-size: map.get($system, title-small-size),
       stepper-header-selected-state-label-text-weight: map.get($system, title-small-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 
diff --git a/src/material/table/_m2-table.scss b/src/material/table/_m2-table.scss
index 0d7934fe83c8..389c28768548 100644
--- a/src/material/table/_m2-table.scss
+++ b/src/material/table/_m2-table.scss
@@ -1,6 +1,5 @@
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m2-utils';
 
 // Tokens that can't be configured through Angular Material's current theming API,
@@ -50,7 +49,8 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $scale: theming.clamp-density(inspection.get-theme-density($theme), -4);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -4);
   $header-scale: (
     0: 56px,
     -1: 52px,
@@ -67,8 +67,8 @@
   );
 
   @return (
-    table-header-container-height: map.get($header-scale, $scale),
-    table-footer-container-height: map.get($cell-scale, $scale),
-    table-row-item-container-height: map.get($cell-scale, $scale),
+    table-header-container-height: map.get($header-scale, $density-scale),
+    table-footer-container-height: map.get($cell-scale, $density-scale),
+    table-row-item-container-height: map.get($cell-scale, $density-scale),
   );
 }
diff --git a/src/material/table/_m3-table.scss b/src/material/table/_m3-table.scss
index b6571e5e797c..27d9f9594052 100644
--- a/src/material/table/_m3-table.scss
+++ b/src/material/table/_m3-table.scss
@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-table.
@@ -36,7 +35,7 @@
       table-footer-supporting-text-tracking: map.get($system, body-medium-tracking),
       table-footer-supporting-text-weight: map.get($system, body-medium-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 
diff --git a/src/material/tabs/_m2-tabs.scss b/src/material/tabs/_m2-tabs.scss
index b067d2b4928a..93dcf4961781 100644
--- a/src/material/tabs/_m2-tabs.scss
+++ b/src/material/tabs/_m2-tabs.scss
@@ -1,6 +1,5 @@
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m2-utils';
 @use '../core/tokens/m3-utils';
 
@@ -70,7 +69,8 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $scale: theming.clamp-density(inspection.get-theme-density($theme), -4);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -4);
 
   @return (
     tab-container-height: map.get((
@@ -79,6 +79,6 @@
       -2: 40px,
       -3: 36px,
       -4: 32px,
-    ), $scale),
+    ), $density-scale),
   );
 }
diff --git a/src/material/tabs/_m3-tabs.scss b/src/material/tabs/_m3-tabs.scss
index 67949570618f..b5236583183b 100644
--- a/src/material/tabs/_m3-tabs.scss
+++ b/src/material/tabs/_m3-tabs.scss
@@ -2,7 +2,6 @@
 @use 'sass:map';
 @use 'sass:list';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates the tokens for MDC tab
@@ -44,7 +43,7 @@
       tab-label-text-tracking: map.get($system, title-small-tracking),
       tab-label-text-weight: map.get($system, title-small-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 
diff --git a/src/material/toolbar/_m2-toolbar.scss b/src/material/toolbar/_m2-toolbar.scss
index 269ab1c96ee0..f877b02e63f1 100644
--- a/src/material/toolbar/_m2-toolbar.scss
+++ b/src/material/toolbar/_m2-toolbar.scss
@@ -1,6 +1,5 @@
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m2-utils';
 
 // Tokens that can't be configured through Angular Material's current theming API,
@@ -32,7 +31,8 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $density-scale: theming.clamp-density(inspection.get-theme-density($theme), -3);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -3);
   $standard-scale: (
     0: 64px,
     -1: 60px,
diff --git a/src/material/toolbar/_m3-toolbar.scss b/src/material/toolbar/_m3-toolbar.scss
index dd1a1972b20b..90ba878639f3 100644
--- a/src/material/toolbar/_m3-toolbar.scss
+++ b/src/material/toolbar/_m3-toolbar.scss
@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 /// Generates custom tokens for the mat-toolbar.
@@ -26,7 +25,7 @@
       toolbar-title-text-tracking: map.get($system, title-large-tracking),
       toolbar-title-text-weight: map.get($system, title-large-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }
 
diff --git a/src/material/tree/_m2-tree.scss b/src/material/tree/_m2-tree.scss
index ddf81838115d..e0944b29da4f 100644
--- a/src/material/tree/_m2-tree.scss
+++ b/src/material/tree/_m2-tree.scss
@@ -1,6 +1,5 @@
 @use 'sass:map';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m2-utils';
 
 // Tokens that can't be configured through Angular Material's current theming API,
@@ -33,7 +32,8 @@
 
 // Tokens that can be configured through Angular Material's density theming API.
 @function get-density-tokens($theme) {
-  $density-scale: theming.clamp-density(inspection.get-theme-density($theme), -4);
+  $system: m2-utils.get-system($theme);
+  $density-scale: theming.clamp-density(map.get($system, density-scale), -4);
   $min-height-scale: (
     0: 48px,
     -1: 44px,
diff --git a/src/material/tree/_m3-tree.scss b/src/material/tree/_m3-tree.scss
index 4b51c72d7a5a..9e921b069f21 100644
--- a/src/material/tree/_m3-tree.scss
+++ b/src/material/tree/_m3-tree.scss
@@ -2,7 +2,6 @@
 @use 'sass:list';
 @use '../core/tokens/m3-utils';
 @use '../core/theming/theming';
-@use '../core/theming/inspection';
 @use '../core/tokens/m3';
 
 // The prefix used to generate the fully qualified name for tokens in this file.
@@ -23,7 +22,7 @@ $prefix: (mat, tree);
       tree-node-text-size: map.get($system, body-large-size),
       tree-node-text-weight: map.get($system, body-large-weight),
     ),
-    density: get-density-tokens(map.get($theme, inspection.$internals, density-scale)),
+    density: get-density-tokens(map.get($system, density-scale)),
   );
 }