diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
index 9cc4357d7..28e2f688e 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
@@ -1511,7 +1511,7 @@ public class VideoDetailFragment
                 getChildFragmentManager().beginTransaction()
                         .replace(R.id.relatedStreamsLayout,
                                 RelatedVideosFragment.getInstance(info))
-                        .commitNow();
+                        .commitAllowingStateLoss();
                 relatedStreamsLayout.setVisibility(
                         player != null && player.isFullscreen() ? View.GONE : View.VISIBLE);
             }
diff --git a/app/src/main/res/drawable/ic_list_black_24dp.xml b/app/src/main/res/drawable/ic_list_black_24dp.xml
index 4c2fb8834..7020c1c56 100644
--- a/app/src/main/res/drawable/ic_list_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_list_black_24dp.xml
@@ -1,9 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
+        android:width="43.2dp"
         android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z"/>
+        android:viewportWidth="18"
+        android:viewportHeight="10">
+    <path android:fillColor="#000000"
+          android:pathData="M0,6L2,6L2,4L0,4L0,6L0,6ZM0,10L2,10L2,8L0,8L0,10L0,10ZM0,2L2,2L2,0L0,0L0,2L0,2ZM4,6L18,6L18,4L4,4L4,6L4,6ZM4,10L18,10L18,8L4,8L4,10L4,10ZM4,0L4,2L18,2L18,0L4,0L4,0Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_list_white_24dp.xml b/app/src/main/res/drawable/ic_list_white_24dp.xml
index f47037629..c9ae06017 100644
--- a/app/src/main/res/drawable/ic_list_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_list_white_24dp.xml
@@ -1,5 +1,9 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M3,13h2v-2L3,11v2zM3,17h2v-2L3,15v2zM3,9h2L5,7L3,7v2zM7,13h14v-2L7,11v2zM7,17h14v-2L7,15v2zM7,7v2h14L21,7L7,7z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="43.2dp"
+        android:height="24dp"
+        android:viewportWidth="18"
+        android:viewportHeight="10">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M0,6L2,6L2,4L0,4L0,6L0,6ZM0,10L2,10L2,8L0,8L0,10L0,10ZM0,2L2,2L2,0L0,0L0,2L0,2ZM4,6L18,6L18,4L4,4L4,6L4,6ZM4,10L18,10L18,8L4,8L4,10L4,10ZM4,0L4,2L18,2L18,0L4,0L4,0Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_next_white_24dp.xml b/app/src/main/res/drawable/ic_next_white_24dp.xml
new file mode 100644
index 000000000..603880c2b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_next_white_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="#ffffff">
+    <!-- Tint here is for preventing pixelization -->
+    <path android:fillColor="#ffffff"
+          android:pathData="M5,19 L15,12 5,5ZM16,5v14h3v-14z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_previous_white_24dp.xml b/app/src/main/res/drawable/ic_previous_white_24dp.xml
new file mode 100644
index 000000000..14279ecb2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_previous_white_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="#ffffff">
+    <!-- Tint here is for preventing pixelization -->
+    <path android:fillColor="#ffffff"
+          android:pathData="m19,5 l-10,7 10,7zM8,19v-14H5v14z"/>
+</vector>
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 84a29e0c8..a7872a83a 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
@@ -185,7 +185,7 @@
             android:orientation="horizontal"
             tools:ignore="RtlHardcoded">
 
-            <ImageButton
+            <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/control_backward"
                 android:layout_width="wrap_content"
                 android:layout_height="35dp"
@@ -198,8 +198,8 @@
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:clickable="true"
                 android:focusable="true"
-                android:scaleType="fitXY"
-                android:src="@drawable/exo_controls_previous"
+                android:scaleType="fitCenter"
+                app:srcCompat="@drawable/ic_previous_white_24dp"
                 android:tint="?attr/colorAccent"
                 tools:ignore="ContentDescription" />
 
@@ -238,7 +238,7 @@
                 app:srcCompat="@drawable/ic_shuffle_white_24dp"
                 tools:ignore="ContentDescription"/>
 
-            <ImageButton
+            <androidx.appcompat.widget.AppCompatImageButton
                 android:id="@+id/control_forward"
                 android:layout_width="wrap_content"
                 android:layout_height="35dp"
@@ -251,8 +251,8 @@
                 android:background="?attr/selectableItemBackgroundBorderless"
                 android:clickable="true"
                 android:focusable="true"
-                android:scaleType="fitXY"
-                android:src="@drawable/exo_controls_next"
+                android:scaleType="fitCenter"
+                app:srcCompat="@drawable/ic_next_white_24dp"
                 android:tint="?attr/colorAccent"
                 tools:ignore="ContentDescription" />
         </RelativeLayout>
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 26a2ebc8b..92288933b 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
@@ -217,7 +217,6 @@
 
                 <Button
                     android:id="@+id/qualityTextView"
-                    style="@style/Widget.AppCompat.Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="35dp"
                     android:minWidth="0dp"
@@ -228,36 +227,38 @@
                     android:textColor="@android:color/white"
                     android:textStyle="bold"
                     android:textAllCaps="false"
+                    android:background="?attr/selectableItemBackground"
                     tools:ignore="HardcodedText,RtlHardcoded"/>
 
                 <Button
                     android:id="@+id/playbackSpeed"
-                    style="@style/Widget.AppCompat.Button.Borderless"
-                    android:layout_width="45dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="35dp"
                     android:padding="@dimen/player_main_buttons_padding"
                     android:layout_marginEnd="8dp"
                     android:gravity="center"
-                    android:minHeight="35dp"
+                    android:minWidth="0dp"
                     android:textColor="@android:color/white"
                     android:textStyle="bold"
                     android:textAllCaps="false"
+                    android:background="?attr/selectableItemBackground"
                     tools:ignore="RtlHardcoded,RtlSymmetry"
                     tools:text="1x"/>
 
                 <androidx.appcompat.widget.AppCompatImageButton
                     android:id="@+id/queueButton"
-                    android:layout_width="45dp"
+                    android:layout_width="40dp"
                     android:layout_height="35dp"
-                    android:padding="@dimen/player_main_buttons_padding"
+                    android:padding="10dp"
                     android:layout_marginEnd="8dp"
                     android:clickable="true"
                     android:focusable="true"
-                    android:scaleType="fitXY"
+                    android:scaleType="fitCenter"
                     app:srcCompat="@drawable/ic_list_white_24dp"
                     android:background="?attr/selectableItemBackground"
                     tools:ignore="ContentDescription,RtlHardcoded"
-                    android:visibility="gone"/>
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
 
                 <androidx.appcompat.widget.AppCompatImageButton
                     android:id="@+id/moreOptionsButton"
@@ -284,7 +285,6 @@
 
                 <Button
                     android:id="@+id/resizeTextView"
-                    style="@style/Widget.AppCompat.Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="35dp"
                     android:padding="@dimen/player_main_buttons_padding"
@@ -299,7 +299,6 @@
                     tools:text="FIT"/>
 
                 <Button
-                    style="@style/Widget.AppCompat.Button.Borderless"
                     android:id="@+id/captionTextView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -480,7 +479,7 @@
             android:weightSum="5.5">
             <!--tools:visibility="gone">-->
 
-        <ImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/playPreviousButton"
             android:layout_width="0dp"
             android:layout_height="100dp"
@@ -490,7 +489,7 @@
             android:focusable="true"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:scaleType="fitCenter"
-            android:src="@drawable/exo_controls_previous"
+            app:srcCompat="@drawable/ic_previous_white_24dp"
             tools:ignore="ContentDescription"/>
 
 
@@ -504,7 +503,7 @@
             app:srcCompat="@drawable/ic_pause_white_24dp"
             tools:ignore="ContentDescription"/>
 
-        <ImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/playNextButton"
             android:layout_width="0dp"
             android:layout_height="100dp"
@@ -514,7 +513,7 @@
             android:focusable="true"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:scaleType="fitCenter"
-            android:src="@drawable/exo_controls_next"
+            app:srcCompat="@drawable/ic_next_white_24dp"
             tools:ignore="ContentDescription"/>
 
         </LinearLayout>
@@ -660,7 +659,6 @@
 
     <Button
         android:id="@+id/closeButton"
-        style="@style/Widget.AppCompat.Button.Borderless"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
diff --git a/app/src/main/res/layout/activity_main_player.xml b/app/src/main/res/layout/activity_main_player.xml
index 25eddf621..e4a1e7c0c 100644
--- a/app/src/main/res/layout/activity_main_player.xml
+++ b/app/src/main/res/layout/activity_main_player.xml
@@ -237,11 +237,11 @@
                 <TextView
                     android:id="@+id/playbackSpeed"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="35dp"
                     android:padding="@dimen/player_main_buttons_padding"
                     android:layout_marginEnd="8dp"
                     android:gravity="center"
-                    android:minHeight="35dp"
+                    android:minWidth="0dp"
                     android:textColor="@android:color/white"
                     android:textStyle="bold"
                     android:background="?attr/selectableItemBackground"
@@ -250,13 +250,13 @@
 
                 <androidx.appcompat.widget.AppCompatImageButton
                     android:id="@+id/queueButton"
-                    android:layout_width="30dp"
+                    android:layout_width="40dp"
                     android:layout_height="35dp"
-                    android:padding="@dimen/player_main_buttons_padding"
+                    android:padding="10dp"
                     android:layout_marginEnd="8dp"
                     android:clickable="true"
                     android:focusable="true"
-                    android:scaleType="fitXY"
+                    android:scaleType="fitCenter"
                     app:srcCompat="@drawable/ic_list_white_24dp"
                     android:background="?attr/selectableItemBackground"
                     tools:ignore="ContentDescription,RtlHardcoded"
@@ -480,7 +480,7 @@
             android:weightSum="5.5">
             <!--tools:visibility="gone">-->
 
-        <ImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/playPreviousButton"
             android:layout_width="0dp"
             android:layout_height="100dp"
@@ -490,7 +490,7 @@
             android:focusable="true"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:scaleType="fitCenter"
-            android:src="@drawable/exo_controls_previous"
+            app:srcCompat="@drawable/ic_previous_white_24dp"
             tools:ignore="ContentDescription"/>
 
 
@@ -504,7 +504,7 @@
             app:srcCompat="@drawable/ic_pause_white_24dp"
             tools:ignore="ContentDescription"/>
 
-        <ImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/playNextButton"
             android:layout_width="0dp"
             android:layout_height="100dp"
@@ -514,7 +514,7 @@
             android:focusable="true"
             android:background="?attr/selectableItemBackgroundBorderless"
             android:scaleType="fitCenter"
-            android:src="@drawable/exo_controls_next"
+            app:srcCompat="@drawable/ic_next_white_24dp"
             tools:ignore="ContentDescription"/>
 
         </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 c5b8e5743..c5d3b0eb8 100644
--- a/app/src/main/res/layout/activity_player_queue_control.xml
+++ b/app/src/main/res/layout/activity_player_queue_control.xml
@@ -184,7 +184,7 @@
             app:srcCompat="@drawable/ic_repeat_white_24dp"
             tools:ignore="ContentDescription"/>
 
-        <ImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/control_backward"
             android:layout_width="40dp"
             android:layout_height="40dp"
@@ -196,7 +196,7 @@
             android:focusable="true"
             android:scaleType="fitCenter"
             android:tint="?attr/colorAccent"
-            android:src="@drawable/exo_controls_previous"
+            app:srcCompat="@drawable/ic_previous_white_24dp"
             tools:ignore="ContentDescription"/>
 
         <ImageButton
@@ -263,7 +263,7 @@
             android:tint="?attr/colorAccent"
             android:src="@drawable/exo_controls_fastforward"/>
 
-        <ImageButton
+        <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/control_forward"
             android:layout_width="40dp"
             android:layout_height="40dp"
@@ -275,7 +275,7 @@
             android:focusable="true"
             android:scaleType="fitCenter"
             android:tint="?attr/colorAccent"
-            android:src="@drawable/exo_controls_next"
+            app:srcCompat="@drawable/ic_next_white_24dp"
             tools:ignore="ContentDescription"/>
 
         <ImageButton