diff --git a/src/com/android/customization/model/theme/DefaultThemeProvider.java b/src/com/android/customization/model/theme/DefaultThemeProvider.java
index ac33b51..911aa7c 100644
--- a/src/com/android/customization/model/theme/DefaultThemeProvider.java
+++ b/src/com/android/customization/model/theme/DefaultThemeProvider.java
@@ -179,7 +179,7 @@
                 String iconSysUiOverlayPackage = getOverlayPackage(ICON_SYSUI_PREFIX, themeName);
 
                 if (!TextUtils.isEmpty(iconSysUiOverlayPackage)) {
-                    builder.addOverlayPackage(getOverlayCategory(iconAndroidOverlayPackage),
+                    builder.addOverlayPackage(getOverlayCategory(iconSysUiOverlayPackage),
                             iconSysUiOverlayPackage);
                     for (String iconName : SYSUI_ICONS_FOR_PREVIEW) {
                         builder.addIcon(loadIconPreviewDrawable(iconName, iconSysUiOverlayPackage));
@@ -190,7 +190,7 @@
                         themeName);
 
                 if (!TextUtils.isEmpty(iconSettingsOverlayPackage)) {
-                    builder.addOverlayPackage(getOverlayCategory(iconAndroidOverlayPackage),
+                    builder.addOverlayPackage(getOverlayCategory(iconSettingsOverlayPackage),
                             iconSettingsOverlayPackage);
                 }