diff --git a/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt
index 9983c2262..95f6f621c 100644
--- a/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt
+++ b/app/src/main/java/com/github/libretube/ui/fragments/HomeFragment.kt
@@ -4,6 +4,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import androidx.lifecycle.Lifecycle
@@ -91,6 +93,13 @@ class HomeFragment : Fragment() {
                     async { if (visibleItems.contains(FEATURED)) loadFeed() },
                     async { if (visibleItems.contains(PLAYLISTS)) loadPlaylists() },
                 )
+
+                val binding = _binding ?: return@repeatOnLifecycle
+                // No category is shown because they are either empty or disabled
+                if (binding.progress.isVisible) {
+                    binding.progress.isGone = true
+                    binding.nothingHere.isVisible = true
+                }
             }
         }
     }
@@ -190,11 +199,11 @@ class HomeFragment : Fragment() {
 
     private fun makeVisible(vararg views: View) {
         views.forEach {
-            it.visibility = View.VISIBLE
+            it.isVisible = true
         }
         val binding = _binding ?: return
-        binding.progress.visibility = View.GONE
-        binding.scroll.visibility = View.VISIBLE
+        binding.progress.isGone = true
+        binding.scroll.isVisible = true
         binding.refresh.isRefreshing = false
     }
 
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index ad60d6cc0..5f64b5dc8 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -89,4 +89,28 @@
 
     </com.github.libretube.ui.views.CustomSwipeToRefresh>
 
+    <LinearLayout
+        android:id="@+id/nothing_here"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <ImageView
+            android:id="@+id/listIV"
+            android:layout_width="100dp"
+            android:layout_height="100dp"
+            android:layout_gravity="center"
+            android:src="@drawable/ic_list" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/emptyList"
+            android:textSize="20sp"
+            android:textStyle="bold" />
+    </LinearLayout>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index 3264cfdbd..50565897b 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -87,31 +87,28 @@
                             android:textSize="18sp"
                             android:textStyle="bold" />
 
-                        <RelativeLayout
+                        <LinearLayout
                             android:id="@+id/nothing_here"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             android:layout_marginBottom="35dp"
+                            android:orientation="vertical"
                             android:visibility="gone">
 
                             <ImageView
-                                android:id="@+id/listIV"
                                 android:layout_width="100dp"
                                 android:layout_height="100dp"
-                                android:layout_centerInParent="true"
+                                android:layout_gravity="center"
                                 android:src="@drawable/ic_list" />
 
                             <TextView
-                                android:id="@+id/text_like"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_below="@id/listIV"
-                                android:layout_centerHorizontal="true"
-                                android:gravity="center"
+                                android:layout_gravity="center"
                                 android:text="@string/emptyList"
                                 android:textSize="20sp"
                                 android:textStyle="bold" />
-                        </RelativeLayout>
+                        </LinearLayout>
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/playlist_recView"
diff --git a/app/src/main/res/layout/fragment_subscriptions.xml b/app/src/main/res/layout/fragment_subscriptions.xml
index f4022d751..4ea08a922 100644
--- a/app/src/main/res/layout/fragment_subscriptions.xml
+++ b/app/src/main/res/layout/fragment_subscriptions.xml
@@ -14,33 +14,30 @@
         android:layout_centerVertical="true"
         android:visibility="gone" />
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/emptyFeed"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+        android:orientation="vertical"
         android:visibility="gone">
 
         <ImageView
-            android:id="@+id/boogh"
             android:layout_width="100dp"
             android:layout_height="100dp"
-            android:layout_centerInParent="true"
+            android:layout_gravity="center"
             android:layout_marginBottom="16dp"
             android:src="@drawable/ic_list" />
 
         <TextView
-            android:id="@+id/textLike"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@id/boogh"
-            android:layout_centerHorizontal="true"
+            android:layout_gravity="center"
             android:layout_marginHorizontal="10dp"
-            android:gravity="center"
             android:text="@string/emptyList"
             android:textSize="20sp"
             android:textStyle="bold" />
-    </RelativeLayout>
+    </LinearLayout>
 
     <com.github.libretube.ui.views.CustomSwipeToRefresh
         android:id="@+id/sub_refresh"
@@ -147,8 +144,8 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center"
-                                android:layout_marginEnd="6dp"
                                 android:layout_marginStart="12dp"
+                                android:layout_marginEnd="6dp"
                                 android:background="?attr/selectableItemBackgroundBorderless"
                                 android:src="@drawable/ic_edit" />
 
@@ -156,8 +153,8 @@
                                 android:id="@+id/channel_groups"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                app:checkedChip="@id/chip_all"
                                 android:layout_marginStart="5dp"
+                                app:checkedChip="@id/chip_all"
                                 app:selectionRequired="true"
                                 app:singleLine="true"
                                 app:singleSelection="true">