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

832 files changed, 331 insertions, 331 deletions

diff --git a/mimetypes/application/fits.desktop b/mimetypes/application/fits.desktop
index 9482399ef..d2f2438d4 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 893d3b76c..369054e70 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 49b6f05bd..71ceb6710 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 36f670411..364dd6913 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 2d9754e0f..eaae307fc 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 ea7da89b5..fe860f04e 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 a601ebdf2..92ceef713 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 426d1c0ae..859a4e87d 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 035bea515..e8dd58899 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 ea27f4fb1..733945cf4 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 9d9b439a6..3df8f41c6 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 e36d12c54..e4b697187 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 b8a81a084..1ab4c673f 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 b9bd4bd97..eef31b6ba 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 0f4158bb0..1920b5e1d 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 05d4f49ec..d53aa30f6 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 016ddfae6..c23d706ba 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 5c5980f6b..2c828801e 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 8a5a6b0e7..351347d34 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 c88d7039e..de0caa39f 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 8f2928ef9..b30854f62 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 4f8d7c13d..ad19ab4ea 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 9846fc7df..b5246668e 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 3a9f985c5..5a155efbb 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 42f229b17..a0ce56257 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 bade66346..f08dbbe78 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 aa2d3288b..15b4b4597 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 3b96a90a4..8ade2e064 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 fe649b326..77d488a79 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 688df4437..f33d81358 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 ca2b73419..c6207fe79 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 4c288c046..75331945e 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 2243e8116..73f1b27e5 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 cd587e7ff..76023fd89 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 b5945eade..3c4fd7fd6 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 3bde78c6b..d90461379 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 accebd7cb..50e50e09c 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 dac92f914..8da86c8ac 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 72e24aa5e..ec19316dc 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 4e9905e31..0f26e60f7 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 7caaf23f3..e0dd41cdb 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 42a006035..27e3bbc88 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 020158162..c6bbfbc1f 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 caa220b40..ff1c2aacb 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 569d11874..a4b0b9570 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 9f67583b7..121e5d3f1 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 019ca483f..0b7caae17 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 ee4209074..37ceb3e92 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 329eff2c9..6142da98d 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 c0912b736..546db940e 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 e566b8303..692d852fc 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 329a2d83d..ee0254cf5 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 885e0ffb2..ba112d2e1 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 8d9f7a7f8..8e8b85005 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 6683f8306..76fff1994 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 2af2233a2..e53b398be 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 0237eb0e4..393e09cd8 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 6ecf3882d..d4e501308 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 cff0e3ee4..093f24af7 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 8b521da28..50457948e 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 22cda810e..4efdf3ec0 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 9a5481bf1..5bb53750b 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 ddf66a9e9..0ec254730 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 0a65f5748..ec4961dbd 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 59c3e6914..d9279fdb6 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 4be5bb720..70ab9e641 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 bda1df0be..5bfb2e752 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 a6e87498f..dad16b4b4 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 44392222e..a13df9395 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 768235a4b..9d0c7980b 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 a437378df..4df9160a5 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 4e4ae1ae1..51a0428da 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 a2c69bbf3..cf7c2d37e 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 29fd1fc49..c8ef2bbff 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 c44f2b427..706fb7119 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 6e8f82786..d7a3e4392 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 1d72badca..c7efb2f55 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 fe6949e77..c964b508f 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 7d0c033bb..b3b826cf7 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 f73ec57b4..a57caadc9 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 3d87e9494..196196390 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 7978f26e8..f77fbd15b 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 07a9afcf0..d0f0c0b8e 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 5ab0d51c3..43a44acff 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 e15f2047b..cc0b1308d 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 dd0efb20a..5c456ea98 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 3fd459c2e..5071c66be 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 9f062e553..c204ab7c0 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 98539f4ec..9656cb6d8 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 f0191aeae..5683df120 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 affc5194f..521eaca25 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 76871e4c5..20fa3f1c4 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 098d8eb71..8f5184b1e 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 1f687a046..c7453affc 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 f0bc65e5a..d8cad57b9 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 ef1d2422c..453ec4c42 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 7463d25d6..7ab68b39d 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 13e38a83d..dde217068 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 d0dc40162..90fb00d0b 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 1d0f19e70..3d187f483 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 7478096fa..ced562ca8 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 9881d206d..78bb4689c 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 2602f686f..ef0965749 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 f89b9120e..848b40280 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 8ba465f04..12820c489 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 ab6daab8f..5ba1335ae 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 2b6b2c770..35ae14804 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 b5767578e..70d040679 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 923cd46c8..ff595f258 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 e1bc37717..c8cdfb349 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 2c3213c11..dabfca358 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 81edad7e7..e113738ea 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 dee46ccac..f2c2a0e0d 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 a64b2dfe9..3879d6a48 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 9cb68b3b6..0eb6fed46 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 5632fd394..b03a052f5 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 dc31aeea7..3b2baa5c2 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 ba4320075..95324539e 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 e616394d0..c4e92fd07 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 accffda6f..fbf963c43 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 f9d304e66..3c29c808d 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 cf3975699..7ef4cb19f 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 6e5d91373..0137d1aaf 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 9d2745124..d185032fe 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 95ac8fbbe..d3fa6d8ab 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 d5f1a80fe..ffcc60bab 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 8c43a91c8..2a916aaf1 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 93f8bb42b..4be04b60a 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 d2cdb6855..7e299ff5c 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 98992d0c7..4b4a8e926 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 0f1ca766b..8da350e0e 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 fa4ceeeb3..c090df8e1 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 01f30f5c6..88eed1c1a 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 14a0973e0..e48bb1860 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 8eb74969c..626e7879b 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 e9293dc63..d44cba274 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 9c33292e6..7351c4333 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 daaf1731a..a5435f65f 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 4548d5df9..7575d562b 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 e96d9af3c..9a3cbbc5e 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 111276155..d02c1be65 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 35d94a030..b25d42aa5 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 fc52f16f5..699544056 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 b7204979b..91a6c1372 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 6c574cf9a..ef6e99a69 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 cc6062578..3b2b4682f 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 ac06d5d18..1e6e6fc21 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 1c762b095..f926320e3 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 af4d76eb3..418be7fb7 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 cebe23cc8..4bf648e23 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 fd48d9cac..74bce7a5d 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 5954171f2..6c5435fce 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 eabd03f35..395d79cea 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 9b5207249..c212e1b77 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 7ec04c961..20ce18dd6 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 4908a42c1..b636c5328 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 f68968e05..fd0d2f55b 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 ec15c0282..892324690 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 cb7032cc2..853d444c3 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 5512b99b7..7c0b44325 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 e28f4923f..8a6afd63d 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 97681b7c8..d27eb741f 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 614139f99..5153f6ba1 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 45e2c0864..f3e7325c3 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 4c479cff1..20f1ccd3d 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 c742325fd..e07ef1a82 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 e2f635974..96d3f1c87 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 84a255c5b..4a4e0a758 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 b5894a4e7..6348f024f 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 408a7baa4..a2a7eafd9 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 4a02685f5..8906e2ef4 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 56b846088..afb079ef8 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 19c894b00..7d08671ea 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 fbaca82c4..b7010aa45 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 85971120e..0c43738c9 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 e81069dff..d8fda70c9 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 a288db500..7174fdb02 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 bb4c3097c..4efa03d2e 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 26565d89a..58a56501c 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 9dd1c8da0..dbb05585c 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 7d92ece12..9b4f57e34 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 1606b5476..f57222234 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 263dee9da..e221a53f8 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 97696f4d1..79a716d27 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 28c133f82..6199f7114 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 0992679de..01434969c 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 5410e51be..f9f6019f2 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 d00f990ee..e33dbb896 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 9b7d71dad..8a59a724c 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 7a7600d1b..4cbcaba49 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 2b09399ba..551e2d641 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 2cd0fa6ff..d6a7bf8d6 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 55d4dfa29..3f5ce3325 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 5275d9de1..7dfa9b6a0 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 75a372bf7..832d785e6 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 dae8044b3..136074064 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 adca74e67..8b8899929 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 ed13c7852..81c9d50c9 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 8c3809cfc..2ba3afe78 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 5db9061ca..1b7fe99e3 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 27f5d9ca3..490c296b8 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 719bfa1bd..01c02cf1f 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 76b3db59c..2cd269ac6 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 41b3c4431..bb18ef3f9 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 d7f74cc4a..3128c1f4d 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 937bb4c06..38f774db7 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 1d4f7e6f5..2db3b2029 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 7f72fbedb..9b8ddecef 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 d29e9a074..26b7f3918 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 c0fd57574..c4d2a8599 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 a9fcc0e9c..db883de63 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 c7559e346..3c6b62654 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 30dd91e85..fdf7e6da4 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 ab19ce978..e01ebbd59 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 887da3f16..8aa7fa509 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 d7a5824b5..f15f29b16 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 2e2860912..97d37deef 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 f42b0669e..c743dc60a 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 23c924d6c..f21ffc6e4 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 844ff892a..73e30e6ed 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 14aff6c2e..5cf37189e 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 3302b8d45..bab85af24 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 20edc3442..781fd178c 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 79b6b275d..65226ed59 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 dfa49a42f..73d7abf74 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 c623a59d2..b990a86da 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 49fbde8a4..274901078 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 79bce5ad3..deda7cd91 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 c745e6615..c3858a06a 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 2c795b7a7..8aaf0bd03 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 960ab3c93..27d496f6a 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 f36ca7589..f90b3b20f 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 436ba783b..1ae75e55c 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 11d23cbed..cdd488b49 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 0bbc47499..2a9a11a57 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 204eac098..ca234b16a 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 567c00fb7..9a38a1f7e 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 1788b3e32..63d3b07be 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 124490bd0..8b094bdfd 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 5d7ed7bd5..909d778aa 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 0bdc67efb..d0d5da6b5 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 9640e2e85..def1985aa 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 70d67b7c7..41f1bedde 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 8ba8b08bd..59fa3020f 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 c1f814a44..c59becb2c 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 ba98ce5c1..ed179e313 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 0195a422d..4188abd9d 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 f2ce09593..ebf6e2a83 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 0fab72f33..7b0c22140 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 1748502e8..234a5123c 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 4be6258ee..3ec971b54 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 f0b68f670..751f5f945 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 8fcec5d1a..62ad2d5c0 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 eddfa5fc2..8751bc3aa 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 aeb9d164a..98c778397 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 dd114f153..34ec0d673 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 63f6f5ecf..b3798025c 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 b65fa6f4e..f83d2cf81 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 dc5074499..dcbda09ef 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 00c6edc3e..d30cc060a 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 ad85c3dc4..3e748890c 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 97997f53f..531a070ad 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 6afcc90f7..af6b798ca 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 4ce507a2e..0a0233b1d 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 b83bb161e..cbab921d9 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 e216da4de..f72a8bb8e 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 8faf3f180..b5bd71962 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 b27645784..8b0bb4197 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 016017572..05fbeea79 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 e83b0f832..a3f40d0e8 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 8d6d436cd..63b9bda26 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 fd218ca5e..459d43e5f 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 c63a83a58..469d6f90d 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 862144dfb..0e86d7093 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 3d0bc3ea6..479f31df3 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 fd301784a..443f00535 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 06ad24fa8..1e7914777 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 cac61159c..8aaf247bb 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 49b99f73d..181a3794f 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 486bca3ab..ce076cd5c 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 d6dd97c3c..7690c7db9 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 dda517637..3118c1ed9 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 f8c610a99..3f68df71d 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 1ac73bee0..c64f3cf37 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 1b75c40bb..8ecb65b07 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 259bfc4af..d0da1dc1f 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 e55289660..01fe63ebc 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 fa452c7d3..2754f6f93 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 eab0a15e4..ca6388de3 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 71892aa2c..79de9dc17 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 7791a9280..e76167528 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 47540055d..09981c105 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 92a86cc1f..b5c490ffe 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 380fd4cb2..4c2991bc4 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 21b63e616..d45a2576e 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 b6613d7e5..0b569ee28 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 bfe0c225c..ad1af5c03 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 28681a496..9d768299f 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 b889e85e6..6bfcb9ab3 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 cefbd03c7..a26c17df9 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 14decec46..4c6b395f2 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 26e4e640e..63c141c98 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 31407fd1f..4f69fbc47 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 a9abaa0e0..0ed651c96 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
diff --git a/pics/crystalsvg/cr128-mime-netscape_doc.png b/pics/crystalsvg/cr128-mime-.png
index fbc99e16e..fbc99e16e 100644
--- a/pics/crystalsvg/cr128-mime-netscape_doc.png
+++ b/pics/crystalsvg/cr128-mime-.png
diff --git a/pics/crystalsvg/cr128-mime-binary.png b/pics/crystalsvg/cr128-mime-application-octet-stream.png
index e968365c6..e968365c6 100644
--- a/pics/crystalsvg/cr128-mime-binary.png
+++ b/pics/crystalsvg/cr128-mime-application-octet-stream.png
diff --git a/pics/crystalsvg/cr128-mime-pdf.png b/pics/crystalsvg/cr128-mime-application-pdf.png
index 351e02623..351e02623 100644
--- a/pics/crystalsvg/cr128-mime-pdf.png
+++ b/pics/crystalsvg/cr128-mime-application-pdf.png
diff --git a/pics/crystalsvg/cr128-mime-postscript.png b/pics/crystalsvg/cr128-mime-application-postscript.png
index 5b6dc35fa..5b6dc35fa 100644
--- a/pics/crystalsvg/cr128-mime-postscript.png
+++ b/pics/crystalsvg/cr128-mime-application-postscript.png
diff --git a/pics/crystalsvg/cr128-mime-database.png b/pics/crystalsvg/cr128-mime-application-vnd.oasis.opendocument.database.png
index 54a9f6484..54a9f6484 100644
--- a/pics/crystalsvg/cr128-mime-database.png
+++ b/pics/crystalsvg/cr128-mime-application-vnd.oasis.opendocument.database.png
diff --git a/pics/crystalsvg/cr128-mime-drawing.png b/pics/crystalsvg/cr128-mime-application-vnd.oasis.opendocument.graphics.png
index daebcc5d6..daebcc5d6 100644
--- a/pics/crystalsvg/cr128-mime-drawing.png
+++ b/pics/crystalsvg/cr128-mime-application-vnd.oasis.opendocument.graphics.png
diff --git a/pics/crystalsvg/cr128-mime-presentation.png b/pics/crystalsvg/cr128-mime-application-vnd.oasis.opendocument.presentation.png
index c66f732c9..c66f732c9 100644
--- a/pics/crystalsvg/cr128-mime-presentation.png
+++ b/pics/crystalsvg/cr128-mime-application-vnd.oasis.opendocument.presentation.png
diff --git a/pics/crystalsvg/cr128-mime-spreadsheet.png b/pics/crystalsvg/cr128-mime-application-vnd.oasis.opendocument.spreadsheet.png
index 7c1f455f0..7c1f455f0 100644
--- a/pics/crystalsvg/cr128-mime-spreadsheet.png
+++ b/pics/crystalsvg/cr128-mime-application-vnd.oasis.opendocument.spreadsheet.png
diff --git a/pics/crystalsvg/cr128-mime-wordprocessing.png b/pics/crystalsvg/cr128-mime-application-vnd.oasis.opendocument.text.png
index 975d96ec4..975d96ec4 100644
--- a/pics/crystalsvg/cr128-mime-wordprocessing.png
+++ b/pics/crystalsvg/cr128-mime-application-vnd.oasis.opendocument.text.png
diff --git a/pics/crystalsvg/cr128-mime-info.png b/pics/crystalsvg/cr128-mime-application-vnd.tde.info.png
index 0685f86af..0685f86af 100644
--- a/pics/crystalsvg/cr128-mime-info.png
+++ b/pics/crystalsvg/cr128-mime-application-vnd.tde.info.png
diff --git a/pics/crystalsvg/cr128-mime-misc.png b/pics/crystalsvg/cr128-mime-application-vnd.tde.misc.png
index 8555b15f3..8555b15f3 100644
--- a/pics/crystalsvg/cr128-mime-misc.png
+++ b/pics/crystalsvg/cr128-mime-application-vnd.tde.misc.png
diff --git a/pics/crystalsvg/cr128-mime-zip.png b/pics/crystalsvg/cr128-mime-application-vnd.tde.overlay.zip.png
index 1cb85cf59..1cb85cf59 100644
--- a/pics/crystalsvg/cr128-mime-zip.png
+++ b/pics/crystalsvg/cr128-mime-application-vnd.tde.overlay.zip.png
diff --git a/pics/crystalsvg/cr128-mime-resource.png b/pics/crystalsvg/cr128-mime-application-vnd.tde.resource.png
index 12727f16a..12727f16a 100644
--- a/pics/crystalsvg/cr128-mime-resource.png
+++ b/pics/crystalsvg/cr128-mime-application-vnd.tde.resource.png
diff --git a/pics/crystalsvg/cr128-mime-tdemultiple.png b/pics/crystalsvg/cr128-mime-application-vnd.tde.tdemultiple.png
index 9e822431c..9e822431c 100644
--- a/pics/crystalsvg/cr128-mime-tdemultiple.png
+++ b/pics/crystalsvg/cr128-mime-application-vnd.tde.tdemultiple.png
diff --git a/pics/crystalsvg/cr128-mime-template_source.png b/pics/crystalsvg/cr128-mime-application-vnd.tde.template_source.png
index 99ce52628..99ce52628 100644
--- a/pics/crystalsvg/cr128-mime-template_source.png
+++ b/pics/crystalsvg/cr128-mime-application-vnd.tde.template_source.png
diff --git a/pics/crystalsvg/cr128-mime-txt2.png b/pics/crystalsvg/cr128-mime-application-vnd.tde.text.alt.png
index 3004ab4fe..3004ab4fe 100644
--- a/pics/crystalsvg/cr128-mime-txt2.png
+++ b/pics/crystalsvg/cr128-mime-application-vnd.tde.text.alt.png
diff --git a/pics/crystalsvg/cr128-mime-applix.png b/pics/crystalsvg/cr128-mime-application-x-applix-word.png
index e7c3b8ede..e7c3b8ede 100644
--- a/pics/crystalsvg/cr128-mime-applix.png
+++ b/pics/crystalsvg/cr128-mime-application-x-applix-word.png
diff --git a/pics/crystalsvg/cr128-mime-bt.png b/pics/crystalsvg/cr128-mime-application-x-bittorrent.png
index 2e9937d5a..2e9937d5a 100644
--- a/pics/crystalsvg/cr128-mime-bt.png
+++ b/pics/crystalsvg/cr128-mime-application-x-bittorrent.png
diff --git a/pics/crystalsvg/cr128-mime-cdimage.png b/pics/crystalsvg/cr128-mime-application-x-cd-image.png
index 285c5403a..285c5403a 100644
--- a/pics/crystalsvg/cr128-mime-cdimage.png
+++ b/pics/crystalsvg/cr128-mime-application-x-cd-image.png
diff --git a/pics/crystalsvg/cr128-mime-cdtrack.png b/pics/crystalsvg/cr128-mime-application-x-cda.png
index fe83f1a2e..fe83f1a2e 100644
--- a/pics/crystalsvg/cr128-mime-cdtrack.png
+++ b/pics/crystalsvg/cr128-mime-application-x-cda.png
diff --git a/pics/crystalsvg/cr128-mime-cdr.png b/pics/crystalsvg/cr128-mime-application-x-cdr.png
index 956c7bd8e..956c7bd8e 100644
--- a/pics/crystalsvg/cr128-mime-cdr.png
+++ b/pics/crystalsvg/cr128-mime-application-x-cdr.png
diff --git a/pics/crystalsvg/cr128-mime-core.png b/pics/crystalsvg/cr128-mime-application-x-core.png
index 013e93d1f..013e93d1f 100644
--- a/pics/crystalsvg/cr128-mime-core.png
+++ b/pics/crystalsvg/cr128-mime-application-x-core.png
diff --git a/pics/crystalsvg/cr128-mime-deb.png b/pics/crystalsvg/cr128-mime-application-x-deb.png
index 50af44224..50af44224 100644
--- a/pics/crystalsvg/cr128-mime-deb.png
+++ b/pics/crystalsvg/cr128-mime-application-x-deb.png
diff --git a/pics/crystalsvg/cr128-mime-widget_doc.png b/pics/crystalsvg/cr128-mime-application-x-designer.png
index 955f0f3c2..955f0f3c2 100644
--- a/pics/crystalsvg/cr128-mime-widget_doc.png
+++ b/pics/crystalsvg/cr128-mime-application-x-designer.png
diff --git a/pics/crystalsvg/cr128-mime-font_bitmap.png b/pics/crystalsvg/cr128-mime-application-x-font-snf.png
index f158d1442..f158d1442 100644
--- a/pics/crystalsvg/cr128-mime-font_bitmap.png
+++ b/pics/crystalsvg/cr128-mime-application-x-font-snf.png
diff --git a/pics/crystalsvg/cr128-mime-font_truetype.png b/pics/crystalsvg/cr128-mime-application-x-font-ttf.png
index 264101056..264101056 100644
--- a/pics/crystalsvg/cr128-mime-font_truetype.png
+++ b/pics/crystalsvg/cr128-mime-application-x-font-ttf.png
diff --git a/pics/crystalsvg/cr128-mime-font_type1.png b/pics/crystalsvg/cr128-mime-application-x-font-type1.png
index ff72df155..ff72df155 100644
--- a/pics/crystalsvg/cr128-mime-font_type1.png
+++ b/pics/crystalsvg/cr128-mime-application-x-font-type1.png
diff --git a/pics/crystalsvg/cr128-mime-karbon_karbon.png b/pics/crystalsvg/cr128-mime-application-x-karbon.png
index 3dc426858..3dc426858 100644
--- a/pics/crystalsvg/cr128-mime-karbon_karbon.png
+++ b/pics/crystalsvg/cr128-mime-application-x-karbon.png
diff --git a/pics/crystalsvg/cr128-mime-colorscm.png b/pics/crystalsvg/cr128-mime-application-x-kcsrc.png
index a66c239fa..a66c239fa 100644
--- a/pics/crystalsvg/cr128-mime-colorscm.png
+++ b/pics/crystalsvg/cr128-mime-application-x-kcsrc.png
diff --git a/pics/crystalsvg/cr128-mime-kexi_kexi.png b/pics/crystalsvg/cr128-mime-application-x-kexi.png
index d545abe57..d545abe57 100644
--- a/pics/crystalsvg/cr128-mime-kexi_kexi.png
+++ b/pics/crystalsvg/cr128-mime-application-x-kexi.png
diff --git a/pics/crystalsvg/cr128-mime-krita_kra.png b/pics/crystalsvg/cr128-mime-application-x-krita.png
index 366841728..366841728 100644
--- a/pics/crystalsvg/cr128-mime-krita_kra.png
+++ b/pics/crystalsvg/cr128-mime-application-x-krita.png
diff --git a/pics/crystalsvg/cr128-mime-dvi.png b/pics/crystalsvg/cr128-mime-application-x-lyx.png
index bee5c3e4c..bee5c3e4c 100644
--- a/pics/crystalsvg/cr128-mime-dvi.png
+++ b/pics/crystalsvg/cr128-mime-application-x-lyx.png
diff --git a/pics/crystalsvg/cr128-mime-metafont.png b/pics/crystalsvg/cr128-mime-application-x-metafont.png
index 247cf32bd..247cf32bd 100644
--- a/pics/crystalsvg/cr128-mime-metafont.png
+++ b/pics/crystalsvg/cr128-mime-application-x-metafont.png
diff --git a/pics/crystalsvg/cr128-mime-exec_wine.png b/pics/crystalsvg/cr128-mime-application-x-mswinurl.png
index 66fab57f2..66fab57f2 100644
--- a/pics/crystalsvg/cr128-mime-exec_wine.png
+++ b/pics/crystalsvg/cr128-mime-application-x-mswinurl.png
diff --git a/pics/crystalsvg/cr128-mime-rpm.png b/pics/crystalsvg/cr128-mime-application-x-rpm.png
index 22d8ab19c..22d8ab19c 100644
--- a/pics/crystalsvg/cr128-mime-rpm.png
+++ b/pics/crystalsvg/cr128-mime-application-x-rpm.png
diff --git a/pics/crystalsvg/cr128-mime-soffice.png b/pics/crystalsvg/cr128-mime-application-x-soffice.png
index 46d932831..46d932831 100644
--- a/pics/crystalsvg/cr128-mime-soffice.png
+++ b/pics/crystalsvg/cr128-mime-application-x-soffice.png
diff --git a/pics/crystalsvg/cr128-mime-tar.png b/pics/crystalsvg/cr128-mime-application-x-tar.png
index 91f24d19f..91f24d19f 100644
--- a/pics/crystalsvg/cr128-mime-tar.png
+++ b/pics/crystalsvg/cr128-mime-application-x-tar.png
diff --git a/pics/crystalsvg/cr128-mime-tgz.png b/pics/crystalsvg/cr128-mime-application-x-tarz.png
index cfde6ee03..cfde6ee03 100644
--- a/pics/crystalsvg/cr128-mime-tgz.png
+++ b/pics/crystalsvg/cr128-mime-application-x-tarz.png
diff --git a/pics/crystalsvg/cr128-mime-gf.png b/pics/crystalsvg/cr128-mime-application-x-tex-gf.png
index dfed8f731..dfed8f731 100644
--- a/pics/crystalsvg/cr128-mime-gf.png
+++ b/pics/crystalsvg/cr128-mime-application-x-tex-gf.png
diff --git a/pics/crystalsvg/cr128-mime-pk.png b/pics/crystalsvg/cr128-mime-application-x-tex-pk.png
index 4b50e99d1..4b50e99d1 100644
--- a/pics/crystalsvg/cr128-mime-pk.png
+++ b/pics/crystalsvg/cr128-mime-application-x-tex-pk.png
diff --git a/pics/crystalsvg/cr128-mime-recycled.png b/pics/crystalsvg/cr128-mime-application-x-trash.png
index 93ce4b177..93ce4b177 100644
--- a/pics/crystalsvg/cr128-mime-recycled.png
+++ b/pics/crystalsvg/cr128-mime-application-x-trash.png
diff --git a/pics/crystalsvg/cr128-mime-man.png b/pics/crystalsvg/cr128-mime-application-x-troff-man.png
index fdf37cc10..fdf37cc10 100644
--- a/pics/crystalsvg/cr128-mime-man.png
+++ b/pics/crystalsvg/cr128-mime-application-x-troff-man.png
diff --git a/pics/crystalsvg/cr128-mime-empty.png b/pics/crystalsvg/cr128-mime-application-x-zerosize.png
index f6e177a35..f6e177a35 100644
--- a/pics/crystalsvg/cr128-mime-empty.png
+++ b/pics/crystalsvg/cr128-mime-application-x-zerosize.png
diff --git a/pics/crystalsvg/cr128-mime-midi.png b/pics/crystalsvg/cr128-mime-audio-midi.png
index 40632f061..40632f061 100644
--- a/pics/crystalsvg/cr128-mime-midi.png
+++ b/pics/crystalsvg/cr128-mime-audio-midi.png
diff --git a/pics/crystalsvg/cr128-mime-sound.png b/pics/crystalsvg/cr128-mime-audio-x-generic.png
index dc4c177e8..dc4c177e8 100644
--- a/pics/crystalsvg/cr128-mime-sound.png
+++ b/pics/crystalsvg/cr128-mime-audio-x-generic.png
diff --git a/pics/crystalsvg/cr128-mime-font.png b/pics/crystalsvg/cr128-mime-font-x-generic.png
index 40f7baacd..40f7baacd 100644
--- a/pics/crystalsvg/cr128-mime-font.png
+++ b/pics/crystalsvg/cr128-mime-font-x-generic.png
diff --git a/pics/crystalsvg/cr128-mime-vectorgfx.png b/pics/crystalsvg/cr128-mime-image-svg+xml.png
index ccf5580a7..ccf5580a7 100644
--- a/pics/crystalsvg/cr128-mime-vectorgfx.png
+++ b/pics/crystalsvg/cr128-mime-image-svg+xml.png
diff --git a/pics/crystalsvg/cr128-mime-image.png b/pics/crystalsvg/cr128-mime-image-x-generic.png
index 3d2fc5d93..3d2fc5d93 100644
--- a/pics/crystalsvg/cr128-mime-image.png
+++ b/pics/crystalsvg/cr128-mime-image-x-generic.png
diff --git a/pics/crystalsvg/cr128-mime-html.png b/pics/crystalsvg/cr128-mime-text-html.png
index ab8334bf8..ab8334bf8 100644
--- a/pics/crystalsvg/cr128-mime-html.png
+++ b/pics/crystalsvg/cr128-mime-text-html.png
diff --git a/pics/crystalsvg/cr128-mime-txt.png b/pics/crystalsvg/cr128-mime-text-plain.png
index 5b52964a3..5b52964a3 100644
--- a/pics/crystalsvg/cr128-mime-txt.png
+++ b/pics/crystalsvg/cr128-mime-text-plain.png
diff --git a/pics/crystalsvg/cr128-mime-rtf.png b/pics/crystalsvg/cr128-mime-text-rtf.png
index fd77cc495..fd77cc495 100644
--- a/pics/crystalsvg/cr128-mime-rtf.png
+++ b/pics/crystalsvg/cr128-mime-text-rtf.png
diff --git a/pics/crystalsvg/cr128-mime-ascii.png b/pics/crystalsvg/cr128-mime-text-vnd.tde.ascii.png
index 59a764257..59a764257 100644
--- a/pics/crystalsvg/cr128-mime-ascii.png
+++ b/pics/crystalsvg/cr128-mime-text-vnd.tde.ascii.png
diff --git a/pics/crystalsvg/cr128-mime-source_s.png b/pics/crystalsvg/cr128-mime-text-x-asm.png
index 4dddfec8e..4dddfec8e 100644
--- a/pics/crystalsvg/cr128-mime-source_s.png
+++ b/pics/crystalsvg/cr128-mime-text-x-asm.png
diff --git a/pics/crystalsvg/cr128-mime-source_cpp.png b/pics/crystalsvg/cr128-mime-text-x-c++src.png
index 00d5426f7..00d5426f7 100644
--- a/pics/crystalsvg/cr128-mime-source_cpp.png
+++ b/pics/crystalsvg/cr128-mime-text-x-c++src.png
diff --git a/pics/crystalsvg/cr128-mime-source_c.png b/pics/crystalsvg/cr128-mime-text-x-csrc.png
index d978e7251..d978e7251 100644
--- a/pics/crystalsvg/cr128-mime-source_c.png
+++ b/pics/crystalsvg/cr128-mime-text-x-csrc.png
diff --git a/pics/crystalsvg/cr128-mime-source_f.png b/pics/crystalsvg/cr128-mime-text-x-fortran.png
index ee1c97415..ee1c97415 100644
--- a/pics/crystalsvg/cr128-mime-source_f.png
+++ b/pics/crystalsvg/cr128-mime-text-x-fortran.png
diff --git a/pics/crystalsvg/cr128-mime-document2.png b/pics/crystalsvg/cr128-mime-text-x-generic-template.png
index 840662327..840662327 100644
--- a/pics/crystalsvg/cr128-mime-document2.png
+++ b/pics/crystalsvg/cr128-mime-text-x-generic-template.png
diff --git a/pics/crystalsvg/cr128-mime-document.png b/pics/crystalsvg/cr128-mime-text-x-generic.png
index 970fe33d5..970fe33d5 100644
--- a/pics/crystalsvg/cr128-mime-document.png
+++ b/pics/crystalsvg/cr128-mime-text-x-generic.png
diff --git a/pics/crystalsvg/cr128-mime-source_h.png b/pics/crystalsvg/cr128-mime-text-x-hsrc.png
index d9094216c..d9094216c 100644
--- a/pics/crystalsvg/cr128-mime-source_h.png
+++ b/pics/crystalsvg/cr128-mime-text-x-hsrc.png
diff --git a/pics/crystalsvg/cr128-mime-source_java.png b/pics/crystalsvg/cr128-mime-text-x-java.png
index 3add2e2b7..3add2e2b7 100644
--- a/pics/crystalsvg/cr128-mime-source_java.png
+++ b/pics/crystalsvg/cr128-mime-text-x-java.png
diff --git a/pics/crystalsvg/cr128-mime-source_j.png b/pics/crystalsvg/cr128-mime-text-x-jsrc.png
index 9a8cda00c..9a8cda00c 100644
--- a/pics/crystalsvg/cr128-mime-source_j.png
+++ b/pics/crystalsvg/cr128-mime-text-x-jsrc.png
diff --git a/pics/crystalsvg/cr128-mime-unknown.png b/pics/crystalsvg/cr128-mime-text-x-katefilelist.png
index 431c18ed4..431c18ed4 100644
--- a/pics/crystalsvg/cr128-mime-unknown.png
+++ b/pics/crystalsvg/cr128-mime-text-x-katefilelist.png
diff --git a/pics/crystalsvg/cr128-mime-log.png b/pics/crystalsvg/cr128-mime-text-x-log.png
index c1347a3e5..c1347a3e5 100644
--- a/pics/crystalsvg/cr128-mime-log.png
+++ b/pics/crystalsvg/cr128-mime-text-x-log.png
diff --git a/pics/crystalsvg/cr128-mime-source_l.png b/pics/crystalsvg/cr128-mime-text-x-lsrc.png
index 20b5b7aac..20b5b7aac 100644
--- a/pics/crystalsvg/cr128-mime-source_l.png
+++ b/pics/crystalsvg/cr128-mime-text-x-lsrc.png
diff --git a/pics/crystalsvg/cr128-mime-make.png b/pics/crystalsvg/cr128-mime-text-x-makefile.png
index 759c0a1ac..759c0a1ac 100644
--- a/pics/crystalsvg/cr128-mime-make.png
+++ b/pics/crystalsvg/cr128-mime-text-x-makefile.png
diff --git a/pics/crystalsvg/cr128-mime-source_moc.png b/pics/crystalsvg/cr128-mime-text-x-mocsrc.png
index 3b8191d8d..3b8191d8d 100644
--- a/pics/crystalsvg/cr128-mime-source_moc.png
+++ b/pics/crystalsvg/cr128-mime-text-x-mocsrc.png
diff --git a/pics/crystalsvg/cr128-mime-source_o.png b/pics/crystalsvg/cr128-mime-text-x-osrc.png
index c55476ffb..c55476ffb 100644
--- a/pics/crystalsvg/cr128-mime-source_o.png
+++ b/pics/crystalsvg/cr128-mime-text-x-osrc.png
diff --git a/pics/crystalsvg/cr128-mime-source_pl.png b/pics/crystalsvg/cr128-mime-text-x-perl.png
index 118ac4133..118ac4133 100644
--- a/pics/crystalsvg/cr128-mime-source_pl.png
+++ b/pics/crystalsvg/cr128-mime-text-x-perl.png
diff --git a/pics/crystalsvg/cr128-mime-source_php.png b/pics/crystalsvg/cr128-mime-text-x-php.png
index 5830741bf..5830741bf 100644
--- a/pics/crystalsvg/cr128-mime-source_php.png
+++ b/pics/crystalsvg/cr128-mime-text-x-php.png
diff --git a/pics/crystalsvg/cr128-mime-source_p.png b/pics/crystalsvg/cr128-mime-text-x-psrc.png
index 90df5862a..90df5862a 100644
--- a/pics/crystalsvg/cr128-mime-source_p.png
+++ b/pics/crystalsvg/cr128-mime-text-x-psrc.png
diff --git a/pics/crystalsvg/cr128-mime-source_py.png b/pics/crystalsvg/cr128-mime-text-x-python.png
index 3351d36eb..3351d36eb 100644
--- a/pics/crystalsvg/cr128-mime-source_py.png
+++ b/pics/crystalsvg/cr128-mime-text-x-python.png
diff --git a/pics/crystalsvg/cr128-mime-readme.png b/pics/crystalsvg/cr128-mime-text-x-readme.png
index 2958b9053..2958b9053 100644
--- a/pics/crystalsvg/cr128-mime-readme.png
+++ b/pics/crystalsvg/cr128-mime-text-x-readme.png
diff --git a/pics/crystalsvg/cr128-mime-shellscript.png b/pics/crystalsvg/cr128-mime-text-x-script.png
index f0bde8f03..f0bde8f03 100644
--- a/pics/crystalsvg/cr128-mime-shellscript.png
+++ b/pics/crystalsvg/cr128-mime-text-x-script.png
diff --git a/pics/crystalsvg/cr128-mime-source.png b/pics/crystalsvg/cr128-mime-text-x-src.png
index 203b5cbb2..203b5cbb2 100644
--- a/pics/crystalsvg/cr128-mime-source.png
+++ b/pics/crystalsvg/cr128-mime-text-x-src.png
diff --git a/pics/crystalsvg/cr128-mime-tex.png b/pics/crystalsvg/cr128-mime-text-x-tex.png
index 537bb0dfe..537bb0dfe 100644
--- a/pics/crystalsvg/cr128-mime-tex.png
+++ b/pics/crystalsvg/cr128-mime-text-x-tex.png
diff --git a/pics/crystalsvg/cr128-mime-source_y.png b/pics/crystalsvg/cr128-mime-text-x-ysrc.png
index a8794a512..a8794a512 100644
--- a/pics/crystalsvg/cr128-mime-source_y.png
+++ b/pics/crystalsvg/cr128-mime-text-x-ysrc.png
diff --git a/pics/crystalsvg/cr128-mime-video.png b/pics/crystalsvg/cr128-mime-video-x-generic.png
index eea34177f..eea34177f 100644
--- a/pics/crystalsvg/cr128-mime-video.png
+++ b/pics/crystalsvg/cr128-mime-video-x-generic.png
diff --git a/pics/crystalsvg/cr128-mime-quicktime.png b/pics/crystalsvg/cr128-mime-video-x-quicktime.png
index 1863302f0..1863302f0 100644
--- a/pics/crystalsvg/cr128-mime-quicktime.png
+++ b/pics/crystalsvg/cr128-mime-video-x-quicktime.png
diff --git a/pics/crystalsvg/cr128-mime-vcard.png b/pics/crystalsvg/cr128-mime-x-office-address-book.png
index 51e4a088b..51e4a088b 100644
--- a/pics/crystalsvg/cr128-mime-vcard.png
+++ b/pics/crystalsvg/cr128-mime-x-office-address-book.png
diff --git a/pics/crystalsvg/cr128-mime-vcalendar.png b/pics/crystalsvg/cr128-mime-x-office-calendar.png
index 506836a28..506836a28 100644
--- a/pics/crystalsvg/cr128-mime-vcalendar.png
+++ b/pics/crystalsvg/cr128-mime-x-office-calendar.png
diff --git a/pics/crystalsvg/cr16-mime-netscape_doc.png b/pics/crystalsvg/cr16-mime-.png
index 384290bbb..384290bbb 100644
--- a/pics/crystalsvg/cr16-mime-netscape_doc.png
+++ b/pics/crystalsvg/cr16-mime-.png
diff --git a/pics/crystalsvg/cr16-mime-binary.png b/pics/crystalsvg/cr16-mime-application-octet-stream.png
index e23beb1fd..e23beb1fd 100644
--- a/pics/crystalsvg/cr16-mime-binary.png
+++ b/pics/crystalsvg/cr16-mime-application-octet-stream.png
diff --git a/pics/crystalsvg/cr16-mime-pdf.png b/pics/crystalsvg/cr16-mime-application-pdf.png
index 27faad6fc..27faad6fc 100644
--- a/pics/crystalsvg/cr16-mime-pdf.png
+++ b/pics/crystalsvg/cr16-mime-application-pdf.png
diff --git a/pics/crystalsvg/cr16-mime-postscript.png b/pics/crystalsvg/cr16-mime-application-postscript.png
index 06dbfa7b7..06dbfa7b7 100644
--- a/pics/crystalsvg/cr16-mime-postscript.png
+++ b/pics/crystalsvg/cr16-mime-application-postscript.png
diff --git a/pics/crystalsvg/cr16-mime-database.png b/pics/crystalsvg/cr16-mime-application-vnd.oasis.opendocument.database.png
index 94f36bbc2..94f36bbc2 100644
--- a/pics/crystalsvg/cr16-mime-database.png
+++ b/pics/crystalsvg/cr16-mime-application-vnd.oasis.opendocument.database.png
diff --git a/pics/crystalsvg/cr16-mime-drawing.png b/pics/crystalsvg/cr16-mime-application-vnd.oasis.opendocument.graphics.png
index acce3537b..acce3537b 100644
--- a/pics/crystalsvg/cr16-mime-drawing.png
+++ b/pics/crystalsvg/cr16-mime-application-vnd.oasis.opendocument.graphics.png
diff --git a/pics/crystalsvg/cr16-mime-presentation.png b/pics/crystalsvg/cr16-mime-application-vnd.oasis.opendocument.presentation.png
index f0abdec2a..f0abdec2a 100644
--- a/pics/crystalsvg/cr16-mime-presentation.png
+++ b/pics/crystalsvg/cr16-mime-application-vnd.oasis.opendocument.presentation.png
diff --git a/pics/crystalsvg/cr16-mime-spreadsheet.png b/pics/crystalsvg/cr16-mime-application-vnd.oasis.opendocument.spreadsheet.png
index 126f1c878..126f1c878 100644
--- a/pics/crystalsvg/cr16-mime-spreadsheet.png
+++ b/pics/crystalsvg/cr16-mime-application-vnd.oasis.opendocument.spreadsheet.png
diff --git a/pics/crystalsvg/cr16-mime-wordprocessing.png b/pics/crystalsvg/cr16-mime-application-vnd.oasis.opendocument.text.png
index 285830847..285830847 100644
--- a/pics/crystalsvg/cr16-mime-wordprocessing.png
+++ b/pics/crystalsvg/cr16-mime-application-vnd.oasis.opendocument.text.png
diff --git a/pics/crystalsvg/cr16-mime-info.png b/pics/crystalsvg/cr16-mime-application-vnd.tde.info.png
index 2ba3998d1..2ba3998d1 100644
--- a/pics/crystalsvg/cr16-mime-info.png
+++ b/pics/crystalsvg/cr16-mime-application-vnd.tde.info.png
diff --git a/pics/crystalsvg/cr16-mime-misc.png b/pics/crystalsvg/cr16-mime-application-vnd.tde.misc.png
index c0584aa18..c0584aa18 100644
--- a/pics/crystalsvg/cr16-mime-misc.png
+++ b/pics/crystalsvg/cr16-mime-application-vnd.tde.misc.png
diff --git a/pics/crystalsvg/cr16-mime-zip.png b/pics/crystalsvg/cr16-mime-application-vnd.tde.overlay.zip.png
index a5324db8a..a5324db8a 100644
--- a/pics/crystalsvg/cr16-mime-zip.png
+++ b/pics/crystalsvg/cr16-mime-application-vnd.tde.overlay.zip.png
diff --git a/pics/crystalsvg/cr16-mime-resource.png b/pics/crystalsvg/cr16-mime-application-vnd.tde.resource.png
index eda4dc1db..eda4dc1db 100644
--- a/pics/crystalsvg/cr16-mime-resource.png
+++ b/pics/crystalsvg/cr16-mime-application-vnd.tde.resource.png
diff --git a/pics/crystalsvg/cr16-mime-tdemultiple.png b/pics/crystalsvg/cr16-mime-application-vnd.tde.tdemultiple.png
index d19526823..d19526823 100644
--- a/pics/crystalsvg/cr16-mime-tdemultiple.png
+++ b/pics/crystalsvg/cr16-mime-application-vnd.tde.tdemultiple.png
diff --git a/pics/crystalsvg/cr16-mime-template_source.png b/pics/crystalsvg/cr16-mime-application-vnd.tde.template_source.png
index 4539b5542..4539b5542 100644
--- a/pics/crystalsvg/cr16-mime-template_source.png
+++ b/pics/crystalsvg/cr16-mime-application-vnd.tde.template_source.png
diff --git a/pics/crystalsvg/cr16-mime-txt2.png b/pics/crystalsvg/cr16-mime-application-vnd.tde.text.alt.png
index 9b401acd6..9b401acd6 100644
--- a/pics/crystalsvg/cr16-mime-txt2.png
+++ b/pics/crystalsvg/cr16-mime-application-vnd.tde.text.alt.png
diff --git a/pics/crystalsvg/cr16-mime-applix.png b/pics/crystalsvg/cr16-mime-application-x-applix-word.png
index d42384e8e..d42384e8e 100644
--- a/pics/crystalsvg/cr16-mime-applix.png
+++ b/pics/crystalsvg/cr16-mime-application-x-applix-word.png
diff --git a/pics/crystalsvg/cr16-mime-bt.png b/pics/crystalsvg/cr16-mime-application-x-bittorrent.png
index f88826326..f88826326 100644
--- a/pics/crystalsvg/cr16-mime-bt.png
+++ b/pics/crystalsvg/cr16-mime-application-x-bittorrent.png
diff --git a/pics/crystalsvg/cr16-mime-cdimage.png b/pics/crystalsvg/cr16-mime-application-x-cd-image.png
index 4e09ba91e..4e09ba91e 100644
--- a/pics/crystalsvg/cr16-mime-cdimage.png
+++ b/pics/crystalsvg/cr16-mime-application-x-cd-image.png
diff --git a/pics/crystalsvg/cr16-mime-cdtrack.png b/pics/crystalsvg/cr16-mime-application-x-cda.png
index 803127e9f..803127e9f 100644
--- a/pics/crystalsvg/cr16-mime-cdtrack.png
+++ b/pics/crystalsvg/cr16-mime-application-x-cda.png
diff --git a/pics/crystalsvg/cr16-mime-cdr.png b/pics/crystalsvg/cr16-mime-application-x-cdr.png
index b18b44814..b18b44814 100644
--- a/pics/crystalsvg/cr16-mime-cdr.png
+++ b/pics/crystalsvg/cr16-mime-application-x-cdr.png
diff --git a/pics/crystalsvg/cr16-mime-core.png b/pics/crystalsvg/cr16-mime-application-x-core.png
index 1bbc1d39b..1bbc1d39b 100644
--- a/pics/crystalsvg/cr16-mime-core.png
+++ b/pics/crystalsvg/cr16-mime-application-x-core.png
diff --git a/pics/crystalsvg/cr16-mime-deb.png b/pics/crystalsvg/cr16-mime-application-x-deb.png
index 6189a45f8..6189a45f8 100644
--- a/pics/crystalsvg/cr16-mime-deb.png
+++ b/pics/crystalsvg/cr16-mime-application-x-deb.png
diff --git a/pics/crystalsvg/cr16-mime-widget_doc.png b/pics/crystalsvg/cr16-mime-application-x-designer.png
index 3275ae5ef..3275ae5ef 100644
--- a/pics/crystalsvg/cr16-mime-widget_doc.png
+++ b/pics/crystalsvg/cr16-mime-application-x-designer.png
diff --git a/pics/crystalsvg/cr16-mime-font_bitmap.png b/pics/crystalsvg/cr16-mime-application-x-font-snf.png
index 697337181..697337181 100644
--- a/pics/crystalsvg/cr16-mime-font_bitmap.png
+++ b/pics/crystalsvg/cr16-mime-application-x-font-snf.png
diff --git a/pics/crystalsvg/cr16-mime-font_truetype.png b/pics/crystalsvg/cr16-mime-application-x-font-ttf.png
index f843a8b41..f843a8b41 100644
--- a/pics/crystalsvg/cr16-mime-font_truetype.png
+++ b/pics/crystalsvg/cr16-mime-application-x-font-ttf.png
diff --git a/pics/crystalsvg/cr16-mime-font_type1.png b/pics/crystalsvg/cr16-mime-application-x-font-type1.png
index d17f9c02a..d17f9c02a 100644
--- a/pics/crystalsvg/cr16-mime-font_type1.png
+++ b/pics/crystalsvg/cr16-mime-application-x-font-type1.png
diff --git a/pics/crystalsvg/cr16-mime-gettext.png b/pics/crystalsvg/cr16-mime-application-x-gettext.png
index d17f9c02a..d17f9c02a 100644
--- a/pics/crystalsvg/cr16-mime-gettext.png
+++ b/pics/crystalsvg/cr16-mime-application-x-gettext.png
diff --git a/pics/crystalsvg/cr16-mime-karbon_karbon.png b/pics/crystalsvg/cr16-mime-application-x-karbon.png
index ccdf5f28c..ccdf5f28c 100644
--- a/pics/crystalsvg/cr16-mime-karbon_karbon.png
+++ b/pics/crystalsvg/cr16-mime-application-x-karbon.png
diff --git a/pics/crystalsvg/cr16-mime-kchart_chrt.png b/pics/crystalsvg/cr16-mime-application-x-kchart.png
index a44210ddc..a44210ddc 100644
--- a/pics/crystalsvg/cr16-mime-kchart_chrt.png
+++ b/pics/crystalsvg/cr16-mime-application-x-kchart.png
diff --git a/pics/crystalsvg/cr16-mime-colorscm.png b/pics/crystalsvg/cr16-mime-application-x-kcsrc.png
index 0e25a74e2..0e25a74e2 100644
--- a/pics/crystalsvg/cr16-mime-colorscm.png
+++ b/pics/crystalsvg/cr16-mime-application-x-kcsrc.png
diff --git a/pics/crystalsvg/cr16-mime-kexi_kexi.png b/pics/crystalsvg/cr16-mime-application-x-kexi.png
index 9036d40bd..9036d40bd 100644
--- a/pics/crystalsvg/cr16-mime-kexi_kexi.png
+++ b/pics/crystalsvg/cr16-mime-application-x-kexi.png
diff --git a/pics/crystalsvg/cr16-mime-kformula_kfo.png b/pics/crystalsvg/cr16-mime-application-x-kformula.png
index c426a04f9..c426a04f9 100644
--- a/pics/crystalsvg/cr16-mime-kformula_kfo.png
+++ b/pics/crystalsvg/cr16-mime-application-x-kformula.png
diff --git a/pics/crystalsvg/cr16-mime-kivio_flw.png b/pics/crystalsvg/cr16-mime-application-x-kivio.png
index eac0354a0..eac0354a0 100644
--- a/pics/crystalsvg/cr16-mime-kivio_flw.png
+++ b/pics/crystalsvg/cr16-mime-application-x-kivio.png
diff --git a/pics/crystalsvg/cr16-mime-kpresenter_kpr.png b/pics/crystalsvg/cr16-mime-application-x-kpresenter.png
index 9b9a483f2..9b9a483f2 100644
--- a/pics/crystalsvg/cr16-mime-kpresenter_kpr.png
+++ b/pics/crystalsvg/cr16-mime-application-x-kpresenter.png
diff --git a/pics/crystalsvg/cr16-mime-krita_kra.png b/pics/crystalsvg/cr16-mime-application-x-krita.png
index 2343b848a..2343b848a 100644
--- a/pics/crystalsvg/cr16-mime-krita_kra.png
+++ b/pics/crystalsvg/cr16-mime-application-x-krita.png
diff --git a/pics/crystalsvg/cr16-mime-kspread_ksp.png b/pics/crystalsvg/cr16-mime-application-x-kspread.png
index 839554fe4..839554fe4 100644
--- a/pics/crystalsvg/cr16-mime-kspread_ksp.png
+++ b/pics/crystalsvg/cr16-mime-application-x-kspread.png
diff --git a/pics/crystalsvg/cr16-mime-kugar_kud.png b/pics/crystalsvg/cr16-mime-application-x-kugar.png
index a9c65cb88..a9c65cb88 100644
--- a/pics/crystalsvg/cr16-mime-kugar_kud.png
+++ b/pics/crystalsvg/cr16-mime-application-x-kugar.png
diff --git a/pics/crystalsvg/cr16-mime-dvi.png b/pics/crystalsvg/cr16-mime-application-x-lyx.png
index 46a15047f..46a15047f 100644
--- a/pics/crystalsvg/cr16-mime-dvi.png
+++ b/pics/crystalsvg/cr16-mime-application-x-lyx.png
diff --git a/pics/crystalsvg/cr16-mime-metafont.png b/pics/crystalsvg/cr16-mime-application-x-metafont.png
index 45f1b6c18..45f1b6c18 100644
--- a/pics/crystalsvg/cr16-mime-metafont.png
+++ b/pics/crystalsvg/cr16-mime-application-x-metafont.png
diff --git a/pics/crystalsvg/cr16-mime-exec_wine.png b/pics/crystalsvg/cr16-mime-application-x-mswinurl.png
index ed125e0c1..ed125e0c1 100644
--- a/pics/crystalsvg/cr16-mime-exec_wine.png
+++ b/pics/crystalsvg/cr16-mime-application-x-mswinurl.png
diff --git a/pics/crystalsvg/cr16-mime-rpm.png b/pics/crystalsvg/cr16-mime-application-x-rpm.png
index 7a7cb19fc..7a7cb19fc 100644
--- a/pics/crystalsvg/cr16-mime-rpm.png
+++ b/pics/crystalsvg/cr16-mime-application-x-rpm.png
diff --git a/pics/crystalsvg/cr16-mime-tar.png b/pics/crystalsvg/cr16-mime-application-x-tar.png
index 8bdfa8a0f..8bdfa8a0f 100644
--- a/pics/crystalsvg/cr16-mime-tar.png
+++ b/pics/crystalsvg/cr16-mime-application-x-tar.png
diff --git a/pics/crystalsvg/cr16-mime-tgz.png b/pics/crystalsvg/cr16-mime-application-x-tarz.png
index 3ca4b8fb1..3ca4b8fb1 100644
--- a/pics/crystalsvg/cr16-mime-tgz.png
+++ b/pics/crystalsvg/cr16-mime-application-x-tarz.png
diff --git a/pics/crystalsvg/cr16-mime-gf.png b/pics/crystalsvg/cr16-mime-application-x-tex-gf.png
index 5ff285a15..5ff285a15 100644
--- a/pics/crystalsvg/cr16-mime-gf.png
+++ b/pics/crystalsvg/cr16-mime-application-x-tex-gf.png
diff --git a/pics/crystalsvg/cr16-mime-pk.png b/pics/crystalsvg/cr16-mime-application-x-tex-pk.png
index eb6a1767a..eb6a1767a 100644
--- a/pics/crystalsvg/cr16-mime-pk.png
+++ b/pics/crystalsvg/cr16-mime-application-x-tex-pk.png
diff --git a/pics/crystalsvg/cr16-mime-recycled.png b/pics/crystalsvg/cr16-mime-application-x-trash.png
index 4789dbd68..4789dbd68 100644
--- a/pics/crystalsvg/cr16-mime-recycled.png
+++ b/pics/crystalsvg/cr16-mime-application-x-trash.png
diff --git a/pics/crystalsvg/cr16-mime-man.png b/pics/crystalsvg/cr16-mime-application-x-troff-man.png
index 708e7b43b..708e7b43b 100644
--- a/pics/crystalsvg/cr16-mime-man.png
+++ b/pics/crystalsvg/cr16-mime-application-x-troff-man.png
diff --git a/pics/crystalsvg/cr16-mime-empty.png b/pics/crystalsvg/cr16-mime-application-x-zerosize.png
index 7f292fcb2..7f292fcb2 100644
--- a/pics/crystalsvg/cr16-mime-empty.png
+++ b/pics/crystalsvg/cr16-mime-application-x-zerosize.png
diff --git a/pics/crystalsvg/cr16-mime-midi.png b/pics/crystalsvg/cr16-mime-audio-midi.png
index d2b66aa63..d2b66aa63 100644
--- a/pics/crystalsvg/cr16-mime-midi.png
+++ b/pics/crystalsvg/cr16-mime-audio-midi.png
diff --git a/pics/crystalsvg/cr16-mime-sound.png b/pics/crystalsvg/cr16-mime-audio-x-generic.png
index bfe6022c8..bfe6022c8 100644
--- a/pics/crystalsvg/cr16-mime-sound.png
+++ b/pics/crystalsvg/cr16-mime-audio-x-generic.png
diff --git a/pics/crystalsvg/cr16-mime-font.png b/pics/crystalsvg/cr16-mime-font-x-generic.png
index 2e788c25d..2e788c25d 100644
--- a/pics/crystalsvg/cr16-mime-font.png
+++ b/pics/crystalsvg/cr16-mime-font-x-generic.png
diff --git a/pics/crystalsvg/cr16-mime-vectorgfx.png b/pics/crystalsvg/cr16-mime-image-svg+xml.png
index bf231896d..bf231896d 100644
--- a/pics/crystalsvg/cr16-mime-vectorgfx.png
+++ b/pics/crystalsvg/cr16-mime-image-svg+xml.png
diff --git a/pics/crystalsvg/cr16-mime-image.png b/pics/crystalsvg/cr16-mime-image-x-generic.png
index fdf537038..fdf537038 100644
--- a/pics/crystalsvg/cr16-mime-image.png
+++ b/pics/crystalsvg/cr16-mime-image-x-generic.png
diff --git a/pics/crystalsvg/cr16-mime-html.png b/pics/crystalsvg/cr16-mime-text-html.png
index 9e5bc52cf..9e5bc52cf 100644
--- a/pics/crystalsvg/cr16-mime-html.png
+++ b/pics/crystalsvg/cr16-mime-text-html.png
diff --git a/pics/crystalsvg/cr16-mime-txt.png b/pics/crystalsvg/cr16-mime-text-plain.png
index f8aaba2e3..f8aaba2e3 100644
--- a/pics/crystalsvg/cr16-mime-txt.png
+++ b/pics/crystalsvg/cr16-mime-text-plain.png
diff --git a/pics/crystalsvg/cr16-mime-rtf.png b/pics/crystalsvg/cr16-mime-text-rtf.png
index d2bed0b59..d2bed0b59 100644
--- a/pics/crystalsvg/cr16-mime-rtf.png
+++ b/pics/crystalsvg/cr16-mime-text-rtf.png
diff --git a/pics/crystalsvg/cr16-mime-ascii.png b/pics/crystalsvg/cr16-mime-text-vnd.tde.ascii.png
index d662de4f2..d662de4f2 100644
--- a/pics/crystalsvg/cr16-mime-ascii.png
+++ b/pics/crystalsvg/cr16-mime-text-vnd.tde.ascii.png
diff --git a/pics/crystalsvg/cr16-mime-source_s.png b/pics/crystalsvg/cr16-mime-text-x-asm.png
index 8669de254..8669de254 100644
--- a/pics/crystalsvg/cr16-mime-source_s.png
+++ b/pics/crystalsvg/cr16-mime-text-x-asm.png
diff --git a/pics/crystalsvg/cr16-mime-source_cpp.png b/pics/crystalsvg/cr16-mime-text-x-c++src.png
index 40c61697a..40c61697a 100644
--- a/pics/crystalsvg/cr16-mime-source_cpp.png
+++ b/pics/crystalsvg/cr16-mime-text-x-c++src.png
diff --git a/pics/crystalsvg/cr16-mime-source_c.png b/pics/crystalsvg/cr16-mime-text-x-csrc.png
index 8312c6b98..8312c6b98 100644
--- a/pics/crystalsvg/cr16-mime-source_c.png
+++ b/pics/crystalsvg/cr16-mime-text-x-csrc.png
diff --git a/pics/crystalsvg/cr16-mime-source_f.png b/pics/crystalsvg/cr16-mime-text-x-fortran.png
index b8dabed85..b8dabed85 100644
--- a/pics/crystalsvg/cr16-mime-source_f.png
+++ b/pics/crystalsvg/cr16-mime-text-x-fortran.png
diff --git a/pics/crystalsvg/cr16-mime-document2.png b/pics/crystalsvg/cr16-mime-text-x-generic-template.png
index f4d5bfd13..f4d5bfd13 100644
--- a/pics/crystalsvg/cr16-mime-document2.png
+++ b/pics/crystalsvg/cr16-mime-text-x-generic-template.png
diff --git a/pics/crystalsvg/cr16-mime-document.png b/pics/crystalsvg/cr16-mime-text-x-generic.png
index 1930fb233..1930fb233 100644
--- a/pics/crystalsvg/cr16-mime-document.png
+++ b/pics/crystalsvg/cr16-mime-text-x-generic.png
diff --git a/pics/crystalsvg/cr16-mime-source_h.png b/pics/crystalsvg/cr16-mime-text-x-hsrc.png
index 203ad57fa..203ad57fa 100644
--- a/pics/crystalsvg/cr16-mime-source_h.png
+++ b/pics/crystalsvg/cr16-mime-text-x-hsrc.png
diff --git a/pics/crystalsvg/cr16-mime-source_java.png b/pics/crystalsvg/cr16-mime-text-x-java.png
index a3c3909e8..a3c3909e8 100644
--- a/pics/crystalsvg/cr16-mime-source_java.png
+++ b/pics/crystalsvg/cr16-mime-text-x-java.png
diff --git a/pics/crystalsvg/cr16-mime-unknown.png b/pics/crystalsvg/cr16-mime-text-x-katefilelist.png
index 7f292fcb2..7f292fcb2 100644
--- a/pics/crystalsvg/cr16-mime-unknown.png
+++ b/pics/crystalsvg/cr16-mime-text-x-katefilelist.png
diff --git a/pics/crystalsvg/cr16-mime-log.png b/pics/crystalsvg/cr16-mime-text-x-log.png
index db1143b58..db1143b58 100644
--- a/pics/crystalsvg/cr16-mime-log.png
+++ b/pics/crystalsvg/cr16-mime-text-x-log.png
diff --git a/pics/crystalsvg/cr16-mime-source_l.png b/pics/crystalsvg/cr16-mime-text-x-lsrc.png
index ee4f84531..ee4f84531 100644
--- a/pics/crystalsvg/cr16-mime-source_l.png
+++ b/pics/crystalsvg/cr16-mime-text-x-lsrc.png
diff --git a/pics/crystalsvg/cr16-mime-make.png b/pics/crystalsvg/cr16-mime-text-x-makefile.png
index 734689e2d..734689e2d 100644
--- a/pics/crystalsvg/cr16-mime-make.png
+++ b/pics/crystalsvg/cr16-mime-text-x-makefile.png
diff --git a/pics/crystalsvg/cr16-mime-source_moc.png b/pics/crystalsvg/cr16-mime-text-x-mocsrc.png
index 8e25a74a4..8e25a74a4 100644
--- a/pics/crystalsvg/cr16-mime-source_moc.png
+++ b/pics/crystalsvg/cr16-mime-text-x-mocsrc.png
diff --git a/pics/crystalsvg/cr16-mime-source_o.png b/pics/crystalsvg/cr16-mime-text-x-osrc.png
index c7b6a9530..c7b6a9530 100644
--- a/pics/crystalsvg/cr16-mime-source_o.png
+++ b/pics/crystalsvg/cr16-mime-text-x-osrc.png
diff --git a/pics/crystalsvg/cr16-mime-source_pl.png b/pics/crystalsvg/cr16-mime-text-x-perl.png
index 178ab5e95..178ab5e95 100644
--- a/pics/crystalsvg/cr16-mime-source_pl.png
+++ b/pics/crystalsvg/cr16-mime-text-x-perl.png
diff --git a/pics/crystalsvg/cr16-mime-source_php.png b/pics/crystalsvg/cr16-mime-text-x-php.png
index 61cebe5ce..61cebe5ce 100644
--- a/pics/crystalsvg/cr16-mime-source_php.png
+++ b/pics/crystalsvg/cr16-mime-text-x-php.png
diff --git a/pics/crystalsvg/cr16-mime-source_py.png b/pics/crystalsvg/cr16-mime-text-x-python.png
index e04fee041..e04fee041 100644
--- a/pics/crystalsvg/cr16-mime-source_py.png
+++ b/pics/crystalsvg/cr16-mime-text-x-python.png
diff --git a/pics/crystalsvg/cr16-mime-readme.png b/pics/crystalsvg/cr16-mime-text-x-readme.png
index 5266a0d8b..5266a0d8b 100644
--- a/pics/crystalsvg/cr16-mime-readme.png
+++ b/pics/crystalsvg/cr16-mime-text-x-readme.png
diff --git a/pics/crystalsvg/cr16-mime-shellscript.png b/pics/crystalsvg/cr16-mime-text-x-script.png
index b560ad5b5..b560ad5b5 100644
--- a/pics/crystalsvg/cr16-mime-shellscript.png
+++ b/pics/crystalsvg/cr16-mime-text-x-script.png
diff --git a/pics/crystalsvg/cr16-mime-source.png b/pics/crystalsvg/cr16-mime-text-x-src.png
index 4ebc8e184..4ebc8e184 100644
--- a/pics/crystalsvg/cr16-mime-source.png
+++ b/pics/crystalsvg/cr16-mime-text-x-src.png
diff --git a/pics/crystalsvg/cr16-mime-tex.png b/pics/crystalsvg/cr16-mime-text-x-tex.png
index 29892002b..29892002b 100644
--- a/pics/crystalsvg/cr16-mime-tex.png
+++ b/pics/crystalsvg/cr16-mime-text-x-tex.png
diff --git a/pics/crystalsvg/cr16-mime-source_y.png b/pics/crystalsvg/cr16-mime-text-x-ysrc.png
index 3190a84f4..3190a84f4 100644
--- a/pics/crystalsvg/cr16-mime-source_y.png
+++ b/pics/crystalsvg/cr16-mime-text-x-ysrc.png
diff --git a/pics/crystalsvg/cr16-mime-video.png b/pics/crystalsvg/cr16-mime-video-x-generic.png
index 6c5f692d7..6c5f692d7 100644
--- a/pics/crystalsvg/cr16-mime-video.png
+++ b/pics/crystalsvg/cr16-mime-video-x-generic.png
diff --git a/pics/crystalsvg/cr16-mime-quicktime.png b/pics/crystalsvg/cr16-mime-video-x-quicktime.png
index 90418af51..90418af51 100644
--- a/pics/crystalsvg/cr16-mime-quicktime.png
+++ b/pics/crystalsvg/cr16-mime-video-x-quicktime.png
diff --git a/pics/crystalsvg/cr16-mime-vcard.png b/pics/crystalsvg/cr16-mime-x-office-address-book.png
index 8210b43eb..8210b43eb 100644
--- a/pics/crystalsvg/cr16-mime-vcard.png
+++ b/pics/crystalsvg/cr16-mime-x-office-address-book.png
diff --git a/pics/crystalsvg/cr16-mime-vcalendar.png b/pics/crystalsvg/cr16-mime-x-office-calendar.png
index 7fb7ca883..7fb7ca883 100644
--- a/pics/crystalsvg/cr16-mime-vcalendar.png
+++ b/pics/crystalsvg/cr16-mime-x-office-calendar.png
diff --git a/pics/crystalsvg/cr16-mime-kword_kwd.png b/pics/crystalsvg/cr16-mime-x-office-document.png
index 2acffc227..2acffc227 100644
--- a/pics/crystalsvg/cr16-mime-kword_kwd.png
+++ b/pics/crystalsvg/cr16-mime-x-office-document.png
diff --git a/pics/crystalsvg/cr22-mime-netscape_doc.png b/pics/crystalsvg/cr22-mime-.png
index a35f48c6b..a35f48c6b 100644
--- a/pics/crystalsvg/cr22-mime-netscape_doc.png
+++ b/pics/crystalsvg/cr22-mime-.png
diff --git a/pics/crystalsvg/cr22-mime-binary.png b/pics/crystalsvg/cr22-mime-application-octet-stream.png
index 28d3beae0..28d3beae0 100644
--- a/pics/crystalsvg/cr22-mime-binary.png
+++ b/pics/crystalsvg/cr22-mime-application-octet-stream.png
diff --git a/pics/crystalsvg/cr22-mime-pdf.png b/pics/crystalsvg/cr22-mime-application-pdf.png
index 41bbe5616..41bbe5616 100644
--- a/pics/crystalsvg/cr22-mime-pdf.png
+++ b/pics/crystalsvg/cr22-mime-application-pdf.png
diff --git a/pics/crystalsvg/cr22-mime-postscript.png b/pics/crystalsvg/cr22-mime-application-postscript.png
index 4459aaf75..4459aaf75 100644
--- a/pics/crystalsvg/cr22-mime-postscript.png
+++ b/pics/crystalsvg/cr22-mime-application-postscript.png
diff --git a/pics/crystalsvg/cr22-mime-database.png b/pics/crystalsvg/cr22-mime-application-vnd.oasis.opendocument.database.png
index a9f512c41..a9f512c41 100644
--- a/pics/crystalsvg/cr22-mime-database.png
+++ b/pics/crystalsvg/cr22-mime-application-vnd.oasis.opendocument.database.png
diff --git a/pics/crystalsvg/cr22-mime-drawing.png b/pics/crystalsvg/cr22-mime-application-vnd.oasis.opendocument.graphics.png
index f4fa2a87f..f4fa2a87f 100644
--- a/pics/crystalsvg/cr22-mime-drawing.png
+++ b/pics/crystalsvg/cr22-mime-application-vnd.oasis.opendocument.graphics.png
diff --git a/pics/crystalsvg/cr22-mime-presentation.png b/pics/crystalsvg/cr22-mime-application-vnd.oasis.opendocument.presentation.png
index d82330f48..d82330f48 100644
--- a/pics/crystalsvg/cr22-mime-presentation.png
+++ b/pics/crystalsvg/cr22-mime-application-vnd.oasis.opendocument.presentation.png
diff --git a/pics/crystalsvg/cr22-mime-spreadsheet.png b/pics/crystalsvg/cr22-mime-application-vnd.oasis.opendocument.spreadsheet.png
index 4e478c0f4..4e478c0f4 100644
--- a/pics/crystalsvg/cr22-mime-spreadsheet.png
+++ b/pics/crystalsvg/cr22-mime-application-vnd.oasis.opendocument.spreadsheet.png
diff --git a/pics/crystalsvg/cr22-mime-wordprocessing.png b/pics/crystalsvg/cr22-mime-application-vnd.oasis.opendocument.text.png
index 378000015..378000015 100644
--- a/pics/crystalsvg/cr22-mime-wordprocessing.png
+++ b/pics/crystalsvg/cr22-mime-application-vnd.oasis.opendocument.text.png
diff --git a/pics/crystalsvg/cr22-mime-file_locked.png b/pics/crystalsvg/cr22-mime-application-vnd.tde.file.locked.png
index 61aabc3eb..61aabc3eb 100644
--- a/pics/crystalsvg/cr22-mime-file_locked.png
+++ b/pics/crystalsvg/cr22-mime-application-vnd.tde.file.locked.png
diff --git a/pics/crystalsvg/cr22-mime-file_temporary.png b/pics/crystalsvg/cr22-mime-application-vnd.tde.file.temporary.png
index 5667b29c0..5667b29c0 100644
--- a/pics/crystalsvg/cr22-mime-file_temporary.png
+++ b/pics/crystalsvg/cr22-mime-application-vnd.tde.file.temporary.png
diff --git a/pics/crystalsvg/cr22-mime-info.png b/pics/crystalsvg/cr22-mime-application-vnd.tde.info.png
index 5b97b2f84..5b97b2f84 100644
--- a/pics/crystalsvg/cr22-mime-info.png
+++ b/pics/crystalsvg/cr22-mime-application-vnd.tde.info.png
diff --git a/pics/crystalsvg/cr22-mime-zip.png b/pics/crystalsvg/cr22-mime-application-vnd.tde.overlay.zip.png
index 27ac93625..27ac93625 100644
--- a/pics/crystalsvg/cr22-mime-zip.png
+++ b/pics/crystalsvg/cr22-mime-application-vnd.tde.overlay.zip.png
diff --git a/pics/crystalsvg/cr22-mime-tdemultiple.png b/pics/crystalsvg/cr22-mime-application-vnd.tde.tdemultiple.png
index 485cc80de..485cc80de 100644
--- a/pics/crystalsvg/cr22-mime-tdemultiple.png
+++ b/pics/crystalsvg/cr22-mime-application-vnd.tde.tdemultiple.png
diff --git a/pics/crystalsvg/cr22-mime-txt2.png b/pics/crystalsvg/cr22-mime-application-vnd.tde.text.alt.png
index db26e1587..db26e1587 100644
--- a/pics/crystalsvg/cr22-mime-txt2.png
+++ b/pics/crystalsvg/cr22-mime-application-vnd.tde.text.alt.png
diff --git a/pics/crystalsvg/cr22-mime-applix.png b/pics/crystalsvg/cr22-mime-application-x-applix-word.png
index 1743794dc..1743794dc 100644
--- a/pics/crystalsvg/cr22-mime-applix.png
+++ b/pics/crystalsvg/cr22-mime-application-x-applix-word.png
diff --git a/pics/crystalsvg/cr22-mime-bt.png b/pics/crystalsvg/cr22-mime-application-x-bittorrent.png
index 270663d1e..270663d1e 100644
--- a/pics/crystalsvg/cr22-mime-bt.png
+++ b/pics/crystalsvg/cr22-mime-application-x-bittorrent.png
diff --git a/pics/crystalsvg/cr22-mime-cdimage.png b/pics/crystalsvg/cr22-mime-application-x-cd-image.png
index 6d285673b..6d285673b 100644
--- a/pics/crystalsvg/cr22-mime-cdimage.png
+++ b/pics/crystalsvg/cr22-mime-application-x-cd-image.png
diff --git a/pics/crystalsvg/cr22-mime-cdtrack.png b/pics/crystalsvg/cr22-mime-application-x-cda.png
index bc3dbff29..bc3dbff29 100644
--- a/pics/crystalsvg/cr22-mime-cdtrack.png
+++ b/pics/crystalsvg/cr22-mime-application-x-cda.png
diff --git a/pics/crystalsvg/cr22-mime-core.png b/pics/crystalsvg/cr22-mime-application-x-core.png
index 73197f572..73197f572 100644
--- a/pics/crystalsvg/cr22-mime-core.png
+++ b/pics/crystalsvg/cr22-mime-application-x-core.png
diff --git a/pics/crystalsvg/cr22-mime-deb.png b/pics/crystalsvg/cr22-mime-application-x-deb.png
index d9faf2ee4..d9faf2ee4 100644
--- a/pics/crystalsvg/cr22-mime-deb.png
+++ b/pics/crystalsvg/cr22-mime-application-x-deb.png
diff --git a/pics/crystalsvg/cr22-mime-widget_doc.png b/pics/crystalsvg/cr22-mime-application-x-designer.png
index 520e27332..520e27332 100644
--- a/pics/crystalsvg/cr22-mime-widget_doc.png
+++ b/pics/crystalsvg/cr22-mime-application-x-designer.png
diff --git a/pics/crystalsvg/cr22-mime-font_bitmap.png b/pics/crystalsvg/cr22-mime-application-x-font-snf.png
index d340826a9..d340826a9 100644
--- a/pics/crystalsvg/cr22-mime-font_bitmap.png
+++ b/pics/crystalsvg/cr22-mime-application-x-font-snf.png
diff --git a/pics/crystalsvg/cr22-mime-font_truetype.png b/pics/crystalsvg/cr22-mime-application-x-font-ttf.png
index 96f708858..96f708858 100644
--- a/pics/crystalsvg/cr22-mime-font_truetype.png
+++ b/pics/crystalsvg/cr22-mime-application-x-font-ttf.png
diff --git a/pics/crystalsvg/cr22-mime-font_type1.png b/pics/crystalsvg/cr22-mime-application-x-font-type1.png
index 9e92aa898..9e92aa898 100644
--- a/pics/crystalsvg/cr22-mime-font_type1.png
+++ b/pics/crystalsvg/cr22-mime-application-x-font-type1.png
diff --git a/pics/crystalsvg/cr22-mime-karbon_karbon.png b/pics/crystalsvg/cr22-mime-application-x-karbon.png
index e141cb90a..e141cb90a 100644
--- a/pics/crystalsvg/cr22-mime-karbon_karbon.png
+++ b/pics/crystalsvg/cr22-mime-application-x-karbon.png
diff --git a/pics/crystalsvg/cr22-mime-kchart_chrt.png b/pics/crystalsvg/cr22-mime-application-x-kchart.png
index 333769d1f..333769d1f 100644
--- a/pics/crystalsvg/cr22-mime-kchart_chrt.png
+++ b/pics/crystalsvg/cr22-mime-application-x-kchart.png
diff --git a/pics/crystalsvg/cr22-mime-colorscm.png b/pics/crystalsvg/cr22-mime-application-x-kcsrc.png
index cf2ccefb5..cf2ccefb5 100644
--- a/pics/crystalsvg/cr22-mime-colorscm.png
+++ b/pics/crystalsvg/cr22-mime-application-x-kcsrc.png
diff --git a/pics/crystalsvg/cr22-mime-kexi_kexi.png b/pics/crystalsvg/cr22-mime-application-x-kexi.png
index 02944114e..02944114e 100644
--- a/pics/crystalsvg/cr22-mime-kexi_kexi.png
+++ b/pics/crystalsvg/cr22-mime-application-x-kexi.png
diff --git a/pics/crystalsvg/cr22-mime-kformula_kfo.png b/pics/crystalsvg/cr22-mime-application-x-kformula.png
index a7632938f..a7632938f 100644
--- a/pics/crystalsvg/cr22-mime-kformula_kfo.png
+++ b/pics/crystalsvg/cr22-mime-application-x-kformula.png
diff --git a/pics/crystalsvg/cr22-mime-kivio_flw.png b/pics/crystalsvg/cr22-mime-application-x-kivio.png
index 88d2d7d34..88d2d7d34 100644
--- a/pics/crystalsvg/cr22-mime-kivio_flw.png
+++ b/pics/crystalsvg/cr22-mime-application-x-kivio.png
diff --git a/pics/crystalsvg/cr22-mime-kpresenter_kpr.png b/pics/crystalsvg/cr22-mime-application-x-kpresenter.png
index 163e67a74..163e67a74 100644
--- a/pics/crystalsvg/cr22-mime-kpresenter_kpr.png
+++ b/pics/crystalsvg/cr22-mime-application-x-kpresenter.png
diff --git a/pics/crystalsvg/cr22-mime-krita_kra.png b/pics/crystalsvg/cr22-mime-application-x-krita.png
index 435c006dd..435c006dd 100644
--- a/pics/crystalsvg/cr22-mime-krita_kra.png
+++ b/pics/crystalsvg/cr22-mime-application-x-krita.png
diff --git a/pics/crystalsvg/cr22-mime-kspread_ksp.png b/pics/crystalsvg/cr22-mime-application-x-kspread.png
index ea67b3d5a..ea67b3d5a 100644
--- a/pics/crystalsvg/cr22-mime-kspread_ksp.png
+++ b/pics/crystalsvg/cr22-mime-application-x-kspread.png
diff --git a/pics/crystalsvg/cr22-mime-kugar_kud.png b/pics/crystalsvg/cr22-mime-application-x-kugar.png
index e3289ed4b..e3289ed4b 100644
--- a/pics/crystalsvg/cr22-mime-kugar_kud.png
+++ b/pics/crystalsvg/cr22-mime-application-x-kugar.png
diff --git a/pics/crystalsvg/cr22-mime-dvi.png b/pics/crystalsvg/cr22-mime-application-x-lyx.png
index 415bc8bbc..415bc8bbc 100644
--- a/pics/crystalsvg/cr22-mime-dvi.png
+++ b/pics/crystalsvg/cr22-mime-application-x-lyx.png
diff --git a/pics/crystalsvg/cr22-mime-metafont.png b/pics/crystalsvg/cr22-mime-application-x-metafont.png
index 454a329bf..454a329bf 100644
--- a/pics/crystalsvg/cr22-mime-metafont.png
+++ b/pics/crystalsvg/cr22-mime-application-x-metafont.png
diff --git a/pics/crystalsvg/cr22-mime-exec_wine.png b/pics/crystalsvg/cr22-mime-application-x-mswinurl.png
index 38e78a9d8..38e78a9d8 100644
--- a/pics/crystalsvg/cr22-mime-exec_wine.png
+++ b/pics/crystalsvg/cr22-mime-application-x-mswinurl.png
diff --git a/pics/crystalsvg/cr22-mime-rpm.png b/pics/crystalsvg/cr22-mime-application-x-rpm.png
index ebef4c7ff..ebef4c7ff 100644
--- a/pics/crystalsvg/cr22-mime-rpm.png
+++ b/pics/crystalsvg/cr22-mime-application-x-rpm.png
diff --git a/pics/crystalsvg/cr22-mime-soffice.png b/pics/crystalsvg/cr22-mime-application-x-soffice.png
index 862eb5203..862eb5203 100644
--- a/pics/crystalsvg/cr22-mime-soffice.png
+++ b/pics/crystalsvg/cr22-mime-application-x-soffice.png
diff --git a/pics/crystalsvg/cr22-mime-tar.png b/pics/crystalsvg/cr22-mime-application-x-tar.png
index fdc7a5255..fdc7a5255 100644
--- a/pics/crystalsvg/cr22-mime-tar.png
+++ b/pics/crystalsvg/cr22-mime-application-x-tar.png
diff --git a/pics/crystalsvg/cr22-mime-tgz.png b/pics/crystalsvg/cr22-mime-application-x-tarz.png
index a7d9230ae..a7d9230ae 100644
--- a/pics/crystalsvg/cr22-mime-tgz.png
+++ b/pics/crystalsvg/cr22-mime-application-x-tarz.png
diff --git a/pics/crystalsvg/cr22-mime-gf.png b/pics/crystalsvg/cr22-mime-application-x-tex-gf.png
index c769b0fda..c769b0fda 100644
--- a/pics/crystalsvg/cr22-mime-gf.png
+++ b/pics/crystalsvg/cr22-mime-application-x-tex-gf.png
diff --git a/pics/crystalsvg/cr22-mime-pk.png b/pics/crystalsvg/cr22-mime-application-x-tex-pk.png
index d7d81a28a..d7d81a28a 100644
--- a/pics/crystalsvg/cr22-mime-pk.png
+++ b/pics/crystalsvg/cr22-mime-application-x-tex-pk.png
diff --git a/pics/crystalsvg/cr22-mime-recycled.png b/pics/crystalsvg/cr22-mime-application-x-trash.png
index aae1835ca..aae1835ca 100644
--- a/pics/crystalsvg/cr22-mime-recycled.png
+++ b/pics/crystalsvg/cr22-mime-application-x-trash.png
diff --git a/pics/crystalsvg/cr22-mime-man.png b/pics/crystalsvg/cr22-mime-application-x-troff-man.png
index d35a19714..d35a19714 100644
--- a/pics/crystalsvg/cr22-mime-man.png
+++ b/pics/crystalsvg/cr22-mime-application-x-troff-man.png
diff --git a/pics/crystalsvg/cr22-mime-empty.png b/pics/crystalsvg/cr22-mime-application-x-zerosize.png
index 1b149459e..1b149459e 100644
--- a/pics/crystalsvg/cr22-mime-empty.png
+++ b/pics/crystalsvg/cr22-mime-application-x-zerosize.png
diff --git a/pics/crystalsvg/cr22-mime-midi.png b/pics/crystalsvg/cr22-mime-audio-midi.png
index 6e39aa824..6e39aa824 100644
--- a/pics/crystalsvg/cr22-mime-midi.png
+++ b/pics/crystalsvg/cr22-mime-audio-midi.png
diff --git a/pics/crystalsvg/cr22-mime-sound.png b/pics/crystalsvg/cr22-mime-audio-x-generic.png
index 2fab2dfab..2fab2dfab 100644
--- a/pics/crystalsvg/cr22-mime-sound.png
+++ b/pics/crystalsvg/cr22-mime-audio-x-generic.png
diff --git a/pics/crystalsvg/cr22-mime-font.png b/pics/crystalsvg/cr22-mime-font-x-generic.png
index 1ac93bcdc..1ac93bcdc 100644
--- a/pics/crystalsvg/cr22-mime-font.png
+++ b/pics/crystalsvg/cr22-mime-font-x-generic.png
diff --git a/pics/crystalsvg/cr22-mime-vectorgfx.png b/pics/crystalsvg/cr22-mime-image-svg+xml.png
index 065de7d18..065de7d18 100644
--- a/pics/crystalsvg/cr22-mime-vectorgfx.png
+++ b/pics/crystalsvg/cr22-mime-image-svg+xml.png
diff --git a/pics/crystalsvg/cr22-mime-image.png b/pics/crystalsvg/cr22-mime-image-x-generic.png
index a6f715e68..a6f715e68 100644
--- a/pics/crystalsvg/cr22-mime-image.png
+++ b/pics/crystalsvg/cr22-mime-image-x-generic.png
diff --git a/pics/crystalsvg/cr22-mime-html.png b/pics/crystalsvg/cr22-mime-text-html.png
index d0df8e958..d0df8e958 100644
--- a/pics/crystalsvg/cr22-mime-html.png
+++ b/pics/crystalsvg/cr22-mime-text-html.png
diff --git a/pics/crystalsvg/cr22-mime-txt.png b/pics/crystalsvg/cr22-mime-text-plain.png
index 47d096853..47d096853 100644
--- a/pics/crystalsvg/cr22-mime-txt.png
+++ b/pics/crystalsvg/cr22-mime-text-plain.png
diff --git a/pics/crystalsvg/cr22-mime-rtf.png b/pics/crystalsvg/cr22-mime-text-rtf.png
index 6a5c95b98..6a5c95b98 100644
--- a/pics/crystalsvg/cr22-mime-rtf.png
+++ b/pics/crystalsvg/cr22-mime-text-rtf.png
diff --git a/pics/crystalsvg/cr22-mime-ascii.png b/pics/crystalsvg/cr22-mime-text-vnd.tde.ascii.png
index 2ae8d9cfc..2ae8d9cfc 100644
--- a/pics/crystalsvg/cr22-mime-ascii.png
+++ b/pics/crystalsvg/cr22-mime-text-vnd.tde.ascii.png
diff --git a/pics/crystalsvg/cr22-mime-source_s.png b/pics/crystalsvg/cr22-mime-text-x-asm.png
index 0315fe0b9..0315fe0b9 100644
--- a/pics/crystalsvg/cr22-mime-source_s.png
+++ b/pics/crystalsvg/cr22-mime-text-x-asm.png
diff --git a/pics/crystalsvg/cr22-mime-source_cpp.png b/pics/crystalsvg/cr22-mime-text-x-c++src.png
index 4f8b50e7e..4f8b50e7e 100644
--- a/pics/crystalsvg/cr22-mime-source_cpp.png
+++ b/pics/crystalsvg/cr22-mime-text-x-c++src.png
diff --git a/pics/crystalsvg/cr22-mime-source_c.png b/pics/crystalsvg/cr22-mime-text-x-csrc.png
index fd4aa2276..fd4aa2276 100644
--- a/pics/crystalsvg/cr22-mime-source_c.png
+++ b/pics/crystalsvg/cr22-mime-text-x-csrc.png
diff --git a/pics/crystalsvg/cr22-mime-source_f.png b/pics/crystalsvg/cr22-mime-text-x-fortran.png
index 598acdd32..598acdd32 100644
--- a/pics/crystalsvg/cr22-mime-source_f.png
+++ b/pics/crystalsvg/cr22-mime-text-x-fortran.png
diff --git a/pics/crystalsvg/cr22-mime-document2.png b/pics/crystalsvg/cr22-mime-text-x-generic-template.png
index 63fac4456..63fac4456 100644
--- a/pics/crystalsvg/cr22-mime-document2.png
+++ b/pics/crystalsvg/cr22-mime-text-x-generic-template.png
diff --git a/pics/crystalsvg/cr22-mime-document.png b/pics/crystalsvg/cr22-mime-text-x-generic.png
index 8901c3aa3..8901c3aa3 100644
--- a/pics/crystalsvg/cr22-mime-document.png
+++ b/pics/crystalsvg/cr22-mime-text-x-generic.png
diff --git a/pics/crystalsvg/cr22-mime-source_h.png b/pics/crystalsvg/cr22-mime-text-x-hsrc.png
index cceca2fc3..cceca2fc3 100644
--- a/pics/crystalsvg/cr22-mime-source_h.png
+++ b/pics/crystalsvg/cr22-mime-text-x-hsrc.png
diff --git a/pics/crystalsvg/cr22-mime-source_java.png b/pics/crystalsvg/cr22-mime-text-x-java.png
index 0f11ce9a6..0f11ce9a6 100644
--- a/pics/crystalsvg/cr22-mime-source_java.png
+++ b/pics/crystalsvg/cr22-mime-text-x-java.png
diff --git a/pics/crystalsvg/cr22-mime-source_j.png b/pics/crystalsvg/cr22-mime-text-x-jsrc.png
index c2830c669..c2830c669 100644
--- a/pics/crystalsvg/cr22-mime-source_j.png
+++ b/pics/crystalsvg/cr22-mime-text-x-jsrc.png
diff --git a/pics/crystalsvg/cr22-mime-unknown.png b/pics/crystalsvg/cr22-mime-text-x-katefilelist.png
index 1b149459e..1b149459e 100644
--- a/pics/crystalsvg/cr22-mime-unknown.png
+++ b/pics/crystalsvg/cr22-mime-text-x-katefilelist.png
diff --git a/pics/crystalsvg/cr22-mime-log.png b/pics/crystalsvg/cr22-mime-text-x-log.png
index c520d1828..c520d1828 100644
--- a/pics/crystalsvg/cr22-mime-log.png
+++ b/pics/crystalsvg/cr22-mime-text-x-log.png
diff --git a/pics/crystalsvg/cr22-mime-source_l.png b/pics/crystalsvg/cr22-mime-text-x-lsrc.png
index 167a0393b..167a0393b 100644
--- a/pics/crystalsvg/cr22-mime-source_l.png
+++ b/pics/crystalsvg/cr22-mime-text-x-lsrc.png
diff --git a/pics/crystalsvg/cr22-mime-make.png b/pics/crystalsvg/cr22-mime-text-x-makefile.png
index bdd047152..bdd047152 100644
--- a/pics/crystalsvg/cr22-mime-make.png
+++ b/pics/crystalsvg/cr22-mime-text-x-makefile.png
diff --git a/pics/crystalsvg/cr22-mime-source_moc.png b/pics/crystalsvg/cr22-mime-text-x-mocsrc.png
index c3e2dcfcc..c3e2dcfcc 100644
--- a/pics/crystalsvg/cr22-mime-source_moc.png
+++ b/pics/crystalsvg/cr22-mime-text-x-mocsrc.png
diff --git a/pics/crystalsvg/cr22-mime-source_o.png b/pics/crystalsvg/cr22-mime-text-x-osrc.png
index 289101683..289101683 100644
--- a/pics/crystalsvg/cr22-mime-source_o.png
+++ b/pics/crystalsvg/cr22-mime-text-x-osrc.png
diff --git a/pics/crystalsvg/cr22-mime-source_pl.png b/pics/crystalsvg/cr22-mime-text-x-perl.png
index ffd12c53b..ffd12c53b 100644
--- a/pics/crystalsvg/cr22-mime-source_pl.png
+++ b/pics/crystalsvg/cr22-mime-text-x-perl.png
diff --git a/pics/crystalsvg/cr22-mime-source_p.png b/pics/crystalsvg/cr22-mime-text-x-psrc.png
index 127a61919..127a61919 100644
--- a/pics/crystalsvg/cr22-mime-source_p.png
+++ b/pics/crystalsvg/cr22-mime-text-x-psrc.png
diff --git a/pics/crystalsvg/cr22-mime-source_py.png b/pics/crystalsvg/cr22-mime-text-x-python.png
index 2da44a75f..2da44a75f 100644
--- a/pics/crystalsvg/cr22-mime-source_py.png
+++ b/pics/crystalsvg/cr22-mime-text-x-python.png
diff --git a/pics/crystalsvg/cr22-mime-readme.png b/pics/crystalsvg/cr22-mime-text-x-readme.png
index 5198e2c2e..5198e2c2e 100644
--- a/pics/crystalsvg/cr22-mime-readme.png
+++ b/pics/crystalsvg/cr22-mime-text-x-readme.png
diff --git a/pics/crystalsvg/cr22-mime-shellscript.png b/pics/crystalsvg/cr22-mime-text-x-script.png
index 59de8cfef..59de8cfef 100644
--- a/pics/crystalsvg/cr22-mime-shellscript.png
+++ b/pics/crystalsvg/cr22-mime-text-x-script.png
diff --git a/pics/crystalsvg/cr22-mime-source.png b/pics/crystalsvg/cr22-mime-text-x-src.png
index 20cdf4cfa..20cdf4cfa 100644
--- a/pics/crystalsvg/cr22-mime-source.png
+++ b/pics/crystalsvg/cr22-mime-text-x-src.png
diff --git a/pics/crystalsvg/cr22-mime-tex.png b/pics/crystalsvg/cr22-mime-text-x-tex.png
index 21901b4f9..21901b4f9 100644
--- a/pics/crystalsvg/cr22-mime-tex.png
+++ b/pics/crystalsvg/cr22-mime-text-x-tex.png
diff --git a/pics/crystalsvg/cr22-mime-source_y.png b/pics/crystalsvg/cr22-mime-text-x-ysrc.png
index 70ec309bd..70ec309bd 100644
--- a/pics/crystalsvg/cr22-mime-source_y.png
+++ b/pics/crystalsvg/cr22-mime-text-x-ysrc.png
diff --git a/pics/crystalsvg/cr22-mime-video.png b/pics/crystalsvg/cr22-mime-video-x-generic.png
index 643fc459c..643fc459c 100644
--- a/pics/crystalsvg/cr22-mime-video.png
+++ b/pics/crystalsvg/cr22-mime-video-x-generic.png
diff --git a/pics/crystalsvg/cr22-mime-quicktime.png b/pics/crystalsvg/cr22-mime-video-x-quicktime.png
index 914917055..914917055 100644
--- a/pics/crystalsvg/cr22-mime-quicktime.png
+++ b/pics/crystalsvg/cr22-mime-video-x-quicktime.png
diff --git a/pics/crystalsvg/cr22-mime-vcard.png b/pics/crystalsvg/cr22-mime-x-office-address-book.png
index a8b942902..a8b942902 100644
--- a/pics/crystalsvg/cr22-mime-vcard.png
+++ b/pics/crystalsvg/cr22-mime-x-office-address-book.png
diff --git a/pics/crystalsvg/cr22-mime-vcalendar.png b/pics/crystalsvg/cr22-mime-x-office-calendar.png
index d754cb405..d754cb405 100644
--- a/pics/crystalsvg/cr22-mime-vcalendar.png
+++ b/pics/crystalsvg/cr22-mime-x-office-calendar.png
diff --git a/pics/crystalsvg/cr22-mime-kword_kwd.png b/pics/crystalsvg/cr22-mime-x-office-document.png
index 4af114e1b..4af114e1b 100644
--- a/pics/crystalsvg/cr22-mime-kword_kwd.png
+++ b/pics/crystalsvg/cr22-mime-x-office-document.png
diff --git a/pics/crystalsvg/cr32-mime-netscape_doc.png b/pics/crystalsvg/cr32-mime-.png
index b43ea49e4..b43ea49e4 100644
--- a/pics/crystalsvg/cr32-mime-netscape_doc.png
+++ b/pics/crystalsvg/cr32-mime-.png
diff --git a/pics/crystalsvg/cr32-mime-binary.png b/pics/crystalsvg/cr32-mime-application-octet-stream.png
index cb2ff548e..cb2ff548e 100644
--- a/pics/crystalsvg/cr32-mime-binary.png
+++ b/pics/crystalsvg/cr32-mime-application-octet-stream.png
diff --git a/pics/crystalsvg/cr32-mime-pdf.png b/pics/crystalsvg/cr32-mime-application-pdf.png
index fca2c672e..fca2c672e 100644
--- a/pics/crystalsvg/cr32-mime-pdf.png
+++ b/pics/crystalsvg/cr32-mime-application-pdf.png
diff --git a/pics/crystalsvg/cr32-mime-postscript.png b/pics/crystalsvg/cr32-mime-application-postscript.png
index 8f941d8a1..8f941d8a1 100644
--- a/pics/crystalsvg/cr32-mime-postscript.png
+++ b/pics/crystalsvg/cr32-mime-application-postscript.png
diff --git a/pics/crystalsvg/cr32-mime-database.png b/pics/crystalsvg/cr32-mime-application-vnd.oasis.opendocument.database.png
index b4752d6fb..b4752d6fb 100644
--- a/pics/crystalsvg/cr32-mime-database.png
+++ b/pics/crystalsvg/cr32-mime-application-vnd.oasis.opendocument.database.png
diff --git a/pics/crystalsvg/cr32-mime-drawing.png b/pics/crystalsvg/cr32-mime-application-vnd.oasis.opendocument.graphics.png
index b35b4d559..b35b4d559 100644
--- a/pics/crystalsvg/cr32-mime-drawing.png
+++ b/pics/crystalsvg/cr32-mime-application-vnd.oasis.opendocument.graphics.png
diff --git a/pics/crystalsvg/cr32-mime-presentation.png b/pics/crystalsvg/cr32-mime-application-vnd.oasis.opendocument.presentation.png
index 8bfc7b771..8bfc7b771 100644
--- a/pics/crystalsvg/cr32-mime-presentation.png
+++ b/pics/crystalsvg/cr32-mime-application-vnd.oasis.opendocument.presentation.png
diff --git a/pics/crystalsvg/cr32-mime-spreadsheet.png b/pics/crystalsvg/cr32-mime-application-vnd.oasis.opendocument.spreadsheet.png
index b9b8d564b..b9b8d564b 100644
--- a/pics/crystalsvg/cr32-mime-spreadsheet.png
+++ b/pics/crystalsvg/cr32-mime-application-vnd.oasis.opendocument.spreadsheet.png
diff --git a/pics/crystalsvg/cr32-mime-wordprocessing.png b/pics/crystalsvg/cr32-mime-application-vnd.oasis.opendocument.text.png
index 048037327..048037327 100644
--- a/pics/crystalsvg/cr32-mime-wordprocessing.png
+++ b/pics/crystalsvg/cr32-mime-application-vnd.oasis.opendocument.text.png
diff --git a/pics/crystalsvg/cr32-mime-file_locked.png b/pics/crystalsvg/cr32-mime-application-vnd.tde.file.locked.png
index 71e275169..71e275169 100644
--- a/pics/crystalsvg/cr32-mime-file_locked.png
+++ b/pics/crystalsvg/cr32-mime-application-vnd.tde.file.locked.png
diff --git a/pics/crystalsvg/cr32-mime-file_temporary.png b/pics/crystalsvg/cr32-mime-application-vnd.tde.file.temporary.png
index 12b3db5c0..12b3db5c0 100644
--- a/pics/crystalsvg/cr32-mime-file_temporary.png
+++ b/pics/crystalsvg/cr32-mime-application-vnd.tde.file.temporary.png
diff --git a/pics/crystalsvg/cr32-mime-info.png b/pics/crystalsvg/cr32-mime-application-vnd.tde.info.png
index 8f5f806d5..8f5f806d5 100644
--- a/pics/crystalsvg/cr32-mime-info.png
+++ b/pics/crystalsvg/cr32-mime-application-vnd.tde.info.png
diff --git a/pics/crystalsvg/cr32-mime-misc.png b/pics/crystalsvg/cr32-mime-application-vnd.tde.misc.png
index 39a03f10f..39a03f10f 100644
--- a/pics/crystalsvg/cr32-mime-misc.png
+++ b/pics/crystalsvg/cr32-mime-application-vnd.tde.misc.png
diff --git a/pics/crystalsvg/cr32-mime-zip.png b/pics/crystalsvg/cr32-mime-application-vnd.tde.overlay.zip.png
index 0b8263c91..0b8263c91 100644
--- a/pics/crystalsvg/cr32-mime-zip.png
+++ b/pics/crystalsvg/cr32-mime-application-vnd.tde.overlay.zip.png
diff --git a/pics/crystalsvg/cr32-mime-resource.png b/pics/crystalsvg/cr32-mime-application-vnd.tde.resource.png
index 8de6ec360..8de6ec360 100644
--- a/pics/crystalsvg/cr32-mime-resource.png
+++ b/pics/crystalsvg/cr32-mime-application-vnd.tde.resource.png
diff --git a/pics/crystalsvg/cr32-mime-tdemultiple.png b/pics/crystalsvg/cr32-mime-application-vnd.tde.tdemultiple.png
index 45cb5ffe8..45cb5ffe8 100644
--- a/pics/crystalsvg/cr32-mime-tdemultiple.png
+++ b/pics/crystalsvg/cr32-mime-application-vnd.tde.tdemultiple.png
diff --git a/pics/crystalsvg/cr32-mime-template_source.png b/pics/crystalsvg/cr32-mime-application-vnd.tde.template_source.png
index d094596eb..d094596eb 100644
--- a/pics/crystalsvg/cr32-mime-template_source.png
+++ b/pics/crystalsvg/cr32-mime-application-vnd.tde.template_source.png
diff --git a/pics/crystalsvg/cr32-mime-txt2.png b/pics/crystalsvg/cr32-mime-application-vnd.tde.text.alt.png
index a9a13568a..a9a13568a 100644
--- a/pics/crystalsvg/cr32-mime-txt2.png
+++ b/pics/crystalsvg/cr32-mime-application-vnd.tde.text.alt.png
diff --git a/pics/crystalsvg/cr32-mime-applix.png b/pics/crystalsvg/cr32-mime-application-x-applix-word.png
index e6d8cbf8d..e6d8cbf8d 100644
--- a/pics/crystalsvg/cr32-mime-applix.png
+++ b/pics/crystalsvg/cr32-mime-application-x-applix-word.png
diff --git a/pics/crystalsvg/cr32-mime-bt.png b/pics/crystalsvg/cr32-mime-application-x-bittorrent.png
index c7d1fdedd..c7d1fdedd 100644
--- a/pics/crystalsvg/cr32-mime-bt.png
+++ b/pics/crystalsvg/cr32-mime-application-x-bittorrent.png
diff --git a/pics/crystalsvg/cr32-mime-cdimage.png b/pics/crystalsvg/cr32-mime-application-x-cd-image.png
index 1c2adb2d4..1c2adb2d4 100644
--- a/pics/crystalsvg/cr32-mime-cdimage.png
+++ b/pics/crystalsvg/cr32-mime-application-x-cd-image.png
diff --git a/pics/crystalsvg/cr32-mime-cdtrack.png b/pics/crystalsvg/cr32-mime-application-x-cda.png
index a3dcfbb4c..a3dcfbb4c 100644
--- a/pics/crystalsvg/cr32-mime-cdtrack.png
+++ b/pics/crystalsvg/cr32-mime-application-x-cda.png
diff --git a/pics/crystalsvg/cr32-mime-cdr.png b/pics/crystalsvg/cr32-mime-application-x-cdr.png
index afbf730ef..afbf730ef 100644
--- a/pics/crystalsvg/cr32-mime-cdr.png
+++ b/pics/crystalsvg/cr32-mime-application-x-cdr.png
diff --git a/pics/crystalsvg/cr32-mime-core.png b/pics/crystalsvg/cr32-mime-application-x-core.png
index 9f4b6cc3d..9f4b6cc3d 100644
--- a/pics/crystalsvg/cr32-mime-core.png
+++ b/pics/crystalsvg/cr32-mime-application-x-core.png
diff --git a/pics/crystalsvg/cr32-mime-deb.png b/pics/crystalsvg/cr32-mime-application-x-deb.png
index fa6276803..fa6276803 100644
--- a/pics/crystalsvg/cr32-mime-deb.png
+++ b/pics/crystalsvg/cr32-mime-application-x-deb.png
diff --git a/pics/crystalsvg/cr32-mime-widget_doc.png b/pics/crystalsvg/cr32-mime-application-x-designer.png
index 498591ac0..498591ac0 100644
--- a/pics/crystalsvg/cr32-mime-widget_doc.png
+++ b/pics/crystalsvg/cr32-mime-application-x-designer.png
diff --git a/pics/crystalsvg/cr32-mime-font_bitmap.png b/pics/crystalsvg/cr32-mime-application-x-font-snf.png
index 2e6b00f0c..2e6b00f0c 100644
--- a/pics/crystalsvg/cr32-mime-font_bitmap.png
+++ b/pics/crystalsvg/cr32-mime-application-x-font-snf.png
diff --git a/pics/crystalsvg/cr32-mime-font_truetype.png b/pics/crystalsvg/cr32-mime-application-x-font-ttf.png
index ec61965e6..ec61965e6 100644
--- a/pics/crystalsvg/cr32-mime-font_truetype.png
+++ b/pics/crystalsvg/cr32-mime-application-x-font-ttf.png
diff --git a/pics/crystalsvg/cr32-mime-font_type1.png b/pics/crystalsvg/cr32-mime-application-x-font-type1.png
index 660863190..660863190 100644
--- a/pics/crystalsvg/cr32-mime-font_type1.png
+++ b/pics/crystalsvg/cr32-mime-application-x-font-type1.png
diff --git a/pics/crystalsvg/cr32-mime-gettext.png b/pics/crystalsvg/cr32-mime-application-x-gettext.png
index 660863190..660863190 100644
--- a/pics/crystalsvg/cr32-mime-gettext.png
+++ b/pics/crystalsvg/cr32-mime-application-x-gettext.png
diff --git a/pics/crystalsvg/cr32-mime-karbon_karbon.png b/pics/crystalsvg/cr32-mime-application-x-karbon.png
index 1845139a3..1845139a3 100644
--- a/pics/crystalsvg/cr32-mime-karbon_karbon.png
+++ b/pics/crystalsvg/cr32-mime-application-x-karbon.png
diff --git a/pics/crystalsvg/cr32-mime-kchart_chrt.png b/pics/crystalsvg/cr32-mime-application-x-kchart.png
index c5ea4f9f2..c5ea4f9f2 100644
--- a/pics/crystalsvg/cr32-mime-kchart_chrt.png
+++ b/pics/crystalsvg/cr32-mime-application-x-kchart.png
diff --git a/pics/crystalsvg/cr32-mime-colorscm.png b/pics/crystalsvg/cr32-mime-application-x-kcsrc.png
index 5c6638671..5c6638671 100644
--- a/pics/crystalsvg/cr32-mime-colorscm.png
+++ b/pics/crystalsvg/cr32-mime-application-x-kcsrc.png
diff --git a/pics/crystalsvg/cr32-mime-kexi_kexi.png b/pics/crystalsvg/cr32-mime-application-x-kexi.png
index a0fa5aada..a0fa5aada 100644
--- a/pics/crystalsvg/cr32-mime-kexi_kexi.png
+++ b/pics/crystalsvg/cr32-mime-application-x-kexi.png
diff --git a/pics/crystalsvg/cr32-mime-kformula_kfo.png b/pics/crystalsvg/cr32-mime-application-x-kformula.png
index 07186d476..07186d476 100644
--- a/pics/crystalsvg/cr32-mime-kformula_kfo.png
+++ b/pics/crystalsvg/cr32-mime-application-x-kformula.png
diff --git a/pics/crystalsvg/cr32-mime-kivio_flw.png b/pics/crystalsvg/cr32-mime-application-x-kivio.png
index e8d300cde..e8d300cde 100644
--- a/pics/crystalsvg/cr32-mime-kivio_flw.png
+++ b/pics/crystalsvg/cr32-mime-application-x-kivio.png
diff --git a/pics/crystalsvg/cr32-mime-kpresenter_kpr.png b/pics/crystalsvg/cr32-mime-application-x-kpresenter.png
index 26772b90a..26772b90a 100644
--- a/pics/crystalsvg/cr32-mime-kpresenter_kpr.png
+++ b/pics/crystalsvg/cr32-mime-application-x-kpresenter.png
diff --git a/pics/crystalsvg/cr32-mime-krita_kra.png b/pics/crystalsvg/cr32-mime-application-x-krita.png
index 76c2d9c2d..76c2d9c2d 100644
--- a/pics/crystalsvg/cr32-mime-krita_kra.png
+++ b/pics/crystalsvg/cr32-mime-application-x-krita.png
diff --git a/pics/crystalsvg/cr32-mime-kspread_ksp.png b/pics/crystalsvg/cr32-mime-application-x-kspread.png
index 3f1cfb698..3f1cfb698 100644
--- a/pics/crystalsvg/cr32-mime-kspread_ksp.png
+++ b/pics/crystalsvg/cr32-mime-application-x-kspread.png
diff --git a/pics/crystalsvg/cr32-mime-kugar_kud.png b/pics/crystalsvg/cr32-mime-application-x-kugar.png
index 3e1d71dc9..3e1d71dc9 100644
--- a/pics/crystalsvg/cr32-mime-kugar_kud.png
+++ b/pics/crystalsvg/cr32-mime-application-x-kugar.png
diff --git a/pics/crystalsvg/cr32-mime-dvi.png b/pics/crystalsvg/cr32-mime-application-x-lyx.png
index d2137c759..d2137c759 100644
--- a/pics/crystalsvg/cr32-mime-dvi.png
+++ b/pics/crystalsvg/cr32-mime-application-x-lyx.png
diff --git a/pics/crystalsvg/cr32-mime-metafont.png b/pics/crystalsvg/cr32-mime-application-x-metafont.png
index b18512344..b18512344 100644
--- a/pics/crystalsvg/cr32-mime-metafont.png
+++ b/pics/crystalsvg/cr32-mime-application-x-metafont.png
diff --git a/pics/crystalsvg/cr32-mime-exec_wine.png b/pics/crystalsvg/cr32-mime-application-x-mswinurl.png
index 503d7e15b..503d7e15b 100644
--- a/pics/crystalsvg/cr32-mime-exec_wine.png
+++ b/pics/crystalsvg/cr32-mime-application-x-mswinurl.png
diff --git a/pics/crystalsvg/cr32-mime-rpm.png b/pics/crystalsvg/cr32-mime-application-x-rpm.png
index 8c0ea5e1e..8c0ea5e1e 100644
--- a/pics/crystalsvg/cr32-mime-rpm.png
+++ b/pics/crystalsvg/cr32-mime-application-x-rpm.png
diff --git a/pics/crystalsvg/cr32-mime-soffice.png b/pics/crystalsvg/cr32-mime-application-x-soffice.png
index 6498d2291..6498d2291 100644
--- a/pics/crystalsvg/cr32-mime-soffice.png
+++ b/pics/crystalsvg/cr32-mime-application-x-soffice.png
diff --git a/pics/crystalsvg/cr32-mime-tar.png b/pics/crystalsvg/cr32-mime-application-x-tar.png
index 2d092f3a5..2d092f3a5 100644
--- a/pics/crystalsvg/cr32-mime-tar.png
+++ b/pics/crystalsvg/cr32-mime-application-x-tar.png
diff --git a/pics/crystalsvg/cr32-mime-tgz.png b/pics/crystalsvg/cr32-mime-application-x-tarz.png
index 85021b22a..85021b22a 100644
--- a/pics/crystalsvg/cr32-mime-tgz.png
+++ b/pics/crystalsvg/cr32-mime-application-x-tarz.png
diff --git a/pics/crystalsvg/cr32-mime-gf.png b/pics/crystalsvg/cr32-mime-application-x-tex-gf.png
index 41ddff69e..41ddff69e 100644
--- a/pics/crystalsvg/cr32-mime-gf.png
+++ b/pics/crystalsvg/cr32-mime-application-x-tex-gf.png
diff --git a/pics/crystalsvg/cr32-mime-pk.png b/pics/crystalsvg/cr32-mime-application-x-tex-pk.png
index 8e77ed5c9..8e77ed5c9 100644
--- a/pics/crystalsvg/cr32-mime-pk.png
+++ b/pics/crystalsvg/cr32-mime-application-x-tex-pk.png
diff --git a/pics/crystalsvg/cr32-mime-recycled.png b/pics/crystalsvg/cr32-mime-application-x-trash.png
index 40d17ed60..40d17ed60 100644
--- a/pics/crystalsvg/cr32-mime-recycled.png
+++ b/pics/crystalsvg/cr32-mime-application-x-trash.png
diff --git a/pics/crystalsvg/cr32-mime-man.png b/pics/crystalsvg/cr32-mime-application-x-troff-man.png
index 99b740ad4..99b740ad4 100644
--- a/pics/crystalsvg/cr32-mime-man.png
+++ b/pics/crystalsvg/cr32-mime-application-x-troff-man.png
diff --git a/pics/crystalsvg/cr32-mime-empty.png b/pics/crystalsvg/cr32-mime-application-x-zerosize.png
index f274fd436..f274fd436 100644
--- a/pics/crystalsvg/cr32-mime-empty.png
+++ b/pics/crystalsvg/cr32-mime-application-x-zerosize.png
diff --git a/pics/crystalsvg/cr32-mime-midi.png b/pics/crystalsvg/cr32-mime-audio-midi.png
index d07d039e2..d07d039e2 100644
--- a/pics/crystalsvg/cr32-mime-midi.png
+++ b/pics/crystalsvg/cr32-mime-audio-midi.png
diff --git a/pics/crystalsvg/cr32-mime-sound.png b/pics/crystalsvg/cr32-mime-audio-x-generic.png
index 9fefadaaf..9fefadaaf 100644
--- a/pics/crystalsvg/cr32-mime-sound.png
+++ b/pics/crystalsvg/cr32-mime-audio-x-generic.png
diff --git a/pics/crystalsvg/cr32-mime-font.png b/pics/crystalsvg/cr32-mime-font-x-generic.png
index 431ca00ec..431ca00ec 100644
--- a/pics/crystalsvg/cr32-mime-font.png
+++ b/pics/crystalsvg/cr32-mime-font-x-generic.png
diff --git a/pics/crystalsvg/cr32-mime-vectorgfx.png b/pics/crystalsvg/cr32-mime-image-svg+xml.png
index 7006d553c..7006d553c 100644
--- a/pics/crystalsvg/cr32-mime-vectorgfx.png
+++ b/pics/crystalsvg/cr32-mime-image-svg+xml.png
diff --git a/pics/crystalsvg/cr32-mime-image.png b/pics/crystalsvg/cr32-mime-image-x-generic.png
index d6a9bc31b..d6a9bc31b 100644
--- a/pics/crystalsvg/cr32-mime-image.png
+++ b/pics/crystalsvg/cr32-mime-image-x-generic.png
diff --git a/pics/crystalsvg/cr32-mime-html.png b/pics/crystalsvg/cr32-mime-text-html.png
index 9490e6e63..9490e6e63 100644
--- a/pics/crystalsvg/cr32-mime-html.png
+++ b/pics/crystalsvg/cr32-mime-text-html.png
diff --git a/pics/crystalsvg/cr32-mime-txt.png b/pics/crystalsvg/cr32-mime-text-plain.png
index c17e3c80a..c17e3c80a 100644
--- a/pics/crystalsvg/cr32-mime-txt.png
+++ b/pics/crystalsvg/cr32-mime-text-plain.png
diff --git a/pics/crystalsvg/cr32-mime-rtf.png b/pics/crystalsvg/cr32-mime-text-rtf.png
index f25dd9527..f25dd9527 100644
--- a/pics/crystalsvg/cr32-mime-rtf.png
+++ b/pics/crystalsvg/cr32-mime-text-rtf.png
diff --git a/pics/crystalsvg/cr32-mime-ascii.png b/pics/crystalsvg/cr32-mime-text-vnd.tde.ascii.png
index cdd115f4f..cdd115f4f 100644
--- a/pics/crystalsvg/cr32-mime-ascii.png
+++ b/pics/crystalsvg/cr32-mime-text-vnd.tde.ascii.png
diff --git a/pics/crystalsvg/cr32-mime-source_s.png b/pics/crystalsvg/cr32-mime-text-x-asm.png
index 9ead3cbc0..9ead3cbc0 100644
--- a/pics/crystalsvg/cr32-mime-source_s.png
+++ b/pics/crystalsvg/cr32-mime-text-x-asm.png
diff --git a/pics/crystalsvg/cr32-mime-source_cpp.png b/pics/crystalsvg/cr32-mime-text-x-c++src.png
index 26fbe224f..26fbe224f 100644
--- a/pics/crystalsvg/cr32-mime-source_cpp.png
+++ b/pics/crystalsvg/cr32-mime-text-x-c++src.png
diff --git a/pics/crystalsvg/cr32-mime-source_c.png b/pics/crystalsvg/cr32-mime-text-x-csrc.png
index 9a0096fb2..9a0096fb2 100644
--- a/pics/crystalsvg/cr32-mime-source_c.png
+++ b/pics/crystalsvg/cr32-mime-text-x-csrc.png
diff --git a/pics/crystalsvg/cr32-mime-source_f.png b/pics/crystalsvg/cr32-mime-text-x-fortran.png
index e1e6466d3..e1e6466d3 100644
--- a/pics/crystalsvg/cr32-mime-source_f.png
+++ b/pics/crystalsvg/cr32-mime-text-x-fortran.png
diff --git a/pics/crystalsvg/cr32-mime-document2.png b/pics/crystalsvg/cr32-mime-text-x-generic-template.png
index e22c50301..e22c50301 100644
--- a/pics/crystalsvg/cr32-mime-document2.png
+++ b/pics/crystalsvg/cr32-mime-text-x-generic-template.png
diff --git a/pics/crystalsvg/cr32-mime-document.png b/pics/crystalsvg/cr32-mime-text-x-generic.png
index 1ddec2794..1ddec2794 100644
--- a/pics/crystalsvg/cr32-mime-document.png
+++ b/pics/crystalsvg/cr32-mime-text-x-generic.png
diff --git a/pics/crystalsvg/cr32-mime-source_h.png b/pics/crystalsvg/cr32-mime-text-x-hsrc.png
index 394ca8578..394ca8578 100644
--- a/pics/crystalsvg/cr32-mime-source_h.png
+++ b/pics/crystalsvg/cr32-mime-text-x-hsrc.png
diff --git a/pics/crystalsvg/cr32-mime-source_java.png b/pics/crystalsvg/cr32-mime-text-x-java.png
index 17877c0d8..17877c0d8 100644
--- a/pics/crystalsvg/cr32-mime-source_java.png
+++ b/pics/crystalsvg/cr32-mime-text-x-java.png
diff --git a/pics/crystalsvg/cr32-mime-source_j.png b/pics/crystalsvg/cr32-mime-text-x-jsrc.png
index 6148fe562..6148fe562 100644
--- a/pics/crystalsvg/cr32-mime-source_j.png
+++ b/pics/crystalsvg/cr32-mime-text-x-jsrc.png
diff --git a/pics/crystalsvg/cr32-mime-unknown.png b/pics/crystalsvg/cr32-mime-text-x-katefilelist.png
index f274fd436..f274fd436 100644
--- a/pics/crystalsvg/cr32-mime-unknown.png
+++ b/pics/crystalsvg/cr32-mime-text-x-katefilelist.png
diff --git a/pics/crystalsvg/cr32-mime-log.png b/pics/crystalsvg/cr32-mime-text-x-log.png
index c491c08d5..c491c08d5 100644
--- a/pics/crystalsvg/cr32-mime-log.png
+++ b/pics/crystalsvg/cr32-mime-text-x-log.png
diff --git a/pics/crystalsvg/cr32-mime-source_l.png b/pics/crystalsvg/cr32-mime-text-x-lsrc.png
index b87b7a4db..b87b7a4db 100644
--- a/pics/crystalsvg/cr32-mime-source_l.png
+++ b/pics/crystalsvg/cr32-mime-text-x-lsrc.png
diff --git a/pics/crystalsvg/cr32-mime-make.png b/pics/crystalsvg/cr32-mime-text-x-makefile.png
index 99d8d82a5..99d8d82a5 100644
--- a/pics/crystalsvg/cr32-mime-make.png
+++ b/pics/crystalsvg/cr32-mime-text-x-makefile.png
diff --git a/pics/crystalsvg/cr32-mime-source_moc.png b/pics/crystalsvg/cr32-mime-text-x-mocsrc.png
index 2c5447e67..2c5447e67 100644
--- a/pics/crystalsvg/cr32-mime-source_moc.png
+++ b/pics/crystalsvg/cr32-mime-text-x-mocsrc.png
diff --git a/pics/crystalsvg/cr32-mime-source_o.png b/pics/crystalsvg/cr32-mime-text-x-osrc.png
index 3fdbe51bc..3fdbe51bc 100644
--- a/pics/crystalsvg/cr32-mime-source_o.png
+++ b/pics/crystalsvg/cr32-mime-text-x-osrc.png
diff --git a/pics/crystalsvg/cr32-mime-source_pl.png b/pics/crystalsvg/cr32-mime-text-x-perl.png
index 5731b387b..5731b387b 100644
--- a/pics/crystalsvg/cr32-mime-source_pl.png
+++ b/pics/crystalsvg/cr32-mime-text-x-perl.png
diff --git a/pics/crystalsvg/cr32-mime-source_php.png b/pics/crystalsvg/cr32-mime-text-x-php.png
index 67b966d59..67b966d59 100644
--- a/pics/crystalsvg/cr32-mime-source_php.png
+++ b/pics/crystalsvg/cr32-mime-text-x-php.png
diff --git a/pics/crystalsvg/cr32-mime-source_p.png b/pics/crystalsvg/cr32-mime-text-x-psrc.png
index e2b1266bc..e2b1266bc 100644
--- a/pics/crystalsvg/cr32-mime-source_p.png
+++ b/pics/crystalsvg/cr32-mime-text-x-psrc.png
diff --git a/pics/crystalsvg/cr32-mime-source_py.png b/pics/crystalsvg/cr32-mime-text-x-python.png
index b69b1d91e..b69b1d91e 100644
--- a/pics/crystalsvg/cr32-mime-source_py.png
+++ b/pics/crystalsvg/cr32-mime-text-x-python.png
diff --git a/pics/crystalsvg/cr32-mime-readme.png b/pics/crystalsvg/cr32-mime-text-x-readme.png
index 6785a42f3..6785a42f3 100644
--- a/pics/crystalsvg/cr32-mime-readme.png
+++ b/pics/crystalsvg/cr32-mime-text-x-readme.png
diff --git a/pics/crystalsvg/cr32-mime-shellscript.png b/pics/crystalsvg/cr32-mime-text-x-script.png
index a0f6727d7..a0f6727d7 100644
--- a/pics/crystalsvg/cr32-mime-shellscript.png
+++ b/pics/crystalsvg/cr32-mime-text-x-script.png
diff --git a/pics/crystalsvg/cr32-mime-source.png b/pics/crystalsvg/cr32-mime-text-x-src.png
index e9d7305f1..e9d7305f1 100644
--- a/pics/crystalsvg/cr32-mime-source.png
+++ b/pics/crystalsvg/cr32-mime-text-x-src.png
diff --git a/pics/crystalsvg/cr32-mime-tex.png b/pics/crystalsvg/cr32-mime-text-x-tex.png
index 7f9ecd901..7f9ecd901 100644
--- a/pics/crystalsvg/cr32-mime-tex.png
+++ b/pics/crystalsvg/cr32-mime-text-x-tex.png
diff --git a/pics/crystalsvg/cr32-mime-source_y.png b/pics/crystalsvg/cr32-mime-text-x-ysrc.png
index 779ddfcfb..779ddfcfb 100644
--- a/pics/crystalsvg/cr32-mime-source_y.png
+++ b/pics/crystalsvg/cr32-mime-text-x-ysrc.png
diff --git a/pics/crystalsvg/cr32-mime-video.png b/pics/crystalsvg/cr32-mime-video-x-generic.png
index de00f0ed1..de00f0ed1 100644
--- a/pics/crystalsvg/cr32-mime-video.png
+++ b/pics/crystalsvg/cr32-mime-video-x-generic.png
diff --git a/pics/crystalsvg/cr32-mime-quicktime.png b/pics/crystalsvg/cr32-mime-video-x-quicktime.png
index 637d39292..637d39292 100644
--- a/pics/crystalsvg/cr32-mime-quicktime.png
+++ b/pics/crystalsvg/cr32-mime-video-x-quicktime.png
diff --git a/pics/crystalsvg/cr32-mime-vcard.png b/pics/crystalsvg/cr32-mime-x-office-address-book.png
index 326feb106..326feb106 100644
--- a/pics/crystalsvg/cr32-mime-vcard.png
+++ b/pics/crystalsvg/cr32-mime-x-office-address-book.png
diff --git a/pics/crystalsvg/cr32-mime-vcalendar.png b/pics/crystalsvg/cr32-mime-x-office-calendar.png
index 4e0b082a5..4e0b082a5 100644
--- a/pics/crystalsvg/cr32-mime-vcalendar.png
+++ b/pics/crystalsvg/cr32-mime-x-office-calendar.png
diff --git a/pics/crystalsvg/cr32-mime-kword_kwd.png b/pics/crystalsvg/cr32-mime-x-office-document.png
index 599c01700..599c01700 100644
--- a/pics/crystalsvg/cr32-mime-kword_kwd.png
+++ b/pics/crystalsvg/cr32-mime-x-office-document.png
diff --git a/pics/crystalsvg/cr48-mime-netscape_doc.png b/pics/crystalsvg/cr48-mime-.png
index 82ab1860c..82ab1860c 100644
--- a/pics/crystalsvg/cr48-mime-netscape_doc.png
+++ b/pics/crystalsvg/cr48-mime-.png
diff --git a/pics/crystalsvg/cr48-mime-binary.png b/pics/crystalsvg/cr48-mime-application-octet-stream.png
index bb4651029..bb4651029 100644
--- a/pics/crystalsvg/cr48-mime-binary.png
+++ b/pics/crystalsvg/cr48-mime-application-octet-stream.png
diff --git a/pics/crystalsvg/cr48-mime-pdf.png b/pics/crystalsvg/cr48-mime-application-pdf.png
index 9dee72819..9dee72819 100644
--- a/pics/crystalsvg/cr48-mime-pdf.png
+++ b/pics/crystalsvg/cr48-mime-application-pdf.png
diff --git a/pics/crystalsvg/cr48-mime-postscript.png b/pics/crystalsvg/cr48-mime-application-postscript.png
index c9b1ec168..c9b1ec168 100644
--- a/pics/crystalsvg/cr48-mime-postscript.png
+++ b/pics/crystalsvg/cr48-mime-application-postscript.png
diff --git a/pics/crystalsvg/cr48-mime-database.png b/pics/crystalsvg/cr48-mime-application-vnd.oasis.opendocument.database.png
index 517ae3c48..517ae3c48 100644
--- a/pics/crystalsvg/cr48-mime-database.png
+++ b/pics/crystalsvg/cr48-mime-application-vnd.oasis.opendocument.database.png
diff --git a/pics/crystalsvg/cr48-mime-drawing.png b/pics/crystalsvg/cr48-mime-application-vnd.oasis.opendocument.graphics.png
index ad7a9cd0c..ad7a9cd0c 100644
--- a/pics/crystalsvg/cr48-mime-drawing.png
+++ b/pics/crystalsvg/cr48-mime-application-vnd.oasis.opendocument.graphics.png
diff --git a/pics/crystalsvg/cr48-mime-presentation.png b/pics/crystalsvg/cr48-mime-application-vnd.oasis.opendocument.presentation.png
index f2a50c933..f2a50c933 100644
--- a/pics/crystalsvg/cr48-mime-presentation.png
+++ b/pics/crystalsvg/cr48-mime-application-vnd.oasis.opendocument.presentation.png
diff --git a/pics/crystalsvg/cr48-mime-spreadsheet.png b/pics/crystalsvg/cr48-mime-application-vnd.oasis.opendocument.spreadsheet.png
index f6a8d5996..f6a8d5996 100644
--- a/pics/crystalsvg/cr48-mime-spreadsheet.png
+++ b/pics/crystalsvg/cr48-mime-application-vnd.oasis.opendocument.spreadsheet.png
diff --git a/pics/crystalsvg/cr48-mime-wordprocessing.png b/pics/crystalsvg/cr48-mime-application-vnd.oasis.opendocument.text.png
index 2f8b02fb8..2f8b02fb8 100644
--- a/pics/crystalsvg/cr48-mime-wordprocessing.png
+++ b/pics/crystalsvg/cr48-mime-application-vnd.oasis.opendocument.text.png
diff --git a/pics/crystalsvg/cr48-mime-info.png b/pics/crystalsvg/cr48-mime-application-vnd.tde.info.png
index f21142b51..f21142b51 100644
--- a/pics/crystalsvg/cr48-mime-info.png
+++ b/pics/crystalsvg/cr48-mime-application-vnd.tde.info.png
diff --git a/pics/crystalsvg/cr48-mime-misc.png b/pics/crystalsvg/cr48-mime-application-vnd.tde.misc.png
index 0808fdfd4..0808fdfd4 100644
--- a/pics/crystalsvg/cr48-mime-misc.png
+++ b/pics/crystalsvg/cr48-mime-application-vnd.tde.misc.png
diff --git a/pics/crystalsvg/cr48-mime-zip.png b/pics/crystalsvg/cr48-mime-application-vnd.tde.overlay.zip.png
index 7294e5db8..7294e5db8 100644
--- a/pics/crystalsvg/cr48-mime-zip.png
+++ b/pics/crystalsvg/cr48-mime-application-vnd.tde.overlay.zip.png
diff --git a/pics/crystalsvg/cr48-mime-resource.png b/pics/crystalsvg/cr48-mime-application-vnd.tde.resource.png
index 8abea7bb8..8abea7bb8 100644
--- a/pics/crystalsvg/cr48-mime-resource.png
+++ b/pics/crystalsvg/cr48-mime-application-vnd.tde.resource.png
diff --git a/pics/crystalsvg/cr48-mime-tdemultiple.png b/pics/crystalsvg/cr48-mime-application-vnd.tde.tdemultiple.png
index 00651fcd2..00651fcd2 100644
--- a/pics/crystalsvg/cr48-mime-tdemultiple.png
+++ b/pics/crystalsvg/cr48-mime-application-vnd.tde.tdemultiple.png
diff --git a/pics/crystalsvg/cr48-mime-template_source.png b/pics/crystalsvg/cr48-mime-application-vnd.tde.template_source.png
index f37438397..f37438397 100644
--- a/pics/crystalsvg/cr48-mime-template_source.png
+++ b/pics/crystalsvg/cr48-mime-application-vnd.tde.template_source.png
diff --git a/pics/crystalsvg/cr48-mime-txt2.png b/pics/crystalsvg/cr48-mime-application-vnd.tde.text.alt.png
index 8a796f9be..8a796f9be 100644
--- a/pics/crystalsvg/cr48-mime-txt2.png
+++ b/pics/crystalsvg/cr48-mime-application-vnd.tde.text.alt.png
diff --git a/pics/crystalsvg/cr48-mime-applix.png b/pics/crystalsvg/cr48-mime-application-x-applix-word.png
index 3316d8383..3316d8383 100644
--- a/pics/crystalsvg/cr48-mime-applix.png
+++ b/pics/crystalsvg/cr48-mime-application-x-applix-word.png
diff --git a/pics/crystalsvg/cr48-mime-bt.png b/pics/crystalsvg/cr48-mime-application-x-bittorrent.png
index 5ca3f1ded..5ca3f1ded 100644
--- a/pics/crystalsvg/cr48-mime-bt.png
+++ b/pics/crystalsvg/cr48-mime-application-x-bittorrent.png
diff --git a/pics/crystalsvg/cr48-mime-cdimage.png b/pics/crystalsvg/cr48-mime-application-x-cd-image.png
index bdf7c9180..bdf7c9180 100644
--- a/pics/crystalsvg/cr48-mime-cdimage.png
+++ b/pics/crystalsvg/cr48-mime-application-x-cd-image.png
diff --git a/pics/crystalsvg/cr48-mime-cdtrack.png b/pics/crystalsvg/cr48-mime-application-x-cda.png
index 359ea8e81..359ea8e81 100644
--- a/pics/crystalsvg/cr48-mime-cdtrack.png
+++ b/pics/crystalsvg/cr48-mime-application-x-cda.png
diff --git a/pics/crystalsvg/cr48-mime-cdr.png b/pics/crystalsvg/cr48-mime-application-x-cdr.png
index d767779b7..d767779b7 100644
--- a/pics/crystalsvg/cr48-mime-cdr.png
+++ b/pics/crystalsvg/cr48-mime-application-x-cdr.png
diff --git a/pics/crystalsvg/cr48-mime-core.png b/pics/crystalsvg/cr48-mime-application-x-core.png
index b37fa6faa..b37fa6faa 100644
--- a/pics/crystalsvg/cr48-mime-core.png
+++ b/pics/crystalsvg/cr48-mime-application-x-core.png
diff --git a/pics/crystalsvg/cr48-mime-deb.png b/pics/crystalsvg/cr48-mime-application-x-deb.png
index 000b8bc13..000b8bc13 100644
--- a/pics/crystalsvg/cr48-mime-deb.png
+++ b/pics/crystalsvg/cr48-mime-application-x-deb.png
diff --git a/pics/crystalsvg/cr48-mime-widget_doc.png b/pics/crystalsvg/cr48-mime-application-x-designer.png
index 72460168c..72460168c 100644
--- a/pics/crystalsvg/cr48-mime-widget_doc.png
+++ b/pics/crystalsvg/cr48-mime-application-x-designer.png
diff --git a/pics/crystalsvg/cr48-mime-font_bitmap.png b/pics/crystalsvg/cr48-mime-application-x-font-snf.png
index 1e6a9eb2a..1e6a9eb2a 100644
--- a/pics/crystalsvg/cr48-mime-font_bitmap.png
+++ b/pics/crystalsvg/cr48-mime-application-x-font-snf.png
diff --git a/pics/crystalsvg/cr48-mime-font_truetype.png b/pics/crystalsvg/cr48-mime-application-x-font-ttf.png
index d843013da..d843013da 100644
--- a/pics/crystalsvg/cr48-mime-font_truetype.png
+++ b/pics/crystalsvg/cr48-mime-application-x-font-ttf.png
diff --git a/pics/crystalsvg/cr48-mime-font_type1.png b/pics/crystalsvg/cr48-mime-application-x-font-type1.png
index c40bb5c24..c40bb5c24 100644
--- a/pics/crystalsvg/cr48-mime-font_type1.png
+++ b/pics/crystalsvg/cr48-mime-application-x-font-type1.png
diff --git a/pics/crystalsvg/cr48-mime-gettext.png b/pics/crystalsvg/cr48-mime-application-x-gettext.png
index c40bb5c24..c40bb5c24 100644
--- a/pics/crystalsvg/cr48-mime-gettext.png
+++ b/pics/crystalsvg/cr48-mime-application-x-gettext.png
diff --git a/pics/crystalsvg/cr48-mime-karbon_karbon.png b/pics/crystalsvg/cr48-mime-application-x-karbon.png
index 2cfdf5271..2cfdf5271 100644
--- a/pics/crystalsvg/cr48-mime-karbon_karbon.png
+++ b/pics/crystalsvg/cr48-mime-application-x-karbon.png
diff --git a/pics/crystalsvg/cr48-mime-kchart_chrt.png b/pics/crystalsvg/cr48-mime-application-x-kchart.png
index f841f91f6..f841f91f6 100644
--- a/pics/crystalsvg/cr48-mime-kchart_chrt.png
+++ b/pics/crystalsvg/cr48-mime-application-x-kchart.png
diff --git a/pics/crystalsvg/cr48-mime-colorscm.png b/pics/crystalsvg/cr48-mime-application-x-kcsrc.png
index 4aa04d607..4aa04d607 100644
--- a/pics/crystalsvg/cr48-mime-colorscm.png
+++ b/pics/crystalsvg/cr48-mime-application-x-kcsrc.png
diff --git a/pics/crystalsvg/cr48-mime-kexi_kexi.png b/pics/crystalsvg/cr48-mime-application-x-kexi.png
index b140db8aa..b140db8aa 100644
--- a/pics/crystalsvg/cr48-mime-kexi_kexi.png
+++ b/pics/crystalsvg/cr48-mime-application-x-kexi.png
diff --git a/pics/crystalsvg/cr48-mime-kformula_kfo.png b/pics/crystalsvg/cr48-mime-application-x-kformula.png
index d6902ff35..d6902ff35 100644
--- a/pics/crystalsvg/cr48-mime-kformula_kfo.png
+++ b/pics/crystalsvg/cr48-mime-application-x-kformula.png
diff --git a/pics/crystalsvg/cr48-mime-kivio_flw.png b/pics/crystalsvg/cr48-mime-application-x-kivio.png
index 8821912cc..8821912cc 100644
--- a/pics/crystalsvg/cr48-mime-kivio_flw.png
+++ b/pics/crystalsvg/cr48-mime-application-x-kivio.png
diff --git a/pics/crystalsvg/cr48-mime-kpresenter_kpr.png b/pics/crystalsvg/cr48-mime-application-x-kpresenter.png
index 30c1c6561..30c1c6561 100644
--- a/pics/crystalsvg/cr48-mime-kpresenter_kpr.png
+++ b/pics/crystalsvg/cr48-mime-application-x-kpresenter.png
diff --git a/pics/crystalsvg/cr48-mime-krita_kra.png b/pics/crystalsvg/cr48-mime-application-x-krita.png
index e52f17554..e52f17554 100644
--- a/pics/crystalsvg/cr48-mime-krita_kra.png
+++ b/pics/crystalsvg/cr48-mime-application-x-krita.png
diff --git a/pics/crystalsvg/cr48-mime-kspread_ksp.png b/pics/crystalsvg/cr48-mime-application-x-kspread.png
index df1b750e4..df1b750e4 100644
--- a/pics/crystalsvg/cr48-mime-kspread_ksp.png
+++ b/pics/crystalsvg/cr48-mime-application-x-kspread.png
diff --git a/pics/crystalsvg/cr48-mime-kugar_kud.png b/pics/crystalsvg/cr48-mime-application-x-kugar.png
index fed9f1028..fed9f1028 100644
--- a/pics/crystalsvg/cr48-mime-kugar_kud.png
+++ b/pics/crystalsvg/cr48-mime-application-x-kugar.png
diff --git a/pics/crystalsvg/cr48-mime-dvi.png b/pics/crystalsvg/cr48-mime-application-x-lyx.png
index b74aee209..b74aee209 100644
--- a/pics/crystalsvg/cr48-mime-dvi.png
+++ b/pics/crystalsvg/cr48-mime-application-x-lyx.png
diff --git a/pics/crystalsvg/cr48-mime-metafont.png b/pics/crystalsvg/cr48-mime-application-x-metafont.png
index fae5827cc..fae5827cc 100644
--- a/pics/crystalsvg/cr48-mime-metafont.png
+++ b/pics/crystalsvg/cr48-mime-application-x-metafont.png
diff --git a/pics/crystalsvg/cr48-mime-exec_wine.png b/pics/crystalsvg/cr48-mime-application-x-mswinurl.png
index 1e57f9537..1e57f9537 100644
--- a/pics/crystalsvg/cr48-mime-exec_wine.png
+++ b/pics/crystalsvg/cr48-mime-application-x-mswinurl.png
diff --git a/pics/crystalsvg/cr48-mime-rpm.png b/pics/crystalsvg/cr48-mime-application-x-rpm.png
index 70b1ab609..70b1ab609 100644
--- a/pics/crystalsvg/cr48-mime-rpm.png
+++ b/pics/crystalsvg/cr48-mime-application-x-rpm.png
diff --git a/pics/crystalsvg/cr48-mime-soffice.png b/pics/crystalsvg/cr48-mime-application-x-soffice.png
index eed7d172f..eed7d172f 100644
--- a/pics/crystalsvg/cr48-mime-soffice.png
+++ b/pics/crystalsvg/cr48-mime-application-x-soffice.png
diff --git a/pics/crystalsvg/cr48-mime-tar.png b/pics/crystalsvg/cr48-mime-application-x-tar.png
index d3bf2ab41..d3bf2ab41 100644
--- a/pics/crystalsvg/cr48-mime-tar.png
+++ b/pics/crystalsvg/cr48-mime-application-x-tar.png
diff --git a/pics/crystalsvg/cr48-mime-tgz.png b/pics/crystalsvg/cr48-mime-application-x-tarz.png
index 535d82fe8..535d82fe8 100644
--- a/pics/crystalsvg/cr48-mime-tgz.png
+++ b/pics/crystalsvg/cr48-mime-application-x-tarz.png
diff --git a/pics/crystalsvg/cr48-mime-gf.png b/pics/crystalsvg/cr48-mime-application-x-tex-gf.png
index b6d592757..b6d592757 100644
--- a/pics/crystalsvg/cr48-mime-gf.png
+++ b/pics/crystalsvg/cr48-mime-application-x-tex-gf.png
diff --git a/pics/crystalsvg/cr48-mime-pk.png b/pics/crystalsvg/cr48-mime-application-x-tex-pk.png
index 79f096124..79f096124 100644
--- a/pics/crystalsvg/cr48-mime-pk.png
+++ b/pics/crystalsvg/cr48-mime-application-x-tex-pk.png
diff --git a/pics/crystalsvg/cr48-mime-recycled.png b/pics/crystalsvg/cr48-mime-application-x-trash.png
index d70b01eb4..d70b01eb4 100644
--- a/pics/crystalsvg/cr48-mime-recycled.png
+++ b/pics/crystalsvg/cr48-mime-application-x-trash.png
diff --git a/pics/crystalsvg/cr48-mime-man.png b/pics/crystalsvg/cr48-mime-application-x-troff-man.png
index b221fd55f..b221fd55f 100644
--- a/pics/crystalsvg/cr48-mime-man.png
+++ b/pics/crystalsvg/cr48-mime-application-x-troff-man.png
diff --git a/pics/crystalsvg/cr48-mime-empty.png b/pics/crystalsvg/cr48-mime-application-x-zerosize.png
index 399dcc7b8..399dcc7b8 100644
--- a/pics/crystalsvg/cr48-mime-empty.png
+++ b/pics/crystalsvg/cr48-mime-application-x-zerosize.png
diff --git a/pics/crystalsvg/cr48-mime-midi.png b/pics/crystalsvg/cr48-mime-audio-midi.png
index 519c3f7b4..519c3f7b4 100644
--- a/pics/crystalsvg/cr48-mime-midi.png
+++ b/pics/crystalsvg/cr48-mime-audio-midi.png
diff --git a/pics/crystalsvg/cr48-mime-sound.png b/pics/crystalsvg/cr48-mime-audio-x-generic.png
index b80dc415a..b80dc415a 100644
--- a/pics/crystalsvg/cr48-mime-sound.png
+++ b/pics/crystalsvg/cr48-mime-audio-x-generic.png
diff --git a/pics/crystalsvg/cr48-mime-font.png b/pics/crystalsvg/cr48-mime-font-x-generic.png
index 21a04810e..21a04810e 100644
--- a/pics/crystalsvg/cr48-mime-font.png
+++ b/pics/crystalsvg/cr48-mime-font-x-generic.png
diff --git a/pics/crystalsvg/cr48-mime-vectorgfx.png b/pics/crystalsvg/cr48-mime-image-svg+xml.png
index b1b34ba41..b1b34ba41 100644
--- a/pics/crystalsvg/cr48-mime-vectorgfx.png
+++ b/pics/crystalsvg/cr48-mime-image-svg+xml.png
diff --git a/pics/crystalsvg/cr48-mime-image.png b/pics/crystalsvg/cr48-mime-image-x-generic.png
index e174c3a1b..e174c3a1b 100644
--- a/pics/crystalsvg/cr48-mime-image.png
+++ b/pics/crystalsvg/cr48-mime-image-x-generic.png
diff --git a/pics/crystalsvg/cr48-mime-html.png b/pics/crystalsvg/cr48-mime-text-html.png
index bddde59c0..bddde59c0 100644
--- a/pics/crystalsvg/cr48-mime-html.png
+++ b/pics/crystalsvg/cr48-mime-text-html.png
diff --git a/pics/crystalsvg/cr48-mime-txt.png b/pics/crystalsvg/cr48-mime-text-plain.png
index 6456b1373..6456b1373 100644
--- a/pics/crystalsvg/cr48-mime-txt.png
+++ b/pics/crystalsvg/cr48-mime-text-plain.png
diff --git a/pics/crystalsvg/cr48-mime-rtf.png b/pics/crystalsvg/cr48-mime-text-rtf.png
index 2fe6e7c87..2fe6e7c87 100644
--- a/pics/crystalsvg/cr48-mime-rtf.png
+++ b/pics/crystalsvg/cr48-mime-text-rtf.png
diff --git a/pics/crystalsvg/cr48-mime-ascii.png b/pics/crystalsvg/cr48-mime-text-vnd.tde.ascii.png
index 39af2b38e..39af2b38e 100644
--- a/pics/crystalsvg/cr48-mime-ascii.png
+++ b/pics/crystalsvg/cr48-mime-text-vnd.tde.ascii.png
diff --git a/pics/crystalsvg/cr48-mime-source_s.png b/pics/crystalsvg/cr48-mime-text-x-asm.png
index a0504ef46..a0504ef46 100644
--- a/pics/crystalsvg/cr48-mime-source_s.png
+++ b/pics/crystalsvg/cr48-mime-text-x-asm.png
diff --git a/pics/crystalsvg/cr48-mime-source_cpp.png b/pics/crystalsvg/cr48-mime-text-x-c++src.png
index b4a44c910..b4a44c910 100644
--- a/pics/crystalsvg/cr48-mime-source_cpp.png
+++ b/pics/crystalsvg/cr48-mime-text-x-c++src.png
diff --git a/pics/crystalsvg/cr48-mime-source_c.png b/pics/crystalsvg/cr48-mime-text-x-csrc.png
index e2f303814..e2f303814 100644
--- a/pics/crystalsvg/cr48-mime-source_c.png
+++ b/pics/crystalsvg/cr48-mime-text-x-csrc.png
diff --git a/pics/crystalsvg/cr48-mime-source_f.png b/pics/crystalsvg/cr48-mime-text-x-fortran.png
index 34723c1c1..34723c1c1 100644
--- a/pics/crystalsvg/cr48-mime-source_f.png
+++ b/pics/crystalsvg/cr48-mime-text-x-fortran.png
diff --git a/pics/crystalsvg/cr48-mime-document2.png b/pics/crystalsvg/cr48-mime-text-x-generic-template.png
index 029e12ae7..029e12ae7 100644
--- a/pics/crystalsvg/cr48-mime-document2.png
+++ b/pics/crystalsvg/cr48-mime-text-x-generic-template.png
diff --git a/pics/crystalsvg/cr48-mime-document.png b/pics/crystalsvg/cr48-mime-text-x-generic.png
index 21f079bf4..21f079bf4 100644
--- a/pics/crystalsvg/cr48-mime-document.png
+++ b/pics/crystalsvg/cr48-mime-text-x-generic.png
diff --git a/pics/crystalsvg/cr48-mime-source_h.png b/pics/crystalsvg/cr48-mime-text-x-hsrc.png
index 4b7915c8f..4b7915c8f 100644
--- a/pics/crystalsvg/cr48-mime-source_h.png
+++ b/pics/crystalsvg/cr48-mime-text-x-hsrc.png
diff --git a/pics/crystalsvg/cr48-mime-source_java.png b/pics/crystalsvg/cr48-mime-text-x-java.png
index dd0da8456..dd0da8456 100644
--- a/pics/crystalsvg/cr48-mime-source_java.png
+++ b/pics/crystalsvg/cr48-mime-text-x-java.png
diff --git a/pics/crystalsvg/cr48-mime-source_j.png b/pics/crystalsvg/cr48-mime-text-x-jsrc.png
index ff7a41bbe..ff7a41bbe 100644
--- a/pics/crystalsvg/cr48-mime-source_j.png
+++ b/pics/crystalsvg/cr48-mime-text-x-jsrc.png
diff --git a/pics/crystalsvg/cr48-mime-unknown.png b/pics/crystalsvg/cr48-mime-text-x-katefilelist.png
index 3cd16fc1d..3cd16fc1d 100644
--- a/pics/crystalsvg/cr48-mime-unknown.png
+++ b/pics/crystalsvg/cr48-mime-text-x-katefilelist.png
diff --git a/pics/crystalsvg/cr48-mime-log.png b/pics/crystalsvg/cr48-mime-text-x-log.png
index 869da6d7e..869da6d7e 100644
--- a/pics/crystalsvg/cr48-mime-log.png
+++ b/pics/crystalsvg/cr48-mime-text-x-log.png
diff --git a/pics/crystalsvg/cr48-mime-source_l.png b/pics/crystalsvg/cr48-mime-text-x-lsrc.png
index 7230464d7..7230464d7 100644
--- a/pics/crystalsvg/cr48-mime-source_l.png
+++ b/pics/crystalsvg/cr48-mime-text-x-lsrc.png
diff --git a/pics/crystalsvg/cr48-mime-make.png b/pics/crystalsvg/cr48-mime-text-x-makefile.png
index f3631a87c..f3631a87c 100644
--- a/pics/crystalsvg/cr48-mime-make.png
+++ b/pics/crystalsvg/cr48-mime-text-x-makefile.png
diff --git a/pics/crystalsvg/cr48-mime-source_moc.png b/pics/crystalsvg/cr48-mime-text-x-mocsrc.png
index d199e18f0..d199e18f0 100644
--- a/pics/crystalsvg/cr48-mime-source_moc.png
+++ b/pics/crystalsvg/cr48-mime-text-x-mocsrc.png
diff --git a/pics/crystalsvg/cr48-mime-source_o.png b/pics/crystalsvg/cr48-mime-text-x-osrc.png
index 31185e7bb..31185e7bb 100644
--- a/pics/crystalsvg/cr48-mime-source_o.png
+++ b/pics/crystalsvg/cr48-mime-text-x-osrc.png
diff --git a/pics/crystalsvg/cr48-mime-source_pl.png b/pics/crystalsvg/cr48-mime-text-x-perl.png
index 50d005b26..50d005b26 100644
--- a/pics/crystalsvg/cr48-mime-source_pl.png
+++ b/pics/crystalsvg/cr48-mime-text-x-perl.png
diff --git a/pics/crystalsvg/cr48-mime-source_php.png b/pics/crystalsvg/cr48-mime-text-x-php.png
index 61ef1029a..61ef1029a 100644
--- a/pics/crystalsvg/cr48-mime-source_php.png
+++ b/pics/crystalsvg/cr48-mime-text-x-php.png
diff --git a/pics/crystalsvg/cr48-mime-source_p.png b/pics/crystalsvg/cr48-mime-text-x-psrc.png
index 6c1191285..6c1191285 100644
--- a/pics/crystalsvg/cr48-mime-source_p.png
+++ b/pics/crystalsvg/cr48-mime-text-x-psrc.png
diff --git a/pics/crystalsvg/cr48-mime-source_py.png b/pics/crystalsvg/cr48-mime-text-x-python.png
index a9c9d2334..a9c9d2334 100644
--- a/pics/crystalsvg/cr48-mime-source_py.png
+++ b/pics/crystalsvg/cr48-mime-text-x-python.png
diff --git a/pics/crystalsvg/cr48-mime-readme.png b/pics/crystalsvg/cr48-mime-text-x-readme.png
index 45e66bcdc..45e66bcdc 100644
--- a/pics/crystalsvg/cr48-mime-readme.png
+++ b/pics/crystalsvg/cr48-mime-text-x-readme.png
diff --git a/pics/crystalsvg/cr48-mime-shellscript.png b/pics/crystalsvg/cr48-mime-text-x-script.png
index bc37e0d09..bc37e0d09 100644
--- a/pics/crystalsvg/cr48-mime-shellscript.png
+++ b/pics/crystalsvg/cr48-mime-text-x-script.png
diff --git a/pics/crystalsvg/cr48-mime-source.png b/pics/crystalsvg/cr48-mime-text-x-src.png
index ee1314074..ee1314074 100644
--- a/pics/crystalsvg/cr48-mime-source.png
+++ b/pics/crystalsvg/cr48-mime-text-x-src.png
diff --git a/pics/crystalsvg/cr48-mime-tex.png b/pics/crystalsvg/cr48-mime-text-x-tex.png
index 6cab0339a..6cab0339a 100644
--- a/pics/crystalsvg/cr48-mime-tex.png
+++ b/pics/crystalsvg/cr48-mime-text-x-tex.png
diff --git a/pics/crystalsvg/cr48-mime-source_y.png b/pics/crystalsvg/cr48-mime-text-x-ysrc.png
index 50abba6af..50abba6af 100644
--- a/pics/crystalsvg/cr48-mime-source_y.png
+++ b/pics/crystalsvg/cr48-mime-text-x-ysrc.png
diff --git a/pics/crystalsvg/cr48-mime-video.png b/pics/crystalsvg/cr48-mime-video-x-generic.png
index 20127110b..20127110b 100644
--- a/pics/crystalsvg/cr48-mime-video.png
+++ b/pics/crystalsvg/cr48-mime-video-x-generic.png
diff --git a/pics/crystalsvg/cr48-mime-quicktime.png b/pics/crystalsvg/cr48-mime-video-x-quicktime.png
index fa14e61c7..fa14e61c7 100644
--- a/pics/crystalsvg/cr48-mime-quicktime.png
+++ b/pics/crystalsvg/cr48-mime-video-x-quicktime.png
diff --git a/pics/crystalsvg/cr48-mime-vcard.png b/pics/crystalsvg/cr48-mime-x-office-address-book.png
index 5031409ba..5031409ba 100644
--- a/pics/crystalsvg/cr48-mime-vcard.png
+++ b/pics/crystalsvg/cr48-mime-x-office-address-book.png
diff --git a/pics/crystalsvg/cr48-mime-vcalendar.png b/pics/crystalsvg/cr48-mime-x-office-calendar.png
index f31178350..f31178350 100644
--- a/pics/crystalsvg/cr48-mime-vcalendar.png
+++ b/pics/crystalsvg/cr48-mime-x-office-calendar.png
diff --git a/pics/crystalsvg/cr48-mime-kword_kwd.png b/pics/crystalsvg/cr48-mime-x-office-document.png
index 4610ed6da..4610ed6da 100644
--- a/pics/crystalsvg/cr48-mime-kword_kwd.png
+++ b/pics/crystalsvg/cr48-mime-x-office-document.png
diff --git a/pics/crystalsvg/cr64-mime-netscape_doc.png b/pics/crystalsvg/cr64-mime-.png
index ff29e35c3..ff29e35c3 100644
--- a/pics/crystalsvg/cr64-mime-netscape_doc.png
+++ b/pics/crystalsvg/cr64-mime-.png
diff --git a/pics/crystalsvg/cr64-mime-binary.png b/pics/crystalsvg/cr64-mime-application-octet-stream.png
index 11f7c8317..11f7c8317 100644
--- a/pics/crystalsvg/cr64-mime-binary.png
+++ b/pics/crystalsvg/cr64-mime-application-octet-stream.png
diff --git a/pics/crystalsvg/cr64-mime-pdf.png b/pics/crystalsvg/cr64-mime-application-pdf.png
index 96756b5df..96756b5df 100644
--- a/pics/crystalsvg/cr64-mime-pdf.png
+++ b/pics/crystalsvg/cr64-mime-application-pdf.png
diff --git a/pics/crystalsvg/cr64-mime-postscript.png b/pics/crystalsvg/cr64-mime-application-postscript.png
index 8d5ff928f..8d5ff928f 100644
--- a/pics/crystalsvg/cr64-mime-postscript.png
+++ b/pics/crystalsvg/cr64-mime-application-postscript.png
diff --git a/pics/crystalsvg/cr64-mime-database.png b/pics/crystalsvg/cr64-mime-application-vnd.oasis.opendocument.database.png
index bca874a2b..bca874a2b 100644
--- a/pics/crystalsvg/cr64-mime-database.png
+++ b/pics/crystalsvg/cr64-mime-application-vnd.oasis.opendocument.database.png
diff --git a/pics/crystalsvg/cr64-mime-drawing.png b/pics/crystalsvg/cr64-mime-application-vnd.oasis.opendocument.graphics.png
index 451395f9c..451395f9c 100644
--- a/pics/crystalsvg/cr64-mime-drawing.png
+++ b/pics/crystalsvg/cr64-mime-application-vnd.oasis.opendocument.graphics.png
diff --git a/pics/crystalsvg/cr64-mime-presentation.png b/pics/crystalsvg/cr64-mime-application-vnd.oasis.opendocument.presentation.png
index d00656fe4..d00656fe4 100644
--- a/pics/crystalsvg/cr64-mime-presentation.png
+++ b/pics/crystalsvg/cr64-mime-application-vnd.oasis.opendocument.presentation.png
diff --git a/pics/crystalsvg/cr64-mime-spreadsheet.png b/pics/crystalsvg/cr64-mime-application-vnd.oasis.opendocument.spreadsheet.png
index 62a0df003..62a0df003 100644
--- a/pics/crystalsvg/cr64-mime-spreadsheet.png
+++ b/pics/crystalsvg/cr64-mime-application-vnd.oasis.opendocument.spreadsheet.png
diff --git a/pics/crystalsvg/cr64-mime-wordprocessing.png b/pics/crystalsvg/cr64-mime-application-vnd.oasis.opendocument.text.png
index ec0c7ad05..ec0c7ad05 100644
--- a/pics/crystalsvg/cr64-mime-wordprocessing.png
+++ b/pics/crystalsvg/cr64-mime-application-vnd.oasis.opendocument.text.png
diff --git a/pics/crystalsvg/cr64-mime-info.png b/pics/crystalsvg/cr64-mime-application-vnd.tde.info.png
index 3a75f4a78..3a75f4a78 100644
--- a/pics/crystalsvg/cr64-mime-info.png
+++ b/pics/crystalsvg/cr64-mime-application-vnd.tde.info.png
diff --git a/pics/crystalsvg/cr64-mime-misc.png b/pics/crystalsvg/cr64-mime-application-vnd.tde.misc.png
index 699f73437..699f73437 100644
--- a/pics/crystalsvg/cr64-mime-misc.png
+++ b/pics/crystalsvg/cr64-mime-application-vnd.tde.misc.png
diff --git a/pics/crystalsvg/cr64-mime-zip.png b/pics/crystalsvg/cr64-mime-application-vnd.tde.overlay.zip.png
index 728b000db..728b000db 100644
--- a/pics/crystalsvg/cr64-mime-zip.png
+++ b/pics/crystalsvg/cr64-mime-application-vnd.tde.overlay.zip.png
diff --git a/pics/crystalsvg/cr64-mime-resource.png b/pics/crystalsvg/cr64-mime-application-vnd.tde.resource.png
index 761853843..761853843 100644
--- a/pics/crystalsvg/cr64-mime-resource.png
+++ b/pics/crystalsvg/cr64-mime-application-vnd.tde.resource.png
diff --git a/pics/crystalsvg/cr64-mime-tdemultiple.png b/pics/crystalsvg/cr64-mime-application-vnd.tde.tdemultiple.png
index ee7a8194e..ee7a8194e 100644
--- a/pics/crystalsvg/cr64-mime-tdemultiple.png
+++ b/pics/crystalsvg/cr64-mime-application-vnd.tde.tdemultiple.png
diff --git a/pics/crystalsvg/cr64-mime-template_source.png b/pics/crystalsvg/cr64-mime-application-vnd.tde.template_source.png
index 399e40313..399e40313 100644
--- a/pics/crystalsvg/cr64-mime-template_source.png
+++ b/pics/crystalsvg/cr64-mime-application-vnd.tde.template_source.png
diff --git a/pics/crystalsvg/cr64-mime-txt2.png b/pics/crystalsvg/cr64-mime-application-vnd.tde.text.alt.png
index 753a7af5c..753a7af5c 100644
--- a/pics/crystalsvg/cr64-mime-txt2.png
+++ b/pics/crystalsvg/cr64-mime-application-vnd.tde.text.alt.png
diff --git a/pics/crystalsvg/cr64-mime-applix.png b/pics/crystalsvg/cr64-mime-application-x-applix-word.png
index aa67eb0f9..aa67eb0f9 100644
--- a/pics/crystalsvg/cr64-mime-applix.png
+++ b/pics/crystalsvg/cr64-mime-application-x-applix-word.png
diff --git a/pics/crystalsvg/cr64-mime-bt.png b/pics/crystalsvg/cr64-mime-application-x-bittorrent.png
index 2ccbdd74e..2ccbdd74e 100644
--- a/pics/crystalsvg/cr64-mime-bt.png
+++ b/pics/crystalsvg/cr64-mime-application-x-bittorrent.png
diff --git a/pics/crystalsvg/cr64-mime-cdimage.png b/pics/crystalsvg/cr64-mime-application-x-cd-image.png
index f63d20f7e..f63d20f7e 100644
--- a/pics/crystalsvg/cr64-mime-cdimage.png
+++ b/pics/crystalsvg/cr64-mime-application-x-cd-image.png
diff --git a/pics/crystalsvg/cr64-mime-cdtrack.png b/pics/crystalsvg/cr64-mime-application-x-cda.png
index 90d5dfe62..90d5dfe62 100644
--- a/pics/crystalsvg/cr64-mime-cdtrack.png
+++ b/pics/crystalsvg/cr64-mime-application-x-cda.png
diff --git a/pics/crystalsvg/cr64-mime-cdr.png b/pics/crystalsvg/cr64-mime-application-x-cdr.png
index 5523c4042..5523c4042 100644
--- a/pics/crystalsvg/cr64-mime-cdr.png
+++ b/pics/crystalsvg/cr64-mime-application-x-cdr.png
diff --git a/pics/crystalsvg/cr64-mime-core.png b/pics/crystalsvg/cr64-mime-application-x-core.png
index 8c60308a4..8c60308a4 100644
--- a/pics/crystalsvg/cr64-mime-core.png
+++ b/pics/crystalsvg/cr64-mime-application-x-core.png
diff --git a/pics/crystalsvg/cr64-mime-deb.png b/pics/crystalsvg/cr64-mime-application-x-deb.png
index 2af353874..2af353874 100644
--- a/pics/crystalsvg/cr64-mime-deb.png
+++ b/pics/crystalsvg/cr64-mime-application-x-deb.png
diff --git a/pics/crystalsvg/cr64-mime-widget_doc.png b/pics/crystalsvg/cr64-mime-application-x-designer.png
index db7771283..db7771283 100644
--- a/pics/crystalsvg/cr64-mime-widget_doc.png
+++ b/pics/crystalsvg/cr64-mime-application-x-designer.png
diff --git a/pics/crystalsvg/cr64-mime-font_bitmap.png b/pics/crystalsvg/cr64-mime-application-x-font-snf.png
index e952db734..e952db734 100644
--- a/pics/crystalsvg/cr64-mime-font_bitmap.png
+++ b/pics/crystalsvg/cr64-mime-application-x-font-snf.png
diff --git a/pics/crystalsvg/cr64-mime-font_truetype.png b/pics/crystalsvg/cr64-mime-application-x-font-ttf.png
index 2978a16f3..2978a16f3 100644
--- a/pics/crystalsvg/cr64-mime-font_truetype.png
+++ b/pics/crystalsvg/cr64-mime-application-x-font-ttf.png
diff --git a/pics/crystalsvg/cr64-mime-font_type1.png b/pics/crystalsvg/cr64-mime-application-x-font-type1.png
index 8474db7f8..8474db7f8 100644
--- a/pics/crystalsvg/cr64-mime-font_type1.png
+++ b/pics/crystalsvg/cr64-mime-application-x-font-type1.png
diff --git a/pics/crystalsvg/cr64-mime-karbon_karbon.png b/pics/crystalsvg/cr64-mime-application-x-karbon.png
index f4d0a3c32..f4d0a3c32 100644
--- a/pics/crystalsvg/cr64-mime-karbon_karbon.png
+++ b/pics/crystalsvg/cr64-mime-application-x-karbon.png
diff --git a/pics/crystalsvg/cr64-mime-kchart_chrt.png b/pics/crystalsvg/cr64-mime-application-x-kchart.png
index a771fc163..a771fc163 100644
--- a/pics/crystalsvg/cr64-mime-kchart_chrt.png
+++ b/pics/crystalsvg/cr64-mime-application-x-kchart.png
diff --git a/pics/crystalsvg/cr64-mime-colorscm.png b/pics/crystalsvg/cr64-mime-application-x-kcsrc.png
index 60bf80274..60bf80274 100644
--- a/pics/crystalsvg/cr64-mime-colorscm.png
+++ b/pics/crystalsvg/cr64-mime-application-x-kcsrc.png
diff --git a/pics/crystalsvg/cr64-mime-kformula_kfo.png b/pics/crystalsvg/cr64-mime-application-x-kformula.png
index 4b6f2f8d7..4b6f2f8d7 100644
--- a/pics/crystalsvg/cr64-mime-kformula_kfo.png
+++ b/pics/crystalsvg/cr64-mime-application-x-kformula.png
diff --git a/pics/crystalsvg/cr64-mime-kivio_flw.png b/pics/crystalsvg/cr64-mime-application-x-kivio.png
index 52aec1490..52aec1490 100644
--- a/pics/crystalsvg/cr64-mime-kivio_flw.png
+++ b/pics/crystalsvg/cr64-mime-application-x-kivio.png
diff --git a/pics/crystalsvg/cr64-mime-kpresenter_kpr.png b/pics/crystalsvg/cr64-mime-application-x-kpresenter.png
index 8ab1fd955..8ab1fd955 100644
--- a/pics/crystalsvg/cr64-mime-kpresenter_kpr.png
+++ b/pics/crystalsvg/cr64-mime-application-x-kpresenter.png
diff --git a/pics/crystalsvg/cr64-mime-krita_kra.png b/pics/crystalsvg/cr64-mime-application-x-krita.png
index 1647ebe5b..1647ebe5b 100644
--- a/pics/crystalsvg/cr64-mime-krita_kra.png
+++ b/pics/crystalsvg/cr64-mime-application-x-krita.png
diff --git a/pics/crystalsvg/cr64-mime-kspread_ksp.png b/pics/crystalsvg/cr64-mime-application-x-kspread.png
index f4e234d6e..f4e234d6e 100644
--- a/pics/crystalsvg/cr64-mime-kspread_ksp.png
+++ b/pics/crystalsvg/cr64-mime-application-x-kspread.png
diff --git a/pics/crystalsvg/cr64-mime-kugar_kud.png b/pics/crystalsvg/cr64-mime-application-x-kugar.png
index 7b627da50..7b627da50 100644
--- a/pics/crystalsvg/cr64-mime-kugar_kud.png
+++ b/pics/crystalsvg/cr64-mime-application-x-kugar.png
diff --git a/pics/crystalsvg/cr64-mime-dvi.png b/pics/crystalsvg/cr64-mime-application-x-lyx.png
index 9d0ea9ddc..9d0ea9ddc 100644
--- a/pics/crystalsvg/cr64-mime-dvi.png
+++ b/pics/crystalsvg/cr64-mime-application-x-lyx.png
diff --git a/pics/crystalsvg/cr64-mime-metafont.png b/pics/crystalsvg/cr64-mime-application-x-metafont.png
index d573e73a7..d573e73a7 100644
--- a/pics/crystalsvg/cr64-mime-metafont.png
+++ b/pics/crystalsvg/cr64-mime-application-x-metafont.png
diff --git a/pics/crystalsvg/cr64-mime-exec_wine.png b/pics/crystalsvg/cr64-mime-application-x-mswinurl.png
index b8a25d046..b8a25d046 100644
--- a/pics/crystalsvg/cr64-mime-exec_wine.png
+++ b/pics/crystalsvg/cr64-mime-application-x-mswinurl.png
diff --git a/pics/crystalsvg/cr64-mime-rpm.png b/pics/crystalsvg/cr64-mime-application-x-rpm.png
index e14d5b349..e14d5b349 100644
--- a/pics/crystalsvg/cr64-mime-rpm.png
+++ b/pics/crystalsvg/cr64-mime-application-x-rpm.png
diff --git a/pics/crystalsvg/cr64-mime-soffice.png b/pics/crystalsvg/cr64-mime-application-x-soffice.png
index 1855af575..1855af575 100644
--- a/pics/crystalsvg/cr64-mime-soffice.png
+++ b/pics/crystalsvg/cr64-mime-application-x-soffice.png
diff --git a/pics/crystalsvg/cr64-mime-tar.png b/pics/crystalsvg/cr64-mime-application-x-tar.png
index 352f7e81b..352f7e81b 100644
--- a/pics/crystalsvg/cr64-mime-tar.png
+++ b/pics/crystalsvg/cr64-mime-application-x-tar.png
diff --git a/pics/crystalsvg/cr64-mime-tgz.png b/pics/crystalsvg/cr64-mime-application-x-tarz.png
index 16ebc4b9e..16ebc4b9e 100644
--- a/pics/crystalsvg/cr64-mime-tgz.png
+++ b/pics/crystalsvg/cr64-mime-application-x-tarz.png
diff --git a/pics/crystalsvg/cr64-mime-gf.png b/pics/crystalsvg/cr64-mime-application-x-tex-gf.png
index 5b45f2017..5b45f2017 100644
--- a/pics/crystalsvg/cr64-mime-gf.png
+++ b/pics/crystalsvg/cr64-mime-application-x-tex-gf.png
diff --git a/pics/crystalsvg/cr64-mime-pk.png b/pics/crystalsvg/cr64-mime-application-x-tex-pk.png
index 52cf5d62c..52cf5d62c 100644
--- a/pics/crystalsvg/cr64-mime-pk.png
+++ b/pics/crystalsvg/cr64-mime-application-x-tex-pk.png
diff --git a/pics/crystalsvg/cr64-mime-recycled.png b/pics/crystalsvg/cr64-mime-application-x-trash.png
index 501109f34..501109f34 100644
--- a/pics/crystalsvg/cr64-mime-recycled.png
+++ b/pics/crystalsvg/cr64-mime-application-x-trash.png
diff --git a/pics/crystalsvg/cr64-mime-man.png b/pics/crystalsvg/cr64-mime-application-x-troff-man.png
index c95bead13..c95bead13 100644
--- a/pics/crystalsvg/cr64-mime-man.png
+++ b/pics/crystalsvg/cr64-mime-application-x-troff-man.png
diff --git a/pics/crystalsvg/cr64-mime-empty.png b/pics/crystalsvg/cr64-mime-application-x-zerosize.png
index c8b61c061..c8b61c061 100644
--- a/pics/crystalsvg/cr64-mime-empty.png
+++ b/pics/crystalsvg/cr64-mime-application-x-zerosize.png
diff --git a/pics/crystalsvg/cr64-mime-midi.png b/pics/crystalsvg/cr64-mime-audio-midi.png
index eba026303..eba026303 100644
--- a/pics/crystalsvg/cr64-mime-midi.png
+++ b/pics/crystalsvg/cr64-mime-audio-midi.png
diff --git a/pics/crystalsvg/cr64-mime-sound.png b/pics/crystalsvg/cr64-mime-audio-x-generic.png
index 20e124a67..20e124a67 100644
--- a/pics/crystalsvg/cr64-mime-sound.png
+++ b/pics/crystalsvg/cr64-mime-audio-x-generic.png
diff --git a/pics/crystalsvg/cr64-mime-font.png b/pics/crystalsvg/cr64-mime-font-x-generic.png
index 05078fa80..05078fa80 100644
--- a/pics/crystalsvg/cr64-mime-font.png
+++ b/pics/crystalsvg/cr64-mime-font-x-generic.png
diff --git a/pics/crystalsvg/cr64-mime-vectorgfx.png b/pics/crystalsvg/cr64-mime-image-svg+xml.png
index abae2227b..abae2227b 100644
--- a/pics/crystalsvg/cr64-mime-vectorgfx.png
+++ b/pics/crystalsvg/cr64-mime-image-svg+xml.png
diff --git a/pics/crystalsvg/cr64-mime-image.png b/pics/crystalsvg/cr64-mime-image-x-generic.png
index 787eebc3b..787eebc3b 100644
--- a/pics/crystalsvg/cr64-mime-image.png
+++ b/pics/crystalsvg/cr64-mime-image-x-generic.png
diff --git a/pics/crystalsvg/cr64-mime-html.png b/pics/crystalsvg/cr64-mime-text-html.png
index da2e70958..da2e70958 100644
--- a/pics/crystalsvg/cr64-mime-html.png
+++ b/pics/crystalsvg/cr64-mime-text-html.png
diff --git a/pics/crystalsvg/cr64-mime-txt.png b/pics/crystalsvg/cr64-mime-text-plain.png
index fcd323000..fcd323000 100644
--- a/pics/crystalsvg/cr64-mime-txt.png
+++ b/pics/crystalsvg/cr64-mime-text-plain.png
diff --git a/pics/crystalsvg/cr64-mime-rtf.png b/pics/crystalsvg/cr64-mime-text-rtf.png
index 29ced93d1..29ced93d1 100644
--- a/pics/crystalsvg/cr64-mime-rtf.png
+++ b/pics/crystalsvg/cr64-mime-text-rtf.png
diff --git a/pics/crystalsvg/cr64-mime-ascii.png b/pics/crystalsvg/cr64-mime-text-vnd.tde.ascii.png
index f87f166f0..f87f166f0 100644
--- a/pics/crystalsvg/cr64-mime-ascii.png
+++ b/pics/crystalsvg/cr64-mime-text-vnd.tde.ascii.png
diff --git a/pics/crystalsvg/cr64-mime-source_s.png b/pics/crystalsvg/cr64-mime-text-x-asm.png
index 4ab913a3d..4ab913a3d 100644
--- a/pics/crystalsvg/cr64-mime-source_s.png
+++ b/pics/crystalsvg/cr64-mime-text-x-asm.png
diff --git a/pics/crystalsvg/cr64-mime-source_cpp.png b/pics/crystalsvg/cr64-mime-text-x-c++src.png
index 74def256a..74def256a 100644
--- a/pics/crystalsvg/cr64-mime-source_cpp.png
+++ b/pics/crystalsvg/cr64-mime-text-x-c++src.png
diff --git a/pics/crystalsvg/cr64-mime-source_c.png b/pics/crystalsvg/cr64-mime-text-x-csrc.png
index 8244b717d..8244b717d 100644
--- a/pics/crystalsvg/cr64-mime-source_c.png
+++ b/pics/crystalsvg/cr64-mime-text-x-csrc.png
diff --git a/pics/crystalsvg/cr64-mime-source_f.png b/pics/crystalsvg/cr64-mime-text-x-fortran.png
index ee121645e..ee121645e 100644
--- a/pics/crystalsvg/cr64-mime-source_f.png
+++ b/pics/crystalsvg/cr64-mime-text-x-fortran.png
diff --git a/pics/crystalsvg/cr64-mime-document2.png b/pics/crystalsvg/cr64-mime-text-x-generic-template.png
index 39b547c70..39b547c70 100644
--- a/pics/crystalsvg/cr64-mime-document2.png
+++ b/pics/crystalsvg/cr64-mime-text-x-generic-template.png
diff --git a/pics/crystalsvg/cr64-mime-document.png b/pics/crystalsvg/cr64-mime-text-x-generic.png
index ed0799b92..ed0799b92 100644
--- a/pics/crystalsvg/cr64-mime-document.png
+++ b/pics/crystalsvg/cr64-mime-text-x-generic.png
diff --git a/pics/crystalsvg/cr64-mime-source_h.png b/pics/crystalsvg/cr64-mime-text-x-hsrc.png
index aaf61a8f6..aaf61a8f6 100644
--- a/pics/crystalsvg/cr64-mime-source_h.png
+++ b/pics/crystalsvg/cr64-mime-text-x-hsrc.png
diff --git a/pics/crystalsvg/cr64-mime-source_java.png b/pics/crystalsvg/cr64-mime-text-x-java.png
index 02b63d5c0..02b63d5c0 100644
--- a/pics/crystalsvg/cr64-mime-source_java.png
+++ b/pics/crystalsvg/cr64-mime-text-x-java.png
diff --git a/pics/crystalsvg/cr64-mime-source_j.png b/pics/crystalsvg/cr64-mime-text-x-jsrc.png
index f6bd8efb8..f6bd8efb8 100644
--- a/pics/crystalsvg/cr64-mime-source_j.png
+++ b/pics/crystalsvg/cr64-mime-text-x-jsrc.png
diff --git a/pics/crystalsvg/cr64-mime-unknown.png b/pics/crystalsvg/cr64-mime-text-x-katefilelist.png
index 2ce620f4c..2ce620f4c 100644
--- a/pics/crystalsvg/cr64-mime-unknown.png
+++ b/pics/crystalsvg/cr64-mime-text-x-katefilelist.png
diff --git a/pics/crystalsvg/cr64-mime-log.png b/pics/crystalsvg/cr64-mime-text-x-log.png
index bd84d83be..bd84d83be 100644
--- a/pics/crystalsvg/cr64-mime-log.png
+++ b/pics/crystalsvg/cr64-mime-text-x-log.png
diff --git a/pics/crystalsvg/cr64-mime-source_l.png b/pics/crystalsvg/cr64-mime-text-x-lsrc.png
index 38e09ba97..38e09ba97 100644
--- a/pics/crystalsvg/cr64-mime-source_l.png
+++ b/pics/crystalsvg/cr64-mime-text-x-lsrc.png
diff --git a/pics/crystalsvg/cr64-mime-make.png b/pics/crystalsvg/cr64-mime-text-x-makefile.png
index 340032664..340032664 100644
--- a/pics/crystalsvg/cr64-mime-make.png
+++ b/pics/crystalsvg/cr64-mime-text-x-makefile.png
diff --git a/pics/crystalsvg/cr64-mime-source_moc.png b/pics/crystalsvg/cr64-mime-text-x-mocsrc.png
index 8ee40b944..8ee40b944 100644
--- a/pics/crystalsvg/cr64-mime-source_moc.png
+++ b/pics/crystalsvg/cr64-mime-text-x-mocsrc.png
diff --git a/pics/crystalsvg/cr64-mime-source_o.png b/pics/crystalsvg/cr64-mime-text-x-osrc.png
index 5cf084e3c..5cf084e3c 100644
--- a/pics/crystalsvg/cr64-mime-source_o.png
+++ b/pics/crystalsvg/cr64-mime-text-x-osrc.png
diff --git a/pics/crystalsvg/cr64-mime-source_pl.png b/pics/crystalsvg/cr64-mime-text-x-perl.png
index d626116df..d626116df 100644
--- a/pics/crystalsvg/cr64-mime-source_pl.png
+++ b/pics/crystalsvg/cr64-mime-text-x-perl.png
diff --git a/pics/crystalsvg/cr64-mime-source_php.png b/pics/crystalsvg/cr64-mime-text-x-php.png
index 93582511c..93582511c 100644
--- a/pics/crystalsvg/cr64-mime-source_php.png
+++ b/pics/crystalsvg/cr64-mime-text-x-php.png
diff --git a/pics/crystalsvg/cr64-mime-source_p.png b/pics/crystalsvg/cr64-mime-text-x-psrc.png
index 20616ce03..20616ce03 100644
--- a/pics/crystalsvg/cr64-mime-source_p.png
+++ b/pics/crystalsvg/cr64-mime-text-x-psrc.png
diff --git a/pics/crystalsvg/cr64-mime-source_py.png b/pics/crystalsvg/cr64-mime-text-x-python.png
index c0361fcaf..c0361fcaf 100644
--- a/pics/crystalsvg/cr64-mime-source_py.png
+++ b/pics/crystalsvg/cr64-mime-text-x-python.png
diff --git a/pics/crystalsvg/cr64-mime-readme.png b/pics/crystalsvg/cr64-mime-text-x-readme.png
index 980e17e1a..980e17e1a 100644
--- a/pics/crystalsvg/cr64-mime-readme.png
+++ b/pics/crystalsvg/cr64-mime-text-x-readme.png
diff --git a/pics/crystalsvg/cr64-mime-shellscript.png b/pics/crystalsvg/cr64-mime-text-x-script.png
index 5d3145272..5d3145272 100644
--- a/pics/crystalsvg/cr64-mime-shellscript.png
+++ b/pics/crystalsvg/cr64-mime-text-x-script.png
diff --git a/pics/crystalsvg/cr64-mime-source.png b/pics/crystalsvg/cr64-mime-text-x-src.png
index 6ea5b6da3..6ea5b6da3 100644
--- a/pics/crystalsvg/cr64-mime-source.png
+++ b/pics/crystalsvg/cr64-mime-text-x-src.png
diff --git a/pics/crystalsvg/cr64-mime-tex.png b/pics/crystalsvg/cr64-mime-text-x-tex.png
index f10e24fc9..f10e24fc9 100644
--- a/pics/crystalsvg/cr64-mime-tex.png
+++ b/pics/crystalsvg/cr64-mime-text-x-tex.png
diff --git a/pics/crystalsvg/cr64-mime-source_y.png b/pics/crystalsvg/cr64-mime-text-x-ysrc.png
index 80b004f39..80b004f39 100644
--- a/pics/crystalsvg/cr64-mime-source_y.png
+++ b/pics/crystalsvg/cr64-mime-text-x-ysrc.png
diff --git a/pics/crystalsvg/cr64-mime-video.png b/pics/crystalsvg/cr64-mime-video-x-generic.png
index 9dfb9a58a..9dfb9a58a 100644
--- a/pics/crystalsvg/cr64-mime-video.png
+++ b/pics/crystalsvg/cr64-mime-video-x-generic.png
diff --git a/pics/crystalsvg/cr64-mime-quicktime.png b/pics/crystalsvg/cr64-mime-video-x-quicktime.png
index 77d4f2a89..77d4f2a89 100644
--- a/pics/crystalsvg/cr64-mime-quicktime.png
+++ b/pics/crystalsvg/cr64-mime-video-x-quicktime.png
diff --git a/pics/crystalsvg/cr64-mime-vcard.png b/pics/crystalsvg/cr64-mime-x-office-address-book.png
index b77335cbf..b77335cbf 100644
--- a/pics/crystalsvg/cr64-mime-vcard.png
+++ b/pics/crystalsvg/cr64-mime-x-office-address-book.png
diff --git a/pics/crystalsvg/cr64-mime-vcalendar.png b/pics/crystalsvg/cr64-mime-x-office-calendar.png
index b8eb4bfad..b8eb4bfad 100644
--- a/pics/crystalsvg/cr64-mime-vcalendar.png
+++ b/pics/crystalsvg/cr64-mime-x-office-calendar.png
diff --git a/pics/crystalsvg/cr64-mime-kword_kwd.png b/pics/crystalsvg/cr64-mime-x-office-document.png
index 270ced99f..270ced99f 100644
--- a/pics/crystalsvg/cr64-mime-kword_kwd.png
+++ b/pics/crystalsvg/cr64-mime-x-office-document.png
diff --git a/tdeabc/tdeab2tdeabc.desktop b/tdeabc/tdeab2tdeabc.desktop
index cfc12913e..2c335a53c 100644
--- a/tdeabc/tdeab2tdeabc.desktop
+++ b/tdeabc/tdeab2tdeabc.desktop
@@ -15,7 +15,7 @@ Name[sv]=Kab2kabc
 Name[te]=కెఎబి2కెఎబిసి
 Name[zu]=i-tdeab2tdeabc
 Exec=tdeab2tdeabc --disable-autostart --quiet
-Icon=misc
+Icon=application-vnd.tde.misc
 Type=Application
 Comment=libkab to libtdeabc conversion tool.
 Comment[af]=libkab na libtdeabc omskakeling program.
diff --git a/tdecore/kicontheme.cpp b/tdecore/kicontheme.cpp
index 544eefe01..4b9306142 100644
--- a/tdecore/kicontheme.cpp
+++ b/tdecore/kicontheme.cpp
@@ -156,7 +156,7 @@ TDEIconTheme::TDEIconTheme(const TQString& name, const TQString& appName)
     d->screenshot = cfg.readPathEntry("ScreenShot");
     d->linkOverlay = cfg.readEntry("LinkOverlay", "link");
     d->lockOverlay = cfg.readEntry("LockOverlay", "lock");
-    d->zipOverlay = cfg.readEntry("ZipOverlay", "zip");
+    d->zipOverlay = cfg.readEntry("ZipOverlay", "application-vnd.tde.overlay.zip");
     d->shareOverlay = cfg.readEntry("ShareOverlay","share");
 
     TQStringList dirs = cfg.readPathListEntry("Directories");
diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index fbc947c57..eee9c9ee5 100644
--- a/tdeio/tdefile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -239,9 +239,9 @@ KNotifyWidget::KNotifyWidget( TQWidget *parent, const char *name,
 
     TQPixmap pexec = SmallIcon("exec");
     TQPixmap pstderr = SmallIcon("terminal");
-    TQPixmap pmessage = SmallIcon("info");
-    TQPixmap plogfile = SmallIcon("log");
-    TQPixmap psound = SmallIcon("sound");
+    TQPixmap pmessage = SmallIcon("application-vnd.tde.info");
+    TQPixmap plogfile = SmallIcon("text-x-log");
+    TQPixmap psound = SmallIcon("audio-x-generic");
     TQPixmap ptaskbar = SmallIcon("kicker");
 
     d->pixmaps[COL_EXECUTE] = pexec;
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 0d2df33e0..0aaf2f40e 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -826,7 +826,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props )
       if ( (*it)->mode() != mode )
         mode = (mode_t)0;
       if ( KMimeType::iconForURL(url, mode) != iconStr )
-        iconStr = "tdemultiple";
+        iconStr = "application-vnd.tde.tdemultiple";
       if ( url.directory() != directory )
         directory = TQString::null;
       if ( url.protocol() != protocol )
diff --git a/tdeio/tdefile/tdefiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp
index 2f7166ed6..5e7fe804a 100644
--- a/tdeio/tdefile/tdefiledetailview.cpp
+++ b/tdeio/tdefile/tdefiledetailview.cpp
@@ -543,7 +543,7 @@ TQDragObject *KFileDetailView::dragObject()
     }
     TQPixmap pixmap;
     if( urls.count() > 1 )
-        pixmap = DesktopIcon( "tdemultiple", TDEIcon::SizeSmall );
+        pixmap = DesktopIcon( "application-vnd.tde.tdemultiple", TDEIcon::SizeSmall );
     if( pixmap.isNull() )
         pixmap = currentFileItem()->pixmap( TDEIcon::SizeSmall );
 
diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp
index d4be8a58f..90d2b2a10 100644
--- a/tdeio/tdefile/tdefileiconview.cpp
+++ b/tdeio/tdefile/tdefileiconview.cpp
@@ -819,7 +819,7 @@ TQDragObject *KFileIconView::dragObject()
     }
     TQPixmap pixmap;
     if( urls.count() > 1 )
-        pixmap = DesktopIcon( "tdemultiple", iconSize() );
+        pixmap = DesktopIcon( "application-vnd.tde.tdemultiple", iconSize() );
     if( pixmap.isNull() )
         pixmap = currentFileItem()->pixmap( iconSize() );
 
diff --git a/tdeio/tdefile/tdefiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp
index cb7432423..2710d4c08 100644
--- a/tdeio/tdefile/tdefiletreeview.cpp
+++ b/tdeio/tdefile/tdefiletreeview.cpp
@@ -262,7 +262,7 @@ TQDragObject * KFileTreeView::dragObject()
    TQPoint hotspot;
    TQPixmap pixmap;
    if( urls.count() > 1 ){
-      pixmap = DesktopIcon( "tdemultiple", 16 );
+      pixmap = DesktopIcon( "application-vnd.tde.tdemultiple", 16 );
    }
    if( pixmap.isNull() )
       pixmap = currentKFileTreeViewItem()->fileItem()->pixmap( 16 );
diff --git a/tdeio/tdeio/kmimetype.cpp b/tdeio/tdeio/kmimetype.cpp
index d1bd940eb..13e3e70af 100644
--- a/tdeio/tdeio/kmimetype.cpp
+++ b/tdeio/tdeio/kmimetype.cpp
@@ -752,7 +752,7 @@ TQPixmap KDEDesktopMimeType::pixmap( const KURL& _url, TDEIcon::Group _group, in
   TQPixmap pix = TDEGlobal::iconLoader()->loadIcon( _icon, _group,
         _force_size, _state, _path, false );
   if ( pix.isNull() )
-      pix = TDEGlobal::iconLoader()->loadIcon( "unknown", _group,
+      pix = TDEGlobal::iconLoader()->loadIcon( ""text-x-katefilelist", _group,
         _force_size, _state, _path, false );
   return pix;
 }
diff --git a/tdeioslave/file/file.protocol b/tdeioslave/file/file.protocol
index c2a12f0fd..0b8a1769b 100644
--- a/tdeioslave/file/file.protocol
+++ b/tdeioslave/file/file.protocol
@@ -13,4 +13,4 @@ moving=true
 maxInstances=4
 DocPath=tdeioslave/file/index.html
 Class=:local
-Icon=document-new
+Icon=text-x-text-x-generic-new
diff --git a/tdemdi/tdemdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp
index be7c00929..7df8dbf6b 100644
--- a/tdemdi/tdemdi/dockcontainer.cpp
+++ b/tdemdi/tdemdi/dockcontainer.cpp
@@ -203,7 +203,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt
       connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeOverlapMode()));
     }
 
-    m_tb->appendTab(pixmap.isNull()?SmallIcon("misc"):pixmap,tab,w->tabPageLabel());
+    m_tb->appendTab(pixmap.isNull()?SmallIcon("application-vnd.tde.misc"):pixmap,tab,w->tabPageLabel());
     m_tb->tab(tab)->installEventFilter( this );
     kdDebug(760)<<"NAMENAMENAMENAME:===========================:"<<w->tabPageLabel()<<endl;
 
@@ -457,7 +457,7 @@ void DockContainer::setPixmap(KDockWidget* widget ,const TQPixmap& pixmap)
   int id=m_ws->id(widget);
   if (id==-1) return;
   KMultiTabBarTab *tab=m_tb->tab(id);
-  tab->setIcon(pixmap.isNull()?SmallIcon("misc"):pixmap);
+  tab->setIcon(pixmap.isNull()?SmallIcon("application-vnd.tde.misc"):pixmap);
 }
 
 void DockContainer::save(TDEConfig* cfg,const TQString& group_or_prefix)
diff --git a/tdemdi/tdemdi/mainwindow.cpp b/tdemdi/tdemdi/mainwindow.cpp
index 3b10a1b98..42db02036 100644
--- a/tdemdi/tdemdi/mainwindow.cpp
+++ b/tdemdi/tdemdi/mainwindow.cpp
@@ -144,10 +144,10 @@ void MainWindow::setupMainDock ()
 
 void MainWindow::setupToolViews ()
 {
-  m_leftContainer = createDockWidget("KMdiDock::leftDock",SmallIcon("misc"),0L,"Left Dock");
-  m_rightContainer = createDockWidget("KMdiDock::rightDock",SmallIcon("misc"),0L,"Right Dock");
-  m_topContainer = createDockWidget("KMdiDock::topDock",SmallIcon("misc"),0L,"Top Dock");
-  m_bottomContainer = createDockWidget("KMdiDock::bottomDock",SmallIcon("misc"),0L,"Bottom Dock");
+  m_leftContainer = createDockWidget("KMdiDock::leftDock",SmallIcon("application-vnd.tde.misc"),0L,"Left Dock");
+  m_rightContainer = createDockWidget("KMdiDock::rightDock",SmallIcon("application-vnd.tde.misc"),0L,"Right Dock");
+  m_topContainer = createDockWidget("KMdiDock::topDock",SmallIcon("application-vnd.tde.misc"),0L,"Top Dock");
+  m_bottomContainer = createDockWidget("KMdiDock::bottomDock",SmallIcon("application-vnd.tde.misc"),0L,"Bottom Dock");
 
   KDockWidget *mainDock=getMainDockWidget();
   KDockWidget *w=mainDock;
diff --git a/tdemdi/tdemdidockcontainer.cpp b/tdemdi/tdemdidockcontainer.cpp
index d6771b597..36c99d3af 100644
--- a/tdemdi/tdemdidockcontainer.cpp
+++ b/tdemdi/tdemdidockcontainer.cpp
@@ -226,7 +226,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const
 			connect( btn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changeOverlapMode() ) );
 		}
 
-		m_tb->appendTab( pixmap.isNull() ? SmallIcon( "misc" ) : pixmap, tab, w->tabPageLabel() );
+		m_tb->appendTab( pixmap.isNull() ? SmallIcon( "application-vnd.tde.misc" ) : pixmap, tab, w->tabPageLabel() );
 		m_tb->tab( tab )->installEventFilter( this );
 		kdDebug( 760 ) << k_funcinfo << "Added tab with label " << w->tabPageLabel() <<
 			" to the tabbar" << endl;
@@ -509,7 +509,7 @@ void KMdiDockContainer::setPixmap( KDockWidget* widget , const TQPixmap& pixmap
 	if ( id == -1 )
 		return ;
 	KMultiTabBarTab *tab = m_tb->tab( id );
-	tab->setIcon( pixmap.isNull() ? SmallIcon( "misc" ) : pixmap );
+	tab->setIcon( pixmap.isNull() ? SmallIcon( "application-vnd.tde.misc" ) : pixmap );
 }
 
 void KMdiDockContainer::save( TQDomElement& dockEl )
diff --git a/tdemdi/tdemdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp
index 19059e12e..cc3972e71 100644
--- a/tdemdi/tdemdimainfrm.cpp
+++ b/tdemdi/tdemdimainfrm.cpp
@@ -1923,10 +1923,10 @@ void KMdiMainFrm::findToolViewsDockedToMain( TQPtrList<KDockWidget>* list, KDock
 
 void KMdiMainFrm::setupToolViewsForIDEALMode()
 {
-	m_leftContainer = createDockWidget( "KMdiDock::leftDock", SmallIcon( "misc" ), 0L, "Left Dock" );
-	m_rightContainer = createDockWidget( "KMdiDock::rightDock", SmallIcon( "misc" ), 0L, "Right Dock" );
-	m_topContainer = createDockWidget( "KMdiDock::topDock", SmallIcon( "misc" ), 0L, "Top Dock" );
-	m_bottomContainer = createDockWidget( "KMdiDock::bottomDock", SmallIcon( "misc" ), 0L, "Bottom Dock" );
+	m_leftContainer = createDockWidget( "KMdiDock::leftDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Left Dock" );
+	m_rightContainer = createDockWidget( "KMdiDock::rightDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Right Dock" );
+	m_topContainer = createDockWidget( "KMdiDock::topDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Top Dock" );
+	m_bottomContainer = createDockWidget( "KMdiDock::bottomDock", SmallIcon( "application-vnd.tde.misc" ), 0L, "Bottom Dock" );
 
 	KDockWidget *mainDock = getMainDockWidget();
 	KDockWidget *w = mainDock;
diff --git a/tdeprint/driveritem.cpp b/tdeprint/driveritem.cpp
index 2a73a07e5..0b66c51d9 100644
--- a/tdeprint/driveritem.cpp
+++ b/tdeprint/driveritem.cpp
@@ -36,7 +36,7 @@ DriverItem::DriverItem(TQListViewItem *parent, TQListViewItem *after, DrBase *it
 : TQListViewItem(parent, after), m_item(item), m_conflict(false)
 {
 	setOpen(depth() < 3);
-	if (item) setPixmap(0,SmallIcon((item->isOption() ? "document" : "folder")));
+	if (item) setPixmap(0,SmallIcon((item->isOption() ? "text-x-generic" : "folder")));
 	updateText();
 }
 
diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp
index 47ba4a2a7..1fe9a51f2 100644
--- a/tdeprint/management/kxmlcommanddlg.cpp
+++ b/tdeprint/management/kxmlcommanddlg.cpp
@@ -93,7 +93,7 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam
 	m_addgrp = new TQToolButton(this);
 	m_addgrp->setIconSet(SmallIconSet("folder"));
 	m_addopt = new TQToolButton(this);
-	m_addopt->setIconSet(SmallIconSet("document"));
+	m_addopt->setIconSet(SmallIconSet("text-x-generic"));
 	m_delopt = new TQToolButton(this);
 	m_delopt->setIconSet(SmallIconSet("edit-delete"));
 	m_up = new TQToolButton(this);
@@ -424,7 +424,7 @@ void KXmlCommandAdvancedDlg::parseGroupItem(DrGroup *grp, TQListViewItem *parent
 		}
 		oit.current()->setName(namestr);
 		item = new TQListViewItem(parent, item, oit.current()->get("text"), namestr);
-		item->setPixmap(0, SmallIcon("document"));
+		item->setPixmap(0, SmallIcon("text-x-generic"));
 		item->setRenameEnabled(0, true);
 		m_opts[namestr] = oit.current();
 	}
@@ -670,7 +670,7 @@ void KXmlCommandAdvancedDlg::slotAddOption()
 
 		TQListViewItem	*item = new TQListViewItem(m_view->currentItem(), i18n("New Option"), ID);
 		item->setRenameEnabled(0, true);
-		item->setPixmap(0, SmallIcon("document"));
+		item->setPixmap(0, SmallIcon("text-x-generic"));
 		m_view->ensureItemVisible(item);
 		item->startRename(0);
 	}