1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/IconModels.cpp b/src/gui/IconModels.cpp
index 39732c502..3bdd9a5e6 100644
--- a/src/gui/IconModels.cpp
+++ b/src/gui/IconModels.cpp
@@ -29,7 +29,7 @@ DefaultIconModel::DefaultIconModel(QObject* parent)
 int DefaultIconModel::rowCount(const QModelIndex& parent) const
 {
     if (!parent.isValid()) {
-        return DatabaseIcons::IconCount;
+        return databaseIcons()->count();
     } else {
         return 0;
     }
@@ -41,10 +41,10 @@ QVariant DefaultIconModel::data(const QModelIndex& index, int role) const
         return QVariant();
     }
 
-    Q_ASSERT(index.row() < DatabaseIcons::IconCount);
+    Q_ASSERT(index.row() < databaseIcons()->count());
 
     if (role == Qt::DecorationRole) {
-        return databaseIcons()->iconPixmap(index.row());
+        return databaseIcons()->icon(index.row(), IconSize::Medium);
     }
 
     return QVariant();
@@ -101,7 +101,6 @@ QModelIndex CustomIconModel::indexFromUuid(const QUuid& uuid) const
     int idx = m_iconsOrder.indexOf(uuid);
     if (idx > -1) {
         return index(idx, 0);
-    } else {
-        return QModelIndex();
     }
+    return {};
 }