diff --git a/core/database/src/main/java/de/mm20/launcher2/database/IconDao.kt b/core/database/src/main/java/de/mm20/launcher2/database/IconDao.kt
index a6a9a14c..1d06f709 100644
--- a/core/database/src/main/java/de/mm20/launcher2/database/IconDao.kt
+++ b/core/database/src/main/java/de/mm20/launcher2/database/IconDao.kt
@@ -13,7 +13,7 @@ interface IconDao {
     @Insert
     suspend fun insertAll(icons: List<IconEntity>)
 
-    @Query("SELECT * FROM Icons WHERE packageName = :packageName AND (activityName = :activityName OR activityName IS NULL) AND iconPack = :iconPack AND type IN ('app', 'calendar', 'clock') LIMIT 1")
+    @Query("SELECT * FROM Icons WHERE packageName = :packageName AND (activityName = :activityName OR activityName IS NULL) AND iconPack = :iconPack AND type IN ('app', 'calendar', 'clock') ORDER BY type DESC LIMIT 1")
     suspend fun getIcon(packageName: String, activityName: String?, iconPack: String): IconEntity?
 
     @Query("SELECT * FROM Icons WHERE packageName = :packageName AND (activityName = :activityName OR activityName IS NULL) AND type IN ('app', 'calendar', 'clock')")
diff --git a/services/icons/src/main/java/de/mm20/launcher2/icons/loaders/AppFilterIconPackInstaller.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/loaders/AppFilterIconPackInstaller.kt
index 62c0078c..a870ddec 100644
--- a/services/icons/src/main/java/de/mm20/launcher2/icons/loaders/AppFilterIconPackInstaller.kt
+++ b/services/icons/src/main/java/de/mm20/launcher2/icons/loaders/AppFilterIconPackInstaller.kt
@@ -114,7 +114,7 @@ class AppFilterIconPackInstaller(
                             val icon = CalendarIcon(
                                 packageName = componentName.packageName,
                                 activityName = componentName.shortClassName,
-                                drawables = (0..31).map { "$drawable$it" },
+                                drawables = (1..31).map { "$drawable$it" },
                                 iconPack = pkgName,
                                 themed = iconPack.themed,
                                 name = name,