148 files changed, 165 insertions, 194 deletions

diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index 013ff92b..f19fcb5e 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 6172c482..6172c482 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 405d4548..405d4548 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 7af0b792..7af0b792 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 740dae0f..740dae0f 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 df6aae64..df6aae64 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 b305e490..b305e490 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 8dd5d4e3..8dd5d4e3 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 1ce57520..1ce57520 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 14133f0d..14133f0d 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 6e473436..6e473436 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 acf034c3..acf034c3 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 4ab16708..4ab16708 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 4a1d5773..4a1d5773 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 72f7aef3..72f7aef3 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 20333023..20333023 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 b3162858..b3162858 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 59eb492e..59eb492e 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 75c51b7d..75c51b7d 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 204629f1..204629f1 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 8747c41f..8747c41f 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 bf7351a0..bf7351a0 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 01ba67fe..01ba67fe 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 0b2ae694..0b2ae694 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 a6a9cb99..a6a9cb99 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 f7a72997..f7a72997 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 d5ae2a6d..d5ae2a6d 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 c130beaf..c130beaf 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 08c84f3e..08c84f3e 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 6df9dc06..6df9dc06 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 924d3df5..924d3df5 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 de6b6b74..de6b6b74 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 f909f52c..f909f52c 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 0e7a769e..0e7a769e 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 075b88b7..075b88b7 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 9855024d..9855024d 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 dd6901f3..dd6901f3 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 0198106c..0198106c 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 3b84c764..3b84c764 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 f1c44682..f1c44682 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 161ed339..161ed339 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 7b5b31be..7b5b31be 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 254528c5..254528c5 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 cfc7e8ae..cfc7e8ae 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 3d61e84d..3d61e84d 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 4ed863cf..4ed863cf 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 5492c304..5492c304 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 6551e90a..6551e90a 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 332befdf..332befdf 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 1aab28f7..1aab28f7 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 e0c1c57f..e0c1c57f 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 298cee98..298cee98 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 dacecf0e..dacecf0e 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 ba8951cc..ba8951cc 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 5f97fefe..5f97fefe 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 36ec0b1a..36ec0b1a 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 dd12ff39..dd12ff39 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 60b79002..60b79002 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 8a5c80b9..8a5c80b9 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 057cae76..057cae76 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 95a4a2eb..95a4a2eb 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 a89820a1..a89820a1 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 7ab5210e..7ab5210e 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 02c52219..02c52219 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 c5fdb442..c5fdb442 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 5b130f5d..5b130f5d 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 d4823d8e..d4823d8e 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 84246f2e..84246f2e 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 35227c16..35227c16 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 9f90b9ca..9f90b9ca 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 7910170c..7910170c 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 1bbbbfbd..1bbbbfbd 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 157c6748..157c6748 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 ff678bac..ff678bac 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 f31705a2..f31705a2 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 a3932a26..a3932a26 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 e2ab8a78..e2ab8a78 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 6478554f..6478554f 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 d12c5710..d12c5710 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 e061e7f1..e061e7f1 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 d2684e4e..d2684e4e 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 404766ff..404766ff 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 75a83b5b..75a83b5b 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 b16c978d..b16c978d 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 877d3f04..877d3f04 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 58f4e1b9..58f4e1b9 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 a1c9bb9a..a1c9bb9a 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 d233a742..d233a742 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 506b2a45..506b2a45 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 2fa1ad9a..2fa1ad9a 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 111ad0c6..111ad0c6 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 a5daa119..a5daa119 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 da8297d4..da8297d4 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 f5b01346..f5b01346 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 d3a13b83..d3a13b83 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 b61ea033..b61ea033 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 5e379716..5e379716 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 a9773052..a9773052 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 db480425..db480425 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 616d39b9..616d39b9 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 c1d48432..c1d48432 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 6b8134ca..6b8134ca 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 0e0f87f3..0e0f87f3 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 3153d96f..3153d96f 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 b4b08f02..b4b08f02 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 8db56ebb..8db56ebb 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 62bccb7c..62bccb7c 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 5928b4a5..5928b4a5 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 48037f03..48037f03 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 9a9cb9ec..9a9cb9ec 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 d1f69fe0..d1f69fe0 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 81b70341..81b70341 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 6478554f..6478554f 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 d12c5710..d12c5710 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 e061e7f1..e061e7f1 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 83bc136c..83bc136c 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 961362a9..961362a9 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 ce0f4c36..ce0f4c36 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 dde16fae..dde16fae 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 fbb44729..fbb44729 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 31ee3e5d..31ee3e5d 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 65890a4f..65890a4f 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 316bd97d..316bd97d 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 03243936..03243936 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 7797ce30..7797ce30 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 3bf81698..3bf81698 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 25ff168d..25ff168d 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 932cdc50..932cdc50 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 68a62bc7..68a62bc7 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 66ad7392..66ad7392 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 5cbe031c..5cbe031c 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 d307cea0..d307cea0 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 a0bae1b2..a0bae1b2 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 70e20436..70e20436 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 28d66dbe..28d66dbe 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 9ce1c6d6..9ce1c6d6 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 96445b60..96445b60 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 433cc409..433cc409 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 a3a642dc..a3a642dc 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 6aaeca79..6aaeca79 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 2e46e5f7..2e46e5f7 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 00000000..ce621592
--- /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 3610a1f9..00000000
--- 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 82a5bf7b..00000000
--- 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 f556d1de..00000000
--- 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 710014b4..00000000
--- 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 f457e2ff..00000000
--- 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 43ad2554..e536a26a 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