diff --git a/links/apps/scalable/preferences-plugin.svg b/links/apps/scalable/preferences-plugin.svg
deleted file mode 120000
index 9a40701e..00000000
--- a/links/apps/scalable/preferences-plugin.svg
+++ /dev/null
@@ -1 +0,0 @@
-applications-system.svg
\ No newline at end of file
diff --git a/links/status/32/weather-clear-large.svg b/links/status/32/weather-clear-large.svg
new file mode 120000
index 00000000..55539d44
--- /dev/null
+++ b/links/status/32/weather-clear-large.svg
@@ -0,0 +1 @@
+weather-clear.svg
\ No newline at end of file
diff --git a/links/status/32/weather-clear-night-large.svg b/links/status/32/weather-clear-night-large.svg
new file mode 120000
index 00000000..3429ba52
--- /dev/null
+++ b/links/status/32/weather-clear-night-large.svg
@@ -0,0 +1 @@
+weather-clear-night.svg
\ No newline at end of file
diff --git a/links/status/32/weather-few-clouds-large.svg b/links/status/32/weather-few-clouds-large.svg
new file mode 120000
index 00000000..522e6164
--- /dev/null
+++ b/links/status/32/weather-few-clouds-large.svg
@@ -0,0 +1 @@
+weather-few-clouds.svg
\ No newline at end of file
diff --git a/links/status/32/weather-few-clouds-night-large.svg b/links/status/32/weather-few-clouds-night-large.svg
new file mode 120000
index 00000000..b4e0523a
--- /dev/null
+++ b/links/status/32/weather-few-clouds-night-large.svg
@@ -0,0 +1 @@
+weather-few-clouds-night.svg
\ No newline at end of file
diff --git a/links/status/32/weather-severe-alert-large.svg b/links/status/32/weather-severe-alert-large.svg
new file mode 120000
index 00000000..20a62f05
--- /dev/null
+++ b/links/status/32/weather-severe-alert-large.svg
@@ -0,0 +1 @@
+weather-severe-alert.svg
\ No newline at end of file
diff --git a/links/status/32/weather-showers-large.svg b/links/status/32/weather-showers-large.svg
new file mode 120000
index 00000000..ccc43a6e
--- /dev/null
+++ b/links/status/32/weather-showers-large.svg
@@ -0,0 +1 @@
+weather-showers.svg
\ No newline at end of file
diff --git a/links/status/32/weather-showers-scattered-large.svg b/links/status/32/weather-showers-scattered-large.svg
new file mode 120000
index 00000000..12f67387
--- /dev/null
+++ b/links/status/32/weather-showers-scattered-large.svg
@@ -0,0 +1 @@
+weather-showers-scattered.svg
\ No newline at end of file
diff --git a/links/status/32/weather-snow-large.svg b/links/status/32/weather-snow-large.svg
new file mode 120000
index 00000000..a83d1690
--- /dev/null
+++ b/links/status/32/weather-snow-large.svg
@@ -0,0 +1 @@
+weather-snow.svg
\ No newline at end of file
diff --git a/links/status/32/weather-storm-large.svg b/links/status/32/weather-storm-large.svg
new file mode 120000
index 00000000..6f7583d3
--- /dev/null
+++ b/links/status/32/weather-storm-large.svg
@@ -0,0 +1 @@
+weather-storm.svg
\ No newline at end of file
diff --git a/links/status/32/weather-tornado-large.svg b/links/status/32/weather-tornado-large.svg
new file mode 120000
index 00000000..46579dc0
--- /dev/null
+++ b/links/status/32/weather-tornado-large.svg
@@ -0,0 +1 @@
+weather-storm-tornado.svg
\ No newline at end of file
diff --git a/links/status/32/weather-windy-large.svg b/links/status/32/weather-windy-large.svg
new file mode 120000
index 00000000..e3623196
--- /dev/null
+++ b/links/status/32/weather-windy-large.svg
@@ -0,0 +1 @@
+weather-windy.svg
\ No newline at end of file
diff --git a/links/status/brightness-display-symbolic.svg b/links/status/symbolic/brightness-display-symbolic.svg
similarity index 100%
rename from links/status/brightness-display-symbolic.svg
rename to links/status/symbolic/brightness-display-symbolic.svg
diff --git a/links/status/budgie-info-symbolic.svg b/links/status/symbolic/budgie-info-symbolic.svg
similarity index 100%
rename from links/status/budgie-info-symbolic.svg
rename to links/status/symbolic/budgie-info-symbolic.svg
diff --git a/links/status/media-playlist-no-shuffle-rtl-symbolic.svg b/links/status/symbolic/media-playlist-no-shuffle-rtl-symbolic.svg
similarity index 100%
rename from links/status/media-playlist-no-shuffle-rtl-symbolic.svg
rename to links/status/symbolic/media-playlist-no-shuffle-rtl-symbolic.svg
diff --git a/links/status/media-playlist-repeat-one-rtl-symbolic.svg b/links/status/symbolic/media-playlist-repeat-one-rtl-symbolic.svg
similarity index 100%
rename from links/status/media-playlist-repeat-one-rtl-symbolic.svg
rename to links/status/symbolic/media-playlist-repeat-one-rtl-symbolic.svg
diff --git a/links/status/weather-fog-night-symbolic.svg b/links/status/symbolic/weather-fog-night-symbolic.svg
similarity index 100%
rename from links/status/weather-fog-night-symbolic.svg
rename to links/status/symbolic/weather-fog-night-symbolic.svg
diff --git a/links/status/weather-showers-night-symbolic.svg b/links/status/symbolic/weather-showers-night-symbolic.svg
similarity index 100%
rename from links/status/weather-showers-night-symbolic.svg
rename to links/status/symbolic/weather-showers-night-symbolic.svg
diff --git a/links/status/weather-showers-scattered-night-symbolic.svg b/links/status/symbolic/weather-showers-scattered-night-symbolic.svg
similarity index 100%
rename from links/status/weather-showers-scattered-night-symbolic.svg
rename to links/status/symbolic/weather-showers-scattered-night-symbolic.svg
diff --git a/links/status/weather-storm-night-symbolic.svg b/links/status/symbolic/weather-storm-night-symbolic.svg
similarity index 100%
rename from links/status/weather-storm-night-symbolic.svg
rename to links/status/symbolic/weather-storm-night-symbolic.svg
diff --git a/links/status/weather-storm-tornado-night-symbolic.svg b/links/status/symbolic/weather-storm-tornado-night-symbolic.svg
similarity index 100%
rename from links/status/weather-storm-tornado-night-symbolic.svg
rename to links/status/symbolic/weather-storm-tornado-night-symbolic.svg
diff --git a/src/apps/scalable/extensions.svg b/src/apps/scalable/extensions.svg
index 77c14e43..6413138e 100644
--- a/src/apps/scalable/extensions.svg
+++ b/src/apps/scalable/extensions.svg
@@ -1 +1,8 @@
-
\ No newline at end of file
+
+
diff --git a/src/apps/scalable/preferences-plugin.svg b/src/apps/scalable/preferences-plugin.svg
new file mode 100644
index 00000000..971f317f
--- /dev/null
+++ b/src/apps/scalable/preferences-plugin.svg
@@ -0,0 +1,12 @@
+
+
diff --git a/src/status/16/weather-clear-night-small.svg b/src/status/16/weather-clear-night-small.svg
new file mode 100644
index 00000000..24bda040
--- /dev/null
+++ b/src/status/16/weather-clear-night-small.svg
@@ -0,0 +1,11 @@
+
+
diff --git a/src/status/16/weather-clear-small.svg b/src/status/16/weather-clear-small.svg
new file mode 100644
index 00000000..a6ce3599
--- /dev/null
+++ b/src/status/16/weather-clear-small.svg
@@ -0,0 +1,9 @@
+
+
diff --git a/src/status/16/weather-few-clouds-night-small.svg b/src/status/16/weather-few-clouds-night-small.svg
new file mode 100644
index 00000000..2c224375
--- /dev/null
+++ b/src/status/16/weather-few-clouds-night-small.svg
@@ -0,0 +1,13 @@
+
+
diff --git a/src/status/16/weather-few-clouds-small.svg b/src/status/16/weather-few-clouds-small.svg
new file mode 100644
index 00000000..1608cf5b
--- /dev/null
+++ b/src/status/16/weather-few-clouds-small.svg
@@ -0,0 +1,9 @@
+
+
diff --git a/src/status/16/weather-fog-small.svg b/src/status/16/weather-fog-small.svg
new file mode 100644
index 00000000..f2d92202
--- /dev/null
+++ b/src/status/16/weather-fog-small.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/src/status/16/weather-overcast-small.svg b/src/status/16/weather-overcast-small.svg
new file mode 100644
index 00000000..b939cbe9
--- /dev/null
+++ b/src/status/16/weather-overcast-small.svg
@@ -0,0 +1,9 @@
+
+
diff --git a/src/status/16/weather-severe-alert-small.svg b/src/status/16/weather-severe-alert-small.svg
new file mode 100644
index 00000000..f7ea6965
--- /dev/null
+++ b/src/status/16/weather-severe-alert-small.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/src/status/16/weather-showers-scattered-small.svg b/src/status/16/weather-showers-scattered-small.svg
new file mode 100644
index 00000000..1ecc6493
--- /dev/null
+++ b/src/status/16/weather-showers-scattered-small.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/src/status/16/weather-showers-small.svg b/src/status/16/weather-showers-small.svg
new file mode 100644
index 00000000..ea5df44d
--- /dev/null
+++ b/src/status/16/weather-showers-small.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/src/status/16/weather-snow-small.svg b/src/status/16/weather-snow-small.svg
new file mode 100644
index 00000000..a882bccd
--- /dev/null
+++ b/src/status/16/weather-snow-small.svg
@@ -0,0 +1,6 @@
+
+
diff --git a/src/status/16/weather-storm-small.svg b/src/status/16/weather-storm-small.svg
new file mode 100644
index 00000000..c330fc11
--- /dev/null
+++ b/src/status/16/weather-storm-small.svg
@@ -0,0 +1,11 @@
+
+
diff --git a/src/status/16/weather-tornado-small.svg b/src/status/16/weather-tornado-small.svg
new file mode 100644
index 00000000..555b4cb3
--- /dev/null
+++ b/src/status/16/weather-tornado-small.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/src/status/16/weather-windy-small.svg b/src/status/16/weather-windy-small.svg
new file mode 100644
index 00000000..ccab54c1
--- /dev/null
+++ b/src/status/16/weather-windy-small.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/src/status/32/weather-clear-night.svg b/src/status/32/weather-clear-night.svg
index 1c56d8c1..89a66af0 100644
--- a/src/status/32/weather-clear-night.svg
+++ b/src/status/32/weather-clear-night.svg
@@ -1 +1,19 @@
-
\ No newline at end of file
+
+
diff --git a/src/status/32/weather-clear.svg b/src/status/32/weather-clear.svg
index 7da66b94..9e1d3aad 100644
--- a/src/status/32/weather-clear.svg
+++ b/src/status/32/weather-clear.svg
@@ -1 +1,14 @@
-
\ No newline at end of file
+
+
diff --git a/src/status/32/weather-clouds-night.svg b/src/status/32/weather-clouds-night.svg
index c6cf30c8..4e33f243 100644
--- a/src/status/32/weather-clouds-night.svg
+++ b/src/status/32/weather-clouds-night.svg
@@ -1 +1,11 @@
-
\ No newline at end of file
+
diff --git a/src/status/32/weather-clouds.svg b/src/status/32/weather-clouds.svg
index cc2e2b51..5bb4ad0d 100644
--- a/src/status/32/weather-clouds.svg
+++ b/src/status/32/weather-clouds.svg
@@ -1 +1,14 @@
-
\ No newline at end of file
+
diff --git a/src/status/32/weather-few-clouds-night.svg b/src/status/32/weather-few-clouds-night.svg
index 7448ada8..ad62d99c 100644
--- a/src/status/32/weather-few-clouds-night.svg
+++ b/src/status/32/weather-few-clouds-night.svg
@@ -1 +1,11 @@
-
\ No newline at end of file
+
diff --git a/src/status/32/weather-few-clouds.svg b/src/status/32/weather-few-clouds.svg
index 23f386a4..cf7a2a6c 100644
--- a/src/status/32/weather-few-clouds.svg
+++ b/src/status/32/weather-few-clouds.svg
@@ -1 +1,7 @@
-
\ No newline at end of file
+
diff --git a/src/status/32/weather-fog.svg b/src/status/32/weather-fog.svg
index 0838f14c..3d1025a6 100644
--- a/src/status/32/weather-fog.svg
+++ b/src/status/32/weather-fog.svg
@@ -1,29 +1,6 @@
+
diff --git a/src/status/32/weather-freezing-rain.svg b/src/status/32/weather-freezing-rain.svg
index ac8a18bf..cead74ca 100644
--- a/src/status/32/weather-freezing-rain.svg
+++ b/src/status/32/weather-freezing-rain.svg
@@ -1 +1,8 @@
-
\ No newline at end of file
+
diff --git a/src/status/32/weather-hail.svg b/src/status/32/weather-hail.svg
index 13f4cdf1..2ced6e76 100644
--- a/src/status/32/weather-hail.svg
+++ b/src/status/32/weather-hail.svg
@@ -1 +1,8 @@
-
\ No newline at end of file
+
diff --git a/src/status/32/weather-many-clouds.svg b/src/status/32/weather-many-clouds.svg
index 19084d6d..b001551a 100644
--- a/src/status/32/weather-many-clouds.svg
+++ b/src/status/32/weather-many-clouds.svg
@@ -1 +1,4 @@
-
\ No newline at end of file
+
diff --git a/src/status/32/weather-overcast-large.svg b/src/status/32/weather-overcast-large.svg
new file mode 100644
index 00000000..ae40eeb3
--- /dev/null
+++ b/src/status/32/weather-overcast-large.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/status/32/weather-overcast-night.svg b/src/status/32/weather-overcast-night.svg
index e830d22f..9aca91d5 100644
--- a/src/status/32/weather-overcast-night.svg
+++ b/src/status/32/weather-overcast-night.svg
@@ -1,10 +1,5 @@
+
diff --git a/src/status/32/weather-showers-day.svg b/src/status/32/weather-showers-day.svg
index de8527ee..bb6f6ba9 100644
--- a/src/status/32/weather-showers-day.svg
+++ b/src/status/32/weather-showers-day.svg
@@ -1 +1,12 @@
-
\ No newline at end of file
+
diff --git a/src/status/32/weather-showers-night.svg b/src/status/32/weather-showers-night.svg
index 85b1dd9b..4286fa18 100644
--- a/src/status/32/weather-showers-night.svg
+++ b/src/status/32/weather-showers-night.svg
@@ -1 +1,18 @@
-
\ No newline at end of file
+
diff --git a/src/status/32/weather-showers-scattered-day.svg b/src/status/32/weather-showers-scattered-day.svg
index 07e7c053..970be79a 100644
--- a/src/status/32/weather-showers-scattered-day.svg
+++ b/src/status/32/weather-showers-scattered-day.svg
@@ -1 +1,8 @@
-
\ No newline at end of file
+
diff --git a/src/status/32/weather-showers-scattered-night.svg b/src/status/32/weather-showers-scattered-night.svg
index 9a03c614..406420d5 100644
--- a/src/status/32/weather-showers-scattered-night.svg
+++ b/src/status/32/weather-showers-scattered-night.svg
@@ -1 +1,12 @@
-
\ No newline at end of file
+
diff --git a/src/status/32/weather-showers-scattered.svg b/src/status/32/weather-showers-scattered.svg
index 66e03d9d..e5f15bf5 100644
--- a/src/status/32/weather-showers-scattered.svg
+++ b/src/status/32/weather-showers-scattered.svg
@@ -1 +1,6 @@
-
\ No newline at end of file
+
diff --git a/src/status/32/weather-showers.svg b/src/status/32/weather-showers.svg
index b7cb07a3..4d144cfd 100644
--- a/src/status/32/weather-showers.svg
+++ b/src/status/32/weather-showers.svg
@@ -1 +1,8 @@
-
\ No newline at end of file
+
diff --git a/src/status/32/weather-snow-night.svg b/src/status/32/weather-snow-night.svg
index d577ca24..1ce21517 100644
--- a/src/status/32/weather-snow-night.svg
+++ b/src/status/32/weather-snow-night.svg
@@ -1,17 +1,14 @@
-