diff --git a/data/icons/book.png b/data/icons/book.png
index 1f1e4301..afe00eac 100644
Binary files a/data/icons/book.png and b/data/icons/book.png differ
diff --git a/data/icons/menu/dark/about.png b/data/icons/menu/dark/about.png
index 08b64db1..89f0d1ba 100644
Binary files a/data/icons/menu/dark/about.png and b/data/icons/menu/dark/about.png differ
diff --git a/data/icons/menu/dark/about.svg b/data/icons/menu/dark/about.svg
index 29ed7982..74317abd 100644
--- a/data/icons/menu/dark/about.svg
+++ b/data/icons/menu/dark/about.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/add.png b/data/icons/menu/dark/add.png
index 1525d461..7ea9e401 100644
Binary files a/data/icons/menu/dark/add.png and b/data/icons/menu/dark/add.png differ
diff --git a/data/icons/menu/dark/add.svg b/data/icons/menu/dark/add.svg
index bcf1c2c2..e3f608a6 100644
--- a/data/icons/menu/dark/add.svg
+++ b/data/icons/menu/dark/add.svg
@@ -1,3 +1,16 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/cancel.png b/data/icons/menu/dark/cancel.png
new file mode 100644
index 00000000..9f851195
Binary files /dev/null and b/data/icons/menu/dark/cancel.png differ
diff --git a/data/icons/menu/dark/cancel.svg b/data/icons/menu/dark/cancel.svg
new file mode 100644
index 00000000..d38e65ea
--- /dev/null
+++ b/data/icons/menu/dark/cancel.svg
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/chanlist.png b/data/icons/menu/dark/chanlist.png
index 9aac1a20..2a20a15f 100644
Binary files a/data/icons/menu/dark/chanlist.png and b/data/icons/menu/dark/chanlist.png differ
diff --git a/data/icons/menu/dark/chanlist.svg b/data/icons/menu/dark/chanlist.svg
index d1875770..821308da 100644
--- a/data/icons/menu/dark/chanlist.svg
+++ b/data/icons/menu/dark/chanlist.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/clear.png b/data/icons/menu/dark/clear.png
index d3a1c607..845dc379 100644
Binary files a/data/icons/menu/dark/clear.png and b/data/icons/menu/dark/clear.png differ
diff --git a/data/icons/menu/dark/clear.svg b/data/icons/menu/dark/clear.svg
index 92241371..7f9e8a25 100644
--- a/data/icons/menu/dark/clear.svg
+++ b/data/icons/menu/dark/clear.svg
@@ -1,6 +1,21 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/close.png b/data/icons/menu/dark/close.png
index 6e9bb61a..9fd36cc5 100644
Binary files a/data/icons/menu/dark/close.png and b/data/icons/menu/dark/close.png differ
diff --git a/data/icons/menu/dark/close.svg b/data/icons/menu/dark/close.svg
index b900bde1..127c7150 100644
--- a/data/icons/menu/dark/close.svg
+++ b/data/icons/menu/dark/close.svg
@@ -1,4 +1,17 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/connect.png b/data/icons/menu/dark/connect.png
index d80b55aa..3fc530ea 100644
Binary files a/data/icons/menu/dark/connect.png and b/data/icons/menu/dark/connect.png differ
diff --git a/data/icons/menu/dark/connect.svg b/data/icons/menu/dark/connect.svg
index 23e9f7e1..245bf03c 100644
--- a/data/icons/menu/dark/connect.svg
+++ b/data/icons/menu/dark/connect.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/copy.png b/data/icons/menu/dark/copy.png
index f0dab355..cfe7e8b1 100644
Binary files a/data/icons/menu/dark/copy.png and b/data/icons/menu/dark/copy.png differ
diff --git a/data/icons/menu/dark/copy.svg b/data/icons/menu/dark/copy.svg
index 936b5ebd..f19cce92 100644
--- a/data/icons/menu/dark/copy.svg
+++ b/data/icons/menu/dark/copy.svg
@@ -1,3 +1,17 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/delete.png b/data/icons/menu/dark/delete.png
index 511142cc..7b685701 100644
Binary files a/data/icons/menu/dark/delete.png and b/data/icons/menu/dark/delete.png differ
diff --git a/data/icons/menu/dark/delete.svg b/data/icons/menu/dark/delete.svg
index df61c508..f122a6de 100644
--- a/data/icons/menu/dark/delete.svg
+++ b/data/icons/menu/dark/delete.svg
@@ -1,3 +1,18 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/detach.png b/data/icons/menu/dark/detach.png
index edbf3997..82514205 100644
Binary files a/data/icons/menu/dark/detach.png and b/data/icons/menu/dark/detach.png differ
diff --git a/data/icons/menu/dark/detach.svg b/data/icons/menu/dark/detach.svg
index 5d27f27b..0d4c9371 100644
--- a/data/icons/menu/dark/detach.svg
+++ b/data/icons/menu/dark/detach.svg
@@ -1,4 +1,17 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/disconnect.png b/data/icons/menu/dark/disconnect.png
index f77be0ca..393bf629 100644
Binary files a/data/icons/menu/dark/disconnect.png and b/data/icons/menu/dark/disconnect.png differ
diff --git a/data/icons/menu/dark/disconnect.svg b/data/icons/menu/dark/disconnect.svg
index ac33ae30..5e92afbd 100644
--- a/data/icons/menu/dark/disconnect.svg
+++ b/data/icons/menu/dark/disconnect.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/emoji.png b/data/icons/menu/dark/emoji.png
index c95918dd..b2b9dc78 100644
Binary files a/data/icons/menu/dark/emoji.png and b/data/icons/menu/dark/emoji.png differ
diff --git a/data/icons/menu/dark/emoji.svg b/data/icons/menu/dark/emoji.svg
index 90200fc4..e82f1021 100644
--- a/data/icons/menu/dark/emoji.svg
+++ b/data/icons/menu/dark/emoji.svg
@@ -1 +1,17 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/find.png b/data/icons/menu/dark/find.png
index 43ab9876..8e0a9755 100644
Binary files a/data/icons/menu/dark/find.png and b/data/icons/menu/dark/find.png differ
diff --git a/data/icons/menu/dark/find.svg b/data/icons/menu/dark/find.svg
index da071ab0..13efff81 100644
--- a/data/icons/menu/dark/find.svg
+++ b/data/icons/menu/dark/find.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/help.png b/data/icons/menu/dark/help.png
index 6bb506b4..bf5f833a 100644
Binary files a/data/icons/menu/dark/help.png and b/data/icons/menu/dark/help.png differ
diff --git a/data/icons/menu/dark/help.svg b/data/icons/menu/dark/help.svg
index 372b8148..e78a4a24 100644
--- a/data/icons/menu/dark/help.svg
+++ b/data/icons/menu/dark/help.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/join.png b/data/icons/menu/dark/join.png
index 60907671..6d42e827 100644
Binary files a/data/icons/menu/dark/join.png and b/data/icons/menu/dark/join.png differ
diff --git a/data/icons/menu/dark/join.svg b/data/icons/menu/dark/join.svg
index b7c79c33..02765b5f 100644
--- a/data/icons/menu/dark/join.svg
+++ b/data/icons/menu/dark/join.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/load-plugin.png b/data/icons/menu/dark/load-plugin.png
index cdfec9d5..10148fe7 100644
Binary files a/data/icons/menu/dark/load-plugin.png and b/data/icons/menu/dark/load-plugin.png differ
diff --git a/data/icons/menu/dark/load-plugin.svg b/data/icons/menu/dark/load-plugin.svg
index 16a7ea74..3a42eb86 100644
--- a/data/icons/menu/dark/load-plugin.svg
+++ b/data/icons/menu/dark/load-plugin.svg
@@ -1,6 +1,21 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/network-list.png b/data/icons/menu/dark/network-list.png
index 9aac1a20..2a20a15f 100644
Binary files a/data/icons/menu/dark/network-list.png and b/data/icons/menu/dark/network-list.png differ
diff --git a/data/icons/menu/dark/network-list.svg b/data/icons/menu/dark/network-list.svg
index d1875770..821308da 100644
--- a/data/icons/menu/dark/network-list.svg
+++ b/data/icons/menu/dark/network-list.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/new.png b/data/icons/menu/dark/new.png
index 24e226c9..eb32e465 100644
Binary files a/data/icons/menu/dark/new.png and b/data/icons/menu/dark/new.png differ
diff --git a/data/icons/menu/dark/new.svg b/data/icons/menu/dark/new.svg
index 6b5a7da2..20371d7a 100644
--- a/data/icons/menu/dark/new.svg
+++ b/data/icons/menu/dark/new.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/next.png b/data/icons/menu/dark/next.png
index 0ac0df17..991b7c6f 100644
Binary files a/data/icons/menu/dark/next.png and b/data/icons/menu/dark/next.png differ
diff --git a/data/icons/menu/dark/next.svg b/data/icons/menu/dark/next.svg
index 9a61599d..05fa9576 100644
--- a/data/icons/menu/dark/next.svg
+++ b/data/icons/menu/dark/next.svg
@@ -1,3 +1,15 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/ok.png b/data/icons/menu/dark/ok.png
new file mode 100644
index 00000000..b22df7ed
Binary files /dev/null and b/data/icons/menu/dark/ok.png differ
diff --git a/data/icons/menu/dark/ok.svg b/data/icons/menu/dark/ok.svg
new file mode 100644
index 00000000..ff9c330c
--- /dev/null
+++ b/data/icons/menu/dark/ok.svg
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/preferences.png b/data/icons/menu/dark/preferences.png
index c33104d3..3198eb74 100644
Binary files a/data/icons/menu/dark/preferences.png and b/data/icons/menu/dark/preferences.png differ
diff --git a/data/icons/menu/dark/preferences.svg b/data/icons/menu/dark/preferences.svg
index e9c6ad2b..b99bafab 100644
--- a/data/icons/menu/dark/preferences.svg
+++ b/data/icons/menu/dark/preferences.svg
@@ -1,4 +1,17 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/previous.png b/data/icons/menu/dark/previous.png
index fbbe0dbf..7f47343e 100644
Binary files a/data/icons/menu/dark/previous.png and b/data/icons/menu/dark/previous.png differ
diff --git a/data/icons/menu/dark/previous.svg b/data/icons/menu/dark/previous.svg
index 1f6c39a0..8027c6ab 100644
--- a/data/icons/menu/dark/previous.svg
+++ b/data/icons/menu/dark/previous.svg
@@ -1,3 +1,15 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/quit.png b/data/icons/menu/dark/quit.png
index 47c2793e..67197cbf 100644
Binary files a/data/icons/menu/dark/quit.png and b/data/icons/menu/dark/quit.png differ
diff --git a/data/icons/menu/dark/quit.svg b/data/icons/menu/dark/quit.svg
index 8fed449f..438cb6b0 100644
--- a/data/icons/menu/dark/quit.svg
+++ b/data/icons/menu/dark/quit.svg
@@ -1,4 +1,17 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/refresh.png b/data/icons/menu/dark/refresh.png
index c32d4259..f74286f2 100644
Binary files a/data/icons/menu/dark/refresh.png and b/data/icons/menu/dark/refresh.png differ
diff --git a/data/icons/menu/dark/refresh.svg b/data/icons/menu/dark/refresh.svg
index a325b64e..f549f1b5 100644
--- a/data/icons/menu/dark/refresh.svg
+++ b/data/icons/menu/dark/refresh.svg
@@ -1,3 +1,16 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/remove.png b/data/icons/menu/dark/remove.png
index 83e0e007..e0b2c67d 100644
Binary files a/data/icons/menu/dark/remove.png and b/data/icons/menu/dark/remove.png differ
diff --git a/data/icons/menu/dark/remove.svg b/data/icons/menu/dark/remove.svg
index 63494850..7be56815 100644
--- a/data/icons/menu/dark/remove.svg
+++ b/data/icons/menu/dark/remove.svg
@@ -1,3 +1,16 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/save-as.png b/data/icons/menu/dark/save-as.png
index 21a63153..df2030ee 100644
Binary files a/data/icons/menu/dark/save-as.png and b/data/icons/menu/dark/save-as.png differ
diff --git a/data/icons/menu/dark/save-as.svg b/data/icons/menu/dark/save-as.svg
index 642442d0..7156c953 100644
--- a/data/icons/menu/dark/save-as.svg
+++ b/data/icons/menu/dark/save-as.svg
@@ -1,6 +1,21 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/save.png b/data/icons/menu/dark/save.png
index 841b26c6..ae762910 100644
Binary files a/data/icons/menu/dark/save.png and b/data/icons/menu/dark/save.png differ
diff --git a/data/icons/menu/dark/save.svg b/data/icons/menu/dark/save.svg
index 8525797c..7b6db96c 100644
--- a/data/icons/menu/dark/save.svg
+++ b/data/icons/menu/dark/save.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/search.png b/data/icons/menu/dark/search.png
index 0310a705..2f441ac2 100644
Binary files a/data/icons/menu/dark/search.png and b/data/icons/menu/dark/search.png differ
diff --git a/data/icons/menu/dark/search.svg b/data/icons/menu/dark/search.svg
index a90679aa..df5f3c62 100644
--- a/data/icons/menu/dark/search.svg
+++ b/data/icons/menu/dark/search.svg
@@ -1,4 +1,17 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/spell-check.png b/data/icons/menu/dark/spell-check.png
index ec54916a..4b23fa16 100644
Binary files a/data/icons/menu/dark/spell-check.png and b/data/icons/menu/dark/spell-check.png differ
diff --git a/data/icons/menu/dark/spell-check.svg b/data/icons/menu/dark/spell-check.svg
index 24ebc5be..1f7e741c 100644
--- a/data/icons/menu/dark/spell-check.svg
+++ b/data/icons/menu/dark/spell-check.svg
@@ -1,3 +1,16 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/dark/update.png b/data/icons/menu/dark/update.png
index 83680b92..59b40644 100644
Binary files a/data/icons/menu/dark/update.png and b/data/icons/menu/dark/update.png differ
diff --git a/data/icons/menu/dark/update.svg b/data/icons/menu/dark/update.svg
index 61794d66..7b811698 100644
--- a/data/icons/menu/dark/update.svg
+++ b/data/icons/menu/dark/update.svg
@@ -1 +1,14 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/data/icons/menu/light/about.png b/data/icons/menu/light/about.png
index e1b58432..89f0d1ba 100644
Binary files a/data/icons/menu/light/about.png and b/data/icons/menu/light/about.png differ
diff --git a/data/icons/menu/light/about.svg b/data/icons/menu/light/about.svg
index 0b174910..74317abd 100644
--- a/data/icons/menu/light/about.svg
+++ b/data/icons/menu/light/about.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/add.png b/data/icons/menu/light/add.png
index c160c13f..7ea9e401 100644
Binary files a/data/icons/menu/light/add.png and b/data/icons/menu/light/add.png differ
diff --git a/data/icons/menu/light/add.svg b/data/icons/menu/light/add.svg
index 4f91008c..e3f608a6 100644
--- a/data/icons/menu/light/add.svg
+++ b/data/icons/menu/light/add.svg
@@ -1,3 +1,16 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/cancel.png b/data/icons/menu/light/cancel.png
new file mode 100644
index 00000000..4583575c
Binary files /dev/null and b/data/icons/menu/light/cancel.png differ
diff --git a/data/icons/menu/light/cancel.svg b/data/icons/menu/light/cancel.svg
new file mode 100644
index 00000000..a58fb86e
--- /dev/null
+++ b/data/icons/menu/light/cancel.svg
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/data/icons/menu/light/chanlist.png b/data/icons/menu/light/chanlist.png
index dd358626..2a20a15f 100644
Binary files a/data/icons/menu/light/chanlist.png and b/data/icons/menu/light/chanlist.png differ
diff --git a/data/icons/menu/light/chanlist.svg b/data/icons/menu/light/chanlist.svg
index d76e703e..821308da 100644
--- a/data/icons/menu/light/chanlist.svg
+++ b/data/icons/menu/light/chanlist.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/clear.png b/data/icons/menu/light/clear.png
index 49a4ccfd..845dc379 100644
Binary files a/data/icons/menu/light/clear.png and b/data/icons/menu/light/clear.png differ
diff --git a/data/icons/menu/light/clear.svg b/data/icons/menu/light/clear.svg
index bd8ab3c8..7f9e8a25 100644
--- a/data/icons/menu/light/clear.svg
+++ b/data/icons/menu/light/clear.svg
@@ -1,6 +1,21 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/close.png b/data/icons/menu/light/close.png
index 6f0e8e9c..9fd36cc5 100644
Binary files a/data/icons/menu/light/close.png and b/data/icons/menu/light/close.png differ
diff --git a/data/icons/menu/light/close.svg b/data/icons/menu/light/close.svg
index b3802887..127c7150 100644
--- a/data/icons/menu/light/close.svg
+++ b/data/icons/menu/light/close.svg
@@ -1,4 +1,17 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/connect.png b/data/icons/menu/light/connect.png
index 4f73f890..3fc530ea 100644
Binary files a/data/icons/menu/light/connect.png and b/data/icons/menu/light/connect.png differ
diff --git a/data/icons/menu/light/connect.svg b/data/icons/menu/light/connect.svg
index 0ae90ca0..245bf03c 100644
--- a/data/icons/menu/light/connect.svg
+++ b/data/icons/menu/light/connect.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/copy.png b/data/icons/menu/light/copy.png
index 369e8732..cfe7e8b1 100644
Binary files a/data/icons/menu/light/copy.png and b/data/icons/menu/light/copy.png differ
diff --git a/data/icons/menu/light/copy.svg b/data/icons/menu/light/copy.svg
index 7fb9ada5..f19cce92 100644
--- a/data/icons/menu/light/copy.svg
+++ b/data/icons/menu/light/copy.svg
@@ -1,3 +1,17 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/delete.png b/data/icons/menu/light/delete.png
index a7aff1e8..7b685701 100644
Binary files a/data/icons/menu/light/delete.png and b/data/icons/menu/light/delete.png differ
diff --git a/data/icons/menu/light/delete.svg b/data/icons/menu/light/delete.svg
index d90217ac..f122a6de 100644
--- a/data/icons/menu/light/delete.svg
+++ b/data/icons/menu/light/delete.svg
@@ -1,3 +1,18 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/detach.png b/data/icons/menu/light/detach.png
index 3f4a2e38..82514205 100644
Binary files a/data/icons/menu/light/detach.png and b/data/icons/menu/light/detach.png differ
diff --git a/data/icons/menu/light/detach.svg b/data/icons/menu/light/detach.svg
index 1f24c1d5..0d4c9371 100644
--- a/data/icons/menu/light/detach.svg
+++ b/data/icons/menu/light/detach.svg
@@ -1,4 +1,17 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/disconnect.png b/data/icons/menu/light/disconnect.png
index 275fb050..393bf629 100644
Binary files a/data/icons/menu/light/disconnect.png and b/data/icons/menu/light/disconnect.png differ
diff --git a/data/icons/menu/light/disconnect.svg b/data/icons/menu/light/disconnect.svg
index 07337c2f..5e92afbd 100644
--- a/data/icons/menu/light/disconnect.svg
+++ b/data/icons/menu/light/disconnect.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/emoji.png b/data/icons/menu/light/emoji.png
index d8fe5cdb..b2b9dc78 100644
Binary files a/data/icons/menu/light/emoji.png and b/data/icons/menu/light/emoji.png differ
diff --git a/data/icons/menu/light/emoji.svg b/data/icons/menu/light/emoji.svg
index 989062b8..e82f1021 100644
--- a/data/icons/menu/light/emoji.svg
+++ b/data/icons/menu/light/emoji.svg
@@ -1 +1,17 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/data/icons/menu/light/find.png b/data/icons/menu/light/find.png
index 88cc5143..8e0a9755 100644
Binary files a/data/icons/menu/light/find.png and b/data/icons/menu/light/find.png differ
diff --git a/data/icons/menu/light/find.svg b/data/icons/menu/light/find.svg
index 534d74f2..13efff81 100644
--- a/data/icons/menu/light/find.svg
+++ b/data/icons/menu/light/find.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/help.png b/data/icons/menu/light/help.png
index 55032857..bf5f833a 100644
Binary files a/data/icons/menu/light/help.png and b/data/icons/menu/light/help.png differ
diff --git a/data/icons/menu/light/help.svg b/data/icons/menu/light/help.svg
index b629f781..e78a4a24 100644
--- a/data/icons/menu/light/help.svg
+++ b/data/icons/menu/light/help.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/join.png b/data/icons/menu/light/join.png
index 29a7d38f..6d42e827 100644
Binary files a/data/icons/menu/light/join.png and b/data/icons/menu/light/join.png differ
diff --git a/data/icons/menu/light/join.svg b/data/icons/menu/light/join.svg
index 7e8bce9f..02765b5f 100644
--- a/data/icons/menu/light/join.svg
+++ b/data/icons/menu/light/join.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/load-plugin.png b/data/icons/menu/light/load-plugin.png
index 923c33ae..10148fe7 100644
Binary files a/data/icons/menu/light/load-plugin.png and b/data/icons/menu/light/load-plugin.png differ
diff --git a/data/icons/menu/light/load-plugin.svg b/data/icons/menu/light/load-plugin.svg
index e74500b2..3a42eb86 100644
--- a/data/icons/menu/light/load-plugin.svg
+++ b/data/icons/menu/light/load-plugin.svg
@@ -1,6 +1,21 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/network-list.png b/data/icons/menu/light/network-list.png
index dd358626..2a20a15f 100644
Binary files a/data/icons/menu/light/network-list.png and b/data/icons/menu/light/network-list.png differ
diff --git a/data/icons/menu/light/network-list.svg b/data/icons/menu/light/network-list.svg
index d76e703e..821308da 100644
--- a/data/icons/menu/light/network-list.svg
+++ b/data/icons/menu/light/network-list.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/new.png b/data/icons/menu/light/new.png
index 01625797..eb32e465 100644
Binary files a/data/icons/menu/light/new.png and b/data/icons/menu/light/new.png differ
diff --git a/data/icons/menu/light/new.svg b/data/icons/menu/light/new.svg
index a63e69fb..20371d7a 100644
--- a/data/icons/menu/light/new.svg
+++ b/data/icons/menu/light/new.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/next.png b/data/icons/menu/light/next.png
index 47f6a11d..991b7c6f 100644
Binary files a/data/icons/menu/light/next.png and b/data/icons/menu/light/next.png differ
diff --git a/data/icons/menu/light/next.svg b/data/icons/menu/light/next.svg
index e2427e28..05fa9576 100644
--- a/data/icons/menu/light/next.svg
+++ b/data/icons/menu/light/next.svg
@@ -1,3 +1,15 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/ok.png b/data/icons/menu/light/ok.png
new file mode 100644
index 00000000..264939da
Binary files /dev/null and b/data/icons/menu/light/ok.png differ
diff --git a/data/icons/menu/light/ok.svg b/data/icons/menu/light/ok.svg
new file mode 100644
index 00000000..472a2cc5
--- /dev/null
+++ b/data/icons/menu/light/ok.svg
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/data/icons/menu/light/preferences.png b/data/icons/menu/light/preferences.png
index 5f600e55..3198eb74 100644
Binary files a/data/icons/menu/light/preferences.png and b/data/icons/menu/light/preferences.png differ
diff --git a/data/icons/menu/light/preferences.svg b/data/icons/menu/light/preferences.svg
index a69c4449..b99bafab 100644
--- a/data/icons/menu/light/preferences.svg
+++ b/data/icons/menu/light/preferences.svg
@@ -1,4 +1,17 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/previous.png b/data/icons/menu/light/previous.png
index cb6b8c58..7f47343e 100644
Binary files a/data/icons/menu/light/previous.png and b/data/icons/menu/light/previous.png differ
diff --git a/data/icons/menu/light/previous.svg b/data/icons/menu/light/previous.svg
index bf85619d..8027c6ab 100644
--- a/data/icons/menu/light/previous.svg
+++ b/data/icons/menu/light/previous.svg
@@ -1,3 +1,15 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/quit.png b/data/icons/menu/light/quit.png
index 165393d0..67197cbf 100644
Binary files a/data/icons/menu/light/quit.png and b/data/icons/menu/light/quit.png differ
diff --git a/data/icons/menu/light/quit.svg b/data/icons/menu/light/quit.svg
index c4141749..438cb6b0 100644
--- a/data/icons/menu/light/quit.svg
+++ b/data/icons/menu/light/quit.svg
@@ -1,4 +1,17 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/refresh.png b/data/icons/menu/light/refresh.png
index 929edc37..f74286f2 100644
Binary files a/data/icons/menu/light/refresh.png and b/data/icons/menu/light/refresh.png differ
diff --git a/data/icons/menu/light/refresh.svg b/data/icons/menu/light/refresh.svg
index 735b7a2d..f549f1b5 100644
--- a/data/icons/menu/light/refresh.svg
+++ b/data/icons/menu/light/refresh.svg
@@ -1,3 +1,16 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/remove.png b/data/icons/menu/light/remove.png
index a61b4cff..e0b2c67d 100644
Binary files a/data/icons/menu/light/remove.png and b/data/icons/menu/light/remove.png differ
diff --git a/data/icons/menu/light/remove.svg b/data/icons/menu/light/remove.svg
index c5c69f7c..7be56815 100644
--- a/data/icons/menu/light/remove.svg
+++ b/data/icons/menu/light/remove.svg
@@ -1,3 +1,16 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/save-as.png b/data/icons/menu/light/save-as.png
index 69fe5ffa..df2030ee 100644
Binary files a/data/icons/menu/light/save-as.png and b/data/icons/menu/light/save-as.png differ
diff --git a/data/icons/menu/light/save-as.svg b/data/icons/menu/light/save-as.svg
index a0e43f07..7156c953 100644
--- a/data/icons/menu/light/save-as.svg
+++ b/data/icons/menu/light/save-as.svg
@@ -1,6 +1,21 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/save.png b/data/icons/menu/light/save.png
index 70d5d9da..ae762910 100644
Binary files a/data/icons/menu/light/save.png and b/data/icons/menu/light/save.png differ
diff --git a/data/icons/menu/light/save.svg b/data/icons/menu/light/save.svg
index ac089f3a..7b6db96c 100644
--- a/data/icons/menu/light/save.svg
+++ b/data/icons/menu/light/save.svg
@@ -1,5 +1,19 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/search.png b/data/icons/menu/light/search.png
index cb55e883..2f441ac2 100644
Binary files a/data/icons/menu/light/search.png and b/data/icons/menu/light/search.png differ
diff --git a/data/icons/menu/light/search.svg b/data/icons/menu/light/search.svg
index f2aa57d7..df5f3c62 100644
--- a/data/icons/menu/light/search.svg
+++ b/data/icons/menu/light/search.svg
@@ -1,4 +1,17 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/spell-check.png b/data/icons/menu/light/spell-check.png
index 67fc779c..4b23fa16 100644
Binary files a/data/icons/menu/light/spell-check.png and b/data/icons/menu/light/spell-check.png differ
diff --git a/data/icons/menu/light/spell-check.svg b/data/icons/menu/light/spell-check.svg
index af7af94a..1f7e741c 100644
--- a/data/icons/menu/light/spell-check.svg
+++ b/data/icons/menu/light/spell-check.svg
@@ -1,3 +1,16 @@
-
+
\ No newline at end of file
diff --git a/data/icons/menu/light/update.png b/data/icons/menu/light/update.png
index c06163f4..59b40644 100644
Binary files a/data/icons/menu/light/update.png and b/data/icons/menu/light/update.png differ
diff --git a/data/icons/menu/light/update.svg b/data/icons/menu/light/update.svg
index b423fa58..7b811698 100644
--- a/data/icons/menu/light/update.svg
+++ b/data/icons/menu/light/update.svg
@@ -1 +1,14 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/data/icons/tray_fileoffer.png b/data/icons/tray_fileoffer.png
index 5169e255..e9eb871e 100644
Binary files a/data/icons/tray_fileoffer.png and b/data/icons/tray_fileoffer.png differ
diff --git a/data/icons/tray_highlight.png b/data/icons/tray_highlight.png
index ddab32ad..1836d60a 100644
Binary files a/data/icons/tray_highlight.png and b/data/icons/tray_highlight.png differ
diff --git a/data/icons/tray_message.png b/data/icons/tray_message.png
index df634d53..9c6cbe52 100644
Binary files a/data/icons/tray_message.png and b/data/icons/tray_message.png differ
diff --git a/data/icons/tree_channel.png b/data/icons/tree_channel.png
index f6e83254..b4466df6 100644
Binary files a/data/icons/tree_channel.png and b/data/icons/tree_channel.png differ
diff --git a/data/icons/tree_dialog.png b/data/icons/tree_dialog.png
index 9d2d5008..5e913c19 100644
Binary files a/data/icons/tree_dialog.png and b/data/icons/tree_dialog.png differ
diff --git a/data/icons/tree_server.png b/data/icons/tree_server.png
index acddccc9..17f8152d 100644
Binary files a/data/icons/tree_server.png and b/data/icons/tree_server.png differ
diff --git a/data/icons/tree_util.png b/data/icons/tree_util.png
index 9460dfc7..7ea038d9 100644
Binary files a/data/icons/tree_util.png and b/data/icons/tree_util.png differ
diff --git a/data/icons/ulist_founder.png b/data/icons/ulist_founder.png
index 0e30f8d0..a7ec46d2 100644
Binary files a/data/icons/ulist_founder.png and b/data/icons/ulist_founder.png differ
diff --git a/data/icons/ulist_halfop.png b/data/icons/ulist_halfop.png
index ac5a5162..e822c16b 100644
Binary files a/data/icons/ulist_halfop.png and b/data/icons/ulist_halfop.png differ
diff --git a/data/icons/ulist_netop.png b/data/icons/ulist_netop.png
index aba96858..4bf233fc 100644
Binary files a/data/icons/ulist_netop.png and b/data/icons/ulist_netop.png differ
diff --git a/data/icons/ulist_op.png b/data/icons/ulist_op.png
index ef3c04cf..bde6ae5e 100644
Binary files a/data/icons/ulist_op.png and b/data/icons/ulist_op.png differ
diff --git a/data/icons/ulist_owner.png b/data/icons/ulist_owner.png
index e0fe13a6..edfde3b2 100644
Binary files a/data/icons/ulist_owner.png and b/data/icons/ulist_owner.png differ
diff --git a/data/icons/ulist_voice.png b/data/icons/ulist_voice.png
index dbc13ad8..63b48ea4 100644
Binary files a/data/icons/ulist_voice.png and b/data/icons/ulist_voice.png differ
diff --git a/data/zoitechat.gresource.xml b/data/zoitechat.gresource.xml
index d7bdfdf2..954df153 100644
--- a/data/zoitechat.gresource.xml
+++ b/data/zoitechat.gresource.xml
@@ -74,6 +74,10 @@
icons/menu/light/help.svg
icons/menu/light/about.png
icons/menu/light/about.svg
+ icons/menu/light/ok.png
+ icons/menu/light/ok.svg
+ icons/menu/light/cancel.png
+ icons/menu/light/cancel.svg
icons/menu/light/update.png
icons/menu/light/update.svg
icons/menu/light/emoji.png
@@ -131,6 +135,10 @@
icons/menu/dark/help.svg
icons/menu/dark/about.png
icons/menu/dark/about.svg
+ icons/menu/dark/ok.png
+ icons/menu/dark/ok.svg
+ icons/menu/dark/cancel.png
+ icons/menu/dark/cancel.svg
icons/menu/dark/update.png
icons/menu/dark/update.svg
icons/menu/dark/emoji.png
diff --git a/src/fe-gtk/chanview-tabs.c b/src/fe-gtk/chanview-tabs.c
index 3d364ad4..0c526a5f 100644
--- a/src/fe-gtk/chanview-tabs.c
+++ b/src/fe-gtk/chanview-tabs.c
@@ -27,7 +27,7 @@ typedef struct
GtkWidget *b2; /* button2 */
} tabview;
-#define ICON_CHANVIEW_CLOSE "window-close"
+#define ICON_CHANVIEW_CLOSE "gtk-close"
static void chanview_populate (chanview *cv);
diff --git a/src/fe-gtk/icon-resolver.c b/src/fe-gtk/icon-resolver.c
index 1a825752..426961da 100644
--- a/src/fe-gtk/icon-resolver.c
+++ b/src/fe-gtk/icon-resolver.c
@@ -46,6 +46,8 @@ static const IconRegistryEntry icon_registry[] = {
{ ICON_RESOLVER_ROLE_MENU_ACTION, ICON_RESOLVER_MENU_ACTION_NEXT, "zc-menu-next", "go-next", "next" },
{ ICON_RESOLVER_ROLE_MENU_ACTION, ICON_RESOLVER_MENU_ACTION_HELP, "zc-menu-help", "help-browser", "help" },
{ ICON_RESOLVER_ROLE_MENU_ACTION, ICON_RESOLVER_MENU_ACTION_ABOUT, "zc-menu-about", "help-about", "about" },
+ { ICON_RESOLVER_ROLE_MENU_ACTION, ICON_RESOLVER_MENU_ACTION_OK, "zc-menu-ok", "dialog-ok", "ok" },
+ { ICON_RESOLVER_ROLE_MENU_ACTION, ICON_RESOLVER_MENU_ACTION_CANCEL, "zc-menu-cancel", "dialog-cancel", "cancel" },
{ ICON_RESOLVER_ROLE_MENU_ACTION, ICON_RESOLVER_MENU_ACTION_EMOJI, "zc-menu-emoji", "face-smile", "emoji" },
{ ICON_RESOLVER_ROLE_MENU_ACTION, ICON_RESOLVER_MENU_ACTION_UPDATE, "zc-menu-update", "software-update-available", "update" },
{ ICON_RESOLVER_ROLE_MENU_ACTION, ICON_RESOLVER_MENU_ACTION_CHANLIST, "zc-menu-chanlist", "network-workgroup", "chanlist" },
diff --git a/src/fe-gtk/icon-resolver.h b/src/fe-gtk/icon-resolver.h
index fa486b30..7b5729a8 100644
--- a/src/fe-gtk/icon-resolver.h
+++ b/src/fe-gtk/icon-resolver.h
@@ -45,6 +45,8 @@ typedef enum
ICON_RESOLVER_MENU_ACTION_NEXT,
ICON_RESOLVER_MENU_ACTION_HELP,
ICON_RESOLVER_MENU_ACTION_ABOUT,
+ ICON_RESOLVER_MENU_ACTION_OK,
+ ICON_RESOLVER_MENU_ACTION_CANCEL,
ICON_RESOLVER_MENU_ACTION_EMOJI,
ICON_RESOLVER_MENU_ACTION_UPDATE,
ICON_RESOLVER_MENU_ACTION_CHANLIST
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index a5ba248d..8a4fe7c9 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -46,6 +46,7 @@
#include "theme/theme-css.h"
#include "banlist.h"
#include "gtkutil.h"
+#include "icon-resolver.h"
#include "joind.h"
#include "theme/theme-access.h"
#include "theme/theme-palette.h"
@@ -1560,7 +1561,7 @@ mg_open_quit_dialog (gboolean minimize_button)
button = gtk_button_new_with_mnemonic (_("_Cancel"));
gtk_button_set_image (GTK_BUTTON (button),
- gtk_image_new_from_icon_name ("dialog-cancel", GTK_ICON_SIZE_BUTTON));
+ gtkutil_image_new_from_stock ("gtk-cancel", GTK_ICON_SIZE_BUTTON));
gtk_widget_show (button);
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button,
GTK_RESPONSE_CANCEL);
@@ -3261,8 +3262,21 @@ mg_find_available_icon_name (const char *const *icon_names)
for (i = 0; icon_names[i] != NULL; i++)
{
+ int action;
+
if (gtk_icon_theme_has_icon (theme, icon_names[i]))
return icon_names[i];
+
+ if (icon_resolver_menu_action_from_name (icon_names[i], &action))
+ {
+ char *resource_path = icon_resolver_resolve_path (ICON_RESOLVER_ROLE_MENU_ACTION, action, GTK_ICON_SIZE_MENU, "menu", ICON_RESOLVER_THEME_SYSTEM, NULL);
+
+ if (resource_path)
+ {
+ g_free (resource_path);
+ return icon_names[i];
+ }
+ }
}
return NULL;
diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c
index e7a0fb2d..b4f41a4d 100644
--- a/src/fe-gtk/menu.c
+++ b/src/fe-gtk/menu.c
@@ -1533,12 +1533,12 @@ menu_join (GtkWidget * wid, gpointer none)
button = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_REJECT);
if (button)
gtk_button_set_image (GTK_BUTTON (button),
- gtk_image_new_from_icon_name ("dialog-cancel", GTK_ICON_SIZE_BUTTON));
+ gtkutil_image_new_from_stock ("gtk-cancel", GTK_ICON_SIZE_BUTTON));
button = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
if (button)
gtk_button_set_image (GTK_BUTTON (button),
- gtk_image_new_from_icon_name ("dialog-ok", GTK_ICON_SIZE_BUTTON));
+ gtkutil_image_new_from_stock ("gtk-ok", GTK_ICON_SIZE_BUTTON));
}
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_box_set_homogeneous (GTK_BOX (content_area), TRUE);
diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c
index f6d7a84d..855bcbe6 100644
--- a/src/fe-gtk/servlistgui.c
+++ b/src/fe-gtk/servlistgui.c
@@ -43,7 +43,7 @@
#define ICON_SERVLIST_CONNECT "zc-menu-connect"
#define ICON_SERVLIST_ADD "list-add"
#define ICON_SERVLIST_REMOVE "list-remove"
-#define ICON_SERVLIST_CLOSE "window-close"
+#define ICON_SERVLIST_CLOSE "gtk-close"
#define ICON_SERVLIST_ERROR "dialog-error"
#ifdef USE_OPENSSL
@@ -106,7 +106,7 @@ servlist_icon_button_new (const char *label, const char *icon_name)
GtkWidget *image;
button = gtk_button_new_with_mnemonic (label);
- image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+ image = gtkutil_image_new_from_stock (icon_name, GTK_ICON_SIZE_BUTTON);
gtk_button_set_image (GTK_BUTTON (button), image);
gtk_button_set_always_show_image (GTK_BUTTON (button), TRUE);