diff --git a/COPYING b/COPYING
index c24e6d37f..d4662eacf 100644
--- a/COPYING
+++ b/COPYING
@@ -32,6 +32,17 @@ Copyright: 2006, Otto Salminen
            2011, Felix Geyer <debfx@fobos.de>
 License: GPL-2
 
+Files: share/icons/application/22x22/action/dialog-close.png, share/icons/application/22x22/action/dialog-ok.png,
+       share/icons/application/22x22/status/dialog-error.png, share/icons/application/22x22/status/dialog-information.png,
+       share/icons/application/22x22/status/dialog-warning.png
+Copyright: 2007, Nuno Pinheiro <nuno@oxygen-icons.org>
+           2007, David Vignoni <david@icon-king.com>
+           2007, David Miller <miller@oxygen-icons.org>
+           2007, Johann Ollivier Lapeyre <johann@oxygen-icons.org>
+           2007, Kenneth Wimer <kwwii@bootsplash.org>
+           2007, Riccardo Iaconelli <riccardo@oxygen-icons.org>
+License: LGPL-3+
+
 Files: src/crypto/salsa20/*
 Copyright: is in public domain
 License: -
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index ccf07c3ef..0ce3e0146 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -19,8 +19,8 @@ install(FILES ${DATABASE_ICONS} DESTINATION ${DATA_INSTALL_DIR}/icons/database)
 
 if(UNIX AND NOT APPLE)
     install(DIRECTORY icons/application/ DESTINATION share/icons/hicolor
-            FILES_MATCHING PATTERN "*.png" PATTERN "*.svgz")
-else(UNIX AND NOT APPLE)
-    install(DIRECTORY icons/application/ DESTINATION ${DATA_INSTALL_DIR}/icons/application
-            FILES_MATCHING PATTERN "*.png" PATTERN "*.svgz")
+            FILES_MATCHING PATTERN "keepassx.png" PATTERN "keepassx.svgz")
 endif(UNIX AND NOT APPLE)
+
+install(DIRECTORY icons/application/ DESTINATION ${DATA_INSTALL_DIR}/icons/application
+        FILES_MATCHING PATTERN "*.png" PATTERN "*.svgz")
diff --git a/share/icons/application/22x22/action/dialog-close.png b/share/icons/application/22x22/action/dialog-close.png
new file mode 100644
index 000000000..ef0b6bdc6
Binary files /dev/null and b/share/icons/application/22x22/action/dialog-close.png differ
diff --git a/share/icons/application/22x22/action/dialog-ok.png b/share/icons/application/22x22/action/dialog-ok.png
new file mode 100644
index 000000000..8b12d79a4
Binary files /dev/null and b/share/icons/application/22x22/action/dialog-ok.png differ
diff --git a/share/icons/application/22x22/status/dialog-error.png b/share/icons/application/22x22/status/dialog-error.png
new file mode 100644
index 000000000..86a92a4ee
Binary files /dev/null and b/share/icons/application/22x22/status/dialog-error.png differ
diff --git a/share/icons/application/22x22/status/dialog-information.png b/share/icons/application/22x22/status/dialog-information.png
new file mode 100644
index 000000000..0222fcd72
Binary files /dev/null and b/share/icons/application/22x22/status/dialog-information.png differ
diff --git a/share/icons/application/22x22/status/dialog-warning.png b/share/icons/application/22x22/status/dialog-warning.png
new file mode 100644
index 000000000..e32284930
Binary files /dev/null and b/share/icons/application/22x22/status/dialog-warning.png differ
diff --git a/src/core/DataPath.cpp b/src/core/DataPath.cpp
index 2b934bf6b..31bf35f81 100644
--- a/src/core/DataPath.cpp
+++ b/src/core/DataPath.cpp
@@ -38,7 +38,7 @@ QIcon DataPath::icon(const QString& category, const QString& name)
 
     if (icon.isNull()) {
         QStringList pngSizes;
-        pngSizes << "16" << "24" << "32" << "48" << "64" << "128";
+        pngSizes << "16" << "22" << "24" << "32" << "48" << "64" << "128";
         QString filename;
         Q_FOREACH (const QString& size, pngSizes) {
             filename = QString("%1/icons/application/%2x%2/%3/%4.png").arg(m_basePath, size, category, name);