diff --git a/IconThemes/ikons/16x16/devices/3floppy_mount.png b/IconThemes/ikons/16x16/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/ikons/16x16/devices/3floppy_mount.png
rename to IconThemes/ikons/16x16/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/ikons/16x16/devices/3floppy_unmount.png b/IconThemes/ikons/16x16/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/ikons/16x16/devices/3floppy_unmount.png
rename to IconThemes/ikons/16x16/devices/media-floppy-3_5.png
diff --git a/IconThemes/ikons/16x16/devices/5floppy_mount.png b/IconThemes/ikons/16x16/devices/media-floppy-5_14-mounted.png
similarity index 100%
rename from IconThemes/ikons/16x16/devices/5floppy_mount.png
rename to IconThemes/ikons/16x16/devices/media-floppy-5_14-mounted.png
diff --git a/IconThemes/ikons/16x16/devices/5floppy_unmount.png b/IconThemes/ikons/16x16/devices/media-floppy-5_14.png
similarity index 100%
rename from IconThemes/ikons/16x16/devices/5floppy_unmount.png
rename to IconThemes/ikons/16x16/devices/media-floppy-5_14.png
diff --git a/IconThemes/ikons/16x16/devices/zip_mount.png b/IconThemes/ikons/16x16/devices/media-floppy-zip-mounted.png
similarity index 100%
rename from IconThemes/ikons/16x16/devices/zip_mount.png
rename to IconThemes/ikons/16x16/devices/media-floppy-zip-mounted.png
diff --git a/IconThemes/ikons/16x16/devices/zip_unmount.png b/IconThemes/ikons/16x16/devices/media-floppy-zip.png
similarity index 100%
rename from IconThemes/ikons/16x16/devices/zip_unmount.png
rename to IconThemes/ikons/16x16/devices/media-floppy-zip.png
diff --git a/IconThemes/ikons/16x16/devices/cdaudio_mount.png b/IconThemes/ikons/16x16/devices/media-optical-cdaudio-mounted.png
similarity index 100%
rename from IconThemes/ikons/16x16/devices/cdaudio_mount.png
rename to IconThemes/ikons/16x16/devices/media-optical-cdaudio-mounted.png
diff --git a/IconThemes/ikons/16x16/devices/cdaudio_unmount.png b/IconThemes/ikons/16x16/devices/media-optical-cdaudio.png
similarity index 100%
rename from IconThemes/ikons/16x16/devices/cdaudio_unmount.png
rename to IconThemes/ikons/16x16/devices/media-optical-cdaudio.png
diff --git a/IconThemes/ikons/16x16/devices/cdrom_mount.png b/IconThemes/ikons/16x16/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/ikons/16x16/devices/cdrom_mount.png
rename to IconThemes/ikons/16x16/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/ikons/16x16/devices/cdrom_unmount.png b/IconThemes/ikons/16x16/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/ikons/16x16/devices/cdrom_unmount.png
rename to IconThemes/ikons/16x16/devices/media-optical-cdrom.png
diff --git a/IconThemes/ikons/16x16/devices/dvd_mount.png b/IconThemes/ikons/16x16/devices/media-optical-dvd-mounted.png
similarity index 100%
rename from IconThemes/ikons/16x16/devices/dvd_mount.png
rename to IconThemes/ikons/16x16/devices/media-optical-dvd-mounted.png
diff --git a/IconThemes/ikons/16x16/devices/dvd_unmount.png b/IconThemes/ikons/16x16/devices/media-optical-dvd.png
similarity index 100%
rename from IconThemes/ikons/16x16/devices/dvd_unmount.png
rename to IconThemes/ikons/16x16/devices/media-optical-dvd.png
diff --git a/IconThemes/ikons/32x32/devices/hdd_mount.png b/IconThemes/ikons/32x32/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/ikons/32x32/devices/hdd_mount.png
rename to IconThemes/ikons/32x32/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/ikons/32x32/devices/hdd_unmount.png b/IconThemes/ikons/32x32/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/ikons/32x32/devices/hdd_unmount.png
rename to IconThemes/ikons/32x32/devices/drive-harddisk.png
diff --git a/IconThemes/ikons/32x32/devices/3floppy_mount.png b/IconThemes/ikons/32x32/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/ikons/32x32/devices/3floppy_mount.png
rename to IconThemes/ikons/32x32/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/ikons/32x32/devices/3floppy_unmount.png b/IconThemes/ikons/32x32/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/ikons/32x32/devices/3floppy_unmount.png
rename to IconThemes/ikons/32x32/devices/media-floppy-3_5.png
diff --git a/IconThemes/ikons/32x32/devices/zip_mount.png b/IconThemes/ikons/32x32/devices/media-floppy-zip-mounted.png
similarity index 100%
rename from IconThemes/ikons/32x32/devices/zip_mount.png
rename to IconThemes/ikons/32x32/devices/media-floppy-zip-mounted.png
diff --git a/IconThemes/ikons/32x32/devices/zip_unmount.png b/IconThemes/ikons/32x32/devices/media-floppy-zip.png
similarity index 100%
rename from IconThemes/ikons/32x32/devices/zip_unmount.png
rename to IconThemes/ikons/32x32/devices/media-floppy-zip.png
diff --git a/IconThemes/ikons/32x32/devices/cdaudio_unmount.png b/IconThemes/ikons/32x32/devices/media-optical-cdaudio.png
similarity index 100%
rename from IconThemes/ikons/32x32/devices/cdaudio_unmount.png
rename to IconThemes/ikons/32x32/devices/media-optical-cdaudio.png
diff --git a/IconThemes/ikons/32x32/devices/cdrom_mount.png b/IconThemes/ikons/32x32/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/ikons/32x32/devices/cdrom_mount.png
rename to IconThemes/ikons/32x32/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/ikons/32x32/devices/cdrom_unmount.png b/IconThemes/ikons/32x32/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/ikons/32x32/devices/cdrom_unmount.png
rename to IconThemes/ikons/32x32/devices/media-optical-cdrom.png
diff --git a/IconThemes/ikons/32x32/devices/dvd_mount.png b/IconThemes/ikons/32x32/devices/media-optical-dvd-mounted.png
similarity index 100%
rename from IconThemes/ikons/32x32/devices/dvd_mount.png
rename to IconThemes/ikons/32x32/devices/media-optical-dvd-mounted.png
diff --git a/IconThemes/ikons/32x32/devices/dvd_unmount.png b/IconThemes/ikons/32x32/devices/media-optical-dvd.png
similarity index 100%
rename from IconThemes/ikons/32x32/devices/dvd_unmount.png
rename to IconThemes/ikons/32x32/devices/media-optical-dvd.png
diff --git a/IconThemes/ikons/48x48/devices/hdd_mount.png b/IconThemes/ikons/48x48/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/ikons/48x48/devices/hdd_mount.png
rename to IconThemes/ikons/48x48/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/ikons/48x48/devices/hdd_unmount.png b/IconThemes/ikons/48x48/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/ikons/48x48/devices/hdd_unmount.png
rename to IconThemes/ikons/48x48/devices/drive-harddisk.png
diff --git a/IconThemes/ikons/48x48/devices/3floppy_mount.png b/IconThemes/ikons/48x48/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/ikons/48x48/devices/3floppy_mount.png
rename to IconThemes/ikons/48x48/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/ikons/48x48/devices/3floppy_unmount.png b/IconThemes/ikons/48x48/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/ikons/48x48/devices/3floppy_unmount.png
rename to IconThemes/ikons/48x48/devices/media-floppy-3_5.png
diff --git a/IconThemes/ikons/48x48/devices/5floppy_mount.png b/IconThemes/ikons/48x48/devices/media-floppy-5_14-mounted.png
similarity index 100%
rename from IconThemes/ikons/48x48/devices/5floppy_mount.png
rename to IconThemes/ikons/48x48/devices/media-floppy-5_14-mounted.png
diff --git a/IconThemes/ikons/48x48/devices/5floppy_unmount.png b/IconThemes/ikons/48x48/devices/media-floppy-5_14.png
similarity index 100%
rename from IconThemes/ikons/48x48/devices/5floppy_unmount.png
rename to IconThemes/ikons/48x48/devices/media-floppy-5_14.png
diff --git a/IconThemes/ikons/48x48/devices/zip_mount.png b/IconThemes/ikons/48x48/devices/media-floppy-zip-mounted.png
similarity index 100%
rename from IconThemes/ikons/48x48/devices/zip_mount.png
rename to IconThemes/ikons/48x48/devices/media-floppy-zip-mounted.png
diff --git a/IconThemes/ikons/48x48/devices/zip_unmount.png b/IconThemes/ikons/48x48/devices/media-floppy-zip.png
similarity index 100%
rename from IconThemes/ikons/48x48/devices/zip_unmount.png
rename to IconThemes/ikons/48x48/devices/media-floppy-zip.png
diff --git a/IconThemes/ikons/48x48/devices/cdaudio_mount.png b/IconThemes/ikons/48x48/devices/media-optical-cdaudio-mounted.png
similarity index 100%
rename from IconThemes/ikons/48x48/devices/cdaudio_mount.png
rename to IconThemes/ikons/48x48/devices/media-optical-cdaudio-mounted.png
diff --git a/IconThemes/ikons/48x48/devices/cdaudio_unmount.png b/IconThemes/ikons/48x48/devices/media-optical-cdaudio.png
similarity index 100%
rename from IconThemes/ikons/48x48/devices/cdaudio_unmount.png
rename to IconThemes/ikons/48x48/devices/media-optical-cdaudio.png
diff --git a/IconThemes/ikons/48x48/devices/cdrom_mount.png b/IconThemes/ikons/48x48/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/ikons/48x48/devices/cdrom_mount.png
rename to IconThemes/ikons/48x48/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/ikons/48x48/devices/cdrom_unmount.png b/IconThemes/ikons/48x48/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/ikons/48x48/devices/cdrom_unmount.png
rename to IconThemes/ikons/48x48/devices/media-optical-cdrom.png
diff --git a/IconThemes/ikons/48x48/devices/dvd_mount.png b/IconThemes/ikons/48x48/devices/media-optical-dvd-mounted.png
similarity index 100%
rename from IconThemes/ikons/48x48/devices/dvd_mount.png
rename to IconThemes/ikons/48x48/devices/media-optical-dvd-mounted.png
diff --git a/IconThemes/ikons/48x48/devices/dvd_unmount.png b/IconThemes/ikons/48x48/devices/media-optical-dvd.png
similarity index 100%
rename from IconThemes/ikons/48x48/devices/dvd_unmount.png
rename to IconThemes/ikons/48x48/devices/media-optical-dvd.png
diff --git a/IconThemes/kdeclassic/16x16/devices/hdd_mount.png b/IconThemes/kdeclassic/16x16/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/devices/hdd_mount.png
rename to IconThemes/kdeclassic/16x16/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/kdeclassic/16x16/devices/hdd_unmount.png b/IconThemes/kdeclassic/16x16/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/devices/hdd_unmount.png
rename to IconThemes/kdeclassic/16x16/devices/drive-harddisk.png
diff --git a/IconThemes/kdeclassic/16x16/devices/3floppy_mount.png b/IconThemes/kdeclassic/16x16/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/devices/3floppy_mount.png
rename to IconThemes/kdeclassic/16x16/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/kdeclassic/16x16/devices/3floppy_unmount.png b/IconThemes/kdeclassic/16x16/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/devices/3floppy_unmount.png
rename to IconThemes/kdeclassic/16x16/devices/media-floppy-3_5.png
diff --git a/IconThemes/kdeclassic/16x16/devices/5floppy_mount.png b/IconThemes/kdeclassic/16x16/devices/media-floppy-5_14-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/devices/5floppy_mount.png
rename to IconThemes/kdeclassic/16x16/devices/media-floppy-5_14-mounted.png
diff --git a/IconThemes/kdeclassic/16x16/devices/5floppy_unmount.png b/IconThemes/kdeclassic/16x16/devices/media-floppy-5_14.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/devices/5floppy_unmount.png
rename to IconThemes/kdeclassic/16x16/devices/media-floppy-5_14.png
diff --git a/IconThemes/kdeclassic/16x16/devices/zip_mount.png b/IconThemes/kdeclassic/16x16/devices/media-floppy-zip-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/devices/zip_mount.png
rename to IconThemes/kdeclassic/16x16/devices/media-floppy-zip-mounted.png
diff --git a/IconThemes/kdeclassic/16x16/devices/zip_unmount.png b/IconThemes/kdeclassic/16x16/devices/media-floppy-zip.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/devices/zip_unmount.png
rename to IconThemes/kdeclassic/16x16/devices/media-floppy-zip.png
diff --git a/IconThemes/kdeclassic/16x16/devices/cdaudio_mount.png b/IconThemes/kdeclassic/16x16/devices/media-optical-cdaudio-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/devices/cdaudio_mount.png
rename to IconThemes/kdeclassic/16x16/devices/media-optical-cdaudio-mounted.png
diff --git a/IconThemes/kdeclassic/16x16/devices/cdaudio_unmount.png b/IconThemes/kdeclassic/16x16/devices/media-optical-cdaudio.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/devices/cdaudio_unmount.png
rename to IconThemes/kdeclassic/16x16/devices/media-optical-cdaudio.png
diff --git a/IconThemes/kdeclassic/16x16/devices/cdrom_mount.png b/IconThemes/kdeclassic/16x16/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/devices/cdrom_mount.png
rename to IconThemes/kdeclassic/16x16/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/kdeclassic/16x16/devices/cdrom_unmount.png b/IconThemes/kdeclassic/16x16/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/devices/cdrom_unmount.png
rename to IconThemes/kdeclassic/16x16/devices/media-optical-cdrom.png
diff --git a/IconThemes/kdeclassic/16x16/devices/dvd_mount.png b/IconThemes/kdeclassic/16x16/devices/media-optical-dvd-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/devices/dvd_mount.png
rename to IconThemes/kdeclassic/16x16/devices/media-optical-dvd-mounted.png
diff --git a/IconThemes/kdeclassic/16x16/devices/dvd_unmount.png b/IconThemes/kdeclassic/16x16/devices/media-optical-dvd.png
similarity index 100%
rename from IconThemes/kdeclassic/16x16/devices/dvd_unmount.png
rename to IconThemes/kdeclassic/16x16/devices/media-optical-dvd.png
diff --git a/IconThemes/kdeclassic/32x32/devices/hdd_mount.png b/IconThemes/kdeclassic/32x32/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/devices/hdd_mount.png
rename to IconThemes/kdeclassic/32x32/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/kdeclassic/32x32/devices/hdd_unmount.png b/IconThemes/kdeclassic/32x32/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/devices/hdd_unmount.png
rename to IconThemes/kdeclassic/32x32/devices/drive-harddisk.png
diff --git a/IconThemes/kdeclassic/32x32/devices/3floppy_mount.png b/IconThemes/kdeclassic/32x32/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/devices/3floppy_mount.png
rename to IconThemes/kdeclassic/32x32/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/kdeclassic/32x32/devices/3floppy_unmount.png b/IconThemes/kdeclassic/32x32/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/devices/3floppy_unmount.png
rename to IconThemes/kdeclassic/32x32/devices/media-floppy-3_5.png
diff --git a/IconThemes/kdeclassic/32x32/devices/5floppy_mount.png b/IconThemes/kdeclassic/32x32/devices/media-floppy-5_14-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/devices/5floppy_mount.png
rename to IconThemes/kdeclassic/32x32/devices/media-floppy-5_14-mounted.png
diff --git a/IconThemes/kdeclassic/32x32/devices/5floppy_unmount.png b/IconThemes/kdeclassic/32x32/devices/media-floppy-5_14.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/devices/5floppy_unmount.png
rename to IconThemes/kdeclassic/32x32/devices/media-floppy-5_14.png
diff --git a/IconThemes/kdeclassic/32x32/devices/zip_mount.png b/IconThemes/kdeclassic/32x32/devices/media-floppy-zip-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/devices/zip_mount.png
rename to IconThemes/kdeclassic/32x32/devices/media-floppy-zip-mounted.png
diff --git a/IconThemes/kdeclassic/32x32/devices/zip_unmount.png b/IconThemes/kdeclassic/32x32/devices/media-floppy-zip.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/devices/zip_unmount.png
rename to IconThemes/kdeclassic/32x32/devices/media-floppy-zip.png
diff --git a/IconThemes/kdeclassic/32x32/devices/cdaudio_mount.png b/IconThemes/kdeclassic/32x32/devices/media-optical-cdaudio-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/devices/cdaudio_mount.png
rename to IconThemes/kdeclassic/32x32/devices/media-optical-cdaudio-mounted.png
diff --git a/IconThemes/kdeclassic/32x32/devices/cdaudio_unmount.png b/IconThemes/kdeclassic/32x32/devices/media-optical-cdaudio.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/devices/cdaudio_unmount.png
rename to IconThemes/kdeclassic/32x32/devices/media-optical-cdaudio.png
diff --git a/IconThemes/kdeclassic/32x32/devices/cdrom_mount.png b/IconThemes/kdeclassic/32x32/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/devices/cdrom_mount.png
rename to IconThemes/kdeclassic/32x32/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/kdeclassic/32x32/devices/cdrom_unmount.png b/IconThemes/kdeclassic/32x32/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/devices/cdrom_unmount.png
rename to IconThemes/kdeclassic/32x32/devices/media-optical-cdrom.png
diff --git a/IconThemes/kdeclassic/32x32/devices/dvd_mount.png b/IconThemes/kdeclassic/32x32/devices/media-optical-dvd-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/devices/dvd_mount.png
rename to IconThemes/kdeclassic/32x32/devices/media-optical-dvd-mounted.png
diff --git a/IconThemes/kdeclassic/32x32/devices/dvd_unmount.png b/IconThemes/kdeclassic/32x32/devices/media-optical-dvd.png
similarity index 100%
rename from IconThemes/kdeclassic/32x32/devices/dvd_unmount.png
rename to IconThemes/kdeclassic/32x32/devices/media-optical-dvd.png
diff --git a/IconThemes/kdeclassic/48x48/devices/hdd_mount.png b/IconThemes/kdeclassic/48x48/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/48x48/devices/hdd_mount.png
rename to IconThemes/kdeclassic/48x48/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/kdeclassic/48x48/devices/hdd_unmount.png b/IconThemes/kdeclassic/48x48/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/kdeclassic/48x48/devices/hdd_unmount.png
rename to IconThemes/kdeclassic/48x48/devices/drive-harddisk.png
diff --git a/IconThemes/kdeclassic/48x48/devices/3floppy_mount.png b/IconThemes/kdeclassic/48x48/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/48x48/devices/3floppy_mount.png
rename to IconThemes/kdeclassic/48x48/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/kdeclassic/48x48/devices/3floppy_unmount.png b/IconThemes/kdeclassic/48x48/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/kdeclassic/48x48/devices/3floppy_unmount.png
rename to IconThemes/kdeclassic/48x48/devices/media-floppy-3_5.png
diff --git a/IconThemes/kdeclassic/48x48/devices/5floppy_mount.png b/IconThemes/kdeclassic/48x48/devices/media-floppy-5_14-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/48x48/devices/5floppy_mount.png
rename to IconThemes/kdeclassic/48x48/devices/media-floppy-5_14-mounted.png
diff --git a/IconThemes/kdeclassic/48x48/devices/5floppy_unmount.png b/IconThemes/kdeclassic/48x48/devices/media-floppy-5_14.png
similarity index 100%
rename from IconThemes/kdeclassic/48x48/devices/5floppy_unmount.png
rename to IconThemes/kdeclassic/48x48/devices/media-floppy-5_14.png
diff --git a/IconThemes/kdeclassic/48x48/devices/zip_mount.png b/IconThemes/kdeclassic/48x48/devices/media-floppy-zip-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/48x48/devices/zip_mount.png
rename to IconThemes/kdeclassic/48x48/devices/media-floppy-zip-mounted.png
diff --git a/IconThemes/kdeclassic/48x48/devices/zip_unmount.png b/IconThemes/kdeclassic/48x48/devices/media-floppy-zip.png
similarity index 100%
rename from IconThemes/kdeclassic/48x48/devices/zip_unmount.png
rename to IconThemes/kdeclassic/48x48/devices/media-floppy-zip.png
diff --git a/IconThemes/kdeclassic/48x48/devices/cdaudio_mount.png b/IconThemes/kdeclassic/48x48/devices/media-optical-cdaudio-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/48x48/devices/cdaudio_mount.png
rename to IconThemes/kdeclassic/48x48/devices/media-optical-cdaudio-mounted.png
diff --git a/IconThemes/kdeclassic/48x48/devices/cdaudio_unmount.png b/IconThemes/kdeclassic/48x48/devices/media-optical-cdaudio.png
similarity index 100%
rename from IconThemes/kdeclassic/48x48/devices/cdaudio_unmount.png
rename to IconThemes/kdeclassic/48x48/devices/media-optical-cdaudio.png
diff --git a/IconThemes/kdeclassic/48x48/devices/cdrom_mount.png b/IconThemes/kdeclassic/48x48/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/48x48/devices/cdrom_mount.png
rename to IconThemes/kdeclassic/48x48/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/kdeclassic/48x48/devices/cdrom_unmount.png b/IconThemes/kdeclassic/48x48/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/kdeclassic/48x48/devices/cdrom_unmount.png
rename to IconThemes/kdeclassic/48x48/devices/media-optical-cdrom.png
diff --git a/IconThemes/kdeclassic/48x48/devices/dvd_mount.png b/IconThemes/kdeclassic/48x48/devices/media-optical-dvd-mounted.png
similarity index 100%
rename from IconThemes/kdeclassic/48x48/devices/dvd_mount.png
rename to IconThemes/kdeclassic/48x48/devices/media-optical-dvd-mounted.png
diff --git a/IconThemes/kdeclassic/48x48/devices/dvd_unmount.png b/IconThemes/kdeclassic/48x48/devices/media-optical-dvd.png
similarity index 100%
rename from IconThemes/kdeclassic/48x48/devices/dvd_unmount.png
rename to IconThemes/kdeclassic/48x48/devices/media-optical-dvd.png
diff --git a/IconThemes/kids/16x16/devices/hdd_mount.png b/IconThemes/kids/16x16/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/kids/16x16/devices/hdd_mount.png
rename to IconThemes/kids/16x16/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/kids/16x16/devices/hdd_unmount.png b/IconThemes/kids/16x16/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/kids/16x16/devices/hdd_unmount.png
rename to IconThemes/kids/16x16/devices/drive-harddisk.png
diff --git a/IconThemes/kids/16x16/devices/3floppy_mount.png b/IconThemes/kids/16x16/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/kids/16x16/devices/3floppy_mount.png
rename to IconThemes/kids/16x16/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/kids/16x16/devices/3floppy_unmount.png b/IconThemes/kids/16x16/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/kids/16x16/devices/3floppy_unmount.png
rename to IconThemes/kids/16x16/devices/media-floppy-3_5.png
diff --git a/IconThemes/kids/16x16/devices/cdrom_mount.png b/IconThemes/kids/16x16/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/kids/16x16/devices/cdrom_mount.png
rename to IconThemes/kids/16x16/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/kids/16x16/devices/cdrom_unmount.png b/IconThemes/kids/16x16/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/kids/16x16/devices/cdrom_unmount.png
rename to IconThemes/kids/16x16/devices/media-optical-cdrom.png
diff --git a/IconThemes/kids/22x22/devices/hdd_mount.png b/IconThemes/kids/22x22/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/kids/22x22/devices/hdd_mount.png
rename to IconThemes/kids/22x22/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/kids/22x22/devices/hdd_unmount.png b/IconThemes/kids/22x22/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/kids/22x22/devices/hdd_unmount.png
rename to IconThemes/kids/22x22/devices/drive-harddisk.png
diff --git a/IconThemes/kids/22x22/devices/3floppy_mount.png b/IconThemes/kids/22x22/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/kids/22x22/devices/3floppy_mount.png
rename to IconThemes/kids/22x22/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/kids/22x22/devices/3floppy_unmount.png b/IconThemes/kids/22x22/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/kids/22x22/devices/3floppy_unmount.png
rename to IconThemes/kids/22x22/devices/media-floppy-3_5.png
diff --git a/IconThemes/kids/22x22/devices/cdrom_mount.png b/IconThemes/kids/22x22/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/kids/22x22/devices/cdrom_mount.png
rename to IconThemes/kids/22x22/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/kids/22x22/devices/cdrom_unmount.png b/IconThemes/kids/22x22/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/kids/22x22/devices/cdrom_unmount.png
rename to IconThemes/kids/22x22/devices/media-optical-cdrom.png
diff --git a/IconThemes/kids/32x32/devices/hdd_mount.png b/IconThemes/kids/32x32/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/kids/32x32/devices/hdd_mount.png
rename to IconThemes/kids/32x32/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/kids/32x32/devices/hdd_unmount.png b/IconThemes/kids/32x32/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/kids/32x32/devices/hdd_unmount.png
rename to IconThemes/kids/32x32/devices/drive-harddisk.png
diff --git a/IconThemes/kids/32x32/devices/3floppy_mount.png b/IconThemes/kids/32x32/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/kids/32x32/devices/3floppy_mount.png
rename to IconThemes/kids/32x32/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/kids/32x32/devices/3floppy_unmount.png b/IconThemes/kids/32x32/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/kids/32x32/devices/3floppy_unmount.png
rename to IconThemes/kids/32x32/devices/media-floppy-3_5.png
diff --git a/IconThemes/kids/32x32/devices/cdrom_mount.png b/IconThemes/kids/32x32/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/kids/32x32/devices/cdrom_mount.png
rename to IconThemes/kids/32x32/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/kids/32x32/devices/cdrom_unmount.png b/IconThemes/kids/32x32/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/kids/32x32/devices/cdrom_unmount.png
rename to IconThemes/kids/32x32/devices/media-optical-cdrom.png
diff --git a/IconThemes/kids/48x48/devices/hdd_mount.png b/IconThemes/kids/48x48/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/kids/48x48/devices/hdd_mount.png
rename to IconThemes/kids/48x48/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/kids/48x48/devices/hdd_unmount.png b/IconThemes/kids/48x48/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/kids/48x48/devices/hdd_unmount.png
rename to IconThemes/kids/48x48/devices/drive-harddisk.png
diff --git a/IconThemes/kids/48x48/devices/3floppy_mount.png b/IconThemes/kids/48x48/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/kids/48x48/devices/3floppy_mount.png
rename to IconThemes/kids/48x48/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/kids/48x48/devices/3floppy_unmount.png b/IconThemes/kids/48x48/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/kids/48x48/devices/3floppy_unmount.png
rename to IconThemes/kids/48x48/devices/media-floppy-3_5.png
diff --git a/IconThemes/kids/48x48/devices/cdrom_mount.png b/IconThemes/kids/48x48/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/kids/48x48/devices/cdrom_mount.png
rename to IconThemes/kids/48x48/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/kids/48x48/devices/cdrom_unmount.png b/IconThemes/kids/48x48/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/kids/48x48/devices/cdrom_unmount.png
rename to IconThemes/kids/48x48/devices/media-optical-cdrom.png
diff --git a/IconThemes/kids/64x64/devices/hdd_mount.png b/IconThemes/kids/64x64/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/kids/64x64/devices/hdd_mount.png
rename to IconThemes/kids/64x64/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/kids/64x64/devices/hdd_unmount.png b/IconThemes/kids/64x64/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/kids/64x64/devices/hdd_unmount.png
rename to IconThemes/kids/64x64/devices/drive-harddisk.png
diff --git a/IconThemes/kids/64x64/devices/3floppy_mount.png b/IconThemes/kids/64x64/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/kids/64x64/devices/3floppy_mount.png
rename to IconThemes/kids/64x64/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/kids/64x64/devices/3floppy_unmount.png b/IconThemes/kids/64x64/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/kids/64x64/devices/3floppy_unmount.png
rename to IconThemes/kids/64x64/devices/media-floppy-3_5.png
diff --git a/IconThemes/kids/64x64/devices/cdrom_mount.png b/IconThemes/kids/64x64/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/kids/64x64/devices/cdrom_mount.png
rename to IconThemes/kids/64x64/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/kids/64x64/devices/cdrom_unmount.png b/IconThemes/kids/64x64/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/kids/64x64/devices/cdrom_unmount.png
rename to IconThemes/kids/64x64/devices/media-optical-cdrom.png
diff --git a/IconThemes/locolor/16x16/devices/hdd_mount.png b/IconThemes/locolor/16x16/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/locolor/16x16/devices/hdd_mount.png
rename to IconThemes/locolor/16x16/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/locolor/16x16/devices/hdd_unmount.png b/IconThemes/locolor/16x16/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/locolor/16x16/devices/hdd_unmount.png
rename to IconThemes/locolor/16x16/devices/drive-harddisk.png
diff --git a/IconThemes/locolor/16x16/devices/3floppy_mount.png b/IconThemes/locolor/16x16/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/locolor/16x16/devices/3floppy_mount.png
rename to IconThemes/locolor/16x16/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/locolor/16x16/devices/3floppy_unmount.png b/IconThemes/locolor/16x16/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/locolor/16x16/devices/3floppy_unmount.png
rename to IconThemes/locolor/16x16/devices/media-floppy-3_5.png
diff --git a/IconThemes/locolor/16x16/devices/5floppy_mount.png b/IconThemes/locolor/16x16/devices/media-floppy-5_14-mounted.png
similarity index 100%
rename from IconThemes/locolor/16x16/devices/5floppy_mount.png
rename to IconThemes/locolor/16x16/devices/media-floppy-5_14-mounted.png
diff --git a/IconThemes/locolor/16x16/devices/5floppy_unmount.png b/IconThemes/locolor/16x16/devices/media-floppy-5_14.png
similarity index 100%
rename from IconThemes/locolor/16x16/devices/5floppy_unmount.png
rename to IconThemes/locolor/16x16/devices/media-floppy-5_14.png
diff --git a/IconThemes/locolor/16x16/devices/zip_mount.png b/IconThemes/locolor/16x16/devices/media-floppy-zip-mounted.png
similarity index 100%
rename from IconThemes/locolor/16x16/devices/zip_mount.png
rename to IconThemes/locolor/16x16/devices/media-floppy-zip-mounted.png
diff --git a/IconThemes/locolor/16x16/devices/zip_unmount.png b/IconThemes/locolor/16x16/devices/media-floppy-zip.png
similarity index 100%
rename from IconThemes/locolor/16x16/devices/zip_unmount.png
rename to IconThemes/locolor/16x16/devices/media-floppy-zip.png
diff --git a/IconThemes/locolor/16x16/devices/cdrom_mount.png b/IconThemes/locolor/16x16/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/locolor/16x16/devices/cdrom_mount.png
rename to IconThemes/locolor/16x16/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/locolor/16x16/devices/cdrom_unmount.png b/IconThemes/locolor/16x16/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/locolor/16x16/devices/cdrom_unmount.png
rename to IconThemes/locolor/16x16/devices/media-optical-cdrom.png
diff --git a/IconThemes/locolor/32x32/devices/hdd_mount.png b/IconThemes/locolor/32x32/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/locolor/32x32/devices/hdd_mount.png
rename to IconThemes/locolor/32x32/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/locolor/32x32/devices/hdd_unmount.png b/IconThemes/locolor/32x32/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/locolor/32x32/devices/hdd_unmount.png
rename to IconThemes/locolor/32x32/devices/drive-harddisk.png
diff --git a/IconThemes/locolor/32x32/devices/3floppy_mount.png b/IconThemes/locolor/32x32/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/locolor/32x32/devices/3floppy_mount.png
rename to IconThemes/locolor/32x32/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/locolor/32x32/devices/3floppy_unmount.png b/IconThemes/locolor/32x32/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/locolor/32x32/devices/3floppy_unmount.png
rename to IconThemes/locolor/32x32/devices/media-floppy-3_5.png
diff --git a/IconThemes/locolor/32x32/devices/5floppy_mount.png b/IconThemes/locolor/32x32/devices/media-floppy-5_14-mounted.png
similarity index 100%
rename from IconThemes/locolor/32x32/devices/5floppy_mount.png
rename to IconThemes/locolor/32x32/devices/media-floppy-5_14-mounted.png
diff --git a/IconThemes/locolor/32x32/devices/5floppy_unmount.png b/IconThemes/locolor/32x32/devices/media-floppy-5_14.png
similarity index 100%
rename from IconThemes/locolor/32x32/devices/5floppy_unmount.png
rename to IconThemes/locolor/32x32/devices/media-floppy-5_14.png
diff --git a/IconThemes/locolor/32x32/devices/zip_mount.png b/IconThemes/locolor/32x32/devices/media-floppy-zip-mounted.png
similarity index 100%
rename from IconThemes/locolor/32x32/devices/zip_mount.png
rename to IconThemes/locolor/32x32/devices/media-floppy-zip-mounted.png
diff --git a/IconThemes/locolor/32x32/devices/zip_unmount.png b/IconThemes/locolor/32x32/devices/media-floppy-zip.png
similarity index 100%
rename from IconThemes/locolor/32x32/devices/zip_unmount.png
rename to IconThemes/locolor/32x32/devices/media-floppy-zip.png
diff --git a/IconThemes/locolor/32x32/devices/cdrom_mount.png b/IconThemes/locolor/32x32/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/locolor/32x32/devices/cdrom_mount.png
rename to IconThemes/locolor/32x32/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/locolor/32x32/devices/cdrom_unmount.png b/IconThemes/locolor/32x32/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/locolor/32x32/devices/cdrom_unmount.png
rename to IconThemes/locolor/32x32/devices/media-optical-cdrom.png
diff --git a/IconThemes/slick/16x16/devices/hdd_mount.png b/IconThemes/slick/16x16/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/slick/16x16/devices/hdd_mount.png
rename to IconThemes/slick/16x16/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/slick/16x16/devices/hdd_unmount.png b/IconThemes/slick/16x16/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/slick/16x16/devices/hdd_unmount.png
rename to IconThemes/slick/16x16/devices/drive-harddisk.png
diff --git a/IconThemes/slick/16x16/devices/usbpendrive_mount.png b/IconThemes/slick/16x16/devices/media-flash-usb-mounted.png
similarity index 100%
rename from IconThemes/slick/16x16/devices/usbpendrive_mount.png
rename to IconThemes/slick/16x16/devices/media-flash-usb-mounted.png
diff --git a/IconThemes/slick/16x16/devices/usbpendrive_unmount.png b/IconThemes/slick/16x16/devices/media-flash-usb.png
similarity index 100%
rename from IconThemes/slick/16x16/devices/usbpendrive_unmount.png
rename to IconThemes/slick/16x16/devices/media-flash-usb.png
diff --git a/IconThemes/slick/16x16/devices/3floppy_mount.png b/IconThemes/slick/16x16/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/slick/16x16/devices/3floppy_mount.png
rename to IconThemes/slick/16x16/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/slick/16x16/devices/3floppy_unmount.png b/IconThemes/slick/16x16/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/slick/16x16/devices/3floppy_unmount.png
rename to IconThemes/slick/16x16/devices/media-floppy-3_5.png
diff --git a/IconThemes/slick/16x16/devices/cdaudio_mount.png b/IconThemes/slick/16x16/devices/media-optical-cdaudio-mounted.png
similarity index 100%
rename from IconThemes/slick/16x16/devices/cdaudio_mount.png
rename to IconThemes/slick/16x16/devices/media-optical-cdaudio-mounted.png
diff --git a/IconThemes/slick/16x16/devices/cdaudio_unmount.png b/IconThemes/slick/16x16/devices/media-optical-cdaudio.png
similarity index 100%
rename from IconThemes/slick/16x16/devices/cdaudio_unmount.png
rename to IconThemes/slick/16x16/devices/media-optical-cdaudio.png
diff --git a/IconThemes/slick/16x16/devices/cdrom_mount.png b/IconThemes/slick/16x16/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/slick/16x16/devices/cdrom_mount.png
rename to IconThemes/slick/16x16/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/slick/16x16/devices/cdrom_unmount.png b/IconThemes/slick/16x16/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/slick/16x16/devices/cdrom_unmount.png
rename to IconThemes/slick/16x16/devices/media-optical-cdrom.png
diff --git a/IconThemes/slick/16x16/devices/dvd_mount.png b/IconThemes/slick/16x16/devices/media-optical-dvd-mounted.png
similarity index 100%
rename from IconThemes/slick/16x16/devices/dvd_mount.png
rename to IconThemes/slick/16x16/devices/media-optical-dvd-mounted.png
diff --git a/IconThemes/slick/16x16/devices/dvd_unmount.png b/IconThemes/slick/16x16/devices/media-optical-dvd.png
similarity index 100%
rename from IconThemes/slick/16x16/devices/dvd_unmount.png
rename to IconThemes/slick/16x16/devices/media-optical-dvd.png
diff --git a/IconThemes/slick/22x22/devices/hdd_mount.png b/IconThemes/slick/22x22/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/slick/22x22/devices/hdd_mount.png
rename to IconThemes/slick/22x22/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/slick/22x22/devices/hdd_unmount.png b/IconThemes/slick/22x22/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/slick/22x22/devices/hdd_unmount.png
rename to IconThemes/slick/22x22/devices/drive-harddisk.png
diff --git a/IconThemes/slick/22x22/devices/usbpendrive_mount.png b/IconThemes/slick/22x22/devices/media-flash-usb-mounted.png
similarity index 100%
rename from IconThemes/slick/22x22/devices/usbpendrive_mount.png
rename to IconThemes/slick/22x22/devices/media-flash-usb-mounted.png
diff --git a/IconThemes/slick/22x22/devices/usbpendrive_unmount.png b/IconThemes/slick/22x22/devices/media-flash-usb.png
similarity index 100%
rename from IconThemes/slick/22x22/devices/usbpendrive_unmount.png
rename to IconThemes/slick/22x22/devices/media-flash-usb.png
diff --git a/IconThemes/slick/22x22/devices/3floppy_mount.png b/IconThemes/slick/22x22/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/slick/22x22/devices/3floppy_mount.png
rename to IconThemes/slick/22x22/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/slick/22x22/devices/3floppy_unmount.png b/IconThemes/slick/22x22/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/slick/22x22/devices/3floppy_unmount.png
rename to IconThemes/slick/22x22/devices/media-floppy-3_5.png
diff --git a/IconThemes/slick/22x22/devices/cdaudio_mount.png b/IconThemes/slick/22x22/devices/media-optical-cdaudio-mounted.png
similarity index 100%
rename from IconThemes/slick/22x22/devices/cdaudio_mount.png
rename to IconThemes/slick/22x22/devices/media-optical-cdaudio-mounted.png
diff --git a/IconThemes/slick/22x22/devices/cdaudio_unmount.png b/IconThemes/slick/22x22/devices/media-optical-cdaudio.png
similarity index 100%
rename from IconThemes/slick/22x22/devices/cdaudio_unmount.png
rename to IconThemes/slick/22x22/devices/media-optical-cdaudio.png
diff --git a/IconThemes/slick/22x22/devices/cdrom_mount.png b/IconThemes/slick/22x22/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/slick/22x22/devices/cdrom_mount.png
rename to IconThemes/slick/22x22/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/slick/22x22/devices/cdrom_unmount.png b/IconThemes/slick/22x22/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/slick/22x22/devices/cdrom_unmount.png
rename to IconThemes/slick/22x22/devices/media-optical-cdrom.png
diff --git a/IconThemes/slick/22x22/devices/dvd_mount.png b/IconThemes/slick/22x22/devices/media-optical-dvd-mounted.png
similarity index 100%
rename from IconThemes/slick/22x22/devices/dvd_mount.png
rename to IconThemes/slick/22x22/devices/media-optical-dvd-mounted.png
diff --git a/IconThemes/slick/22x22/devices/dvd_unmount.png b/IconThemes/slick/22x22/devices/media-optical-dvd.png
similarity index 100%
rename from IconThemes/slick/22x22/devices/dvd_unmount.png
rename to IconThemes/slick/22x22/devices/media-optical-dvd.png
diff --git a/IconThemes/slick/32x32/devices/hdd_mount.png b/IconThemes/slick/32x32/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/slick/32x32/devices/hdd_mount.png
rename to IconThemes/slick/32x32/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/slick/32x32/devices/hdd_unmount.png b/IconThemes/slick/32x32/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/slick/32x32/devices/hdd_unmount.png
rename to IconThemes/slick/32x32/devices/drive-harddisk.png
diff --git a/IconThemes/slick/32x32/devices/usbpendrive_mount.png b/IconThemes/slick/32x32/devices/media-flash-usb-mounted.png
similarity index 100%
rename from IconThemes/slick/32x32/devices/usbpendrive_mount.png
rename to IconThemes/slick/32x32/devices/media-flash-usb-mounted.png
diff --git a/IconThemes/slick/32x32/devices/usbpendrive_unmount.png b/IconThemes/slick/32x32/devices/media-flash-usb.png
similarity index 100%
rename from IconThemes/slick/32x32/devices/usbpendrive_unmount.png
rename to IconThemes/slick/32x32/devices/media-flash-usb.png
diff --git a/IconThemes/slick/32x32/devices/3floppy_mount.png b/IconThemes/slick/32x32/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/slick/32x32/devices/3floppy_mount.png
rename to IconThemes/slick/32x32/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/slick/32x32/devices/3floppy_unmount.png b/IconThemes/slick/32x32/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/slick/32x32/devices/3floppy_unmount.png
rename to IconThemes/slick/32x32/devices/media-floppy-3_5.png
diff --git a/IconThemes/slick/32x32/devices/cdaudio_mount.png b/IconThemes/slick/32x32/devices/media-optical-cdaudio-mounted.png
similarity index 100%
rename from IconThemes/slick/32x32/devices/cdaudio_mount.png
rename to IconThemes/slick/32x32/devices/media-optical-cdaudio-mounted.png
diff --git a/IconThemes/slick/32x32/devices/cdaudio_unmount.png b/IconThemes/slick/32x32/devices/media-optical-cdaudio.png
similarity index 100%
rename from IconThemes/slick/32x32/devices/cdaudio_unmount.png
rename to IconThemes/slick/32x32/devices/media-optical-cdaudio.png
diff --git a/IconThemes/slick/32x32/devices/cdrom_mount.png b/IconThemes/slick/32x32/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/slick/32x32/devices/cdrom_mount.png
rename to IconThemes/slick/32x32/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/slick/32x32/devices/cdrom_unmount.png b/IconThemes/slick/32x32/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/slick/32x32/devices/cdrom_unmount.png
rename to IconThemes/slick/32x32/devices/media-optical-cdrom.png
diff --git a/IconThemes/slick/32x32/devices/dvd_mount.png b/IconThemes/slick/32x32/devices/media-optical-dvd-mounted.png
similarity index 100%
rename from IconThemes/slick/32x32/devices/dvd_mount.png
rename to IconThemes/slick/32x32/devices/media-optical-dvd-mounted.png
diff --git a/IconThemes/slick/32x32/devices/dvd_unmount.png b/IconThemes/slick/32x32/devices/media-optical-dvd.png
similarity index 100%
rename from IconThemes/slick/32x32/devices/dvd_unmount.png
rename to IconThemes/slick/32x32/devices/media-optical-dvd.png
diff --git a/IconThemes/slick/48x48/devices/hdd_mount.png b/IconThemes/slick/48x48/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/slick/48x48/devices/hdd_mount.png
rename to IconThemes/slick/48x48/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/slick/48x48/devices/hdd_unmount.png b/IconThemes/slick/48x48/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/slick/48x48/devices/hdd_unmount.png
rename to IconThemes/slick/48x48/devices/drive-harddisk.png
diff --git a/IconThemes/slick/48x48/devices/usbpendrive_mount.png b/IconThemes/slick/48x48/devices/media-flash-usb-mounted.png
similarity index 100%
rename from IconThemes/slick/48x48/devices/usbpendrive_mount.png
rename to IconThemes/slick/48x48/devices/media-flash-usb-mounted.png
diff --git a/IconThemes/slick/48x48/devices/usbpendrive_unmount.png b/IconThemes/slick/48x48/devices/media-flash-usb.png
similarity index 100%
rename from IconThemes/slick/48x48/devices/usbpendrive_unmount.png
rename to IconThemes/slick/48x48/devices/media-flash-usb.png
diff --git a/IconThemes/slick/48x48/devices/3floppy_mount.png b/IconThemes/slick/48x48/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/slick/48x48/devices/3floppy_mount.png
rename to IconThemes/slick/48x48/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/slick/48x48/devices/3floppy_unmount.png b/IconThemes/slick/48x48/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/slick/48x48/devices/3floppy_unmount.png
rename to IconThemes/slick/48x48/devices/media-floppy-3_5.png
diff --git a/IconThemes/slick/48x48/devices/cdaudio_mount.png b/IconThemes/slick/48x48/devices/media-optical-cdaudio-mounted.png
similarity index 100%
rename from IconThemes/slick/48x48/devices/cdaudio_mount.png
rename to IconThemes/slick/48x48/devices/media-optical-cdaudio-mounted.png
diff --git a/IconThemes/slick/48x48/devices/cdaudio_unmount.png b/IconThemes/slick/48x48/devices/media-optical-cdaudio.png
similarity index 100%
rename from IconThemes/slick/48x48/devices/cdaudio_unmount.png
rename to IconThemes/slick/48x48/devices/media-optical-cdaudio.png
diff --git a/IconThemes/slick/48x48/devices/cdrom_mount.png b/IconThemes/slick/48x48/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/slick/48x48/devices/cdrom_mount.png
rename to IconThemes/slick/48x48/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/slick/48x48/devices/cdrom_unmount.png b/IconThemes/slick/48x48/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/slick/48x48/devices/cdrom_unmount.png
rename to IconThemes/slick/48x48/devices/media-optical-cdrom.png
diff --git a/IconThemes/slick/48x48/devices/dvd_mount.png b/IconThemes/slick/48x48/devices/media-optical-dvd-mounted.png
similarity index 100%
rename from IconThemes/slick/48x48/devices/dvd_mount.png
rename to IconThemes/slick/48x48/devices/media-optical-dvd-mounted.png
diff --git a/IconThemes/slick/48x48/devices/dvd_unmount.png b/IconThemes/slick/48x48/devices/media-optical-dvd.png
similarity index 100%
rename from IconThemes/slick/48x48/devices/dvd_unmount.png
rename to IconThemes/slick/48x48/devices/media-optical-dvd.png
diff --git a/IconThemes/slick/64x64/devices/hdd_mount.png b/IconThemes/slick/64x64/devices/drive-harddisk-mounted.png
similarity index 100%
rename from IconThemes/slick/64x64/devices/hdd_mount.png
rename to IconThemes/slick/64x64/devices/drive-harddisk-mounted.png
diff --git a/IconThemes/slick/64x64/devices/hdd_unmount.png b/IconThemes/slick/64x64/devices/drive-harddisk.png
similarity index 100%
rename from IconThemes/slick/64x64/devices/hdd_unmount.png
rename to IconThemes/slick/64x64/devices/drive-harddisk.png
diff --git a/IconThemes/slick/64x64/devices/usbpendrive_mount.png b/IconThemes/slick/64x64/devices/media-flash-usb-mounted.png
similarity index 100%
rename from IconThemes/slick/64x64/devices/usbpendrive_mount.png
rename to IconThemes/slick/64x64/devices/media-flash-usb-mounted.png
diff --git a/IconThemes/slick/64x64/devices/usbpendrive_unmount.png b/IconThemes/slick/64x64/devices/media-flash-usb.png
similarity index 100%
rename from IconThemes/slick/64x64/devices/usbpendrive_unmount.png
rename to IconThemes/slick/64x64/devices/media-flash-usb.png
diff --git a/IconThemes/slick/64x64/devices/3floppy_mount.png b/IconThemes/slick/64x64/devices/media-floppy-3_5-mounted.png
similarity index 100%
rename from IconThemes/slick/64x64/devices/3floppy_mount.png
rename to IconThemes/slick/64x64/devices/media-floppy-3_5-mounted.png
diff --git a/IconThemes/slick/64x64/devices/3floppy_unmount.png b/IconThemes/slick/64x64/devices/media-floppy-3_5.png
similarity index 100%
rename from IconThemes/slick/64x64/devices/3floppy_unmount.png
rename to IconThemes/slick/64x64/devices/media-floppy-3_5.png
diff --git a/IconThemes/slick/64x64/devices/cdaudio_mount.png b/IconThemes/slick/64x64/devices/media-optical-cdaudio-mounted.png
similarity index 100%
rename from IconThemes/slick/64x64/devices/cdaudio_mount.png
rename to IconThemes/slick/64x64/devices/media-optical-cdaudio-mounted.png
diff --git a/IconThemes/slick/64x64/devices/cdaudio_unmount.png b/IconThemes/slick/64x64/devices/media-optical-cdaudio.png
similarity index 100%
rename from IconThemes/slick/64x64/devices/cdaudio_unmount.png
rename to IconThemes/slick/64x64/devices/media-optical-cdaudio.png
diff --git a/IconThemes/slick/64x64/devices/cdrom_mount.png b/IconThemes/slick/64x64/devices/media-optical-cdrom-mounted.png
similarity index 100%
rename from IconThemes/slick/64x64/devices/cdrom_mount.png
rename to IconThemes/slick/64x64/devices/media-optical-cdrom-mounted.png
diff --git a/IconThemes/slick/64x64/devices/cdrom_unmount.png b/IconThemes/slick/64x64/devices/media-optical-cdrom.png
similarity index 100%
rename from IconThemes/slick/64x64/devices/cdrom_unmount.png
rename to IconThemes/slick/64x64/devices/media-optical-cdrom.png
diff --git a/IconThemes/slick/64x64/devices/dvd_mount.png b/IconThemes/slick/64x64/devices/media-optical-dvd-mounted.png
similarity index 100%
rename from IconThemes/slick/64x64/devices/dvd_mount.png
rename to IconThemes/slick/64x64/devices/media-optical-dvd-mounted.png
diff --git a/IconThemes/slick/64x64/devices/dvd_unmount.png b/IconThemes/slick/64x64/devices/media-optical-dvd.png
similarity index 100%
rename from IconThemes/slick/64x64/devices/dvd_unmount.png
rename to IconThemes/slick/64x64/devices/media-optical-dvd.png
diff --git a/tdescreensaver/kdesavers/firesaver.cpp b/tdescreensaver/kdesavers/firesaver.cpp
index 5fda047c..586fa5ff 100644
--- a/tdescreensaver/kdesavers/firesaver.cpp
+++ b/tdescreensaver/kdesavers/firesaver.cpp
@@ -1093,7 +1093,7 @@ void KFireSaver :: readConfig ()
 				imageList.append( new TQImage(tempImage) );
 		if ( config.readBoolEntry( "LogosTDEIcons", true ) ) {
 			const TQString icons[] = {
-				"3floppy_unmount", "cdrom_unmount", "hdd_mount", "kmix",
+				"media-floppy-3_5", "media-optical-cdrom", "drive-harddisk-mounted", "kmix",
 				"network", "my-computer", "folder_home", "konqueror",
 				"kmail", "penguin", "preferences-desktop-personal" };
 			for ( int i = 0; i < 11; i++ )