diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_3d_rotation_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_3d_rotation_24px.xml
index e5c3444cf13..cc24a6e1693 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_3d_rotation_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_3d_rotation_24px.xml
@@ -15,11 +15,13 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    tools:ignore="NewApi,VectorPath">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M7.52,21.48C4.25,19.94 1.91,16.76 1.55,13L0.05,13C0.56,19.16 5.71,24 12,24l0.66,-0.03 -3.81,-3.81 -1.33,1.32zM8.41,14.96c-0.19,0 -0.37,-0.03 -0.52,-0.08 -0.16,-0.06 -0.29,-0.13 -0.4,-0.24 -0.11,-0.1 -0.2,-0.22 -0.26,-0.37 -0.06,-0.14 -0.09,-0.3 -0.09,-0.47h-1.3c0,0.36 0.07,0.68 0.21,0.95 0.14,0.27 0.33,0.5 0.56,0.69 0.24,0.18 0.51,0.32 0.82,0.41 0.3,0.1 0.62,0.15 0.96,0.15 0.37,0 0.72,-0.05 1.03,-0.15 0.32,-0.1 0.6,-0.25 0.83,-0.44s0.42,-0.43 0.55,-0.72c0.13,-0.29 0.2,-0.61 0.2,-0.97 0,-0.19 -0.02,-0.38 -0.07,-0.56 -0.05,-0.18 -0.12,-0.35 -0.23,-0.51 -0.1,-0.16 -0.24,-0.3 -0.4,-0.43 -0.17,-0.13 -0.37,-0.23 -0.61,-0.31 0.2,-0.09 0.37,-0.2 0.52,-0.33 0.15,-0.13 0.27,-0.27 0.37,-0.42 0.1,-0.15 0.17,-0.3 0.22,-0.46 0.05,-0.16 0.07,-0.32 0.07,-0.48 0,-0.36 -0.06,-0.68 -0.18,-0.96 -0.12,-0.28 -0.29,-0.51 -0.51,-0.69 -0.2,-0.19 -0.47,-0.33 -0.77,-0.43C9.1,8.05 8.76,8 8.39,8c-0.36,0 -0.69,0.05 -1,0.16 -0.3,0.11 -0.57,0.26 -0.79,0.45 -0.21,0.19 -0.38,0.41 -0.51,0.67 -0.12,0.26 -0.18,0.54 -0.18,0.85h1.3c0,-0.17 0.03,-0.32 0.09,-0.45s0.14,-0.25 0.25,-0.34c0.11,-0.09 0.23,-0.17 0.38,-0.22 0.15,-0.05 0.3,-0.08 0.48,-0.08 0.4,0 0.7,0.1 0.89,0.31 0.19,0.2 0.29,0.49 0.29,0.86 0,0.18 -0.03,0.34 -0.08,0.49 -0.05,0.15 -0.14,0.27 -0.25,0.37 -0.11,0.1 -0.25,0.18 -0.41,0.24 -0.16,0.06 -0.36,0.09 -0.58,0.09L7.5,11.4v1.03h0.77c0.22,0 0.42,0.02 0.6,0.07s0.33,0.13 0.45,0.23c0.12,0.11 0.22,0.24 0.29,0.4 0.07,0.16 0.1,0.35 0.1,0.57 0,0.41 -0.12,0.72 -0.35,0.93 -0.23,0.23 -0.55,0.33 -0.95,0.33zM16.96,9.04c-0.32,-0.33 -0.7,-0.59 -1.14,-0.77 -0.43,-0.18 -0.92,-0.27 -1.46,-0.27L12,8v8h2.3c0.55,0 1.06,-0.09 1.51,-0.27 0.45,-0.18 0.84,-0.43 1.16,-0.76 0.32,-0.33 0.57,-0.73 0.74,-1.19 0.17,-0.47 0.26,-0.99 0.26,-1.57v-0.4c0,-0.58 -0.09,-1.1 -0.26,-1.57 -0.18,-0.47 -0.43,-0.87 -0.75,-1.2zM16.57,12.2c0,0.42 -0.05,0.79 -0.14,1.13 -0.1,0.33 -0.24,0.62 -0.43,0.85 -0.19,0.23 -0.43,0.41 -0.71,0.53 -0.29,0.12 -0.62,0.18 -0.99,0.18h-0.91L13.39,9.12h0.97c0.72,0 1.27,0.23 1.64,0.69 0.38,0.46 0.57,1.12 0.57,1.99v0.4zM12,0l-0.66,0.03 3.81,3.81 1.33,-1.33c3.27,1.55 5.61,4.72 5.96,8.48h1.5C23.44,4.84 18.29,0 12,0z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_accelerator_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_accelerator_24px.xml
index 7538dc20807..ad31cbfeab0 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_accelerator_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_accelerator_24px.xml
@@ -15,11 +15,13 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M12,22l10,-10L12,2 8.67,5.33l6.65,6.65 -6.67,6.67zM5.3,15.32l3.35,-3.34 -3.31,-3.3L2,12.02z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_add_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_add_24px.xml
index 3a21aec8cae..af311518e05 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_add_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_add_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportHeight="24.0"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_add_circle_checkable_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_add_circle_checkable_24px.xml
new file mode 100644
index 00000000000..b55b123b602
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_add_circle_checkable_24px.xml
@@ -0,0 +1,21 @@
+<!--
+  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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_checkable="true" android:state_checked="false"
+        android:drawable="@drawable/ic_add_circle_default_24px"/>
+  <item android:drawable="@drawable/ic_add_circle_fill_24px"/>
+</selector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_add_circle_default_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_add_circle_default_24px.xml
new file mode 100644
index 00000000000..b0f3b788707
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_add_circle_default_24px.xml
@@ -0,0 +1,22 @@
+<!--
+  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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M440,680L520,680L520,520L680,520L680,440L520,440L520,280L440,280L440,440L280,440L280,520L440,520L440,680ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_add_circle_fill_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_add_circle_fill_24px.xml
new file mode 100644
index 00000000000..775ff3a9100
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_add_circle_fill_24px.xml
@@ -0,0 +1,22 @@
+<!--
+  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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="24dp"
+  android:height="24dp"
+  android:viewportWidth="960"
+  android:viewportHeight="960"
+  android:tint="?attr/colorControlNormal">
+  <path
+    android:fillColor="@android:color/white"
+    android:pathData="M440,680L520,680L520,520L680,520L680,440L520,440L520,280L440,280L440,440L280,440L280,520L440,520L440,680ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Z"/>
+</vector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_close_vd_theme_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_close_vd_theme_24px.xml
index b184e46cd0a..f7a10471bbc 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_close_vd_theme_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_close_vd_theme_24px.xml
@@ -14,11 +14,13 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_colors_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_colors_24px.xml
index 8b2ab1cdda9..b5493e8f968 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_colors_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_colors_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M-278.33,-154.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_colors_vd_theme_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_colors_vd_theme_24px.xml
index 03e066d45ac..2aa4bf80c52 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_colors_vd_theme_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_colors_vd_theme_24px.xml
@@ -14,11 +14,13 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M-278.33,-154.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_components_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_components_24px.xml
index 6970d287c91..2e9813d5f18 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_components_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_components_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:height="24dp"
     android:viewportHeight="24"
     android:viewportWidth="24"
-    android:width="24dp">
+    android:width="24dp"
+    tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M16,8.1V2H2v14h6.1c0.5,3.4,3.4,6,6.9,6c3.9,0,7-3.1,7-7C22,11.5,19.4,8.6,16,8.1z
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_content_copy_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_content_copy_24px.xml
index 000645ca631..7d72b8ea28c 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_content_copy_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_content_copy_24px.xml
@@ -14,12 +14,14 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="24dp"
-  android:height="24dp"
-  android:viewportWidth="24"
-  android:viewportHeight="24"
-  android:tint="?attr/colorControlNormal">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal"
+    tools:ignore="NewApi">
   <path
-    android:fillColor="@android:color/white"
-    android:pathData="M18,21L4,21L4,7L2,7v14c0,1.1 0.9,2 2,2h14v-2zM21,17L21,3c0,-1.1 -0.9,-2 -2,-2L8,1c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2zM19,17L8,17L8,3h11v14z"/>
+      android:fillColor="@android:color/white"
+      android:pathData="M18,21L4,21L4,7L2,7v14c0,1.1 0.9,2 2,2h14v-2zM21,17L21,3c0,-1.1 -0.9,-2 -2,-2L8,1c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2zM19,17L8,17L8,3h11v14z"/>
 </vector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_dashboard_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_dashboard_24px.xml
index 5dadb1cb894..30da30fff31 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_dashboard_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_dashboard_24px.xml
@@ -15,11 +15,13 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_data_table_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_data_table_24px.xml
index 263f4ec2ecd..2f063f05c86 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_data_table_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_data_table_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M-278.33,-198.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_delete_forever_checkable_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_delete_forever_checkable_24px.xml
new file mode 100644
index 00000000000..7852d2fd0e8
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_delete_forever_checkable_24px.xml
@@ -0,0 +1,21 @@
+<!--
+  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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_checkable="true" android:state_checked="false"
+        android:drawable="@drawable/ic_delete_forever_default_24px"/>
+  <item android:drawable="@drawable/ic_delete_forever_fill_24px"/>
+</selector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_delete_forever_default_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_delete_forever_default_24px.xml
new file mode 100644
index 00000000000..290f6693cc8
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_delete_forever_default_24px.xml
@@ -0,0 +1,22 @@
+<!--
+  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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M376,660L480,556L584,660L640,604L536,500L640,396L584,340L480,444L376,340L320,396L424,500L320,604L376,660ZM280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM680,240L280,240L280,760Q280,760 280,760Q280,760 280,760L680,760Q680,760 680,760Q680,760 680,760L680,240ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z"/>
+</vector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_delete_forever_fill_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_delete_forever_fill_24px.xml
new file mode 100644
index 00000000000..76d2eb3f0d5
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_delete_forever_fill_24px.xml
@@ -0,0 +1,22 @@
+<!--
+  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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M376,660L480,556L584,660L640,604L536,500L640,396L584,340L480,444L376,340L320,396L424,500L320,604L376,660ZM280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840Z"/>
+</vector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_demo_play_circle_outline_vd_theme_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_demo_play_circle_outline_vd_theme_24px.xml
index ce320e6f2f7..d81bb97f75f 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_demo_play_circle_outline_vd_theme_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_demo_play_circle_outline_vd_theme_24px.xml
@@ -14,11 +14,13 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:tint="?attr/colorControlNormal"
     android:viewportHeight="36.0"
-    android:viewportWidth="36.0">
+    android:viewportWidth="36.0"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M14.67,25.5l10,-7.5l-10,-7.5z"
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_developer_guide_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_developer_guide_24px.xml
index 0ccc6d899a7..f8fbc85b169 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_developer_guide_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_developer_guide_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M2,2v20h20L22,2L2,2zM20,20L4,20L4,4h2v7l2.5,-1.5L11,11L11,4h9v16z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_dialogs_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_dialogs_24px.xml
index 48ba8548493..85e9a3beec2 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_dialogs_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_dialogs_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M-278.33,-242.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_drag_handle_vd_theme_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_drag_handle_vd_theme_24px.xml
index 850cf1b0a03..498eeed0f72 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_drag_handle_vd_theme_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_drag_handle_vd_theme_24px.xml
@@ -14,11 +14,13 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_drawer_menu_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_drawer_menu_24px.xml
index 3ab5062f5ed..9c85f1f9f6a 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_drawer_menu_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_drawer_menu_24px.xml
@@ -15,11 +15,13 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_edge_to_edge_disable_24dp.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_edge_to_edge_disable_24dp.xml
index d240d32cf29..d5c406906bc 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_edge_to_edge_disable_24dp.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_edge_to_edge_disable_24dp.xml
@@ -15,11 +15,13 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M5,16h3v3h2v-5L5,14v2zM8,8L5,8v2h5L10,5L8,5v3zM14,19h2v-3h3v-2h-5v5zM16,8L16,5h-2v5h5L19,8h-3z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_edge_to_edge_enable_24dp.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_edge_to_edge_enable_24dp.xml
index 1cc2d385656..edc79e800e0 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_edge_to_edge_enable_24dp.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_edge_to_edge_enable_24dp.xml
@@ -15,11 +15,13 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M7,14L5,14v5h5v-2L7,17v-3zM5,10h2L7,7h3L10,5L5,5v5zM17,17h-3v2h5v-5h-2v3zM14,5v2h3v3h2L19,5h-5z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_edit_vd_theme_24dp.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_edit_vd_theme_24dp.xml
index 528d77d2ab3..bd8cebff9ae 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_edit_vd_theme_24dp.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_edit_vd_theme_24dp.xml
@@ -14,11 +14,13 @@
   ~ limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
-        android:tint="?attr/colorControlNormal">
+        android:tint="?attr/colorControlNormal"
+        tools:ignore="NewApi">
 <path
         android:fillColor="#FF000000"
         android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_fab_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_fab_24px.xml
index cfc050ebf36..3b8dd5ede91 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_fab_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_fab_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M-278.33,-22.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_favorite_checkable_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_favorite_checkable_24px.xml
new file mode 100644
index 00000000000..6f83b4baafe
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_favorite_checkable_24px.xml
@@ -0,0 +1,21 @@
+<!--
+  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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_checkable="true" android:state_checked="false"
+        android:drawable="@drawable/ic_favorite_default_24px"/>
+  <item android:drawable="@drawable/ic_favorite_fill_24px"/>
+</selector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_favorite_default_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_favorite_default_24px.xml
new file mode 100644
index 00000000000..2271744e946
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_favorite_default_24px.xml
@@ -0,0 +1,24 @@
+<!--
+  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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    tools:ignore="NewApi,VectorPath">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,840L422,788Q321,697 255,631Q189,565 150,512.5Q111,460 95.5,416Q80,372 80,326Q80,232 143,169Q206,106 300,106Q352,106 399,128Q446,150 480,190Q514,150 561,128Q608,106 660,106Q754,106 817,169Q880,232 880,326Q880,372 864.5,416Q849,460 810,512.5Q771,565 705,631Q639,697 538,788L480,840ZM480,732Q576,646 638,584.5Q700,523 736,477.5Q772,432 786,396.5Q800,361 800,326Q800,266 760,226Q720,186 660,186Q613,186 573,212.5Q533,239 518,280L518,280L442,280L442,280Q427,239 387,212.5Q347,186 300,186Q240,186 200,226Q160,266 160,326Q160,361 174,396.5Q188,432 224,477.5Q260,523 322,584.5Q384,646 480,732ZM480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459L480,459L480,459L480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Z"/>
+</vector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_favorite_fill_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_favorite_fill_24px.xml
new file mode 100644
index 00000000000..d7703dd0848
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_favorite_fill_24px.xml
@@ -0,0 +1,22 @@
+<!--
+  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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,840L422,788Q321,697 255,631Q189,565 150,512.5Q111,460 95.5,416Q80,372 80,326Q80,232 143,169Q206,106 300,106Q352,106 399,128Q446,150 480,190Q514,150 561,128Q608,106 660,106Q754,106 817,169Q880,232 880,326Q880,372 864.5,416Q849,460 810,512.5Q771,565 705,631Q639,697 538,788L480,840Z"/>
+</vector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_favorite_vd_theme_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_favorite_vd_theme_24px.xml
index b892bf2a501..dce362eb9e5 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_favorite_vd_theme_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_favorite_vd_theme_24px.xml
@@ -14,11 +14,13 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M12,21.35l-1.45,-1.32C5.4,15.36 2,12.28 2,8.5 2,5.42 4.42,3 7.5,3c1.74,0 3.41,0.81 4.5,2.09C13.09,3.81 14.76,3 16.5,3 19.58,3 22,5.42 22,8.5c0,3.78 -3.4,6.86 -8.55,11.54L12,21.35z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_feature_highlight_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_feature_highlight_24px.xml
index 1461e0be3f2..6a56c805f2e 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_feature_highlight_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_feature_highlight_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M-278.33,-330.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_github_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_github_24px.xml
index 393e57a6db0..780ca1de3e1 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_github_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_github_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M12,2C6.48,2 2,6.59 2,12.25c0,4.53 2.87,8.37 6.84,9.73 0.5,0.09 0.68,-0.22 0.68,-0.49 0,-0.24 -0.01,-0.89 -0.01,-1.74 -2.78,0.62 -3.37,-1.37 -3.37,-1.37 -0.45,-1.18 -1.11,-1.5 -1.11,-1.5 -0.91,-0.64 0.07,-0.62 0.07,-0.62 1,0.07 1.53,1.06 1.53,1.06 0.89,1.57 2.34,1.11 2.91,0.85 0.09,-0.66 0.35,-1.11 0.63,-1.37 -2.22,-0.26 -4.56,-1.14 -4.56,-5.07 0,-1.12 0.39,-2.03 1.03,-2.75 -0.1,-0.26 -0.45,-1.3 0.1,-2.71 0,0 0.84,-0.28 2.75,1.05 0.8,-0.23 1.65,-0.34 2.5,-0.34 0.85,0 1.7,0.12 2.5,0.34 1.91,-1.33 2.75,-1.05 2.75,-1.05 0.55,1.41 0.2,2.45 0.1,2.71 0.64,0.72 1.03,1.63 1.03,2.75 0,3.94 -2.34,4.81 -4.57,5.06 0.36,0.32 0.68,0.94 0.68,1.9 0,1.37 -0.01,2.48 -0.01,2.81 0,0.27 0.18,0.59 0.69,0.49 3.97,-1.36 6.83,-5.2 6.83,-9.73C22,6.59 17.52,2 12,2"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_home_checkable_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_home_checkable_24px.xml
new file mode 100644
index 00000000000..6697f9ab037
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_home_checkable_24px.xml
@@ -0,0 +1,21 @@
+<!--
+  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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_checkable="true" android:state_checked="false"
+        android:drawable="@drawable/ic_home_default_24px"/>
+  <item android:drawable="@drawable/ic_home_fill_24px"/>
+</selector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_home_default_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_home_default_24px.xml
new file mode 100644
index 00000000000..7a624524a53
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_home_default_24px.xml
@@ -0,0 +1,22 @@
+<!--
+  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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M240,760L360,760L360,520L600,520L600,760L720,760L720,400L480,220L240,400L240,760ZM160,840L160,360L480,120L800,360L800,840L520,840L520,600L440,600L440,840L160,840ZM480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490Z"/>
+</vector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_home_fill_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_home_fill_24px.xml
new file mode 100644
index 00000000000..3c076dc1f9c
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_home_fill_24px.xml
@@ -0,0 +1,22 @@
+<!--
+  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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M160,840L160,360L480,120L800,360L800,840L560,840L560,560L400,560L400,840L160,840Z"/>
+</vector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_info_outline_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_info_outline_24px.xml
index 77eb4ab9a17..a15c138ae9f 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_info_outline_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_info_outline_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    tools:ignore="NewApi">
   <path
       android:fillColor="#FF000000"
       android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_logo_components_48px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_logo_components_48px.xml
index 54b956725bc..9e88672e97b 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_logo_components_48px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_logo_components_48px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:height="48dp"
     android:viewportHeight="48.0"
     android:viewportWidth="48.0"
-    android:width="48dp">
+    android:width="48dp"
+    tools:ignore="NewApi">
     <path
         android:fillColor="#212121"
         android:pathData="M7.16,4h33.68C42.59,4 44,5.41 44,7.16v33.68c0,1.74 -1.41,3.16 -3.16,3.16H7.16C5.41,44 4,42.59 4,40.84V7.16C4,5.41 5.41,4 7.16,4z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_progress_activity_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_progress_activity_24px.xml
index 2924b974ace..2cb7be0e0a0 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_progress_activity_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_progress_activity_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="?attr/colorOnSurface"
         android:pathData="M-278.33,-462.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_refresh_black_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_refresh_black_24px.xml
index c524af7c3f0..75b0a875447 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_refresh_black_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_refresh_black_24px.xml
@@ -16,11 +16,13 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="24dp"
-  android:height="24dp"
-  android:viewportWidth="24"
-  android:viewportHeight="24">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    tools:ignore="NewApi">
   <path
-    android:pathData="M17.65 6.35C16.2 4.9 14.21 4 12 4 7.58 4 4.01 7.58 4.01 12c0 4.42 3.57 8 7.99 8 3.73 0 6.84 -2.55 7.73 -6l-2.08 0C16.83 16.33 14.61 18 12 18 8.69 18 6 15.31 6 12 6 8.69 8.69 6 12 6c1.66 0 3.14 0.69 4.22 1.78L13 11l7 0 0 -7 -2.35 2.35z"
-    android:fillColor="#000000" />
+      android:pathData="M17.65 6.35C16.2 4.9 14.21 4 12 4 7.58 4 4.01 7.58 4.01 12c0 4.42 3.57 8 7.99 8 3.73 0 6.84 -2.55 7.73 -6l-2.08 0C16.83 16.33 14.61 18 12 18 8.69 18 6 15.31 6 12 6 8.69 8.69 6 12 6c1.66 0 3.14 0.69 4.22 1.78L13 11l7 0 0 -7 -2.35 2.35z"
+      android:fillColor="#000000" />
 </vector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_responsive_layout_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_responsive_layout_24px.xml
index b90d0bedfb7..c684fd41854 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_responsive_layout_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_responsive_layout_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M-278.33,-506.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_ripples_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_ripples_24px.xml
index 052775cf7d8..c33fdffb08e 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_ripples_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_ripples_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M-278.33,-550.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_scrollable_header_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_scrollable_header_24px.xml
index 3599fa9045f..7f3d384709d 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_scrollable_header_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_scrollable_header_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M-278.33,-594.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_search_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_search_24px.xml
index 3dbab6cb72c..64dfa657b28 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_search_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_search_24px.xml
@@ -15,11 +15,13 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_search_vd_theme_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_search_vd_theme_24px.xml
index 97d3d2d711f..33fb68cbfa6 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_search_vd_theme_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_search_vd_theme_24px.xml
@@ -14,11 +14,13 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?attr/colorControlNormal"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_selection_controls_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_selection_controls_24px.xml
index 90e1837ded3..d90e56f99e2 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_selection_controls_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_selection_controls_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M-278.33,-638.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_settings_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_settings_24px.xml
index 7604e7202f7..ac873205157 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_settings_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_settings_24px.xml
@@ -21,7 +21,7 @@
     android:height="24dp"
     android:viewportWidth="20"
     android:viewportHeight="20"
-    tools:ignore="NewApi">
+    tools:ignore="NewApi,VectorPath">
 
   <path
       android:pathData="M0,0 L20,0 L20,20 L0,20 L0,0 Z" />
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_settings_checkable_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_settings_checkable_24px.xml
new file mode 100644
index 00000000000..a0157e0ccf5
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_settings_checkable_24px.xml
@@ -0,0 +1,21 @@
+<!--
+  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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:state_checkable="true" android:state_checked="false"
+        android:drawable="@drawable/ic_settings_default_24px"/>
+  <item android:drawable="@drawable/ic_settings_fill_24px"/>
+</selector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_settings_default_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_settings_default_24px.xml
new file mode 100644
index 00000000000..c5df601871f
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_settings_default_24px.xml
@@ -0,0 +1,24 @@
+<!--
+  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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    tools:ignore="NewApi,VectorPath">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M370,880L354,752Q341,747 329.5,740Q318,733 307,725L188,775L78,585L181,507Q180,500 180,493.5Q180,487 180,480Q180,473 180,466.5Q180,460 181,453L78,375L188,185L307,235Q318,227 330,220Q342,213 354,208L370,80L590,80L606,208Q619,213 630.5,220Q642,227 653,235L772,185L882,375L779,453Q780,460 780,466.5Q780,473 780,480Q780,487 780,493.5Q780,500 778,507L881,585L771,775L653,725Q642,733 630,740Q618,747 606,752L590,880L370,880ZM440,800L519,800L533,694Q564,686 590.5,670.5Q617,655 639,633L738,674L777,606L691,541Q696,527 698,511.5Q700,496 700,480Q700,464 698,448.5Q696,433 691,419L777,354L738,286L639,328Q617,305 590.5,289.5Q564,274 533,266L520,160L441,160L427,266Q396,274 369.5,289.5Q343,305 321,327L222,286L183,354L269,418Q264,433 262,448Q260,463 260,480Q260,496 262,511Q264,526 269,541L183,606L222,674L321,632Q343,655 369.5,670.5Q396,686 427,694L440,800ZM482,620Q540,620 581,579Q622,538 622,480Q622,422 581,381Q540,340 482,340Q423,340 382.5,381Q342,422 342,480Q342,538 382.5,579Q423,620 482,620ZM480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Z"/>
+</vector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_settings_fill_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_settings_fill_24px.xml
new file mode 100644
index 00000000000..fe4ba405750
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_settings_fill_24px.xml
@@ -0,0 +1,22 @@
+<!--
+  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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M370,880L354,752Q341,747 329.5,740Q318,733 307,725L188,775L78,585L181,507Q180,500 180,493.5Q180,487 180,480Q180,473 180,466.5Q180,460 181,453L78,375L188,185L307,235Q318,227 330,220Q342,213 354,208L370,80L590,80L606,208Q619,213 630.5,220Q642,227 653,235L772,185L882,375L779,453Q780,460 780,466.5Q780,473 780,480Q780,487 780,493.5Q780,500 778,507L881,585L771,775L653,725Q642,733 630,740Q618,747 606,752L590,880L370,880ZM482,620Q540,620 581,579Q622,538 622,480Q622,422 581,381Q540,340 482,340Q423,340 382.5,381Q342,422 342,480Q342,538 382.5,579Q423,620 482,620Z"/>
+</vector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_shadow_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_shadow_24px.xml
index d66eccc6246..8ed78ec155e 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_shadow_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_shadow_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M6,2v16h16L22,2L6,2zM20,16L8,16L8,4h12v12z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_side_navigation_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_side_navigation_24px.xml
index 06736c13638..de205a5c997 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_side_navigation_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_side_navigation_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="?attr/colorOnSurface"
         android:pathData="M2,22h20L22,2L2,2v20zM20,20h-8L12,4h8v16z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_sliders_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_sliders_24px.xml
index 30349b465a2..77ca5c599cd 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_sliders_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_sliders_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="?attr/colorOnSurface"
         android:pathData="M-278.33,-726.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_star_border_vd_theme_24.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_star_border_vd_theme_24.xml
index c835d10d897..78c912fac7c 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_star_border_vd_theme_24.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_star_border_vd_theme_24.xml
@@ -15,10 +15,12 @@
 -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="?attr/colorControlNormal"
         android:pathData="M22,9.24l-7.19,-0.62L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21 12,17.27 18.18,21l-1.63,-7.03L22,9.24zM12,15.4l-3.76,2.27 1,-4.28 -3.32,-2.88 4.38,-0.38L12,6.1l1.71,4.04 4.38,0.38 -3.32,2.88 1,4.28L12,15.4z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_star_checkable_24.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_star_checkable_24.xml
index 09c7c1a6faf..ab5f9913238 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_star_checkable_24.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_star_checkable_24.xml
@@ -15,7 +15,7 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_checked="true"
-        android:drawable="@drawable/ic_star_vd_theme_24"/>
-  <item android:drawable="@drawable/ic_star_border_vd_theme_24"/>
+  <item android:state_checkable="true" android:state_checked="false"
+        android:drawable="@drawable/ic_star_border_vd_theme_24"/>
+  <item android:drawable="@drawable/ic_star_vd_theme_24"/>
 </selector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_star_vd_theme_24.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_star_vd_theme_24.xml
index cd56f1b2a86..162777e8473 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_star_vd_theme_24.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_star_vd_theme_24.xml
@@ -11,11 +11,13 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:height="24dp"
     android:tint="?attr/colorControlNormal"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0"
-    android:width="24dp">
+    android:width="24dp"
+    tools:ignore="NewApi">
   <path
       android:fillColor="?attr/colorControlNormal"
       android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_steppers_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_steppers_24px.xml
index f090b9d4a05..1c4045db18a 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_steppers_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_steppers_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M-278.33,-770.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_subheader_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_subheader_24px.xml
index e0aca270976..1fcc4402299 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_subheader_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_subheader_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M-278.33,-814.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_switches_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_switches_24px.xml
index 99a3b7ab42f..c6f0a2db5c5 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_switches_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_switches_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M-278.33,-858.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_tabs_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_tabs_24px.xml
index f8535c45b1d..0e04c611c17 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_tabs_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_tabs_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M-278.33,-902.17h76v76h-76z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_text_field_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_text_field_24px.xml
index e4e706f47d8..bf1114b9598 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_text_field_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_text_field_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    tools:ignore="NewApi">
   <path
       android:fillColor="#FF000000"
       android:pathData="M2,19h20v2L2,21zM19,3h1v14h-1zM9.51,3l-5.5,14h2.25l1.12,-3h6.25l1.12,3L17,17L11.51,3h-2zM8.13,12l2.38,-6.33L12.89,12L8.13,12z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_theme_dark_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_theme_dark_24px.xml
index 5333c8be6b2..931ad183dcc 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_theme_dark_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_theme_dark_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M20,8.69V4h-4.69L12,0.69 8.69,4H4v4.69L0.69,12 4,15.31V20h4.69L12,23.31 15.31,20H20v-4.69L23.31,12 20,8.69zM12,18c-0.89,0 -1.74,-0.2 -2.5,-0.55C11.56,16.5 13,14.42 13,12s-1.44,-4.5 -3.5,-5.45C10.26,6.2 11.11,6 12,6c3.31,0 6,2.69 6,6s-2.69,6 -6,6z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_theme_default_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_theme_default_24px.xml
index 07f1050bab5..6eaa0b7347e 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_theme_default_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_theme_default_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_theme_light_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_theme_light_24px.xml
index fd1b8059a69..1a17c0969ff 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_theme_light_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_theme_light_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24.0"
+    tools:ignore="NewApi">
   <path
       android:fillColor="@android:color/white"
       android:pathData="M20,8.69L20,4h-4.69L12,0.69 8.69,4L4,4v4.69L0.69,12 4,15.31L4,20h4.69L12,23.31 15.31,20L20,20v-4.69L23.31,12 20,8.69zM12,18c-3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6 6,2.69 6,6 -2.69,6 -6,6zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4z"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_toast_24px.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_toast_24px.xml
index d194f4615ca..06c15b33f38 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/ic_toast_24px.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_toast_24px.xml
@@ -14,10 +14,12 @@
   limitations under the License.
   -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+        android:viewportHeight="24.0"
+        tools:ignore="NewApi">
     <path
         android:fillColor="#FF000000"
         android:pathData="M20,20H4V4h16M2,2v20h20V2"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/logo_avatar_anonymous_40dp.xml b/catalog/java/io/material/catalog/assets/res/drawable/logo_avatar_anonymous_40dp.xml
index 2b1fdea1862..9a7cc424b51 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/logo_avatar_anonymous_40dp.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/logo_avatar_anonymous_40dp.xml
@@ -14,10 +14,12 @@
      limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:width="40dp"
     android:height="40dp"
     android:viewportWidth="192"
-    android:viewportHeight="192">
+    android:viewportHeight="192"
+    tools:ignore="NewApi">
   <path
       android:pathData="M96,0C43.01,0 0,43.01 0,96s43.01,96 96,96s96,-43.01 96,-96S148.99,0 96,0z"
       android:fillColor="#E0E0E0"/>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/vd_clock_alarm.xml b/catalog/java/io/material/catalog/assets/res/drawable/vd_clock_alarm.xml
index b306bd9b351..e5032972bdc 100644
--- a/catalog/java/io/material/catalog/assets/res/drawable/vd_clock_alarm.xml
+++ b/catalog/java/io/material/catalog/assets/res/drawable/vd_clock_alarm.xml
@@ -14,13 +14,14 @@
   limitations under the License.
   -->
 
-<vector
-  xmlns:android="http://schemas.android.com/apk/res/android"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
   android:width="24dp"
   android:height="24dp"
   android:tint="?attr/colorControlNormal"
   android:viewportHeight="24"
-  android:viewportWidth="24">
+  android:viewportWidth="24"
+  tools:ignore="NewApi">
   <group
     android:name="button"
     android:translateX="12"
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
index a8eb97f25cc..f9290b1fd8f 100644
--- 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
@@ -34,36 +34,36 @@
         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"
+        android:contentDescription="@string/cat_icon_button_label_add_circle"
+        app:icon="@drawable/ic_add_circle_checkable_24px"
         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"
+        android:contentDescription="@string/cat_icon_button_label_favorite"
+        app:icon="@drawable/ic_favorite_checkable_24px"
         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"
+        android:contentDescription="@string/cat_icon_button_label_home"
+        app:icon="@drawable/ic_home_checkable_24px"
         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"
+        android:contentDescription="@string/cat_icon_button_label_settings"
+        app:icon="@drawable/ic_settings_checkable_24px"
         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"
+        android:contentDescription="@string/cat_icon_button_label_delete_forever"
+        app:icon="@drawable/ic_delete_forever_checkable_24px"
         app:iconPadding="0dp"/>
   </com.google.android.material.button.MaterialButtonGroup>
   <com.google.android.material.button.MaterialButtonGroup
@@ -76,36 +76,36 @@
         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"
+        android:contentDescription="@string/cat_icon_button_label_add_circle"
+        app:icon="@drawable/ic_add_circle_checkable_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_star_checkable_24"
+        android:contentDescription="@string/cat_icon_button_label_favorite"
+        app:icon="@drawable/ic_favorite_checkable_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_star_checkable_24"
+        android:contentDescription="@string/cat_icon_button_label_home"
+        app:icon="@drawable/ic_home_checkable_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_star_checkable_24"
+        android:contentDescription="@string/cat_icon_button_label_settings"
+        app:icon="@drawable/ic_settings_checkable_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_star_checkable_24"
+        android:contentDescription="@string/cat_icon_button_label_delete_forever"
+        app:icon="@drawable/ic_delete_forever_checkable_24px"
         app:iconPadding="0dp"/>
   </com.google.android.material.button.MaterialButtonGroup>
   <com.google.android.material.button.MaterialButtonGroup
@@ -118,36 +118,36 @@
         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"
+        android:contentDescription="@string/cat_icon_button_label_add_circle"
+        app:icon="@drawable/ic_add_circle_checkable_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_star_checkable_24"
+        android:contentDescription="@string/cat_icon_button_label_favorite"
+        app:icon="@drawable/ic_favorite_checkable_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_star_checkable_24"
+        android:contentDescription="@string/cat_icon_button_label_home"
+        app:icon="@drawable/ic_home_checkable_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_accelerator"
-        app:icon="@drawable/ic_star_checkable_24"
+        android:contentDescription="@string/cat_icon_button_label_settings"
+        app:icon="@drawable/ic_settings_checkable_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_star_checkable_24"
+        android:contentDescription="@string/cat_icon_button_label_delete_forever"
+        app:icon="@drawable/ic_delete_forever_checkable_24px"
         app:iconPadding="0dp"/>
   </com.google.android.material.button.MaterialButtonGroup>
   <com.google.android.material.button.MaterialButtonGroup
@@ -160,36 +160,36 @@
         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"
+        android:contentDescription="@string/cat_icon_button_label_add_circle"
+        app:icon="@drawable/ic_add_circle_checkable_24px"
         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"
+        android:contentDescription="@string/cat_icon_button_label_favorite"
+        app:icon="@drawable/ic_favorite_checkable_24px"
         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"
+        android:contentDescription="@string/cat_icon_button_label_home"
+        app:icon="@drawable/ic_home_checkable_24px"
         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"
+        android:contentDescription="@string/cat_icon_button_label_settings"
+        app:icon="@drawable/ic_settings_checkable_24px"
         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"
+        android:contentDescription="@string/cat_icon_button_label_delete_forever"
+        app:icon="@drawable/ic_delete_forever_checkable_24px"
         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_mixed.xml b/catalog/java/io/material/catalog/button/res/layout/cat_button_group_content_mixed.xml
index f73d99d9893..756c133a71b 100644
--- 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
@@ -33,33 +33,32 @@
         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"/>
+        android:contentDescription="@string/cat_icon_button_label_add_circle"
+        app:icon="@drawable/ic_add_circle_checkable_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"/>
+        android:contentDescription="@string/cat_icon_button_label_favorite"
+        app:icon="@drawable/ic_favorite_checkable_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"/>
+        android:contentDescription="@string/cat_icon_button_label_settings"
+        app:icon="@drawable/ic_settings_checkable_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"/>
+        android:contentDescription="@string/cat_icon_button_label_delete_forever"
+        app:icon="@drawable/ic_delete_forever_checkable_24px"/>
   </com.google.android.material.button.MaterialButtonGroup>
   <com.google.android.material.button.MaterialButtonGroup
       android:layout_width="wrap_content"
@@ -70,34 +69,33 @@
         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"/>
+        android:contentDescription="@string/cat_icon_button_label_add_circle"
+        app:icon="@drawable/ic_add_circle_checkable_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"/>
+        android:contentDescription="@string/cat_icon_button_label_favorite"
+        app:icon="@drawable/ic_favorite_checkable_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"/>
+        android:contentDescription="@string/cat_icon_button_label_settings"
+        app:icon="@drawable/ic_settings_checkable_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"/>
+        android:contentDescription="@string/cat_icon_button_label_delete_forever"
+        app:icon="@drawable/ic_delete_forever_checkable_24px"/>
   </com.google.android.material.button.MaterialButtonGroup>
   <com.google.android.material.button.MaterialButtonGroup
       android:layout_width="wrap_content"
@@ -108,34 +106,33 @@
         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"/>
+        android:contentDescription="@string/cat_icon_button_label_add_circle"
+        app:icon="@drawable/ic_add_circle_checkable_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"/>
+        android:contentDescription="@string/cat_icon_button_label_favorite"
+        app:icon="@drawable/ic_favorite_checkable_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"/>
+        android:contentDescription="@string/cat_icon_button_label_settings"
+        app:icon="@drawable/ic_settings_checkable_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"/>
+        android:contentDescription="@string/cat_icon_button_label_delete_forever"
+        app:icon="@drawable/ic_delete_forever_checkable_24px"/>
   </com.google.android.material.button.MaterialButtonGroup>
   <com.google.android.material.button.MaterialButtonGroup
       android:layout_width="wrap_content"
@@ -146,33 +143,32 @@
         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"/>
+        android:contentDescription="@string/cat_icon_button_label_add_circle"
+        app:icon="@drawable/ic_add_circle_checkable_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"/>
+        android:contentDescription="@string/cat_icon_button_label_favorite"
+        app:icon="@drawable/ic_favorite_checkable_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"/>
+        android:contentDescription="@string/cat_icon_button_label_settings"
+        app:icon="@drawable/ic_settings_checkable_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"/>
+        android:contentDescription="@string/cat_icon_button_label_delete_forever"
+        app:icon="@drawable/ic_delete_forever_checkable_24px"/>
   </com.google.android.material.button.MaterialButtonGroup>
 </merge>
diff --git a/catalog/java/io/material/catalog/button/res/layout/cat_buttons_toggle_group_fragment.xml b/catalog/java/io/material/catalog/button/res/layout/cat_buttons_toggle_group_fragment.xml
index e0aa9e4ecee..47b5fef1d06 100644
--- a/catalog/java/io/material/catalog/button/res/layout/cat_buttons_toggle_group_fragment.xml
+++ b/catalog/java/io/material/catalog/button/res/layout/cat_buttons_toggle_group_fragment.xml
@@ -110,40 +110,40 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:minWidth="@dimen/mtrl_min_touch_target_size"
-          android:contentDescription="@string/cat_icon_button_label_paint_bucket"
-          app:icon="@drawable/ic_colors_24px"
+          android:contentDescription="@string/cat_icon_button_label_add_circle"
+          app:icon="@drawable/ic_add_circle_checkable_24px"
           app:iconPadding="0dp"/>
       <Button
           style="?attr/materialButtonOutlinedStyle"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:minWidth="@dimen/mtrl_min_touch_target_size"
-          android:contentDescription="@string/cat_icon_button_label_plus"
-          app:icon="@drawable/ic_fab_24px"
+          android:contentDescription="@string/cat_icon_button_label_favorite"
+          app:icon="@drawable/ic_favorite_checkable_24px"
           app:iconPadding="0dp"/>
       <Button
           style="?attr/materialButtonOutlinedStyle"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:minWidth="@dimen/mtrl_min_touch_target_size"
-          android:contentDescription="@string/cat_icon_button_label_components"
-          app:icon="@drawable/ic_components_24px"
+          android:contentDescription="@string/cat_icon_button_label_home"
+          app:icon="@drawable/ic_home_checkable_24px"
           app:iconPadding="0dp"/>
       <Button
           style="?attr/materialButtonOutlinedStyle"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:minWidth="@dimen/mtrl_min_touch_target_size"
-          android:contentDescription="@string/cat_icon_button_label_accelerator"
-          app:icon="@drawable/ic_accelerator_24px"
+          android:contentDescription="@string/cat_icon_button_label_settings"
+          app:icon="@drawable/ic_settings_checkable_24px"
           app:iconPadding="0dp"/>
       <Button
           style="?attr/materialButtonOutlinedStyle"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:minWidth="@dimen/mtrl_min_touch_target_size"
-          android:contentDescription="@string/cat_icon_button_label_dialog"
-          app:icon="@drawable/ic_dialogs_24px"
+          android:contentDescription="@string/cat_icon_button_label_delete_forever"
+          app:icon="@drawable/ic_delete_forever_checkable_24px"
           app:iconPadding="0dp"/>
     </com.google.android.material.button.MaterialButtonToggleGroup>
 
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 3f426fed4be..967d9a4c175 100644
--- a/catalog/java/io/material/catalog/button/res/values/strings.xml
+++ b/catalog/java/io/material/catalog/button/res/values/strings.xml
@@ -91,15 +91,17 @@
   <string name="cat_button_label_tomatoes">Tomatoes</string>
   <string name="cat_button_label_mushrooms">Mushrooms</string>
   <string description="A label for an icon-only button [CHAR LIMIT=NONE]"
-      name="cat_icon_button_label_paint_bucket">Paint bucket icon</string>
+    name="cat_icon_button_label_add_circle">Add icon</string>
   <string description="A label for an icon-only button [CHAR LIMIT=NONE]"
-      name="cat_icon_button_label_plus">Plus icon</string>
+    name="cat_icon_button_label_favorite">Favorite icon</string>
   <string description="A label for an icon-only button [CHAR LIMIT=NONE]"
-      name="cat_icon_button_label_components">Components icon</string>
+    name="cat_icon_button_label_home">Home icon</string>
   <string description="A label for an icon-only button [CHAR LIMIT=NONE]"
-      name="cat_icon_button_label_accelerator">Accelerator icon</string>
+    name="cat_icon_button_label_settings">Settings icon</string>
   <string description="A label for an icon-only button [CHAR LIMIT=NONE]"
-      name="cat_icon_button_label_dialog">Dialog icon</string>
+    name="cat_icon_button_label_delete_forever">Delete forever icon</string>
+  <string description="A label for an icon-only button [CHAR LIMIT=NONE]"
+    name="cat_icon_button_label_star">Star icon</string>
   <string name="cat_button_require_selection" translatable="false">Require Selection</string>
   <string name="cat_button_vertical_orientation" translatable="false">Vertical Orientation</string>
   <string name="cat_button_enable" translatable="false">Enabled</string>