diff --git a/app/src/main/res/layout-sw720dp/main_activity.xml b/app/src/main/res/layout-sw720dp/main_activity.xml
index 4accfd4a66..691cdb7c2a 100644
--- a/app/src/main/res/layout-sw720dp/main_activity.xml
+++ b/app/src/main/res/layout-sw720dp/main_activity.xml
@@ -26,49 +26,40 @@
                 android:layout_height="?attr/actionBarSize"
                 android:theme="?attr/actionBarTheme" />
 
-        </com.google.android.material.appbar.TachiyomiAppBarLayout>
-
-        <FrameLayout
-            android:id="@+id/downloaded_only"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorTertiary"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/side_nav"
-            app:layout_constraintTop_toBottomOf="@+id/appbar"
-            tools:visibility="visible">
+            <com.google.android.material.tabs.TabLayout
+                android:id="@+id/tabs"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
 
             <TextView
-                android:layout_width="wrap_content"
+                android:id="@+id/downloaded_only"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
+                android:background="?attr/colorTertiary"
+                android:gravity="center"
                 android:padding="4dp"
                 android:text="@string/label_downloaded_only"
-                android:textColor="?attr/colorOnTertiary" />
-
-        </FrameLayout>
-
-        <FrameLayout
-            android:id="@+id/incognito_mode"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/side_nav"
-            app:layout_constraintTop_toBottomOf="@+id/downloaded_only"
-            tools:visibility="visible">
+                android:textAlignment="center"
+                android:textAppearance="?attr/textAppearanceLabelMedium"
+                android:textColor="?attr/colorOnTertiary"
+                android:visibility="gone"
+                tools:visibility="visible" />
 
             <TextView
-                android:layout_width="wrap_content"
+                android:id="@+id/incognito_mode"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
+                android:background="?attr/colorPrimary"
+                android:gravity="center"
                 android:padding="4dp"
                 android:text="@string/pref_incognito_mode"
-                android:textColor="?attr/colorOnPrimary" />
+                android:textAlignment="center"
+                android:textAppearance="?attr/textAppearanceLabelMedium"
+                android:textColor="?attr/colorOnPrimary"
+                android:visibility="gone"
+                tools:visibility="visible" />
 
-        </FrameLayout>
+        </com.google.android.material.appbar.TachiyomiAppBarLayout>
 
         <com.google.android.material.navigationrail.NavigationRailView
             android:id="@+id/side_nav"
@@ -79,14 +70,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:menu="@menu/main_nav" />
 
-        <com.google.android.material.tabs.TabLayout
-            android:id="@+id/tabs"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/side_nav"
-            app:layout_constraintTop_toBottomOf="@+id/incognito_mode" />
-
         <eu.kanade.tachiyomi.widget.TachiyomiChangeHandlerFrameLayout
             android:id="@+id/controller_container"
             android:layout_width="0dp"
@@ -94,7 +77,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/side_nav"
-            app:layout_constraintTop_toBottomOf="@+id/tabs" />
+            app:layout_constraintTop_toBottomOf="@+id/appbar" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/main_activity.xml b/app/src/main/res/layout/main_activity.xml
index 62edad8541..98e63ad494 100644
--- a/app/src/main/res/layout/main_activity.xml
+++ b/app/src/main/res/layout/main_activity.xml
@@ -32,41 +32,33 @@
             android:layout_height="wrap_content"
             android:visibility="gone" />
 
-        <FrameLayout
+        <TextView
             android:id="@+id/downloaded_only"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/colorTertiary"
+            android:gravity="center"
+            android:padding="4dp"
+            android:text="@string/label_downloaded_only"
+            android:textAlignment="center"
+            android:textAppearance="?attr/textAppearanceLabelMedium"
+            android:textColor="?attr/colorOnTertiary"
             android:visibility="gone"
-            tools:visibility="visible">
+            tools:visibility="visible" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:padding="4dp"
-                android:text="@string/label_downloaded_only"
-                android:textColor="?attr/colorOnTertiary" />
-
-        </FrameLayout>
-
-        <FrameLayout
+        <TextView
             android:id="@+id/incognito_mode"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/colorPrimary"
+            android:gravity="center"
+            android:padding="4dp"
+            android:text="@string/pref_incognito_mode"
+            android:textAlignment="center"
+            android:textAppearance="?attr/textAppearanceLabelMedium"
+            android:textColor="?attr/colorOnPrimary"
             android:visibility="gone"
-            tools:visibility="visible">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:padding="4dp"
-                android:text="@string/pref_incognito_mode"
-                android:textColor="?attr/colorOnPrimary" />
-
-        </FrameLayout>
+            tools:visibility="visible" />
 
     </com.google.android.material.appbar.TachiyomiAppBarLayout>