diff --git a/application/vlc-android/res/layout/audio_browser.xml b/application/vlc-android/res/layout/audio_browser.xml
index 4bc02f792..94690e7e3 100644
--- a/application/vlc-android/res/layout/audio_browser.xml
+++ b/application/vlc-android/res/layout/audio_browser.xml
@@ -63,7 +63,7 @@
         <org.videolan.vlc.gui.view.EmptyLoadingStateView
                 android:id="@+id/audio_empty_loading"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 app:empty_text="@string/nomedia"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/application/vlc-android/res/layout/directory_browser.xml b/application/vlc-android/res/layout/directory_browser.xml
index 56ba52294..ff2aadeb6 100644
--- a/application/vlc-android/res/layout/directory_browser.xml
+++ b/application/vlc-android/res/layout/directory_browser.xml
@@ -65,7 +65,7 @@
         <org.videolan.vlc.gui.view.EmptyLoadingStateView
                 android:id="@+id/empty_loading"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 app:empty_text="@string/nomedia"
                 app:show_no_media="false"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/application/vlc-android/res/layout/video_grid.xml b/application/vlc-android/res/layout/video_grid.xml
index 25403fb43..828c05d81 100644
--- a/application/vlc-android/res/layout/video_grid.xml
+++ b/application/vlc-android/res/layout/video_grid.xml
@@ -49,7 +49,7 @@
         <org.videolan.vlc.gui.view.EmptyLoadingStateView
                 android:id="@+id/empty_loading"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="0dp"
                 app:empty_text="@string/nomedia"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/application/vlc-android/res/layout/view_empty_loading.xml b/application/vlc-android/res/layout/view_empty_loading.xml
index e6f092272..9bf457887 100644
--- a/application/vlc-android/res/layout/view_empty_loading.xml
+++ b/application/vlc-android/res/layout/view_empty_loading.xml
@@ -27,14 +27,14 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:id="@+id/container"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent">
 
     <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideline12"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.5" />
+            app:layout_constraintGuide_percent="0.5"/>
 
     <androidx.constraintlayout.widget.Barrier
             android:id="@+id/text_barrier"
@@ -56,6 +56,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
+            android:layout_marginBottom="8dp"
             android:gravity="center"
             android:maxWidth="600dp"
             android:textColor="?attr/font_light"
@@ -63,7 +64,6 @@
             app:layout_constraintBottom_toBottomOf="@id/guideline12"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="@id/guideline12"
             tools:visibility="visible" />
 
     <TextView