diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
index 481def60e..7181a7a6b 100644
--- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
+++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayerImpl.java
@@ -134,7 +134,6 @@ public class VideoPlayerImpl extends VideoPlayer
     static final String POPUP_SAVED_WIDTH = "popup_saved_width";
     static final String POPUP_SAVED_X = "popup_saved_x";
     static final String POPUP_SAVED_Y = "popup_saved_y";
-    private static final int MINIMUM_SHOW_EXTRA_WIDTH_DP = 300;
     private static final int IDLE_WINDOW_FLAGS = WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
             | WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
     private static final int ONGOING_PLAYBACK_WINDOW_FLAGS = IDLE_WINDOW_FLAGS
@@ -988,6 +987,7 @@ public class VideoPlayerImpl extends VideoPlayer
         super.onDismiss(menu);
         if (isPlaying()) {
             hideControls(DEFAULT_CONTROLS_DURATION, 0);
+            hideSystemUIIfNeeded();
         }
     }
 
@@ -1012,15 +1012,6 @@ public class VideoPlayerImpl extends VideoPlayer
 
             setInitialGestureValues();
             queueLayout.getLayoutParams().height = height - queueLayout.getTop();
-
-            if (popupPlayerSelected()) {
-                final float widthDp = Math.abs(r - l) / service.getResources()
-                        .getDisplayMetrics().density;
-                final int visibility = widthDp > MINIMUM_SHOW_EXTRA_WIDTH_DP
-                        ? View.VISIBLE
-                        : View.GONE;
-                secondaryControls.setVisibility(visibility);
-            }
         }
     }
 
diff --git a/app/src/main/res/layout-large-land/player.xml b/app/src/main/res/layout-large-land/player.xml
index 6c500edb6..78bca8cf5 100644
--- a/app/src/main/res/layout-large-land/player.xml
+++ b/app/src/main/res/layout-large-land/player.xml
@@ -232,29 +232,29 @@
                     tools:ignore="HardcodedText,RtlHardcoded"
                     tools:text="FIT"/>
 
-                <Button
-                    android:id="@+id/captionTextView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:padding="@dimen/player_main_buttons_padding"
-                    android:layout_marginEnd="8dp"
-                    android:gravity="center|left"
-                    android:minHeight="35dp"
-                    android:lines="1"
-                    android:ellipsize="end"
-                    android:minWidth="50dp"
-                    android:textColor="@android:color/white"
-                    android:textStyle="bold"
-                    android:textAllCaps="false"
-                    android:background="?attr/selectableItemBackground"
-                    tools:ignore="RelativeOverlap,RtlHardcoded"
-                    tools:text="English"/>
-
-                <Space
-                    android:id="@+id/spaceBeforeButton"
+                <FrameLayout
                     android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_weight="3"/>
+                    android:layout_height="wrap_content"
+                    android:layout_weight="3">
+
+                    <TextView
+                        android:id="@+id/captionTextView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/player_main_buttons_padding"
+                        android:layout_marginEnd="8dp"
+                        android:gravity="center|left"
+                        android:minHeight="35dp"
+                        android:lines="1"
+                        android:ellipsize="end"
+                        android:minWidth="50dp"
+                        android:textColor="@android:color/white"
+                        android:textStyle="bold"
+                        android:background="?attr/selectableItemBackground"
+                        tools:ignore="RelativeOverlap,RtlHardcoded"
+                        tools:text="English"/>
+
+                </FrameLayout>
 
                 <androidx.appcompat.widget.AppCompatImageButton
                     android:id="@+id/playWithKodi"
@@ -311,25 +311,24 @@
                     android:contentDescription="@string/mute"
                     tools:ignore="RtlHardcoded" />
 
+                <androidx.appcompat.widget.AppCompatImageButton
+                    android:id="@+id/fullScreenButton"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:padding="@dimen/player_main_buttons_padding"
+                    android:background="?attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:scaleType="fitCenter"
+                    app:srcCompat="@drawable/ic_fullscreen_white_24dp"
+                    tools:ignore="ContentDescription,RtlHardcoded"
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
+
                 </LinearLayout>
 
             </LinearLayout>
 
-            <androidx.appcompat.widget.AppCompatImageButton
-                android:id="@+id/fullScreenButton"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:padding="@dimen/player_main_buttons_padding"
-                android:layout_alignParentRight="true"
-                android:background="?attr/selectableItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:scaleType="fitCenter"
-                app:srcCompat="@drawable/ic_fullscreen_white_24dp"
-                tools:ignore="ContentDescription,RtlHardcoded"
-                android:visibility="gone"
-                tools:visibility="visible"/>
-
             <LinearLayout
                 android:id="@+id/bottomControls"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
index 751d1cc93..c52a78f96 100644
--- a/app/src/main/res/layout/player.xml
+++ b/app/src/main/res/layout/player.xml
@@ -231,29 +231,29 @@
                     tools:ignore="HardcodedText,RtlHardcoded"
                     tools:text="FIT"/>
 
-                <TextView
-                    android:id="@+id/captionTextView"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:padding="@dimen/player_main_buttons_padding"
-                    android:layout_marginEnd="8dp"
-                    android:gravity="center|left"
-                    android:minHeight="35dp"
-                    android:maxWidth="100dp"
-                    android:lines="1"
-                    android:ellipsize="end"
-                    android:minWidth="50dp"
-                    android:textColor="@android:color/white"
-                    android:textStyle="bold"
-                    android:background="?attr/selectableItemBackground"
-                    tools:ignore="RelativeOverlap,RtlHardcoded"
-                    tools:text="English"/>
-
-                <Space
-                    android:id="@+id/spaceBeforeButton"
+                <FrameLayout
                     android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:layout_weight="3"/>
+                    android:layout_height="wrap_content"
+                    android:layout_weight="3">
+
+                    <TextView
+                        android:id="@+id/captionTextView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:padding="@dimen/player_main_buttons_padding"
+                        android:layout_marginEnd="8dp"
+                        android:gravity="center|left"
+                        android:minHeight="35dp"
+                        android:lines="1"
+                        android:ellipsize="end"
+                        android:minWidth="50dp"
+                        android:textColor="@android:color/white"
+                        android:textStyle="bold"
+                        android:background="?attr/selectableItemBackground"
+                        tools:ignore="RelativeOverlap,RtlHardcoded"
+                        tools:text="English"/>
+
+                </FrameLayout>
 
                 <androidx.appcompat.widget.AppCompatImageButton
                     android:id="@+id/playWithKodi"
@@ -310,25 +310,24 @@
                     android:contentDescription="@string/mute"
                     tools:ignore="RtlHardcoded" />
 
+                <androidx.appcompat.widget.AppCompatImageButton
+                    android:id="@+id/fullScreenButton"
+                    android:layout_width="40dp"
+                    android:layout_height="40dp"
+                    android:padding="@dimen/player_main_buttons_padding"
+                    android:background="?attr/selectableItemBackground"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:scaleType="fitCenter"
+                    app:srcCompat="@drawable/ic_fullscreen_white_24dp"
+                    tools:ignore="ContentDescription,RtlHardcoded"
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
+
                 </LinearLayout>
 
             </LinearLayout>
 
-            <androidx.appcompat.widget.AppCompatImageButton
-                android:id="@+id/fullScreenButton"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:padding="@dimen/player_main_buttons_padding"
-                android:layout_alignParentRight="true"
-                android:background="?attr/selectableItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                android:scaleType="fitCenter"
-                app:srcCompat="@drawable/ic_fullscreen_white_24dp"
-                tools:ignore="ContentDescription,RtlHardcoded"
-                android:visibility="gone"
-                tools:visibility="visible"/>
-
             <LinearLayout
                 android:id="@+id/bottomControls"
                 android:layout_width="match_parent"