diff --git a/samples/Support7Demos/Android.mk b/samples/Support7Demos/Android.mk
index 371c737a1..21d34a946 100644
--- a/samples/Support7Demos/Android.mk
+++ b/samples/Support7Demos/Android.mk
@@ -38,7 +38,6 @@ LOCAL_RESOURCE_DIR = \
         frameworks/support/v7/cardview/res \
         frameworks/support/design/res \
         frameworks/support/v7/recyclerview/res
-
 LOCAL_AAPT_FLAGS := \
         --auto-add-overlay \
         --extra-packages android.support.v7.appcompat \
@@ -46,5 +45,6 @@ LOCAL_AAPT_FLAGS := \
         --extra-packages android.support.v7.gridlayout \
         --extra-packages android.support.v7.mediarouter \
         --extra-packages android.support.design \
-        --extra-packages android.support.v7.recyclerview
+        --extra-packages android.support.v7.recyclerview \
+        --no-version-vectors
 include $(BUILD_PACKAGE)
diff --git a/samples/SupportDesignDemos/Android.mk b/samples/SupportDesignDemos/Android.mk
index 96068ee6f..9dc4538bd 100644
--- a/samples/SupportDesignDemos/Android.mk
+++ b/samples/SupportDesignDemos/Android.mk
@@ -36,6 +36,7 @@ LOCAL_AAPT_FLAGS := \
         --auto-add-overlay \
         --extra-packages android.support.v7.appcompat \
         --extra-packages android.support.v7.recyclerview \
-        --extra-packages android.support.design
+        --extra-packages android.support.design \
+        --no-version-vectors
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 include $(BUILD_PACKAGE)
diff --git a/samples/SupportDesignDemos/res/drawable-xxhdpi/ic_add.png b/samples/SupportDesignDemos/res/drawable-xxhdpi/ic_add.png
new file mode 100644
index 000000000..a84106b01
Binary files /dev/null and b/samples/SupportDesignDemos/res/drawable-xxhdpi/ic_add.png differ
diff --git a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_with_fab.xml b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_with_fab.xml
index adf7900de..a960ddb65 100644
--- a/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_with_fab.xml
+++ b/samples/SupportDesignDemos/res/layout/design_appbar_toolbar_collapse_pin_with_fab.xml
@@ -51,7 +51,7 @@
             android:layout_width="wrap_content"
             app:layout_anchor="@id/appbar"
             app:layout_anchorGravity="bottom|right|end"
-            android:src="@drawable/abc_ic_ab_back_mtrl_am_alpha"
+            android:src="@drawable/ic_add"
             android:layout_marginRight="16dp"
             android:clickable="true"
             app:fabSize="mini"/>
diff --git a/samples/SupportDesignDemos/res/layout/design_fab.xml b/samples/SupportDesignDemos/res/layout/design_fab.xml
index 26a128a54..0eedea313 100644
--- a/samples/SupportDesignDemos/res/layout/design_fab.xml
+++ b/samples/SupportDesignDemos/res/layout/design_fab.xml
@@ -47,7 +47,7 @@
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_margin="16dp"
-                android:src="@drawable/abc_ic_ab_back_mtrl_am_alpha"
+                android:src="@drawable/ic_add"
                 android:clickable="true" />
 
         <TextView
@@ -61,7 +61,7 @@
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:layout_margin="16dp"
-                android:src="@drawable/abc_ic_ab_back_mtrl_am_alpha"
+                android:src="@drawable/ic_add"
                 android:clickable="true"
                 app:fabSize="mini" />
 
diff --git a/samples/SupportDesignDemos/res/layout/design_snackbar_with_fab.xml b/samples/SupportDesignDemos/res/layout/design_snackbar_with_fab.xml
index e3bcd7cde..2f64d7b64 100644
--- a/samples/SupportDesignDemos/res/layout/design_snackbar_with_fab.xml
+++ b/samples/SupportDesignDemos/res/layout/design_snackbar_with_fab.xml
@@ -63,7 +63,7 @@
             android:layout_width="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="16dp"
-            android:src="@drawable/abc_ic_ab_back_mtrl_am_alpha"
+            android:src="@drawable/ic_add"
             android:clickable="true"/>
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file