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 a29fa8c78..c7b77ee9a 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
@@ -603,19 +603,19 @@
                 android:id="@+id/view_pager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior"
-                android:paddingBottom="48dp"/>
+                android:paddingBottom="48dp"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
             <com.google.android.material.tabs.TabLayout
                 android:id="@+id/tab_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|center"
-                app:tabIndicatorGravity="top"
-                app:tabIconTint="?attr/colorAccent"
+                app:elevation="16dp"
                 app:tabBackground="?attr/windowBackground"
                 app:tabGravity="fill"
-                app:elevation="16dp"/>
+                app:tabIconTint="?attr/colorAccent"
+                app:tabIndicatorGravity="top" />
 
         </org.schabi.newpipe.views.FocusAwareCoordinator>
 
@@ -627,6 +627,7 @@
             android:layout_weight="3" />
     </LinearLayout>
 
+
     <RelativeLayout
         android:id="@+id/overlay_layout"
         android:layout_width="match_parent"
@@ -657,6 +658,7 @@
             android:focusable="true"
             android:gravity="center_vertical"
             android:orientation="vertical"
+            android:theme="@style/ContrastTintTheme"
             tools:ignore="RtlHardcoded">
 
             <org.schabi.newpipe.views.NewPipeTextView
@@ -694,8 +696,7 @@
             android:layout_height="60dp"
             android:layout_alignParentEnd="true"
             android:gravity="center_vertical"
-            android:paddingLeft="@dimen/video_item_search_padding"
-            android:paddingRight="@dimen/video_item_search_padding"
+            android:theme="@style/ContrastTintTheme"
             tools:ignore="RtlHardcoded">
 
             <ImageButton
@@ -703,7 +704,7 @@
                 android:layout_width="40dp"
                 android:layout_height="match_parent"
                 android:background="?attr/selectableItemBackground"
-                android:padding="10dp"
+                android:contentDescription="@string/title_activity_play_queue"
                 android:scaleType="center"
                 android:src="@drawable/ic_list"
                 tools:ignore="ContentDescription,RtlHardcoded" />
@@ -713,22 +714,22 @@
                 android:layout_width="40dp"
                 android:layout_height="match_parent"
                 android:background="?attr/selectableItemBackground"
-                android:padding="10dp"
-                android:scaleType="center"
+                android:contentDescription="@string/pause"
                 android:focusable="true"
                 android:focusedByDefault="true"
-                android:src="@drawable/ic_play_arrow"
-                tools:ignore="ContentDescription,RtlHardcoded" />
+                android:scaleType="center"
+                android:src="@drawable/ic_play_arrow" />
 
             <ImageButton
                 android:id="@+id/overlay_close_button"
-                android:layout_width="40dp"
+                android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:background="?attr/selectableItemBackground"
-                android:padding="10dp"
+                android:contentDescription="@string/close"
+                android:paddingRight="8dp"
                 android:scaleType="center"
                 android:src="@drawable/ic_close"
-                tools:ignore="ContentDescription,RtlHardcoded" />
+                tools:ignore="RtlSymmetry" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_video_detail.xml b/app/src/main/res/layout/fragment_video_detail.xml
index be3504878..b407c5ca7 100644
--- a/app/src/main/res/layout/fragment_video_detail.xml
+++ b/app/src/main/res/layout/fragment_video_detail.xml
@@ -41,9 +41,9 @@
                         android:id="@+id/detail_thumbnail_image_view"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:minHeight="200dp"
                         android:background="?windowBackground"
                         android:contentDescription="@string/detail_thumbnail_view_description"
+                        android:minHeight="200dp"
                         android:scaleType="fitCenter"
                         tools:ignore="RtlHardcoded"
                         tools:layout_height="200dp"
@@ -586,19 +586,19 @@
             android:id="@+id/view_pager"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"
-            android:paddingBottom="48dp"/>
+            android:paddingBottom="48dp"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
         <com.google.android.material.tabs.TabLayout
             android:id="@+id/tab_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|center"
-            app:tabIndicatorGravity="top"
-            app:tabIconTint="?attr/colorAccent"
+            app:elevation="16dp"
             app:tabBackground="?attr/windowBackground"
             app:tabGravity="fill"
-            app:elevation="16dp"/>
+            app:tabIconTint="?attr/colorAccent"
+            app:tabIndicatorGravity="top" />
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
@@ -668,8 +668,6 @@
             android:layout_height="60dp"
             android:layout_alignParentEnd="true"
             android:gravity="center_vertical"
-            android:paddingLeft="@dimen/video_item_search_padding"
-            android:paddingRight="@dimen/video_item_search_padding"
             android:theme="@style/ContrastTintTheme"
             tools:ignore="RtlHardcoded">
 
@@ -678,7 +676,7 @@
                 android:layout_width="40dp"
                 android:layout_height="match_parent"
                 android:background="?attr/selectableItemBackground"
-                android:padding="10dp"
+                android:contentDescription="@string/title_activity_play_queue"
                 android:scaleType="center"
                 android:src="@drawable/ic_list"
                 tools:ignore="ContentDescription,RtlHardcoded" />
@@ -688,22 +686,22 @@
                 android:layout_width="40dp"
                 android:layout_height="match_parent"
                 android:background="?attr/selectableItemBackground"
-                android:padding="10dp"
-                android:scaleType="center"
+                android:contentDescription="@string/pause"
                 android:focusable="true"
                 android:focusedByDefault="true"
-                android:src="@drawable/ic_play_arrow"
-                tools:ignore="ContentDescription,RtlHardcoded" />
+                android:scaleType="center"
+                android:src="@drawable/ic_play_arrow" />
 
             <ImageButton
                 android:id="@+id/overlay_close_button"
-                android:layout_width="40dp"
+                android:layout_width="48dp"
                 android:layout_height="match_parent"
                 android:background="?attr/selectableItemBackground"
-                android:padding="10dp"
+                android:contentDescription="@string/close"
+                android:paddingRight="8dp"
                 android:scaleType="center"
                 android:src="@drawable/ic_close"
-                tools:ignore="ContentDescription,RtlHardcoded" />
+                tools:ignore="RtlSymmetry" />
 
         </LinearLayout>