diff --git a/COPYING b/COPYING
index 4dbaece33..d36384011 100644
--- a/COPYING
+++ b/COPYING
@@ -41,6 +41,8 @@ Files: share/icons/application/*/apps/keepassxc.png
        share/icons/application/scalable/apps/keepassxc-dark.svgz
        share/icons/application/*/apps/keepassxc-locked.png
        share/icons/application/scalable/apps/keepassxc-locked.svgz
+       share/icons/application/*/apps/keepassxc-unlocked.png
+       share/icons/application/scalable/apps/keepassxc-unlocked.svgz
        share/icons/application/*/mimetypes/application-x-keepassxc.png
        share/icons/application/scalable/mimetypes/application-x-keepassxc.svgz
 Copyright: 2016, Lorenzo Stella <lorenzo.stl@gmail.com>
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 9660d7509..7d01a1c40 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -89,6 +89,22 @@ add_custom_target(icons
                   COMMAND inkscape -z -w 256 -h 256
                     icons/application/scalable/apps/keepassxc-locked.svgz -e icons/application/256x256/apps/keepassxc-locked.png
 
+                  # SVGZ to PNGs for KeePassXC
+                  COMMAND inkscape -z -w 16 -h 16
+                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/16x16/apps/keepassxc-unlocked.png
+                  COMMAND inkscape -z -w  24 -h 24
+                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/24x24/apps/keepassxc-unlocked.png
+                  COMMAND inkscape -z -w  32 -h 32
+                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/32x32/apps/keepassxc-unlocked.png
+                  COMMAND inkscape -z -w 48 -h 48
+                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/48x48/apps/keepassxc-unlocked.png
+                  COMMAND inkscape -z -w 64 -h 64
+                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/64x64/apps/keepassxc-unlocked.png
+                  COMMAND inkscape -z -w 128 -h 128
+                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/128x128/apps/keepassxc-unlocked.png
+                  COMMAND inkscape -z -w 256 -h 256
+                    icons/application/scalable/apps/keepassxc-unlocked.svgz -e icons/application/256x256/apps/keepassxc-unlocked.png
+
                   # SVGZ to PNGs for KeePassXC MIME-Type
                   COMMAND inkscape -z -w 16 -h 16
                     icons/application/scalable/mimetypes/application-x-keepassxc.svgz -e icons/application/16x16/mimetypes/application-x-keepassxc.png
diff --git a/share/icons/application/128x128/apps/keepassxc-unlocked.png b/share/icons/application/128x128/apps/keepassxc-unlocked.png
new file mode 100644
index 000000000..69b0fe24e
Binary files /dev/null and b/share/icons/application/128x128/apps/keepassxc-unlocked.png differ
diff --git a/share/icons/application/16x16/apps/keepassxc-unlocked.png b/share/icons/application/16x16/apps/keepassxc-unlocked.png
new file mode 100644
index 000000000..2164f0335
Binary files /dev/null and b/share/icons/application/16x16/apps/keepassxc-unlocked.png differ
diff --git a/share/icons/application/24x24/apps/keepassxc-unlocked.png b/share/icons/application/24x24/apps/keepassxc-unlocked.png
new file mode 100644
index 000000000..68c6cabc1
Binary files /dev/null and b/share/icons/application/24x24/apps/keepassxc-unlocked.png differ
diff --git a/share/icons/application/256x256/apps/keepassxc-unlocked.png b/share/icons/application/256x256/apps/keepassxc-unlocked.png
new file mode 100644
index 000000000..d1c117813
Binary files /dev/null and b/share/icons/application/256x256/apps/keepassxc-unlocked.png differ
diff --git a/share/icons/application/32x32/apps/keepassxc-unlocked.png b/share/icons/application/32x32/apps/keepassxc-unlocked.png
new file mode 100644
index 000000000..de06bf03a
Binary files /dev/null and b/share/icons/application/32x32/apps/keepassxc-unlocked.png differ
diff --git a/share/icons/application/48x48/apps/keepassxc-unlocked.png b/share/icons/application/48x48/apps/keepassxc-unlocked.png
new file mode 100644
index 000000000..06a563d1a
Binary files /dev/null and b/share/icons/application/48x48/apps/keepassxc-unlocked.png differ
diff --git a/share/icons/application/64x64/apps/keepassxc-unlocked.png b/share/icons/application/64x64/apps/keepassxc-unlocked.png
new file mode 100644
index 000000000..8ade0e85e
Binary files /dev/null and b/share/icons/application/64x64/apps/keepassxc-unlocked.png differ
diff --git a/share/icons/application/scalable/apps/keepassxc-unlocked.svgz b/share/icons/application/scalable/apps/keepassxc-unlocked.svgz
new file mode 100644
index 000000000..84ce13904
Binary files /dev/null and b/share/icons/application/scalable/apps/keepassxc-unlocked.svgz differ
diff --git a/src/core/FilePath.cpp b/src/core/FilePath.cpp
index 0506e3ab7..67ececfbb 100644
--- a/src/core/FilePath.cpp
+++ b/src/core/FilePath.cpp
@@ -101,7 +101,7 @@ QIcon FilePath::trayIconLocked()
 
 QIcon FilePath::trayIconUnlocked()
 {
-    return applicationIcon();
+    return icon("apps", "keepassxc-unlocked");
 }
 
 QIcon FilePath::icon(const QString& category, const QString& name, bool fromTheme)