diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_checkbox.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_checkbox.xml
new file mode 100644
index 000000000..a35ecdf55
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_checkbox.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2018 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="80dp"
+    android:height="80dp"
+    android:viewportHeight="80"
+    android:viewportWidth="80">
+  <group android:name="group_2">
+    <group android:name="mask_2">
+      <path
+          android:name="path_1"
+          android:fillColor="#000"
+          android:pathData="M 36.458 48.854 L 27.603 39.999 L 30.111 37.494 L 36.458 43.843 L 49.89 30.411 L 52.396 32.917 L 36.458 48.854 Z M 53.222 22.999 L 26.777 22.999 C 24.701 22.999 23.001 24.699 23.001 26.778 L 23.001 53.223 C 23.001 55.299 24.701 56.999 26.777 56.999 L 53.222 56.999 C 55.301 56.999 57.001 55.299 57.001 53.223 L 57.001 26.778 C 57.001 24.699 55.301 22.999 53.222 22.999 Z"
+          android:strokeWidth="1"/>
+    </group>
+  </group>
+</vector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_radio_button.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_radio_button.xml
new file mode 100644
index 000000000..a55896888
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_radio_button.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2018 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="80dp"
+    android:height="80dp"
+    android:viewportHeight="80"
+    android:viewportWidth="80">
+  <group android:name="group">
+    <path
+        android:name="path_1_1"
+        android:fillColor="#000"
+        android:pathData="M 40 31.5 C 35.308 31.5 31.5 35.308 31.5 40 C 31.5 44.692 35.308 48.5 40 48.5 C 44.692 48.5 48.5 44.692 48.5 40 C 48.5 35.308 44.692 31.5 40 31.5 Z M 40 23 C 30.616 23 23 30.616 23 40 C 23 49.384 30.616 57 40 57 C 49.384 57 57 49.384 57 40 C 57 30.616 49.384 23 40 23 Z M 40 53.6 C 32.486 53.6 26.4 47.514 26.4 40 C 26.4 32.486 32.486 26.4 40 26.4 C 47.514 26.4 53.6 32.486 53.6 40 C 53.6 47.514 47.514 53.6 40 53.6 Z"
+        android:strokeWidth="1"/>
+  </group>
+</vector>
diff --git a/catalog/java/io/material/catalog/assets/res/drawable/ic_switch.xml b/catalog/java/io/material/catalog/assets/res/drawable/ic_switch.xml
new file mode 100644
index 000000000..efdc30a88
--- /dev/null
+++ b/catalog/java/io/material/catalog/assets/res/drawable/ic_switch.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Copyright 2018 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:name="vector"
+    android:width="80dp"
+    android:height="80dp"
+    android:viewportHeight="80"
+    android:viewportWidth="80">
+  <group android:name="group_2">
+    <path
+        android:name="path"
+        android:fillColor="#bdc1c6"
+        android:pathData="M 49.565 52.16 L 18.035 52.16 C 11.887 52.16 7 46.97 7 40.44 C 7 33.91 11.887 28.72 18.035 28.72 L 49.565 28.72 C 55.713 28.72 60.6 33.91 60.6 40.44 C 60.6 46.97 55.713 52.16 49.565 52.16 Z"
+        android:strokeWidth="1"/>
+    <group android:name="group">
+      <path
+          android:name="path_1"
+          android:fillColor="#000"
+          android:pathData="M 53.9 23.697 C 49.459 23.697 45.196 25.462 42.056 28.601 C 38.916 31.74 37.15 36.001 37.15 40.44 C 37.15 44.879 38.916 49.14 42.056 52.279 C 45.196 55.418 49.459 57.183 53.9 57.183 C 58.341 57.183 62.604 55.418 65.744 52.279 C 68.884 49.14 70.65 44.879 70.65 40.44 C 70.65 36.001 68.884 31.74 65.744 28.601 C 62.604 25.462 58.341 23.697 53.9 23.697 Z"
+          android:strokeWidth="1"/>
+    </group>
+    <group android:name="group_1">
+      <path
+          android:name="path_1_1"
+          android:fillColor="#000"
+          android:pathData="M 53.9 23.697 C 49.459 23.697 45.196 25.462 42.056 28.601 C 38.916 31.74 37.15 36.001 37.15 40.44 C 37.15 44.879 38.916 49.14 42.056 52.279 C 45.196 55.418 49.459 57.183 53.9 57.183 C 58.341 57.183 62.604 55.418 65.744 52.279 C 68.884 49.14 70.65 44.879 70.65 40.44 C 70.65 36.001 68.884 31.74 65.744 28.601 C 62.604 25.462 58.341 23.697 53.9 23.697 Z"
+          android:strokeWidth="1"/>
+    </group>
+  </group>
+</vector>
diff --git a/catalog/java/io/material/catalog/checkbox/CheckBoxFragment.java b/catalog/java/io/material/catalog/checkbox/CheckBoxFragment.java
index bb81959c7..1e4425f7b 100644
--- a/catalog/java/io/material/catalog/checkbox/CheckBoxFragment.java
+++ b/catalog/java/io/material/catalog/checkbox/CheckBoxFragment.java
@@ -63,7 +63,7 @@ public class CheckBoxFragment extends DemoLandingFragment {
     @Provides
     @ActivityScope
     static FeatureDemo provideFeatureDemo() {
-      return new FeatureDemo(R.string.cat_checkbox_title, R.drawable.ic_check_box_black_24dp) {
+      return new FeatureDemo(R.string.cat_checkbox_title, R.drawable.ic_checkbox) {
         @Override
         public Fragment createFragment() {
           return new CheckBoxFragment();
diff --git a/catalog/java/io/material/catalog/checkbox/res/drawable/ic_check_box_black_24dp.xml b/catalog/java/io/material/catalog/checkbox/res/drawable/ic_check_box_black_24dp.xml
deleted file mode 100644
index 950da041c..000000000
--- a/catalog/java/io/material/catalog/checkbox/res/drawable/ic_check_box_black_24dp.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  Copyright 2018 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
-</vector>
diff --git a/catalog/java/io/material/catalog/radiobutton/RadioButtonFragment.java b/catalog/java/io/material/catalog/radiobutton/RadioButtonFragment.java
index 3702b09f2..91271d71c 100644
--- a/catalog/java/io/material/catalog/radiobutton/RadioButtonFragment.java
+++ b/catalog/java/io/material/catalog/radiobutton/RadioButtonFragment.java
@@ -63,8 +63,7 @@ public class RadioButtonFragment extends DemoLandingFragment {
     @Provides
     @ActivityScope
     static FeatureDemo provideFeatureDemo() {
-      return new FeatureDemo(
-          R.string.cat_radiobutton_title, R.drawable.ic_radio_button_checked_black_24dp) {
+      return new FeatureDemo(R.string.cat_radiobutton_title, R.drawable.ic_radio_button) {
         @Override
         public Fragment createFragment() {
           return new RadioButtonFragment();
diff --git a/catalog/java/io/material/catalog/radiobutton/res/drawable/ic_radio_button_checked_black_24dp.xml b/catalog/java/io/material/catalog/radiobutton/res/drawable/ic_radio_button_checked_black_24dp.xml
deleted file mode 100644
index a9349764a..000000000
--- a/catalog/java/io/material/catalog/radiobutton/res/drawable/ic_radio_button_checked_black_24dp.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2018 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      https://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
-</vector>
diff --git a/catalog/java/io/material/catalog/switchmaterial/SwitchFragment.java b/catalog/java/io/material/catalog/switchmaterial/SwitchFragment.java
index dedb030e6..ff22c4f1a 100644
--- a/catalog/java/io/material/catalog/switchmaterial/SwitchFragment.java
+++ b/catalog/java/io/material/catalog/switchmaterial/SwitchFragment.java
@@ -63,7 +63,7 @@ public class SwitchFragment extends DemoLandingFragment {
     @Provides
     @ActivityScope
     static FeatureDemo provideFeatureDemo() {
-      return new FeatureDemo(R.string.cat_switch_title, R.drawable.ic_switches_24px) {
+      return new FeatureDemo(R.string.cat_switch_title, R.drawable.ic_switch) {
         @Override
         public Fragment createFragment() {
           return new SwitchFragment();