diff --git a/gajim/data/icons/hicolor/16x16/actions/document-send.png b/gajim/data/icons/hicolor/16x16/actions/document-send.png
deleted file mode 100644
index c3b373325..000000000
Binary files a/gajim/data/icons/hicolor/16x16/actions/document-send.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/16x16/status/aim-away.png b/gajim/data/icons/hicolor/16x16/status/aim-away.png
new file mode 100644
index 000000000..a4c812454
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/aim-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/aim-chat.png b/gajim/data/icons/hicolor/16x16/status/aim-chat.png
new file mode 100644
index 000000000..5bf473cbb
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/aim-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/aim-dnd.png b/gajim/data/icons/hicolor/16x16/status/aim-dnd.png
new file mode 100644
index 000000000..bf2cb9d0e
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/aim-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/aim-notinroster.png b/gajim/data/icons/hicolor/16x16/status/aim-notinroster.png
new file mode 100644
index 000000000..185a9ee53
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/aim-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/aim-offline.png b/gajim/data/icons/hicolor/16x16/status/aim-offline.png
new file mode 100644
index 000000000..b4368f6e3
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/aim-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/aim-online.png b/gajim/data/icons/hicolor/16x16/status/aim-online.png
new file mode 100644
index 000000000..265fc1c74
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/aim-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/aim-xa.png b/gajim/data/icons/hicolor/16x16/status/aim-xa.png
new file mode 100644
index 000000000..6df52c3c0
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/aim-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-away.png b/gajim/data/icons/hicolor/16x16/status/dcraven-away.png
new file mode 100644
index 000000000..4b2946173
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-chat.png b/gajim/data/icons/hicolor/16x16/status/dcraven-chat.png
new file mode 100644
index 000000000..5a571b079
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-closed.png b/gajim/data/icons/hicolor/16x16/status/dcraven-closed.png
new file mode 100644
index 000000000..4220cb7f1
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-closed.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-connecting.png b/gajim/data/icons/hicolor/16x16/status/dcraven-connecting.png
new file mode 100644
index 000000000..c6e87019d
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-connecting.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-dnd.png b/gajim/data/icons/hicolor/16x16/status/dcraven-dnd.png
new file mode 100644
index 000000000..9842c5bcc
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-error.png b/gajim/data/icons/hicolor/16x16/status/dcraven-error.png
new file mode 100644
index 000000000..a63351db1
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-error.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-event.png b/gajim/data/icons/hicolor/16x16/status/dcraven-event.png
new file mode 100644
index 000000000..3bd582cc8
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-event.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-invisible.png b/gajim/data/icons/hicolor/16x16/status/dcraven-invisible.png
new file mode 100644
index 000000000..c085980e4
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-invisible.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-muc-active.png b/gajim/data/icons/hicolor/16x16/status/dcraven-muc-active.png
new file mode 100644
index 000000000..982900305
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-muc-active.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-muc-inactive.png b/gajim/data/icons/hicolor/16x16/status/dcraven-muc-inactive.png
new file mode 100644
index 000000000..93a126752
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-muc-inactive.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-notinroster.png b/gajim/data/icons/hicolor/16x16/status/dcraven-notinroster.png
new file mode 100644
index 000000000..0b5bd4cb8
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-offline.png b/gajim/data/icons/hicolor/16x16/status/dcraven-offline.png
new file mode 100644
index 000000000..54568896d
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-online.png b/gajim/data/icons/hicolor/16x16/status/dcraven-online.png
new file mode 100644
index 000000000..3605ccc6d
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-opened.png b/gajim/data/icons/hicolor/16x16/status/dcraven-opened.png
new file mode 100644
index 000000000..a8414bc0f
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-opened.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-requested.png b/gajim/data/icons/hicolor/16x16/status/dcraven-requested.png
new file mode 100644
index 000000000..8ce7c669a
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-requested.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/dcraven-xa.png b/gajim/data/icons/hicolor/16x16/status/dcraven-xa.png
new file mode 100644
index 000000000..5865a6639
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/dcraven-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/facebook-away.png b/gajim/data/icons/hicolor/16x16/status/facebook-away.png
new file mode 100644
index 000000000..4bb8de1bb
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/facebook-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/facebook-chat.png b/gajim/data/icons/hicolor/16x16/status/facebook-chat.png
new file mode 100644
index 000000000..bc42cf9b0
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/facebook-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/facebook-dnd.png b/gajim/data/icons/hicolor/16x16/status/facebook-dnd.png
new file mode 100644
index 000000000..4bb8de1bb
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/facebook-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/facebook-notinroster.png b/gajim/data/icons/hicolor/16x16/status/facebook-notinroster.png
new file mode 100644
index 000000000..2666be91a
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/facebook-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/facebook-offline.png b/gajim/data/icons/hicolor/16x16/status/facebook-offline.png
new file mode 100644
index 000000000..a980b777b
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/facebook-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/facebook-online.png b/gajim/data/icons/hicolor/16x16/status/facebook-online.png
new file mode 100644
index 000000000..bc42cf9b0
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/facebook-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/facebook-xa.png b/gajim/data/icons/hicolor/16x16/status/facebook-xa.png
new file mode 100644
index 000000000..4bb8de1bb
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/facebook-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gadu-away.png b/gajim/data/icons/hicolor/16x16/status/gadu-away.png
new file mode 100644
index 000000000..ef1287d8f
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gadu-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gadu-chat.png b/gajim/data/icons/hicolor/16x16/status/gadu-chat.png
new file mode 100644
index 000000000..7d3378aeb
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gadu-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gadu-dnd.png b/gajim/data/icons/hicolor/16x16/status/gadu-dnd.png
new file mode 100644
index 000000000..23003b33c
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gadu-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gadu-invisible.png b/gajim/data/icons/hicolor/16x16/status/gadu-invisible.png
new file mode 100644
index 000000000..1d408e4e9
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gadu-invisible.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gadu-notinroster.png b/gajim/data/icons/hicolor/16x16/status/gadu-notinroster.png
new file mode 100644
index 000000000..8409067a5
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gadu-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gadu-offline.png b/gajim/data/icons/hicolor/16x16/status/gadu-offline.png
new file mode 100644
index 000000000..3c5093e47
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gadu-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gadu-online.png b/gajim/data/icons/hicolor/16x16/status/gadu-online.png
new file mode 100644
index 000000000..0a7e6d4e0
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gadu-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gadu-xa.png b/gajim/data/icons/hicolor/16x16/status/gadu-xa.png
new file mode 100644
index 000000000..ef1287d8f
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gadu-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-away.png b/gajim/data/icons/hicolor/16x16/status/gnome-away.png
new file mode 100644
index 000000000..bbd5dbaf5
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-chat.png b/gajim/data/icons/hicolor/16x16/status/gnome-chat.png
new file mode 100644
index 000000000..badfb2d6d
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-closed.png b/gajim/data/icons/hicolor/16x16/status/gnome-closed.png
new file mode 100644
index 000000000..71ed19c04
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-closed.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-connecting.png b/gajim/data/icons/hicolor/16x16/status/gnome-connecting.png
new file mode 100644
index 000000000..c6e87019d
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-connecting.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-dnd.png b/gajim/data/icons/hicolor/16x16/status/gnome-dnd.png
new file mode 100644
index 000000000..0e31d6938
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-error.png b/gajim/data/icons/hicolor/16x16/status/gnome-error.png
new file mode 100644
index 000000000..578102f99
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-error.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-event.png b/gajim/data/icons/hicolor/16x16/status/gnome-event.png
new file mode 100644
index 000000000..3bd582cc8
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-event.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-invisible.png b/gajim/data/icons/hicolor/16x16/status/gnome-invisible.png
new file mode 100644
index 000000000..7a99d65a7
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-invisible.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-muc-active.png b/gajim/data/icons/hicolor/16x16/status/gnome-muc-active.png
new file mode 100644
index 000000000..efdd60f12
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-muc-active.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-muc-inactive.png b/gajim/data/icons/hicolor/16x16/status/gnome-muc-inactive.png
new file mode 100644
index 000000000..0bf75af15
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-muc-inactive.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-notinroster.png b/gajim/data/icons/hicolor/16x16/status/gnome-notinroster.png
new file mode 100644
index 000000000..45cda57e6
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-offline.png b/gajim/data/icons/hicolor/16x16/status/gnome-offline.png
new file mode 100644
index 000000000..60a6e40e6
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-online.png b/gajim/data/icons/hicolor/16x16/status/gnome-online.png
new file mode 100644
index 000000000..30b318fd6
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-opened.png b/gajim/data/icons/hicolor/16x16/status/gnome-opened.png
new file mode 100644
index 000000000..8df4f53ea
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-opened.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-requested.png b/gajim/data/icons/hicolor/16x16/status/gnome-requested.png
new file mode 100644
index 000000000..4dc377b44
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-requested.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gnome-xa.png b/gajim/data/icons/hicolor/16x16/status/gnome-xa.png
new file mode 100644
index 000000000..319b20115
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gnome-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-away.png b/gajim/data/icons/hicolor/16x16/status/goojim-away.png
new file mode 100644
index 000000000..72a4c7a1d
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-chat.png b/gajim/data/icons/hicolor/16x16/status/goojim-chat.png
new file mode 100644
index 000000000..7dcf08e4d
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-closed.png b/gajim/data/icons/hicolor/16x16/status/goojim-closed.png
new file mode 100644
index 000000000..ee32dff1d
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-closed.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-connecting.png b/gajim/data/icons/hicolor/16x16/status/goojim-connecting.png
new file mode 100644
index 000000000..d74b7c6e8
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-connecting.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-dnd.png b/gajim/data/icons/hicolor/16x16/status/goojim-dnd.png
new file mode 100644
index 000000000..3d045a374
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-error.png b/gajim/data/icons/hicolor/16x16/status/goojim-error.png
new file mode 100644
index 000000000..85cce3860
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-error.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-event.png b/gajim/data/icons/hicolor/16x16/status/goojim-event.png
new file mode 100644
index 000000000..381100218
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-event.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-invisible.png b/gajim/data/icons/hicolor/16x16/status/goojim-invisible.png
new file mode 100644
index 000000000..073b8b8aa
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-invisible.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-muc-active.png b/gajim/data/icons/hicolor/16x16/status/goojim-muc-active.png
new file mode 100644
index 000000000..efdd60f12
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-muc-active.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-muc-inactive.png b/gajim/data/icons/hicolor/16x16/status/goojim-muc-inactive.png
new file mode 100644
index 000000000..0bf75af15
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-muc-inactive.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-notinroster.png b/gajim/data/icons/hicolor/16x16/status/goojim-notinroster.png
new file mode 100644
index 000000000..b6adff121
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-offline.png b/gajim/data/icons/hicolor/16x16/status/goojim-offline.png
new file mode 100644
index 000000000..0c265dfd9
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-online.png b/gajim/data/icons/hicolor/16x16/status/goojim-online.png
new file mode 100644
index 000000000..431997652
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-opened.png b/gajim/data/icons/hicolor/16x16/status/goojim-opened.png
new file mode 100644
index 000000000..a735933d9
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-opened.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-requested.png b/gajim/data/icons/hicolor/16x16/status/goojim-requested.png
new file mode 100644
index 000000000..b151fb5e8
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-requested.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/goojim-xa.png b/gajim/data/icons/hicolor/16x16/status/goojim-xa.png
new file mode 100644
index 000000000..96906eaca
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/goojim-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-away.png b/gajim/data/icons/hicolor/16x16/status/gota-away.png
new file mode 100644
index 000000000..84b6b094c
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-chat.png b/gajim/data/icons/hicolor/16x16/status/gota-chat.png
new file mode 100644
index 000000000..b557d203e
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-closed.png b/gajim/data/icons/hicolor/16x16/status/gota-closed.png
new file mode 100644
index 000000000..0b8439d11
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-closed.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-connecting.png b/gajim/data/icons/hicolor/16x16/status/gota-connecting.png
new file mode 100644
index 000000000..c6e87019d
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-connecting.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-dnd.png b/gajim/data/icons/hicolor/16x16/status/gota-dnd.png
new file mode 100644
index 000000000..d19c7f6e8
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-error.png b/gajim/data/icons/hicolor/16x16/status/gota-error.png
new file mode 100644
index 000000000..4e1c85ead
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-error.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-event.png b/gajim/data/icons/hicolor/16x16/status/gota-event.png
new file mode 100644
index 000000000..3bd582cc8
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-event.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-invisible.png b/gajim/data/icons/hicolor/16x16/status/gota-invisible.png
new file mode 100644
index 000000000..b30666a86
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-invisible.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-muc-active.png b/gajim/data/icons/hicolor/16x16/status/gota-muc-active.png
new file mode 100644
index 000000000..efdd60f12
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-muc-active.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-muc-inactive.png b/gajim/data/icons/hicolor/16x16/status/gota-muc-inactive.png
new file mode 100644
index 000000000..0bf75af15
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-muc-inactive.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-notinroster.png b/gajim/data/icons/hicolor/16x16/status/gota-notinroster.png
new file mode 100644
index 000000000..e4cab925b
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-offline.png b/gajim/data/icons/hicolor/16x16/status/gota-offline.png
new file mode 100644
index 000000000..a4e188f36
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-online.png b/gajim/data/icons/hicolor/16x16/status/gota-online.png
new file mode 100644
index 000000000..dd86745db
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-opened.png b/gajim/data/icons/hicolor/16x16/status/gota-opened.png
new file mode 100644
index 000000000..3e18f4141
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-opened.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-requested.png b/gajim/data/icons/hicolor/16x16/status/gota-requested.png
new file mode 100644
index 000000000..baff984c8
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-requested.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/gota-xa.png b/gajim/data/icons/hicolor/16x16/status/gota-xa.png
new file mode 100644
index 000000000..94bab7787
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gota-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/icq-away.png b/gajim/data/icons/hicolor/16x16/status/icq-away.png
new file mode 100644
index 000000000..7c6935236
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/icq-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/icq-chat.png b/gajim/data/icons/hicolor/16x16/status/icq-chat.png
new file mode 100644
index 000000000..e07261b27
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/icq-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/icq-dnd.png b/gajim/data/icons/hicolor/16x16/status/icq-dnd.png
new file mode 100644
index 000000000..9ba3e6906
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/icq-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/icq-notinroster.png b/gajim/data/icons/hicolor/16x16/status/icq-notinroster.png
new file mode 100644
index 000000000..5517fafce
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/icq-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/icq-offline.png b/gajim/data/icons/hicolor/16x16/status/icq-offline.png
new file mode 100644
index 000000000..260dd8592
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/icq-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/icq-online.png b/gajim/data/icons/hicolor/16x16/status/icq-online.png
new file mode 100644
index 000000000..427c5afe2
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/icq-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/icq-xa.png b/gajim/data/icons/hicolor/16x16/status/icq-xa.png
new file mode 100644
index 000000000..d2d589b2d
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/icq-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/irc-away.png b/gajim/data/icons/hicolor/16x16/status/irc-away.png
new file mode 100644
index 000000000..ed526a197
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/irc-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/irc-chat.png b/gajim/data/icons/hicolor/16x16/status/irc-chat.png
new file mode 100644
index 000000000..24f1cac31
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/irc-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/irc-dnd.png b/gajim/data/icons/hicolor/16x16/status/irc-dnd.png
new file mode 100644
index 000000000..850c47f47
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/irc-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/irc-notinroster.png b/gajim/data/icons/hicolor/16x16/status/irc-notinroster.png
new file mode 100644
index 000000000..5748a71c2
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/irc-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/irc-offline.png b/gajim/data/icons/hicolor/16x16/status/irc-offline.png
new file mode 100644
index 000000000..52a441fa3
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/irc-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/irc-online.png b/gajim/data/icons/hicolor/16x16/status/irc-online.png
new file mode 100644
index 000000000..00647bba6
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/irc-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/irc-xa.png b/gajim/data/icons/hicolor/16x16/status/irc-xa.png
new file mode 100644
index 000000000..61d0271c0
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/irc-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-away.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-away.png
new file mode 100644
index 000000000..354aaa9d8
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-chat.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-chat.png
new file mode 100644
index 000000000..bf4296c81
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-closed.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-closed.png
new file mode 100644
index 000000000..2cff0d6fc
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-closed.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-connecting.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-connecting.png
new file mode 100644
index 000000000..9801f62e9
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-connecting.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-dnd.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-dnd.png
new file mode 100644
index 000000000..933e3d181
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-error.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-error.png
new file mode 100644
index 000000000..0ecf3a82c
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-error.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-event.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-event.png
new file mode 100644
index 000000000..3bd582cc8
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-event.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-invisible.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-invisible.png
new file mode 100644
index 000000000..19fd677fe
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-invisible.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-muc-active.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-muc-active.png
new file mode 100644
index 000000000..efdd60f12
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-muc-active.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-muc-inactive.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-muc-inactive.png
new file mode 100644
index 000000000..0bf75af15
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-muc-inactive.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-notinroster.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-notinroster.png
new file mode 100644
index 000000000..d705d2a40
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-offline.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-offline.png
new file mode 100644
index 000000000..7dfb587a7
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-online.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-online.png
new file mode 100644
index 000000000..6e030a9d1
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-opened.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-opened.png
new file mode 100644
index 000000000..2a13d8034
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-opened.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-requested.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-requested.png
new file mode 100644
index 000000000..9474b7ab1
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-requested.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/jabberbulb-xa.png b/gajim/data/icons/hicolor/16x16/status/jabberbulb-xa.png
new file mode 100644
index 000000000..61b8ade70
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/jabberbulb-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/mrim-away.png b/gajim/data/icons/hicolor/16x16/status/mrim-away.png
new file mode 100644
index 000000000..5160f03f3
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/mrim-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/mrim-chat.png b/gajim/data/icons/hicolor/16x16/status/mrim-chat.png
new file mode 100644
index 000000000..0daf86b8c
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/mrim-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/mrim-dnd.png b/gajim/data/icons/hicolor/16x16/status/mrim-dnd.png
new file mode 100644
index 000000000..656e7ab18
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/mrim-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/mrim-notinroster.png b/gajim/data/icons/hicolor/16x16/status/mrim-notinroster.png
new file mode 100644
index 000000000..defe9ba3d
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/mrim-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/mrim-offline.png b/gajim/data/icons/hicolor/16x16/status/mrim-offline.png
new file mode 100644
index 000000000..5516c86dc
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/mrim-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/mrim-online.png b/gajim/data/icons/hicolor/16x16/status/mrim-online.png
new file mode 100644
index 000000000..36fc00474
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/mrim-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/mrim-xa.png b/gajim/data/icons/hicolor/16x16/status/mrim-xa.png
new file mode 100644
index 000000000..f0f7720cf
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/mrim-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/security-high.png b/gajim/data/icons/hicolor/16x16/status/security-high.png
deleted file mode 100644
index 8f229a037..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/security-high.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/16x16/status/security-low.png b/gajim/data/icons/hicolor/16x16/status/security-low.png
deleted file mode 100644
index 35385cf2e..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/security-low.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sms-away.png b/gajim/data/icons/hicolor/16x16/status/sms-away.png
new file mode 100644
index 000000000..ccb1c4426
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sms-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sms-chat.png b/gajim/data/icons/hicolor/16x16/status/sms-chat.png
new file mode 100644
index 000000000..ccb1c4426
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sms-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sms-dnd.png b/gajim/data/icons/hicolor/16x16/status/sms-dnd.png
new file mode 100644
index 000000000..e398aad30
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sms-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sms-offline.png b/gajim/data/icons/hicolor/16x16/status/sms-offline.png
new file mode 100644
index 000000000..eadd36dea
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sms-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sms-online.png b/gajim/data/icons/hicolor/16x16/status/sms-online.png
new file mode 100644
index 000000000..ccb1c4426
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sms-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sms-xa.png b/gajim/data/icons/hicolor/16x16/status/sms-xa.png
new file mode 100644
index 000000000..ccb1c4426
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sms-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-away.png b/gajim/data/icons/hicolor/16x16/status/sun-away.png
new file mode 100644
index 000000000..9f9b563d3
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-chat.png b/gajim/data/icons/hicolor/16x16/status/sun-chat.png
new file mode 100644
index 000000000..c4ce6c06a
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-closed.png b/gajim/data/icons/hicolor/16x16/status/sun-closed.png
new file mode 100644
index 000000000..f3f7eb713
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-closed.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-connecting.png b/gajim/data/icons/hicolor/16x16/status/sun-connecting.png
new file mode 100644
index 000000000..c6e87019d
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-connecting.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-dnd.png b/gajim/data/icons/hicolor/16x16/status/sun-dnd.png
new file mode 100644
index 000000000..5d5752d18
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-error.png b/gajim/data/icons/hicolor/16x16/status/sun-error.png
new file mode 100644
index 000000000..63d303093
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-error.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-event.png b/gajim/data/icons/hicolor/16x16/status/sun-event.png
new file mode 100644
index 000000000..3bd582cc8
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-event.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-invisible.png b/gajim/data/icons/hicolor/16x16/status/sun-invisible.png
new file mode 100644
index 000000000..42a957db4
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-invisible.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-muc-active.png b/gajim/data/icons/hicolor/16x16/status/sun-muc-active.png
new file mode 100644
index 000000000..efdd60f12
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-muc-active.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-muc-inactive.png b/gajim/data/icons/hicolor/16x16/status/sun-muc-inactive.png
new file mode 100644
index 000000000..0bf75af15
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-muc-inactive.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-notinroster.png b/gajim/data/icons/hicolor/16x16/status/sun-notinroster.png
new file mode 100644
index 000000000..55e639f81
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-offline.png b/gajim/data/icons/hicolor/16x16/status/sun-offline.png
new file mode 100644
index 000000000..01bc86574
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-online.png b/gajim/data/icons/hicolor/16x16/status/sun-online.png
new file mode 100644
index 000000000..578390c5a
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-opened.png b/gajim/data/icons/hicolor/16x16/status/sun-opened.png
new file mode 100644
index 000000000..5e1d6a06f
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-opened.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-requested.png b/gajim/data/icons/hicolor/16x16/status/sun-requested.png
new file mode 100644
index 000000000..3c48593c3
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-requested.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/sun-xa.png b/gajim/data/icons/hicolor/16x16/status/sun-xa.png
new file mode 100644
index 000000000..cdbb40c29
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/sun-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/tlen-away.png b/gajim/data/icons/hicolor/16x16/status/tlen-away.png
new file mode 100644
index 000000000..7baa11d20
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/tlen-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/tlen-chat.png b/gajim/data/icons/hicolor/16x16/status/tlen-chat.png
new file mode 100644
index 000000000..76bfc48d4
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/tlen-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/tlen-dnd.png b/gajim/data/icons/hicolor/16x16/status/tlen-dnd.png
new file mode 100644
index 000000000..4a466184b
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/tlen-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/tlen-notinroster.png b/gajim/data/icons/hicolor/16x16/status/tlen-notinroster.png
new file mode 100644
index 000000000..bda1f6fd1
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/tlen-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/tlen-offline.png b/gajim/data/icons/hicolor/16x16/status/tlen-offline.png
new file mode 100644
index 000000000..cd62e302a
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/tlen-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/tlen-online.png b/gajim/data/icons/hicolor/16x16/status/tlen-online.png
new file mode 100644
index 000000000..0c3210669
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/tlen-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/tlen-xa.png b/gajim/data/icons/hicolor/16x16/status/tlen-xa.png
new file mode 100644
index 000000000..8b2e335d2
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/tlen-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/weather-away.png b/gajim/data/icons/hicolor/16x16/status/weather-away.png
new file mode 100644
index 000000000..0c7d671e9
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/weather-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/weather-chat.png b/gajim/data/icons/hicolor/16x16/status/weather-chat.png
new file mode 100644
index 000000000..3bd001c4d
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/weather-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/weather-dnd.png b/gajim/data/icons/hicolor/16x16/status/weather-dnd.png
new file mode 100644
index 000000000..f4d3256b2
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/weather-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/weather-offline.png b/gajim/data/icons/hicolor/16x16/status/weather-offline.png
new file mode 100644
index 000000000..a7d04ebcc
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/weather-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/weather-online.png b/gajim/data/icons/hicolor/16x16/status/weather-online.png
new file mode 100644
index 000000000..192aa1c88
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/weather-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/weather-xa.png b/gajim/data/icons/hicolor/16x16/status/weather-xa.png
new file mode 100644
index 000000000..09b06fbd3
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/weather-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-away.png b/gajim/data/icons/hicolor/16x16/status/wroop-away.png
new file mode 100644
index 000000000..ab3643812
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-chat.png b/gajim/data/icons/hicolor/16x16/status/wroop-chat.png
new file mode 100644
index 000000000..a9a0962b0
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-closed.png b/gajim/data/icons/hicolor/16x16/status/wroop-closed.png
new file mode 100644
index 000000000..2cded1ea8
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-closed.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-connecting.png b/gajim/data/icons/hicolor/16x16/status/wroop-connecting.png
new file mode 100644
index 000000000..c6e87019d
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-connecting.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-dnd.png b/gajim/data/icons/hicolor/16x16/status/wroop-dnd.png
new file mode 100644
index 000000000..93f03b92f
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-error.png b/gajim/data/icons/hicolor/16x16/status/wroop-error.png
new file mode 100644
index 000000000..a28a58d89
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-error.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-event.png b/gajim/data/icons/hicolor/16x16/status/wroop-event.png
new file mode 100644
index 000000000..3bd582cc8
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-event.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-invisible.png b/gajim/data/icons/hicolor/16x16/status/wroop-invisible.png
new file mode 100644
index 000000000..433ed39f3
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-invisible.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-muc-active.png b/gajim/data/icons/hicolor/16x16/status/wroop-muc-active.png
new file mode 100644
index 000000000..5d3f505fc
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-muc-active.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-muc-inactive.png b/gajim/data/icons/hicolor/16x16/status/wroop-muc-inactive.png
new file mode 100644
index 000000000..552069b19
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-muc-inactive.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-notinroster.png b/gajim/data/icons/hicolor/16x16/status/wroop-notinroster.png
new file mode 100644
index 000000000..c346512a1
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-offline.png b/gajim/data/icons/hicolor/16x16/status/wroop-offline.png
new file mode 100644
index 000000000..58acbec80
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-online.png b/gajim/data/icons/hicolor/16x16/status/wroop-online.png
new file mode 100644
index 000000000..d868f9a2e
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-opened.png b/gajim/data/icons/hicolor/16x16/status/wroop-opened.png
new file mode 100644
index 000000000..6fb917004
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-opened.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-requested.png b/gajim/data/icons/hicolor/16x16/status/wroop-requested.png
new file mode 100644
index 000000000..ab3643812
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-requested.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/wroop-xa.png b/gajim/data/icons/hicolor/16x16/status/wroop-xa.png
new file mode 100644
index 000000000..ab3643812
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/wroop-xa.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/yahoo-away.png b/gajim/data/icons/hicolor/16x16/status/yahoo-away.png
new file mode 100644
index 000000000..f7647ac35
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/yahoo-away.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/yahoo-chat.png b/gajim/data/icons/hicolor/16x16/status/yahoo-chat.png
new file mode 100644
index 000000000..2f0747269
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/yahoo-chat.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/yahoo-dnd.png b/gajim/data/icons/hicolor/16x16/status/yahoo-dnd.png
new file mode 100644
index 000000000..cda1d8e14
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/yahoo-dnd.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/yahoo-notinroster.png b/gajim/data/icons/hicolor/16x16/status/yahoo-notinroster.png
new file mode 100644
index 000000000..e5d0fed8b
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/yahoo-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/yahoo-offline.png b/gajim/data/icons/hicolor/16x16/status/yahoo-offline.png
new file mode 100644
index 000000000..f0b768eb9
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/yahoo-offline.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/yahoo-online.png b/gajim/data/icons/hicolor/16x16/status/yahoo-online.png
new file mode 100644
index 000000000..fb4579b83
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/yahoo-online.png differ
diff --git a/gajim/data/icons/hicolor/16x16/status/yahoo-xa.png b/gajim/data/icons/hicolor/16x16/status/yahoo-xa.png
new file mode 100644
index 000000000..524a5023c
Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/yahoo-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/mimetypes/application-certificate.png b/gajim/data/icons/hicolor/32x32/mimetypes/application-certificate.png
deleted file mode 100644
index b75ba54e2..000000000
Binary files a/gajim/data/icons/hicolor/32x32/mimetypes/application-certificate.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/aim-away.png b/gajim/data/icons/hicolor/32x32/status/aim-away.png
new file mode 100644
index 000000000..611d4f879
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/aim-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/aim-chat.png b/gajim/data/icons/hicolor/32x32/status/aim-chat.png
new file mode 100644
index 000000000..bdc05885e
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/aim-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/aim-dnd.png b/gajim/data/icons/hicolor/32x32/status/aim-dnd.png
new file mode 100644
index 000000000..4ed29d2da
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/aim-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/aim-notinroster.png b/gajim/data/icons/hicolor/32x32/status/aim-notinroster.png
new file mode 100644
index 000000000..5a680a410
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/aim-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/aim-offline.png b/gajim/data/icons/hicolor/32x32/status/aim-offline.png
new file mode 100644
index 000000000..a7578a979
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/aim-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/aim-online.png b/gajim/data/icons/hicolor/32x32/status/aim-online.png
new file mode 100644
index 000000000..823727ef7
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/aim-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/aim-xa.png b/gajim/data/icons/hicolor/32x32/status/aim-xa.png
new file mode 100644
index 000000000..7890b53af
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/aim-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-away.png b/gajim/data/icons/hicolor/32x32/status/dcraven-away.png
new file mode 100644
index 000000000..a708af3bd
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-chat.png b/gajim/data/icons/hicolor/32x32/status/dcraven-chat.png
new file mode 100644
index 000000000..ec4ef0d8d
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-closed.png b/gajim/data/icons/hicolor/32x32/status/dcraven-closed.png
new file mode 100644
index 000000000..f33ea4857
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-closed.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-connecting.png b/gajim/data/icons/hicolor/32x32/status/dcraven-connecting.png
new file mode 100644
index 000000000..35ac602a4
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-connecting.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-dnd.png b/gajim/data/icons/hicolor/32x32/status/dcraven-dnd.png
new file mode 100644
index 000000000..492d2b4f2
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-error.png b/gajim/data/icons/hicolor/32x32/status/dcraven-error.png
new file mode 100644
index 000000000..ff16e2ffa
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-error.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-event.png b/gajim/data/icons/hicolor/32x32/status/dcraven-event.png
new file mode 100644
index 000000000..20efb6f90
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-event.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-invisible.png b/gajim/data/icons/hicolor/32x32/status/dcraven-invisible.png
new file mode 100644
index 000000000..8571eb2bf
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-invisible.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-muc-active.png b/gajim/data/icons/hicolor/32x32/status/dcraven-muc-active.png
new file mode 100644
index 000000000..387afe957
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-muc-active.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-muc-inactive.png b/gajim/data/icons/hicolor/32x32/status/dcraven-muc-inactive.png
new file mode 100644
index 000000000..52e1a9c5b
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-muc-inactive.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-notinroster.png b/gajim/data/icons/hicolor/32x32/status/dcraven-notinroster.png
new file mode 100644
index 000000000..e9aebd435
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-offline.png b/gajim/data/icons/hicolor/32x32/status/dcraven-offline.png
new file mode 100644
index 000000000..cc590185a
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-online.png b/gajim/data/icons/hicolor/32x32/status/dcraven-online.png
new file mode 100644
index 000000000..cb2f65a03
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-opened.png b/gajim/data/icons/hicolor/32x32/status/dcraven-opened.png
new file mode 100644
index 000000000..d06c80177
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-opened.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-requested.png b/gajim/data/icons/hicolor/32x32/status/dcraven-requested.png
new file mode 100644
index 000000000..ebc054418
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-requested.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/dcraven-xa.png b/gajim/data/icons/hicolor/32x32/status/dcraven-xa.png
new file mode 100644
index 000000000..72e3996c6
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/dcraven-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/facebook-away.png b/gajim/data/icons/hicolor/32x32/status/facebook-away.png
new file mode 100644
index 000000000..c89b9304d
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/facebook-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/facebook-chat.png b/gajim/data/icons/hicolor/32x32/status/facebook-chat.png
new file mode 100644
index 000000000..65695e9e5
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/facebook-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/facebook-dnd.png b/gajim/data/icons/hicolor/32x32/status/facebook-dnd.png
new file mode 100644
index 000000000..c89b9304d
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/facebook-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/facebook-notinroster.png b/gajim/data/icons/hicolor/32x32/status/facebook-notinroster.png
new file mode 100644
index 000000000..faaaa1ccd
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/facebook-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/facebook-offline.png b/gajim/data/icons/hicolor/32x32/status/facebook-offline.png
new file mode 100644
index 000000000..2ae605802
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/facebook-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/facebook-online.png b/gajim/data/icons/hicolor/32x32/status/facebook-online.png
new file mode 100644
index 000000000..65695e9e5
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/facebook-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/facebook-xa.png b/gajim/data/icons/hicolor/32x32/status/facebook-xa.png
new file mode 100644
index 000000000..c89b9304d
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/facebook-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gadu-away.png b/gajim/data/icons/hicolor/32x32/status/gadu-away.png
new file mode 100644
index 000000000..7ac86af1e
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gadu-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gadu-chat.png b/gajim/data/icons/hicolor/32x32/status/gadu-chat.png
new file mode 100644
index 000000000..e95ccd2f9
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gadu-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gadu-dnd.png b/gajim/data/icons/hicolor/32x32/status/gadu-dnd.png
new file mode 100644
index 000000000..af7dba91c
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gadu-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gadu-invisible.png b/gajim/data/icons/hicolor/32x32/status/gadu-invisible.png
new file mode 100644
index 000000000..b13f84cc3
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gadu-invisible.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gadu-notinroster.png b/gajim/data/icons/hicolor/32x32/status/gadu-notinroster.png
new file mode 100644
index 000000000..fc53528cc
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gadu-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gadu-offline.png b/gajim/data/icons/hicolor/32x32/status/gadu-offline.png
new file mode 100644
index 000000000..579a47bed
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gadu-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gadu-online.png b/gajim/data/icons/hicolor/32x32/status/gadu-online.png
new file mode 100644
index 000000000..8d42f25f9
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gadu-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gadu-xa.png b/gajim/data/icons/hicolor/32x32/status/gadu-xa.png
new file mode 100644
index 000000000..7ac86af1e
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gadu-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gnome-away.png b/gajim/data/icons/hicolor/32x32/status/gnome-away.png
new file mode 100644
index 000000000..a31290323
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gnome-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gnome-chat.png b/gajim/data/icons/hicolor/32x32/status/gnome-chat.png
new file mode 100644
index 000000000..1d1c8ba02
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gnome-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gnome-connecting.png b/gajim/data/icons/hicolor/32x32/status/gnome-connecting.png
new file mode 100644
index 000000000..49599fbc5
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gnome-connecting.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gnome-dnd.png b/gajim/data/icons/hicolor/32x32/status/gnome-dnd.png
new file mode 100644
index 000000000..d421e4b79
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gnome-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gnome-event.png b/gajim/data/icons/hicolor/32x32/status/gnome-event.png
new file mode 100644
index 000000000..70eef820e
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gnome-event.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gnome-muc-active.png b/gajim/data/icons/hicolor/32x32/status/gnome-muc-active.png
new file mode 100644
index 000000000..3c7474c82
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gnome-muc-active.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gnome-muc-inactive.png b/gajim/data/icons/hicolor/32x32/status/gnome-muc-inactive.png
new file mode 100644
index 000000000..279843fde
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gnome-muc-inactive.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gnome-notinroster.png b/gajim/data/icons/hicolor/32x32/status/gnome-notinroster.png
new file mode 100644
index 000000000..4cd5a230b
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gnome-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gnome-offline.png b/gajim/data/icons/hicolor/32x32/status/gnome-offline.png
new file mode 100644
index 000000000..f3fb12768
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gnome-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gnome-online.png b/gajim/data/icons/hicolor/32x32/status/gnome-online.png
new file mode 100644
index 000000000..4e02f9a8f
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gnome-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gnome-requested.png b/gajim/data/icons/hicolor/32x32/status/gnome-requested.png
new file mode 100644
index 000000000..f32a55ac4
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gnome-requested.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gnome-xa.png b/gajim/data/icons/hicolor/32x32/status/gnome-xa.png
new file mode 100644
index 000000000..cbe251ea8
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gnome-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-away.png b/gajim/data/icons/hicolor/32x32/status/goojim-away.png
new file mode 100644
index 000000000..70d92ba5d
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-chat.png b/gajim/data/icons/hicolor/32x32/status/goojim-chat.png
new file mode 100644
index 000000000..e896f1d39
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-closed.png b/gajim/data/icons/hicolor/32x32/status/goojim-closed.png
new file mode 100644
index 000000000..bf0f789b1
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-closed.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-connecting.png b/gajim/data/icons/hicolor/32x32/status/goojim-connecting.png
new file mode 100644
index 000000000..637183b08
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-connecting.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-dnd.png b/gajim/data/icons/hicolor/32x32/status/goojim-dnd.png
new file mode 100644
index 000000000..d6aa46c5d
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-error.png b/gajim/data/icons/hicolor/32x32/status/goojim-error.png
new file mode 100644
index 000000000..600bb94c9
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-error.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-event.png b/gajim/data/icons/hicolor/32x32/status/goojim-event.png
new file mode 100644
index 000000000..f45e1950d
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-event.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-invisible.png b/gajim/data/icons/hicolor/32x32/status/goojim-invisible.png
new file mode 100644
index 000000000..fd83fc46d
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-invisible.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-message.png b/gajim/data/icons/hicolor/32x32/status/goojim-message.png
new file mode 100644
index 000000000..70eef820e
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-message.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-muc-active.png b/gajim/data/icons/hicolor/32x32/status/goojim-muc-active.png
new file mode 100644
index 000000000..3c7474c82
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-muc-active.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-muc-inactive.png b/gajim/data/icons/hicolor/32x32/status/goojim-muc-inactive.png
new file mode 100644
index 000000000..279843fde
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-muc-inactive.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-notinroster.png b/gajim/data/icons/hicolor/32x32/status/goojim-notinroster.png
new file mode 100644
index 000000000..85c807d27
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-offline.png b/gajim/data/icons/hicolor/32x32/status/goojim-offline.png
new file mode 100644
index 000000000..5c8a35e86
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-online.png b/gajim/data/icons/hicolor/32x32/status/goojim-online.png
new file mode 100644
index 000000000..cf2d6dd3c
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-opened.png b/gajim/data/icons/hicolor/32x32/status/goojim-opened.png
new file mode 100644
index 000000000..4143dea0f
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-opened.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-requested.png b/gajim/data/icons/hicolor/32x32/status/goojim-requested.png
new file mode 100644
index 000000000..546a363eb
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-requested.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/goojim-xa.png b/gajim/data/icons/hicolor/32x32/status/goojim-xa.png
new file mode 100644
index 000000000..aa4697066
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/goojim-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-away.png b/gajim/data/icons/hicolor/32x32/status/gota-away.png
new file mode 100644
index 000000000..405d40357
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-chat.png b/gajim/data/icons/hicolor/32x32/status/gota-chat.png
new file mode 100644
index 000000000..22c304bfc
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-closed.png b/gajim/data/icons/hicolor/32x32/status/gota-closed.png
new file mode 100644
index 000000000..db43d93ad
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-closed.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-connecting.png b/gajim/data/icons/hicolor/32x32/status/gota-connecting.png
new file mode 100644
index 000000000..49599fbc5
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-connecting.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-dnd.png b/gajim/data/icons/hicolor/32x32/status/gota-dnd.png
new file mode 100644
index 000000000..f609c322a
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-error.png b/gajim/data/icons/hicolor/32x32/status/gota-error.png
new file mode 100644
index 000000000..562495063
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-error.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-event.png b/gajim/data/icons/hicolor/32x32/status/gota-event.png
new file mode 100644
index 000000000..70eef820e
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-event.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-invisible.png b/gajim/data/icons/hicolor/32x32/status/gota-invisible.png
new file mode 100644
index 000000000..6aecc358f
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-invisible.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-muc-active.png b/gajim/data/icons/hicolor/32x32/status/gota-muc-active.png
new file mode 100644
index 000000000..3c7474c82
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-muc-active.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-muc-inactive.png b/gajim/data/icons/hicolor/32x32/status/gota-muc-inactive.png
new file mode 100644
index 000000000..279843fde
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-muc-inactive.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-notinroster.png b/gajim/data/icons/hicolor/32x32/status/gota-notinroster.png
new file mode 100644
index 000000000..f7a77a4f4
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-offline.png b/gajim/data/icons/hicolor/32x32/status/gota-offline.png
new file mode 100644
index 000000000..6bc715b6d
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-online.png b/gajim/data/icons/hicolor/32x32/status/gota-online.png
new file mode 100644
index 000000000..20cab8b86
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-opened.png b/gajim/data/icons/hicolor/32x32/status/gota-opened.png
new file mode 100644
index 000000000..86e9a8982
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-opened.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-requested.png b/gajim/data/icons/hicolor/32x32/status/gota-requested.png
new file mode 100644
index 000000000..236f9f9ff
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-requested.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/gota-xa.png b/gajim/data/icons/hicolor/32x32/status/gota-xa.png
new file mode 100644
index 000000000..677ac71db
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gota-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/icq-away.png b/gajim/data/icons/hicolor/32x32/status/icq-away.png
new file mode 100644
index 000000000..e1cd5b78f
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/icq-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/icq-chat.png b/gajim/data/icons/hicolor/32x32/status/icq-chat.png
new file mode 100644
index 000000000..d1e5d48ea
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/icq-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/icq-dnd.png b/gajim/data/icons/hicolor/32x32/status/icq-dnd.png
new file mode 100644
index 000000000..ede09e4b2
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/icq-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/icq-notinroster.png b/gajim/data/icons/hicolor/32x32/status/icq-notinroster.png
new file mode 100644
index 000000000..ce89631e6
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/icq-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/icq-offline.png b/gajim/data/icons/hicolor/32x32/status/icq-offline.png
new file mode 100644
index 000000000..25b8d50c8
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/icq-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/icq-online.png b/gajim/data/icons/hicolor/32x32/status/icq-online.png
new file mode 100644
index 000000000..1023343a2
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/icq-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/icq-xa.png b/gajim/data/icons/hicolor/32x32/status/icq-xa.png
new file mode 100644
index 000000000..0be3ad515
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/icq-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/irc-away.png b/gajim/data/icons/hicolor/32x32/status/irc-away.png
new file mode 100644
index 000000000..c27716fd9
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/irc-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/irc-chat.png b/gajim/data/icons/hicolor/32x32/status/irc-chat.png
new file mode 100644
index 000000000..33d05687c
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/irc-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/irc-dnd.png b/gajim/data/icons/hicolor/32x32/status/irc-dnd.png
new file mode 100644
index 000000000..b689fd275
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/irc-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/irc-notinroster.png b/gajim/data/icons/hicolor/32x32/status/irc-notinroster.png
new file mode 100644
index 000000000..348d896f6
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/irc-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/irc-offline.png b/gajim/data/icons/hicolor/32x32/status/irc-offline.png
new file mode 100644
index 000000000..2bdfc7c59
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/irc-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/irc-online.png b/gajim/data/icons/hicolor/32x32/status/irc-online.png
new file mode 100644
index 000000000..471742a86
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/irc-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/irc-xa.png b/gajim/data/icons/hicolor/32x32/status/irc-xa.png
new file mode 100644
index 000000000..947c78ccf
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/irc-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/jabberbulb-away.png b/gajim/data/icons/hicolor/32x32/status/jabberbulb-away.png
new file mode 100644
index 000000000..e6a4e69e0
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/jabberbulb-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/jabberbulb-chat.png b/gajim/data/icons/hicolor/32x32/status/jabberbulb-chat.png
new file mode 100644
index 000000000..f31896300
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/jabberbulb-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/jabberbulb-dnd.png b/gajim/data/icons/hicolor/32x32/status/jabberbulb-dnd.png
new file mode 100644
index 000000000..0c825db06
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/jabberbulb-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/jabberbulb-error.png b/gajim/data/icons/hicolor/32x32/status/jabberbulb-error.png
new file mode 100644
index 000000000..f5d2329cc
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/jabberbulb-error.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/jabberbulb-event.png b/gajim/data/icons/hicolor/32x32/status/jabberbulb-event.png
new file mode 100644
index 000000000..70eef820e
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/jabberbulb-event.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/jabberbulb-invisible.png b/gajim/data/icons/hicolor/32x32/status/jabberbulb-invisible.png
new file mode 100644
index 000000000..0b5e352ed
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/jabberbulb-invisible.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/jabberbulb-muc-active.png b/gajim/data/icons/hicolor/32x32/status/jabberbulb-muc-active.png
new file mode 100644
index 000000000..3c7474c82
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/jabberbulb-muc-active.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/jabberbulb-muc-inactive.png b/gajim/data/icons/hicolor/32x32/status/jabberbulb-muc-inactive.png
new file mode 100644
index 000000000..279843fde
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/jabberbulb-muc-inactive.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/jabberbulb-notinroster.png b/gajim/data/icons/hicolor/32x32/status/jabberbulb-notinroster.png
new file mode 100644
index 000000000..d04a6cc47
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/jabberbulb-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/jabberbulb-offline.png b/gajim/data/icons/hicolor/32x32/status/jabberbulb-offline.png
new file mode 100644
index 000000000..46f0a1a45
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/jabberbulb-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/jabberbulb-online.png b/gajim/data/icons/hicolor/32x32/status/jabberbulb-online.png
new file mode 100644
index 000000000..0493a26f1
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/jabberbulb-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/jabberbulb-requested.png b/gajim/data/icons/hicolor/32x32/status/jabberbulb-requested.png
new file mode 100644
index 000000000..b53268095
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/jabberbulb-requested.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/jabberbulb-xa.png b/gajim/data/icons/hicolor/32x32/status/jabberbulb-xa.png
new file mode 100644
index 000000000..63a254ede
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/jabberbulb-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/mrim-away.png b/gajim/data/icons/hicolor/32x32/status/mrim-away.png
new file mode 100644
index 000000000..fc7c88cc4
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/mrim-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/mrim-chat.png b/gajim/data/icons/hicolor/32x32/status/mrim-chat.png
new file mode 100644
index 000000000..8fef576d7
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/mrim-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/mrim-dnd.png b/gajim/data/icons/hicolor/32x32/status/mrim-dnd.png
new file mode 100644
index 000000000..d1061f293
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/mrim-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/mrim-notinroster.png b/gajim/data/icons/hicolor/32x32/status/mrim-notinroster.png
new file mode 100644
index 000000000..8f14082c8
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/mrim-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/mrim-offline.png b/gajim/data/icons/hicolor/32x32/status/mrim-offline.png
new file mode 100644
index 000000000..d06e576d8
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/mrim-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/mrim-online.png b/gajim/data/icons/hicolor/32x32/status/mrim-online.png
new file mode 100644
index 000000000..f1d8c4766
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/mrim-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/mrim-xa.png b/gajim/data/icons/hicolor/32x32/status/mrim-xa.png
new file mode 100644
index 000000000..05be9a3ce
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/mrim-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/security-high.png b/gajim/data/icons/hicolor/32x32/status/security-high.png
deleted file mode 100644
index beedf016c..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/security-high.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/security-low.png b/gajim/data/icons/hicolor/32x32/status/security-low.png
deleted file mode 100644
index 64a53201a..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/security-low.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sms-away.png b/gajim/data/icons/hicolor/32x32/status/sms-away.png
new file mode 100644
index 000000000..3baf205c4
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sms-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sms-chat.png b/gajim/data/icons/hicolor/32x32/status/sms-chat.png
new file mode 100644
index 000000000..3baf205c4
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sms-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sms-dnd.png b/gajim/data/icons/hicolor/32x32/status/sms-dnd.png
new file mode 100644
index 000000000..a147ec652
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sms-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sms-offline.png b/gajim/data/icons/hicolor/32x32/status/sms-offline.png
new file mode 100644
index 000000000..6a66ba384
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sms-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sms-online.png b/gajim/data/icons/hicolor/32x32/status/sms-online.png
new file mode 100644
index 000000000..3baf205c4
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sms-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sms-xa.png b/gajim/data/icons/hicolor/32x32/status/sms-xa.png
new file mode 100644
index 000000000..3baf205c4
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sms-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sun-away.png b/gajim/data/icons/hicolor/32x32/status/sun-away.png
new file mode 100644
index 000000000..e2c50a5e1
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sun-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sun-chat.png b/gajim/data/icons/hicolor/32x32/status/sun-chat.png
new file mode 100644
index 000000000..9e4db32ad
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sun-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sun-connecting.png b/gajim/data/icons/hicolor/32x32/status/sun-connecting.png
new file mode 100644
index 000000000..49599fbc5
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sun-connecting.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sun-dnd.png b/gajim/data/icons/hicolor/32x32/status/sun-dnd.png
new file mode 100644
index 000000000..35579a925
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sun-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sun-error.png b/gajim/data/icons/hicolor/32x32/status/sun-error.png
new file mode 100644
index 000000000..4255cfbdf
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sun-error.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sun-event.png b/gajim/data/icons/hicolor/32x32/status/sun-event.png
new file mode 100644
index 000000000..70eef820e
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sun-event.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sun-invisible.png b/gajim/data/icons/hicolor/32x32/status/sun-invisible.png
new file mode 100644
index 000000000..140d37e07
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sun-invisible.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sun-muc-active.png b/gajim/data/icons/hicolor/32x32/status/sun-muc-active.png
new file mode 100644
index 000000000..3c7474c82
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sun-muc-active.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sun-muc-inactive.png b/gajim/data/icons/hicolor/32x32/status/sun-muc-inactive.png
new file mode 100644
index 000000000..279843fde
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sun-muc-inactive.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sun-notinroster.png b/gajim/data/icons/hicolor/32x32/status/sun-notinroster.png
new file mode 100644
index 000000000..44d4b67a4
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sun-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sun-offline.png b/gajim/data/icons/hicolor/32x32/status/sun-offline.png
new file mode 100644
index 000000000..ed2413367
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sun-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sun-online.png b/gajim/data/icons/hicolor/32x32/status/sun-online.png
new file mode 100644
index 000000000..fa31e434d
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sun-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sun-requested.png b/gajim/data/icons/hicolor/32x32/status/sun-requested.png
new file mode 100644
index 000000000..029e30db1
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sun-requested.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/sun-xa.png b/gajim/data/icons/hicolor/32x32/status/sun-xa.png
new file mode 100644
index 000000000..e099b7f3d
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/sun-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/tlen-away.png b/gajim/data/icons/hicolor/32x32/status/tlen-away.png
new file mode 100644
index 000000000..a6a65ba14
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/tlen-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/tlen-chat.png b/gajim/data/icons/hicolor/32x32/status/tlen-chat.png
new file mode 100644
index 000000000..84e696f5e
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/tlen-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/tlen-dnd.png b/gajim/data/icons/hicolor/32x32/status/tlen-dnd.png
new file mode 100644
index 000000000..292162e9e
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/tlen-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/tlen-notinroster.png b/gajim/data/icons/hicolor/32x32/status/tlen-notinroster.png
new file mode 100644
index 000000000..fb0330fdb
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/tlen-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/tlen-offline.png b/gajim/data/icons/hicolor/32x32/status/tlen-offline.png
new file mode 100644
index 000000000..225e5082e
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/tlen-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/tlen-online.png b/gajim/data/icons/hicolor/32x32/status/tlen-online.png
new file mode 100644
index 000000000..2ac24cc60
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/tlen-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/tlen-xa.png b/gajim/data/icons/hicolor/32x32/status/tlen-xa.png
new file mode 100644
index 000000000..413abfadc
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/tlen-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/weather-away.png b/gajim/data/icons/hicolor/32x32/status/weather-away.png
new file mode 100644
index 000000000..40f6466ad
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/weather-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/weather-chat.png b/gajim/data/icons/hicolor/32x32/status/weather-chat.png
new file mode 100644
index 000000000..683684fc0
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/weather-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/weather-dnd.png b/gajim/data/icons/hicolor/32x32/status/weather-dnd.png
new file mode 100644
index 000000000..444dd189b
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/weather-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/weather-offline.png b/gajim/data/icons/hicolor/32x32/status/weather-offline.png
new file mode 100644
index 000000000..1c0a72e81
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/weather-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/weather-online.png b/gajim/data/icons/hicolor/32x32/status/weather-online.png
new file mode 100644
index 000000000..40f6466ad
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/weather-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/weather-xa.png b/gajim/data/icons/hicolor/32x32/status/weather-xa.png
new file mode 100644
index 000000000..a870125b2
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/weather-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/wroop-away.png b/gajim/data/icons/hicolor/32x32/status/wroop-away.png
new file mode 100644
index 000000000..2e37e9cd5
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/wroop-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/wroop-chat.png b/gajim/data/icons/hicolor/32x32/status/wroop-chat.png
new file mode 100644
index 000000000..11eba7c63
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/wroop-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/wroop-connecting.png b/gajim/data/icons/hicolor/32x32/status/wroop-connecting.png
new file mode 100644
index 000000000..49599fbc5
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/wroop-connecting.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/wroop-dnd.png b/gajim/data/icons/hicolor/32x32/status/wroop-dnd.png
new file mode 100644
index 000000000..3c28fc49a
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/wroop-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/wroop-error.png b/gajim/data/icons/hicolor/32x32/status/wroop-error.png
new file mode 100644
index 000000000..4b6c6661e
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/wroop-error.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/wroop-event.png b/gajim/data/icons/hicolor/32x32/status/wroop-event.png
new file mode 100644
index 000000000..70eef820e
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/wroop-event.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/wroop-invisible.png b/gajim/data/icons/hicolor/32x32/status/wroop-invisible.png
new file mode 100644
index 000000000..a5aea01e4
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/wroop-invisible.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/wroop-muc-active.png b/gajim/data/icons/hicolor/32x32/status/wroop-muc-active.png
new file mode 100644
index 000000000..e0544aa56
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/wroop-muc-active.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/wroop-muc-inactive.png b/gajim/data/icons/hicolor/32x32/status/wroop-muc-inactive.png
new file mode 100644
index 000000000..80e31bf31
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/wroop-muc-inactive.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/wroop-notinroster.png b/gajim/data/icons/hicolor/32x32/status/wroop-notinroster.png
new file mode 100644
index 000000000..d3214410c
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/wroop-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/wroop-offline.png b/gajim/data/icons/hicolor/32x32/status/wroop-offline.png
new file mode 100644
index 000000000..6eb60c95a
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/wroop-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/wroop-online.png b/gajim/data/icons/hicolor/32x32/status/wroop-online.png
new file mode 100644
index 000000000..013102b23
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/wroop-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/wroop-requested.png b/gajim/data/icons/hicolor/32x32/status/wroop-requested.png
new file mode 100644
index 000000000..2e37e9cd5
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/wroop-requested.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/wroop-xa.png b/gajim/data/icons/hicolor/32x32/status/wroop-xa.png
new file mode 100644
index 000000000..2e37e9cd5
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/wroop-xa.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/yahoo-away.png b/gajim/data/icons/hicolor/32x32/status/yahoo-away.png
new file mode 100644
index 000000000..41eeaf325
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/yahoo-away.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/yahoo-chat.png b/gajim/data/icons/hicolor/32x32/status/yahoo-chat.png
new file mode 100644
index 000000000..69f4918cb
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/yahoo-chat.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/yahoo-dnd.png b/gajim/data/icons/hicolor/32x32/status/yahoo-dnd.png
new file mode 100644
index 000000000..8a5c3a30e
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/yahoo-dnd.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/yahoo-notinroster.png b/gajim/data/icons/hicolor/32x32/status/yahoo-notinroster.png
new file mode 100644
index 000000000..aa01b2871
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/yahoo-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/yahoo-offline.png b/gajim/data/icons/hicolor/32x32/status/yahoo-offline.png
new file mode 100644
index 000000000..691798d9f
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/yahoo-offline.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/yahoo-online.png b/gajim/data/icons/hicolor/32x32/status/yahoo-online.png
new file mode 100644
index 000000000..63ef8ae60
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/yahoo-online.png differ
diff --git a/gajim/data/icons/hicolor/32x32/status/yahoo-xa.png b/gajim/data/icons/hicolor/32x32/status/yahoo-xa.png
new file mode 100644
index 000000000..6c5848f1b
Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/yahoo-xa.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/aim-offline.png b/gajim/data/icons/hicolor/48x48/status/aim-offline.png
new file mode 100644
index 000000000..049ddda3d
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/aim-offline.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/aim-online.png b/gajim/data/icons/hicolor/48x48/status/aim-online.png
new file mode 100644
index 000000000..757d7bba0
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/aim-online.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/dcraven-offline.png b/gajim/data/icons/hicolor/48x48/status/dcraven-offline.png
new file mode 100644
index 000000000..8ce7ff83b
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/dcraven-offline.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/dcraven-online.png b/gajim/data/icons/hicolor/48x48/status/dcraven-online.png
new file mode 100644
index 000000000..4d826a8a6
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/dcraven-online.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/facebook-offline.png b/gajim/data/icons/hicolor/48x48/status/facebook-offline.png
new file mode 100644
index 000000000..fd33197c2
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/facebook-offline.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/facebook-online.png b/gajim/data/icons/hicolor/48x48/status/facebook-online.png
new file mode 100644
index 000000000..2501acaab
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/facebook-online.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/gadu-offline.png b/gajim/data/icons/hicolor/48x48/status/gadu-offline.png
new file mode 100644
index 000000000..49cfc6cd8
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/gadu-offline.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/gadu-online.png b/gajim/data/icons/hicolor/48x48/status/gadu-online.png
new file mode 100644
index 000000000..de2fa0214
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/gadu-online.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/gnome-offline.png b/gajim/data/icons/hicolor/48x48/status/gnome-offline.png
new file mode 100644
index 000000000..f3fb12768
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/gnome-offline.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/gnome-online.png b/gajim/data/icons/hicolor/48x48/status/gnome-online.png
new file mode 100644
index 000000000..4e02f9a8f
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/gnome-online.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/goojim-offline.png b/gajim/data/icons/hicolor/48x48/status/goojim-offline.png
new file mode 100644
index 000000000..a29dd7e1b
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/goojim-offline.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/goojim-online.png b/gajim/data/icons/hicolor/48x48/status/goojim-online.png
new file mode 100644
index 000000000..3fd526d4a
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/goojim-online.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/gota-offline.png b/gajim/data/icons/hicolor/48x48/status/gota-offline.png
new file mode 100644
index 000000000..6bc715b6d
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/gota-offline.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/gota-online.png b/gajim/data/icons/hicolor/48x48/status/gota-online.png
new file mode 100644
index 000000000..20cab8b86
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/gota-online.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/icq-offline.png b/gajim/data/icons/hicolor/48x48/status/icq-offline.png
new file mode 100644
index 000000000..81c58cccc
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/icq-offline.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/icq-online.png b/gajim/data/icons/hicolor/48x48/status/icq-online.png
new file mode 100644
index 000000000..43d01ae73
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/icq-online.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/jabberbulb-offline.png b/gajim/data/icons/hicolor/48x48/status/jabberbulb-offline.png
new file mode 100644
index 000000000..46f0a1a45
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/jabberbulb-offline.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/jabberbulb-online.png b/gajim/data/icons/hicolor/48x48/status/jabberbulb-online.png
new file mode 100644
index 000000000..0493a26f1
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/jabberbulb-online.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/mrim-offline.png b/gajim/data/icons/hicolor/48x48/status/mrim-offline.png
new file mode 100644
index 000000000..9c91ddd66
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/mrim-offline.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/mrim-online.png b/gajim/data/icons/hicolor/48x48/status/mrim-online.png
new file mode 100644
index 000000000..3eab34880
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/mrim-online.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/sun-offline.png b/gajim/data/icons/hicolor/48x48/status/sun-offline.png
new file mode 100644
index 000000000..6c2a5a1ed
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/sun-offline.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/sun-online.png b/gajim/data/icons/hicolor/48x48/status/sun-online.png
new file mode 100644
index 000000000..9cdc3e81c
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/sun-online.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/tlen-offline.png b/gajim/data/icons/hicolor/48x48/status/tlen-offline.png
new file mode 100644
index 000000000..763a68246
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/tlen-offline.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/tlen-online.png b/gajim/data/icons/hicolor/48x48/status/tlen-online.png
new file mode 100644
index 000000000..ed22fb503
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/tlen-online.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/wroop-away.png b/gajim/data/icons/hicolor/48x48/status/wroop-away.png
new file mode 100644
index 000000000..2b2846c25
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/wroop-away.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/wroop-chat.png b/gajim/data/icons/hicolor/48x48/status/wroop-chat.png
new file mode 100644
index 000000000..8e1b4213c
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/wroop-chat.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/wroop-dnd.png b/gajim/data/icons/hicolor/48x48/status/wroop-dnd.png
new file mode 100644
index 000000000..81954c0e5
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/wroop-dnd.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/wroop-error.png b/gajim/data/icons/hicolor/48x48/status/wroop-error.png
new file mode 100644
index 000000000..72a706aaf
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/wroop-error.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/wroop-invisible.png b/gajim/data/icons/hicolor/48x48/status/wroop-invisible.png
new file mode 100644
index 000000000..d6993e576
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/wroop-invisible.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/wroop-muc-active.png b/gajim/data/icons/hicolor/48x48/status/wroop-muc-active.png
new file mode 100644
index 000000000..a6aa8c3ba
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/wroop-muc-active.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/wroop-muc-inactive.png b/gajim/data/icons/hicolor/48x48/status/wroop-muc-inactive.png
new file mode 100644
index 000000000..1ef4c9947
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/wroop-muc-inactive.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/wroop-notinroster.png b/gajim/data/icons/hicolor/48x48/status/wroop-notinroster.png
new file mode 100644
index 000000000..d219b272f
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/wroop-notinroster.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/wroop-offline.png b/gajim/data/icons/hicolor/48x48/status/wroop-offline.png
new file mode 100644
index 000000000..ca40bb48c
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/wroop-offline.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/wroop-online.png b/gajim/data/icons/hicolor/48x48/status/wroop-online.png
new file mode 100644
index 000000000..35a6b9e04
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/wroop-online.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/wroop-requested.png b/gajim/data/icons/hicolor/48x48/status/wroop-requested.png
new file mode 100644
index 000000000..2b2846c25
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/wroop-requested.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/wroop-xa.png b/gajim/data/icons/hicolor/48x48/status/wroop-xa.png
new file mode 100644
index 000000000..2b2846c25
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/wroop-xa.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/yahoo-offline.png b/gajim/data/icons/hicolor/48x48/status/yahoo-offline.png
new file mode 100644
index 000000000..9da04cc8e
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/yahoo-offline.png differ
diff --git a/gajim/data/icons/hicolor/48x48/status/yahoo-online.png b/gajim/data/icons/hicolor/48x48/status/yahoo-online.png
new file mode 100644
index 000000000..8a9816fb3
Binary files /dev/null and b/gajim/data/icons/hicolor/48x48/status/yahoo-online.png differ
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-away.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-away.svg
new file mode 100644
index 000000000..ffef8cefe
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-away.svg
@@ -0,0 +1,646 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-chat.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-chat.svg
new file mode 100644
index 000000000..6014eeeba
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-chat.svg
@@ -0,0 +1,677 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-closed.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-closed.svg
new file mode 100644
index 000000000..78d079fbf
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-closed.svg
@@ -0,0 +1,108 @@
+
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-connecting.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-connecting.svg
new file mode 100644
index 000000000..1d53640bf
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-connecting.svg
@@ -0,0 +1,1589 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-dnd.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-dnd.svg
new file mode 100644
index 000000000..831ac1d2f
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-dnd.svg
@@ -0,0 +1,748 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-error.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-error.svg
new file mode 100644
index 000000000..c1d4760bf
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-error.svg
@@ -0,0 +1,706 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-invisible.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-invisible.svg
new file mode 100644
index 000000000..5561e18d9
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-invisible.svg
@@ -0,0 +1,691 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-message.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-message.svg
new file mode 100644
index 000000000..748e0fa79
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-message.svg
@@ -0,0 +1,409 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-muc-active.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-muc-active.svg
new file mode 100644
index 000000000..4d7c4be16
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-muc-active.svg
@@ -0,0 +1,224 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-muc-inactive.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-muc-inactive.svg
new file mode 100644
index 000000000..02195331f
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-muc-inactive.svg
@@ -0,0 +1,245 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-notinroster.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-notinroster.svg
new file mode 100644
index 000000000..d4411661a
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-notinroster.svg
@@ -0,0 +1,450 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-offline.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-offline.svg
new file mode 100644
index 000000000..857ee71a7
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-offline.svg
@@ -0,0 +1,472 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-online.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-online.svg
new file mode 100644
index 000000000..213eb8f11
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-online.svg
@@ -0,0 +1,447 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-opened.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-opened.svg
new file mode 100644
index 000000000..a7a1e1519
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-opened.svg
@@ -0,0 +1,99 @@
+
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-requested.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-requested.svg
new file mode 100644
index 000000000..6c857ab82
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-requested.svg
@@ -0,0 +1,686 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/dcraven-xa.svg b/gajim/data/icons/hicolor/scalable/status/dcraven-xa.svg
new file mode 100644
index 000000000..74947fedf
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/dcraven-xa.svg
@@ -0,0 +1,646 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-aim.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-aim.svg
new file mode 100644
index 000000000..ce2e7a76a
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-aim.svg
@@ -0,0 +1,155 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-bytestreams.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-bytestreams.svg
new file mode 100644
index 000000000..e45fad62d
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-bytestreams.svg
@@ -0,0 +1,858 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-conference.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-conference.svg
new file mode 100644
index 000000000..0c13a843a
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-conference.svg
@@ -0,0 +1,230 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-disc.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-disc.svg
new file mode 100644
index 000000000..1c3a8c615
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-disc.svg
@@ -0,0 +1,803 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-error.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-error.svg
new file mode 100644
index 000000000..07229f075
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-error.svg
@@ -0,0 +1,144 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-gadu-gadu.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-gadu-gadu.svg
new file mode 100644
index 000000000..c423f23d5
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-gadu-gadu.svg
@@ -0,0 +1,199 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-http-ws.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-http-ws.svg
new file mode 100644
index 000000000..36f455b2c
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-http-ws.svg
@@ -0,0 +1,269 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-icq.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-icq.svg
new file mode 100644
index 000000000..497d1b4c6
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-icq.svg
@@ -0,0 +1,199 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-irc.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-irc.svg
new file mode 100644
index 000000000..b64d3be55
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-irc.svg
@@ -0,0 +1,135 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-jabber.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-jabber.svg
new file mode 100644
index 000000000..390f32571
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-jabber.svg
@@ -0,0 +1,3595 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-jud.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-jud.svg
new file mode 100644
index 000000000..b7dbdefb8
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-jud.svg
@@ -0,0 +1,449 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-mail.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-mail.svg
new file mode 100644
index 000000000..994c433c3
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-mail.svg
@@ -0,0 +1,409 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-msn.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-msn.svg
new file mode 100644
index 000000000..36f88fbc9
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-msn.svg
@@ -0,0 +1,168 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-pubsub.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-pubsub.svg
new file mode 100644
index 000000000..7d7b2e820
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-pubsub.svg
@@ -0,0 +1,398 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-rss.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-rss.svg
new file mode 100644
index 000000000..f30d2cce7
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-rss.svg
@@ -0,0 +1,233 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-sip.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-sip.svg
new file mode 100644
index 000000000..0dfed96c8
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-sip.svg
@@ -0,0 +1,239 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-sms.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-sms.svg
new file mode 100644
index 000000000..098cb48f6
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-sms.svg
@@ -0,0 +1,718 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-tv.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-tv.svg
new file mode 100644
index 000000000..c5d26875e
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-tv.svg
@@ -0,0 +1,269 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-weather.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-weather.svg
new file mode 100644
index 000000000..5a4bdb7e7
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-weather.svg
@@ -0,0 +1,216 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-yahoo.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-yahoo.svg
new file mode 100644
index 000000000..f94d34a15
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-agent-yahoo.svg
@@ -0,0 +1,204 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-chat_msg_recv.svg b/gajim/data/icons/hicolor/scalable/status/gajim-chat_msg_recv.svg
new file mode 100644
index 000000000..e426c0232
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-chat_msg_recv.svg
@@ -0,0 +1,519 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-connection_lost.svg b/gajim/data/icons/hicolor/scalable/status/gajim-connection_lost.svg
new file mode 100644
index 000000000..24987e245
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-connection_lost.svg
@@ -0,0 +1,1161 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-ft_done.svg b/gajim/data/icons/hicolor/scalable/status/gajim-ft_done.svg
new file mode 100644
index 000000000..7f21c4145
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-ft_done.svg
@@ -0,0 +1,694 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-ft_error.svg b/gajim/data/icons/hicolor/scalable/status/gajim-ft_error.svg
new file mode 100644
index 000000000..253aa886d
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-ft_error.svg
@@ -0,0 +1,366 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-ft_request.svg b/gajim/data/icons/hicolor/scalable/status/gajim-ft_request.svg
new file mode 100644
index 000000000..0737ff2b6
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-ft_request.svg
@@ -0,0 +1,321 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-ft_stopped.svg b/gajim/data/icons/hicolor/scalable/status/gajim-ft_stopped.svg
new file mode 100644
index 000000000..ff86427ea
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-ft_stopped.svg
@@ -0,0 +1,390 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-ft_stopsvg.svg b/gajim/data/icons/hicolor/scalable/status/gajim-ft_stopsvg.svg
new file mode 100644
index 000000000..ff86427ea
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-ft_stopsvg.svg
@@ -0,0 +1,390 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-gc_invitation.svg b/gajim/data/icons/hicolor/scalable/status/gajim-gc_invitation.svg
new file mode 100644
index 000000000..bdb2a2bc6
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-gc_invitation.svg
@@ -0,0 +1,1042 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-mail.svg b/gajim/data/icons/hicolor/scalable/status/gajim-mail.svg
new file mode 100644
index 000000000..994c433c3
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-mail.svg
@@ -0,0 +1,409 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-new_email_recv.svg b/gajim/data/icons/hicolor/scalable/status/gajim-new_email_recv.svg
new file mode 100644
index 000000000..5bad09252
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-new_email_recv.svg
@@ -0,0 +1,419 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-priv_msg_recv.svg b/gajim/data/icons/hicolor/scalable/status/gajim-priv_msg_recv.svg
new file mode 100644
index 000000000..27b3c8ca9
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-priv_msg_recv.svg
@@ -0,0 +1,463 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-single_msg_recv.svg b/gajim/data/icons/hicolor/scalable/status/gajim-single_msg_recv.svg
new file mode 100644
index 000000000..1a9bcb6ea
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-single_msg_recv.svg
@@ -0,0 +1,433 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-subscribe.svg b/gajim/data/icons/hicolor/scalable/status/gajim-subscribe.svg
new file mode 100644
index 000000000..23eafdb45
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-subscribe.svg
@@ -0,0 +1,1121 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-unsubscribe.svg b/gajim/data/icons/hicolor/scalable/status/gajim-unsubscribe.svg
new file mode 100644
index 000000000..45589fa8e
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/gajim-unsubscribe.svg
@@ -0,0 +1,991 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/sun-away.svg b/gajim/data/icons/hicolor/scalable/status/sun-away.svg
new file mode 100644
index 000000000..f025e0b4c
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/sun-away.svg
@@ -0,0 +1,1142 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/sun-chat.svg b/gajim/data/icons/hicolor/scalable/status/sun-chat.svg
new file mode 100644
index 000000000..a9f0018ad
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/sun-chat.svg
@@ -0,0 +1,833 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/sun-dnd.svg b/gajim/data/icons/hicolor/scalable/status/sun-dnd.svg
new file mode 100644
index 000000000..df097f519
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/sun-dnd.svg
@@ -0,0 +1,576 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/sun-error.svg b/gajim/data/icons/hicolor/scalable/status/sun-error.svg
new file mode 100644
index 000000000..1547b278c
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/sun-error.svg
@@ -0,0 +1,1590 @@
+
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/sun-invisible.svg b/gajim/data/icons/hicolor/scalable/status/sun-invisible.svg
new file mode 100644
index 000000000..3dea04d5e
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/sun-invisible.svg
@@ -0,0 +1,805 @@
+
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/sun-not_in_roster.svg b/gajim/data/icons/hicolor/scalable/status/sun-not_in_roster.svg
new file mode 100644
index 000000000..a0b2e5d73
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/sun-not_in_roster.svg
@@ -0,0 +1,1030 @@
+
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/sun-offline.svg b/gajim/data/icons/hicolor/scalable/status/sun-offline.svg
new file mode 100644
index 000000000..b9bbc1113
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/sun-offline.svg
@@ -0,0 +1,150 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/sun-online.svg b/gajim/data/icons/hicolor/scalable/status/sun-online.svg
new file mode 100644
index 000000000..b95ad7d42
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/sun-online.svg
@@ -0,0 +1,792 @@
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/sun-requested.svg b/gajim/data/icons/hicolor/scalable/status/sun-requested.svg
new file mode 100644
index 000000000..cf5280fb4
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/sun-requested.svg
@@ -0,0 +1,922 @@
+
+
+
+
diff --git a/gajim/data/icons/hicolor/scalable/status/sun-xa.svg b/gajim/data/icons/hicolor/scalable/status/sun-xa.svg
new file mode 100644
index 000000000..a4660153d
--- /dev/null
+++ b/gajim/data/icons/hicolor/scalable/status/sun-xa.svg
@@ -0,0 +1,679 @@
+
+
+