diff --git a/share/branding/keepassxc-fileicon.ai b/share/branding/keepassxc-fileicon.ai
new file mode 100644
index 000000000..89c1bf46e
Binary files /dev/null and b/share/branding/keepassxc-fileicon.ai differ
diff --git a/share/branding/keepassxc-icon.ai b/share/branding/keepassxc-icon.ai
new file mode 100644
index 000000000..4b69986c7
Binary files /dev/null and b/share/branding/keepassxc-icon.ai differ
diff --git a/share/branding/keepassxc.ai b/share/branding/keepassxc.ai
new file mode 100644
index 000000000..9cea4431c
Binary files /dev/null and b/share/branding/keepassxc.ai differ
diff --git a/share/branding/png/keepassxc-128x128.png b/share/branding/png/keepassxc-128x128.png
new file mode 100644
index 000000000..9b9f19b6d
Binary files /dev/null and b/share/branding/png/keepassxc-128x128.png differ
diff --git a/share/branding/png/keepassxc-256x256.png b/share/branding/png/keepassxc-256x256.png
new file mode 100644
index 000000000..d9be148ee
Binary files /dev/null and b/share/branding/png/keepassxc-256x256.png differ
diff --git a/share/branding/png/keepassxc-32x32.png b/share/branding/png/keepassxc-32x32.png
new file mode 100644
index 000000000..55b1ab6cc
Binary files /dev/null and b/share/branding/png/keepassxc-32x32.png differ
diff --git a/share/branding/png/keepassxc-512x512.png b/share/branding/png/keepassxc-512x512.png
new file mode 100644
index 000000000..778556851
Binary files /dev/null and b/share/branding/png/keepassxc-512x512.png differ
diff --git a/share/branding/png/keepassxc-64x64.png b/share/branding/png/keepassxc-64x64.png
new file mode 100644
index 000000000..c56e8881c
Binary files /dev/null and b/share/branding/png/keepassxc-64x64.png differ
diff --git a/share/branding/png/keepassxc-bw-128x128.png b/share/branding/png/keepassxc-bw-128x128.png
new file mode 100644
index 000000000..5701cc025
Binary files /dev/null and b/share/branding/png/keepassxc-bw-128x128.png differ
diff --git a/share/branding/png/keepassxc-bw-256x256.png b/share/branding/png/keepassxc-bw-256x256.png
new file mode 100644
index 000000000..12990da6a
Binary files /dev/null and b/share/branding/png/keepassxc-bw-256x256.png differ
diff --git a/share/branding/png/keepassxc-bw-32x32.png b/share/branding/png/keepassxc-bw-32x32.png
new file mode 100644
index 000000000..f51e5a62e
Binary files /dev/null and b/share/branding/png/keepassxc-bw-32x32.png differ
diff --git a/share/branding/png/keepassxc-bw-512x512.png b/share/branding/png/keepassxc-bw-512x512.png
new file mode 100644
index 000000000..280b37a22
Binary files /dev/null and b/share/branding/png/keepassxc-bw-512x512.png differ
diff --git a/share/branding/png/keepassxc-bw-64x64.png b/share/branding/png/keepassxc-bw-64x64.png
new file mode 100644
index 000000000..75cb238e7
Binary files /dev/null and b/share/branding/png/keepassxc-bw-64x64.png differ
diff --git a/share/branding/png/keepassxc-macos-128x128.png b/share/branding/png/keepassxc-macos-128x128.png
new file mode 100644
index 000000000..598762a4d
Binary files /dev/null and b/share/branding/png/keepassxc-macos-128x128.png differ
diff --git a/share/branding/png/keepassxc-macos-256x256.png b/share/branding/png/keepassxc-macos-256x256.png
new file mode 100644
index 000000000..db35171d4
Binary files /dev/null and b/share/branding/png/keepassxc-macos-256x256.png differ
diff --git a/share/branding/png/keepassxc-macos-32x32.png b/share/branding/png/keepassxc-macos-32x32.png
new file mode 100644
index 000000000..3d6048a9e
Binary files /dev/null and b/share/branding/png/keepassxc-macos-32x32.png differ
diff --git a/share/branding/png/keepassxc-macos-512x512.png b/share/branding/png/keepassxc-macos-512x512.png
new file mode 100644
index 000000000..09d5f4f95
Binary files /dev/null and b/share/branding/png/keepassxc-macos-512x512.png differ
diff --git a/share/branding/png/keepassxc-macos-64x64.png b/share/branding/png/keepassxc-macos-64x64.png
new file mode 100644
index 000000000..52b9abec0
Binary files /dev/null and b/share/branding/png/keepassxc-macos-64x64.png differ
diff --git a/share/branding/png/keepassxc-shape-128x128.png b/share/branding/png/keepassxc-shape-128x128.png
new file mode 100644
index 000000000..34a6a11f9
Binary files /dev/null and b/share/branding/png/keepassxc-shape-128x128.png differ
diff --git a/share/branding/png/keepassxc-shape-256x256.png b/share/branding/png/keepassxc-shape-256x256.png
new file mode 100644
index 000000000..944fea8b6
Binary files /dev/null and b/share/branding/png/keepassxc-shape-256x256.png differ
diff --git a/share/branding/png/keepassxc-shape-32x32.png b/share/branding/png/keepassxc-shape-32x32.png
new file mode 100644
index 000000000..a3429cf6a
Binary files /dev/null and b/share/branding/png/keepassxc-shape-32x32.png differ
diff --git a/share/branding/png/keepassxc-shape-512x512.png b/share/branding/png/keepassxc-shape-512x512.png
new file mode 100644
index 000000000..702e9b3b2
Binary files /dev/null and b/share/branding/png/keepassxc-shape-512x512.png differ
diff --git a/share/branding/png/keepassxc-shape-64x64.png b/share/branding/png/keepassxc-shape-64x64.png
new file mode 100644
index 000000000..484cce6df
Binary files /dev/null and b/share/branding/png/keepassxc-shape-64x64.png differ
diff --git a/share/branding/scalable/keepassxc-bw.svg b/share/branding/scalable/keepassxc-bw.svg
new file mode 100644
index 000000000..f1d54590b
--- /dev/null
+++ b/share/branding/scalable/keepassxc-bw.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/share/branding/scalable/keepassxc-macos.svg b/share/branding/scalable/keepassxc-macos.svg
new file mode 100644
index 000000000..168d17212
--- /dev/null
+++ b/share/branding/scalable/keepassxc-macos.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/share/branding/scalable/keepassxc-shape.svg b/share/branding/scalable/keepassxc-shape.svg
new file mode 100644
index 000000000..8618f215e
--- /dev/null
+++ b/share/branding/scalable/keepassxc-shape.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/share/branding/scalable/keepassxc.svg b/share/branding/scalable/keepassxc.svg
new file mode 100644
index 000000000..90d75f364
--- /dev/null
+++ b/share/branding/scalable/keepassxc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/share/icons/application/256x256/apps/keepassxc.png b/share/icons/application/256x256/apps/keepassxc.png
index 91a232118..95a0cdd76 100644
Binary files a/share/icons/application/256x256/apps/keepassxc.png and b/share/icons/application/256x256/apps/keepassxc.png differ
diff --git a/share/icons/application/scalable/apps/keepassxc-locked.svg b/share/icons/application/scalable/apps/keepassxc-locked.svg
index 7d84d536e..d411716a6 100644
--- a/share/icons/application/scalable/apps/keepassxc-locked.svg
+++ b/share/icons/application/scalable/apps/keepassxc-locked.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/share/icons/application/scalable/apps/keepassxc-monochrome-dark-locked.svg b/share/icons/application/scalable/apps/keepassxc-monochrome-dark-locked.svg
index 128588928..872b5fad5 100644
--- a/share/icons/application/scalable/apps/keepassxc-monochrome-dark-locked.svg
+++ b/share/icons/application/scalable/apps/keepassxc-monochrome-dark-locked.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/share/icons/application/scalable/apps/keepassxc-monochrome-dark.svg b/share/icons/application/scalable/apps/keepassxc-monochrome-dark.svg
index 93452845a..233198814 100644
--- a/share/icons/application/scalable/apps/keepassxc-monochrome-dark.svg
+++ b/share/icons/application/scalable/apps/keepassxc-monochrome-dark.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/share/icons/application/scalable/apps/keepassxc-monochrome-light-locked.svg b/share/icons/application/scalable/apps/keepassxc-monochrome-light-locked.svg
index 79bc8d49d..c8c4f991e 100644
--- a/share/icons/application/scalable/apps/keepassxc-monochrome-light-locked.svg
+++ b/share/icons/application/scalable/apps/keepassxc-monochrome-light-locked.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/share/icons/application/scalable/apps/keepassxc-monochrome-light.svg b/share/icons/application/scalable/apps/keepassxc-monochrome-light.svg
index 4e72e893b..65474c9f6 100644
--- a/share/icons/application/scalable/apps/keepassxc-monochrome-light.svg
+++ b/share/icons/application/scalable/apps/keepassxc-monochrome-light.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/share/icons/application/scalable/apps/keepassxc-unlocked.svg b/share/icons/application/scalable/apps/keepassxc-unlocked.svg
index 88a440965..a377b782d 100644
--- a/share/icons/application/scalable/apps/keepassxc-unlocked.svg
+++ b/share/icons/application/scalable/apps/keepassxc-unlocked.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/share/icons/application/scalable/apps/keepassxc.svg b/share/icons/application/scalable/apps/keepassxc.svg
index 433a4041b..a377b782d 100644
--- a/share/icons/application/scalable/apps/keepassxc.svg
+++ b/share/icons/application/scalable/apps/keepassxc.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg b/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg
index 4b33c5a69..433331616 100644
--- a/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg
+++ b/share/icons/application/scalable/mimetypes/application-x-keepassxc.svg
@@ -1,2 +1 @@
-
-
+
\ No newline at end of file
diff --git a/share/macosx/keepassxc.ai b/share/macosx/keepassxc.ai
deleted file mode 100755
index cea3b65c0..000000000
Binary files a/share/macosx/keepassxc.ai and /dev/null differ
diff --git a/share/macosx/keepassxc.icns b/share/macosx/keepassxc.icns
index c5125d782..e52973d85 100644
Binary files a/share/macosx/keepassxc.icns and b/share/macosx/keepassxc.icns differ
diff --git a/share/macosx/keepassxc.iconset/icon_128x128.png b/share/macosx/keepassxc.iconset/icon_128x128.png
index 7512796d4..598762a4d 100755
Binary files a/share/macosx/keepassxc.iconset/icon_128x128.png and b/share/macosx/keepassxc.iconset/icon_128x128.png differ
diff --git a/share/macosx/keepassxc.iconset/icon_128x128@2x.png b/share/macosx/keepassxc.iconset/icon_128x128@2x.png
index 3c00e0e8c..db35171d4 100755
Binary files a/share/macosx/keepassxc.iconset/icon_128x128@2x.png and b/share/macosx/keepassxc.iconset/icon_128x128@2x.png differ
diff --git a/share/macosx/keepassxc.iconset/icon_16x16.png b/share/macosx/keepassxc.iconset/icon_16x16.png
index ca6823954..09eb33b25 100755
Binary files a/share/macosx/keepassxc.iconset/icon_16x16.png and b/share/macosx/keepassxc.iconset/icon_16x16.png differ
diff --git a/share/macosx/keepassxc.iconset/icon_16x16@2x.png b/share/macosx/keepassxc.iconset/icon_16x16@2x.png
index 47af8eb1b..3d6048a9e 100755
Binary files a/share/macosx/keepassxc.iconset/icon_16x16@2x.png and b/share/macosx/keepassxc.iconset/icon_16x16@2x.png differ
diff --git a/share/macosx/keepassxc.iconset/icon_256x256.png b/share/macosx/keepassxc.iconset/icon_256x256.png
index 3c00e0e8c..db35171d4 100755
Binary files a/share/macosx/keepassxc.iconset/icon_256x256.png and b/share/macosx/keepassxc.iconset/icon_256x256.png differ
diff --git a/share/macosx/keepassxc.iconset/icon_256x256@2x.png b/share/macosx/keepassxc.iconset/icon_256x256@2x.png
index 1c6e2a094..d0d329b10 100755
Binary files a/share/macosx/keepassxc.iconset/icon_256x256@2x.png and b/share/macosx/keepassxc.iconset/icon_256x256@2x.png differ
diff --git a/share/macosx/keepassxc.iconset/icon_32x32.png b/share/macosx/keepassxc.iconset/icon_32x32.png
index 47af8eb1b..3d6048a9e 100755
Binary files a/share/macosx/keepassxc.iconset/icon_32x32.png and b/share/macosx/keepassxc.iconset/icon_32x32.png differ
diff --git a/share/macosx/keepassxc.iconset/icon_32x32@2x.png b/share/macosx/keepassxc.iconset/icon_32x32@2x.png
index 63c9847c4..52b9abec0 100755
Binary files a/share/macosx/keepassxc.iconset/icon_32x32@2x.png and b/share/macosx/keepassxc.iconset/icon_32x32@2x.png differ
diff --git a/share/macosx/keepassxc.iconset/icon_512x512.png b/share/macosx/keepassxc.iconset/icon_512x512.png
index 1c6e2a094..09d5f4f95 100755
Binary files a/share/macosx/keepassxc.iconset/icon_512x512.png and b/share/macosx/keepassxc.iconset/icon_512x512.png differ
diff --git a/share/macosx/keepassxc.iconset/icon_512x512@2x.png b/share/macosx/keepassxc.iconset/icon_512x512@2x.png
index 68e4a3dce..015042d4e 100755
Binary files a/share/macosx/keepassxc.iconset/icon_512x512@2x.png and b/share/macosx/keepassxc.iconset/icon_512x512@2x.png differ
diff --git a/share/windows/installer-header.bmp b/share/windows/installer-header.bmp
index f9e17cae7..d76a56b2e 100644
Binary files a/share/windows/installer-header.bmp and b/share/windows/installer-header.bmp differ
diff --git a/share/windows/installer-wizard.bmp b/share/windows/installer-wizard.bmp
index 76d04518f..229ead7c4 100644
Binary files a/share/windows/installer-wizard.bmp and b/share/windows/installer-wizard.bmp differ
diff --git a/share/windows/installer-wizard.psd b/share/windows/installer-wizard.psd
new file mode 100644
index 000000000..acdaca38f
Binary files /dev/null and b/share/windows/installer-wizard.psd differ
diff --git a/share/windows/keepassxc-kdbx.ico b/share/windows/keepassxc-kdbx.ico
index 0cec1e4ce..07f57aca1 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 58ae8c2ba..e05843388 100644
Binary files a/share/windows/keepassxc.ico and b/share/windows/keepassxc.ico differ
diff --git a/share/windows/wix-banner.bmp b/share/windows/wix-banner.bmp
index 14a13b8f1..aae5d698b 100644
Binary files a/share/windows/wix-banner.bmp and b/share/windows/wix-banner.bmp differ
diff --git a/share/windows/wix-dialog.bmp b/share/windows/wix-dialog.bmp
index b26ad1e25..1040f0f03 100644
Binary files a/share/windows/wix-dialog.bmp and b/share/windows/wix-dialog.bmp differ