diff --git a/iconloaderlib/src/com/android/launcher3/icons/IconProvider.java b/iconloaderlib/src/com/android/launcher3/icons/IconProvider.java
index 23eed3b..fd1c022 100644
--- a/iconloaderlib/src/com/android/launcher3/icons/IconProvider.java
+++ b/iconloaderlib/src/com/android/launcher3/icons/IconProvider.java
@@ -39,8 +39,6 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.InsetDrawable;
 import android.os.Build;
-import android.os.Build.VERSION;
-import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Process;
@@ -58,9 +56,7 @@
 import java.util.Calendar;
 import java.util.Objects;
 
-// Lawnchair-TODO: NO-OP IconProvider
 import app.lawnchair.icons.CustomAdaptiveIconDrawable;
-import app.lawnchair.icons.IconPreferencesKt;
 
 /**
  * Class to handle icon loading from different packages
@@ -76,8 +72,8 @@ public class IconProvider {
     private static final String SYSTEM_STATE_SEPARATOR = " ";
 
     protected final Context mContext;
-    private final ComponentName mCalendar;
-    private final ComponentName mClock;
+    protected final ComponentName mCalendar;
+    protected final ComponentName mClock;
 
     @NonNull
     protected String mSystemState = "";
@@ -157,9 +153,11 @@ public Drawable getIcon(PackageItemInfo info, ApplicationInfo appInfo, int iconD
         if (icon == null) {
             icon = loadPackageIcon(info, appInfo, iconDpi);
             if (ATLEAST_T && icon instanceof AdaptiveIconDrawable && td != null) {
-                AdaptiveIconDrawable aid = (AdaptiveIconDrawable) icon;
+                CustomAdaptiveIconDrawable aid = (CustomAdaptiveIconDrawable) CustomAdaptiveIconDrawable.wrapNonNull(
+                    icon
+                );
                 if  (aid.getMonochrome() == null) {
-                    icon = new AdaptiveIconDrawable(aid.getBackground(),
+                    icon = new CustomAdaptiveIconDrawable(aid.getBackground(),
                             aid.getForeground(), td.loadPaddedDrawable());
                 }
             }
@@ -171,7 +169,7 @@ protected ThemeData getThemeDataForPackage(String packageName) {
         return null;
     }
 
-    private Drawable loadPackageIcon(PackageItemInfo info, ApplicationInfo appInfo, int density) {
+    protected Drawable loadPackageIcon(PackageItemInfo info, ApplicationInfo appInfo, int density) {
         Drawable icon = null;
         if (BuildCompat.isAtLeastV() && info.isArchived) {
             // Icons for archived apps com from system service, let the default impl handle that
@@ -205,7 +203,7 @@ protected Drawable loadAppInfoIcon(ApplicationInfo info, Resources resources, in
     }
 
     @TargetApi(Build.VERSION_CODES.TIRAMISU)
-    private Drawable loadCalendarDrawable(int iconDpi, @Nullable ThemeData td) {
+    protected Drawable loadCalendarDrawable(int iconDpi, @Nullable ThemeData td) {
         PackageManager pm = mContext.getPackageManager();
         try {
             final Bundle metadata = pm.getActivityInfo(
@@ -290,7 +288,7 @@ public void updateSystemState() {
     /**
      * @return Today's day of the month, zero-indexed.
      */
-    private static int getDay() {
+    protected static int getDay() {
         return Calendar.getInstance().get(Calendar.DAY_OF_MONTH) - 1;
     }