diff --git a/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt b/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt
index 31deaed780..714db985d0 100644
--- a/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt
+++ b/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt
@@ -12,6 +12,7 @@ import com.android.launcher3.AbstractFloatingView
 import com.android.launcher3.LauncherSettings.Favorites.ITEM_TYPE_APPLICATION
 import com.android.launcher3.R
 import com.android.launcher3.Utilities
+import com.android.launcher3.icons.BitmapInfo
 import com.android.launcher3.model.data.ItemInfo
 import com.android.launcher3.popup.SystemShortcut
 import com.android.launcher3.util.ComponentKey
@@ -34,7 +35,10 @@ class LawnchairShortcut {
             val outObj = Array<Any?>(1) { null }
             val key = ComponentKey(mItemInfo.targetComponent, mItemInfo.user)
             val appInfo = launcher.appsView.appsStore.getApp(key)!!
-            val icon = Utilities.getFullDrawable(launcher, appInfo, 0, 0, outObj)
+            var icon = Utilities.loadFullDrawableWithoutTheme(launcher, appInfo, 0, 0, outObj)
+            if (mItemInfo.screenId != NO_ID && icon is BitmapInfo.Extender) {
+                icon = icon.getThemedDrawable(launcher)
+            }
             val launcherActivityInfo = outObj[0] as LauncherActivityInfo
             val defaultTitle = launcherActivityInfo.label.toString()
 
diff --git a/src/com/android/launcher3/Utilities.java b/src/com/android/launcher3/Utilities.java
index 7b3abcdb2c..3e9e040beb 100644
--- a/src/com/android/launcher3/Utilities.java
+++ b/src/com/android/launcher3/Utilities.java
@@ -684,7 +684,7 @@ public final class Utilities {
         return icon;
     }
 
-    private static Drawable loadFullDrawableWithoutTheme(Launcher launcher, ItemInfo info,
+    public static Drawable loadFullDrawableWithoutTheme(Launcher launcher, ItemInfo info,
             int width, int height, Object[] outObj) {
         LauncherAppState appState = LauncherAppState.getInstance(launcher);
         if (info.itemType == LauncherSettings.Favorites.ITEM_TYPE_APPLICATION) {