diff --git a/Habitica/res/layout/bottom_sheet_wrapper.xml b/Habitica/res/layout/bottom_sheet_wrapper.xml
index b21f6ceb7..f1ae3343f 100644
--- a/Habitica/res/layout/bottom_sheet_wrapper.xml
+++ b/Habitica/res/layout/bottom_sheet_wrapper.xml
@@ -13,8 +13,12 @@
         android:layout_marginBottom="@dimen/spacing_large"
         android:layout_gravity="center_horizontal"
         />
-<FrameLayout
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content" />
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <FrameLayout
+            android:id="@+id/container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </androidx.core.widget.NestedScrollView>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
index 87f31eb75..01cf4a1a3 100644
--- a/Habitica/res/layout/dialog_task_filter.xml
+++ b/Habitica/res/layout/dialog_task_filter.xml
@@ -6,18 +6,19 @@
     android:layout_height="match_parent"
     android:layout_marginBottom="16dp"
     android:paddingStart="@dimen/bottom_sheet_inset"
-    android:paddingEnd="@dimen/bottom_sheet_inset">
+    android:paddingEnd="@dimen/bottom_sheet_inset"
+    android:paddingBottom="@dimen/spacing_large">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/spacing_large">
 
         <TextView
-            style="@style/Headline"
+            style="@style/Subheader1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/filters"
-            android:textColor="@color/text_primary"
+            android:textColor="@color/text_ternary"
             android:layout_gravity="center_vertical"/>
         <Space
             android:layout_width="0dp"
@@ -38,9 +39,10 @@
     </LinearLayout>
     <TextView
         android:id="@+id/task_type_title"
-        style="@style/Caption3"
+        style="@style/Caption2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textColor="@color/text_quad"
         tools:text="@string/habits"
         android:textAllCaps="true"/>
     <RadioGroup
@@ -82,11 +84,12 @@
 
         <TextView
             android:id="@+id/tags_title"
-            style="@style/Caption3"
+            style="@style/Caption2"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_weight="2"
+            android:textColor="@color/text_quad"
             android:text="@string/tags"
             android:textAllCaps="true"/>
 
@@ -103,17 +106,13 @@
             android:paddingEnd="0dp"
             android:paddingStart="0dp"/>
     </LinearLayout>
-    <ScrollView
+    <LinearLayout
+        android:id="@+id/tags_list"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <LinearLayout
-            android:id="@+id/tags_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="24dp"
-            android:orientation="vertical"
-            android:showDividers="middle"
-            android:divider="@color/transparent"
-            android:dividerPadding="8dp"/>
-    </ScrollView>
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
+        android:orientation="vertical"
+        android:showDividers="middle"
+        android:divider="@color/transparent"
+        android:dividerPadding="8dp"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index 9148b0462..090e07de4 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -83,7 +83,7 @@
     <dimen name="diamond_button_height">40dp</dimen>
     <dimen name="setup_customization_size">56dp</dimen>
     <dimen name="outer_inset">16dp</dimen>
-	<dimen name="rounded_button_radius">8dp</dimen>
+	<dimen name="rounded_button_radius">12dp</dimen>
     <dimen name="content_border">18dp</dimen>
 	<dimen name="content_section_spacing">21dp</dimen>
 	<dimen name="header_spacing">6dp</dimen>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
index e95b4a757..76bb68e52 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/tasks/TaskFilterDialog.kt
@@ -127,8 +127,8 @@ class TaskFilterDialog(context: Context, component: UserComponent?) : HabiticaBo
                 context.getThemeColor(R.attr.colorAccent) // enabled
             )
         )
-        val leftPadding = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 16f, context.resources.displayMetrics).toInt()
-        val verticalPadding = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 12f, context.resources.displayMetrics).toInt()
+        val leftPadding = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 12f, context.resources.displayMetrics).toInt()
+        val verticalPadding = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8f, context.resources.displayMetrics).toInt()
         for (tag in tags) {
             val tagCheckbox = AppCompatCheckBox(context)
             tagCheckbox.text = tag.name