Merge branch 'higher-resolution-icon'

82 files changed, 87 insertions, 37 deletions

diff --git a/gui/assets/images/menubar icons/darwin/lock-1.png b/gui/assets/images/menubar icons/darwin/lock-1.png
index 9982de6fd7..1faa35e191 100644
--- a/gui/assets/images/menubar icons/darwin/lock-1.png
+++ b/gui/assets/images/menubar icons/darwin/lock-1.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-10.png b/gui/assets/images/menubar icons/darwin/lock-10.png
index c84966ee03..37dbb12519 100644
--- a/gui/assets/images/menubar icons/darwin/lock-10.png
+++ b/gui/assets/images/menubar icons/darwin/lock-10.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-10@2x.png b/gui/assets/images/menubar icons/darwin/lock-10@2x.png
index 390323435e..d69770c94d 100644
--- a/gui/assets/images/menubar icons/darwin/lock-10@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-10@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-10Template.png b/gui/assets/images/menubar icons/darwin/lock-10Template.png
index 0473040c88..b33a43056a 100644
--- a/gui/assets/images/menubar icons/darwin/lock-10Template.png
+++ b/gui/assets/images/menubar icons/darwin/lock-10Template.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-10Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-10Template@2x.png
index 02d23e306c..f9f2288ed2 100644
--- a/gui/assets/images/menubar icons/darwin/lock-10Template@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-10Template@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-1@2x.png b/gui/assets/images/menubar icons/darwin/lock-1@2x.png
index ac4975a141..d2e8bf02fb 100644
--- a/gui/assets/images/menubar icons/darwin/lock-1@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-1@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-1Template.png b/gui/assets/images/menubar icons/darwin/lock-1Template.png
index db5905657d..008321b4be 100644
--- a/gui/assets/images/menubar icons/darwin/lock-1Template.png
+++ b/gui/assets/images/menubar icons/darwin/lock-1Template.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-1Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-1Template@2x.png
index 39b77e3361..33cd60cf0b 100644
--- a/gui/assets/images/menubar icons/darwin/lock-1Template@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-1Template@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-2.png b/gui/assets/images/menubar icons/darwin/lock-2.png
index a62875eb14..7f689dc3e9 100644
--- a/gui/assets/images/menubar icons/darwin/lock-2.png
+++ b/gui/assets/images/menubar icons/darwin/lock-2.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-2@2x.png b/gui/assets/images/menubar icons/darwin/lock-2@2x.png
index 15d645f8f5..0c0e66d87f 100644
--- a/gui/assets/images/menubar icons/darwin/lock-2@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-2@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-2Template.png b/gui/assets/images/menubar icons/darwin/lock-2Template.png
index f9a8270227..1322544ae5 100644
--- a/gui/assets/images/menubar icons/darwin/lock-2Template.png
+++ b/gui/assets/images/menubar icons/darwin/lock-2Template.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-2Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-2Template@2x.png
index 0f9d49ec93..9acd89ecf1 100644
--- a/gui/assets/images/menubar icons/darwin/lock-2Template@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-2Template@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-3.png b/gui/assets/images/menubar icons/darwin/lock-3.png
index c7590c1b59..b66b83c760 100644
--- a/gui/assets/images/menubar icons/darwin/lock-3.png
+++ b/gui/assets/images/menubar icons/darwin/lock-3.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-3@2x.png b/gui/assets/images/menubar icons/darwin/lock-3@2x.png
index e8403ea999..38c1a345a0 100644
--- a/gui/assets/images/menubar icons/darwin/lock-3@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-3@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-3Template.png b/gui/assets/images/menubar icons/darwin/lock-3Template.png
index 4c8c21de02..85b7fc25d0 100644
--- a/gui/assets/images/menubar icons/darwin/lock-3Template.png
+++ b/gui/assets/images/menubar icons/darwin/lock-3Template.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-3Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-3Template@2x.png
index 1fa05af764..bb98981a45 100644
--- a/gui/assets/images/menubar icons/darwin/lock-3Template@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-3Template@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-4.png b/gui/assets/images/menubar icons/darwin/lock-4.png
index aa97f2a442..aa6f643daa 100644
--- a/gui/assets/images/menubar icons/darwin/lock-4.png
+++ b/gui/assets/images/menubar icons/darwin/lock-4.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-4@2x.png b/gui/assets/images/menubar icons/darwin/lock-4@2x.png
index 7ec8cda048..e9c28f662f 100644
--- a/gui/assets/images/menubar icons/darwin/lock-4@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-4@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-4Template.png b/gui/assets/images/menubar icons/darwin/lock-4Template.png
index aab6eb5505..51cbf5c043 100644
--- a/gui/assets/images/menubar icons/darwin/lock-4Template.png
+++ b/gui/assets/images/menubar icons/darwin/lock-4Template.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-4Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-4Template@2x.png
index 6870f7fb1a..5c5fe89350 100644
--- a/gui/assets/images/menubar icons/darwin/lock-4Template@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-4Template@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-5.png b/gui/assets/images/menubar icons/darwin/lock-5.png
index 26db606626..892d3adcdf 100644
--- a/gui/assets/images/menubar icons/darwin/lock-5.png
+++ b/gui/assets/images/menubar icons/darwin/lock-5.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-5@2x.png b/gui/assets/images/menubar icons/darwin/lock-5@2x.png
index 410cdb415b..4875f1ff15 100644
--- a/gui/assets/images/menubar icons/darwin/lock-5@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-5@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-5Template.png b/gui/assets/images/menubar icons/darwin/lock-5Template.png
index a4a23bdeb7..1feae49254 100644
--- a/gui/assets/images/menubar icons/darwin/lock-5Template.png
+++ b/gui/assets/images/menubar icons/darwin/lock-5Template.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-5Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-5Template@2x.png
index 97b93cdab0..41e6a2a68e 100644
--- a/gui/assets/images/menubar icons/darwin/lock-5Template@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-5Template@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-6.png b/gui/assets/images/menubar icons/darwin/lock-6.png
index ebc5a3c5d5..5f6d294897 100644
--- a/gui/assets/images/menubar icons/darwin/lock-6.png
+++ b/gui/assets/images/menubar icons/darwin/lock-6.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-6@2x.png b/gui/assets/images/menubar icons/darwin/lock-6@2x.png
index 8ad3e9a9b1..704a4e7ff8 100644
--- a/gui/assets/images/menubar icons/darwin/lock-6@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-6@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-6Template.png b/gui/assets/images/menubar icons/darwin/lock-6Template.png
index 6766e24687..a13cdb5f53 100644
--- a/gui/assets/images/menubar icons/darwin/lock-6Template.png
+++ b/gui/assets/images/menubar icons/darwin/lock-6Template.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-6Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-6Template@2x.png
index 4b3e19d29c..7bd0e497cf 100644
--- a/gui/assets/images/menubar icons/darwin/lock-6Template@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-6Template@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-7.png b/gui/assets/images/menubar icons/darwin/lock-7.png
index c5b650c0bb..ddffe4ef5f 100644
--- a/gui/assets/images/menubar icons/darwin/lock-7.png
+++ b/gui/assets/images/menubar icons/darwin/lock-7.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-7@2x.png b/gui/assets/images/menubar icons/darwin/lock-7@2x.png
index 36ca209ce4..6d9b232dcc 100644
--- a/gui/assets/images/menubar icons/darwin/lock-7@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-7@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-7Template.png b/gui/assets/images/menubar icons/darwin/lock-7Template.png
index ef1a451b24..9faa2a0d42 100644
--- a/gui/assets/images/menubar icons/darwin/lock-7Template.png
+++ b/gui/assets/images/menubar icons/darwin/lock-7Template.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-7Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-7Template@2x.png
index 5e4c937185..62c3a652ab 100644
--- a/gui/assets/images/menubar icons/darwin/lock-7Template@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-7Template@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-8.png b/gui/assets/images/menubar icons/darwin/lock-8.png
index 0bf01822af..abca663adb 100644
--- a/gui/assets/images/menubar icons/darwin/lock-8.png
+++ b/gui/assets/images/menubar icons/darwin/lock-8.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-8@2x.png b/gui/assets/images/menubar icons/darwin/lock-8@2x.png
index 79affd7f8d..287c891519 100644
--- a/gui/assets/images/menubar icons/darwin/lock-8@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-8@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-8Template.png b/gui/assets/images/menubar icons/darwin/lock-8Template.png
index 9cc1f1edc0..408378fc43 100644
--- a/gui/assets/images/menubar icons/darwin/lock-8Template.png
+++ b/gui/assets/images/menubar icons/darwin/lock-8Template.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-8Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-8Template@2x.png
index 430b2098dc..7f3b26dc48 100644
--- a/gui/assets/images/menubar icons/darwin/lock-8Template@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-8Template@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-9.png b/gui/assets/images/menubar icons/darwin/lock-9.png
index 6e2cd4eb55..dc0639a60e 100644
--- a/gui/assets/images/menubar icons/darwin/lock-9.png
+++ b/gui/assets/images/menubar icons/darwin/lock-9.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-9@2x.png b/gui/assets/images/menubar icons/darwin/lock-9@2x.png
index 1ba3c5ff99..3101843934 100644
--- a/gui/assets/images/menubar icons/darwin/lock-9@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-9@2x.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-9Template.png b/gui/assets/images/menubar icons/darwin/lock-9Template.png
index 644073a009..6a6b67f711 100644
--- a/gui/assets/images/menubar icons/darwin/lock-9Template.png
+++ b/gui/assets/images/menubar icons/darwin/lock-9Template.png
diff --git a/gui/assets/images/menubar icons/darwin/lock-9Template@2x.png b/gui/assets/images/menubar icons/darwin/lock-9Template@2x.png
index dcfe02f3b6..136188433d 100644
--- a/gui/assets/images/menubar icons/darwin/lock-9Template@2x.png
+++ b/gui/assets/images/menubar icons/darwin/lock-9Template@2x.png
diff --git a/gui/assets/images/menubar icons/linux/lock-1.png b/gui/assets/images/menubar icons/linux/lock-1.png
index bcd2fcd780..703b5d7d39 100644
--- a/gui/assets/images/menubar icons/linux/lock-1.png
+++ b/gui/assets/images/menubar icons/linux/lock-1.png
diff --git a/gui/assets/images/menubar icons/linux/lock-10.png b/gui/assets/images/menubar icons/linux/lock-10.png
index 2fa3137d24..2d5ec51cf6 100644
--- a/gui/assets/images/menubar icons/linux/lock-10.png
+++ b/gui/assets/images/menubar icons/linux/lock-10.png
diff --git a/gui/assets/images/menubar icons/linux/lock-10_white.png b/gui/assets/images/menubar icons/linux/lock-10_white.png
index 5925dc0fab..c0bc8f22cb 100644
--- a/gui/assets/images/menubar icons/linux/lock-10_white.png
+++ b/gui/assets/images/menubar icons/linux/lock-10_white.png
diff --git a/gui/assets/images/menubar icons/linux/lock-1_white.png b/gui/assets/images/menubar icons/linux/lock-1_white.png
index 3174325cd6..fcb8299156 100644
--- a/gui/assets/images/menubar icons/linux/lock-1_white.png
+++ b/gui/assets/images/menubar icons/linux/lock-1_white.png
diff --git a/gui/assets/images/menubar icons/linux/lock-2.png b/gui/assets/images/menubar icons/linux/lock-2.png
index 2e2bce923b..7957030fa7 100644
--- a/gui/assets/images/menubar icons/linux/lock-2.png
+++ b/gui/assets/images/menubar icons/linux/lock-2.png
diff --git a/gui/assets/images/menubar icons/linux/lock-2_white.png b/gui/assets/images/menubar icons/linux/lock-2_white.png
index b0aefec4cd..99f610e738 100644
--- a/gui/assets/images/menubar icons/linux/lock-2_white.png
+++ b/gui/assets/images/menubar icons/linux/lock-2_white.png
diff --git a/gui/assets/images/menubar icons/linux/lock-3.png b/gui/assets/images/menubar icons/linux/lock-3.png
index e1da7d5609..f2c65c79ed 100644
--- a/gui/assets/images/menubar icons/linux/lock-3.png
+++ b/gui/assets/images/menubar icons/linux/lock-3.png
diff --git a/gui/assets/images/menubar icons/linux/lock-3_white.png b/gui/assets/images/menubar icons/linux/lock-3_white.png
index 077bb466c0..28c035bba3 100644
--- a/gui/assets/images/menubar icons/linux/lock-3_white.png
+++ b/gui/assets/images/menubar icons/linux/lock-3_white.png
diff --git a/gui/assets/images/menubar icons/linux/lock-4.png b/gui/assets/images/menubar icons/linux/lock-4.png
index d97e9db7a4..374e52763e 100644
--- a/gui/assets/images/menubar icons/linux/lock-4.png
+++ b/gui/assets/images/menubar icons/linux/lock-4.png
diff --git a/gui/assets/images/menubar icons/linux/lock-4_white.png b/gui/assets/images/menubar icons/linux/lock-4_white.png
index 0466dd7c63..c11f1d7690 100644
--- a/gui/assets/images/menubar icons/linux/lock-4_white.png
+++ b/gui/assets/images/menubar icons/linux/lock-4_white.png
diff --git a/gui/assets/images/menubar icons/linux/lock-5.png b/gui/assets/images/menubar icons/linux/lock-5.png
index e2b3377923..d653339175 100644
--- a/gui/assets/images/menubar icons/linux/lock-5.png
+++ b/gui/assets/images/menubar icons/linux/lock-5.png
diff --git a/gui/assets/images/menubar icons/linux/lock-5_white.png b/gui/assets/images/menubar icons/linux/lock-5_white.png
index 0e6cb89e41..ce57a0b823 100644
--- a/gui/assets/images/menubar icons/linux/lock-5_white.png
+++ b/gui/assets/images/menubar icons/linux/lock-5_white.png
diff --git a/gui/assets/images/menubar icons/linux/lock-6.png b/gui/assets/images/menubar icons/linux/lock-6.png
index 3302c8a649..5ed849f866 100644
--- a/gui/assets/images/menubar icons/linux/lock-6.png
+++ b/gui/assets/images/menubar icons/linux/lock-6.png
diff --git a/gui/assets/images/menubar icons/linux/lock-6_white.png b/gui/assets/images/menubar icons/linux/lock-6_white.png
index 8bb7017430..68f170b879 100644
--- a/gui/assets/images/menubar icons/linux/lock-6_white.png
+++ b/gui/assets/images/menubar icons/linux/lock-6_white.png
diff --git a/gui/assets/images/menubar icons/linux/lock-7.png b/gui/assets/images/menubar icons/linux/lock-7.png
index 11b248ef03..7ecdcb47f9 100644
--- a/gui/assets/images/menubar icons/linux/lock-7.png
+++ b/gui/assets/images/menubar icons/linux/lock-7.png
diff --git a/gui/assets/images/menubar icons/linux/lock-7_white.png b/gui/assets/images/menubar icons/linux/lock-7_white.png
index a31abd0c13..7b11106178 100644
--- a/gui/assets/images/menubar icons/linux/lock-7_white.png
+++ b/gui/assets/images/menubar icons/linux/lock-7_white.png
diff --git a/gui/assets/images/menubar icons/linux/lock-8.png b/gui/assets/images/menubar icons/linux/lock-8.png
index 642a1c47b5..bd9805d254 100644
--- a/gui/assets/images/menubar icons/linux/lock-8.png
+++ b/gui/assets/images/menubar icons/linux/lock-8.png
diff --git a/gui/assets/images/menubar icons/linux/lock-8_white.png b/gui/assets/images/menubar icons/linux/lock-8_white.png
index 6a06797a35..21351d4500 100644
--- a/gui/assets/images/menubar icons/linux/lock-8_white.png
+++ b/gui/assets/images/menubar icons/linux/lock-8_white.png
diff --git a/gui/assets/images/menubar icons/linux/lock-9.png b/gui/assets/images/menubar icons/linux/lock-9.png
index 9b88a35809..6d3a822ab6 100644
--- a/gui/assets/images/menubar icons/linux/lock-9.png
+++ b/gui/assets/images/menubar icons/linux/lock-9.png
diff --git a/gui/assets/images/menubar icons/linux/lock-9_white.png b/gui/assets/images/menubar icons/linux/lock-9_white.png
index cd2d468760..fe6ab88cd6 100644
--- a/gui/assets/images/menubar icons/linux/lock-9_white.png
+++ b/gui/assets/images/menubar icons/linux/lock-9_white.png
diff --git a/gui/assets/images/menubar icons/svg/lock-10_2.svg b/gui/assets/images/menubar icons/svg/lock-10_mono.svg
index 045e06d770..045e06d770 100644
--- a/gui/assets/images/menubar icons/svg/lock-10_2.svg
+++ b/gui/assets/images/menubar icons/svg/lock-10_mono.svg
diff --git a/gui/assets/images/menubar icons/win32/lock-1.ico b/gui/assets/images/menubar icons/win32/lock-1.ico
index 64f3a23fdb..30d82bec86 100644
--- a/gui/assets/images/menubar icons/win32/lock-1.ico
+++ b/gui/assets/images/menubar icons/win32/lock-1.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-10.ico b/gui/assets/images/menubar icons/win32/lock-10.ico
index ed21f2ab12..eaa8434279 100644
--- a/gui/assets/images/menubar icons/win32/lock-10.ico
+++ b/gui/assets/images/menubar icons/win32/lock-10.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-10_white.ico b/gui/assets/images/menubar icons/win32/lock-10_white.ico
index 87894468a2..6bd7d3fdf8 100644
--- a/gui/assets/images/menubar icons/win32/lock-10_white.ico
+++ b/gui/assets/images/menubar icons/win32/lock-10_white.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-1_white.ico b/gui/assets/images/menubar icons/win32/lock-1_white.ico
index dd2384f989..73c8051b18 100644
--- a/gui/assets/images/menubar icons/win32/lock-1_white.ico
+++ b/gui/assets/images/menubar icons/win32/lock-1_white.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-2.ico b/gui/assets/images/menubar icons/win32/lock-2.ico
index 82ea6fefd3..e8f0a281f9 100644
--- a/gui/assets/images/menubar icons/win32/lock-2.ico
+++ b/gui/assets/images/menubar icons/win32/lock-2.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-2_white.ico b/gui/assets/images/menubar icons/win32/lock-2_white.ico
index 39eaee28e1..973c17fc9a 100644
--- a/gui/assets/images/menubar icons/win32/lock-2_white.ico
+++ b/gui/assets/images/menubar icons/win32/lock-2_white.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-3.ico b/gui/assets/images/menubar icons/win32/lock-3.ico
index 4ff7bc330b..09ff8feb17 100644
--- a/gui/assets/images/menubar icons/win32/lock-3.ico
+++ b/gui/assets/images/menubar icons/win32/lock-3.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-3_white.ico b/gui/assets/images/menubar icons/win32/lock-3_white.ico
index 1349c46408..186d8a2629 100644
--- a/gui/assets/images/menubar icons/win32/lock-3_white.ico
+++ b/gui/assets/images/menubar icons/win32/lock-3_white.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-4.ico b/gui/assets/images/menubar icons/win32/lock-4.ico
index 7a52b04679..4cffe9b9fa 100644
--- a/gui/assets/images/menubar icons/win32/lock-4.ico
+++ b/gui/assets/images/menubar icons/win32/lock-4.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-4_white.ico b/gui/assets/images/menubar icons/win32/lock-4_white.ico
index bfbdbfff50..1c5b361b18 100644
--- a/gui/assets/images/menubar icons/win32/lock-4_white.ico
+++ b/gui/assets/images/menubar icons/win32/lock-4_white.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-5.ico b/gui/assets/images/menubar icons/win32/lock-5.ico
index 5115aea230..8b232cfba6 100644
--- a/gui/assets/images/menubar icons/win32/lock-5.ico
+++ b/gui/assets/images/menubar icons/win32/lock-5.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-5_white.ico b/gui/assets/images/menubar icons/win32/lock-5_white.ico
index 1c6c8ca780..dac76b2a0a 100644
--- a/gui/assets/images/menubar icons/win32/lock-5_white.ico
+++ b/gui/assets/images/menubar icons/win32/lock-5_white.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-6.ico b/gui/assets/images/menubar icons/win32/lock-6.ico
index eeda42adda..ba4a77679d 100644
--- a/gui/assets/images/menubar icons/win32/lock-6.ico
+++ b/gui/assets/images/menubar icons/win32/lock-6.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-6_white.ico b/gui/assets/images/menubar icons/win32/lock-6_white.ico
index 5e336f4d88..7cf7890dbc 100644
--- a/gui/assets/images/menubar icons/win32/lock-6_white.ico
+++ b/gui/assets/images/menubar icons/win32/lock-6_white.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-7.ico b/gui/assets/images/menubar icons/win32/lock-7.ico
index da90f3b810..d43d178a29 100644
--- a/gui/assets/images/menubar icons/win32/lock-7.ico
+++ b/gui/assets/images/menubar icons/win32/lock-7.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-7_white.ico b/gui/assets/images/menubar icons/win32/lock-7_white.ico
index da1a4657f8..5ccc7842d5 100644
--- a/gui/assets/images/menubar icons/win32/lock-7_white.ico
+++ b/gui/assets/images/menubar icons/win32/lock-7_white.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-8.ico b/gui/assets/images/menubar icons/win32/lock-8.ico
index 9bd9167ce7..7795aadb4b 100644
--- a/gui/assets/images/menubar icons/win32/lock-8.ico
+++ b/gui/assets/images/menubar icons/win32/lock-8.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-8_white.ico b/gui/assets/images/menubar icons/win32/lock-8_white.ico
index 6f61fea3c4..6949e03e0b 100644
--- a/gui/assets/images/menubar icons/win32/lock-8_white.ico
+++ b/gui/assets/images/menubar icons/win32/lock-8_white.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-9.ico b/gui/assets/images/menubar icons/win32/lock-9.ico
index 5f72d70861..fd244f8172 100644
--- a/gui/assets/images/menubar icons/win32/lock-9.ico
+++ b/gui/assets/images/menubar icons/win32/lock-9.ico
diff --git a/gui/assets/images/menubar icons/win32/lock-9_white.ico b/gui/assets/images/menubar icons/win32/lock-9_white.ico
index b7c186c12a..6ce6ce2486 100644
--- a/gui/assets/images/menubar icons/win32/lock-9_white.ico
+++ b/gui/assets/images/menubar icons/win32/lock-9_white.ico
diff --git a/gui/scripts/build-menubar-icons.sh b/gui/scripts/build-menubar-icons.sh
index f886b089af..5bc2c26b64 100755
--- a/gui/scripts/build-menubar-icons.sh
+++ b/gui/scripts/build-menubar-icons.sh
@@ -1,62 +1,112 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
+
+set -eu
 
 if ! command -v convert > /dev/null; then
-  echo >&2 "convert (imagemagick) is required to run this script"
-  exit 1
+    echo >&2 "convert (imagemagick) is required to run this script"
+    exit 1
 fi
 
-MENUBAR_PATH="assets/images/menubar icons"
+if ! command -v rsvg-convert > /dev/null; then
+    echo >&2 "rsvg-convert (librsvg) is required to run this script"
+    exit 1
+fi
 
-MACOS="$MENUBAR_PATH/darwin"
-WINDOWS="$MENUBAR_PATH/win32"
-LINUX="$MENUBAR_PATH/linux"
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+cd "$SCRIPT_DIR"
 
-WINDOWS_SIZES="-define icon:auto-resize=48,32,16"
+MENUBAR_ICONS_DIR="../assets/images/menubar icons"
 
-MAKE_BLACK='s/#[0-9a-fA-f]{6}/#000000/g'
-MAKE_WHITE='s/#[0-9a-fA-f]{6}/#FFFFFF/g'
+SVG_DIR="$MENUBAR_ICONS_DIR/svg"
+MACOS_DIR="$MENUBAR_ICONS_DIR/darwin"
+WINDOWS_DIR="$MENUBAR_ICONS_DIR/win32"
+LINUX_DIR="$MENUBAR_ICONS_DIR/linux"
+TMP_DIR="$MENUBAR_ICONS_DIR/tmp"
 
 COMPRESSION_OPTIONS="-define png:compression-filter=5 -define png:compression-level=9 \
-  -define png:compression-strategy=1 -define png:exclude-chunk=all -strip"
-OPTIONS="-background transparent -density 1200 $COMPRESSION_OPTIONS"
+    -define png:compression-strategy=1 -define png:exclude-chunk=all -strip"
+
+function generate_ico() {
+    local svg_source_path="$1"
+    local ico_target_path="$2"
+
+    local tmp_file_paths=()
+    for size in 16 32 48; do
+        local png_tmp_path="$TMP_DIR/$size.png"
+        local png8_tmp_path="$TMP_DIR/$size-8.png"
+        local png4_tmp_path="$TMP_DIR/$size-4.png"
+
+        rsvg-convert -o "$png_tmp_path" -w $size -h $size "$svg_source_path"
+        convert -background transparent "$png_tmp_path" -gravity center -extent ${size}x$size \
+            "$png_tmp_path"
+        # 4- and 8-bit versions for RDP
+        convert -colors 256 +dither "$png_tmp_path" png8:"$png8_tmp_path"
+        convert -colors 16  +dither "$png8_tmp_path" "$png4_tmp_path"
+
+        tmp_file_paths+=("$png_tmp_path" "$png8_tmp_path" "$png4_tmp_path")
+    done
 
-function resize() {
-  WITHOUT_PADDING=$[$1 - ($2 * 2)]
-  echo "-resize ${WITHOUT_PADDING}x$WITHOUT_PADDING -gravity center -extent ${1}x$1"
+    convert "${tmp_file_paths[@]}" $COMPRESSION_OPTIONS "$ico_target_path"
+    rm "${tmp_file_paths[@]}"
+}
+
+function generate_png() {
+    local svg_source_path="$1"
+    local png_target_path="$2"
+    local target_size=$3
+    local target_padding=$4
+    local target_size_no_padding=$[$target_size - $target_padding * 2]
+    local png_tmp_path="$TMP_DIR/tmp.png"
+
+    rsvg-convert -o "$png_tmp_path" -w $target_size_no_padding -h $target_size_no_padding \
+        "$svg_source_path"
+    convert -background transparent "$png_tmp_path" -gravity center \
+        -extent ${target_size}x$target_size $COMPRESSION_OPTIONS "$png_target_path"
+    rm "$png_tmp_path"
 }
 
 function generate() {
-  IN="$MENUBAR_PATH/svg/$1.svg"
-  IN_MONO="$MENUBAR_PATH/svg/$2.svg"
-  OUT="$1"
+    local icon_name="$1"
+    local svg_source_path="$SVG_DIR/$icon_name.svg"
+    local monochrome_svg_source_path="$SVG_DIR/$2.svg"
+
+    local black_svg_source_path="$TMP_DIR/black.svg"
+    local white_svg_source_path="$TMP_DIR/white.svg"
+
+    sed -E 's/#[0-9a-fA-f]{6}/#000000/g' "$monochrome_svg_source_path" > "$black_svg_source_path"
+    sed -E 's/#[0-9a-fA-f]{6}/#FFFFFF/g' "$monochrome_svg_source_path" > "$white_svg_source_path"
+
+    # MacOS colored
+    generate_png "$svg_source_path" "$MACOS_DIR/$icon_name.png" 22 3
+    generate_png "$svg_source_path" "$MACOS_DIR/$icon_name@2x.png" 44 6
 
-  # MacOS colored
-  convert $OPTIONS $(resize 22 3) "$IN" "$MACOS/$OUT.png"
-  convert $OPTIONS $(resize 44 6) "$IN" "$MACOS/$OUT@2x.png"
+    # MacOS monochrome
+    generate_png "$black_svg_source_path" "$MACOS_DIR/${icon_name}Template.png" 22 3
+    generate_png "$black_svg_source_path" "$MACOS_DIR/${icon_name}Template@2x.png" 44 6
 
-  # MacOS monochrome
-  sed -E $MAKE_BLACK "$IN_MONO" | convert $OPTIONS $(resize 22 3) - "$MACOS/${OUT}Template.png"
-  sed -E $MAKE_BLACK "$IN_MONO" | convert $OPTIONS $(resize 44 6) - "$MACOS/${OUT}Template@2x.png"
+    # Linux colored
+    generate_png "$svg_source_path" "$LINUX_DIR/$icon_name.png" 48 8
 
-  # Linux colored
-  convert $OPTIONS $(resize 32 4) "$IN" "$LINUX/$OUT.png"
+    # Linux white
+    generate_png "$white_svg_source_path" "$LINUX_DIR/${icon_name}_white.png" 48 8
 
-  # Linux white
-  sed -E $MAKE_WHITE "$IN_MONO" | convert $OPTIONS $(resize 32 4) - "$LINUX/${OUT}_white.png"
+    # Windows colored
+    generate_ico "$svg_source_path" "$WINDOWS_DIR/$icon_name.ico"
 
-  # Windows colored
-  convert $OPTIONS $(resize 64 3) "$IN" $WINDOWS_SIZES "$WINDOWS/$OUT.ico"
+    # Windows white
+    generate_ico "$white_svg_source_path" "$WINDOWS_DIR/${icon_name}_white.ico"
 
-  # Windows white
-  sed -E $MAKE_WHITE "$IN_MONO" \
-    | convert $OPTIONS $(resize 64 2) - $WINDOWS_SIZES "$WINDOWS/${OUT}_white.ico"
+    rm "$black_svg_source_path" "$white_svg_source_path"
 }
 
-mkdir -p "$MENUBAR_PATH/darwin" "$MENUBAR_PATH/win32" "$MENUBAR_PATH/linux"
+mkdir -p "$MACOS_DIR" "$WINDOWS_DIR" "$LINUX_DIR" "$TMP_DIR"
 
-for i in {1..9}; do
-  generate lock-$i lock-$i
+for frame in {1..9}; do
+    generate lock-$frame lock-$frame
 done
+# The monochrome source svg differs from the colored one. The red circle is a hole in the monochrome
+# one. "lock-10_mono.svg" is the same icon but with a hole instead of a circle.
+generate lock-10 lock-10_mono
 
-generate lock-10 lock-10_2
+rmdir "$TMP_DIR"