diff --git a/lib/java/com/google/android/material/color/res/values/tokens.xml b/lib/java/com/google/android/material/color/res/values/tokens.xml
index 669bcabc5fd..2e9736efde4 100644
--- a/lib/java/com/google/android/material/color/res/values/tokens.xml
+++ b/lib/java/com/google/android/material/color/res/values/tokens.xml
@@ -42,6 +42,7 @@
@color/m3_ref_palette_neutral_variant80
@color/m3_ref_palette_neutral90
@color/m3_ref_palette_neutral20
+ ?attr/colorPrimary
@color/m3_ref_palette_neutral10
@color/m3_ref_palette_neutral90
@@ -76,6 +77,7 @@
@color/m3_ref_palette_neutral_variant30
@color/m3_ref_palette_neutral20
@color/m3_ref_palette_neutral95
+ ?attr/colorPrimary
@color/m3_ref_palette_neutral99
@color/m3_ref_palette_neutral10
diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml
index 7fe851ffa79..7c50a938151 100644
--- a/lib/java/com/google/android/material/dialog/res/values/themes_base.xml
+++ b/lib/java/com/google/android/material/dialog/res/values/themes_base.xml
@@ -237,7 +237,7 @@
- true
- - ?attr/colorPrimary
+ - @macro/m3_sys_color_light_surface_tint
- @style/ThemeOverlay.Material3.Dialog.Alert
@@ -471,7 +471,7 @@
- true
- - ?attr/colorPrimary
+ - @macro/m3_sys_color_dark_surface_tint
- @style/ThemeOverlay.Material3.Dialog.Alert
diff --git a/lib/java/com/google/android/material/theme/res/values/themes_base.xml b/lib/java/com/google/android/material/theme/res/values/themes_base.xml
index 21d158314b0..0f16d1dc6a5 100644
--- a/lib/java/com/google/android/material/theme/res/values/themes_base.xml
+++ b/lib/java/com/google/android/material/theme/res/values/themes_base.xml
@@ -249,7 +249,7 @@
- true
- - ?attr/colorPrimary
+ - @macro/m3_sys_color_light_surface_tint
- @style/ThemeOverlay.Material3.DynamicColors.Light
@@ -485,7 +485,7 @@
- true
- - ?attr/colorPrimary
+ - @macro/m3_sys_color_dark_surface_tint
- @style/ThemeOverlay.Material3.DynamicColors.Dark