diff --git a/kdesktop/init/Templates/CDROM-Device.desktop b/kdesktop/init/Templates/CDROM-Device.desktop
index b4201f447..5f0a8ee0f 100644
--- a/kdesktop/init/Templates/CDROM-Device.desktop
+++ b/kdesktop/init/Templates/CDROM-Device.desktop
@@ -3,8 +3,8 @@ MountPoint=
 Dev=
 ReadOnly=false
 Type=FSDevice
-Icon=cdrom_mount
-UnmountIcon=cdrom_unmount
+Icon=media-optical-cdrom-mounted
+UnmountIcon=media-optical-cdrom
 Actions=Eject;
 X-TDE-Priority=TopLevel
 [Desktop Action Eject]
diff --git a/kdesktop/init/Templates/CDWRITER-Device.desktop b/kdesktop/init/Templates/CDWRITER-Device.desktop
index 77c5d0774..3dbb0a248 100644
--- a/kdesktop/init/Templates/CDWRITER-Device.desktop
+++ b/kdesktop/init/Templates/CDWRITER-Device.desktop
@@ -3,8 +3,8 @@ MountPoint=
 Dev=
 ReadOnly=0
 Type=FSDevice
-Icon=cdwriter_mount
-UnmountIcon=cdwriter_unmount
+Icon=media-optical-cdwriter-mounted
+UnmountIcon=media-optical-cdwriter
 Actions=Eject;
 X-TDE-Priority=TopLevel
 [Desktop Action Eject]
diff --git a/kdesktop/init/Templates/DVDROM-Device.desktop b/kdesktop/init/Templates/DVDROM-Device.desktop
index d4f272c43..335967e0f 100644
--- a/kdesktop/init/Templates/DVDROM-Device.desktop
+++ b/kdesktop/init/Templates/DVDROM-Device.desktop
@@ -3,8 +3,8 @@ MountPoint=
 Dev=
 ReadOnly=false
 Type=FSDevice
-Icon=dvd_mount
-UnmountIcon=dvd_unmount
+Icon=media-optical-dvd-mounted
+UnmountIcon=media-optical-dvd
 Actions=Eject;
 X-TDE-Priority=TopLevel
 [Desktop Action Eject]
diff --git a/kdesktop/init/Templates/Floppy.desktop b/kdesktop/init/Templates/Floppy.desktop
index 5d73d3648..9182d28e8 100644
--- a/kdesktop/init/Templates/Floppy.desktop
+++ b/kdesktop/init/Templates/Floppy.desktop
@@ -73,6 +73,6 @@ MountPoint=
 Dev=
 ReadOnly=false
 Type=FSDevice
-Icon=3floppy_mount
-UnmountIcon=3floppy_unmount
+Icon=media-floppy-3_5-mounted
+UnmountIcon=media-floppy-3_5
 X-TDE-Priority=TopLevel
diff --git a/kdesktop/init/Templates/HD.desktop b/kdesktop/init/Templates/HD.desktop
index 78ed614dc..69646a095 100644
--- a/kdesktop/init/Templates/HD.desktop
+++ b/kdesktop/init/Templates/HD.desktop
@@ -3,5 +3,5 @@ MountPoint=
 Dev=
 ReadOnly=false
 Type=FSDevice
-Icon=hdd_mount
-UnmountIcon=hdd_unmount
+Icon=drive-harddisk-mounted
+UnmountIcon=drive-harddisk
diff --git a/kdesktop/init/Templates/ZIP-Device.desktop b/kdesktop/init/Templates/ZIP-Device.desktop
index bec34fe73..8115f6e5b 100644
--- a/kdesktop/init/Templates/ZIP-Device.desktop
+++ b/kdesktop/init/Templates/ZIP-Device.desktop
@@ -3,8 +3,8 @@ MountPoint=
 Dev=
 ReadOnly=false
 Type=FSDevice
-Icon=zip_mount
-UnmountIcon=zip_unmount
+Icon=media-floppy-zip-mounted
+UnmountIcon=media-floppy-zip
 Actions=Eject;
 X-TDE-Priority=TopLevel
 [Desktop Action Eject]
diff --git a/kdesktop/init/Templates/linkCDROM.desktop b/kdesktop/init/Templates/linkCDROM.desktop
index b895fe79b..98bd0dddc 100644
--- a/kdesktop/init/Templates/linkCDROM.desktop
+++ b/kdesktop/init/Templates/linkCDROM.desktop
@@ -147,4 +147,4 @@ Comment[zh_CN]=新建 CD-ROM 设备
 Comment[zh_TW]=新光碟機設備
 Type=Link
 URL=.source/CDROM-Device.desktop
-Icon=cdrom_unmount
+Icon=media-optical-cdrom
diff --git a/kdesktop/init/Templates/linkCDWRITER.desktop b/kdesktop/init/Templates/linkCDWRITER.desktop
index 8a080c55a..5f9ecc49e 100644
--- a/kdesktop/init/Templates/linkCDWRITER.desktop
+++ b/kdesktop/init/Templates/linkCDWRITER.desktop
@@ -147,4 +147,4 @@ Comment[zh_CN]=新建刻录机设备
 Comment[zh_TW]=新光碟燒錄機設備
 Type=Link
 URL=.source/CDWRITER-Device.desktop
-Icon=cdwriter_unmount
+Icon=media-optical-cdwriter
diff --git a/kdesktop/init/Templates/linkDVDROM.desktop b/kdesktop/init/Templates/linkDVDROM.desktop
index e65875b9d..82e04295a 100644
--- a/kdesktop/init/Templates/linkDVDROM.desktop
+++ b/kdesktop/init/Templates/linkDVDROM.desktop
@@ -147,4 +147,4 @@ Comment[zh_CN]=新建 DVD-ROM 设备
 Comment[zh_TW]=新 DVD-ROM 設備
 Type=Link
 URL=.source/DVDROM-Device.desktop
-Icon=dvd_unmount
+Icon=media-optical-dvd
diff --git a/kdesktop/init/Templates/linkFloppy.desktop b/kdesktop/init/Templates/linkFloppy.desktop
index 2a86dd575..f4852ef4b 100644
--- a/kdesktop/init/Templates/linkFloppy.desktop
+++ b/kdesktop/init/Templates/linkFloppy.desktop
@@ -155,4 +155,4 @@ Comment[zh_TW]=新軟碟設備
 Comment[zu]=Ithuluzi le-Floppy elisha
 Type=Link
 URL=.source/Floppy.desktop
-Icon=3floppy_unmount
+Icon=media-floppy-3_5
diff --git a/kdesktop/init/Templates/linkHD.desktop b/kdesktop/init/Templates/linkHD.desktop
index 43a5ba482..ee73bbadd 100644
--- a/kdesktop/init/Templates/linkHD.desktop
+++ b/kdesktop/init/Templates/linkHD.desktop
@@ -154,4 +154,4 @@ Comment[zh_TW]=新硬碟設備
 Comment[zu]=I-diski Elukhuni Entsha
 Type=Link
 URL=.source/HD.desktop
-Icon=hdd_unmount
+Icon=drive-harddisk
diff --git a/kdesktop/init/Templates/linkZIP.desktop b/kdesktop/init/Templates/linkZIP.desktop
index 9ef9eaee9..9615679dd 100644
--- a/kdesktop/init/Templates/linkZIP.desktop
+++ b/kdesktop/init/Templates/linkZIP.desktop
@@ -147,4 +147,4 @@ Comment[zh_CN]=新建 ZIP 设备
 Comment[zh_TW]=新 ZIP 設備
 Type=Link
 URL=.source/ZIP-Device.desktop
-Icon=zip_unmount
+Icon=media-floppy-zip
diff --git a/kicker/applets/media/mediaapplet.desktop b/kicker/applets/media/mediaapplet.desktop
index 8c4f8a990..8d5aa5598 100644
--- a/kicker/applets/media/mediaapplet.desktop
+++ b/kicker/applets/media/mediaapplet.desktop
@@ -126,5 +126,5 @@ Name[vi]=Ổ chứa Dữ liệu
 Name[wa]=Sopoirts di wårdaedje
 Name[zh_CN]=存储介质
 Name[zh_TW]=儲存媒體
-Icon=3floppy_unmount
+Icon=media-floppy-3_5
 X-TDE-Library=media_panelapplet
diff --git a/konqueror/sidebar/trees/init/services/audiocd.desktop b/konqueror/sidebar/trees/init/services/audiocd.desktop
index e3049f288..58c307e6d 100644
--- a/konqueror/sidebar/trees/init/services/audiocd.desktop
+++ b/konqueror/sidebar/trees/init/services/audiocd.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Link
 URL=audiocd:/
-Icon=cdaudio_unmount
+Icon=media-optical-cdaudio
 Name=Audio CD Browser
 Name[af]=Musiek CD Blaaier
 Name[ar]=متصفح الأقراص المدمجة الصوتية
diff --git a/tdeioslave/floppy/floppy.protocol b/tdeioslave/floppy/floppy.protocol
index 336839ca8..68c41d793 100644
--- a/tdeioslave/floppy/floppy.protocol
+++ b/tdeioslave/floppy/floppy.protocol
@@ -9,6 +9,6 @@ writing=true
 makedir=true
 deleting=true
 moving=true
-Icon=3floppy_mount
+Icon=media-floppy-3_5-mounted
 X-DocPath=tdeioslave/floppy/index.html
 Class=:local
diff --git a/tdeioslave/media/mimetypes/audiocd.desktop b/tdeioslave/media/mimetypes/audiocd.desktop
index ec53de33d..de2e05b13 100644
--- a/tdeioslave/media/mimetypes/audiocd.desktop
+++ b/tdeioslave/media/mimetypes/audiocd.desktop
@@ -59,7 +59,7 @@ Comment[vi]=CD Nhạc
 Comment[wa]=Plake lazer CD odio
 Comment[zh_CN]=音频 CD
 Comment[zh_TW]=音樂 CD
-Icon=cdaudio_unmount
+Icon=media-optical-cdaudio
 
 X-TDE-AutoEmbed=true
 X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/blankcd.desktop b/tdeioslave/media/mimetypes/blankcd.desktop
index 723ade236..59032377f 100644
--- a/tdeioslave/media/mimetypes/blankcd.desktop
+++ b/tdeioslave/media/mimetypes/blankcd.desktop
@@ -69,5 +69,5 @@ Comment[vi]=CD trống
 Comment[wa]=Plake lazer CD sins rén dzo
 Comment[zh_CN]=空 CD
 Comment[zh_TW]=空白 CD
-Icon=cdwriter_unmount
+Icon=media-optical-cdwriter
 
diff --git a/tdeioslave/media/mimetypes/blankdvd.desktop b/tdeioslave/media/mimetypes/blankdvd.desktop
index 6aa21b144..d2a288fa6 100644
--- a/tdeioslave/media/mimetypes/blankdvd.desktop
+++ b/tdeioslave/media/mimetypes/blankdvd.desktop
@@ -69,4 +69,4 @@ Comment[vi]=DVD trống
 Comment[wa]=Plake lazer DVD sins rén dzo
 Comment[zh_CN]=空 DVD
 Comment[zh_TW]=空白 DVD
-Icon=dvd_unmount
+Icon=media-optical-dvd
diff --git a/tdeioslave/media/mimetypes/cd-r_mounted.desktop b/tdeioslave/media/mimetypes/cd-r_mounted.desktop
index 35490857d..bad9fecd9 100644
--- a/tdeioslave/media/mimetypes/cd-r_mounted.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_mounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=cdwriter_mount
+Icon=media-optical-cdwriter-mounted
 Type=MimeType
 MimeType=media/cd-r_mounted
 Comment=Mounted CD-R
diff --git a/tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop
index 650555e76..e51fd87f0 100644
--- a/tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=cdwriter_mount_decrypt
+Icon=media-optical-cdwriter-mounted_decrypt
 Type=MimeType
 MimeType=media/cd-r_mounted_decrypted
 Comment=Mounted Decrypted CD-R
diff --git a/tdeioslave/media/mimetypes/cd-r_unmounted.desktop b/tdeioslave/media/mimetypes/cd-r_unmounted.desktop
index 5dfdde32e..ba15872bb 100644
--- a/tdeioslave/media/mimetypes/cd-r_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_unmounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=cdwriter_unmount
+Icon=media-optical-cdwriter
 Type=MimeType
 MimeType=media/cd-r_unmounted
 Comment=Unmounted CD-R
diff --git a/tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop
index a9b5143d7..9165ccd55 100644
--- a/tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=cdwriter_unmount_decrypt
+Icon=media-optical-cdwriter_decrypt
 Type=MimeType
 MimeType=media/cd-r_unmounted_decrypted
 Comment=Unmounted Decrypted CD-R
diff --git a/tdeioslave/media/mimetypes/cd-r_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/cd-r_unmounted_encrypted.desktop
index 596de66b2..63c0add16 100644
--- a/tdeioslave/media/mimetypes/cd-r_unmounted_encrypted.desktop
+++ b/tdeioslave/media/mimetypes/cd-r_unmounted_encrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=cdwriter_unmount_encrypt
+Icon=media-optical-cdwriter_encrypt
 Type=MimeType
 MimeType=media/cd-r_unmounted_encrypted
 Comment=Unmounted Encrypted CD-R
diff --git a/tdeioslave/media/mimetypes/cd-rw_mounted.desktop b/tdeioslave/media/mimetypes/cd-rw_mounted.desktop
index a1df9c261..aa9a96949 100644
--- a/tdeioslave/media/mimetypes/cd-rw_mounted.desktop
+++ b/tdeioslave/media/mimetypes/cd-rw_mounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=cdwriter_mount
+Icon=media-optical-cdwriter-mounted
 Type=MimeType
 MimeType=media/cd-rw_mounted
 Comment=Mounted CD-RW
diff --git a/tdeioslave/media/mimetypes/cd-rw_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/cd-rw_mounted_decrypted.desktop
index 05b2d8fca..56da837d1 100644
--- a/tdeioslave/media/mimetypes/cd-rw_mounted_decrypted.desktop
+++ b/tdeioslave/media/mimetypes/cd-rw_mounted_decrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=cdwriter_mount_decrypt
+Icon=media-optical-cdwriter-mounted_decrypt
 Type=MimeType
 MimeType=media/cd-rw_mounted_decrypted
 Comment=Mounted Decrypted CD-RW
diff --git a/tdeioslave/media/mimetypes/cd-rw_unmounted.desktop b/tdeioslave/media/mimetypes/cd-rw_unmounted.desktop
index 90a3aebf6..9ee0d6238 100644
--- a/tdeioslave/media/mimetypes/cd-rw_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/cd-rw_unmounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=cdwriter_unmount
+Icon=media-optical-cdwriter
 Type=MimeType
 MimeType=media/cd-rw_unmounted
 Comment=Unmounted CD-RW
diff --git a/tdeioslave/media/mimetypes/cd-rw_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/cd-rw_unmounted_decrypted.desktop
index a437e0a82..8464a9fe4 100644
--- a/tdeioslave/media/mimetypes/cd-rw_unmounted_decrypted.desktop
+++ b/tdeioslave/media/mimetypes/cd-rw_unmounted_decrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=cdwriter_unmount_decrypt
+Icon=media-optical-cdwriter_decrypt
 Type=MimeType
 MimeType=media/cd-rw_unmounted_decrypted
 Comment=Unmounted Decrypted CD-RW
diff --git a/tdeioslave/media/mimetypes/cd-rw_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/cd-rw_unmounted_encrypted.desktop
index d24b165bf..42988c447 100644
--- a/tdeioslave/media/mimetypes/cd-rw_unmounted_encrypted.desktop
+++ b/tdeioslave/media/mimetypes/cd-rw_unmounted_encrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=cdwriter_unmount_encrypt
+Icon=media-optical-cdwriter_encrypt
 Type=MimeType
 MimeType=media/cd-rw_unmounted_encrypted
 Comment=Unmounted Encrypted CD-RW
diff --git a/tdeioslave/media/mimetypes/cdrom_mounted.desktop b/tdeioslave/media/mimetypes/cdrom_mounted.desktop
index 427951b57..fca015abf 100644
--- a/tdeioslave/media/mimetypes/cdrom_mounted.desktop
+++ b/tdeioslave/media/mimetypes/cdrom_mounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=cdrom_mount
+Icon=media-optical-cdrom-mounted
 Type=MimeType
 MimeType=media/cdrom_mounted
 Comment=Mounted CD-ROM
diff --git a/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop
index d8bd4f199..65aab182d 100644
--- a/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop
+++ b/tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=cdrom_mount_decrypt
+Icon=media-optical-cdrom-mounted_decrypt
 Type=MimeType
 MimeType=media/cdrom_mounted_decrypted
 Comment=Mounted Decrypted CD-ROM
diff --git a/tdeioslave/media/mimetypes/cdrom_unmounted.desktop b/tdeioslave/media/mimetypes/cdrom_unmounted.desktop
index 3d35eef32..984000c52 100644
--- a/tdeioslave/media/mimetypes/cdrom_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/cdrom_unmounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=cdrom_unmount
+Icon=media-optical-cdrom
 Type=MimeType
 MimeType=media/cdrom_unmounted
 Comment=Unmounted CD-ROM
diff --git a/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop
index c53abbc82..bd636507e 100644
--- a/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop
+++ b/tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=cdrom_unmount_decrypt
+Icon=media-optical-cdrom_decrypt
 Type=MimeType
 MimeType=media/cdrom_unmounted_decrypted
 Comment=Unmounted Decrypted CD-ROM
diff --git a/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop
index f11e43807..e6f2909e0 100644
--- a/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop
+++ b/tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=cdrom_unmount_encrypt
+Icon=media-optical-cdrom_encrypt
 Type=MimeType
 MimeType=media/cdrom_unmounted_encrypted
 Comment=Unmounted Encrypted CD-ROM
diff --git a/tdeioslave/media/mimetypes/dvd_mounted.desktop b/tdeioslave/media/mimetypes/dvd_mounted.desktop
index 7e0ff307b..297b063dd 100644
--- a/tdeioslave/media/mimetypes/dvd_mounted.desktop
+++ b/tdeioslave/media/mimetypes/dvd_mounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=dvd_mount
+Icon=media-optical-dvd-mounted
 Type=MimeType
 MimeType=media/dvd_mounted
 Comment=Mounted DVD
diff --git a/tdeioslave/media/mimetypes/dvd_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/dvd_mounted_decrypted.desktop
index ac5f34db9..ee75a19d4 100644
--- a/tdeioslave/media/mimetypes/dvd_mounted_decrypted.desktop
+++ b/tdeioslave/media/mimetypes/dvd_mounted_decrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=dvd_mount_decrypt
+Icon=media-optical-dvd-mounted_decrypt
 Type=MimeType
 MimeType=media/dvd_mounted_decrypted
 Comment=Mounted Decrypted DVD
diff --git a/tdeioslave/media/mimetypes/dvd_unmounted.desktop b/tdeioslave/media/mimetypes/dvd_unmounted.desktop
index 4b6785e34..918416c42 100644
--- a/tdeioslave/media/mimetypes/dvd_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/dvd_unmounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=dvd_unmount
+Icon=media-optical-dvd
 Type=MimeType
 MimeType=media/dvd_unmounted
 Comment=Unmounted DVD
diff --git a/tdeioslave/media/mimetypes/dvd_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/dvd_unmounted_decrypted.desktop
index a34f174ea..ddcd7fd81 100644
--- a/tdeioslave/media/mimetypes/dvd_unmounted_decrypted.desktop
+++ b/tdeioslave/media/mimetypes/dvd_unmounted_decrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=dvd_unmount_decrypt
+Icon=media-optical-dvd_decrypt
 Type=MimeType
 MimeType=media/dvd_unmounted_decrypted
 Comment=Unmounted Decrypted DVD
diff --git a/tdeioslave/media/mimetypes/dvd_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/dvd_unmounted_encrypted.desktop
index e6eba099d..fd259471e 100644
--- a/tdeioslave/media/mimetypes/dvd_unmounted_encrypted.desktop
+++ b/tdeioslave/media/mimetypes/dvd_unmounted_encrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=dvd_unmount_encrypt
+Icon=media-optical-dvd_encrypt
 Type=MimeType
 MimeType=media/dvd_unmounted_encrypted
 Comment=Unmounted Encrypted DVD
diff --git a/tdeioslave/media/mimetypes/dvdvideo.desktop b/tdeioslave/media/mimetypes/dvdvideo.desktop
index 8a7d44c52..047fdbe7c 100644
--- a/tdeioslave/media/mimetypes/dvdvideo.desktop
+++ b/tdeioslave/media/mimetypes/dvdvideo.desktop
@@ -68,6 +68,6 @@ Comment[vi]=Đĩa Video DVD
 Comment[wa]=Plake videyo DVD
 Comment[zh_CN]=DVD 影碟
 Comment[zh_TW]=DVD 視訊光碟
-Icon=dvd_unmount
+Icon=media-optical-dvd
 
 X-TDE-IsAlso=inode/directory
diff --git a/tdeioslave/media/mimetypes/floppy5_mounted.desktop b/tdeioslave/media/mimetypes/floppy5_mounted.desktop
index 8439720a2..c91e76b6a 100644
--- a/tdeioslave/media/mimetypes/floppy5_mounted.desktop
+++ b/tdeioslave/media/mimetypes/floppy5_mounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=5floppy_mount
+Icon=media-floppy-5_14-mounted
 Type=MimeType
 MimeType=media/floppy5_mounted
 Comment=Mounted 5¼" Floppy
diff --git a/tdeioslave/media/mimetypes/floppy5_unmounted.desktop b/tdeioslave/media/mimetypes/floppy5_unmounted.desktop
index 2e23cd6eb..8eb8bdeaa 100644
--- a/tdeioslave/media/mimetypes/floppy5_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/floppy5_unmounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=5floppy_unmount
+Icon=media-floppy-5_14
 Type=MimeType
 MimeType=media/floppy5_unmounted
 Comment=Unmounted 5¼" Floppy
diff --git a/tdeioslave/media/mimetypes/floppy_mounted.desktop b/tdeioslave/media/mimetypes/floppy_mounted.desktop
index ee0c1075c..1b07eaf28 100644
--- a/tdeioslave/media/mimetypes/floppy_mounted.desktop
+++ b/tdeioslave/media/mimetypes/floppy_mounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=3floppy_mount
+Icon=media-floppy-3_5-mounted
 Type=MimeType
 MimeType=media/floppy_mounted
 Comment=Mounted Floppy
diff --git a/tdeioslave/media/mimetypes/floppy_unmounted.desktop b/tdeioslave/media/mimetypes/floppy_unmounted.desktop
index c413cbc03..56afeb8f1 100644
--- a/tdeioslave/media/mimetypes/floppy_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/floppy_unmounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=3floppy_unmount
+Icon=media-floppy-3_5
 Type=MimeType
 MimeType=media/floppy_unmounted
 Comment=Unmounted Floppy
diff --git a/tdeioslave/media/mimetypes/hdd_mounted.desktop b/tdeioslave/media/mimetypes/hdd_mounted.desktop
index c442b554d..61f8af457 100644
--- a/tdeioslave/media/mimetypes/hdd_mounted.desktop
+++ b/tdeioslave/media/mimetypes/hdd_mounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=hdd_mount
+Icon=drive-harddisk-mounted
 Type=MimeType
 MimeType=media/hdd_mounted
 Comment=Mounted Hard Disk Volume
diff --git a/tdeioslave/media/mimetypes/hdd_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/hdd_mounted_decrypted.desktop
index 4330b82be..886c11c12 100644
--- a/tdeioslave/media/mimetypes/hdd_mounted_decrypted.desktop
+++ b/tdeioslave/media/mimetypes/hdd_mounted_decrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=hdd_mount_decrypt
+Icon=drive-harddisk-mounted_decrypt
 Type=MimeType
 MimeType=media/hdd_mounted_decrypted
 Comment=Mounted Decrypted Hard Disk Volume
diff --git a/tdeioslave/media/mimetypes/hdd_unmounted.desktop b/tdeioslave/media/mimetypes/hdd_unmounted.desktop
index cee21730f..e5463e21e 100644
--- a/tdeioslave/media/mimetypes/hdd_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/hdd_unmounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=hdd_unmount
+Icon=drive-harddisk
 Type=MimeType
 MimeType=media/hdd_unmounted
 Comment=Unmounted Hard Disk Volume
diff --git a/tdeioslave/media/mimetypes/hdd_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/hdd_unmounted_decrypted.desktop
index cd2e387ce..5a9547f80 100644
--- a/tdeioslave/media/mimetypes/hdd_unmounted_decrypted.desktop
+++ b/tdeioslave/media/mimetypes/hdd_unmounted_decrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=hdd_unmount_decrypt
+Icon=drive-harddisk_decrypt
 Type=MimeType
 MimeType=media/hdd_unmounted_decrypted
 Comment=Unmounted Decrypted Hard Disk Volume
diff --git a/tdeioslave/media/mimetypes/hdd_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/hdd_unmounted_encrypted.desktop
index ecc744974..8a1107bc9 100644
--- a/tdeioslave/media/mimetypes/hdd_unmounted_encrypted.desktop
+++ b/tdeioslave/media/mimetypes/hdd_unmounted_encrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=hdd_unmount_encrypt
+Icon=drive-harddisk_encrypt
 Type=MimeType
 MimeType=media/hdd_unmounted_encrypted
 Comment=Unmounted Encrypted Hard Disk Volume
diff --git a/tdeioslave/media/mimetypes/removable_mounted.desktop b/tdeioslave/media/mimetypes/removable_mounted.desktop
index 8371af6ac..7d91f49ed 100644
--- a/tdeioslave/media/mimetypes/removable_mounted.desktop
+++ b/tdeioslave/media/mimetypes/removable_mounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=usbpendrive_mount
+Icon=media-flash-usb-mounted
 Type=MimeType
 MimeType=media/removable_mounted
 Comment=Mounted Removable Medium
diff --git a/tdeioslave/media/mimetypes/removable_mounted_decrypted.desktop b/tdeioslave/media/mimetypes/removable_mounted_decrypted.desktop
index 88298712e..863819555 100644
--- a/tdeioslave/media/mimetypes/removable_mounted_decrypted.desktop
+++ b/tdeioslave/media/mimetypes/removable_mounted_decrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=usbpendrive_mount_decrypt
+Icon=media-flash-usb-mounted_decrypt
 Type=MimeType
 MimeType=media/removable_mounted_decrypted
 Comment=Mounted Decrypted Removable Medium
diff --git a/tdeioslave/media/mimetypes/removable_unmounted.desktop b/tdeioslave/media/mimetypes/removable_unmounted.desktop
index 0fe53d898..2c87fa941 100644
--- a/tdeioslave/media/mimetypes/removable_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/removable_unmounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=usbpendrive_unmount
+Icon=media-flash-usb
 Type=MimeType
 MimeType=media/removable_unmounted
 Comment=Unmounted Removable Medium
diff --git a/tdeioslave/media/mimetypes/removable_unmounted_decrypted.desktop b/tdeioslave/media/mimetypes/removable_unmounted_decrypted.desktop
index 3af682050..773ef7e62 100644
--- a/tdeioslave/media/mimetypes/removable_unmounted_decrypted.desktop
+++ b/tdeioslave/media/mimetypes/removable_unmounted_decrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=usbpendrive_unmount_decrypt
+Icon=media-flash-usb_decrypt
 Type=MimeType
 MimeType=media/removable_unmounted_decrypted
 Comment=Unmounted Decrypted Removable Medium
diff --git a/tdeioslave/media/mimetypes/removable_unmounted_encrypted.desktop b/tdeioslave/media/mimetypes/removable_unmounted_encrypted.desktop
index f904eb9ec..97b202345 100644
--- a/tdeioslave/media/mimetypes/removable_unmounted_encrypted.desktop
+++ b/tdeioslave/media/mimetypes/removable_unmounted_encrypted.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Encoding=UTF-8
-Icon=usbpendrive_unmount_encrypt
+Icon=media-flash-usb_encrypt
 Type=MimeType
 MimeType=media/removable_unmounted_encrypted
 Comment=Unmounted Encrypted Removable Medium
diff --git a/tdeioslave/media/mimetypes/svcd.desktop b/tdeioslave/media/mimetypes/svcd.desktop
index 68c965a6f..29b8e1a57 100644
--- a/tdeioslave/media/mimetypes/svcd.desktop
+++ b/tdeioslave/media/mimetypes/svcd.desktop
@@ -47,4 +47,4 @@ Comment[vi]=Đĩa siêu video CD
 Comment[wa]=Super plake lazer CD videyo
 Comment[zh_CN]=超级 VCD
 Comment[zh_TW]=超級視訊 CD
-Icon=cdrom_unmount
+Icon=media-optical-cdrom
diff --git a/tdeioslave/media/mimetypes/vcd.desktop b/tdeioslave/media/mimetypes/vcd.desktop
index dae4ddcaf..aedbeeec7 100644
--- a/tdeioslave/media/mimetypes/vcd.desktop
+++ b/tdeioslave/media/mimetypes/vcd.desktop
@@ -47,4 +47,4 @@ Comment[vi]=Đĩa video CD
 Comment[wa]=Plake lazer CD videyo
 Comment[zh_CN]=VCD
 Comment[zh_TW]=視訊 CD
-Icon=cdrom_unmount
+Icon=media-optical-cdrom
diff --git a/tdeioslave/media/mimetypes/zip_mounted.desktop b/tdeioslave/media/mimetypes/zip_mounted.desktop
index ce82fe968..1cc2faef9 100644
--- a/tdeioslave/media/mimetypes/zip_mounted.desktop
+++ b/tdeioslave/media/mimetypes/zip_mounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=zip_mount
+Icon=media-floppy-zip-mounted
 Type=MimeType
 MimeType=media/zip_mounted
 Comment=Mounted Zip Disk
diff --git a/tdeioslave/media/mimetypes/zip_unmounted.desktop b/tdeioslave/media/mimetypes/zip_unmounted.desktop
index eaa35577f..b71779996 100644
--- a/tdeioslave/media/mimetypes/zip_unmounted.desktop
+++ b/tdeioslave/media/mimetypes/zip_unmounted.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Icon=zip_unmount
+Icon=media-floppy-zip
 Type=MimeType
 MimeType=media/zip_unmounted
 Comment=Unmounted Zip Disk