diff --git a/Resources/AddText-16-symbolic.png b/Resources/AddText-16-symbolic.png
index 89a76a9..dd56197 100644
Binary files a/Resources/AddText-16-symbolic.png and b/Resources/AddText-16-symbolic.png differ
diff --git a/Resources/AddText-22-symbolic.png b/Resources/AddText-22-symbolic.png
index 79f4c80..b876a96 100644
Binary files a/Resources/AddText-22-symbolic.png and b/Resources/AddText-22-symbolic.png differ
diff --git a/Resources/AddText-24-symbolic.png b/Resources/AddText-24-symbolic.png
index 0794d6b..13da12f 100644
Binary files a/Resources/AddText-24-symbolic.png and b/Resources/AddText-24-symbolic.png differ
diff --git a/Resources/AddText-32-symbolic.png b/Resources/AddText-32-symbolic.png
index 37e0059..f158f24 100644
Binary files a/Resources/AddText-32-symbolic.png and b/Resources/AddText-32-symbolic.png differ
diff --git a/Resources/AddText-44-symbolic.png b/Resources/AddText-44-symbolic.png
index fa22388..7e49a9e 100644
Binary files a/Resources/AddText-44-symbolic.png and b/Resources/AddText-44-symbolic.png differ
diff --git a/Resources/AddText-48-symbolic.png b/Resources/AddText-48-symbolic.png
index 07868fa..7f61e09 100644
Binary files a/Resources/AddText-48-symbolic.png and b/Resources/AddText-48-symbolic.png differ
diff --git a/Resources/AddText-64-symbolic.png b/Resources/AddText-64-symbolic.png
index 3e9b5cb..2d33991 100644
Binary files a/Resources/AddText-64-symbolic.png and b/Resources/AddText-64-symbolic.png differ
diff --git a/Resources/AddText-symbolic.png b/Resources/AddText-symbolic.png
index 0794d6b..13da12f 100644
Binary files a/Resources/AddText-symbolic.png and b/Resources/AddText-symbolic.png differ
diff --git a/Resources/Arrow-16-symbolic.png b/Resources/Arrow-16-symbolic.png
index 1de6af9..16ff5cf 100644
Binary files a/Resources/Arrow-16-symbolic.png and b/Resources/Arrow-16-symbolic.png differ
diff --git a/Resources/Arrow-22-symbolic.png b/Resources/Arrow-22-symbolic.png
index f62b7c3..f20c42f 100644
Binary files a/Resources/Arrow-22-symbolic.png and b/Resources/Arrow-22-symbolic.png differ
diff --git a/Resources/Arrow-24-symbolic.png b/Resources/Arrow-24-symbolic.png
index 991e727..87c75ac 100644
Binary files a/Resources/Arrow-24-symbolic.png and b/Resources/Arrow-24-symbolic.png differ
diff --git a/Resources/Arrow-32-symbolic.png b/Resources/Arrow-32-symbolic.png
index 1b0fd81..41a44d1 100644
Binary files a/Resources/Arrow-32-symbolic.png and b/Resources/Arrow-32-symbolic.png differ
diff --git a/Resources/Arrow-44-symbolic.png b/Resources/Arrow-44-symbolic.png
index fb6d4ac..caa38e0 100644
Binary files a/Resources/Arrow-44-symbolic.png and b/Resources/Arrow-44-symbolic.png differ
diff --git a/Resources/Arrow-48-symbolic.png b/Resources/Arrow-48-symbolic.png
index f2eabbd..44b263c 100644
Binary files a/Resources/Arrow-48-symbolic.png and b/Resources/Arrow-48-symbolic.png differ
diff --git a/Resources/Arrow-64-symbolic.png b/Resources/Arrow-64-symbolic.png
index b93b7cc..db239bf 100644
Binary files a/Resources/Arrow-64-symbolic.png and b/Resources/Arrow-64-symbolic.png differ
diff --git a/Resources/Arrow-symbolic.png b/Resources/Arrow-symbolic.png
index 991e727..87c75ac 100644
Binary files a/Resources/Arrow-symbolic.png and b/Resources/Arrow-symbolic.png differ
diff --git a/Resources/CopyImage-16-symbolic.png b/Resources/CopyImage-16-symbolic.png
index 8ccc5f6..1a680e3 100644
Binary files a/Resources/CopyImage-16-symbolic.png and b/Resources/CopyImage-16-symbolic.png differ
diff --git a/Resources/CopyImage-22-symbolic.png b/Resources/CopyImage-22-symbolic.png
index 252cbdc..19e9730 100644
Binary files a/Resources/CopyImage-22-symbolic.png and b/Resources/CopyImage-22-symbolic.png differ
diff --git a/Resources/CopyImage-24-symbolic.png b/Resources/CopyImage-24-symbolic.png
index 82ad64b..c5f582d 100644
Binary files a/Resources/CopyImage-24-symbolic.png and b/Resources/CopyImage-24-symbolic.png differ
diff --git a/Resources/CopyImage-32-symbolic.png b/Resources/CopyImage-32-symbolic.png
index 5123dc0..eb8d380 100644
Binary files a/Resources/CopyImage-32-symbolic.png and b/Resources/CopyImage-32-symbolic.png differ
diff --git a/Resources/CopyImage-44-symbolic.png b/Resources/CopyImage-44-symbolic.png
index acfd818..5c83eba 100644
Binary files a/Resources/CopyImage-44-symbolic.png and b/Resources/CopyImage-44-symbolic.png differ
diff --git a/Resources/CopyImage-48-symbolic.png b/Resources/CopyImage-48-symbolic.png
index bd60024..1aa3e1c 100644
Binary files a/Resources/CopyImage-48-symbolic.png and b/Resources/CopyImage-48-symbolic.png differ
diff --git a/Resources/CopyImage-64-symbolic.png b/Resources/CopyImage-64-symbolic.png
index 192c5e8..7780520 100644
Binary files a/Resources/CopyImage-64-symbolic.png and b/Resources/CopyImage-64-symbolic.png differ
diff --git a/Resources/CopyImage-symbolic.png b/Resources/CopyImage-symbolic.png
index 82ad64b..c5f582d 100644
Binary files a/Resources/CopyImage-symbolic.png and b/Resources/CopyImage-symbolic.png differ
diff --git a/Resources/Eraser-16-symbolic.png b/Resources/Eraser-16-symbolic.png
index ca630a5..cb3e3b4 100644
Binary files a/Resources/Eraser-16-symbolic.png and b/Resources/Eraser-16-symbolic.png differ
diff --git a/Resources/Eraser-22-symbolic.png b/Resources/Eraser-22-symbolic.png
index 7d1f11f..d8f8694 100644
Binary files a/Resources/Eraser-22-symbolic.png and b/Resources/Eraser-22-symbolic.png differ
diff --git a/Resources/Eraser-24-symbolic.png b/Resources/Eraser-24-symbolic.png
index 7865cb9..6ab63fd 100644
Binary files a/Resources/Eraser-24-symbolic.png and b/Resources/Eraser-24-symbolic.png differ
diff --git a/Resources/Eraser-32-symbolic.png b/Resources/Eraser-32-symbolic.png
index 128b92e..84c7920 100644
Binary files a/Resources/Eraser-32-symbolic.png and b/Resources/Eraser-32-symbolic.png differ
diff --git a/Resources/Eraser-44-symbolic.png b/Resources/Eraser-44-symbolic.png
index 980ece5..f13e587 100644
Binary files a/Resources/Eraser-44-symbolic.png and b/Resources/Eraser-44-symbolic.png differ
diff --git a/Resources/Eraser-48-symbolic.png b/Resources/Eraser-48-symbolic.png
index 3f62cf2..cf3860e 100644
Binary files a/Resources/Eraser-48-symbolic.png and b/Resources/Eraser-48-symbolic.png differ
diff --git a/Resources/Eraser-64-symbolic.png b/Resources/Eraser-64-symbolic.png
index 3a7433e..34e13a6 100644
Binary files a/Resources/Eraser-64-symbolic.png and b/Resources/Eraser-64-symbolic.png differ
diff --git a/Resources/Eraser-symbolic.png b/Resources/Eraser-symbolic.png
index 7865cb9..6ab63fd 100644
Binary files a/Resources/Eraser-symbolic.png and b/Resources/Eraser-symbolic.png differ
diff --git a/Resources/Highligher-16-symbolic.png b/Resources/Highligher-16-symbolic.png
index 9134292..a6f243a 100644
Binary files a/Resources/Highligher-16-symbolic.png and b/Resources/Highligher-16-symbolic.png differ
diff --git a/Resources/Highligher-22-symbolic.png b/Resources/Highligher-22-symbolic.png
index f271225..2a3bff7 100644
Binary files a/Resources/Highligher-22-symbolic.png and b/Resources/Highligher-22-symbolic.png differ
diff --git a/Resources/Highligher-24-symbolic.png b/Resources/Highligher-24-symbolic.png
index 5658c53..166ef83 100644
Binary files a/Resources/Highligher-24-symbolic.png and b/Resources/Highligher-24-symbolic.png differ
diff --git a/Resources/Highligher-32-symbolic.png b/Resources/Highligher-32-symbolic.png
index b470189..8227d50 100644
Binary files a/Resources/Highligher-32-symbolic.png and b/Resources/Highligher-32-symbolic.png differ
diff --git a/Resources/Highligher-44-symbolic.png b/Resources/Highligher-44-symbolic.png
index 342f87e..8394a26 100644
Binary files a/Resources/Highligher-44-symbolic.png and b/Resources/Highligher-44-symbolic.png differ
diff --git a/Resources/Highligher-48-symbolic.png b/Resources/Highligher-48-symbolic.png
index f61f941..81f383d 100644
Binary files a/Resources/Highligher-48-symbolic.png and b/Resources/Highligher-48-symbolic.png differ
diff --git a/Resources/Highligher-64-symbolic.png b/Resources/Highligher-64-symbolic.png
index 87bcaf8..2b0cb69 100644
Binary files a/Resources/Highligher-64-symbolic.png and b/Resources/Highligher-64-symbolic.png differ
diff --git a/Resources/Highligher-symbolic.png b/Resources/Highligher-symbolic.png
index 5658c53..166ef83 100644
Binary files a/Resources/Highligher-symbolic.png and b/Resources/Highligher-symbolic.png differ
diff --git a/Resources/Icons/NumberedStep-16.svg b/Resources/Icons/NumberedStep-16.svg
deleted file mode 100644
index c9a9f21..0000000
--- a/Resources/Icons/NumberedStep-16.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/Resources/Icons/Rectangle-16.svg b/Resources/Icons/Rectangle-16.svg
deleted file mode 100644
index 65e533f..0000000
--- a/Resources/Icons/Rectangle-16.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/Resources/MarqueeTool-16-symbolic.png b/Resources/MarqueeTool-16-symbolic.png
index d154b32..87ce782 100644
Binary files a/Resources/MarqueeTool-16-symbolic.png and b/Resources/MarqueeTool-16-symbolic.png differ
diff --git a/Resources/MarqueeTool-22-symbolic.png b/Resources/MarqueeTool-22-symbolic.png
index 8fa7f1d..e71843e 100644
Binary files a/Resources/MarqueeTool-22-symbolic.png and b/Resources/MarqueeTool-22-symbolic.png differ
diff --git a/Resources/MarqueeTool-24-symbolic.png b/Resources/MarqueeTool-24-symbolic.png
index f0fa0f2..843ba35 100644
Binary files a/Resources/MarqueeTool-24-symbolic.png and b/Resources/MarqueeTool-24-symbolic.png differ
diff --git a/Resources/MarqueeTool-32-symbolic.png b/Resources/MarqueeTool-32-symbolic.png
index 5169cb3..339696c 100644
Binary files a/Resources/MarqueeTool-32-symbolic.png and b/Resources/MarqueeTool-32-symbolic.png differ
diff --git a/Resources/MarqueeTool-44-symbolic.png b/Resources/MarqueeTool-44-symbolic.png
index 85c8af4..486b888 100644
Binary files a/Resources/MarqueeTool-44-symbolic.png and b/Resources/MarqueeTool-44-symbolic.png differ
diff --git a/Resources/MarqueeTool-48-symbolic.png b/Resources/MarqueeTool-48-symbolic.png
index 6a5cb71..52a6b33 100644
Binary files a/Resources/MarqueeTool-48-symbolic.png and b/Resources/MarqueeTool-48-symbolic.png differ
diff --git a/Resources/MarqueeTool-64-symbolic.png b/Resources/MarqueeTool-64-symbolic.png
index 1e93342..0ab55e3 100644
Binary files a/Resources/MarqueeTool-64-symbolic.png and b/Resources/MarqueeTool-64-symbolic.png differ
diff --git a/Resources/MarqueeTool-symbolic.png b/Resources/MarqueeTool-symbolic.png
index f0fa0f2..843ba35 100644
Binary files a/Resources/MarqueeTool-symbolic.png and b/Resources/MarqueeTool-symbolic.png differ
diff --git a/Resources/More-16-symbolic.png b/Resources/More-16-symbolic.png
index 140c7bf..b6cd7d3 100644
Binary files a/Resources/More-16-symbolic.png and b/Resources/More-16-symbolic.png differ
diff --git a/Resources/More-22-symbolic.png b/Resources/More-22-symbolic.png
index 55fbe68..a61ef6c 100644
Binary files a/Resources/More-22-symbolic.png and b/Resources/More-22-symbolic.png differ
diff --git a/Resources/More-24-symbolic.png b/Resources/More-24-symbolic.png
index 75674b0..27f218f 100644
Binary files a/Resources/More-24-symbolic.png and b/Resources/More-24-symbolic.png differ
diff --git a/Resources/More-32-symbolic.png b/Resources/More-32-symbolic.png
index eadefe3..24c5fa1 100644
Binary files a/Resources/More-32-symbolic.png and b/Resources/More-32-symbolic.png differ
diff --git a/Resources/More-44-symbolic.png b/Resources/More-44-symbolic.png
index 1a9a64c..471906d 100644
Binary files a/Resources/More-44-symbolic.png and b/Resources/More-44-symbolic.png differ
diff --git a/Resources/More-48-symbolic.png b/Resources/More-48-symbolic.png
index c7b0b75..ecbd072 100644
Binary files a/Resources/More-48-symbolic.png and b/Resources/More-48-symbolic.png differ
diff --git a/Resources/More-64-symbolic.png b/Resources/More-64-symbolic.png
index 8ca91f4..04b9f66 100644
Binary files a/Resources/More-64-symbolic.png and b/Resources/More-64-symbolic.png differ
diff --git a/Resources/More-symbolic.png b/Resources/More-symbolic.png
index 75674b0..27f218f 100644
Binary files a/Resources/More-symbolic.png and b/Resources/More-symbolic.png differ
diff --git a/Resources/NumberedStep-16-symbolic.png b/Resources/NumberedStep-16-symbolic.png
index 3dd8dc7..0ba41e2 100644
Binary files a/Resources/NumberedStep-16-symbolic.png and b/Resources/NumberedStep-16-symbolic.png differ
diff --git a/Resources/NumberedStep-22-symbolic.png b/Resources/NumberedStep-22-symbolic.png
index fd44a16..da1e347 100644
Binary files a/Resources/NumberedStep-22-symbolic.png and b/Resources/NumberedStep-22-symbolic.png differ
diff --git a/Resources/NumberedStep-24-symbolic.png b/Resources/NumberedStep-24-symbolic.png
index 8987234..498102d 100644
Binary files a/Resources/NumberedStep-24-symbolic.png and b/Resources/NumberedStep-24-symbolic.png differ
diff --git a/Resources/NumberedStep-32-symbolic.png b/Resources/NumberedStep-32-symbolic.png
index e4a3e23..78fcaef 100644
Binary files a/Resources/NumberedStep-32-symbolic.png and b/Resources/NumberedStep-32-symbolic.png differ
diff --git a/Resources/NumberedStep-44-symbolic.png b/Resources/NumberedStep-44-symbolic.png
index 2fb6c28..aa6ae99 100644
Binary files a/Resources/NumberedStep-44-symbolic.png and b/Resources/NumberedStep-44-symbolic.png differ
diff --git a/Resources/NumberedStep-48-symbolic.png b/Resources/NumberedStep-48-symbolic.png
index 323dc91..5b46cdd 100644
Binary files a/Resources/NumberedStep-48-symbolic.png and b/Resources/NumberedStep-48-symbolic.png differ
diff --git a/Resources/NumberedStep-64-symbolic.png b/Resources/NumberedStep-64-symbolic.png
index c1b42f7..99cfd0a 100644
Binary files a/Resources/NumberedStep-64-symbolic.png and b/Resources/NumberedStep-64-symbolic.png differ
diff --git a/Resources/NumberedStep-symbolic.png b/Resources/NumberedStep-symbolic.png
index 8987234..498102d 100644
Binary files a/Resources/NumberedStep-symbolic.png and b/Resources/NumberedStep-symbolic.png differ
diff --git a/Resources/PenTool-16-symbolic.png b/Resources/PenTool-16-symbolic.png
index 5cab7ac..d830ab6 100644
Binary files a/Resources/PenTool-16-symbolic.png and b/Resources/PenTool-16-symbolic.png differ
diff --git a/Resources/PenTool-22-symbolic.png b/Resources/PenTool-22-symbolic.png
index bcbd88b..564f378 100644
Binary files a/Resources/PenTool-22-symbolic.png and b/Resources/PenTool-22-symbolic.png differ
diff --git a/Resources/PenTool-24-symbolic.png b/Resources/PenTool-24-symbolic.png
index b149c60..e52ae7d 100644
Binary files a/Resources/PenTool-24-symbolic.png and b/Resources/PenTool-24-symbolic.png differ
diff --git a/Resources/PenTool-32-symbolic.png b/Resources/PenTool-32-symbolic.png
index e75e12b..8d5e96a 100644
Binary files a/Resources/PenTool-32-symbolic.png and b/Resources/PenTool-32-symbolic.png differ
diff --git a/Resources/PenTool-44-symbolic.png b/Resources/PenTool-44-symbolic.png
index 2873783..f735136 100644
Binary files a/Resources/PenTool-44-symbolic.png and b/Resources/PenTool-44-symbolic.png differ
diff --git a/Resources/PenTool-48-symbolic.png b/Resources/PenTool-48-symbolic.png
index 28c2381..818fceb 100644
Binary files a/Resources/PenTool-48-symbolic.png and b/Resources/PenTool-48-symbolic.png differ
diff --git a/Resources/PenTool-64-symbolic.png b/Resources/PenTool-64-symbolic.png
index da348f5..621b219 100644
Binary files a/Resources/PenTool-64-symbolic.png and b/Resources/PenTool-64-symbolic.png differ
diff --git a/Resources/PenTool-symbolic.png b/Resources/PenTool-symbolic.png
index b149c60..e52ae7d 100644
Binary files a/Resources/PenTool-symbolic.png and b/Resources/PenTool-symbolic.png differ
diff --git a/Resources/Preferences-16-symbolic.png b/Resources/Preferences-16-symbolic.png
index 2bdcdb6..e54f3e5 100644
Binary files a/Resources/Preferences-16-symbolic.png and b/Resources/Preferences-16-symbolic.png differ
diff --git a/Resources/Preferences-22-symbolic.png b/Resources/Preferences-22-symbolic.png
index 5c71cf3..49c9e15 100644
Binary files a/Resources/Preferences-22-symbolic.png and b/Resources/Preferences-22-symbolic.png differ
diff --git a/Resources/Preferences-24-symbolic.png b/Resources/Preferences-24-symbolic.png
index 1546370..0a7c259 100644
Binary files a/Resources/Preferences-24-symbolic.png and b/Resources/Preferences-24-symbolic.png differ
diff --git a/Resources/Preferences-32-symbolic.png b/Resources/Preferences-32-symbolic.png
index eaf3f98..f37e72e 100644
Binary files a/Resources/Preferences-32-symbolic.png and b/Resources/Preferences-32-symbolic.png differ
diff --git a/Resources/Preferences-44-symbolic.png b/Resources/Preferences-44-symbolic.png
index f7d5794..4b11efe 100644
Binary files a/Resources/Preferences-44-symbolic.png and b/Resources/Preferences-44-symbolic.png differ
diff --git a/Resources/Preferences-48-symbolic.png b/Resources/Preferences-48-symbolic.png
index 7b1ff2b..f6f45cd 100644
Binary files a/Resources/Preferences-48-symbolic.png and b/Resources/Preferences-48-symbolic.png differ
diff --git a/Resources/Preferences-64-symbolic.png b/Resources/Preferences-64-symbolic.png
index 6d2e96b..f9ebe10 100644
Binary files a/Resources/Preferences-64-symbolic.png and b/Resources/Preferences-64-symbolic.png differ
diff --git a/Resources/Preferences-symbolic.png b/Resources/Preferences-symbolic.png
index 1546370..0a7c259 100644
Binary files a/Resources/Preferences-symbolic.png and b/Resources/Preferences-symbolic.png differ
diff --git a/Resources/Rectangle-16-symbolic.png b/Resources/Rectangle-16-symbolic.png
index cb11238..ec7bfb1 100644
Binary files a/Resources/Rectangle-16-symbolic.png and b/Resources/Rectangle-16-symbolic.png differ
diff --git a/Resources/Rectangle-22-symbolic.png b/Resources/Rectangle-22-symbolic.png
index db46355..9dea456 100644
Binary files a/Resources/Rectangle-22-symbolic.png and b/Resources/Rectangle-22-symbolic.png differ
diff --git a/Resources/Rectangle-24-symbolic.png b/Resources/Rectangle-24-symbolic.png
index 2a80b4c..addd178 100644
Binary files a/Resources/Rectangle-24-symbolic.png and b/Resources/Rectangle-24-symbolic.png differ
diff --git a/Resources/Rectangle-32-symbolic.png b/Resources/Rectangle-32-symbolic.png
index be661a1..d4daca6 100644
Binary files a/Resources/Rectangle-32-symbolic.png and b/Resources/Rectangle-32-symbolic.png differ
diff --git a/Resources/Rectangle-44-symbolic.png b/Resources/Rectangle-44-symbolic.png
index bacada8..b165485 100644
Binary files a/Resources/Rectangle-44-symbolic.png and b/Resources/Rectangle-44-symbolic.png differ
diff --git a/Resources/Rectangle-48-symbolic.png b/Resources/Rectangle-48-symbolic.png
index a05873e..191edde 100644
Binary files a/Resources/Rectangle-48-symbolic.png and b/Resources/Rectangle-48-symbolic.png differ
diff --git a/Resources/Rectangle-64-symbolic.png b/Resources/Rectangle-64-symbolic.png
index f6c2ff8..4391e8b 100644
Binary files a/Resources/Rectangle-64-symbolic.png and b/Resources/Rectangle-64-symbolic.png differ
diff --git a/Resources/Rectangle-symbolic.png b/Resources/Rectangle-symbolic.png
index 2a80b4c..addd178 100644
Binary files a/Resources/Rectangle-symbolic.png and b/Resources/Rectangle-symbolic.png differ
diff --git a/Resources/Redact-16-symbolic.png b/Resources/Redact-16-symbolic.png
index 4c0e898..afb25cf 100644
Binary files a/Resources/Redact-16-symbolic.png and b/Resources/Redact-16-symbolic.png differ
diff --git a/Resources/Redact-22-symbolic.png b/Resources/Redact-22-symbolic.png
index 97673a7..2ec1027 100644
Binary files a/Resources/Redact-22-symbolic.png and b/Resources/Redact-22-symbolic.png differ
diff --git a/Resources/Redact-24-symbolic.png b/Resources/Redact-24-symbolic.png
index 49e87bc..c6e8016 100644
Binary files a/Resources/Redact-24-symbolic.png and b/Resources/Redact-24-symbolic.png differ
diff --git a/Resources/Redact-32-symbolic.png b/Resources/Redact-32-symbolic.png
index dc7eccb..60e1304 100644
Binary files a/Resources/Redact-32-symbolic.png and b/Resources/Redact-32-symbolic.png differ
diff --git a/Resources/Redact-44-symbolic.png b/Resources/Redact-44-symbolic.png
index f984274..6e479ce 100644
Binary files a/Resources/Redact-44-symbolic.png and b/Resources/Redact-44-symbolic.png differ
diff --git a/Resources/Redact-48-symbolic.png b/Resources/Redact-48-symbolic.png
index f02bea7..ae6d14f 100644
Binary files a/Resources/Redact-48-symbolic.png and b/Resources/Redact-48-symbolic.png differ
diff --git a/Resources/Redact-64-symbolic.png b/Resources/Redact-64-symbolic.png
index de2e2d9..ddb443e 100644
Binary files a/Resources/Redact-64-symbolic.png and b/Resources/Redact-64-symbolic.png differ
diff --git a/Resources/Redact-symbolic.png b/Resources/Redact-symbolic.png
index 49e87bc..c6e8016 100644
Binary files a/Resources/Redact-symbolic.png and b/Resources/Redact-symbolic.png differ
diff --git a/Resources/Redo-16-symbolic.png b/Resources/Redo-16-symbolic.png
index d2f28b7..9db3782 100644
Binary files a/Resources/Redo-16-symbolic.png and b/Resources/Redo-16-symbolic.png differ
diff --git a/Resources/Redo-22-symbolic.png b/Resources/Redo-22-symbolic.png
index b9c6eac..23b83e5 100644
Binary files a/Resources/Redo-22-symbolic.png and b/Resources/Redo-22-symbolic.png differ
diff --git a/Resources/Redo-24-symbolic.png b/Resources/Redo-24-symbolic.png
index 556f868..1ae57a6 100644
Binary files a/Resources/Redo-24-symbolic.png and b/Resources/Redo-24-symbolic.png differ
diff --git a/Resources/Redo-32-symbolic.png b/Resources/Redo-32-symbolic.png
index 6637fb6..d3e3ca0 100644
Binary files a/Resources/Redo-32-symbolic.png and b/Resources/Redo-32-symbolic.png differ
diff --git a/Resources/Redo-44-symbolic.png b/Resources/Redo-44-symbolic.png
index 8f41df1..4e56488 100644
Binary files a/Resources/Redo-44-symbolic.png and b/Resources/Redo-44-symbolic.png differ
diff --git a/Resources/Redo-48-symbolic.png b/Resources/Redo-48-symbolic.png
index db97bc4..db62232 100644
Binary files a/Resources/Redo-48-symbolic.png and b/Resources/Redo-48-symbolic.png differ
diff --git a/Resources/Redo-64-symbolic.png b/Resources/Redo-64-symbolic.png
index a1e45a3..1c164cc 100644
Binary files a/Resources/Redo-64-symbolic.png and b/Resources/Redo-64-symbolic.png differ
diff --git a/Resources/Redo-symbolic.png b/Resources/Redo-symbolic.png
index 556f868..1ae57a6 100644
Binary files a/Resources/Redo-symbolic.png and b/Resources/Redo-symbolic.png differ
diff --git a/Resources/Save-16-symbolic.png b/Resources/Save-16-symbolic.png
index 7081872..607f2eb 100644
Binary files a/Resources/Save-16-symbolic.png and b/Resources/Save-16-symbolic.png differ
diff --git a/Resources/Save-22-symbolic.png b/Resources/Save-22-symbolic.png
index 2570bf4..1e051ec 100644
Binary files a/Resources/Save-22-symbolic.png and b/Resources/Save-22-symbolic.png differ
diff --git a/Resources/Save-24-symbolic.png b/Resources/Save-24-symbolic.png
index 40a126e..849cdb4 100644
Binary files a/Resources/Save-24-symbolic.png and b/Resources/Save-24-symbolic.png differ
diff --git a/Resources/Save-32-symbolic.png b/Resources/Save-32-symbolic.png
index e89422a..beee454 100644
Binary files a/Resources/Save-32-symbolic.png and b/Resources/Save-32-symbolic.png differ
diff --git a/Resources/Save-44-symbolic.png b/Resources/Save-44-symbolic.png
index 4b7d45b..c321934 100644
Binary files a/Resources/Save-44-symbolic.png and b/Resources/Save-44-symbolic.png differ
diff --git a/Resources/Save-48-symbolic.png b/Resources/Save-48-symbolic.png
index 7041c55..df50140 100644
Binary files a/Resources/Save-48-symbolic.png and b/Resources/Save-48-symbolic.png differ
diff --git a/Resources/Save-64-symbolic.png b/Resources/Save-64-symbolic.png
index cdc370d..b5d7558 100644
Binary files a/Resources/Save-64-symbolic.png and b/Resources/Save-64-symbolic.png differ
diff --git a/Resources/Save-symbolic.png b/Resources/Save-symbolic.png
index 40a126e..849cdb4 100644
Binary files a/Resources/Save-symbolic.png and b/Resources/Save-symbolic.png differ
diff --git a/Resources/Share-16-symbolic.png b/Resources/Share-16-symbolic.png
index ae3aaec..385a047 100644
Binary files a/Resources/Share-16-symbolic.png and b/Resources/Share-16-symbolic.png differ
diff --git a/Resources/Share-22-symbolic.png b/Resources/Share-22-symbolic.png
index 619e556..e00c706 100644
Binary files a/Resources/Share-22-symbolic.png and b/Resources/Share-22-symbolic.png differ
diff --git a/Resources/Share-24-symbolic.png b/Resources/Share-24-symbolic.png
index f3cd3ed..988ac1a 100644
Binary files a/Resources/Share-24-symbolic.png and b/Resources/Share-24-symbolic.png differ
diff --git a/Resources/Share-32-symbolic.png b/Resources/Share-32-symbolic.png
index 126c977..7f9c6ab 100644
Binary files a/Resources/Share-32-symbolic.png and b/Resources/Share-32-symbolic.png differ
diff --git a/Resources/Share-44-symbolic.png b/Resources/Share-44-symbolic.png
index b309141..cfca226 100644
Binary files a/Resources/Share-44-symbolic.png and b/Resources/Share-44-symbolic.png differ
diff --git a/Resources/Share-48-symbolic.png b/Resources/Share-48-symbolic.png
index db9f3dd..e66421f 100644
Binary files a/Resources/Share-48-symbolic.png and b/Resources/Share-48-symbolic.png differ
diff --git a/Resources/Share-64-symbolic.png b/Resources/Share-64-symbolic.png
index 0df539c..e70e891 100644
Binary files a/Resources/Share-64-symbolic.png and b/Resources/Share-64-symbolic.png differ
diff --git a/Resources/Share-symbolic.png b/Resources/Share-symbolic.png
index f3cd3ed..988ac1a 100644
Binary files a/Resources/Share-symbolic.png and b/Resources/Share-symbolic.png differ
diff --git a/Resources/Undo-16-symbolic.png b/Resources/Undo-16-symbolic.png
index c8fcfed..c0c7ca4 100644
Binary files a/Resources/Undo-16-symbolic.png and b/Resources/Undo-16-symbolic.png differ
diff --git a/Resources/Undo-22-symbolic.png b/Resources/Undo-22-symbolic.png
index 17a79c7..4db5cc4 100644
Binary files a/Resources/Undo-22-symbolic.png and b/Resources/Undo-22-symbolic.png differ
diff --git a/Resources/Undo-24-symbolic.png b/Resources/Undo-24-symbolic.png
index e7b30a8..32a10a6 100644
Binary files a/Resources/Undo-24-symbolic.png and b/Resources/Undo-24-symbolic.png differ
diff --git a/Resources/Undo-32-symbolic.png b/Resources/Undo-32-symbolic.png
index 0e39ab7..f931203 100644
Binary files a/Resources/Undo-32-symbolic.png and b/Resources/Undo-32-symbolic.png differ
diff --git a/Resources/Undo-44-symbolic.png b/Resources/Undo-44-symbolic.png
index 71c5dbc..0ab788c 100644
Binary files a/Resources/Undo-44-symbolic.png and b/Resources/Undo-44-symbolic.png differ
diff --git a/Resources/Undo-48-symbolic.png b/Resources/Undo-48-symbolic.png
index a993125..0572835 100644
Binary files a/Resources/Undo-48-symbolic.png and b/Resources/Undo-48-symbolic.png differ
diff --git a/Resources/Undo-64-symbolic.png b/Resources/Undo-64-symbolic.png
index 6066785..1b9929d 100644
Binary files a/Resources/Undo-64-symbolic.png and b/Resources/Undo-64-symbolic.png differ
diff --git a/Resources/Undo-symbolic.png b/Resources/Undo-symbolic.png
index e7b30a8..32a10a6 100644
Binary files a/Resources/Undo-symbolic.png and b/Resources/Undo-symbolic.png differ
diff --git a/scripts/render_toolbar_icons.py b/scripts/render_toolbar_icons.py
index 90b0ca1..1155138 100755
--- a/scripts/render_toolbar_icons.py
+++ b/scripts/render_toolbar_icons.py
@@ -10,11 +10,12 @@
#
"""Render the toolbar icons from Resources/Icons/*.svg to the PNGs the app loads.
-Each icon is drawn on a 24-unit grid, its art inside 1 to 23. It's rendered at every size the
-toolbar draws it at, so no icon is resampled on screen: --symbolic.png for 16, 24 and 32
-px (and 48 and 64, their 2x), and 22 and 44 px cut from the 24 and 48 px renderings (the tool
-switcher's size, the grid's 1-unit margin left off, so its lines stay on whole pixels). The
-24 px rendering is also -symbolic.png, the name older code and packaging look for.
+Each icon is drawn on a 24-unit grid, its art inside 3 to 21. Only that middle 18 units is
+rendered, so the glyph fills about 85% of the icon, as Fluent's and Adwaita's do. Drawn whole,
+the grid left the glyph at about 62%, and 10 px in WinUITheme's 16 px toolbar icon. It's rendered
+at every size the toolbar draws it at, so no icon is resampled on screen:
+--symbolic.png for 16, 22, 24 and 32 px, and 44, 48 and 64, their 2x. The 24 px
+rendering is also -symbolic.png, the name older code and packaging look for.
-.svg, when there is one, replaces .svg at that size: a drawing hinted to that
size's pixels, still on the 24-unit grid.
@@ -36,23 +37,17 @@
SOURCES = os.path.join(ROOT, "Resources", "Icons")
OUTPUT = os.path.join(ROOT, "Resources")
-# Pixel size -> (scale from the 24-unit grid, units cut from each edge).
-SIZES = {
- 16: (16 / 24, 0),
- 22: (1, 1),
- 24: (1, 0),
- 32: (32 / 24, 0),
- 44: (2, 1),
- 48: (2, 0),
- 64: (64 / 24, 0),
-}
+SIZES = (16, 22, 24, 32, 44, 48, 64)
+# The part of the 24-unit grid an icon shows: the 18 units in the middle.
+MARGIN = 3
+SHOWN = 24 - 2 * MARGIN
-def render(handle, pixels, scale, margin):
+def render(handle, pixels):
surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, pixels, pixels)
context = cairo.Context(surface)
- context.scale(scale, scale)
- context.translate(-margin, -margin)
+ context.scale(pixels / SHOWN, pixels / SHOWN)
+ context.translate(-MARGIN, -MARGIN)
viewport = Rsvg.Rectangle()
viewport.x, viewport.y, viewport.width, viewport.height = 0, 0, 24, 24
handle.render_document(context, viewport)
@@ -69,10 +64,10 @@ def main():
continue
stem = name[:-len(".svg")]
handle = Rsvg.Handle.new_from_file(os.path.join(SOURCES, name))
- for pixels, (scale, margin) in SIZES.items():
+ for pixels in SIZES:
override = os.path.join(SOURCES, "%s-%d.svg" % (stem, pixels))
source = Rsvg.Handle.new_from_file(override) if os.path.exists(override) else handle
- surface = render(source, pixels, scale, margin)
+ surface = render(source, pixels)
surface.write_to_png(os.path.join(OUTPUT, "%s-%d-symbolic.png" % (stem, pixels)))
if pixels == 24:
surface.write_to_png(os.path.join(OUTPUT, "%s-symbolic.png" % stem))