summaryrefslogtreecommitdiffstats
path: root/mimetypes
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-22 01:27:30 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-22 01:27:30 -0500
commit2cd15151863796c2e708f6193f0f8420a6363383 (patch)
tree0ea2792da210f89f8a66c45472749b2e13d36404 /mimetypes
parent628f37ef39a7f2dd8d64a3f8b0c08f384362fc91 (diff)
downloadtdelibs-2cd15151863796c2e708f6193f0f8420a6363383.tar.gz
tdelibs-2cd15151863796c2e708f6193f0f8420a6363383.zip
Bring most mimetypes in line with XDG specifications. The following are not fully verified in source as of this commit due to ubiquity: html, empty, info, make, man, misc, source, unknown
Diffstat (limited to 'mimetypes')
-rw-r--r--mimetypes/application/fits.desktop2
-rw-r--r--mimetypes/application/illustrator.desktop2
-rw-r--r--mimetypes/application/java.desktop2
-rw-r--r--mimetypes/application/mathml+xml.desktop2
-rw-r--r--mimetypes/application/msexcel.desktop2
-rw-r--r--mimetypes/application/mspowerpoint.desktop2
-rw-r--r--mimetypes/application/msword.desktop2
-rw-r--r--mimetypes/application/ogg.desktop2
-rw-r--r--mimetypes/application/pdf.desktop2
-rw-r--r--mimetypes/application/postscript.desktop2
-rw-r--r--mimetypes/application/relaxng.desktop2
-rw-r--r--mimetypes/application/vnd.mozilla.xul+xml.desktop2
-rw-r--r--mimetypes/application/vnd.ms-access.desktop2
-rw-r--r--mimetypes/application/vnd.ms-asf.desktop2
-rw-r--r--mimetypes/application/vnd.ms-excel.addin.macroEnabled.12.desktop2
-rw-r--r--mimetypes/application/vnd.ms-excel.desktop2
-rw-r--r--mimetypes/application/vnd.ms-excel.sheet.binary.macroEnabled.12.desktop2
-rw-r--r--mimetypes/application/vnd.ms-excel.sheet.macroEnabled.12.desktop2
-rw-r--r--mimetypes/application/vnd.ms-excel.template.macroEnabled.12.desktop2
-rw-r--r--mimetypes/application/vnd.ms-powerpoint.addin.macroEnabled.12.desktop2
-rw-r--r--mimetypes/application/vnd.ms-powerpoint.desktop2
-rw-r--r--mimetypes/application/vnd.ms-powerpoint.presentation.macroEnabled.12.desktop2
-rw-r--r--mimetypes/application/vnd.ms-powerpoint.slideshow.macroEnabled.12.desktop2
-rw-r--r--mimetypes/application/vnd.ms-powerpoint.template.macroEnabled.12.desktop2
-rw-r--r--mimetypes/application/vnd.ms-word.desktop2
-rw-r--r--mimetypes/application/vnd.ms-word.document.macroEnabled.12.desktop2
-rw-r--r--mimetypes/application/vnd.ms-word.template.macroEnabled.12.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.chart.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.database.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.formula.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.graphics-flat-xml.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.graphics.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.image.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.presentation-flat-xml.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.presentation.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.spreadsheet-flat-xml.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.text-flat-xml.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.text-template.desktop2
-rw-r--r--mimetypes/application/vnd.oasis.opendocument.text.desktop2
-rw-r--r--mimetypes/application/vnd.openxmlformats-officedocument.presentationml.presentation.desktop2
-rw-r--r--mimetypes/application/vnd.openxmlformats-officedocument.presentationml.slideshow.desktop2
-rw-r--r--mimetypes/application/vnd.openxmlformats-officedocument.presentationml.template.desktop2
-rw-r--r--mimetypes/application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.desktop2
-rw-r--r--mimetypes/application/vnd.openxmlformats-officedocument.spreadsheetml.template.desktop2
-rw-r--r--mimetypes/application/vnd.openxmlformats-officedocument.wordprocessingml.document.desktop2
-rw-r--r--mimetypes/application/vnd.openxmlformats-officedocument.wordprocessingml.template.desktop2
-rw-r--r--mimetypes/application/vnd.palm.desktop2
-rw-r--r--mimetypes/application/vnd.rn-realmedia.desktop2
-rw-r--r--mimetypes/application/vnd.stardivision.calc.desktop2
-rw-r--r--mimetypes/application/vnd.stardivision.chart.desktop2
-rw-r--r--mimetypes/application/vnd.stardivision.draw.desktop2
-rw-r--r--mimetypes/application/vnd.stardivision.impress.desktop2
-rw-r--r--mimetypes/application/vnd.stardivision.math.desktop2
-rw-r--r--mimetypes/application/vnd.stardivision.writer-global.desktop2
-rw-r--r--mimetypes/application/vnd.stardivision.writer.desktop2
-rw-r--r--mimetypes/application/vnd.sun.xml.base.desktop2
-rw-r--r--mimetypes/application/vnd.sun.xml.calc.desktop2
-rw-r--r--mimetypes/application/vnd.sun.xml.calc.template.desktop2
-rw-r--r--mimetypes/application/vnd.sun.xml.draw.desktop2
-rw-r--r--mimetypes/application/vnd.sun.xml.draw.template.desktop2
-rw-r--r--mimetypes/application/vnd.sun.xml.impress.desktop2
-rw-r--r--mimetypes/application/vnd.sun.xml.impress.template.desktop2
-rw-r--r--mimetypes/application/vnd.sun.xml.writer.desktop2
-rw-r--r--mimetypes/application/vnd.sun.xml.writer.master.desktop2
-rw-r--r--mimetypes/application/vnd.sun.xml.writer.template.desktop2
-rw-r--r--mimetypes/application/wordperfect.desktop2
-rw-r--r--mimetypes/application/x-7z.desktop2
-rw-r--r--mimetypes/application/x-abiword.desktop2
-rw-r--r--mimetypes/application/x-ace.desktop2
-rw-r--r--mimetypes/application/x-afm.desktop2
-rw-r--r--mimetypes/application/x-amipro.desktop2
-rw-r--r--mimetypes/application/x-applixgraphics.desktop2
-rw-r--r--mimetypes/application/x-applixspread.desktop2
-rw-r--r--mimetypes/application/x-applixword.desktop2
-rw-r--r--mimetypes/application/x-arc.desktop2
-rw-r--r--mimetypes/application/x-archive.desktop2
-rw-r--r--mimetypes/application/x-arj.desktop2
-rw-r--r--mimetypes/application/x-awk.desktop2
-rw-r--r--mimetypes/application/x-bittorrent.desktop2
-rw-r--r--mimetypes/application/x-bz2dvi.desktop2
-rw-r--r--mimetypes/application/x-bzip.desktop2
-rw-r--r--mimetypes/application/x-bzip2.desktop2
-rw-r--r--mimetypes/application/x-cda.desktop2
-rw-r--r--mimetypes/application/x-compress.desktop2
-rw-r--r--mimetypes/application/x-core.desktop2
-rw-r--r--mimetypes/application/x-cpio.desktop2
-rw-r--r--mimetypes/application/x-cue.desktop2
-rw-r--r--mimetypes/application/x-dbase.desktop2
-rw-r--r--mimetypes/application/x-deb.desktop2
-rw-r--r--mimetypes/application/x-debian-package.desktop2
-rw-r--r--mimetypes/application/x-designer.desktop2
-rw-r--r--mimetypes/application/x-dvi.desktop2
-rw-r--r--mimetypes/application/x-egon.desktop2
-rw-r--r--mimetypes/application/x-font-bdf.desktop2
-rw-r--r--mimetypes/application/x-font-ghostscript.desktop2
-rw-r--r--mimetypes/application/x-font-otf.desktop2
-rw-r--r--mimetypes/application/x-font-pcf.desktop2
-rw-r--r--mimetypes/application/x-font-snf.desktop2
-rw-r--r--mimetypes/application/x-font-speedo.desktop2
-rw-r--r--mimetypes/application/x-font-ttc.desktop2
-rw-r--r--mimetypes/application/x-font-ttf.desktop2
-rw-r--r--mimetypes/application/x-font-type1.desktop2
-rw-r--r--mimetypes/application/x-gettext.desktop2
-rw-r--r--mimetypes/application/x-gnumeric.desktop2
-rw-r--r--mimetypes/application/x-gzdvi.desktop2
-rw-r--r--mimetypes/application/x-gzip.desktop2
-rw-r--r--mimetypes/application/x-gzpostscript.desktop2
-rw-r--r--mimetypes/application/x-hancomword.desktop2
-rw-r--r--mimetypes/application/x-ica.desktop2
-rw-r--r--mimetypes/application/x-iso.desktop2
-rw-r--r--mimetypes/application/x-jar.desktop2
-rw-r--r--mimetypes/application/x-java.desktop2
-rw-r--r--mimetypes/application/x-karbon.desktop2
-rw-r--r--mimetypes/application/x-kchart.desktop2
-rw-r--r--mimetypes/application/x-kcsrc.desktop2
-rw-r--r--mimetypes/application/x-kformula.desktop2
-rw-r--r--mimetypes/application/x-kivio.desktop2
-rw-r--r--mimetypes/application/x-kontour.desktop2
-rw-r--r--mimetypes/application/x-kpresenter.desktop2
-rw-r--r--mimetypes/application/x-krita.desktop2
-rw-r--r--mimetypes/application/x-kspread.desktop2
-rw-r--r--mimetypes/application/x-kugar.desktop2
-rw-r--r--mimetypes/application/x-kword.desktop2
-rw-r--r--mimetypes/application/x-lha.desktop2
-rw-r--r--mimetypes/application/x-linguist.desktop2
-rw-r--r--mimetypes/application/x-lyx.desktop2
-rw-r--r--mimetypes/application/x-lzma.desktop2
-rw-r--r--mimetypes/application/x-lzop.desktop2
-rw-r--r--mimetypes/application/x-magicpoint.desktop2
-rw-r--r--mimetypes/application/x-mplayer2.desktop2
-rw-r--r--mimetypes/application/x-msaccess.desktop2
-rw-r--r--mimetypes/application/x-msmetafile.desktop2
-rw-r--r--mimetypes/application/x-mswrite.desktop2
-rw-r--r--mimetypes/application/x-nzb.desktop2
-rw-r--r--mimetypes/application/x-object.desktop2
-rw-r--r--mimetypes/application/x-ogg.desktop2
-rw-r--r--mimetypes/application/x-pak.desktop2
-rw-r--r--mimetypes/application/x-perl-module.desktop2
-rw-r--r--mimetypes/application/x-perl.desktop2
-rw-r--r--mimetypes/application/x-php.desktop2
-rw-r--r--mimetypes/application/x-pw.desktop2
-rw-r--r--mimetypes/application/x-python-bytecode.desktop2
-rw-r--r--mimetypes/application/x-python.desktop2
-rw-r--r--mimetypes/application/x-quattropro.desktop2
-rw-r--r--mimetypes/application/x-rar-compressed.desktop2
-rw-r--r--mimetypes/application/x-rar.desktop2
-rw-r--r--mimetypes/application/x-rpm.desktop2
-rw-r--r--mimetypes/application/x-ruby.desktop2
-rw-r--r--mimetypes/application/x-sharedlib.desktop2
-rw-r--r--mimetypes/application/x-shellscript.desktop2
-rw-r--r--mimetypes/application/x-siag.desktop2
-rw-r--r--mimetypes/application/x-sqlite2.desktop2
-rw-r--r--mimetypes/application/x-sqlite3.desktop2
-rw-r--r--mimetypes/application/x-tar.desktop2
-rw-r--r--mimetypes/application/x-tarz.desktop2
-rw-r--r--mimetypes/application/x-tbz.desktop2
-rw-r--r--mimetypes/application/x-tex-gf.desktop2
-rw-r--r--mimetypes/application/x-tex-pk.desktop2
-rw-r--r--mimetypes/application/x-tgif.desktop2
-rw-r--r--mimetypes/application/x-tgz.desktop2
-rw-r--r--mimetypes/application/x-tlz.desktop2
-rw-r--r--mimetypes/application/x-trash.desktop2
-rw-r--r--mimetypes/application/x-troff-man.desktop2
-rw-r--r--mimetypes/application/x-troff.desktop2
-rw-r--r--mimetypes/application/x-txz.desktop2
-rw-r--r--mimetypes/application/x-tzo.desktop2
-rw-r--r--mimetypes/application/x-vnd.kde.kexi.desktop2
-rw-r--r--mimetypes/application/x-vnd.kde.kugar.mixed.desktop2
-rw-r--r--mimetypes/application/x-xliff.desktop2
-rw-r--r--mimetypes/application/x-xz.desktop2
-rw-r--r--mimetypes/application/x-zerosize.desktop2
-rw-r--r--mimetypes/application/x-zip-compressed.desktop2
-rw-r--r--mimetypes/application/x-zip.desktop2
-rw-r--r--mimetypes/application/x-zoo.desktop2
-rw-r--r--mimetypes/application/xhtml+xml.desktop2
-rw-r--r--mimetypes/application/xml-dtd.desktop2
-rw-r--r--mimetypes/application/xml.desktop2
-rw-r--r--mimetypes/application/xsd.desktop2
-rw-r--r--mimetypes/audio/aac.desktop2
-rw-r--r--mimetypes/audio/ac3.desktop2
-rw-r--r--mimetypes/audio/basic.desktop2
-rw-r--r--mimetypes/audio/mp4.desktop2
-rw-r--r--mimetypes/audio/mpeg.desktop2
-rw-r--r--mimetypes/audio/mpegurl.desktop2
-rw-r--r--mimetypes/audio/prs.sid.desktop2
-rw-r--r--mimetypes/audio/vnd.rn-realaudio.desktop2
-rw-r--r--mimetypes/audio/vorbis.desktop2
-rw-r--r--mimetypes/audio/x-adpcm.desktop2
-rw-r--r--mimetypes/audio/x-aiff.desktop2
-rw-r--r--mimetypes/audio/x-flac.desktop2
-rw-r--r--mimetypes/audio/x-matroska.desktop2
-rw-r--r--mimetypes/audio/x-midi.desktop2
-rw-r--r--mimetypes/audio/x-mod.desktop2
-rw-r--r--mimetypes/audio/x-mp2.desktop2
-rw-r--r--mimetypes/audio/x-mp3.desktop2
-rw-r--r--mimetypes/audio/x-mpegurl.desktop2
-rw-r--r--mimetypes/audio/x-ms-wma.desktop2
-rw-r--r--mimetypes/audio/x-musepack.desktop2
-rw-r--r--mimetypes/audio/x-oggflac.desktop2
-rw-r--r--mimetypes/audio/x-pn-realaudio-plugin.desktop2
-rw-r--r--mimetypes/audio/x-pn-realaudio.desktop2
-rw-r--r--mimetypes/audio/x-scpls.desktop2
-rw-r--r--mimetypes/audio/x-speex.desktop2
-rw-r--r--mimetypes/audio/x-vorbis.desktop2
-rw-r--r--mimetypes/audio/x-wav.desktop2
-rw-r--r--mimetypes/image/cgm.desktop2
-rw-r--r--mimetypes/image/fax-g3.desktop2
-rw-r--r--mimetypes/image/fits.desktop2
-rw-r--r--mimetypes/image/gif.desktop2
-rw-r--r--mimetypes/image/jp2.desktop2
-rw-r--r--mimetypes/image/jpeg.desktop2
-rw-r--r--mimetypes/image/jpg.desktop2
-rw-r--r--mimetypes/image/pjpeg.desktop2
-rw-r--r--mimetypes/image/png.desktop2
-rw-r--r--mimetypes/image/svg+xml.desktop2
-rw-r--r--mimetypes/image/svg-xml.desktop2
-rw-r--r--mimetypes/image/tiff.desktop2
-rw-r--r--mimetypes/image/x-bmp.desktop2
-rw-r--r--mimetypes/image/x-dds.desktop2
-rw-r--r--mimetypes/image/x-eps.desktop2
-rw-r--r--mimetypes/image/x-exr.desktop2
-rw-r--r--mimetypes/image/x-hdr.desktop2
-rw-r--r--mimetypes/image/x-ico.desktop2
-rw-r--r--mimetypes/image/x-jng.desktop2
-rw-r--r--mimetypes/image/x-msod.desktop2
-rw-r--r--mimetypes/image/x-pcx.desktop2
-rw-r--r--mimetypes/image/x-photo-cd.desktop2
-rw-r--r--mimetypes/image/x-portable-bitmap.desktop2
-rw-r--r--mimetypes/image/x-portable-greymap.desktop2
-rw-r--r--mimetypes/image/x-portable-pixmap.desktop2
-rw-r--r--mimetypes/image/x-raw.desktop2
-rw-r--r--mimetypes/image/x-rgb.desktop2
-rw-r--r--mimetypes/image/x-targa.desktop2
-rw-r--r--mimetypes/image/x-vnd.adobe.photoshop.desktop2
-rw-r--r--mimetypes/image/x-vnd.trolltech.qpicture.desktop2
-rw-r--r--mimetypes/image/x-wmf.desktop2
-rw-r--r--mimetypes/image/x-xbm.desktop2
-rw-r--r--mimetypes/image/x-xcf-gimp.desktop2
-rw-r--r--mimetypes/image/x-xfig.desktop2
-rw-r--r--mimetypes/image/x-xpm.desktop2
-rw-r--r--mimetypes/text/calendar.desktop2
-rw-r--r--mimetypes/text/css.desktop2
-rw-r--r--mimetypes/text/docbook.desktop2
-rw-r--r--mimetypes/text/enriched.desktop2
-rw-r--r--mimetypes/text/html.desktop2
-rw-r--r--mimetypes/text/plain.desktop2
-rw-r--r--mimetypes/text/rtf.desktop2
-rw-r--r--mimetypes/text/sgml.desktop2
-rw-r--r--mimetypes/text/vnd.abc.desktop2
-rw-r--r--mimetypes/text/vnd.wap.wml.desktop2
-rw-r--r--mimetypes/text/x-adasrc.desktop2
-rw-r--r--mimetypes/text/x-bibtex.desktop2
-rw-r--r--mimetypes/text/x-c++hdr.desktop2
-rw-r--r--mimetypes/text/x-c++src.desktop2
-rw-r--r--mimetypes/text/x-chdr.desktop2
-rw-r--r--mimetypes/text/x-csrc.desktop2
-rw-r--r--mimetypes/text/x-csv.desktop2
-rw-r--r--mimetypes/text/x-diff.desktop2
-rw-r--r--mimetypes/text/x-hex.desktop2
-rw-r--r--mimetypes/text/x-java.desktop2
-rw-r--r--mimetypes/text/x-katefilelist.desktop2
-rw-r--r--mimetypes/text/x-latex.desktop2
-rw-r--r--mimetypes/text/x-ldif.desktop2
-rw-r--r--mimetypes/text/x-log.desktop2
-rw-r--r--mimetypes/text/x-makefile.desktop2
-rw-r--r--mimetypes/text/x-moc.desktop2
-rw-r--r--mimetypes/text/x-mswinurl.desktop2
-rw-r--r--mimetypes/text/x-objchdr.desktop2
-rw-r--r--mimetypes/text/x-objcsrc.desktop2
-rw-r--r--mimetypes/text/x-pascal.desktop2
-rw-r--r--mimetypes/text/x-perl.desktop2
-rw-r--r--mimetypes/text/x-python.desktop2
-rw-r--r--mimetypes/text/x-shellscript.desktop2
-rw-r--r--mimetypes/text/x-tcl.desktop2
-rw-r--r--mimetypes/text/x-tex.desktop2
-rw-r--r--mimetypes/text/x-vcalendar.desktop2
-rw-r--r--mimetypes/text/x-vcard.desktop2
-rw-r--r--mimetypes/text/x-xslfo.desktop2
-rw-r--r--mimetypes/text/x-xslt.desktop2
-rw-r--r--mimetypes/text/xml.desktop2
-rw-r--r--mimetypes/uri/mms.desktop2
-rw-r--r--mimetypes/uri/mmst.desktop2
-rw-r--r--mimetypes/uri/mmsu.desktop2
-rw-r--r--mimetypes/uri/pnm.desktop2
-rw-r--r--mimetypes/uri/rtspt.desktop2
-rw-r--r--mimetypes/uri/rtspu.desktop2
-rw-r--r--mimetypes/video/avi.desktop2
-rw-r--r--mimetypes/video/mp4.desktop2
-rw-r--r--mimetypes/video/mpeg.desktop2
-rw-r--r--mimetypes/video/quicktime.desktop2
-rw-r--r--mimetypes/video/vnd.rn-realvideo.desktop2
-rw-r--r--mimetypes/video/x-flic.desktop2
-rw-r--r--mimetypes/video/x-flv.desktop2
-rw-r--r--mimetypes/video/x-matroska.desktop2
-rw-r--r--mimetypes/video/x-mng.desktop2
-rw-r--r--mimetypes/video/x-ms-asf.desktop2
-rw-r--r--mimetypes/video/x-ms-wmv.desktop2
-rw-r--r--mimetypes/video/x-msvideo.desktop2
-rw-r--r--mimetypes/video/x-ogm.desktop2
-rw-r--r--mimetypes/video/x-theora.desktop2
304 files changed, 304 insertions, 304 deletions
diff --git a/mimetypes/application/fits.desktop b/mimetypes/application/fits.desktop
index 9482399e..d2f2438d 100644
--- a/mimetypes/application/fits.desktop
+++ b/mimetypes/application/fits.desktop
@@ -61,6 +61,6 @@ Comment[vi]=Dữ liệu FITS
Comment[zh_CN]=FITs 数据
Comment[zh_HK]=FITS 資料
Comment[zh_TW]=FITS 資料
-Icon=binary
+Icon=application-octet-stream
# Note: application/fits is for any kind of FITS, so also for non-images
### TODO: what file pattern, especially that image/fits has the same
diff --git a/mimetypes/application/illustrator.desktop b/mimetypes/application/illustrator.desktop
index 893d3b76..369054e7 100644
--- a/mimetypes/application/illustrator.desktop
+++ b/mimetypes/application/illustrator.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/illustrator
-Icon=pdf
+Icon=application-pdf
Patterns=*.ai;*.AI;
Comment=Adobe Illustrator Document
Comment[af]=Adobe Illustreerder Dokument
diff --git a/mimetypes/application/java.desktop b/mimetypes/application/java.desktop
index 49b6f05b..71ceb671 100644
--- a/mimetypes/application/java.desktop
+++ b/mimetypes/application/java.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/java
-Icon=source_java
+Icon=text-x-text-x-java
Comment=Java Class
Comment[af]=Java Klas
Comment[az]=Java Sinifi
diff --git a/mimetypes/application/mathml+xml.desktop b/mimetypes/application/mathml+xml.desktop
index 36f67041..364dd691 100644
--- a/mimetypes/application/mathml+xml.desktop
+++ b/mimetypes/application/mathml+xml.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/mathml+xml
Patterns=*.mml;*.MML
-Icon=html
+Icon=text-x-text-html
Hidden=false
X-TDE-IsAlso=text/xml
Comment=MathML Document
diff --git a/mimetypes/application/msexcel.desktop b/mimetypes/application/msexcel.desktop
index 2d9754e0..eaae307f 100644
--- a/mimetypes/application/msexcel.desktop
+++ b/mimetypes/application/msexcel.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/msexcel
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Patterns=*.xls;*.XLS;*.xlc;*.XLC;*.xll;*.XLL;*.xlm;*.XLM;*.xlw;*.XLW;
X-TDE-IsAlso=application/vnd.ms-excel
Comment=Microsoft Excel Spreadsheet
diff --git a/mimetypes/application/mspowerpoint.desktop b/mimetypes/application/mspowerpoint.desktop
index ea7da89b..fe860f04 100644
--- a/mimetypes/application/mspowerpoint.desktop
+++ b/mimetypes/application/mspowerpoint.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/mspowerpoint
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
X-TDE-IsAlso=application/vnd.ms-powerpoint
Patterns=*.ppz;*.PPZ;*.ppt;*.PPT;*.pps;*.PPS;
Comment=Microsoft PowerPoint Presentation
diff --git a/mimetypes/application/msword.desktop b/mimetypes/application/msword.desktop
index a601ebdf..92ceef71 100644
--- a/mimetypes/application/msword.desktop
+++ b/mimetypes/application/msword.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/msword
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Patterns=*.doc;*.DOC;
X-TDE-IsAlso=application/vnd.ms-word
X-TDE-PatternsAccuracy=50
diff --git a/mimetypes/application/ogg.desktop b/mimetypes/application/ogg.desktop
index 426d1c0a..859a4e87 100644
--- a/mimetypes/application/ogg.desktop
+++ b/mimetypes/application/ogg.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/ogg
-Icon=sound
+Icon=audio-x-generic
Patterns=*.ogg;*.OGG;
# Previous name of this mimetype
X-TDE-IsAlso=application/x-ogg
diff --git a/mimetypes/application/pdf.desktop b/mimetypes/application/pdf.desktop
index 035bea51..e8dd5889 100644
--- a/mimetypes/application/pdf.desktop
+++ b/mimetypes/application/pdf.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/pdf
-Icon=pdf
+Icon=application-pdf
Patterns=*.pdf;*.PDF;
X-TDE-PatternsAccuracy=90
Comment=PDF Document
diff --git a/mimetypes/application/postscript.desktop b/mimetypes/application/postscript.desktop
index ea27f4fb..733945cf 100644
--- a/mimetypes/application/postscript.desktop
+++ b/mimetypes/application/postscript.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/postscript
-Icon=postscript
+Icon=application-postscript
Patterns=*.ps;*.PS;
X-TDE-PatternsAccuracy=95
Comment=PostScript Document
diff --git a/mimetypes/application/relaxng.desktop b/mimetypes/application/relaxng.desktop
index 9d9b439a..3df8f41c 100644
--- a/mimetypes/application/relaxng.desktop
+++ b/mimetypes/application/relaxng.desktop
@@ -3,7 +3,7 @@ Comment=RELAX NG
Comment[af]=Ontspannende NG
Comment[hi]=रीलेक्स एनजी
Comment[te]=రిలేక్స్ NG
-Icon=html
+Icon=text-x-text-html
Type=MimeType
MimeType=application/xml
X-TDE-IsAlso=text/xml
diff --git a/mimetypes/application/vnd.mozilla.xul+xml.desktop b/mimetypes/application/vnd.mozilla.xul+xml.desktop
index e36d12c5..e4b69718 100644
--- a/mimetypes/application/vnd.mozilla.xul+xml.desktop
+++ b/mimetypes/application/vnd.mozilla.xul+xml.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.mozilla.xul+xml
X-TDE-IsAlso=text/xml
-Icon=netscape_doc
+Icon=
Patterns=*.xul;*.XUL;
Comment=Mozilla XUL File
Comment[af]=Mozilla XUL Lêer
diff --git a/mimetypes/application/vnd.ms-access.desktop b/mimetypes/application/vnd.ms-access.desktop
index b8a81a08..1ab4c673 100644
--- a/mimetypes/application/vnd.ms-access.desktop
+++ b/mimetypes/application/vnd.ms-access.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/vnd.ms-access
-Icon=database
+Icon=application-vnd.oasis.opendocument.database
Comment=Microsoft Access Database
[Property::X-TDE-NativeExtension]
Type=TQString
diff --git a/mimetypes/application/vnd.ms-asf.desktop b/mimetypes/application/vnd.ms-asf.desktop
index b9bd4bd9..eef31b6b 100644
--- a/mimetypes/application/vnd.ms-asf.desktop
+++ b/mimetypes/application/vnd.ms-asf.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/vnd.ms-asf
-Icon=video
+Icon=video-x-generic
Comment=ASF Media
Comment[ar]=وسيط ASF
Comment[az]=ASF Mediyası
diff --git a/mimetypes/application/vnd.ms-excel.addin.macroEnabled.12.desktop b/mimetypes/application/vnd.ms-excel.addin.macroEnabled.12.desktop
index 0f4158bb..1920b5e1 100644
--- a/mimetypes/application/vnd.ms-excel.addin.macroEnabled.12.desktop
+++ b/mimetypes/application/vnd.ms-excel.addin.macroEnabled.12.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.ms-excel.addin.macroEnabled.12
Patterns=*.xlam;*.XLAM
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Comment=Microsoft Excel Spreadsheet Add-In Macro Enabled
Comment[af]=Microsoft Excel Spreiblad
Comment[ar]=ورقة عمل مايكروسوفت اكسل
diff --git a/mimetypes/application/vnd.ms-excel.desktop b/mimetypes/application/vnd.ms-excel.desktop
index 05d4f49e..d53aa30f 100644
--- a/mimetypes/application/vnd.ms-excel.desktop
+++ b/mimetypes/application/vnd.ms-excel.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.ms-excel
Patterns=*.xls;*.XLS
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Comment=Microsoft Excel Spreadsheet
Comment[af]=Microsoft Excel Spreiblad
Comment[ar]=ورقة عمل مايكروسوفت اكسل
diff --git a/mimetypes/application/vnd.ms-excel.sheet.binary.macroEnabled.12.desktop b/mimetypes/application/vnd.ms-excel.sheet.binary.macroEnabled.12.desktop
index 016ddfae..c23d706b 100644
--- a/mimetypes/application/vnd.ms-excel.sheet.binary.macroEnabled.12.desktop
+++ b/mimetypes/application/vnd.ms-excel.sheet.binary.macroEnabled.12.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.ms-excel.sheet.binary.macroEnabled.12
Patterns=*.xlsb;*.XLSB
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Comment=Microsoft Excel Spreadsheet Macro Enabled
Comment[af]=Microsoft Excel Spreiblad
Comment[ar]=ورقة عمل مايكروسوفت اكسل
diff --git a/mimetypes/application/vnd.ms-excel.sheet.macroEnabled.12.desktop b/mimetypes/application/vnd.ms-excel.sheet.macroEnabled.12.desktop
index 5c5980f6..2c828801 100644
--- a/mimetypes/application/vnd.ms-excel.sheet.macroEnabled.12.desktop
+++ b/mimetypes/application/vnd.ms-excel.sheet.macroEnabled.12.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.ms-excel.sheet.macroEnabled.12
Patterns=*.xlsm;*.XLSM
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Comment=Microsoft Excel Spreadsheet Macro Enabled
Comment[af]=Microsoft Excel Spreiblad
Comment[ar]=ورقة عمل مايكروسوفت اكسل
diff --git a/mimetypes/application/vnd.ms-excel.template.macroEnabled.12.desktop b/mimetypes/application/vnd.ms-excel.template.macroEnabled.12.desktop
index 8a5a6b0e..351347d3 100644
--- a/mimetypes/application/vnd.ms-excel.template.macroEnabled.12.desktop
+++ b/mimetypes/application/vnd.ms-excel.template.macroEnabled.12.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.ms-excel.template.macroEnabled.12
Patterns=*.xltm;*.XLTM
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Comment=Microsoft Excel Spreadsheet Template Macro Enabled
Comment[af]=Microsoft Excel Spreiblad
Comment[ar]=ورقة عمل مايكروسوفت اكسل
diff --git a/mimetypes/application/vnd.ms-powerpoint.addin.macroEnabled.12.desktop b/mimetypes/application/vnd.ms-powerpoint.addin.macroEnabled.12.desktop
index c88d7039..de0caa39 100644
--- a/mimetypes/application/vnd.ms-powerpoint.addin.macroEnabled.12.desktop
+++ b/mimetypes/application/vnd.ms-powerpoint.addin.macroEnabled.12.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.ms-powerpoint.addin.macroEnabled.12.desktop
Patterns=*.ppam
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
Comment=Microsoft PowerPoint Presentation Add-In Macro Enabled
Comment[af]=Microsoft Powerpoint Voorlegging
Comment[ar]=مستند مايكروسوفت باوربوينت
diff --git a/mimetypes/application/vnd.ms-powerpoint.desktop b/mimetypes/application/vnd.ms-powerpoint.desktop
index 8f2928ef..b30854f6 100644
--- a/mimetypes/application/vnd.ms-powerpoint.desktop
+++ b/mimetypes/application/vnd.ms-powerpoint.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.ms-powerpoint
Patterns=*.ppt;*.PPT
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
Comment=Microsoft PowerPoint Presentation
Comment[af]=Microsoft Powerpoint Voorlegging
Comment[ar]=مستند مايكروسوفت باوربوينت
diff --git a/mimetypes/application/vnd.ms-powerpoint.presentation.macroEnabled.12.desktop b/mimetypes/application/vnd.ms-powerpoint.presentation.macroEnabled.12.desktop
index 4f8d7c13..ad19ab4e 100644
--- a/mimetypes/application/vnd.ms-powerpoint.presentation.macroEnabled.12.desktop
+++ b/mimetypes/application/vnd.ms-powerpoint.presentation.macroEnabled.12.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.ms-powerpoint.presentation.macroEnabled.12
Patterns=*.pptm;*.PPTM
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
Comment=Microsoft PowerPoint Presentation Macro Enabled
Comment[af]=Microsoft Powerpoint Voorlegging
Comment[ar]=مستند مايكروسوفت باوربوينت
diff --git a/mimetypes/application/vnd.ms-powerpoint.slideshow.macroEnabled.12.desktop b/mimetypes/application/vnd.ms-powerpoint.slideshow.macroEnabled.12.desktop
index 9846fc7d..b5246668 100644
--- a/mimetypes/application/vnd.ms-powerpoint.slideshow.macroEnabled.12.desktop
+++ b/mimetypes/application/vnd.ms-powerpoint.slideshow.macroEnabled.12.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.ms-powerpoint.slideshow.macroEnabled.12
Patterns=*.ppsm;*.PPSM
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
Comment=Microsoft PowerPoint Presentation SlideShow Macro Enabled
Comment[af]=Microsoft Powerpoint Voorlegging
Comment[ar]=مستند مايكروسوفت باوربوينت
diff --git a/mimetypes/application/vnd.ms-powerpoint.template.macroEnabled.12.desktop b/mimetypes/application/vnd.ms-powerpoint.template.macroEnabled.12.desktop
index 3a9f985c..5a155efb 100644
--- a/mimetypes/application/vnd.ms-powerpoint.template.macroEnabled.12.desktop
+++ b/mimetypes/application/vnd.ms-powerpoint.template.macroEnabled.12.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.ms-powerpoint.template.macroEnabled.12
Patterns=*.potm;*.POTM
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
Comment=Microsoft PowerPoint Presentation Template Macro Enabled
Comment[af]=Microsoft Powerpoint Voorlegging
Comment[ar]=مستند مايكروسوفت باوربوينت
diff --git a/mimetypes/application/vnd.ms-word.desktop b/mimetypes/application/vnd.ms-word.desktop
index 42f229b1..a0ce5625 100644
--- a/mimetypes/application/vnd.ms-word.desktop
+++ b/mimetypes/application/vnd.ms-word.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.ms-word
Patterns=*.doc;*.DOC
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Comment=Microsoft Word Document
Comment[af]=Microsoft Woord Dokument
Comment[ar]=مستند مايكروسوفت وورد
diff --git a/mimetypes/application/vnd.ms-word.document.macroEnabled.12.desktop b/mimetypes/application/vnd.ms-word.document.macroEnabled.12.desktop
index bade6634..f08dbbe7 100644
--- a/mimetypes/application/vnd.ms-word.document.macroEnabled.12.desktop
+++ b/mimetypes/application/vnd.ms-word.document.macroEnabled.12.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.ms-word.document.macroEnabled.12
Patterns=*.docm;*.DOCM
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Comment=Microsoft Word Document Macro Enabled
Comment[af]=Microsoft Woord Dokument
Comment[ar]=مستند مايكروسوفت وورد
diff --git a/mimetypes/application/vnd.ms-word.template.macroEnabled.12.desktop b/mimetypes/application/vnd.ms-word.template.macroEnabled.12.desktop
index aa2d3288..15b4b459 100644
--- a/mimetypes/application/vnd.ms-word.template.macroEnabled.12.desktop
+++ b/mimetypes/application/vnd.ms-word.template.macroEnabled.12.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.ms-word.template.macroEnabled.12
Patterns=*.dotm;*.DOTM
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Comment=Microsoft Word Document Template Macro Enabled
Comment[af]=Microsoft Woord Dokument
Comment[ar]=مستند مايكروسوفت وورد
diff --git a/mimetypes/application/vnd.oasis.opendocument.chart.desktop b/mimetypes/application/vnd.oasis.opendocument.chart.desktop
index 3b96a90a..8ade2e06 100644
--- a/mimetypes/application/vnd.oasis.opendocument.chart.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.chart.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.chart
Patterns=*.odc;*.ODC
-Icon=kchart_chrt
+Icon=application-x-kchart
Comment=OASIS OpenDocument Chart
Comment[af]=OASIS Oop Dokument kaart
Comment[be]=Дыяграма OASIS OpenDocument
diff --git a/mimetypes/application/vnd.oasis.opendocument.database.desktop b/mimetypes/application/vnd.oasis.opendocument.database.desktop
index fe649b32..77d488a7 100644
--- a/mimetypes/application/vnd.oasis.opendocument.database.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.database.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.database
Patterns=*.odb;*.ODB
-Icon=database
+Icon=application-vnd.oasis.opendocument.database
Comment=OASIS OpenDocument Database
[Property::X-TDE-NativeExtension]
Type=TQString
diff --git a/mimetypes/application/vnd.oasis.opendocument.formula.desktop b/mimetypes/application/vnd.oasis.opendocument.formula.desktop
index 688df443..f33d8135 100644
--- a/mimetypes/application/vnd.oasis.opendocument.formula.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.formula.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.formula
Patterns=*.odf;*.ODF
-Icon=kformula_kfo
+Icon=application-x-kformula
Comment=OASIS OpenDocument Formula
Comment[af]=OASIS Oop Dokument formule
Comment[be]=Формула OASIS OpenDocument
diff --git a/mimetypes/application/vnd.oasis.opendocument.graphics-flat-xml.desktop b/mimetypes/application/vnd.oasis.opendocument.graphics-flat-xml.desktop
index ca2b7341..c6207fe7 100644
--- a/mimetypes/application/vnd.oasis.opendocument.graphics-flat-xml.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.graphics-flat-xml.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.graphics-flat-xml
Patterns=*.fodg;*.FODG
-Icon=drawing
+Icon=application-vnd.oasis.opendocument.graphics
Comment=OASIS OpenDocument Graphics (Flat XML)
Comment[af]=OASIS Oop Dokument Grafieke (Flat XML)
Comment[be]=Графіка OASIS OpenDocument (Flat XML)
diff --git a/mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop b/mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop
index 4c288c04..75331945 100644
--- a/mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.graphics-template.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.graphics-template
Patterns=*.otg;*.OTG
-Icon=drawing
+Icon=application-vnd.oasis.opendocument.graphics
Comment=OASIS OpenDocument Graphics Template
Comment[af]=OASIS oop Dokument grafiese Voorbeeld
Comment[be]=Шаблон графікі OASIS OpenDocument
diff --git a/mimetypes/application/vnd.oasis.opendocument.graphics.desktop b/mimetypes/application/vnd.oasis.opendocument.graphics.desktop
index 2243e811..73f1b27e 100644
--- a/mimetypes/application/vnd.oasis.opendocument.graphics.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.graphics.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.graphics
Patterns=*.odg;*.ODG
-Icon=drawing
+Icon=application-vnd.oasis.opendocument.graphics
Comment=OASIS OpenDocument Graphics
Comment[af]=OASIS Oop Dokument Grafieke
Comment[be]=Графіка OASIS OpenDocument
diff --git a/mimetypes/application/vnd.oasis.opendocument.image.desktop b/mimetypes/application/vnd.oasis.opendocument.image.desktop
index cd587e7f..76023fd8 100644
--- a/mimetypes/application/vnd.oasis.opendocument.image.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.image.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.image
Patterns=*.odi;*.ODI
-Icon=krita_kra
+Icon=application-x-krita
Comment=OASIS OpenDocument Image
Comment[af]=OASIS oop Dokument beeld
Comment[be]=Рысунак OASIS OpenDocument
diff --git a/mimetypes/application/vnd.oasis.opendocument.presentation-flat-xml.desktop b/mimetypes/application/vnd.oasis.opendocument.presentation-flat-xml.desktop
index b5945ead..3c4fd7fd 100644
--- a/mimetypes/application/vnd.oasis.opendocument.presentation-flat-xml.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.presentation-flat-xml.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.presentation-flat-xml
Patterns=*.fodp;*.FODP
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
Comment=OASIS OpenDocument Presentation (Flat XML)
Comment[af]=OASIS Oop dokument Voorlegging (Flat XML)
Comment[be]=Прэзентацыя OASIS OpenDocument (Flat XML)
diff --git a/mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop b/mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop
index 3bde78c6..d9046137 100644
--- a/mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.presentation-template.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.presentation-template
Patterns=*.otp;*.OTP
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
Comment=OASIS OpenDocument Presentation Template
Comment[af]=OASIS Oop Dokument voorlegging voorbeeld
Comment[be]=Шаблон прэзентацыі OASIS OpenDocument
diff --git a/mimetypes/application/vnd.oasis.opendocument.presentation.desktop b/mimetypes/application/vnd.oasis.opendocument.presentation.desktop
index accebd7c..50e50e09 100644
--- a/mimetypes/application/vnd.oasis.opendocument.presentation.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.presentation.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.presentation
Patterns=*.odp;*.ODP
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
Comment=OASIS OpenDocument Presentation
Comment[af]=OASIS Oop dokument Voorlegging
Comment[be]=Прэзентацыя OASIS OpenDocument
diff --git a/mimetypes/application/vnd.oasis.opendocument.spreadsheet-flat-xml.desktop b/mimetypes/application/vnd.oasis.opendocument.spreadsheet-flat-xml.desktop
index dac92f91..8da86c8a 100644
--- a/mimetypes/application/vnd.oasis.opendocument.spreadsheet-flat-xml.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.spreadsheet-flat-xml.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.spreadsheet-flat-xml
Patterns=*.fods;*.fODS
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Comment=OASIS OpenDocument SpreadSheet (Flat XML)
Comment[af]=OASIS Oop Dokument Spreiblad (Flat XML)
Comment[be]=Разліковы аркуш OASIS OpenDocument (Flat XML)
diff --git a/mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop b/mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop
index 72e24aa5..ec19316d 100644
--- a/mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.spreadsheet-template.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.spreadsheet-template
Patterns=*.ots;*.OTS
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Comment=OASIS OpenDocument SpreadSheet Template
Comment[af]=OASIS Oop Dokument Spreiblad Voorbeeld
Comment[be]=Шаблон разліковага аркуша OASIS OpenDocument
diff --git a/mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop b/mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop
index 4e9905e3..0f26e60f 100644
--- a/mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.spreadsheet.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.spreadsheet
Patterns=*.ods;*.ODS
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Comment=OASIS OpenDocument SpreadSheet
Comment[af]=OASIS Oop Dokument Spreiblad
Comment[be]=Разліковы аркуш OASIS OpenDocument
diff --git a/mimetypes/application/vnd.oasis.opendocument.text-flat-xml.desktop b/mimetypes/application/vnd.oasis.opendocument.text-flat-xml.desktop
index 7caaf23f..e0dd41cd 100644
--- a/mimetypes/application/vnd.oasis.opendocument.text-flat-xml.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.text-flat-xml.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.text-flat-xml
Patterns=*.fodt;*.FODT
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Comment=OASIS OpenDocument Text (Flat XML)
Comment[af]=OASIS Oop Dokument Teks (Flat XML)
Comment[be]=Тэкставы файл OASIS OpenDocument (Flat XML)
diff --git a/mimetypes/application/vnd.oasis.opendocument.text-template.desktop b/mimetypes/application/vnd.oasis.opendocument.text-template.desktop
index 42a00603..27e3bbc8 100644
--- a/mimetypes/application/vnd.oasis.opendocument.text-template.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.text-template.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.text-template
Patterns=*.ott;*.OTT
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Comment=OASIS OpenDocument Text Template
Comment[af]=OASIS Oop Dokument Teks Voorbeeld
Comment[be]=Шаблон тэкставага файла OASIS OpenDocument
diff --git a/mimetypes/application/vnd.oasis.opendocument.text.desktop b/mimetypes/application/vnd.oasis.opendocument.text.desktop
index 02015816..c6bbfbc1 100644
--- a/mimetypes/application/vnd.oasis.opendocument.text.desktop
+++ b/mimetypes/application/vnd.oasis.opendocument.text.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.oasis.opendocument.text
Patterns=*.odt;*.ODT
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Comment=OASIS OpenDocument Text
Comment[af]=OASIS Oop Dokument Teks
Comment[be]=Тэкставы файл OASIS OpenDocument
diff --git a/mimetypes/application/vnd.openxmlformats-officedocument.presentationml.presentation.desktop b/mimetypes/application/vnd.openxmlformats-officedocument.presentationml.presentation.desktop
index caa220b4..ff1c2aac 100644
--- a/mimetypes/application/vnd.openxmlformats-officedocument.presentationml.presentation.desktop
+++ b/mimetypes/application/vnd.openxmlformats-officedocument.presentationml.presentation.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.openxmlformats-officedocument.presentationml.presentation
Patterns=*.pptx;*.PPTX
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
Comment=Microsoft PowerPoint Presentation
Comment[af]=Microsoft Powerpoint Voorlegging
Comment[ar]=مستند مايكروسوفت باوربوينت
diff --git a/mimetypes/application/vnd.openxmlformats-officedocument.presentationml.slideshow.desktop b/mimetypes/application/vnd.openxmlformats-officedocument.presentationml.slideshow.desktop
index 569d1187..a4b0b957 100644
--- a/mimetypes/application/vnd.openxmlformats-officedocument.presentationml.slideshow.desktop
+++ b/mimetypes/application/vnd.openxmlformats-officedocument.presentationml.slideshow.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.openxmlformats-officedocument.presentationml.slideshow
Patterns=*.ppsx;*.PPSX
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
Comment=Microsoft PowerPoint Presentation SlideShow
Comment[af]=Microsoft Powerpoint Voorlegging
Comment[ar]=مستند مايكروسوفت باوربوينت
diff --git a/mimetypes/application/vnd.openxmlformats-officedocument.presentationml.template.desktop b/mimetypes/application/vnd.openxmlformats-officedocument.presentationml.template.desktop
index 9f67583b..121e5d3f 100644
--- a/mimetypes/application/vnd.openxmlformats-officedocument.presentationml.template.desktop
+++ b/mimetypes/application/vnd.openxmlformats-officedocument.presentationml.template.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.openxmlformats-officedocument.presentationml.template
Patterns=*.potx;*.POTX
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
Comment=Microsoft PowerPoint Presentation Template
Comment[af]=Microsoft Powerpoint Voorlegging
Comment[ar]=مستند مايكروسوفت باوربوينت
diff --git a/mimetypes/application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.desktop b/mimetypes/application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.desktop
index 019ca483..0b7caae1 100644
--- a/mimetypes/application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.desktop
+++ b/mimetypes/application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
Patterns=*.xlsx;*.XLSX
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Comment=Microsoft Excel Spreadsheet
Comment[af]=Microsoft Excel Spreiblad
Comment[ar]=ورقة عمل مايكروسوفت اكسل
diff --git a/mimetypes/application/vnd.openxmlformats-officedocument.spreadsheetml.template.desktop b/mimetypes/application/vnd.openxmlformats-officedocument.spreadsheetml.template.desktop
index ee420907..37ceb3e9 100644
--- a/mimetypes/application/vnd.openxmlformats-officedocument.spreadsheetml.template.desktop
+++ b/mimetypes/application/vnd.openxmlformats-officedocument.spreadsheetml.template.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.openxmlformats-officedocument.spreadsheetml.template
Patterns=*.xltx;*.XLTX
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Comment=Microsoft Excel Spreadsheet Template
Comment[af]=Microsoft Excel Spreiblad
Comment[ar]=ورقة عمل مايكروسوفت اكسل
diff --git a/mimetypes/application/vnd.openxmlformats-officedocument.wordprocessingml.document.desktop b/mimetypes/application/vnd.openxmlformats-officedocument.wordprocessingml.document.desktop
index 329eff2c..6142da98 100644
--- a/mimetypes/application/vnd.openxmlformats-officedocument.wordprocessingml.document.desktop
+++ b/mimetypes/application/vnd.openxmlformats-officedocument.wordprocessingml.document.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.openxmlformats-officedocument.wordprocessingml.document
Patterns=*.docx;*.DOCX
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Comment=Microsoft Word Document
Comment[af]=Microsoft Woord Dokument
Comment[ar]=مستند مايكروسوفت وورد
diff --git a/mimetypes/application/vnd.openxmlformats-officedocument.wordprocessingml.template.desktop b/mimetypes/application/vnd.openxmlformats-officedocument.wordprocessingml.template.desktop
index c0912b73..546db940 100644
--- a/mimetypes/application/vnd.openxmlformats-officedocument.wordprocessingml.template.desktop
+++ b/mimetypes/application/vnd.openxmlformats-officedocument.wordprocessingml.template.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.openxmlformats-officedocument.wordprocessingml.template
Patterns=*.dotx;*.DOTX
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Comment=Microsoft Word Document Template
Comment[af]=Microsoft Woord Dokument
Comment[ar]=مستند مايكروسوفت وورد
diff --git a/mimetypes/application/vnd.palm.desktop b/mimetypes/application/vnd.palm.desktop
index e566b830..692d852f 100644
--- a/mimetypes/application/vnd.palm.desktop
+++ b/mimetypes/application/vnd.palm.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/vnd.palm
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Patterns=*.pdb;*.PDB;*.prc;*.PRC;
Comment=Palm Document
Comment[af]=Palm Dokument
diff --git a/mimetypes/application/vnd.rn-realmedia.desktop b/mimetypes/application/vnd.rn-realmedia.desktop
index 329a2d83..ee0254cf 100644
--- a/mimetypes/application/vnd.rn-realmedia.desktop
+++ b/mimetypes/application/vnd.rn-realmedia.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/vnd.rn-realmedia
-Icon=video
+Icon=video-x-generic
Patterns=*.rm;*.RM;
Comment=RealMedia File
Comment[af]=RealMedia Lêer
diff --git a/mimetypes/application/vnd.stardivision.calc.desktop b/mimetypes/application/vnd.stardivision.calc.desktop
index 885e0ffb..ba112d2e 100644
--- a/mimetypes/application/vnd.stardivision.calc.desktop
+++ b/mimetypes/application/vnd.stardivision.calc.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.stardivision.calc
Patterns=*.sdc;*.SDC;
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Comment=StarOffice Calc Spreadsheet
Comment[af]=StarOffice Calc Spreiblad
Comment[ar]=مستند StarOffice Calc
diff --git a/mimetypes/application/vnd.stardivision.chart.desktop b/mimetypes/application/vnd.stardivision.chart.desktop
index 8d9f7a7f..8e8b8500 100644
--- a/mimetypes/application/vnd.stardivision.chart.desktop
+++ b/mimetypes/application/vnd.stardivision.chart.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.stardivision.chart
Patterns=*.sds;*.SDS;
-Icon=kchart_chrt
+Icon=application-x-kchart
Comment=StarOffice Chart
Comment[af]=StarOffice Kaart
Comment[be]=Дыяграма StarOffice
diff --git a/mimetypes/application/vnd.stardivision.draw.desktop b/mimetypes/application/vnd.stardivision.draw.desktop
index 6683f830..76fff199 100644
--- a/mimetypes/application/vnd.stardivision.draw.desktop
+++ b/mimetypes/application/vnd.stardivision.draw.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.stardivision.draw
Patterns=*.sda;*.SDA;
-Icon=image
+Icon=image-x-generic
Comment=StarOffice Drawing
Comment[af]=StarOffice Tekening
Comment[be]=Рысунак StarOffice
diff --git a/mimetypes/application/vnd.stardivision.impress.desktop b/mimetypes/application/vnd.stardivision.impress.desktop
index 2af2233a..e53b398b 100644
--- a/mimetypes/application/vnd.stardivision.impress.desktop
+++ b/mimetypes/application/vnd.stardivision.impress.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.stardivision.impress
Patterns=*.sdd;*.SDD;
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
Comment=StarOffice Impress Presentation
Comment[af]=StarOffice Impress Voorlegging
Comment[ar]=عرض StarOffice Impress
diff --git a/mimetypes/application/vnd.stardivision.math.desktop b/mimetypes/application/vnd.stardivision.math.desktop
index 0237eb0e..393e09cd 100644
--- a/mimetypes/application/vnd.stardivision.math.desktop
+++ b/mimetypes/application/vnd.stardivision.math.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.stardivision.math
Patterns=*.sdf;*.SDF;
-Icon=kformula_kfo
+Icon=application-x-kformula
Comment=StarOffice Math Document
Comment[af]=StarOffice Wiskunde Dokument
Comment[be]=Формула StarOffice Math
diff --git a/mimetypes/application/vnd.stardivision.writer-global.desktop b/mimetypes/application/vnd.stardivision.writer-global.desktop
index 6ecf3882..d4e50130 100644
--- a/mimetypes/application/vnd.stardivision.writer-global.desktop
+++ b/mimetypes/application/vnd.stardivision.writer-global.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.stardivision.writer-global
Patterns=*.sgl;*.SGL;
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Comment=StarOffice Writer Master Document
Comment[af]=StarOffice skrywer Meester Dokument
Comment[be]=Дакумент-чараўнік StarOffice Writer
diff --git a/mimetypes/application/vnd.stardivision.writer.desktop b/mimetypes/application/vnd.stardivision.writer.desktop
index cff0e3ee..093f24af 100644
--- a/mimetypes/application/vnd.stardivision.writer.desktop
+++ b/mimetypes/application/vnd.stardivision.writer.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=application/vnd.stardivision.writer
Patterns=*.sdw;*.SDW;
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Comment=StarOffice Writer Document
Comment[af]=StarOffice skrywer Dokument
Comment[ar]=مستند StarOffice Writer
diff --git a/mimetypes/application/vnd.sun.xml.base.desktop b/mimetypes/application/vnd.sun.xml.base.desktop
index 8b521da2..50457948 100644
--- a/mimetypes/application/vnd.sun.xml.base.desktop
+++ b/mimetypes/application/vnd.sun.xml.base.desktop
@@ -67,7 +67,7 @@ Comment[vi]=Cơ sở dữ liệu OpenOffice.org
Comment[zh_CN]=OpenOffice.org 数据库
Comment[zh_HK]=OpenOffice.org 資料庫
Comment[zh_TW]=OpenOffice.org 資料庫
-Icon=database
+Icon=application-vnd.oasis.opendocument.database
Type=MimeType
Patterns=*.odb;*.ODB;
MimeType=application/vnd.sun.xml.base
diff --git a/mimetypes/application/vnd.sun.xml.calc.desktop b/mimetypes/application/vnd.sun.xml.calc.desktop
index 22cda810..4efdf3ec 100644
--- a/mimetypes/application/vnd.sun.xml.calc.desktop
+++ b/mimetypes/application/vnd.sun.xml.calc.desktop
@@ -75,7 +75,7 @@ Comment[wa]=Foye di tåvleu OpenOffice.org
Comment[zh_CN]=OpenOffice.org 电子表格
Comment[zh_HK]=OpenOffice.org 試算表
Comment[zh_TW]=OpenOffice.org 試算表
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Type=MimeType
Patterns=*.sxc;*.SXC;
MimeType=application/vnd.sun.xml.calc
diff --git a/mimetypes/application/vnd.sun.xml.calc.template.desktop b/mimetypes/application/vnd.sun.xml.calc.template.desktop
index 9a5481bf..5bb53750 100644
--- a/mimetypes/application/vnd.sun.xml.calc.template.desktop
+++ b/mimetypes/application/vnd.sun.xml.calc.template.desktop
@@ -71,7 +71,7 @@ Comment[vi]=Biểu mẫu bảng tính OpenOffice.org
Comment[zh_CN]=OpenOffice.org 电子表格模板
Comment[zh_HK]=OpenOffice.org 試算表範本
Comment[zh_TW]=OpenOffice.org 試算表樣本
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Type=MimeType
Patterns=*.stc;*.STC;
MimeType=application/vnd.sun.xml.calc.template
diff --git a/mimetypes/application/vnd.sun.xml.draw.desktop b/mimetypes/application/vnd.sun.xml.draw.desktop
index ddf66a9e..0ec25473 100644
--- a/mimetypes/application/vnd.sun.xml.draw.desktop
+++ b/mimetypes/application/vnd.sun.xml.draw.desktop
@@ -75,7 +75,7 @@ Comment[zh_HK]=OpenOffice.org 繪圖
Comment[zh_TW]=OpenOffice.org 繪圖
MimeType=application/vnd.sun.xml.draw
Type=MimeType
-Icon=image
+Icon=image-x-generic
Patterns=*.sxd;*.SXD;
[Property::X-TDE-NativeExtension]
Type=TQString
diff --git a/mimetypes/application/vnd.sun.xml.draw.template.desktop b/mimetypes/application/vnd.sun.xml.draw.template.desktop
index 0a65f574..ec4961db 100644
--- a/mimetypes/application/vnd.sun.xml.draw.template.desktop
+++ b/mimetypes/application/vnd.sun.xml.draw.template.desktop
@@ -73,7 +73,7 @@ Comment[zh_HK]=OpenOffice.org 繪圖範本
Comment[zh_TW]=OpenOffice.org 繪圖樣本
MimeType=application/vnd.sun.xml.draw.template
Type=MimeType
-Icon=image
+Icon=image-x-generic
Patterns=*.std;*.STD;
[Property::X-TDE-NativeExtension]
Type=TQString
diff --git a/mimetypes/application/vnd.sun.xml.impress.desktop b/mimetypes/application/vnd.sun.xml.impress.desktop
index 59c3e691..d9279fdb 100644
--- a/mimetypes/application/vnd.sun.xml.impress.desktop
+++ b/mimetypes/application/vnd.sun.xml.impress.desktop
@@ -77,7 +77,7 @@ Comment[zh_HK]=OpenOffice.org 簡報
Comment[zh_TW]=OpenOffice.org 簡報
MimeType=application/vnd.sun.xml.impress
Type=MimeType
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
Patterns=*.sxi;*.SXI;
[Property::X-TDE-NativeExtension]
Type=TQString
diff --git a/mimetypes/application/vnd.sun.xml.impress.template.desktop b/mimetypes/application/vnd.sun.xml.impress.template.desktop
index 4be5bb72..70ab9e64 100644
--- a/mimetypes/application/vnd.sun.xml.impress.template.desktop
+++ b/mimetypes/application/vnd.sun.xml.impress.template.desktop
@@ -73,7 +73,7 @@ Comment[zh_HK]=OpenOffice.org 簡報範本
Comment[zh_TW]=OpenOffice.org 簡報樣本
MimeType=application/vnd.sun.xml.impress.template
Type=MimeType
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
Patterns=*.sti;*.STI;
[Property::X-TDE-NativeExtension]
Type=TQString
diff --git a/mimetypes/application/vnd.sun.xml.writer.desktop b/mimetypes/application/vnd.sun.xml.writer.desktop
index bda1df0b..5bfb2e75 100644
--- a/mimetypes/application/vnd.sun.xml.writer.desktop
+++ b/mimetypes/application/vnd.sun.xml.writer.desktop
@@ -78,7 +78,7 @@ Comment[zh_HK]=OpenOffice.org 文字文件
Comment[zh_TW]=OpenOffice.org Text 文件
MimeType=application/vnd.sun.xml.writer
Type=MimeType
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Patterns=*.sxw;*.SXW;
[Property::X-TDE-NativeExtension]
Type=TQString
diff --git a/mimetypes/application/vnd.sun.xml.writer.master.desktop b/mimetypes/application/vnd.sun.xml.writer.master.desktop
index a6e87498..dad16b4b 100644
--- a/mimetypes/application/vnd.sun.xml.writer.master.desktop
+++ b/mimetypes/application/vnd.sun.xml.writer.master.desktop
@@ -71,7 +71,7 @@ Comment[zh_HK]=OpenOffice.org 主控文字文件
Comment[zh_TW]=OpenOffice.org Master Text 文件
MimeType=application/vnd.sun.xml.writer.master
Type=MimeType
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Patterns=*.sxg;*.SXG;
[Property::X-TDE-NativeExtension]
Type=TQString
diff --git a/mimetypes/application/vnd.sun.xml.writer.template.desktop b/mimetypes/application/vnd.sun.xml.writer.template.desktop
index 44392222..a13df939 100644
--- a/mimetypes/application/vnd.sun.xml.writer.template.desktop
+++ b/mimetypes/application/vnd.sun.xml.writer.template.desktop
@@ -73,7 +73,7 @@ Comment[zh_HK]=OpenOffice.org 文字文件範本
Comment[zh_TW]=OpenOffice.org Text 文件樣本
MimeType=application/vnd.sun.xml.writer.template
Type=MimeType
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Patterns=*.stw;*.STW;
[Property::X-TDE-NativeExtension]
Type=TQString
diff --git a/mimetypes/application/wordperfect.desktop b/mimetypes/application/wordperfect.desktop
index 768235a4..9d0c7980 100644
--- a/mimetypes/application/wordperfect.desktop
+++ b/mimetypes/application/wordperfect.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/wordperfect
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Patterns=*.wpd;*.WPD;
Comment=WordPerfect Document
Comment[af]=WordPerfect Dokument
diff --git a/mimetypes/application/x-7z.desktop b/mimetypes/application/x-7z.desktop
index a437378d..4df9160a 100644
--- a/mimetypes/application/x-7z.desktop
+++ b/mimetypes/application/x-7z.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-7z
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.7z;*.7Z;
Comment=7-Zip Archive
Comment[af]=7-Zip Argief
diff --git a/mimetypes/application/x-abiword.desktop b/mimetypes/application/x-abiword.desktop
index 4e4ae1ae..51a0428d 100644
--- a/mimetypes/application/x-abiword.desktop
+++ b/mimetypes/application/x-abiword.desktop
@@ -84,5 +84,5 @@ Comment[zh_CN]=AbiWord 文档
Comment[zh_HK]=AbiWord 文件
Comment[zh_TW]=AbiWord 文件
Comment[zu]=Uhlu lwamafayela e-AbiWord
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Patterns=*.abw;*.ABW;*.abw.gz;*.zabw;*.abw.bz2;*.bzabw;*.awt
diff --git a/mimetypes/application/x-ace.desktop b/mimetypes/application/x-ace.desktop
index a2c69bbf..cf7c2d37 100644
--- a/mimetypes/application/x-ace.desktop
+++ b/mimetypes/application/x-ace.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-ace
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.ace;*.ACE;
Comment=ACE Archive
Comment[af]=ACE Argief
diff --git a/mimetypes/application/x-afm.desktop b/mimetypes/application/x-afm.desktop
index 29fd1fc4..c8ef2bbf 100644
--- a/mimetypes/application/x-afm.desktop
+++ b/mimetypes/application/x-afm.desktop
@@ -72,7 +72,7 @@ Comment[wa]=Metrikes di fonte PostScript
Comment[zh_CN]=PostScript 字型
Comment[zh_HK]=PostScript 字體 Merics
Comment[zh_TW]=PostScript 字體 Merics
-Icon=font_type1
+Icon=font-x-generic_type1
Type=MimeType
MimeType=application/x-afm
Patterns=*.afm;*.AFM
diff --git a/mimetypes/application/x-amipro.desktop b/mimetypes/application/x-amipro.desktop
index c44f2b42..706fb711 100644
--- a/mimetypes/application/x-amipro.desktop
+++ b/mimetypes/application/x-amipro.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Type=MimeType
MimeType=application/x-amipro
Patterns=*.sam;*.SAM;
diff --git a/mimetypes/application/x-applixgraphics.desktop b/mimetypes/application/x-applixgraphics.desktop
index 6e8f8278..d7a3e439 100644
--- a/mimetypes/application/x-applixgraphics.desktop
+++ b/mimetypes/application/x-applixgraphics.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-applixgraphics
-Icon=image
+Icon=image-x-generic
Patterns=*.ag
Comment=Applix Graphics Document
Comment[af]=Applix Grafieka Dokument
diff --git a/mimetypes/application/x-applixspread.desktop b/mimetypes/application/x-applixspread.desktop
index 1d72badc..c7efb2f5 100644
--- a/mimetypes/application/x-applixspread.desktop
+++ b/mimetypes/application/x-applixspread.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-applixspread
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Patterns=*.as
Comment=Applix Spreadsheets Document
Comment[af]=Applix Spreiblad Dokument
diff --git a/mimetypes/application/x-applixword.desktop b/mimetypes/application/x-applixword.desktop
index fe6949e7..c964b508 100644
--- a/mimetypes/application/x-applixword.desktop
+++ b/mimetypes/application/x-applixword.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-applixword
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Patterns=*.aw
Comment=Applix Words Document
Comment[af]=Applix Woorde Dokument
diff --git a/mimetypes/application/x-arc.desktop b/mimetypes/application/x-arc.desktop
index 7d0c033b..b3b826cf 100644
--- a/mimetypes/application/x-arc.desktop
+++ b/mimetypes/application/x-arc.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-arc
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.arc;*.ARC;
Comment=ARC Archive
Comment[af]=ARC Argief
diff --git a/mimetypes/application/x-archive.desktop b/mimetypes/application/x-archive.desktop
index f73ec57b..a57caadc 100644
--- a/mimetypes/application/x-archive.desktop
+++ b/mimetypes/application/x-archive.desktop
@@ -82,6 +82,6 @@ Comment[zh_CN]=Ar 归档
Comment[zh_HK]=Ar 壓縮檔
Comment[zh_TW]=Ar 壓縮文件
Comment[zu]=Umqulu we-Ar
-Icon=tgz
+Icon=application-x-tarz
Type=MimeType
Patterns=*.a;
diff --git a/mimetypes/application/x-arj.desktop b/mimetypes/application/x-arj.desktop
index 3d87e949..19619639 100644
--- a/mimetypes/application/x-arj.desktop
+++ b/mimetypes/application/x-arj.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-arj
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.arj;*.ARJ;
Comment=ARJ Archive
Comment[af]=Arj Argief
diff --git a/mimetypes/application/x-awk.desktop b/mimetypes/application/x-awk.desktop
index 7978f26e..f77fbd15 100644
--- a/mimetypes/application/x-awk.desktop
+++ b/mimetypes/application/x-awk.desktop
@@ -82,7 +82,7 @@ Comment[zh_CN]=AWK 脚本
Comment[zh_HK]=AWK 程式
Comment[zh_TW]=AWK 程式
Comment[zu]=Isikripti se-AWK
-Icon=shellscript
+Icon=text-x-text-x-script
Type=MimeType
MimeType=application/x-awk
Patterns=
diff --git a/mimetypes/application/x-bittorrent.desktop b/mimetypes/application/x-bittorrent.desktop
index 07a9afcf..d0f0c0b8 100644
--- a/mimetypes/application/x-bittorrent.desktop
+++ b/mimetypes/application/x-bittorrent.desktop
@@ -76,7 +76,7 @@ Comment[zh_HK]=BitTorrent 下載
Comment[zh_TW]=BitTorrent 下載
Hidden=false
MimeType=application/x-bittorrent
-Icon=bt
+Icon=application-x-bittorrent
Type=MimeType
Patterns=*.torrent;*.tor
X-TDE-AutoEmbed=false
diff --git a/mimetypes/application/x-bz2dvi.desktop b/mimetypes/application/x-bz2dvi.desktop
index 5ab0d51c..43a44acf 100644
--- a/mimetypes/application/x-bz2dvi.desktop
+++ b/mimetypes/application/x-bz2dvi.desktop
@@ -70,7 +70,7 @@ Comment[zh_CN]=Bzip2 压缩的 DVI 文件
Comment[zh_HK]=Bzip2 格式壓縮的 DVI 檔案
Comment[zh_TW]=Bzip2 壓縮的 DVI 檔案
Hidden=false
-Icon=tgz
+Icon=application-x-tarz
MimeType=application/x-bz2dvi
Patterns=*.dvi.bz2
Type=MimeType
diff --git a/mimetypes/application/x-bzip.desktop b/mimetypes/application/x-bzip.desktop
index e15f2047..cc0b1308 100644
--- a/mimetypes/application/x-bzip.desktop
+++ b/mimetypes/application/x-bzip.desktop
@@ -83,6 +83,6 @@ Comment[zh_CN]=Bzip 文件
Comment[zh_HK]=Bzip 檔案
Comment[zh_TW]=Bzip 檔案
Comment[zu]=Ifayela le-Bzip
-Icon=tgz
+Icon=application-x-tarz
Type=MimeType
Patterns=*.bz;*.BZ;
diff --git a/mimetypes/application/x-bzip2.desktop b/mimetypes/application/x-bzip2.desktop
index dd0efb20..5c456ea9 100644
--- a/mimetypes/application/x-bzip2.desktop
+++ b/mimetypes/application/x-bzip2.desktop
@@ -83,6 +83,6 @@ Comment[zh_CN]=Bzip2 文件
Comment[zh_HK]=Bzip2 檔案
Comment[zh_TW]=Bzip2 檔案
Comment[zu]=Ifayela le-Bzip2
-Icon=tgz
+Icon=application-x-tarz
Type=MimeType
Patterns=*.bz2;*.BZ2;
diff --git a/mimetypes/application/x-cda.desktop b/mimetypes/application/x-cda.desktop
index 3fd459c2..5071c66b 100644
--- a/mimetypes/application/x-cda.desktop
+++ b/mimetypes/application/x-cda.desktop
@@ -78,5 +78,5 @@ Comment[zh_HK]=CD 音效
Comment[zh_TW]=CD 音效
Comment[zu]=Umsindo we-CD
MimeType=application/x-cda
-Icon=cdtrack
+Icon=application-x-cda
Patterns=*.cda;*.CDA
diff --git a/mimetypes/application/x-compress.desktop b/mimetypes/application/x-compress.desktop
index 9f062e55..c204ab7c 100644
--- a/mimetypes/application/x-compress.desktop
+++ b/mimetypes/application/x-compress.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-compress
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.Z;
Comment=UNIX Compressed File
Comment[af]=Unix Saamgepersde Lêer
diff --git a/mimetypes/application/x-core.desktop b/mimetypes/application/x-core.desktop
index 98539f4e..9656cb6d 100644
--- a/mimetypes/application/x-core.desktop
+++ b/mimetypes/application/x-core.desktop
@@ -1,6 +1,6 @@
[Desktop Entry]
Type=MimeType
-Icon=core
+Icon=application-x-core
Patterns=core;
MimeType=application/x-core
Comment=Program Crash Data
diff --git a/mimetypes/application/x-cpio.desktop b/mimetypes/application/x-cpio.desktop
index f0191aea..5683df12 100644
--- a/mimetypes/application/x-cpio.desktop
+++ b/mimetypes/application/x-cpio.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-cpio
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.cpio;
Comment=CPIO Archive
Comment[af]=Cpio Argief
diff --git a/mimetypes/application/x-cue.desktop b/mimetypes/application/x-cue.desktop
index affc5194..521eaca2 100644
--- a/mimetypes/application/x-cue.desktop
+++ b/mimetypes/application/x-cue.desktop
@@ -2,7 +2,7 @@
Type=MimeType
Patterns=*.cue;*.CUE
MimeType=application/x-cue
-Icon=cdimage
+Icon=application-x-cd-image
Comment=CDRWIN Cue-Sheet
Comment[af]=CDRWIN Cue-Bladsy
Comment[bg]=CDRWIN документ
diff --git a/mimetypes/application/x-dbase.desktop b/mimetypes/application/x-dbase.desktop
index 76871e4c..20fa3f1c 100644
--- a/mimetypes/application/x-dbase.desktop
+++ b/mimetypes/application/x-dbase.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-dbase
-Icon=database
+Icon=application-vnd.oasis.opendocument.database
Patterns=*.dbf;*.DBF;
Comment=dBASE Document
Comment[af]=dBASE Dokument
diff --git a/mimetypes/application/x-deb.desktop b/mimetypes/application/x-deb.desktop
index 098d8eb7..8f5184b1 100644
--- a/mimetypes/application/x-deb.desktop
+++ b/mimetypes/application/x-deb.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-deb
-Icon=deb
+Icon=application-x-deb
Patterns=*.deb;*.DEB;
Comment=Debian Package
Comment[af]=Debian Pakkie
diff --git a/mimetypes/application/x-debian-package.desktop b/mimetypes/application/x-debian-package.desktop
index 1f687a04..c7453aff 100644
--- a/mimetypes/application/x-debian-package.desktop
+++ b/mimetypes/application/x-debian-package.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-debian-package
-Icon=deb
+Icon=application-x-deb
# Just an alias for x-deb, remove in KDE4
X-TDE-IsAlso=application/x-deb
Comment=Debian Package
diff --git a/mimetypes/application/x-designer.desktop b/mimetypes/application/x-designer.desktop
index f0bc65e5..d8cad57b 100644
--- a/mimetypes/application/x-designer.desktop
+++ b/mimetypes/application/x-designer.desktop
@@ -81,7 +81,7 @@ Comment[zh_CN]=Qt Designer 文件
Comment[zh_HK]=Qt Designer 檔案
Comment[zh_TW]=Qt Designer 檔案
Comment[zu]=Ifayela Lomdwebi lwe-Qt
-Icon=widget_doc
+Icon=application-x-designer
Type=MimeType
MimeType=application/x-designer
Patterns=*.ui;
diff --git a/mimetypes/application/x-dvi.desktop b/mimetypes/application/x-dvi.desktop
index ef1d2422..453ec4c4 100644
--- a/mimetypes/application/x-dvi.desktop
+++ b/mimetypes/application/x-dvi.desktop
@@ -80,7 +80,7 @@ Comment[xh]=Ifayile Ezimeleyo Yecebo le TeX
Comment[zh_CN]=TeX 设备无关文件
Comment[zh_TW]=與裝置無關的 Tex 檔案
Comment[zu]=Ifayela Lethuluzi lokusebenza Elizimele le-TeX
-Icon=dvi
+Icon=application-x-lyx
Type=MimeType
MimeType=application/x-dvi
Patterns=*.dvi;*.DVI;
diff --git a/mimetypes/application/x-egon.desktop b/mimetypes/application/x-egon.desktop
index 7463d25d..7ab68b39 100644
--- a/mimetypes/application/x-egon.desktop
+++ b/mimetypes/application/x-egon.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-egon
-Icon=image
+Icon=image-x-generic
Patterns=*.egon;
Comment=Egon Animator
Comment[af]=Egon Animeerder
diff --git a/mimetypes/application/x-font-bdf.desktop b/mimetypes/application/x-font-bdf.desktop
index 13e38a83..dde21706 100644
--- a/mimetypes/application/x-font-bdf.desktop
+++ b/mimetypes/application/x-font-bdf.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-font-bdf
-Icon=font_bitmap
+Icon=font-x-generic_bitmap
Patterns=*.bdf;*.bdf.Z;*.bdf.gz;*.BDF;*.BDF.Z;*.BDF.gz
Comment=BDF Bitmap Font
Comment[af]=Bdf Biskaart Skrif tipe
diff --git a/mimetypes/application/x-font-ghostscript.desktop b/mimetypes/application/x-font-ghostscript.desktop
index d0dc4016..90fb00d0 100644
--- a/mimetypes/application/x-font-ghostscript.desktop
+++ b/mimetypes/application/x-font-ghostscript.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-font-ghostscript
-Icon=font
+Icon=font-x-generic
Patterns=*.gsf;*.GSF
Comment=Ghostscript Font
Comment[af]=Ghostscript Skrif tipe
diff --git a/mimetypes/application/x-font-otf.desktop b/mimetypes/application/x-font-otf.desktop
index 1d0f19e7..3d187f48 100644
--- a/mimetypes/application/x-font-otf.desktop
+++ b/mimetypes/application/x-font-otf.desktop
@@ -76,7 +76,7 @@ Comment[wa]=Fonte OpenType
Comment[zh_CN]=OpenType 字体
Comment[zh_HK]=OpenType 字型
Comment[zh_TW]=OpenType 字型
-Icon=font_truetype
+Icon=font-x-generic_truetype
Type=MimeType
MimeType=application/x-font-otf
Patterns=*.otf;*.OTF
diff --git a/mimetypes/application/x-font-pcf.desktop b/mimetypes/application/x-font-pcf.desktop
index 7478096f..ced562ca 100644
--- a/mimetypes/application/x-font-pcf.desktop
+++ b/mimetypes/application/x-font-pcf.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-font-pcf
-Icon=font_bitmap
+Icon=font-x-generic_bitmap
Patterns=*.pcf;*.pcf.Z;*.pcf.gz;*.PCF;*.PCF.Z;*.PCF.gz
Comment=PCF Bitmap Font
Comment[af]=Pcf Biskaart Skrif tipe
diff --git a/mimetypes/application/x-font-snf.desktop b/mimetypes/application/x-font-snf.desktop
index 9881d206..78bb4689 100644
--- a/mimetypes/application/x-font-snf.desktop
+++ b/mimetypes/application/x-font-snf.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-font-snf
-Icon=font_bitmap
+Icon=font-x-generic_bitmap
Patterns=*.snf;*.snf.Z;*.snf.gz;*.SNF;*.SNF.Z;*.SNF.gz
Comment=SNF Bitmap Font
Comment[af]=Snf Biskaart Skrif tipe
diff --git a/mimetypes/application/x-font-speedo.desktop b/mimetypes/application/x-font-speedo.desktop
index 2602f686..ef096574 100644
--- a/mimetypes/application/x-font-speedo.desktop
+++ b/mimetypes/application/x-font-speedo.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-font-speedo
-Icon=font
+Icon=font-x-generic
Patterns=*.spd;*.SPD
Comment=Speedo Font
Comment[af]=Speedo Skrif tipe
diff --git a/mimetypes/application/x-font-ttc.desktop b/mimetypes/application/x-font-ttc.desktop
index f89b9120..848b4028 100644
--- a/mimetypes/application/x-font-ttc.desktop
+++ b/mimetypes/application/x-font-ttc.desktop
@@ -75,7 +75,7 @@ Comment[wa]=Ramexhnêye di fontes TrueType
Comment[zh_CN]=Truetype 字体集合
Comment[zh_HK]=TrueType 字型集
Comment[zh_TW]=Truetype 字型集合
-Icon=font_truetype
+Icon=font-x-generic_truetype
Type=MimeType
MimeType=application/x-font-ttc
Patterns=*.ttc;*.TTC
diff --git a/mimetypes/application/x-font-ttf.desktop b/mimetypes/application/x-font-ttf.desktop
index 8ba465f0..12820c48 100644
--- a/mimetypes/application/x-font-ttf.desktop
+++ b/mimetypes/application/x-font-ttf.desktop
@@ -76,7 +76,7 @@ Comment[wa]=Fonte TrueType
Comment[zh_CN]=TrueType 字体
Comment[zh_HK]=TrueType 字型
Comment[zh_TW]=Truetype 字型
-Icon=font_truetype
+Icon=font-x-generic_truetype
Type=MimeType
MimeType=application/x-font-ttf
Patterns=*.ttf;*.TTF
diff --git a/mimetypes/application/x-font-type1.desktop b/mimetypes/application/x-font-type1.desktop
index ab6daab8..5ba1335a 100644
--- a/mimetypes/application/x-font-type1.desktop
+++ b/mimetypes/application/x-font-type1.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-font-type1
-Icon=font_type1
+Icon=font-x-generic_type1
Patterns=*.pfa;*.PFA;*.pfb;*.PFB
Comment=PostScript Type1 Font
Comment[af]=Postscript Tipe1 Skrif tipe
diff --git a/mimetypes/application/x-gettext.desktop b/mimetypes/application/x-gettext.desktop
index 2b6b2c77..35ae1480 100644
--- a/mimetypes/application/x-gettext.desktop
+++ b/mimetypes/application/x-gettext.desktop
@@ -76,7 +76,7 @@ Comment[wa]=Catalogue di messaedjes po GNU gettext
Comment[zh_CN]=GNU Gettext 消息编目
Comment[zh_HK]=GNU Gettext 訊息型錄
Comment[zh_TW]=GNU Gettext 訊息型錄
-Icon=gettext
+Icon=application-x-gettext
Type=MimeType
MimeType=application/x-gettext
Patterns=*.po;*.pot;*.PO;*.POT;
diff --git a/mimetypes/application/x-gnumeric.desktop b/mimetypes/application/x-gnumeric.desktop
index b5767578..70d04067 100644
--- a/mimetypes/application/x-gnumeric.desktop
+++ b/mimetypes/application/x-gnumeric.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-gnumeric
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Patterns=*.gnumeric;*.GNUMERIC;
Comment=GNUmeric Spreadsheet
Comment[af]=Gnumeric Spreiblad
diff --git a/mimetypes/application/x-gzdvi.desktop b/mimetypes/application/x-gzdvi.desktop
index 923cd46c..ff595f25 100644
--- a/mimetypes/application/x-gzdvi.desktop
+++ b/mimetypes/application/x-gzdvi.desktop
@@ -70,7 +70,7 @@ Comment[zh_CN]=Gzip 压缩的 DVI 文件
Comment[zh_HK]=Gzip 格式壓縮的 DVI 檔案
Comment[zh_TW]=Gzip 壓縮的 DVI 檔案
Hidden=false
-Icon=tgz
+Icon=application-x-tarz
MimeType=application/x-gzdvi
Patterns=*.dvi.gz
Type=MimeType
diff --git a/mimetypes/application/x-gzip.desktop b/mimetypes/application/x-gzip.desktop
index e1bc3771..c8cdfb34 100644
--- a/mimetypes/application/x-gzip.desktop
+++ b/mimetypes/application/x-gzip.desktop
@@ -83,6 +83,6 @@ Comment[zh_CN]=Gzip 文件
Comment[zh_HK]=Gzip 檔案
Comment[zh_TW]=Gzip 檔案
Comment[zu]=Ifayela le-Gzip
-Icon=tgz
+Icon=application-x-tarz
Type=MimeType
Patterns=*.gz;*.tgz;
diff --git a/mimetypes/application/x-gzpostscript.desktop b/mimetypes/application/x-gzpostscript.desktop
index 2c3213c1..dabfca35 100644
--- a/mimetypes/application/x-gzpostscript.desktop
+++ b/mimetypes/application/x-gzpostscript.desktop
@@ -82,7 +82,7 @@ Comment[zh_HK]=Gzip 格式壓縮的 Postscript 檔案
Comment[zh_TW]=Gzip 壓縮的 Postscript 檔案
Comment[zu]=Ifayela le-PostScript ye-Gzipped
Hidden=false
-Icon=tgz
+Icon=application-x-tarz
MimeType=application/x-gzpostscript
Patterns=*.ps.gz
Type=MimeType
diff --git a/mimetypes/application/x-hancomword.desktop b/mimetypes/application/x-hancomword.desktop
index 81edad7e..e113738e 100644
--- a/mimetypes/application/x-hancomword.desktop
+++ b/mimetypes/application/x-hancomword.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-hancomword
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Patterns=*.hwp;*.HWP;
Comment=HancomWord Document
Comment[af]=HancomWord Dokument
diff --git a/mimetypes/application/x-ica.desktop b/mimetypes/application/x-ica.desktop
index dee46cca..f2c2a0e0 100644
--- a/mimetypes/application/x-ica.desktop
+++ b/mimetypes/application/x-ica.desktop
@@ -67,7 +67,7 @@ Comment[vi]=Cấu hình ứng dụng khách ICA Citrix
Comment[zh_CN]=Citrix ICA 客户配置
Comment[zh_HK]=Citrix ICA 客戶端組態
Comment[zh_TW]=Citrix ICA 客戶端設定
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Type=MimeType
Patterns=*.ica;*.ICA;
X-TDE-AutoEmbed=false
diff --git a/mimetypes/application/x-iso.desktop b/mimetypes/application/x-iso.desktop
index a64b2dfe..3879d6a4 100644
--- a/mimetypes/application/x-iso.desktop
+++ b/mimetypes/application/x-iso.desktop
@@ -2,7 +2,7 @@
Type=MimeType
Patterns=*.iso;*.ISO
MimeType=application/x-iso
-Icon=cdtrack
+Icon=application-x-cda
Comment=ISO9660 Image File
Comment[af]=ISO9660 Beeld Leêr
Comment[bg]=ISO9660 образ
diff --git a/mimetypes/application/x-jar.desktop b/mimetypes/application/x-jar.desktop
index 9cb68b3b..0eb6fed4 100644
--- a/mimetypes/application/x-jar.desktop
+++ b/mimetypes/application/x-jar.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-jar
-Icon=source_java
+Icon=text-x-text-x-java
Patterns=*.jar;
Comment=Java Archive
Comment[af]=Java Argief
diff --git a/mimetypes/application/x-java.desktop b/mimetypes/application/x-java.desktop
index 5632fd39..b03a052f 100644
--- a/mimetypes/application/x-java.desktop
+++ b/mimetypes/application/x-java.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-java
-Icon=source_java
+Icon=text-x-text-x-java
Patterns=*.class;
Comment=Java Class
Comment[af]=Java Klas
diff --git a/mimetypes/application/x-karbon.desktop b/mimetypes/application/x-karbon.desktop
index dc31aeea..3b2baa5c 100644
--- a/mimetypes/application/x-karbon.desktop
+++ b/mimetypes/application/x-karbon.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
MimeType=application/x-karbon
Type=MimeType
-Icon=karbon_karbon
+Icon=application-x-karbon
Patterns=*.karbon;
X-TDE-AutoEmbed=false
Comment=Karbon14 Document
diff --git a/mimetypes/application/x-kchart.desktop b/mimetypes/application/x-kchart.desktop
index ba432007..95324539 100644
--- a/mimetypes/application/x-kchart.desktop
+++ b/mimetypes/application/x-kchart.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-kchart
-Icon=kchart_chrt
+Icon=application-x-kchart
Patterns=*.chrt;
Comment=KChart Document
Comment[af]=Kchart Dokument
diff --git a/mimetypes/application/x-kcsrc.desktop b/mimetypes/application/x-kcsrc.desktop
index e616394d..c4e92fd0 100644
--- a/mimetypes/application/x-kcsrc.desktop
+++ b/mimetypes/application/x-kcsrc.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-kcsrc
-Icon=colorscm
+Icon=application-x-kcsrc
Patterns=*.kcsrc;*.KCSRC
Comment=TDE Color Theme
Comment[af]=TDE Kleur Tema
diff --git a/mimetypes/application/x-kformula.desktop b/mimetypes/application/x-kformula.desktop
index accffda6..fbf963c4 100644
--- a/mimetypes/application/x-kformula.desktop
+++ b/mimetypes/application/x-kformula.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-kformula
-Icon=kformula_kfo
+Icon=application-x-kformula
Patterns=*.kfo;
Comment=KFormula Document
Comment[af]=KFormula Dokument
diff --git a/mimetypes/application/x-kivio.desktop b/mimetypes/application/x-kivio.desktop
index f9d304e6..3c29c808 100644
--- a/mimetypes/application/x-kivio.desktop
+++ b/mimetypes/application/x-kivio.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-kivio
-Icon=kivio_flw
+Icon=application-x-kivio
Patterns=*.flw;
X-TDE-AutoEmbed=false
Comment=Kivio Document
diff --git a/mimetypes/application/x-kontour.desktop b/mimetypes/application/x-kontour.desktop
index cf397569..7ef4cb19 100644
--- a/mimetypes/application/x-kontour.desktop
+++ b/mimetypes/application/x-kontour.desktop
@@ -82,7 +82,7 @@ Comment[zh_CN]=Kontour 文档
Comment[zh_HK]=Kontour 文件
Comment[zh_TW]=Kontour 文件
Comment[zu]=Uhlu lwamafayela lwe-Kontour
-Icon=vectorgfx
+Icon=image-svg+xml
Type=MimeType
Patterns=*.kon;
X-TDE-AutoEmbed=false
diff --git a/mimetypes/application/x-kpresenter.desktop b/mimetypes/application/x-kpresenter.desktop
index 6e5d9137..0137d1aa 100644
--- a/mimetypes/application/x-kpresenter.desktop
+++ b/mimetypes/application/x-kpresenter.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-kpresenter
-Icon=kpresenter_kpr
+Icon=application-x-kpresenter
Patterns=*.kpr;*.kpt;
X-TDE-AutoEmbed=false
Comment=KPresenter Document
diff --git a/mimetypes/application/x-krita.desktop b/mimetypes/application/x-krita.desktop
index 9d274512..d185032f 100644
--- a/mimetypes/application/x-krita.desktop
+++ b/mimetypes/application/x-krita.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-krita
-Icon=krita_kra
+Icon=application-x-krita
Patterns=*.kra;
X-TDE-AutoEmbed=false
Comment=Krita Document
diff --git a/mimetypes/application/x-kspread.desktop b/mimetypes/application/x-kspread.desktop
index 95ac8fbb..d3fa6d8a 100644
--- a/mimetypes/application/x-kspread.desktop
+++ b/mimetypes/application/x-kspread.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-kspread
-Icon=kspread_ksp
+Icon=application-x-kspread
Patterns=*.ksp;
X-TDE-AutoEmbed=false
Comment=KSpread Document
diff --git a/mimetypes/application/x-kugar.desktop b/mimetypes/application/x-kugar.desktop
index d5f1a80f..ffcc60ba 100644
--- a/mimetypes/application/x-kugar.desktop
+++ b/mimetypes/application/x-kugar.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-kugar
-Icon=kugar_kud
+Icon=application-x-kugar
Patterns=*.kud
Comment=Kugar Data File
Comment[af]=Kugar Data Lêer
diff --git a/mimetypes/application/x-kword.desktop b/mimetypes/application/x-kword.desktop
index 8c43a91c..2a916aaf 100644
--- a/mimetypes/application/x-kword.desktop
+++ b/mimetypes/application/x-kword.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-kword
-Icon=kword_kwd
+Icon=x-office-document
Patterns=*.kwd;*.kwt;
X-TDE-AutoEmbed=false
Comment=KWord Document
diff --git a/mimetypes/application/x-lha.desktop b/mimetypes/application/x-lha.desktop
index 93f8bb42..4be04b60 100644
--- a/mimetypes/application/x-lha.desktop
+++ b/mimetypes/application/x-lha.desktop
@@ -83,6 +83,6 @@ Comment[zh_CN]=Lha 归档
Comment[zh_HK]=Lha 壓縮檔
Comment[zh_TW]=Lha 壓縮檔案
Comment[zu]=Umqulu we-Lha
-Icon=tgz
+Icon=application-x-tarz
Type=MimeType
Patterns=*.lha;*.lzh;*.LHA;*.LZH;
diff --git a/mimetypes/application/x-linguist.desktop b/mimetypes/application/x-linguist.desktop
index d2cdb685..7e299ff5 100644
--- a/mimetypes/application/x-linguist.desktop
+++ b/mimetypes/application/x-linguist.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-linguist
-Icon=gettext
+Icon=application-x-gettext
Patterns=*.ts;
Comment=Qt Translation Source File
Comment[af]=Qt Vertaal Bronlêer
diff --git a/mimetypes/application/x-lyx.desktop b/mimetypes/application/x-lyx.desktop
index 98992d0c..4b4a8e92 100644
--- a/mimetypes/application/x-lyx.desktop
+++ b/mimetypes/application/x-lyx.desktop
@@ -85,7 +85,7 @@ Comment[zu]=Uhlu lwamafayela lwe-LyX
MimeType=application/x-lyx
Patterns=*.lyx
Type=MimeType
-Icon=dvi
+Icon=application-x-lyx
[Property::X-TDE-text]
Type=bool
diff --git a/mimetypes/application/x-lzma.desktop b/mimetypes/application/x-lzma.desktop
index 0f1ca766..8da350e0 100644
--- a/mimetypes/application/x-lzma.desktop
+++ b/mimetypes/application/x-lzma.desktop
@@ -83,6 +83,6 @@ Comment[zh_CN]=LZMA 文件
Comment[zh_HK]=LZMA 檔案
Comment[zh_TW]=LZMA 檔案
Comment[zu]=Ifayela le-LZMA
-Icon=tgz
+Icon=application-x-tarz
Type=MimeType
Patterns=*.lzma;*.lz
diff --git a/mimetypes/application/x-lzop.desktop b/mimetypes/application/x-lzop.desktop
index fa4ceeeb..c090df8e 100644
--- a/mimetypes/application/x-lzop.desktop
+++ b/mimetypes/application/x-lzop.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-lzop
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.lzo
Comment=Lzopped File
Comment[af]=Lzop gekompakteerde Lêer
diff --git a/mimetypes/application/x-magicpoint.desktop b/mimetypes/application/x-magicpoint.desktop
index 01f30f5c..88eed1c1 100644
--- a/mimetypes/application/x-magicpoint.desktop
+++ b/mimetypes/application/x-magicpoint.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-magicpoint
-Icon=presentation
+Icon=application-vnd.oasis.opendocument.presentation
Patterns=*.mgp;*.MGP;
Comment=MagicPoint Presentation
Comment[af]=MagicPoint Voorlegging
diff --git a/mimetypes/application/x-mplayer2.desktop b/mimetypes/application/x-mplayer2.desktop
index 14a0973e..e48bb186 100644
--- a/mimetypes/application/x-mplayer2.desktop
+++ b/mimetypes/application/x-mplayer2.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-mplayer2
-Icon=video
+Icon=video-x-generic
Patterns=*.avi;*.AVI;*.asf;*.wmv;*.ASF;*.WMV;*.asx;*.ASX;*.wma;*.WMA;*.wmx;*.WMX
Icon=multimedia
X-TDE-AutoEmbed=true
diff --git a/mimetypes/application/x-msaccess.desktop b/mimetypes/application/x-msaccess.desktop
index 8eb74969..626e7879 100644
--- a/mimetypes/application/x-msaccess.desktop
+++ b/mimetypes/application/x-msaccess.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-msaccess
-Icon=database
+Icon=application-vnd.oasis.opendocument.database
Patterns=*.mdb;*.MDB;*.mda;*.MDA;*.mde;*.MDE;
Comment=Microsoft Access Database
Comment[af]=Microsoft Access Databasis
diff --git a/mimetypes/application/x-msmetafile.desktop b/mimetypes/application/x-msmetafile.desktop
index e9293dc6..d44cba27 100644
--- a/mimetypes/application/x-msmetafile.desktop
+++ b/mimetypes/application/x-msmetafile.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-msmetafile
-Icon=vectorgfx
+Icon=image-svg+xml
X-TDE-IsAlso=image/x-wmf
diff --git a/mimetypes/application/x-mswrite.desktop b/mimetypes/application/x-mswrite.desktop
index 9c33292e..7351c433 100644
--- a/mimetypes/application/x-mswrite.desktop
+++ b/mimetypes/application/x-mswrite.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=document
+Icon=text-x-text-x-generic
Type=MimeType
MimeType=application/x-mswrite
Patterns=
diff --git a/mimetypes/application/x-nzb.desktop b/mimetypes/application/x-nzb.desktop
index daaf1731..a5435f65 100644
--- a/mimetypes/application/x-nzb.desktop
+++ b/mimetypes/application/x-nzb.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
Comment=NewzBin Usenet Index
Hidden=false
MimeType=application/x-nzb
-Icon=bt
+Icon=application-x-bittorrent
Type=MimeType
Patterns=*.nzb
X-TDE-AutoEmbed=false
diff --git a/mimetypes/application/x-object.desktop b/mimetypes/application/x-object.desktop
index 4548d5df..7575d562 100644
--- a/mimetypes/application/x-object.desktop
+++ b/mimetypes/application/x-object.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-object
-Icon=binary
+Icon=application-octet-stream
Patterns=*.o;
Comment=Object Code
Comment[af]=Voorwerp Kode
diff --git a/mimetypes/application/x-ogg.desktop b/mimetypes/application/x-ogg.desktop
index e96d9af3..9a3cbbc5 100644
--- a/mimetypes/application/x-ogg.desktop
+++ b/mimetypes/application/x-ogg.desktop
@@ -4,7 +4,7 @@
# application/ogg "inherits" from it, so that apps associated with x-ogg can open ogg files.
Type=MimeType
MimeType=application/x-ogg
-Icon=sound
+Icon=audio-x-generic
Comment=Ogg Multimedia
Comment[ar]=وسائط Ogg متعددة
Comment[az]=Ogg Multimediya
diff --git a/mimetypes/application/x-pak.desktop b/mimetypes/application/x-pak.desktop
index 11127615..d02c1be6 100644
--- a/mimetypes/application/x-pak.desktop
+++ b/mimetypes/application/x-pak.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-pak
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.pak;*.PAK;
Comment=PAK File Archive
Comment[af]=PAK Argief
diff --git a/mimetypes/application/x-perl-module.desktop b/mimetypes/application/x-perl-module.desktop
index 35d94a03..b25d42aa 100644
--- a/mimetypes/application/x-perl-module.desktop
+++ b/mimetypes/application/x-perl-module.desktop
@@ -68,7 +68,7 @@ Comment[vi]=Mô-đun Perl
Comment[zh_CN]=Perl 模块
Comment[zh_HK]=Perl 模組
Comment[zh_TW]=Perl 模組
-Icon=source_pl
+Icon=text-x-text-x-perl
Type=MimeType
MimeType=application/x-perl-module
Patterns=*.pm;*.PM;
diff --git a/mimetypes/application/x-perl.desktop b/mimetypes/application/x-perl.desktop
index fc52f16f..69954405 100644
--- a/mimetypes/application/x-perl.desktop
+++ b/mimetypes/application/x-perl.desktop
@@ -69,7 +69,7 @@ Comment[vi]=Chương trình Perl
Comment[zh_CN]=Perl 程序
Comment[zh_HK]=Perl 程式
Comment[zh_TW]=PERL 程式
-Icon=source_pl
+Icon=text-x-text-x-perl
Type=MimeType
MimeType=application/x-perl
Patterns=*.pl;*.PL;*.perl;*.PERL;*.Perl
diff --git a/mimetypes/application/x-php.desktop b/mimetypes/application/x-php.desktop
index b7204979..91a6c137 100644
--- a/mimetypes/application/x-php.desktop
+++ b/mimetypes/application/x-php.desktop
@@ -75,7 +75,7 @@ Comment[vi]=Tập lệnh PHP
Comment[wa]=Sicripe PHP
Comment[zh_CN]=PHP 脚本
-Icon=source_php
+Icon=text-x-text-x-php
Type=MimeType
MimeType=application/x-php
Patterns=*.php;*.PHP;*.php3;*.PHP3;*.php4;*.PHP4
diff --git a/mimetypes/application/x-pw.desktop b/mimetypes/application/x-pw.desktop
index 6c574cf9..ef6e99a6 100644
--- a/mimetypes/application/x-pw.desktop
+++ b/mimetypes/application/x-pw.desktop
@@ -77,6 +77,6 @@ Comment[wa]=Documint «Pathetic Writer»
Comment[zh_CN]=Pathetic Writer 文档
Comment[zh_HK]=Pathetic Writer 文件
Comment[zh_TW]=Pathetic Writer 文件
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Type=MimeType
Patterns=*.pw;*.PW;
diff --git a/mimetypes/application/x-python-bytecode.desktop b/mimetypes/application/x-python-bytecode.desktop
index cc606257..3b2b4682 100644
--- a/mimetypes/application/x-python-bytecode.desktop
+++ b/mimetypes/application/x-python-bytecode.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-python-bytecode
-Icon=binary
+Icon=application-octet-stream
Patterns=*.pyc;
Comment=Python Bytecode
Comment[af]=Python Bytekode
diff --git a/mimetypes/application/x-python.desktop b/mimetypes/application/x-python.desktop
index ac06d5d1..1e6e6fc2 100644
--- a/mimetypes/application/x-python.desktop
+++ b/mimetypes/application/x-python.desktop
@@ -83,7 +83,7 @@ Comment[zh_TW]=Python 程式
Comment[zu]=Uhlelo lwamafayela lwe-Python
Type=MimeType
MimeType=application/x-python
-Icon=source_py
+Icon=text-x-text-x-src_py
Patterns=*.py;
X-TDE-IsAlso=application/x-executable-script
diff --git a/mimetypes/application/x-quattropro.desktop b/mimetypes/application/x-quattropro.desktop
index 1c762b09..f926320e 100644
--- a/mimetypes/application/x-quattropro.desktop
+++ b/mimetypes/application/x-quattropro.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-quattropro
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Patterns=*.wb1;*.WB1;*.wb2;*.WB2;*.wb3;*.WB3;
Comment=Quattro Pro Document
Comment[af]=Quattro Pro Dokument
diff --git a/mimetypes/application/x-rar-compressed.desktop b/mimetypes/application/x-rar-compressed.desktop
index af4d76eb..418be7fb 100644
--- a/mimetypes/application/x-rar-compressed.desktop
+++ b/mimetypes/application/x-rar-compressed.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-rar-compressed
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.rar;*.RAR;
Comment=Rar Archive
Comment[af]=Rar Argief
diff --git a/mimetypes/application/x-rar.desktop b/mimetypes/application/x-rar.desktop
index cebe23cc..4bf648e2 100644
--- a/mimetypes/application/x-rar.desktop
+++ b/mimetypes/application/x-rar.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-rar
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.rar;*.RAR;
Comment=Rar Archive
Comment[af]=Rar Argief
diff --git a/mimetypes/application/x-rpm.desktop b/mimetypes/application/x-rpm.desktop
index fd48d9ca..74bce7a5 100644
--- a/mimetypes/application/x-rpm.desktop
+++ b/mimetypes/application/x-rpm.desktop
@@ -2,7 +2,7 @@
X-TDE-AutoEmbed=true
Type=MimeType
MimeType=application/x-rpm
-Icon=rpm
+Icon=application-x-rpm
Patterns=*.rpm;
Comment=RPM Package File
Comment[af]=Rpm Paket Lêer
diff --git a/mimetypes/application/x-ruby.desktop b/mimetypes/application/x-ruby.desktop
index 5954171f..6c5435fc 100644
--- a/mimetypes/application/x-ruby.desktop
+++ b/mimetypes/application/x-ruby.desktop
@@ -75,7 +75,7 @@ Comment[zh_CN]=Ruby 程序
Comment[zh_HK]=Ruby 程式
Comment[zh_TW]=Ruby 程式
# A source_rb icon is missing...
-Icon=source
+Icon=text-x-text-x-src
Type=MimeType
MimeType=application/x-ruby
Patterns=*.rb;*.RB;*.ruby;*.RUBY
diff --git a/mimetypes/application/x-sharedlib.desktop b/mimetypes/application/x-sharedlib.desktop
index eabd03f3..395d79ce 100644
--- a/mimetypes/application/x-sharedlib.desktop
+++ b/mimetypes/application/x-sharedlib.desktop
@@ -81,7 +81,7 @@ Comment[zh_CN]=共享库
Comment[zh_HK]=共用程式庫
Comment[zh_TW]=共用程式庫
Comment[zu]=Umtapo wolwazi Osetshenziswa ngokuhlanganyela
-Icon=binary
+Icon=application-octet-stream
Type=MimeType
MimeType=application/x-sharedlib
Patterns=
diff --git a/mimetypes/application/x-shellscript.desktop b/mimetypes/application/x-shellscript.desktop
index 9b520724..c212e1b7 100644
--- a/mimetypes/application/x-shellscript.desktop
+++ b/mimetypes/application/x-shellscript.desktop
@@ -80,7 +80,7 @@ Comment[zh_CN]=Shell 脚本
Comment[zh_HK]=Shell 程式
Comment[zh_TW]=Shell 程式
Comment[zu]=Isikripti Segobolondo
-Icon=shellscript
+Icon=text-x-text-x-script
Type=MimeType
MimeType=application/x-shellscript
Patterns=*.sh;*.csh
diff --git a/mimetypes/application/x-siag.desktop b/mimetypes/application/x-siag.desktop
index 7ec04c96..20ce18dd 100644
--- a/mimetypes/application/x-siag.desktop
+++ b/mimetypes/application/x-siag.desktop
@@ -79,6 +79,6 @@ Comment[wa]=Documint tåvleu Siag
Comment[zh_CN]=Siag 电子表格
Comment[zh_HK]=Siag 電子表格
Comment[zh_TW]=Siag 電子表格
-Icon=spreadsheet
+Icon=application-vnd.oasis.opendocument.spreadsheet
Type=MimeType
Patterns=*.siag;*.csv;*.wk1;
diff --git a/mimetypes/application/x-sqlite2.desktop b/mimetypes/application/x-sqlite2.desktop
index 4908a42c..b636c532 100644
--- a/mimetypes/application/x-sqlite2.desktop
+++ b/mimetypes/application/x-sqlite2.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-sqlite2
-Icon=empty
+Icon=application-x-zerosize
Patterns=
Comment=SQLite2 Database File
Comment[af]=SQLite2 Databasis Lêer
diff --git a/mimetypes/application/x-sqlite3.desktop b/mimetypes/application/x-sqlite3.desktop
index f68968e0..fd0d2f55 100644
--- a/mimetypes/application/x-sqlite3.desktop
+++ b/mimetypes/application/x-sqlite3.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-sqlite3
-Icon=empty
+Icon=application-x-zerosize
Patterns=
Comment=SQLite3 Database File
Comment[af]=SQLite3 Databasis Lêer
diff --git a/mimetypes/application/x-tar.desktop b/mimetypes/application/x-tar.desktop
index ec15c028..89232469 100644
--- a/mimetypes/application/x-tar.desktop
+++ b/mimetypes/application/x-tar.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-tar
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.tar;
Comment=Tar Archive
Comment[af]=Tar Argief
diff --git a/mimetypes/application/x-tarz.desktop b/mimetypes/application/x-tarz.desktop
index cb7032cc..853d444c 100644
--- a/mimetypes/application/x-tarz.desktop
+++ b/mimetypes/application/x-tarz.desktop
@@ -84,7 +84,7 @@ Comment[zh_CN]=压缩的 Tar 归档
Comment[zh_HK]=壓縮過的 Tar 保存檔
Comment[zh_TW]=壓縮的 Tar 壓縮文件
Comment[zu]=Umqulu we-Tar Elicindezelwe
-Icon=tgz
+Icon=application-x-tarz
Type=MimeType
Patterns=*.tar.Z;
[Property::X-TDE-LocalProtocol]
diff --git a/mimetypes/application/x-tbz.desktop b/mimetypes/application/x-tbz.desktop
index 5512b99b..7c0b4432 100644
--- a/mimetypes/application/x-tbz.desktop
+++ b/mimetypes/application/x-tbz.desktop
@@ -65,7 +65,7 @@ Comment[zh_CN]=Bzip 压缩的 Tar 归档
Comment[zh_HK]=Bzip2 壓縮的 Tar 保存檔
Comment[zh_TW]=Bzip2-ed Tar 壓縮文件
MimeType=application/x-tbz
-Icon=tgz
+Icon=application-x-tarz
Type=MimeType
Patterns=*.tar.bz;*.tbz;*.tar.bz2;*.tbz2;
diff --git a/mimetypes/application/x-tex-gf.desktop b/mimetypes/application/x-tex-gf.desktop
index e28f4923..8a6afd63 100644
--- a/mimetypes/application/x-tex-gf.desktop
+++ b/mimetypes/application/x-tex-gf.desktop
@@ -81,7 +81,7 @@ Comment[zh_CN]=普通字体文件
Comment[zh_HK]=一般字型檔案
Comment[zh_TW]=一般字型檔案
Comment[zu]=Uhlobo lwamagama Lawonke wonke
-Icon=gf
+Icon=application-x-tex-gf
Type=MimeType
MimeType=application/x-tex-gf
Patterns=*.gf;*.GF;
diff --git a/mimetypes/application/x-tex-pk.desktop b/mimetypes/application/x-tex-pk.desktop
index 97681b7c..d27eb741 100644
--- a/mimetypes/application/x-tex-pk.desktop
+++ b/mimetypes/application/x-tex-pk.desktop
@@ -81,7 +81,7 @@ Comment[zh_CN]=打包的字体
Comment[zh_HK]=壓縮過的字型檔案
Comment[zh_TW]=壓縮的字型檔案
Comment[zu]=Uhlobo lwamafayela Olupakishiwe
-Icon=pk
+Icon=application-x-tex-pk
Type=MimeType
MimeType=application/x-tex-pk
Patterns=*.pk;*.PK;
diff --git a/mimetypes/application/x-tgif.desktop b/mimetypes/application/x-tgif.desktop
index 614139f9..5153f6ba 100644
--- a/mimetypes/application/x-tgif.desktop
+++ b/mimetypes/application/x-tgif.desktop
@@ -84,4 +84,4 @@ Comment[zh_TW]=TGIF 文件
Comment[zu]=Uhlu lwamafayela lwe-TGIF
MimeType=application/x-tgif
Type=MimeType
-Icon=vectorgfx
+Icon=image-svg+xml
diff --git a/mimetypes/application/x-tgz.desktop b/mimetypes/application/x-tgz.desktop
index 45e2c086..f3e7325c 100644
--- a/mimetypes/application/x-tgz.desktop
+++ b/mimetypes/application/x-tgz.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-tgz
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.tar.gz;*.tgz;
Comment=Gzipped Tar Archive
Comment[af]=Gzip gekompakteerde Tar Argief
diff --git a/mimetypes/application/x-tlz.desktop b/mimetypes/application/x-tlz.desktop
index 4c479cff..20f1ccd3 100644
--- a/mimetypes/application/x-tlz.desktop
+++ b/mimetypes/application/x-tlz.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-tlz
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.tar.lzma;*.tlz;*.tar.lz
Comment=LZMA Tar Archive
Comment[af]=LZMA gekompakteerde Tar Argief
diff --git a/mimetypes/application/x-trash.desktop b/mimetypes/application/x-trash.desktop
index c742325f..e07ef1a8 100644
--- a/mimetypes/application/x-trash.desktop
+++ b/mimetypes/application/x-trash.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-trash
-Icon=recycled
+Icon=application-x-trash
Patterns=*~;*%;*.bak;*.old;*.sik;
Comment=Backup File
Comment[af]=Rugsteun Lêer
diff --git a/mimetypes/application/x-troff-man.desktop b/mimetypes/application/x-troff-man.desktop
index e2f63597..96d3f1c8 100644
--- a/mimetypes/application/x-troff-man.desktop
+++ b/mimetypes/application/x-troff-man.desktop
@@ -81,7 +81,7 @@ Comment[zh_CN]=带有 Manpage 宏的 Troff 文档
Comment[zh_HK]=帶有 Manpage 巨集 Troff 文件
Comment[zh_TW]=帶有 Manpage 巨集 Troff 文件
Comment[zu]=Faka kuhlu lwamafayela lwe-Troff nge-Manpage Macros
-Icon=man
+Icon=application-x-troff-man
Type=MimeType
MimeType=application/x-troff-man
Patterns=*.man
diff --git a/mimetypes/application/x-troff.desktop b/mimetypes/application/x-troff.desktop
index 84a255c5..4a4e0a75 100644
--- a/mimetypes/application/x-troff.desktop
+++ b/mimetypes/application/x-troff.desktop
@@ -82,7 +82,7 @@ Comment[zh_CN]=Troff 文档
Comment[zh_HK]=Troff 文件
Comment[zh_TW]=Troff 文件
Comment[zu]=Uhlu lwamafayela lwe-Troff
-Icon=man
+Icon=application-x-troff-man
Type=MimeType
MimeType=application/x-troff
Patterns=*.tr;*.roff;
diff --git a/mimetypes/application/x-txz.desktop b/mimetypes/application/x-txz.desktop
index b5894a4e..6348f024 100644
--- a/mimetypes/application/x-txz.desktop
+++ b/mimetypes/application/x-txz.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-txz
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.tar.xz;*.txz;
Comment=Xzipped Tar Archive
Comment[af]=Xzip gekompakteerde Tar Argief
diff --git a/mimetypes/application/x-tzo.desktop b/mimetypes/application/x-tzo.desktop
index 408a7baa..a2a7eafd 100644
--- a/mimetypes/application/x-tzo.desktop
+++ b/mimetypes/application/x-tzo.desktop
@@ -85,6 +85,6 @@ Comment[zh_CN]=Lzopped 压缩的 Tar 归档
Comment[zh_HK]=Lzop 壓縮的 Tar 保存檔
Comment[zh_TW]=Lzop 壓縮的 Tar 壓縮文件
Comment[zu]=Umquu lwe-Lzopped Tar
-Icon=tgz
+Icon=application-x-tarz
Type=MimeType
Patterns=*.tar.lzo;*.tzo;
diff --git a/mimetypes/application/x-vnd.kde.kexi.desktop b/mimetypes/application/x-vnd.kde.kexi.desktop
index 4a02685f..8906e2ef 100644
--- a/mimetypes/application/x-vnd.kde.kexi.desktop
+++ b/mimetypes/application/x-vnd.kde.kexi.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-vnd.kde.kexi
-Icon=kexi_kexi
+Icon=application-x-kexi
Patterns=*.kexi;
X-TDE-AutoEmbed=false
Comment=Kexi Project File
diff --git a/mimetypes/application/x-vnd.kde.kugar.mixed.desktop b/mimetypes/application/x-vnd.kde.kugar.mixed.desktop
index 56b84608..afb079ef 100644
--- a/mimetypes/application/x-vnd.kde.kugar.mixed.desktop
+++ b/mimetypes/application/x-vnd.kde.kugar.mixed.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-vnd.kde.kugar.mixed
-Icon=kugar_kud
+Icon=application-x-kugar
Patterns=*.kug
Comment=Kugar Archive File
Comment[af]=Kugar Argief Lêer
diff --git a/mimetypes/application/x-xliff.desktop b/mimetypes/application/x-xliff.desktop
index 19c894b0..7d08671e 100644
--- a/mimetypes/application/x-xliff.desktop
+++ b/mimetypes/application/x-xliff.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-xliff
-Icon=gettext
+Icon=application-x-gettext
Patterns=*.xlf;*.XLF;
Comment=XLIFF Translation File
Comment[af]=XLIFF Vertaal Lêer
diff --git a/mimetypes/application/x-xz.desktop b/mimetypes/application/x-xz.desktop
index fbaca82c..b7010aa4 100644
--- a/mimetypes/application/x-xz.desktop
+++ b/mimetypes/application/x-xz.desktop
@@ -83,6 +83,6 @@ Comment[zh_CN]=Xzip 文件
Comment[zh_HK]=Xzip 檔案
Comment[zh_TW]=Xzip 檔案
Comment[zu]=Ifayela le-Xzip
-Icon=tgz
+Icon=application-x-tarz
Type=MimeType
Patterns=*.xz;
diff --git a/mimetypes/application/x-zerosize.desktop b/mimetypes/application/x-zerosize.desktop
index 85971120..0c43738c 100644
--- a/mimetypes/application/x-zerosize.desktop
+++ b/mimetypes/application/x-zerosize.desktop
@@ -84,4 +84,4 @@ Comment[zh_TW]=空的文件
Comment[zu]=Uhlu lwamafayela Olungenalutho
MimeType=application/x-zerosize
Type=MimeType
-Icon=empty
+Icon=application-x-zerosize
diff --git a/mimetypes/application/x-zip-compressed.desktop b/mimetypes/application/x-zip-compressed.desktop
index e81069df..d8fda70c 100644
--- a/mimetypes/application/x-zip-compressed.desktop
+++ b/mimetypes/application/x-zip-compressed.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-zip-compressed
-Icon=tgz
+Icon=application-x-tarz
Comment=Zip Archive
Comment[af]=Zip Argief
Comment[ar]=أرشيف Zip
diff --git a/mimetypes/application/x-zip.desktop b/mimetypes/application/x-zip.desktop
index a288db50..7174fdb0 100644
--- a/mimetypes/application/x-zip.desktop
+++ b/mimetypes/application/x-zip.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-zip
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.zip;*.ZIP;
Comment=Zip Archive
Comment[af]=Zip Argief
diff --git a/mimetypes/application/x-zoo.desktop b/mimetypes/application/x-zoo.desktop
index bb4c3097..4efa03d2 100644
--- a/mimetypes/application/x-zoo.desktop
+++ b/mimetypes/application/x-zoo.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=application/x-zoo
-Icon=tgz
+Icon=application-x-tarz
Patterns=*.zoo;*.ZOO;
Comment=Zoo Archive
Comment[af]=Zoo Argief
diff --git a/mimetypes/application/xhtml+xml.desktop b/mimetypes/application/xhtml+xml.desktop
index 26565d89..58a56501 100644
--- a/mimetypes/application/xhtml+xml.desktop
+++ b/mimetypes/application/xhtml+xml.desktop
@@ -77,7 +77,7 @@ Comment[zh_CN]=XHTML 及类似文档
Comment[zh_HK]=XHTML 類型文件
Comment[zh_TW]=XHTML Family 文件
Type=MimeType
-Icon=html
+Icon=text-x-text-html
MimeType=application/xhtml+xml
X-TDE-IsAlso=text/xml
Patterns=*.xhtml
diff --git a/mimetypes/application/xml-dtd.desktop b/mimetypes/application/xml-dtd.desktop
index 9dd1c8da..dbb05585 100644
--- a/mimetypes/application/xml-dtd.desktop
+++ b/mimetypes/application/xml-dtd.desktop
@@ -64,7 +64,7 @@ Comment[vi]=Tài liệu DTD XML
Comment[zh_CN]=XML DTD 文档
Comment[zh_HK]=XML DTD 文件
Comment[zh_TW]=XML DTD 文件
-Icon=html
+Icon=text-x-text-html
Type=MimeType
# RFC 3023
MimeType=application/xml-dtd
diff --git a/mimetypes/application/xml.desktop b/mimetypes/application/xml.desktop
index 7d92ece1..9b4f57e3 100644
--- a/mimetypes/application/xml.desktop
+++ b/mimetypes/application/xml.desktop
@@ -76,7 +76,7 @@ Comment[wa]=Documint XML
Comment[zh_CN]=XML 文档
Comment[zh_HK]=XML 文件
Comment[zh_TW]=XML 文件
-Icon=html
+Icon=text-x-text-html
Type=MimeType
MimeType=application/xml
# This mimetype is an alias for text/xml. Both are referenced by the W3C.
diff --git a/mimetypes/application/xsd.desktop b/mimetypes/application/xsd.desktop
index 1606b547..f5722223 100644
--- a/mimetypes/application/xsd.desktop
+++ b/mimetypes/application/xsd.desktop
@@ -64,7 +64,7 @@ Comment[uz]=W3C XML hujjati
Comment[uz@cyrillic]=W3C XML ҳужжати
Comment[vi]=Giản đồ XML W3C
Comment[zh_CN]=W3C WML 大纲
-Icon=html
+Icon=text-x-text-html
Type=MimeType
MimeType=application/xsd
X-TDE-IsAlso=text/xml
diff --git a/mimetypes/audio/aac.desktop b/mimetypes/audio/aac.desktop
index 263dee9d..e221a53f 100644
--- a/mimetypes/audio/aac.desktop
+++ b/mimetypes/audio/aac.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/aac
-Icon=sound
+Icon=audio-x-generic
Patterns=*.aac;*.AAC;
Comment=AAC Sound
Comment[af]=AAC Klank
diff --git a/mimetypes/audio/ac3.desktop b/mimetypes/audio/ac3.desktop
index 97696f4d..79a716d2 100644
--- a/mimetypes/audio/ac3.desktop
+++ b/mimetypes/audio/ac3.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/ac3
-Icon=sound
+Icon=audio-x-generic
Patterns=*.ac3;*.AC3;
Comment=Dolby AC3 Sound
Comment[af]=Dolby AC3 Klank
diff --git a/mimetypes/audio/basic.desktop b/mimetypes/audio/basic.desktop
index 28c133f8..6199f711 100644
--- a/mimetypes/audio/basic.desktop
+++ b/mimetypes/audio/basic.desktop
@@ -81,5 +81,5 @@ Comment[zh_HK]=ULAW (Sun) 音效檔
Comment[zh_TW]=ULAW (Sun) 聲音文件
Comment[zu]=Okuzwakalayo kwe-ULAW (Ilanga)
MimeType=audio/basic
-Icon=sound
+Icon=audio-x-generic
Patterns=*.au;*.AU;*.snd;*.SND
diff --git a/mimetypes/audio/mp4.desktop b/mimetypes/audio/mp4.desktop
index 0992679d..01434969 100644
--- a/mimetypes/audio/mp4.desktop
+++ b/mimetypes/audio/mp4.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/mp4
-Icon=sound
+Icon=audio-x-generic
Patterns=*.m4a;*.M4A;
Comment=MPEG-4 Audio
Comment[af]=MPEG-4 Klank
diff --git a/mimetypes/audio/mpeg.desktop b/mimetypes/audio/mpeg.desktop
index 5410e51b..f9f6019f 100644
--- a/mimetypes/audio/mpeg.desktop
+++ b/mimetypes/audio/mpeg.desktop
@@ -4,7 +4,7 @@
# See also audio/x-mp3 and audio/x-mp2
Type=MimeType
MimeType=audio/mpeg
-Icon=sound
+Icon=audio-x-generic
Comment=MPEG Audio
Comment[af]=MPEG Klank
Comment[be]=Гукавы файл MPEG
diff --git a/mimetypes/audio/mpegurl.desktop b/mimetypes/audio/mpegurl.desktop
index d00f990e..e33dbb89 100644
--- a/mimetypes/audio/mpegurl.desktop
+++ b/mimetypes/audio/mpegurl.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/mpegurl
-Icon=sound
+Icon=audio-x-generic
Patterns=*.m3u;*.M3U;
X-TDE-IsAlso=audio/x-mpegurl
Comment=Streaming MPEG Layer 3 Audio
diff --git a/mimetypes/audio/prs.sid.desktop b/mimetypes/audio/prs.sid.desktop
index 9b7d71da..8a59a724 100644
--- a/mimetypes/audio/prs.sid.desktop
+++ b/mimetypes/audio/prs.sid.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/prs.sid
-Icon=sound
+Icon=audio-x-generic
Patterns=*.sid;*.SID;*.psid;*.PSID
Comment=C64 SID Music
Comment[af]=C64 SID Musiek
diff --git a/mimetypes/audio/vnd.rn-realaudio.desktop b/mimetypes/audio/vnd.rn-realaudio.desktop
index 7a7600d1..4cbcaba4 100644
--- a/mimetypes/audio/vnd.rn-realaudio.desktop
+++ b/mimetypes/audio/vnd.rn-realaudio.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/vnd.rn-realaudio
-Icon=sound
+Icon=audio-x-generic
Patterns=*.ra;*.ram;*.RA;*.RAM;
X-TDE-IsAlso=audio/x-pn-realaudio
Comment=RealAudio File
diff --git a/mimetypes/audio/vorbis.desktop b/mimetypes/audio/vorbis.desktop
index 2b09399b..551e2d64 100644
--- a/mimetypes/audio/vorbis.desktop
+++ b/mimetypes/audio/vorbis.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/vorbis
-Icon=sound
+Icon=audio-x-generic
X-TDE-IsAlso=audio/x-vorbis
Comment=Ogg Vorbis Audio
Comment[af]=Ogg Vorbis Klank
diff --git a/mimetypes/audio/x-adpcm.desktop b/mimetypes/audio/x-adpcm.desktop
index 2cd0fa6f..d6a7bf8d 100644
--- a/mimetypes/audio/x-adpcm.desktop
+++ b/mimetypes/audio/x-adpcm.desktop
@@ -81,7 +81,7 @@ Comment[zh_HK]=PCM 音效檔
Comment[zh_TW]=PCM 聲音文件
Comment[zu]=Okuzwakalayo kwe-PCM
MimeType=audio/x-adpcm
-Icon=sound
+Icon=audio-x-generic
Patterns=;
[Property::X-TDE-NativeExtension]
Type=TQString
diff --git a/mimetypes/audio/x-aiff.desktop b/mimetypes/audio/x-aiff.desktop
index 55d4dfa2..3f5ce332 100644
--- a/mimetypes/audio/x-aiff.desktop
+++ b/mimetypes/audio/x-aiff.desktop
@@ -81,5 +81,5 @@ Comment[zh_HK]=AIFF/Amiga 音效檔
Comment[zh_TW]=AIFF/Amiga 聲音文件
Comment[zu]=Okuzwakalayo kwe-AIFF/Amiga
MimeType=audio/x-aiff
-Icon=sound
+Icon=audio-x-generic
Patterns=*.aiff;*.AIFF
diff --git a/mimetypes/audio/x-flac.desktop b/mimetypes/audio/x-flac.desktop
index 5275d9de..7dfa9b6a 100644
--- a/mimetypes/audio/x-flac.desktop
+++ b/mimetypes/audio/x-flac.desktop
@@ -74,5 +74,5 @@ Comment[zh_CN]=FLAC 音频
Comment[zh_HK]=FLAC 音效檔
Comment[zh_TW]=FLAC 聲音
MimeType=audio/x-flac
-Icon=sound
+Icon=audio-x-generic
Patterns=*.flac;*.FLAC;
diff --git a/mimetypes/audio/x-matroska.desktop b/mimetypes/audio/x-matroska.desktop
index 75a372bf..832d785e 100644
--- a/mimetypes/audio/x-matroska.desktop
+++ b/mimetypes/audio/x-matroska.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/x-matroska
-Icon=sound
+Icon=audio-x-generic
Patterns=*.mka;*.MKA;
Comment=Matroska Audio
Comment[af]=Matroska Klank
diff --git a/mimetypes/audio/x-midi.desktop b/mimetypes/audio/x-midi.desktop
index dae8044b..13607406 100644
--- a/mimetypes/audio/x-midi.desktop
+++ b/mimetypes/audio/x-midi.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/x-midi
-Icon=midi
+Icon=audio-midi
Patterns=*.mid;*.MID;
Comment=MIDI Audio
Comment[af]=MIDI Klank
diff --git a/mimetypes/audio/x-mod.desktop b/mimetypes/audio/x-mod.desktop
index adca74e6..8b889992 100644
--- a/mimetypes/audio/x-mod.desktop
+++ b/mimetypes/audio/x-mod.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/x-mod
-Icon=sound
+Icon=audio-x-generic
Patterns=*.mod;*.MOD;*.s3m;*.S3M;*.stm;*.STM;*.ult;*.ULT;*.UNI;*.uni;*.xm;*.XM;*.m15;*.M15;*.mtm;*.MTM;*.669;*.it;*.IT;
Comment=Amiga Soundtracker Audio
Comment[ar]=صوت Amiga Soundtracker
diff --git a/mimetypes/audio/x-mp2.desktop b/mimetypes/audio/x-mp2.desktop
index ed13c785..81c9d50c 100644
--- a/mimetypes/audio/x-mp2.desktop
+++ b/mimetypes/audio/x-mp2.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/x-mp2
-Icon=sound
+Icon=audio-x-generic
Patterns=*.mp2;*.MP2;
X-TDE-IsAlso=audio/mpeg
Comment=MPEG Layer 2 Audio
diff --git a/mimetypes/audio/x-mp3.desktop b/mimetypes/audio/x-mp3.desktop
index 8c3809cf..2ba3afe7 100644
--- a/mimetypes/audio/x-mp3.desktop
+++ b/mimetypes/audio/x-mp3.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/x-mp3
-Icon=sound
+Icon=audio-x-generic
Patterns=*.mp3;*.MP3;*.Mp3;
X-TDE-IsAlso=audio/mpeg
Comment=MPEG Layer 3 Audio
diff --git a/mimetypes/audio/x-mpegurl.desktop b/mimetypes/audio/x-mpegurl.desktop
index 5db9061c..1b7fe99e 100644
--- a/mimetypes/audio/x-mpegurl.desktop
+++ b/mimetypes/audio/x-mpegurl.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/x-mpegurl
-Icon=sound
+Icon=audio-x-generic
Comment=Streaming MPEG Layer 3 Audio
Comment[af]=Stroomende Mpeg Laag 3 Audio
Comment[ar]=صوت انسيابي من MPEG الطبقة 3
diff --git a/mimetypes/audio/x-ms-wma.desktop b/mimetypes/audio/x-ms-wma.desktop
index 27f5d9ca..490c296b 100644
--- a/mimetypes/audio/x-ms-wma.desktop
+++ b/mimetypes/audio/x-ms-wma.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/x-ms-wma
-Icon=sound
+Icon=audio-x-generic
Patterns=*.wma;*.WMA
Comment=Windows Media Audio
Comment[af]=Windows Media Klank
diff --git a/mimetypes/audio/x-musepack.desktop b/mimetypes/audio/x-musepack.desktop
index 719bfa1b..01c02cf1 100644
--- a/mimetypes/audio/x-musepack.desktop
+++ b/mimetypes/audio/x-musepack.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/x-musepack
-Icon=sound
+Icon=audio-x-generic
Patterns=*.mpc;*.MPC;*.mp+;*.MP+
Comment=Musepack Audio
Comment[af]=Musepack Klank
diff --git a/mimetypes/audio/x-oggflac.desktop b/mimetypes/audio/x-oggflac.desktop
index 76b3db59..2cd269ac 100644
--- a/mimetypes/audio/x-oggflac.desktop
+++ b/mimetypes/audio/x-oggflac.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/x-oggflac
-Icon=sound
+Icon=audio-x-generic
X-TDE-IsAlso=application/ogg
Comment=Ogg FLAC Audio
Comment[af]=Ogg FLAC Klank
diff --git a/mimetypes/audio/x-pn-realaudio-plugin.desktop b/mimetypes/audio/x-pn-realaudio-plugin.desktop
index 41b3c443..bb18ef3f 100644
--- a/mimetypes/audio/x-pn-realaudio-plugin.desktop
+++ b/mimetypes/audio/x-pn-realaudio-plugin.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/x-pn-realaudio-plugin
-Icon=sound
+Icon=audio-x-generic
Comment=RealAudio Plugin File
Comment[bg]=Приставка за RealAudio
Comment[ca]=Fitxer endollable de RealAudio
diff --git a/mimetypes/audio/x-pn-realaudio.desktop b/mimetypes/audio/x-pn-realaudio.desktop
index d7f74cc4..3128c1f4 100644
--- a/mimetypes/audio/x-pn-realaudio.desktop
+++ b/mimetypes/audio/x-pn-realaudio.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/x-pn-realaudio
-Icon=sound
+Icon=audio-x-generic
Comment=RealAudio File
Comment[af]=RealAudio Lêer
Comment[ar]=ملف Real Audio
diff --git a/mimetypes/audio/x-scpls.desktop b/mimetypes/audio/x-scpls.desktop
index 937bb4c0..38f774db 100644
--- a/mimetypes/audio/x-scpls.desktop
+++ b/mimetypes/audio/x-scpls.desktop
@@ -84,5 +84,5 @@ Comment[zh_CN]=MP3 ShoutCast 播放列表
Comment[zh_HK]=MP3 ShoutCast 播放清單
Comment[zh_TW]=MP3 ShoutCast 播放列表
Patterns=*.pls;*.PLS;
-Icon=sound
+Icon=audio-x-generic
diff --git a/mimetypes/audio/x-speex.desktop b/mimetypes/audio/x-speex.desktop
index 1d4f7e6f..2db3b202 100644
--- a/mimetypes/audio/x-speex.desktop
+++ b/mimetypes/audio/x-speex.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/x-speex
-Icon=sound
+Icon=audio-x-generic
Patterns=*.spx;*.SPX;
Comment=Speex Audio
Comment[af]=Speex Klank
diff --git a/mimetypes/audio/x-vorbis.desktop b/mimetypes/audio/x-vorbis.desktop
index 7f72fbed..9b8ddece 100644
--- a/mimetypes/audio/x-vorbis.desktop
+++ b/mimetypes/audio/x-vorbis.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/x-vorbis
-Icon=sound
+Icon=audio-x-generic
X-TDE-IsAlso=application/ogg
Comment=Ogg Vorbis Audio
Comment[af]=Ogg Vorbis Klank
diff --git a/mimetypes/audio/x-wav.desktop b/mimetypes/audio/x-wav.desktop
index d29e9a07..26b7f391 100644
--- a/mimetypes/audio/x-wav.desktop
+++ b/mimetypes/audio/x-wav.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=audio/x-wav
-Icon=sound
+Icon=audio-x-generic
Patterns=*.wav;*.WAV;
Comment=WAV Audio
Comment[af]=Wav Audio
diff --git a/mimetypes/image/cgm.desktop b/mimetypes/image/cgm.desktop
index c0fd5757..c4d2a859 100644
--- a/mimetypes/image/cgm.desktop
+++ b/mimetypes/image/cgm.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/cgm
-Icon=image
+Icon=image-x-generic
Patterns=*.cgm;*.CGM;
Comment=Computer Graphics Metafile
Comment[af]=Rekenaar Grafieka Metaleêr
diff --git a/mimetypes/image/fax-g3.desktop b/mimetypes/image/fax-g3.desktop
index a9fcc0e9..db883de6 100644
--- a/mimetypes/image/fax-g3.desktop
+++ b/mimetypes/image/fax-g3.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/fax-g3
-Icon=image
+Icon=image-x-generic
Patterns=*.g3;*.G3;
Comment=CCITT G3 Fax
Comment[af]=Ccitt G3 Faks
diff --git a/mimetypes/image/fits.desktop b/mimetypes/image/fits.desktop
index c7559e34..3c6b6265 100644
--- a/mimetypes/image/fits.desktop
+++ b/mimetypes/image/fits.desktop
@@ -2,7 +2,7 @@
Type=MimeType
# RFC 4047
MimeType=image/fits
-Icon=image
+Icon=image-x-generic
Comment=FITS Image
Comment[af]=FITS Beeld
Comment[be]=Відарыс FITS
diff --git a/mimetypes/image/gif.desktop b/mimetypes/image/gif.desktop
index 30dd91e8..fdf7e6da 100644
--- a/mimetypes/image/gif.desktop
+++ b/mimetypes/image/gif.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/gif
-Icon=image
+Icon=image-x-generic
Patterns=*.gif;*.GIF;
Comment=GIF Image
Comment[af]=Gif Beeld
diff --git a/mimetypes/image/jp2.desktop b/mimetypes/image/jp2.desktop
index ab19ce97..e01ebbd5 100644
--- a/mimetypes/image/jp2.desktop
+++ b/mimetypes/image/jp2.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/jp2
-Icon=image
+Icon=image-x-generic
Patterns=*.jp2;*.JP2
Comment=JPEG 2000 Image
Comment[af]=JPEG 2000 Beeld
diff --git a/mimetypes/image/jpeg.desktop b/mimetypes/image/jpeg.desktop
index 887da3f1..8aa7fa50 100644
--- a/mimetypes/image/jpeg.desktop
+++ b/mimetypes/image/jpeg.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/jpeg
-Icon=image
+Icon=image-x-generic
Patterns=*.jpg;*.JPG;*.jpeg;*.JPEG;
Comment=JPEG Image
Comment[af]=JPEG Beeld
diff --git a/mimetypes/image/jpg.desktop b/mimetypes/image/jpg.desktop
index d7a5824b..f15f29b1 100644
--- a/mimetypes/image/jpg.desktop
+++ b/mimetypes/image/jpg.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=image
+Icon=image-x-generic
Type=MimeType
MimeType=image/jpg
X-TDE-IsAlso=image/jpeg
diff --git a/mimetypes/image/pjpeg.desktop b/mimetypes/image/pjpeg.desktop
index 2e286091..97d37dee 100644
--- a/mimetypes/image/pjpeg.desktop
+++ b/mimetypes/image/pjpeg.desktop
@@ -2,7 +2,7 @@
# This is just a silly MS alias for progressive JPEGs
Type=MimeType
MimeType=image/pjpeg
-Icon=image
+Icon=image-x-generic
X-TDE-IsAlso=image/jpeg
Comment=JPEG Image
Comment[af]=JPEG Beeld
diff --git a/mimetypes/image/png.desktop b/mimetypes/image/png.desktop
index f42b0669..c743dc60 100644
--- a/mimetypes/image/png.desktop
+++ b/mimetypes/image/png.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/png
-Icon=image
+Icon=image-x-generic
Patterns=*.png;*.PNG;
Comment=PNG Image
Comment[af]=Png Beeld
diff --git a/mimetypes/image/svg+xml.desktop b/mimetypes/image/svg+xml.desktop
index 23c924d6..f21ffc6e 100644
--- a/mimetypes/image/svg+xml.desktop
+++ b/mimetypes/image/svg+xml.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=vectorgfx
+Icon=image-svg+xml
Type=MimeType
MimeType=image/svg+xml
X-TDE-IsAlso=text/xml
diff --git a/mimetypes/image/svg-xml.desktop b/mimetypes/image/svg-xml.desktop
index 844ff892..73e30e6e 100644
--- a/mimetypes/image/svg-xml.desktop
+++ b/mimetypes/image/svg-xml.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=vectorgfx
+Icon=image-svg+xml
Type=MimeType
MimeType=image/svg-xml
X-TDE-IsAlso=image/svg+xml
diff --git a/mimetypes/image/tiff.desktop b/mimetypes/image/tiff.desktop
index 14aff6c2..5cf37189 100644
--- a/mimetypes/image/tiff.desktop
+++ b/mimetypes/image/tiff.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/tiff
-Icon=image
+Icon=image-x-generic
Patterns=*.tiff;*.TIFF;*.tif;*.TIF;
Comment=TIFF Image
Comment[af]=Tiff Beeld
diff --git a/mimetypes/image/x-bmp.desktop b/mimetypes/image/x-bmp.desktop
index 3302b8d4..bab85af2 100644
--- a/mimetypes/image/x-bmp.desktop
+++ b/mimetypes/image/x-bmp.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-bmp
-Icon=image
+Icon=image-x-generic
Patterns=*.bmp;*.BMP;
Comment=BMP Image
Comment[af]=BMP Beeld
diff --git a/mimetypes/image/x-dds.desktop b/mimetypes/image/x-dds.desktop
index 20edc344..781fd178 100644
--- a/mimetypes/image/x-dds.desktop
+++ b/mimetypes/image/x-dds.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-dds
-Icon=image
+Icon=image-x-generic
Patterns=*.dds;*.DDS;
Comment=DirectDraw Surface
Comment[af]=DirectDraw Oppervlakte
diff --git a/mimetypes/image/x-eps.desktop b/mimetypes/image/x-eps.desktop
index 79b6b275..65226ed5 100644
--- a/mimetypes/image/x-eps.desktop
+++ b/mimetypes/image/x-eps.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-eps
-Icon=image
+Icon=image-x-generic
Patterns=*.eps;*.EPS;*.epsi;*.EPSI;*.epsf;*.EPSF;
Comment=Encapsulated PostScript Image
Comment[af]=Geënkapsuleerde Postscript Beeld
diff --git a/mimetypes/image/x-exr.desktop b/mimetypes/image/x-exr.desktop
index dfa49a42..73d7abf7 100644
--- a/mimetypes/image/x-exr.desktop
+++ b/mimetypes/image/x-exr.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-exr
-Icon=image
+Icon=image-x-generic
Patterns=*.exr;*.EXR;
Comment=ILM EXR Image
Comment[af]=ILM EXR Beeld
diff --git a/mimetypes/image/x-hdr.desktop b/mimetypes/image/x-hdr.desktop
index c623a59d..b990a86d 100644
--- a/mimetypes/image/x-hdr.desktop
+++ b/mimetypes/image/x-hdr.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-hdr
-Icon=image
+Icon=image-x-generic
Patterns=*.hdr;*.HDR;*.pic;*.PIC
Comment=High Dynamic Range Image
Comment[af]=Hoog Dinamiese Reeks Beeld
diff --git a/mimetypes/image/x-ico.desktop b/mimetypes/image/x-ico.desktop
index 49fbde8a..27490107 100644
--- a/mimetypes/image/x-ico.desktop
+++ b/mimetypes/image/x-ico.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-ico
-Icon=image
+Icon=image-x-generic
Patterns=*.ico;*.ICO;
Comment=Windows Icon
Comment[af]=Vensters Ikoon
diff --git a/mimetypes/image/x-jng.desktop b/mimetypes/image/x-jng.desktop
index 79bce5ad..deda7cd9 100644
--- a/mimetypes/image/x-jng.desktop
+++ b/mimetypes/image/x-jng.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-jng
-Icon=image
+Icon=image-x-generic
Patterns=*.jng;*.JNG;
Comment=JNG Image
Comment[af]=Jng Beeld
diff --git a/mimetypes/image/x-msod.desktop b/mimetypes/image/x-msod.desktop
index c745e661..c3858a06 100644
--- a/mimetypes/image/x-msod.desktop
+++ b/mimetypes/image/x-msod.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=image
+Icon=image-x-generic
Type=MimeType
MimeType=image/x-msod
Patterns=*.msod;*.MSOD;
diff --git a/mimetypes/image/x-pcx.desktop b/mimetypes/image/x-pcx.desktop
index 2c795b7a..8aaf0bd0 100644
--- a/mimetypes/image/x-pcx.desktop
+++ b/mimetypes/image/x-pcx.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-pcx
-Icon=image
+Icon=image-x-generic
Patterns=*.pcx;*.PCX;
Comment=PCX Image
Comment[af]=PCX Beeld
diff --git a/mimetypes/image/x-photo-cd.desktop b/mimetypes/image/x-photo-cd.desktop
index 960ab3c9..27d496f6 100644
--- a/mimetypes/image/x-photo-cd.desktop
+++ b/mimetypes/image/x-photo-cd.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-photo-cd
-Icon=image
+Icon=image-x-generic
Patterns=*.pcd;*.PCD;
Comment=PhotoCD Image
Comment[af]=Photocd Beeld
diff --git a/mimetypes/image/x-portable-bitmap.desktop b/mimetypes/image/x-portable-bitmap.desktop
index f36ca758..f90b3b20 100644
--- a/mimetypes/image/x-portable-bitmap.desktop
+++ b/mimetypes/image/x-portable-bitmap.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-portable-bitmap
-Icon=image
+Icon=image-x-generic
Patterns=*.pbm;*.PBM;*.pbmraw;*.PBMRAW
Comment=Portable Bitmap Image
Comment[af]=Draagbaar Biskaart Beeld
diff --git a/mimetypes/image/x-portable-greymap.desktop b/mimetypes/image/x-portable-greymap.desktop
index 436ba783..1ae75e55 100644
--- a/mimetypes/image/x-portable-greymap.desktop
+++ b/mimetypes/image/x-portable-greymap.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-portable-greymap
-Icon=image
+Icon=image-x-generic
Patterns=*.pgm;*.PGM;*.pgmraw;*.PGMRAW
Comment=Portable Graymap Image
Comment[af]=Draagbaar Graymap Beeld
diff --git a/mimetypes/image/x-portable-pixmap.desktop b/mimetypes/image/x-portable-pixmap.desktop
index 11d23cbe..cdd488b4 100644
--- a/mimetypes/image/x-portable-pixmap.desktop
+++ b/mimetypes/image/x-portable-pixmap.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-portable-pixmap
-Icon=image
+Icon=image-x-generic
Patterns=*.ppm;*.PPM;*.pnm;*.PNM;*.ppmraw;*.PPMRAW
Comment=Portable Pixmap Image
Comment[af]=Draagbaar Bispatroon Beeld
diff --git a/mimetypes/image/x-raw.desktop b/mimetypes/image/x-raw.desktop
index 0bbc4749..2a9a11a5 100644
--- a/mimetypes/image/x-raw.desktop
+++ b/mimetypes/image/x-raw.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-raw
-Icon=image
+Icon=image-x-generic
Patterns=*.raw;*.RAW;*.dcr;*.DCR;*.dng;*.DNG;*.crw;*.CRW;*.cr2;*.CR2;*.nef;*.NEF;*.mrw;*.MRW;*.bay;*.bmq;*.cs1;*.dc2;*.erf;*.fff;*.hrd;*.k25;*.kdc;*.mdc;*.mos;*.orf;*.pef;*.pxn;*.raf;*.rdc;*.sr2;*.srf;*.x3f;
Comment=RAW Camera Image
Comment[be]=Малюнак з камеры RAW
diff --git a/mimetypes/image/x-rgb.desktop b/mimetypes/image/x-rgb.desktop
index 204eac09..ca234b16 100644
--- a/mimetypes/image/x-rgb.desktop
+++ b/mimetypes/image/x-rgb.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-rgb
-Icon=image
+Icon=image-x-generic
Patterns=*.rgb;*.RGB;*.rgba;*.RGBA;*.bw;*.BW;*.sgi;*.SGI
Comment=SGI Image (RGB)
Comment[af]=SGI Beeld (RGB)
diff --git a/mimetypes/image/x-targa.desktop b/mimetypes/image/x-targa.desktop
index 567c00fb..9a38a1f7 100644
--- a/mimetypes/image/x-targa.desktop
+++ b/mimetypes/image/x-targa.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-targa
-Icon=image
+Icon=image-x-generic
Patterns=*.tga;*.TGA;
Comment=Truevision Targa Image
Comment[af]=Truevision Targa Beeld
diff --git a/mimetypes/image/x-vnd.adobe.photoshop.desktop b/mimetypes/image/x-vnd.adobe.photoshop.desktop
index 1788b3e3..63d3b07b 100644
--- a/mimetypes/image/x-vnd.adobe.photoshop.desktop
+++ b/mimetypes/image/x-vnd.adobe.photoshop.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=image
+Icon=image-x-generic
Type=MimeType
MimeType=image/x-vnd.adobe.photoshop
Patterns=*.psd;*.PSD;
diff --git a/mimetypes/image/x-vnd.trolltech.qpicture.desktop b/mimetypes/image/x-vnd.trolltech.qpicture.desktop
index 124490bd..8b094bdf 100644
--- a/mimetypes/image/x-vnd.trolltech.qpicture.desktop
+++ b/mimetypes/image/x-vnd.trolltech.qpicture.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=vectorgfx
+Icon=image-svg+xml
Type=MimeType
MimeType=image/x-vnd.trolltech.qpicture
Patterns=*.qpic;
diff --git a/mimetypes/image/x-wmf.desktop b/mimetypes/image/x-wmf.desktop
index 5d7ed7bd..909d778a 100644
--- a/mimetypes/image/x-wmf.desktop
+++ b/mimetypes/image/x-wmf.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=vectorgfx
+Icon=image-svg+xml
Type=MimeType
MimeType=image/x-wmf
Patterns=*.wmf;*.WMF;
diff --git a/mimetypes/image/x-xbm.desktop b/mimetypes/image/x-xbm.desktop
index 0bdc67ef..d0d5da6b 100644
--- a/mimetypes/image/x-xbm.desktop
+++ b/mimetypes/image/x-xbm.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-xbm
-Icon=image
+Icon=image-x-generic
Patterns=*.xbm;*.XBM;
Comment=X BitMap Image
Comment[af]=X Biskaart Beeld
diff --git a/mimetypes/image/x-xcf-gimp.desktop b/mimetypes/image/x-xcf-gimp.desktop
index 9640e2e8..def1985a 100644
--- a/mimetypes/image/x-xcf-gimp.desktop
+++ b/mimetypes/image/x-xcf-gimp.desktop
@@ -78,7 +78,7 @@ Comment[zh_CN]=GIMP 本地图像格式
Comment[zh_HK]=GIMP 內置圖檔格式
Comment[zh_TW]=GIMP 原聲影像格式
Comment[zu]=Isakhiwo Sesithombe Sasendulo se-GIMP
-Icon=image
+Icon=image-x-generic
MimeType=image/x-xcf-gimp
Patterns=*.xcf;
Type=MimeType
diff --git a/mimetypes/image/x-xfig.desktop b/mimetypes/image/x-xfig.desktop
index 70d67b7c..41f1bedd 100644
--- a/mimetypes/image/x-xfig.desktop
+++ b/mimetypes/image/x-xfig.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=vectorgfx
+Icon=image-svg+xml
Type=MimeType
MimeType=image/x-xfig
Patterns=*.fig;*.FIG;
diff --git a/mimetypes/image/x-xpm.desktop b/mimetypes/image/x-xpm.desktop
index 8ba8b08b..59fa3020 100644
--- a/mimetypes/image/x-xpm.desktop
+++ b/mimetypes/image/x-xpm.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=image/x-xpm
-Icon=image
+Icon=image-x-generic
Patterns=*.xpm;*.XPM;
Comment=X PixMap Image
Comment[af]=X Bispatroon Beeld
diff --git a/mimetypes/text/calendar.desktop b/mimetypes/text/calendar.desktop
index c1f814a4..c59becb2 100644
--- a/mimetypes/text/calendar.desktop
+++ b/mimetypes/text/calendar.desktop
@@ -82,7 +82,7 @@ Comment[zh_CN]=iCalendar 文件
Comment[zh_HK]=iCalendar 文件
Comment[zh_TW]=iCalendar 文件
Comment[zu]=Ifayela Lekhalenda
-Icon=vcalendar
+Icon=x-office-calendar
Type=MimeType
MimeType=text/calendar
Patterns=*.ics
diff --git a/mimetypes/text/css.desktop b/mimetypes/text/css.desktop
index ba98ce5c..ed179e31 100644
--- a/mimetypes/text/css.desktop
+++ b/mimetypes/text/css.desktop
@@ -65,7 +65,7 @@ Comment[vi]=Tờ kiểu dáng tầng xếp (CSS)
Comment[xh]=Uhlobo lwekhasi Elingxangxazayo
Comment[zh_CN]=层叠样式表单
Comment[zu]=Iphepha Lesitayela Lokulandelanisa
-Icon=txt
+Icon=text-plain
Type=MimeType
Patterns=*.css;*.CSSL;
diff --git a/mimetypes/text/docbook.desktop b/mimetypes/text/docbook.desktop
index 0195a422..4188abd9 100644
--- a/mimetypes/text/docbook.desktop
+++ b/mimetypes/text/docbook.desktop
@@ -76,7 +76,7 @@ Comment[wa]=Documint DocBook
Comment[zh_CN]=DocBook 文档
Comment[zh_HK]=DocBook 文件
Comment[zh_TW]=DocBook 文件
-Icon=wordprocessing
+Icon=application-vnd.oasis.opendocument.text
Type=MimeType
MimeType=text/docbook
Patterns=*.docbook;
diff --git a/mimetypes/text/enriched.desktop b/mimetypes/text/enriched.desktop
index f2ce0959..ebf6e2a8 100644
--- a/mimetypes/text/enriched.desktop
+++ b/mimetypes/text/enriched.desktop
@@ -68,7 +68,7 @@ Comment[wa]=Documint tecse ledjirmint eritchî
Comment[zh_CN]=轻装的丰富文本文档
Comment[zh_HK]=Lightly Enriched 文件檔案
Comment[zh_TW]=Lightly Enriched 文件檔案
-Icon=txt
+Icon=text-plain
Type=MimeType
Patterns=
diff --git a/mimetypes/text/html.desktop b/mimetypes/text/html.desktop
index 0fab72f3..7b0c2214 100644
--- a/mimetypes/text/html.desktop
+++ b/mimetypes/text/html.desktop
@@ -76,7 +76,7 @@ Comment[wa]=Documint HTML
Comment[zh_CN]=HTML 文档
Comment[zh_HK]=HTML 文件
Comment[zh_TW]=HTML 文件
-Icon=html
+Icon=text-x-text-html
Type=MimeType
MimeType=text/html
Patterns=*.html;*.HTML;*.htm;*.HTM;*.shtml;
diff --git a/mimetypes/text/plain.desktop b/mimetypes/text/plain.desktop
index 1748502e..234a5123 100644
--- a/mimetypes/text/plain.desktop
+++ b/mimetypes/text/plain.desktop
@@ -77,7 +77,7 @@ Comment[wa]=Documint e peur tecse
Comment[zh_CN]=纯文本文档
Comment[zh_HK]=純文字檔案
Comment[zh_TW]=純文字檔案
-Icon=txt
+Icon=text-plain
Type=MimeType
Patterns=*.txt;*.TXT;
diff --git a/mimetypes/text/rtf.desktop b/mimetypes/text/rtf.desktop
index 4be6258e..3ec971b5 100644
--- a/mimetypes/text/rtf.desktop
+++ b/mimetypes/text/rtf.desktop
@@ -77,7 +77,7 @@ Comment[wa]=Documint RTF
Comment[zh_CN]=RTF 文档
Comment[zh_HK]=RTF 文件
Comment[zh_TW]=RTF 文件
-Icon=rtf
+Icon=text-x-text-rtf
Type=MimeType
Patterns=*.rtf;*.RTF;
[Property::X-TDE-text]
diff --git a/mimetypes/text/sgml.desktop b/mimetypes/text/sgml.desktop
index f0b68f67..751f5f94 100644
--- a/mimetypes/text/sgml.desktop
+++ b/mimetypes/text/sgml.desktop
@@ -83,7 +83,7 @@ Comment[zh_CN]=SGML 文档
Comment[zh_HK]=SGML 文件
Comment[zh_TW]=SGML 文件
Comment[zu]=Uhlu lwamafayela lwe-SGML
-Icon=txt
+Icon=text-plain
Type=MimeType
Patterns=*.sgml;*.SGML;
diff --git a/mimetypes/text/vnd.abc.desktop b/mimetypes/text/vnd.abc.desktop
index 8fcec5d1..62ad2d5c 100644
--- a/mimetypes/text/vnd.abc.desktop
+++ b/mimetypes/text/vnd.abc.desktop
@@ -69,7 +69,7 @@ Comment[vi]=Tập tin âm nhạc ABC
Comment[zh_CN]=ABC 音乐文件
Comment[zh_HK]=ABC 音樂原始檔
Comment[zh_TW]=ABC 音樂檔
-Icon=sound
+Icon=audio-x-generic
Type=MimeType
MimeType=text/vnd.abc
Patterns=*.abc;*.ABC;
diff --git a/mimetypes/text/vnd.wap.wml.desktop b/mimetypes/text/vnd.wap.wml.desktop
index eddfa5fc..8751bc3a 100644
--- a/mimetypes/text/vnd.wap.wml.desktop
+++ b/mimetypes/text/vnd.wap.wml.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=html
+Icon=text-x-text-html
Type=MimeType
MimeType=text/vnd.wap.wml
Patterns=*.wml;*.WML;
diff --git a/mimetypes/text/x-adasrc.desktop b/mimetypes/text/x-adasrc.desktop
index aeb9d164..98c77839 100644
--- a/mimetypes/text/x-adasrc.desktop
+++ b/mimetypes/text/x-adasrc.desktop
@@ -82,7 +82,7 @@ Comment[zh_CN]=Ada 源文件
Comment[zh_HK]=Ada 源代碼
Comment[zh_TW]=Ada 原始檔
Comment[zu]=Ifayela Lemvelaphi le-Ada
-Icon=source_cpp
+Icon=text-x-text-x-csrcpp
Type=MimeType
MimeType=text/x-adasrc
Patterns=*.adb;*.ads;
diff --git a/mimetypes/text/x-bibtex.desktop b/mimetypes/text/x-bibtex.desktop
index dd114f15..34ec0d67 100644
--- a/mimetypes/text/x-bibtex.desktop
+++ b/mimetypes/text/x-bibtex.desktop
@@ -80,7 +80,7 @@ Comment[zh_CN]=书目数据(Bibtex)
Comment[zh_HK]=作者資料 (Bibtex)
Comment[zh_TW]=作者資料 (bibtex)
Comment[zu]=Idata Yokuqukethwe umlando (Bibtex)
-Icon=tex
+Icon=text-x-tex
MimeType=text/x-bibtex
Patterns=*.bib
Type=MimeType
diff --git a/mimetypes/text/x-c++hdr.desktop b/mimetypes/text/x-c++hdr.desktop
index 63f6f5ec..b3798025 100644
--- a/mimetypes/text/x-c++hdr.desktop
+++ b/mimetypes/text/x-c++hdr.desktop
@@ -81,7 +81,7 @@ Comment[zh_CN]=C++ 头文件
Comment[zh_HK]=C++ 標頭檔
Comment[zh_TW]=C++ 標頭檔
Comment[zu]=Ifayela Lenhloko le-C++
-Icon=source_h
+Icon=text-x-text-x-hsrc
Type=MimeType
MimeType=text/x-c++hdr
Patterns=*.hh;*.hpp;*.H;
diff --git a/mimetypes/text/x-c++src.desktop b/mimetypes/text/x-c++src.desktop
index b65fa6f4..f83d2cf8 100644
--- a/mimetypes/text/x-c++src.desktop
+++ b/mimetypes/text/x-c++src.desktop
@@ -81,7 +81,7 @@ Comment[zh_CN]=C++ 源文件
Comment[zh_HK]=C++ 源代碼
Comment[zh_TW]=C++ 原始檔
Comment[zu]=Ifayela Lemvelaphi le-C++
-Icon=source_cpp
+Icon=text-x-text-x-csrcpp
Type=MimeType
MimeType=text/x-c++src
Patterns=*.cpp;*.cxx;*.cc;*.C;*.CPP;
diff --git a/mimetypes/text/x-chdr.desktop b/mimetypes/text/x-chdr.desktop
index dc507449..dcbda09e 100644
--- a/mimetypes/text/x-chdr.desktop
+++ b/mimetypes/text/x-chdr.desktop
@@ -81,7 +81,7 @@ Comment[zh_CN]=C 头文件
Comment[zh_HK]=C 標頭檔
Comment[zh_TW]=C 標頭檔
Comment[zu]=Ifayela Lenhloko le-C
-Icon=source_h
+Icon=text-x-text-x-hsrc
Type=MimeType
MimeType=text/x-chdr
Patterns=*.h;
diff --git a/mimetypes/text/x-csrc.desktop b/mimetypes/text/x-csrc.desktop
index 00c6edc3..d30cc060 100644
--- a/mimetypes/text/x-csrc.desktop
+++ b/mimetypes/text/x-csrc.desktop
@@ -81,7 +81,7 @@ Comment[zh_CN]=C 源文件
Comment[zh_HK]=C 源代碼
Comment[zh_TW]=C 原始程式
Comment[zu]=Ifayela Lemvelaphi le-C
-Icon=source_c
+Icon=text-x-text-x-csrc
Type=MimeType
MimeType=text/x-csrc
Patterns=*.c;
diff --git a/mimetypes/text/x-csv.desktop b/mimetypes/text/x-csv.desktop
index ad85c3dc..3e748890 100644
--- a/mimetypes/text/x-csv.desktop
+++ b/mimetypes/text/x-csv.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=txt
+Icon=text-plain
Type=MimeType
MimeType=text/x-csv
Patterns=*.csv;*.CSV;
diff --git a/mimetypes/text/x-diff.desktop b/mimetypes/text/x-diff.desktop
index 97997f53..531a070a 100644
--- a/mimetypes/text/x-diff.desktop
+++ b/mimetypes/text/x-diff.desktop
@@ -81,7 +81,7 @@ Comment[zh_CN]=文件的差异
Comment[zh_HK]=檔案間的差異
Comment[zh_TW]=在檔案間的差異
Comment[zu]=Amafayela phakathi komehluko
-Icon=txt
+Icon=text-plain
Type=MimeType
Patterns=*.dif;*.diff;*.patch
X-TDE-IsAlso=text/plain
diff --git a/mimetypes/text/x-hex.desktop b/mimetypes/text/x-hex.desktop
index 6afcc90f..af6b798c 100644
--- a/mimetypes/text/x-hex.desktop
+++ b/mimetypes/text/x-hex.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Icon=source
+Icon=text-x-text-x-src
Type=MimeType
MimeType=text/x-hex
X-TDE-IsAlso=text/plain
diff --git a/mimetypes/text/x-java.desktop b/mimetypes/text/x-java.desktop
index 4ce507a2..0a0233b1 100644
--- a/mimetypes/text/x-java.desktop
+++ b/mimetypes/text/x-java.desktop
@@ -80,7 +80,7 @@ Comment[zh_CN]=Java 源文件
Comment[zh_HK]=Java 源代碼
Comment[zh_TW]=Java 原始程式
Comment[zu]=Ifayela Lemvelaphi ye-Java
-Icon=source_java
+Icon=text-x-text-x-java
Type=MimeType
MimeType=text/x-java
Patterns=*.java;
diff --git a/mimetypes/text/x-katefilelist.desktop b/mimetypes/text/x-katefilelist.desktop
index b83bb161..cbab921d 100644
--- a/mimetypes/text/x-katefilelist.desktop
+++ b/mimetypes/text/x-katefilelist.desktop
@@ -77,7 +77,7 @@ Comment[zh_CN]=文件列表(用于 Kate 文件列表装入器插件)
Comment[zh_HK]=檔案清單 (供 Kate 檔案清單載入器)
Comment[zh_TW]=檔案清單 (供 Kate 檔案清單載入器)
Comment[zu]=Uhlu Lwamafayela (Ukungena ngaphakathi Komlayishi Kwefayela Lohlu)
-Icon=unknown
+Icon=text-x-katefilelist
Type=MimeType
MimeType=text/x-katefilelist
Patterns=*.katefl;
diff --git a/mimetypes/text/x-latex.desktop b/mimetypes/text/x-latex.desktop
index e216da4d..f72a8bb8 100644
--- a/mimetypes/text/x-latex.desktop
+++ b/mimetypes/text/x-latex.desktop
@@ -76,7 +76,7 @@ Comment[wa]=Documint LaTeX
Comment[zh_CN]=LaTeX 文档
Comment[zh_HK]=LaTex 文件
Comment[zh_TW]=LaTex 文件
-Icon=tex
+Icon=text-x-tex
MimeType=text/x-latex
Patterns=*.latex;*.tex;
Type=MimeType
diff --git a/mimetypes/text/x-ldif.desktop b/mimetypes/text/x-ldif.desktop
index 8faf3f18..b5bd7196 100644
--- a/mimetypes/text/x-ldif.desktop
+++ b/mimetypes/text/x-ldif.desktop
@@ -76,7 +76,7 @@ Comment[wa]=Calpin d' adresses LDAP
Comment[zh_CN]=LDAP 地址簿
Comment[zh_HK]=LDAP 地址簿
Comment[zh_TW]=LDAP 地址簿
-Icon=vcard
+Icon=x-office-address-book
Type=MimeType
MimeType=text/x-ldif
Patterns=*.ldif;*.LDIF
diff --git a/mimetypes/text/x-log.desktop b/mimetypes/text/x-log.desktop
index b2764578..8b0bb419 100644
--- a/mimetypes/text/x-log.desktop
+++ b/mimetypes/text/x-log.desktop
@@ -82,7 +82,7 @@ Comment[zh_TW]=應用程式日誌檔案
Comment[zu]=Ifayela Lokungena Lomyaleli
Type=MimeType
Patterns=*.log;
-Icon=log
+Icon=text-x-text-x-log
X-TDE-IsAlso=text/plain
[Property::X-TDE-text]
diff --git a/mimetypes/text/x-makefile.desktop b/mimetypes/text/x-makefile.desktop
index 01601757..05fbeea7 100644
--- a/mimetypes/text/x-makefile.desktop
+++ b/mimetypes/text/x-makefile.desktop
@@ -34,7 +34,7 @@ Comment[xh]=Yenza ifayile
Comment[zu]=Yenza ifayela
Type=MimeType
Patterns=GNUmakefile;Makefile;makefile;Makefile.*;makefile.*
-Icon=make
+Icon=text-x-text-x-makefile
X-TDE-IsAlso=text/plain
[Property::X-TDE-text]
diff --git a/mimetypes/text/x-moc.desktop b/mimetypes/text/x-moc.desktop
index e83b0f83..a3f40d0e 100644
--- a/mimetypes/text/x-moc.desktop
+++ b/mimetypes/text/x-moc.desktop
@@ -81,7 +81,7 @@ Comment[zh_TW]=Qt Meta 目標文件
Comment[zu]=Ifayela Lento ye-Meta lwe-Qt
Type=MimeType
Patterns=*.moc;
-Icon=source_moc
+Icon=text-x-text-x-mocsrc
X-TDE-IsAlso=text/plain
[Property::X-TDE-text]
diff --git a/mimetypes/text/x-mswinurl.desktop b/mimetypes/text/x-mswinurl.desktop
index 8d6d436c..63b9bda2 100644
--- a/mimetypes/text/x-mswinurl.desktop
+++ b/mimetypes/text/x-mswinurl.desktop
@@ -2,7 +2,7 @@
Type=MimeType
MimeType=text/x-mswinurl
Patterns=*.url;*.URL;
-Icon=html
+Icon=text-x-text-html
Comment=Internet Shortcut
Comment[af]=Internet Kortpad
Comment[ar]=إختصار إنترنت
diff --git a/mimetypes/text/x-objchdr.desktop b/mimetypes/text/x-objchdr.desktop
index fd218ca5..459d43e5 100644
--- a/mimetypes/text/x-objchdr.desktop
+++ b/mimetypes/text/x-objchdr.desktop
@@ -66,7 +66,7 @@ Comment[vi]=Tập tin phần đầu Objective-C
Comment[zh_CN]=Objective-C 头文件
Comment[zh_HK]=Objective-C 標頭檔
Comment[zh_TW]=Objective-C 標頭檔
-Icon=source_h
+Icon=text-x-text-x-hsrc
Type=MimeType
MimeType=text/x-objchdr
#Patterns=*.h;
diff --git a/mimetypes/text/x-objcsrc.desktop b/mimetypes/text/x-objcsrc.desktop
index c63a83a5..469d6f90 100644
--- a/mimetypes/text/x-objcsrc.desktop
+++ b/mimetypes/text/x-objcsrc.desktop
@@ -80,7 +80,7 @@ Comment[zh_CN]=Objective-C 源文件
Comment[zh_HK]=Objective-C 源代碼
Comment[zh_TW]=Objective-C 原始碼
Comment[zu]=Ifayela lemvelaphi Lenhloso ka-C
-Icon=source_c
+Icon=text-x-text-x-csrc
Type=MimeType
MimeType=text/x-objcsrc
Patterns=*.m;
diff --git a/mimetypes/text/x-pascal.desktop b/mimetypes/text/x-pascal.desktop
index 862144df..0e86d709 100644
--- a/mimetypes/text/x-pascal.desktop
+++ b/mimetypes/text/x-pascal.desktop
@@ -80,7 +80,7 @@ Comment[zh_CN]=Pascal 源文件
Comment[zh_HK]=Pascal 源代碼
Comment[zh_TW]=Pascal 源碼
Comment[zu]=Ifayela Lemvelaphi ye-Pascal
-Icon=source_p
+Icon=text-x-text-x-src_p
Type=MimeType
MimeType=text/x-pascal
Patterns=*.p;*.pas;*.pp;*.dpr;*.DPR;*.PP;*.PAS;*.P
diff --git a/mimetypes/text/x-perl.desktop b/mimetypes/text/x-perl.desktop
index 3d0bc3ea..479f31df 100644
--- a/mimetypes/text/x-perl.desktop
+++ b/mimetypes/text/x-perl.desktop
@@ -69,7 +69,7 @@ Comment[vi]=Chương trình Perl
Comment[zh_CN]=Perl 程序
Comment[zh_HK]=Perl 程式
Comment[zh_TW]=PERL 程式
-Icon=source_pl
+Icon=text-x-text-x-perl
Type=MimeType
MimeType=text/x-perl
Patterns=*.pl;*.PL;*.perl;*.PERL;*.Perl
diff --git a/mimetypes/text/x-python.desktop b/mimetypes/text/x-python.desktop
index fd301784..443f0053 100644
--- a/mimetypes/text/x-python.desktop
+++ b/mimetypes/text/x-python.desktop
@@ -83,7 +83,7 @@ Comment[zh_TW]=Python 程式
Comment[zu]=Uhlelo lwamafayela lwe-Python
Type=MimeType
MimeType=text/x-python
-Icon=source_py
+Icon=text-x-text-x-src_py
# alias of application/x-python
X-TDE-IsAlso=application/x-python
diff --git a/mimetypes/text/x-shellscript.desktop b/mimetypes/text/x-shellscript.desktop
index 06ad24fa..1e791477 100644
--- a/mimetypes/text/x-shellscript.desktop
+++ b/mimetypes/text/x-shellscript.desktop
@@ -80,7 +80,7 @@ Comment[zh_CN]=Shell 脚本
Comment[zh_HK]=Shell 程式
Comment[zh_TW]=Shell 程式
Comment[zu]=Isikripti Segobolondo
-Icon=shellscript
+Icon=text-x-text-x-script
Type=MimeType
MimeType=text/x-shellscript
Patterns=*.sh;*.csh
diff --git a/mimetypes/text/x-tcl.desktop b/mimetypes/text/x-tcl.desktop
index cac61159..8aaf247b 100644
--- a/mimetypes/text/x-tcl.desktop
+++ b/mimetypes/text/x-tcl.desktop
@@ -85,7 +85,7 @@ Comment[zu]=Ifayela le-Tcl
Type=MimeType
MimeType=text/x-tcl
Patterns=*.tcl;*.tk;
-Icon=source
+Icon=text-x-text-x-src
X-TDE-IsAlso=text/plain
[Property::X-TDE-text]
diff --git a/mimetypes/text/x-tex.desktop b/mimetypes/text/x-tex.desktop
index 49b99f73..181a3794 100644
--- a/mimetypes/text/x-tex.desktop
+++ b/mimetypes/text/x-tex.desktop
@@ -82,7 +82,7 @@ Comment[zh_CN]=TeX 文件
Comment[zh_HK]=TeX 檔案
Comment[zh_TW]=TeX 檔案
Comment[zu]=Ifayela le-TeX
-Icon=tex
+Icon=text-x-tex
Type=MimeType
MimeType=text/x-tex
Patterns=*.tex;*.ltx;*.sty;*.cls;*.TEX;*.LTX;*.STY;*.CLS;
diff --git a/mimetypes/text/x-vcalendar.desktop b/mimetypes/text/x-vcalendar.desktop
index 486bca3a..ce076cd5 100644
--- a/mimetypes/text/x-vcalendar.desktop
+++ b/mimetypes/text/x-vcalendar.desktop
@@ -79,7 +79,7 @@ Comment[zh_CN]=vCalendar 交换文件
Comment[zh_HK]=vCalendar 交換檔
Comment[zh_TW]=vCalendar 交換檔案
Comment[zu]=Ifayela Elinokushintsha ngaphakathi le-vCalendar
-Icon=vcalendar
+Icon=x-office-calendar
Type=MimeType
MimeType=text/x-vcalendar
Patterns=*.vcs
diff --git a/mimetypes/text/x-vcard.desktop b/mimetypes/text/x-vcard.desktop
index d6dd97c3..7690c7db 100644
--- a/mimetypes/text/x-vcard.desktop
+++ b/mimetypes/text/x-vcard.desktop
@@ -82,7 +82,7 @@ Comment[zh_CN]=电子商业卡片
Comment[zh_HK]=電子商業卡片
Comment[zh_TW]=電子商業卡片
Comment[zu]= Ikhadi Lebhizinisi Likagesi
-Icon=vcard
+Icon=x-office-address-book
Type=MimeType
MimeType=text/x-vcard
Patterns=*.vct;*.vcf;*.VCT;*.VCF
diff --git a/mimetypes/text/x-xslfo.desktop b/mimetypes/text/x-xslfo.desktop
index dda51763..3118c1ed 100644
--- a/mimetypes/text/x-xslfo.desktop
+++ b/mimetypes/text/x-xslfo.desktop
@@ -78,7 +78,7 @@ Comment[zh_CN]=XSL 格式对象文件
Comment[zh_HK]=XSL 格式物件檔案
Comment[zh_TW]=XSL 格式物件檔案
Comment[zu]=Ifayela Lokubonisa Lesakhiwo se-XSL
-Icon=html
+Icon=text-x-text-html
MimeType=text/x-xslfo
Patterns=*.fo;*.xslfo
Type=MimeType
diff --git a/mimetypes/text/x-xslt.desktop b/mimetypes/text/x-xslt.desktop
index f8c610a9..3f68df71 100644
--- a/mimetypes/text/x-xslt.desktop
+++ b/mimetypes/text/x-xslt.desktop
@@ -80,7 +80,7 @@ Comment[zh_CN]=XSLT 样式表文件
Comment[zh_HK]=XSLT 樣式表格檔案
Comment[zh_TW]=XSLT 樣式表格檔案
Comment[zu]=Ifayela Lepheshana lesitayela lika-XSLT
-Icon=html
+Icon=text-x-text-html
MimeType=text/x-xslt
X-TDE-IsAlso=text/xml
Patterns=*.xslt;*.xsl;
diff --git a/mimetypes/text/xml.desktop b/mimetypes/text/xml.desktop
index 1ac73bee..c64f3cf3 100644
--- a/mimetypes/text/xml.desktop
+++ b/mimetypes/text/xml.desktop
@@ -76,7 +76,7 @@ Comment[wa]=Documint XML
Comment[zh_CN]=XML 文档
Comment[zh_HK]=XML 文件
Comment[zh_TW]=XML 文件
-Icon=html
+Icon=text-x-text-html
Type=MimeType
MimeType=text/xml
Patterns=*.xml;*.XML;
diff --git a/mimetypes/uri/mms.desktop b/mimetypes/uri/mms.desktop
index 1b75c40b..8ecb65b0 100644
--- a/mimetypes/uri/mms.desktop
+++ b/mimetypes/uri/mms.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=uri/mms
-Icon=video
+Icon=video-x-generic
Comment=mms: URIs
Comment[be]=mms: URI
Comment[br]=URIoù mms:
diff --git a/mimetypes/uri/mmst.desktop b/mimetypes/uri/mmst.desktop
index 259bfc4a..d0da1dc1 100644
--- a/mimetypes/uri/mmst.desktop
+++ b/mimetypes/uri/mmst.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=uri/mmst
-Icon=video
+Icon=video-x-generic
Comment=mmst: URIs
Comment[be]=mmst: URI
Comment[br]=URIoù mmst:
diff --git a/mimetypes/uri/mmsu.desktop b/mimetypes/uri/mmsu.desktop
index e5528966..01fe63eb 100644
--- a/mimetypes/uri/mmsu.desktop
+++ b/mimetypes/uri/mmsu.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=uri/mmsu
-Icon=video
+Icon=video-x-generic
Comment=mmsu: URIs
Comment[be]=mmsu: URI
Comment[br]=URIoù mmsu:
diff --git a/mimetypes/uri/pnm.desktop b/mimetypes/uri/pnm.desktop
index fa452c7d..2754f6f9 100644
--- a/mimetypes/uri/pnm.desktop
+++ b/mimetypes/uri/pnm.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=uri/pnm
-Icon=video
+Icon=video-x-generic
Comment=pnm: URIs
Comment[be]=pnm: URI
Comment[br]=URIoù pnm:
diff --git a/mimetypes/uri/rtspt.desktop b/mimetypes/uri/rtspt.desktop
index eab0a15e..ca6388de 100644
--- a/mimetypes/uri/rtspt.desktop
+++ b/mimetypes/uri/rtspt.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=uri/rtspt
-Icon=video
+Icon=video-x-generic
Comment=rtspt: URIs
Comment[be]=rtspt: URI
Comment[br]=URIoù rtspt:
diff --git a/mimetypes/uri/rtspu.desktop b/mimetypes/uri/rtspu.desktop
index 71892aa2..79de9dc1 100644
--- a/mimetypes/uri/rtspu.desktop
+++ b/mimetypes/uri/rtspu.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=uri/rtspu
-Icon=video
+Icon=video-x-generic
Comment=rtspu: URIs
Comment[be]=rtspu: URI
Comment[br]=URIoù rtspu:
diff --git a/mimetypes/video/avi.desktop b/mimetypes/video/avi.desktop
index 7791a928..e7616752 100644
--- a/mimetypes/video/avi.desktop
+++ b/mimetypes/video/avi.desktop
@@ -2,7 +2,7 @@
[Desktop Entry]
Type=MimeType
MimeType=video/avi
-Icon=video
+Icon=video-x-generic
X-TDE-IsAlso=video/x-msvideo
Comment=Microsoft AVI Video
Comment[af]=Microsoft Avi Video
diff --git a/mimetypes/video/mp4.desktop b/mimetypes/video/mp4.desktop
index 47540055..09981c10 100644
--- a/mimetypes/video/mp4.desktop
+++ b/mimetypes/video/mp4.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=video/mp4
-Icon=video
+Icon=video-x-generic
Patterns=*.mp4;*.MP4;*.m4v;*.M4V;
Comment=MPEG-4 Video
Comment[ar]=ملف مرئي MPEG-4
diff --git a/mimetypes/video/mpeg.desktop b/mimetypes/video/mpeg.desktop
index 92a86cc1..b5c490ff 100644
--- a/mimetypes/video/mpeg.desktop
+++ b/mimetypes/video/mpeg.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=video/mpeg
-Icon=video
+Icon=video-x-generic
Patterns=*.mpeg;*.mpg;*.MPEG;*.MPG;
Comment=MPEG Video
Comment[af]=Mpeg Video
diff --git a/mimetypes/video/quicktime.desktop b/mimetypes/video/quicktime.desktop
index 380fd4cb..4c2991bc 100644
--- a/mimetypes/video/quicktime.desktop
+++ b/mimetypes/video/quicktime.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=video/quicktime
-Icon=video
+Icon=video-x-generic
Patterns=*.qt;*.mov;*.moov;*.qtvr;*.QT;*.MOV;*.MOOV;*.MooV;*.QTVR;
Comment=Quicktime Video
Comment[ar]=ملف مرئي Quicktime
diff --git a/mimetypes/video/vnd.rn-realvideo.desktop b/mimetypes/video/vnd.rn-realvideo.desktop
index 21b63e61..d45a2576 100644
--- a/mimetypes/video/vnd.rn-realvideo.desktop
+++ b/mimetypes/video/vnd.rn-realvideo.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=video/vnd.rn-realvideo
-Icon=video
+Icon=video-x-generic
Patterns=*.rv;*.RV;
Comment=RealVideo File
Comment[af]=RealVideo Lêer
diff --git a/mimetypes/video/x-flic.desktop b/mimetypes/video/x-flic.desktop
index b6613d7e..0b569ee2 100644
--- a/mimetypes/video/x-flic.desktop
+++ b/mimetypes/video/x-flic.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=video/x-flic
-Icon=video
+Icon=video-x-generic
Patterns=*.fli;*.flc;*.FLI;*.FLC;
Comment=Autodesk's FLIC File
Comment[af]=Autodesk se FLIC Lêer
diff --git a/mimetypes/video/x-flv.desktop b/mimetypes/video/x-flv.desktop
index bfe0c225..ad1af5c0 100644
--- a/mimetypes/video/x-flv.desktop
+++ b/mimetypes/video/x-flv.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=video/x-flv
-Icon=video
+Icon=video-x-generic
Comment=Flash Video
Comment[ar]=ملف فيديو Flash
Comment[be]=Відэафайл Flash
diff --git a/mimetypes/video/x-matroska.desktop b/mimetypes/video/x-matroska.desktop
index 28681a49..9d768299 100644
--- a/mimetypes/video/x-matroska.desktop
+++ b/mimetypes/video/x-matroska.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=video/x-matroska
-Icon=video
+Icon=video-x-generic
Patterns=*.mkv;*.MKV;
Comment=Matroska Video
Comment[ar]=مرئي Matroska
diff --git a/mimetypes/video/x-mng.desktop b/mimetypes/video/x-mng.desktop
index b889e85e..6bfcb9ab 100644
--- a/mimetypes/video/x-mng.desktop
+++ b/mimetypes/video/x-mng.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=video/x-mng
-Icon=image
+Icon=image-x-generic
Patterns=*.mng;*.MNG;
Comment=MNG Image
Comment[af]=Mng Beeld
diff --git a/mimetypes/video/x-ms-asf.desktop b/mimetypes/video/x-ms-asf.desktop
index cefbd03c..a26c17df 100644
--- a/mimetypes/video/x-ms-asf.desktop
+++ b/mimetypes/video/x-ms-asf.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=video/x-ms-asf
-Icon=video
+Icon=video-x-generic
Patterns=*.asf;*.ASF;*.asx;*.ASX
X-TDE-IsAlso=application/vnd.ms-asf
Comment=ASF Media
diff --git a/mimetypes/video/x-ms-wmv.desktop b/mimetypes/video/x-ms-wmv.desktop
index 14decec4..4c6b395f 100644
--- a/mimetypes/video/x-ms-wmv.desktop
+++ b/mimetypes/video/x-ms-wmv.desktop
@@ -72,7 +72,7 @@ Comment[zh_CN]=Windows Media 视频
Comment[zh_HK]=Windows Media 視像檔
Comment[zh_TW]=WIndows Media 視頻檔案
Hidden=false
-Icon=video
+Icon=video-x-generic
MimeType=video/x-ms-wmv
Patterns=*.wmv
Type=MimeType
diff --git a/mimetypes/video/x-msvideo.desktop b/mimetypes/video/x-msvideo.desktop
index 26e4e640..63c141c9 100644
--- a/mimetypes/video/x-msvideo.desktop
+++ b/mimetypes/video/x-msvideo.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=video/x-msvideo
-Icon=video
+Icon=video-x-generic
Patterns=*.avi;*.AVI;
Comment=Microsoft AVI Video
Comment[af]=Microsoft Avi Video
diff --git a/mimetypes/video/x-ogm.desktop b/mimetypes/video/x-ogm.desktop
index 31407fd1..4f69fbc4 100644
--- a/mimetypes/video/x-ogm.desktop
+++ b/mimetypes/video/x-ogm.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=video/x-ogm
-Icon=video
+Icon=video-x-generic
Patterns=*.ogm;*.OGM;
X-TDE-IsAlso=application/ogg
Comment=Ogg/Ogm Video
diff --git a/mimetypes/video/x-theora.desktop b/mimetypes/video/x-theora.desktop
index a9abaa0e..0ed651c9 100644
--- a/mimetypes/video/x-theora.desktop
+++ b/mimetypes/video/x-theora.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=MimeType
MimeType=video/x-theora
-Icon=video
+Icon=video-x-generic
X-TDE-IsAlso=application/ogg
Comment=Theora Video
Comment[ar]=ملف فيديو Theora