diff --git a/lib/java/com/google/android/material/appbar/res/values/dimens.xml b/lib/java/com/google/android/material/appbar/res/values/dimens.xml
index 4184e1d68e2..d677f62e5f3 100644
--- a/lib/java/com/google/android/material/appbar/res/values/dimens.xml
+++ b/lib/java/com/google/android/material/appbar/res/values/dimens.xml
@@ -20,9 +20,9 @@
 
   <dimen name="mtrl_toolbar_default_height">56dp</dimen>
 
-  <dimen name="m3_appbar_size_compact">@dimen/m3_comp_top_app_bar_small_container_height</dimen>
-  <dimen name="m3_appbar_size_medium">@dimen/m3_comp_top_app_bar_medium_container_height</dimen>
-  <dimen name="m3_appbar_size_large">@dimen/m3_comp_top_app_bar_large_container_height</dimen>
+  <dimen name="m3_appbar_size_compact">64dp</dimen>
+  <dimen name="m3_appbar_size_medium">112dp</dimen>
+  <dimen name="m3_appbar_size_large">152dp</dimen>
 
   <dimen name="m3_appbar_expanded_title_margin_horizontal">16dp</dimen>
   <dimen name="m3_appbar_expanded_title_margin_bottom">16dp</dimen>
diff --git a/lib/java/com/google/android/material/appbar/res/values/styles.xml b/lib/java/com/google/android/material/appbar/res/values/styles.xml
index 07931c1e001..fdcf809f2e1 100644
--- a/lib/java/com/google/android/material/appbar/res/values/styles.xml
+++ b/lib/java/com/google/android/material/appbar/res/values/styles.xml
@@ -149,8 +149,6 @@
   <!-- M3 AppBarLayout styles -->
   <style name="Widget.Material3.AppBarLayout" parent="Widget.MaterialComponents.AppBarLayout.Surface">
     <item name="liftOnScroll">true</item>
-    <item name="elevation">@dimen/m3_comp_top_app_bar_small_container_elevation</item>
-    <item name="android:background">@macro/m3_comp_top_app_bar_small_container_color</item>
 
     <!-- On newer API levels, hide shadows while keeping elevation. -->
     <item name="android:outlineAmbientShadowColor" tools:ignore="NewApi">@android:color/transparent</item>
@@ -159,9 +157,9 @@
 
   <!-- M3 CollapsingToolbarLayout styles -->
   <style name="Base.Widget.Material3.CollapsingToolbar" parent="Widget.MaterialComponents.CollapsingToolbar">
-    <item name="collapsedTitleTextAppearance">@macro/m3_comp_top_app_bar_small_headline_type</item>
-    <item name="collapsedTitleTextColor">@macro/m3_comp_top_app_bar_small_headline_color</item>
-    <item name="expandedTitleTextColor">@macro/m3_comp_top_app_bar_small_headline_color</item>
+    <item name="collapsedTitleTextAppearance">?attr/textAppearanceTitleLarge</item>
+    <item name="collapsedTitleTextColor">?attr/colorOnSurface</item>
+    <item name="expandedTitleTextColor">?attr/colorOnSurface</item>
     <item name="expandedTitleMarginStart">@dimen/m3_appbar_expanded_title_margin_horizontal</item>
     <item name="expandedTitleMarginEnd">@dimen/m3_appbar_expanded_title_margin_horizontal</item>
     <item name="expandedTitleMarginBottom">@dimen/m3_appbar_expanded_title_margin_bottom</item>
@@ -183,21 +181,17 @@
 
   <style name="Widget.Material3.CollapsingToolbar.Medium" parent="Base.Widget.Material3.CollapsingToolbar">
     <item name="scrimVisibleHeightTrigger">@dimen/m3_appbar_scrim_height_trigger_medium</item>
-    <item name="collapsedTitleTextColor">@macro/m3_comp_top_app_bar_medium_headline_color</item>
-    <item name="expandedTitleTextColor">@macro/m3_comp_top_app_bar_medium_headline_color</item>
-    <item name="expandedTitleTextAppearance">@macro/m3_comp_top_app_bar_medium_headline_type</item>
+    <item name="expandedTitleTextAppearance">?attr/textAppearanceHeadlineSmall</item>
   </style>
 
   <style name="Widget.Material3.CollapsingToolbar.Large" parent="Base.Widget.Material3.CollapsingToolbar">
     <item name="scrimVisibleHeightTrigger">@dimen/m3_appbar_scrim_height_trigger_large</item>
-    <item name="collapsedTitleTextColor">@macro/m3_comp_top_app_bar_large_headline_color</item>
-    <item name="expandedTitleTextColor">@macro/m3_comp_top_app_bar_large_headline_color</item>
-    <item name="expandedTitleTextAppearance">@macro/m3_comp_top_app_bar_large_headline_type</item>
+    <item name="expandedTitleTextAppearance">?attr/textAppearanceHeadlineMedium</item>
   </style>
 
   <!-- Style for a M3 Toolbar. -->
   <style name="Widget.Material3.Toolbar" parent="Widget.AppCompat.Toolbar">
-    <item name="titleTextAppearance">@macro/m3_comp_top_app_bar_small_headline_type</item>
+    <item name="titleTextAppearance">?attr/textAppearanceTitleLarge</item>
     <item name="subtitleTextAppearance">?attr/textAppearanceTitleMedium</item>
     <item name="contentInsetStartWithNavigation">0dp</item>
 
@@ -210,9 +204,9 @@
        colors for text and iconography). Use with MaterialToolbar to get
        navigation icon and menu icon coloring. -->
   <style name="Widget.Material3.Toolbar.OnSurface">
-    <item name="titleTextColor">@macro/m3_comp_top_app_bar_small_headline_color</item>
+    <item name="titleTextColor">?attr/colorOnSurface</item>
     <item name="subtitleTextColor">?attr/colorOnSurfaceVariant</item>
-    <item name="navigationIconTint">@macro/m3_comp_top_app_bar_small_leading_icon_color</item>
+    <item name="navigationIconTint">?attr/colorOnSurface</item>
     <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Toolbar.Surface</item>
   </style>
 
@@ -220,12 +214,12 @@
        colors for text and iconography). Use with MaterialToolbar to get
        navigation icon and menu icon coloring. -->
   <style name="Widget.Material3.Toolbar.Surface" parent="Widget.Material3.Toolbar.OnSurface">
-    <item name="android:background">@macro/m3_comp_top_app_bar_small_container_color</item>
+    <item name="android:background">?attr/colorSurface</item>
   </style>
 
   <style name="ThemeOverlay.Material3.Toolbar.Surface" parent="">
-    <item name="actionMenuTextColor">@macro/m3_comp_top_app_bar_small_trailing_icon_color</item>
-    <item name="colorControlNormal">@macro/m3_comp_top_app_bar_small_trailing_icon_color</item>
+    <item name="actionMenuTextColor">?attr/colorOnSurfaceVariant</item>
+    <item name="colorControlNormal">?attr/colorOnSurfaceVariant</item>
   </style>
 
   <!-- Style for a M3 ActionBar (inherited from AppCompat due to different
@@ -233,9 +227,9 @@
   <style name="Base.Widget.Material3.ActionBar.Solid" parent="Widget.AppCompat.ActionBar.Solid">
     <item name="titleTextStyle">@style/TextAppearance.Material3.ActionBar.Title</item>
     <item name="subtitleTextStyle">@style/TextAppearance.Material3.ActionBar.Subtitle</item>
-    <item name="background">@macro/m3_comp_top_app_bar_small_container_color</item>
-    <item name="backgroundStacked">@macro/m3_comp_top_app_bar_small_container_color</item>
-    <item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_container_color</item>
+    <item name="background">?attr/colorSurface</item>
+    <item name="backgroundStacked">?attr/colorSurface</item>
+    <item name="backgroundSplit">?attr/colorSurface</item>
   </style>
 
   <style name="Widget.Material3.ActionBar.Solid" parent="Base.Widget.Material3.ActionBar.Solid" />
@@ -243,9 +237,9 @@
   <style name="Base.Widget.Material3.Light.ActionBar.Solid" parent="Widget.AppCompat.Light.ActionBar.Solid">
     <item name="titleTextStyle">@style/TextAppearance.Material3.ActionBar.Title</item>
     <item name="subtitleTextStyle">@style/TextAppearance.Material3.ActionBar.Subtitle</item>
-    <item name="background">@macro/m3_comp_top_app_bar_small_container_color</item>
-    <item name="backgroundStacked">@macro/m3_comp_top_app_bar_small_container_color</item>
-    <item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_container_color</item>
+    <item name="background">?attr/colorSurface</item>
+    <item name="backgroundStacked">?attr/colorSurface</item>
+    <item name="backgroundSplit">?attr/colorSurface</item>
   </style>
 
   <style name="Widget.Material3.Light.ActionBar.Solid" parent="Base.Widget.Material3.Light.ActionBar.Solid" />
@@ -253,14 +247,14 @@
   <style name="Base.Widget.Material3.ActionMode" parent="Widget.AppCompat.ActionMode">
     <item name="titleTextStyle">@style/TextAppearance.Material3.ActionBar.Title</item>
     <item name="subtitleTextStyle">@style/TextAppearance.Material3.ActionBar.Subtitle</item>
-    <item name="background">@macro/m3_comp_top_app_bar_small_container_color</item>
-    <item name="backgroundSplit">@macro/m3_comp_top_app_bar_small_container_color</item>
+    <item name="background">?attr/colorSurface</item>
+    <item name="backgroundSplit">?attr/colorSurface</item>
   </style>
 
   <style name="Widget.Material3.ActionMode" parent="Base.Widget.Material3.ActionMode" />
 
   <style name="TextAppearance.Material3.ActionBar.Title" parent="TextAppearance.Material3.TitleLarge">
-    <item name="android:textColor">@macro/m3_comp_top_app_bar_small_headline_color</item>
+    <item name="android:textColor">?attr/colorOnSurface</item>
   </style>
 
   <style name="TextAppearance.Material3.ActionBar.Subtitle" parent="TextAppearance.Material3.TitleMedium">
diff --git a/lib/java/com/google/android/material/appbar/res/values/tokens.xml b/lib/java/com/google/android/material/appbar/res/values/tokens.xml
deleted file mode 100644
index 33130541c42..00000000000
--- a/lib/java/com/google/android/material/appbar/res/values/tokens.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2022 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
--->
-<!-- AUTOGENERATED FILE. DO NOT MODIFY. -->
-<!-- Version: v0.147 -->
-
-<resources>
-
-  <!-- Generated from token set (md.comp.top-app-bar.small) in context (platform=android, audience=3p). -->
-  <!-- Enabled - Container -->
-  <macro name="m3_comp_top_app_bar_small_container_color">?attr/colorSurface</macro>
-  <dimen name="m3_comp_top_app_bar_small_container_height">64dp</dimen>
-  <dimen name="m3_comp_top_app_bar_small_container_elevation">@dimen/m3_sys_elevation_level0</dimen>
-  <!-- Enabled - Leading icon -->
-  <macro name="m3_comp_top_app_bar_small_leading_icon_color">?attr/colorOnSurface</macro>
-  <!-- Enabled - Trailing icon -->
-  <macro name="m3_comp_top_app_bar_small_trailing_icon_color">?attr/colorOnSurfaceVariant</macro>
-  <!-- Enabled - Headline -->
-  <macro name="m3_comp_top_app_bar_small_headline_type">?attr/textAppearanceTitleLarge</macro>
-  <macro name="m3_comp_top_app_bar_small_headline_color">?attr/colorOnSurface</macro>
-
-  <!-- Generated from token set (md.comp.top-app-bar.medium) in context (platform=android, audience=3p). -->
-  <!-- Enabled - Container -->
-  <dimen name="m3_comp_top_app_bar_medium_container_height">112dp</dimen>
-  <!-- Enabled - Headline -->
-  <macro name="m3_comp_top_app_bar_medium_headline_type">?attr/textAppearanceHeadlineSmall</macro>
-  <macro name="m3_comp_top_app_bar_medium_headline_color">?attr/colorOnSurface</macro>
-
-  <!-- Generated from token set (md.comp.top-app-bar.large) in context (platform=android, audience=3p). -->
-  <!-- Enabled - Container -->
-  <dimen name="m3_comp_top_app_bar_large_container_height">152dp</dimen>
-  <!-- Enabled - Headline -->
-  <macro name="m3_comp_top_app_bar_large_headline_type">?attr/textAppearanceHeadlineMedium</macro>
-  <macro name="m3_comp_top_app_bar_large_headline_color">?attr/colorOnSurface</macro>
-
-</resources>