accessx-status: Simplify icons installation

148 files changed, 165 insertions, 194 deletions

diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index 013ff92bc..f19fcb5e1 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-SUBDIRS = docs pixmaps
+SUBDIRS = docs icons
 
 AM_CPPFLAGS = \
 	${WARN_CFLAGS} \
diff --git a/accessx-status/pixmaps/16x16/mate-ax-bouncekeys.png b/accessx-status/icons/16x16/apps/mate-ax-bouncekeys.png
index 6172c482c..6172c482c 100644
--- a/accessx-status/pixmaps/16x16/mate-ax-bouncekeys.png
+++ b/accessx-status/icons/16x16/apps/mate-ax-bouncekeys.png
diff --git a/accessx-status/pixmaps/16x16/mate-ax-key-base.png b/accessx-status/icons/16x16/apps/mate-ax-key-base.png
index 405d4548c..405d4548c 100644
--- a/accessx-status/pixmaps/16x16/mate-ax-key-base.png
+++ b/accessx-status/icons/16x16/apps/mate-ax-key-base.png
diff --git a/accessx-status/pixmaps/16x16/mate-ax-key-inverse.png b/accessx-status/icons/16x16/apps/mate-ax-key-inverse.png
index 7af0b7928..7af0b7928 100644
--- a/accessx-status/pixmaps/16x16/mate-ax-key-inverse.png
+++ b/accessx-status/icons/16x16/apps/mate-ax-key-inverse.png
diff --git a/accessx-status/pixmaps/16x16/mate-ax-key-no.png b/accessx-status/icons/16x16/apps/mate-ax-key-no.png
index 740dae0f5..740dae0f5 100644
--- a/accessx-status/pixmaps/16x16/mate-ax-key-no.png
+++ b/accessx-status/icons/16x16/apps/mate-ax-key-no.png
diff --git a/accessx-status/pixmaps/16x16/mate-ax-key-none.png b/accessx-status/icons/16x16/apps/mate-ax-key-none.png
index df6aae64e..df6aae64e 100644
--- a/accessx-status/pixmaps/16x16/mate-ax-key-none.png
+++ b/accessx-status/icons/16x16/apps/mate-ax-key-none.png
diff --git a/accessx-status/pixmaps/16x16/mate-ax-key-yes.png b/accessx-status/icons/16x16/apps/mate-ax-key-yes.png
index b305e4901..b305e4901 100644
--- a/accessx-status/pixmaps/16x16/mate-ax-key-yes.png
+++ b/accessx-status/icons/16x16/apps/mate-ax-key-yes.png
diff --git a/accessx-status/pixmaps/16x16/mate-ax-slowkeys-no.png b/accessx-status/icons/16x16/apps/mate-ax-slowkeys-no.png
index 8dd5d4e3c..8dd5d4e3c 100644
--- a/accessx-status/pixmaps/16x16/mate-ax-slowkeys-no.png
+++ b/accessx-status/icons/16x16/apps/mate-ax-slowkeys-no.png
diff --git a/accessx-status/pixmaps/16x16/mate-ax-slowkeys-pending.png b/accessx-status/icons/16x16/apps/mate-ax-slowkeys-pending.png
index 1ce575207..1ce575207 100644
--- a/accessx-status/pixmaps/16x16/mate-ax-slowkeys-pending.png
+++ b/accessx-status/icons/16x16/apps/mate-ax-slowkeys-pending.png
diff --git a/accessx-status/pixmaps/16x16/mate-ax-slowkeys-yes.png b/accessx-status/icons/16x16/apps/mate-ax-slowkeys-yes.png
index 14133f0dc..14133f0dc 100644
--- a/accessx-status/pixmaps/16x16/mate-ax-slowkeys-yes.png
+++ b/accessx-status/icons/16x16/apps/mate-ax-slowkeys-yes.png
diff --git a/accessx-status/pixmaps/16x16/mate-ax-slowkeys.png b/accessx-status/icons/16x16/apps/mate-ax-slowkeys.png
index 6e4734362..6e4734362 100644
--- a/accessx-status/pixmaps/16x16/mate-ax-slowkeys.png
+++ b/accessx-status/icons/16x16/apps/mate-ax-slowkeys.png
diff --git a/accessx-status/pixmaps/16x16/mate-mousekeys-base.png b/accessx-status/icons/16x16/apps/mate-mousekeys-base.png
index acf034c3d..acf034c3d 100644
--- a/accessx-status/pixmaps/16x16/mate-mousekeys-base.png
+++ b/accessx-status/icons/16x16/apps/mate-mousekeys-base.png
diff --git a/accessx-status/pixmaps/16x16/mate-mousekeys-default-left.png b/accessx-status/icons/16x16/apps/mate-mousekeys-default-left.png
index 4ab167089..4ab167089 100644
--- a/accessx-status/pixmaps/16x16/mate-mousekeys-default-left.png
+++ b/accessx-status/icons/16x16/apps/mate-mousekeys-default-left.png
diff --git a/accessx-status/pixmaps/16x16/mate-mousekeys-default-middle.png b/accessx-status/icons/16x16/apps/mate-mousekeys-default-middle.png
index 4a1d57739..4a1d57739 100644
--- a/accessx-status/pixmaps/16x16/mate-mousekeys-default-middle.png
+++ b/accessx-status/icons/16x16/apps/mate-mousekeys-default-middle.png
diff --git a/accessx-status/pixmaps/16x16/mate-mousekeys-default-right.png b/accessx-status/icons/16x16/apps/mate-mousekeys-default-right.png
index 72f7aef38..72f7aef38 100644
--- a/accessx-status/pixmaps/16x16/mate-mousekeys-default-right.png
+++ b/accessx-status/icons/16x16/apps/mate-mousekeys-default-right.png
diff --git a/accessx-status/pixmaps/16x16/mate-mousekeys-pressed-left.png b/accessx-status/icons/16x16/apps/mate-mousekeys-pressed-left.png
index 203330236..203330236 100644
--- a/accessx-status/pixmaps/16x16/mate-mousekeys-pressed-left.png
+++ b/accessx-status/icons/16x16/apps/mate-mousekeys-pressed-left.png
diff --git a/accessx-status/pixmaps/16x16/mate-mousekeys-pressed-middle.png b/accessx-status/icons/16x16/apps/mate-mousekeys-pressed-middle.png
index b31628585..b31628585 100644
--- a/accessx-status/pixmaps/16x16/mate-mousekeys-pressed-middle.png
+++ b/accessx-status/icons/16x16/apps/mate-mousekeys-pressed-middle.png
diff --git a/accessx-status/pixmaps/16x16/mate-mousekeys-pressed-right.png b/accessx-status/icons/16x16/apps/mate-mousekeys-pressed-right.png
index 59eb492ef..59eb492ef 100644
--- a/accessx-status/pixmaps/16x16/mate-mousekeys-pressed-right.png
+++ b/accessx-status/icons/16x16/apps/mate-mousekeys-pressed-right.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-alt-latched.png b/accessx-status/icons/16x16/apps/mate-sticky-alt-latched.png
index 75c51b7d9..75c51b7d9 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-alt-latched.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-alt-latched.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-alt-locked.png b/accessx-status/icons/16x16/apps/mate-sticky-alt-locked.png
index 204629f1b..204629f1b 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-alt-locked.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-alt-locked.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-alt-none.png b/accessx-status/icons/16x16/apps/mate-sticky-alt-none.png
index 8747c41fe..8747c41fe 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-alt-none.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-alt-none.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-ctrl-latched.png b/accessx-status/icons/16x16/apps/mate-sticky-ctrl-latched.png
index bf7351a06..bf7351a06 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-ctrl-latched.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-ctrl-latched.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-ctrl-locked.png b/accessx-status/icons/16x16/apps/mate-sticky-ctrl-locked.png
index 01ba67fef..01ba67fef 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-ctrl-locked.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-ctrl-locked.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-ctrl-none.png b/accessx-status/icons/16x16/apps/mate-sticky-ctrl-none.png
index 0b2ae6948..0b2ae6948 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-ctrl-none.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-ctrl-none.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-hyper-latched.png b/accessx-status/icons/16x16/apps/mate-sticky-hyper-latched.png
index a6a9cb991..a6a9cb991 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-hyper-latched.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-hyper-latched.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-hyper-locked.png b/accessx-status/icons/16x16/apps/mate-sticky-hyper-locked.png
index f7a729972..f7a729972 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-hyper-locked.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-hyper-locked.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-hyper-none.png b/accessx-status/icons/16x16/apps/mate-sticky-hyper-none.png
index d5ae2a6dc..d5ae2a6dc 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-hyper-none.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-hyper-none.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-meta-latched.png b/accessx-status/icons/16x16/apps/mate-sticky-meta-latched.png
index c130beaf4..c130beaf4 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-meta-latched.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-meta-latched.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-meta-locked.png b/accessx-status/icons/16x16/apps/mate-sticky-meta-locked.png
index 08c84f3e1..08c84f3e1 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-meta-locked.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-meta-locked.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-meta-none.png b/accessx-status/icons/16x16/apps/mate-sticky-meta-none.png
index 6df9dc06b..6df9dc06b 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-meta-none.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-meta-none.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-shift-latched.png b/accessx-status/icons/16x16/apps/mate-sticky-shift-latched.png
index 924d3df5f..924d3df5f 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-shift-latched.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-shift-latched.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-shift-locked.png b/accessx-status/icons/16x16/apps/mate-sticky-shift-locked.png
index de6b6b74d..de6b6b74d 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-shift-locked.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-shift-locked.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-shift-none.png b/accessx-status/icons/16x16/apps/mate-sticky-shift-none.png
index f909f52cb..f909f52cb 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-shift-none.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-shift-none.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-super-latched.png b/accessx-status/icons/16x16/apps/mate-sticky-super-latched.png
index 0e7a769e4..0e7a769e4 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-super-latched.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-super-latched.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-super-locked.png b/accessx-status/icons/16x16/apps/mate-sticky-super-locked.png
index 075b88b71..075b88b71 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-super-locked.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-super-locked.png
diff --git a/accessx-status/pixmaps/16x16/mate-sticky-super-none.png b/accessx-status/icons/16x16/apps/mate-sticky-super-none.png
index 9855024db..9855024db 100644
--- a/accessx-status/pixmaps/16x16/mate-sticky-super-none.png
+++ b/accessx-status/icons/16x16/apps/mate-sticky-super-none.png
diff --git a/accessx-status/pixmaps/24x24/mate-ax-bouncekeys.png b/accessx-status/icons/24x24/apps/mate-ax-bouncekeys.png
index dd6901f3c..dd6901f3c 100644
--- a/accessx-status/pixmaps/24x24/mate-ax-bouncekeys.png
+++ b/accessx-status/icons/24x24/apps/mate-ax-bouncekeys.png
diff --git a/accessx-status/pixmaps/24x24/mate-ax-key-base.png b/accessx-status/icons/24x24/apps/mate-ax-key-base.png
index 0198106c6..0198106c6 100644
--- a/accessx-status/pixmaps/24x24/mate-ax-key-base.png
+++ b/accessx-status/icons/24x24/apps/mate-ax-key-base.png
diff --git a/accessx-status/pixmaps/24x24/mate-ax-key-inverse.png b/accessx-status/icons/24x24/apps/mate-ax-key-inverse.png
index 3b84c764d..3b84c764d 100644
--- a/accessx-status/pixmaps/24x24/mate-ax-key-inverse.png
+++ b/accessx-status/icons/24x24/apps/mate-ax-key-inverse.png
diff --git a/accessx-status/pixmaps/24x24/mate-ax-key-no.png b/accessx-status/icons/24x24/apps/mate-ax-key-no.png
index f1c446822..f1c446822 100644
--- a/accessx-status/pixmaps/24x24/mate-ax-key-no.png
+++ b/accessx-status/icons/24x24/apps/mate-ax-key-no.png
diff --git a/accessx-status/pixmaps/24x24/mate-ax-key-none.png b/accessx-status/icons/24x24/apps/mate-ax-key-none.png
index 161ed3399..161ed3399 100644
--- a/accessx-status/pixmaps/24x24/mate-ax-key-none.png
+++ b/accessx-status/icons/24x24/apps/mate-ax-key-none.png
diff --git a/accessx-status/pixmaps/24x24/mate-ax-key-yes.png b/accessx-status/icons/24x24/apps/mate-ax-key-yes.png
index 7b5b31be3..7b5b31be3 100644
--- a/accessx-status/pixmaps/24x24/mate-ax-key-yes.png
+++ b/accessx-status/icons/24x24/apps/mate-ax-key-yes.png
diff --git a/accessx-status/pixmaps/24x24/mate-ax-slowkeys-no.png b/accessx-status/icons/24x24/apps/mate-ax-slowkeys-no.png
index 254528c52..254528c52 100644
--- a/accessx-status/pixmaps/24x24/mate-ax-slowkeys-no.png
+++ b/accessx-status/icons/24x24/apps/mate-ax-slowkeys-no.png
diff --git a/accessx-status/pixmaps/24x24/mate-ax-slowkeys-pending.png b/accessx-status/icons/24x24/apps/mate-ax-slowkeys-pending.png
index cfc7e8ae1..cfc7e8ae1 100644
--- a/accessx-status/pixmaps/24x24/mate-ax-slowkeys-pending.png
+++ b/accessx-status/icons/24x24/apps/mate-ax-slowkeys-pending.png
diff --git a/accessx-status/pixmaps/24x24/mate-ax-slowkeys-yes.png b/accessx-status/icons/24x24/apps/mate-ax-slowkeys-yes.png
index 3d61e84d2..3d61e84d2 100644
--- a/accessx-status/pixmaps/24x24/mate-ax-slowkeys-yes.png
+++ b/accessx-status/icons/24x24/apps/mate-ax-slowkeys-yes.png
diff --git a/accessx-status/pixmaps/24x24/mate-ax-slowkeys.png b/accessx-status/icons/24x24/apps/mate-ax-slowkeys.png
index 4ed863cf0..4ed863cf0 100644
--- a/accessx-status/pixmaps/24x24/mate-ax-slowkeys.png
+++ b/accessx-status/icons/24x24/apps/mate-ax-slowkeys.png
diff --git a/accessx-status/pixmaps/24x24/mate-mousekeys-base.png b/accessx-status/icons/24x24/apps/mate-mousekeys-base.png
index 5492c3049..5492c3049 100644
--- a/accessx-status/pixmaps/24x24/mate-mousekeys-base.png
+++ b/accessx-status/icons/24x24/apps/mate-mousekeys-base.png
diff --git a/accessx-status/pixmaps/24x24/mate-mousekeys-default-left.png b/accessx-status/icons/24x24/apps/mate-mousekeys-default-left.png
index 6551e90ab..6551e90ab 100644
--- a/accessx-status/pixmaps/24x24/mate-mousekeys-default-left.png
+++ b/accessx-status/icons/24x24/apps/mate-mousekeys-default-left.png
diff --git a/accessx-status/pixmaps/24x24/mate-mousekeys-default-middle.png b/accessx-status/icons/24x24/apps/mate-mousekeys-default-middle.png
index 332befdf1..332befdf1 100644
--- a/accessx-status/pixmaps/24x24/mate-mousekeys-default-middle.png
+++ b/accessx-status/icons/24x24/apps/mate-mousekeys-default-middle.png
diff --git a/accessx-status/pixmaps/24x24/mate-mousekeys-default-right.png b/accessx-status/icons/24x24/apps/mate-mousekeys-default-right.png
index 1aab28f71..1aab28f71 100644
--- a/accessx-status/pixmaps/24x24/mate-mousekeys-default-right.png
+++ b/accessx-status/icons/24x24/apps/mate-mousekeys-default-right.png
diff --git a/accessx-status/pixmaps/24x24/mate-mousekeys-pressed-left.png b/accessx-status/icons/24x24/apps/mate-mousekeys-pressed-left.png
index e0c1c57f6..e0c1c57f6 100644
--- a/accessx-status/pixmaps/24x24/mate-mousekeys-pressed-left.png
+++ b/accessx-status/icons/24x24/apps/mate-mousekeys-pressed-left.png
diff --git a/accessx-status/pixmaps/24x24/mate-mousekeys-pressed-middle.png b/accessx-status/icons/24x24/apps/mate-mousekeys-pressed-middle.png
index 298cee985..298cee985 100644
--- a/accessx-status/pixmaps/24x24/mate-mousekeys-pressed-middle.png
+++ b/accessx-status/icons/24x24/apps/mate-mousekeys-pressed-middle.png
diff --git a/accessx-status/pixmaps/24x24/mate-mousekeys-pressed-right.png b/accessx-status/icons/24x24/apps/mate-mousekeys-pressed-right.png
index dacecf0e9..dacecf0e9 100644
--- a/accessx-status/pixmaps/24x24/mate-mousekeys-pressed-right.png
+++ b/accessx-status/icons/24x24/apps/mate-mousekeys-pressed-right.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-alt-latched.png b/accessx-status/icons/24x24/apps/mate-sticky-alt-latched.png
index ba8951cc8..ba8951cc8 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-alt-latched.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-alt-latched.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-alt-locked.png b/accessx-status/icons/24x24/apps/mate-sticky-alt-locked.png
index 5f97fefee..5f97fefee 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-alt-locked.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-alt-locked.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-alt-none.png b/accessx-status/icons/24x24/apps/mate-sticky-alt-none.png
index 36ec0b1ac..36ec0b1ac 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-alt-none.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-alt-none.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-ctrl-latched.png b/accessx-status/icons/24x24/apps/mate-sticky-ctrl-latched.png
index dd12ff395..dd12ff395 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-ctrl-latched.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-ctrl-latched.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-ctrl-locked.png b/accessx-status/icons/24x24/apps/mate-sticky-ctrl-locked.png
index 60b790023..60b790023 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-ctrl-locked.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-ctrl-locked.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-ctrl-none.png b/accessx-status/icons/24x24/apps/mate-sticky-ctrl-none.png
index 8a5c80b9d..8a5c80b9d 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-ctrl-none.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-ctrl-none.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-hyper-latched.png b/accessx-status/icons/24x24/apps/mate-sticky-hyper-latched.png
index 057cae761..057cae761 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-hyper-latched.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-hyper-latched.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-hyper-locked.png b/accessx-status/icons/24x24/apps/mate-sticky-hyper-locked.png
index 95a4a2eb3..95a4a2eb3 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-hyper-locked.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-hyper-locked.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-hyper-none.png b/accessx-status/icons/24x24/apps/mate-sticky-hyper-none.png
index a89820a14..a89820a14 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-hyper-none.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-hyper-none.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-meta-latched.png b/accessx-status/icons/24x24/apps/mate-sticky-meta-latched.png
index 7ab5210e6..7ab5210e6 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-meta-latched.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-meta-latched.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-meta-locked.png b/accessx-status/icons/24x24/apps/mate-sticky-meta-locked.png
index 02c522191..02c522191 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-meta-locked.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-meta-locked.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-meta-none.png b/accessx-status/icons/24x24/apps/mate-sticky-meta-none.png
index c5fdb442f..c5fdb442f 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-meta-none.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-meta-none.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-shift-latched.png b/accessx-status/icons/24x24/apps/mate-sticky-shift-latched.png
index 5b130f5d5..5b130f5d5 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-shift-latched.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-shift-latched.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-shift-locked.png b/accessx-status/icons/24x24/apps/mate-sticky-shift-locked.png
index d4823d8ec..d4823d8ec 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-shift-locked.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-shift-locked.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-shift-none.png b/accessx-status/icons/24x24/apps/mate-sticky-shift-none.png
index 84246f2ed..84246f2ed 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-shift-none.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-shift-none.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-super-latched.png b/accessx-status/icons/24x24/apps/mate-sticky-super-latched.png
index 35227c165..35227c165 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-super-latched.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-super-latched.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-super-locked.png b/accessx-status/icons/24x24/apps/mate-sticky-super-locked.png
index 9f90b9ca5..9f90b9ca5 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-super-locked.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-super-locked.png
diff --git a/accessx-status/pixmaps/24x24/mate-sticky-super-none.png b/accessx-status/icons/24x24/apps/mate-sticky-super-none.png
index 7910170c4..7910170c4 100644
--- a/accessx-status/pixmaps/24x24/mate-sticky-super-none.png
+++ b/accessx-status/icons/24x24/apps/mate-sticky-super-none.png
diff --git a/accessx-status/pixmaps/32x32/mate-ax-bouncekeys.png b/accessx-status/icons/32x32/apps/mate-ax-bouncekeys.png
index 1bbbbfbde..1bbbbfbde 100644
--- a/accessx-status/pixmaps/32x32/mate-ax-bouncekeys.png
+++ b/accessx-status/icons/32x32/apps/mate-ax-bouncekeys.png
diff --git a/accessx-status/pixmaps/32x32/mate-ax-key-base.png b/accessx-status/icons/32x32/apps/mate-ax-key-base.png
index 157c67482..157c67482 100644
--- a/accessx-status/pixmaps/32x32/mate-ax-key-base.png
+++ b/accessx-status/icons/32x32/apps/mate-ax-key-base.png
diff --git a/accessx-status/pixmaps/32x32/mate-ax-key-inverse.png b/accessx-status/icons/32x32/apps/mate-ax-key-inverse.png
index ff678bac6..ff678bac6 100644
--- a/accessx-status/pixmaps/32x32/mate-ax-key-inverse.png
+++ b/accessx-status/icons/32x32/apps/mate-ax-key-inverse.png
diff --git a/accessx-status/pixmaps/32x32/mate-ax-key-no.png b/accessx-status/icons/32x32/apps/mate-ax-key-no.png
index f31705a2c..f31705a2c 100644
--- a/accessx-status/pixmaps/32x32/mate-ax-key-no.png
+++ b/accessx-status/icons/32x32/apps/mate-ax-key-no.png
diff --git a/accessx-status/pixmaps/32x32/mate-ax-key-none.png b/accessx-status/icons/32x32/apps/mate-ax-key-none.png
index a3932a260..a3932a260 100644
--- a/accessx-status/pixmaps/32x32/mate-ax-key-none.png
+++ b/accessx-status/icons/32x32/apps/mate-ax-key-none.png
diff --git a/accessx-status/pixmaps/32x32/mate-ax-key-yes.png b/accessx-status/icons/32x32/apps/mate-ax-key-yes.png
index e2ab8a781..e2ab8a781 100644
--- a/accessx-status/pixmaps/32x32/mate-ax-key-yes.png
+++ b/accessx-status/icons/32x32/apps/mate-ax-key-yes.png
diff --git a/accessx-status/pixmaps/32x32/mate-ax-slowkeys-no.png b/accessx-status/icons/32x32/apps/mate-ax-slowkeys-no.png
index 6478554f6..6478554f6 100644
--- a/accessx-status/pixmaps/32x32/mate-ax-slowkeys-no.png
+++ b/accessx-status/icons/32x32/apps/mate-ax-slowkeys-no.png
diff --git a/accessx-status/pixmaps/32x32/mate-ax-slowkeys-pending.png b/accessx-status/icons/32x32/apps/mate-ax-slowkeys-pending.png
index d12c5710e..d12c5710e 100644
--- a/accessx-status/pixmaps/32x32/mate-ax-slowkeys-pending.png
+++ b/accessx-status/icons/32x32/apps/mate-ax-slowkeys-pending.png
diff --git a/accessx-status/pixmaps/32x32/mate-ax-slowkeys-yes.png b/accessx-status/icons/32x32/apps/mate-ax-slowkeys-yes.png
index e061e7f17..e061e7f17 100644
--- a/accessx-status/pixmaps/32x32/mate-ax-slowkeys-yes.png
+++ b/accessx-status/icons/32x32/apps/mate-ax-slowkeys-yes.png
diff --git a/accessx-status/pixmaps/32x32/mate-ax-slowkeys.png b/accessx-status/icons/32x32/apps/mate-ax-slowkeys.png
index d2684e4eb..d2684e4eb 100644
--- a/accessx-status/pixmaps/32x32/mate-ax-slowkeys.png
+++ b/accessx-status/icons/32x32/apps/mate-ax-slowkeys.png
diff --git a/accessx-status/pixmaps/32x32/mate-mousekeys-base.png b/accessx-status/icons/32x32/apps/mate-mousekeys-base.png
index 404766ffd..404766ffd 100644
--- a/accessx-status/pixmaps/32x32/mate-mousekeys-base.png
+++ b/accessx-status/icons/32x32/apps/mate-mousekeys-base.png
diff --git a/accessx-status/pixmaps/32x32/mate-mousekeys-default-left.png b/accessx-status/icons/32x32/apps/mate-mousekeys-default-left.png
index 75a83b5b6..75a83b5b6 100644
--- a/accessx-status/pixmaps/32x32/mate-mousekeys-default-left.png
+++ b/accessx-status/icons/32x32/apps/mate-mousekeys-default-left.png
diff --git a/accessx-status/pixmaps/32x32/mate-mousekeys-default-middle.png b/accessx-status/icons/32x32/apps/mate-mousekeys-default-middle.png
index b16c978d6..b16c978d6 100644
--- a/accessx-status/pixmaps/32x32/mate-mousekeys-default-middle.png
+++ b/accessx-status/icons/32x32/apps/mate-mousekeys-default-middle.png
diff --git a/accessx-status/pixmaps/32x32/mate-mousekeys-default-right.png b/accessx-status/icons/32x32/apps/mate-mousekeys-default-right.png
index 877d3f041..877d3f041 100644
--- a/accessx-status/pixmaps/32x32/mate-mousekeys-default-right.png
+++ b/accessx-status/icons/32x32/apps/mate-mousekeys-default-right.png
diff --git a/accessx-status/pixmaps/32x32/mate-mousekeys-pressed-left.png b/accessx-status/icons/32x32/apps/mate-mousekeys-pressed-left.png
index 58f4e1b90..58f4e1b90 100644
--- a/accessx-status/pixmaps/32x32/mate-mousekeys-pressed-left.png
+++ b/accessx-status/icons/32x32/apps/mate-mousekeys-pressed-left.png
diff --git a/accessx-status/pixmaps/32x32/mate-mousekeys-pressed-middle.png b/accessx-status/icons/32x32/apps/mate-mousekeys-pressed-middle.png
index a1c9bb9a2..a1c9bb9a2 100644
--- a/accessx-status/pixmaps/32x32/mate-mousekeys-pressed-middle.png
+++ b/accessx-status/icons/32x32/apps/mate-mousekeys-pressed-middle.png
diff --git a/accessx-status/pixmaps/32x32/mate-mousekeys-pressed-right.png b/accessx-status/icons/32x32/apps/mate-mousekeys-pressed-right.png
index d233a7420..d233a7420 100644
--- a/accessx-status/pixmaps/32x32/mate-mousekeys-pressed-right.png
+++ b/accessx-status/icons/32x32/apps/mate-mousekeys-pressed-right.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-alt-latched.png b/accessx-status/icons/32x32/apps/mate-sticky-alt-latched.png
index 506b2a456..506b2a456 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-alt-latched.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-alt-latched.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-alt-locked.png b/accessx-status/icons/32x32/apps/mate-sticky-alt-locked.png
index 2fa1ad9a7..2fa1ad9a7 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-alt-locked.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-alt-locked.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-alt-none.png b/accessx-status/icons/32x32/apps/mate-sticky-alt-none.png
index 111ad0c6c..111ad0c6c 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-alt-none.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-alt-none.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-ctrl-latched.png b/accessx-status/icons/32x32/apps/mate-sticky-ctrl-latched.png
index a5daa1197..a5daa1197 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-ctrl-latched.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-ctrl-latched.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-ctrl-locked.png b/accessx-status/icons/32x32/apps/mate-sticky-ctrl-locked.png
index da8297d40..da8297d40 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-ctrl-locked.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-ctrl-locked.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-ctrl-none.png b/accessx-status/icons/32x32/apps/mate-sticky-ctrl-none.png
index f5b013467..f5b013467 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-ctrl-none.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-ctrl-none.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-hyper-latched.png b/accessx-status/icons/32x32/apps/mate-sticky-hyper-latched.png
index d3a13b832..d3a13b832 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-hyper-latched.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-hyper-latched.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-hyper-locked.png b/accessx-status/icons/32x32/apps/mate-sticky-hyper-locked.png
index b61ea0333..b61ea0333 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-hyper-locked.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-hyper-locked.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-hyper-none.png b/accessx-status/icons/32x32/apps/mate-sticky-hyper-none.png
index 5e379716f..5e379716f 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-hyper-none.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-hyper-none.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-meta-latched.png b/accessx-status/icons/32x32/apps/mate-sticky-meta-latched.png
index a97730525..a97730525 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-meta-latched.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-meta-latched.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-meta-locked.png b/accessx-status/icons/32x32/apps/mate-sticky-meta-locked.png
index db480425b..db480425b 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-meta-locked.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-meta-locked.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-meta-none.png b/accessx-status/icons/32x32/apps/mate-sticky-meta-none.png
index 616d39b90..616d39b90 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-meta-none.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-meta-none.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-shift-latched.png b/accessx-status/icons/32x32/apps/mate-sticky-shift-latched.png
index c1d48432e..c1d48432e 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-shift-latched.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-shift-latched.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-shift-locked.png b/accessx-status/icons/32x32/apps/mate-sticky-shift-locked.png
index 6b8134cab..6b8134cab 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-shift-locked.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-shift-locked.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-shift-none.png b/accessx-status/icons/32x32/apps/mate-sticky-shift-none.png
index 0e0f87f3f..0e0f87f3f 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-shift-none.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-shift-none.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-super-latched.png b/accessx-status/icons/32x32/apps/mate-sticky-super-latched.png
index 3153d96f4..3153d96f4 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-super-latched.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-super-latched.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-super-locked.png b/accessx-status/icons/32x32/apps/mate-sticky-super-locked.png
index b4b08f024..b4b08f024 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-super-locked.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-super-locked.png
diff --git a/accessx-status/pixmaps/32x32/mate-sticky-super-none.png b/accessx-status/icons/32x32/apps/mate-sticky-super-none.png
index 8db56ebbf..8db56ebbf 100644
--- a/accessx-status/pixmaps/32x32/mate-sticky-super-none.png
+++ b/accessx-status/icons/32x32/apps/mate-sticky-super-none.png
diff --git a/accessx-status/pixmaps/48x48/mate-ax-bouncekeys.png b/accessx-status/icons/48x48/apps/mate-ax-bouncekeys.png
index 62bccb7c7..62bccb7c7 100644
--- a/accessx-status/pixmaps/48x48/mate-ax-bouncekeys.png
+++ b/accessx-status/icons/48x48/apps/mate-ax-bouncekeys.png
diff --git a/accessx-status/pixmaps/48x48/mate-ax-key-base.png b/accessx-status/icons/48x48/apps/mate-ax-key-base.png
index 5928b4a54..5928b4a54 100644
--- a/accessx-status/pixmaps/48x48/mate-ax-key-base.png
+++ b/accessx-status/icons/48x48/apps/mate-ax-key-base.png
diff --git a/accessx-status/pixmaps/48x48/mate-ax-key-inverse.png b/accessx-status/icons/48x48/apps/mate-ax-key-inverse.png
index 48037f03e..48037f03e 100644
--- a/accessx-status/pixmaps/48x48/mate-ax-key-inverse.png
+++ b/accessx-status/icons/48x48/apps/mate-ax-key-inverse.png
diff --git a/accessx-status/pixmaps/48x48/mate-ax-key-no.png b/accessx-status/icons/48x48/apps/mate-ax-key-no.png
index 9a9cb9eca..9a9cb9eca 100644
--- a/accessx-status/pixmaps/48x48/mate-ax-key-no.png
+++ b/accessx-status/icons/48x48/apps/mate-ax-key-no.png
diff --git a/accessx-status/pixmaps/48x48/mate-ax-key-none.png b/accessx-status/icons/48x48/apps/mate-ax-key-none.png
index d1f69fe0e..d1f69fe0e 100644
--- a/accessx-status/pixmaps/48x48/mate-ax-key-none.png
+++ b/accessx-status/icons/48x48/apps/mate-ax-key-none.png
diff --git a/accessx-status/pixmaps/48x48/mate-ax-key-yes.png b/accessx-status/icons/48x48/apps/mate-ax-key-yes.png
index 81b70341d..81b70341d 100644
--- a/accessx-status/pixmaps/48x48/mate-ax-key-yes.png
+++ b/accessx-status/icons/48x48/apps/mate-ax-key-yes.png
diff --git a/accessx-status/pixmaps/48x48/mate-ax-slowkeys-no.png b/accessx-status/icons/48x48/apps/mate-ax-slowkeys-no.png
index 6478554f6..6478554f6 100644
--- a/accessx-status/pixmaps/48x48/mate-ax-slowkeys-no.png
+++ b/accessx-status/icons/48x48/apps/mate-ax-slowkeys-no.png
diff --git a/accessx-status/pixmaps/48x48/mate-ax-slowkeys-pending.png b/accessx-status/icons/48x48/apps/mate-ax-slowkeys-pending.png
index d12c5710e..d12c5710e 100644
--- a/accessx-status/pixmaps/48x48/mate-ax-slowkeys-pending.png
+++ b/accessx-status/icons/48x48/apps/mate-ax-slowkeys-pending.png
diff --git a/accessx-status/pixmaps/48x48/mate-ax-slowkeys-yes.png b/accessx-status/icons/48x48/apps/mate-ax-slowkeys-yes.png
index e061e7f17..e061e7f17 100644
--- a/accessx-status/pixmaps/48x48/mate-ax-slowkeys-yes.png
+++ b/accessx-status/icons/48x48/apps/mate-ax-slowkeys-yes.png
diff --git a/accessx-status/pixmaps/48x48/mate-ax-slowkeys.png b/accessx-status/icons/48x48/apps/mate-ax-slowkeys.png
index 83bc136c5..83bc136c5 100644
--- a/accessx-status/pixmaps/48x48/mate-ax-slowkeys.png
+++ b/accessx-status/icons/48x48/apps/mate-ax-slowkeys.png
diff --git a/accessx-status/pixmaps/48x48/mate-mousekeys-base.png b/accessx-status/icons/48x48/apps/mate-mousekeys-base.png
index 961362a9e..961362a9e 100644
--- a/accessx-status/pixmaps/48x48/mate-mousekeys-base.png
+++ b/accessx-status/icons/48x48/apps/mate-mousekeys-base.png
diff --git a/accessx-status/pixmaps/48x48/mate-mousekeys-default-left.png b/accessx-status/icons/48x48/apps/mate-mousekeys-default-left.png
index ce0f4c36b..ce0f4c36b 100644
--- a/accessx-status/pixmaps/48x48/mate-mousekeys-default-left.png
+++ b/accessx-status/icons/48x48/apps/mate-mousekeys-default-left.png
diff --git a/accessx-status/pixmaps/48x48/mate-mousekeys-default-middle.png b/accessx-status/icons/48x48/apps/mate-mousekeys-default-middle.png
index dde16fae0..dde16fae0 100644
--- a/accessx-status/pixmaps/48x48/mate-mousekeys-default-middle.png
+++ b/accessx-status/icons/48x48/apps/mate-mousekeys-default-middle.png
diff --git a/accessx-status/pixmaps/48x48/mate-mousekeys-default-right.png b/accessx-status/icons/48x48/apps/mate-mousekeys-default-right.png
index fbb447293..fbb447293 100644
--- a/accessx-status/pixmaps/48x48/mate-mousekeys-default-right.png
+++ b/accessx-status/icons/48x48/apps/mate-mousekeys-default-right.png
diff --git a/accessx-status/pixmaps/48x48/mate-mousekeys-pressed-left.png b/accessx-status/icons/48x48/apps/mate-mousekeys-pressed-left.png
index 31ee3e5d8..31ee3e5d8 100644
--- a/accessx-status/pixmaps/48x48/mate-mousekeys-pressed-left.png
+++ b/accessx-status/icons/48x48/apps/mate-mousekeys-pressed-left.png
diff --git a/accessx-status/pixmaps/48x48/mate-mousekeys-pressed-middle.png b/accessx-status/icons/48x48/apps/mate-mousekeys-pressed-middle.png
index 65890a4f2..65890a4f2 100644
--- a/accessx-status/pixmaps/48x48/mate-mousekeys-pressed-middle.png
+++ b/accessx-status/icons/48x48/apps/mate-mousekeys-pressed-middle.png
diff --git a/accessx-status/pixmaps/48x48/mate-mousekeys-pressed-right.png b/accessx-status/icons/48x48/apps/mate-mousekeys-pressed-right.png
index 316bd97d1..316bd97d1 100644
--- a/accessx-status/pixmaps/48x48/mate-mousekeys-pressed-right.png
+++ b/accessx-status/icons/48x48/apps/mate-mousekeys-pressed-right.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-alt-latched.png b/accessx-status/icons/48x48/apps/mate-sticky-alt-latched.png
index 03243936a..03243936a 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-alt-latched.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-alt-latched.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-alt-locked.png b/accessx-status/icons/48x48/apps/mate-sticky-alt-locked.png
index 7797ce301..7797ce301 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-alt-locked.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-alt-locked.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-alt-none.png b/accessx-status/icons/48x48/apps/mate-sticky-alt-none.png
index 3bf816984..3bf816984 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-alt-none.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-alt-none.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-ctrl-latched.png b/accessx-status/icons/48x48/apps/mate-sticky-ctrl-latched.png
index 25ff168db..25ff168db 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-ctrl-latched.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-ctrl-latched.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-ctrl-locked.png b/accessx-status/icons/48x48/apps/mate-sticky-ctrl-locked.png
index 932cdc50d..932cdc50d 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-ctrl-locked.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-ctrl-locked.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-ctrl-none.png b/accessx-status/icons/48x48/apps/mate-sticky-ctrl-none.png
index 68a62bc7c..68a62bc7c 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-ctrl-none.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-ctrl-none.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-hyper-latched.png b/accessx-status/icons/48x48/apps/mate-sticky-hyper-latched.png
index 66ad73921..66ad73921 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-hyper-latched.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-hyper-latched.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-hyper-locked.png b/accessx-status/icons/48x48/apps/mate-sticky-hyper-locked.png
index 5cbe031cb..5cbe031cb 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-hyper-locked.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-hyper-locked.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-hyper-none.png b/accessx-status/icons/48x48/apps/mate-sticky-hyper-none.png
index d307cea04..d307cea04 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-hyper-none.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-hyper-none.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-meta-latched.png b/accessx-status/icons/48x48/apps/mate-sticky-meta-latched.png
index a0bae1b27..a0bae1b27 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-meta-latched.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-meta-latched.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-meta-locked.png b/accessx-status/icons/48x48/apps/mate-sticky-meta-locked.png
index 70e204369..70e204369 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-meta-locked.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-meta-locked.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-meta-none.png b/accessx-status/icons/48x48/apps/mate-sticky-meta-none.png
index 28d66dbef..28d66dbef 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-meta-none.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-meta-none.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-shift-latched.png b/accessx-status/icons/48x48/apps/mate-sticky-shift-latched.png
index 9ce1c6d6d..9ce1c6d6d 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-shift-latched.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-shift-latched.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-shift-locked.png b/accessx-status/icons/48x48/apps/mate-sticky-shift-locked.png
index 96445b603..96445b603 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-shift-locked.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-shift-locked.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-shift-none.png b/accessx-status/icons/48x48/apps/mate-sticky-shift-none.png
index 433cc4093..433cc4093 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-shift-none.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-shift-none.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-super-latched.png b/accessx-status/icons/48x48/apps/mate-sticky-super-latched.png
index a3a642dc1..a3a642dc1 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-super-latched.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-super-latched.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-super-locked.png b/accessx-status/icons/48x48/apps/mate-sticky-super-locked.png
index 6aaeca791..6aaeca791 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-super-locked.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-super-locked.png
diff --git a/accessx-status/pixmaps/48x48/mate-sticky-super-none.png b/accessx-status/icons/48x48/apps/mate-sticky-super-none.png
index 2e46e5f74..2e46e5f74 100644
--- a/accessx-status/pixmaps/48x48/mate-sticky-super-none.png
+++ b/accessx-status/icons/48x48/apps/mate-sticky-super-none.png
diff --git a/accessx-status/icons/Makefile.am b/accessx-status/icons/Makefile.am
new file mode 100644
index 000000000..ce621592c
--- /dev/null
+++ b/accessx-status/icons/Makefile.am
@@ -0,0 +1,163 @@
+iconsdir = $(datadir)/icons/hicolor
+
+png_icons = \
+	16x16/apps/mate-ax-bouncekeys.png \
+	16x16/apps/mate-ax-key-base.png \
+	16x16/apps/mate-ax-key-inverse.png \
+	16x16/apps/mate-ax-key-none.png \
+	16x16/apps/mate-ax-key-no.png \
+	16x16/apps/mate-ax-key-yes.png \
+	16x16/apps/mate-ax-slowkeys-no.png \
+	16x16/apps/mate-ax-slowkeys-pending.png \
+	16x16/apps/mate-ax-slowkeys.png \
+	16x16/apps/mate-ax-slowkeys-yes.png \
+	16x16/apps/mate-mousekeys-base.png \
+	16x16/apps/mate-mousekeys-default-left.png \
+	16x16/apps/mate-mousekeys-default-middle.png \
+	16x16/apps/mate-mousekeys-default-right.png \
+	16x16/apps/mate-mousekeys-pressed-left.png \
+	16x16/apps/mate-mousekeys-pressed-middle.png \
+	16x16/apps/mate-mousekeys-pressed-right.png \
+	16x16/apps/mate-sticky-alt-latched.png \
+	16x16/apps/mate-sticky-alt-locked.png \
+	16x16/apps/mate-sticky-alt-none.png \
+	16x16/apps/mate-sticky-ctrl-latched.png \
+	16x16/apps/mate-sticky-ctrl-locked.png \
+	16x16/apps/mate-sticky-ctrl-none.png \
+	16x16/apps/mate-sticky-hyper-latched.png \
+	16x16/apps/mate-sticky-hyper-locked.png \
+	16x16/apps/mate-sticky-hyper-none.png \
+	16x16/apps/mate-sticky-meta-latched.png \
+	16x16/apps/mate-sticky-meta-locked.png \
+	16x16/apps/mate-sticky-meta-none.png \
+	16x16/apps/mate-sticky-shift-latched.png \
+	16x16/apps/mate-sticky-shift-locked.png \
+	16x16/apps/mate-sticky-shift-none.png \
+	16x16/apps/mate-sticky-super-latched.png \
+	16x16/apps/mate-sticky-super-locked.png \
+	16x16/apps/mate-sticky-super-none.png \
+	24x24/apps/mate-ax-bouncekeys.png \
+	24x24/apps/mate-ax-key-base.png \
+	24x24/apps/mate-ax-key-inverse.png \
+	24x24/apps/mate-ax-key-none.png \
+	24x24/apps/mate-ax-key-no.png \
+	24x24/apps/mate-ax-key-yes.png \
+	24x24/apps/mate-ax-slowkeys-no.png \
+	24x24/apps/mate-ax-slowkeys-pending.png \
+	24x24/apps/mate-ax-slowkeys.png \
+	24x24/apps/mate-ax-slowkeys-yes.png \
+	24x24/apps/mate-mousekeys-base.png \
+	24x24/apps/mate-mousekeys-default-left.png \
+	24x24/apps/mate-mousekeys-default-middle.png \
+	24x24/apps/mate-mousekeys-default-right.png \
+	24x24/apps/mate-mousekeys-pressed-left.png \
+	24x24/apps/mate-mousekeys-pressed-middle.png \
+	24x24/apps/mate-mousekeys-pressed-right.png \
+	24x24/apps/mate-sticky-alt-latched.png \
+	24x24/apps/mate-sticky-alt-locked.png \
+	24x24/apps/mate-sticky-alt-none.png \
+	24x24/apps/mate-sticky-ctrl-latched.png \
+	24x24/apps/mate-sticky-ctrl-locked.png \
+	24x24/apps/mate-sticky-ctrl-none.png \
+	24x24/apps/mate-sticky-hyper-latched.png \
+	24x24/apps/mate-sticky-hyper-locked.png \
+	24x24/apps/mate-sticky-hyper-none.png \
+	24x24/apps/mate-sticky-meta-latched.png \
+	24x24/apps/mate-sticky-meta-locked.png \
+	24x24/apps/mate-sticky-meta-none.png \
+	24x24/apps/mate-sticky-shift-latched.png \
+	24x24/apps/mate-sticky-shift-locked.png \
+	24x24/apps/mate-sticky-shift-none.png \
+	24x24/apps/mate-sticky-super-latched.png \
+	24x24/apps/mate-sticky-super-locked.png \
+	24x24/apps/mate-sticky-super-none.png \
+	32x32/apps/mate-ax-bouncekeys.png \
+	32x32/apps/mate-ax-key-base.png \
+	32x32/apps/mate-ax-key-inverse.png \
+	32x32/apps/mate-ax-key-none.png \
+	32x32/apps/mate-ax-key-no.png \
+	32x32/apps/mate-ax-key-yes.png \
+	32x32/apps/mate-ax-slowkeys-no.png \
+	32x32/apps/mate-ax-slowkeys-pending.png \
+	32x32/apps/mate-ax-slowkeys.png \
+	32x32/apps/mate-ax-slowkeys-yes.png \
+	32x32/apps/mate-mousekeys-base.png \
+	32x32/apps/mate-mousekeys-default-left.png \
+	32x32/apps/mate-mousekeys-default-middle.png \
+	32x32/apps/mate-mousekeys-default-right.png \
+	32x32/apps/mate-mousekeys-pressed-left.png \
+	32x32/apps/mate-mousekeys-pressed-middle.png \
+	32x32/apps/mate-mousekeys-pressed-right.png \
+	32x32/apps/mate-sticky-alt-latched.png \
+	32x32/apps/mate-sticky-alt-locked.png \
+	32x32/apps/mate-sticky-alt-none.png \
+	32x32/apps/mate-sticky-ctrl-latched.png \
+	32x32/apps/mate-sticky-ctrl-locked.png \
+	32x32/apps/mate-sticky-ctrl-none.png \
+	32x32/apps/mate-sticky-hyper-latched.png \
+	32x32/apps/mate-sticky-hyper-locked.png \
+	32x32/apps/mate-sticky-hyper-none.png \
+	32x32/apps/mate-sticky-meta-latched.png \
+	32x32/apps/mate-sticky-meta-locked.png \
+	32x32/apps/mate-sticky-meta-none.png \
+	32x32/apps/mate-sticky-shift-latched.png \
+	32x32/apps/mate-sticky-shift-locked.png \
+	32x32/apps/mate-sticky-shift-none.png \
+	32x32/apps/mate-sticky-super-latched.png \
+	32x32/apps/mate-sticky-super-locked.png \
+	32x32/apps/mate-sticky-super-none.png \
+	48x48/apps/mate-ax-bouncekeys.png \
+	48x48/apps/mate-ax-key-base.png \
+	48x48/apps/mate-ax-key-inverse.png \
+	48x48/apps/mate-ax-key-none.png \
+	48x48/apps/mate-ax-key-no.png \
+	48x48/apps/mate-ax-key-yes.png \
+	48x48/apps/mate-ax-slowkeys-no.png \
+	48x48/apps/mate-ax-slowkeys-pending.png \
+	48x48/apps/mate-ax-slowkeys.png \
+	48x48/apps/mate-ax-slowkeys-yes.png \
+	48x48/apps/mate-mousekeys-base.png \
+	48x48/apps/mate-mousekeys-default-left.png \
+	48x48/apps/mate-mousekeys-default-middle.png \
+	48x48/apps/mate-mousekeys-default-right.png \
+	48x48/apps/mate-mousekeys-pressed-left.png \
+	48x48/apps/mate-mousekeys-pressed-middle.png \
+	48x48/apps/mate-mousekeys-pressed-right.png \
+	48x48/apps/mate-sticky-alt-latched.png \
+	48x48/apps/mate-sticky-alt-locked.png \
+	48x48/apps/mate-sticky-alt-none.png \
+	48x48/apps/mate-sticky-ctrl-latched.png \
+	48x48/apps/mate-sticky-ctrl-locked.png \
+	48x48/apps/mate-sticky-ctrl-none.png \
+	48x48/apps/mate-sticky-hyper-latched.png \
+	48x48/apps/mate-sticky-hyper-locked.png \
+	48x48/apps/mate-sticky-hyper-none.png \
+	48x48/apps/mate-sticky-meta-latched.png \
+	48x48/apps/mate-sticky-meta-locked.png \
+	48x48/apps/mate-sticky-meta-none.png \
+	48x48/apps/mate-sticky-shift-latched.png \
+	48x48/apps/mate-sticky-shift-locked.png \
+	48x48/apps/mate-sticky-shift-none.png \
+	48x48/apps/mate-sticky-super-latched.png \
+	48x48/apps/mate-sticky-super-locked.png \
+	48x48/apps/mate-sticky-super-none.png \
+	$(NULL)
+
+nobase_dist_icons_DATA = \
+	$(png_icons) \
+	$(NULL)
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(iconsdir)
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated. After install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
+
+-include $(top_srcdir)/git.mk
diff --git a/accessx-status/pixmaps/16x16/Makefile.am b/accessx-status/pixmaps/16x16/Makefile.am
deleted file mode 100644
index 3610a1f9a..000000000
--- a/accessx-status/pixmaps/16x16/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-accessx_status_iconsdir = $(iconsdir)/hicolor/16x16/apps
-accessx_status_icons_DATA =	\
-	mate-ax-key-base.png			\
-	mate-ax-key-inverse.png			\
-	mate-ax-key-none.png			\
-	mate-ax-key-yes.png			\
-	mate-ax-key-no.png			\
-	mate-mousekeys-base.png			\
-	mate-mousekeys-pressed-left.png		\
-	mate-mousekeys-pressed-middle.png	\
-	mate-mousekeys-pressed-right.png	\
-	mate-mousekeys-default-left.png		\
-	mate-mousekeys-default-middle.png	\
-	mate-mousekeys-default-right.png	\
-	mate-sticky-shift-none.png		\
-	mate-sticky-shift-latched.png		\
-	mate-sticky-shift-locked.png		\
-	mate-sticky-ctrl-none.png		\
-	mate-sticky-ctrl-latched.png		\
-	mate-sticky-ctrl-locked.png		\
-	mate-sticky-alt-none.png		\
-	mate-sticky-alt-latched.png		\
-	mate-sticky-alt-locked.png		\
-	mate-sticky-meta-latched.png		\
-	mate-sticky-meta-locked.png		\
-	mate-sticky-meta-none.png		\
-	mate-sticky-hyper-latched.png		\
-	mate-sticky-hyper-locked.png		\
-	mate-sticky-hyper-none.png		\
-	mate-sticky-super-latched.png		\
-	mate-sticky-super-locked.png		\
-	mate-sticky-super-none.png		\
-	mate-ax-slowkeys.png			\
-	mate-ax-slowkeys-pending.png		\
-	mate-ax-slowkeys-yes.png		\
-	mate-ax-slowkeys-no.png			\
-	mate-ax-bouncekeys.png
-
-EXTRA_DIST = \
-	$(accessx_status_icons_DATA)
-
-
--include $(top_srcdir)/git.mk
diff --git a/accessx-status/pixmaps/24x24/Makefile.am b/accessx-status/pixmaps/24x24/Makefile.am
deleted file mode 100644
index 82a5bf7b2..000000000
--- a/accessx-status/pixmaps/24x24/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-accessx_status_iconsdir = $(iconsdir)/hicolor/24x24/apps
-accessx_status_icons_DATA =	\
-	mate-ax-key-base.png			\
-	mate-ax-key-inverse.png			\
-	mate-ax-key-none.png			\
-	mate-ax-key-yes.png			\
-	mate-ax-key-no.png			\
-	mate-mousekeys-base.png			\
-	mate-mousekeys-pressed-left.png		\
-	mate-mousekeys-pressed-middle.png	\
-	mate-mousekeys-pressed-right.png	\
-	mate-mousekeys-default-left.png		\
-	mate-mousekeys-default-middle.png	\
-	mate-mousekeys-default-right.png	\
-	mate-sticky-shift-none.png		\
-	mate-sticky-shift-latched.png		\
-	mate-sticky-shift-locked.png		\
-	mate-sticky-ctrl-none.png		\
-	mate-sticky-ctrl-latched.png		\
-	mate-sticky-ctrl-locked.png		\
-	mate-sticky-alt-none.png		\
-	mate-sticky-alt-latched.png		\
-	mate-sticky-alt-locked.png		\
-	mate-sticky-meta-latched.png		\
-	mate-sticky-meta-locked.png		\
-	mate-sticky-meta-none.png		\
-	mate-sticky-hyper-latched.png		\
-	mate-sticky-hyper-locked.png		\
-	mate-sticky-hyper-none.png		\
-	mate-sticky-super-latched.png		\
-	mate-sticky-super-locked.png		\
-	mate-sticky-super-none.png		\
-	mate-ax-slowkeys.png			\
-	mate-ax-slowkeys-pending.png		\
-	mate-ax-slowkeys-yes.png		\
-	mate-ax-slowkeys-no.png			\
-	mate-ax-bouncekeys.png
-
-EXTRA_DIST = \
-	$(accessx_status_icons_DATA)
-
-
--include $(top_srcdir)/git.mk
diff --git a/accessx-status/pixmaps/32x32/Makefile.am b/accessx-status/pixmaps/32x32/Makefile.am
deleted file mode 100644
index f556d1dec..000000000
--- a/accessx-status/pixmaps/32x32/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-accessx_status_iconsdir = $(iconsdir)/hicolor/32x32/apps
-accessx_status_icons_DATA =	\
-	mate-ax-key-base.png			\
-	mate-ax-key-inverse.png			\
-	mate-ax-key-none.png			\
-	mate-ax-key-yes.png			\
-	mate-ax-key-no.png			\
-	mate-mousekeys-base.png			\
-	mate-mousekeys-pressed-left.png		\
-	mate-mousekeys-pressed-middle.png	\
-	mate-mousekeys-pressed-right.png	\
-	mate-mousekeys-default-left.png		\
-	mate-mousekeys-default-middle.png	\
-	mate-mousekeys-default-right.png	\
-	mate-sticky-shift-none.png		\
-	mate-sticky-shift-latched.png		\
-	mate-sticky-shift-locked.png		\
-	mate-sticky-ctrl-none.png		\
-	mate-sticky-ctrl-latched.png		\
-	mate-sticky-ctrl-locked.png		\
-	mate-sticky-alt-none.png		\
-	mate-sticky-alt-latched.png		\
-	mate-sticky-alt-locked.png		\
-	mate-sticky-meta-latched.png		\
-	mate-sticky-meta-locked.png		\
-	mate-sticky-meta-none.png		\
-	mate-sticky-hyper-latched.png		\
-	mate-sticky-hyper-locked.png		\
-	mate-sticky-hyper-none.png		\
-	mate-sticky-super-latched.png		\
-	mate-sticky-super-locked.png		\
-	mate-sticky-super-none.png		\
-	mate-ax-slowkeys.png			\
-	mate-ax-slowkeys-pending.png		\
-	mate-ax-slowkeys-yes.png		\
-	mate-ax-slowkeys-no.png			\
-	mate-ax-bouncekeys.png
-
-EXTRA_DIST = \
-	$(accessx_status_icons_DATA)
-
-
--include $(top_srcdir)/git.mk
diff --git a/accessx-status/pixmaps/48x48/Makefile.am b/accessx-status/pixmaps/48x48/Makefile.am
deleted file mode 100644
index 710014b4d..000000000
--- a/accessx-status/pixmaps/48x48/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-accessx_status_iconsdir = $(iconsdir)/hicolor/48x48/apps
-accessx_status_icons_DATA =	\
-	mate-ax-key-base.png			\
-	mate-ax-key-inverse.png			\
-	mate-ax-key-none.png			\
-	mate-ax-key-yes.png			\
-	mate-ax-key-no.png			\
-	mate-mousekeys-base.png			\
-	mate-mousekeys-pressed-left.png		\
-	mate-mousekeys-pressed-middle.png	\
-	mate-mousekeys-pressed-right.png	\
-	mate-mousekeys-default-left.png		\
-	mate-mousekeys-default-middle.png	\
-	mate-mousekeys-default-right.png	\
-	mate-sticky-shift-none.png		\
-	mate-sticky-shift-latched.png		\
-	mate-sticky-shift-locked.png		\
-	mate-sticky-ctrl-none.png		\
-	mate-sticky-ctrl-latched.png		\
-	mate-sticky-ctrl-locked.png		\
-	mate-sticky-alt-none.png		\
-	mate-sticky-alt-latched.png		\
-	mate-sticky-alt-locked.png		\
-	mate-sticky-meta-latched.png		\
-	mate-sticky-meta-locked.png		\
-	mate-sticky-meta-none.png		\
-	mate-sticky-hyper-latched.png		\
-	mate-sticky-hyper-locked.png		\
-	mate-sticky-hyper-none.png		\
-	mate-sticky-super-latched.png		\
-	mate-sticky-super-locked.png		\
-	mate-sticky-super-none.png		\
-	mate-ax-slowkeys.png			\
-	mate-ax-slowkeys-pending.png		\
-	mate-ax-slowkeys-yes.png		\
-	mate-ax-slowkeys-no.png			\
-	mate-ax-bouncekeys.png
-
-EXTRA_DIST = \
-	$(accessx_status_icons_DATA)
-
-
--include $(top_srcdir)/git.mk
diff --git a/accessx-status/pixmaps/Makefile.am b/accessx-status/pixmaps/Makefile.am
deleted file mode 100644
index f457e2fff..000000000
--- a/accessx-status/pixmaps/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-SUBDIRS = 16x16 24x24 32x32 48x48
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(iconsdir)/hicolor
-
-install-data-hook: update-icon-cache
-uninstall-hook: update-icon-cache
-update-icon-cache:
-	@-if test -z "$(DESTDIR)"; then \
-		echo "Updating Gtk icon cache."; \
-		$(gtk_update_icon_cache); \
-	else \
-		echo "*** Icon cache not updated. After install, run this:"; \
-		echo "***   $(gtk_update_icon_cache)"; \
-	fi
-
--include $(top_srcdir)/git.mk
diff --git a/configure.ac b/configure.ac
index 43ad2554a..e536a26a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -561,11 +561,7 @@ Makefile
 po/Makefile.in
 accessx-status/Makefile
 accessx-status/docs/Makefile
-accessx-status/pixmaps/Makefile
-accessx-status/pixmaps/16x16/Makefile
-accessx-status/pixmaps/24x24/Makefile
-accessx-status/pixmaps/32x32/Makefile
-accessx-status/pixmaps/48x48/Makefile
+accessx-status/icons/Makefile
 drivemount/Makefile
 drivemount/help/Makefile
 drivemount/org.mate.drivemount.gschema.xml