diff --git a/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java b/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java
index 68648a8ad..62f25810b 100644
--- a/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java
+++ b/app/src/main/java/org/schabi/newpipe/player/NotificationUtil.java
@@ -356,7 +356,7 @@ public final class NotificationUtil {
                 }
                 break;
             case "close":
-                builder.addAction(R.drawable.ic_close_white_32dp, "Close",
+                builder.addAction(R.drawable.ic_close_white_24dp, "Close",
                         PendingIntent.getBroadcast(context, NOTIFICATION_ID_BACKGROUND,
                                 new Intent(BackgroundPlayer.ACTION_CLOSE),
                                 PendingIntent.FLAG_UPDATE_CURRENT));
@@ -450,7 +450,7 @@ public final class NotificationUtil {
                     notificationBuilder.setSmallIcon(android.R.drawable.stat_sys_download);
                 } else if (basePlayerImpl.getCurrentState() == BasePlayer.STATE_COMPLETED) {
                     notificationBuilder.mActions.set(slotNumber,
-                            new NotificationCompat.Action(R.drawable.ic_replay_white_32dp,
+                            new NotificationCompat.Action(R.drawable.ic_replay_white_24dp,
                                     "Completed", PendingIntent.getBroadcast(context,
                                     NOTIFICATION_ID_BACKGROUND,
                                     new Intent(BackgroundPlayer.ACTION_PLAY_PAUSE),
@@ -486,7 +486,7 @@ public final class NotificationUtil {
                                     PendingIntent.FLAG_UPDATE_CURRENT)));
                 } else if (basePlayerImpl.getCurrentState() == BasePlayer.STATE_COMPLETED) {
                     notificationBuilder.mActions.set(slotNumber,
-                            new NotificationCompat.Action(R.drawable.ic_replay_white_32dp,
+                            new NotificationCompat.Action(R.drawable.ic_replay_white_24dp,
                                     "Completed", PendingIntent.getBroadcast(context,
                                     NOTIFICATION_ID_BACKGROUND,
                                     new Intent(BackgroundPlayer.ACTION_PLAY_PAUSE),
@@ -611,7 +611,7 @@ public final class NotificationUtil {
                 break;
             case "close":
                 notificationBuilder.mActions.set(slotNumber,
-                        new NotificationCompat.Action(R.drawable.ic_close_white_32dp, "Close",
+                        new NotificationCompat.Action(R.drawable.ic_close_white_24dp, "Close",
                                 PendingIntent.getBroadcast(context, NOTIFICATION_ID_BACKGROUND,
                                         new Intent(BackgroundPlayer.ACTION_CLOSE),
                                         PendingIntent.FLAG_UPDATE_CURRENT)));
@@ -840,7 +840,7 @@ public final class NotificationUtil {
                 }
                 break;
             case "close":
-                builder.addAction(R.drawable.ic_close_white_32dp, "Close",
+                builder.addAction(R.drawable.ic_close_white_24dp, "Close",
                         PendingIntent.getBroadcast(context, NOTIFICATION_ID_POPUP,
                                 new Intent(PopupVideoPlayer.ACTION_CLOSE),
                                 PendingIntent.FLAG_UPDATE_CURRENT));
@@ -927,7 +927,7 @@ public final class NotificationUtil {
                     notificationBuilder.setSmallIcon(android.R.drawable.stat_sys_download);
                 } else if (playerImpl.getCurrentState() == BasePlayer.STATE_COMPLETED) {
                     notificationBuilder.mActions.set(slotNumber,
-                            new NotificationCompat.Action(R.drawable.ic_replay_white_32dp,
+                            new NotificationCompat.Action(R.drawable.ic_replay_white_24dp,
                                     "Completed", PendingIntent.getBroadcast(context,
                                     NOTIFICATION_ID_POPUP,
                                     new Intent(PopupVideoPlayer.ACTION_PLAY_PAUSE),
@@ -963,7 +963,7 @@ public final class NotificationUtil {
                                     PendingIntent.FLAG_UPDATE_CURRENT)));
                 } else if (playerImpl.getCurrentState() == BasePlayer.STATE_COMPLETED) {
                     notificationBuilder.mActions.set(slotNumber,
-                            new NotificationCompat.Action(R.drawable.ic_replay_white_32dp,
+                            new NotificationCompat.Action(R.drawable.ic_replay_white_24dp,
                                     "Completed", PendingIntent.getBroadcast(context,
                                     NOTIFICATION_ID_POPUP,
                                     new Intent(PopupVideoPlayer.ACTION_PLAY_PAUSE),
@@ -1090,7 +1090,7 @@ public final class NotificationUtil {
                 break;
             case "close":
                 notificationBuilder.mActions.set(slotNumber,
-                        new NotificationCompat.Action(R.drawable.ic_close_white_32dp, "Close",
+                        new NotificationCompat.Action(R.drawable.ic_close_white_24dp, "Close",
                                 PendingIntent.getBroadcast(context, NOTIFICATION_ID_POPUP,
                                         new Intent(PopupVideoPlayer.ACTION_CLOSE),
                                         PendingIntent.FLAG_UPDATE_CURRENT)));
diff --git a/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png
deleted file mode 100644
index ceb1a1eeb..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_close_white_32dp.png b/app/src/main/res/drawable-hdpi/ic_close_white_32dp.png
deleted file mode 100644
index b7c7ffd0e..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_close_white_32dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_replay_white_24dp.png
deleted file mode 100644
index fcddcf02d..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_replay_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_replay_white_32dp.png b/app/src/main/res/drawable-hdpi/ic_replay_white_32dp.png
deleted file mode 100644
index ac1dd1a66..000000000
Binary files a/app/src/main/res/drawable-hdpi/ic_replay_white_32dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png
deleted file mode 100644
index af7f8288d..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_close_white_32dp.png b/app/src/main/res/drawable-mdpi/ic_close_white_32dp.png
deleted file mode 100644
index 20b61eaee..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_close_white_32dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_replay_white_24dp.png
deleted file mode 100644
index 3b4191325..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_replay_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_replay_white_32dp.png b/app/src/main/res/drawable-mdpi/ic_replay_white_32dp.png
deleted file mode 100644
index 0a1d09cbf..000000000
Binary files a/app/src/main/res/drawable-mdpi/ic_replay_white_32dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png
deleted file mode 100644
index b7c7ffd0e..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_close_white_32dp.png b/app/src/main/res/drawable-xhdpi/ic_close_white_32dp.png
deleted file mode 100644
index cc1334734..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_close_white_32dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_replay_white_24dp.png
deleted file mode 100644
index 1573fb111..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_replay_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_replay_white_32dp.png b/app/src/main/res/drawable-xhdpi/ic_replay_white_32dp.png
deleted file mode 100644
index dfa434473..000000000
Binary files a/app/src/main/res/drawable-xhdpi/ic_replay_white_32dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png
deleted file mode 100644
index 6b717e0dd..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_white_32dp.png b/app/src/main/res/drawable-xxhdpi/ic_close_white_32dp.png
deleted file mode 100644
index 396419219..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_close_white_32dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp.png
deleted file mode 100644
index 5105c2251..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_replay_white_32dp.png b/app/src/main/res/drawable-xxhdpi/ic_replay_white_32dp.png
deleted file mode 100644
index 1573fb111..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/ic_replay_white_32dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png
deleted file mode 100644
index 396419219..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_white_32dp.png b/app/src/main/res/drawable-xxxhdpi/ic_close_white_32dp.png
deleted file mode 100644
index c56b1fcfc..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_close_white_32dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp.png
deleted file mode 100644
index 04cbde9af..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_replay_white_32dp.png b/app/src/main/res/drawable-xxxhdpi/ic_replay_white_32dp.png
deleted file mode 100644
index b51ecf755..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_replay_white_32dp.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_close_white_24dp.xml b/app/src/main/res/drawable/ic_close_white_24dp.xml
new file mode 100644
index 000000000..d11cc5c9c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_replay_white_24dp.xml b/app/src/main/res/drawable/ic_replay_white_24dp.xml
new file mode 100644
index 000000000..8e84c195b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_replay_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,5V1L7,6l5,5V7c3.31,0 6,2.69 6,6s-2.69,6 -6,6 -6,-2.69 -6,-6H4c0,4.42 3.58,8 8,8s8,-3.58 8,-8 -3.58,-8 -8,-8z"/>
+</vector>
diff --git a/app/src/main/res/layout-large-land/activity_main_player.xml b/app/src/main/res/layout-large-land/activity_main_player.xml
index 16dcff639..8f683ccdf 100644
--- a/app/src/main/res/layout-large-land/activity_main_player.xml
+++ b/app/src/main/res/layout-large-land/activity_main_player.xml
@@ -65,18 +65,18 @@
                 android:id="@+id/playQueueClose"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:layout_centerVertical="true"
-                android:layout_alignParentRight="true"
                 android:layout_alignParentEnd="true"
-                android:layout_marginRight="40dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
                 android:layout_marginEnd="40dp"
-                android:padding="10dp"
+                android:layout_marginRight="40dp"
+                android:background="?android:selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
+                android:padding="10dp"
                 android:scaleType="fitXY"
                 android:tint="?attr/colorAccent"
                 app:srcCompat="@drawable/ic_close_white_24dp"
-                android:background="?android:selectableItemBackground"
                 tools:ignore="ContentDescription"/>
 
             <ImageButton
diff --git a/app/src/main/res/layout/activity_main_player.xml b/app/src/main/res/layout/activity_main_player.xml
index 4bae123ee..bb7caa8a8 100644
--- a/app/src/main/res/layout/activity_main_player.xml
+++ b/app/src/main/res/layout/activity_main_player.xml
@@ -63,19 +63,19 @@
                 android:id="@+id/playQueueClose"
                 android:layout_width="50dp"
                 android:layout_height="50dp"
-                android:layout_centerVertical="true"
-                android:layout_alignParentRight="true"
                 android:layout_alignParentEnd="true"
-                android:layout_marginRight="40dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
                 android:layout_marginEnd="40dp"
-                android:padding="10dp"
+                android:layout_marginRight="40dp"
+                android:background="?android:selectableItemBackground"
                 android:clickable="true"
                 android:focusable="true"
+                android:padding="10dp"
                 android:scaleType="fitXY"
                 android:tint="?attr/colorAccent"
                 app:srcCompat="@drawable/ic_close_white_24dp"
-                android:background="?android:selectableItemBackground"
-                tools:ignore="ContentDescription"/>
+                tools:ignore="ContentDescription" />
 
             <ImageButton
                 android:id="@+id/repeatButton"
diff --git a/app/src/main/res/layout/player_background_notification.xml b/app/src/main/res/layout/player_background_notification.xml
index e04d72f7d..dc7215fb5 100644
--- a/app/src/main/res/layout/player_background_notification.xml
+++ b/app/src/main/res/layout/player_background_notification.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout 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="64dp"
-             xmlns:tools="http://schemas.android.com/tools">
+    android:layout_height="64dp"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <LinearLayout
         android:id="@+id/notificationContent"
@@ -107,8 +107,8 @@
             android:focusable="true"
             android:padding="5dp"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_close_white_24dp"
-            tools:ignore="ContentDescription,RtlHardcoded"/>
+            app:srcCompat="@drawable/ic_close_white_24dp"
+            tools:ignore="ContentDescription,RtlHardcoded" />
     </LinearLayout>
 
     <ProgressBar
@@ -121,4 +121,4 @@
         android:progressDrawable="@drawable/custom_progress_bar"
         tools:ignore="RtlHardcoded"
         tools:progress="52"/>
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/player_background_notification_expanded.xml b/app/src/main/res/layout/player_background_notification_expanded.xml
index e5a9b632b..80bc22627 100644
--- a/app/src/main/res/layout/player_background_notification_expanded.xml
+++ b/app/src/main/res/layout/player_background_notification_expanded.xml
@@ -29,8 +29,8 @@
         android:focusable="true"
         android:padding="8dp"
         android:scaleType="fitCenter"
-        android:src="@drawable/ic_close_white_24dp"
-        tools:ignore="ContentDescription,RtlHardcoded"/>
+        app:srcCompat="@drawable/ic_close_white_24dp"
+        tools:ignore="ContentDescription,RtlHardcoded" />
 
 
     <LinearLayout
@@ -162,4 +162,4 @@
             android:src="@drawable/exo_controls_next"
             tools:ignore="ContentDescription"/>
     </RelativeLayout>
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
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 cba06874e..e7607edaf 100644
--- a/app/src/main/res/layout/player_popup_close_overlay.xml
+++ b/app/src/main/res/layout/player_popup_close_overlay.xml
@@ -1,6 +1,5 @@
 <?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:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -11,8 +10,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center_horizontal"
         android:layout_marginBottom="24dp"
-        app:srcCompat="@drawable/ic_close_white_24dp"
         app:backgroundTint="@color/light_youtube_primary_color"
         app:borderWidth="0dp"
-        app:fabSize="normal"/>
-</FrameLayout>
\ No newline at end of file
+        app:fabSize="normal"
+        app:srcCompat="@drawable/ic_close_white_24dp" />
+</FrameLayout>
diff --git a/app/src/main/res/layout/player_popup_notification.xml b/app/src/main/res/layout/player_popup_notification.xml
index e8b077ecc..1aa767c58 100644
--- a/app/src/main/res/layout/player_popup_notification.xml
+++ b/app/src/main/res/layout/player_popup_notification.xml
@@ -83,6 +83,6 @@
         android:focusable="true"
         android:padding="5dp"
         android:scaleType="fitCenter"
-        android:src="@drawable/ic_close_white_24dp"
-        tools:ignore="ContentDescription,RtlHardcoded"/>
-</LinearLayout>
\ No newline at end of file
+        app:srcCompat="@drawable/ic_close_white_24dp"
+        tools:ignore="ContentDescription,RtlHardcoded" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/toolbar_search_layout.xml b/app/src/main/res/layout/toolbar_search_layout.xml
index 9a7d56a6e..74647e2e0 100644
--- a/app/src/main/res/layout/toolbar_search_layout.xml
+++ b/app/src/main/res/layout/toolbar_search_layout.xml
@@ -47,7 +47,7 @@
             android:contentDescription="@string/search"
             android:scaleType="fitCenter"
             app:srcCompat="?attr/ic_close"
-            tools:ignore="RtlHardcoded"/>
+            tools:ignore="RtlHardcoded" />
     </FrameLayout>
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>