diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index 06b718130..2b6704da7 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -45,98 +45,93 @@ install(DIRECTORY icons/application/ DESTINATION ${DATA_INSTALL_DIR}/icons/appli
FILES_MATCHING PATTERN "*.png" PATTERN "*.svg")
add_custom_target(icons
- # SVGZ to PNGs for KeePassXC
- COMMAND inkscape -z -w 16 -h 16
- icons/application/scalable/apps/keepassxc.svg -e icons/application/16x16/apps/keepassxc.png
- COMMAND inkscape -z -w 24 -h 24
- icons/application/scalable/apps/keepassxc.svg -e icons/application/24x24/apps/keepassxc.png
- COMMAND inkscape -z -w 32 -h 32
- icons/application/scalable/apps/keepassxc.svg -e icons/application/32x32/apps/keepassxc.png
- COMMAND inkscape -z -w 48 -h 48
- icons/application/scalable/apps/keepassxc.svg -e icons/application/48x48/apps/keepassxc.png
- COMMAND inkscape -z -w 64 -h 64
- icons/application/scalable/apps/keepassxc.svg -e icons/application/64x64/apps/keepassxc.png
- COMMAND inkscape -z -w 128 -h 128
- icons/application/scalable/apps/keepassxc.svg -e icons/application/128x128/apps/keepassxc.png
- COMMAND inkscape -z -w 256 -h 256
- icons/application/scalable/apps/keepassxc.svg -e icons/application/256x256/apps/keepassxc.png
+ # SVG to PNGs for KeePassXC
+ COMMAND inkscape -z -w 16 -h 16
+ icons/application/scalable/apps/keepassxc.svg -e icons/application/16x16/apps/keepassxc.png
+ COMMAND inkscape -z -w 24 -h 24
+ icons/application/scalable/apps/keepassxc.svg -e icons/application/24x24/apps/keepassxc.png
+ COMMAND inkscape -z -w 32 -h 32
+ icons/application/scalable/apps/keepassxc.svg -e icons/application/32x32/apps/keepassxc.png
+ COMMAND inkscape -z -w 48 -h 48
+ icons/application/scalable/apps/keepassxc.svg -e icons/application/48x48/apps/keepassxc.png
+ COMMAND inkscape -z -w 64 -h 64
+ icons/application/scalable/apps/keepassxc.svg -e icons/application/64x64/apps/keepassxc.png
+ COMMAND inkscape -z -w 128 -h 128
+ icons/application/scalable/apps/keepassxc.svg -e icons/application/128x128/apps/keepassxc.png
+ COMMAND inkscape -z -w 256 -h 256
+ icons/application/scalable/apps/keepassxc.svg -e icons/application/256x256/apps/keepassxc.png
- # SVGZ to PNGs for KeePassXC
- COMMAND inkscape -z -w 16 -h 16
- icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/16x16/apps/keepassxc-dark.png
- COMMAND inkscape -z -w 24 -h 24
- icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/24x24/apps/keepassxc-dark.png
- COMMAND inkscape -z -w 32 -h 32
- icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/32x32/apps/keepassxc-dark.png
- COMMAND inkscape -z -w 48 -h 48
- icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/48x48/apps/keepassxc-dark.png
- COMMAND inkscape -z -w 64 -h 64
- icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/64x64/apps/keepassxc-dark.png
- COMMAND inkscape -z -w 128 -h 128
- icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/128x128/apps/keepassxc-dark.png
- COMMAND inkscape -z -w 256 -h 256
- icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/256x256/apps/keepassxc-dark.png
+ # SVG to PNGs for KeePassXC
+ COMMAND inkscape -z -w 16 -h 16
+ icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/16x16/apps/keepassxc-dark.png
+ COMMAND inkscape -z -w 24 -h 24
+ icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/24x24/apps/keepassxc-dark.png
+ COMMAND inkscape -z -w 32 -h 32
+ icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/32x32/apps/keepassxc-dark.png
+ COMMAND inkscape -z -w 48 -h 48
+ icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/48x48/apps/keepassxc-dark.png
+ COMMAND inkscape -z -w 64 -h 64
+ icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/64x64/apps/keepassxc-dark.png
+ COMMAND inkscape -z -w 128 -h 128
+ icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/128x128/apps/keepassxc-dark.png
+ COMMAND inkscape -z -w 256 -h 256
+ icons/application/scalable/apps/keepassxc-dark.svg -e icons/application/256x256/apps/keepassxc-dark.png
- # SVGZ to PNGs for KeePassXC
- COMMAND inkscape -z -w 16 -h 16
- icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/16x16/apps/keepassxc-locked.png
- COMMAND inkscape -z -w 24 -h 24
- icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/24x24/apps/keepassxc-locked.png
- COMMAND inkscape -z -w 32 -h 32
- icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/32x32/apps/keepassxc-locked.png
- COMMAND inkscape -z -w 48 -h 48
- icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/48x48/apps/keepassxc-locked.png
- COMMAND inkscape -z -w 64 -h 64
- icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/64x64/apps/keepassxc-locked.png
- COMMAND inkscape -z -w 128 -h 128
- icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/128x128/apps/keepassxc-locked.png
- COMMAND inkscape -z -w 256 -h 256
- icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/256x256/apps/keepassxc-locked.png
+ # SVG to PNGs for KeePassXC
+ COMMAND inkscape -z -w 16 -h 16
+ icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/16x16/apps/keepassxc-locked.png
+ COMMAND inkscape -z -w 24 -h 24
+ icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/24x24/apps/keepassxc-locked.png
+ COMMAND inkscape -z -w 32 -h 32
+ icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/32x32/apps/keepassxc-locked.png
+ COMMAND inkscape -z -w 48 -h 48
+ icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/48x48/apps/keepassxc-locked.png
+ COMMAND inkscape -z -w 64 -h 64
+ icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/64x64/apps/keepassxc-locked.png
+ COMMAND inkscape -z -w 128 -h 128
+ icons/application/scalable/apps/keepassxc-locked.svg -e icons/application/128x128/apps/keepassxc-locked.png
+ COMMAND inkscape -z -w 256 -h 256
+ icons/application/scalable/apps/keepassxc-locked.svg -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.svg -e icons/application/16x16/apps/keepassxc-unlocked.png
- COMMAND inkscape -z -w 24 -h 24
- icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/24x24/apps/keepassxc-unlocked.png
- COMMAND inkscape -z -w 32 -h 32
- icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/32x32/apps/keepassxc-unlocked.png
- COMMAND inkscape -z -w 48 -h 48
- icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/48x48/apps/keepassxc-unlocked.png
- COMMAND inkscape -z -w 64 -h 64
- icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/64x64/apps/keepassxc-unlocked.png
- COMMAND inkscape -z -w 128 -h 128
- icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/128x128/apps/keepassxc-unlocked.png
- COMMAND inkscape -z -w 256 -h 256
- icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/256x256/apps/keepassxc-unlocked.png
+ # SVG to PNGs for KeePassXC
+ COMMAND inkscape -z -w 16 -h 16
+ icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/16x16/apps/keepassxc-unlocked.png
+ COMMAND inkscape -z -w 24 -h 24
+ icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/24x24/apps/keepassxc-unlocked.png
+ COMMAND inkscape -z -w 32 -h 32
+ icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/32x32/apps/keepassxc-unlocked.png
+ COMMAND inkscape -z -w 48 -h 48
+ icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/48x48/apps/keepassxc-unlocked.png
+ COMMAND inkscape -z -w 64 -h 64
+ icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/64x64/apps/keepassxc-unlocked.png
+ COMMAND inkscape -z -w 128 -h 128
+ icons/application/scalable/apps/keepassxc-unlocked.svg -e icons/application/128x128/apps/keepassxc-unlocked.png
+ COMMAND inkscape -z -w 256 -h 256
+ icons/application/scalable/apps/keepassxc-unlocked.svg -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.svg -e icons/application/16x16/mimetypes/application-x-keepassxc.png
- COMMAND inkscape -z -w 22 -h 22
- icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/22x22/mimetypes/application-x-keepassxc.png
- COMMAND inkscape -z -w 32 -h 32
- icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/32x32/mimetypes/application-x-keepassxc.png
- COMMAND inkscape -z -w 64 -h 64
- icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/64x64/mimetypes/application-x-keepassxc.png
- COMMAND inkscape -z -w 128 -h 128
- icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/128x128/mimetypes/application-x-keepassxc.png
+ # SVG to PNGs for KeePassXC MIME-Type
+ COMMAND inkscape -z -w 16 -h 16
+ icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/16x16/mimetypes/application-x-keepassxc.png
+ COMMAND inkscape -z -w 22 -h 22
+ icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/22x22/mimetypes/application-x-keepassxc.png
+ COMMAND inkscape -z -w 32 -h 32
+ icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/32x32/mimetypes/application-x-keepassxc.png
+ COMMAND inkscape -z -w 64 -h 64
+ icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/64x64/mimetypes/application-x-keepassxc.png
+ COMMAND inkscape -z -w 128 -h 128
+ icons/application/scalable/mimetypes/application-x-keepassxc.svg -e icons/application/128x128/mimetypes/application-x-keepassxc.png
- # ICNS for MacOS
- COMMAND png2icns macosx/keepassxc.icns
- icons/application/16x16/apps/keepassxc.png
- icons/application/32x32/apps/keepassxc.png
- icons/application/48x48/apps/keepassxc.png
- icons/application/128x128/apps/keepassxc.png
- icons/application/256x256/apps/keepassxc.png
+ # ICNS for MacOS
+ COMMAND png2icns macosx/keepassxc.icns
+ icons/application/16x16/apps/keepassxc.png
+ icons/application/32x32/apps/keepassxc.png
+ icons/application/48x48/apps/keepassxc.png
+ icons/application/128x128/apps/keepassxc.png
+ icons/application/256x256/apps/keepassxc.png
- # ICO for Windows
- COMMAND icotool -c -o windows/keepassxc.ico
- icons/application/16x16/apps/keepassxc.png
- icons/application/24x24/apps/keepassxc.png
- icons/application/32x32/apps/keepassxc.png
- icons/application/48x48/apps/keepassxc.png
- icons/application/64x64/apps/keepassxc.png
- icons/application/128x128/apps/keepassxc.png
- icons/application/256x256/apps/keepassxc.png
- VERBATIM
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+ # ICO for Windows
+ COMMAND bash ./windows/create-ico.sh icons/application/scalable/apps/keepassxc.svg windows/keepassxc.ico
+ COMMAND bash ./windows/create-ico.sh icons/application/scalable/mimetypes/application-x-keepassxc.svg windows/keepassxc-kdbx.ico
+
+ VERBATIM
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/share/icons/application/128x128/mimetypes/application-x-keepassxc.png b/share/icons/application/128x128/mimetypes/application-x-keepassxc.png
index 539823d92..9993a58f6 100644
Binary files a/share/icons/application/128x128/mimetypes/application-x-keepassxc.png and b/share/icons/application/128x128/mimetypes/application-x-keepassxc.png differ
diff --git a/share/icons/application/16x16/mimetypes/application-x-keepassxc.png b/share/icons/application/16x16/mimetypes/application-x-keepassxc.png
index 7bfdf6d59..a5c8c2835 100644
Binary files a/share/icons/application/16x16/mimetypes/application-x-keepassxc.png and b/share/icons/application/16x16/mimetypes/application-x-keepassxc.png differ
diff --git a/share/icons/application/22x22/mimetypes/application-x-keepassxc.png b/share/icons/application/22x22/mimetypes/application-x-keepassxc.png
index 2fc813f6f..9519c3718 100644
Binary files a/share/icons/application/22x22/mimetypes/application-x-keepassxc.png and b/share/icons/application/22x22/mimetypes/application-x-keepassxc.png differ
diff --git a/share/icons/application/32x32/mimetypes/application-x-keepassxc.png b/share/icons/application/32x32/mimetypes/application-x-keepassxc.png
index 195f792d8..674b613d0 100644
Binary files a/share/icons/application/32x32/mimetypes/application-x-keepassxc.png and b/share/icons/application/32x32/mimetypes/application-x-keepassxc.png differ
diff --git a/share/icons/application/64x64/mimetypes/application-x-keepassxc.png b/share/icons/application/64x64/mimetypes/application-x-keepassxc.png
index dc97a7d24..e4c9a1a2c 100644
Binary files a/share/icons/application/64x64/mimetypes/application-x-keepassxc.png and b/share/icons/application/64x64/mimetypes/application-x-keepassxc.png differ
diff --git a/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg b/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg
index 58e596094..c32ea9161 100644
--- a/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg
+++ b/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg
@@ -6,46 +6,38 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0"
id="svg2606"
height="128"
- width="128">
+ width="128"
+ sodipodi:docname="application-x-keepassxc.svg"
+ inkscape:export-filename="C:\Users\jdwus\Projects\Apps\keepassxc\share\windows\keepassxc-kdbx.png"
+ inkscape:export-xdpi="192"
+ inkscape:export-ydpi="192"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ id="radialGradient3919-5"
+ xlink:href="#linearGradient3913-5" />
+
+
+
+
+
+
+
+ id="filter3909-6"
+ color-interpolation-filters="sRGB">
+ id="feGaussianBlur3911-9"
+ stdDeviation="0.43040059" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ height="1.408259"
+ y="-0.2041295"
+ width="1.3293014"
+ x="-0.16465071"
+ id="filter4087">
+ id="feGaussianBlur4089"
+ stdDeviation="4.2234282" />
+
+
+
+
-
@@ -228,150 +261,74 @@
+ id="layer1"
+ transform="translate(5.6821192)"
+ inkscape:export-filename="C:\Users\jdwus\Projects\Apps\keepassxc\share\windows\layer1.png"
+ inkscape:export-xdpi="12"
+ inkscape:export-ydpi="12"
+ inkscape:label="layer1">
-
+ transform="matrix(0.9886676,0,0,0.95756415,-0.86136107,2.9411239)"
+ d="m 13.09375,3.5 a 1.0280226,1.0280226 0 0 0 -0.125,0.03125 C 12.083764,3.7185227 11.496893,4.4391709 11.5,5.34375 v 118.3125 a 1.0280226,1.0280226 0 0 0 0,0.0313 c 0.01849,1.02971 0.782949,1.79389 1.8125,1.8125 a 1.0280226,1.0280226 0 0 0 0.03125,0 h 48.8125 c 1.665878,0 4.022349,0.23675 7.09375,-1.84375 a 1.0280226,1.0280226 0 0 0 0.28125,-0.21875 c 0.0578,-0.0515 0.139644,-0.12864 0.25,-0.21875 0.220712,-0.18022 0.516774,-0.41745 0.78125,-0.625 0.264476,-0.20755 0.495635,-0.39648 0.65625,-0.53125 0.04015,-0.0337 0.07966,-0.051 0.125,-0.0937 0.02267,-0.0214 0.04798,-0.0408 0.09375,-0.0937 0.02288,-0.0265 0.04727,-0.051 0.09375,-0.125 0.0081,-0.013 0.01807,-0.0366 0.03125,-0.0625 9.780644,-9.33282 27.440979,-28.680919 38.5,-39.875 1.71105,-1.711053 3.78125,-3.862728 3.78125,-8.5 V 5.3439 a 1.0280226,1.0280226 0 0 0 0,-0.03125 C 113.82509,4.2829723 113.06085,3.5186039 112.03125,3.5 A 1.0280226,1.0280226 0 0 0 112,3.5 H 13.4375 c -0.03179,-0.00301 -0.06191,0.00137 -0.09375,0 -0.08491,-0.00365 -0.165226,-0.00803 -0.25,0 z"
+ id="path3314"
+ style="display:inline;fill:#000000;fill-opacity:1;filter:url(#filter3814)"
+ inkscape:connector-curvature="0" />
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ d="M 11.608716,7.1286088 V 122.18677 h 49.485099 c 1.680486,0 4.562221,-0.23589 7.657514,-3.21241 8.897609,-8.55625 31.539591,-31.226084 38.820721,-38.408401 2.44813,-2.414922 3.01026,-4.384582 3.01026,-6.593821 l -0.003,-66.8435292 z"
+ style="display:inline;fill:#ffffff;fill-opacity:1;stroke-width:0.99451458"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccsccccc" />
+ transform="matrix(0.85302032,0,0,0.85302032,17.848986,15.848981)"
+ style="display:inline">
+ style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ d="M 50,6.3242189 A 43.676472,43.676472 0 0 0 6.3242189,50 43.676472,43.676472 0 0 0 50,93.675781 43.676472,43.676472 0 0 0 93.675781,50 43.676472,43.676472 0 0 0 50,6.3242189 Z m 0,6.7109371 c 2.26423,0.0083 4.523397,0.224904 6.748047,0.646485 0.10716,0.48368 0.167969,0.98402 0.167969,1.5 0,3.82265 -3.097269,6.918015 -6.917969,6.916015 -3.82069,0.0022 -6.916016,-3.091382 -6.916016,-6.914062 0,-0.5181 0.06204,-1.02034 0.169922,-1.50586 C 45.476743,13.257569 47.7359,13.042035 50,13.035156 Z m -18.994141,5.298828 c -0.24053,1.21916 -0.371333,2.474142 -0.371093,3.763672 0,7.71966 4.528393,14.367959 11.064453,17.480469 v 35.089844 l 8.298828,8.298828 8.300781,-8.300781 -0.476562,-7.34961 3.914062,-3.912109 -3.914062,-3.912109 5.871093,-5.867188 -5.871093,-5.871094 0.476562,-8.177734 c 6.53802,-3.11057 11.066406,-9.758856 11.066406,-17.478516 0,-1.28696 -0.133397,-2.540982 -0.373046,-3.757812 C 80.124647,25.007387 86.946634,37.023584 86.964844,50 86.964304,70.414588 70.41459,86.964292 50,86.964844 29.58541,86.964292 13.035701,70.414589 13.035156,50 13.050706,37.021755 19.872279,25.003208 31.005859,18.333984 Z m 13.458985,25.898438 h 2.767578 v 27.666016 h -2.765625 l -0.002,-27.664063 v -0.002 z"
+ style="display:inline;opacity:1;fill:#f9f9f9;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+ d="m 56.747561,13.681815 c 0.107159,0.48368 0.16838,0.98465 0.16838,1.50063 0,3.822651 -3.097351,6.917921 -6.91805,6.915921 -3.82069,0.0022 -6.91594,-3.09115 -6.91594,-6.913831 0,-0.5181 0.0626,-1.02142 0.17048,-1.50694 C 45.477221,13.25743 47.7359,13.042554 50,13.035675 c 2.26423,0.0083 4.52291,0.224559 6.747561,0.64614 z m -26.11261,8.416551 c 0,7.71966 4.528179,14.36677 11.064239,17.47928 v 35.091179 l 8.2987,8.2987 8.30082,-8.3008 -0.47566,-7.3495 3.91258,-3.9126 -3.91258,-3.9126 5.86992,-5.867799 -5.86992,-5.8699 0.47565,-8.17878 c 6.53802,-3.11057 11.06635,-9.75752 11.06635,-17.47718 0,-1.28696 -0.13288,-2.54209 -0.37253,-3.75892 11.132459,6.667543 17.953549,18.684164 17.97176,31.66058 C 86.96374,70.414615 70.414591,86.963775 50,86.964325 29.58541,86.963775 13.03626,70.414615 13.03572,50.000026 c 0.0155,-12.978245 6.83607,-24.997676 17.96965,-31.6669 -0.24053,1.21916 -0.37066,2.47571 -0.370419,3.76524 z m 13.829769,22.13472 h 2.76764 v 27.665839 h -2.76554 l -0.002,-27.663749 v -0.002 z"
+ style="display:inline;opacity:1;fill:#559f2f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ inkscape:connector-curvature="0" />
+
+
+ d="m 110.3049,76.364203 c -3.48027,2.947247 -3.5665,2.769147 -7.02359,5.116948 -7.11485,4.831902 -21.758838,3.808851 -29.810472,3.92183 -0.112812,8.061568 0.720236,21.530529 -4.105701,28.654139 -2.439092,3.49278 -3.765335,8.08458 -7.818567,8.08458 3.228399,0 6.670924,-1.79491 10.562523,-5.69609 12.449774,-12.48043 20.530223,-20.64768 32.616327,-33.000089 2.67259,-2.951702 4.50307,-3.873725 5.57948,-7.081318 z"
+ style="display:inline;fill:url(#linearGradient3895-3);fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccscc" />
-
-
+ d="m 110.57168,74.077495 c -3.52789,3.323161 -3.7845,3.755015 -5.93914,5.417894 -5.257342,3.570397 -10.459376,3.789693 -32.372653,3.789693 0,19.761338 -0.44043,27.917838 -4.258644,32.746758 -2.272989,2.87466 -4.712665,5.22575 -8.421577,6.06925 5.061183,0.35582 5.88211,-0.78402 9.202135,-4.00153 0.472301,-0.5418 1.415698,-1.55003 2.15657,-2.69493 3.94064,-5.81684 3.837814,-17.294738 3.837814,-29.263477 8.051633,-0.11295 22.202451,1.162156 29.317295,-3.669742 0.64822,-0.440215 2.73193,-2.020759 3.31249,-2.58944 3.22475,-3.158721 2.89893,-3.517768 3.16571,-5.804476 z M 59.579666,122.10109 c -0.219575,0.0485 -0.436533,0.0579 -0.652846,0.087 0.218648,-0.0234 0.432367,-0.0468 0.652846,-0.087 z"
+ style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccscccccccccc" />
diff --git a/share/icons/svg/application-x-keepassxc-16.svg b/share/icons/svg/application-x-keepassxc-16.svg
deleted file mode 100644
index eb248b339..000000000
--- a/share/icons/svg/application-x-keepassxc-16.svg
+++ /dev/null
@@ -1,312 +0,0 @@
-
-
diff --git a/share/icons/svg/application-x-keepassxc.svg b/share/icons/svg/application-x-keepassxc.svg
index 0ea2e0b07..c32ea9161 100644
Binary files a/share/icons/svg/application-x-keepassxc.svg and b/share/icons/svg/application-x-keepassxc.svg differ
diff --git a/share/macosx/keepassxc.icns b/share/macosx/keepassxc.icns
index dfb98d20d..02baec7d4 100644
Binary files a/share/macosx/keepassxc.icns and b/share/macosx/keepassxc.icns differ
diff --git a/share/windows/create-ico.sh b/share/windows/create-ico.sh
new file mode 100644
index 000000000..44ae06a04
--- /dev/null
+++ b/share/windows/create-ico.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+if [[ -z "$1" ]]; then
+ echo "You must include an SVG file to convert!"
+ exit 1
+fi
+
+outfile=$2
+if [[ -z "outfile" ]]; then
+ outfile="logo.ico"
+fi
+
+echo "Generating $outfile from $1..."
+size_list=(16 24 32 48 64 128 256)
+for size in ${size_list[@]}; do
+ inkscape -z -e $size.png -w $size -h $size "$1" >/dev/null 2>/dev/null
+done
+
+images=`printf "%s.png " "${size_list[@]}"`
+convert $images $outfile
+
+rm $images
diff --git a/share/windows/keepassxc-kdbx.ico b/share/windows/keepassxc-kdbx.ico
index 266046b9f..98b9996c6 100644
Binary files a/share/windows/keepassxc-kdbx.ico and b/share/windows/keepassxc-kdbx.ico differ
diff --git a/share/windows/keepassxc.ico b/share/windows/keepassxc.ico
index a77c8391c..58ae8c2ba 100644
Binary files a/share/windows/keepassxc.ico and b/share/windows/keepassxc.ico differ