diff --git a/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java b/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java
index 975f8f10a..9e1ee43c3 100644
--- a/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java
+++ b/app/src/main/java/org/tasks/repeats/CustomRecurrenceDialog.java
@@ -303,11 +303,11 @@ public class CustomRecurrenceDialog extends InjectingDialogFragment {
               new int[] {android.R.attr.state_checked}, new int[] {-android.R.attr.state_checked}
             },
             new int[] {
-              ResourceResolver.getData(context, R.attr.colorOnSecondary),
+              ResourceResolver.getData(context, R.attr.weekdayButtonText),
               getColor(context, R.color.text_primary)
             });
     int inset = (int) context.getResources().getDimension(R.dimen.week_button_inset);
-    int accentColor = ResourceResolver.getData(context, R.attr.colorAccent);
+    int accentColor = ResourceResolver.getData(context, R.attr.weekdayButtonBackground);
     int animationDuration =
         context.getResources().getInteger(android.R.integer.config_shortAnimTime);
 
diff --git a/app/src/main/res/layout/control_set_repeat.xml b/app/src/main/res/layout/control_set_repeat.xml
index 43ff81aff..179a6a7e3 100644
--- a/app/src/main/res/layout/control_set_repeat.xml
+++ b/app/src/main/res/layout/control_set_repeat.xml
@@ -17,7 +17,7 @@
     <FrameLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="?colorAccentDialog">
+      android:background="?attr/colorPrimary">
 
       <androidx.appcompat.widget.AppCompatSpinner
         android:id="@+id/frequency"
@@ -31,7 +31,7 @@
         android:paddingEnd="@dimen/keyline_first"
         android:paddingLeft="@dimen/keyline_first"
         android:paddingRight="@dimen/keyline_first"
-        app:backgroundTint="?attr/colorOnSecondary"/>
+        app:backgroundTint="?attr/colorOnPrimary"/>
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/frequency_item.xml b/app/src/main/res/layout/frequency_item.xml
index 3b4022b29..fb2b9e05a 100644
--- a/app/src/main/res/layout/frequency_item.xml
+++ b/app/src/main/res/layout/frequency_item.xml
@@ -13,4 +13,4 @@
   android:ellipsize="end"
   android:singleLine="true"
   android:textAlignment="viewStart"
-  android:textColor="?attr/colorOnSecondary"/>
+  android:textColor="?attr/colorOnPrimary"/>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index fd561ba66..bf3bf6978 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -22,6 +22,8 @@
   <attr format="reference" name="materialButtonBackground"/>
   <attr format="reference" name="materialButtonRipple"/>
   <attr format="reference" name="materialButtonStroke"/>
+  <attr format="reference" name="weekdayButtonBackground"/>
+  <attr format="reference" name="weekdayButtonText"/>
 
   <declare-styleable name="TimePreference">
     <attr format="string" name="summary"/>
diff --git a/app/src/main/res/values/theme.xml b/app/src/main/res/values/theme.xml
index 6fce8cf0d..e5d19e089 100644
--- a/app/src/main/res/values/theme.xml
+++ b/app/src/main/res/values/theme.xml
@@ -35,6 +35,8 @@
     <item name="materialButtonBackground">@color/mtrl_btn_text_btn_bg_color_selector</item>
     <item name="materialButtonRipple">@color/mtrl_btn_text_btn_ripple_color</item>
     <item name="materialButtonStroke">@color/mtrl_btn_stroke_color_selector</item>
+    <item name="weekdayButtonBackground">?attr/colorPrimary</item>
+    <item name="weekdayButtonText">?attr/colorOnPrimary</item>
   </style>
 
   <style name="Tasks" parent="TasksBase"/>
diff --git a/app/src/main/res/values/theme_white.xml b/app/src/main/res/values/theme_white.xml
index bde4f07d5..57544ff2f 100644
--- a/app/src/main/res/values/theme_white.xml
+++ b/app/src/main/res/values/theme_white.xml
@@ -14,6 +14,8 @@
     <item name="materialButtonBackground">@color/button_accent_background</item>
     <item name="materialButtonRipple">@color/button_accent_ripple</item>
     <item name="materialButtonStroke">@color/button_accent_stroke</item>
+    <item name="weekdayButtonBackground">?attr/colorAccent</item>
+    <item name="weekdayButtonText">?attr/colorOnSecondary</item>
   </style>
 
   <style name="AlertButtonStyle" parent="Widget.MaterialComponents.Button.TextButton.Dialog.Flush">