diff --git a/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt b/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt
index d99baa994e..ff9b873667 100644
--- a/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt
+++ b/lawnchair/src/app/lawnchair/preferences/PreferenceManager.kt
@@ -75,6 +75,7 @@ class PreferenceManager private constructor(private val context: Context) : Base
     val searchResultSettings = BoolPref("pref_searchResultSettings", false)
 
     val themedIcons = BoolPref("themed_icons", false)
+    val drawerThemedIcons = BoolPref("drawer_themed_icons", false, recreate)
     val hotseatQsbCornerRadius = FloatPref("pref_hotseatQsbCornerRadius", 1F, recreate)
 
     val recentsActionScreenshot = BoolPref("pref_recentsActionScreenshot", !isOnePlusStock)
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt
index 902cc1ba62..b95fc83f08 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/AppDrawerPreferences.kt
@@ -133,6 +133,13 @@ fun AppDrawerPreferences() {
                 valueRange = 0.5F..1.5F,
                 showAsPercentage = true,
             )
+            val themedIconsEnabled = prefs.themedIcons.get()
+            if (themedIconsEnabled) {
+                SwitchPreference(
+                    adapter = prefs.drawerThemedIcons.getAdapter(),
+                    label = stringResource(id = R.string.themed_icon_title)
+                )
+            }
             val showDrawerLabels = prefs2.showIconLabelsInDrawer.getAdapter()
             SwitchPreference(
                 adapter = showDrawerLabels,
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java
index 689d40ff94..4651a2a70a 100644
--- a/src/com/android/launcher3/BubbleTextView.java
+++ b/src/com/android/launcher3/BubbleTextView.java
@@ -78,6 +78,7 @@ import java.util.HashMap;
 import java.util.Locale;
 
 import app.lawnchair.font.FontManager;
+import app.lawnchair.preferences.PreferenceManager;
 import app.lawnchair.util.LawnchairUtilsKt;
 
 /**
@@ -366,6 +367,9 @@ public class BubbleTextView extends TextView implements ItemInfoUpdateReceiver,
     }
 
     public boolean shouldUseTheme() {
+        if (mDisplay == DISPLAY_ALL_APPS) {
+            return PreferenceManager.getInstance(getContext()).getDrawerThemedIcons().get();
+        }
         return mDisplay == DISPLAY_WORKSPACE || mDisplay == DISPLAY_FOLDER || mDisplay == DISPLAY_TASKBAR;
     }