diff --git a/data/icons/menu/dark/about.png b/data/icons/menu/dark/about.png
deleted file mode 100644
index 89f0d1ba..00000000
Binary files a/data/icons/menu/dark/about.png and /dev/null differ
diff --git a/data/icons/menu/dark/about.svg b/data/icons/menu/dark/about.svg
deleted file mode 100644
index 74317abd..00000000
--- a/data/icons/menu/dark/about.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/add.png b/data/icons/menu/dark/add.png
deleted file mode 100644
index 7ea9e401..00000000
Binary files a/data/icons/menu/dark/add.png and /dev/null differ
diff --git a/data/icons/menu/dark/add.svg b/data/icons/menu/dark/add.svg
deleted file mode 100644
index e3f608a6..00000000
--- a/data/icons/menu/dark/add.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/cancel.png b/data/icons/menu/dark/cancel.png
deleted file mode 100644
index 9f851195..00000000
Binary files a/data/icons/menu/dark/cancel.png and /dev/null differ
diff --git a/data/icons/menu/dark/cancel.svg b/data/icons/menu/dark/cancel.svg
deleted file mode 100644
index d38e65ea..00000000
--- a/data/icons/menu/dark/cancel.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/chanlist.png b/data/icons/menu/dark/chanlist.png
deleted file mode 100644
index 2a20a15f..00000000
Binary files a/data/icons/menu/dark/chanlist.png and /dev/null differ
diff --git a/data/icons/menu/dark/chanlist.svg b/data/icons/menu/dark/chanlist.svg
deleted file mode 100644
index 821308da..00000000
--- a/data/icons/menu/dark/chanlist.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/clear.png b/data/icons/menu/dark/clear.png
deleted file mode 100644
index 845dc379..00000000
Binary files a/data/icons/menu/dark/clear.png and /dev/null differ
diff --git a/data/icons/menu/dark/clear.svg b/data/icons/menu/dark/clear.svg
deleted file mode 100644
index 7f9e8a25..00000000
--- a/data/icons/menu/dark/clear.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/close.png b/data/icons/menu/dark/close.png
deleted file mode 100644
index 9fd36cc5..00000000
Binary files a/data/icons/menu/dark/close.png and /dev/null differ
diff --git a/data/icons/menu/dark/close.svg b/data/icons/menu/dark/close.svg
deleted file mode 100644
index 127c7150..00000000
--- a/data/icons/menu/dark/close.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/connect.png b/data/icons/menu/dark/connect.png
deleted file mode 100644
index 3fc530ea..00000000
Binary files a/data/icons/menu/dark/connect.png and /dev/null differ
diff --git a/data/icons/menu/dark/connect.svg b/data/icons/menu/dark/connect.svg
deleted file mode 100644
index 245bf03c..00000000
--- a/data/icons/menu/dark/connect.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/copy.png b/data/icons/menu/dark/copy.png
deleted file mode 100644
index cfe7e8b1..00000000
Binary files a/data/icons/menu/dark/copy.png and /dev/null differ
diff --git a/data/icons/menu/dark/copy.svg b/data/icons/menu/dark/copy.svg
deleted file mode 100644
index f19cce92..00000000
--- a/data/icons/menu/dark/copy.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/delete.png b/data/icons/menu/dark/delete.png
deleted file mode 100644
index 7b685701..00000000
Binary files a/data/icons/menu/dark/delete.png and /dev/null differ
diff --git a/data/icons/menu/dark/delete.svg b/data/icons/menu/dark/delete.svg
deleted file mode 100644
index f122a6de..00000000
--- a/data/icons/menu/dark/delete.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/detach.png b/data/icons/menu/dark/detach.png
deleted file mode 100644
index 82514205..00000000
Binary files a/data/icons/menu/dark/detach.png and /dev/null differ
diff --git a/data/icons/menu/dark/detach.svg b/data/icons/menu/dark/detach.svg
deleted file mode 100644
index 0d4c9371..00000000
--- a/data/icons/menu/dark/detach.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/disconnect.png b/data/icons/menu/dark/disconnect.png
deleted file mode 100644
index 393bf629..00000000
Binary files a/data/icons/menu/dark/disconnect.png and /dev/null differ
diff --git a/data/icons/menu/dark/disconnect.svg b/data/icons/menu/dark/disconnect.svg
deleted file mode 100644
index 5e92afbd..00000000
--- a/data/icons/menu/dark/disconnect.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/emoji.png b/data/icons/menu/dark/emoji.png
deleted file mode 100644
index b2b9dc78..00000000
Binary files a/data/icons/menu/dark/emoji.png and /dev/null differ
diff --git a/data/icons/menu/dark/emoji.svg b/data/icons/menu/dark/emoji.svg
deleted file mode 100644
index e82f1021..00000000
--- a/data/icons/menu/dark/emoji.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/find.png b/data/icons/menu/dark/find.png
deleted file mode 100644
index 8e0a9755..00000000
Binary files a/data/icons/menu/dark/find.png and /dev/null differ
diff --git a/data/icons/menu/dark/find.svg b/data/icons/menu/dark/find.svg
deleted file mode 100644
index 13efff81..00000000
--- a/data/icons/menu/dark/find.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/help.png b/data/icons/menu/dark/help.png
deleted file mode 100644
index bf5f833a..00000000
Binary files a/data/icons/menu/dark/help.png and /dev/null differ
diff --git a/data/icons/menu/dark/help.svg b/data/icons/menu/dark/help.svg
deleted file mode 100644
index e78a4a24..00000000
--- a/data/icons/menu/dark/help.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/join.png b/data/icons/menu/dark/join.png
deleted file mode 100644
index 6d42e827..00000000
Binary files a/data/icons/menu/dark/join.png and /dev/null differ
diff --git a/data/icons/menu/dark/join.svg b/data/icons/menu/dark/join.svg
deleted file mode 100644
index 02765b5f..00000000
--- a/data/icons/menu/dark/join.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/load-plugin.png b/data/icons/menu/dark/load-plugin.png
deleted file mode 100644
index 10148fe7..00000000
Binary files a/data/icons/menu/dark/load-plugin.png and /dev/null differ
diff --git a/data/icons/menu/dark/load-plugin.svg b/data/icons/menu/dark/load-plugin.svg
deleted file mode 100644
index 3a42eb86..00000000
--- a/data/icons/menu/dark/load-plugin.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/network-list.png b/data/icons/menu/dark/network-list.png
deleted file mode 100644
index 2a20a15f..00000000
Binary files a/data/icons/menu/dark/network-list.png and /dev/null differ
diff --git a/data/icons/menu/dark/network-list.svg b/data/icons/menu/dark/network-list.svg
deleted file mode 100644
index 821308da..00000000
--- a/data/icons/menu/dark/network-list.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/new.png b/data/icons/menu/dark/new.png
deleted file mode 100644
index eb32e465..00000000
Binary files a/data/icons/menu/dark/new.png and /dev/null differ
diff --git a/data/icons/menu/dark/new.svg b/data/icons/menu/dark/new.svg
deleted file mode 100644
index 20371d7a..00000000
--- a/data/icons/menu/dark/new.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/next.png b/data/icons/menu/dark/next.png
deleted file mode 100644
index 991b7c6f..00000000
Binary files a/data/icons/menu/dark/next.png and /dev/null differ
diff --git a/data/icons/menu/dark/next.svg b/data/icons/menu/dark/next.svg
deleted file mode 100644
index 05fa9576..00000000
--- a/data/icons/menu/dark/next.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/ok.png b/data/icons/menu/dark/ok.png
deleted file mode 100644
index b22df7ed..00000000
Binary files a/data/icons/menu/dark/ok.png and /dev/null differ
diff --git a/data/icons/menu/dark/ok.svg b/data/icons/menu/dark/ok.svg
deleted file mode 100644
index ff9c330c..00000000
--- a/data/icons/menu/dark/ok.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/preferences.png b/data/icons/menu/dark/preferences.png
deleted file mode 100644
index 3198eb74..00000000
Binary files a/data/icons/menu/dark/preferences.png and /dev/null differ
diff --git a/data/icons/menu/dark/preferences.svg b/data/icons/menu/dark/preferences.svg
deleted file mode 100644
index b99bafab..00000000
--- a/data/icons/menu/dark/preferences.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/previous.png b/data/icons/menu/dark/previous.png
deleted file mode 100644
index 7f47343e..00000000
Binary files a/data/icons/menu/dark/previous.png and /dev/null differ
diff --git a/data/icons/menu/dark/previous.svg b/data/icons/menu/dark/previous.svg
deleted file mode 100644
index 8027c6ab..00000000
--- a/data/icons/menu/dark/previous.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/quit.png b/data/icons/menu/dark/quit.png
deleted file mode 100644
index 67197cbf..00000000
Binary files a/data/icons/menu/dark/quit.png and /dev/null differ
diff --git a/data/icons/menu/dark/quit.svg b/data/icons/menu/dark/quit.svg
deleted file mode 100644
index 438cb6b0..00000000
--- a/data/icons/menu/dark/quit.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/refresh.png b/data/icons/menu/dark/refresh.png
deleted file mode 100644
index f74286f2..00000000
Binary files a/data/icons/menu/dark/refresh.png and /dev/null differ
diff --git a/data/icons/menu/dark/refresh.svg b/data/icons/menu/dark/refresh.svg
deleted file mode 100644
index f549f1b5..00000000
--- a/data/icons/menu/dark/refresh.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/remove.png b/data/icons/menu/dark/remove.png
deleted file mode 100644
index e0b2c67d..00000000
Binary files a/data/icons/menu/dark/remove.png and /dev/null differ
diff --git a/data/icons/menu/dark/remove.svg b/data/icons/menu/dark/remove.svg
deleted file mode 100644
index 7be56815..00000000
--- a/data/icons/menu/dark/remove.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/save-as.png b/data/icons/menu/dark/save-as.png
deleted file mode 100644
index df2030ee..00000000
Binary files a/data/icons/menu/dark/save-as.png and /dev/null differ
diff --git a/data/icons/menu/dark/save-as.svg b/data/icons/menu/dark/save-as.svg
deleted file mode 100644
index 7156c953..00000000
--- a/data/icons/menu/dark/save-as.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/save.png b/data/icons/menu/dark/save.png
deleted file mode 100644
index ae762910..00000000
Binary files a/data/icons/menu/dark/save.png and /dev/null differ
diff --git a/data/icons/menu/dark/save.svg b/data/icons/menu/dark/save.svg
deleted file mode 100644
index 7b6db96c..00000000
--- a/data/icons/menu/dark/save.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/search.png b/data/icons/menu/dark/search.png
deleted file mode 100644
index 2f441ac2..00000000
Binary files a/data/icons/menu/dark/search.png and /dev/null differ
diff --git a/data/icons/menu/dark/search.svg b/data/icons/menu/dark/search.svg
deleted file mode 100644
index df5f3c62..00000000
--- a/data/icons/menu/dark/search.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/spell-check.png b/data/icons/menu/dark/spell-check.png
deleted file mode 100644
index 4b23fa16..00000000
Binary files a/data/icons/menu/dark/spell-check.png and /dev/null differ
diff --git a/data/icons/menu/dark/spell-check.svg b/data/icons/menu/dark/spell-check.svg
deleted file mode 100644
index 1f7e741c..00000000
--- a/data/icons/menu/dark/spell-check.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/dark/update.png b/data/icons/menu/dark/update.png
deleted file mode 100644
index 59b40644..00000000
Binary files a/data/icons/menu/dark/update.png and /dev/null differ
diff --git a/data/icons/menu/dark/update.svg b/data/icons/menu/dark/update.svg
deleted file mode 100644
index 7b811698..00000000
--- a/data/icons/menu/dark/update.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/about.png b/data/icons/menu/light/about.png
deleted file mode 100644
index 89f0d1ba..00000000
Binary files a/data/icons/menu/light/about.png and /dev/null differ
diff --git a/data/icons/menu/light/about.svg b/data/icons/menu/light/about.svg
deleted file mode 100644
index 74317abd..00000000
--- a/data/icons/menu/light/about.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/add.png b/data/icons/menu/light/add.png
deleted file mode 100644
index 7ea9e401..00000000
Binary files a/data/icons/menu/light/add.png and /dev/null differ
diff --git a/data/icons/menu/light/add.svg b/data/icons/menu/light/add.svg
deleted file mode 100644
index e3f608a6..00000000
--- a/data/icons/menu/light/add.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/cancel.png b/data/icons/menu/light/cancel.png
deleted file mode 100644
index 4583575c..00000000
Binary files a/data/icons/menu/light/cancel.png and /dev/null differ
diff --git a/data/icons/menu/light/cancel.svg b/data/icons/menu/light/cancel.svg
deleted file mode 100644
index a58fb86e..00000000
--- a/data/icons/menu/light/cancel.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/chanlist.png b/data/icons/menu/light/chanlist.png
deleted file mode 100644
index 2a20a15f..00000000
Binary files a/data/icons/menu/light/chanlist.png and /dev/null differ
diff --git a/data/icons/menu/light/chanlist.svg b/data/icons/menu/light/chanlist.svg
deleted file mode 100644
index 821308da..00000000
--- a/data/icons/menu/light/chanlist.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/clear.png b/data/icons/menu/light/clear.png
deleted file mode 100644
index 845dc379..00000000
Binary files a/data/icons/menu/light/clear.png and /dev/null differ
diff --git a/data/icons/menu/light/clear.svg b/data/icons/menu/light/clear.svg
deleted file mode 100644
index 7f9e8a25..00000000
--- a/data/icons/menu/light/clear.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/close.png b/data/icons/menu/light/close.png
deleted file mode 100644
index 9fd36cc5..00000000
Binary files a/data/icons/menu/light/close.png and /dev/null differ
diff --git a/data/icons/menu/light/close.svg b/data/icons/menu/light/close.svg
deleted file mode 100644
index 127c7150..00000000
--- a/data/icons/menu/light/close.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/connect.png b/data/icons/menu/light/connect.png
deleted file mode 100644
index 3fc530ea..00000000
Binary files a/data/icons/menu/light/connect.png and /dev/null differ
diff --git a/data/icons/menu/light/connect.svg b/data/icons/menu/light/connect.svg
deleted file mode 100644
index 245bf03c..00000000
--- a/data/icons/menu/light/connect.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/copy.png b/data/icons/menu/light/copy.png
deleted file mode 100644
index cfe7e8b1..00000000
Binary files a/data/icons/menu/light/copy.png and /dev/null differ
diff --git a/data/icons/menu/light/copy.svg b/data/icons/menu/light/copy.svg
deleted file mode 100644
index f19cce92..00000000
--- a/data/icons/menu/light/copy.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/delete.png b/data/icons/menu/light/delete.png
deleted file mode 100644
index 7b685701..00000000
Binary files a/data/icons/menu/light/delete.png and /dev/null differ
diff --git a/data/icons/menu/light/delete.svg b/data/icons/menu/light/delete.svg
deleted file mode 100644
index f122a6de..00000000
--- a/data/icons/menu/light/delete.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/detach.png b/data/icons/menu/light/detach.png
deleted file mode 100644
index 82514205..00000000
Binary files a/data/icons/menu/light/detach.png and /dev/null differ
diff --git a/data/icons/menu/light/detach.svg b/data/icons/menu/light/detach.svg
deleted file mode 100644
index 0d4c9371..00000000
--- a/data/icons/menu/light/detach.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/disconnect.png b/data/icons/menu/light/disconnect.png
deleted file mode 100644
index 393bf629..00000000
Binary files a/data/icons/menu/light/disconnect.png and /dev/null differ
diff --git a/data/icons/menu/light/disconnect.svg b/data/icons/menu/light/disconnect.svg
deleted file mode 100644
index 5e92afbd..00000000
--- a/data/icons/menu/light/disconnect.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/emoji.png b/data/icons/menu/light/emoji.png
deleted file mode 100644
index b2b9dc78..00000000
Binary files a/data/icons/menu/light/emoji.png and /dev/null differ
diff --git a/data/icons/menu/light/emoji.svg b/data/icons/menu/light/emoji.svg
deleted file mode 100644
index e82f1021..00000000
--- a/data/icons/menu/light/emoji.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/find.png b/data/icons/menu/light/find.png
deleted file mode 100644
index 8e0a9755..00000000
Binary files a/data/icons/menu/light/find.png and /dev/null differ
diff --git a/data/icons/menu/light/find.svg b/data/icons/menu/light/find.svg
deleted file mode 100644
index 13efff81..00000000
--- a/data/icons/menu/light/find.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/help.png b/data/icons/menu/light/help.png
deleted file mode 100644
index bf5f833a..00000000
Binary files a/data/icons/menu/light/help.png and /dev/null differ
diff --git a/data/icons/menu/light/help.svg b/data/icons/menu/light/help.svg
deleted file mode 100644
index e78a4a24..00000000
--- a/data/icons/menu/light/help.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/join.png b/data/icons/menu/light/join.png
deleted file mode 100644
index 6d42e827..00000000
Binary files a/data/icons/menu/light/join.png and /dev/null differ
diff --git a/data/icons/menu/light/join.svg b/data/icons/menu/light/join.svg
deleted file mode 100644
index 02765b5f..00000000
--- a/data/icons/menu/light/join.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/load-plugin.png b/data/icons/menu/light/load-plugin.png
deleted file mode 100644
index 10148fe7..00000000
Binary files a/data/icons/menu/light/load-plugin.png and /dev/null differ
diff --git a/data/icons/menu/light/load-plugin.svg b/data/icons/menu/light/load-plugin.svg
deleted file mode 100644
index 3a42eb86..00000000
--- a/data/icons/menu/light/load-plugin.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/network-list.png b/data/icons/menu/light/network-list.png
deleted file mode 100644
index 2a20a15f..00000000
Binary files a/data/icons/menu/light/network-list.png and /dev/null differ
diff --git a/data/icons/menu/light/network-list.svg b/data/icons/menu/light/network-list.svg
deleted file mode 100644
index 821308da..00000000
--- a/data/icons/menu/light/network-list.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/new.png b/data/icons/menu/light/new.png
deleted file mode 100644
index eb32e465..00000000
Binary files a/data/icons/menu/light/new.png and /dev/null differ
diff --git a/data/icons/menu/light/new.svg b/data/icons/menu/light/new.svg
deleted file mode 100644
index 20371d7a..00000000
--- a/data/icons/menu/light/new.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/next.png b/data/icons/menu/light/next.png
deleted file mode 100644
index 991b7c6f..00000000
Binary files a/data/icons/menu/light/next.png and /dev/null differ
diff --git a/data/icons/menu/light/next.svg b/data/icons/menu/light/next.svg
deleted file mode 100644
index 05fa9576..00000000
--- a/data/icons/menu/light/next.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/ok.png b/data/icons/menu/light/ok.png
deleted file mode 100644
index 264939da..00000000
Binary files a/data/icons/menu/light/ok.png and /dev/null differ
diff --git a/data/icons/menu/light/ok.svg b/data/icons/menu/light/ok.svg
deleted file mode 100644
index 472a2cc5..00000000
--- a/data/icons/menu/light/ok.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/preferences.png b/data/icons/menu/light/preferences.png
deleted file mode 100644
index 3198eb74..00000000
Binary files a/data/icons/menu/light/preferences.png and /dev/null differ
diff --git a/data/icons/menu/light/preferences.svg b/data/icons/menu/light/preferences.svg
deleted file mode 100644
index b99bafab..00000000
--- a/data/icons/menu/light/preferences.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/previous.png b/data/icons/menu/light/previous.png
deleted file mode 100644
index 7f47343e..00000000
Binary files a/data/icons/menu/light/previous.png and /dev/null differ
diff --git a/data/icons/menu/light/previous.svg b/data/icons/menu/light/previous.svg
deleted file mode 100644
index 8027c6ab..00000000
--- a/data/icons/menu/light/previous.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/quit.png b/data/icons/menu/light/quit.png
deleted file mode 100644
index 67197cbf..00000000
Binary files a/data/icons/menu/light/quit.png and /dev/null differ
diff --git a/data/icons/menu/light/quit.svg b/data/icons/menu/light/quit.svg
deleted file mode 100644
index 438cb6b0..00000000
--- a/data/icons/menu/light/quit.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/refresh.png b/data/icons/menu/light/refresh.png
deleted file mode 100644
index f74286f2..00000000
Binary files a/data/icons/menu/light/refresh.png and /dev/null differ
diff --git a/data/icons/menu/light/refresh.svg b/data/icons/menu/light/refresh.svg
deleted file mode 100644
index f549f1b5..00000000
--- a/data/icons/menu/light/refresh.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/remove.png b/data/icons/menu/light/remove.png
deleted file mode 100644
index e0b2c67d..00000000
Binary files a/data/icons/menu/light/remove.png and /dev/null differ
diff --git a/data/icons/menu/light/remove.svg b/data/icons/menu/light/remove.svg
deleted file mode 100644
index 7be56815..00000000
--- a/data/icons/menu/light/remove.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/save-as.png b/data/icons/menu/light/save-as.png
deleted file mode 100644
index df2030ee..00000000
Binary files a/data/icons/menu/light/save-as.png and /dev/null differ
diff --git a/data/icons/menu/light/save-as.svg b/data/icons/menu/light/save-as.svg
deleted file mode 100644
index 7156c953..00000000
--- a/data/icons/menu/light/save-as.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/save.png b/data/icons/menu/light/save.png
deleted file mode 100644
index ae762910..00000000
Binary files a/data/icons/menu/light/save.png and /dev/null differ
diff --git a/data/icons/menu/light/save.svg b/data/icons/menu/light/save.svg
deleted file mode 100644
index 7b6db96c..00000000
--- a/data/icons/menu/light/save.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/search.png b/data/icons/menu/light/search.png
deleted file mode 100644
index 2f441ac2..00000000
Binary files a/data/icons/menu/light/search.png and /dev/null differ
diff --git a/data/icons/menu/light/search.svg b/data/icons/menu/light/search.svg
deleted file mode 100644
index df5f3c62..00000000
--- a/data/icons/menu/light/search.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/spell-check.png b/data/icons/menu/light/spell-check.png
deleted file mode 100644
index 4b23fa16..00000000
Binary files a/data/icons/menu/light/spell-check.png and /dev/null differ
diff --git a/data/icons/menu/light/spell-check.svg b/data/icons/menu/light/spell-check.svg
deleted file mode 100644
index 1f7e741c..00000000
--- a/data/icons/menu/light/spell-check.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
\ No newline at end of file
diff --git a/data/icons/menu/light/update.png b/data/icons/menu/light/update.png
deleted file mode 100644
index 59b40644..00000000
Binary files a/data/icons/menu/light/update.png and /dev/null differ
diff --git a/data/icons/menu/light/update.svg b/data/icons/menu/light/update.svg
deleted file mode 100644
index 7b811698..00000000
--- a/data/icons/menu/light/update.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
\ No newline at end of file
diff --git a/data/zoitechat.gresource.xml b/data/zoitechat.gresource.xml
index 954df153..c8ac5fe9 100644
--- a/data/zoitechat.gresource.xml
+++ b/data/zoitechat.gresource.xml
@@ -22,126 +22,6 @@
icons/tree_server.png
icons/tree_util.png
- icons/menu/light/new.png
- icons/menu/light/new.svg
- icons/menu/light/network-list.png
- icons/menu/light/network-list.svg
- icons/menu/light/load-plugin.png
- icons/menu/light/load-plugin.svg
- icons/menu/light/detach.png
- icons/menu/light/detach.svg
- icons/menu/light/close.png
- icons/menu/light/close.svg
- icons/menu/light/quit.png
- icons/menu/light/quit.svg
- icons/menu/light/disconnect.png
- icons/menu/light/disconnect.svg
- icons/menu/light/connect.png
- icons/menu/light/connect.svg
- icons/menu/light/join.png
- icons/menu/light/join.svg
- icons/menu/light/chanlist.png
- icons/menu/light/chanlist.svg
- icons/menu/light/preferences.png
- icons/menu/light/preferences.svg
- icons/menu/light/clear.png
- icons/menu/light/clear.svg
- icons/menu/light/copy.png
- icons/menu/light/copy.svg
- icons/menu/light/delete.png
- icons/menu/light/delete.svg
- icons/menu/light/add.png
- icons/menu/light/add.svg
- icons/menu/light/remove.png
- icons/menu/light/remove.svg
- icons/menu/light/spell-check.png
- icons/menu/light/spell-check.svg
- icons/menu/light/save.png
- icons/menu/light/save.svg
- icons/menu/light/save-as.png
- icons/menu/light/save-as.svg
- icons/menu/light/refresh.png
- icons/menu/light/refresh.svg
- icons/menu/light/search.png
- icons/menu/light/search.svg
- icons/menu/light/find.png
- icons/menu/light/find.svg
- icons/menu/light/previous.png
- icons/menu/light/previous.svg
- icons/menu/light/next.png
- icons/menu/light/next.svg
- icons/menu/light/help.png
- 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
- icons/menu/light/emoji.svg
- icons/menu/dark/new.png
- icons/menu/dark/new.svg
- icons/menu/dark/network-list.png
- icons/menu/dark/network-list.svg
- icons/menu/dark/load-plugin.png
- icons/menu/dark/load-plugin.svg
- icons/menu/dark/detach.png
- icons/menu/dark/detach.svg
- icons/menu/dark/close.png
- icons/menu/dark/close.svg
- icons/menu/dark/quit.png
- icons/menu/dark/quit.svg
- icons/menu/dark/disconnect.png
- icons/menu/dark/disconnect.svg
- icons/menu/dark/connect.png
- icons/menu/dark/connect.svg
- icons/menu/dark/join.png
- icons/menu/dark/join.svg
- icons/menu/dark/chanlist.png
- icons/menu/dark/chanlist.svg
- icons/menu/dark/preferences.png
- icons/menu/dark/preferences.svg
- icons/menu/dark/clear.png
- icons/menu/dark/clear.svg
- icons/menu/dark/copy.png
- icons/menu/dark/copy.svg
- icons/menu/dark/delete.png
- icons/menu/dark/delete.svg
- icons/menu/dark/add.png
- icons/menu/dark/add.svg
- icons/menu/dark/remove.png
- icons/menu/dark/remove.svg
- icons/menu/dark/spell-check.png
- icons/menu/dark/spell-check.svg
- icons/menu/dark/save.png
- icons/menu/dark/save.svg
- icons/menu/dark/save-as.png
- icons/menu/dark/save-as.svg
- icons/menu/dark/refresh.png
- icons/menu/dark/refresh.svg
- icons/menu/dark/search.png
- icons/menu/dark/search.svg
- icons/menu/dark/find.png
- icons/menu/dark/find.svg
- icons/menu/dark/previous.png
- icons/menu/dark/previous.svg
- icons/menu/dark/next.png
- icons/menu/dark/next.svg
- icons/menu/dark/help.png
- 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
- icons/menu/dark/emoji.svg
diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c
index 7e416db8..650e5a27 100644
--- a/src/fe-gtk/gtkutil.c
+++ b/src/fe-gtk/gtkutil.c
@@ -148,16 +148,7 @@ gtkutil_button_new_from_stock (const char *stock, const char *label)
{
GtkWidget *button = label ? gtk_button_new_with_mnemonic (label) : gtk_button_new ();
- if (stock)
- {
- GtkWidget *image = gtkutil_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON);
-
- if (image)
- {
- gtk_button_set_image (GTK_BUTTON (button), image);
- gtk_button_set_always_show_image (GTK_BUTTON (button), TRUE);
- }
- }
+ (void)stock;
return button;
}
@@ -873,21 +864,14 @@ GtkWidget *
gtkutil_button (GtkWidget *box, char *stock, char *tip, void *callback,
void *userdata, char *labeltext)
{
- GtkWidget *wid, *img, *bbox;
+ GtkWidget *wid, *bbox;
+ (void)stock;
wid = gtk_button_new ();
if (labeltext)
{
gtk_button_set_label (GTK_BUTTON (wid), labeltext);
- img = NULL;
- if (stock)
- img = gtkutil_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON);
- if (img)
- {
- gtk_button_set_image (GTK_BUTTON (wid), img);
- gtk_button_set_always_show_image (GTK_BUTTON (wid), TRUE);
- }
gtk_button_set_use_underline (GTK_BUTTON (wid), TRUE);
if (box)
gtk_container_add (GTK_CONTAINER (box), wid);
@@ -897,16 +881,6 @@ gtkutil_button (GtkWidget *box, char *stock, char *tip, void *callback,
bbox = gtkutil_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE, 0);
gtk_container_add (GTK_CONTAINER (wid), bbox);
gtk_widget_show (bbox);
-
- img = NULL;
- if (stock)
- img = gtkutil_image_new_from_stock (stock, GTK_ICON_SIZE_BUTTON);
- if (img)
- {
- gtk_container_add (GTK_CONTAINER (bbox), img);
- gtk_widget_show (img);
- gtk_button_set_always_show_image (GTK_BUTTON (wid), TRUE);
- }
gtk_box_pack_start (GTK_BOX (box), wid, 0, 0, 0);
}
diff --git a/src/fe-gtk/icon-resolver.c b/src/fe-gtk/icon-resolver.c
index 426961da..86c83a53 100644
--- a/src/fe-gtk/icon-resolver.c
+++ b/src/fe-gtk/icon-resolver.c
@@ -297,25 +297,10 @@ resolve_bundled_variant (const IconRegistryEntry *entry, IconResolverThemeVarian
const char *variant_name = variant == ICON_RESOLVER_THEME_DARK ? "dark" : "light";
char *path;
- if (entry->role == ICON_RESOLVER_ROLE_MENU_ACTION)
- {
- path = g_strdup_printf ("/icons/menu/%s/%s.png", variant_name, entry->resource_name);
- if (resource_exists (path))
- return path;
- g_free (path);
-
- path = g_strdup_printf ("/icons/menu/%s/%s.svg", variant_name, entry->resource_name);
- if (resource_exists (path))
- return path;
- g_free (path);
- }
- else
- {
- path = g_strdup_printf ("/icons/%s-%s.png", entry->resource_name, variant_name);
- if (resource_exists (path))
- return path;
- g_free (path);
- }
+ path = g_strdup_printf ("/icons/%s-%s.png", entry->resource_name, variant_name);
+ if (resource_exists (path))
+ return path;
+ g_free (path);
return NULL;
}
@@ -325,25 +310,10 @@ resolve_bundled_neutral (const IconRegistryEntry *entry)
{
char *path;
- if (entry->role == ICON_RESOLVER_ROLE_MENU_ACTION)
- {
- path = g_strdup_printf ("/icons/menu/light/%s.png", entry->resource_name);
- if (resource_exists (path))
- return path;
- g_free (path);
-
- path = g_strdup_printf ("/icons/menu/light/%s.svg", entry->resource_name);
- if (resource_exists (path))
- return path;
- g_free (path);
- }
- else
- {
- path = g_strdup_printf ("/icons/%s.png", entry->resource_name);
- if (resource_exists (path))
- return path;
- g_free (path);
- }
+ path = g_strdup_printf ("/icons/%s.png", entry->resource_name);
+ if (resource_exists (path))
+ return path;
+ g_free (path);
return NULL;
}
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index 207f8629..5cc50b6c 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -1772,16 +1772,12 @@ mg_open_quit_dialog (gboolean minimize_button)
}
button = gtk_button_new_with_mnemonic (_("_Cancel"));
- gtk_button_set_image (GTK_BUTTON (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);
gtk_widget_grab_focus (button);
button = gtk_button_new_with_mnemonic (_("_Quit"));
- gtk_button_set_image (GTK_BUTTON (button),
- gtk_image_new_from_icon_name ("application-exit", GTK_ICON_SIZE_BUTTON));
gtk_widget_show (button);
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, 0);
diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c
index 5baed6da..e69ddec7 100644
--- a/src/fe-gtk/menu.c
+++ b/src/fe-gtk/menu.c
@@ -66,28 +66,6 @@
static GSList *submenu_list;
-static gboolean
-menu_icon_exists_in_resource (const char *icon_name)
-{
- char *resource_path;
- gboolean found;
-
- if (!icon_name || !g_str_has_prefix (icon_name, "zc-menu-"))
- return FALSE;
-
- resource_path = g_strdup_printf ("/icons/menu/light/%s.png", icon_name + strlen ("zc-menu-"));
- found = g_resources_get_info (resource_path, G_RESOURCE_LOOKUP_FLAGS_NONE, NULL, NULL, NULL);
- if (!found)
- {
- g_free (resource_path);
- resource_path = g_strdup_printf ("/icons/menu/light/%s.svg", icon_name + strlen ("zc-menu-"));
- found = g_resources_get_info (resource_path, G_RESOURCE_LOOKUP_FLAGS_NONE, NULL, NULL, NULL);
- }
- g_free (resource_path);
-
- return found;
-}
-
static GtkWidget *
menu_icon_widget_new (const char *icon)
{
@@ -111,14 +89,7 @@ menu_icon_widget_new (const char *icon)
}
else
{
- char *menu_icon_name = g_strdup_printf ("zc-menu-%s", icon);
-
- if (menu_icon_exists_in_resource (menu_icon_name))
- img = gtkutil_image_new_from_stock (menu_icon_name, GTK_ICON_SIZE_MENU);
- else
- img = gtkutil_image_new_from_stock (icon, GTK_ICON_SIZE_MENU);
-
- g_free (menu_icon_name);
+ img = gtkutil_image_new_from_stock (icon, GTK_ICON_SIZE_MENU);
}
g_free (path);
@@ -1541,24 +1512,6 @@ menu_join (GtkWidget * wid, gpointer none)
_("_OK"), GTK_RESPONSE_ACCEPT,
NULL);
theme_manager_attach_window (dialog);
- {
- GtkWidget *button;
-
- button = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_HELP);
- if (button)
- gtk_button_set_image (GTK_BUTTON (button),
- gtk_image_new_from_icon_name ("help-browser", GTK_ICON_SIZE_BUTTON));
-
- button = gtk_dialog_get_widget_for_response (GTK_DIALOG (dialog), GTK_RESPONSE_REJECT);
- if (button)
- gtk_button_set_image (GTK_BUTTON (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),
- 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);
gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c
index 8cf97ca2..67e4aca2 100644
--- a/src/fe-gtk/servlistgui.c
+++ b/src/fe-gtk/servlistgui.c
@@ -382,12 +382,9 @@ static GtkWidget *
servlist_icon_button_new (const char *label, const char *icon_name)
{
GtkWidget *button;
- GtkWidget *image;
+ (void)icon_name;
button = gtk_button_new_with_mnemonic (label);
- 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);
return button;
}