diff --git a/quickstep/res/values-night/colors.xml b/quickstep/res/values-night/colors.xml
index 23ece7b2f5..623a1655ed 100644
--- a/quickstep/res/values-night/colors.xml
+++ b/quickstep/res/values-night/colors.xml
@@ -27,5 +27,5 @@
     <!-- Turn on work apps button -->
     <color name="work_turn_on_stroke">?attr/colorAccentPrimary</color>
     <color name="work_fab_bg_color">?attr/materialColorPrimaryFixedDim</color>
-    <color name="work_fab_icon_color">?attr/materialColorOnPrimaryFixed</color>
-</resources>
\ No newline at end of file
+    <color name="work_fab_icon_color">@color/material_color_on_primary_fixed</color>
+</resources>
diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml
index f799d72b15..9ca66bb8d3 100644
--- a/quickstep/res/values/colors.xml
+++ b/quickstep/res/values/colors.xml
@@ -95,5 +95,5 @@
     <!-- Turn on work apps button -->
     <color name="work_turn_on_stroke">?attr/colorAccentPrimary</color>
     <color name="work_fab_bg_color">?attr/materialColorPrimaryFixedDim</color>
-    <color name="work_fab_icon_color">?attr/materialColorOnPrimaryFixed</color>
-</resources>
\ No newline at end of file
+    <color name="work_fab_icon_color">@color/material_color_on_primary_fixed</color>
+</resources>
diff --git a/src/com/android/launcher3/allapps/WorkProfileManager.java b/src/com/android/launcher3/allapps/WorkProfileManager.java
index c4e03cc774..958680962d 100644
--- a/src/com/android/launcher3/allapps/WorkProfileManager.java
+++ b/src/com/android/launcher3/allapps/WorkProfileManager.java
@@ -166,8 +166,7 @@ public class WorkProfileManager implements PersonalWorkSlidingTabStrip.OnActiveP
      */
     public boolean attachWorkModeSwitch() {
         if (!mAllApps.getAppsStore().hasModelFlag(
-                FLAG_HAS_SHORTCUT_PERMISSION | FLAG_QUIET_MODE_CHANGE_PERMISSION)
-            || !Utilities.ATLEAST_Q) {
+                FLAG_HAS_SHORTCUT_PERMISSION | FLAG_QUIET_MODE_CHANGE_PERMISSION)) {
             Log.e(TAG, "unable to attach work mode switch; Missing required permissions");
             return false;
         }