diff --git a/catalog/java/io/material/catalog/fab/ExtendedFabDemoFragment.java b/catalog/java/io/material/catalog/fab/ExtendedFabDemoFragment.java
index 78a31be6455..d98ebb090ae 100644
--- a/catalog/java/io/material/catalog/fab/ExtendedFabDemoFragment.java
+++ b/catalog/java/io/material/catalog/fab/ExtendedFabDemoFragment.java
@@ -93,6 +93,6 @@ public View onCreateDemoView(
 
   @LayoutRes
   protected int getExtendedFabContent() {
-    return R.layout.mtrl_extended_fabs;
+    return R.layout.m3_extended_fabs;
   }
 }
diff --git a/catalog/java/io/material/catalog/fab/FabFragment.java b/catalog/java/io/material/catalog/fab/FabFragment.java
index 9847e69484f..ef41e531f80 100644
--- a/catalog/java/io/material/catalog/fab/FabFragment.java
+++ b/catalog/java/io/material/catalog/fab/FabFragment.java
@@ -70,13 +70,6 @@ public Fragment createFragment() {
             return new ExtendedFabBehaviorDemoFragment();
           }
         });
-    additionalDemos.add(
-        new Demo(R.string.m3_large_fab_demo_title) {
-          @Override
-          public Fragment createFragment() {
-            return new LargeFabDemoFragment();
-          }
-        });
     return additionalDemos;
   }
 
diff --git a/catalog/java/io/material/catalog/fab/FabMainDemoFragment.java b/catalog/java/io/material/catalog/fab/FabMainDemoFragment.java
index 9bbd4d9ccad..933a005f898 100644
--- a/catalog/java/io/material/catalog/fab/FabMainDemoFragment.java
+++ b/catalog/java/io/material/catalog/fab/FabMainDemoFragment.java
@@ -95,11 +95,11 @@ public View onCreateDemoView(
 
   @LayoutRes
   protected int getFabsContent() {
-    return R.layout.mtrl_fabs;
+    return R.layout.m3_fabs;
   }
 
   @LayoutRes
   protected int getThemeFabLayoutResId() {
-    return R.layout.theme_fab;
+    return R.layout.m3_theme_fab;
   }
 }
diff --git a/catalog/java/io/material/catalog/fab/LargeFabDemoFragment.java b/catalog/java/io/material/catalog/fab/LargeFabDemoFragment.java
deleted file mode 100644
index e9bee857764..00000000000
--- a/catalog/java/io/material/catalog/fab/LargeFabDemoFragment.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2021 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.
- */
-
-package io.material.catalog.fab;
-
-import io.material.catalog.R;
-
-/**
- * A landing fragment that demos large FABs
- */
-public class LargeFabDemoFragment extends FabMainDemoFragment {
-
-  @Override
-  protected int getFabsContent() {
-    return R.layout.m3_large_fabs;
-  }
-
-  @Override
-  protected int getThemeFabLayoutResId() {
-    return R.layout.m3_theme_large_fab;
-  }
-
-}
diff --git a/catalog/java/io/material/catalog/fab/res/layout/cat_fab_fragment.xml b/catalog/java/io/material/catalog/fab/res/layout/cat_fab_fragment.xml
index 151e2ac753e..a14de909f1f 100644
--- a/catalog/java/io/material/catalog/fab/res/layout/cat_fab_fragment.xml
+++ b/catalog/java/io/material/catalog/fab/res/layout/cat_fab_fragment.xml
@@ -24,15 +24,16 @@
     android:orientation="vertical">
 
   <ScrollView
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="0dp"
     android:layout_weight="1">
     <GridLayout
       android:id="@+id/content"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:layout_gravity="center_horizontal"
       android:columnCount="3"
-      android:rowCount="5">
+      android:rowCount="12">
     </GridLayout>
   </ScrollView>
 
diff --git a/catalog/java/io/material/catalog/fab/res/layout/mtrl_extended_fabs.xml b/catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml
similarity index 93%
rename from catalog/java/io/material/catalog/fab/res/layout/mtrl_extended_fabs.xml
rename to catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml
index 2e07dc20aa2..cef790cbca2 100644
--- a/catalog/java/io/material/catalog/fab/res/layout/mtrl_extended_fabs.xml
+++ b/catalog/java/io/material/catalog/fab/res/layout/m3_extended_fabs.xml
@@ -30,7 +30,7 @@
     android:layout_height="wrap_content"
     android:layout_marginRight="24dp"
     android:layout_gravity="start|center"
-    android:text="@string/m3_surface_fab_label" />
+    android:text="@string/m3_surface_extended_fab_label" />
   <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
     style="?attr/extendedFloatingActionButtonSurfaceStyle"
     android:layout_width="wrap_content"
@@ -46,7 +46,7 @@
     android:layout_height="wrap_content"
     android:layout_marginRight="24dp"
     android:layout_gravity="start|center"
-    android:text="@string/m3_primary_fab_label" />
+    android:text="@string/m3_primary_extended_fab_label" />
   <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
     style="?attr/extendedFloatingActionButtonPrimaryStyle"
     android:layout_width="wrap_content"
@@ -62,7 +62,7 @@
     android:layout_height="wrap_content"
     android:layout_marginRight="24dp"
     android:layout_gravity="start|center"
-    android:text="@string/m3_secondary_fab_label" />
+    android:text="@string/m3_secondary_extended_fab_label" />
   <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
     style="?extendedFloatingActionButtonSecondaryStyle"
     android:layout_width="wrap_content"
@@ -78,7 +78,7 @@
     android:layout_height="wrap_content"
     android:layout_marginRight="24dp"
     android:layout_gravity="start|center"
-    android:text="@string/m3_tertiary_fab_label" />
+    android:text="@string/m3_tertiary_extended_fab_label" />
   <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
     style="?attr/extendedFloatingActionButtonTertiaryStyle"
     android:layout_width="wrap_content"
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
new file mode 100644
index 00000000000..9c96a1fb501
--- /dev/null
+++ b/catalog/java/io/material/catalog/fab/res/layout/m3_fabs.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2017 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.
+  -->
+
+<!-- Padding is used to avoid clipping the FAB's shadows. This is not normally necessary for
+     full-screen containers. -->
+
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="wrap_content"
+  android:layout_height="wrap_content"
+  android:clipToPadding="false"
+  tools:parentTag="android.widget.GridLayout">
+
+  <TextView
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_columnSpan="3"
+    android:text="@string/m3_surface_fab_label"/>
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    style="?attr/floatingActionButtonSurfaceStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:layout_gravity="center"
+    android:contentDescription="@string/m3_surface_fab_content_desc"
+    app:srcCompat="@drawable/ic_add_24px"/>
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    style="?attr/floatingActionButtonSmallSurfaceStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:layout_gravity="center"
+    android:contentDescription="@string/m3_surface_small_fab_content_desc"
+    app:srcCompat="@drawable/ic_add_24px"/>
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    style="?attr/floatingActionButtonLargeSurfaceStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:layout_gravity="center"
+    android:contentDescription="@string/m3_surface_large_fab_content_desc"
+    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_fab_label"/>
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    style="?attr/floatingActionButtonPrimaryStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:layout_gravity="center"
+    android:contentDescription="@string/m3_primary_fab_content_desc"
+    app:srcCompat="@drawable/ic_add_24px"/>
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    style="?attr/floatingActionButtonSmallPrimaryStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:layout_gravity="center"
+    android:contentDescription="@string/m3_primary_small_fab_content_desc"
+    app:srcCompat="@drawable/ic_add_24px"/>
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    style="?attr/floatingActionButtonLargePrimaryStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:layout_gravity="center"
+    android:contentDescription="@string/m3_primary_large_fab_content_desc"
+    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_fab_label"/>
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    style="?attr/floatingActionButtonSecondaryStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:layout_gravity="center"
+    android:contentDescription="@string/m3_secondary_fab_content_desc"
+    app:srcCompat="@drawable/ic_add_24px"/>
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    style="?attr/floatingActionButtonSmallSecondaryStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:layout_gravity="center"
+    android:contentDescription="@string/m3_secondary_small_fab_content_desc"
+    app:srcCompat="@drawable/ic_add_24px"/>
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    style="?attr/floatingActionButtonLargeSecondaryStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:layout_gravity="center"
+    android:contentDescription="@string/m3_secondary_large_fab_content_desc"
+    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_fab_label"/>
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    style="?attr/floatingActionButtonTertiaryStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:layout_gravity="center"
+    android:contentDescription="@string/m3_tertiary_fab_content_desc"
+    app:srcCompat="@drawable/ic_add_24px"/>
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    style="?attr/floatingActionButtonSmallTertiaryStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:layout_gravity="center"
+    android:contentDescription="@string/m3_tertiary_small_fab_content_desc"
+    app:srcCompat="@drawable/ic_add_24px"/>
+  <com.google.android.material.floatingactionbutton.FloatingActionButton
+    style="?attr/floatingActionButtonLargeTertiaryStyle"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:layout_gravity="center"
+    android:contentDescription="@string/m3_tertiary_large_fab_content_desc"
+    app:srcCompat="@drawable/ic_add_24px" />
+</merge>
diff --git a/catalog/java/io/material/catalog/fab/res/layout/m3_large_fabs.xml b/catalog/java/io/material/catalog/fab/res/layout/m3_large_fabs.xml
deleted file mode 100644
index 64387308a8b..00000000000
--- a/catalog/java/io/material/catalog/fab/res/layout/m3_large_fabs.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright 2021 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.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="wrap_content"
-  android:layout_height="wrap_content"
-  android:clipToPadding="false"
-  android:padding="8dp"
-  tools:parentTag="android.widget.GridLayout">
-
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
-    android:layout_gravity="center"
-    android:text="@string/m3_surface_fab_label"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    style="?attr/floatingActionButtonLargeSurfaceStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_large_surface_fab_content_desc"
-    app:srcCompat="@drawable/ic_add_24px" />
-  <Space/>
-
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
-    android:layout_gravity="center"
-    android:text="@string/m3_primary_fab_label"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    style="?attr/floatingActionButtonLargePrimaryStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_large_primary_fab_content_desc"
-    app:srcCompat="@drawable/ic_add_24px" />
-  <Space/>
-
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
-    android:layout_gravity="center"
-    android:text="@string/m3_secondary_fab_label"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    style="?attr/floatingActionButtonLargeSecondaryStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_large_secondary_fab_content_desc"
-    app:srcCompat="@drawable/ic_add_24px" />
-  <Space/>
-
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
-    android:layout_gravity="center"
-    android:text="@string/m3_tertiary_fab_label"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    style="?attr/floatingActionButtonLargeTertiaryStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_large_tertiary_fab_content_desc"
-    app:srcCompat="@drawable/ic_add_24px" />
-  <Space/>
-
-</merge>
diff --git a/catalog/java/io/material/catalog/fab/res/layout/theme_fab.xml b/catalog/java/io/material/catalog/fab/res/layout/m3_theme_fab.xml
similarity index 68%
rename from catalog/java/io/material/catalog/fab/res/layout/theme_fab.xml
rename to catalog/java/io/material/catalog/fab/res/layout/m3_theme_fab.xml
index 92859870c3c..00b0a8d4ee0 100644
--- a/catalog/java/io/material/catalog/fab/res/layout/theme_fab.xml
+++ b/catalog/java/io/material/catalog/fab/res/layout/m3_theme_fab.xml
@@ -26,23 +26,32 @@
   <TextView
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
+    android:layout_marginTop="24dp"
     android:layout_gravity="center"
-    android:text="@string/theme_fab_label"/>
+    android:layout_columnSpan="3"
+    android:text="@string/m3_theme_fab_label"/>
   <com.google.android.material.floatingactionbutton.FloatingActionButton
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_margin="8dp"
     android:layout_gravity="center"
-    android:contentDescription="@string/cat_theme_fab_content_desc"
+    android:contentDescription="@string/m3_theme_fab_content_desc"
     app:srcCompat="@drawable/ic_add_24px"/>
   <com.google.android.material.floatingactionbutton.FloatingActionButton
+    style="?attr/floatingActionButtonSmallStyle"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_margin="16dp"
     android:layout_gravity="center"
-    android:contentDescription="@string/cat_theme_fab_mini_content_desc"
-    app:srcCompat="@drawable/ic_add_24px"
-    app:fabSize="mini"/>
+    android:contentDescription="@string/m3_theme_small_fab_content_desc"
+    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_theme_large_fab_content_desc"
+    app:srcCompat="@drawable/ic_add_24px" />
 
 </merge>
diff --git a/catalog/java/io/material/catalog/fab/res/layout/m3_theme_large_fab.xml b/catalog/java/io/material/catalog/fab/res/layout/m3_theme_large_fab.xml
deleted file mode 100644
index ba4915d5ff3..00000000000
--- a/catalog/java/io/material/catalog/fab/res/layout/m3_theme_large_fab.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright 2021 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.
--->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="wrap_content"
-  android:layout_height="wrap_content"
-  android:clipToPadding="false"
-  tools:parentTag="android.widget.GridLayout">
-
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
-    android:layout_gravity="center"
-    android:text="@string/theme_fab_label" />
-  <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_theme_large_fab_content_desc"
-    app:srcCompat="@drawable/ic_add_24px" />
-  <Space/>
-
-</merge>
diff --git a/catalog/java/io/material/catalog/fab/res/layout/mtrl_fabs.xml b/catalog/java/io/material/catalog/fab/res/layout/mtrl_fabs.xml
deleted file mode 100644
index 5f6c604cabd..00000000000
--- a/catalog/java/io/material/catalog/fab/res/layout/mtrl_fabs.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright 2017 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.
-  -->
-
-<!-- Padding is used to avoid clipping the FAB's shadows. This is not normally necessary for
-     full-screen containers. -->
-
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:padding="8dp"
-    android:clipToPadding="false"
-    tools:parentTag="android.widget.GridLayout">
-
-  <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginRight="24dp"
-      android:layout_gravity="center"
-      android:text="@string/m3_surface_fab_label"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-      style="?attr/floatingActionButtonSurfaceStyle"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_margin="8dp"
-      android:layout_gravity="center"
-      android:contentDescription="@string/m3_surface_fab_content_desc"
-      app:srcCompat="@drawable/ic_add_24px"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-      style="?attr/floatingActionButtonSurfaceStyle"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_margin="8dp"
-      android:layout_gravity="center"
-      android:contentDescription="@string/m3_surface_fab_mini_content_desc"
-      app:fabSize="mini"
-      app:srcCompat="@drawable/ic_add_24px"/>
-
-  <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginRight="24dp"
-      android:layout_gravity="center"
-      android:text="@string/m3_primary_fab_label"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-      style="?attr/floatingActionButtonPrimaryStyle"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_margin="8dp"
-      android:layout_gravity="center"
-      android:contentDescription="@string/m3_primary_fab_content_desc"
-      app:srcCompat="@drawable/ic_add_24px"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-      style="?attr/floatingActionButtonPrimaryStyle"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_margin="8dp"
-      android:layout_gravity="center"
-      android:contentDescription="@string/m3_primary_fab_mini_content_desc"
-      app:fabSize="mini"
-      app:srcCompat="@drawable/ic_add_24px"/>
-
-  <TextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginRight="24dp"
-      android:layout_gravity="center"
-      android:text="@string/m3_secondary_fab_label"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-      style="?attr/floatingActionButtonSecondaryStyle"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_margin="8dp"
-      android:layout_gravity="center"
-      android:contentDescription="@string/m3_secondary_fab_content_desc"
-      app:srcCompat="@drawable/ic_add_24px"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-      style="?attr/floatingActionButtonSecondaryStyle"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_margin="8dp"
-      android:layout_gravity="center"
-      android:contentDescription="@string/m3_secondary_fab_mini_content_desc"
-      app:fabSize="mini"
-      app:srcCompat="@drawable/ic_add_24px"/>
-
-  <TextView
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginRight="24dp"
-    android:layout_gravity="center"
-    android:text="@string/m3_tertiary_fab_label"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    style="?attr/floatingActionButtonTertiaryStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_tertiary_fab_content_desc"
-    app:srcCompat="@drawable/ic_add_24px"/>
-  <com.google.android.material.floatingactionbutton.FloatingActionButton
-    style="?attr/floatingActionButtonTertiaryStyle"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:layout_gravity="center"
-    android:contentDescription="@string/m3_tertiary_fab_mini_content_desc"
-    app:fabSize="mini"
-    app:srcCompat="@drawable/ic_add_24px"/>
-</merge>
diff --git a/catalog/java/io/material/catalog/fab/res/values/strings.xml b/catalog/java/io/material/catalog/fab/res/values/strings.xml
index 25af12dc576..38226cbb2cd 100644
--- a/catalog/java/io/material/catalog/fab/res/values/strings.xml
+++ b/catalog/java/io/material/catalog/fab/res/values/strings.xml
@@ -17,61 +17,51 @@
 
 <resources>
 
-  <string name="cat_fab_title">Floating Action Button</string>
-  <string name="cat_fab_description">The Floating Action Button (FAB) represents your product\'s primary action, and should be considered a direct extension of its brand.</string>
-  <string name="cat_extended_fab_demo_title">Extended FAB</string>
-  <string name="cat_extended_fab_behavior_demo_title">Extended FAB Behavior</string>
+  <string name="cat_fab_title" translatable="false">Floating Action Button</string>
+  <string name="cat_fab_description" translatable="false">The Floating Action Button (FAB) represents your product\'s primary action, and should be considered a direct extension of its brand.</string>
+  <string name="cat_extended_fab_demo_title" translatable="false">Extended FAB</string>
+  <string name="cat_extended_fab_behavior_demo_title" translatable="false">Extended FAB Behavior</string>
 
-  <string name="regular_fab_label">Regular</string>
-  <string name="legacy_fab_label">Legacy</string>
-  <string name="theme_fab_label">Theme</string>
+  <string name="extended_fab_label" translatable="false">Extended FAB</string>
+  <string name="cat_extended_fab_content_desc" translatable="false">Extended FAB</string>
 
-  <string name="extended_fab_with_text">With icon and text</string>
-  <string name="extended_fab_without_icon">Without icon</string>
-  <string name="extended_fab_without_text">Without text</string>
-  <string name="extended_fab_label">Extended FAB</string>
+  <string name="hide_fabs_label" translatable="false">Hide FABs</string>
+  <string name="show_fabs_label" translatable="false">Show FABs</string>
+  <string name="rotate_fabs_label" translatable="false">Rotate FABs</string>
+  <string name="shrink_fabs_label" translatable="false">Shrink FABs</string>
+  <string name="extend_fabs_label" translatable="false">Extend FABs</string>
 
-  <string name="hide_fabs_label">Hide FABs</string>
-  <string name="show_fabs_label">Show FABs</string>
-  <string name="rotate_fabs_label">Rotate FABs</string>
-  <string name="shrink_fabs_label">Shrink FABs</string>
-  <string name="extend_fabs_label">Extend FABs</string>
-  <string name="hide_fab_on_scroll_label">Hide FAB on Scroll</string>
-  <string name="shrink_fab_on_scroll_label">Shrink FAB on Scroll</string>
+  <string name="cat_fab_clicked" translatable="false">FAB clicked</string>
+  <string name="cat_extended_fab_clicked" translatable="false">Extended FAB clicked</string>
 
-  <string name="cat_fab_clicked">FAB clicked</string>
-  <string name="cat_extended_fab_clicked">Extended FAB clicked</string>
+  <!-- FAB strings -->
+  <string name="m3_primary_fab_label" translatable="false">Primary (default, small, large)</string>
+  <string name="m3_secondary_fab_label" translatable="false">Secondary (default, small, large)</string>
+  <string name="m3_tertiary_fab_label" translatable="false">Tertiary (default, small, large)</string>
+  <string name="m3_surface_fab_label" translatable="false">Surface (default, small, large)</string>
+  <string name="m3_theme_fab_label" translatable="false">Theme (default, small, large)</string>
 
   <!-- Content descriptions for demo FABs. -->
-  <string name="cat_regular_fab_content_desc">Regular FAB</string>
-  <string name="cat_regular_fab_mini_content_desc">Regular mini FAB</string>
-  <string name="cat_legacy_fab_content_desc">Legacy FAB</string>
-  <string name="cat_legacy_fab_mini_content_desc">Legacy mini FAB</string>
-  <string name="cat_theme_fab_content_desc">Themed FAB</string>
-  <string name="cat_theme_fab_mini_content_desc">Mini themed FAB</string>
-  <string name="cat_extended_fab_content_desc">Extended FAB</string>
+  <string name="m3_primary_fab_content_desc" translatable="false">Primary FAB</string>
+  <string name="m3_primary_small_fab_content_desc" translatable="false">Primary small FAB</string>
+  <string name="m3_primary_large_fab_content_desc" translatable="false">Primary large FAB</string>
+  <string name="m3_secondary_fab_content_desc" translatable="false">Secondary FAB</string>
+  <string name="m3_secondary_small_fab_content_desc" translatable="false">Secondary small FAB</string>
+  <string name="m3_secondary_large_fab_content_desc" translatable="false">Secondary large FAB</string>
+  <string name="m3_tertiary_fab_content_desc" translatable="false">Tertiary FAB</string>
+  <string name="m3_tertiary_small_fab_content_desc" translatable="false">Tertiary small FAB</string>
+  <string name="m3_tertiary_large_fab_content_desc" translatable="false">Tertiary large FAB</string>
+  <string name="m3_surface_fab_content_desc" translatable="false">Surface FAB</string>
+  <string name="m3_surface_small_fab_content_desc" translatable="false">Surface small FAB</string>
+  <string name="m3_surface_large_fab_content_desc" translatable="false">Surface large FAB</string>
+  <string name="m3_theme_fab_content_desc" translatable="false">Theme FAB</string>
+  <string name="m3_theme_small_fab_content_desc" translatable="false">Theme small FAB</string>
+  <string name="m3_theme_large_fab_content_desc" translatable="false">Theme large FAB</string>
 
-  <!-- M3 FAB strings -->
-  <string name="m3_primary_fab_label">Primary</string>
-  <string name="m3_secondary_fab_label">Secondary</string>
-  <string name="m3_tertiary_fab_label">Tertiary</string>
-  <string name="m3_surface_fab_label">Surface</string>
-
-  <string name="m3_primary_fab_content_desc">Primary FAB</string>
-  <string name="m3_primary_fab_mini_content_desc">Primary mini FAB</string>
-  <string name="m3_secondary_fab_content_desc">Secondary FAB</string>
-  <string name="m3_secondary_fab_mini_content_desc">Secondary mini FAB</string>
-  <string name="m3_tertiary_fab_content_desc">Tertiary FAB</string>
-  <string name="m3_tertiary_fab_mini_content_desc">Tertiary mini FAB</string>
-  <string name="m3_surface_fab_content_desc">Surface FAB</string>
-  <string name="m3_surface_fab_mini_content_desc">Surface mini FAB</string>
-  <string name="m3_theme_large_fab_content_desc">Theme large FAB</string>
-
-  <string name="m3_large_fab_demo_title">Large FAB</string>
-
-  <string name="m3_large_primary_fab_content_desc">Large primary FAB</string>
-  <string name="m3_large_secondary_fab_content_desc">Large secondary FAB</string>
-  <string name="m3_large_tertiary_fab_content_desc">Large tertiary FAB</string>
-  <string name="m3_large_surface_fab_content_desc">Large surface FAB</string>
+  <!-- Extended FAB strings -->
+  <string name="m3_primary_extended_fab_label" translatable="false">Primary</string>
+  <string name="m3_secondary_extended_fab_label" translatable="false">Secondary</string>
+  <string name="m3_tertiary_extended_fab_label" translatable="false">Tertiary</string>
+  <string name="m3_surface_extended_fab_label" translatable="false">Surface</string>
 
 </resources>