diff --git a/app/src/main/res/layout/activity_library.xml b/app/src/main/res/layout/activity_library.xml
index 7fca04727..82f29f0dd 100644
--- a/app/src/main/res/layout/activity_library.xml
+++ b/app/src/main/res/layout/activity_library.xml
@@ -10,7 +10,10 @@
   <TextView
     android:id="@+id/libraryErrorText"
     style="@style/no_list_content_text"
-    tools:ignore="MissingConstraints" />
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent" />
 
 
   <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
diff --git a/app/src/main/res/layout/fragment_destination_download.xml b/app/src/main/res/layout/fragment_destination_download.xml
index a77d153bb..ba33eae7e 100644
--- a/app/src/main/res/layout/fragment_destination_download.xml
+++ b/app/src/main/res/layout/fragment_destination_download.xml
@@ -18,31 +18,38 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical">
 
   <include layout="@layout/layout_toolbar" />
 
-  <TextView
-    android:id="@+id/libraryErrorText"
-    style="@style/no_list_content_text"
-    tools:ignore="MissingConstraints" />
-
-
-  <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-    android:id="@+id/librarySwipeRefresh"
+  <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
+    android:layout_height="match_parent">
 
-    <androidx.recyclerview.widget.RecyclerView
-      android:id="@+id/libraryList"
+    <TextView
+      android:id="@+id/libraryErrorText"
+      style="@style/no_list_content_text"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+      android:id="@+id/librarySwipeRefresh"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent">
+
+      <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/libraryList"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+  </androidx.constraintlayout.widget.ConstraintLayout>
 
-  </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_destination_library.xml b/app/src/main/res/layout/fragment_destination_library.xml
index 802cb243d..8e15f2bc0 100644
--- a/app/src/main/res/layout/fragment_destination_library.xml
+++ b/app/src/main/res/layout/fragment_destination_library.xml
@@ -16,47 +16,52 @@
   ~
   -->
 
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:orientation="vertical">
 
   <include layout="@layout/layout_toolbar" />
 
-  <TextView
-    android:id="@+id/file_management_no_files"
-    style="@style/no_list_content_text"
-    android:layout_gravity="center"
-    android:text="@string/no_files_here"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent" />
-
-  <Button
-    android:id="@+id/go_to_downloads_button_no_files"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:text="@string/download_books"
-    android:visibility="gone"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@+id/file_management_no_files" />
-
-  <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-    android:id="@+id/zim_swiperefresh"
+  <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:layout_editor_absoluteX="16dp"
-    tools:layout_editor_absoluteY="-142dp">
+    android:layout_height="match_parent">
 
-    <androidx.recyclerview.widget.RecyclerView
-      android:id="@+id/zimfilelist"
+
+    <TextView
+      android:id="@+id/file_management_no_files"
+      style="@style/no_list_content_text"
+      android:layout_gravity="center"
+      android:text="@string/no_files_here"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+
+    <Button
+      android:id="@+id/go_to_downloads_button_no_files"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:text="@string/download_books"
+      android:visibility="gone"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@+id/file_management_no_files" />
+
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+      android:id="@+id/zim_swiperefresh"
       android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      app:layout_behavior="@string/appbar_scrolling_view_behavior" />
+      android:layout_height="match_parent">
 
-  </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+      <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/zimfilelist"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
+
+
+  </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>