diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 6915f60c2..75cf0d71e 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -117,7 +117,7 @@
         <activity
             android:name=".activities.FilterSelectionActivity"
             android:exported="true"
-            android:theme="@style/DialogBase" />
+            android:theme="@style/TasksDialog" />
 
         <activity
             android:name=".activities.AddAttachmentActivity"
diff --git a/src/main/java/org/tasks/activities/FilterSelectionActivity.java b/src/main/java/org/tasks/activities/FilterSelectionActivity.java
index 5385f5492..09f0b1519 100644
--- a/src/main/java/org/tasks/activities/FilterSelectionActivity.java
+++ b/src/main/java/org/tasks/activities/FilterSelectionActivity.java
@@ -36,7 +36,7 @@ public class FilterSelectionActivity extends InjectingAppCompatActivity {
 
         final boolean returnFilter = getIntent().getBooleanExtra(EXTRA_RETURN_FILTER, false);
 
-        activityPreferences.applyTheme();
+        activityPreferences.applyDialogTheme();
 
         final FilterAdapter filterAdapter = new FilterAdapter(filterProvider, filterCounter, this, null, false);
         filterAdapter.populateList();
diff --git a/src/main/res/values/styles_dark.xml b/src/main/res/values/styles_dark.xml
index 4e14004b9..597a83b9e 100644
--- a/src/main/res/values/styles_dark.xml
+++ b/src/main/res/values/styles_dark.xml
@@ -54,6 +54,7 @@
         <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="asTextColor">@android:color/white</item>
         <item name="asListDividerColor">#dddddd</item>
+        <item name="icon_tint">@android:color/white</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values/styles_light.xml b/src/main/res/values/styles_light.xml
index 8fbad13f8..69042867e 100644
--- a/src/main/res/values/styles_light.xml
+++ b/src/main/res/values/styles_light.xml
@@ -53,6 +53,7 @@
         <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="asTextColor">@android:color/black</item>
         <item name="asListDividerColor">#dddddd</item>
+        <item name="icon_tint">@android:color/black</item>
     </style>
 
 </resources>
\ No newline at end of file