diff --git a/app/src/main/java/org/tasks/themes/ThemeCache.java b/app/src/main/java/org/tasks/themes/ThemeCache.java
index 6c1afcd1d..78c975ab4 100644
--- a/app/src/main/java/org/tasks/themes/ThemeCache.java
+++ b/app/src/main/java/org/tasks/themes/ThemeCache.java
@@ -84,8 +84,8 @@ public class ThemeCache {
               widgetBackgroundNames[i],
               i,
               getColor(context, WidgetTheme.BACKGROUNDS[i]),
-              getColor(context, i == 0 ? R.color.black_87 : R.color.white_100),
-              getColor(context, i == 0 ? R.color.black_54 : R.color.white_70)));
+              getColor(context, i == 0 ? R.color.black_87 : R.color.white_87),
+              getColor(context, i == 0 ? R.color.black_54 : R.color.white_60)));
     }
     untaggedColor =
         new ThemeColor(context, 19, getColor(context, R.color.tag_color_none_background));
diff --git a/app/src/main/java/org/tasks/themes/ThemeColor.java b/app/src/main/java/org/tasks/themes/ThemeColor.java
index 6579610b0..d4ca90fd5 100644
--- a/app/src/main/java/org/tasks/themes/ThemeColor.java
+++ b/app/src/main/java/org/tasks/themes/ThemeColor.java
@@ -142,7 +142,7 @@ public class ThemeColor implements Pickable {
     this.colorPrimary = colorPrimary;
     this.colorPrimaryVariant = ColorUtil.darken(colorPrimary, 12);
 
-    int whiteText = context.getResources().getColor(R.color.white_100);
+    int whiteText = context.getResources().getColor(R.color.white_87);
     double contrast = ColorUtils.calculateContrast(whiteText, colorPrimary);
     this.isDark = contrast < 3;
     colorOnPrimary = isDark ? context.getResources().getColor(R.color.black_87) : whiteText;
diff --git a/app/src/main/res/color-night/text_primary.xml b/app/src/main/res/color-night/text_primary.xml
index f0005dd05..9ded5af63 100644
--- a/app/src/main/res/color-night/text_primary.xml
+++ b/app/src/main/res/color-night/text_primary.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:color="@color/white_50" android:state_enabled="false"/>
-  <item android:color="@color/white_100"/>
+  <item android:color="@color/white_38" android:state_enabled="false"/>
+  <item android:color="@color/white_87"/>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 2ff2d7b9b..571b7e92c 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -7,7 +7,7 @@
   <color name="icon_tint_with_alpha">@color/icon_tint_dark_alpha</color>
   <color name="drawer_color">@color/md_background_dark</color>
   <color name="drawer_color_selected">@color/drawer_background_dark_selected</color>
-  <color name="text_secondary">@color/white_70</color>
-  <color name="text_tertiary">@color/white_50</color>
+  <color name="text_secondary">@color/white_60</color>
+  <color name="text_tertiary">@color/white_38</color>
   <color name="overdue">@color/overdue_87</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3fd02c63e..62e576827 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -86,8 +86,9 @@
   <color name="black_12">#1f000000</color>
 
   <color name="white_100">#ffffffff</color>
-  <color name="white_70">#b3ffffff</color>
-  <color name="white_50">#80ffffff</color>
+  <color name="white_87">#deffffff</color>
+  <color name="white_60">#99ffffff</color>
+  <color name="white_38">#61ffffff</color>
   <color name="white_12">#1fffffff</color>
 
   <color name="overdue_87">#def44336</color>
@@ -99,7 +100,7 @@
   <color name="icon_tint_light">@android:color/black</color>
   <color name="icon_tint_dark">@android:color/white</color>
   <color name="icon_tint_light_alpha">@color/black_54</color>
-  <color name="icon_tint_dark_alpha">@color/white_70</color>
+  <color name="icon_tint_dark_alpha">@color/white_60</color>
 
   <color name="drawer_background_light_selected">#e8e8e8</color>
   <color name="drawer_background_dark_selected">#303030</color>
@@ -109,7 +110,7 @@
   <color name="priority_3">@color/blue_500</color>
   <color name="priority_4">@color/grey_500</color>
 
-  <color name="snackbar_text_color">@color/white_100</color>
+  <color name="snackbar_text_color">@color/white_87</color>
   <color name="snackbar_action_color">#f4b400</color>
   <color name="snackbar_background">@color/grey_800</color>
   <color name="tag_color_none_background">#e1e1e1</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 12735124a..6a22152e2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -28,8 +28,8 @@
 
   <style name="WhiteToolbarTheme">
     <item name="overlay_theme">@style/WhiteToolbarOverlay</item>
-    <item name="colorOnPrimary">@color/white_100</item>
-    <item name="colorOnPrimaryHint">@color/white_70</item>
+    <item name="colorOnPrimary">@color/white_87</item>
+    <item name="colorOnPrimaryHint">@color/white_60</item>
     <item name="android:actionOverflowButtonStyle">@style/WhiteOverflow</item>
   </style>
 
@@ -41,7 +41,7 @@
   </style>
 
   <style name="WhiteTint">
-    <item name="colorOnSecondary">@color/white_100</item>
+    <item name="colorOnSecondary">@color/white_87</item>
   </style>
 
   <style name="BlackTint">
@@ -49,7 +49,7 @@
   </style>
 
   <style name="WhiteOverflow" parent="Widget.AppCompat.Light.ActionButton.Overflow">
-    <item name="android:tint">@color/white_100</item>
+    <item name="android:tint">@color/white_87</item>
   </style>
 
   <style name="BlackOverflow" parent="Widget.AppCompat.Light.ActionButton.Overflow">
@@ -57,9 +57,9 @@
   </style>
 
   <style name="WhiteToolbarOverlay" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">
-    <item name="colorControlNormal">@color/white_100</item>
-    <item name="android:textColorHint">@color/white_100</item>
-    <item name="android:editTextColor">@color/white_100</item>
+    <item name="colorControlNormal">@color/white_87</item>
+    <item name="android:textColorHint">@color/white_60</item>
+    <item name="android:editTextColor">@color/white_87</item>
   </style>
 
   <style name="BlackToolbarOverlay" parent="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar">