diff --git a/src/material/core/tokens/m3/definitions/_md-sys-color.scss b/src/material/core/tokens/m3/definitions/_md-sys-color.scss
index 81d3638ec619..f4668551305f 100644
--- a/src/material/core/tokens/m3/definitions/_md-sys-color.scss
+++ b/src/material/core/tokens/m3/definitions/_md-sys-color.scss
@@ -53,7 +53,7 @@ $_default-dark: (
     'surface-bright': map.get($deps, 'md-ref-palette', 'neutral24'),
     'surface-container': map.get($deps, 'md-ref-palette', 'neutral12'),
     'surface-container-high': map.get($deps, 'md-ref-palette', 'neutral17'),
-    'surface-container-highest': map.get($deps, 'md-ref-palette', 'neutral24'),
+    'surface-container-highest': map.get($deps, 'md-ref-palette', 'neutral22'),
     'surface-container-low': map.get($deps, 'md-ref-palette', 'neutral10'),
     'surface-container-lowest': map.get($deps, 'md-ref-palette', 'neutral4'),
     'surface-dim': map.get($deps, 'md-ref-palette', 'neutral6'),
@@ -80,20 +80,20 @@ $_default-light: (
     'inverse-surface': map.get($deps, 'md-ref-palette', 'neutral20'),
     'on-background': map.get($deps, 'md-ref-palette', 'neutral10'),
     'on-error': map.get($deps, 'md-ref-palette', 'error100'),
-    'on-error-container': map.get($deps, 'md-ref-palette', 'error10'),
+    'on-error-container': map.get($deps, 'md-ref-palette', 'error30'),
     'on-primary': map.get($deps, 'md-ref-palette', 'primary100'),
-    'on-primary-container': map.get($deps, 'md-ref-palette', 'primary10'),
+    'on-primary-container': map.get($deps, 'md-ref-palette', 'primary30'),
     'on-primary-fixed': map.get($deps, 'md-ref-palette', 'primary10'),
     'on-primary-fixed-variant': map.get($deps, 'md-ref-palette', 'primary30'),
     'on-secondary': map.get($deps, 'md-ref-palette', 'secondary100'),
-    'on-secondary-container': map.get($deps, 'md-ref-palette', 'secondary10'),
+    'on-secondary-container': map.get($deps, 'md-ref-palette', 'secondary30'),
     'on-secondary-fixed': map.get($deps, 'md-ref-palette', 'secondary10'),
     'on-secondary-fixed-variant':
       map.get($deps, 'md-ref-palette', 'secondary30'),
     'on-surface': map.get($deps, 'md-ref-palette', 'neutral10'),
     'on-surface-variant': map.get($deps, 'md-ref-palette', 'neutral-variant30'),
     'on-tertiary': map.get($deps, 'md-ref-palette', 'tertiary100'),
-    'on-tertiary-container': map.get($deps, 'md-ref-palette', 'tertiary10'),
+    'on-tertiary-container': map.get($deps, 'md-ref-palette', 'tertiary30'),
     'on-tertiary-fixed': map.get($deps, 'md-ref-palette', 'tertiary10'),
     'on-tertiary-fixed-variant': map.get($deps, 'md-ref-palette', 'tertiary30'),
     'outline': map.get($deps, 'md-ref-palette', 'neutral-variant50'),