diff --git a/ring-android/app/src/main/res/layout/activity_launch.xml b/ring-android/app/src/main/res/layout/activity_launch.xml
index c948474..29f6bc0 100644
--- a/ring-android/app/src/main/res/layout/activity_launch.xml
+++ b/ring-android/app/src/main/res/layout/activity_launch.xml
@@ -1,5 +1,6 @@
 <?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:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/color_primary_light"
@@ -12,7 +13,7 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:contentDescription="@string/app_name"
-        android:src="@drawable/ic_logo_ring_white" />
+        app:srcCompat="@drawable/ic_logo_ring_white" />
 
     <ProgressBar
         android:id="@+id/loading_indicator"
diff --git a/ring-android/app/src/main/res/layout/camerapicker.xml b/ring-android/app/src/main/res/layout/camerapicker.xml
index 5539f23..0736652 100644
--- a/ring-android/app/src/main/res/layout/camerapicker.xml
+++ b/ring-android/app/src/main/res/layout/camerapicker.xml
@@ -17,8 +17,8 @@
         android:layout_centerHorizontal="true"
         android:contentDescription="@string/action_call_decline"
         android:padding="16dp"
-        android:src="@drawable/ic_photo_camera"
         app:backgroundTint="@color/holo_green_dark"
         app:rippleColor="@android:color/white"
+        app:srcCompat="@drawable/ic_photo_camera"
         app:useCompatPadding="true" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/frag_account_migration.xml b/ring-android/app/src/main/res/layout/frag_account_migration.xml
index 3ed73bc..3cae936 100644
--- a/ring-android/app/src/main/res/layout/frag_account_migration.xml
+++ b/ring-android/app/src/main/res/layout/frag_account_migration.xml
@@ -54,7 +54,7 @@
                     android:layout_alignParentTop="true"
                     android:layout_margin="16dp"
                     android:contentDescription="@string/app_name"
-                    android:src="@drawable/ring_logo_48dp" />
+                    app:srcCompat="@drawable/ring_logo_48dp" />
 
                 <TextView
                     android:id="@+id/ring_acc_title_txt"
diff --git a/ring-android/app/src/main/res/layout/frag_settings.xml b/ring-android/app/src/main/res/layout/frag_settings.xml
index 05df998..62b4fca 100644
--- a/ring-android/app/src/main/res/layout/frag_settings.xml
+++ b/ring-android/app/src/main/res/layout/frag_settings.xml
@@ -65,7 +65,7 @@
                             android:layout_height="wrap_content"
                             android:layout_gravity="start"
                             android:contentDescription="@string/pref_mobileData_summary"
-                            android:src="@drawable/ic_perm_data_setting_black_24dp" />
+                            app:srcCompat="@drawable/ic_perm_data_setting_black_24dp" />
 
                     </LinearLayout>
 
diff --git a/ring-android/app/src/main/res/layout/item_contact.xml b/ring-android/app/src/main/res/layout/item_contact.xml
index e06a493..f468901 100644
--- a/ring-android/app/src/main/res/layout/item_contact.xml
+++ b/ring-android/app/src/main/res/layout/item_contact.xml
@@ -38,7 +38,7 @@
         android:layout_marginRight="16dp"
         android:contentDescription="@string/contact_picture_description"
         android:scaleType="centerCrop"
-        android:src="@drawable/ic_contact_picture" />
+        app:srcCompat="@drawable/ic_contact_picture" />
 
     <TextView
         android:id="@+id/display_name"
diff --git a/ring-android/app/src/main/res/layout/item_contact_blacklist.xml b/ring-android/app/src/main/res/layout/item_contact_blacklist.xml
index 7e6623b..928d3fd 100644
--- a/ring-android/app/src/main/res/layout/item_contact_blacklist.xml
+++ b/ring-android/app/src/main/res/layout/item_contact_blacklist.xml
@@ -16,7 +16,7 @@
         android:layout_marginRight="16dp"
         android:contentDescription="@string/contact_picture_description"
         android:scaleType="centerCrop"
-        android:src="@drawable/ic_contact_picture" />
+        app:srcCompat="@drawable/ic_contact_picture" />
 
     <TextView
         android:id="@+id/display_name"
diff --git a/ring-android/app/src/main/res/layout/item_smartlist.xml b/ring-android/app/src/main/res/layout/item_smartlist.xml
index c6b0f59..97b6e9e 100644
--- a/ring-android/app/src/main/res/layout/item_smartlist.xml
+++ b/ring-android/app/src/main/res/layout/item_smartlist.xml
@@ -19,6 +19,7 @@
 -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/call_entry"
     android:layout_width="match_parent"
@@ -41,7 +42,7 @@
         android:paddingEnd="4dp"
         android:paddingStart="0dp"
         android:scaleType="fitCenter"
-        android:src="@drawable/ic_contact_picture" />
+        app:srcCompat="@drawable/ic_contact_picture" />
 
     <ImageView
         android:id="@+id/online"
@@ -49,7 +50,7 @@
         android:layout_height="22dp"
         android:layout_alignBottom="@+id/photo"
         android:layout_alignEnd="@+id/photo"
-        android:src="@drawable/ic_online_indicator" />
+        app:srcCompat="@drawable/ic_online_indicator" />
 
     <RelativeLayout
         android:layout_width="match_parent"
diff --git a/ring-android/app/src/main/res/layout/tv_titleview.xml b/ring-android/app/src/main/res/layout/tv_titleview.xml
index 10ea79e..2d686d9 100644
--- a/ring-android/app/src/main/res/layout/tv_titleview.xml
+++ b/ring-android/app/src/main/res/layout/tv_titleview.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <android.support.v17.leanback.widget.SearchOrbView
         android:id="@+id/title_orb"
@@ -53,5 +54,5 @@
         android:layout_gravity="center_vertical|end"
         android:layout_marginEnd="24dp"
         android:padding="6dp"
-        android:src="@drawable/ic_contact_picture" />
+        app:srcCompat="@drawable/ic_contact_picture" />
 </merge>
\ No newline at end of file