diff --git a/links/status/16/appointment-recurring.svg b/links/status/16/appointment-recurring.svg
index 06ab9d18..badbc28d 120000
--- a/links/status/16/appointment-recurring.svg
+++ b/links/status/16/appointment-recurring.svg
@@ -1 +1 @@
-../../actions/16/view-refresh.svg
\ No newline at end of file
+system-reboot.svg
\ No newline at end of file
diff --git a/links/status/16/appointment-reminder.svg b/links/status/16/appointment-reminder.svg
index 86664b25..a3677aed 120000
--- a/links/status/16/appointment-reminder.svg
+++ b/links/status/16/appointment-reminder.svg
@@ -1 +1 @@
-../../actions/16/notifications.svg
\ No newline at end of file
+notification-inactive.svg
\ No newline at end of file
diff --git a/links/status/16/irc-channel-joined.svg b/links/status/16/irc-channel-joined.svg
deleted file mode 120000
index a714d53e..00000000
--- a/links/status/16/irc-channel-joined.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/16/irc-channel-active.svg
\ No newline at end of file
diff --git a/links/status/16/irc-channel-parted.svg b/links/status/16/irc-channel-parted.svg
deleted file mode 120000
index b58aba64..00000000
--- a/links/status/16/irc-channel-parted.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/16/irc-channel-inactive.svg
\ No newline at end of file
diff --git a/links/status/16/pidgin-tray-away.svg b/links/status/16/pidgin-tray-away.svg
index c26c40ee..d0a56fad 120000
--- a/links/status/16/pidgin-tray-away.svg
+++ b/links/status/16/pidgin-tray-away.svg
@@ -1 +1 @@
-../../actions/16/im-user-away.svg
\ No newline at end of file
+user-away.svg
\ No newline at end of file
diff --git a/links/status/16/pidgin-tray-busy.svg b/links/status/16/pidgin-tray-busy.svg
index def4f485..ce0d3d7f 120000
--- a/links/status/16/pidgin-tray-busy.svg
+++ b/links/status/16/pidgin-tray-busy.svg
@@ -1 +1 @@
-../../actions/16/im-user-busy.svg
\ No newline at end of file
+user-busy.svg
\ No newline at end of file
diff --git a/links/status/16/pidgin-tray-email.svg b/links/status/16/pidgin-tray-email.svg
deleted file mode 120000
index f1279de1..00000000
--- a/links/status/16/pidgin-tray-email.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/16/mail-mark-unread.svg
\ No newline at end of file
diff --git a/links/status/16/pidgin-tray-invisible.svg b/links/status/16/pidgin-tray-invisible.svg
index 92e2b2e5..cbe782f3 120000
--- a/links/status/16/pidgin-tray-invisible.svg
+++ b/links/status/16/pidgin-tray-invisible.svg
@@ -1 +1 @@
-../../actions/16/im-invisible-user.svg
\ No newline at end of file
+user-invisible.svg
\ No newline at end of file
diff --git a/links/status/16/pidgin-tray-offline.svg b/links/status/16/pidgin-tray-offline.svg
index a6ddc7ee..3d0c6dcb 120000
--- a/links/status/16/pidgin-tray-offline.svg
+++ b/links/status/16/pidgin-tray-offline.svg
@@ -1 +1 @@
-../../actions/16/im-user-offline.svg
\ No newline at end of file
+user-offline.svg
\ No newline at end of file
diff --git a/links/status/16/task-recurring.svg b/links/status/16/task-recurring.svg
index 06ab9d18..badbc28d 120000
--- a/links/status/16/task-recurring.svg
+++ b/links/status/16/task-recurring.svg
@@ -1 +1 @@
-../../actions/16/view-refresh.svg
\ No newline at end of file
+system-reboot.svg
\ No newline at end of file
diff --git a/links/status/16/task-reminder.svg b/links/status/16/task-reminder.svg
index 86664b25..a3677aed 120000
--- a/links/status/16/task-reminder.svg
+++ b/links/status/16/task-reminder.svg
@@ -1 +1 @@
-../../actions/16/notifications.svg
\ No newline at end of file
+notification-inactive.svg
\ No newline at end of file
diff --git a/links/status/16/user-away.svg b/links/status/16/user-away.svg
deleted file mode 120000
index c26c40ee..00000000
--- a/links/status/16/user-away.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/16/im-user-away.svg
\ No newline at end of file
diff --git a/links/status/16/user-busy.svg b/links/status/16/user-busy.svg
deleted file mode 120000
index def4f485..00000000
--- a/links/status/16/user-busy.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/16/im-user-busy.svg
\ No newline at end of file
diff --git a/links/status/16/user-invisible.svg b/links/status/16/user-invisible.svg
deleted file mode 120000
index 92e2b2e5..00000000
--- a/links/status/16/user-invisible.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/16/im-invisible-user.svg
\ No newline at end of file
diff --git a/links/status/16/user-offline.svg b/links/status/16/user-offline.svg
deleted file mode 120000
index a6ddc7ee..00000000
--- a/links/status/16/user-offline.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/16/im-user-offline.svg
\ No newline at end of file
diff --git a/links/status/16/user-online.svg b/links/status/16/user-online.svg
deleted file mode 120000
index 630d5e06..00000000
--- a/links/status/16/user-online.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/16/im-user-online.svg
\ No newline at end of file
diff --git a/links/status/22/appointment-recurring.svg b/links/status/22/appointment-recurring.svg
index 67cfa4ca..badbc28d 120000
--- a/links/status/22/appointment-recurring.svg
+++ b/links/status/22/appointment-recurring.svg
@@ -1 +1 @@
-../../actions/22/view-refresh.svg
\ No newline at end of file
+system-reboot.svg
\ No newline at end of file
diff --git a/links/status/22/appointment-reminder.svg b/links/status/22/appointment-reminder.svg
index 5ab003fa..a3677aed 120000
--- a/links/status/22/appointment-reminder.svg
+++ b/links/status/22/appointment-reminder.svg
@@ -1 +1 @@
-../../actions/22/notifications.svg
\ No newline at end of file
+notification-inactive.svg
\ No newline at end of file
diff --git a/links/status/22/irc-channel-joined.svg b/links/status/22/irc-channel-joined.svg
deleted file mode 120000
index 2cea55cc..00000000
--- a/links/status/22/irc-channel-joined.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/22/irc-channel-active.svg
\ No newline at end of file
diff --git a/links/status/22/irc-channel-parted.svg b/links/status/22/irc-channel-parted.svg
deleted file mode 120000
index a8d3de83..00000000
--- a/links/status/22/irc-channel-parted.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/22/irc-channel-inactive.svg
\ No newline at end of file
diff --git a/links/status/22/script-error.svg b/links/status/22/script-error.svg
deleted file mode 120000
index a8c351a5..00000000
--- a/links/status/22/script-error.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/22/tools-report-bug.svg
\ No newline at end of file
diff --git a/links/status/22/task-recurring.svg b/links/status/22/task-recurring.svg
index 67cfa4ca..badbc28d 120000
--- a/links/status/22/task-recurring.svg
+++ b/links/status/22/task-recurring.svg
@@ -1 +1 @@
-../../actions/22/view-refresh.svg
\ No newline at end of file
+system-reboot.svg
\ No newline at end of file
diff --git a/links/status/22/task-reminder.svg b/links/status/22/task-reminder.svg
index 5ab003fa..a3677aed 120000
--- a/links/status/22/task-reminder.svg
+++ b/links/status/22/task-reminder.svg
@@ -1 +1 @@
-../../actions/22/notifications.svg
\ No newline at end of file
+notification-inactive.svg
\ No newline at end of file
diff --git a/links/status/22/user-available.svg b/links/status/22/user-available.svg
deleted file mode 120000
index 5706c2b2..00000000
--- a/links/status/22/user-available.svg
+++ /dev/null
@@ -1 +0,0 @@
-user-online.svg
\ No newline at end of file
diff --git a/links/status/22/user-away.svg b/links/status/22/user-away.svg
deleted file mode 120000
index 64fe1c51..00000000
--- a/links/status/22/user-away.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/22/im-user-away.svg
\ No newline at end of file
diff --git a/links/status/22/user-busy.svg b/links/status/22/user-busy.svg
deleted file mode 120000
index 32361179..00000000
--- a/links/status/22/user-busy.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/22/im-user-busy.svg
\ No newline at end of file
diff --git a/links/status/22/user-invisible.svg b/links/status/22/user-invisible.svg
deleted file mode 120000
index cfdaa110..00000000
--- a/links/status/22/user-invisible.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/22/im-invisible-user.svg
\ No newline at end of file
diff --git a/links/status/22/user-offline.svg b/links/status/22/user-offline.svg
deleted file mode 120000
index 24fdd455..00000000
--- a/links/status/22/user-offline.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/22/im-user-offline.svg
\ No newline at end of file
diff --git a/links/status/22/user-online.svg b/links/status/22/user-online.svg
deleted file mode 120000
index dd038fb6..00000000
--- a/links/status/22/user-online.svg
+++ /dev/null
@@ -1 +0,0 @@
-../../actions/22/im-user-online.svg
\ No newline at end of file
diff --git a/src/actions/16/system-shutdown.svg b/src/actions/16/system-shutdown.svg
new file mode 100644
index 00000000..e79ba9b9
--- /dev/null
+++ b/src/actions/16/system-shutdown.svg
@@ -0,0 +1,11 @@
+
diff --git a/src/status/16/irc-channel-joined.svg b/src/status/16/irc-channel-joined.svg
new file mode 100644
index 00000000..74126608
--- /dev/null
+++ b/src/status/16/irc-channel-joined.svg
@@ -0,0 +1,20 @@
+
diff --git a/src/status/16/irc-channel-parted.svg b/src/status/16/irc-channel-parted.svg
new file mode 100644
index 00000000..aa654cc6
--- /dev/null
+++ b/src/status/16/irc-channel-parted.svg
@@ -0,0 +1,20 @@
+
diff --git a/src/status/16/pidgin-tray-email.svg b/src/status/16/pidgin-tray-email.svg
new file mode 100644
index 00000000..d497ffc7
--- /dev/null
+++ b/src/status/16/pidgin-tray-email.svg
@@ -0,0 +1,8 @@
+
diff --git a/src/status/16/user-away.svg b/src/status/16/user-away.svg
new file mode 100644
index 00000000..a7334a9a
--- /dev/null
+++ b/src/status/16/user-away.svg
@@ -0,0 +1,6 @@
+
diff --git a/src/status/16/user-busy.svg b/src/status/16/user-busy.svg
new file mode 100644
index 00000000..2665d864
--- /dev/null
+++ b/src/status/16/user-busy.svg
@@ -0,0 +1,4 @@
+
diff --git a/src/status/16/user-invisible.svg b/src/status/16/user-invisible.svg
new file mode 100644
index 00000000..47b387fc
--- /dev/null
+++ b/src/status/16/user-invisible.svg
@@ -0,0 +1,16 @@
+
diff --git a/src/status/16/user-offline.svg b/src/status/16/user-offline.svg
new file mode 100644
index 00000000..de51efa2
--- /dev/null
+++ b/src/status/16/user-offline.svg
@@ -0,0 +1,15 @@
+
diff --git a/src/status/16/user-online.svg b/src/status/16/user-online.svg
new file mode 100644
index 00000000..1acb8016
--- /dev/null
+++ b/src/status/16/user-online.svg
@@ -0,0 +1,9 @@
+
diff --git a/src/status/22/dialog-password.svg b/src/status/22/dialog-password.svg
index 11fac1d3..edaebccf 100644
--- a/src/status/22/dialog-password.svg
+++ b/src/status/22/dialog-password.svg
@@ -1,6 +1,6 @@
diff --git a/src/status/22/irc-channel-joined.svg b/src/status/22/irc-channel-joined.svg
new file mode 100644
index 00000000..9b41013b
--- /dev/null
+++ b/src/status/22/irc-channel-joined.svg
@@ -0,0 +1,18 @@
+
diff --git a/src/status/22/irc-channel-parted.svg b/src/status/22/irc-channel-parted.svg
new file mode 100644
index 00000000..c1e40efd
--- /dev/null
+++ b/src/status/22/irc-channel-parted.svg
@@ -0,0 +1,19 @@
+
diff --git a/src/status/22/script-error.svg b/src/status/22/script-error.svg
new file mode 100644
index 00000000..eabce449
--- /dev/null
+++ b/src/status/22/script-error.svg
@@ -0,0 +1,13 @@
+
diff --git a/src/status/22/user-away.svg b/src/status/22/user-away.svg
new file mode 100644
index 00000000..d99de845
--- /dev/null
+++ b/src/status/22/user-away.svg
@@ -0,0 +1,7 @@
+
diff --git a/src/status/22/user-busy.svg b/src/status/22/user-busy.svg
new file mode 100644
index 00000000..ce260314
--- /dev/null
+++ b/src/status/22/user-busy.svg
@@ -0,0 +1,7 @@
+
diff --git a/src/status/22/user-invisible.svg b/src/status/22/user-invisible.svg
new file mode 100644
index 00000000..fc8c5ab7
--- /dev/null
+++ b/src/status/22/user-invisible.svg
@@ -0,0 +1,17 @@
+
diff --git a/src/status/22/user-offline.svg b/src/status/22/user-offline.svg
new file mode 100644
index 00000000..5fd8d63a
--- /dev/null
+++ b/src/status/22/user-offline.svg
@@ -0,0 +1,17 @@
+
diff --git a/src/status/22/user-online.svg b/src/status/22/user-online.svg
new file mode 100644
index 00000000..0bc4758c
--- /dev/null
+++ b/src/status/22/user-online.svg
@@ -0,0 +1,10 @@
+