diff --git a/app/src/main/java/org/tasks/fragments/CommentBarFragment.java b/app/src/main/java/org/tasks/fragments/CommentBarFragment.java
index 5ca6b55c0..7324c1230 100644
--- a/app/src/main/java/org/tasks/fragments/CommentBarFragment.java
+++ b/app/src/main/java/org/tasks/fragments/CommentBarFragment.java
@@ -219,7 +219,7 @@ public class CommentBarFragment extends TaskEditControlFragment {
 
   private void resetPictureButton() {
     TypedValue typedValue = new TypedValue();
-    getActivity().getTheme().resolveAttribute(R.attr.actionBarPrimaryText, typedValue, true);
+    getActivity().getTheme().resolveAttribute(R.attr.colorOnPrimary, typedValue, true);
     Drawable drawable =
         DrawableCompat.wrap(
             ContextCompat.getDrawable(getContext(), R.drawable.ic_outline_photo_camera_24px));
diff --git a/app/src/main/java/org/tasks/themes/ThemeCache.java b/app/src/main/java/org/tasks/themes/ThemeCache.java
index 62dde4e18..2696f7a79 100644
--- a/app/src/main/java/org/tasks/themes/ThemeCache.java
+++ b/app/src/main/java/org/tasks/themes/ThemeCache.java
@@ -68,7 +68,7 @@ public class ThemeCache {
               i,
               resolveAttribute(theme, R.attr.colorPrimary),
               resolveAttribute(theme, R.attr.colorPrimaryVariant),
-              resolveAttribute(theme, R.attr.actionBarPrimaryText),
+              resolveAttribute(theme, R.attr.colorOnPrimary),
               resolveBoolean(theme, R.attr.dark_status_bar)));
     }
     String[] accentNames = resources.getStringArray(R.array.accents);
diff --git a/app/src/main/java/org/tasks/ui/MenuColorizer.java b/app/src/main/java/org/tasks/ui/MenuColorizer.java
index a115e77a3..582849df6 100644
--- a/app/src/main/java/org/tasks/ui/MenuColorizer.java
+++ b/app/src/main/java/org/tasks/ui/MenuColorizer.java
@@ -51,19 +51,18 @@ public class MenuColorizer {
 
   public static void colorToolbar(Context context, Toolbar toolbar) {
     TypedValue typedValue = new TypedValue();
-    context.getTheme().resolveAttribute(R.attr.actionBarPrimaryText, typedValue, true);
+    context.getTheme().resolveAttribute(R.attr.colorOnPrimary, typedValue, true);
     colorToolbar(toolbar, typedValue.data);
   }
 
   public static void colorToolbar(Toolbar toolbar, int color) {
     toolbar.setNavigationIcon(colorDrawable(toolbar.getNavigationIcon(), color));
-    toolbar.setTitleTextColor(color);
     colorMenu(toolbar.getMenu(), color);
   }
 
   public static void colorMenu(Context context, Menu menu) {
     TypedValue typedValue = new TypedValue();
-    context.getTheme().resolveAttribute(R.attr.actionBarPrimaryText, typedValue, true);
+    context.getTheme().resolveAttribute(R.attr.colorOnPrimary, typedValue, true);
     colorMenu(menu, typedValue.data);
   }
 
diff --git a/app/src/main/res/layout/fragment_comment_bar.xml b/app/src/main/res/layout/fragment_comment_bar.xml
index bf31ed5fa..fad499682 100644
--- a/app/src/main/res/layout/fragment_comment_bar.xml
+++ b/app/src/main/res/layout/fragment_comment_bar.xml
@@ -42,7 +42,7 @@
     android:nextFocusLeft="@id/commentField"
     android:nextFocusUp="@id/commentField"
     android:textAlignment="viewStart"
-    android:textColor="?attr/actionBarPrimaryText"
+    android:textColor="?attr/colorOnPrimary"
     android:textColorHint="?attr/actionBarSecondaryText"
     android:textCursorDrawable="@null"
     android:textSize="16sp"/>
@@ -56,7 +56,7 @@
     android:layout_marginLeft="3dip"
     android:scaleType="center"
     android:src="@drawable/ic_outline_add_24px"
-    android:tint="?attr/actionBarPrimaryText"
+    android:tint="?attr/colorOnPrimary"
     android:visibility="gone"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
index b43a6ac01..bb476ba2c 100644
--- a/app/src/main/res/layout/toolbar.xml
+++ b/app/src/main/res/layout/toolbar.xml
@@ -7,6 +7,7 @@
   android:background="?attr/colorPrimary"
   android:elevation="@dimen/elevation_toolbar"
   android:theme="?attr/overlay_theme"
+  app:titleTextColor="?attr/colorOnPrimary"
   app:popupTheme="@style/popup_overlay"
   app:toolbarStyle="@style/Widget.MaterialComponents.Toolbar"
   tools:ignore="UnusedAttribute"/>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 04a4aeed0..1d9314dde 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -12,7 +12,6 @@
   <attr format="color" name="asTextColorHint"/>
   <attr format="color" name="icon_tint"/>
   <attr format="reference" name="overlay_theme"/>
-  <attr format="color" name="actionBarPrimaryText"/>
   <attr format="color" name="actionBarSecondaryText"/>
   <attr format="boolean" name="dark_status_bar"/>
   <attr format="dimension" name="alpha_secondary"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fcfc65315..28e4eac64 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -31,14 +31,14 @@
   <style name="WhiteToolbarTheme">
     <item name="dark_status_bar">false</item>
     <item name="overlay_theme">@style/WhiteToolbarOverlay</item>
-    <item name="actionBarPrimaryText">@color/white_100</item>
+    <item name="colorOnPrimary">@color/white_100</item>
     <item name="actionBarSecondaryText">@color/white_70</item>
   </style>
 
   <style name="BlackToolbarTheme">
     <item name="dark_status_bar">true</item>
     <item name="overlay_theme">@style/BlackToolbarOverlay</item>
-    <item name="actionBarPrimaryText">@color/black_87</item>
+    <item name="colorOnPrimary">@color/black_87</item>
     <item name="actionBarSecondaryText">@color/black_54</item>
   </style>