diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml
index 2bd36dfad..4354edcc2 100644
--- a/app/src/main/res/layout/activity_group.xml
+++ b/app/src/main/res/layout/activity_group.xml
@@ -49,24 +49,20 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <FrameLayout
+            <!-- Listview status -->
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:layout_width="match_parent"
+                android:id="@+id/swipeContainer"
                 android:layout_height="match_parent">
-                <!-- Listview status -->
-                <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/lv_status"
                     android:layout_width="match_parent"
-                    android:id="@+id/swipeContainer"
-                    android:layout_height="match_parent">
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/lv_status"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:scrollbars="none"
-                        android:divider="@null"
-                        >
-                    </androidx.recyclerview.widget.RecyclerView>
-                </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-            </FrameLayout>
+                    android:layout_height="wrap_content"
+                    android:scrollbars="none"
+                    android:divider="@null"
+                    >
+                </androidx.recyclerview.widget.RecyclerView>
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
             <RelativeLayout
                 android:id="@+id/no_action"
                 android:visibility="gone"
diff --git a/app/src/main/res/layout/activity_hashtag.xml b/app/src/main/res/layout/activity_hashtag.xml
index d1b69ee0e..00a383b6b 100644
--- a/app/src/main/res/layout/activity_hashtag.xml
+++ b/app/src/main/res/layout/activity_hashtag.xml
@@ -49,24 +49,20 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <FrameLayout
+            <!-- Listview status -->
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:layout_width="match_parent"
+                android:id="@+id/swipeContainer"
                 android:layout_height="match_parent">
-                <!-- Listview status -->
-                <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/lv_status"
                     android:layout_width="match_parent"
-                    android:id="@+id/swipeContainer"
-                    android:layout_height="match_parent">
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/lv_status"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:scrollbars="none"
-                        android:divider="@null"
-                        >
-                    </androidx.recyclerview.widget.RecyclerView>
-                </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-            </FrameLayout>
+                    android:layout_height="wrap_content"
+                    android:scrollbars="none"
+                    android:divider="@null"
+                    >
+                </androidx.recyclerview.widget.RecyclerView>
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
             <RelativeLayout
                 android:id="@+id/no_action"
                 android:visibility="gone"
diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml
index 461eedb6c..8e8914ea7 100644
--- a/app/src/main/res/layout/activity_list.xml
+++ b/app/src/main/res/layout/activity_list.xml
@@ -49,22 +49,18 @@
             android:paddingRight="@dimen/fab_margin"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <FrameLayout
+            <!-- Listview status -->
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:layout_width="match_parent"
+                android:id="@+id/swipeContainer"
                 android:layout_height="match_parent">
-                <!-- Listview status -->
-                <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/lv_status"
                     android:layout_width="match_parent"
-                    android:id="@+id/swipeContainer"
-                    android:layout_height="match_parent">
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/lv_status"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:scrollbars="none"
-                        />
-                </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-            </FrameLayout>
+                    android:layout_height="wrap_content"
+                    android:scrollbars="none"
+                    />
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
             <RelativeLayout
                 android:id="@+id/no_action"
                 android:visibility="gone"
diff --git a/app/src/main/res/layout/activity_muted_instances.xml b/app/src/main/res/layout/activity_muted_instances.xml
index d9e784e58..2959cddcc 100644
--- a/app/src/main/res/layout/activity_muted_instances.xml
+++ b/app/src/main/res/layout/activity_muted_instances.xml
@@ -20,23 +20,19 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <FrameLayout
+    <!-- Listview Accounts -->
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:layout_width="match_parent"
+        android:id="@+id/swipeContainer"
         android:layout_height="match_parent">
-        <!-- Listview Accounts -->
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/lv_domains"
             android:layout_width="match_parent"
-            android:id="@+id/swipeContainer"
-            android:layout_height="match_parent">
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/lv_domains"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scrollbars="none"
-                android:divider="@null"
-                />
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-    </FrameLayout>
+            android:layout_height="wrap_content"
+            android:scrollbars="none"
+            android:divider="@null"
+            />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     <RelativeLayout
         android:id="@+id/no_action"
         android:visibility="gone"
diff --git a/app/src/main/res/layout/activity_ower_status.xml b/app/src/main/res/layout/activity_ower_status.xml
index 31e49a06f..1c0622383 100644
--- a/app/src/main/res/layout/activity_ower_status.xml
+++ b/app/src/main/res/layout/activity_ower_status.xml
@@ -36,21 +36,17 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             tools:context="app.fedilab.android.activities.OwnerStatusActivity"
             >
-            <FrameLayout
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:layout_width="match_parent"
+                android:id="@+id/swipeContainer"
                 android:layout_height="match_parent">
-                <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/lv_status"
                     android:layout_width="match_parent"
-                    android:id="@+id/swipeContainer"
-                    android:layout_height="match_parent">
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/lv_status"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:scrollbars="none"
-                        />
-                </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-            </FrameLayout>
+                    android:layout_height="wrap_content"
+                    android:scrollbars="none"
+                    />
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
             <RelativeLayout
                 android:id="@+id/no_action"
                 android:visibility="gone"
diff --git a/app/src/main/res/layout/activity_playlists.xml b/app/src/main/res/layout/activity_playlists.xml
index 7d4ebdd28..07ff7e65f 100644
--- a/app/src/main/res/layout/activity_playlists.xml
+++ b/app/src/main/res/layout/activity_playlists.xml
@@ -49,22 +49,18 @@
             android:paddingRight="@dimen/fab_margin"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
-            <FrameLayout
+            <!-- Listview status -->
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:layout_width="match_parent"
+                android:id="@+id/swipeContainer"
                 android:layout_height="match_parent">
-                <!-- Listview status -->
-                <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/lv_playlist"
                     android:layout_width="match_parent"
-                    android:id="@+id/swipeContainer"
-                    android:layout_height="match_parent">
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/lv_playlist"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:scrollbars="none"
-                        />
-                </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-            </FrameLayout>
+                    android:layout_height="wrap_content"
+                    android:scrollbars="none"
+                    />
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
             <RelativeLayout
                 android:id="@+id/no_action"
                 android:visibility="gone"
diff --git a/app/src/main/res/layout/activity_show_conversation.xml b/app/src/main/res/layout/activity_show_conversation.xml
index 7b21a8d1e..6abe8909d 100644
--- a/app/src/main/res/layout/activity_show_conversation.xml
+++ b/app/src/main/res/layout/activity_show_conversation.xml
@@ -38,21 +38,17 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             tools:context="app.fedilab.android.activities.ShowConversationActivity"
             >
-            <FrameLayout
+            <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
                 android:layout_width="match_parent"
+                android:id="@+id/swipeContainer"
                 android:layout_height="match_parent">
-                <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+                <androidx.recyclerview.widget.RecyclerView
+                    android:id="@+id/lv_status"
                     android:layout_width="match_parent"
-                    android:id="@+id/swipeContainer"
-                    android:layout_height="match_parent">
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/lv_status"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:scrollbars="none"
-                        android:divider="@null" />
-                </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-            </FrameLayout>
+                    android:layout_height="wrap_content"
+                    android:scrollbars="none"
+                    android:divider="@null" />
+            </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
         </RelativeLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
diff --git a/app/src/main/res/layout/fragment_accounts.xml b/app/src/main/res/layout/fragment_accounts.xml
index 460cd847d..a559dcae8 100644
--- a/app/src/main/res/layout/fragment_accounts.xml
+++ b/app/src/main/res/layout/fragment_accounts.xml
@@ -22,22 +22,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <!-- Listview Accounts -->
-    <FrameLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:layout_width="match_parent"
+        android:id="@+id/swipeContainer"
         android:layout_height="match_parent">
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/lv_accounts"
             android:layout_width="match_parent"
-            android:id="@+id/swipeContainer"
-            android:layout_height="match_parent">
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/lv_accounts"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scrollbars="none"
-                android:divider="@null"
-                />
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-    </FrameLayout>
+            android:layout_height="wrap_content"
+            android:scrollbars="none"
+            android:divider="@null"
+            />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     <RelativeLayout
         android:id="@+id/no_action"
         android:visibility="gone"
diff --git a/app/src/main/res/layout/fragment_admin_accounts.xml b/app/src/main/res/layout/fragment_admin_accounts.xml
index 2070ce801..e9bc00da4 100644
--- a/app/src/main/res/layout/fragment_admin_accounts.xml
+++ b/app/src/main/res/layout/fragment_admin_accounts.xml
@@ -21,23 +21,19 @@
     android:paddingRight="@dimen/fab_margin"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <FrameLayout
+    <!-- Listview Accounts -->
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:layout_width="match_parent"
+        android:id="@+id/swipeContainer"
         android:layout_height="match_parent">
-        <!-- Listview Accounts -->
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/lv_admin_accounts"
             android:layout_width="match_parent"
-            android:id="@+id/swipeContainer"
-            android:layout_height="match_parent">
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/lv_admin_accounts"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scrollbars="none"
-                android:divider="@null"
-                />
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-    </FrameLayout>
+            android:layout_height="wrap_content"
+            android:scrollbars="none"
+            android:divider="@null"
+            />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     <RelativeLayout
         android:id="@+id/no_action"
         android:visibility="gone"
diff --git a/app/src/main/res/layout/fragment_admin_reports.xml b/app/src/main/res/layout/fragment_admin_reports.xml
index 85fbc1c1e..1e6b84a18 100644
--- a/app/src/main/res/layout/fragment_admin_reports.xml
+++ b/app/src/main/res/layout/fragment_admin_reports.xml
@@ -21,23 +21,19 @@
     android:paddingRight="@dimen/fab_margin"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <FrameLayout
+    <!-- Listview Accounts -->
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:layout_width="match_parent"
+        android:id="@+id/swipeContainer"
         android:layout_height="match_parent">
-        <!-- Listview Accounts -->
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/lv_reports"
             android:layout_width="match_parent"
-            android:id="@+id/swipeContainer"
-            android:layout_height="match_parent">
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/lv_reports"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scrollbars="none"
-                android:divider="@null"
-                />
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-    </FrameLayout>
+            android:layout_height="wrap_content"
+            android:scrollbars="none"
+            android:divider="@null"
+            />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     <RelativeLayout
         android:id="@+id/no_action"
         android:visibility="gone"
diff --git a/app/src/main/res/layout/fragment_muted_instances.xml b/app/src/main/res/layout/fragment_muted_instances.xml
index f10efd01c..1c7f6a3be 100644
--- a/app/src/main/res/layout/fragment_muted_instances.xml
+++ b/app/src/main/res/layout/fragment_muted_instances.xml
@@ -21,23 +21,19 @@
     android:paddingRight="@dimen/fab_margin"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <FrameLayout
+    <!-- Listview Accounts -->
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:layout_width="match_parent"
+        android:id="@+id/swipeContainer"
         android:layout_height="match_parent">
-        <!-- Listview Accounts -->
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/lv_domains"
             android:layout_width="match_parent"
-            android:id="@+id/swipeContainer"
-            android:layout_height="match_parent">
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/lv_domains"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scrollbars="none"
-                android:divider="@null"
-                />
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-    </FrameLayout>
+            android:layout_height="wrap_content"
+            android:scrollbars="none"
+            android:divider="@null"
+            />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     <RelativeLayout
         android:id="@+id/no_action"
         android:visibility="gone"
diff --git a/app/src/main/res/layout/fragment_notifications.xml b/app/src/main/res/layout/fragment_notifications.xml
index 06e66508b..34c8dbce6 100644
--- a/app/src/main/res/layout/fragment_notifications.xml
+++ b/app/src/main/res/layout/fragment_notifications.xml
@@ -22,22 +22,17 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
     <!-- Listview Notifications -->
-    <FrameLayout
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
         android:layout_width="match_parent"
+        android:id="@+id/swipeContainer"
         android:layout_height="match_parent">
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/lv_notifications"
             android:layout_width="match_parent"
-            android:id="@+id/swipeContainer"
-            android:layout_height="match_parent">
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/lv_notifications"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:scrollbars="none"
-
-                />
-        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-    </FrameLayout>
+            android:layout_height="wrap_content"
+            android:scrollbars="none"
+            />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     <RelativeLayout
         android:id="@+id/no_action"
         android:visibility="gone"
@@ -55,7 +50,7 @@
             android:layout_height="match_parent" />
     </RelativeLayout>
     <!-- Main Loader -->
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <RelativeLayout
         android:id="@+id/loader"
         android:visibility="gone"
         android:layout_width="match_parent"