diff --git a/elementary-xfce/actions/16/iso-image-new.svg b/elementary-xfce/actions/16/iso-image-new.svg
index 519dac54e..958184ab5 120000
--- a/elementary-xfce/actions/16/iso-image-new.svg
+++ b/elementary-xfce/actions/16/iso-image-new.svg
@@ -1 +1 @@
-../../mimes/16/application-x-cd-image.svg
\ No newline at end of file
+../../mimes/16/application-vnd.efi.iso.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/128/application-x-java-archive.svg b/elementary-xfce/mimes/128/application-java-archive.svg
similarity index 100%
rename from elementary-xfce/mimes/128/application-x-java-archive.svg
rename to elementary-xfce/mimes/128/application-java-archive.svg
diff --git a/elementary-xfce/mimes/128/application-x-mobi8-ebook.svg b/elementary-xfce/mimes/128/application-vnd.amazon.mobi8-ebook.svg
similarity index 100%
rename from elementary-xfce/mimes/128/application-x-mobi8-ebook.svg
rename to elementary-xfce/mimes/128/application-vnd.amazon.mobi8-ebook.svg
diff --git a/elementary-xfce/mimes/128/application-vnd.efi.img.svg b/elementary-xfce/mimes/128/application-vnd.efi.img.svg
new file mode 120000
index 000000000..636afd585
--- /dev/null
+++ b/elementary-xfce/mimes/128/application-vnd.efi.img.svg
@@ -0,0 +1 @@
+application-vnd.efi.iso.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/128/application-x-cd-image.svg b/elementary-xfce/mimes/128/application-vnd.efi.iso.svg
similarity index 100%
rename from elementary-xfce/mimes/128/application-x-cd-image.svg
rename to elementary-xfce/mimes/128/application-vnd.efi.iso.svg
diff --git a/elementary-xfce/mimes/128/application-vnd.oasis.opendocument.drawing-template.svg b/elementary-xfce/mimes/128/application-vnd.oasis.opendocument.drawing-template.svg
deleted file mode 120000
index e24ef9457..000000000
--- a/elementary-xfce/mimes/128/application-vnd.oasis.opendocument.drawing-template.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing-template.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/128/application-x-bzip-compressed-tar.svg b/elementary-xfce/mimes/128/application-x-bzip2-compressed-tar.svg
similarity index 100%
rename from elementary-xfce/mimes/128/application-x-bzip-compressed-tar.svg
rename to elementary-xfce/mimes/128/application-x-bzip2-compressed-tar.svg
diff --git a/elementary-xfce/mimes/128/application-x-bzip.svg b/elementary-xfce/mimes/128/application-x-bzip2.svg
similarity index 100%
rename from elementary-xfce/mimes/128/application-x-bzip.svg
rename to elementary-xfce/mimes/128/application-x-bzip2.svg
diff --git a/elementary-xfce/mimes/128/application-x-ms-dos-executable.svg b/elementary-xfce/mimes/128/application-x-msdownload.svg
similarity index 100%
rename from elementary-xfce/mimes/128/application-x-ms-dos-executable.svg
rename to elementary-xfce/mimes/128/application-x-msdownload.svg
diff --git a/elementary-xfce/mimes/128/application-x-msi.svg b/elementary-xfce/mimes/128/application-x-msi.svg
index 216658108..5c78e366d 120000
--- a/elementary-xfce/mimes/128/application-x-msi.svg
+++ b/elementary-xfce/mimes/128/application-x-msi.svg
@@ -1 +1 @@
-application-x-ms-dos-executable.svg
\ No newline at end of file
+application-x-msdownload.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/128/application-x-raw-disk-image.svg b/elementary-xfce/mimes/128/application-x-raw-disk-image.svg
deleted file mode 120000
index 38aa8675c..000000000
--- a/elementary-xfce/mimes/128/application-x-raw-disk-image.svg
+++ /dev/null
@@ -1 +0,0 @@
-application-x-cd-image.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/128/application-x-yaml.svg b/elementary-xfce/mimes/128/application-yaml.svg
similarity index 100%
rename from elementary-xfce/mimes/128/application-x-yaml.svg
rename to elementary-xfce/mimes/128/application-yaml.svg
diff --git a/elementary-xfce/mimes/128/audio-x-wav.svg b/elementary-xfce/mimes/128/audio-vnd.wave.svg
similarity index 100%
rename from elementary-xfce/mimes/128/audio-x-wav.svg
rename to elementary-xfce/mimes/128/audio-vnd.wave.svg
diff --git a/elementary-xfce/mimes/128/audio-x-mp3-playlist.svg b/elementary-xfce/mimes/128/audio-x-mp3-playlist.svg
deleted file mode 120000
index ace508bdd..000000000
--- a/elementary-xfce/mimes/128/audio-x-mp3-playlist.svg
+++ /dev/null
@@ -1 +0,0 @@
-audio-x-playlist.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/128/audio-x-mpegurl.svg b/elementary-xfce/mimes/128/audio-x-mpegurl.svg
index 43ca88781..ace508bdd 120000
--- a/elementary-xfce/mimes/128/audio-x-mpegurl.svg
+++ b/elementary-xfce/mimes/128/audio-x-mpegurl.svg
@@ -1 +1 @@
-audio-x-mp3-playlist.svg
\ No newline at end of file
+audio-x-playlist.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/128/audio-x-scpls.svg b/elementary-xfce/mimes/128/audio-x-scpls.svg
index 43ca88781..ace508bdd 120000
--- a/elementary-xfce/mimes/128/audio-x-scpls.svg
+++ b/elementary-xfce/mimes/128/audio-x-scpls.svg
@@ -1 +1 @@
-audio-x-mp3-playlist.svg
\ No newline at end of file
+audio-x-playlist.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/128/image-jpeg2000.svg b/elementary-xfce/mimes/128/image-jp2.svg
similarity index 100%
rename from elementary-xfce/mimes/128/image-jpeg2000.svg
rename to elementary-xfce/mimes/128/image-jp2.svg
diff --git a/elementary-xfce/mimes/128/application-vnd.oasis.opendocument.drawing.svg b/elementary-xfce/mimes/128/image-svg+xml.svg
similarity index 100%
rename from elementary-xfce/mimes/128/application-vnd.oasis.opendocument.drawing.svg
rename to elementary-xfce/mimes/128/image-svg+xml.svg
diff --git a/elementary-xfce/mimes/128/image-x-ico.svg b/elementary-xfce/mimes/128/image-vnd.microsoft.icon.svg
similarity index 100%
rename from elementary-xfce/mimes/128/image-x-ico.svg
rename to elementary-xfce/mimes/128/image-vnd.microsoft.icon.svg
diff --git a/elementary-xfce/mimes/128/text-directory.svg b/elementary-xfce/mimes/128/text-directory.svg
deleted file mode 120000
index f8f54ddaa..000000000
--- a/elementary-xfce/mimes/128/text-directory.svg
+++ /dev/null
@@ -1 +0,0 @@
-office-contact.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/128/application-javascript.svg b/elementary-xfce/mimes/128/text-javascript.svg
similarity index 100%
rename from elementary-xfce/mimes/128/application-javascript.svg
rename to elementary-xfce/mimes/128/text-javascript.svg
diff --git a/elementary-xfce/mimes/128/text-x-c++.svg b/elementary-xfce/mimes/128/text-x-c++.svg
deleted file mode 100644
index a4a62cbbe..000000000
--- a/elementary-xfce/mimes/128/text-x-c++.svg
+++ /dev/null
@@ -1,255 +0,0 @@
-
-
diff --git a/elementary-xfce/mimes/128/text-x-c++src.svg b/elementary-xfce/mimes/128/text-x-c++src.svg
deleted file mode 120000
index cac65765e..000000000
--- a/elementary-xfce/mimes/128/text-x-c++src.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-x-c++.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/128/text-x-c++src.svg b/elementary-xfce/mimes/128/text-x-c++src.svg
new file mode 100644
index 000000000..a4a62cbbe
--- /dev/null
+++ b/elementary-xfce/mimes/128/text-x-c++src.svg
@@ -0,0 +1,255 @@
+
+
diff --git a/elementary-xfce/mimes/128/text-x-c.svg b/elementary-xfce/mimes/128/text-x-c.svg
deleted file mode 120000
index a50897fba..000000000
--- a/elementary-xfce/mimes/128/text-x-c.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-x-csrc.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/128/text-xml.svg b/elementary-xfce/mimes/128/text-xml.svg
deleted file mode 120000
index c4ba3155f..000000000
--- a/elementary-xfce/mimes/128/text-xml.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-html.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/16/application-x-bzip-compressed-tar.svg b/elementary-xfce/mimes/16/application-java-archive.svg
similarity index 100%
rename from elementary-xfce/mimes/16/application-x-bzip-compressed-tar.svg
rename to elementary-xfce/mimes/16/application-java-archive.svg
diff --git a/elementary-xfce/mimes/16/application-x-mobi8-ebook.svg b/elementary-xfce/mimes/16/application-vnd.amazon.mobi8-ebook.svg
similarity index 100%
rename from elementary-xfce/mimes/16/application-x-mobi8-ebook.svg
rename to elementary-xfce/mimes/16/application-vnd.amazon.mobi8-ebook.svg
diff --git a/elementary-xfce/mimes/16/application-vnd.efi.img.svg b/elementary-xfce/mimes/16/application-vnd.efi.img.svg
new file mode 120000
index 000000000..636afd585
--- /dev/null
+++ b/elementary-xfce/mimes/16/application-vnd.efi.img.svg
@@ -0,0 +1 @@
+application-vnd.efi.iso.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/16/application-x-cd-image.svg b/elementary-xfce/mimes/16/application-vnd.efi.iso.svg
similarity index 100%
rename from elementary-xfce/mimes/16/application-x-cd-image.svg
rename to elementary-xfce/mimes/16/application-vnd.efi.iso.svg
diff --git a/elementary-xfce/mimes/16/application-vnd.oasis.opendocument.drawing-template.svg b/elementary-xfce/mimes/16/application-vnd.oasis.opendocument.drawing-template.svg
deleted file mode 120000
index e24ef9457..000000000
--- a/elementary-xfce/mimes/16/application-vnd.oasis.opendocument.drawing-template.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing-template.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/16/application-x-bzip.svg b/elementary-xfce/mimes/16/application-x-bzip2-compressed-tar.svg
similarity index 100%
rename from elementary-xfce/mimes/16/application-x-bzip.svg
rename to elementary-xfce/mimes/16/application-x-bzip2-compressed-tar.svg
diff --git a/elementary-xfce/mimes/16/application-x-java-archive.svg b/elementary-xfce/mimes/16/application-x-bzip2.svg
similarity index 100%
rename from elementary-xfce/mimes/16/application-x-java-archive.svg
rename to elementary-xfce/mimes/16/application-x-bzip2.svg
diff --git a/elementary-xfce/mimes/16/application-x-ms-dos-executable.svg b/elementary-xfce/mimes/16/application-x-msdownload.svg
similarity index 100%
rename from elementary-xfce/mimes/16/application-x-ms-dos-executable.svg
rename to elementary-xfce/mimes/16/application-x-msdownload.svg
diff --git a/elementary-xfce/mimes/16/application-x-msi.svg b/elementary-xfce/mimes/16/application-x-msi.svg
index 216658108..5c78e366d 120000
--- a/elementary-xfce/mimes/16/application-x-msi.svg
+++ b/elementary-xfce/mimes/16/application-x-msi.svg
@@ -1 +1 @@
-application-x-ms-dos-executable.svg
\ No newline at end of file
+application-x-msdownload.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/16/application-x-raw-disk-image.svg b/elementary-xfce/mimes/16/application-x-raw-disk-image.svg
deleted file mode 120000
index 38aa8675c..000000000
--- a/elementary-xfce/mimes/16/application-x-raw-disk-image.svg
+++ /dev/null
@@ -1 +0,0 @@
-application-x-cd-image.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/16/application-x-yaml.svg b/elementary-xfce/mimes/16/application-yaml.svg
similarity index 100%
rename from elementary-xfce/mimes/16/application-x-yaml.svg
rename to elementary-xfce/mimes/16/application-yaml.svg
diff --git a/elementary-xfce/mimes/16/audio-x-wav.svg b/elementary-xfce/mimes/16/audio-vnd.wave.svg
similarity index 100%
rename from elementary-xfce/mimes/16/audio-x-wav.svg
rename to elementary-xfce/mimes/16/audio-vnd.wave.svg
diff --git a/elementary-xfce/mimes/16/audio-x-mp3-playlist.svg b/elementary-xfce/mimes/16/audio-x-mp3-playlist.svg
deleted file mode 120000
index ace508bdd..000000000
--- a/elementary-xfce/mimes/16/audio-x-mp3-playlist.svg
+++ /dev/null
@@ -1 +0,0 @@
-audio-x-playlist.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/16/image-jpeg2000.svg b/elementary-xfce/mimes/16/image-jp2.svg
similarity index 100%
rename from elementary-xfce/mimes/16/image-jpeg2000.svg
rename to elementary-xfce/mimes/16/image-jp2.svg
diff --git a/elementary-xfce/mimes/128/image-x-svg+xml.svg b/elementary-xfce/mimes/16/image-svg+xml.svg
similarity index 100%
rename from elementary-xfce/mimes/128/image-x-svg+xml.svg
rename to elementary-xfce/mimes/16/image-svg+xml.svg
diff --git a/elementary-xfce/mimes/16/image-x-ico.svg b/elementary-xfce/mimes/16/image-vnd.microsoft.icon.svg
similarity index 100%
rename from elementary-xfce/mimes/16/image-x-ico.svg
rename to elementary-xfce/mimes/16/image-vnd.microsoft.icon.svg
diff --git a/elementary-xfce/mimes/16/text-directory.svg b/elementary-xfce/mimes/16/text-directory.svg
deleted file mode 120000
index f8f54ddaa..000000000
--- a/elementary-xfce/mimes/16/text-directory.svg
+++ /dev/null
@@ -1 +0,0 @@
-office-contact.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/16/application-javascript.svg b/elementary-xfce/mimes/16/text-javascript.svg
similarity index 100%
rename from elementary-xfce/mimes/16/application-javascript.svg
rename to elementary-xfce/mimes/16/text-javascript.svg
diff --git a/elementary-xfce/mimes/16/text-x-c++.svg b/elementary-xfce/mimes/16/text-x-c++.svg
deleted file mode 100644
index e85280232..000000000
--- a/elementary-xfce/mimes/16/text-x-c++.svg
+++ /dev/null
@@ -1,190 +0,0 @@
-
-
diff --git a/elementary-xfce/mimes/16/text-x-c++src.svg b/elementary-xfce/mimes/16/text-x-c++src.svg
deleted file mode 120000
index cac65765e..000000000
--- a/elementary-xfce/mimes/16/text-x-c++src.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-x-c++.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/16/text-x-c++src.svg b/elementary-xfce/mimes/16/text-x-c++src.svg
new file mode 100644
index 000000000..e85280232
--- /dev/null
+++ b/elementary-xfce/mimes/16/text-x-c++src.svg
@@ -0,0 +1,190 @@
+
+
diff --git a/elementary-xfce/mimes/16/text-x-c.svg b/elementary-xfce/mimes/16/text-x-c.svg
deleted file mode 120000
index a50897fba..000000000
--- a/elementary-xfce/mimes/16/text-x-c.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-x-csrc.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/16/text-xml.svg b/elementary-xfce/mimes/16/text-xml.svg
deleted file mode 120000
index c4ba3155f..000000000
--- a/elementary-xfce/mimes/16/text-xml.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-html.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/24/application-x-bzip-compressed-tar.svg b/elementary-xfce/mimes/24/application-java-archive.svg
similarity index 100%
rename from elementary-xfce/mimes/24/application-x-bzip-compressed-tar.svg
rename to elementary-xfce/mimes/24/application-java-archive.svg
diff --git a/elementary-xfce/mimes/24/application-x-mobi8-ebook.svg b/elementary-xfce/mimes/24/application-vnd.amazon.mobi8-ebook.svg
similarity index 100%
rename from elementary-xfce/mimes/24/application-x-mobi8-ebook.svg
rename to elementary-xfce/mimes/24/application-vnd.amazon.mobi8-ebook.svg
diff --git a/elementary-xfce/mimes/24/application-vnd.efi.img.svg b/elementary-xfce/mimes/24/application-vnd.efi.img.svg
new file mode 120000
index 000000000..636afd585
--- /dev/null
+++ b/elementary-xfce/mimes/24/application-vnd.efi.img.svg
@@ -0,0 +1 @@
+application-vnd.efi.iso.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/24/application-x-cd-image.svg b/elementary-xfce/mimes/24/application-vnd.efi.iso.svg
similarity index 100%
rename from elementary-xfce/mimes/24/application-x-cd-image.svg
rename to elementary-xfce/mimes/24/application-vnd.efi.iso.svg
diff --git a/elementary-xfce/mimes/24/application-vnd.oasis.opendocument.drawing-template.svg b/elementary-xfce/mimes/24/application-vnd.oasis.opendocument.drawing-template.svg
deleted file mode 120000
index e24ef9457..000000000
--- a/elementary-xfce/mimes/24/application-vnd.oasis.opendocument.drawing-template.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing-template.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/24/application-x-bzip.svg b/elementary-xfce/mimes/24/application-x-bzip2-compressed-tar.svg
similarity index 100%
rename from elementary-xfce/mimes/24/application-x-bzip.svg
rename to elementary-xfce/mimes/24/application-x-bzip2-compressed-tar.svg
diff --git a/elementary-xfce/mimes/24/application-x-java-archive.svg b/elementary-xfce/mimes/24/application-x-bzip2.svg
similarity index 100%
rename from elementary-xfce/mimes/24/application-x-java-archive.svg
rename to elementary-xfce/mimes/24/application-x-bzip2.svg
diff --git a/elementary-xfce/mimes/24/application-x-ms-dos-executable.svg b/elementary-xfce/mimes/24/application-x-msdownload.svg
similarity index 100%
rename from elementary-xfce/mimes/24/application-x-ms-dos-executable.svg
rename to elementary-xfce/mimes/24/application-x-msdownload.svg
diff --git a/elementary-xfce/mimes/24/application-x-msi.svg b/elementary-xfce/mimes/24/application-x-msi.svg
index 216658108..5c78e366d 120000
--- a/elementary-xfce/mimes/24/application-x-msi.svg
+++ b/elementary-xfce/mimes/24/application-x-msi.svg
@@ -1 +1 @@
-application-x-ms-dos-executable.svg
\ No newline at end of file
+application-x-msdownload.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/24/application-x-raw-disk-image.svg b/elementary-xfce/mimes/24/application-x-raw-disk-image.svg
deleted file mode 120000
index 38aa8675c..000000000
--- a/elementary-xfce/mimes/24/application-x-raw-disk-image.svg
+++ /dev/null
@@ -1 +0,0 @@
-application-x-cd-image.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/24/application-x-yaml.svg b/elementary-xfce/mimes/24/application-yaml.svg
similarity index 100%
rename from elementary-xfce/mimes/24/application-x-yaml.svg
rename to elementary-xfce/mimes/24/application-yaml.svg
diff --git a/elementary-xfce/mimes/24/audio-x-wav.svg b/elementary-xfce/mimes/24/audio-vnd.wave.svg
similarity index 100%
rename from elementary-xfce/mimes/24/audio-x-wav.svg
rename to elementary-xfce/mimes/24/audio-vnd.wave.svg
diff --git a/elementary-xfce/mimes/24/audio-x-mp3-playlist.svg b/elementary-xfce/mimes/24/audio-x-mp3-playlist.svg
deleted file mode 120000
index ace508bdd..000000000
--- a/elementary-xfce/mimes/24/audio-x-mp3-playlist.svg
+++ /dev/null
@@ -1 +0,0 @@
-audio-x-playlist.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/24/image-jpeg2000.svg b/elementary-xfce/mimes/24/image-jp2.svg
similarity index 100%
rename from elementary-xfce/mimes/24/image-jpeg2000.svg
rename to elementary-xfce/mimes/24/image-jp2.svg
diff --git a/elementary-xfce/mimes/128/vnd.oasis.opendocument.drawing.svg b/elementary-xfce/mimes/24/image-svg+xml.svg
similarity index 100%
rename from elementary-xfce/mimes/128/vnd.oasis.opendocument.drawing.svg
rename to elementary-xfce/mimes/24/image-svg+xml.svg
diff --git a/elementary-xfce/mimes/24/image-x-ico.svg b/elementary-xfce/mimes/24/image-vnd.microsoft.icon.svg
similarity index 100%
rename from elementary-xfce/mimes/24/image-x-ico.svg
rename to elementary-xfce/mimes/24/image-vnd.microsoft.icon.svg
diff --git a/elementary-xfce/mimes/24/image-x-svg+xml.svg b/elementary-xfce/mimes/24/image-x-svg+xml.svg
deleted file mode 120000
index a3382f09c..000000000
--- a/elementary-xfce/mimes/24/image-x-svg+xml.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/24/text-directory.svg b/elementary-xfce/mimes/24/text-directory.svg
deleted file mode 120000
index f8f54ddaa..000000000
--- a/elementary-xfce/mimes/24/text-directory.svg
+++ /dev/null
@@ -1 +0,0 @@
-office-contact.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/24/application-javascript.svg b/elementary-xfce/mimes/24/text-javascript.svg
similarity index 100%
rename from elementary-xfce/mimes/24/application-javascript.svg
rename to elementary-xfce/mimes/24/text-javascript.svg
diff --git a/elementary-xfce/mimes/24/text-x-c++.svg b/elementary-xfce/mimes/24/text-x-c++.svg
deleted file mode 100644
index ea490df2c..000000000
--- a/elementary-xfce/mimes/24/text-x-c++.svg
+++ /dev/null
@@ -1,217 +0,0 @@
-
-
diff --git a/elementary-xfce/mimes/24/text-x-c++src.svg b/elementary-xfce/mimes/24/text-x-c++src.svg
deleted file mode 120000
index cac65765e..000000000
--- a/elementary-xfce/mimes/24/text-x-c++src.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-x-c++.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/24/text-x-c++src.svg b/elementary-xfce/mimes/24/text-x-c++src.svg
new file mode 100644
index 000000000..ea490df2c
--- /dev/null
+++ b/elementary-xfce/mimes/24/text-x-c++src.svg
@@ -0,0 +1,217 @@
+
+
diff --git a/elementary-xfce/mimes/24/text-x-c.svg b/elementary-xfce/mimes/24/text-x-c.svg
deleted file mode 120000
index a50897fba..000000000
--- a/elementary-xfce/mimes/24/text-x-c.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-x-csrc.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/24/text-xml.svg b/elementary-xfce/mimes/24/text-xml.svg
deleted file mode 120000
index c4ba3155f..000000000
--- a/elementary-xfce/mimes/24/text-xml.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-html.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/24/vnd.oasis.opendocument.drawing.svg b/elementary-xfce/mimes/24/vnd.oasis.opendocument.drawing.svg
deleted file mode 120000
index a3382f09c..000000000
--- a/elementary-xfce/mimes/24/vnd.oasis.opendocument.drawing.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/32/application-x-bzip-compressed-tar.svg b/elementary-xfce/mimes/32/application-java-archive.svg
similarity index 100%
rename from elementary-xfce/mimes/32/application-x-bzip-compressed-tar.svg
rename to elementary-xfce/mimes/32/application-java-archive.svg
diff --git a/elementary-xfce/mimes/32/application-x-mobi8-ebook.svg b/elementary-xfce/mimes/32/application-vnd.amazon.mobi8-ebook.svg
similarity index 100%
rename from elementary-xfce/mimes/32/application-x-mobi8-ebook.svg
rename to elementary-xfce/mimes/32/application-vnd.amazon.mobi8-ebook.svg
diff --git a/elementary-xfce/mimes/32/application-vnd.efi.img.svg b/elementary-xfce/mimes/32/application-vnd.efi.img.svg
new file mode 120000
index 000000000..636afd585
--- /dev/null
+++ b/elementary-xfce/mimes/32/application-vnd.efi.img.svg
@@ -0,0 +1 @@
+application-vnd.efi.iso.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/32/application-x-cd-image.svg b/elementary-xfce/mimes/32/application-vnd.efi.iso.svg
similarity index 100%
rename from elementary-xfce/mimes/32/application-x-cd-image.svg
rename to elementary-xfce/mimes/32/application-vnd.efi.iso.svg
diff --git a/elementary-xfce/mimes/32/application-vnd.oasis.opendocument.drawing-template.svg b/elementary-xfce/mimes/32/application-vnd.oasis.opendocument.drawing-template.svg
deleted file mode 120000
index e24ef9457..000000000
--- a/elementary-xfce/mimes/32/application-vnd.oasis.opendocument.drawing-template.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing-template.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/32/application-vnd.oasis.opendocument.drawing.svg b/elementary-xfce/mimes/32/application-vnd.oasis.opendocument.drawing.svg
deleted file mode 120000
index a3382f09c..000000000
--- a/elementary-xfce/mimes/32/application-vnd.oasis.opendocument.drawing.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/32/application-x-bzip.svg b/elementary-xfce/mimes/32/application-x-bzip2-compressed-tar.svg
similarity index 100%
rename from elementary-xfce/mimes/32/application-x-bzip.svg
rename to elementary-xfce/mimes/32/application-x-bzip2-compressed-tar.svg
diff --git a/elementary-xfce/mimes/32/application-x-java-archive.svg b/elementary-xfce/mimes/32/application-x-bzip2.svg
similarity index 100%
rename from elementary-xfce/mimes/32/application-x-java-archive.svg
rename to elementary-xfce/mimes/32/application-x-bzip2.svg
diff --git a/elementary-xfce/mimes/32/application-x-ms-dos-executable.svg b/elementary-xfce/mimes/32/application-x-msdownload.svg
similarity index 100%
rename from elementary-xfce/mimes/32/application-x-ms-dos-executable.svg
rename to elementary-xfce/mimes/32/application-x-msdownload.svg
diff --git a/elementary-xfce/mimes/32/application-x-msi.svg b/elementary-xfce/mimes/32/application-x-msi.svg
index 216658108..5c78e366d 120000
--- a/elementary-xfce/mimes/32/application-x-msi.svg
+++ b/elementary-xfce/mimes/32/application-x-msi.svg
@@ -1 +1 @@
-application-x-ms-dos-executable.svg
\ No newline at end of file
+application-x-msdownload.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/32/application-x-raw-disk-image.svg b/elementary-xfce/mimes/32/application-x-raw-disk-image.svg
deleted file mode 120000
index 38aa8675c..000000000
--- a/elementary-xfce/mimes/32/application-x-raw-disk-image.svg
+++ /dev/null
@@ -1 +0,0 @@
-application-x-cd-image.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/32/application-x-yaml.svg b/elementary-xfce/mimes/32/application-yaml.svg
similarity index 100%
rename from elementary-xfce/mimes/32/application-x-yaml.svg
rename to elementary-xfce/mimes/32/application-yaml.svg
diff --git a/elementary-xfce/mimes/32/audio-x-wav.svg b/elementary-xfce/mimes/32/audio-vnd.wave.svg
similarity index 100%
rename from elementary-xfce/mimes/32/audio-x-wav.svg
rename to elementary-xfce/mimes/32/audio-vnd.wave.svg
diff --git a/elementary-xfce/mimes/32/audio-x-mp3-playlist.svg b/elementary-xfce/mimes/32/audio-x-mp3-playlist.svg
deleted file mode 120000
index ace508bdd..000000000
--- a/elementary-xfce/mimes/32/audio-x-mp3-playlist.svg
+++ /dev/null
@@ -1 +0,0 @@
-audio-x-playlist.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/32/audio-x-mpegurl.svg b/elementary-xfce/mimes/32/audio-x-mpegurl.svg
index 43ca88781..ace508bdd 120000
--- a/elementary-xfce/mimes/32/audio-x-mpegurl.svg
+++ b/elementary-xfce/mimes/32/audio-x-mpegurl.svg
@@ -1 +1 @@
-audio-x-mp3-playlist.svg
\ No newline at end of file
+audio-x-playlist.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/32/audio-x-scpls.svg b/elementary-xfce/mimes/32/audio-x-scpls.svg
index 43ca88781..ace508bdd 120000
--- a/elementary-xfce/mimes/32/audio-x-scpls.svg
+++ b/elementary-xfce/mimes/32/audio-x-scpls.svg
@@ -1 +1 @@
-audio-x-mp3-playlist.svg
\ No newline at end of file
+audio-x-playlist.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/32/image-jpeg2000.svg b/elementary-xfce/mimes/32/image-jp2.svg
similarity index 100%
rename from elementary-xfce/mimes/32/image-jpeg2000.svg
rename to elementary-xfce/mimes/32/image-jp2.svg
diff --git a/elementary-xfce/mimes/16/application-vnd.oasis.opendocument.drawing.svg b/elementary-xfce/mimes/32/image-svg+xml.svg
similarity index 100%
rename from elementary-xfce/mimes/16/application-vnd.oasis.opendocument.drawing.svg
rename to elementary-xfce/mimes/32/image-svg+xml.svg
diff --git a/elementary-xfce/mimes/32/image-x-ico.svg b/elementary-xfce/mimes/32/image-vnd.microsoft.icon.svg
similarity index 100%
rename from elementary-xfce/mimes/32/image-x-ico.svg
rename to elementary-xfce/mimes/32/image-vnd.microsoft.icon.svg
diff --git a/elementary-xfce/mimes/32/image-x-svg+xml.svg b/elementary-xfce/mimes/32/image-x-svg+xml.svg
deleted file mode 120000
index a3382f09c..000000000
--- a/elementary-xfce/mimes/32/image-x-svg+xml.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/32/text-directory.svg b/elementary-xfce/mimes/32/text-directory.svg
deleted file mode 120000
index f8f54ddaa..000000000
--- a/elementary-xfce/mimes/32/text-directory.svg
+++ /dev/null
@@ -1 +0,0 @@
-office-contact.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/32/application-javascript.svg b/elementary-xfce/mimes/32/text-javascript.svg
similarity index 100%
rename from elementary-xfce/mimes/32/application-javascript.svg
rename to elementary-xfce/mimes/32/text-javascript.svg
diff --git a/elementary-xfce/mimes/32/text-x-c++.svg b/elementary-xfce/mimes/32/text-x-c++.svg
deleted file mode 100644
index caa79efcb..000000000
--- a/elementary-xfce/mimes/32/text-x-c++.svg
+++ /dev/null
@@ -1,243 +0,0 @@
-
-
diff --git a/elementary-xfce/mimes/32/text-x-c++src.svg b/elementary-xfce/mimes/32/text-x-c++src.svg
deleted file mode 120000
index cac65765e..000000000
--- a/elementary-xfce/mimes/32/text-x-c++src.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-x-c++.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/32/text-x-c++src.svg b/elementary-xfce/mimes/32/text-x-c++src.svg
new file mode 100644
index 000000000..caa79efcb
--- /dev/null
+++ b/elementary-xfce/mimes/32/text-x-c++src.svg
@@ -0,0 +1,243 @@
+
+
diff --git a/elementary-xfce/mimes/32/text-x-c.svg b/elementary-xfce/mimes/32/text-x-c.svg
deleted file mode 120000
index a50897fba..000000000
--- a/elementary-xfce/mimes/32/text-x-c.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-x-csrc.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/32/text-xml.svg b/elementary-xfce/mimes/32/text-xml.svg
deleted file mode 120000
index c4ba3155f..000000000
--- a/elementary-xfce/mimes/32/text-xml.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-html.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/32/vnd.oasis.opendocument.drawing.svg b/elementary-xfce/mimes/32/vnd.oasis.opendocument.drawing.svg
deleted file mode 120000
index a3382f09c..000000000
--- a/elementary-xfce/mimes/32/vnd.oasis.opendocument.drawing.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/48/application-x-java-archive.svg b/elementary-xfce/mimes/48/application-java-archive.svg
similarity index 100%
rename from elementary-xfce/mimes/48/application-x-java-archive.svg
rename to elementary-xfce/mimes/48/application-java-archive.svg
diff --git a/elementary-xfce/mimes/48/application-x-mobi8-ebook.svg b/elementary-xfce/mimes/48/application-vnd.amazon.mobi8-ebook.svg
similarity index 100%
rename from elementary-xfce/mimes/48/application-x-mobi8-ebook.svg
rename to elementary-xfce/mimes/48/application-vnd.amazon.mobi8-ebook.svg
diff --git a/elementary-xfce/mimes/48/application-vnd.efi.img.svg b/elementary-xfce/mimes/48/application-vnd.efi.img.svg
new file mode 120000
index 000000000..636afd585
--- /dev/null
+++ b/elementary-xfce/mimes/48/application-vnd.efi.img.svg
@@ -0,0 +1 @@
+application-vnd.efi.iso.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/48/application-x-cd-image.svg b/elementary-xfce/mimes/48/application-vnd.efi.iso.svg
similarity index 100%
rename from elementary-xfce/mimes/48/application-x-cd-image.svg
rename to elementary-xfce/mimes/48/application-vnd.efi.iso.svg
diff --git a/elementary-xfce/mimes/48/application-vnd.oasis.opendocument.drawing-template.svg b/elementary-xfce/mimes/48/application-vnd.oasis.opendocument.drawing-template.svg
deleted file mode 120000
index e24ef9457..000000000
--- a/elementary-xfce/mimes/48/application-vnd.oasis.opendocument.drawing-template.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing-template.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/48/application-vnd.oasis.opendocument.drawing.svg b/elementary-xfce/mimes/48/application-vnd.oasis.opendocument.drawing.svg
deleted file mode 120000
index a3382f09c..000000000
--- a/elementary-xfce/mimes/48/application-vnd.oasis.opendocument.drawing.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/48/application-x-bzip-compressed-tar.svg b/elementary-xfce/mimes/48/application-x-bzip2-compressed-tar.svg
similarity index 100%
rename from elementary-xfce/mimes/48/application-x-bzip-compressed-tar.svg
rename to elementary-xfce/mimes/48/application-x-bzip2-compressed-tar.svg
diff --git a/elementary-xfce/mimes/48/application-x-bzip.svg b/elementary-xfce/mimes/48/application-x-bzip2.svg
similarity index 100%
rename from elementary-xfce/mimes/48/application-x-bzip.svg
rename to elementary-xfce/mimes/48/application-x-bzip2.svg
diff --git a/elementary-xfce/mimes/48/application-x-ms-dos-executable.svg b/elementary-xfce/mimes/48/application-x-msdownload.svg
similarity index 100%
rename from elementary-xfce/mimes/48/application-x-ms-dos-executable.svg
rename to elementary-xfce/mimes/48/application-x-msdownload.svg
diff --git a/elementary-xfce/mimes/48/application-x-msi.svg b/elementary-xfce/mimes/48/application-x-msi.svg
index 216658108..5c78e366d 120000
--- a/elementary-xfce/mimes/48/application-x-msi.svg
+++ b/elementary-xfce/mimes/48/application-x-msi.svg
@@ -1 +1 @@
-application-x-ms-dos-executable.svg
\ No newline at end of file
+application-x-msdownload.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/48/application-x-raw-disk-image.svg b/elementary-xfce/mimes/48/application-x-raw-disk-image.svg
deleted file mode 120000
index 38aa8675c..000000000
--- a/elementary-xfce/mimes/48/application-x-raw-disk-image.svg
+++ /dev/null
@@ -1 +0,0 @@
-application-x-cd-image.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/48/application-x-yaml.svg b/elementary-xfce/mimes/48/application-yaml.svg
similarity index 100%
rename from elementary-xfce/mimes/48/application-x-yaml.svg
rename to elementary-xfce/mimes/48/application-yaml.svg
diff --git a/elementary-xfce/mimes/48/audio-x-wav.svg b/elementary-xfce/mimes/48/audio-vnd.wave.svg
similarity index 100%
rename from elementary-xfce/mimes/48/audio-x-wav.svg
rename to elementary-xfce/mimes/48/audio-vnd.wave.svg
diff --git a/elementary-xfce/mimes/48/audio-x-mp3-playlist.svg b/elementary-xfce/mimes/48/audio-x-mp3-playlist.svg
deleted file mode 120000
index ace508bdd..000000000
--- a/elementary-xfce/mimes/48/audio-x-mp3-playlist.svg
+++ /dev/null
@@ -1 +0,0 @@
-audio-x-playlist.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/48/audio-x-mpegurl.svg b/elementary-xfce/mimes/48/audio-x-mpegurl.svg
index 43ca88781..ace508bdd 120000
--- a/elementary-xfce/mimes/48/audio-x-mpegurl.svg
+++ b/elementary-xfce/mimes/48/audio-x-mpegurl.svg
@@ -1 +1 @@
-audio-x-mp3-playlist.svg
\ No newline at end of file
+audio-x-playlist.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/48/audio-x-scpls.svg b/elementary-xfce/mimes/48/audio-x-scpls.svg
index 43ca88781..ace508bdd 120000
--- a/elementary-xfce/mimes/48/audio-x-scpls.svg
+++ b/elementary-xfce/mimes/48/audio-x-scpls.svg
@@ -1 +1 @@
-audio-x-mp3-playlist.svg
\ No newline at end of file
+audio-x-playlist.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/48/image-jpeg2000.svg b/elementary-xfce/mimes/48/image-jp2.svg
similarity index 100%
rename from elementary-xfce/mimes/48/image-jpeg2000.svg
rename to elementary-xfce/mimes/48/image-jp2.svg
diff --git a/elementary-xfce/mimes/16/image-x-svg+xml.svg b/elementary-xfce/mimes/48/image-svg+xml.svg
similarity index 100%
rename from elementary-xfce/mimes/16/image-x-svg+xml.svg
rename to elementary-xfce/mimes/48/image-svg+xml.svg
diff --git a/elementary-xfce/mimes/48/image-x-ico.svg b/elementary-xfce/mimes/48/image-vnd.microsoft.icon.svg
similarity index 100%
rename from elementary-xfce/mimes/48/image-x-ico.svg
rename to elementary-xfce/mimes/48/image-vnd.microsoft.icon.svg
diff --git a/elementary-xfce/mimes/48/image-x-svg+xml.svg b/elementary-xfce/mimes/48/image-x-svg+xml.svg
deleted file mode 120000
index a3382f09c..000000000
--- a/elementary-xfce/mimes/48/image-x-svg+xml.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/48/text-directory.svg b/elementary-xfce/mimes/48/text-directory.svg
deleted file mode 120000
index f8f54ddaa..000000000
--- a/elementary-xfce/mimes/48/text-directory.svg
+++ /dev/null
@@ -1 +0,0 @@
-office-contact.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/48/application-javascript.svg b/elementary-xfce/mimes/48/text-javascript.svg
similarity index 100%
rename from elementary-xfce/mimes/48/application-javascript.svg
rename to elementary-xfce/mimes/48/text-javascript.svg
diff --git a/elementary-xfce/mimes/48/text-x-c++.svg b/elementary-xfce/mimes/48/text-x-c++.svg
deleted file mode 100644
index 22a3d54be..000000000
--- a/elementary-xfce/mimes/48/text-x-c++.svg
+++ /dev/null
@@ -1,233 +0,0 @@
-
-
diff --git a/elementary-xfce/mimes/48/text-x-c++src.svg b/elementary-xfce/mimes/48/text-x-c++src.svg
deleted file mode 120000
index cac65765e..000000000
--- a/elementary-xfce/mimes/48/text-x-c++src.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-x-c++.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/48/text-x-c++src.svg b/elementary-xfce/mimes/48/text-x-c++src.svg
new file mode 100644
index 000000000..22a3d54be
--- /dev/null
+++ b/elementary-xfce/mimes/48/text-x-c++src.svg
@@ -0,0 +1,233 @@
+
+
diff --git a/elementary-xfce/mimes/48/text-x-c.svg b/elementary-xfce/mimes/48/text-x-c.svg
deleted file mode 120000
index a50897fba..000000000
--- a/elementary-xfce/mimes/48/text-x-c.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-x-csrc.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/48/text-xml.svg b/elementary-xfce/mimes/48/text-xml.svg
deleted file mode 120000
index c4ba3155f..000000000
--- a/elementary-xfce/mimes/48/text-xml.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-html.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/48/vnd.oasis.opendocument.drawing.svg b/elementary-xfce/mimes/48/vnd.oasis.opendocument.drawing.svg
deleted file mode 120000
index a3382f09c..000000000
--- a/elementary-xfce/mimes/48/vnd.oasis.opendocument.drawing.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/64/application-x-java-archive.svg b/elementary-xfce/mimes/64/application-java-archive.svg
similarity index 100%
rename from elementary-xfce/mimes/64/application-x-java-archive.svg
rename to elementary-xfce/mimes/64/application-java-archive.svg
diff --git a/elementary-xfce/mimes/64/application-x-mobi8-ebook.svg b/elementary-xfce/mimes/64/application-vnd.amazon.mobi8-ebook.svg
similarity index 100%
rename from elementary-xfce/mimes/64/application-x-mobi8-ebook.svg
rename to elementary-xfce/mimes/64/application-vnd.amazon.mobi8-ebook.svg
diff --git a/elementary-xfce/mimes/64/application-vnd.efi.img.svg b/elementary-xfce/mimes/64/application-vnd.efi.img.svg
new file mode 120000
index 000000000..636afd585
--- /dev/null
+++ b/elementary-xfce/mimes/64/application-vnd.efi.img.svg
@@ -0,0 +1 @@
+application-vnd.efi.iso.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/64/application-x-cd-image.svg b/elementary-xfce/mimes/64/application-vnd.efi.iso.svg
similarity index 100%
rename from elementary-xfce/mimes/64/application-x-cd-image.svg
rename to elementary-xfce/mimes/64/application-vnd.efi.iso.svg
diff --git a/elementary-xfce/mimes/64/application-vnd.oasis.opendocument.drawing-template.svg b/elementary-xfce/mimes/64/application-vnd.oasis.opendocument.drawing-template.svg
deleted file mode 120000
index e24ef9457..000000000
--- a/elementary-xfce/mimes/64/application-vnd.oasis.opendocument.drawing-template.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing-template.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/64/application-vnd.oasis.opendocument.drawing.svg b/elementary-xfce/mimes/64/application-vnd.oasis.opendocument.drawing.svg
deleted file mode 120000
index a3382f09c..000000000
--- a/elementary-xfce/mimes/64/application-vnd.oasis.opendocument.drawing.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/64/application-x-bzip-compressed-tar.svg b/elementary-xfce/mimes/64/application-x-bzip2-compressed-tar.svg
similarity index 100%
rename from elementary-xfce/mimes/64/application-x-bzip-compressed-tar.svg
rename to elementary-xfce/mimes/64/application-x-bzip2-compressed-tar.svg
diff --git a/elementary-xfce/mimes/64/application-x-bzip.svg b/elementary-xfce/mimes/64/application-x-bzip2.svg
similarity index 100%
rename from elementary-xfce/mimes/64/application-x-bzip.svg
rename to elementary-xfce/mimes/64/application-x-bzip2.svg
diff --git a/elementary-xfce/mimes/64/application-x-ms-dos-executable.svg b/elementary-xfce/mimes/64/application-x-msdownload.svg
similarity index 100%
rename from elementary-xfce/mimes/64/application-x-ms-dos-executable.svg
rename to elementary-xfce/mimes/64/application-x-msdownload.svg
diff --git a/elementary-xfce/mimes/64/application-x-msi.svg b/elementary-xfce/mimes/64/application-x-msi.svg
index 216658108..5c78e366d 120000
--- a/elementary-xfce/mimes/64/application-x-msi.svg
+++ b/elementary-xfce/mimes/64/application-x-msi.svg
@@ -1 +1 @@
-application-x-ms-dos-executable.svg
\ No newline at end of file
+application-x-msdownload.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/64/application-x-raw-disk-image.svg b/elementary-xfce/mimes/64/application-x-raw-disk-image.svg
deleted file mode 120000
index 38aa8675c..000000000
--- a/elementary-xfce/mimes/64/application-x-raw-disk-image.svg
+++ /dev/null
@@ -1 +0,0 @@
-application-x-cd-image.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/64/application-x-yaml.svg b/elementary-xfce/mimes/64/application-yaml.svg
similarity index 100%
rename from elementary-xfce/mimes/64/application-x-yaml.svg
rename to elementary-xfce/mimes/64/application-yaml.svg
diff --git a/elementary-xfce/mimes/64/audio-x-wav.svg b/elementary-xfce/mimes/64/audio-vnd.wave.svg
similarity index 100%
rename from elementary-xfce/mimes/64/audio-x-wav.svg
rename to elementary-xfce/mimes/64/audio-vnd.wave.svg
diff --git a/elementary-xfce/mimes/64/audio-x-mp3-playlist.svg b/elementary-xfce/mimes/64/audio-x-mp3-playlist.svg
deleted file mode 120000
index ace508bdd..000000000
--- a/elementary-xfce/mimes/64/audio-x-mp3-playlist.svg
+++ /dev/null
@@ -1 +0,0 @@
-audio-x-playlist.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/64/audio-x-mpegurl.svg b/elementary-xfce/mimes/64/audio-x-mpegurl.svg
index 43ca88781..ace508bdd 120000
--- a/elementary-xfce/mimes/64/audio-x-mpegurl.svg
+++ b/elementary-xfce/mimes/64/audio-x-mpegurl.svg
@@ -1 +1 @@
-audio-x-mp3-playlist.svg
\ No newline at end of file
+audio-x-playlist.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/64/audio-x-scpls.svg b/elementary-xfce/mimes/64/audio-x-scpls.svg
index 43ca88781..ace508bdd 120000
--- a/elementary-xfce/mimes/64/audio-x-scpls.svg
+++ b/elementary-xfce/mimes/64/audio-x-scpls.svg
@@ -1 +1 @@
-audio-x-mp3-playlist.svg
\ No newline at end of file
+audio-x-playlist.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/64/image-jpeg2000.svg b/elementary-xfce/mimes/64/image-jp2.svg
similarity index 100%
rename from elementary-xfce/mimes/64/image-jpeg2000.svg
rename to elementary-xfce/mimes/64/image-jp2.svg
diff --git a/elementary-xfce/mimes/16/vnd.oasis.opendocument.drawing.svg b/elementary-xfce/mimes/64/image-svg+xml.svg
similarity index 100%
rename from elementary-xfce/mimes/16/vnd.oasis.opendocument.drawing.svg
rename to elementary-xfce/mimes/64/image-svg+xml.svg
diff --git a/elementary-xfce/mimes/64/image-x-ico.svg b/elementary-xfce/mimes/64/image-vnd.microsoft.icon.svg
similarity index 100%
rename from elementary-xfce/mimes/64/image-x-ico.svg
rename to elementary-xfce/mimes/64/image-vnd.microsoft.icon.svg
diff --git a/elementary-xfce/mimes/64/image-x-svg+xml.svg b/elementary-xfce/mimes/64/image-x-svg+xml.svg
deleted file mode 120000
index a3382f09c..000000000
--- a/elementary-xfce/mimes/64/image-x-svg+xml.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/64/text-directory.svg b/elementary-xfce/mimes/64/text-directory.svg
deleted file mode 120000
index f8f54ddaa..000000000
--- a/elementary-xfce/mimes/64/text-directory.svg
+++ /dev/null
@@ -1 +0,0 @@
-office-contact.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/64/application-javascript.svg b/elementary-xfce/mimes/64/text-javascript.svg
similarity index 100%
rename from elementary-xfce/mimes/64/application-javascript.svg
rename to elementary-xfce/mimes/64/text-javascript.svg
diff --git a/elementary-xfce/mimes/64/text-x-c++.svg b/elementary-xfce/mimes/64/text-x-c++.svg
deleted file mode 100644
index 3f3c6b2c1..000000000
--- a/elementary-xfce/mimes/64/text-x-c++.svg
+++ /dev/null
@@ -1,253 +0,0 @@
-
-
diff --git a/elementary-xfce/mimes/64/text-x-c++src.svg b/elementary-xfce/mimes/64/text-x-c++src.svg
deleted file mode 120000
index cac65765e..000000000
--- a/elementary-xfce/mimes/64/text-x-c++src.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-x-c++.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/64/text-x-c++src.svg b/elementary-xfce/mimes/64/text-x-c++src.svg
new file mode 100644
index 000000000..3f3c6b2c1
--- /dev/null
+++ b/elementary-xfce/mimes/64/text-x-c++src.svg
@@ -0,0 +1,253 @@
+
+
diff --git a/elementary-xfce/mimes/64/text-x-c.svg b/elementary-xfce/mimes/64/text-x-c.svg
deleted file mode 120000
index a50897fba..000000000
--- a/elementary-xfce/mimes/64/text-x-c.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-x-csrc.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/64/text-xml.svg b/elementary-xfce/mimes/64/text-xml.svg
deleted file mode 120000
index c4ba3155f..000000000
--- a/elementary-xfce/mimes/64/text-xml.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-html.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/64/vnd.oasis.opendocument.drawing.svg b/elementary-xfce/mimes/64/vnd.oasis.opendocument.drawing.svg
deleted file mode 120000
index a3382f09c..000000000
--- a/elementary-xfce/mimes/64/vnd.oasis.opendocument.drawing.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/96/application-x-java-archive.svg b/elementary-xfce/mimes/96/application-java-archive.svg
similarity index 100%
rename from elementary-xfce/mimes/96/application-x-java-archive.svg
rename to elementary-xfce/mimes/96/application-java-archive.svg
diff --git a/elementary-xfce/mimes/96/application-x-mobi8-ebook.svg b/elementary-xfce/mimes/96/application-vnd.amazon.mobi8-ebook.svg
similarity index 100%
rename from elementary-xfce/mimes/96/application-x-mobi8-ebook.svg
rename to elementary-xfce/mimes/96/application-vnd.amazon.mobi8-ebook.svg
diff --git a/elementary-xfce/mimes/96/application-vnd.efi.img.svg b/elementary-xfce/mimes/96/application-vnd.efi.img.svg
new file mode 120000
index 000000000..636afd585
--- /dev/null
+++ b/elementary-xfce/mimes/96/application-vnd.efi.img.svg
@@ -0,0 +1 @@
+application-vnd.efi.iso.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/96/application-x-cd-image.svg b/elementary-xfce/mimes/96/application-vnd.efi.iso.svg
similarity index 100%
rename from elementary-xfce/mimes/96/application-x-cd-image.svg
rename to elementary-xfce/mimes/96/application-vnd.efi.iso.svg
diff --git a/elementary-xfce/mimes/96/application-vnd.oasis.opendocument.drawing-template.svg b/elementary-xfce/mimes/96/application-vnd.oasis.opendocument.drawing-template.svg
deleted file mode 120000
index e24ef9457..000000000
--- a/elementary-xfce/mimes/96/application-vnd.oasis.opendocument.drawing-template.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing-template.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/96/application-vnd.oasis.opendocument.drawing.svg b/elementary-xfce/mimes/96/application-vnd.oasis.opendocument.drawing.svg
deleted file mode 120000
index a3382f09c..000000000
--- a/elementary-xfce/mimes/96/application-vnd.oasis.opendocument.drawing.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/96/application-x-bzip-compressed-tar.svg b/elementary-xfce/mimes/96/application-x-bzip2-compressed-tar.svg
similarity index 100%
rename from elementary-xfce/mimes/96/application-x-bzip-compressed-tar.svg
rename to elementary-xfce/mimes/96/application-x-bzip2-compressed-tar.svg
diff --git a/elementary-xfce/mimes/96/application-x-bzip.svg b/elementary-xfce/mimes/96/application-x-bzip2.svg
similarity index 100%
rename from elementary-xfce/mimes/96/application-x-bzip.svg
rename to elementary-xfce/mimes/96/application-x-bzip2.svg
diff --git a/elementary-xfce/mimes/96/application-x-ms-dos-executable.svg b/elementary-xfce/mimes/96/application-x-msdownload.svg
similarity index 100%
rename from elementary-xfce/mimes/96/application-x-ms-dos-executable.svg
rename to elementary-xfce/mimes/96/application-x-msdownload.svg
diff --git a/elementary-xfce/mimes/96/application-x-msi.svg b/elementary-xfce/mimes/96/application-x-msi.svg
index 216658108..5c78e366d 120000
--- a/elementary-xfce/mimes/96/application-x-msi.svg
+++ b/elementary-xfce/mimes/96/application-x-msi.svg
@@ -1 +1 @@
-application-x-ms-dos-executable.svg
\ No newline at end of file
+application-x-msdownload.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/96/application-x-raw-disk-image.svg b/elementary-xfce/mimes/96/application-x-raw-disk-image.svg
deleted file mode 120000
index 38aa8675c..000000000
--- a/elementary-xfce/mimes/96/application-x-raw-disk-image.svg
+++ /dev/null
@@ -1 +0,0 @@
-application-x-cd-image.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/96/application-x-yaml.svg b/elementary-xfce/mimes/96/application-yaml.svg
similarity index 100%
rename from elementary-xfce/mimes/96/application-x-yaml.svg
rename to elementary-xfce/mimes/96/application-yaml.svg
diff --git a/elementary-xfce/mimes/96/audio-x-wav.svg b/elementary-xfce/mimes/96/audio-vnd.wave.svg
similarity index 100%
rename from elementary-xfce/mimes/96/audio-x-wav.svg
rename to elementary-xfce/mimes/96/audio-vnd.wave.svg
diff --git a/elementary-xfce/mimes/96/audio-x-mp3-playlist.svg b/elementary-xfce/mimes/96/audio-x-mp3-playlist.svg
deleted file mode 120000
index ace508bdd..000000000
--- a/elementary-xfce/mimes/96/audio-x-mp3-playlist.svg
+++ /dev/null
@@ -1 +0,0 @@
-audio-x-playlist.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/96/image-jpeg2000.svg b/elementary-xfce/mimes/96/image-jp2.svg
similarity index 100%
rename from elementary-xfce/mimes/96/image-jpeg2000.svg
rename to elementary-xfce/mimes/96/image-jp2.svg
diff --git a/elementary-xfce/mimes/24/application-vnd.oasis.opendocument.drawing.svg b/elementary-xfce/mimes/96/image-svg+xml.svg
similarity index 100%
rename from elementary-xfce/mimes/24/application-vnd.oasis.opendocument.drawing.svg
rename to elementary-xfce/mimes/96/image-svg+xml.svg
diff --git a/elementary-xfce/mimes/96/image-x-ico.svg b/elementary-xfce/mimes/96/image-vnd.microsoft.icon.svg
similarity index 100%
rename from elementary-xfce/mimes/96/image-x-ico.svg
rename to elementary-xfce/mimes/96/image-vnd.microsoft.icon.svg
diff --git a/elementary-xfce/mimes/96/image-x-svg+xml.svg b/elementary-xfce/mimes/96/image-x-svg+xml.svg
deleted file mode 120000
index a3382f09c..000000000
--- a/elementary-xfce/mimes/96/image-x-svg+xml.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/96/text-directory.svg b/elementary-xfce/mimes/96/text-directory.svg
deleted file mode 120000
index f8f54ddaa..000000000
--- a/elementary-xfce/mimes/96/text-directory.svg
+++ /dev/null
@@ -1 +0,0 @@
-office-contact.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/96/application-javascript.svg b/elementary-xfce/mimes/96/text-javascript.svg
similarity index 100%
rename from elementary-xfce/mimes/96/application-javascript.svg
rename to elementary-xfce/mimes/96/text-javascript.svg
diff --git a/elementary-xfce/mimes/96/text-x-c++.svg b/elementary-xfce/mimes/96/text-x-c++.svg
deleted file mode 100644
index 483ce8d83..000000000
--- a/elementary-xfce/mimes/96/text-x-c++.svg
+++ /dev/null
@@ -1,230 +0,0 @@
-
-
diff --git a/elementary-xfce/mimes/96/text-x-c++src.svg b/elementary-xfce/mimes/96/text-x-c++src.svg
deleted file mode 120000
index cac65765e..000000000
--- a/elementary-xfce/mimes/96/text-x-c++src.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-x-c++.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/96/text-x-c++src.svg b/elementary-xfce/mimes/96/text-x-c++src.svg
new file mode 100644
index 000000000..483ce8d83
--- /dev/null
+++ b/elementary-xfce/mimes/96/text-x-c++src.svg
@@ -0,0 +1,230 @@
+
+
diff --git a/elementary-xfce/mimes/96/text-x-c.svg b/elementary-xfce/mimes/96/text-x-c.svg
deleted file mode 120000
index a50897fba..000000000
--- a/elementary-xfce/mimes/96/text-x-c.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-x-csrc.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/96/text-xml.svg b/elementary-xfce/mimes/96/text-xml.svg
deleted file mode 120000
index c4ba3155f..000000000
--- a/elementary-xfce/mimes/96/text-xml.svg
+++ /dev/null
@@ -1 +0,0 @@
-text-html.svg
\ No newline at end of file
diff --git a/elementary-xfce/mimes/96/vnd.oasis.opendocument.drawing.svg b/elementary-xfce/mimes/96/vnd.oasis.opendocument.drawing.svg
deleted file mode 120000
index a3382f09c..000000000
--- a/elementary-xfce/mimes/96/vnd.oasis.opendocument.drawing.svg
+++ /dev/null
@@ -1 +0,0 @@
-x-office-drawing.svg
\ No newline at end of file