diff --git a/COPYING b/COPYING
index de96e46a4..af17b5996 100644
--- a/COPYING
+++ b/COPYING
@@ -31,7 +31,8 @@ Files: share/icons/application/*/apps/keepassx.png
        share/icons/application/scalable/apps/keepassx.svgz
 Copyright: 2006, Otto Salminen
            2009, Miguelito Vieira
-           2011, Felix Geyer <debfx@fobos.de>
+           2011-2013, Felix Geyer <debfx@fobos.de>
+           2012, Tobias Tangemann <tobiastangemann@gmail.com>
 License: GPL-2
 
 Files: share/icons/application/*/actions/auto-type.png
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index c97c08643..d358473b3 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -35,6 +35,7 @@ add_custom_target(icons
                     icons/application/32x32/apps/keepassx.png
                     icons/application/48x48/apps/keepassx.png
                     icons/application/128x128/apps/keepassx.png
+                    icons/application/256x256/apps/keepassx.png
                   COMMAND icotool -c -o windows/keepassx.ico
                     icons/application/16x16/apps/keepassx.png
                     icons/application/24x24/apps/keepassx.png
@@ -42,5 +43,6 @@ add_custom_target(icons
                     icons/application/48x48/apps/keepassx.png
                     icons/application/64x64/apps/keepassx.png
                     icons/application/128x128/apps/keepassx.png
+                    icons/application/256x256/apps/keepassx.png
                   VERBATIM
                   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/share/icons/application/128x128/apps/keepassx.png b/share/icons/application/128x128/apps/keepassx.png
index 9b469a759..567a0d432 100644
Binary files a/share/icons/application/128x128/apps/keepassx.png and b/share/icons/application/128x128/apps/keepassx.png differ
diff --git a/share/icons/application/24x24/apps/keepassx.png b/share/icons/application/24x24/apps/keepassx.png
index 646878ce0..c8ecaa9c2 100644
Binary files a/share/icons/application/24x24/apps/keepassx.png and b/share/icons/application/24x24/apps/keepassx.png differ
diff --git a/share/icons/application/256x256/apps/keepassx.png b/share/icons/application/256x256/apps/keepassx.png
new file mode 100644
index 000000000..bf85b6b64
Binary files /dev/null and b/share/icons/application/256x256/apps/keepassx.png differ
diff --git a/share/icons/application/32x32/apps/keepassx.png b/share/icons/application/32x32/apps/keepassx.png
index e41f8b331..f8358d68d 100644
Binary files a/share/icons/application/32x32/apps/keepassx.png and b/share/icons/application/32x32/apps/keepassx.png differ
diff --git a/share/icons/application/48x48/apps/keepassx.png b/share/icons/application/48x48/apps/keepassx.png
index 57606f759..dbe1baa42 100644
Binary files a/share/icons/application/48x48/apps/keepassx.png and b/share/icons/application/48x48/apps/keepassx.png differ
diff --git a/share/icons/application/64x64/apps/keepassx.png b/share/icons/application/64x64/apps/keepassx.png
index 18ea44ad7..b1d1ed1f3 100644
Binary files a/share/icons/application/64x64/apps/keepassx.png and b/share/icons/application/64x64/apps/keepassx.png differ
diff --git a/share/icons/application/scalable/apps/keepassx.svgz b/share/icons/application/scalable/apps/keepassx.svgz
index 71ead0ae2..6490f4310 100644
Binary files a/share/icons/application/scalable/apps/keepassx.svgz and b/share/icons/application/scalable/apps/keepassx.svgz differ
diff --git a/share/macosx/keepassx.icns b/share/macosx/keepassx.icns
index 5a9efe274..cf988020b 100644
Binary files a/share/macosx/keepassx.icns and b/share/macosx/keepassx.icns differ
diff --git a/share/windows/keepassx.ico b/share/windows/keepassx.ico
index 44cd0b834..7c2b3d5a9 100644
Binary files a/share/windows/keepassx.ico and b/share/windows/keepassx.ico differ