diff --git a/extra/scalable/apps/preferences-system-and-accounts-about.svg b/extra/scalable/apps/preferences-about.svg
similarity index 100%
rename from extra/scalable/apps/preferences-system-and-accounts-about.svg
rename to extra/scalable/apps/preferences-about.svg
diff --git a/extra/scalable/apps/preferences-desktop-appearance.svg b/extra/scalable/apps/preferences-appearance.svg
similarity index 100%
rename from extra/scalable/apps/preferences-desktop-appearance.svg
rename to extra/scalable/apps/preferences-appearance.svg
diff --git a/extra/scalable/apps/preferences-time-and-language-date-and-time.svg b/extra/scalable/apps/preferences-date-and-time.svg
similarity index 100%
rename from extra/scalable/apps/preferences-time-and-language-date-and-time.svg
rename to extra/scalable/apps/preferences-date-and-time.svg
diff --git a/extra/scalable/apps/preferences-system-and-accounts-default-applications-symbolic.svg b/extra/scalable/apps/preferences-default-applications-symbolic.svg
similarity index 100%
rename from extra/scalable/apps/preferences-system-and-accounts-default-applications-symbolic.svg
rename to extra/scalable/apps/preferences-default-applications-symbolic.svg
diff --git a/extra/scalable/apps/preferences-system-and-accounts-default-applications.svg b/extra/scalable/apps/preferences-default-applications.svg
similarity index 100%
rename from extra/scalable/apps/preferences-system-and-accounts-default-applications.svg
rename to extra/scalable/apps/preferences-default-applications.svg
diff --git a/extra/scalable/apps/preferences-desktop-dock.svg b/extra/scalable/apps/preferences-dock.svg
similarity index 100%
rename from extra/scalable/apps/preferences-desktop-dock.svg
rename to extra/scalable/apps/preferences-dock.svg
diff --git a/extra/scalable/apps/preferences-input-devices-mouse.svg b/extra/scalable/apps/preferences-mouse.svg
similarity index 100%
rename from extra/scalable/apps/preferences-input-devices-mouse.svg
rename to extra/scalable/apps/preferences-mouse.svg
diff --git a/extra/scalable/apps/preferences-desktop-panel.svg b/extra/scalable/apps/preferences-panel.svg
similarity index 100%
rename from extra/scalable/apps/preferences-desktop-panel.svg
rename to extra/scalable/apps/preferences-panel.svg
diff --git a/extra/scalable/apps/preferences-region-and-language-symbolic.svg b/extra/scalable/apps/preferences-region-and-language-symbolic.svg
new file mode 100644
index 0000000..ca3d5e8
--- /dev/null
+++ b/extra/scalable/apps/preferences-region-and-language-symbolic.svg
@@ -0,0 +1,6 @@
+
diff --git a/extra/scalable/apps/preferences-time-and-language-region-and-language.svg b/extra/scalable/apps/preferences-region-and-language.svg
similarity index 100%
rename from extra/scalable/apps/preferences-time-and-language-region-and-language.svg
rename to extra/scalable/apps/preferences-region-and-language.svg
diff --git a/extra/scalable/apps/preferences-input-devices-touchpad.svg b/extra/scalable/apps/preferences-touchpad.svg
similarity index 100%
rename from extra/scalable/apps/preferences-input-devices-touchpad.svg
rename to extra/scalable/apps/preferences-touchpad.svg
diff --git a/extra/scalable/apps/preferences-system-and-accounts-updates-and-recovery-symbolic.svg b/extra/scalable/apps/preferences-updates-and-recovery-symbolic.svg
similarity index 100%
rename from extra/scalable/apps/preferences-system-and-accounts-updates-and-recovery-symbolic.svg
rename to extra/scalable/apps/preferences-updates-and-recovery-symbolic.svg
diff --git a/extra/scalable/apps/preferences-system-and-accounts-updates-and-recovery.svg b/extra/scalable/apps/preferences-updates-and-recovery.svg
similarity index 100%
rename from extra/scalable/apps/preferences-system-and-accounts-updates-and-recovery.svg
rename to extra/scalable/apps/preferences-updates-and-recovery.svg
diff --git a/extra/scalable/apps/preferences-system-and-accounts-users.svg b/extra/scalable/apps/preferences-users.svg
similarity index 100%
rename from extra/scalable/apps/preferences-system-and-accounts-users.svg
rename to extra/scalable/apps/preferences-users.svg
diff --git a/extra/scalable/apps/preferences-network-and-wireless-vpn.svg b/extra/scalable/apps/preferences-vpn.svg
similarity index 100%
rename from extra/scalable/apps/preferences-network-and-wireless-vpn.svg
rename to extra/scalable/apps/preferences-vpn.svg
diff --git a/extra/scalable/apps/preferences-desktop-window-management.svg b/extra/scalable/apps/preferences-window-managment.svg
similarity index 100%
rename from extra/scalable/apps/preferences-desktop-window-management.svg
rename to extra/scalable/apps/preferences-window-managment.svg
diff --git a/extra/scalable/apps/preferences-network-and-wireless-wired.svg b/extra/scalable/apps/preferences-wired.svg
similarity index 100%
rename from extra/scalable/apps/preferences-network-and-wireless-wired.svg
rename to extra/scalable/apps/preferences-wired.svg
diff --git a/extra/scalable/apps/preferences-network-and-wireless-wi-fi.svg b/extra/scalable/apps/preferences-wireless.svg
similarity index 100%
rename from extra/scalable/apps/preferences-network-and-wireless-wi-fi.svg
rename to extra/scalable/apps/preferences-wireless.svg
diff --git a/extra/scalable/apps/preferences-desktop-workspaces.svg b/extra/scalable/apps/preferences-workspaces.svg
similarity index 100%
rename from extra/scalable/apps/preferences-desktop-workspaces.svg
rename to extra/scalable/apps/preferences-workspaces.svg
diff --git a/extra/scalable/mimetypes/inode-directory.svg b/extra/scalable/mimetypes/inode-directory.svg
index da53883..947da92 100644
--- a/extra/scalable/mimetypes/inode-directory.svg
+++ b/extra/scalable/mimetypes/inode-directory.svg
@@ -1 +1,14 @@
-
\ No newline at end of file
+
diff --git a/extra/scalable/places/folder-documents.svg b/extra/scalable/places/folder-documents.svg
index 178054e..fb60d3d 100644
--- a/extra/scalable/places/folder-documents.svg
+++ b/extra/scalable/places/folder-documents.svg
@@ -1 +1,16 @@
-
\ No newline at end of file
+
diff --git a/extra/scalable/places/folder-download.svg b/extra/scalable/places/folder-download.svg
index 205c26e..a83be73 100644
--- a/extra/scalable/places/folder-download.svg
+++ b/extra/scalable/places/folder-download.svg
@@ -1 +1,17 @@
-
\ No newline at end of file
+
diff --git a/extra/scalable/places/folder-music.svg b/extra/scalable/places/folder-music.svg
index caafd43..a67dd5c 100644
--- a/extra/scalable/places/folder-music.svg
+++ b/extra/scalable/places/folder-music.svg
@@ -1 +1,16 @@
-
\ No newline at end of file
+
diff --git a/extra/scalable/places/folder-pictures.svg b/extra/scalable/places/folder-pictures.svg
index 89fa8af..963f5d7 100644
--- a/extra/scalable/places/folder-pictures.svg
+++ b/extra/scalable/places/folder-pictures.svg
@@ -1 +1,19 @@
-
\ No newline at end of file
+
diff --git a/extra/scalable/places/folder-publicshare.svg b/extra/scalable/places/folder-publicshare.svg
index bc934b5..cc90a26 100644
--- a/extra/scalable/places/folder-publicshare.svg
+++ b/extra/scalable/places/folder-publicshare.svg
@@ -1 +1,20 @@
-
\ No newline at end of file
+
diff --git a/extra/scalable/places/folder-recent.svg b/extra/scalable/places/folder-recent.svg
index c7c2e3a..67974c6 100644
--- a/extra/scalable/places/folder-recent.svg
+++ b/extra/scalable/places/folder-recent.svg
@@ -1 +1,17 @@
-
\ No newline at end of file
+
diff --git a/extra/scalable/places/folder-templates.svg b/extra/scalable/places/folder-templates.svg
index 8c17124..0585aef 100644
--- a/extra/scalable/places/folder-templates.svg
+++ b/extra/scalable/places/folder-templates.svg
@@ -1 +1,19 @@
-
\ No newline at end of file
+
diff --git a/extra/scalable/places/folder-videos.svg b/extra/scalable/places/folder-videos.svg
index 2effb9f..571ccb2 100644
--- a/extra/scalable/places/folder-videos.svg
+++ b/extra/scalable/places/folder-videos.svg
@@ -1 +1,17 @@
-
\ No newline at end of file
+
diff --git a/extra/scalable/apps/preferences-input-devices-keyboard.svg b/freedesktop/scalable/apps/preferences-desktop-keyboard.svg
similarity index 100%
rename from extra/scalable/apps/preferences-input-devices-keyboard.svg
rename to freedesktop/scalable/apps/preferences-desktop-keyboard.svg
diff --git a/freedesktop/scalable/places/folder-remote.svg b/freedesktop/scalable/places/folder-remote.svg
index 94516fc..9a926d4 100644
--- a/freedesktop/scalable/places/folder-remote.svg
+++ b/freedesktop/scalable/places/folder-remote.svg
@@ -1 +1,14 @@
-
\ No newline at end of file
+
diff --git a/freedesktop/scalable/places/folder.svg b/freedesktop/scalable/places/folder.svg
index da53883..947da92 100644
--- a/freedesktop/scalable/places/folder.svg
+++ b/freedesktop/scalable/places/folder.svg
@@ -1 +1,14 @@
-
\ No newline at end of file
+
diff --git a/freedesktop/scalable/places/user-desktop.svg b/freedesktop/scalable/places/user-desktop.svg
index c188616..e28b92a 100644
--- a/freedesktop/scalable/places/user-desktop.svg
+++ b/freedesktop/scalable/places/user-desktop.svg
@@ -1 +1,17 @@
-
\ No newline at end of file
+
diff --git a/freedesktop/scalable/places/user-home.svg b/freedesktop/scalable/places/user-home.svg
index 66b2aeb..43eb048 100644
--- a/freedesktop/scalable/places/user-home.svg
+++ b/freedesktop/scalable/places/user-home.svg
@@ -1 +1,17 @@
-
\ No newline at end of file
+