diff --git a/elementary-xfce-dark/panel/16/applications-chat-panel.svg b/elementary-xfce-dark/panel/16/applications-chat-panel.svg
deleted file mode 120000
index c60c9bb01..000000000
--- a/elementary-xfce-dark/panel/16/applications-chat-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-available-panel.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/empathy-pending.svg b/elementary-xfce-dark/panel/16/empathy-pending.svg
deleted file mode 120000
index 9c653fa64..000000000
--- a/elementary-xfce-dark/panel/16/empathy-pending.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-status-pending.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/im-message-new.svg b/elementary-xfce-dark/panel/16/im-message-new.svg
deleted file mode 100644
index 3c532a205..000000000
--- a/elementary-xfce-dark/panel/16/im-message-new.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
diff --git a/elementary-xfce-dark/panel/16/pidgin-tray-available.svg b/elementary-xfce-dark/panel/16/pidgin-tray-available.svg
deleted file mode 120000
index 1d537a4d6..000000000
--- a/elementary-xfce-dark/panel/16/pidgin-tray-available.svg
+++ /dev/null
@@ -1 +0,0 @@
-empathy-available.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/pidgin-tray-away.svg b/elementary-xfce-dark/panel/16/pidgin-tray-away.svg
deleted file mode 120000
index 9caa5c715..000000000
--- a/elementary-xfce-dark/panel/16/pidgin-tray-away.svg
+++ /dev/null
@@ -1 +0,0 @@
-empathy-away.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/pidgin-tray-busy.svg b/elementary-xfce-dark/panel/16/pidgin-tray-busy.svg
deleted file mode 120000
index 6fe4cc2b3..000000000
--- a/elementary-xfce-dark/panel/16/pidgin-tray-busy.svg
+++ /dev/null
@@ -1 +0,0 @@
-empathy-busy.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/pidgin-tray-email.svg b/elementary-xfce-dark/panel/16/pidgin-tray-email.svg
deleted file mode 120000
index 9b4e5fb57..000000000
--- a/elementary-xfce-dark/panel/16/pidgin-tray-email.svg
+++ /dev/null
@@ -1 +0,0 @@
-im-message-new.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/pidgin-tray-offline.svg b/elementary-xfce-dark/panel/16/pidgin-tray-offline.svg
deleted file mode 120000
index 838b838d7..000000000
--- a/elementary-xfce-dark/panel/16/pidgin-tray-offline.svg
+++ /dev/null
@@ -1 +0,0 @@
-empathy-offline.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/pidgin-tray-pending.svg b/elementary-xfce-dark/panel/16/pidgin-tray-pending.svg
deleted file mode 120000
index 9b4e5fb57..000000000
--- a/elementary-xfce-dark/panel/16/pidgin-tray-pending.svg
+++ /dev/null
@@ -1 +0,0 @@
-im-message-new.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/pidgin-tray-xa.svg b/elementary-xfce-dark/panel/16/pidgin-tray-xa.svg
deleted file mode 120000
index 9caa5c715..000000000
--- a/elementary-xfce-dark/panel/16/pidgin-tray-xa.svg
+++ /dev/null
@@ -1 +0,0 @@
-empathy-away.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/user-available.svg b/elementary-xfce-dark/panel/16/user-available.svg
deleted file mode 100644
index e690b2709..000000000
--- a/elementary-xfce-dark/panel/16/user-available.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
diff --git a/elementary-xfce-dark/panel/16/user-away.svg b/elementary-xfce-dark/panel/16/user-away.svg
deleted file mode 100644
index 5faaec908..000000000
--- a/elementary-xfce-dark/panel/16/user-away.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
diff --git a/elementary-xfce-dark/panel/16/user-busy.svg b/elementary-xfce-dark/panel/16/user-busy.svg
deleted file mode 100644
index 3c27816ec..000000000
--- a/elementary-xfce-dark/panel/16/user-busy.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
diff --git a/elementary-xfce-dark/panel/16/user-idle-panel.svg b/elementary-xfce-dark/panel/16/user-idle-panel.svg
deleted file mode 120000
index 5b852efc6..000000000
--- a/elementary-xfce-dark/panel/16/user-idle-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-idle.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/user-idle.svg b/elementary-xfce-dark/panel/16/user-idle.svg
deleted file mode 100644
index a529f05d7..000000000
--- a/elementary-xfce-dark/panel/16/user-idle.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
diff --git a/elementary-xfce-dark/panel/16/user-invisible-panel.svg b/elementary-xfce-dark/panel/16/user-invisible-panel.svg
deleted file mode 120000
index cbe782f3e..000000000
--- a/elementary-xfce-dark/panel/16/user-invisible-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-invisible.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/user-invisible.svg b/elementary-xfce-dark/panel/16/user-invisible.svg
deleted file mode 100644
index 2f69ef21f..000000000
--- a/elementary-xfce-dark/panel/16/user-invisible.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
diff --git a/elementary-xfce-dark/panel/16/user-offline.svg b/elementary-xfce-dark/panel/16/user-offline.svg
deleted file mode 100644
index 8735fca11..000000000
--- a/elementary-xfce-dark/panel/16/user-offline.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
diff --git a/elementary-xfce-dark/panel/16/user-status-pending-panel.svg b/elementary-xfce-dark/panel/16/user-status-pending-panel.svg
deleted file mode 120000
index 9c653fa64..000000000
--- a/elementary-xfce-dark/panel/16/user-status-pending-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-status-pending.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/user-status-pending.svg b/elementary-xfce-dark/panel/16/user-status-pending.svg
deleted file mode 100644
index d28987bf7..000000000
--- a/elementary-xfce-dark/panel/16/user-status-pending.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
diff --git a/elementary-xfce/panel/16/applications-chat-panel.svg b/elementary-xfce/panel/16/applications-chat-panel.svg
deleted file mode 120000
index c60c9bb01..000000000
--- a/elementary-xfce/panel/16/applications-chat-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-available-panel.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/empathy-available.svg b/elementary-xfce/panel/16/empathy-available.svg
deleted file mode 120000
index 1bbb5c839..000000000
--- a/elementary-xfce/panel/16/empathy-available.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-available.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/empathy-busy.svg b/elementary-xfce/panel/16/empathy-busy.svg
deleted file mode 120000
index ce0d3d7f7..000000000
--- a/elementary-xfce/panel/16/empathy-busy.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-busy.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/empathy-offline.svg b/elementary-xfce/panel/16/empathy-offline.svg
deleted file mode 120000
index 3d0c6dcba..000000000
--- a/elementary-xfce/panel/16/empathy-offline.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-offline.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/empathy-pending.svg b/elementary-xfce/panel/16/empathy-pending.svg
deleted file mode 120000
index 9c653fa64..000000000
--- a/elementary-xfce/panel/16/empathy-pending.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-status-pending.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/im-message-new.svg b/elementary-xfce/panel/16/im-message-new.svg
deleted file mode 100644
index a5bbb6e23..000000000
--- a/elementary-xfce/panel/16/im-message-new.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
diff --git a/elementary-xfce/panel/16/pidgin-tray-available.svg b/elementary-xfce/panel/16/pidgin-tray-available.svg
deleted file mode 120000
index 1d537a4d6..000000000
--- a/elementary-xfce/panel/16/pidgin-tray-available.svg
+++ /dev/null
@@ -1 +0,0 @@
-empathy-available.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/pidgin-tray-away.svg b/elementary-xfce/panel/16/pidgin-tray-away.svg
deleted file mode 120000
index 9caa5c715..000000000
--- a/elementary-xfce/panel/16/pidgin-tray-away.svg
+++ /dev/null
@@ -1 +0,0 @@
-empathy-away.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/pidgin-tray-busy.svg b/elementary-xfce/panel/16/pidgin-tray-busy.svg
deleted file mode 120000
index 6fe4cc2b3..000000000
--- a/elementary-xfce/panel/16/pidgin-tray-busy.svg
+++ /dev/null
@@ -1 +0,0 @@
-empathy-busy.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/pidgin-tray-email.svg b/elementary-xfce/panel/16/pidgin-tray-email.svg
deleted file mode 120000
index 9b4e5fb57..000000000
--- a/elementary-xfce/panel/16/pidgin-tray-email.svg
+++ /dev/null
@@ -1 +0,0 @@
-im-message-new.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/pidgin-tray-offline.svg b/elementary-xfce/panel/16/pidgin-tray-offline.svg
deleted file mode 120000
index 838b838d7..000000000
--- a/elementary-xfce/panel/16/pidgin-tray-offline.svg
+++ /dev/null
@@ -1 +0,0 @@
-empathy-offline.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/pidgin-tray-pending.svg b/elementary-xfce/panel/16/pidgin-tray-pending.svg
deleted file mode 120000
index 9b4e5fb57..000000000
--- a/elementary-xfce/panel/16/pidgin-tray-pending.svg
+++ /dev/null
@@ -1 +0,0 @@
-im-message-new.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/pidgin-tray-xa.svg b/elementary-xfce/panel/16/pidgin-tray-xa.svg
deleted file mode 120000
index 9caa5c715..000000000
--- a/elementary-xfce/panel/16/pidgin-tray-xa.svg
+++ /dev/null
@@ -1 +0,0 @@
-empathy-away.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/user-available-panel.svg b/elementary-xfce/panel/16/user-available-panel.svg
deleted file mode 120000
index 1bbb5c839..000000000
--- a/elementary-xfce/panel/16/user-available-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-available.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/user-available.svg b/elementary-xfce/panel/16/user-available.svg
deleted file mode 100644
index d727b12dc..000000000
--- a/elementary-xfce/panel/16/user-available.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
diff --git a/elementary-xfce/panel/16/user-away-panel.svg b/elementary-xfce/panel/16/user-away-panel.svg
deleted file mode 120000
index d0a56fad1..000000000
--- a/elementary-xfce/panel/16/user-away-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-away.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/user-away.svg b/elementary-xfce/panel/16/user-away.svg
deleted file mode 100644
index a248ade53..000000000
--- a/elementary-xfce/panel/16/user-away.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
diff --git a/elementary-xfce/panel/16/user-busy-panel.svg b/elementary-xfce/panel/16/user-busy-panel.svg
deleted file mode 120000
index ce0d3d7f7..000000000
--- a/elementary-xfce/panel/16/user-busy-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-busy.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/user-busy.svg b/elementary-xfce/panel/16/user-busy.svg
deleted file mode 100644
index 92c3a338f..000000000
--- a/elementary-xfce/panel/16/user-busy.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
diff --git a/elementary-xfce/panel/16/user-idle-panel.svg b/elementary-xfce/panel/16/user-idle-panel.svg
deleted file mode 120000
index 5b852efc6..000000000
--- a/elementary-xfce/panel/16/user-idle-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-idle.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/user-idle.svg b/elementary-xfce/panel/16/user-idle.svg
deleted file mode 100644
index 00dd60641..000000000
--- a/elementary-xfce/panel/16/user-idle.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
diff --git a/elementary-xfce/panel/16/user-invisible-panel.svg b/elementary-xfce/panel/16/user-invisible-panel.svg
deleted file mode 120000
index cbe782f3e..000000000
--- a/elementary-xfce/panel/16/user-invisible-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-invisible.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/user-invisible.svg b/elementary-xfce/panel/16/user-invisible.svg
deleted file mode 100644
index 56735f8c7..000000000
--- a/elementary-xfce/panel/16/user-invisible.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
diff --git a/elementary-xfce/panel/16/user-offline-panel.svg b/elementary-xfce/panel/16/user-offline-panel.svg
deleted file mode 120000
index 3d0c6dcba..000000000
--- a/elementary-xfce/panel/16/user-offline-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-offline.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/user-offline.svg b/elementary-xfce/panel/16/user-offline.svg
deleted file mode 100644
index 1b2cb3b86..000000000
--- a/elementary-xfce/panel/16/user-offline.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
diff --git a/elementary-xfce/panel/16/user-status-pending-panel.svg b/elementary-xfce/panel/16/user-status-pending-panel.svg
deleted file mode 120000
index 9c653fa64..000000000
--- a/elementary-xfce/panel/16/user-status-pending-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-status-pending.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/user-status-pending.svg b/elementary-xfce/panel/16/user-status-pending.svg
deleted file mode 100644
index b1be5ab4e..000000000
--- a/elementary-xfce/panel/16/user-status-pending.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
diff --git a/elementary-xfce/panel/22/applications-chat-panel.svg b/elementary-xfce/panel/22/applications-chat-panel.svg
deleted file mode 120000
index c60c9bb01..000000000
--- a/elementary-xfce/panel/22/applications-chat-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-available-panel.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/22/user-available-panel.svg b/elementary-xfce/panel/22/user-available-panel.svg
deleted file mode 100644
index ab622ce8b..000000000
--- a/elementary-xfce/panel/22/user-available-panel.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
diff --git a/elementary-xfce/panel/22/user-away-panel.svg b/elementary-xfce/panel/22/user-away-panel.svg
deleted file mode 100644
index 5c3f196f4..000000000
--- a/elementary-xfce/panel/22/user-away-panel.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
diff --git a/elementary-xfce/panel/22/user-busy-panel.svg b/elementary-xfce/panel/22/user-busy-panel.svg
deleted file mode 100644
index b37d192d4..000000000
--- a/elementary-xfce/panel/22/user-busy-panel.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
diff --git a/elementary-xfce/panel/22/user-idle-panel.svg b/elementary-xfce/panel/22/user-idle-panel.svg
deleted file mode 100644
index d2ff7bfaa..000000000
--- a/elementary-xfce/panel/22/user-idle-panel.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
diff --git a/elementary-xfce/panel/22/user-invisible-panel.svg b/elementary-xfce/panel/22/user-invisible-panel.svg
deleted file mode 100644
index 18f0ffd9f..000000000
--- a/elementary-xfce/panel/22/user-invisible-panel.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
diff --git a/elementary-xfce/panel/22/user-offline-panel.svg b/elementary-xfce/panel/22/user-offline-panel.svg
deleted file mode 100644
index d51f06b5a..000000000
--- a/elementary-xfce/panel/22/user-offline-panel.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
diff --git a/elementary-xfce/panel/24/applications-chat-panel.svg b/elementary-xfce/panel/24/applications-chat-panel.svg
deleted file mode 120000
index c60c9bb01..000000000
--- a/elementary-xfce/panel/24/applications-chat-panel.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-available-panel.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/24/user-available-panel.svg b/elementary-xfce/panel/24/user-available-panel.svg
deleted file mode 100644
index 72e1a837f..000000000
--- a/elementary-xfce/panel/24/user-available-panel.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
diff --git a/elementary-xfce-dark/panel/16/empathy-available.svg b/elementary-xfce/status/16/pidgin-tray-available.svg
similarity index 100%
rename from elementary-xfce-dark/panel/16/empathy-available.svg
rename to elementary-xfce/status/16/pidgin-tray-available.svg
diff --git a/elementary-xfce-dark/panel/16/empathy-away.svg b/elementary-xfce/status/16/pidgin-tray-away.svg
similarity index 100%
rename from elementary-xfce-dark/panel/16/empathy-away.svg
rename to elementary-xfce/status/16/pidgin-tray-away.svg
diff --git a/elementary-xfce-dark/panel/16/empathy-busy.svg b/elementary-xfce/status/16/pidgin-tray-busy.svg
similarity index 100%
rename from elementary-xfce-dark/panel/16/empathy-busy.svg
rename to elementary-xfce/status/16/pidgin-tray-busy.svg
diff --git a/elementary-xfce-dark/panel/16/pidgin-tray-invisible.svg b/elementary-xfce/status/16/pidgin-tray-invisible.svg
similarity index 100%
rename from elementary-xfce-dark/panel/16/pidgin-tray-invisible.svg
rename to elementary-xfce/status/16/pidgin-tray-invisible.svg
diff --git a/elementary-xfce-dark/panel/16/empathy-offline.svg b/elementary-xfce/status/16/pidgin-tray-offline.svg
similarity index 100%
rename from elementary-xfce-dark/panel/16/empathy-offline.svg
rename to elementary-xfce/status/16/pidgin-tray-offline.svg
diff --git a/elementary-xfce/status/16/pidgin-tray-pending.svg b/elementary-xfce/status/16/pidgin-tray-pending.svg
new file mode 120000
index 000000000..8f7e1857d
--- /dev/null
+++ b/elementary-xfce/status/16/pidgin-tray-pending.svg
@@ -0,0 +1 @@
+user-typing.svg
\ No newline at end of file
diff --git a/elementary-xfce-dark/panel/16/empathy-extended-away.svg b/elementary-xfce/status/16/pidgin-tray-xa.svg
similarity index 100%
rename from elementary-xfce-dark/panel/16/empathy-extended-away.svg
rename to elementary-xfce/status/16/pidgin-tray-xa.svg
diff --git a/elementary-xfce/status/16/user-available.svg b/elementary-xfce/status/16/user-available.svg
index 763a74669..49707144b 100644
--- a/elementary-xfce/status/16/user-available.svg
+++ b/elementary-xfce/status/16/user-available.svg
@@ -1,97 +1,113 @@
diff --git a/elementary-xfce/status/16/user-away.svg b/elementary-xfce/status/16/user-away.svg
index 83b00dce6..cc8489efa 100644
--- a/elementary-xfce/status/16/user-away.svg
+++ b/elementary-xfce/status/16/user-away.svg
@@ -1,88 +1,121 @@
diff --git a/elementary-xfce/status/16/user-busy.svg b/elementary-xfce/status/16/user-busy.svg
index 06773b526..fa4b28440 100644
--- a/elementary-xfce/status/16/user-busy.svg
+++ b/elementary-xfce/status/16/user-busy.svg
@@ -1,210 +1,131 @@
diff --git a/elementary-xfce/status/16/user-invisible.svg b/elementary-xfce/status/16/user-invisible.svg
index 98b50a524..0dfd97ab3 100644
--- a/elementary-xfce/status/16/user-invisible.svg
+++ b/elementary-xfce/status/16/user-invisible.svg
@@ -1,93 +1,113 @@
diff --git a/elementary-xfce/status/16/user-offline.svg b/elementary-xfce/status/16/user-offline.svg
index da4d23914..f8b628c84 100644
--- a/elementary-xfce/status/16/user-offline.svg
+++ b/elementary-xfce/status/16/user-offline.svg
@@ -1,173 +1,122 @@
diff --git a/elementary-xfce/status/16/user-typing.svg b/elementary-xfce/status/16/user-typing.svg
index 96aa1b024..384325a6e 100644
--- a/elementary-xfce/status/16/user-typing.svg
+++ b/elementary-xfce/status/16/user-typing.svg
@@ -1,15 +1,38 @@
diff --git a/elementary-xfce-dark/panel/16/user-available-panel.svg b/elementary-xfce/status/24/pidgin-tray-available.svg
similarity index 100%
rename from elementary-xfce-dark/panel/16/user-available-panel.svg
rename to elementary-xfce/status/24/pidgin-tray-available.svg
diff --git a/elementary-xfce-dark/panel/16/user-away-panel.svg b/elementary-xfce/status/24/pidgin-tray-away.svg
similarity index 100%
rename from elementary-xfce-dark/panel/16/user-away-panel.svg
rename to elementary-xfce/status/24/pidgin-tray-away.svg
diff --git a/elementary-xfce-dark/panel/16/user-busy-panel.svg b/elementary-xfce/status/24/pidgin-tray-busy.svg
similarity index 100%
rename from elementary-xfce-dark/panel/16/user-busy-panel.svg
rename to elementary-xfce/status/24/pidgin-tray-busy.svg
diff --git a/elementary-xfce/panel/16/pidgin-tray-invisible.svg b/elementary-xfce/status/24/pidgin-tray-invisible.svg
similarity index 100%
rename from elementary-xfce/panel/16/pidgin-tray-invisible.svg
rename to elementary-xfce/status/24/pidgin-tray-invisible.svg
diff --git a/elementary-xfce-dark/panel/16/user-offline-panel.svg b/elementary-xfce/status/24/pidgin-tray-offline.svg
similarity index 100%
rename from elementary-xfce-dark/panel/16/user-offline-panel.svg
rename to elementary-xfce/status/24/pidgin-tray-offline.svg
diff --git a/elementary-xfce/status/24/pidgin-tray-pending.svg b/elementary-xfce/status/24/pidgin-tray-pending.svg
new file mode 120000
index 000000000..8f7e1857d
--- /dev/null
+++ b/elementary-xfce/status/24/pidgin-tray-pending.svg
@@ -0,0 +1 @@
+user-typing.svg
\ No newline at end of file
diff --git a/elementary-xfce/panel/16/empathy-away.svg b/elementary-xfce/status/24/pidgin-tray-xa.svg
similarity index 100%
rename from elementary-xfce/panel/16/empathy-away.svg
rename to elementary-xfce/status/24/pidgin-tray-xa.svg
diff --git a/elementary-xfce/status/24/user-available.svg b/elementary-xfce/status/24/user-available.svg
index 19f4540c7..61745abcb 100644
--- a/elementary-xfce/status/24/user-available.svg
+++ b/elementary-xfce/status/24/user-available.svg
@@ -1,117 +1,138 @@
diff --git a/elementary-xfce/status/24/user-away.svg b/elementary-xfce/status/24/user-away.svg
index c06f8bb5b..59de8b0e2 100644
--- a/elementary-xfce/status/24/user-away.svg
+++ b/elementary-xfce/status/24/user-away.svg
@@ -1,117 +1,146 @@
diff --git a/elementary-xfce/status/24/user-busy.svg b/elementary-xfce/status/24/user-busy.svg
index f3bc472a4..18d7c0447 100644
--- a/elementary-xfce/status/24/user-busy.svg
+++ b/elementary-xfce/status/24/user-busy.svg
@@ -1,117 +1,156 @@
diff --git a/elementary-xfce/panel/16/empathy-extended-away.svg b/elementary-xfce/status/24/user-idle.svg
similarity index 100%
rename from elementary-xfce/panel/16/empathy-extended-away.svg
rename to elementary-xfce/status/24/user-idle.svg
diff --git a/elementary-xfce/status/24/user-invisible.svg b/elementary-xfce/status/24/user-invisible.svg
new file mode 100644
index 000000000..1ef79466a
--- /dev/null
+++ b/elementary-xfce/status/24/user-invisible.svg
@@ -0,0 +1,138 @@
+
+
diff --git a/elementary-xfce/status/24/user-offline.svg b/elementary-xfce/status/24/user-offline.svg
index e42a474b8..219b761e1 100644
--- a/elementary-xfce/status/24/user-offline.svg
+++ b/elementary-xfce/status/24/user-offline.svg
@@ -1,117 +1,147 @@
diff --git a/elementary-xfce/status/24/user-typing.svg b/elementary-xfce/status/24/user-typing.svg
new file mode 100644
index 000000000..edbbb16bc
--- /dev/null
+++ b/elementary-xfce/status/24/user-typing.svg
@@ -0,0 +1,161 @@
+
+