diff --git a/app/src/main/res/layout/dialog_feed_group_create.xml b/app/src/main/res/layout/dialog_feed_group_create.xml
index 364a6c891..2bd0e1141 100644
--- a/app/src/main/res/layout/dialog_feed_group_create.xml
+++ b/app/src/main/res/layout/dialog_feed_group_create.xml
@@ -182,7 +182,7 @@
             android:layout_centerVertical="true"
             android:minWidth="0dp"
             android:scaleType="centerInside"
-            android:src="?attr/ic_delete"
+            app:srcCompat="?attr/ic_delete"
             android:visibility="gone"
             tools:ignore="ContentDescription"
             tools:visibility="visible" />
diff --git a/app/src/main/res/layout/dialog_playlists.xml b/app/src/main/res/layout/dialog_playlists.xml
index 0c691ed6a..eebeb2951 100644
--- a/app/src/main/res/layout/dialog_playlists.xml
+++ b/app/src/main/res/layout/dialog_playlists.xml
@@ -1,8 +1,8 @@
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <RelativeLayout
         android:id="@+id/newPlaylist"
@@ -19,7 +19,7 @@
             android:layout_centerVertical="true"
             android:layout_marginLeft="12dp"
             android:layout_marginRight="12dp"
-            android:src="?attr/ic_playlist_add"
+            app:srcCompat="?attr/ic_playlist_add"
             tools:ignore="ContentDescription,RtlHardcoded"/>
 
         <TextView
diff --git a/app/src/main/res/layout/feed_group_reorder_item.xml b/app/src/main/res/layout/feed_group_reorder_item.xml
index cb8c3b975..1b77c391f 100644
--- a/app/src/main/res/layout/feed_group_reorder_item.xml
+++ b/app/src/main/res/layout/feed_group_reorder_item.xml
@@ -56,7 +56,7 @@
             android:paddingTop="12dp"
             android:paddingRight="16dp"
             android:paddingBottom="12dp"
-            android:src="?attr/ic_drag_handle"
+            app:srcCompat="?attr/ic_drag_handle"
             tools:ignore="ContentDescription,RtlHardcoded" />
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_instance.xml b/app/src/main/res/layout/item_instance.xml
index 05af7ac00..587712e61 100644
--- a/app/src/main/res/layout/item_instance.xml
+++ b/app/src/main/res/layout/item_instance.xml
@@ -77,7 +77,7 @@
             android:paddingLeft="16dp"
             android:paddingRight="10dp"
             android:paddingTop="12dp"
-            android:src="?attr/ic_drag_handle"
+            app:srcCompat="?attr/ic_drag_handle"
             tools:ignore="ContentDescription,RtlHardcoded"/>
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_search_suggestion.xml b/app/src/main/res/layout/item_search_suggestion.xml
index b45de164e..d93032cc5 100644
--- a/app/src/main/res/layout/item_search_suggestion.xml
+++ b/app/src/main/res/layout/item_search_suggestion.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal">
 
     <LinearLayout
@@ -63,7 +63,7 @@
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:layout_gravity="center"
-            android:src="?attr/ic_search_add"
+            app:srcCompat="?attr/ic_search_add"
             tools:ignore="ContentDescription,RtlHardcoded"/>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/list_choose_tabs.xml b/app/src/main/res/layout/list_choose_tabs.xml
index 22f94e925..2c13e886b 100644
--- a/app/src/main/res/layout/list_choose_tabs.xml
+++ b/app/src/main/res/layout/list_choose_tabs.xml
@@ -57,7 +57,7 @@
             android:paddingLeft="16dp"
             android:paddingRight="16dp"
             android:paddingTop="12dp"
-            android:src="?attr/ic_drag_handle"
+            app:srcCompat="?attr/ic_drag_handle"
             tools:ignore="ContentDescription,RtlHardcoded"/>
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_comments_item.xml b/app/src/main/res/layout/list_comments_item.xml
index b468ca56b..1cbafdb6b 100644
--- a/app/src/main/res/layout/list_comments_item.xml
+++ b/app/src/main/res/layout/list_comments_item.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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:id="@+id/itemRoot"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -56,7 +57,7 @@
         android:layout_below="@id/itemCommentContentView"
         android:layout_toRightOf="@+id/itemThumbnailView"
         android:contentDescription="@string/detail_likes_img_view_description"
-        android:src="?attr/ic_thumb_up" />
+        app:srcCompat="?attr/ic_thumb_up" />
 
     <TextView
         android:id="@+id/detail_thumbs_up_count_view"
@@ -82,7 +83,7 @@
         android:layout_marginLeft="12dp"
         android:layout_toRightOf="@id/detail_thumbs_up_count_view"
         android:contentDescription="@string/detail_dislikes_img_view_description"
-        android:src="?attr/thumbs_down"
+        app:srcCompat="?attr/thumbs_down"
         tools:ignore="RtlHardcoded" />
 
     <TextView
diff --git a/app/src/main/res/layout/list_comments_mini_item.xml b/app/src/main/res/layout/list_comments_mini_item.xml
index 1dc1bca5d..d8cee3323 100644
--- a/app/src/main/res/layout/list_comments_mini_item.xml
+++ b/app/src/main/res/layout/list_comments_mini_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/itemRoot"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -38,7 +38,7 @@
         android:layout_below="@id/itemCommentContentView"
         android:layout_toRightOf="@+id/itemThumbnailView"
         android:contentDescription="@string/detail_likes_img_view_description"
-        android:src="?attr/ic_thumb_up" />
+        app:srcCompat="?attr/ic_thumb_up" />
 
     <TextView
         android:id="@+id/detail_thumbs_up_count_view"
@@ -63,7 +63,7 @@
         android:layout_marginLeft="12dp"
         android:layout_toRightOf="@id/detail_thumbs_up_count_view"
         android:contentDescription="@string/detail_dislikes_img_view_description"
-        android:src="?attr/thumbs_down"
+        app:srcCompat="?attr/thumbs_down"
         tools:ignore="RtlHardcoded" />
 
     <TextView
diff --git a/app/src/main/res/layout/list_playlist_grid_item.xml b/app/src/main/res/layout/list_playlist_grid_item.xml
index 949b1159b..82dc0be11 100644
--- a/app/src/main/res/layout/list_playlist_grid_item.xml
+++ b/app/src/main/res/layout/list_playlist_grid_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/itemRoot"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
 		android:layout_alignRight="@id/itemThumbnailView"
 		android:layout_alignTop="@id/itemThumbnailView"
 		android:background="@color/playlist_stream_count_background_color"
-		android:drawableTop="@drawable/ic_playlist_play_white_24dp"
+		app:drawableTopCompat="@drawable/ic_playlist_play_white_24dp"
 		android:gravity="center"
 		android:paddingBottom="14dp"
 		android:paddingTop="16dp"
diff --git a/app/src/main/res/layout/list_playlist_item.xml b/app/src/main/res/layout/list_playlist_item.xml
index 57a3cbef9..2aeefef38 100644
--- a/app/src/main/res/layout/list_playlist_item.xml
+++ b/app/src/main/res/layout/list_playlist_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/itemRoot"
     android:layout_width="match_parent"
     android:layout_height="@dimen/video_item_search_height"
@@ -31,7 +31,7 @@
         android:layout_alignRight="@id/itemThumbnailView"
         android:layout_alignTop="@id/itemThumbnailView"
         android:background="@color/playlist_stream_count_background_color"
-        android:drawableTop="@drawable/ic_playlist_play_white_24dp"
+        app:drawableTopCompat="@drawable/ic_playlist_play_white_24dp"
         android:gravity="center"
         android:paddingBottom="14dp"
         android:paddingTop="16dp"
diff --git a/app/src/main/res/layout/list_playlist_mini_item.xml b/app/src/main/res/layout/list_playlist_mini_item.xml
index 7e94678cd..3935d30ca 100644
--- a/app/src/main/res/layout/list_playlist_mini_item.xml
+++ b/app/src/main/res/layout/list_playlist_mini_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/itemRoot"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
         android:layout_alignRight="@id/itemThumbnailView"
         android:layout_alignTop="@id/itemThumbnailView"
         android:background="@color/playlist_stream_count_background_color"
-        android:drawableTop="@drawable/ic_playlist_play_white_24dp"
+        app:drawableTopCompat="@drawable/ic_playlist_play_white_24dp"
         android:gravity="center"
         android:paddingBottom="6dp"
         android:paddingTop="4dp"
diff --git a/app/src/main/res/layout/list_stream_playlist_grid_item.xml b/app/src/main/res/layout/list_stream_playlist_grid_item.xml
index 2a4ffc03e..f96b0eaf7 100644
--- a/app/src/main/res/layout/list_stream_playlist_grid_item.xml
+++ b/app/src/main/res/layout/list_stream_playlist_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:tools="http://schemas.android.com/tools"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:id="@+id/itemRoot"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
@@ -49,7 +50,7 @@
 		android:contentDescription="@string/detail_drag_description"
 		android:paddingLeft="@dimen/video_item_search_image_right_margin"
 		android:scaleType="center"
-		android:src="?attr/ic_drag_handle"
+		app:srcCompat="?attr/ic_drag_handle"
 		tools:ignore="RtlHardcoded,RtlSymmetry" />
 
 	<TextView
diff --git a/app/src/main/res/layout/list_stream_playlist_item.xml b/app/src/main/res/layout/list_stream_playlist_item.xml
index 1f293d5eb..a36d6f0d8 100644
--- a/app/src/main/res/layout/list_stream_playlist_item.xml
+++ b/app/src/main/res/layout/list_stream_playlist_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/itemRoot"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -50,7 +50,7 @@
         android:layout_alignParentRight="true"
         android:paddingLeft="@dimen/video_item_search_image_right_margin"
         android:scaleType="center"
-        android:src="?attr/ic_drag_handle"
+        app:srcCompat="?attr/ic_drag_handle"
         android:contentDescription="@string/detail_drag_description"
         tools:ignore="RtlHardcoded,RtlSymmetry"/>
 
diff --git a/app/src/main/res/layout/mission_item_linear.xml b/app/src/main/res/layout/mission_item_linear.xml
index 1003c6be0..bcfcea8e2 100644
--- a/app/src/main/res/layout/mission_item_linear.xml
+++ b/app/src/main/res/layout/mission_item_linear.xml
@@ -1,5 +1,6 @@
 <RelativeLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_height="wrap_content"
 	android:layout_width="match_parent">
 	
@@ -69,7 +70,7 @@
 			android:layout_alignParentRight="true"
 			android:layout_centerVertical="true"
 			android:layout_marginRight="4dp"
-			android:src="@drawable/ic_more_vert_white_24dp"
+			app:srcCompat="@drawable/ic_more_vert_white_24dp"
 			android:scaleType="centerInside"
             android:contentDescription="TODO" />
 
diff --git a/app/src/main/res/layout/player_popup_close_overlay.xml b/app/src/main/res/layout/player_popup_close_overlay.xml
index 2cc04ec09..cba06874e 100644
--- a/app/src/main/res/layout/player_popup_close_overlay.xml
+++ b/app/src/main/res/layout/player_popup_close_overlay.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center_horizontal"
         android:layout_marginBottom="24dp"
-        android:src="@drawable/ic_close_white_24dp"
+        app:srcCompat="@drawable/ic_close_white_24dp"
         app:backgroundTint="@color/light_youtube_primary_color"
         app:borderWidth="0dp"
         app:fabSize="normal"/>
diff --git a/app/src/main/res/layout/player_popup_notification.xml b/app/src/main/res/layout/player_popup_notification.xml
index 122ed1e9e..2bcb657bd 100644
--- a/app/src/main/res/layout/player_popup_notification.xml
+++ b/app/src/main/res/layout/player_popup_notification.xml
@@ -82,6 +82,6 @@
         android:focusable="true"
         android:padding="5dp"
         android:scaleType="fitCenter"
-        android:src="@drawable/ic_close_white_24dp"
+        app:srcCompat="@drawable/ic_close_white_24dp"
         tools:ignore="ContentDescription,RtlHardcoded"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/playlist_control.xml b/app/src/main/res/layout/playlist_control.xml
index ee1ab1b33..53890d017 100644
--- a/app/src/main/res/layout/playlist_control.xml
+++ b/app/src/main/res/layout/playlist_control.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout
+<LinearLayout 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:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/playlist_control"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:visibility="invisible"
     tools:visibility="visible">
 
@@ -26,8 +26,8 @@
             android:textSize="@dimen/channel_rss_title_size"
             android:textColor="?attr/colorAccent"
             android:drawablePadding="4dp"
-            android:drawableLeft="?attr/ic_headset"
-            android:drawableStart="?attr/ic_headset"/>
+            app:drawableLeftCompat="?attr/ic_headset"
+            app:drawableStartCompat="?attr/ic_headset"/>
     </LinearLayout>
 
     <View android:id="@+id/anchorLeft"
@@ -81,7 +81,7 @@
             android:textSize="@dimen/channel_rss_title_size"
             android:textColor="?attr/colorAccent"
             android:drawablePadding="4dp"
-            android:drawableLeft="?attr/ic_popup"
-            android:drawableStart="?attr/ic_popup"/>
+            app:drawableLeftCompat="?attr/ic_popup"
+            app:drawableStartCompat="?attr/ic_popup"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/statistic_playlist_control.xml b/app/src/main/res/layout/statistic_playlist_control.xml
index f9aba5d57..2bddfffa4 100644
--- a/app/src/main/res/layout/statistic_playlist_control.xml
+++ b/app/src/main/res/layout/statistic_playlist_control.xml
@@ -1,9 +1,9 @@
 <?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"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <RelativeLayout
@@ -22,7 +22,7 @@
             android:layout_centerVertical="true"
             android:layout_marginLeft="12dp"
             android:layout_marginRight="12dp"
-            android:src="?attr/ic_filter_list"
+            app:srcCompat="?attr/ic_filter_list"
             tools:ignore="ContentDescription,RtlHardcoded"/>
 
         <TextView
diff --git a/app/src/main/res/layout/stream_quality_item.xml b/app/src/main/res/layout/stream_quality_item.xml
index bb502a0f1..000907bb0 100644
--- a/app/src/main/res/layout/stream_quality_item.xml
+++ b/app/src/main/res/layout/stream_quality_item.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="48dp">
+    android:layout_height="48dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <ImageView
         android:id="@+id/wo_sound_icon"
@@ -13,7 +13,7 @@
         android:layout_centerVertical="true"
         android:layout_marginLeft="6dp"
         android:scaleType="fitCenter"
-        android:src="?attr/ic_volume_off"
+        app:srcCompat="?attr/ic_volume_off"
         tools:ignore="ContentDescription,RtlHardcoded"/>
 
     <TextView
diff --git a/app/src/main/res/layout/toolbar_search_layout.xml b/app/src/main/res/layout/toolbar_search_layout.xml
index fa511cfc4..34e659ece 100644
--- a/app/src/main/res/layout/toolbar_search_layout.xml
+++ b/app/src/main/res/layout/toolbar_search_layout.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?attr/colorPrimary">
 
     <EditText
@@ -44,7 +44,7 @@
             android:layout_gravity="center"
             android:contentDescription="@string/search"
             android:scaleType="fitCenter"
-            android:src="?attr/ic_close"
+            app:srcCompat="?attr/ic_close"
             tools:ignore="RtlHardcoded"/>
     </FrameLayout>