diff --git a/catalog/java/io/material/catalog/button/ButtonGroupDemoFragment.java b/catalog/java/io/material/catalog/button/ButtonGroupDemoFragment.java
index bf8a0676668..c8577828196 100644
--- a/catalog/java/io/material/catalog/button/ButtonGroupDemoFragment.java
+++ b/catalog/java/io/material/catalog/button/ButtonGroupDemoFragment.java
@@ -24,10 +24,9 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewGroup.LayoutParams;
+import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import com.google.android.material.button.MaterialButton;
 import com.google.android.material.button.MaterialButtonGroup;
 import com.google.android.material.materialswitch.MaterialSwitch;
 import io.material.catalog.feature.DemoFragment;
@@ -37,8 +36,6 @@
 /** A fragment that displays a button group demo for the Catalog app. */
 public class ButtonGroupDemoFragment extends DemoFragment {
 
-  private int defaultInset;
-
   /** Create a Demo View with different types of {@link MaterialButtonGroup}. */
   @Nullable
   @Override
@@ -49,25 +46,21 @@ public View onCreateDemoView(
     View view =
         layoutInflater.inflate(
             R.layout.cat_buttons_group_fragment, viewGroup, /* attachToRoot= */ false);
+
+    ViewGroup content = view.findViewById(R.id.button_group_content);
+    layoutInflater.inflate(getIconOnlyButtonGroupContent(), content, /* attachToRoot= */ true);
+    layoutInflater.inflate(getLabelOnlyButtonGroupContent(), content, /* attachToRoot= */ true);
+    layoutInflater.inflate(getMixedButtonGroupContent(), content, /* attachToRoot= */ true);
+
     List<MaterialButtonGroup> buttonGroups =
         DemoUtils.findViewsWithType(view, MaterialButtonGroup.class);
 
-    defaultInset = getResources().getDimensionPixelSize(R.dimen.mtrl_btn_inset);
-
     MaterialSwitch verticalOrientationToggle = view.findViewById(R.id.orientation_switch_toggle);
     verticalOrientationToggle.setOnCheckedChangeListener(
         (buttonView, isChecked) -> {
           for (MaterialButtonGroup buttonGroup : buttonGroups) {
             int orientation = isChecked ? VERTICAL : HORIZONTAL;
             buttonGroup.setOrientation(orientation);
-            for (int i = 0; i < buttonGroup.getChildCount(); ++i) {
-              int inset = getInsetForOrientation(orientation);
-              MaterialButton button = (MaterialButton) buttonGroup.getChildAt(i);
-              button.setInsetBottom(inset);
-              button.setInsetTop(inset);
-              adjustParams(button.getLayoutParams(), orientation);
-            }
-
             buttonGroup.requestLayout();
           }
         });
@@ -83,12 +76,18 @@ public View onCreateDemoView(
     return view;
   }
 
-  private int getInsetForOrientation(int orientation) {
-    return orientation == VERTICAL ? 0 : defaultInset;
+  @LayoutRes
+  protected int getIconOnlyButtonGroupContent() {
+    return R.layout.cat_button_group_content_icon_only;
+  }
+
+  @LayoutRes
+  protected int getLabelOnlyButtonGroupContent() {
+    return R.layout.cat_button_group_content_label_only;
   }
 
-  private static void adjustParams(LayoutParams layoutParams, int orientation) {
-    layoutParams.width =
-        orientation == VERTICAL ? LayoutParams.MATCH_PARENT : LayoutParams.WRAP_CONTENT;
+  @LayoutRes
+  protected int getMixedButtonGroupContent() {
+    return R.layout.cat_button_group_content_mixed;
   }
 }
diff --git a/catalog/java/io/material/catalog/button/ButtonsFragment.java b/catalog/java/io/material/catalog/button/ButtonsFragment.java
index 5d948500c30..0666c05c37c 100644
--- a/catalog/java/io/material/catalog/button/ButtonsFragment.java
+++ b/catalog/java/io/material/catalog/button/ButtonsFragment.java
@@ -19,6 +19,7 @@
 import io.material.catalog.R;
 
 import androidx.fragment.app.Fragment;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import dagger.Provides;
 import dagger.android.ContributesAndroidInjector;
@@ -57,13 +58,7 @@ public Fragment createFragment() {
   @Override
   public List<Demo> getAdditionalDemos() {
     return Arrays.asList(
-        new Demo(R.string.cat_buttons_group) {
-          @Nullable
-          @Override
-          public Fragment createFragment() {
-            return new ButtonGroupDemoFragment();
-          }
-        },
+        getButtonGroupDemo(),
         new Demo(R.string.cat_buttons_toggle_group) {
           @Nullable
           @Override
@@ -73,6 +68,17 @@ public Fragment createFragment() {
         });
   }
 
+  @NonNull
+  protected Demo getButtonGroupDemo() {
+    return new Demo(R.string.cat_buttons_group) {
+      @Nullable
+      @Override
+      public Fragment createFragment() {
+        return new ButtonGroupDemoFragment();
+      }
+    };
+  }
+
   /** The Dagger module for {@link ButtonsFragment} dependencies. */
   @dagger.Module
   public abstract static class Module {
diff --git a/catalog/java/io/material/catalog/button/res/layout/cat_button_group_content_icon_only.xml b/catalog/java/io/material/catalog/button/res/layout/cat_button_group_content_icon_only.xml
new file mode 100644
index 00000000000..a8eb97f25cc
--- /dev/null
+++ b/catalog/java/io/material/catalog/button/res/layout/cat_button_group_content_icon_only.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2024 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.
+  -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+  <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingTop="16dp"
+      android:paddingBottom="8dp"
+      android:text="@string/cat_icon_only"
+      android:textAppearance="?attr/textAppearanceSubtitle1"/>
+  <com.google.android.material.button.MaterialButtonGroup
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingBottom="8dp"
+      android:gravity="center_horizontal"
+      android:spacing="4dp">
+    <Button
+        style="?attr/materialIconButtonFilledStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_paint_bucket"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonFilledStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_plus"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonFilledStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_components"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonFilledStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_accelerator"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonFilledStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_dialog"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+  </com.google.android.material.button.MaterialButtonGroup>
+  <com.google.android.material.button.MaterialButtonGroup
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingBottom="8dp"
+      android:gravity="center_horizontal"
+      android:spacing="4dp">
+    <Button
+        style="?attr/materialIconButtonFilledTonalStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_paint_bucket"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonFilledTonalStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_plus"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonFilledTonalStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_components"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonFilledTonalStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_accelerator"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonFilledTonalStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_dialog"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+  </com.google.android.material.button.MaterialButtonGroup>
+  <com.google.android.material.button.MaterialButtonGroup
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingBottom="8dp"
+      android:gravity="center_horizontal"
+      android:spacing="4dp">
+    <Button
+        style="?attr/materialIconButtonOutlinedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_paint_bucket"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonOutlinedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_plus"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonOutlinedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_components"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonOutlinedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_accelerator"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonOutlinedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_dialog"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+  </com.google.android.material.button.MaterialButtonGroup>
+  <com.google.android.material.button.MaterialButtonGroup
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingBottom="8dp"
+      android:gravity="center_horizontal"
+      android:spacing="4dp">
+    <Button
+        style="?attr/materialIconButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_paint_bucket"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_plus"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_components"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_accelerator"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+    <Button
+        style="?attr/materialIconButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_dialog"
+        app:icon="@drawable/ic_star_checkable_24"
+        app:iconPadding="0dp"/>
+  </com.google.android.material.button.MaterialButtonGroup>
+</merge>
diff --git a/catalog/java/io/material/catalog/button/res/layout/cat_button_group_content_label_only.xml b/catalog/java/io/material/catalog/button/res/layout/cat_button_group_content_label_only.xml
new file mode 100644
index 00000000000..207f0a9c5f1
--- /dev/null
+++ b/catalog/java/io/material/catalog/button/res/layout/cat_button_group_content_label_only.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2024 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.
+  -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+  <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingTop="16dp"
+      android:paddingBottom="8dp"
+      android:text="@string/cat_label_only"
+      android:textAppearance="?attr/textAppearanceSubtitle1"/>
+  <com.google.android.material.button.MaterialButtonGroup
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingBottom="8dp"
+      android:gravity="center_horizontal"
+      android:spacing="12dp">
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cat_button_label_cheese"/>
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cat_button_label_tomatoes"/>
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cat_button_label_mushrooms"/>
+  </com.google.android.material.button.MaterialButtonGroup>
+  <com.google.android.material.button.MaterialButtonGroup
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingBottom="8dp"
+      android:gravity="center_horizontal"
+      android:spacing="12dp">
+    <Button
+        style="?attr/materialButtonTonalStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cat_button_label_cheese"/>
+    <Button
+        style="?attr/materialButtonTonalStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cat_button_label_tomatoes"/>
+    <Button
+        style="?attr/materialButtonTonalStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cat_button_label_mushrooms"/>
+  </com.google.android.material.button.MaterialButtonGroup>
+  <com.google.android.material.button.MaterialButtonGroup
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingBottom="8dp"
+      android:gravity="center_horizontal"
+      android:spacing="12dp">
+    <Button
+        style="?attr/materialButtonOutlinedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cat_button_label_cheese"/>
+    <Button
+        style="?attr/materialButtonOutlinedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cat_button_label_tomatoes"/>
+    <Button
+        style="?attr/materialButtonOutlinedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cat_button_label_mushrooms"/>
+  </com.google.android.material.button.MaterialButtonGroup>
+  <com.google.android.material.button.MaterialButtonGroup
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingBottom="8dp"
+      android:gravity="center_horizontal"
+      android:spacing="12dp">
+    <Button
+        style="?attr/materialButtonElevatedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cat_button_label_cheese"/>
+    <Button
+        style="?attr/materialButtonElevatedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cat_button_label_tomatoes"/>
+    <Button
+        style="?attr/materialButtonElevatedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cat_button_label_mushrooms"/>
+  </com.google.android.material.button.MaterialButtonGroup>
+  <com.google.android.material.button.MaterialButtonGroup
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingBottom="8dp"
+      android:gravity="center_horizontal"
+      android:spacing="12dp">
+    <Button
+        style="?attr/borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cat_button_label_cheese"/>
+    <Button
+        style="?attr/borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cat_button_label_tomatoes"/>
+    <Button
+        style="?attr/borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/cat_button_label_mushrooms"/>
+  </com.google.android.material.button.MaterialButtonGroup>
+</merge>
diff --git a/catalog/java/io/material/catalog/button/res/layout/cat_button_group_content_mixed.xml b/catalog/java/io/material/catalog/button/res/layout/cat_button_group_content_mixed.xml
new file mode 100644
index 00000000000..f73d99d9893
--- /dev/null
+++ b/catalog/java/io/material/catalog/button/res/layout/cat_button_group_content_mixed.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2024 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.
+  -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+  <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingTop="16dp"
+      android:paddingBottom="8dp"
+      android:text="@string/cat_icon_and_label_mixed"
+      android:textAppearance="?attr/textAppearanceSubtitle1"/>
+  <com.google.android.material.button.MaterialButtonGroup
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingBottom="8dp"
+      android:spacing="4dp">
+    <Button
+        style="?attr/materialIconButtonFilledStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_paint_bucket"
+        app:icon="@drawable/ic_colors_24px"/>
+    <Button
+        style="?attr/materialIconButtonFilledStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_plus"
+        app:icon="@drawable/ic_fab_24px"/>
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:insetLeft="4dp"
+        android:insetRight="4dp"
+        android:contentDescription="@string/cat_icon_button_label_components"
+        android:text="@string/cat_button_label_custom"/>
+    <Button
+        style="?attr/materialIconButtonFilledStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_accelerator"
+        app:icon="@drawable/ic_accelerator_24px"/>
+    <Button
+        style="?attr/materialIconButtonFilledStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_dialog"
+        app:icon="@drawable/ic_dialogs_24px"/>
+  </com.google.android.material.button.MaterialButtonGroup>
+  <com.google.android.material.button.MaterialButtonGroup
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingBottom="8dp"
+      android:spacing="4dp">
+    <Button
+        style="?attr/materialIconButtonFilledTonalStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_paint_bucket"
+        app:icon="@drawable/ic_colors_24px"/>
+    <Button
+        style="?attr/materialIconButtonFilledTonalStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_plus"
+        app:icon="@drawable/ic_fab_24px"/>
+    <Button
+        style="?attr/materialButtonTonalStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:insetLeft="4dp"
+        android:insetRight="4dp"
+        android:contentDescription="@string/cat_icon_button_label_components"
+        android:text="@string/cat_button_label_custom"/>
+    <Button
+        style="?attr/materialIconButtonFilledTonalStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_accelerator"
+        app:icon="@drawable/ic_accelerator_24px"/>
+    <Button
+        style="?attr/materialIconButtonFilledTonalStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_dialog"
+        app:icon="@drawable/ic_dialogs_24px"/>
+  </com.google.android.material.button.MaterialButtonGroup>
+  <com.google.android.material.button.MaterialButtonGroup
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingBottom="8dp"
+      android:spacing="4dp">
+    <Button
+        style="?attr/materialIconButtonOutlinedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_paint_bucket"
+        app:icon="@drawable/ic_colors_24px"/>
+    <Button
+        style="?attr/materialIconButtonOutlinedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_plus"
+        app:icon="@drawable/ic_fab_24px"/>
+    <Button
+        style="?attr/materialButtonOutlinedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:insetLeft="4dp"
+        android:insetRight="4dp"
+        android:contentDescription="@string/cat_icon_button_label_components"
+        android:text="@string/cat_button_label_custom"/>
+    <Button
+        style="?attr/materialIconButtonOutlinedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_accelerator"
+        app:icon="@drawable/ic_accelerator_24px"/>
+    <Button
+        style="?attr/materialIconButtonOutlinedStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_dialog"
+        app:icon="@drawable/ic_dialogs_24px"/>
+  </com.google.android.material.button.MaterialButtonGroup>
+  <com.google.android.material.button.MaterialButtonGroup
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:paddingBottom="8dp"
+      android:spacing="4dp">
+    <Button
+        style="?attr/materialIconButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_paint_bucket"
+        app:icon="@drawable/ic_colors_24px"/>
+    <Button
+        style="?attr/materialIconButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_plus"
+        app:icon="@drawable/ic_fab_24px"/>
+    <Button
+        style="?attr/borderlessButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:insetLeft="4dp"
+        android:insetRight="4dp"
+        android:contentDescription="@string/cat_icon_button_label_components"
+        android:text="@string/cat_button_label_custom"/>
+    <Button
+        style="?attr/materialIconButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_accelerator"
+        app:icon="@drawable/ic_accelerator_24px"/>
+    <Button
+        style="?attr/materialIconButtonStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/cat_icon_button_label_dialog"
+        app:icon="@drawable/ic_dialogs_24px"/>
+  </com.google.android.material.button.MaterialButtonGroup>
+</merge>
diff --git a/catalog/java/io/material/catalog/button/res/layout/cat_buttons_group_fragment.xml b/catalog/java/io/material/catalog/button/res/layout/cat_buttons_group_fragment.xml
index 3ec176ecd1d..078fe8e8377 100644
--- a/catalog/java/io/material/catalog/button/res/layout/cat_buttons_group_fragment.xml
+++ b/catalog/java/io/material/catalog/button/res/layout/cat_buttons_group_fragment.xml
@@ -16,7 +16,6 @@
   -->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical">
@@ -27,128 +26,13 @@
       android:paddingHorizontal="8dp"
       android:gravity="center_horizontal"
       android:orientation="vertical">
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="16dp"
-        android:paddingBottom="8dp"
-        android:text="@string/cat_icon_only"
-        android:textAppearance="?attr/textAppearanceSubtitle1"/>
-    <com.google.android.material.button.MaterialButtonGroup
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:spacing="0dp">
-      <Button
-          style="?attr/materialIconButtonFilledTonalStyle"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:contentDescription="@string/cat_icon_button_label_paint_bucket"
-          app:icon="@drawable/ic_colors_24px"
-          app:iconPadding="0dp"/>
-      <Button
-          style="?attr/materialIconButtonFilledTonalStyle"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:contentDescription="@string/cat_icon_button_label_plus"
-          app:icon="@drawable/ic_fab_24px"
-          app:iconPadding="0dp"/>
-      <Button
-          style="?attr/materialIconButtonFilledTonalStyle"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:contentDescription="@string/cat_icon_button_label_components"
-          app:icon="@drawable/ic_components_24px"
-          app:iconPadding="0dp"/>
-      <Button
-          style="?attr/materialIconButtonFilledTonalStyle"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:contentDescription="@string/cat_icon_button_label_accelerator"
-          app:icon="@drawable/ic_accelerator_24px"
-          app:iconPadding="0dp"/>
-      <Button
-          style="?attr/materialIconButtonFilledTonalStyle"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:contentDescription="@string/cat_icon_button_label_dialog"
-          app:icon="@drawable/ic_dialogs_24px"
-          app:iconPadding="0dp"/>
-    </com.google.android.material.button.MaterialButtonGroup>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="16dp"
-        android:paddingBottom="8dp"
-        android:text="@string/cat_label_only"
-        android:textAppearance="?attr/textAppearanceSubtitle1"/>
-    <com.google.android.material.button.MaterialButtonGroup
+    <LinearLayout
+        android:id="@+id/button_group_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:spacing="8dp">
-      <Button
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="@string/cat_button_label_cheese"/>
-      <Button
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="@string/cat_button_label_tomatoes"/>
-      <Button
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:text="@string/cat_button_label_mushrooms"/>
-    </com.google.android.material.button.MaterialButtonGroup>
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="16dp"
-        android:paddingBottom="8dp"
-        android:text="@string/cat_icon_and_label_mixed"
-        android:textAppearance="?attr/textAppearanceSubtitle1"/>
-    <com.google.android.material.button.MaterialButtonGroup
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:spacing="0dp">
-      <Button
-          style="?attr/materialIconButtonOutlinedStyle"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:contentDescription="@string/cat_icon_button_label_paint_bucket"
-          app:icon="@drawable/ic_colors_24px"
-          app:iconPadding="0dp"/>
-      <Button
-          style="?attr/materialIconButtonOutlinedStyle"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:contentDescription="@string/cat_icon_button_label_plus"
-          app:icon="@drawable/ic_fab_24px"
-          app:iconPadding="0dp"/>
-      <Button
-          style="?attr/materialIconButtonOutlinedStyle"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:contentDescription="@string/cat_icon_button_label_components"
-          app:icon="@drawable/ic_components_24px"
-          app:iconPadding="0dp"
-          android:text="@string/cat_button_label_custom"/>
-      <Button
-          style="?attr/materialIconButtonOutlinedStyle"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:contentDescription="@string/cat_icon_button_label_accelerator"
-          app:icon="@drawable/ic_accelerator_24px"
-          app:iconPadding="0dp"/>
-      <Button
-          style="?attr/materialIconButtonOutlinedStyle"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:contentDescription="@string/cat_icon_button_label_dialog"
-          app:icon="@drawable/ic_dialogs_24px"
-          app:iconPadding="0dp"/>
-    </com.google.android.material.button.MaterialButtonGroup>
-
+        android:orientation="vertical">
+    </LinearLayout>
     <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/orientation_switch_toggle"
         android:paddingTop="16dp"
@@ -160,9 +44,10 @@
         android:text="@string/cat_button_vertical_orientation" />
     <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/switch_enable"
-        android:paddingTop="16dp"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
+        android:paddingTop="16dp"
+        android:paddingBottom="16dp"
         android:layout_gravity="center"
         android:checked="true"
         android:enabled="true"
diff --git a/catalog/java/io/material/catalog/button/res/layout/cat_icon_buttons_content.xml b/catalog/java/io/material/catalog/button/res/layout/cat_icon_buttons_content.xml
index df0219228d8..8dcb7052488 100644
--- a/catalog/java/io/material/catalog/button/res/layout/cat_icon_buttons_content.xml
+++ b/catalog/java/io/material/catalog/button/res/layout/cat_icon_buttons_content.xml
@@ -46,7 +46,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:contentDescription="@string/cat_standard_icon_button_desc"
-          app:icon="@drawable/ic_dialogs_24px"/>
+          app:icon="@drawable/ic_star_checkable_24"/>
       <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -64,7 +64,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:contentDescription="@string/cat_filled_icon_button_desc"
-          app:icon="@drawable/ic_dialogs_24px"/>
+          app:icon="@drawable/ic_star_checkable_24"/>
       <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -82,7 +82,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:contentDescription="@string/cat_filled_tonal_icon_button_desc"
-          app:icon="@drawable/ic_dialogs_24px"/>
+          app:icon="@drawable/ic_star_checkable_24"/>
       <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -100,7 +100,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:contentDescription="@string/cat_outlined_icon_button_desc"
-          app:icon="@drawable/ic_dialogs_24px"/>
+          app:icon="@drawable/ic_star_checkable_24"/>
       <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -134,7 +134,7 @@
           android:layout_height="wrap_content"
           android:contentDescription="@string/cat_standard_icon_button_desc"
           android:checkable="true"
-          app:icon="@drawable/ic_dialogs_24px"/>
+          app:icon="@drawable/ic_star_checkable_24"/>
       <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -153,7 +153,7 @@
           android:layout_height="wrap_content"
           android:contentDescription="@string/cat_filled_icon_button_desc"
           android:checkable="true"
-          app:icon="@drawable/ic_dialogs_24px"/>
+          app:icon="@drawable/ic_star_checkable_24"/>
       <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -172,7 +172,7 @@
           android:layout_height="wrap_content"
           android:contentDescription="@string/cat_filled_tonal_icon_button_desc"
           android:checkable="true"
-          app:icon="@drawable/ic_dialogs_24px"/>
+          app:icon="@drawable/ic_star_checkable_24"/>
       <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
@@ -191,7 +191,7 @@
           android:layout_height="wrap_content"
           android:contentDescription="@string/cat_outlined_icon_button_desc"
           android:checkable="true"
-          app:icon="@drawable/ic_dialogs_24px"/>
+          app:icon="@drawable/ic_star_checkable_24"/>
       <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
diff --git a/catalog/java/io/material/catalog/button/res/layout/cat_label_buttons_content.xml b/catalog/java/io/material/catalog/button/res/layout/cat_label_buttons_content.xml
index aa014e3ab04..446be0d443b 100644
--- a/catalog/java/io/material/catalog/button/res/layout/cat_label_buttons_content.xml
+++ b/catalog/java/io/material/catalog/button/res/layout/cat_label_buttons_content.xml
@@ -63,10 +63,10 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:paddingTop="8dp"
-      android:text="@string/cat_text_button_text"
+      android:text="@string/cat_elevated_button_text"
       android:textSize="12sp" />
   <Button
-      style="?attr/borderlessButtonStyle"
+      style="?attr/materialButtonElevatedStyle"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/cat_button_label_enabled" />
@@ -74,10 +74,10 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:paddingTop="8dp"
-      android:text="@string/cat_elevated_button_text"
+      android:text="@string/cat_text_button_text"
       android:textSize="12sp" />
   <Button
-      style="?attr/materialButtonElevatedStyle"
+      style="?attr/borderlessButtonStyle"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/cat_button_label_enabled" />
diff --git a/catalog/java/io/material/catalog/button/res/layout/cat_label_icon_buttons_content.xml b/catalog/java/io/material/catalog/button/res/layout/cat_label_icon_buttons_content.xml
index ec97d77341f..3a704a5fd35 100644
--- a/catalog/java/io/material/catalog/button/res/layout/cat_label_icon_buttons_content.xml
+++ b/catalog/java/io/material/catalog/button/res/layout/cat_label_icon_buttons_content.xml
@@ -39,7 +39,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/cat_button_label_enabled"
-      app:icon="@drawable/ic_dialogs_24px" />
+      app:icon="@drawable/ic_star_checkable_24" />
   <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -51,7 +51,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/cat_button_label_enabled"
-      app:icon="@drawable/ic_dialogs_24px" />
+      app:icon="@drawable/ic_star_checkable_24" />
   <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -63,29 +63,29 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/cat_button_label_enabled"
-      app:icon="@drawable/ic_dialogs_24px" />
+      app:icon="@drawable/ic_star_checkable_24" />
   <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:paddingTop="8dp"
-      android:text="@string/cat_text_button_text"
+      android:text="@string/cat_elevated_button_text"
       android:textSize="12sp" />
   <Button
-      style="@style/Widget.Material3.Button.TextButton.Icon"
+      style="@style/Widget.Material3.Button.ElevatedButton.Icon"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/cat_button_label_enabled"
-      app:icon="@drawable/ic_dialogs_24px" />
+      app:icon="@drawable/ic_star_checkable_24" />
   <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:paddingTop="8dp"
-      android:text="@string/cat_elevated_button_text"
+      android:text="@string/cat_text_button_text"
       android:textSize="12sp" />
   <Button
-      style="@style/Widget.Material3.Button.ElevatedButton.Icon"
+      style="@style/Widget.Material3.Button.TextButton.Icon"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/cat_button_label_enabled"
-      app:icon="@drawable/ic_dialogs_24px" />
+      app:icon="@drawable/ic_star_checkable_24" />
 </LinearLayout>
diff --git a/catalog/java/io/material/catalog/button/res/values/strings.xml b/catalog/java/io/material/catalog/button/res/values/strings.xml
index ef1b9c1b6be..3f426fed4be 100644
--- a/catalog/java/io/material/catalog/button/res/values/strings.xml
+++ b/catalog/java/io/material/catalog/button/res/values/strings.xml
@@ -74,8 +74,11 @@
   <string name="cat_single_select">Single-select</string>
   <string name="cat_multi_select">Multi-select</string>
   <string name="cat_icon_only" description="A label for icon only buttons below. [CHAR LIMIT=NONE]">Icon only</string>
+  <string name="cat_icon_only_toggle" description="A label for icon only toggle buttons below. [CHAR LIMIT=NONE]">Icon only toggle</string>
   <string name="cat_label_only" description="A label for lebal only buttons below. [CHAR LIMIT=NONE]">Label only</string>
+  <string name="cat_label_only_toggle" description="A label for lebal only toggle buttons below. [CHAR LIMIT=NONE]">Label only toggle</string>
   <string name="cat_icon_and_label_mixed" description="A label for icon and label mixed buttons below. [CHAR LIMIT=NONE]">Icon and label mixed</string>
+  <string name="cat_icon_and_label_mixed_toggle" description="A label for icon and label mixed toggle buttons below. [CHAR LIMIT=NONE]">Icon and label mixed toggle</string>
   <string description="A label for a spacing slider [CHAR LIMIT=NONE]"
       name="cat_spacing_label">Spacing (dp)</string>
   <string description="A label for an inner corner size slider [CHAR LIMIT=NONE]"