summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-03-02 15:10:04 (GMT)
committer Timothy Pearson <kb9vqf@pearsoncomputing.net>2015-03-02 15:10:04 (GMT)
commit0157291f5ea3af6c7fae08ff20eb346bb01624f8 (patch)
tree6a07cf20215f8c8356f60358d9d9d99b8fb4576a
parent9005480696634e967011a285e424f307b3043527 (diff)
downloadtdebase-0157291f.zip
tdebase-0157291f.tar.gz
Rename most device icons to comply with XDG standards
-rw-r--r--kdesktop/init/Templates/CDROM-Device.desktop4
-rw-r--r--kdesktop/init/Templates/CDWRITER-Device.desktop4
-rw-r--r--kdesktop/init/Templates/DVDROM-Device.desktop4
-rw-r--r--kdesktop/init/Templates/Floppy.desktop4
-rw-r--r--kdesktop/init/Templates/HD.desktop4
-rw-r--r--kdesktop/init/Templates/ZIP-Device.desktop4
-rw-r--r--kdesktop/init/Templates/linkCDROM.desktop2
-rw-r--r--kdesktop/init/Templates/linkCDWRITER.desktop2
-rw-r--r--kdesktop/init/Templates/linkDVDROM.desktop2
-rw-r--r--kdesktop/init/Templates/linkFloppy.desktop2
-rw-r--r--kdesktop/init/Templates/linkHD.desktop2
-rw-r--r--kdesktop/init/Templates/linkZIP.desktop2
-rw-r--r--kicker/applets/media/mediaapplet.desktop2
-rw-r--r--konqueror/sidebar/trees/init/services/audiocd.desktop2
-rw-r--r--tdeioslave/floppy/floppy.protocol2
-rw-r--r--tdeioslave/media/mimetypes/audiocd.desktop2
-rw-r--r--tdeioslave/media/mimetypes/blankcd.desktop2
-rw-r--r--tdeioslave/media/mimetypes/blankdvd.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-r_mounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-r_mounted_decrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-r_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-r_unmounted_decrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-r_unmounted_encrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-rw_mounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-rw_mounted_decrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-rw_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-rw_unmounted_decrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cd-rw_unmounted_encrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cdrom_mounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cdrom_mounted_decrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cdrom_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cdrom_unmounted_decrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/cdrom_unmounted_encrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/dvd_mounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/dvd_mounted_decrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/dvd_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/dvd_unmounted_decrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/dvd_unmounted_encrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/dvdvideo.desktop2
-rw-r--r--tdeioslave/media/mimetypes/floppy5_mounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/floppy5_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/floppy_mounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/floppy_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/hdd_mounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/hdd_mounted_decrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/hdd_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/hdd_unmounted_decrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/hdd_unmounted_encrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/removable_mounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/removable_mounted_decrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/removable_unmounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/removable_unmounted_decrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/removable_unmounted_encrypted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/svcd.desktop2
-rw-r--r--tdeioslave/media/mimetypes/vcd.desktop2
-rw-r--r--tdeioslave/media/mimetypes/zip_mounted.desktop2
-rw-r--r--tdeioslave/media/mimetypes/zip_unmounted.desktop2
57 files changed, 63 insertions, 63 deletions
diff --git a/kdesktop/init/Templates/CDROM-Device.desktop b/kdesktop/init/Templates/CDROM-Device.desktop
index b4201f4..5f0a8ee 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 77c5d07..3dbb0a2 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 d4f272c..335967e 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 5d73d36..9182d28 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 78ed614..69646a0 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 bec34fe..8115f6e 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 b895fe7..98bd0dd 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 8a080c5..5f9ecc4 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 e65875b..82e0429 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 2a86dd5..f4852ef 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 43a5ba4..ee73bba 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 9ef9eae..9615679 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 8c4f8a9..8d5aa55 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 e3049f2..58c307e 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 336839c..68c41d7 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 ec53de3..de2e05b 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 723ade2..5903237 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 6aa21b1..d2a288f 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 3549085..bad9fec 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 650555e..e51fd87 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 5dfdde3..ba15872 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 a9b5143..9165ccd 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 596de66..63c0add 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 a1df9c2..aa9a969 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 05b2d8f..56da837 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 90a3aeb..9ee0d62 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 a437e0a..8464a9f 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 d24b165..42988c4 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 427951b..fca015a 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 d8bd4f1..65aab18 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 3d35eef..984000c 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 c53abbc..bd63650 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 f11e438..e6f2909 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 7e0ff30..297b063 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 ac5f34d..ee75a19 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 4b6785e..918416c 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 a34f174..ddcd7fd 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 e6eba09..fd25947 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 8a7d44c..047fdbe 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 8439720..c91e76b 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 2e23cd6..8eb8bde 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 ee0c107..1b07eaf 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 c413cbc..56afeb8 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 c442b55..61f8af4 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 4330b82..886c11c 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 cee2173..e5463e2 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 cd2e387..5a9547f 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 ecc7449..8a1107b 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 8371af6..7d91f49 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 8829871..8638195 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 0fe53d8..2c87fa9 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 3af6820..773ef7e 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 f904eb9..97b2023 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 68c965a..29b8e1a 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 dae4ddc..aedbeee 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 ce82fe9..1cc2fae 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 eaa3557..b717799 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