diff --git a/app/src/main/res/layout/player.xml b/app/src/main/res/layout/player.xml
index 1aaf45383..be4ed59bf 100644
--- a/app/src/main/res/layout/player.xml
+++ b/app/src/main/res/layout/player.xml
@@ -240,151 +240,137 @@
                     android:id="@+id/secondaryControls"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:baselineAligned="false"
                     android:gravity="top"
                     android:visibility="invisible"
                     tools:ignore="RtlHardcoded"
                     tools:visibility="visible">
 
-                    <LinearLayout
+                    <org.schabi.newpipe.views.NewPipeTextView
+                        android:id="@+id/resizeTextView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="35dp"
+                        android:layout_marginEnd="8dp"
+                        android:background="?attr/selectableItemBackground"
+                        android:gravity="center"
+                        android:minWidth="50dp"
+                        android:padding="@dimen/player_main_buttons_padding"
+                        android:textColor="@android:color/white"
+                        android:textStyle="bold"
+                        tools:ignore="HardcodedText,RtlHardcoded"
+                        tools:text="FIT" />
+
+                    <FrameLayout
                         android:layout_width="0dp"
-                        android:layout_height="match_parent"
-                        android:layout_weight="1">
+                        android:layout_height="wrap_content"
+                        android:layout_weight="3">
 
                         <org.schabi.newpipe.views.NewPipeTextView
-                            android:id="@+id/resizeTextView"
+                            android:id="@+id/captionTextView"
                             android:layout_width="wrap_content"
-                            android:layout_height="35dp"
+                            android:layout_height="wrap_content"
                             android:layout_marginEnd="8dp"
                             android:background="?attr/selectableItemBackground"
-                            android:gravity="center"
+                            android:ellipsize="end"
+                            android:gravity="center|left"
+                            android:lines="1"
                             android:minWidth="50dp"
+                            android:minHeight="35dp"
                             android:padding="@dimen/player_main_buttons_padding"
                             android:textColor="@android:color/white"
                             android:textStyle="bold"
-                            tools:ignore="HardcodedText,RtlHardcoded"
-                            tools:text="FIT" />
+                            tools:ignore="RelativeOverlap,RtlHardcoded"
+                            tools:text="English" />
 
-                        <FrameLayout
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_weight="3">
+                    </FrameLayout>
 
-                            <org.schabi.newpipe.views.NewPipeTextView
-                                android:id="@+id/captionTextView"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_marginEnd="8dp"
-                                android:background="?attr/selectableItemBackground"
-                                android:ellipsize="end"
-                                android:gravity="center|left"
-                                android:lines="1"
-                                android:minWidth="50dp"
-                                android:minHeight="35dp"
-                                android:padding="@dimen/player_main_buttons_padding"
-                                android:textColor="@android:color/white"
-                                android:textStyle="bold"
-                                tools:ignore="RelativeOverlap,RtlHardcoded"
-                                tools:text="English" />
-
-                        </FrameLayout>
-
-                    </LinearLayout>
-
-                    <LinearLayout
+                    <androidx.appcompat.widget.AppCompatImageButton
+                        android:id="@+id/playWithKodi"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="right">
-
-                        <androidx.appcompat.widget.AppCompatImageButton
-                            android:id="@+id/playWithKodi"
-                            android:layout_width="0dp"
-                            android:layout_height="35dp"
-                            android:layout_weight="1"
-                            android:background="?attr/selectableItemBackgroundBorderless"
-                            android:clickable="true"
-                            android:contentDescription="@string/play_with_kodi_title"
-                            android:focusable="true"
-                            android:padding="@dimen/player_main_buttons_padding"
-                            android:scaleType="center"
+                        android:layout_height="35dp"
+                        android:layout_marginEnd="8dp"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:clickable="true"
+                        android:contentDescription="@string/play_with_kodi_title"
+                        android:focusable="true"
+                        android:padding="@dimen/player_main_buttons_padding"
+                        android:scaleType="fitXY"
                         app:srcCompat="@drawable/ic_cast"
-                            app:tint="@color/white"
+                        app:tint="@color/white"
                         tools:ignore="RtlHardcoded" />
 
-                        <androidx.appcompat.widget.AppCompatImageButton
-                            android:id="@+id/openInBrowser"
-                            android:layout_width="0dp"
-                            android:layout_height="35dp"
-                            android:layout_weight="1"
-                            android:background="?attr/selectableItemBackgroundBorderless"
-                            android:clickable="true"
-                            android:contentDescription="@string/open_in_browser"
-                            android:focusable="true"
-                            android:padding="@dimen/player_main_buttons_padding"
-                            android:scaleType="center"
-                            app:srcCompat="@drawable/ic_language"
+                    <androidx.appcompat.widget.AppCompatImageButton
+                        android:id="@+id/openInBrowser"
+                        android:layout_width="wrap_content"
+                        android:layout_height="35dp"
+                        android:layout_marginEnd="8dp"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:clickable="true"
+                        android:contentDescription="@string/open_in_browser"
+                        android:focusable="true"
+                        android:padding="@dimen/player_main_buttons_padding"
+                        android:scaleType="fitXY"
+                        app:srcCompat="@drawable/ic_language"
                         app:tint="@color/white"
-                            tools:ignore="RtlHardcoded" />
+                        tools:ignore="RtlHardcoded" />
 
-                        <androidx.appcompat.widget.AppCompatImageButton
-                            android:id="@+id/share"
-                            android:layout_width="0dp"
-                            android:layout_height="35dp"
-                            android:layout_weight="1"
-                            android:background="?attr/selectableItemBackgroundBorderless"
-                            android:clickable="true"
-                            android:contentDescription="@string/share"
-                            android:focusable="true"
-                            android:padding="@dimen/player_main_buttons_padding"
-                            android:scaleType="center"
-                            app:srcCompat="@drawable/ic_share"
+                    <androidx.appcompat.widget.AppCompatImageButton
+                        android:id="@+id/share"
+                        android:layout_width="wrap_content"
+                        android:layout_height="35dp"
+                        android:layout_marginEnd="8dp"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:clickable="true"
+                        android:contentDescription="@string/share"
+                        android:focusable="true"
+                        android:padding="@dimen/player_main_buttons_padding"
+                        android:scaleType="fitXY"
+                        app:srcCompat="@drawable/ic_share"
                         app:tint="@color/white"
-                            tools:ignore="RtlHardcoded" />
+                        tools:ignore="RtlHardcoded" />
 
-                        <androidx.appcompat.widget.AppCompatImageButton
-                            android:id="@+id/switchMute"
-                            android:layout_width="0dp"
-                            android:layout_height="35dp"
-                            android:layout_weight="1"
-                            android:background="?attr/selectableItemBackgroundBorderless"
-                            android:clickable="true"
-                            android:contentDescription="@string/mute"
-                            android:focusable="true"
-                            android:padding="@dimen/player_main_buttons_padding"
-                            android:scaleType="center"
+                    <androidx.appcompat.widget.AppCompatImageButton
+                        android:id="@+id/switchMute"
+                        android:layout_width="wrap_content"
+                        android:layout_height="37dp"
+                        android:layout_marginEnd="8dp"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:clickable="true"
+                        android:contentDescription="@string/mute"
+                        android:focusable="true"
+                        android:padding="@dimen/player_main_buttons_padding"
+                        android:scaleType="fitXY"
                         app:srcCompat="@drawable/ic_volume_off"
-                            app:tint="@color/white"
-                            tools:ignore="RtlHardcoded" />
+                        app:tint="@color/white"
+                        tools:ignore="RtlHardcoded" />
 
-                        <androidx.appcompat.widget.AppCompatImageButton
-                            android:id="@+id/switchSponsorBlocking"
-                            android:layout_width="0dp"
-                            android:layout_height="35dp"
-                            android:layout_weight="1"
-                            android:background="?attr/selectableItemBackground"
-                            android:clickable="true"
-                            android:contentDescription="@string/sponsor_block_toggle_skipping"
-                            android:focusable="true"
-                            android:padding="@dimen/player_main_buttons_padding"
-                            android:scaleType="center"
-                            app:tint="@color/white"
-                            app:srcCompat="@drawable/ic_sponsor_block_disable"
-                            tools:ignore="RtlHardcoded" />
+                    <androidx.appcompat.widget.AppCompatImageButton
+                        android:id="@+id/switchSponsorBlocking"
+                        android:layout_width="wrap_content"
+                        android:layout_height="35dp"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:clickable="true"
+                        android:contentDescription="@string/sponsor_block_toggle_skipping"
+                        android:focusable="true"
+                        android:padding="@dimen/player_main_buttons_padding"
+                        android:scaleType="center"
+                        app:srcCompat="@drawable/ic_sponsor_block_enable"
+                        app:tint="@color/white"
+                        tools:ignore="RtlHardcoded" />
 
-                        <androidx.appcompat.widget.AppCompatImageButton
-                            android:id="@+id/fullScreenButton"
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            android:background="?attr/selectableItemBackgroundBorderless"
-                            android:clickable="true"
-                            android:focusable="true"
-                            android:padding="@dimen/player_main_buttons_padding"
-                            android:scaleType="fitCenter"
-                            android:visibility="gone"
+                    <androidx.appcompat.widget.AppCompatImageButton
+                        android:id="@+id/fullScreenButton"
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:background="?attr/selectableItemBackgroundBorderless"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:padding="@dimen/player_main_buttons_padding"
+                        android:scaleType="fitCenter"
+                        android:visibility="gone"
                         app:srcCompat="@drawable/ic_fullscreen"
-                            app:tint="@color/white"
-                            tools:ignore="ContentDescription,RtlHardcoded"
-                            tools:visibility="visible" />
+                        app:tint="@color/white"
+                        tools:ignore="ContentDescription,RtlHardcoded"
+                        tools:visibility="visible" />
 
                 </LinearLayout>
 
@@ -430,8 +416,6 @@
                         app:srcCompat="@drawable/dummy_thumbnail"
                         tools:visibility="visible" />
 
-                    </LinearLayout>
-
                 </LinearLayout>
 
             </LinearLayout>
@@ -458,6 +442,7 @@
                     tools:ignore="HardcodedText"
                     tools:text="1:06:29" />
 
+
                 <org.schabi.newpipe.views.FocusAwareSeekBar
                     android:id="@+id/playbackSeekBar"
                     style="@style/Widget.AppCompat.SeekBar"
@@ -764,6 +749,7 @@
             </RelativeLayout>
 
         </RelativeLayout>
+
     </RelativeLayout>
 
     <View