diff --git a/catalog/java/io/material/catalog/application/theme/res/values/styles.xml b/catalog/java/io/material/catalog/application/theme/res/values/styles.xml
index bf14489dc7b..c575252c74b 100644
--- a/catalog/java/io/material/catalog/application/theme/res/values/styles.xml
+++ b/catalog/java/io/material/catalog/application/theme/res/values/styles.xml
@@ -19,7 +19,7 @@
   <!-- For the catalog we know that toolbars will always be on top of a "surface" color,
        so it's better for them to have no background, especially because it's common for
        toolbars to be nested in an AppBarLayout which has its own background handling. -->
-  <style name="Widget.Catalog.Toolbar" parent="Widget.Material3Expressive.Toolbar.OnSurface" />
+  <style name="Widget.Catalog.Toolbar" parent="Widget.Material3.Toolbar.OnSurface" />
 
   <style name="Widget.Catalog.Toolbar.WithCloseButton">
     <item name="navigationContentDescription">@string/toolbar_navigation_close_description</item>
diff --git a/catalog/java/io/material/catalog/application/theme/res/values/themes.xml b/catalog/java/io/material/catalog/application/theme/res/values/themes.xml
index ff56d0f789e..f9c4ffb74b3 100644
--- a/catalog/java/io/material/catalog/application/theme/res/values/themes.xml
+++ b/catalog/java/io/material/catalog/application/theme/res/values/themes.xml
@@ -16,7 +16,7 @@
   -->
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-  <style name="Theme.Catalog" parent="Theme.Material3Expressive.DayNight.NoActionBar">
+  <style name="Theme.Catalog" parent="Theme.Material3.DayNight.NoActionBar">
     <item name="preferenceTheme">@style/CatalogPreferenceThemeOverlay</item>
     <item name="catalogToolbarStyle">@style/Widget.Catalog.Toolbar</item>
     <item name="catalogToolbarWithCloseButtonStyle">@style/Widget.Catalog.Toolbar.WithCloseButton</item>
diff --git a/catalog/java/io/material/catalog/dialog/DialogMainDemoFragment.java b/catalog/java/io/material/catalog/dialog/DialogMainDemoFragment.java
index 4873ccb05d8..6efd1153468 100644
--- a/catalog/java/io/material/catalog/dialog/DialogMainDemoFragment.java
+++ b/catalog/java/io/material/catalog/dialog/DialogMainDemoFragment.java
@@ -309,7 +309,7 @@ public void onClick(DialogInterface dialog, int which) {
 
   @StyleRes
   protected int getCenteredTitleThemeOverlay() {
-    return com.google.android.material.R.style.ThemeOverlay_Material3Expressive_MaterialAlertDialog_Centered;
+    return com.google.android.material.R.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered;
   }
 
   @StyleRes
diff --git a/catalog/java/io/material/catalog/dialog/res/values/styles.xml b/catalog/java/io/material/catalog/dialog/res/values/styles.xml
index fd9018c9dad..affc1161567 100644
--- a/catalog/java/io/material/catalog/dialog/res/values/styles.xml
+++ b/catalog/java/io/material/catalog/dialog/res/values/styles.xml
@@ -17,14 +17,14 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-  <style name="Widget.Catalog.Button.TextButton.Dialog.FullWidth" parent="Widget.Material3Expressive.Button.TextButton.Dialog">
+  <style name="Widget.Catalog.Button.TextButton.Dialog.FullWidth" parent="Widget.Material3.Button.TextButton.Dialog">
     <item name="android:layout_width">0dp</item>
     <item name="android:layout_weight">1</item>
     <item name="android:maxWidth">@null</item>
   </style>
 
   <!-- A theme overlay for dialogs with buttons that span the width of the dialog. -->
-  <style name="ThemeOverlay.Catalog.MaterialAlertDialog.FullWidthButtons" parent="ThemeOverlay.Material3Expressive.MaterialAlertDialog">
+  <style name="ThemeOverlay.Catalog.MaterialAlertDialog.FullWidthButtons" parent="ThemeOverlay.Material3.MaterialAlertDialog">
     <item name="materialAlertDialogButtonSpacerVisibility">@integer/mtrl_view_gone</item>
     <item name="buttonBarPositiveButtonStyle">@style/Widget.Catalog.Button.TextButton.Dialog.FullWidth</item>
     <item name="buttonBarNegativeButtonStyle">@style/Widget.Catalog.Button.TextButton.Dialog.FullWidth</item>
@@ -32,7 +32,7 @@
   </style>
 
   <!-- A theme overlay for dialogs with a center aligned title text, icon and buttons that span the width of the dialog. -->
-  <style name="ThemeOverlay.Catalog.MaterialAlertDialog.Centered.FullWidthButtons" parent="ThemeOverlay.Material3Expressive.MaterialAlertDialog.Centered">
+  <style name="ThemeOverlay.Catalog.MaterialAlertDialog.Centered.FullWidthButtons" parent="ThemeOverlay.Material3.MaterialAlertDialog.Centered">
     <!-- Mark spacer as gone when showing full width buttons -->
     <item name="materialAlertDialogButtonSpacerVisibility">@integer/mtrl_view_gone</item>
     <item name="buttonBarPositiveButtonStyle">@style/Widget.Catalog.Button.TextButton.Dialog.FullWidth</item>
diff --git a/catalog/java/io/material/catalog/dockedtoolbar/res/layout/cat_docked_toolbar_small_content.xml b/catalog/java/io/material/catalog/dockedtoolbar/res/layout/cat_docked_toolbar_small_content.xml
index ec9b7e9e0ba..51c9b959402 100644
--- a/catalog/java/io/material/catalog/dockedtoolbar/res/layout/cat_docked_toolbar_small_content.xml
+++ b/catalog/java/io/material/catalog/dockedtoolbar/res/layout/cat_docked_toolbar_small_content.xml
@@ -45,7 +45,6 @@
       android:layout_height="wrap_content"
       android:layout_gravity="center"
       style="?attr/materialIconButtonFilledStyle"
-      app:materialSizeOverlay="@style/SizeOverlay.Material3Expressive.Button.IconButton.Small.Square"
       android:contentDescription="@string/cat_docked_toolbar_add_button_description"
       app:icon="@drawable/ic_add_24px" />
   </FrameLayout>
diff --git a/catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml b/catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml
index 39224cf8e95..5bb8ec45d94 100644
--- a/catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml
+++ b/catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml
@@ -47,7 +47,7 @@
     android:layout_gravity="center"
     android:contentDescription="@string/m3_primary_small_extended_fab_content_desc"
     android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Primary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Primary"
     app:icon="@drawable/ic_add_24px" />
   <TextView
     android:layout_width="wrap_content"
@@ -63,7 +63,7 @@
     android:layout_gravity="center"
     android:contentDescription="@string/m3_primary_medium_extended_fab_content_desc"
     android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Primary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Primary"
     app:icon="@drawable/ic_add_24px" />
   <TextView
     android:layout_width="wrap_content"
@@ -79,7 +79,7 @@
     android:layout_gravity="center"
     android:contentDescription="@string/m3_primary_large_extended_fab_content_desc"
     android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Primary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Primary"
     app:icon="@drawable/ic_add_24px" />
 
   <TextView
@@ -104,7 +104,7 @@
     android:layout_gravity="center"
     android:contentDescription="@string/m3_secondary_small_extended_fab_content_desc"
     android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Secondary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Secondary"
     app:icon="@drawable/ic_add_24px" />
   <TextView
     android:layout_width="wrap_content"
@@ -120,7 +120,7 @@
     android:layout_gravity="center"
     android:contentDescription="@string/m3_secondary_medium_extended_fab_content_desc"
     android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Secondary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Secondary"
     app:icon="@drawable/ic_add_24px" />
   <TextView
     android:layout_width="wrap_content"
@@ -136,7 +136,7 @@
     android:layout_gravity="center"
     android:contentDescription="@string/m3_secondary_large_extended_fab_content_desc"
     android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Secondary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Secondary"
     app:icon="@drawable/ic_add_24px" />
 
   <TextView
@@ -161,7 +161,7 @@
     android:layout_gravity="center"
     android:contentDescription="@string/m3_tertiary_small_extended_fab_content_desc"
     android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Tertiary"
     app:icon="@drawable/ic_add_24px" />
   <TextView
     android:layout_width="wrap_content"
@@ -177,7 +177,7 @@
     android:layout_gravity="center"
     android:contentDescription="@string/m3_tertiary_medium_extended_fab_content_desc"
     android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Tertiary"
     app:icon="@drawable/ic_add_24px" />
   <TextView
     android:layout_width="wrap_content"
@@ -193,178 +193,7 @@
     android:layout_gravity="center"
     android:contentDescription="@string/m3_tertiary_large_extended_fab_content_desc"
     android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary"
-    app:icon="@drawable/ic_add_24px" />
-
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="start|center"
-    android:layout_columnSpan="2"
-    android:textAppearance="?attr/textAppearanceTitleLarge"
-    android:text="@string/m3_primary_container_extended_fab_label" />
-
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
-    android:layout_gravity="start|center"
-    android:text="@string/m3_small_extended_fab_label"/>
-  <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-    style="?attr/extendedFloatingActionButtonSmallStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_primary_container_small_extended_fab_content_desc"
-    android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer"
-    app:icon="@drawable/ic_add_24px" />
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
-    android:layout_gravity="start|center"
-    android:text="@string/m3_medium_extended_fab_label"/>
-  <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-    style="?attr/extendedFloatingActionButtonMediumStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_primary_container_medium_extended_fab_content_desc"
-    android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer"
-    app:icon="@drawable/ic_add_24px" />
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
-    android:layout_gravity="start|center"
-    android:text="@string/m3_large_extended_fab_label"/>
-  <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-    style="?attr/extendedFloatingActionButtonLargeStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_primary_container_large_extended_fab_content_desc"
-    android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer"
-    app:icon="@drawable/ic_add_24px" />
-
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="start|center"
-    android:layout_columnSpan="2"
-    android:textAppearance="?attr/textAppearanceTitleLarge"
-    android:text="@string/m3_secondary_container_extended_fab_label" />
-
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
-    android:layout_gravity="start|center"
-    android:text="@string/m3_small_extended_fab_label"/>
-  <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-    style="?attr/extendedFloatingActionButtonSmallStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_secondary_container_small_extended_fab_content_desc"
-    android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.SecondaryContainer"
-    app:icon="@drawable/ic_add_24px" />
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
-    android:layout_gravity="start|center"
-    android:text="@string/m3_medium_extended_fab_label"/>
-  <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-    style="?attr/extendedFloatingActionButtonMediumStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_secondary_container_medium_extended_fab_content_desc"
-    android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.SecondaryContainer"
-    app:icon="@drawable/ic_add_24px" />
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
-    android:layout_gravity="start|center"
-    android:text="@string/m3_large_extended_fab_label"/>
-  <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-    style="?attr/extendedFloatingActionButtonLargeStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_secondary_container_large_extended_fab_content_desc"
-    android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.SecondaryContainer"
-    app:icon="@drawable/ic_add_24px" />
-
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="start|center"
-    android:layout_columnSpan="2"
-    android:textAppearance="?attr/textAppearanceTitleLarge"
-    android:text="@string/m3_tertiary_container_extended_fab_label" />
-
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
-    android:layout_gravity="start|center"
-    android:text="@string/m3_small_extended_fab_label"/>
-  <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-    style="?attr/extendedFloatingActionButtonSmallStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_tertiary_container_small_extended_fab_content_desc"
-    android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.TertiaryContainer"
-    app:icon="@drawable/ic_add_24px" />
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
-    android:layout_gravity="start|center"
-    android:text="@string/m3_medium_extended_fab_label"/>
-  <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-    style="?attr/extendedFloatingActionButtonMediumStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_tertiary_container_medium_extended_fab_content_desc"
-    android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.TertiaryContainer"
-    app:icon="@drawable/ic_add_24px" />
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
-    android:layout_gravity="start|center"
-    android:text="@string/m3_large_extended_fab_label"/>
-  <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-    style="?attr/extendedFloatingActionButtonLargeStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_tertiary_container_large_extended_fab_content_desc"
-    android:text="@string/extended_fab_label"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.TertiaryContainer"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Tertiary"
     app:icon="@drawable/ic_add_24px" />
 
 </GridLayout>
diff --git a/catalog/java/io/material/catalog/fab/res/layout/m3_fabs.xml b/catalog/java/io/material/catalog/fab/res/layout/m3_fabs.xml
index 68b72671e6a..3c354210844 100644
--- a/catalog/java/io/material/catalog/fab/res/layout/m3_fabs.xml
+++ b/catalog/java/io/material/catalog/fab/res/layout/m3_fabs.xml
@@ -42,7 +42,7 @@
     android:layout_margin="8dp"
     android:layout_gravity="center"
     android:contentDescription="@string/m3_primary_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Primary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Primary"
     app:srcCompat="@drawable/ic_add_24px"/>
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     style="?attr/floatingActionButtonMediumStyle"
@@ -51,7 +51,7 @@
     android:layout_margin="8dp"
     android:layout_gravity="center"
     android:contentDescription="@string/m3_primary_medium_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Primary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Primary"
     app:srcCompat="@drawable/ic_add_24px"/>
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     style="?attr/floatingActionButtonLargeStyle"
@@ -60,7 +60,7 @@
     android:layout_margin="8dp"
     android:layout_gravity="center"
     android:contentDescription="@string/m3_primary_large_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Primary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Primary"
     app:srcCompat="@drawable/ic_add_24px" />
 
   <TextView
@@ -77,7 +77,7 @@
     android:layout_margin="8dp"
     android:layout_gravity="center"
     android:contentDescription="@string/m3_secondary_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Secondary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Secondary"
     app:srcCompat="@drawable/ic_add_24px"/>
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     style="?attr/floatingActionButtonMediumStyle"
@@ -86,7 +86,7 @@
     android:layout_margin="8dp"
     android:layout_gravity="center"
     android:contentDescription="@string/m3_secondary_medium_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Secondary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Secondary"
     app:srcCompat="@drawable/ic_add_24px"/>
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     style="?attr/floatingActionButtonLargeStyle"
@@ -95,7 +95,7 @@
     android:layout_margin="8dp"
     android:layout_gravity="center"
     android:contentDescription="@string/m3_secondary_large_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Secondary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Secondary"
     app:srcCompat="@drawable/ic_add_24px" />
 
   <TextView
@@ -112,7 +112,7 @@
     android:layout_margin="8dp"
     android:layout_gravity="center"
     android:contentDescription="@string/m3_tertiary_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Tertiary"
     app:srcCompat="@drawable/ic_add_24px"/>
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     style="?attr/floatingActionButtonMediumStyle"
@@ -121,7 +121,7 @@
     android:layout_margin="8dp"
     android:layout_gravity="center"
     android:contentDescription="@string/m3_tertiary_medium_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Tertiary"
     app:srcCompat="@drawable/ic_add_24px"/>
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     style="?attr/floatingActionButtonLargeStyle"
@@ -130,111 +130,7 @@
     android:layout_margin="8dp"
     android:layout_gravity="center"
     android:contentDescription="@string/m3_tertiary_large_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary"
+    app:materialThemeOverlay="@style/ThemeOverlay.Material3.FloatingActionButton.Tertiary"
     app:srcCompat="@drawable/ic_add_24px" />
 
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="24dp"
-    android:layout_gravity="center"
-    android:layout_columnSpan="3"
-    android:text="@string/m3_primary_container_fab_label"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    style="?attr/floatingActionButtonStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_primary_container_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer"
-    app:srcCompat="@drawable/ic_add_24px"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    style="?attr/floatingActionButtonMediumStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_primary_container_medium_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer"
-    app:srcCompat="@drawable/ic_add_24px"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    style="?attr/floatingActionButtonLargeStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_primary_container_large_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer"
-    app:srcCompat="@drawable/ic_add_24px" />
-
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="24dp"
-    android:layout_gravity="center"
-    android:layout_columnSpan="3"
-    android:text="@string/m3_secondary_container_fab_label"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    style="?attr/floatingActionButtonStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_secondary_container_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.SecondaryContainer"
-    app:srcCompat="@drawable/ic_add_24px"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    style="?attr/floatingActionButtonMediumStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_secondary_container_medium_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.SecondaryContainer"
-    app:srcCompat="@drawable/ic_add_24px"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    style="?attr/floatingActionButtonLargeStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_secondary_container_large_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.SecondaryContainer"
-    app:srcCompat="@drawable/ic_add_24px" />
-
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="24dp"
-    android:layout_gravity="center"
-    android:layout_columnSpan="3"
-    android:text="@string/m3_tertiary_container_fab_label"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    style="?attr/floatingActionButtonStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_tertiary_container_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.TertiaryContainer"
-    app:srcCompat="@drawable/ic_add_24px"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    style="?attr/floatingActionButtonMediumStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_tertiary_container_medium_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.TertiaryContainer"
-    app:srcCompat="@drawable/ic_add_24px"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    style="?attr/floatingActionButtonLargeStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_tertiary_container_large_fab_content_desc"
-    app:materialThemeOverlay="@style/ThemeOverlay.Material3Expressive.FloatingActionButton.TertiaryContainer"
-    app:srcCompat="@drawable/ic_add_24px" />
 </merge>
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 6521f222e58..d692ae589bc 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
@@ -16,59 +16,6 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-  <!-- M3 Expressive AppBarLayout styles -->
-  <style name="Widget.Material3Expressive.AppBarLayout" parent="Widget.Material3.AppBarLayout"/>
-
-  <!-- M3 Expressive CollapsingToolbarLayout styles. -->
-  <style name="Widget.Material3Expressive.CollapsingToolbar" parent="Widget.Material3.CollapsingToolbar">
-    <item name="collapsedTitleTextAppearance">@macro/m3_comp_app_bar_small_title_font</item>
-    <item name="expandedTitleTextAppearance">@macro/m3_comp_app_bar_small_title_font</item>
-    <item name="collapsedSubtitleTextAppearance">@macro/m3_comp_app_bar_small_subtitle_font</item>
-    <item name="expandedSubtitleTextAppearance">@macro/m3_comp_app_bar_small_subtitle_font</item>
-    <item name="collapsedTitleTextColor">@macro/m3_comp_app_bar_title_color</item>
-    <item name="expandedTitleTextColor">@macro/m3_comp_app_bar_title_color</item>
-    <item name="collapsedSubtitleTextColor">@macro/m3_comp_app_bar_subtitle_color</item>
-    <item name="expandedSubtitleTextColor">@macro/m3_comp_app_bar_subtitle_color</item>
-    <item name="expandedTitleMarginTop">72dp</item>
-    <item name="expandedTitleMarginBottom">12dp</item>
-    <item name="collapsedTitleGravityMode">availableSpace</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.CollapsingToolbar.Medium" parent="Widget.Material3Expressive.CollapsingToolbar">
-    <item name="expandedTitleTextAppearance">@macro/m3_comp_app_bar_medium_flexible_title_font</item>
-    <item name="expandedSubtitleTextAppearance">@macro/m3_comp_app_bar_medium_flexible_subtitle_font</item>
-    <item name="expandedTitleSpacing">4dp</item>
-    <item name="scrimVisibleHeightTrigger">@dimen/m3_comp_app_bar_medium_flexible_container_height</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.CollapsingToolbar.Large" parent="Widget.Material3Expressive.CollapsingToolbar">
-    <item name="expandedTitleTextAppearance">@macro/m3_comp_app_bar_large_flexible_title_font</item>
-    <item name="expandedSubtitleTextAppearance">@macro/m3_comp_app_bar_large_flexible_subtitle_font</item>
-    <item name="expandedTitleSpacing">8dp</item>
-    <item name="scrimVisibleHeightTrigger">@dimen/m3_comp_app_bar_large_flexible_container_height</item>
-  </style>
-
-  <!-- M3 Expressive Toolbar styles. -->
-  <style name="Widget.Material3Expressive.Toolbar" parent="Widget.Material3.Toolbar">
-    <item name="titleTextAppearance">@macro/m3_comp_app_bar_small_title_font</item>
-    <item name="subtitleTextAppearance">@macro/m3_comp_app_bar_small_subtitle_font</item>
-    <item name="android:layout_marginEnd">4dp</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.Toolbar.OnSurface" parent="Widget.Material3.Toolbar.OnSurface">
-    <item name="titleTextAppearance">@macro/m3_comp_app_bar_small_title_font</item>
-    <item name="subtitleTextAppearance">@macro/m3_comp_app_bar_small_subtitle_font</item>
-    <item name="android:layout_marginEnd">4dp</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.Toolbar.Surface" parent="Widget.Material3.Toolbar.Surface">
-    <item name="titleTextAppearance">@macro/m3_comp_app_bar_small_title_font</item>
-    <item name="subtitleTextAppearance">@macro/m3_comp_app_bar_small_subtitle_font</item>
-    <item name="android:layout_marginEnd">4dp</item>
-  </style>
-
-  <style name="ThemeOverlay.Material3Expressive.Toolbar.Surface" parent="ThemeOverlay.Material3.Toolbar.Surface"/>
-
   <!-- M3 AppBarLayout styles -->
   <style name="Widget.Material3.AppBarLayout" parent="Widget.MaterialComponents.AppBarLayout.Surface">
     <item name="liftOnScroll">true</item>
diff --git a/lib/java/com/google/android/material/bottomnavigation/res/values-sw600dp/integers.xml b/lib/java/com/google/android/material/bottomnavigation/res/values-sw600dp/integers.xml
deleted file mode 100644
index 4c69d321558..00000000000
--- a/lib/java/com/google/android/material/bottomnavigation/res/values-sw600dp/integers.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2025 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
-  ~
-  ~     https://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.
-  -->
-<resources>
-  <integer name="m3expressive_bottom_nav_icon_gravity">1</integer>
-  <integer name="m3expressive_bottom_nav_item_gravity">17</integer>
-</resources>
diff --git a/lib/java/com/google/android/material/bottomnavigation/res/values/integers.xml b/lib/java/com/google/android/material/bottomnavigation/res/values/integers.xml
deleted file mode 100644
index 3fd1b87285c..00000000000
--- a/lib/java/com/google/android/material/bottomnavigation/res/values/integers.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright 2025 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
-  ~
-  ~     https://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.
-  -->
-<resources>
-  <integer name="m3expressive_bottom_nav_icon_gravity">0</integer>
-  <integer name="m3expressive_bottom_nav_item_gravity">49</integer>
-</resources>
diff --git a/lib/java/com/google/android/material/bottomnavigation/res/values/styles.xml b/lib/java/com/google/android/material/bottomnavigation/res/values/styles.xml
index f498fd24421..980a8c49959 100644
--- a/lib/java/com/google/android/material/bottomnavigation/res/values/styles.xml
+++ b/lib/java/com/google/android/material/bottomnavigation/res/values/styles.xml
@@ -16,40 +16,6 @@
   -->
 <resources>
 
-  <!-- Styles for M3 Expressive BottomNavigationView. -->
-
-  <style name="Widget.Material3Expressive.BottomNavigationView" parent="Widget.Material3.BottomNavigationView">
-    <item name="android:minHeight">@dimen/m3_comp_nav_bar_container_height</item>
-    <item name="elevation">@dimen/m3_comp_nav_bar_container_elevation</item>
-    <item name="android:background">@macro/m3_comp_nav_bar_container_color</item>
-    <item name="itemTextColor">@color/m3expressive_bottom_nav_item_label_tint</item>
-    <item name="itemIconTint">@color/m3expressive_bottom_nav_item_icon_tint</item>
-    <item name="itemRippleColor">@color/m3expressive_bottom_nav_item_ripple_tint</item>
-    <item name="itemPaddingTop">@dimen/m3_comp_nav_bar_item_vertical_container_between_space</item>
-    <item name="itemPaddingBottom">@dimen/m3_comp_nav_bar_item_vertical_container_between_space</item>
-    <item name="itemIconGravity">@integer/m3expressive_bottom_nav_icon_gravity</item>
-    <item name="itemGravity">@integer/m3expressive_bottom_nav_item_gravity</item>
-    <item name="itemTextAppearanceActiveBoldEnabled">false</item>
-    <item name="itemTextAppearanceActive">@macro/m3_comp_nav_bar_item_vertical_label_text_font</item>
-    <item name="itemTextAppearanceInactive">@macro/m3_comp_nav_bar_item_vertical_label_text_font</item>
-    <item name="horizontalItemTextAppearanceActive">@macro/m3_comp_nav_bar_item_horizontal_label_text_font</item>
-    <item name="horizontalItemTextAppearanceInactive">@macro/m3_comp_nav_bar_item_horizontal_label_text_font</item>
-    <item name="itemActiveIndicatorStyle">@style/Widget.Material3Expressive.BottomNavigationView.ActiveIndicator</item>
-    <item name="activeIndicatorLabelPadding">@dimen/m3_comp_nav_bar_item_active_indicator_icon_label_space</item>
-    <item name="itemIconSize">@dimen/m3_comp_nav_bar_item_icon_size</item>
-    <item name="labelFontScalingEnabled">true</item>
-    <item name="labelMaxLines">999</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.BottomNavigationView.ActiveIndicator" parent="Widget.Material3.BottomNavigationView.ActiveIndicator">
-    <item name="android:width">@dimen/m3_comp_nav_bar_item_vertical_active_indicator_width</item>
-    <item name="android:height">@dimen/m3_comp_nav_bar_item_vertical_active_indicator_height</item>
-    <item name="marginHorizontal">@dimen/m3_bottom_nav_item_active_indicator_margin_horizontal</item>
-    <item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.NavBar.Item.ActiveIndicator.Shape</item>
-    <item name="android:color">@macro/m3_comp_nav_bar_item_active_indicator_color</item>
-    <item name="expandedHeight">@dimen/m3_comp_nav_bar_item_horizontal_active_indicator_height</item>
-  </style>
-
   <!-- Styles for M3 BottomNavigationView. -->
 
   <style name="Base.Widget.Material3.BottomNavigationView" parent="Widget.MaterialComponents.BottomNavigationView">
diff --git a/lib/java/com/google/android/material/button/res-public/values/public.xml b/lib/java/com/google/android/material/button/res-public/values/public.xml
index 81a7d9ce73b..6c9b9cf4486 100644
--- a/lib/java/com/google/android/material/button/res-public/values/public.xml
+++ b/lib/java/com/google/android/material/button/res-public/values/public.xml
@@ -82,64 +82,4 @@
   <public name="ThemeOverlay.Material3.Button.TextButton.Snackbar" type="style"/>
   <public name="ThemeOverlay.Material3.Button.TonalButton" type="style"/>
   <public name="m3_split_button_chevron_avd" type="drawable"/>
-  <public name="Widget.Material3Expressive.Button" type="style"/>
-  <public name="Widget.Material3Expressive.Button.TonalButton" type="style"/>
-  <public name="Widget.Material3Expressive.Button.OutlinedButton" type="style"/>
-  <public name="Widget.Material3Expressive.Button.ElevatedButton" type="style"/>
-  <public name="Widget.Material3Expressive.Button.TextButton" type="style"/>
-  <public name="Widget.Material3Expressive.Button.TextButton.Dialog" type="style"/>
-  <public name="Widget.Material3Expressive.Button.TextButton.Dialog.Icon" type="style"/>
-  <public name="Widget.Material3Expressive.Button.TextButton.Dialog.Flush" type="style"/>
-  <public name="Widget.Material3Expressive.Button.TextButton.Snackbar" type="style"/>
-  <public name="Widget.Material3Expressive.Button.IconButton" type="style"/>
-  <public name="Widget.Material3Expressive.Button.IconButton.Filled" type="style"/>
-  <public name="Widget.Material3Expressive.Button.IconButton.Tonal" type="style"/>
-  <public name="Widget.Material3Expressive.Button.IconButton.Outlined" type="style"/>
-  <public name="ThemeOverlay.Material3Expressive.Button.Filled" type="style"/>
-  <public name="ThemeOverlay.Material3Expressive.Button.Tonal" type="style"/>
-  <public name="ThemeOverlay.Material3Expressive.Button.Outlined" type="style"/>
-  <public name="ThemeOverlay.Material3Expressive.Button.TextButton" type="style"/>
-  <public name="ThemeOverlay.Material3Expressive.Button.TextButton.Snackbar" type="style"/>
-  <public name="ThemeOverlay.Material3Expressive.Button.Elevated" type="style"/>
-  <public name="ThemeOverlay.Material3Expressive.Button.IconButton.Standard" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.Xsmall" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.Xsmall.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.Small" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.Small.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.Medium" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.Medium.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.Large" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.Large.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.Xlarge" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.Xlarge.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Xsmall" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Xsmall.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Xsmall.Narrow" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Xsmall.Narrow.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Xsmall.Wide" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Xsmall.Wide.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Small" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Small.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Small.Narrow" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Small.Narrow.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Small.Wide" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Small.Wide.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Medium" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Medium.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Medium.Narrow" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Medium.Narrow.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Medium.Wide" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Medium.Wide.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Large" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Large.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Large.Narrow" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Large.Narrow.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Large.Wide" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Large.Wide.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Xlarge" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Xlarge.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Xlarge.Narrow" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Xlarge.Narrow.Square" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Xlarge.Wide" type="style"/>
-  <public name="SizeOverlay.Material3Expressive.Button.IconButton.Xlarge.Wide.Square" type="style"/>
 </resources>
diff --git a/lib/java/com/google/android/material/button/res/values/dimens.xml b/lib/java/com/google/android/material/button/res/values/dimens.xml
index 5535728031a..c284048b231 100644
--- a/lib/java/com/google/android/material/button/res/values/dimens.xml
+++ b/lib/java/com/google/android/material/button/res/values/dimens.xml
@@ -88,8 +88,4 @@
   <dimen name="m3_btn_disabled_translation_z">0dp</dimen>
   <dimen name="m3_btn_disabled_elevation">0dp</dimen>
 
-  <!-- Enforce the min touch target size for the button. -->
-  <dimen name="m3expressive_btn_min_height">48dp</dimen>
-  <dimen name="m3expressive_btn_min_width">48dp</dimen>
-
 </resources>
diff --git a/lib/java/com/google/android/material/button/res/values/styles.xml b/lib/java/com/google/android/material/button/res/values/styles.xml
index eeb6321a26b..8e898f23133 100644
--- a/lib/java/com/google/android/material/button/res/values/styles.xml
+++ b/lib/java/com/google/android/material/button/res/values/styles.xml
@@ -17,507 +17,6 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-  <!-- Styles for M3 Expressive Button Groups. -->
-
-  <!-- M3 Expressive Button Group. -->
-  <style name="Widget.Material3Expressive.MaterialButtonGroup" parent="Widget.Material3.MaterialButtonGroup"/>
-
-  <!-- M3 Expressive Connected Button Group. -->
-  <style name="Widget.Material3Expressive.MaterialButtonGroup.Connected" parent="Widget.Material3.MaterialButtonGroup.Connected">
-    <item name="innerCornerSize">@xml/m3expressive_connected_buttons_inner_corner_size_state_list</item>
-  </style>
-
-  <!-- M3 Expressive Connected Button Toggle Group (Segmented Button). -->
-  <style name="Widget.Material3Expressive.MaterialButtonToggleGroup" parent="Widget.Material3.MaterialButtonToggleGroup">
-    <item name="innerCornerSize">@xml/m3expressive_connected_buttons_inner_corner_size_state_list</item>
-    <item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.ButtonGroup.Connected.Small.Container.Shape</item>
-    <item name="android:spacing">@dimen/m3_comp_button_group_connected_small_between_space</item>
-  </style>
-
-  <!-- Styles for M3 Expressive Buttons. -->
-
-  <!-- M3 Expressive filled button style. -->
-  <style name="Widget.Material3Expressive.Button" parent="Widget.Material3.Button">
-    <item name="android:paddingStart">?attr/containerPaddingStart</item>
-    <item name="android:paddingEnd">?attr/containerPaddingEnd</item>
-    <item name="android:paddingTop">?attr/containerPaddingTop</item>
-    <item name="android:paddingBottom">?attr/containerPaddingBottom</item>
-    <item name="android:insetTop">?attr/containerInsetTop</item>
-    <item name="android:insetBottom">?attr/containerInsetBottom</item>
-    <item name="iconPadding">?attr/containerIconPadding</item>
-    <item name="iconSize">?attr/containerIconSize</item>
-    <item name="android:textAppearance">?attr/labelTextAppearance</item>
-    <item name="shapeAppearance">@xml/m3expressive_button_shape_state_list</item>
-    <item name="shapeAppearanceOverlay">@null</item>
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.Button.Filled</item>
-    <item name="materialSizeOverlay">@style/SizeOverlay.Material3Expressive.Button.Small</item>
-  </style>
-
-  <!-- M3 Expressive tonal button style. -->
-  <style name="Widget.Material3Expressive.Button.TonalButton">
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.Button.Tonal</item>
-  </style>
-
-  <!-- M3 Expressive outlined button style. -->
-  <style name="Widget.Material3Expressive.Button.OutlinedButton">
-    <item name="android:stateListAnimator" tools:ignore="NewApi">@animator/mtrl_btn_unelevated_state_list_anim</item>
-    <item name="elevation">@dimen/m3_sys_elevation_level0</item>
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.Button.Outlined</item>
-    <item name="strokeColor">@color/m3expressive_button_outline_color_selector</item>
-    <item name="strokeWidth">?attr/containerStrokeWidth</item>
-    <item name="backgroundTint">@color/m3expressive_button_outlined_background_color_selector</item>
-  </style>
-
-  <!-- M3 Expressive elevated button style. -->
-  <style name="Widget.Material3Expressive.Button.ElevatedButton">
-    <item name="android:stateListAnimator" tools:ignore="NewApi">@animator/m3_btn_elevated_btn_state_list_anim</item>
-    <item name="elevation">@dimen/m3_comp_button_elevated_container_elevation</item>
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.Button.Elevated</item>
-  </style>
-
-  <!-- M3 Expressive text button style. -->
-  <style name="Widget.Material3Expressive.Button.TextButton">
-    <item name="android:stateListAnimator" tools:ignore="NewApi">@animator/mtrl_btn_unelevated_state_list_anim</item>
-    <item name="elevation">@dimen/m3_sys_elevation_level0</item>
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.Button.TextButton</item>
-  </style>
-
-  <!-- M3 Expressive button style to show in the Dialog component.  -->
-  <style name="Widget.Material3Expressive.Button.TextButton.Dialog">
-    <item name="android:minWidth">@dimen/m3_btn_dialog_btn_min_width</item>
-    <item name="android:layout_marginLeft">@dimen/m3_btn_dialog_btn_spacing</item>
-    <item name="android:layout_marginStart">@dimen/m3_btn_dialog_btn_spacing</item>
-    <item name="android:maxLines">2</item>
-    <item name="android:ellipsize">end</item>
-    <item name="android:singleLine">false</item>
-  </style>
-  <style name="Widget.Material3Expressive.Button.TextButton.Dialog.Icon">
-    <item name="android:paddingStart">@dimen/m3_btn_text_btn_icon_padding_left</item>
-    <item name="android:paddingEnd">@dimen/m3_btn_text_btn_icon_padding_right</item>
-  </style>
-  <!-- LINT.IfChange -->
-  <style name="Widget.Material3Expressive.Button.TextButton.Dialog.Flush">
-    <item name="android:layout_marginStart">0dp</item>
-    <item name="android:layout_marginLeft">0dp</item>
-  </style>
-  <!-- LINT.ThenChange(../../../theme/res/values/themes.xml) -->
-
-  <!-- M3 Expressive button style to show in the Snackbar component. -->
-  <style name="Widget.Material3Expressive.Button.TextButton.Snackbar">
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.Button.TextButton.Snackbar</item>
-  </style>
-
-  <!-- Styles for M3 Expressive Icon Buttons. -->
-
-  <!-- M3 Expressive icon only button filled container style. -->
-  <style name="Widget.Material3Expressive.Button.IconButton">
-    <item name="android:stateListAnimator" tools:ignore="NewApi">@animator/mtrl_btn_unelevated_state_list_anim</item>
-    <item name="elevation">@dimen/m3_sys_elevation_level0</item>
-    <item name="android:minWidth">@dimen/m3expressive_btn_min_width</item>
-    <item name="android:minHeight">@dimen/m3expressive_btn_min_height</item>
-    <item name="android:insetLeft">?attr/containerInsetLeft</item>
-    <item name="android:insetRight">?attr/containerInsetRight</item>
-    <item name="iconPadding">@dimen/m3_btn_icon_only_icon_padding</item>
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.Button.Filled</item>
-    <item name="materialSizeOverlay">@style/SizeOverlay.Material3Expressive.Button.IconButton.Small</item>
-  </style>
-  <style name="Widget.Material3Expressive.Button.IconButton.Filled"/>
-
-  <!-- M3 Expressive icon only button in tonal container style. -->
-  <style name="Widget.Material3Expressive.Button.IconButton.Tonal">
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.Button.Tonal</item>
-  </style>
-
-  <!-- M3 Expressive icon only button with an outline style. -->
-  <style name="Widget.Material3Expressive.Button.IconButton.Outlined">
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.Button.Outlined</item>
-    <item name="strokeColor">@color/m3expressive_button_outline_color_selector</item>
-    <item name="strokeWidth">?attr/containerStrokeWidth</item>
-    <item name="backgroundTint">@color/m3expressive_button_outlined_background_color_selector</item>
-  </style>
-
-  <!-- M3 Expressive icon only button without a container or outline style. -->
-  <style name="Widget.Material3Expressive.Button.IconButton.Standard">
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.Button.IconButton.Standard</item>
-    <item name="backgroundTint">@android:color/transparent</item>
-  </style>
-
-  <!-- M3 Expressive Button Theme Overlays for different color variants. -->
-
-  <!-- M3 Expressive Button Theme Overlay for the filled color variant. -->
-  <style name="ThemeOverlay.Material3Expressive.Button.Filled" parent="">
-    <item name="colorContainer">@macro/m3_comp_button_filled_container_color</item>
-    <item name="colorContainerChecked">@macro/m3_comp_button_filled_selected_container_color</item>
-    <item name="colorContainerUnchecked">@macro/m3_comp_button_filled_unselected_container_color</item>
-    <item name="colorOnContainer">@macro/m3_comp_button_filled_icon_color</item>
-    <item name="colorOnContainerChecked">@macro/m3_comp_button_filled_selected_icon_color</item>
-    <item name="colorOnContainerUnchecked">@macro/m3_comp_button_filled_unselected_icon_color</item>
-  </style>
-
-  <!-- M3 Expressive Button Theme Overlay for the tonal color variant. -->
-  <style name="ThemeOverlay.Material3Expressive.Button.Tonal" parent="">
-    <item name="colorContainer">@macro/m3_comp_button_tonal_container_color</item>
-    <item name="colorContainerChecked">@macro/m3_comp_button_tonal_selected_container_color</item>
-    <item name="colorContainerUnchecked">@macro/m3_comp_button_tonal_unselected_container_color</item>
-    <item name="colorOnContainer">@macro/m3_comp_button_tonal_icon_color</item>
-    <item name="colorOnContainerChecked">@macro/m3_comp_button_tonal_selected_icon_color</item>
-    <item name="colorOnContainerUnchecked">@macro/m3_comp_button_tonal_unselected_icon_color</item>
-  </style>
-
-  <!-- M3 Expressive Button Theme Overlay for the outlined variant. -->
-  <style name="ThemeOverlay.Material3Expressive.Button.Outlined" parent="">
-    <item name="colorContainer">@android:color/transparent</item>
-    <item name="colorContainerChecked">@macro/m3_comp_button_outlined_selected_container_color</item>
-    <item name="colorContainerUnchecked">@android:color/transparent</item>
-    <item name="colorOnContainer">@macro/m3_comp_button_outlined_icon_color</item>
-    <item name="colorOnContainerChecked">@macro/m3_comp_button_outlined_selected_icon_color</item>
-    <item name="colorOnContainerUnchecked">@macro/m3_comp_button_outlined_unselected_icon_color</item>
-  </style>
-
-  <!-- M3 Expressive Button Theme Overlay for the text only variant. -->
-  <style name="ThemeOverlay.Material3Expressive.Button.TextButton" parent="ThemeOverlay.Material3.Button.TextButton">
-    <item name="colorContainerChecked">?attr/colorContainer</item>
-    <item name="colorContainerUnchecked">?attr/colorContainer</item>
-    <item name="colorOnContainerChecked">?attr/colorOnContainer</item>
-    <item name="colorOnContainerUnchecked">?attr/colorOnSurfaceVariant</item>
-  </style>
-
-  <!-- M3 Expressive Button Theme Overlay for the text only variant on a Snackbar. -->
-  <style name="ThemeOverlay.Material3Expressive.Button.TextButton.Snackbar" parent="ThemeOverlay.Material3.Button.TextButton.Snackbar">
-    <item name="colorContainerChecked">?attr/colorContainer</item>
-    <item name="colorContainerUnchecked">?attr/colorContainer</item>
-    <item name="colorOnContainerChecked">?attr/colorOnContainer</item>
-    <item name="colorOnContainerUnchecked">?attr/colorOnSurfaceInverse</item>
-  </style>
-
-  <!-- M3 Expressive Button Theme Overlay for the elevated container variant. -->
-  <style name="ThemeOverlay.Material3Expressive.Button.Elevated" parent="">
-    <item name="colorContainer">@macro/m3_comp_button_elevated_container_color</item>
-    <item name="colorContainerChecked">@macro/m3_comp_button_elevated_selected_container_color</item>
-    <item name="colorContainerUnchecked">@macro/m3_comp_button_elevated_unselected_container_color</item>
-    <item name="colorOnContainer">@macro/m3_comp_button_elevated_icon_color</item>
-    <item name="colorOnContainerChecked">@macro/m3_comp_button_elevated_selected_icon_color</item>
-    <item name="colorOnContainerUnchecked">@macro/m3_comp_button_elevated_unselected_icon_color</item>
-  </style>
-
-  <!-- M3 Expressive Button Theme Overlay for the icon only variant. -->
-  <style name="ThemeOverlay.Material3Expressive.Button.IconButton.Standard" parent="">
-    <item name="colorContainer">@android:color/transparent</item>
-    <item name="colorContainerChecked">@android:color/transparent</item>
-    <item name="colorContainerUnchecked">@android:color/transparent</item>
-    <item name="colorOnContainer">@macro/m3_comp_icon_button_standard_icon_color</item>
-    <item name="colorOnContainerChecked">@macro/m3_comp_icon_button_standard_selected_icon_color</item>
-    <item name="colorOnContainerUnchecked">@macro/m3_comp_icon_button_standard_unselected_icon_color</item>
-  </style>
-
-  <!-- M3 Expressive Button Theme Overlay for the extra small variant. -->
-  <style name="SizeOverlay.Material3Expressive.Button.Xsmall" parent="">
-    <item name="containerPaddingStart">@dimen/m3_comp_button_xsmall_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_button_xsmall_trailing_space</item>
-    <item name="containerPaddingTop">6dp</item>
-    <item name="containerPaddingBottom">6dp</item>
-    <item name="containerInsetTop">8dp</item>
-    <item name="containerInsetBottom">8dp</item>
-    <item name="containerIconSize">@dimen/m3_comp_button_xsmall_icon_size</item>
-    <item name="containerIconPadding">@dimen/m3_comp_button_xsmall_icon_label_space</item>
-    <item name="containerStrokeWidth">@dimen/m3_comp_button_xsmall_outlined_outline_width</item>
-    <item name="labelTextAppearance">@macro/m3_comp_button_xsmall_label_text</item>
-    <item name="containerShapePressed">@macro/m3_comp_button_xsmall_pressed_container_shape</item>
-    <item name="containerShapeChecked">@macro/m3_comp_button_xsmall_selected_container_shape_round</item>
-    <item name="containerShapeDefault">@style/ShapeAppearance.M3.Comp.Button.Xsmall.Container.Shape.Round</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.Xsmall.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.Button.Xsmall.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_button_xsmall_container_shape_square</item>
-  </style>
-
-  <!-- M3 Expressive Button Theme Overlay for the small variant. -->
-  <style name="SizeOverlay.Material3Expressive.Button.Small" parent="">
-    <item name="containerPaddingStart">@dimen/m3_comp_button_small_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_button_small_trailing_space</item>
-    <item name="containerPaddingTop">10dp</item>
-    <item name="containerPaddingBottom">10dp</item>
-    <item name="containerInsetTop">4dp</item>
-    <item name="containerInsetBottom">4dp</item>
-    <item name="containerIconSize">@dimen/m3_comp_button_small_icon_size</item>
-    <item name="containerIconPadding">@dimen/m3_comp_button_small_icon_label_space</item>
-    <item name="containerStrokeWidth">@dimen/m3_comp_button_small_outlined_outline_width</item>
-    <item name="labelTextAppearance">@macro/m3_comp_button_small_label_text</item>
-    <item name="containerShapePressed">@macro/m3_comp_button_small_pressed_container_shape</item>
-    <item name="containerShapeChecked">@macro/m3_comp_button_small_selected_container_shape_round</item>
-    <item name="containerShapeDefault">@style/ShapeAppearance.M3.Comp.Button.Small.Container.Shape.Round</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.Small.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.Button.Small.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_button_small_container_shape_square</item>
-  </style>
-
-  <!-- M3 Expressive Button Theme Overlay for the medium variant. -->
-  <style name="SizeOverlay.Material3Expressive.Button.Medium" parent="">
-    <item name="containerPaddingStart">@dimen/m3_comp_button_medium_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_button_medium_trailing_space</item>
-    <item name="containerPaddingTop">16dp</item>
-    <item name="containerPaddingBottom">16dp</item>
-    <item name="containerInsetTop">0dp</item>
-    <item name="containerInsetBottom">0dp</item>
-    <item name="containerIconSize">@dimen/m3_comp_button_medium_icon_size</item>
-    <item name="containerIconPadding">@dimen/m3_comp_button_medium_icon_label_space</item>
-    <item name="containerStrokeWidth">@dimen/m3_comp_button_medium_outlined_outline_width</item>
-    <item name="labelTextAppearance">@macro/m3_comp_button_medium_label_text</item>
-    <item name="containerShapePressed">@macro/m3_comp_button_medium_pressed_container_shape</item>
-    <item name="containerShapeChecked">@macro/m3_comp_button_medium_selected_container_shape_round</item>
-    <item name="containerShapeDefault">@style/ShapeAppearance.M3.Comp.Button.Medium.Container.Shape.Round</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.Medium.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.Button.Medium.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_button_medium_container_shape_square</item>
-  </style>
-
-  <!-- M3 Expressive Button Theme Overlay for the large variant. -->
-  <style name="SizeOverlay.Material3Expressive.Button.Large" parent="">
-    <item name="containerPaddingStart">@dimen/m3_comp_button_large_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_button_large_trailing_space</item>
-    <item name="containerPaddingTop">32dp</item>
-    <item name="containerPaddingBottom">32dp</item>
-    <item name="containerInsetTop">0dp</item>
-    <item name="containerInsetBottom">0dp</item>
-    <item name="containerIconSize">@dimen/m3_comp_button_large_icon_size</item>
-    <item name="containerIconPadding">@dimen/m3_comp_button_large_icon_label_space</item>
-    <item name="containerStrokeWidth">@dimen/m3_comp_button_large_outlined_outline_width</item>
-    <item name="labelTextAppearance">@macro/m3_comp_button_large_label_text</item>
-    <item name="containerShapePressed">@macro/m3_comp_button_large_pressed_container_shape</item>
-    <item name="containerShapeChecked">@macro/m3_comp_button_large_selected_container_shape_round</item>
-    <item name="containerShapeDefault">@style/ShapeAppearance.M3.Comp.Button.Large.Container.Shape.Round</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.Large.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.Button.Large.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_button_large_container_shape_square</item>
-  </style>
-
-  <!-- M3 Expressive Button Theme Overlay for the extra large variant. -->
-  <style name="SizeOverlay.Material3Expressive.Button.Xlarge" parent="">
-    <item name="containerPaddingStart">@dimen/m3_comp_button_xlarge_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_button_xlarge_trailing_space</item>
-    <item name="containerPaddingTop">48dp</item>
-    <item name="containerPaddingBottom">48dp</item>
-    <item name="containerInsetTop">0dp</item>
-    <item name="containerInsetBottom">0dp</item>
-    <item name="containerIconSize">@dimen/m3_comp_button_xlarge_icon_size</item>
-    <item name="containerIconPadding">@dimen/m3_comp_button_xlarge_icon_label_space</item>
-    <item name="containerStrokeWidth">@dimen/m3_comp_button_xlarge_outlined_outline_width</item>
-    <item name="labelTextAppearance">@macro/m3_comp_button_xlarge_label_text</item>
-    <item name="containerShapePressed">@macro/m3_comp_button_xlarge_pressed_container_shape</item>
-    <item name="containerShapeChecked">@macro/m3_comp_button_xlarge_selected_container_shape_round</item>
-    <item name="containerShapeDefault">@style/ShapeAppearance.M3.Comp.Button.Xlarge.Container.Shape.Round</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.Xlarge.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.Button.Xlarge.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_button_xlarge_container_shape_square</item>
-  </style>
-
-  <!-- M3 Expressive Icon Button Theme Overlay for the extra small variant. -->
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Xsmall" parent="">
-    <item name="containerPaddingStart">@dimen/m3_comp_icon_button_xsmall_default_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_icon_button_xsmall_default_trailing_space</item>
-    <item name="containerPaddingTop">6dp</item>
-    <item name="containerPaddingBottom">6dp</item>
-    <item name="containerInsetTop">8dp</item>
-    <item name="containerInsetBottom">8dp</item>
-    <item name="containerInsetLeft">8dp</item>
-    <item name="containerInsetRight">8dp</item>
-    <item name="containerIconSize">@dimen/m3_comp_icon_button_xsmall_icon_size</item>
-    <item name="containerStrokeWidth">@dimen/m3_comp_icon_button_xsmall_outlined_outline_width</item>
-    <item name="containerShapePressed">@macro/m3_comp_icon_button_xsmall_pressed_container_shape</item>
-    <item name="containerShapeChecked">@macro/m3_comp_icon_button_xsmall_selected_container_shape_round</item>
-    <item name="containerShapeDefault">@style/ShapeAppearance.M3.Comp.IconButton.Xsmall.Container.Shape.Round</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Xsmall.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.IconButton.Xsmall.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_icon_button_xsmall_container_shape_square</item>
-  </style>
-
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Xsmall.Narrow">
-    <item name="containerPaddingStart">@dimen/m3_comp_icon_button_xsmall_narrow_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_icon_button_xsmall_narrow_trailing_space</item>
-    <item name="containerInsetLeft">10dp</item>
-    <item name="containerInsetRight">10dp</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Xsmall.Narrow.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.IconButton.Xsmall.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_icon_button_xsmall_container_shape_square</item>
-  </style>
-
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Xsmall.Wide">
-    <item name="containerPaddingStart">@dimen/m3_comp_icon_button_xsmall_wide_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_icon_button_xsmall_wide_trailing_space</item>
-    <item name="containerInsetLeft">4dp</item>
-    <item name="containerInsetRight">4dp</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Xsmall.Wide.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.IconButton.Xsmall.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_icon_button_xsmall_container_shape_square</item>
-  </style>
-
-  <!-- M3 Expressive Icon Button Theme Overlay for the small variant. -->
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Small" parent="">
-    <item name="containerPaddingStart">@dimen/m3_comp_icon_button_small_default_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_icon_button_small_default_trailing_space</item>
-    <item name="containerPaddingTop">8dp</item>
-    <item name="containerPaddingBottom">8dp</item>
-    <item name="containerInsetTop">4dp</item>
-    <item name="containerInsetBottom">4dp</item>
-    <item name="containerInsetLeft">4dp</item>
-    <item name="containerInsetRight">4dp</item>
-    <item name="containerIconSize">@dimen/m3_comp_icon_button_small_icon_size</item>
-    <item name="containerStrokeWidth">@dimen/m3_comp_icon_button_small_outlined_outline_width</item>
-    <item name="containerShapePressed">@macro/m3_comp_icon_button_small_pressed_container_shape</item>
-    <item name="containerShapeChecked">@macro/m3_comp_icon_button_small_selected_container_shape_round</item>
-    <item name="containerShapeDefault">@style/ShapeAppearance.M3.Comp.IconButton.Small.Container.Shape.Round</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Small.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.IconButton.Small.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_icon_button_small_container_shape_square</item>
-  </style>
-
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Small.Narrow">
-    <item name="containerPaddingStart">@dimen/m3_comp_icon_button_small_narrow_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_icon_button_small_narrow_trailing_space</item>
-    <item name="containerInsetLeft">8dp</item>
-    <item name="containerInsetRight">8dp</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Small.Narrow.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.IconButton.Small.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_icon_button_small_container_shape_square</item>
-  </style>
-
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Small.Wide">
-    <item name="containerPaddingStart">@dimen/m3_comp_icon_button_small_wide_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_icon_button_small_wide_trailing_space</item>
-    <item name="containerInsetLeft">0dp</item>
-    <item name="containerInsetRight">0dp</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Small.Wide.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.IconButton.Small.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_icon_button_small_container_shape_square</item>
-  </style>
-
-  <!-- M3 Expressive Icon Button Theme Overlay for the medium variant. -->
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Medium" parent="">
-    <item name="containerPaddingStart">@dimen/m3_comp_icon_button_medium_default_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_icon_button_medium_default_trailing_space</item>
-    <item name="containerPaddingTop">16dp</item>
-    <item name="containerPaddingBottom">16dp</item>
-    <item name="containerInsetTop">0dp</item>
-    <item name="containerInsetBottom">0dp</item>
-    <item name="containerInsetLeft">0dp</item>
-    <item name="containerInsetRight">0dp</item>
-    <item name="containerIconSize">@dimen/m3_comp_icon_button_medium_icon_size</item>
-    <item name="containerStrokeWidth">@dimen/m3_comp_icon_button_medium_outlined_outline_width</item>
-    <item name="containerShapePressed">@macro/m3_comp_icon_button_medium_pressed_container_shape</item>
-    <item name="containerShapeChecked">@macro/m3_comp_icon_button_medium_selected_container_shape_round</item>
-    <item name="containerShapeDefault">@style/ShapeAppearance.M3.Comp.IconButton.Medium.Container.Shape.Round</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Medium.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.IconButton.Medium.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_icon_button_medium_container_shape_square</item>
-  </style>
-
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Medium.Narrow">
-    <item name="containerPaddingStart">@dimen/m3_comp_icon_button_medium_narrow_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_icon_button_medium_narrow_trailing_space</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Medium.Narrow.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.IconButton.Medium.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_icon_button_medium_container_shape_square</item>
-  </style>
-
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Medium.Wide">
-    <item name="containerPaddingStart">@dimen/m3_comp_icon_button_medium_wide_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_icon_button_medium_wide_trailing_space</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Medium.Wide.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.IconButton.Medium.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_icon_button_medium_container_shape_square</item>
-  </style>
-
-  <!-- M3 Expressive Icon Button Theme Overlay for the large variant. -->
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Large" parent="">
-    <item name="containerPaddingStart">@dimen/m3_comp_icon_button_large_default_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_icon_button_large_default_trailing_space</item>
-    <item name="containerPaddingTop">32dp</item>
-    <item name="containerPaddingBottom">32dp</item>
-    <item name="containerInsetTop">0dp</item>
-    <item name="containerInsetBottom">0dp</item>
-    <item name="containerInsetLeft">0dp</item>
-    <item name="containerInsetRight">0dp</item>
-    <item name="containerIconSize">@dimen/m3_comp_icon_button_large_icon_size</item>
-    <item name="containerStrokeWidth">@dimen/m3_comp_icon_button_large_outlined_outline_width</item>
-    <item name="containerShapePressed">@macro/m3_comp_icon_button_large_pressed_container_shape</item>
-    <item name="containerShapeChecked">@macro/m3_comp_icon_button_large_selected_container_shape_round</item>
-    <item name="containerShapeDefault">@style/ShapeAppearance.M3.Comp.IconButton.Large.Container.Shape.Round</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Large.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.IconButton.Large.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_icon_button_large_container_shape_square</item>
-  </style>
-
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Large.Narrow">
-    <item name="containerPaddingStart">@dimen/m3_comp_icon_button_large_narrow_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_icon_button_large_narrow_trailing_space</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Large.Narrow.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.IconButton.Large.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_icon_button_large_container_shape_square</item>
-  </style>
-
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Large.Wide">
-    <item name="containerPaddingStart">@dimen/m3_comp_icon_button_large_wide_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_icon_button_large_wide_trailing_space</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Large.Wide.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.IconButton.Large.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_icon_button_large_container_shape_square</item>
-  </style>
-
-  <!-- M3 Expressive Icon Button Theme Overlay for the extra large variant. -->
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Xlarge" parent="">
-    <item name="containerPaddingStart">@dimen/m3_comp_icon_button_xlarge_default_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_icon_button_xlarge_default_trailing_space</item>
-    <item name="containerPaddingTop">48dp</item>
-    <item name="containerPaddingBottom">48dp</item>
-    <item name="containerInsetTop">0dp</item>
-    <item name="containerInsetBottom">0dp</item>
-    <item name="containerInsetLeft">0dp</item>
-    <item name="containerInsetRight">0dp</item>
-    <item name="containerIconSize">@dimen/m3_comp_icon_button_xlarge_icon_size</item>
-    <item name="containerStrokeWidth">@dimen/m3_comp_icon_button_xlarge_outlined_outline_width</item>
-    <item name="containerShapePressed">@macro/m3_comp_icon_button_xlarge_pressed_container_shape</item>
-    <item name="containerShapeChecked">@macro/m3_comp_icon_button_xlarge_selected_container_shape_round</item>
-    <item name="containerShapeDefault">@style/ShapeAppearance.M3.Comp.IconButton.Xlarge.Container.Shape.Round</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Xlarge.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.IconButton.Xlarge.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_icon_button_xlarge_container_shape_square</item>
-  </style>
-
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Xlarge.Narrow">
-    <item name="containerPaddingStart">@dimen/m3_comp_icon_button_xlarge_narrow_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_icon_button_xlarge_narrow_trailing_space</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Xlarge.Narrow.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.IconButton.Xlarge.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_icon_button_xlarge_container_shape_square</item>
-  </style>
-
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Xlarge.Wide">
-    <item name="containerPaddingStart">@dimen/m3_comp_icon_button_xlarge_wide_leading_space</item>
-    <item name="containerPaddingEnd">@dimen/m3_comp_icon_button_xlarge_wide_trailing_space</item>
-  </style>
-  <style name="SizeOverlay.Material3Expressive.Button.IconButton.Xlarge.Wide.Square">
-    <item name="containerShapeChecked">@style/ShapeAppearance.M3.Comp.IconButton.Xlarge.Selected.Container.Shape.Square</item>
-    <item name="containerShapeDefault">@macro/m3_comp_icon_button_xlarge_container_shape_square</item>
-  </style>
-
   <!-- Styles for M3 Button Groups. -->
 
   <style name="Widget.Material3.MaterialButtonGroup" parent="android:Widget">
diff --git a/lib/java/com/google/android/material/dialog/res-public/values/public.xml b/lib/java/com/google/android/material/dialog/res-public/values/public.xml
index 35d891610b0..6a98840d2a7 100644
--- a/lib/java/com/google/android/material/dialog/res-public/values/public.xml
+++ b/lib/java/com/google/android/material/dialog/res-public/values/public.xml
@@ -94,28 +94,5 @@
   <public name="MaterialAlertDialog.Material3.Title.Text.CenterStacked" type="style"/>
   <public name="MaterialAlertDialog.Material3.Body.Text.CenterStacked" type="style"/>
 
-  <public name="Theme.Material3Expressive.Light.Dialog" type="style"/>
-  <public name="Theme.Material3Expressive.Light.Dialog.Alert" type="style"/>
-  <public name="Theme.Material3Expressive.Light.Dialog.MinWidth" type="style"/>
-
-  <public name="Theme.Material3Expressive.Dark.Dialog" type="style"/>
-  <public name="Theme.Material3Expressive.Dark.Dialog.Alert" type="style"/>
-  <public name="Theme.Material3Expressive.Dark.Dialog.MinWidth" type="style"/>
-
-  <public name="Theme.Material3Expressive.DayNight.Dialog" type="style"/>
-  <public name="Theme.Material3Expressive.DayNight.Dialog.Alert" type="style"/>
-  <public name="Theme.Material3Expressive.DayNight.Dialog.MinWidth" type="style"/>
-
-  <public name="ThemeOverlay.Material3Expressive.Dialog" type="style"/>
-  <public name="ThemeOverlay.Material3Expressive.Dialog.Alert" type="style"/>
-  <public name="ThemeOverlay.Material3Expressive.MaterialAlertDialog" type="style"/>
-  <public name="ThemeOverlay.Material3Expressive.MaterialAlertDialog.Centered" type="style"/>
-
-  <public name="MaterialAlertDialog.Material3Expressive" type="style"/>
-  <public name="MaterialAlertDialog.Material3Expressive.Title.Panel" type="style"/>
-  <public name="MaterialAlertDialog.Material3Expressive.Title.Panel.CenterStacked" type="style"/>
-  <public name="MaterialAlertDialog.Material3Expressive.Title.Text" type="style"/>
-  <public name="MaterialAlertDialog.Material3Expressive.Title.Text.CenterStacked" type="style"/>
-
 </resources>
 
diff --git a/lib/java/com/google/android/material/dialog/res/layout/m3expressive_alert_dialog.xml b/lib/java/com/google/android/material/dialog/res/layout/m3expressive_alert_dialog.xml
deleted file mode 100644
index 5b2cdf1af5f..00000000000
--- a/lib/java/com/google/android/material/dialog/res/layout/m3expressive_alert_dialog.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2025 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.
--->
-<androidx.appcompat.widget.AlertDialogLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/parentPanel"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="start|left|top"
-    android:orientation="vertical"
-    android:clipChildren="true"
-    android:filterTouchesWhenObscured="true">
-
-  <include layout="@layout/m3expressive_alert_dialog_title"/>
-
-  <FrameLayout
-      android:id="@+id/contentPanel"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:minHeight="48dp">
-
-    <ImageView android:id="@+id/scrollIndicatorUp"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_gravity="top"
-        android:background="#1f000000"
-        android:visibility="gone"
-        android:contentDescription="@null"
-        app:backgroundTint="?android:attr/colorForeground"/>
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/scrollView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clipToPadding="false">
-
-      <LinearLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:orientation="vertical">
-
-        <android.widget.Space
-            android:id="@+id/textSpacerNoTitle"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/m3expressive_alert_dialog_top_padding"
-            android:visibility="gone"/>
-
-        <TextView
-            android:id="@android:id/message"
-            style="?attr/materialAlertDialogBodyTextStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingLeft="?attr/dialogPreferredPadding"
-            android:paddingRight="?attr/dialogPreferredPadding"/>
-
-        <android.widget.Space
-            android:id="@+id/textSpacerNoButtons"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/m3expressive_alert_dialog_bottom_padding"
-            android:visibility="gone"/>
-      </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-
-    <ImageView android:id="@+id/scrollIndicatorDown"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_gravity="bottom"
-        android:background="#1f000000"
-        android:visibility="gone"
-        android:contentDescription="@null"
-        app:backgroundTint="?android:attr/colorForeground"/>
-
-  </FrameLayout>
-
-  <FrameLayout
-      android:id="@+id/customPanel"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:minHeight="48dp">
-
-    <FrameLayout
-        android:id="@+id/custom"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-  </FrameLayout>
-
-  <include layout="@layout/m3_alert_dialog_actions"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"/>
-
-</androidx.appcompat.widget.AlertDialogLayout>
diff --git a/lib/java/com/google/android/material/dialog/res/layout/m3expressive_alert_dialog_title.xml b/lib/java/com/google/android/material/dialog/res/layout/m3expressive_alert_dialog_title.xml
deleted file mode 100644
index 99b2214c73c..00000000000
--- a/lib/java/com/google/android/material/dialog/res/layout/m3expressive_alert_dialog_title.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2025 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/topPanel"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:filterTouchesWhenObscured="true">
-
-  <!-- If the client uses a customTitle, it will be added here. -->
-
-  <LinearLayout
-      android:id="@+id/title_template"
-      style="?attr/materialAlertDialogTitlePanelStyle"
-      tools:ignore="UseCompoundDrawables">
-
-    <ImageView
-        android:id="@android:id/icon"
-        tools:ignore="ContentDescription"
-        style="?attr/materialAlertDialogTitleIconStyle"/>
-
-    <TextView
-        android:id="@+id/alertTitle"
-        style="?attr/materialAlertDialogTitleTextStyle"/>
-  </LinearLayout>
-
-  <android.widget.Space
-      android:id="@+id/titleDividerNoCustom"
-      android:layout_width="match_parent"
-      android:layout_height="@dimen/m3_alert_dialog_title_bottom_margin"
-      android:visibility="gone"/>
-</LinearLayout>
diff --git a/lib/java/com/google/android/material/dialog/res/values/dimens.xml b/lib/java/com/google/android/material/dialog/res/values/dimens.xml
index b18afd84ede..252bfb8e32d 100644
--- a/lib/java/com/google/android/material/dialog/res/values/dimens.xml
+++ b/lib/java/com/google/android/material/dialog/res/values/dimens.xml
@@ -35,8 +35,4 @@
   <!-- equals 24dp - @dimen/m3_btn_padding_bottom (6dp) - @dimen/m3_btn_inset (4dp) -->
   <dimen name="m3_alert_dialog_action_bottom_padding">14dp</dimen>
 
-  <!-- Dialog container top padding. -->
-  <dimen name="m3expressive_alert_dialog_top_padding">24dp</dimen>
-  <!-- Dialog container bottom padding. -->
-  <dimen name="m3expressive_alert_dialog_bottom_padding">24dp</dimen>
 </resources>
diff --git a/lib/java/com/google/android/material/dialog/res/values/styles.xml b/lib/java/com/google/android/material/dialog/res/values/styles.xml
index e9dfd19e107..1689e82ac1e 100644
--- a/lib/java/com/google/android/material/dialog/res/values/styles.xml
+++ b/lib/java/com/google/android/material/dialog/res/values/styles.xml
@@ -17,33 +17,6 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-  <!-- Styles for M3 Expressive Dialogs. -->
-
-  <style name="MaterialAlertDialog.Material3Expressive" parent="MaterialAlertDialog.Material3">
-    <item name="android:layout">@layout/m3expressive_alert_dialog</item>
-  </style>
-
-  <style name="MaterialAlertDialog.Material3Expressive.Title.Panel" parent="MaterialAlertDialog.Material3.Title.Panel">
-    <item name="android:paddingLeft">?attr/dialogPreferredPadding</item>
-    <item name="android:paddingRight">?attr/dialogPreferredPadding</item>
-    <item name="android:paddingTop">@dimen/m3expressive_alert_dialog_top_padding</item>
-  </style>
-
-  <style name="MaterialAlertDialog.Material3Expressive.Title.Panel.CenterStacked">
-    <item name="android:orientation">vertical</item>
-  </style>
-
-  <style name="MaterialAlertDialog.Material3Expressive.Title.Text" parent="MaterialAlertDialog.Material3.Title.Text">
-    <item name="android:singleLine">false</item>
-    <item name="android:maxLines">4</item>
-  </style>
-
-  <style name="MaterialAlertDialog.Material3Expressive.Title.Text.CenterStacked">
-    <item name="android:layout_gravity">center</item>
-    <item name="android:gravity">center</item>
-    <item name="android:textAlignment" tools:ignore="NewApi">gravity</item>
-  </style>
-
   <!-- Styles for M3 Dialogs. -->
 
   <style name="Widget.Material3.CheckedTextView" parent="Widget.MaterialComponents.CheckedTextView">
diff --git a/lib/java/com/google/android/material/dialog/res/values/themes.xml b/lib/java/com/google/android/material/dialog/res/values/themes.xml
index 52bab99144c..da3744dfbcf 100644
--- a/lib/java/com/google/android/material/dialog/res/values/themes.xml
+++ b/lib/java/com/google/android/material/dialog/res/values/themes.xml
@@ -15,49 +15,6 @@
   ~ limitations under the License.
 -->
 <resources>
-  <!-- Themes for M3 Expressive Dialogs. -->
-
-  <!--
-    Themes in the "Theme.Material3Expressive" family will contain a default full color scheme.
-
-    These theme declarations contain any version-independent specification. Items
-    that need to vary based on platform version should be defined in the corresponding
-    "Base.Theme" theme.
-  -->
-
-  <style name="Theme.Material3Expressive.Light.Dialog" parent="Base.Theme.Material3Expressive.Light.Dialog"/>
-  <style name="Theme.Material3Expressive.Dark.Dialog" parent="Base.Theme.Material3Expressive.Dark.Dialog"/>
-
-  <!--
-    Material 3 Expressive theme for alert dialog windows, which is used by the AlertDialog class.
-    This is basically a dialog but sets the background to empty so it can do
-    two-tone backgrounds. For applications targeting Honeycomb or newer, this is the default
-    AlertDialog theme.
-  -->
-  <style name="Theme.Material3Expressive.Light.Dialog.Alert" parent="Base.Theme.Material3Expressive.Light.Dialog">
-    <item name="windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
-    <item name="windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
-  </style>
-
-  <style name="Theme.Material3Expressive.Dark.Dialog.Alert" parent="Base.Theme.Material3Expressive.Dark.Dialog">
-    <item name="windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
-    <item name="windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
-  </style>
-
-  <!--
-    Variant of Theme.Material3Expressive.Dialog that has a nice minimum width for a regular dialog.
-  -->
-  <style name="Theme.Material3Expressive.Light.Dialog.MinWidth" parent="Base.Theme.Material3Expressive.Light.Dialog">
-    <item name="windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
-    <item name="windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
-  </style>
-
-  <style name="Theme.Material3Expressive.Dark.Dialog.MinWidth" parent="Base.Theme.Material3Expressive.Dark.Dialog">
-    <item name="windowMinWidthMajor">@dimen/abc_dialog_min_width_major</item>
-    <item name="windowMinWidthMinor">@dimen/abc_dialog_min_width_minor</item>
-  </style>
-
-
   <!-- Themes for M3 Dialogs. -->
 
   <!--
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 7549a0c1f1b..516ac232e9e 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
@@ -19,145 +19,6 @@
   <!-- All new attributes should be set in the follow four Base.V14 themes. -->
   <eat-comment/>
 
-  <!-- Base themes of Theme.Material3Expressive themes for dialogs. -->
-
-  <style name="Base.Theme.Material3Expressive.Light.Dialog" parent="Theme.Material3.Light.Dialog">
-    <!-- Color palettes. -->
-    <item name="colorOnPrimaryContainer">@color/m3_ref_palette_primary30</item>
-    <item name="colorOnSecondaryContainer">@color/m3_ref_palette_secondary30</item>
-    <item name="colorOnTertiaryContainer">@color/m3_ref_palette_tertiary30</item>
-    <item name="colorOnErrorContainer">@color/m3_ref_palette_error30</item>
-
-    <!-- Dialog themes. -->
-    <item name="alertDialogTheme">@style/ThemeOverlay.Material3Expressive.Dialog.Alert</item>
-    <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3Expressive.MaterialAlertDialog</item>
-
-    <!-- Widget styles. -->
-    <item name="appBarLayoutStyle">@style/Widget.Material3Expressive.AppBarLayout</item>
-    <item name="collapsingToolbarLayoutStyle">@style/Widget.Material3Expressive.CollapsingToolbar</item>
-    <item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Medium</item>
-    <item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Large</item>
-
-    <item name="materialSearchBarStyle">@style/Widget.Material3Expressive.SearchBar</item>
-
-    <!--
-      Default as primary container FABs. Unlisted FAB style attributes are not updated in Material3Expressive.
-      Please use the corresponding themeoverlay for other color variants via materialThemeOverlay.
-    -->
-    <item name="floatingActionButtonStyle">@style/Widget.Material3Expressive.FloatingActionButton</item>
-    <item name="floatingActionButtonMediumStyle">@style/Widget.Material3Expressive.FloatingActionButton.Medium</item>
-    <item name="floatingActionButtonLargeStyle">@style/Widget.Material3Expressive.FloatingActionButton.Large</item>
-
-    <!--
-      Default as primary container extended FABs. Unlisted FAB style attributes are not updated in Material3Expressive.
-      Please use the corresponding themeoverlay for other color varaints via materialThemeOverlay.
-    -->
-    <item name="extendedFloatingActionButtonSmallStyle">@style/Widget.Material3Expressive.ExtendedFloatingActionButton.Small</item>
-    <item name="extendedFloatingActionButtonMediumStyle">@style/Widget.Material3Expressive.ExtendedFloatingActionButton.Medium</item>
-    <item name="extendedFloatingActionButtonLargeStyle">@style/Widget.Material3Expressive.ExtendedFloatingActionButton.Large</item>
-
-    <item name="materialButtonStyle">@style/Widget.Material3Expressive.Button</item>
-    <item name="materialButtonTonalStyle">@style/Widget.Material3Expressive.Button.TonalButton</item>
-    <item name="materialButtonOutlinedStyle">@style/Widget.Material3Expressive.Button.OutlinedButton</item>
-    <item name="materialButtonElevatedStyle">@style/Widget.Material3Expressive.Button.ElevatedButton</item>
-    <item name="borderlessButtonStyle">@style/Widget.Material3Expressive.Button.TextButton</item>
-    <item name="buttonBarButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Dialog</item>
-    <item name="snackbarButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Snackbar</item>
-    <item name="materialIconButtonStyle">@style/Widget.Material3Expressive.Button.IconButton.Standard</item>
-    <item name="materialIconButtonOutlinedStyle">@style/Widget.Material3Expressive.Button.IconButton.Outlined</item>
-    <item name="materialIconButtonFilledStyle">@style/Widget.Material3Expressive.Button.IconButton.Filled</item>
-    <item name="materialIconButtonFilledTonalStyle">@style/Widget.Material3Expressive.Button.IconButton.Tonal</item>
-
-    <item name="materialButtonGroupStyle">@style/Widget.Material3Expressive.MaterialButtonGroup</item>
-    <item name="materialButtonToggleGroupStyle">@style/Widget.Material3Expressive.MaterialButtonToggleGroup</item>
-
-    <item name="bottomNavigationStyle">@style/Widget.Material3Expressive.BottomNavigationView</item>
-    <item name="navigationRailStyle">@style/Widget.Material3Expressive.NavigationRailView</item>
-
-    <item name="toolbarStyle">@style/Widget.Material3Expressive.Toolbar</item>
-    <item name="toolbarSurfaceStyle">@style/Widget.Material3Expressive.Toolbar.Surface</item>
-
-    <!-- Top App Bars. -->
-    <item name="collapsingToolbarLayoutMediumSize">@dimen/m3_comp_app_bar_medium_flexible_container_height</item>
-    <item name="collapsingToolbarLayoutLargeSize">@dimen/m3_comp_app_bar_large_flexible_container_height</item>
-
-    <!-- Action Bar. -->
-    <item name="actionBarSize">@dimen/m3_comp_app_bar_small_container_height</item>
-  </style>
-
-  <style name="Base.Theme.Material3Expressive.Dark.Dialog" parent="Theme.Material3.Dark.Dialog">
-
-    <!-- Dialog themes. -->
-    <item name="alertDialogTheme">@style/ThemeOverlay.Material3Expressive.Dialog.Alert</item>
-    <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3Expressive.MaterialAlertDialog</item>
-
-    <!-- Widget styles. -->
-    <item name="appBarLayoutStyle">@style/Widget.Material3Expressive.AppBarLayout</item>
-    <item name="collapsingToolbarLayoutStyle">@style/Widget.Material3Expressive.CollapsingToolbar</item>
-    <item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Medium</item>
-    <item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Large</item>
-
-    <item name="materialSearchBarStyle">@style/Widget.Material3Expressive.SearchBar</item>
-
-    <!--
-      Default as primary container FABs. Unlisted FAB style attributes are not updated in Material3Expressive.
-      Please use the corresponding themeoverlay for other color variants via materialThemeOverlay.
-    -->
-    <item name="floatingActionButtonStyle">@style/Widget.Material3Expressive.FloatingActionButton</item>
-    <item name="floatingActionButtonMediumStyle">@style/Widget.Material3Expressive.FloatingActionButton.Medium</item>
-    <item name="floatingActionButtonLargeStyle">@style/Widget.Material3Expressive.FloatingActionButton.Large</item>
-
-    <!--
-      Default as primary container extended FABs. Unlisted FAB style attributes are not updated in Material3Expressive.
-      Please use the corresponding themeoverlay for other color varaints via materialThemeOverlay.
-    -->
-    <item name="extendedFloatingActionButtonSmallStyle">@style/Widget.Material3Expressive.ExtendedFloatingActionButton.Small</item>
-    <item name="extendedFloatingActionButtonMediumStyle">@style/Widget.Material3Expressive.ExtendedFloatingActionButton.Medium</item>
-    <item name="extendedFloatingActionButtonLargeStyle">@style/Widget.Material3Expressive.ExtendedFloatingActionButton.Large</item>
-
-    <item name="materialButtonStyle">@style/Widget.Material3Expressive.Button</item>
-    <item name="materialButtonTonalStyle">@style/Widget.Material3Expressive.Button.TonalButton</item>
-    <item name="materialButtonOutlinedStyle">@style/Widget.Material3Expressive.Button.OutlinedButton</item>
-    <item name="materialButtonElevatedStyle">@style/Widget.Material3Expressive.Button.ElevatedButton</item>
-    <item name="borderlessButtonStyle">@style/Widget.Material3Expressive.Button.TextButton</item>
-    <item name="buttonBarButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Dialog</item>
-    <item name="snackbarButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Snackbar</item>
-    <item name="materialIconButtonStyle">@style/Widget.Material3Expressive.Button.IconButton.Standard</item>
-    <item name="materialIconButtonOutlinedStyle">@style/Widget.Material3Expressive.Button.IconButton.Outlined</item>
-    <item name="materialIconButtonFilledStyle">@style/Widget.Material3Expressive.Button.IconButton.Filled</item>
-    <item name="materialIconButtonFilledTonalStyle">@style/Widget.Material3Expressive.Button.IconButton.Tonal</item>
-
-    <item name="materialButtonGroupStyle">@style/Widget.Material3Expressive.MaterialButtonGroup</item>
-    <item name="materialButtonToggleGroupStyle">@style/Widget.Material3Expressive.MaterialButtonToggleGroup</item>
-
-    <item name="bottomNavigationStyle">@style/Widget.Material3Expressive.BottomNavigationView</item>
-    <item name="navigationRailStyle">@style/Widget.Material3Expressive.NavigationRailView</item>
-
-    <item name="toolbarStyle">@style/Widget.Material3Expressive.Toolbar</item>
-    <item name="toolbarSurfaceStyle">@style/Widget.Material3Expressive.Toolbar.Surface</item>
-
-    <!-- Top App Bars. -->
-    <item name="collapsingToolbarLayoutMediumSize">@dimen/m3_comp_app_bar_medium_flexible_container_height</item>
-    <item name="collapsingToolbarLayoutLargeSize">@dimen/m3_comp_app_bar_large_flexible_container_height</item>
-
-    <!-- Action Bar. -->
-    <item name="actionBarSize">@dimen/m3_comp_app_bar_small_container_height</item>
-  </style>
-
-  <style name="Base.Theme.Material3Expressive.Light.Dialog.FixedSize">
-    <item name="windowFixedWidthMajor">@dimen/abc_dialog_fixed_width_major</item>
-    <item name="windowFixedWidthMinor">@dimen/abc_dialog_fixed_width_minor</item>
-    <item name="windowFixedHeightMajor">@dimen/abc_dialog_fixed_height_major</item>
-    <item name="windowFixedHeightMinor">@dimen/abc_dialog_fixed_height_minor</item>
-  </style>
-
-  <style name="Base.Theme.Material3Expressive.Dark.Dialog.FixedSize">
-    <item name="windowFixedWidthMajor">@dimen/abc_dialog_fixed_width_major</item>
-    <item name="windowFixedWidthMinor">@dimen/abc_dialog_fixed_width_minor</item>
-    <item name="windowFixedHeightMajor">@dimen/abc_dialog_fixed_height_major</item>
-    <item name="windowFixedHeightMinor">@dimen/abc_dialog_fixed_height_minor</item>
-  </style>
-
   <!-- Base themes of Theme.Material3 themes for dialogs. -->
 
   <style name="Base.V14.Theme.Material3.Light.Dialog" parent="Theme.MaterialComponents.Light.Dialog">
diff --git a/lib/java/com/google/android/material/dialog/res/values/themes_overlay.xml b/lib/java/com/google/android/material/dialog/res/values/themes_overlay.xml
index 69ca268501e..6c50c702bcf 100644
--- a/lib/java/com/google/android/material/dialog/res/values/themes_overlay.xml
+++ b/lib/java/com/google/android/material/dialog/res/values/themes_overlay.xml
@@ -16,56 +16,6 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-  <!-- Dialog theme overlays for M3 Expressive. -->
-
-  <style name="Base.ThemeOverlay.Material3Expressive.Dialog" parent="Base.ThemeOverlay.Material3.Dialog">
-    <item name="materialButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Dialog.Flush</item>
-  </style>
-
-  <style name="ThemeOverlay.Material3Expressive.Dialog" parent="Base.ThemeOverlay.Material3Expressive.Dialog"/>
-
-  <!--
-    The default Material3Expressive theme overlay used for AlertDialogs built via the
-    alertDialogTheme attribute.
-  -->
-  <style name="ThemeOverlay.Material3Expressive.Dialog.Alert" parent="ThemeOverlay.Material3.Dialog.Alert">
-    <item name="buttonBarButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Dialog.Flush</item>
-  </style>
-
-  <!--
-    The default theme overlay used by Material3Expressive for framework
-    (non-AppCompat) alert dialogs, via the android:alertDialogTheme attribute.
-    It is recommended to use AppCompat alert dialogs, but Preferences does not.
-  -->
-  <style name="ThemeOverlay.Material3Expressive.Dialog.Alert.Framework" parent="ThemeOverlay.Material3.Dialog.Alert.Framework">
-    <item name="android:buttonBarButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Dialog.Flush</item>
-  </style>
-
-  <style name="ThemeOverlay.Material3Expressive.Light.Dialog.Alert.Framework" parent="ThemeOverlay.Material3.Light.Dialog.Alert.Framework">
-    <item name="android:buttonBarButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Dialog.Flush</item>
-  </style>
-
-  <!--
-    The default Material3Expressive theme overlay for AlertDialogs built with the MaterialAlertDialogBuilder, via the
-    materialAlertDialogTheme attribute.
-    -->
-  <style name="ThemeOverlay.Material3Expressive.MaterialAlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
-    <item name="alertDialogStyle">@style/MaterialAlertDialog.Material3Expressive</item>
-    <item name="buttonBarButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Dialog</item>
-    <item name="buttonBarPositiveButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Dialog</item>
-    <item name="buttonBarNegativeButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Dialog</item>
-    <item name="buttonBarNeutralButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Dialog.Flush</item>
-    <item name="materialAlertDialogTitlePanelStyle">@style/MaterialAlertDialog.Material3Expressive.Title.Panel</item>
-    <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialog.Material3Expressive.Title.Text</item>
-  </style>
-
-  <!-- A theme overlay for Material3Expressive Alert Dialog panels with a center aligned title text and icon. -->
-  <style name="ThemeOverlay.Material3Expressive.MaterialAlertDialog.Centered">
-    <item name="materialAlertDialogTitlePanelStyle">@style/MaterialAlertDialog.Material3Expressive.Title.Panel.CenterStacked</item>
-    <item name="materialAlertDialogTitleIconStyle">@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked</item>
-    <item name="materialAlertDialogTitleTextStyle">@style/MaterialAlertDialog.Material3Expressive.Title.Text.CenterStacked</item>
-  </style>
-
   <!-- Dialog theme overlays for M3. -->
 
   <style name="Base.ThemeOverlay.Material3.Dialog" parent="Base.ThemeOverlay.MaterialComponents.Dialog">
diff --git a/lib/java/com/google/android/material/dockedtoolbar/res/values/styles.xml b/lib/java/com/google/android/material/dockedtoolbar/res/values/styles.xml
index 7e4905ad698..1d039a05ff0 100644
--- a/lib/java/com/google/android/material/dockedtoolbar/res/values/styles.xml
+++ b/lib/java/com/google/android/material/dockedtoolbar/res/values/styles.xml
@@ -38,7 +38,7 @@
   </style>
 
   <!-- Style for Icon Button in Standard Docked Toolbar. -->
-  <style name="Widget.Material3.DockedToolbar.IconButton" parent="Widget.Material3Expressive.Button.IconButton">
+  <style name="Widget.Material3.DockedToolbar.IconButton" parent="Widget.Material3.Button.IconButton">
     <item name="backgroundTint">@color/m3_standard_toolbar_icon_button_container_color_selector</item>
     <item name="android:textColor">@color/m3_standard_toolbar_button_text_color_selector</item>
     <item name="iconTint">@color/m3_standard_toolbar_icon_button_icon_color_selector</item>
@@ -46,7 +46,7 @@
   </style>
 
   <!-- Style for Buttons in Standard Docked Toolbar. -->
-  <style name="Widget.Material3.DockedToolbar.Button" parent="Widget.Material3Expressive.Button">
+  <style name="Widget.Material3.DockedToolbar.Button" parent="Widget.Material3.Button">
     <item name="backgroundTint">@color/m3_standard_toolbar_icon_button_container_color_selector</item>
     <item name="android:textColor">@color/m3_standard_toolbar_button_text_color_selector</item>
     <item name="iconTint">@color/m3_standard_toolbar_icon_button_icon_color_selector</item>
@@ -54,7 +54,7 @@
   </style>
 
   <!-- Style for Text Buttons in Standard Docked Toolbar. -->
-  <style name="Widget.Material3.DockedToolbar.TextButton" parent="Widget.Material3Expressive.Button.TextButton">
+  <style name="Widget.Material3.DockedToolbar.TextButton" parent="Widget.Material3.Button.TextButton">
     <item name="backgroundTint">@color/m3_standard_toolbar_icon_button_container_color_selector</item>
     <item name="android:textColor">@color/m3_standard_toolbar_button_text_color_selector</item>
     <item name="iconTint">@color/m3_standard_toolbar_icon_button_icon_color_selector</item>
diff --git a/lib/java/com/google/android/material/floatingactionbutton/res/values/styles.xml b/lib/java/com/google/android/material/floatingactionbutton/res/values/styles.xml
index 391d73ee0ca..b4273e4ff45 100644
--- a/lib/java/com/google/android/material/floatingactionbutton/res/values/styles.xml
+++ b/lib/java/com/google/android/material/floatingactionbutton/res/values/styles.xml
@@ -16,72 +16,6 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-  <!-- Styles for M3 Expressive FABs. -->
-
-  <!-- M3 Expressive Regular FABs -->
-  <style name="Widget.Material3Expressive.FloatingActionButton" parent="Base.Widget.Material3.FloatingActionButton">
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer</item>
-  </style>
-
-  <!-- M3 Expressive Medium FABs -->
-  <style name="Widget.Material3Expressive.FloatingActionButton.Medium" parent="Base.Widget.Material3.FloatingActionButton.Medium">
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer</item>
-  </style>
-
-  <!-- M3 Expressive Large FABs -->
-  <style name="Widget.Material3Expressive.FloatingActionButton.Large" parent="Base.Widget.Material3.FloatingActionButton.Large">
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer</item>
-  </style>
-
-  <!-- Styles for M3 Expressive Extended FABs. -->
-
-  <!-- M3 Expressive Extended Small FABs -->
-  <style name="Widget.Material3Expressive.ExtendedFloatingActionButton.Small" parent="Base.Widget.Material3.ExtendedFloatingActionButton.Small">
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer</item>
-  </style>
-
-  <!-- M3 Expressive Extended Medium FABs -->
-  <style name="Widget.Material3Expressive.ExtendedFloatingActionButton.Medium" parent="Base.Widget.Material3.ExtendedFloatingActionButton.Medium">
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer</item>
-  </style>
-
-  <!-- M3 Expressive Extended Large FABs -->
-  <style name="Widget.Material3Expressive.ExtendedFloatingActionButton.Large" parent="Base.Widget.Material3.ExtendedFloatingActionButton.Large">
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer</item>
-  </style>
-
-  <!-- M3 Expressive FAB (and extended FAB) Theme Overlays for different color variants. -->
-
-  <style name="ThemeOverlay.Material3Expressive.FloatingActionButton.Primary" parent="">
-    <item name="colorContainer">@macro/m3_comp_fab_primary_container_color</item>
-    <item name="colorOnContainer">@macro/m3_comp_fab_primary_icon_color</item>
-  </style>
-
-  <style name="ThemeOverlay.Material3Expressive.FloatingActionButton.Secondary" parent="">
-    <item name="colorContainer">@macro/m3_comp_fab_secondary_container_color</item>
-    <item name="colorOnContainer">@macro/m3_comp_fab_secondary_icon_color</item>
-  </style>
-
-  <style name="ThemeOverlay.Material3Expressive.FloatingActionButton.Tertiary" parent="">
-    <item name="colorContainer">@macro/m3_comp_fab_tertiary_container_color</item>
-    <item name="colorOnContainer">@macro/m3_comp_fab_tertiary_icon_color</item>
-  </style>
-
-  <style name="ThemeOverlay.Material3Expressive.FloatingActionButton.PrimaryContainer" parent="">
-    <item name="colorContainer">@macro/m3_comp_fab_primary_container_container_color</item>
-    <item name="colorOnContainer">@macro/m3_comp_fab_primary_container_icon_color</item>
-  </style>
-
-  <style name="ThemeOverlay.Material3Expressive.FloatingActionButton.SecondaryContainer" parent="">
-    <item name="colorContainer">@macro/m3_comp_fab_secondary_container_container_color</item>
-    <item name="colorOnContainer">@macro/m3_comp_fab_secondary_container_icon_color</item>
-  </style>
-
-  <style name="ThemeOverlay.Material3Expressive.FloatingActionButton.TertiaryContainer" parent="">
-    <item name="colorContainer">@macro/m3_comp_fab_tertiary_container_container_color</item>
-    <item name="colorOnContainer">@macro/m3_comp_fab_tertiary_container_icon_color</item>
-  </style>
-
   <!-- Styles for M3 FABs. -->
 
   <!-- M3 Regular FABs -->
@@ -224,7 +158,6 @@
     <item name="elevation">@dimen/m3_comp_extended_fab_primary_container_container_elevation</item>
     <item name="android:stateListAnimator">@animator/m3_extended_fab_state_list_animator</item>
     <item name="iconSize">@dimen/m3_comp_extended_fab_small_icon_size</item>
-    <!-- Hardcoded, since token is updated for Expressive eFABs. -->
     <item name="android:textAppearance">?attr/textAppearanceLabelLarge</item>
     <item name="shapeAppearance">@macro/m3_comp_extended_fab_small_container_shape</item>
     <item name="shapeAppearanceOverlay">@null</item>
@@ -279,7 +212,7 @@
     <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Surface</item>
   </style>
 
-  <!-- M3 Expressive Extended Small FABs -->
+  <!-- M3 Extended Small FABs -->
   <style name="Base.Widget.Material3.ExtendedFloatingActionButton.Small" parent="Base.Widget.Material3.ExtendedFloatingActionButton">
     <item name="android:minWidth">@dimen/m3_comp_extended_fab_small_container_height</item>
     <item name="android:minHeight">@dimen/m3_comp_extended_fab_small_container_height</item>
@@ -296,7 +229,7 @@
     <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Primary</item>
   </style>
 
-  <!-- M3 Expressive Extended Medium FABs -->
+  <!-- M3 Extended Medium FABs -->
   <style name="Base.Widget.Material3.ExtendedFloatingActionButton.Medium" parent="Base.Widget.Material3.ExtendedFloatingActionButton">
     <item name="android:minWidth">@dimen/m3_comp_extended_fab_medium_container_height</item>
     <item name="android:minHeight">@dimen/m3_comp_extended_fab_medium_container_height</item>
@@ -314,7 +247,7 @@
     <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.ExtendedFloatingActionButton.Primary</item>
   </style>
 
-  <!-- M3 Expressive Extended Large FABs -->
+  <!-- M3 Extended Large FABs -->
   <style name="Base.Widget.Material3.ExtendedFloatingActionButton.Large" parent="Base.Widget.Material3.ExtendedFloatingActionButton">
     <item name="android:minWidth">@dimen/m3_comp_extended_fab_large_container_height</item>
     <item name="android:minHeight">@dimen/m3_comp_extended_fab_large_container_height</item>
@@ -353,7 +286,7 @@
     <item name="colorContainer">@macro/m3_comp_extended_fab_surface_container_color</item>
     <item name="colorOnContainer">@macro/m3_comp_extended_fab_surface_icon_color</item>
   </style>
-  
+
   <!-- Styles of M2 FABs. -->
 
   <style name="Widget.Design.FloatingActionButton" parent="android:Widget">
diff --git a/lib/java/com/google/android/material/floatingtoolbar/res-public/values/public.xml b/lib/java/com/google/android/material/floatingtoolbar/res-public/values/public.xml
index ad45f8785c0..de02f8cdbf0 100644
--- a/lib/java/com/google/android/material/floatingtoolbar/res-public/values/public.xml
+++ b/lib/java/com/google/android/material/floatingtoolbar/res-public/values/public.xml
@@ -19,8 +19,4 @@
   <public name="floatingToolbarVibrantStyle" type="attr"/>
   <public name="Widget.Material3.FloatingToolbar" type="style"/>
   <public name="Widget.Material3.FloatingToolbar.Vibrant" type="style"/>
-  <public name="Widget.Material3Expressive.FloatingToolbar" type="style"/>
-  <public name="Widget.Material3Expressive.FloatingToolbar.Vibrant" type="style"/>
-  <public name="Widget.Material3Expressive.FloatingToolbar.IconButton" type="style"/>
-  <public name="Widget.Material3Expressive.FloatingToolbar.IconButton.Vibrant" type="style"/>
 </resources>
diff --git a/lib/java/com/google/android/material/floatingtoolbar/res/values/styles.xml b/lib/java/com/google/android/material/floatingtoolbar/res/values/styles.xml
index c400d186aac..192f635ba86 100644
--- a/lib/java/com/google/android/material/floatingtoolbar/res/values/styles.xml
+++ b/lib/java/com/google/android/material/floatingtoolbar/res/values/styles.xml
@@ -45,7 +45,7 @@
   </style>
 
   <!-- Style for icon buttons within Standard Floating Toolbars. -->
-  <style name="Widget.Material3.FloatingToolbar.IconButton" parent="Widget.Material3Expressive.Button.IconButton.Tonal">
+  <style name="Widget.Material3.FloatingToolbar.IconButton" parent="Widget.Material3.Button.IconButton.Filled.Tonal">
     <item name="backgroundTint">@color/m3_standard_toolbar_icon_button_container_color_selector</item>
     <item name="android:textColor">@color/m3_standard_toolbar_button_text_color_selector</item>
     <item name="iconTint">@color/m3_standard_toolbar_icon_button_icon_color_selector</item>
@@ -54,7 +54,7 @@
   </style>
 
   <!-- Style for buttons within Standard Floating Toolbars. -->
-  <style name="Widget.Material3.FloatingToolbar.Button" parent="Widget.Material3Expressive.Button">
+  <style name="Widget.Material3.FloatingToolbar.Button" parent="Widget.Material3.Button">
     <item name="backgroundTint">@color/m3_standard_toolbar_icon_button_container_color_selector</item>
     <item name="android:textColor">@color/m3_standard_toolbar_button_text_color_selector</item>
     <item name="iconTint">@color/m3_standard_toolbar_icon_button_icon_color_selector</item>
@@ -62,7 +62,7 @@
   </style>
 
   <!-- Style for borderless text buttons within Standard Floating Toolbars. -->
-  <style name="Widget.Material3.FloatingToolbar.TextButton" parent="Widget.Material3Expressive.Button.TextButton">
+  <style name="Widget.Material3.FloatingToolbar.TextButton" parent="Widget.Material3.Button.TextButton">
     <item name="backgroundTint">@color/m3_standard_toolbar_icon_button_container_color_selector</item>
     <item name="android:textColor">@color/m3_standard_toolbar_button_text_color_selector</item>
     <item name="iconTint">@color/m3_standard_toolbar_icon_button_icon_color_selector</item>
diff --git a/lib/java/com/google/android/material/navigationrail/res/values/dimens.xml b/lib/java/com/google/android/material/navigationrail/res/values/dimens.xml
index 3c21836c2ee..074dbcd25fb 100644
--- a/lib/java/com/google/android/material/navigationrail/res/values/dimens.xml
+++ b/lib/java/com/google/android/material/navigationrail/res/values/dimens.xml
@@ -48,13 +48,4 @@
   <dimen name="m3_navigation_rail_max_expanded_width">360dp</dimen>
   <dimen name="m3_navigation_rail_expanded_item_spacing">0dp</dimen>
 
-  <dimen name="m3expressive_nav_rail_item_min_height">@dimen/m3_comp_nav_rail_item_container_height</dimen>
-  <dimen name="m3expressive_nav_rail_min_width">@dimen/m3_comp_nav_rail_collapsed_container_width</dimen>
-  <dimen name="m3expressive_nav_rail_content_margin_top">@dimen/m3_comp_nav_rail_collapsed_top_space</dimen>
-  <dimen name="m3expressive_nav_rail_header_items_margin">@dimen/m3_comp_nav_rail_item_header_space_minimum</dimen>
-  <dimen name="m3expressive_nav_rail_item_vertical_padding">@dimen/m3_comp_nav_rail_item_container_vertical_space</dimen>
-  <dimen name="m3expressive_nav_rail_item_spacing">@dimen/m3_comp_nav_rail_collapsed_item_vertical_space</dimen>
-  <!-- TODO:b/373943921 - integrate tokens when ready -->
-  <dimen name="m3expressive_nav_rail_item_leading_trailing_padding">20dp</dimen>
-
 </resources>
diff --git a/lib/java/com/google/android/material/navigationrail/res/values/styles.xml b/lib/java/com/google/android/material/navigationrail/res/values/styles.xml
index 3cf74f3ec11..3b735037837 100644
--- a/lib/java/com/google/android/material/navigationrail/res/values/styles.xml
+++ b/lib/java/com/google/android/material/navigationrail/res/values/styles.xml
@@ -16,54 +16,6 @@
   -->
 <resources>
 
-  <!-- Styles for M3 Expressive NavigationRailView. -->
-
-  <style name="Widget.Material3Expressive.NavigationRailView" parent="Widget.Material3.NavigationRailView">
-    <item name="collapsedItemMinHeight">@dimen/m3expressive_nav_rail_item_min_height</item>
-    <item name="expandedItemMinHeight">@dimen/m3_comp_nav_rail_item_short_container_height</item>
-    <item name="expandedMinWidth">@dimen/m3_comp_nav_rail_expanded_container_width_minimum</item>
-    <item name="expandedMaxWidth">@dimen/m3_comp_nav_rail_expanded_container_width_maximum</item>
-    <item name="android:background">@macro/m3_comp_nav_rail_collapsed_container_color</item>
-    <item name="elevation">@dimen/m3_comp_nav_rail_collapsed_container_elevation</item>
-    <item name="android:minWidth">@dimen/m3expressive_nav_rail_min_width</item>
-    <item name="itemPaddingTop">@dimen/m3expressive_nav_rail_item_vertical_padding</item>
-    <item name="itemPaddingBottom">@dimen/m3expressive_nav_rail_item_vertical_padding</item>
-    <item name="contentMarginTop">@dimen/m3expressive_nav_rail_content_margin_top</item>
-    <item name="headerMarginBottom">@dimen/m3expressive_nav_rail_header_items_margin</item>
-    <item name="itemSpacing">@dimen/m3expressive_nav_rail_item_spacing</item>
-    <item name="measureBottomPaddingFromLabelBaseline">false</item>
-    <item name="itemTextColor">@color/m3expressive_nav_rail_item_label_tint</item>
-    <item name="itemIconTint">@color/m3expressive_nav_rail_item_icon_tint</item>
-    <item name="itemRippleColor">@color/m3expressive_nav_rail_item_ripple_tint</item>
-    <item name="itemTextAppearanceActiveBoldEnabled">false</item>
-    <item name="itemActiveIndicatorStyle">@style/Widget.Material3Expressive.NavigationRailView.ActiveIndicator</item>
-    <item name="itemIconSize">@dimen/m3_comp_nav_rail_item_icon_size</item>
-    <item name="activeIndicatorLabelPadding">@dimen/m3_comp_nav_rail_item_vertical_icon_label_space</item>
-    <item name="horizontalItemTextAppearanceActive">@macro/m3_comp_nav_rail_item_horizontal_label_text_font</item>
-    <item name="horizontalItemTextAppearanceInactive">@macro/m3_comp_nav_rail_item_horizontal_label_text_font</item>
-    <item name="itemTextAppearanceActive">@macro/m3_comp_nav_rail_item_vertical_label_text_font</item>
-    <item name="itemTextAppearanceInactive">@macro/m3_comp_nav_rail_item_vertical_label_text_font</item>
-    <item name="scrollingEnabled">true</item>
-    <item name="labelFontScalingEnabled">true</item>
-    <item name="labelMaxLines">999</item>
-    <item name="labelVisibilityMode">labeled</item>
-    <item name="iconLabelHorizontalSpacing">@dimen/m3_comp_nav_rail_item_horizontal_icon_label_space</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.NavigationRailView.ActiveIndicator" parent="Widget.Material3.NavigationRailView.ActiveIndicator">
-    <item name="android:color">@macro/m3_comp_nav_rail_item_active_indicator_color</item>
-    <item name="shapeAppearance">@style/ShapeAppearance.M3.Comp.NavRail.Item.ActiveIndicator.Shape</item>
-    <item name="android:width">@dimen/m3_comp_nav_rail_item_vertical_active_indicator_width</item>
-    <item name="android:height">@dimen/m3_comp_nav_rail_item_vertical_active_indicator_height</item>
-    <item name="expandedHeight">@dimen/m3_comp_nav_rail_item_horizontal_active_indicator_height</item>
-    <item name="expandedWidth">wrap_content</item>
-    <item name="expandedMarginHorizontal">@dimen/m3expressive_nav_rail_item_leading_trailing_padding</item>
-    <item name="expandedActiveIndicatorPaddingStart">@dimen/m3_comp_nav_rail_item_horizontal_full_width_leading_space</item>
-    <item name="expandedActiveIndicatorPaddingEnd">@dimen/m3_comp_nav_rail_item_horizontal_full_width_trailing_space</item>
-    <item name="expandedActiveIndicatorPaddingTop">@dimen/m3_comp_nav_rail_item_vertical_leading_space</item>
-    <item name="expandedActiveIndicatorPaddingBottom">@dimen/m3_comp_nav_rail_item_vertical_trailing_space</item>
-  </style>
-
   <!-- Styles for M3 NavigationRailView. -->
 
   <style name="Widget.Material3.NavigationRailView" parent="Widget.MaterialComponents.NavigationRailView">
diff --git a/lib/java/com/google/android/material/progressindicator/res/values/styles.xml b/lib/java/com/google/android/material/progressindicator/res/values/styles.xml
index 7bd992941b2..2c200101c9b 100644
--- a/lib/java/com/google/android/material/progressindicator/res/values/styles.xml
+++ b/lib/java/com/google/android/material/progressindicator/res/values/styles.xml
@@ -16,28 +16,6 @@
 -->
 <resources>
 
-  <!-- Styles for M3 Expressive ProgressIndicator. -->
-
-  <style name="Widget.Material3Expressive.LinearProgressIndicator" parent="Widget.Material3.LinearProgressIndicator"/>
-
-  <style name="Widget.Material3Expressive.LinearProgressIndicator.Wavy">
-    <item name="waveAmplitude">@dimen/m3_comp_progress_indicator_linear_active_indicator_wave_amplitude</item>
-    <item name="wavelength">@dimen/m3_comp_progress_indicator_linear_active_indicator_wave_wavelength</item>
-    <item name="wavelengthIndeterminate">@dimen/m3_comp_progress_indicator_linear_indeterminate_active_indicator_wave_wavelength</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.CircularProgressIndicator" parent="Widget.Material3.CircularProgressIndicator">
-    <item name="indeterminateAnimationTypeCircular">retreat</item>
-    <item name="indeterminateTrackVisible">true</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.CircularProgressIndicator.Wavy">
-    <item name="indicatorSize">@dimen/m3_comp_progress_indicator_circular_with_wave_size</item>
-    <item name="indicatorInset">0dp</item>
-    <item name="waveAmplitude">@dimen/m3_comp_progress_indicator_circular_active_indicator_wave_amplitude</item>
-    <item name="wavelength">@dimen/m3_comp_progress_indicator_circular_active_indicator_wave_wavelength</item>
-  </style>
-
   <!-- Styles for M3 ProgressIndicator. -->
 
   <!-- M3 LinearProgressIndicator style -->
diff --git a/lib/java/com/google/android/material/search/res-public/values/public.xml b/lib/java/com/google/android/material/search/res-public/values/public.xml
index 69bc422c54e..5ba4bd84616 100644
--- a/lib/java/com/google/android/material/search/res-public/values/public.xml
+++ b/lib/java/com/google/android/material/search/res-public/values/public.xml
@@ -41,10 +41,4 @@
   <public name="Widget.Material3.Search.ActionButton.Overflow" type="style"/>
   <public name="Widget.Material3.Search.Toolbar.Button.Navigation" type="style"/>
   <public name="searchbar_scrolling_view_behavior" type="string"/>
-  <public name="Widget.Material3Expressive.SearchBar" type="style"/>
-  <public name="Widget.Material3Expressive.SearchBar.CenteredText" type="style"/>
-  <public name="Widget.Material3Expressive.SearchBar.Outlined" type="style"/>
-  <public name="Widget.Material3Expressive.SearchView" type="style"/>
-  <public name="Widget.Material3Expressive.SearchBar.CenteredText.AppBarWithSearch" type="style"/>
-  <public name="Widget.Material3Expressive.SearchBar.AppBarWithSearch" type="style"/>
 </resources>
diff --git a/lib/java/com/google/android/material/search/res/values/styles.xml b/lib/java/com/google/android/material/search/res/values/styles.xml
index 9efa2891268..66ad9d57265 100644
--- a/lib/java/com/google/android/material/search/res/values/styles.xml
+++ b/lib/java/com/google/android/material/search/res/values/styles.xml
@@ -16,68 +16,6 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-  <!-- Styles for M3 Expressive SearchBar. -->
-
-  <style name="Widget.Material3Expressive.SearchBar" parent="Widget.Material3.SearchBar">
-    <item name="backgroundTint">?attr/colorSurfaceContainer</item>
-    <item name="liftOnScrollColor">?attr/colorSurfaceContainerHighest</item>
-    <item name="liftOnScroll">true</item>
-    <item name="contentInsetStart">24dp</item>
-    <item name="android:paddingEnd">4dp</item>
-    <item name="android:maxWidth">720dp</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.SearchBar.CenteredText">
-    <item name="contentInsetStart">8dp</item>
-    <item name="contentInsetEnd">8dp</item>
-    <item name="hideNavigationIcon">true</item>
-    <item name="textCentered">true</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.SearchBar.Outlined" parent="Widget.Material3.SearchBar.Outlined">
-    <item name="backgroundTint">?attr/colorSurfaceContainer</item>
-    <item name="liftOnScrollColor">?attr/colorSurfaceContainerHighest</item>
-    <item name="liftOnScroll">true</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.SearchView" parent="Widget.Material3.SearchView"/>
-
-  <style name="Widget.Material3Expressive.SearchBar.CenteredText.AppBarWithSearch">
-    <item name="android:maxWidth">312dp</item>
-    <item name="defaultMarginsEnabled">false</item>
-    <item name="android:layout_gravity">center</item>
-    <item name="android:layout_marginStart">8dp</item>
-    <item name="android:layout_marginEnd">8dp</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.SearchBar.AppBarWithSearch">
-    <item name="android:maxWidth">312dp</item>
-    <item name="defaultMarginsEnabled">false</item>
-    <item name="hideNavigationIcon">true</item>
-    <item name="android:layout_gravity">center</item>
-    <item name="android:layout_marginStart">8dp</item>
-    <item name="android:layout_marginEnd">8dp</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.AppBarLayout.AppBarWithSearch">
-    <item name="android:paddingStart">4dp</item>
-    <item name="android:paddingEnd">4dp</item>
-    <item name="android:minHeight">64dp</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.Toolbar.AppBarWithSearch">
-    <item name="buttonGravity">center_vertical</item>
-    <item name="android:layout_marginEnd">0dp</item>
-    <item name="layout_scrollFlags">scroll|snap|enterAlways</item>
-    <item name="materialThemeOverlay">@style/ThemeOverlay.Material3.Search</item>
-  </style>
-
-  <style name="ThemeOverlay.Material3Expressive.AppBarWithSearch" parent="">
-    <item name="appBarLayoutStyle">@style/Widget.Material3Expressive.AppBarLayout.AppBarWithSearch</item>
-    <item name="toolbarStyle">@style/Widget.Material3Expressive.Toolbar.AppBarWithSearch</item>
-    <item name="materialSearchBarStyle">@style/Widget.Material3Expressive.SearchBar.CenteredText.AppBarWithSearch</item>
-  </style>
-
   <!-- Styles for M3 SearchBar. -->
 
   <style name="Widget.Material3.SearchBar" parent="android:Widget">
diff --git a/lib/java/com/google/android/material/slider/res/values/styles.xml b/lib/java/com/google/android/material/slider/res/values/styles.xml
index 94ecabbb0c7..beae19ea997 100644
--- a/lib/java/com/google/android/material/slider/res/values/styles.xml
+++ b/lib/java/com/google/android/material/slider/res/values/styles.xml
@@ -16,41 +16,6 @@
 -->
 <resources>
 
-  <!-- Styles of M3 Expressive Slider. -->
-
-  <style name="Widget.Material3Expressive.Slider.Xsmall" parent="Widget.Material3.Slider">
-    <item name="trackHeight">@dimen/m3_comp_slider_xsmall_active_track_height</item>
-    <item name="thumbHeight">@dimen/m3_comp_slider_xsmall_active_handle_height</item>
-    <item name="trackCornerSize">@dimen/m3_comp_slider_xsmall_active_track_shape_leading</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.Slider.Small" parent="Widget.Material3.Slider">
-    <item name="trackHeight">@dimen/m3_comp_slider_small_active_track_height</item>
-    <item name="thumbHeight">@dimen/m3_comp_slider_small_active_handle_height</item>
-    <item name="trackCornerSize">@dimen/m3_comp_slider_small_active_track_shape_leading</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.Slider.Medium" parent="Widget.Material3.Slider">
-    <item name="trackHeight">@dimen/m3_comp_slider_medium_active_track_height</item>
-    <item name="thumbHeight">@dimen/m3_comp_slider_medium_active_handle_height</item>
-    <item name="trackCornerSize">@dimen/m3_comp_slider_medium_active_track_shape_leading</item>
-    <item name="trackIconSize">@dimen/m3_comp_slider_medium_icon_size</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.Slider.Large" parent="Widget.Material3.Slider">
-    <item name="trackHeight">@dimen/m3_comp_slider_large_active_track_height</item>
-    <item name="thumbHeight">@dimen/m3_comp_slider_large_active_handle_height</item>
-    <item name="trackCornerSize">@dimen/m3_comp_slider_large_active_track_shape_leading</item>
-    <item name="trackIconSize">@dimen/m3_comp_slider_large_icon_size</item>
-  </style>
-
-  <style name="Widget.Material3Expressive.Slider.Xlarge" parent="Widget.Material3.Slider">
-    <item name="trackHeight">@dimen/m3_comp_slider_xlarge_active_track_height</item>
-    <item name="thumbHeight">@dimen/m3_comp_slider_xlarge_active_handle_height</item>
-    <item name="trackCornerSize">@dimen/m3_comp_slider_xlarge_active_track_shape_leading</item>
-    <item name="trackIconSize">@dimen/m3_comp_slider_xlarge_icon_size</item>
-  </style>
-
   <!-- Styles of M3 Slider. -->
 
   <style name="Widget.Material3.Slider" parent="Widget.MaterialComponents.Slider">
diff --git a/lib/java/com/google/android/material/theme/res-public/values/public.xml b/lib/java/com/google/android/material/theme/res-public/values/public.xml
index e5f42a23d14..f1b3a50c67c 100644
--- a/lib/java/com/google/android/material/theme/res-public/values/public.xml
+++ b/lib/java/com/google/android/material/theme/res-public/values/public.xml
@@ -15,28 +15,6 @@
   ~ limitations under the License.
 -->
 <resources>
-  <public name="Theme.Material3Expressive.Light" type="style"/>
-  <public name="Theme.Material3Expressive.Light.NoActionBar" type="style"/>
-  <public name="Theme.Material3Expressive.Dark" type="style"/>
-  <public name="Theme.Material3Expressive.Dark.NoActionBar" type="style"/>
-  <public name="Theme.Material3Expressive.DayNight" type="style"/>
-  <public name="Theme.Material3Expressive.DayNight.NoActionBar" type="style"/>
-  <public name="Theme.Material3Expressive.DynamicColors.Light" type="style"/>
-  <public name="Theme.Material3Expressive.DynamicColors.Light.NoActionBar" type="style"/>
-  <public name="Theme.Material3Expressive.DynamicColors.Dark" type="style"/>
-  <public name="Theme.Material3Expressive.DynamicColors.Dark.NoActionBar" type="style"/>
-  <public name="Theme.Material3Expressive.DynamicColors.DayNight" type="style"/>
-  <public name="Theme.Material3Expressive.DynamicColors.DayNight.NoActionBar" type="style"/>
-  <public name="Theme.Material3Expressive.Light.DialogWhenLarge" type="style"/>
-  <public name="Theme.Material3Expressive.Dark.DialogWhenLarge" type="style"/>
-  <public name="Theme.Material3Expressive.DayNight.DialogWhenLarge" type="style"/>
-
-  <public name="ThemeOverlay.Material3Expressive" type="style"/>
-  <public name="ThemeOverlay.Material3Expressive.Light" type="style"/>
-  <public name="ThemeOverlay.Material3Expressive.Dark" type="style"/>
-  <public name="ThemeOverlay.Material3Expressive.DynamicColors.Light" type="style"/>
-  <public name="ThemeOverlay.Material3Expressive.DynamicColors.Dark" type="style"/>
-  <public name="ThemeOverlay.Material3Expressive.DynamicColors.DayNight" type="style"/>
 
   <public name="Theme.Material3.Light" type="style"/>
   <public name="Theme.Material3.Light.NoActionBar" type="style"/>
diff --git a/lib/java/com/google/android/material/theme/res/values-large/themes_base.xml b/lib/java/com/google/android/material/theme/res/values-large/themes_base.xml
index bef5060aee2..bada50e5e18 100644
--- a/lib/java/com/google/android/material/theme/res/values-large/themes_base.xml
+++ b/lib/java/com/google/android/material/theme/res/values-large/themes_base.xml
@@ -16,12 +16,6 @@
 -->
 <resources>
 
-  <style name="Base.Theme.Material3Expressive.Light.DialogWhenLarge"
-    parent="Base.Theme.Material3Expressive.Light.Dialog.FixedSize"/>
-
-  <style name="Base.Theme.Material3Expressive.Dark.DialogWhenLarge"
-    parent="Base.Theme.Material3Expressive.Dark.Dialog.FixedSize"/>
-
   <style name="Base.Theme.Material3.Light.DialogWhenLarge"
     parent="Base.Theme.Material3.Light.Dialog.FixedSize"/>
 
diff --git a/lib/java/com/google/android/material/theme/res/values-night/themes_daynight.xml b/lib/java/com/google/android/material/theme/res/values-night/themes_daynight.xml
index 336dc309ace..cea687f46bc 100644
--- a/lib/java/com/google/android/material/theme/res/values-night/themes_daynight.xml
+++ b/lib/java/com/google/android/material/theme/res/values-night/themes_daynight.xml
@@ -15,12 +15,6 @@
   ~ limitations under the License.
 -->
 <resources>
-  <!-- Material 3 Expressive themes (day/night versions) for activities. -->
-  <style name="Theme.Material3Expressive.DayNight" parent="Theme.Material3Expressive.Dark"/>
-  <style name="Theme.Material3Expressive.DayNight.NoActionBar" parent="Theme.Material3Expressive.Dark.NoActionBar"/>
-  <style name="Theme.Material3Expressive.DynamicColors.DayNight" parent="Theme.Material3Expressive.DynamicColors.Dark"/>
-  <style name="Theme.Material3Expressive.DynamicColors.DayNight.NoActionBar" parent="Theme.Material3Expressive.DynamicColors.Dark.NoActionBar"/>
-  <style name="Theme.Material3Expressive.DayNight.DialogWhenLarge" parent="Theme.Material3Expressive.Dark.DialogWhenLarge"/>
 
   <!-- Material 3 themes (day/night versions) for activities. -->
   <style name="Theme.Material3.DayNight" parent="Theme.Material3.Dark"/>
diff --git a/lib/java/com/google/android/material/theme/res/values-night/themes_overlay.xml b/lib/java/com/google/android/material/theme/res/values-night/themes_overlay.xml
index fca5db54168..95045f0c637 100644
--- a/lib/java/com/google/android/material/theme/res/values-night/themes_overlay.xml
+++ b/lib/java/com/google/android/material/theme/res/values-night/themes_overlay.xml
@@ -15,6 +15,5 @@
   ~ limitations under the License.
 -->
 <resources>
-  <style name="ThemeOverlay.Material3Expressive.DynamicColors.DayNight" parent="ThemeOverlay.Material3Expressive.DynamicColors.Dark" />
   <style name="ThemeOverlay.Material3.DynamicColors.DayNight" parent="ThemeOverlay.Material3.DynamicColors.Dark" />
 </resources>
diff --git a/lib/java/com/google/android/material/theme/res/values-v31/themes.xml b/lib/java/com/google/android/material/theme/res/values-v31/themes.xml
index 2eb553cab42..4e1783db51a 100644
--- a/lib/java/com/google/android/material/theme/res/values-v31/themes.xml
+++ b/lib/java/com/google/android/material/theme/res/values-v31/themes.xml
@@ -15,10 +15,6 @@
   ~ limitations under the License.
 -->
 <resources>
-  <style name="Theme.Material3Expressive.DynamicColors.Light" parent="Theme.Material3.DynamicColors.Light"/>
-
-  <style name="Theme.Material3Expressive.DynamicColors.Dark" parent="Theme.Material3.DynamicColors.Dark"/>
-
   <style name="Theme.Material3.DynamicColors.Light" parent="Theme.Material3.Light">
     <item name="isMaterial3DynamicColorApplied">true</item>
 
diff --git a/lib/java/com/google/android/material/theme/res/values-v31/themes_overlay.xml b/lib/java/com/google/android/material/theme/res/values-v31/themes_overlay.xml
index e9822d3fd3e..4db997e4c92 100644
--- a/lib/java/com/google/android/material/theme/res/values-v31/themes_overlay.xml
+++ b/lib/java/com/google/android/material/theme/res/values-v31/themes_overlay.xml
@@ -15,9 +15,6 @@
   ~ limitations under the License.
 -->
 <resources>
-  <style name="ThemeOverlay.Material3Expressive.DynamicColors.Light" parent="ThemeOverlay.Material3.DynamicColors.Light"/>
-
-  <style name="ThemeOverlay.Material3Expressive.DynamicColors.Dark" parent="ThemeOverlay.Material3.DynamicColors.Dark"/>
 
   <style name="ThemeOverlay.Material3.DynamicColors.Light" parent="">
     <item name="isMaterial3DynamicColorApplied">true</item>
diff --git a/lib/java/com/google/android/material/theme/res/values/themes.xml b/lib/java/com/google/android/material/theme/res/values/themes.xml
index 4dbeb5cfbb1..d240dc29773 100644
--- a/lib/java/com/google/android/material/theme/res/values/themes.xml
+++ b/lib/java/com/google/android/material/theme/res/values/themes.xml
@@ -16,48 +16,6 @@
 -->
 <resources>
 
-  <!--
-    Themes in the "Theme.Material3Expressive" family will contain a default full color scheme.
-
-    These theme declarations contain any version-independent specification. Items
-    that need to vary based on platform version should be defined in the corresponding
-    "Base.Theme" theme.
-  -->
-
-  <!-- Platform-independent theme providing a full color scheme in a light-themed activity. -->
-  <style name="Theme.Material3Expressive.Light" parent="Base.Theme.Material3Expressive.Light"/>
-
-  <!-- Platform-independent theme providing a full color scheme in a dark-themed activity. -->
-  <style name="Theme.Material3Expressive.Dark" parent="Base.Theme.Material3Expressive.Dark"/>
-
-  <style name="Theme.Material3Expressive.Light.NoActionBar">
-    <item name="windowActionBar">false</item>
-    <item name="windowNoTitle">true</item>
-  </style>
-
-  <style name="Theme.Material3Expressive.Dark.NoActionBar">
-    <item name="windowActionBar">false</item>
-    <item name="windowNoTitle">true</item>
-  </style>
-
-  <style name="Theme.Material3Expressive.DynamicColors.Light" parent="Theme.Material3Expressive.Light"/>
-
-  <style name="Theme.Material3Expressive.DynamicColors.Dark" parent="Theme.Material3Expressive.Dark"/>
-
-  <style name="Theme.Material3Expressive.DynamicColors.Light.NoActionBar">
-    <item name="windowActionBar">false</item>
-    <item name="windowNoTitle">true</item>
-  </style>
-
-  <style name="Theme.Material3Expressive.DynamicColors.Dark.NoActionBar">
-    <item name="windowActionBar">false</item>
-    <item name="windowNoTitle">true</item>
-  </style>
-
-  <style name="Theme.Material3Expressive.Light.DialogWhenLarge" parent="Base.Theme.Material3Expressive.Light.DialogWhenLarge"/>
-
-  <style name="Theme.Material3Expressive.Dark.DialogWhenLarge" parent="Base.Theme.Material3Expressive.Dark.DialogWhenLarge"/>
-
   <!--
     Themes in the "Theme.Material3" family will contain a default full color scheme.
 
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 6e697656d6b..d969967abc8 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
@@ -19,150 +19,6 @@
   <!-- All new attributes should be set in the following Base.V14 and Base.V21 themes. -->
   <eat-comment/>
 
-  <!-- Base themes of Theme.Material3Expressive themes. -->
-
-  <style name="Base.Theme.Material3Expressive.Light" parent="Base.Theme.Material3.Light">
-    <!-- Color palettes. -->
-    <item name="colorOnPrimaryContainer">@color/m3_ref_palette_primary30</item>
-    <item name="colorOnSecondaryContainer">@color/m3_ref_palette_secondary30</item>
-    <item name="colorOnTertiaryContainer">@color/m3_ref_palette_tertiary30</item>
-    <item name="colorOnErrorContainer">@color/m3_ref_palette_error30</item>
-
-    <!-- Dialog themes. -->
-    <item name="alertDialogTheme">@style/ThemeOverlay.Material3Expressive.Dialog.Alert</item>
-    <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3Expressive.MaterialAlertDialog</item>
-
-    <!-- Widget styles. -->
-    <item name="appBarLayoutStyle">@style/Widget.Material3Expressive.AppBarLayout</item>
-    <item name="collapsingToolbarLayoutStyle">@style/Widget.Material3Expressive.CollapsingToolbar</item>
-    <item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Medium</item>
-    <item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Large</item>
-
-    <item name="materialSearchBarStyle">@style/Widget.Material3Expressive.SearchBar</item>
-
-    <!--
-      Default as primary container FABs. Unlisted FAB style attributes are not updated in Material3Expressive.
-      Please use the corresponding themeoverlay for other color variants via materialThemeOverlay.
-    -->
-    <item name="floatingActionButtonStyle">@style/Widget.Material3Expressive.FloatingActionButton</item>
-    <item name="floatingActionButtonMediumStyle">@style/Widget.Material3Expressive.FloatingActionButton.Medium</item>
-    <item name="floatingActionButtonLargeStyle">@style/Widget.Material3Expressive.FloatingActionButton.Large</item>
-
-    <!--
-      Default as primary container extended FABs. Unlisted FAB style attributes are not updated in Material3Expressive.
-      Please use the corresponding themeoverlay for other color variants via materialThemeOverlay.
-    -->
-    <item name="extendedFloatingActionButtonSmallStyle">@style/Widget.Material3Expressive.ExtendedFloatingActionButton.Small</item>
-    <item name="extendedFloatingActionButtonMediumStyle">@style/Widget.Material3Expressive.ExtendedFloatingActionButton.Medium</item>
-    <item name="extendedFloatingActionButtonLargeStyle">@style/Widget.Material3Expressive.ExtendedFloatingActionButton.Large</item>
-
-    <item name="materialButtonStyle">@style/Widget.Material3Expressive.Button</item>
-    <item name="materialButtonTonalStyle">@style/Widget.Material3Expressive.Button.TonalButton</item>
-    <item name="materialButtonOutlinedStyle">@style/Widget.Material3Expressive.Button.OutlinedButton</item>
-    <item name="materialButtonElevatedStyle">@style/Widget.Material3Expressive.Button.ElevatedButton</item>
-    <item name="borderlessButtonStyle">@style/Widget.Material3Expressive.Button.TextButton</item>
-    <item name="buttonBarButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Dialog</item>
-    <item name="snackbarButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Snackbar</item>
-    <item name="materialIconButtonStyle">@style/Widget.Material3Expressive.Button.IconButton.Standard</item>
-    <item name="materialIconButtonOutlinedStyle">@style/Widget.Material3Expressive.Button.IconButton.Outlined</item>
-    <item name="materialIconButtonFilledStyle">@style/Widget.Material3Expressive.Button.IconButton.Filled</item>
-    <item name="materialIconButtonFilledTonalStyle">@style/Widget.Material3Expressive.Button.IconButton.Tonal</item>
-
-    <item name="materialButtonGroupStyle">@style/Widget.Material3Expressive.MaterialButtonGroup</item>
-    <item name="materialButtonToggleGroupStyle">@style/Widget.Material3Expressive.MaterialButtonToggleGroup</item>
-
-    <item name="bottomNavigationStyle">@style/Widget.Material3Expressive.BottomNavigationView</item>
-    <item name="navigationRailStyle">@style/Widget.Material3Expressive.NavigationRailView</item>
-
-    <item name="toolbarStyle">@style/Widget.Material3Expressive.Toolbar</item>
-    <item name="toolbarSurfaceStyle">@style/Widget.Material3Expressive.Toolbar.Surface</item>
-
-    <item name="linearProgressIndicatorStyle">@style/Widget.Material3Expressive.LinearProgressIndicator</item>
-    <item name="circularProgressIndicatorStyle">@style/Widget.Material3Expressive.CircularProgressIndicator</item>
-
-    <item name="sliderStyle">@style/Widget.Material3Expressive.Slider.Xsmall</item>
-
-    <!-- Top App Bars. -->
-    <item name="collapsingToolbarLayoutMediumSize">@dimen/m3_comp_app_bar_medium_flexible_container_height</item>
-    <item name="collapsingToolbarLayoutLargeSize">@dimen/m3_comp_app_bar_large_flexible_container_height</item>
-
-    <!-- Action Bar. -->
-    <item name="actionBarSize">@dimen/m3_comp_app_bar_small_container_height</item>
-
-    <!-- Theme overlays. -->
-    <item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3Expressive.DynamicColors.Light</item>
-  </style>
-
-  <style name="Base.Theme.Material3Expressive.Dark" parent="Base.Theme.Material3.Dark">
-    <!-- Dialog themes. -->
-    <item name="alertDialogTheme">@style/ThemeOverlay.Material3Expressive.Dialog.Alert</item>
-    <item name="materialAlertDialogTheme">@style/ThemeOverlay.Material3Expressive.MaterialAlertDialog</item>
-
-    <!-- Widget styles. -->
-    <item name="appBarLayoutStyle">@style/Widget.Material3Expressive.AppBarLayout</item>
-    <item name="collapsingToolbarLayoutStyle">@style/Widget.Material3Expressive.CollapsingToolbar</item>
-    <item name="collapsingToolbarLayoutMediumStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Medium</item>
-    <item name="collapsingToolbarLayoutLargeStyle">@style/Widget.Material3Expressive.CollapsingToolbar.Large</item>
-
-    <item name="materialSearchBarStyle">@style/Widget.Material3Expressive.SearchBar</item>
-
-    <!--
-      Default as primary container FABs. Unlisted FAB style attributes are not updated in Material3Expressive.
-      Please use the corresponding themeoverlay for other color varaints via materialThemeOverlay.
-    -->
-    <item name="floatingActionButtonStyle">@style/Widget.Material3Expressive.FloatingActionButton</item>
-    <item name="floatingActionButtonMediumStyle">@style/Widget.Material3Expressive.FloatingActionButton.Medium</item>
-    <item name="floatingActionButtonLargeStyle">@style/Widget.Material3Expressive.FloatingActionButton.Large</item>
-
-    <!--
-      Default as primary container extended FABs. Unlisted FAB style attributes are not updated in Material3Expressive.
-      Please use the corresponding themeoverlay for other color varaints via materialThemeOverlay.
-    -->
-    <item name="extendedFloatingActionButtonSmallStyle">@style/Widget.Material3Expressive.ExtendedFloatingActionButton.Small</item>
-    <item name="extendedFloatingActionButtonMediumStyle">@style/Widget.Material3Expressive.ExtendedFloatingActionButton.Medium</item>
-    <item name="extendedFloatingActionButtonLargeStyle">@style/Widget.Material3Expressive.ExtendedFloatingActionButton.Large</item>
-
-    <item name="materialButtonStyle">@style/Widget.Material3Expressive.Button</item>
-    <item name="materialButtonTonalStyle">@style/Widget.Material3Expressive.Button.TonalButton</item>
-    <item name="materialButtonOutlinedStyle">@style/Widget.Material3Expressive.Button.OutlinedButton</item>
-    <item name="materialButtonElevatedStyle">@style/Widget.Material3Expressive.Button.ElevatedButton</item>
-    <item name="borderlessButtonStyle">@style/Widget.Material3Expressive.Button.TextButton</item>
-    <item name="buttonBarButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Dialog</item>
-    <item name="snackbarButtonStyle">@style/Widget.Material3Expressive.Button.TextButton.Snackbar</item>
-    <item name="materialIconButtonStyle">@style/Widget.Material3Expressive.Button.IconButton.Standard</item>
-    <item name="materialIconButtonOutlinedStyle">@style/Widget.Material3Expressive.Button.IconButton.Outlined</item>
-    <item name="materialIconButtonFilledStyle">@style/Widget.Material3Expressive.Button.IconButton.Filled</item>
-    <item name="materialIconButtonFilledTonalStyle">@style/Widget.Material3Expressive.Button.IconButton.Tonal</item>
-
-    <item name="materialButtonGroupStyle">@style/Widget.Material3Expressive.MaterialButtonGroup</item>
-    <item name="materialButtonToggleGroupStyle">@style/Widget.Material3Expressive.MaterialButtonToggleGroup</item>
-
-    <item name="bottomNavigationStyle">@style/Widget.Material3Expressive.BottomNavigationView</item>
-    <item name="navigationRailStyle">@style/Widget.Material3Expressive.NavigationRailView</item>
-
-    <item name="toolbarStyle">@style/Widget.Material3Expressive.Toolbar</item>
-    <item name="toolbarSurfaceStyle">@style/Widget.Material3Expressive.Toolbar.Surface</item>
-
-    <item name="linearProgressIndicatorStyle">@style/Widget.Material3Expressive.LinearProgressIndicator</item>
-    <item name="circularProgressIndicatorStyle">@style/Widget.Material3Expressive.CircularProgressIndicator</item>
-
-    <item name="sliderStyle">@style/Widget.Material3Expressive.Slider.Xsmall</item>
-
-    <!-- Top App Bars. -->
-    <item name="collapsingToolbarLayoutMediumSize">@dimen/m3_comp_app_bar_medium_flexible_container_height</item>
-    <item name="collapsingToolbarLayoutLargeSize">@dimen/m3_comp_app_bar_large_flexible_container_height</item>
-
-    <!-- Action Bar. -->
-    <item name="actionBarSize">@dimen/m3_comp_app_bar_small_container_height</item>
-
-    <!-- Theme overlays. -->
-    <item name="dynamicColorThemeOverlay">@style/ThemeOverlay.Material3Expressive.DynamicColors.Dark</item>
-  </style>
-
-  <!-- We're not large, so redirect to Base.Theme.Material3Expressive themes. -->
-  <style name="Base.Theme.Material3Expressive.Light.DialogWhenLarge" parent="Base.Theme.Material3Expressive.Light"/>
-  <style name="Base.Theme.Material3Expressive.Dark.DialogWhenLarge" parent="Base.Theme.Material3Expressive.Dark"/>
-
   <!-- Base themes of Theme.Material3 themes. -->
 
   <style name="Base.V14.Theme.Material3.Light" parent="Theme.MaterialComponents.Light">
diff --git a/lib/java/com/google/android/material/theme/res/values/themes_daynight.xml b/lib/java/com/google/android/material/theme/res/values/themes_daynight.xml
index f470210492d..0b8f10f68ba 100644
--- a/lib/java/com/google/android/material/theme/res/values/themes_daynight.xml
+++ b/lib/java/com/google/android/material/theme/res/values/themes_daynight.xml
@@ -15,12 +15,6 @@
   ~ limitations under the License.
 -->
 <resources>
-  <!-- Material 3 Expressive themes (day/night versions) for activities. -->
-  <style name="Theme.Material3Expressive.DayNight" parent="Theme.Material3Expressive.Light"/>
-  <style name="Theme.Material3Expressive.DayNight.NoActionBar" parent="Theme.Material3Expressive.Light.NoActionBar"/>
-  <style name="Theme.Material3Expressive.DynamicColors.DayNight" parent="Theme.Material3Expressive.DynamicColors.Light"/>
-  <style name="Theme.Material3Expressive.DynamicColors.DayNight.NoActionBar" parent="Theme.Material3Expressive.DynamicColors.Light.NoActionBar"/>
-  <style name="Theme.Material3Expressive.DayNight.DialogWhenLarge" parent="Theme.Material3Expressive.Light.DialogWhenLarge"/>
 
   <!-- Material 3 themes (day/night versions) for activities. -->
   <style name="Theme.Material3.DayNight" parent="Theme.Material3.Light"/>
diff --git a/lib/java/com/google/android/material/theme/res/values/themes_overlay.xml b/lib/java/com/google/android/material/theme/res/values/themes_overlay.xml
index a6f69a1c3c1..d53932ad24c 100644
--- a/lib/java/com/google/android/material/theme/res/values/themes_overlay.xml
+++ b/lib/java/com/google/android/material/theme/res/values/themes_overlay.xml
@@ -16,34 +16,6 @@
 -->
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-  <!--
-    Material 3 Expressive theme overlay.
-  -->
-  <style name="ThemeOverlay.Material3Expressive" parent="ThemeOverlay.Material3"/>
-
-  <!--
-    Theme overlay that replaces colors with their light versions.
-  -->
-  <style name="ThemeOverlay.Material3Expressive.Light" parent="ThemeOverlay.Material3.Light">
-    <!-- Color palettes -->
-    <item name="colorOnPrimaryContainer">@color/m3_ref_palette_primary30</item>
-    <item name="colorOnSecondaryContainer">@color/m3_ref_palette_secondary30</item>
-    <item name="colorOnTertiaryContainer">@color/m3_ref_palette_tertiary30</item>
-    <item name="colorOnErrorContainer">@color/m3_ref_palette_error30</item>
-  </style>
-
-  <!--
-    Theme overlay that replaces colors with their dark versions.
-  -->
-  <style name="ThemeOverlay.Material3Expressive.Dark" parent="ThemeOverlay.Material3.Dark"/>
-
-  <!--
-    Theme overlay to support dynamic colors.
-  -->
-  <style name="ThemeOverlay.Material3Expressive.DynamicColors.Light" parent="ThemeOverlay.Material3Expressive.Light"/>
-  <style name="ThemeOverlay.Material3Expressive.DynamicColors.Dark" parent="ThemeOverlay.Material3Expressive.Dark"/>
-  <style name="ThemeOverlay.Material3Expressive.DynamicColors.DayNight" parent="ThemeOverlay.Material3.DynamicColors.Light" />
-
   <!--
     Material 3 theme overlay.
   -->