diff --git a/elementary-xfce-dark/panel/22/clipman.svg b/elementary-xfce-dark/panel/22/clipman.svg
deleted file mode 100644
index 0b9254742..000000000
--- a/elementary-xfce-dark/panel/22/clipman.svg
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
diff --git a/elementary-xfce-dark/panel/24/clipman.svg b/elementary-xfce-dark/panel/24/clipman.svg
deleted file mode 100644
index c461f1d07..000000000
--- a/elementary-xfce-dark/panel/24/clipman.svg
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
diff --git a/elementary-xfce/actions/16/stock_people.svg b/elementary-xfce/actions/16/stock_people.svg
new file mode 120000
index 000000000..cea592a05
--- /dev/null
+++ b/elementary-xfce/actions/16/stock_people.svg
@@ -0,0 +1 @@
+../../apps/16/system-users.svg
\ No newline at end of file
diff --git a/elementary-xfce/actions/32/stock_people.svg b/elementary-xfce/actions/32/stock_people.svg
new file mode 120000
index 000000000..861266ae3
--- /dev/null
+++ b/elementary-xfce/actions/32/stock_people.svg
@@ -0,0 +1 @@
+../../apps/32/system-users.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/128/archive-manager.svg b/elementary-xfce/apps/128/archive-manager.svg
index a060fe4b5..5fcecdab9 100644
--- a/elementary-xfce/apps/128/archive-manager.svg
+++ b/elementary-xfce/apps/128/archive-manager.svg
@@ -1,15 +1,38 @@
diff --git a/elementary-xfce/apps/128/org.xfce.panel.launcher.svg b/elementary-xfce/apps/128/org.xfce.panel.launcher.svg
index bcedd3f3c..5d44e97de 120000
--- a/elementary-xfce/apps/128/org.xfce.panel.launcher.svg
+++ b/elementary-xfce/apps/128/org.xfce.panel.launcher.svg
@@ -1 +1 @@
-../../mimes/128/application-x-executable.svg
\ No newline at end of file
+../../categories/128/applications-other.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/16/org.xfce.panel.launcher.svg b/elementary-xfce/apps/16/org.xfce.panel.launcher.svg
index cc10602ae..4949a9a6b 120000
--- a/elementary-xfce/apps/16/org.xfce.panel.launcher.svg
+++ b/elementary-xfce/apps/16/org.xfce.panel.launcher.svg
@@ -1 +1 @@
-../../mimes/16/application-x-executable.svg
\ No newline at end of file
+../../categories/16/applications-other.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/16/xfce4-cpufreq-plugin.svg b/elementary-xfce/apps/16/xfce4-cpufreq-plugin.svg
new file mode 120000
index 000000000..b4608ec92
--- /dev/null
+++ b/elementary-xfce/apps/16/xfce4-cpufreq-plugin.svg
@@ -0,0 +1 @@
+../../mimes/16/application-x-firmware.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/16/xfce4-pulseaudio-plugin.svg b/elementary-xfce/apps/16/xfce4-pulseaudio-plugin.svg
new file mode 120000
index 000000000..7ee0ec76f
--- /dev/null
+++ b/elementary-xfce/apps/16/xfce4-pulseaudio-plugin.svg
@@ -0,0 +1 @@
+../../devices/16/audio-speakers.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/22/clipman-symbolic.svg b/elementary-xfce/apps/22/clipman-symbolic.svg
new file mode 100644
index 000000000..f6358e277
--- /dev/null
+++ b/elementary-xfce/apps/22/clipman-symbolic.svg
@@ -0,0 +1,60 @@
+
+
diff --git a/elementary-xfce/apps/22/org.xfce.panel.launcher.svg b/elementary-xfce/apps/22/org.xfce.panel.launcher.svg
index 70f485480..52a4e445f 120000
--- a/elementary-xfce/apps/22/org.xfce.panel.launcher.svg
+++ b/elementary-xfce/apps/22/org.xfce.panel.launcher.svg
@@ -1 +1 @@
-application-default-icon.svg
\ No newline at end of file
+../../categories/22/applications-other.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/22/xfce4-pulseaudio-plugin.svg b/elementary-xfce/apps/22/xfce4-pulseaudio-plugin.svg
new file mode 120000
index 000000000..7602e6d76
--- /dev/null
+++ b/elementary-xfce/apps/22/xfce4-pulseaudio-plugin.svg
@@ -0,0 +1 @@
+../../devices/22/audio-speakers.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/24/clipman-symbolic.svg b/elementary-xfce/apps/24/clipman-symbolic.svg
new file mode 100644
index 000000000..bdb9e9d47
--- /dev/null
+++ b/elementary-xfce/apps/24/clipman-symbolic.svg
@@ -0,0 +1,63 @@
+
+
diff --git a/elementary-xfce/apps/24/org.xfce.panel.launcher.svg b/elementary-xfce/apps/24/org.xfce.panel.launcher.svg
index 412e117e5..5848ba7f5 120000
--- a/elementary-xfce/apps/24/org.xfce.panel.launcher.svg
+++ b/elementary-xfce/apps/24/org.xfce.panel.launcher.svg
@@ -1 +1 @@
-../../mimes/24/application-x-executable.svg
\ No newline at end of file
+../../categories/24/applications-other.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/24/xfce4-battery-plugin.svg b/elementary-xfce/apps/24/xfce4-battery-plugin.svg
new file mode 100644
index 000000000..e8d6242e6
--- /dev/null
+++ b/elementary-xfce/apps/24/xfce4-battery-plugin.svg
@@ -0,0 +1,302 @@
+
+
diff --git a/elementary-xfce/apps/24/xfce4-cpufreq-plugin.svg b/elementary-xfce/apps/24/xfce4-cpufreq-plugin.svg
new file mode 120000
index 000000000..965b3776e
--- /dev/null
+++ b/elementary-xfce/apps/24/xfce4-cpufreq-plugin.svg
@@ -0,0 +1 @@
+../../mimes/24/application-x-firmware.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/24/xfce4-pulseaudio-plugin.svg b/elementary-xfce/apps/24/xfce4-pulseaudio-plugin.svg
new file mode 120000
index 000000000..5f0c4274b
--- /dev/null
+++ b/elementary-xfce/apps/24/xfce4-pulseaudio-plugin.svg
@@ -0,0 +1 @@
+../../devices/24/audio-speakers.svg
\ No newline at end of file
diff --git a/elementary-xfce/apps/32/archive-manager.svg b/elementary-xfce/apps/32/archive-manager.svg
index aa1e83570..e9cada010 100644
--- a/elementary-xfce/apps/32/archive-manager.svg
+++ b/elementary-xfce/apps/32/archive-manager.svg
@@ -1,15 +1,38 @@