diff --git a/src/core/DataPath.cpp b/src/core/DataPath.cpp
index 1186bc00..a5ed61e1 100644
--- a/src/core/DataPath.cpp
+++ b/src/core/DataPath.cpp
@@ -32,9 +32,13 @@ QIcon DataPath::applicationIcon()
     return icon("apps", "keepassx");
 }
 
-QIcon DataPath::icon(const QString& category, const QString& name)
+QIcon DataPath::icon(const QString& category, const QString& name, bool fromTheme)
 {
-    QIcon icon = QIcon::fromTheme(name);
+    QIcon icon;
+
+    if (fromTheme) {
+        icon = QIcon::fromTheme(name);
+    }
 
     if (icon.isNull()) {
         QStringList pngSizes;
diff --git a/src/core/DataPath.h b/src/core/DataPath.h
index 470a31d4..6a479b04 100644
--- a/src/core/DataPath.h
+++ b/src/core/DataPath.h
@@ -26,7 +26,7 @@ class DataPath
 public:
     QString path(const QString& name);
     QIcon applicationIcon();
-    QIcon icon(const QString& category, const QString& name);
+    QIcon icon(const QString& category, const QString& name, bool fromTheme = true);
 
 private:
     DataPath();