diff --git a/app/src/main/java/org/tasks/themes/ThemeCache.java b/app/src/main/java/org/tasks/themes/ThemeCache.java
index a15373143..62dde4e18 100644
--- a/app/src/main/java/org/tasks/themes/ThemeCache.java
+++ b/app/src/main/java/org/tasks/themes/ThemeCache.java
@@ -67,7 +67,7 @@ public class ThemeCache {
               colorNames[i],
               i,
               resolveAttribute(theme, R.attr.colorPrimary),
-              resolveAttribute(theme, R.attr.colorPrimaryDark),
+              resolveAttribute(theme, R.attr.colorPrimaryVariant),
               resolveAttribute(theme, R.attr.actionBarPrimaryText),
               resolveBoolean(theme, R.attr.dark_status_bar)));
     }
diff --git a/app/src/main/java/org/tasks/themes/ThemeColor.java b/app/src/main/java/org/tasks/themes/ThemeColor.java
index cd10cece6..4a2395ad4 100644
--- a/app/src/main/java/org/tasks/themes/ThemeColor.java
+++ b/app/src/main/java/org/tasks/themes/ThemeColor.java
@@ -109,14 +109,14 @@ public class ThemeColor implements ColorPickerDialog.Pickable {
   private final int actionBarTint;
   private final int style;
   private final int colorPrimary;
-  private final int colorPrimaryDark;
+  private final int colorPrimaryVariant;
   private final boolean isDark;
 
   public ThemeColor(
       String name,
       int index,
       int colorPrimary,
-      int colorPrimaryDark,
+      int colorPrimaryVariant,
       int actionBarTint,
       boolean isDark) {
     this.name = name;
@@ -124,7 +124,7 @@ public class ThemeColor implements ColorPickerDialog.Pickable {
     this.actionBarTint = actionBarTint;
     this.style = COLORS[index];
     this.colorPrimary = colorPrimary;
-    this.colorPrimaryDark = colorPrimaryDark;
+    this.colorPrimaryVariant = colorPrimaryVariant;
     this.isDark = isDark;
   }
 
@@ -134,7 +134,7 @@ public class ThemeColor implements ColorPickerDialog.Pickable {
     actionBarTint = source.readInt();
     style = source.readInt();
     colorPrimary = source.readInt();
-    colorPrimaryDark = source.readInt();
+    colorPrimaryVariant = source.readInt();
     isDark = source.readInt() == 1;
   }
 
@@ -148,13 +148,13 @@ public class ThemeColor implements ColorPickerDialog.Pickable {
 
   public void setStatusBarColor(Activity activity) {
     if (atLeastLollipop()) {
-      activity.getWindow().setStatusBarColor(getColorPrimaryDark());
+      activity.getWindow().setStatusBarColor(getColorPrimaryVariant());
     }
   }
 
   public void applyToStatusBar(DrawerLayout drawerLayout) {
     if (atLeastLollipop()) {
-      drawerLayout.setStatusBarBackgroundColor(getColorPrimaryDark());
+      drawerLayout.setStatusBarBackgroundColor(getColorPrimaryVariant());
     }
     if (atLeastMarshmallow()) {
       int systemUiVisibility = applyLightStatusBarFlag(drawerLayout.getSystemUiVisibility());
@@ -242,8 +242,8 @@ public class ThemeColor implements ColorPickerDialog.Pickable {
     return actionBarTint;
   }
 
-  private int getColorPrimaryDark() {
-    return colorPrimaryDark;
+  private int getColorPrimaryVariant() {
+    return colorPrimaryVariant;
   }
 
   public void apply(Toolbar toolbar) {
@@ -263,7 +263,7 @@ public class ThemeColor implements ColorPickerDialog.Pickable {
     dest.writeInt(actionBarTint);
     dest.writeInt(style);
     dest.writeInt(colorPrimary);
-    dest.writeInt(colorPrimaryDark);
+    dest.writeInt(colorPrimaryVariant);
     dest.writeInt(isDark ? 1 : 0);
   }
 }
diff --git a/app/src/main/res/layout/activity_location_picker.xml b/app/src/main/res/layout/activity_location_picker.xml
index f093d7387..df5ce8d41 100644
--- a/app/src/main/res/layout/activity_location_picker.xml
+++ b/app/src/main/res/layout/activity_location_picker.xml
@@ -21,7 +21,7 @@
       android:fitsSystemWindows="true"
       app:contentScrim="?attr/colorPrimary"
       app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"
-      app:statusBarScrim="?attr/colorPrimaryDark"
+      app:statusBarScrim="?attr/colorPrimaryVariant"
       app:titleEnabled="false">
 
       <androidx.constraintlayout.widget.ConstraintLayout
diff --git a/app/src/main/res/values/theme_amber.xml b/app/src/main/res/values/theme_amber.xml
index 79565d0e2..b007794b4 100644
--- a/app/src/main/res/values/theme_amber.xml
+++ b/app/src/main/res/values/theme_amber.xml
@@ -3,7 +3,7 @@
 
   <style name="Amber" parent="BlackToolbarTheme">
     <item name="colorPrimary">@color/amber_500</item>
-    <item name="colorPrimaryDark">@color/amber_700</item>
+    <item name="colorPrimaryVariant">@color/amber_700</item>
   </style>
 
   <style name="AmberAccent" parent="BlackTint">
diff --git a/app/src/main/res/values/theme_blue.xml b/app/src/main/res/values/theme_blue.xml
index a9e6852cb..b18ddc8a0 100644
--- a/app/src/main/res/values/theme_blue.xml
+++ b/app/src/main/res/values/theme_blue.xml
@@ -3,7 +3,7 @@
 
   <style name="Blue" parent="WhiteToolbarTheme">
     <item name="colorPrimary">@color/blue_500</item>
-    <item name="colorPrimaryDark">@color/blue_700</item>
+    <item name="colorPrimaryVariant">@color/blue_700</item>
   </style>
 
   <style name="BlueAccent" parent="WhiteTint">
diff --git a/app/src/main/res/values/theme_blue_grey.xml b/app/src/main/res/values/theme_blue_grey.xml
index e7bb31f79..c86c450fa 100644
--- a/app/src/main/res/values/theme_blue_grey.xml
+++ b/app/src/main/res/values/theme_blue_grey.xml
@@ -3,7 +3,7 @@
 
   <style name="BlueGrey" parent="WhiteToolbarTheme">
     <item name="colorPrimary">@color/blue_grey_500</item>
-    <item name="colorPrimaryDark">@color/blue_grey_700</item>
+    <item name="colorPrimaryVariant">@color/blue_grey_700</item>
   </style>
 
   <style name="BlueGreyAccent" parent="WhiteTint">
diff --git a/app/src/main/res/values/theme_brown.xml b/app/src/main/res/values/theme_brown.xml
index 69a1833e8..f39abf96e 100644
--- a/app/src/main/res/values/theme_brown.xml
+++ b/app/src/main/res/values/theme_brown.xml
@@ -3,7 +3,7 @@
 
   <style name="Brown" parent="WhiteToolbarTheme">
     <item name="colorPrimary">@color/brown_500</item>
-    <item name="colorPrimaryDark">@color/brown_700</item>
+    <item name="colorPrimaryVariant">@color/brown_700</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 52ffcfa37..e6ab76b94 100644
--- a/app/src/main/res/values/theme_cyan.xml
+++ b/app/src/main/res/values/theme_cyan.xml
@@ -3,7 +3,7 @@
 
   <style name="Cyan" parent="BlackToolbarTheme">
     <item name="colorPrimary">@color/cyan_500</item>
-    <item name="colorPrimaryDark">@color/cyan_700</item>
+    <item name="colorPrimaryVariant">@color/cyan_700</item>
   </style>
 
   <style name="CyanAccent" parent="BlackTint">
diff --git a/app/src/main/res/values/theme_dark_grey.xml b/app/src/main/res/values/theme_dark_grey.xml
index 18c268aa7..e6e9e1985 100644
--- a/app/src/main/res/values/theme_dark_grey.xml
+++ b/app/src/main/res/values/theme_dark_grey.xml
@@ -3,7 +3,7 @@
 
   <style name="DarkGrey" parent="WhiteToolbarTheme">
     <item name="colorPrimary">@color/grey_900</item>
-    <item name="colorPrimaryDark">@color/grey_statusbar</item>
+    <item name="colorPrimaryVariant">@color/grey_statusbar</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 3134a51d5..6b2cb83a0 100644
--- a/app/src/main/res/values/theme_deep_orange.xml
+++ b/app/src/main/res/values/theme_deep_orange.xml
@@ -3,7 +3,7 @@
 
   <style name="DeepOrange" parent="WhiteToolbarTheme">
     <item name="colorPrimary">@color/deep_orange_500</item>
-    <item name="colorPrimaryDark">@color/deep_orange_700</item>
+    <item name="colorPrimaryVariant">@color/deep_orange_700</item>
   </style>
 
   <style name="DeepOrangeAccent" parent="WhiteTint">
diff --git a/app/src/main/res/values/theme_deep_purple.xml b/app/src/main/res/values/theme_deep_purple.xml
index 900bbb597..69076d76d 100644
--- a/app/src/main/res/values/theme_deep_purple.xml
+++ b/app/src/main/res/values/theme_deep_purple.xml
@@ -3,7 +3,7 @@
 
   <style name="DeepPurple" parent="WhiteToolbarTheme">
     <item name="colorPrimary">@color/deep_purple_500</item>
-    <item name="colorPrimaryDark">@color/deep_purple_700</item>
+    <item name="colorPrimaryVariant">@color/deep_purple_700</item>
   </style>
 
   <style name="DeepPurpleAccent" parent="WhiteTint">
diff --git a/app/src/main/res/values/theme_green.xml b/app/src/main/res/values/theme_green.xml
index 6d468b1e5..21509a875 100644
--- a/app/src/main/res/values/theme_green.xml
+++ b/app/src/main/res/values/theme_green.xml
@@ -3,7 +3,7 @@
 
   <style name="Green" parent="BlackToolbarTheme">
     <item name="colorPrimary">@color/green_500</item>
-    <item name="colorPrimaryDark">@color/green_700</item>
+    <item name="colorPrimaryVariant">@color/green_700</item>
   </style>
 
   <style name="GreenAccent" parent="BlackTint">
diff --git a/app/src/main/res/values/theme_grey.xml b/app/src/main/res/values/theme_grey.xml
index f04171874..ad39e073b 100644
--- a/app/src/main/res/values/theme_grey.xml
+++ b/app/src/main/res/values/theme_grey.xml
@@ -3,7 +3,7 @@
 
   <style name="Grey" parent="BlackToolbarTheme">
     <item name="colorPrimary">@color/grey_500</item>
-    <item name="colorPrimaryDark">@color/grey_700</item>
+    <item name="colorPrimaryVariant">@color/grey_700</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 1c2850627..a74e6d795 100644
--- a/app/src/main/res/values/theme_indigo.xml
+++ b/app/src/main/res/values/theme_indigo.xml
@@ -3,7 +3,7 @@
 
   <style name="Indigo" parent="WhiteToolbarTheme">
     <item name="colorPrimary">@color/indigo_500</item>
-    <item name="colorPrimaryDark">@color/indigo_700</item>
+    <item name="colorPrimaryVariant">@color/indigo_700</item>
   </style>
 
   <style name="IndigoAccent" parent="WhiteTint">
diff --git a/app/src/main/res/values/theme_light_blue.xml b/app/src/main/res/values/theme_light_blue.xml
index 26f188875..6d540baa7 100644
--- a/app/src/main/res/values/theme_light_blue.xml
+++ b/app/src/main/res/values/theme_light_blue.xml
@@ -3,7 +3,7 @@
 
   <style name="LightBlue" parent="BlackToolbarTheme">
     <item name="colorPrimary">@color/light_blue_500</item>
-    <item name="colorPrimaryDark">@color/light_blue_700</item>
+    <item name="colorPrimaryVariant">@color/light_blue_700</item>
   </style>
 
   <style name="LightBlueAccent" parent="BlackTint">
diff --git a/app/src/main/res/values/theme_light_green.xml b/app/src/main/res/values/theme_light_green.xml
index 92a7ec1b2..55c4a32b8 100644
--- a/app/src/main/res/values/theme_light_green.xml
+++ b/app/src/main/res/values/theme_light_green.xml
@@ -3,7 +3,7 @@
 
   <style name="LightGreen" parent="BlackToolbarTheme">
     <item name="colorPrimary">@color/light_green_500</item>
-    <item name="colorPrimaryDark">@color/light_green_700</item>
+    <item name="colorPrimaryVariant">@color/light_green_700</item>
   </style>
 
   <style name="LightGreenAccent" parent="BlackTint">
diff --git a/app/src/main/res/values/theme_lime.xml b/app/src/main/res/values/theme_lime.xml
index 2c7ce486c..0f10527f1 100644
--- a/app/src/main/res/values/theme_lime.xml
+++ b/app/src/main/res/values/theme_lime.xml
@@ -3,7 +3,7 @@
 
   <style name="Lime" parent="BlackToolbarTheme">
     <item name="colorPrimary">@color/lime_500</item>
-    <item name="colorPrimaryDark">@color/lime_700</item>
+    <item name="colorPrimaryVariant">@color/lime_700</item>
   </style>
 
   <style name="LimeAccent" parent="BlackTint">
diff --git a/app/src/main/res/values/theme_orange.xml b/app/src/main/res/values/theme_orange.xml
index 9d0e3404d..10bfeae77 100644
--- a/app/src/main/res/values/theme_orange.xml
+++ b/app/src/main/res/values/theme_orange.xml
@@ -3,7 +3,7 @@
 
   <style name="Orange" parent="BlackToolbarTheme">
     <item name="colorPrimary">@color/orange_500</item>
-    <item name="colorPrimaryDark">@color/orange_700</item>
+    <item name="colorPrimaryVariant">@color/orange_700</item>
   </style>
 
   <style name="OrangeAccent" parent="BlackTint">
diff --git a/app/src/main/res/values/theme_pink.xml b/app/src/main/res/values/theme_pink.xml
index 34f1cd1ce..98f5169c6 100644
--- a/app/src/main/res/values/theme_pink.xml
+++ b/app/src/main/res/values/theme_pink.xml
@@ -3,7 +3,7 @@
 
   <style name="Pink" parent="WhiteToolbarTheme">
     <item name="colorPrimary">@color/pink_500</item>
-    <item name="colorPrimaryDark">@color/pink_700</item>
+    <item name="colorPrimaryVariant">@color/pink_700</item>
   </style>
 
   <style name="PinkAccent" parent="WhiteTint">
diff --git a/app/src/main/res/values/theme_purple.xml b/app/src/main/res/values/theme_purple.xml
index 68f5ed68c..31954d793 100644
--- a/app/src/main/res/values/theme_purple.xml
+++ b/app/src/main/res/values/theme_purple.xml
@@ -3,7 +3,7 @@
 
   <style name="Purple" parent="WhiteToolbarTheme">
     <item name="colorPrimary">@color/purple_500</item>
-    <item name="colorPrimaryDark">@color/purple_700</item>
+    <item name="colorPrimaryVariant">@color/purple_700</item>
   </style>
 
   <style name="PurpleAccent" parent="WhiteTint">
diff --git a/app/src/main/res/values/theme_red.xml b/app/src/main/res/values/theme_red.xml
index 972203e9a..4c4a6b5bb 100644
--- a/app/src/main/res/values/theme_red.xml
+++ b/app/src/main/res/values/theme_red.xml
@@ -3,7 +3,7 @@
 
   <style name="Red" parent="WhiteToolbarTheme">
     <item name="colorPrimary">@color/red_500</item>
-    <item name="colorPrimaryDark">@color/red_700</item>
+    <item name="colorPrimaryVariant">@color/red_700</item>
   </style>
 
   <style name="RedAccent" parent="WhiteTint">
diff --git a/app/src/main/res/values/theme_teal.xml b/app/src/main/res/values/theme_teal.xml
index 54b9c75bd..d44e8936c 100644
--- a/app/src/main/res/values/theme_teal.xml
+++ b/app/src/main/res/values/theme_teal.xml
@@ -3,7 +3,7 @@
 
   <style name="Teal" parent="WhiteToolbarTheme">
     <item name="colorPrimary">@color/teal_500</item>
-    <item name="colorPrimaryDark">@color/teal_700</item>
+    <item name="colorPrimaryVariant">@color/teal_700</item>
   </style>
 
   <style name="TealAccent" parent="BlackTint">
diff --git a/app/src/main/res/values/theme_white.xml b/app/src/main/res/values/theme_white.xml
index 4d405c83f..08dce7c80 100644
--- a/app/src/main/res/values/theme_white.xml
+++ b/app/src/main/res/values/theme_white.xml
@@ -3,7 +3,7 @@
 
   <style name="White" parent="BlackToolbarTheme">
     <item name="colorPrimary">@color/white_100</item>
-    <item name="colorPrimaryDark">@color/white_100</item>
+    <item name="colorPrimaryVariant">@color/white_100</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 79412b291..3836d71b2 100644
--- a/app/src/main/res/values/theme_yellow.xml
+++ b/app/src/main/res/values/theme_yellow.xml
@@ -3,7 +3,7 @@
 
   <style name="Yellow" parent="BlackToolbarTheme">
     <item name="colorPrimary">@color/yellow_500</item>
-    <item name="colorPrimaryDark">@color/yellow_700</item>
+    <item name="colorPrimaryVariant">@color/yellow_700</item>
   </style>
 
   <style name="YellowAccent" parent="BlackTint">