diff --git a/mimetypes/application/pgp-keys.desktop b/mimetypes/application/pgp-keys.desktop
index e08c57583..f80f390e1 100644
--- a/mimetypes/application/pgp-keys.desktop
+++ b/mimetypes/application/pgp-keys.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=MimeType
 MimeType=application/pgp-keys
-Icon=certificate
+Icon=encrypted
 Patterns=*.pgp;*.gpg;*.asc
 Comment=OpenPGP Key Bundle
 Comment[af]=OpenPGP Sleutel Bundel
diff --git a/mimetypes/application/pgp-signature.desktop b/mimetypes/application/pgp-signature.desktop
index df787440b..fea4187e1 100644
--- a/mimetypes/application/pgp-signature.desktop
+++ b/mimetypes/application/pgp-signature.desktop
@@ -15,7 +15,7 @@ Comment[cs]=Samostatný podpis OpenPGP
 Comment[csb]=Osóbny pòdpisënk OpenPGP
 Comment[cy]=Llofnod OpenPGP wedi'i Ddatglymu
 Comment[da]=Løsreven OpenPGP-underskrift
-Comment[de]=Abgetrennte OpenPGP-Signatur
+Comment[de]=Abgetrennte OpenPGP-Unterschrift
 Comment[el]=Αποσπασμένη υπογραφή OpenPGP
 Comment[eo]=Deligita OpenPGP-subskribo
 Comment[es]=Firma suelta OpenPGP
diff --git a/mimetypes/application/pkcs10.desktop b/mimetypes/application/pkcs10.desktop
index 66fb6f35b..6d0799488 100644
--- a/mimetypes/application/pkcs10.desktop
+++ b/mimetypes/application/pkcs10.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=MimeType
 MimeType=application/pkcs10
-Icon=certificate
+Icon=encrypted
 Patterns=*.p10;*.P10
 Comment=S/MIME Certification Request
 Comment[af]=S/MIME Sertifikaat Aanvraag
diff --git a/mimetypes/application/pkcs7-signature.desktop b/mimetypes/application/pkcs7-signature.desktop
index 613d03db4..3a6380c54 100644
--- a/mimetypes/application/pkcs7-signature.desktop
+++ b/mimetypes/application/pkcs7-signature.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=MimeType
 MimeType=application/pkcs7-signature
-Icon=certificate
+Icon=encrypted
 Patterns=*.p7s;*.P7S
 Comment=Detached S/MIME Signature
 Comment[af]=Ontkoppel S/Mime Handtekening
@@ -16,7 +16,7 @@ Comment[cs]=Samostatný podpis S/MIME
 Comment[csb]=Osóbny pòdpisënk S/MIME
 Comment[cy]=Llofnod S/MIME wedi'i Ddatglymu 
 Comment[da]=Løsreven S/MIME-underskrift
-Comment[de]=Abgetrennte S/MIME-Signatur
+Comment[de]=Abgetrennte S/MIME-Unterschrift
 Comment[el]=Αποσπασμένη υπογραφή S/MIME
 Comment[eo]=Deligita S/MIME-subskribo
 Comment[es]=Firma suelta S/MIME
diff --git a/mimetypes/application/x-font-bdf.desktop b/mimetypes/application/x-font-bdf.desktop
index dde217068..6f2830535 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-x-generic_bitmap
+Icon=font-x-generic
 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-otf.desktop b/mimetypes/application/x-font-otf.desktop
index 3d187f483..800a54fd0 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-x-generic_truetype
+Icon=application-x-font-ttf
 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 ced562ca8..2d9b62d1a 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-x-generic_bitmap
+Icon=font-x-generic
 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 78bb4689c..4ea6d2cc9 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-x-generic_bitmap
+Icon=font-x-generic
 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-ttc.desktop b/mimetypes/application/x-font-ttc.desktop
index 848b40280..a35cdd0de 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-x-generic_truetype
+Icon=application-x-font-ttf
 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 12820c489..b10ee3b4c 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-x-generic_truetype
+Icon=application-x-font-ttf
 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 5ba1335ae..53eb8aee6 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-x-generic_type1
+Icon=application-x-font-type1
 Patterns=*.pfa;*.PFA;*.pfb;*.PFB
 Comment=PostScript Type1 Font
 Comment[af]=Postscript Tipe1 Skrif tipe
diff --git a/mimetypes/application/x-java-applet.desktop b/mimetypes/application/x-java-applet.desktop
index c6784aa98..7b2dc8cac 100644
--- a/mimetypes/application/x-java-applet.desktop
+++ b/mimetypes/application/x-java-applet.desktop
@@ -71,5 +71,5 @@ Comment[vi]=Tiểu dụng Java
 Comment[wa]=Aplikete Java
 Comment[zh_CN]=Java 小程序
 MimeType=application/x-java-applet
-Icon=java_jar
+Icon=text-x-java
 X-TDE-AutoEmbed=true
diff --git a/mimetypes/application/x-java-jnlp-file.desktop b/mimetypes/application/x-java-jnlp-file.desktop
index 4a60276bc..e87893e98 100644
--- a/mimetypes/application/x-java-jnlp-file.desktop
+++ b/mimetypes/application/x-java-jnlp-file.desktop
@@ -1,4 +1,5 @@
 [Desktop Entry]
+Icon=text-x-java
 Type=MimeType
 Comment=Java Web Start application
 Comment[af]=Java Web Begin program
diff --git a/mimetypes/application/x-javascript.desktop b/mimetypes/application/x-javascript.desktop
index 845ddb492..b06129a1c 100644
--- a/mimetypes/application/x-javascript.desktop
+++ b/mimetypes/application/x-javascript.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=MimeType
 MimeType=application/x-javascript
-Icon=javascript
+Icon=text-x-jsrc
 Patterns=*.js;
 Comment=JavaScript File
 Comment[af]=JavaScript Lêer
diff --git a/mimetypes/application/x-pkcs12.desktop b/mimetypes/application/x-pkcs12.desktop
index 42e4c16d3..e6bee676f 100644
--- a/mimetypes/application/x-pkcs12.desktop
+++ b/mimetypes/application/x-pkcs12.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=MimeType
 MimeType=application/x-pkcs12
-Icon=certificate
+Icon=encrypted
 Patterns=*.p12;*.P12;*.pfx
 Comment=PKCS#12 Certificate Bundle
 Comment[af]=Pkcs#12 Sertifikaat Bundel
diff --git a/mimetypes/application/x-python.desktop b/mimetypes/application/x-python.desktop
index 02761c1c7..79e9bb003 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=text-x-src_py
+Icon=text-x-python
 Patterns=*.py;
 X-TDE-IsAlso=application/x-executable-script
 
diff --git a/mimetypes/image/x-djvu-2.desktop b/mimetypes/image/x-djvu-2.desktop
index 9ac9e6e2c..e4f6f413d 100644
--- a/mimetypes/image/x-djvu-2.desktop
+++ b/mimetypes/image/x-djvu-2.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=MimeType
 MimeType=image/x.djvu
-Icon=djvu
+Icon=image-x-generic
 Patterns=*.djvu;*.DJVU;*.djv;*.DJV;
 Comment=DjVu Document
 Comment[af]=DjVu Dokument
diff --git a/mimetypes/image/x-djvu.desktop b/mimetypes/image/x-djvu.desktop
index fac481bb9..fd1079793 100644
--- a/mimetypes/image/x-djvu.desktop
+++ b/mimetypes/image/x-djvu.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=MimeType
 MimeType=image/x-djvu
-Icon=djvu
+Icon=image-x-generic
 Patterns=*.djvu;*.DJVU;*.djv;*.DJV;
 Comment=DjVu Document
 Comment[af]=DjVu Dokument
diff --git a/mimetypes/text/x-python.desktop b/mimetypes/text/x-python.desktop
index 2055bd2e2..ed528c730 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=text-x-src_py
+Icon=text-x-python
 # alias of application/x-python
 X-TDE-IsAlso=application/x-python
 
diff --git a/tdecert/tdecertpart.desktop b/tdecert/tdecertpart.desktop
index eeedd2de3..223221a72 100644
--- a/tdecert/tdecertpart.desktop
+++ b/tdecert/tdecertpart.desktop
@@ -83,7 +83,7 @@ Comment[zh_HK]=可嵌入的個人證書管理工具
 Comment[zh_TW]=可嵌入的個人認證管理工具
 Comment[zu]=Imeneja Yesitifiketi Sobunini Oshuthekiwe
 MimeType=application/x-pkcs12;application/x-x509-ca-cert;application/binary-certificate;
-Icon=system-lock-screen
+Icon=encrypted
 Name=KCertPart
 Name[af]=Kcertpart
 Name[bn]=কে-সার্ট-পার্ট