diff --git a/app/src/main/java/org/tasks/dialogs/NativeDatePickerDialog.java b/app/src/main/java/org/tasks/dialogs/NativeDatePickerDialog.java
index 5b907724a..f3a52993e 100644
--- a/app/src/main/java/org/tasks/dialogs/NativeDatePickerDialog.java
+++ b/app/src/main/java/org/tasks/dialogs/NativeDatePickerDialog.java
@@ -6,7 +6,6 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.DatePickerDialog;
 import android.app.Dialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.widget.DatePicker;
@@ -48,11 +47,9 @@ public class NativeDatePickerDialog extends InjectingNativeDialogFragment
   @Override
   public Dialog onCreateDialog(Bundle savedInstanceState) {
     Bundle args = getArguments();
-    Context context = getActivity();
-    theme.applyToContext(context);
     DatePickerDialog datePickerDialog =
         new DatePickerDialog(
-            context,
+            theme.wrap(getContext()),
             this,
             args.getInt(EXTRA_YEAR),
             args.getInt(EXTRA_MONTH),
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index ce6c47877..c5e4fa229 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -10,7 +10,6 @@
   <attr format="color" name="asContentBackground"/>
   <attr format="reference" name="overlay_theme"/>
   <attr format="boolean" name="dark_status_bar"/>
-  <attr format="color" name="colorAccentDialog"/>
   <attr format="dimension" name="card_elevation"/>
   <attr format="reference" name="materialButtonText"/>
   <attr format="reference" name="materialButtonBackground"/>
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index c7166be62..48f4bec3c 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -40,12 +40,10 @@
     <item name="android:windowBackground">@color/dialog_background</item>
     <item name="colorOnBackground">@color/text_primary</item>
     <item name="colorOnSurface">@color/text_primary</item>
-    <item name="colorAccent">?attr/colorAccentDialog</item>
   </style>
 
   <style name="TasksDialog" parent="DayNightDialog">
     <item name="android:windowBackground">@color/dialog_background</item>
-    <item name="colorAccent">?attr/colorAccentDialog</item>
   </style>
 
   <style name="ThemeBlack" parent="Tasks">
diff --git a/app/src/main/res/values/theme_amber.xml b/app/src/main/res/values/theme_amber.xml
index b007794b4..1a46cdb06 100644
--- a/app/src/main/res/values/theme_amber.xml
+++ b/app/src/main/res/values/theme_amber.xml
@@ -8,7 +8,6 @@
 
   <style name="AmberAccent" parent="BlackTint">
     <item name="colorAccent">@color/amber_a400</item>
-    <item name="colorAccentDialog">@color/amber_a400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_blue.xml b/app/src/main/res/values/theme_blue.xml
index b18ddc8a0..915432be0 100644
--- a/app/src/main/res/values/theme_blue.xml
+++ b/app/src/main/res/values/theme_blue.xml
@@ -8,7 +8,6 @@
 
   <style name="BlueAccent" parent="WhiteTint">
     <item name="colorAccent">@color/blue_a400</item>
-    <item name="colorAccentDialog">@color/blue_a400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_blue_grey.xml b/app/src/main/res/values/theme_blue_grey.xml
index c86c450fa..9ad244da0 100644
--- a/app/src/main/res/values/theme_blue_grey.xml
+++ b/app/src/main/res/values/theme_blue_grey.xml
@@ -8,7 +8,6 @@
 
   <style name="BlueGreyAccent" parent="WhiteTint">
     <item name="colorAccent">@color/blue_grey_400</item>
-    <item name="colorAccentDialog">@color/blue_grey_400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_cyan.xml b/app/src/main/res/values/theme_cyan.xml
index e6ab76b94..c9ae63475 100644
--- a/app/src/main/res/values/theme_cyan.xml
+++ b/app/src/main/res/values/theme_cyan.xml
@@ -8,7 +8,6 @@
 
   <style name="CyanAccent" parent="BlackTint">
     <item name="colorAccent">@color/cyan_a400</item>
-    <item name="colorAccentDialog">@color/cyan_a400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_deep_orange.xml b/app/src/main/res/values/theme_deep_orange.xml
index 6b2cb83a0..46d4632ed 100644
--- a/app/src/main/res/values/theme_deep_orange.xml
+++ b/app/src/main/res/values/theme_deep_orange.xml
@@ -8,7 +8,6 @@
 
   <style name="DeepOrangeAccent" parent="WhiteTint">
     <item name="colorAccent">@color/deep_orange_a400</item>
-    <item name="colorAccentDialog">@color/deep_orange_a400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_deep_purple.xml b/app/src/main/res/values/theme_deep_purple.xml
index 69076d76d..5727db495 100644
--- a/app/src/main/res/values/theme_deep_purple.xml
+++ b/app/src/main/res/values/theme_deep_purple.xml
@@ -8,7 +8,6 @@
 
   <style name="DeepPurpleAccent" parent="WhiteTint">
     <item name="colorAccent">@color/deep_purple_a400</item>
-    <item name="colorAccentDialog">@color/deep_purple_a400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_green.xml b/app/src/main/res/values/theme_green.xml
index 21509a875..4956544c3 100644
--- a/app/src/main/res/values/theme_green.xml
+++ b/app/src/main/res/values/theme_green.xml
@@ -8,7 +8,6 @@
 
   <style name="GreenAccent" parent="BlackTint">
     <item name="colorAccent">@color/green_a400</item>
-    <item name="colorAccentDialog">@color/green_a400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_indigo.xml b/app/src/main/res/values/theme_indigo.xml
index a74e6d795..19febe8cc 100644
--- a/app/src/main/res/values/theme_indigo.xml
+++ b/app/src/main/res/values/theme_indigo.xml
@@ -8,7 +8,6 @@
 
   <style name="IndigoAccent" parent="WhiteTint">
     <item name="colorAccent">@color/indigo_a400</item>
-    <item name="colorAccentDialog">@color/indigo_a400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_light_blue.xml b/app/src/main/res/values/theme_light_blue.xml
index 6d540baa7..282f0bedb 100644
--- a/app/src/main/res/values/theme_light_blue.xml
+++ b/app/src/main/res/values/theme_light_blue.xml
@@ -8,7 +8,6 @@
 
   <style name="LightBlueAccent" parent="BlackTint">
     <item name="colorAccent">@color/light_blue_a400</item>
-    <item name="colorAccentDialog">@color/light_blue_a400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_light_green.xml b/app/src/main/res/values/theme_light_green.xml
index 55c4a32b8..9a0fefd61 100644
--- a/app/src/main/res/values/theme_light_green.xml
+++ b/app/src/main/res/values/theme_light_green.xml
@@ -8,7 +8,6 @@
 
   <style name="LightGreenAccent" parent="BlackTint">
     <item name="colorAccent">@color/light_green_a400</item>
-    <item name="colorAccentDialog">@color/light_green_a400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_lime.xml b/app/src/main/res/values/theme_lime.xml
index 0f10527f1..2117af6c3 100644
--- a/app/src/main/res/values/theme_lime.xml
+++ b/app/src/main/res/values/theme_lime.xml
@@ -8,7 +8,6 @@
 
   <style name="LimeAccent" parent="BlackTint">
     <item name="colorAccent">@color/lime_a400</item>
-    <item name="colorAccentDialog">@color/lime_a400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_orange.xml b/app/src/main/res/values/theme_orange.xml
index 10bfeae77..1f7742881 100644
--- a/app/src/main/res/values/theme_orange.xml
+++ b/app/src/main/res/values/theme_orange.xml
@@ -8,7 +8,6 @@
 
   <style name="OrangeAccent" parent="BlackTint">
     <item name="colorAccent">@color/orange_a400</item>
-    <item name="colorAccentDialog">@color/orange_a400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_pink.xml b/app/src/main/res/values/theme_pink.xml
index 98f5169c6..776d51f8a 100644
--- a/app/src/main/res/values/theme_pink.xml
+++ b/app/src/main/res/values/theme_pink.xml
@@ -8,7 +8,6 @@
 
   <style name="PinkAccent" parent="WhiteTint">
     <item name="colorAccent">@color/pink_a400</item>
-    <item name="colorAccentDialog">@color/pink_a400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_purple.xml b/app/src/main/res/values/theme_purple.xml
index 31954d793..53788468d 100644
--- a/app/src/main/res/values/theme_purple.xml
+++ b/app/src/main/res/values/theme_purple.xml
@@ -8,7 +8,6 @@
 
   <style name="PurpleAccent" parent="WhiteTint">
     <item name="colorAccent">@color/purple_a400</item>
-    <item name="colorAccentDialog">@color/purple_a400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_red.xml b/app/src/main/res/values/theme_red.xml
index 4c4a6b5bb..9483b3940 100644
--- a/app/src/main/res/values/theme_red.xml
+++ b/app/src/main/res/values/theme_red.xml
@@ -8,7 +8,6 @@
 
   <style name="RedAccent" parent="WhiteTint">
     <item name="colorAccent">@color/red_a400</item>
-    <item name="colorAccentDialog">@color/red_a400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_teal.xml b/app/src/main/res/values/theme_teal.xml
index d44e8936c..aa3be4d2c 100644
--- a/app/src/main/res/values/theme_teal.xml
+++ b/app/src/main/res/values/theme_teal.xml
@@ -8,7 +8,6 @@
 
   <style name="TealAccent" parent="BlackTint">
     <item name="colorAccent">@color/teal_a400</item>
-    <item name="colorAccentDialog">@color/teal_a400</item>
   </style>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/theme_yellow.xml b/app/src/main/res/values/theme_yellow.xml
index 3836d71b2..7fb83642a 100644
--- a/app/src/main/res/values/theme_yellow.xml
+++ b/app/src/main/res/values/theme_yellow.xml
@@ -8,7 +8,6 @@
 
   <style name="YellowAccent" parent="BlackTint">
     <item name="colorAccent">@color/yellow_a400</item>
-    <item name="colorAccentDialog">@color/yellow_a400</item>
   </style>
 
 </resources>
\ No newline at end of file