diff --git a/app/build.gradle b/app/build.gradle
index 06eb822cc..67026df7e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -20,7 +20,6 @@ android {
         versionName "0.23.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables.useSupportLibrary = true
 
         javaCompileOptions {
             annotationProcessorOptions {
diff --git a/app/src/main/res/layout-land/activity_player_queue_control.xml b/app/src/main/res/layout-land/activity_player_queue_control.xml
index c2359552e..7d3b43ecc 100644
--- a/app/src/main/res/layout-land/activity_player_queue_control.xml
+++ b/app/src/main/res/layout-land/activity_player_queue_control.xml
@@ -138,8 +138,8 @@
                 android:clickable="true"
                 android:focusable="true"
                 android:scaleType="fitCenter"
+                android:src="@drawable/ic_pause"
                 android:tint="?attr/colorAccent"
-                app:srcCompat="@drawable/ic_pause"
                 tools:ignore="ContentDescription" />
 
             <ProgressBar
@@ -199,8 +199,8 @@
                 android:gravity="center"
                 android:minWidth="50dp"
                 android:scaleType="fitCenter"
+                android:src="@drawable/ic_previous"
                 android:tint="?attr/colorAccent"
-                app:srcCompat="@drawable/ic_previous"
                 tools:ignore="ContentDescription" />
 
             <ImageButton
@@ -214,8 +214,8 @@
                 android:clickable="true"
                 android:focusable="true"
                 android:scaleType="fitXY"
+                android:src="@drawable/ic_repeat"
                 android:tint="?attr/colorAccent"
-                app:srcCompat="@drawable/ic_repeat"
                 tools:ignore="ContentDescription" />
 
             <View
@@ -235,8 +235,8 @@
                 android:clickable="true"
                 android:focusable="true"
                 android:scaleType="fitXY"
+                android:src="@drawable/ic_shuffle"
                 android:tint="?attr/colorAccent"
-                app:srcCompat="@drawable/ic_shuffle"
                 tools:ignore="ContentDescription" />
 
             <androidx.appcompat.widget.AppCompatImageButton
@@ -253,8 +253,8 @@
                 android:gravity="center"
                 android:minWidth="50dp"
                 android:scaleType="fitCenter"
+                android:src="@drawable/ic_next"
                 android:tint="?attr/colorAccent"
-                app:srcCompat="@drawable/ic_next"
                 tools:ignore="ContentDescription" />
         </RelativeLayout>
     </RelativeLayout>
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index 851085b5b..d8e52b354 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -65,8 +65,8 @@
                             android:layout_height="64dp"
                             android:layout_gravity="center"
                             android:background="@android:color/transparent"
+                            android:src="@drawable/ic_play_arrow_shadow"
                             android:visibility="invisible"
-                            app:srcCompat="@drawable/ic_play_arrow_shadow"
                             tools:ignore="ContentDescription"
                             tools:visibility="visible" />
 
@@ -199,7 +199,7 @@
                             android:layout_gravity="top|end"
                             android:layout_marginTop="11dp"
                             android:layout_marginEnd="10dp"
-                            app:srcCompat="@drawable/ic_expand_more"
+                            android:src="@drawable/ic_expand_more"
                             tools:ignore="ContentDescription" />
 
                     </FrameLayout>
@@ -326,18 +326,6 @@
                                         tools:text="Uploader" />
                                 </LinearLayout>
 
-                                <!--<Button
-                                    android:id="@+id/detail_uploader_subscribe"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_gravity="center_vertical|right"
-                                    android:layout_marginRight="12dp"
-                                    android:text="@string/rss_button_title"
-                                    android:textSize="12sp"
-                                    android:theme="@style/RedButton"
-                                    app:drawableLeftCompat="@drawable/ic_rss_feed"
-                                    tools:ignore="RtlHardcoded"
-                                    android:visibility="gone"/>-->
                             </LinearLayout>
 
                             <!-- VIEW & THUMBS -->
@@ -369,7 +357,7 @@
                                     android:layout_height="@dimen/video_item_detail_like_image_height"
                                     android:layout_below="@id/detail_view_count_view"
                                     android:contentDescription="@string/detail_likes_img_view_description"
-                                    app:srcCompat="@drawable/ic_thumb_up" />
+                                    android:src="@drawable/ic_thumb_up" />
 
                                 <org.schabi.newpipe.views.NewPipeTextView
                                     android:id="@+id/detail_thumbs_up_count_view"
@@ -393,7 +381,7 @@
                                     android:layout_marginLeft="12dp"
                                     android:layout_toRightOf="@id/detail_thumbs_up_count_view"
                                     android:contentDescription="@string/detail_dislikes_img_view_description"
-                                    app:srcCompat="@drawable/ic_thumb_down"
+                                    android:src="@drawable/ic_thumb_down"
                                     tools:ignore="RtlHardcoded" />
 
                                 <org.schabi.newpipe.views.NewPipeTextView
@@ -447,12 +435,12 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:clickable="true"
                                 android:contentDescription="@string/add_to_playlist"
+                                android:drawableTop="@drawable/ic_playlist_add"
                                 android:focusable="true"
                                 android:gravity="center"
                                 android:paddingVertical="@dimen/detail_control_padding"
                                 android:text="@string/controls_add_to_playlist_title"
-                                android:textSize="@dimen/detail_control_text_size"
-                                app:drawableTopCompat="@drawable/ic_playlist_add" />
+                                android:textSize="@dimen/detail_control_text_size" />
 
                             <org.schabi.newpipe.views.NewPipeTextView
                                 android:id="@+id/detail_controls_background"
@@ -463,12 +451,12 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:clickable="true"
                                 android:contentDescription="@string/play_audio"
+                                android:drawableTop="@drawable/ic_headset"
                                 android:focusable="true"
                                 android:gravity="center"
                                 android:paddingVertical="@dimen/detail_control_padding"
                                 android:text="@string/controls_background_title"
-                                android:textSize="@dimen/detail_control_text_size"
-                                app:drawableTopCompat="@drawable/ic_headset" />
+                                android:textSize="@dimen/detail_control_text_size" />
 
                             <org.schabi.newpipe.views.NewPipeTextView
                                 android:id="@+id/detail_controls_popup"
@@ -479,12 +467,12 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:clickable="true"
                                 android:contentDescription="@string/open_in_popup_mode"
+                                android:drawableTop="@drawable/ic_picture_in_picture"
                                 android:focusable="true"
                                 android:gravity="center"
                                 android:paddingVertical="@dimen/detail_control_padding"
                                 android:text="@string/controls_popup_title"
-                                android:textSize="@dimen/detail_control_text_size"
-                                app:drawableTopCompat="@drawable/ic_picture_in_picture" />
+                                android:textSize="@dimen/detail_control_text_size" />
 
                             <org.schabi.newpipe.views.NewPipeTextView
                                 android:id="@+id/detail_controls_download"
@@ -495,12 +483,12 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:clickable="true"
                                 android:contentDescription="@string/controls_download_desc"
+                                android:drawableTop="@drawable/ic_file_download"
                                 android:focusable="true"
                                 android:gravity="center"
                                 android:paddingVertical="@dimen/detail_control_padding"
                                 android:text="@string/download"
-                                android:textSize="@dimen/detail_control_text_size"
-                                app:drawableTopCompat="@drawable/ic_file_download" />
+                                android:textSize="@dimen/detail_control_text_size" />
 
                         </LinearLayout>
 
@@ -526,12 +514,12 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:clickable="true"
                                 android:contentDescription="@string/share"
+                                android:drawableTop="@drawable/ic_share"
                                 android:focusable="true"
                                 android:gravity="center"
                                 android:paddingVertical="@dimen/detail_control_padding"
                                 android:text="@string/share"
-                                android:textSize="@dimen/detail_control_text_size"
-                                app:drawableTopCompat="@drawable/ic_share" />
+                                android:textSize="@dimen/detail_control_text_size" />
 
                             <org.schabi.newpipe.views.NewPipeTextView
                                 android:id="@+id/detail_controls_open_in_browser"
@@ -542,12 +530,12 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:clickable="true"
                                 android:contentDescription="@string/open_in_browser"
+                                android:drawableTop="@drawable/ic_language"
                                 android:focusable="true"
                                 android:gravity="center"
                                 android:paddingVertical="@dimen/detail_control_padding"
                                 android:text="@string/open_in_browser"
-                                android:textSize="@dimen/detail_control_text_size"
-                                app:drawableTopCompat="@drawable/ic_language" />
+                                android:textSize="@dimen/detail_control_text_size" />
 
                             <org.schabi.newpipe.views.NewPipeTextView
                                 android:id="@+id/detail_controls_play_with_kodi"
@@ -558,14 +546,14 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:clickable="true"
                                 android:contentDescription="@string/play_with_kodi_title"
+                                android:drawableTop="@drawable/ic_cast"
                                 android:focusable="true"
                                 android:gravity="center"
                                 android:paddingVertical="@dimen/detail_control_padding"
                                 android:text="@string/play_with_kodi_title"
-                                android:textSize="@dimen/detail_control_text_size"
-                                app:drawableTopCompat="@drawable/ic_cast" />
+                                android:textSize="@dimen/detail_control_text_size" />
 
-                            <TextView
+                            <org.schabi.newpipe.views.NewPipeTextView
                                 android:id="@+id/detail_controls_crash_the_player"
                                 android:layout_width="@dimen/detail_control_width"
                                 android:layout_height="@dimen/detail_control_height"
@@ -574,12 +562,12 @@
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:clickable="true"
                                 android:contentDescription="@string/crash_the_player"
+                                android:drawableTop="@drawable/ic_bug_report"
                                 android:focusable="true"
                                 android:gravity="center"
                                 android:paddingVertical="@dimen/detail_control_padding"
                                 android:text="@string/crash_the_player"
-                                android:textSize="@dimen/detail_control_text_size"
-                                app:drawableTopCompat="@drawable/ic_bug_report" />
+                                android:textSize="@dimen/detail_control_text_size" />
 
                         </LinearLayout>
 
@@ -719,7 +707,7 @@
                 android:scaleType="center"
                 android:focusable="true"
                 android:focusedByDefault="true"
-                app:srcCompat="@drawable/ic_play_arrow"
+                android:src="@drawable/ic_play_arrow"
                 tools:ignore="ContentDescription,RtlHardcoded" />
 
             <ImageButton
@@ -729,7 +717,7 @@
                 android:background="?attr/selectableItemBackground"
                 android:padding="10dp"
                 android:scaleType="center"
-                app:srcCompat="@drawable/ic_close"
+                android:src="@drawable/ic_close"
                 tools:ignore="ContentDescription,RtlHardcoded" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/activity_player_queue_control.xml b/app/src/main/res/layout/activity_player_queue_control.xml
index 24e062932..29efa36f9 100644
--- a/app/src/main/res/layout/activity_player_queue_control.xml
+++ b/app/src/main/res/layout/activity_player_queue_control.xml
@@ -174,8 +174,8 @@
             android:clickable="true"
             android:focusable="true"
             android:scaleType="fitXY"
+            android:src="@drawable/ic_repeat"
             android:tint="?attr/colorAccent"
-            app:srcCompat="@drawable/ic_repeat"
             tools:ignore="ContentDescription" />
 
         <androidx.appcompat.widget.AppCompatImageButton
@@ -189,8 +189,8 @@
             android:clickable="true"
             android:focusable="true"
             android:scaleType="fitCenter"
+            android:src="@drawable/ic_previous"
             android:tint="?attr/colorAccent"
-            app:srcCompat="@drawable/ic_previous"
             tools:ignore="ContentDescription" />
 
         <ImageButton
@@ -219,8 +219,8 @@
             android:clickable="true"
             android:focusable="true"
             android:scaleType="fitCenter"
+            android:src="@drawable/ic_pause"
             android:tint="?attr/colorAccent"
-            app:srcCompat="@drawable/ic_pause"
             tools:ignore="ContentDescription" />
 
         <ProgressBar
@@ -268,8 +268,8 @@
             android:clickable="true"
             android:focusable="true"
             android:scaleType="fitCenter"
+            android:src="@drawable/ic_next"
             android:tint="?attr/colorAccent"
-            app:srcCompat="@drawable/ic_next"
             tools:ignore="ContentDescription" />
 
         <ImageButton
@@ -284,8 +284,8 @@
             android:clickable="true"
             android:focusable="true"
             android:scaleType="fitXY"
+            android:src="@drawable/ic_shuffle"
             android:tint="?attr/colorAccent"
-            app:srcCompat="@drawable/ic_shuffle"
             tools:ignore="ContentDescription" />
 
     </RelativeLayout>
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 a08041e97..464940238 100644
--- a/app/src/main/res/layout/dialog_feed_group_create.xml
+++ b/app/src/main/res/layout/dialog_feed_group_create.xml
@@ -193,8 +193,8 @@
             android:layout_centerVertical="true"
             android:minWidth="0dp"
             android:scaleType="centerInside"
+            android:src="@drawable/ic_delete"
             android:visibility="gone"
-            app:srcCompat="@drawable/ic_delete"
             tools:ignore="ContentDescription"
             tools:visibility="visible" />
 
diff --git a/app/src/main/res/layout/dialog_playback_parameter.xml b/app/src/main/res/layout/dialog_playback_parameter.xml
index e402f4fb1..cc506cc79 100644
--- a/app/src/main/res/layout/dialog_playback_parameter.xml
+++ b/app/src/main/res/layout/dialog_playback_parameter.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView 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="match_parent"
@@ -154,7 +153,7 @@
             android:layout_alignParentEnd="true"
             android:clickable="true"
             android:focusable="true"
-            app:srcCompat="@drawable/ic_expand_more"
+            android:src="@drawable/ic_expand_more"
             tools:ignore="ContentDescription" />
 
         <LinearLayout
diff --git a/app/src/main/res/layout/dialog_playlists.xml b/app/src/main/res/layout/dialog_playlists.xml
index 99c46e552..18b08d93c 100644
--- a/app/src/main/res/layout/dialog_playlists.xml
+++ b/app/src/main/res/layout/dialog_playlists.xml
@@ -1,5 +1,4 @@
 <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:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -20,7 +19,7 @@
             android:layout_centerVertical="true"
             android:layout_marginLeft="12dp"
             android:layout_marginRight="12dp"
-            app:srcCompat="@drawable/ic_playlist_add"
+            android:src="@drawable/ic_playlist_add"
             tools:ignore="ContentDescription,RtlHardcoded" />
 
         <org.schabi.newpipe.views.NewPipeTextView
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 94e045863..fe076ff7c 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -39,7 +39,7 @@
                 android:layout_width="@dimen/drawer_header_newpipe_icon_size"
                 android:layout_height="@dimen/drawer_header_newpipe_icon_size"
                 android:layout_marginEnd="@dimen/drawer_header_newpipe_icon_title_space"
-                app:srcCompat="@drawable/splash_foreground"
+                android:src="@drawable/splash_foreground"
                 tools:ignore="ContentDescription" />
 
             <org.schabi.newpipe.views.NewPipeTextView
@@ -86,7 +86,7 @@
                     android:scaleType="fitCenter"
                     app:tint="@color/drawer_header_font_color"
                     tools:ignore="ContentDescription"
-                    tools:srcCompat="@drawable/ic_smart_display" />
+                    tools:src="@drawable/ic_smart_display" />
 
                 <org.schabi.newpipe.views.NewPipeTextView
                     android:id="@+id/drawer_header_service_view"
@@ -104,7 +104,7 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_marginStart="4dp"
-                app:srcCompat="@drawable/ic_arrow_drop_down"
+                android:src="@drawable/ic_arrow_drop_down"
                 app:tint="@color/drawer_header_font_color"
                 tools:ignore="ContentDescription" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/feed_group_add_new_item.xml b/app/src/main/res/layout/feed_group_add_new_item.xml
index df3fc9b3a..0dfe819a6 100644
--- a/app/src/main/res/layout/feed_group_add_new_item.xml
+++ b/app/src/main/res/layout/feed_group_add_new_item.xml
@@ -24,7 +24,7 @@
             android:layout_height="14dp"
             android:layout_gravity="center"
             android:scaleType="centerInside"
-            app:srcCompat="@drawable/ic_add"
+            android:src="@drawable/ic_add"
             tools:ignore="ContentDescription" />
 
         <org.schabi.newpipe.views.NewPipeTextView
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 8d72a2638..0743542d9 100644
--- a/app/src/main/res/layout/feed_group_reorder_item.xml
+++ b/app/src/main/res/layout/feed_group_reorder_item.xml
@@ -55,7 +55,7 @@
             android:paddingTop="12dp"
             android:paddingRight="16dp"
             android:paddingBottom="12dp"
-            app:srcCompat="@drawable/ic_drag_handle"
+            android:src="@drawable/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/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index db93f1d8d..1807acb10 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -1,5 +1,4 @@
 <androidx.core.widget.NestedScrollView 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="match_parent"
@@ -20,7 +19,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="8dp"
             android:contentDescription="@string/app_name"
-            app:srcCompat="@mipmap/ic_launcher" />
+            android:src="@mipmap/ic_launcher" />
 
         <org.schabi.newpipe.views.NewPipeTextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/fragment_choose_tabs.xml b/app/src/main/res/layout/fragment_choose_tabs.xml
index d27192327..485fd89c3 100644
--- a/app/src/main/res/layout/fragment_choose_tabs.xml
+++ b/app/src/main/res/layout/fragment_choose_tabs.xml
@@ -40,10 +40,10 @@
         android:layout_marginBottom="16dp"
         android:clickable="true"
         android:focusable="true"
+        android:src="@drawable/ic_add"
         app:backgroundTint="?attr/colorPrimary"
         app:fabSize="auto"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:srcCompat="@drawable/ic_add" />
+        app:layout_constraintEnd_toEndOf="parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_description.xml b/app/src/main/res/layout/fragment_description.xml
index b020d5db3..157b8f394 100644
--- a/app/src/main/res/layout/fragment_description.xml
+++ b/app/src/main/res/layout/fragment_description.xml
@@ -38,11 +38,11 @@
             android:contentDescription="@string/description_select_enable"
             android:focusable="true"
             android:padding="5dp"
+            android:src="@drawable/ic_select_all"
             app:layout_constraintBottom_toTopOf="@+id/barrier"
             app:layout_constraintDimensionRatio="1"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_select_all" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.constraintlayout.widget.Barrier
             android:id="@+id/barrier"
diff --git a/app/src/main/res/layout/fragment_feed.xml b/app/src/main/res/layout/fragment_feed.xml
index ebe76af0c..de2096605 100644
--- a/app/src/main/res/layout/fragment_feed.xml
+++ b/app/src/main/res/layout/fragment_feed.xml
@@ -1,6 +1,5 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -57,7 +56,7 @@
             android:layout_alignParentEnd="true"
             android:layout_marginStart="6dp"
             android:layout_marginEnd="12dp"
-            app:srcCompat="@drawable/ic_refresh"
+            android:src="@drawable/ic_refresh"
             tools:ignore="ContentDescription" />
 
         <View
diff --git a/app/src/main/res/layout/fragment_instance_list.xml b/app/src/main/res/layout/fragment_instance_list.xml
index aaf56fcc1..2e976b286 100644
--- a/app/src/main/res/layout/fragment_instance_list.xml
+++ b/app/src/main/res/layout/fragment_instance_list.xml
@@ -44,8 +44,8 @@
         android:layout_marginBottom="16dp"
         android:clickable="true"
         android:focusable="true"
+        android:src="@drawable/ic_add"
         app:backgroundTint="?attr/colorPrimary"
-        app:fabSize="auto"
-        app:srcCompat="@drawable/ic_add" />
+        app:fabSize="auto" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index 08a9bcf0a..18655283e 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -55,8 +55,8 @@
                         android:layout_height="64dp"
                         android:layout_gravity="center"
                         android:background="@android:color/transparent"
+                        android:src="@drawable/ic_play_arrow_shadow"
                         android:visibility="invisible"
-                        app:srcCompat="@drawable/ic_play_arrow_shadow"
                         tools:ignore="ContentDescription"
                         tools:visibility="visible" />
 
@@ -187,7 +187,7 @@
                         android:layout_gravity="top|end"
                         android:layout_marginTop="11dp"
                         android:layout_marginEnd="10dp"
-                        app:srcCompat="@drawable/ic_expand_more"
+                        android:src="@drawable/ic_expand_more"
                         tools:ignore="ContentDescription" />
 
                 </FrameLayout>
@@ -313,19 +313,6 @@
                                     tools:text="Uploader" />
 
                             </LinearLayout>
-
-                            <!--<Button
-                                android:id="@+id/detail_uploader_subscribe"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical|right"
-                                android:layout_marginRight="12dp"
-                                android:text="@string/rss_button_title"
-                                android:textSize="12sp"
-                                android:theme="@style/RedButton"
-                                app:drawableLeftCompat="@drawable/ic_rss_feed"
-                                tools:ignore="RtlHardcoded"
-                                android:visibility="gone"/>-->
                         </LinearLayout>
 
                         <!-- VIEW & THUMBS -->
@@ -357,7 +344,7 @@
                                 android:layout_height="@dimen/video_item_detail_like_image_height"
                                 android:layout_below="@id/detail_view_count_view"
                                 android:contentDescription="@string/detail_likes_img_view_description"
-                                app:srcCompat="@drawable/ic_thumb_up" />
+                                android:src="@drawable/ic_thumb_up" />
 
                             <org.schabi.newpipe.views.NewPipeTextView
                                 android:id="@+id/detail_thumbs_up_count_view"
@@ -381,7 +368,7 @@
                                 android:layout_marginLeft="12dp"
                                 android:layout_toRightOf="@id/detail_thumbs_up_count_view"
                                 android:contentDescription="@string/detail_dislikes_img_view_description"
-                                app:srcCompat="@drawable/ic_thumb_down"
+                                android:src="@drawable/ic_thumb_down"
                                 tools:ignore="RtlHardcoded" />
 
                             <org.schabi.newpipe.views.NewPipeTextView
@@ -433,12 +420,12 @@
                             android:background="?attr/selectableItemBackgroundBorderless"
                             android:clickable="true"
                             android:contentDescription="@string/add_to_playlist"
+                            android:drawableTop="@drawable/ic_playlist_add"
                             android:focusable="true"
                             android:gravity="center"
                             android:paddingVertical="@dimen/detail_control_padding"
                             android:text="@string/controls_add_to_playlist_title"
-                            android:textSize="@dimen/detail_control_text_size"
-                            app:drawableTopCompat="@drawable/ic_playlist_add" />
+                            android:textSize="@dimen/detail_control_text_size" />
 
                         <org.schabi.newpipe.views.NewPipeTextView
                             android:id="@+id/detail_controls_background"
@@ -449,12 +436,12 @@
                             android:background="?attr/selectableItemBackgroundBorderless"
                             android:clickable="true"
                             android:contentDescription="@string/play_audio"
+                            android:drawableTop="@drawable/ic_headset"
                             android:focusable="true"
                             android:gravity="center"
                             android:paddingVertical="@dimen/detail_control_padding"
                             android:text="@string/controls_background_title"
-                            android:textSize="@dimen/detail_control_text_size"
-                            app:drawableTopCompat="@drawable/ic_headset" />
+                            android:textSize="@dimen/detail_control_text_size" />
 
                         <org.schabi.newpipe.views.NewPipeTextView
                             android:id="@+id/detail_controls_popup"
@@ -465,12 +452,12 @@
                             android:background="?attr/selectableItemBackgroundBorderless"
                             android:clickable="true"
                             android:contentDescription="@string/open_in_popup_mode"
+                            android:drawableTop="@drawable/ic_picture_in_picture"
                             android:focusable="true"
                             android:gravity="center"
                             android:paddingVertical="@dimen/detail_control_padding"
                             android:text="@string/controls_popup_title"
-                            android:textSize="@dimen/detail_control_text_size"
-                            app:drawableTopCompat="@drawable/ic_picture_in_picture" />
+                            android:textSize="@dimen/detail_control_text_size" />
 
                         <org.schabi.newpipe.views.NewPipeTextView
                             android:id="@+id/detail_controls_download"
@@ -481,12 +468,12 @@
                             android:background="?attr/selectableItemBackgroundBorderless"
                             android:clickable="true"
                             android:contentDescription="@string/controls_download_desc"
+                            android:drawableTop="@drawable/ic_file_download"
                             android:focusable="true"
                             android:gravity="center"
                             android:paddingVertical="@dimen/detail_control_padding"
                             android:text="@string/download"
-                            android:textSize="@dimen/detail_control_text_size"
-                            app:drawableTopCompat="@drawable/ic_file_download" />
+                            android:textSize="@dimen/detail_control_text_size" />
 
                     </LinearLayout>
 
@@ -510,12 +497,12 @@
                             android:background="?attr/selectableItemBackgroundBorderless"
                             android:clickable="true"
                             android:contentDescription="@string/share"
+                            android:drawableTop="@drawable/ic_share"
                             android:focusable="true"
                             android:gravity="center"
                             android:paddingVertical="@dimen/detail_control_padding"
                             android:text="@string/share"
-                            android:textSize="@dimen/detail_control_text_size"
-                            app:drawableTopCompat="@drawable/ic_share" />
+                            android:textSize="@dimen/detail_control_text_size" />
 
                         <org.schabi.newpipe.views.NewPipeTextView
                             android:id="@+id/detail_controls_open_in_browser"
@@ -526,12 +513,12 @@
                             android:background="?attr/selectableItemBackgroundBorderless"
                             android:clickable="true"
                             android:contentDescription="@string/open_in_browser"
+                            android:drawableTop="@drawable/ic_language"
                             android:focusable="true"
                             android:gravity="center"
                             android:paddingVertical="@dimen/detail_control_padding"
                             android:text="@string/open_in_browser"
-                            android:textSize="@dimen/detail_control_text_size"
-                            app:drawableTopCompat="@drawable/ic_language" />
+                            android:textSize="@dimen/detail_control_text_size" />
 
                         <org.schabi.newpipe.views.NewPipeTextView
                             android:id="@+id/detail_controls_play_with_kodi"
@@ -542,14 +529,14 @@
                             android:background="?attr/selectableItemBackgroundBorderless"
                             android:clickable="true"
                             android:contentDescription="@string/play_with_kodi_title"
+                            android:drawableTop="@drawable/ic_cast"
                             android:focusable="true"
                             android:gravity="center"
                             android:paddingVertical="@dimen/detail_control_padding"
                             android:text="@string/play_with_kodi_title"
-                            android:textSize="@dimen/detail_control_text_size"
-                            app:drawableTopCompat="@drawable/ic_cast" />
+                            android:textSize="@dimen/detail_control_text_size" />
 
-                        <TextView
+                        <org.schabi.newpipe.views.NewPipeTextView
                             android:id="@+id/detail_controls_crash_the_player"
                             android:layout_width="@dimen/detail_control_width"
                             android:layout_height="@dimen/detail_control_height"
@@ -558,12 +545,12 @@
                             android:background="?attr/selectableItemBackgroundBorderless"
                             android:clickable="true"
                             android:contentDescription="@string/crash_the_player"
+                            android:drawableTop="@drawable/ic_bug_report"
                             android:focusable="true"
                             android:gravity="center"
                             android:paddingVertical="@dimen/detail_control_padding"
                             android:text="@string/crash_the_player"
-                            android:textSize="@dimen/detail_control_text_size"
-                            app:drawableTopCompat="@drawable/ic_bug_report" />
+                            android:textSize="@dimen/detail_control_text_size" />
 
                     </LinearLayout>
 
@@ -696,7 +683,7 @@
                 android:scaleType="center"
                 android:focusable="true"
                 android:focusedByDefault="true"
-                app:srcCompat="@drawable/ic_play_arrow"
+                android:src="@drawable/ic_play_arrow"
                 tools:ignore="ContentDescription,RtlHardcoded" />
 
             <ImageButton
@@ -706,7 +693,7 @@
                 android:background="?attr/selectableItemBackground"
                 android:padding="10dp"
                 android:scaleType="center"
-                app:srcCompat="@drawable/ic_close"
+                android:src="@drawable/ic_close"
                 tools:ignore="ContentDescription,RtlHardcoded" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/item_instance.xml b/app/src/main/res/layout/item_instance.xml
index dd5b4156f..12ecb2ea7 100644
--- a/app/src/main/res/layout/item_instance.xml
+++ b/app/src/main/res/layout/item_instance.xml
@@ -75,7 +75,7 @@
             android:paddingTop="12dp"
             android:paddingRight="10dp"
             android:paddingBottom="12dp"
-            app:srcCompat="@drawable/ic_drag_handle"
+            android:src="@drawable/ic_drag_handle"
             tools:ignore="ContentDescription,RtlHardcoded" />
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/item_search_suggestion.xml b/app/src/main/res/layout/item_search_suggestion.xml
index 4b1025fea..f7a07bbcc 100644
--- a/app/src/main/res/layout/item_search_suggestion.xml
+++ b/app/src/main/res/layout/item_search_suggestion.xml
@@ -1,6 +1,5 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -64,7 +63,7 @@
             android:layout_width="20dp"
             android:layout_height="20dp"
             android:layout_gravity="center"
-            app:srcCompat="@drawable/ic_search_add"
+            android:src="@drawable/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 e6cebda11..ed7ad94c4 100644
--- a/app/src/main/res/layout/list_choose_tabs.xml
+++ b/app/src/main/res/layout/list_choose_tabs.xml
@@ -55,7 +55,7 @@
             android:paddingTop="12dp"
             android:paddingRight="16dp"
             android:paddingBottom="12dp"
-            app:srcCompat="@drawable/ic_drag_handle"
+            android:src="@drawable/ic_drag_handle"
             tools:ignore="ContentDescription,RtlHardcoded" />
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/list_comments_item.xml b/app/src/main/res/layout/list_comments_item.xml
index 3b148de03..4358c438f 100644
--- a/app/src/main/res/layout/list_comments_item.xml
+++ b/app/src/main/res/layout/list_comments_item.xml
@@ -32,8 +32,8 @@
         android:layout_marginRight="@dimen/video_item_detail_pinned_right_margin"
         android:layout_toEndOf="@+id/itemThumbnailView"
         android:contentDescription="@string/detail_pinned_comment_view_description"
+        android:src="@drawable/ic_pin"
         android:visibility="gone"
-        app:srcCompat="@drawable/ic_pin"
         tools:visibility="visible" />
 
     <org.schabi.newpipe.views.NewPipeTextView
@@ -69,7 +69,7 @@
         android:layout_below="@id/itemCommentContentView"
         android:layout_toRightOf="@+id/itemThumbnailView"
         android:contentDescription="@string/detail_likes_img_view_description"
-        app:srcCompat="@drawable/ic_thumb_up" />
+        android:src="@drawable/ic_thumb_up" />
 
     <org.schabi.newpipe.views.NewPipeTextView
         android:id="@+id/detail_thumbs_up_count_view"
@@ -92,37 +92,9 @@
         android:layout_marginLeft="@dimen/video_item_detail_heart_margin"
         android:layout_toRightOf="@+id/detail_thumbs_up_count_view"
         android:contentDescription="@string/detail_heart_img_view_description"
+        android:src="@drawable/ic_heart"
         android:visibility="gone"
-        tools:visibility="visible"
-        app:srcCompat="@drawable/ic_heart" />
-
-
-    <!--we can uncomment below code if we need dislike button and count in future-->
-
-    <!--<ImageView
-        android:id="@+id/detail_thumbs_down_img_view"
-        android:layout_width="@dimen/video_item_detail_like_image_width"
-        android:layout_height="@dimen/video_item_detail_like_image_height"
-        android:layout_below="@id/itemCommentContentView"
-        android:layout_marginLeft="12dp"
-        android:layout_toRightOf="@id/detail_thumbs_up_count_view"
-        android:contentDescription="@string/detail_dislikes_img_view_description"
-        app:srcCompat="?attr/thumbs_down"
-        tools:ignore="RtlHardcoded" />
-
-    <org.schabi.newpipe.views.NewPipeTextView
-        android:id="@+id/detail_thumbs_down_count_view"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/video_item_detail_like_image_height"
-        android:layout_below="@id/itemCommentContentView"
-        android:layout_marginLeft="@dimen/video_item_detail_like_margin"
-        android:layout_toRightOf="@id/detail_thumbs_down_img_view"
-        android:gravity="center_vertical"
-        android:lines="1"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="@dimen/video_item_detail_likes_text_size"
-        tools:ignore="RtlHardcoded"
-        tools:text="10K" />-->
+        tools:visibility="visible" />
 
     <org.schabi.newpipe.views.NewPipeTextView
         android:id="@+id/itemPublishedTime"
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 90653532b..6bd363311 100644
--- a/app/src/main/res/layout/list_comments_mini_item.xml
+++ b/app/src/main/res/layout/list_comments_mini_item.xml
@@ -39,7 +39,7 @@
         android:layout_below="@id/itemCommentContentView"
         android:layout_toRightOf="@+id/itemThumbnailView"
         android:contentDescription="@string/detail_likes_img_view_description"
-        app:srcCompat="@drawable/ic_thumb_up" />
+        android:src="@drawable/ic_thumb_up" />
 
     <org.schabi.newpipe.views.NewPipeTextView
         android:id="@+id/detail_thumbs_up_count_view"
@@ -54,33 +54,6 @@
         tools:ignore="RtlHardcoded"
         tools:text="12M" />
 
-    <!--we can uncomment below code if we need dislike button and count in future-->
-
-    <!--<ImageView
-        android:id="@+id/detail_thumbs_down_img_view"
-        android:layout_width="@dimen/video_item_detail_like_image_width"
-        android:layout_height="@dimen/video_item_detail_like_image_height"
-        android:layout_below="@id/itemCommentContentView"
-        android:layout_marginLeft="12dp"
-        android:layout_toRightOf="@id/detail_thumbs_up_count_view"
-        android:contentDescription="@string/detail_dislikes_img_view_description"
-        app:srcCompat="?attr/thumbs_down"
-        tools:ignore="RtlHardcoded" />
-
-    <org.schabi.newpipe.views.NewPipeTextView
-        android:id="@+id/detail_thumbs_down_count_view"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/video_item_detail_like_image_height"
-        android:layout_below="@id/itemCommentContentView"
-        android:layout_marginLeft="@dimen/video_item_detail_like_margin"
-        android:layout_toRightOf="@id/detail_thumbs_down_img_view"
-        android:gravity="center_vertical"
-        android:lines="1"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="@dimen/video_item_detail_likes_text_size"
-        tools:ignore="RtlHardcoded"
-        tools:text="10K" />-->
-
     <org.schabi.newpipe.views.NewPipeTextView
         android:id="@+id/itemPublishedTime"
         android:layout_width="wrap_content"
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 2357458ff..e052e9ac0 100644
--- a/app/src/main/res/layout/list_playlist_grid_item.xml
+++ b/app/src/main/res/layout/list_playlist_grid_item.xml
@@ -1,6 +1,5 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemRoot"
     android:layout_width="match_parent"
@@ -29,6 +28,8 @@
         android:layout_alignEnd="@id/itemThumbnailView"
         android:layout_alignBottom="@id/itemThumbnailView"
         android:background="@color/playlist_stream_count_background_color"
+        android:drawableTop="@drawable/ic_playlist_play"
+        android:drawableTint="@color/duration_text_color"
         android:gravity="center"
         android:paddingTop="16dp"
         android:paddingBottom="14dp"
@@ -36,8 +37,6 @@
         android:textColor="@color/duration_text_color"
         android:textSize="@dimen/video_item_search_duration_text_size"
         android:textStyle="bold"
-        app:drawableTint="@color/duration_text_color"
-        app:drawableTopCompat="@drawable/ic_playlist_play"
         tools:text="314159" />
 
     <org.schabi.newpipe.views.NewPipeTextView
diff --git a/app/src/main/res/layout/list_playlist_item.xml b/app/src/main/res/layout/list_playlist_item.xml
index 8207a7365..452596af9 100644
--- a/app/src/main/res/layout/list_playlist_item.xml
+++ b/app/src/main/res/layout/list_playlist_item.xml
@@ -1,6 +1,5 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemRoot"
     android:layout_width="match_parent"
@@ -30,6 +29,8 @@
         android:layout_alignEnd="@id/itemThumbnailView"
         android:layout_alignBottom="@id/itemThumbnailView"
         android:background="@color/playlist_stream_count_background_color"
+        android:drawableTop="@drawable/ic_playlist_play"
+        android:drawableTint="@color/duration_text_color"
         android:gravity="center"
         android:paddingTop="16dp"
         android:paddingBottom="14dp"
@@ -37,8 +38,6 @@
         android:textColor="@color/duration_text_color"
         android:textSize="@dimen/video_item_search_duration_text_size"
         android:textStyle="bold"
-        app:drawableTint="@color/duration_text_color"
-        app:drawableTopCompat="@drawable/ic_playlist_play"
         tools:text="314159" />
 
     <org.schabi.newpipe.views.NewPipeTextView
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 bbad6efd0..b08c90d94 100644
--- a/app/src/main/res/layout/list_playlist_mini_item.xml
+++ b/app/src/main/res/layout/list_playlist_mini_item.xml
@@ -1,6 +1,5 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemRoot"
     android:layout_width="match_parent"
@@ -30,6 +29,8 @@
         android:layout_alignEnd="@id/itemThumbnailView"
         android:layout_alignBottom="@id/itemThumbnailView"
         android:background="@color/playlist_stream_count_background_color"
+        android:drawableTop="@drawable/ic_playlist_play"
+        android:drawableTint="@color/duration_text_color"
         android:gravity="center"
         android:paddingTop="4dp"
         android:paddingBottom="6dp"
@@ -37,8 +38,6 @@
         android:textColor="@color/duration_text_color"
         android:textSize="@dimen/video_item_search_duration_text_size"
         android:textStyle="bold"
-        app:drawableTint="@color/duration_text_color"
-        app:drawableTopCompat="@drawable/ic_playlist_play"
         tools:text="3141" />
 
     <org.schabi.newpipe.views.NewPipeTextView
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 e21a7238c..3d61e57bf 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,5 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemRoot"
     android:layout_width="match_parent"
@@ -49,7 +48,7 @@
         android:contentDescription="@string/detail_drag_description"
         android:paddingLeft="@dimen/video_item_search_image_right_margin"
         android:scaleType="center"
-        app:srcCompat="@drawable/ic_drag_handle"
+        android:src="@drawable/ic_drag_handle"
         tools:ignore="RtlHardcoded,RtlSymmetry" />
 
     <org.schabi.newpipe.views.NewPipeTextView
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 428c762aa..49d34a157 100644
--- a/app/src/main/res/layout/list_stream_playlist_item.xml
+++ b/app/src/main/res/layout/list_stream_playlist_item.xml
@@ -1,6 +1,5 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemRoot"
     android:layout_width="match_parent"
@@ -50,7 +49,7 @@
         android:contentDescription="@string/detail_drag_description"
         android:paddingLeft="@dimen/video_item_search_image_right_margin"
         android:scaleType="center"
-        app:srcCompat="@drawable/ic_drag_handle"
+        android:src="@drawable/ic_drag_handle"
         tools:ignore="RtlHardcoded,RtlSymmetry" />
 
     <org.schabi.newpipe.views.NewPipeTextView
diff --git a/app/src/main/res/layout/mission_item.xml b/app/src/main/res/layout/mission_item.xml
index 445776bea..5338949aa 100644
--- a/app/src/main/res/layout/mission_item.xml
+++ b/app/src/main/res/layout/mission_item.xml
@@ -39,7 +39,7 @@
                 android:layout_marginRight="1dp"
                 android:contentDescription="TODO"
                 android:scaleType="center"
-                app:srcCompat="@drawable/ic_more_vert"
+                android:src="@drawable/ic_more_vert"
                 app:tint="?attr/actionColor" />
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/mission_item_linear.xml b/app/src/main/res/layout/mission_item_linear.xml
index d7235fcaf..ce2d1af4b 100644
--- a/app/src/main/res/layout/mission_item_linear.xml
+++ b/app/src/main/res/layout/mission_item_linear.xml
@@ -72,7 +72,7 @@
             android:layout_marginRight="4dp"
             android:contentDescription="TODO"
             android:scaleType="centerInside"
-            app:srcCompat="@drawable/ic_more_vert"
+            android:src="@drawable/ic_more_vert"
             app:tint="?attr/actionColor" />
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/picker_subscription_item.xml b/app/src/main/res/layout/picker_subscription_item.xml
index 1aaa1e7d8..c858ccc4e 100644
--- a/app/src/main/res/layout/picker_subscription_item.xml
+++ b/app/src/main/res/layout/picker_subscription_item.xml
@@ -52,8 +52,8 @@
             android:layout_gravity="top|center_horizontal"
             android:layout_marginTop="4dp"
             android:scaleType="centerInside"
+            android:src="@drawable/ic_done"
             app:tint="@color/white"
-            app:srcCompat="@drawable/ic_done"
             tools:ignore="ContentDescription" />
     </FrameLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/play_queue_item.xml b/app/src/main/res/layout/play_queue_item.xml
index 5fb9419f6..7d672dc8b 100644
--- a/app/src/main/res/layout/play_queue_item.xml
+++ b/app/src/main/res/layout/play_queue_item.xml
@@ -89,10 +89,10 @@
         android:layout_gravity="center_vertical"
         android:paddingHorizontal="@dimen/video_item_search_image_right_margin"
         android:scaleType="center"
+        android:src="@drawable/ic_drag_handle"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_drag_handle"
         tools:ignore="ContentDescription,RtlHardcoded" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
index d748942e0..b8b60b3f8 100644
--- a/app/src/main/res/layout/player.xml
+++ b/app/src/main/res/layout/player.xml
@@ -112,8 +112,8 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
+                        android:src="@drawable/ic_close"
                         android:visibility="gone"
-                        app:srcCompat="@drawable/ic_close"
                         app:tint="@color/white"
                         tools:ignore="ContentDescription,RtlHardcoded" />
 
@@ -198,8 +198,8 @@
                         android:paddingEnd="3dp"
                         android:paddingBottom="3dp"
                         android:scaleType="fitCenter"
+                        android:src="@drawable/ic_list"
                         android:visibility="gone"
-                        app:srcCompat="@drawable/ic_list"
                         app:tint="@color/white"
                         tools:ignore="ContentDescription,RtlHardcoded" />
 
@@ -216,8 +216,8 @@
                         android:paddingEnd="6dp"
                         android:paddingBottom="3dp"
                         android:scaleType="fitCenter"
+                        android:src="@drawable/ic_format_list_numbered"
                         android:visibility="gone"
-                        app:srcCompat="@drawable/ic_format_list_numbered"
                         app:tint="@color/white"
                         tools:ignore="ContentDescription,RtlHardcoded" />
 
@@ -230,7 +230,7 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
-                        app:srcCompat="@drawable/ic_expand_more"
+                        android:src="@drawable/ic_expand_more"
                         app:tint="@color/white"
                         tools:ignore="ContentDescription,RtlHardcoded" />
 
@@ -294,7 +294,7 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
-                        app:srcCompat="@drawable/ic_cast"
+                        android:src="@drawable/ic_cast"
                         app:tint="@color/white"
                         tools:ignore="RtlHardcoded" />
 
@@ -309,7 +309,7 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
-                        app:srcCompat="@drawable/ic_language"
+                        android:src="@drawable/ic_language"
                         app:tint="@color/white"
                         tools:ignore="RtlHardcoded" />
 
@@ -324,7 +324,7 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
-                        app:srcCompat="@drawable/ic_share"
+                        android:src="@drawable/ic_share"
                         app:tint="@color/white"
                         tools:ignore="RtlHardcoded" />
 
@@ -338,7 +338,7 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitXY"
-                        app:srcCompat="@drawable/ic_volume_off"
+                        android:src="@drawable/ic_volume_off"
                         app:tint="@color/white"
                         tools:ignore="RtlHardcoded" />
 
@@ -351,8 +351,8 @@
                         android:focusable="true"
                         android:padding="@dimen/player_main_buttons_padding"
                         android:scaleType="fitCenter"
+                        android:src="@drawable/ic_fullscreen"
                         android:visibility="gone"
-                        app:srcCompat="@drawable/ic_fullscreen"
                         app:tint="@color/white"
                         tools:ignore="ContentDescription,RtlHardcoded"
                         tools:visibility="visible" />
@@ -397,8 +397,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:paddingTop="2dp"
+                        android:src="@drawable/dummy_thumbnail"
                         android:visibility="gone"
-                        app:srcCompat="@drawable/dummy_thumbnail"
                         tools:visibility="visible" />
 
                 </LinearLayout>
@@ -475,8 +475,8 @@
                     android:nextFocusUp="@id/playbackSeekBar"
                     android:padding="@dimen/player_main_buttons_padding"
                     android:scaleType="fitCenter"
+                    android:src="@drawable/ic_fullscreen"
                     android:visibility="gone"
-                    app:srcCompat="@drawable/ic_fullscreen"
                     app:tint="@color/white"
                     tools:ignore="ContentDescription,RtlHardcoded"
                     tools:visibility="visible" />
@@ -500,7 +500,7 @@
                 android:clickable="true"
                 android:focusable="true"
                 android:scaleType="fitCenter"
-                app:srcCompat="@drawable/ic_previous"
+                android:src="@drawable/ic_previous"
                 app:tint="@color/white"
                 tools:ignore="ContentDescription" />
 
@@ -512,7 +512,7 @@
                 android:layout_weight="1"
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:scaleType="fitCenter"
-                app:srcCompat="@drawable/ic_pause"
+                android:src="@drawable/ic_pause"
                 app:tint="@color/white"
                 tools:ignore="ContentDescription" />
 
@@ -526,7 +526,7 @@
                 android:clickable="true"
                 android:focusable="true"
                 android:scaleType="fitCenter"
-                app:srcCompat="@drawable/ic_next"
+                android:src="@drawable/ic_next"
                 app:tint="@color/white"
                 tools:ignore="ContentDescription" />
 
@@ -577,8 +577,8 @@
                 android:focusable="true"
                 android:padding="10dp"
                 android:scaleType="fitXY"
+                android:src="@drawable/exo_controls_repeat_off"
                 android:tint="?attr/colorAccent"
-                app:srcCompat="@drawable/exo_controls_repeat_off"
                 tools:ignore="ContentDescription,RtlHardcoded" />
 
             <androidx.appcompat.widget.AppCompatImageButton
@@ -592,8 +592,8 @@
                 android:focusable="true"
                 android:padding="10dp"
                 android:scaleType="fitXY"
+                android:src="@drawable/ic_shuffle"
                 android:tint="?attr/colorAccent"
-                app:srcCompat="@drawable/ic_shuffle"
                 tools:ignore="ContentDescription,RtlHardcoded" />
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -618,8 +618,8 @@
                 android:focusable="true"
                 android:padding="10dp"
                 android:scaleType="fitXY"
+                android:src="@drawable/ic_playlist_add"
                 android:tint="?attr/colorAccent"
-                app:srcCompat="@drawable/ic_playlist_add"
                 tools:ignore="ContentDescription,RtlHardcoded" />
 
             <androidx.appcompat.widget.AppCompatImageButton
@@ -635,7 +635,7 @@
                 android:focusable="true"
                 android:padding="10dp"
                 android:scaleType="fitXY"
-                app:srcCompat="@drawable/ic_close"
+                android:src="@drawable/ic_close"
                 app:tint="@color/white" />
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/player_fast_seek_seconds_view.xml b/app/src/main/res/layout/player_fast_seek_seconds_view.xml
index 57f5aa787..2946f8449 100644
--- a/app/src/main/res/layout/player_fast_seek_seconds_view.xml
+++ b/app/src/main/res/layout/player_fast_seek_seconds_view.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge 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"
     tools:ignore="ContentDescription"
     tools:layout_height="wrap_content"
@@ -19,21 +18,21 @@
             android:id="@+id/icon_1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_play_seek_triangle"
+            android:src="@drawable/ic_play_seek_triangle"
             tools:alpha="0.18" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon_2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_play_seek_triangle"
+            android:src="@drawable/ic_play_seek_triangle"
             tools:alpha="0.5" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/icon_3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:srcCompat="@drawable/ic_play_seek_triangle"
+            android:src="@drawable/ic_play_seek_triangle"
             tools:alpha="1" />
 
     </LinearLayout>
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 b2403583d..10d81d77e 100644
--- a/app/src/main/res/layout/player_popup_close_overlay.xml
+++ b/app/src/main/res/layout/player_popup_close_overlay.xml
@@ -10,8 +10,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center_horizontal"
         android:layout_marginBottom="24dp"
+        android:src="@drawable/ic_close"
         app:backgroundTint="@color/light_youtube_primary_color"
         app:borderWidth="0dp"
-        app:fabSize="normal"
-        app:srcCompat="@drawable/ic_close" />
+        app:fabSize="normal" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/playlist_control.xml b/app/src/main/res/layout/playlist_control.xml
index a5f258f50..5a8856128 100644
--- a/app/src/main/res/layout/playlist_control.xml
+++ b/app/src/main/res/layout/playlist_control.xml
@@ -1,6 +1,5 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -20,13 +19,12 @@
         <org.schabi.newpipe.views.NewPipeTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/ic_headset"
             android:drawablePadding="4dp"
             android:gravity="center_vertical"
             android:text="@string/controls_background_title"
             android:textColor="?attr/colorAccent"
-            android:textSize="@dimen/channel_rss_title_size"
-            app:drawableLeftCompat="@drawable/ic_headset"
-            app:drawableStartCompat="@drawable/ic_headset" />
+            android:textSize="@dimen/channel_rss_title_size" />
     </LinearLayout>
 
     <View
@@ -77,12 +75,11 @@
         <org.schabi.newpipe.views.NewPipeTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:drawableStart="@drawable/ic_picture_in_picture"
             android:drawablePadding="4dp"
             android:gravity="center_vertical"
             android:text="@string/controls_popup_title"
             android:textColor="?attr/colorAccent"
-            android:textSize="@dimen/channel_rss_title_size"
-            app:drawableLeftCompat="@drawable/ic_picture_in_picture"
-            app:drawableStartCompat="@drawable/ic_picture_in_picture" />
+            android:textSize="@dimen/channel_rss_title_size" />
     </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 577e94e4b..36540d32e 100644
--- a/app/src/main/res/layout/statistic_playlist_control.xml
+++ b/app/src/main/res/layout/statistic_playlist_control.xml
@@ -1,6 +1,5 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -22,7 +21,7 @@
             android:layout_centerVertical="true"
             android:layout_marginLeft="12dp"
             android:layout_marginRight="12dp"
-            app:srcCompat="@drawable/ic_filter_list"
+            android:src="@drawable/ic_filter_list"
             tools:ignore="ContentDescription,RtlHardcoded" />
 
         <org.schabi.newpipe.views.NewPipeTextView
diff --git a/app/src/main/res/layout/stream_quality_item.xml b/app/src/main/res/layout/stream_quality_item.xml
index 073b0b221..0230b7fa8 100644
--- a/app/src/main/res/layout/stream_quality_item.xml
+++ b/app/src/main/res/layout/stream_quality_item.xml
@@ -1,6 +1,5 @@
 <?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"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="48dp">
@@ -13,7 +12,7 @@
         android:layout_centerVertical="true"
         android:layout_marginLeft="6dp"
         android:scaleType="fitCenter"
-        app:srcCompat="@drawable/ic_volume_off"
+        android:src="@drawable/ic_volume_off"
         tools:ignore="ContentDescription,RtlHardcoded" />
 
     <org.schabi.newpipe.views.NewPipeTextView
diff --git a/app/src/main/res/layout/toolbar_search_layout.xml b/app/src/main/res/layout/toolbar_search_layout.xml
index 4fa40f313..a07ec96a3 100644
--- a/app/src/main/res/layout/toolbar_search_layout.xml
+++ b/app/src/main/res/layout/toolbar_search_layout.xml
@@ -48,8 +48,8 @@
             android:layout_gravity="center"
             android:contentDescription="@string/search"
             android:scaleType="fitCenter"
+            android:src="@drawable/ic_close"
             app:tint="?attr/toolbarSearchColor"
-            app:srcCompat="@drawable/ic_close"
             tools:ignore="RtlHardcoded" />
     </FrameLayout>