diff --git a/catalog/java/io/material/catalog/preferences/res/layout/mtrl_preferences_dialog_option_button.xml b/catalog/java/io/material/catalog/preferences/res/layout/mtrl_preferences_dialog_option_button.xml
index 04dc86b07c3..a1892d01351 100644
--- a/catalog/java/io/material/catalog/preferences/res/layout/mtrl_preferences_dialog_option_button.xml
+++ b/catalog/java/io/material/catalog/preferences/res/layout/mtrl_preferences_dialog_option_button.xml
@@ -15,12 +15,6 @@
   -->
 <Button
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
   style="?attr/materialButtonTonalStyle"
   android:layout_width="wrap_content"
-  android:layout_height="wrap_content"
-  android:paddingLeft="8dp"
-  android:paddingRight="12dp"
-  android:minWidth="0dp"
-  app:iconPadding="4dp"
-  app:materialSizeOverlay="@style/SizeOverlay.Material3Expressive.Button.Xsmall"/>
+  android:layout_height="wrap_content"/>
diff --git a/catalog/java/io/material/catalog/preferences/res/layout/mtrl_preferences_dialog_preference.xml b/catalog/java/io/material/catalog/preferences/res/layout/mtrl_preferences_dialog_preference.xml
index ee79d7645fa..39e7ace42a5 100644
--- a/catalog/java/io/material/catalog/preferences/res/layout/mtrl_preferences_dialog_preference.xml
+++ b/catalog/java/io/material/catalog/preferences/res/layout/mtrl_preferences_dialog_preference.xml
@@ -32,10 +32,11 @@
 
   <com.google.android.material.button.MaterialButtonToggleGroup
     android:id="@+id/preference_options"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="8dp"
     app:selectionRequired="true"
-    app:singleSelection="true" />
+    app:singleSelection="true"
+    app:overflowMode="wrap"/>
 
 </LinearLayout>