diff --git a/AppImage-Recipe.sh b/AppImage-Recipe.sh
index ba47e1b2d..2459bfcc1 100755
--- a/AppImage-Recipe.sh
+++ b/AppImage-Recipe.sh
@@ -74,6 +74,11 @@ cat << EOF > ./usr/bin/keepassxc_env
 #export QT_QPA_PLATFORMTHEME=gtk2
 export LD_LIBRARY_PATH="../opt/qt58/lib:\${LD_LIBRARY_PATH}"
 export QT_PLUGIN_PATH="..${QT_PLUGIN_PATH}"
+
+# unset XDG_DATA_DIRS to make tray icon work in Ubuntu Unity
+# see https://github.com/probonopd/AppImageKit/issues/351
+unset XDG_DATA_DIRS
+
 exec keepassxc "\$@"
 EOF
 chmod +x ./usr/bin/keepassxc_env
diff --git a/src/core/FilePath.cpp b/src/core/FilePath.cpp
index efbc18a10..0506e3ab7 100644
--- a/src/core/FilePath.cpp
+++ b/src/core/FilePath.cpp
@@ -91,12 +91,12 @@ QString FilePath::pluginPath(const QString& name)
 
 QIcon FilePath::applicationIcon()
 {
-    return icon("apps", "keepassxc", false);
+    return icon("apps", "keepassxc");
 }
 
 QIcon FilePath::trayIconLocked()
 {
-    return icon("apps", "keepassxc-locked", false);
+    return icon("apps", "keepassxc-locked");
 }
 
 QIcon FilePath::trayIconUnlocked()