diff --git a/Habitica/res/layout/activity_setup.xml b/Habitica/res/layout/activity_setup.xml
index 0f5a67c48..52f751411 100644
--- a/Habitica/res/layout/activity_setup.xml
+++ b/Habitica/res/layout/activity_setup.xml
@@ -3,16 +3,16 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/content_background">
+    android:orientation="vertical">
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:background="@color/window_background"
         android:layout_weight="1" />
 
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/bottomBar"
         android:orientation="horizontal"
         android:layout_width="match_parent"
@@ -21,6 +21,15 @@
         android:gravity="center_vertical"
         android:elevation="8dp">
 
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/view_pager_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="24dp"
+            android:layout_centerInParent="true"
+            app:tabBackground="@drawable/indicator_diamond"
+            android:background="@color/transparent"
+            app:tabIndicator="@null" />
+
         <Button
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -28,23 +37,8 @@
             android:drawableStart="@drawable/back_arrow_disabled"
             android:background="@color/transparent"
             android:drawablePadding="12dp"
+            android:layout_centerVertical="true"
             android:textColor="@color/white" />
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1f" />
-
-        <com.google.android.material.tabs.TabLayout
-            android:id="@+id/view_pager_indicator"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:tabBackground="@drawable/indicator_diamond"
-            android:background="@color/transparent"
-            app:tabIndicator="@null" />
-        <Space
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_weight="1f" />
 
         <Button
             android:layout_width="wrap_content"
@@ -54,6 +48,8 @@
             android:drawablePadding="12dp"
             android:textColor="@color/white"
             android:drawableEnd="@drawable/forward_arrow_enabled"
-            android:background="@color/transparent" />
-    </LinearLayout>
+            android:background="@color/transparent"
+            android:layout_alignParentEnd="true"
+            android:layout_centerVertical="true"/>
+    </RelativeLayout>
 </LinearLayout>
diff --git a/Habitica/res/layout/fragment_setup_tasks.xml b/Habitica/res/layout/fragment_setup_tasks.xml
index 54b131f19..003ebbee9 100644
--- a/Habitica/res/layout/fragment_setup_tasks.xml
+++ b/Habitica/res/layout/fragment_setup_tasks.xml
@@ -50,11 +50,10 @@
         android:layout_marginStart="@dimen/content_inset"
         android:layout_marginEnd="@dimen/content_inset"
         android:layout_marginBottom="12dp"/>
-    <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
+    <androidx.recyclerview.widget.RecyclerView
             android:layout_width="match_parent"
             android:layout_height="230dp"
             android:background="@drawable/avatar_customization_category_bg"
             android:id="@+id/recyclerView"
             android:padding="17dp"/>
-
 </LinearLayout>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt
index 6e3c00b19..48f5fc30e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/setup/TaskSetupAdapter.kt
@@ -23,6 +23,7 @@ class TaskSetupAdapter : RecyclerView.Adapter<TaskSetupAdapter.TaskViewHolder>()
         for (ignored in this.taskList) {
             this.checkedList.add(false)
         }
+        notifyDataSetChanged()
     }
 
     override fun onCreateViewHolder(