diff --git a/list/lib/_list.scss b/list/lib/_list.scss
index 5afb7155b8..b2d16b8708 100644
--- a/list/lib/_list.scss
+++ b/list/lib/_list.scss
@@ -12,7 +12,6 @@
 @use 'sass:string';
 // go/keep-sorted end
 // go/keep-sorted start
-@use '../../elevation/lib/elevation';
 @use '../../sass/theme';
 @use '../../tokens';
 @use './listitem/list-item';
diff --git a/menu/lib/_menu.scss b/menu/lib/_menu.scss
index 5392fbfa3b..ed0083e597 100644
--- a/menu/lib/_menu.scss
+++ b/menu/lib/_menu.scss
@@ -39,21 +39,20 @@ $_custom-property-prefix: 'menu';
 
     @include md-list.theme(
       (
-        list-item-container-color: var(--_container-color),
+        'list-item-container-color': var(--_container-color),
       )
     );
 
     @include elevation.theme(
       (
-        level: var(--_container-elevation),
-        shadow-color: var(--_container-shadow-color),
-        surface-tint: var(--_container-surface-tint-layer-color),
+        'level': var(--_container-elevation),
+        'shadow-color': var(--_container-shadow-color),
       )
     );
 
     @include focus-ring.theme(
       (
-        shape: var(--_container-shape),
+        'shape': var(--_container-shape),
       )
     );
 
diff --git a/menu/lib/menu.ts b/menu/lib/menu.ts
index 69b4de2d3d..a96383f360 100644
--- a/menu/lib/menu.ts
+++ b/menu/lib/menu.ts
@@ -8,7 +8,7 @@
 // tslint:disable:no-new-decorators
 import '../../list/list.js';
 import '../../focus/focus-ring.js';
-import '../../elevation/elevation-surface.js';
+import '../../elevation/elevation.js';
 
 import {html, isServer, LitElement} from 'lit';
 import {eventOptions, property, query, state} from 'lit/decorators.js';
@@ -297,7 +297,7 @@ export abstract class Menu extends LitElement {
    * Renders the elevation component.
    */
   protected renderElevation() {
-    return html`<md-elevation-surface shadow></md-elevation-surface>`;
+    return html`<md-elevation></md-elevation>`;
   }
 
   /**
diff --git a/tokens/_md-comp-list.scss b/tokens/_md-comp-list.scss
index e505e76240..e9b855ef09 100644
--- a/tokens/_md-comp-list.scss
+++ b/tokens/_md-comp-list.scss
@@ -7,13 +7,12 @@
 @use 'sass:map';
 // go/keep-sorted end
 // go/keep-sorted start
+@use './md-sys-color';
 @use './md-sys-elevation';
 @use './md-sys-shape';
 @use './md-sys-state';
 @use './md-sys-typescale';
-// TODO(b/272526637): tonal surface update
-@use './v0_161/md-comp-list';
-@use './v0_161/md-sys-color';
+@use './v0_172/md-comp-list';
 // go/keep-sorted end
 
 $_default: (
diff --git a/tokens/_md-comp-menu.scss b/tokens/_md-comp-menu.scss
index 06ad4313bc..12f3c28dbc 100644
--- a/tokens/_md-comp-menu.scss
+++ b/tokens/_md-comp-menu.scss
@@ -4,11 +4,10 @@
 //
 
 // go/keep-sorted start
+@use './md-sys-color';
 @use './md-sys-elevation';
 @use './md-sys-shape';
-// TODO(b/272526637): tonal surface update
-@use './v0_161/md-comp-menu';
-@use './v0_161/md-sys-color';
+@use './v0_172/md-comp-menu';
 // go/keep-sorted end
 
 $_default: (