diff --git a/links/actions/16/org.xfce.settings.manager.svg b/links/actions/16/org.xfce.settings.manager.svg
new file mode 120000
index 00000000..998070b5
--- /dev/null
+++ b/links/actions/16/org.xfce.settings.manager.svg
@@ -0,0 +1 @@
+configure.svg
\ No newline at end of file
diff --git a/links/actions/16/xfce-system-settings.svg b/links/actions/16/xfce-system-settings.svg
new file mode 120000
index 00000000..998070b5
--- /dev/null
+++ b/links/actions/16/xfce-system-settings.svg
@@ -0,0 +1 @@
+configure.svg
\ No newline at end of file
diff --git a/links/actions/16/xfce4-settings.svg b/links/actions/16/xfce4-settings.svg
new file mode 120000
index 00000000..998070b5
--- /dev/null
+++ b/links/actions/16/xfce4-settings.svg
@@ -0,0 +1 @@
+configure.svg
\ No newline at end of file
diff --git a/links/actions/22/org.xfce.settings.manager.svg b/links/actions/22/org.xfce.settings.manager.svg
new file mode 120000
index 00000000..998070b5
--- /dev/null
+++ b/links/actions/22/org.xfce.settings.manager.svg
@@ -0,0 +1 @@
+configure.svg
\ No newline at end of file
diff --git a/links/actions/22/xfce-system-settings.svg b/links/actions/22/xfce-system-settings.svg
new file mode 120000
index 00000000..998070b5
--- /dev/null
+++ b/links/actions/22/xfce-system-settings.svg
@@ -0,0 +1 @@
+configure.svg
\ No newline at end of file
diff --git a/links/actions/22/xfce4-settings.svg b/links/actions/22/xfce4-settings.svg
new file mode 120000
index 00000000..998070b5
--- /dev/null
+++ b/links/actions/22/xfce4-settings.svg
@@ -0,0 +1 @@
+configure.svg
\ No newline at end of file
diff --git a/links/actions/24/org.xfce.settings.manager.svg b/links/actions/24/org.xfce.settings.manager.svg
new file mode 120000
index 00000000..998070b5
--- /dev/null
+++ b/links/actions/24/org.xfce.settings.manager.svg
@@ -0,0 +1 @@
+configure.svg
\ No newline at end of file
diff --git a/links/actions/24/xfce-system-settings.svg b/links/actions/24/xfce-system-settings.svg
new file mode 120000
index 00000000..998070b5
--- /dev/null
+++ b/links/actions/24/xfce-system-settings.svg
@@ -0,0 +1 @@
+configure.svg
\ No newline at end of file
diff --git a/links/actions/24/xfce4-settings.svg b/links/actions/24/xfce4-settings.svg
new file mode 120000
index 00000000..998070b5
--- /dev/null
+++ b/links/actions/24/xfce4-settings.svg
@@ -0,0 +1 @@
+configure.svg
\ No newline at end of file
diff --git a/links/places/16/org.xfce.panel.showdesktop.svg b/links/places/16/org.xfce.panel.showdesktop.svg
new file mode 120000
index 00000000..c720251f
--- /dev/null
+++ b/links/places/16/org.xfce.panel.showdesktop.svg
@@ -0,0 +1 @@
+desktop.svg
\ No newline at end of file
diff --git a/links/places/16/org.xfce.xfdesktop.svg b/links/places/16/org.xfce.xfdesktop.svg
new file mode 120000
index 00000000..c720251f
--- /dev/null
+++ b/links/places/16/org.xfce.xfdesktop.svg
@@ -0,0 +1 @@
+desktop.svg
\ No newline at end of file
diff --git a/links/places/22/org.xfce.panel.showdesktop.svg b/links/places/22/org.xfce.panel.showdesktop.svg
new file mode 120000
index 00000000..c720251f
--- /dev/null
+++ b/links/places/22/org.xfce.panel.showdesktop.svg
@@ -0,0 +1 @@
+desktop.svg
\ No newline at end of file
diff --git a/links/places/22/org.xfce.xfdesktop.svg b/links/places/22/org.xfce.xfdesktop.svg
new file mode 120000
index 00000000..c720251f
--- /dev/null
+++ b/links/places/22/org.xfce.xfdesktop.svg
@@ -0,0 +1 @@
+desktop.svg
\ No newline at end of file
diff --git a/links/places/24/org.xfce.panel.showdesktop.svg b/links/places/24/org.xfce.panel.showdesktop.svg
new file mode 120000
index 00000000..c720251f
--- /dev/null
+++ b/links/places/24/org.xfce.panel.showdesktop.svg
@@ -0,0 +1 @@
+desktop.svg
\ No newline at end of file
diff --git a/links/places/24/org.xfce.xfdesktop.svg b/links/places/24/org.xfce.xfdesktop.svg
new file mode 120000
index 00000000..c720251f
--- /dev/null
+++ b/links/places/24/org.xfce.xfdesktop.svg
@@ -0,0 +1 @@
+desktop.svg
\ No newline at end of file
diff --git a/links/status/22/input-keyboard-symbolic.svg b/links/status/22/input-keyboard-symbolic.svg
new file mode 120000
index 00000000..3635f145
--- /dev/null
+++ b/links/status/22/input-keyboard-symbolic.svg
@@ -0,0 +1 @@
+indicator-keyboard.svg
\ No newline at end of file
diff --git a/links/status/22/system-devices-panel.svg b/links/status/22/system-devices-panel.svg
new file mode 120000
index 00000000..014e3332
--- /dev/null
+++ b/links/status/22/system-devices-panel.svg
@@ -0,0 +1 @@
+system-shutdown.svg
\ No newline at end of file
diff --git a/links/status/24/input-keyboard-symbolic.svg b/links/status/24/input-keyboard-symbolic.svg
new file mode 120000
index 00000000..3635f145
--- /dev/null
+++ b/links/status/24/input-keyboard-symbolic.svg
@@ -0,0 +1 @@
+indicator-keyboard.svg
\ No newline at end of file
diff --git a/links/status/24/system-devices-panel.svg b/links/status/24/system-devices-panel.svg
new file mode 120000
index 00000000..014e3332
--- /dev/null
+++ b/links/status/24/system-devices-panel.svg
@@ -0,0 +1 @@
+system-shutdown.svg
\ No newline at end of file
diff --git a/src/actions/24/configure.svg b/src/actions/24/configure.svg
index e9f67095..2c7b5217 100644
--- a/src/actions/24/configure.svg
+++ b/src/actions/24/configure.svg
@@ -1,13 +1,8 @@
-
diff --git a/src/status/22/indicator-messages-new.svg b/src/status/22/indicator-messages-new.svg
index 8d8ba053..9c840ea3 100644
--- a/src/status/22/indicator-messages-new.svg
+++ b/src/status/22/indicator-messages-new.svg
@@ -1,11 +1,4 @@
diff --git a/src/status/22/indicator-messages-red.svg b/src/status/22/indicator-messages-red.svg
index 6f2abf4c..b0ea46ea 100644
--- a/src/status/22/indicator-messages-red.svg
+++ b/src/status/22/indicator-messages-red.svg
@@ -1,8 +1,3 @@
diff --git a/src/status/22/indicator-messages.svg b/src/status/22/indicator-messages.svg
index 3e86d6df..c46f5465 100644
--- a/src/status/22/indicator-messages.svg
+++ b/src/status/22/indicator-messages.svg
@@ -1,8 +1,3 @@
diff --git a/src/status/22/system-devices-panel.svg b/src/status/22/system-devices-panel.svg
deleted file mode 100644
index 1cc76b8d..00000000
--- a/src/status/22/system-devices-panel.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-
diff --git a/src/status/22/system-switch-user.svg b/src/status/22/system-switch-user.svg
index db4a75be..8dea73ff 100644
--- a/src/status/22/system-switch-user.svg
+++ b/src/status/22/system-switch-user.svg
@@ -1,9 +1,8 @@
-
diff --git a/src/status/24/indicator-messages-new.svg b/src/status/24/indicator-messages-new.svg
index d15227f7..79d52c2d 100644
--- a/src/status/24/indicator-messages-new.svg
+++ b/src/status/24/indicator-messages-new.svg
@@ -1,6 +1,4 @@
diff --git a/src/status/24/indicator-messages-red.svg b/src/status/24/indicator-messages-red.svg
index e43e2630..5c184ab9 100644
--- a/src/status/24/indicator-messages-red.svg
+++ b/src/status/24/indicator-messages-red.svg
@@ -1,5 +1,3 @@
diff --git a/src/status/24/indicator-messages.svg b/src/status/24/indicator-messages.svg
index 86d66576..8f67dd3c 100644
--- a/src/status/24/indicator-messages.svg
+++ b/src/status/24/indicator-messages.svg
@@ -1,5 +1,3 @@
diff --git a/src/status/24/system-devices-panel.svg b/src/status/24/system-devices-panel.svg
deleted file mode 100644
index 9d6e2d97..00000000
--- a/src/status/24/system-devices-panel.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/src/status/24/system-switch-user.svg b/src/status/24/system-switch-user.svg
index 26cbc90e..22f0f458 100644
--- a/src/status/24/system-switch-user.svg
+++ b/src/status/24/system-switch-user.svg
@@ -1,9 +1,8 @@
-