Converting all android:src to app:srcCompat to handle VectorDrawables

39 files changed, 149 insertions, 126 deletions

diff --git a/WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml b/WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml
index fc128eb3f..faab9765f 100644
--- a/WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml
+++ b/WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -68,7 +69,7 @@
                         android:layout_margin="@dimen/margin_none"
                         android:adjustViewBounds="true"
                         android:contentDescription="@string/customize"
-                        android:src="@drawable/ic_theme_customize" />
+                        app:srcCompat="@drawable/ic_theme_customize" />
 
                     <org.wordpress.android.widgets.WPTextView
                         android:layout_width="wrap_content"
@@ -97,7 +98,7 @@
                         android:layout_margin="@dimen/margin_none"
                         android:adjustViewBounds="true"
                         android:contentDescription="@string/details"
-                        android:src="@drawable/ic_theme_details" />
+                        app:srcCompat="@drawable/ic_theme_details" />
 
                     <org.wordpress.android.widgets.WPTextView
                         android:layout_width="wrap_content"
@@ -126,7 +127,7 @@
                         android:layout_margin="@dimen/margin_none"
                         android:adjustViewBounds="true"
                         android:contentDescription="@string/support"
-                        android:src="@drawable/ic_theme_support" />
+                        app:srcCompat="@drawable/ic_theme_support" />
 
                     <org.wordpress.android.widgets.WPTextView
                         android:layout_width="wrap_content"
diff --git a/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml b/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml
index 87d1807a4..8425ea4a8 100644
--- a/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml
+++ b/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:baselineAligned="false"
-              android:padding="@dimen/margin_extra_large"
-              android:orientation="horizontal">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:baselineAligned="false"
+    android:padding="@dimen/margin_extra_large"
+    android:orientation="horizontal">
 
     <!-- Posts item -->
     <LinearLayout
@@ -27,7 +28,7 @@
                 android:layout_height="12dp"
                 android:layout_marginRight="3dp"
                 android:layout_marginEnd="3dp"
-                android:src="@drawable/my_site_icon_posts" />
+                app:srcCompat="@drawable/my_site_icon_posts" />
 
             <org.wordpress.android.widgets.WPAutoResizeTextView
                 style="@style/StatsInsightsLabel"
@@ -72,7 +73,7 @@
                 android:layout_height="12dp"
                 android:layout_marginRight="3dp"
                 android:layout_marginEnd="3dp"
-                android:src="@drawable/stats_icon_views" />
+                app:srcCompat="@drawable/stats_icon_views" />
 
             <org.wordpress.android.widgets.WPAutoResizeTextView
                 style="@style/StatsInsightsLabel"
@@ -117,7 +118,7 @@
                 android:layout_height="12dp"
                 android:layout_marginRight="3dp"
                 android:layout_marginEnd="3dp"
-                android:src="@drawable/stats_icon_visitors" />
+                app:srcCompat="@drawable/stats_icon_visitors" />
 
             <org.wordpress.android.widgets.WPAutoResizeTextView
                 style="@style/StatsInsightsLabel"
@@ -162,7 +163,7 @@
                 android:layout_height="12dp"
                 android:layout_marginRight="3dp"
                 android:layout_marginEnd="3dp"
-                android:src="@drawable/stats_icon_trophy" />
+                app:srcCompat="@drawable/stats_icon_trophy" />
 
             <org.wordpress.android.widgets.WPAutoResizeTextView
                 style="@style/StatsInsightsLabel"
diff --git a/WordPress/src/main/res/layout/about_activity.xml b/WordPress/src/main/res/layout/about_activity.xml
index e6adee481..74236533a 100644
--- a/WordPress/src/main/res/layout/about_activity.xml
+++ b/WordPress/src/main/res/layout/about_activity.xml
@@ -27,7 +27,7 @@
                 android:id="@+id/nux_fragment_icon"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:src="@drawable/nux_icon_wp"
+                app:srcCompat="@drawable/nux_icon_wp"
                 android:layout_marginTop="@dimen/margin_medium"/>
 
             <org.wordpress.android.widgets.WPTextView
diff --git a/WordPress/src/main/res/layout/categories_row.xml b/WordPress/src/main/res/layout/categories_row.xml
index 107641fad..489b513c4 100644
--- a/WordPress/src/main/res/layout/categories_row.xml
+++ b/WordPress/src/main/res/layout/categories_row.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<org.wordpress.android.widgets.CheckedLinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/category_row_height"
-        android:orientation="horizontal"
-        android:id="@+id/categoryRow" android:clickable="false">
+<org.wordpress.android.widgets.CheckedLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/category_row_height"
+    android:orientation="horizontal"
+    android:id="@+id/categoryRow"
+    android:clickable="false">
     <ImageView android:layout_width="@dimen/category_row_height"
                android:layout_height="@dimen/category_row_height"
-               android:src="@drawable/ic_level_indicator"
+               app:srcCompat="@drawable/ic_level_indicator"
                android:id="@+id/categoryRowLevelIndicator" android:scaleType="fitEnd"/>
     <CheckedTextView
             android:orientation="vertical"
diff --git a/WordPress/src/main/res/layout/categories_row_parent.xml b/WordPress/src/main/res/layout/categories_row_parent.xml
index b549bdaf3..06a0d6a7d 100644
--- a/WordPress/src/main/res/layout/categories_row_parent.xml
+++ b/WordPress/src/main/res/layout/categories_row_parent.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/category_parent_spinner_row_height"
-        android:orientation="horizontal"
-        android:id="@+id/categoryRow" android:clickable="false">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/category_parent_spinner_row_height"
+    android:orientation="horizontal"
+    android:id="@+id/categoryRow"
+    android:clickable="false">
     <ImageView android:layout_width="@dimen/category_row_height"
                android:layout_height="@dimen/category_row_height"
-               android:src="@drawable/ic_level_indicator"
+               app:srcCompat="@drawable/ic_level_indicator"
                android:id="@+id/categoryRowLevelIndicator" android:scaleType="fitEnd"/>
     <TextView
             android:orientation="vertical"
diff --git a/WordPress/src/main/res/layout/comment_action_footer.xml b/WordPress/src/main/res/layout/comment_action_footer.xml
index 5fa353f9f..5294df243 100644
--- a/WordPress/src/main/res/layout/comment_action_footer.xml
+++ b/WordPress/src/main/res/layout/comment_action_footer.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/layout_buttons"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -30,7 +31,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/margin_small"
-                android:src="@drawable/ic_action_like"
+                app:srcCompat="@drawable/ic_action_like"
                 android:contentDescription="@string/reader_label_like" />
 
             <org.wordpress.android.widgets.WPTextView
@@ -60,7 +61,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:paddingTop="@dimen/margin_small"
-                android:src="@drawable/ic_action_approve"
+                app:srcCompat="@drawable/ic_action_approve"
                 android:contentDescription="@string/reader_label_like" />
 
             <org.wordpress.android.widgets.WPTextView
diff --git a/WordPress/src/main/res/layout/comment_listitem.xml b/WordPress/src/main/res/layout/comment_listitem.xml
index 10783d2b6..6a73b382d 100644
--- a/WordPress/src/main/res/layout/comment_listitem.xml
+++ b/WordPress/src/main/res/layout/comment_listitem.xml
@@ -1,5 +1,6 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:selectableItemBackground"
@@ -33,7 +34,7 @@
                 android:layout_height="@dimen/notifications_avatar_sz"
                 android:background="@drawable/shape_oval_blue"
                 android:padding="@dimen/margin_medium"
-                android:src="@drawable/ic_check_white_24dp"
+                app:srcCompat="@drawable/ic_check_white_24dp"
                 android:visibility="gone" />
 
             <LinearLayout
diff --git a/WordPress/src/main/res/layout/create_blog_fragment.xml b/WordPress/src/main/res/layout/create_blog_fragment.xml
index 71de44282..39ceb5359 100644
--- a/WordPress/src/main/res/layout/create_blog_fragment.xml
+++ b/WordPress/src/main/res/layout/create_blog_fragment.xml
@@ -52,7 +52,7 @@
                     android:layout_gravity="center_horizontal"
                     android:layout_alignParentEnd="false"
                     android:layout_alignParentStart="false"
-                    android:src="@drawable/dashicon_edit"
+                    app:srcCompat="@drawable/dashicon_edit"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="10dp"
                     android:tint="@color/grey_darken_10"/>
@@ -105,7 +105,7 @@
                     android:layout_gravity="center_horizontal"
                     android:layout_alignParentEnd="false"
                     android:layout_alignParentStart="false"
-                    android:src="@drawable/dashicon_admin_site"
+                    app:srcCompat="@drawable/dashicon_admin_site"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="10dp"
                     android:tint="@color/grey_darken_10"/>
diff --git a/WordPress/src/main/res/layout/endlist_indicator.xml b/WordPress/src/main/res/layout/endlist_indicator.xml
index 2e99aafd0..dafc90904 100644
--- a/WordPress/src/main/res/layout/endlist_indicator.xml
+++ b/WordPress/src/main/res/layout/endlist_indicator.xml
@@ -5,6 +5,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/endlist_indicator"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -24,7 +25,7 @@
         android:layout_gravity="center"
         android:layout_marginLeft="@dimen/margin_medium"
         android:layout_marginRight="@dimen/margin_medium"
-        android:src="@drawable/endlist_logo" />
+        app:srcCompat="@drawable/endlist_logo" />
 
     <View
         android:layout_width="match_parent"
diff --git a/WordPress/src/main/res/layout/filtered_recyclerview_settings_control.xml b/WordPress/src/main/res/layout/filtered_recyclerview_settings_control.xml
index 606ba8dcc..a98e4a414 100644
--- a/WordPress/src/main/res/layout/filtered_recyclerview_settings_control.xml
+++ b/WordPress/src/main/res/layout/filtered_recyclerview_settings_control.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/btn_edit_tags"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="?android:selectableItemBackground"
     android:contentDescription="@string/reader_menu_tags"
-    android:src="@drawable/reader_settings" />
+    app:srcCompat="@drawable/reader_settings" />
diff --git a/WordPress/src/main/res/layout/home_row.xml b/WordPress/src/main/res/layout/home_row.xml
index a501e486a..0200e3925 100644
--- a/WordPress/src/main/res/layout/home_row.xml
+++ b/WordPress/src/main/res/layout/home_row.xml
@@ -1,4 +1,5 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="?android:selectableItemBackground"
@@ -12,7 +13,7 @@
         android:layout_marginTop="12dip"
         android:gravity="center|center"
         android:scaleType="centerCrop"
-        android:src="@mipmap/app_icon" />
+        app:srcCompat="@mipmap/app_icon" />
 
     <LinearLayout
         android:layout_width="fill_parent"
diff --git a/WordPress/src/main/res/layout/list_editor.xml b/WordPress/src/main/res/layout/list_editor.xml
index 496aa5ee5..1d7d9dde0 100644
--- a/WordPress/src/main/res/layout/list_editor.xml
+++ b/WordPress/src/main/res/layout/list_editor.xml
@@ -50,7 +50,7 @@
             android:layout_marginBottom="@dimen/fab_margin"
             android:layout_marginRight="@dimen/fab_margin"
             android:layout_marginEnd="@dimen/fab_margin"
-            android:src="@drawable/ic_add_white_24dp"
+            app:srcCompat="@drawable/ic_add_white_24dp"
             android:contentDescription="@string/add"
             app:borderWidth="0dp"
             app:rippleColor="@color/fab_pressed" />
diff --git a/WordPress/src/main/res/layout/me_fragment.xml b/WordPress/src/main/res/layout/me_fragment.xml
index a20c69dd2..7d79edc8e 100644
--- a/WordPress/src/main/res/layout/me_fragment.xml
+++ b/WordPress/src/main/res/layout/me_fragment.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/scroll_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -59,7 +60,7 @@
             <ImageView
                 android:id="@+id/me_my_profile_icon"
                 style="@style/MeListRowIcon"
-                android:src="@drawable/me_icon_my_profile"
+                app:srcCompat="@drawable/me_icon_my_profile"
                 android:contentDescription="@string/my_profile"/>
 
             <org.wordpress.android.widgets.WPTextView
@@ -78,7 +79,7 @@
             <ImageView
                 android:id="@+id/me_account_settings_icon"
                 style="@style/MeListRowIcon"
-                android:src="@drawable/me_icon_account_settings"
+                app:srcCompat="@drawable/me_icon_account_settings"
                 android:contentDescription="@string/me_btn_account_settings"/>
 
             <org.wordpress.android.widgets.WPTextView
@@ -97,7 +98,7 @@
             <ImageView
                 android:id="@+id/me_app_settings_icon"
                 style="@style/MeListRowIcon"
-                android:src="@drawable/me_icon_app_settings"
+                app:srcCompat="@drawable/me_icon_app_settings"
                 android:contentDescription="@string/me_btn_app_settings"/>
 
             <org.wordpress.android.widgets.WPTextView
@@ -116,7 +117,7 @@
             <ImageView
                 android:id="@+id/me_notifications_icon"
                 style="@style/MeListRowIcon"
-                android:src="@drawable/me_icon_notifications"
+                app:srcCompat="@drawable/me_icon_notifications"
                 android:contentDescription="@string/notification_settings"/>
 
             <org.wordpress.android.widgets.WPTextView
@@ -136,7 +137,7 @@
             <ImageView
                 android:id="@+id/me_support_icon"
                 style="@style/MeListRowIcon"
-                android:src="@drawable/me_icon_support"
+                app:srcCompat="@drawable/me_icon_support"
                 android:contentDescription="@string/me_btn_support"/>
 
             <org.wordpress.android.widgets.WPAutoResizeTextView
@@ -155,7 +156,7 @@
             <ImageView
                 android:id="@+id/me_login_logout_icon"
                 style="@style/MeListRowIcon"
-                android:src="@drawable/me_icon_login_logout"
+                app:srcCompat="@drawable/me_icon_login_logout"
                 android:contentDescription="@string/me_btn_login_logout"/>
 
             <org.wordpress.android.widgets.WPAutoResizeTextView
diff --git a/WordPress/src/main/res/layout/media_gallery_item.xml b/WordPress/src/main/res/layout/media_gallery_item.xml
index e21b2708e..d87a91499 100644
--- a/WordPress/src/main/res/layout/media_gallery_item.xml
+++ b/WordPress/src/main/res/layout/media_gallery_item.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/media_grid_frame_layout"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content" >
+    android:layout_height="wrap_content">
 
     <FrameLayout
         android:id="@+id/drag_handle"
@@ -13,7 +14,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="8dp"
-            android:src="@drawable/gallery_tablet_move_file" />
+            app:srcCompat="@drawable/gallery_tablet_move_file" />
     </FrameLayout>
 
     <com.android.volley.toolbox.NetworkImageView
diff --git a/WordPress/src/main/res/layout/my_site_fragment.xml b/WordPress/src/main/res/layout/my_site_fragment.xml
index b51a14245..68a0e6ccf 100644
--- a/WordPress/src/main/res/layout/my_site_fragment.xml
+++ b/WordPress/src/main/res/layout/my_site_fragment.xml
@@ -98,7 +98,7 @@
                 <ImageView
                     android:id="@+id/my_site_view_site_icon"
                     style="@style/MySiteListRowIcon"
-                    android:src="@drawable/my_site_icon_view_site" />
+                    app:srcCompat="@drawable/my_site_icon_view_site" />
 
                 <org.wordpress.android.widgets.WPTextView
                     android:id="@+id/my_site_view_site_text_view"
@@ -116,7 +116,7 @@
                 <ImageView
                     android:id="@+id/my_site_stats_icon"
                     style="@style/MySiteListRowIcon"
-                    android:src="@drawable/my_site_icon_stats" />
+                    app:srcCompat="@drawable/my_site_icon_stats" />
 
                 <org.wordpress.android.widgets.WPTextView
                     android:id="@+id/my_site_stats_text_view"
@@ -134,7 +134,7 @@
                 <ImageView
                     android:id="@+id/my_site_plan_icon"
                     style="@style/MySiteListRowIcon"
-                    android:src="@drawable/gridicons_clipboard" />
+                    app:srcCompat="@drawable/gridicons_clipboard" />
 
                 <org.wordpress.android.widgets.WPTextView
                     android:id="@+id/my_site_plan_text_view"
@@ -177,7 +177,7 @@
                 <ImageView
                     android:id="@+id/my_site_blog_posts_icon"
                     style="@style/MySiteListRowIcon"
-                    android:src="@drawable/my_site_icon_posts" />
+                    app:srcCompat="@drawable/my_site_icon_posts" />
 
                 <org.wordpress.android.widgets.WPTextView
                     android:id="@+id/my_site_blog_posts_text_view"
@@ -195,7 +195,7 @@
                 <ImageView
                     android:id="@+id/my_site_media_icon"
                     style="@style/MySiteListRowIcon"
-                    android:src="@drawable/my_site_icon_media" />
+                    app:srcCompat="@drawable/my_site_icon_media" />
 
                 <org.wordpress.android.widgets.WPTextView
                     android:id="@+id/my_site_media_text_view"
@@ -213,7 +213,7 @@
                 <ImageView
                     android:id="@+id/my_site_pages_icon"
                     style="@style/MySiteListRowIcon"
-                    android:src="@drawable/my_site_icon_pages" />
+                    app:srcCompat="@drawable/my_site_icon_pages" />
 
                 <org.wordpress.android.widgets.WPTextView
                     android:id="@+id/my_site_pages_text_view"
@@ -231,7 +231,7 @@
                 <ImageView
                     android:id="@+id/my_site_comments_icon"
                     style="@style/MySiteListRowIcon"
-                    android:src="@drawable/my_site_icon_comments" />
+                    app:srcCompat="@drawable/my_site_icon_comments" />
 
                 <org.wordpress.android.widgets.WPTextView
                     android:id="@+id/my_site_comments_text_view"
@@ -262,7 +262,7 @@
                 <ImageView
                     android:id="@+id/my_site_themes_icon"
                     style="@style/MySiteListRowIcon"
-                    android:src="@drawable/my_site_icon_themes" />
+                    app:srcCompat="@drawable/my_site_icon_themes" />
 
                 <org.wordpress.android.widgets.WPTextView
                     android:id="@+id/my_site_themes_text_view"
@@ -293,7 +293,7 @@
                 <ImageView
                     android:id="@+id/my_site_settings_icon"
                     style="@style/MySiteListRowIcon"
-                    android:src="@drawable/my_site_icon_settings" />
+                    app:srcCompat="@drawable/my_site_icon_settings" />
 
                 <org.wordpress.android.widgets.WPTextView
                     android:id="@+id/my_site_settings_text_view"
@@ -328,7 +328,7 @@
                     <ImageView
                         android:id="@+id/my_site_view_admin_icon"
                         style="@style/MySiteListRowIcon"
-                        android:src="@drawable/my_site_icon_view_admin" />
+                        app:srcCompat="@drawable/my_site_icon_view_admin" />
 
                     <org.wordpress.android.widgets.WPTextView
                         android:id="@+id/my_site_view_admin_text_view"
@@ -366,7 +366,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:src="@drawable/my_site_no_sites_drake" />
+            app:srcCompat="@drawable/my_site_no_sites_drake" />
 
         <org.wordpress.android.widgets.WPTextView
             android:layout_width="wrap_content"
@@ -425,7 +425,7 @@
             android:layout_gravity="end|bottom"
             android:layout_marginBottom="@dimen/fab_margin"
             android:layout_marginRight="@dimen/fab_margin"
-            android:src="@drawable/gridicon_create_light"
+            app:srcCompat="@drawable/gridicon_create_light"
             android:contentDescription="@string/new_post"
             app:borderWidth="0dp"
             app:rippleColor="@color/fab_pressed" />
diff --git a/WordPress/src/main/res/layout/new_account_user_fragment_screen.xml b/WordPress/src/main/res/layout/new_account_user_fragment_screen.xml
index 8344e7cde..eb0876d58 100644
--- a/WordPress/src/main/res/layout/new_account_user_fragment_screen.xml
+++ b/WordPress/src/main/res/layout/new_account_user_fragment_screen.xml
@@ -24,7 +24,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/info_button"
-                android:src="@drawable/dashicon_info"
+                app:srcCompat="@drawable/dashicon_info"
                 android:layout_marginRight="16dp"
                 android:layout_marginTop="16dp"
                 android:contentDescription="@string/help"
@@ -68,7 +68,7 @@
                     android:layout_gravity="center_horizontal"
                     android:layout_alignParentEnd="false"
                     android:layout_alignParentStart="false"
-                    android:src="@drawable/dashicon_email"
+                    app:srcCompat="@drawable/dashicon_email"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="10dp"
                     android:tint="@color/grey_darken_10"/>
@@ -98,7 +98,7 @@
                     android:layout_gravity="center_horizontal"
                     android:layout_alignParentEnd="false"
                     android:layout_alignParentStart="false"
-                    android:src="@drawable/dashicon_admin_users"
+                    app:srcCompat="@drawable/dashicon_admin_users"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="10dp"
                     android:tint="@color/grey_darken_10"/>
@@ -127,7 +127,7 @@
                     android:layout_gravity="center_horizontal"
                     android:layout_alignParentEnd="false"
                     android:layout_alignParentStart="false"
-                    android:src="@drawable/dashicon_lock"
+                    app:srcCompat="@drawable/dashicon_lock"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="10dp"
                     android:tint="@color/grey_darken_10"/>
@@ -139,7 +139,7 @@
                     android:layout_gravity="center_horizontal"
                     android:layout_alignParentEnd="false"
                     android:layout_alignParentStart="false"
-                    android:src="@drawable/dashicon_eye_closed"
+                    app:srcCompat="@drawable/dashicon_eye_closed"
                     android:layout_centerVertical="true"
                     android:layout_marginRight="16dp"
                     android:layout_alignParentRight="true"
@@ -192,7 +192,7 @@
                     android:layout_gravity="center_horizontal"
                     android:layout_alignParentEnd="false"
                     android:layout_alignParentStart="false"
-                    android:src="@drawable/dashicon_admin_site"
+                    app:srcCompat="@drawable/dashicon_admin_site"
                     android:layout_centerVertical="true"
                     android:layout_marginLeft="10dp"
                     android:tint="@color/grey_darken_10"/>
diff --git a/WordPress/src/main/res/layout/page_item.xml b/WordPress/src/main/res/layout/page_item.xml
index d3ceb96cf..1d11540d8 100644
--- a/WordPress/src/main/res/layout/page_item.xml
+++ b/WordPress/src/main/res/layout/page_item.xml
@@ -88,7 +88,7 @@
             android:background="?android:selectableItemBackground"
             android:padding="@dimen/margin_medium"
             android:contentDescription="@string/more"
-            android:src="@drawable/ic_action_more" />
+            app:srcCompat="@drawable/ic_action_more" />
     </RelativeLayout>
 
     <View
diff --git a/WordPress/src/main/res/layout/post_list_fragment.xml b/WordPress/src/main/res/layout/post_list_fragment.xml
index de20fc7f1..c68544978 100644
--- a/WordPress/src/main/res/layout/post_list_fragment.xml
+++ b/WordPress/src/main/res/layout/post_list_fragment.xml
@@ -23,7 +23,7 @@
             android:layout_width="112dp"
             android:layout_height="86dp"
             android:layout_marginBottom="@dimen/margin_medium"
-            android:src="@drawable/penandink" />
+            app:srcCompat="@drawable/penandink" />
 
         <org.wordpress.android.widgets.WPTextView
             android:id="@+id/title_empty"
@@ -64,7 +64,7 @@
             android:layout_gravity="end|bottom"
             android:layout_marginBottom="@dimen/fab_margin"
             android:layout_marginRight="@dimen/fab_margin"
-            android:src="@drawable/gridicon_create_light"
+            app:srcCompat="@drawable/gridicon_create_light"
             android:contentDescription="@string/new_post"
             app:borderWidth="0dp"
             app:rippleColor="@color/fab_pressed" />
diff --git a/WordPress/src/main/res/layout/reader_activity_subs.xml b/WordPress/src/main/res/layout/reader_activity_subs.xml
index 4f6b040a0..01c6295ac 100644
--- a/WordPress/src/main/res/layout/reader_activity_subs.xml
+++ b/WordPress/src/main/res/layout/reader_activity_subs.xml
@@ -66,7 +66,7 @@
             android:background="?android:selectableItemBackground"
             android:padding="@dimen/margin_small"
             android:contentDescription="@string/add"
-            android:src="@drawable/reader_follow" />
+            app:srcCompat="@drawable/reader_follow" />
 
     </LinearLayout>
 
diff --git a/WordPress/src/main/res/layout/reader_cardview_post.xml b/WordPress/src/main/res/layout/reader_cardview_post.xml
index a01a426ac..ef46b360b 100644
--- a/WordPress/src/main/res/layout/reader_cardview_post.xml
+++ b/WordPress/src/main/res/layout/reader_cardview_post.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:wp="http://schemas.android.com/apk/res-auto"
@@ -77,7 +78,7 @@
                 android:paddingRight="@dimen/margin_large"
                 android:paddingTop="@dimen/margin_large"
                 android:contentDescription="@string/more"
-                android:src="@drawable/ic_action_more_grey" />
+                app:srcCompat="@drawable/ic_action_more_grey" />
 
         </RelativeLayout>
 
diff --git a/WordPress/src/main/res/layout/reader_empty_view.xml b/WordPress/src/main/res/layout/reader_empty_view.xml
index c20165c3e..96e44f01b 100644
--- a/WordPress/src/main/res/layout/reader_empty_view.xml
+++ b/WordPress/src/main/res/layout/reader_empty_view.xml
@@ -20,7 +20,7 @@
             android:layout_width="86dp"
             android:layout_height="54dp"
             android:layout_alignParentBottom="true"
-            android:src="@drawable/box_with_pages_bottom" />
+            app:srcCompat="@drawable/box_with_pages_bottom" />
 
         <ImageView
             android:id="@+id/empty_tags_box_page3"
@@ -29,7 +29,7 @@
             android:layout_alignParentBottom="true"
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="2dp"
-            android:src="@drawable/box_with_pages_page3" />
+            app:srcCompat="@drawable/box_with_pages_page3" />
 
         <ImageView
             android:id="@+id/empty_tags_box_page2"
@@ -39,7 +39,7 @@
             android:layout_alignParentLeft="true"
             android:layout_marginBottom="15dp"
             android:layout_marginLeft="17dp"
-            android:src="@drawable/box_with_pages_page2" />
+            app:srcCompat="@drawable/box_with_pages_page2" />
 
         <ImageView
             android:id="@+id/empty_tags_box_page1"
@@ -48,14 +48,14 @@
             android:layout_alignParentBottom="true"
             android:layout_alignParentLeft="true"
             android:layout_marginLeft="28dp"
-            android:src="@drawable/box_with_pages_page1" />
+            app:srcCompat="@drawable/box_with_pages_page1" />
 
         <ImageView
             android:id="@+id/empty_tags_box_top"
             android:layout_width="86dp"
             android:layout_height="54dp"
             android:layout_alignParentBottom="true"
-            android:src="@drawable/box_with_pages_top" />
+            app:srcCompat="@drawable/box_with_pages_top" />
     </RelativeLayout>
 
     <org.wordpress.android.widgets.WPTextView
diff --git a/WordPress/src/main/res/layout/reader_follow_button.xml b/WordPress/src/main/res/layout/reader_follow_button.xml
index 52eb76dc5..d6c90544c 100644
--- a/WordPress/src/main/res/layout/reader_follow_button.xml
+++ b/WordPress/src/main/res/layout/reader_follow_button.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/frame_follow_button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -16,7 +17,7 @@
         android:layout_width="@dimen/reader_follow_icon"
         android:layout_height="@dimen/reader_follow_icon"
         android:layout_gravity="center_vertical"
-        android:src="@drawable/reader_follow" />
+        app:srcCompat="@drawable/reader_follow" />
 
     <org.wordpress.android.widgets.WPTextView
         android:id="@+id/text_follow_button"
diff --git a/WordPress/src/main/res/layout/reader_include_comment_box.xml b/WordPress/src/main/res/layout/reader_include_comment_box.xml
index 343cc00b3..831229783 100644
--- a/WordPress/src/main/res/layout/reader_include_comment_box.xml
+++ b/WordPress/src/main/res/layout/reader_include_comment_box.xml
@@ -6,6 +6,7 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/white"
@@ -28,7 +29,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="@dimen/content_margin"
-            android:src="@drawable/ic_action_reply" />
+            app:srcCompat="@drawable/ic_action_reply" />
 
         <org.wordpress.android.widgets.SuggestionAutoCompleteText
             android:id="@+id/edit_comment"
diff --git a/WordPress/src/main/res/layout/reader_listitem_comment.xml b/WordPress/src/main/res/layout/reader_listitem_comment.xml
index 285995cfe..56618f79f 100644
--- a/WordPress/src/main/res/layout/reader_listitem_comment.xml
+++ b/WordPress/src/main/res/layout/reader_listitem_comment.xml
@@ -97,7 +97,7 @@
                     android:layout_gravity="center_vertical"
                     android:layout_marginLeft="@dimen/margin_medium"
                     android:padding="@dimen/margin_extra_small"
-                    android:src="@drawable/ic_action_reply" />
+                    app:srcCompat="@drawable/ic_action_reply" />
 
                 <org.wordpress.android.widgets.WPTextView
                     android:id="@+id/text_comment_reply"
diff --git a/WordPress/src/main/res/layout/reader_listitem_tag.xml b/WordPress/src/main/res/layout/reader_listitem_tag.xml
index f2a1359c4..b62958a1b 100644
--- a/WordPress/src/main/res/layout/reader_listitem_tag.xml
+++ b/WordPress/src/main/res/layout/reader_listitem_tag.xml
@@ -6,6 +6,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:selectableItemBackground"
@@ -33,5 +34,5 @@
         android:background="?android:selectableItemBackground"
         android:padding="@dimen/margin_small"
         android:contentDescription="@string/remove"
-        android:src="@drawable/ic_close_grey600_24dp" />
+        app:srcCompat="@drawable/ic_close_grey600_24dp" />
 </LinearLayout>
diff --git a/WordPress/src/main/res/layout/related_posts_dialog.xml b/WordPress/src/main/res/layout/related_posts_dialog.xml
index b5dda2d20..a46a34026 100644
--- a/WordPress/src/main/res/layout/related_posts_dialog.xml
+++ b/WordPress/src/main/res/layout/related_posts_dialog.xml
@@ -97,7 +97,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="96dp"
                 android:layout_marginTop="4dp"
-                android:src="@drawable/rppreview1" />
+                app:srcCompat="@drawable/rppreview1" />
 
             <org.wordpress.android.widgets.WPTextView
                 android:id="@+id/related_post_title1"
@@ -125,7 +125,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="96dp"
                 android:layout_marginTop="8dp"
-                android:src="@drawable/rppreview2" />
+                app:srcCompat="@drawable/rppreview2" />
 
             <org.wordpress.android.widgets.WPTextView
                 android:id="@+id/related_post_title2"
@@ -153,7 +153,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="96dp"
                 android:layout_marginTop="8dp"
-                android:src="@drawable/rppreview3" />
+                app:srcCompat="@drawable/rppreview3" />
 
             <org.wordpress.android.widgets.WPTextView
                 android:id="@+id/related_post_title3"
diff --git a/WordPress/src/main/res/layout/signin_dialog_fragment.xml b/WordPress/src/main/res/layout/signin_dialog_fragment.xml
index 4df6445ad..35c700bf2 100644
--- a/WordPress/src/main/res/layout/signin_dialog_fragment.xml
+++ b/WordPress/src/main/res/layout/signin_dialog_fragment.xml
@@ -20,7 +20,7 @@
             android:id="@+id/nux_dialog_image"
             android:layout_width="50dp"
             android:layout_height="52dp"
-            android:src="@drawable/nux_icon_wp"
+            app:srcCompat="@drawable/nux_icon_wp"
             android:tint="@color/white"
             android:layout_marginBottom="16dp"/>
 
diff --git a/WordPress/src/main/res/layout/signin_fragment.xml b/WordPress/src/main/res/layout/signin_fragment.xml
index 62ab330c3..235a5c3b6 100644
--- a/WordPress/src/main/res/layout/signin_fragment.xml
+++ b/WordPress/src/main/res/layout/signin_fragment.xml
@@ -32,7 +32,7 @@
                 android:layout_height="wrap_content"
                 android:padding="16dp"
                 android:contentDescription="@string/help"
-                android:src="@drawable/dashicon_info"
+                app:srcCompat="@drawable/dashicon_info"
                 android:tint="@color/blue_dark" />
         </LinearLayout>
 
@@ -55,7 +55,7 @@
                     android:layout_width="50dp"
                     android:layout_height="50dp"
                     android:layout_centerInParent="true"
-                    android:src="@drawable/nux_icon_wp" />
+                    app:srcCompat="@drawable/nux_icon_wp" />
 
                 <ImageView
                     android:id="@+id/info_button_secondary"
@@ -67,7 +67,7 @@
                     android:layout_alignTop="@+id/nux_fragment_icon"
                     android:layout_marginRight="16dp"
                     android:contentDescription="@string/help"
-                    android:src="@drawable/dashicon_info"
+                    app:srcCompat="@drawable/dashicon_info"
                     android:tint="@color/blue_dark" />
             </RelativeLayout>
 
@@ -111,7 +111,7 @@
                     android:layout_centerVertical="true"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginLeft="10dp"
-                    android:src="@drawable/dashicon_admin_users"
+                    app:srcCompat="@drawable/dashicon_admin_users"
                     android:tint="@color/grey_darken_10" />
             </RelativeLayout>
 
@@ -141,7 +141,7 @@
                     android:layout_centerVertical="true"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginLeft="10dp"
-                    android:src="@drawable/dashicon_lock"
+                    app:srcCompat="@drawable/dashicon_lock"
                     android:tint="@color/grey_darken_10" />
 
                 <ImageView
@@ -154,7 +154,7 @@
                     android:layout_centerVertical="true"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginRight="16dp"
-                    android:src="@drawable/dashicon_eye_closed"
+                    app:srcCompat="@drawable/dashicon_eye_closed"
                     android:tint="@color/nux_eye_icon_color_closed" />
             </RelativeLayout>
 
@@ -204,7 +204,7 @@
                     android:layout_centerVertical="true"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginLeft="10dp"
-                    android:src="@drawable/dashicon_admin_site"
+                    app:srcCompat="@drawable/dashicon_admin_site"
                     android:tint="@color/grey_darken_10" />
             </RelativeLayout>
             <RelativeLayout
diff --git a/WordPress/src/main/res/layout/stats_insights_all_time_item.xml b/WordPress/src/main/res/layout/stats_insights_all_time_item.xml
index 5bec140f6..cd59bef7e 100644
--- a/WordPress/src/main/res/layout/stats_insights_all_time_item.xml
+++ b/WordPress/src/main/res/layout/stats_insights_all_time_item.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:baselineAligned="false"
-              android:padding="@dimen/margin_extra_large"
-              android:orientation="vertical">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:baselineAligned="false"
+    android:padding="@dimen/margin_extra_large"
+    android:orientation="vertical">
 
     <!-- First row -->
     <LinearLayout
@@ -33,7 +34,7 @@
                     android:layout_height="12dp"
                     android:layout_marginRight="3dp"
                     android:layout_marginEnd="3dp"
-                    android:src="@drawable/my_site_icon_posts" />
+                    app:srcCompat="@drawable/my_site_icon_posts" />
 
                 <org.wordpress.android.widgets.WPAutoResizeTextView
                     style="@style/StatsInsightsLabel"
@@ -78,7 +79,7 @@
                     android:layout_height="12dp"
                     android:layout_marginRight="3dp"
                     android:layout_marginEnd="3dp"
-                    android:src="@drawable/stats_icon_views" />
+                    app:srcCompat="@drawable/stats_icon_views" />
 
                 <org.wordpress.android.widgets.WPAutoResizeTextView
                     style="@style/StatsInsightsLabel"
@@ -130,7 +131,7 @@
                     android:layout_height="12dp"
                     android:layout_marginRight="3dp"
                     android:layout_marginEnd="3dp"
-                    android:src="@drawable/stats_icon_visitors" />
+                    app:srcCompat="@drawable/stats_icon_visitors" />
 
                 <org.wordpress.android.widgets.WPAutoResizeTextView
                     style="@style/StatsInsightsLabel"
@@ -175,7 +176,7 @@
                     android:layout_height="12dp"
                     android:layout_marginRight="3dp"
                     android:layout_marginEnd="3dp"
-                    android:src="@drawable/stats_icon_trophy" />
+                    app:srcCompat="@drawable/stats_icon_trophy" />
 
                 <org.wordpress.android.widgets.WPAutoResizeTextView
                     style="@style/StatsInsightsLabel"
diff --git a/WordPress/src/main/res/layout/stats_list_cell.xml b/WordPress/src/main/res/layout/stats_list_cell.xml
index 0fb34cc53..00e8d206e 100644
--- a/WordPress/src/main/res/layout/stats_list_cell.xml
+++ b/WordPress/src/main/res/layout/stats_list_cell.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
@@ -24,7 +25,7 @@
             android:layout_marginRight="10dp"
             android:layout_marginEnd="10dp"
             android:visibility="gone"
-            android:src="@drawable/stats_link" />
+            app:srcCompat="@drawable/stats_link" />
 
         <ImageView
             android:id="@+id/stats_list_cell_chevron"
@@ -33,7 +34,7 @@
             android:layout_marginRight="@dimen/margin_large"
             android:layout_marginEnd="@dimen/margin_large"
             android:visibility="gone"
-            android:src="@drawable/stats_chevron_right" />
+            app:srcCompat="@drawable/stats_chevron_right" />
 
         <org.wordpress.android.widgets.WPNetworkImageView
             android:id="@+id/stats_list_cell_image"
@@ -73,7 +74,7 @@
             android:paddingLeft="@dimen/margin_small"
             android:paddingRight="@dimen/margin_small"
             android:contentDescription="@string/more"
-            android:src="@drawable/ic_action_more" />
+            app:srcCompat="@drawable/ic_action_more" />
 
         <LinearLayout
             android:id="@+id/stats_list_cell_total_container"
diff --git a/WordPress/src/main/res/layout/stats_visitors_and_views_fragment.xml b/WordPress/src/main/res/layout/stats_visitors_and_views_fragment.xml
index e3d587c96..c563ce6da 100644
--- a/WordPress/src/main/res/layout/stats_visitors_and_views_fragment.xml
+++ b/WordPress/src/main/res/layout/stats_visitors_and_views_fragment.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:orientation="vertical"
-              android:layout_gravity="center"
-              android:gravity="center">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_gravity="center"
+    android:gravity="center">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -85,7 +86,7 @@
                 <ImageView
                     android:layout_width="24dp"
                     android:layout_height="24dp"
-                    android:src="@drawable/stats_icon_info"
+                    app:srcCompat="@drawable/stats_icon_info"
                     android:paddingEnd="@dimen/margin_medium"
                     android:paddingRight="@dimen/margin_medium"/>
                 <TextView
diff --git a/WordPress/src/main/res/layout/stats_visitors_and_views_tab.xml b/WordPress/src/main/res/layout/stats_visitors_and_views_tab.xml
index c22ff6f2c..dc1bc7685 100644
--- a/WordPress/src/main/res/layout/stats_visitors_and_views_tab.xml
+++ b/WordPress/src/main/res/layout/stats_visitors_and_views_tab.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_height="match_parent"
     android:layout_width="0dp"
     android:layout_weight="1"
@@ -28,7 +29,7 @@
                 android:layout_height="12dp"
                 android:layout_marginRight="3dp"
                 android:layout_marginEnd="3dp"
-                android:src="@drawable/ic_like" />
+                app:srcCompat="@drawable/ic_like" />
 
             <org.wordpress.android.widgets.WPAutoResizeTextView
                 android:id="@+id/stats_visitors_and_views_tab_label"
diff --git a/WordPress/src/main/res/layout/stats_widget_layout.xml b/WordPress/src/main/res/layout/stats_widget_layout.xml
index f96166c38..0b993e2f5 100644
--- a/WordPress/src/main/res/layout/stats_widget_layout.xml
+++ b/WordPress/src/main/res/layout/stats_widget_layout.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/stats_widget_outer_container"
     android:background="@drawable/stats_widget_background"
     android:layout_width="match_parent"
@@ -19,7 +20,7 @@
         <ImageView
             android:layout_width="@dimen/stats_widget_icon_size"
             android:layout_height="@dimen/stats_widget_icon_size"
-            android:src="@drawable/stats_widget_header_icon" />
+            app:srcCompat="@drawable/stats_widget_header_icon" />
 
         <TextView
             android:id="@+id/blog_title"
@@ -71,7 +72,7 @@
                     android:layout_height="@dimen/stats_widget_image_layout_size"
                     android:layout_marginRight="@dimen/stats_widget_image_layout_margin"
                     android:layout_marginEnd="@dimen/stats_widget_image_layout_margin"
-                    android:src="@drawable/stats_icon_views" />
+                    app:srcCompat="@drawable/stats_icon_views" />
 
                 <TextView
                     android:textColor="@color/grey_dark"
@@ -117,7 +118,7 @@
                     android:layout_height="@dimen/stats_widget_image_layout_size"
                     android:layout_marginRight="@dimen/stats_widget_image_layout_margin"
                     android:layout_marginEnd="@dimen/stats_widget_image_layout_margin"
-                    android:src="@drawable/stats_icon_visitors" />
+                    app:srcCompat="@drawable/stats_icon_visitors" />
 
                 <TextView
                     android:textColor="@color/grey_dark"
@@ -163,7 +164,7 @@
                     android:layout_height="@dimen/stats_widget_image_layout_size"
                     android:layout_marginRight="@dimen/stats_widget_image_layout_margin"
                     android:layout_marginEnd="@dimen/stats_widget_image_layout_margin"
-                    android:src="@drawable/stats_icon_likes" />
+                    app:srcCompat="@drawable/stats_icon_likes" />
 
                 <TextView
                     android:textColor="@color/grey_dark"
@@ -209,7 +210,7 @@
                     android:layout_height="@dimen/stats_widget_image_layout_size"
                     android:layout_marginRight="@dimen/stats_widget_image_layout_margin"
                     android:layout_marginEnd="@dimen/stats_widget_image_layout_margin"
-                    android:src="@drawable/stats_icon_comments" />
+                    app:srcCompat="@drawable/stats_icon_comments" />
 
                 <TextView
                     android:textColor="@color/grey_dark"
diff --git a/WordPress/src/main/res/layout/theme_browser_fragment.xml b/WordPress/src/main/res/layout/theme_browser_fragment.xml
index 9a9d61fb7..94e53d257 100644
--- a/WordPress/src/main/res/layout/theme_browser_fragment.xml
+++ b/WordPress/src/main/res/layout/theme_browser_fragment.xml
@@ -55,7 +55,7 @@
             android:id="@+id/drake_empty_results"
             android:layout_width="@dimen/drake_themes_width"
             android:layout_height="wrap_content"
-            android:src="@drawable/drake_empty_results"
+            app:srcCompat="@drawable/drake_empty_results"
             android:adjustViewBounds="true"
             android:layout_centerHorizontal="true"
             android:contentDescription="@string/theme_no_search_result_found" />
diff --git a/WordPress/src/main/res/layout/theme_grid_cardview_header.xml b/WordPress/src/main/res/layout/theme_grid_cardview_header.xml
index d575d06c4..fd125f054 100644
--- a/WordPress/src/main/res/layout/theme_grid_cardview_header.xml
+++ b/WordPress/src/main/res/layout/theme_grid_cardview_header.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -69,7 +70,7 @@
                         android:layout_margin="@dimen/margin_none"
                         android:adjustViewBounds="true"
                         android:contentDescription="@string/customize"
-                        android:src="@drawable/ic_theme_customize" />
+                        app:srcCompat="@drawable/ic_theme_customize" />
 
                     <org.wordpress.android.widgets.WPTextView
                         android:layout_width="wrap_content"
@@ -100,7 +101,7 @@
                         android:layout_margin="@dimen/margin_none"
                         android:adjustViewBounds="true"
                         android:contentDescription="@string/details"
-                        android:src="@drawable/ic_theme_details" />
+                        app:srcCompat="@drawable/ic_theme_details" />
 
                     <org.wordpress.android.widgets.WPTextView
                         android:layout_width="wrap_content"
@@ -131,7 +132,7 @@
                         android:layout_margin="@dimen/margin_none"
                         android:adjustViewBounds="true"
                         android:contentDescription="@string/support"
-                        android:src="@drawable/ic_theme_support" />
+                        app:srcCompat="@drawable/ic_theme_support" />
 
                     <org.wordpress.android.widgets.WPTextView
                         android:layout_width="wrap_content"
diff --git a/WordPress/src/main/res/layout/theme_grid_cardview_header_search.xml b/WordPress/src/main/res/layout/theme_grid_cardview_header_search.xml
index c36bc70f0..686795343 100644
--- a/WordPress/src/main/res/layout/theme_grid_cardview_header_search.xml
+++ b/WordPress/src/main/res/layout/theme_grid_cardview_header_search.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -35,7 +36,7 @@
                 android:layout_height="@dimen/theme_browser_more_button_height"
                 android:layout_marginLeft="@dimen/theme_browser_cardview_margin_large"
                 android:layout_centerVertical="true"
-                android:src="@drawable/ic_search"
+                app:srcCompat="@drawable/ic_search"
                 android:background="?android:attr/selectableItemBackground"
                 android:contentDescription="@string/search"
                 android:layout_alignParentLeft="true" />
diff --git a/WordPress/src/main/res/layout/theme_grid_item.xml b/WordPress/src/main/res/layout/theme_grid_item.xml
index 6b168cef3..be04a9d84 100644
--- a/WordPress/src/main/res/layout/theme_grid_item.xml
+++ b/WordPress/src/main/res/layout/theme_grid_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/tools"
     android:id="@+id/theme_grid_card_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -95,7 +96,7 @@
                         android:layout_width="@dimen/theme_browser_more_button_width"
                         android:layout_height="@dimen/theme_browser_more_button_height"
                         android:padding="@dimen/theme_browser_more_button_padding"
-                        android:src="@drawable/ic_action_more_grey"
+                        app:srcCompat="@drawable/ic_action_more_grey"
                         android:background="?android:attr/selectableItemBackground"
                         android:adjustViewBounds="true"
                         android:contentDescription="@string/button_more" />
diff --git a/libs/editor/WordPressEditor/src/main/res/layout/dialog_image_options.xml b/libs/editor/WordPressEditor/src/main/res/layout/dialog_image_options.xml
index ead7e7653..087bb1ba7 100644
--- a/libs/editor/WordPressEditor/src/main/res/layout/dialog_image_options.xml
+++ b/libs/editor/WordPressEditor/src/main/res/layout/dialog_image_options.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@android:color/white">
@@ -123,7 +123,7 @@
                 android:id="@+id/image_icon"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:src="@drawable/media_icon_32dp"/>
+                app:srcCompat="@drawable/media_icon_32dp"/>
 
             <SeekBar
                 android:id="@+id/image_width_seekbar"
diff --git a/libs/editor/WordPressEditor/src/main/res/layout/format_bar.xml b/libs/editor/WordPressEditor/src/main/res/layout/format_bar.xml
index 5fb9c4fab..1fa988beb 100644
--- a/libs/editor/WordPressEditor/src/main/res/layout/format_bar.xml
+++ b/libs/editor/WordPressEditor/src/main/res/layout/format_bar.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
     android:layout_height="@dimen/format_bar_height"
     android:layout_gravity="bottom"
@@ -102,7 +102,7 @@
         </HorizontalScrollView>
 
         <ImageView
-            android:src="@drawable/format_bar_chevron"
+            app:srcCompat="@drawable/format_bar_chevron"
             android:background="@android:color/transparent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"