Normalized names of devices to avoid unintentional mixed used of icons from different

icon themes.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

186 files changed, 8 insertions, 5 deletions

diff --git a/pics/crystalsvg/cr128-device-camera_mount.png b/pics/crystalsvg/cr128-device-camera-mounted.png
index 356459c5e..356459c5e 100644
--- a/pics/crystalsvg/cr128-device-camera_mount.png
+++ b/pics/crystalsvg/cr128-device-camera-mounted.png
diff --git a/pics/crystalsvg/cr128-device-camera_unmount.png b/pics/crystalsvg/cr128-device-camera-unmounted.png
index aa646f7a8..aa646f7a8 100644
--- a/pics/crystalsvg/cr128-device-camera_unmount.png
+++ b/pics/crystalsvg/cr128-device-camera-unmounted.png
diff --git a/pics/crystalsvg/cr128-device-drive-harddisk.png b/pics/crystalsvg/cr128-device-drive-harddisk-unmounted.png
index af832eb8f..af832eb8f 100644
--- a/pics/crystalsvg/cr128-device-drive-harddisk.png
+++ b/pics/crystalsvg/cr128-device-drive-harddisk-unmounted.png
diff --git a/pics/crystalsvg/cr128-device-media-flash-compact_flash.png b/pics/crystalsvg/cr128-device-media-flash-compact_flash-unmounted.png
index ba6e59c05..ba6e59c05 100644
--- a/pics/crystalsvg/cr128-device-media-flash-compact_flash.png
+++ b/pics/crystalsvg/cr128-device-media-flash-compact_flash-unmounted.png
diff --git a/pics/crystalsvg/cr128-device-media-flash-memory_stick.png b/pics/crystalsvg/cr128-device-media-flash-memory_stick-unmounted.png
index cc6a78d26..cc6a78d26 100644
--- a/pics/crystalsvg/cr128-device-media-flash-memory_stick.png
+++ b/pics/crystalsvg/cr128-device-media-flash-memory_stick-unmounted.png
diff --git a/pics/crystalsvg/cr128-device-media-flash-sd_mmc.png b/pics/crystalsvg/cr128-device-media-flash-sd_mmc-unmounted.png
index b9fe811f0..b9fe811f0 100644
--- a/pics/crystalsvg/cr128-device-media-flash-sd_mmc.png
+++ b/pics/crystalsvg/cr128-device-media-flash-sd_mmc-unmounted.png
diff --git a/pics/crystalsvg/cr128-device-media-flash-smart_media.png b/pics/crystalsvg/cr128-device-media-flash-smart_media-unmounted.png
index 99835c68e..99835c68e 100644
--- a/pics/crystalsvg/cr128-device-media-flash-smart_media.png
+++ b/pics/crystalsvg/cr128-device-media-flash-smart_media-unmounted.png
diff --git a/pics/crystalsvg/cr128-device-media-flash-usb.png b/pics/crystalsvg/cr128-device-media-flash-usb-unmounted.png
index a3caea622..a3caea622 100644
--- a/pics/crystalsvg/cr128-device-media-flash-usb.png
+++ b/pics/crystalsvg/cr128-device-media-flash-usb-unmounted.png
diff --git a/pics/crystalsvg/cr128-device-media-tape.png b/pics/crystalsvg/cr128-device-media-tape-unmounted.png
index 94c3a1eae..94c3a1eae 100644
--- a/pics/crystalsvg/cr128-device-media-tape.png
+++ b/pics/crystalsvg/cr128-device-media-tape-unmounted.png
diff --git a/pics/crystalsvg/cr128-device-multimedia-player.png b/pics/crystalsvg/cr128-device-multimedia-player-unmounted.png
index bddb859fe..bddb859fe 100644
--- a/pics/crystalsvg/cr128-device-multimedia-player.png
+++ b/pics/crystalsvg/cr128-device-multimedia-player-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-camera_mount.png b/pics/crystalsvg/cr16-device-camera-mounted.png
index b4f5cacd2..b4f5cacd2 100644
--- a/pics/crystalsvg/cr16-device-camera_mount.png
+++ b/pics/crystalsvg/cr16-device-camera-mounted.png
diff --git a/pics/crystalsvg/cr16-device-camera_unmount.png b/pics/crystalsvg/cr16-device-camera-unmounted.png
index 2f6145b0d..2f6145b0d 100644
--- a/pics/crystalsvg/cr16-device-camera_unmount.png
+++ b/pics/crystalsvg/cr16-device-camera-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-cd-r_locked.png b/pics/crystalsvg/cr16-device-cd-r-locked.png
index fb08a404f..fb08a404f 100644
--- a/pics/crystalsvg/cr16-device-cd-r_locked.png
+++ b/pics/crystalsvg/cr16-device-cd-r-locked.png
diff --git a/pics/crystalsvg/cr16-device-cd-r_mount.png b/pics/crystalsvg/cr16-device-cd-r-mounted.png
index 8680eeeae..8680eeeae 100644
--- a/pics/crystalsvg/cr16-device-cd-r_mount.png
+++ b/pics/crystalsvg/cr16-device-cd-r-mounted.png
diff --git a/pics/crystalsvg/cr16-device-cd-r_unlocked.png b/pics/crystalsvg/cr16-device-cd-r-unlocked.png
index 9b1228297..9b1228297 100644
--- a/pics/crystalsvg/cr16-device-cd-r_unlocked.png
+++ b/pics/crystalsvg/cr16-device-cd-r-unlocked.png
diff --git a/pics/crystalsvg/cr16-device-cd-r_unmount.png b/pics/crystalsvg/cr16-device-cd-r-unmounted.png
index e408358f6..e408358f6 100644
--- a/pics/crystalsvg/cr16-device-cd-r_unmount.png
+++ b/pics/crystalsvg/cr16-device-cd-r-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-cd-rw_locked.png b/pics/crystalsvg/cr16-device-cd-rw-locked.png
index fb08a404f..fb08a404f 100644
--- a/pics/crystalsvg/cr16-device-cd-rw_locked.png
+++ b/pics/crystalsvg/cr16-device-cd-rw-locked.png
diff --git a/pics/crystalsvg/cr16-device-cd-rw_mount.png b/pics/crystalsvg/cr16-device-cd-rw-mounted.png
index 8680eeeae..8680eeeae 100644
--- a/pics/crystalsvg/cr16-device-cd-rw_mount.png
+++ b/pics/crystalsvg/cr16-device-cd-rw-mounted.png
diff --git a/pics/crystalsvg/cr16-device-cd-rw_unlocked.png b/pics/crystalsvg/cr16-device-cd-rw-unlocked.png
index 9b1228297..9b1228297 100644
--- a/pics/crystalsvg/cr16-device-cd-rw_unlocked.png
+++ b/pics/crystalsvg/cr16-device-cd-rw-unlocked.png
diff --git a/pics/crystalsvg/cr16-device-cd-rw_unmount.png b/pics/crystalsvg/cr16-device-cd-rw-unmounted.png
index e408358f6..e408358f6 100644
--- a/pics/crystalsvg/cr16-device-cd-rw_unmount.png
+++ b/pics/crystalsvg/cr16-device-cd-rw-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-drive-harddisk.png b/pics/crystalsvg/cr16-device-drive-harddisk-unmounted.png
index 21507d09d..21507d09d 100644
--- a/pics/crystalsvg/cr16-device-drive-harddisk.png
+++ b/pics/crystalsvg/cr16-device-drive-harddisk-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-media-flash-compact_flash.png b/pics/crystalsvg/cr16-device-media-flash-compact_flash-unmounted.png
index 49013e414..49013e414 100644
--- a/pics/crystalsvg/cr16-device-media-flash-compact_flash.png
+++ b/pics/crystalsvg/cr16-device-media-flash-compact_flash-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-media-flash-memory_stick.png b/pics/crystalsvg/cr16-device-media-flash-memory_stick-unmounted.png
index 4d6270af1..4d6270af1 100644
--- a/pics/crystalsvg/cr16-device-media-flash-memory_stick.png
+++ b/pics/crystalsvg/cr16-device-media-flash-memory_stick-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-media-flash-sd_mmc.png b/pics/crystalsvg/cr16-device-media-flash-sd_mmc-unmounted.png
index 35f09b9d5..35f09b9d5 100644
--- a/pics/crystalsvg/cr16-device-media-flash-sd_mmc.png
+++ b/pics/crystalsvg/cr16-device-media-flash-sd_mmc-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-media-flash-smart_media.png b/pics/crystalsvg/cr16-device-media-flash-smart_media-unmounted.png
index 71fa370a3..71fa370a3 100644
--- a/pics/crystalsvg/cr16-device-media-flash-smart_media.png
+++ b/pics/crystalsvg/cr16-device-media-flash-smart_media-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-media-flash-usb.png b/pics/crystalsvg/cr16-device-media-flash-usb-unmounted.png
index 6abaf3f45..6abaf3f45 100644
--- a/pics/crystalsvg/cr16-device-media-flash-usb.png
+++ b/pics/crystalsvg/cr16-device-media-flash-usb-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-media-floppy-3_5.png b/pics/crystalsvg/cr16-device-media-floppy-3_5-unmounted.png
index 1b7a662c7..1b7a662c7 100644
--- a/pics/crystalsvg/cr16-device-media-floppy-3_5.png
+++ b/pics/crystalsvg/cr16-device-media-floppy-3_5-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-media-floppy-5_14.png b/pics/crystalsvg/cr16-device-media-floppy-5_14-unmounted.png
index 75d2c5bd6..75d2c5bd6 100644
--- a/pics/crystalsvg/cr16-device-media-floppy-5_14.png
+++ b/pics/crystalsvg/cr16-device-media-floppy-5_14-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-media-floppy-zip.png b/pics/crystalsvg/cr16-device-media-floppy-zip-unmounted.png
index 0430fbd54..0430fbd54 100644
--- a/pics/crystalsvg/cr16-device-media-floppy-zip.png
+++ b/pics/crystalsvg/cr16-device-media-floppy-zip-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-media-optical-cdaudio.png b/pics/crystalsvg/cr16-device-media-optical-cdaudio-unmounted.png
index 4fafed9d3..4fafed9d3 100644
--- a/pics/crystalsvg/cr16-device-media-optical-cdaudio.png
+++ b/pics/crystalsvg/cr16-device-media-optical-cdaudio-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-media-optical-cdrom.png b/pics/crystalsvg/cr16-device-media-optical-cdrom-unmounted.png
index c3df4e725..c3df4e725 100644
--- a/pics/crystalsvg/cr16-device-media-optical-cdrom.png
+++ b/pics/crystalsvg/cr16-device-media-optical-cdrom-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-media-optical-dvd.png b/pics/crystalsvg/cr16-device-media-optical-dvd-unmounted.png
index 1b4d86224..1b4d86224 100644
--- a/pics/crystalsvg/cr16-device-media-optical-dvd.png
+++ b/pics/crystalsvg/cr16-device-media-optical-dvd-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-media-tape.png b/pics/crystalsvg/cr16-device-media-tape-unmounted.png
index e5eb057b4..e5eb057b4 100644
--- a/pics/crystalsvg/cr16-device-media-tape.png
+++ b/pics/crystalsvg/cr16-device-media-tape-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-mo_mount.png b/pics/crystalsvg/cr16-device-mo-mounted.png
index 2c8b57563..2c8b57563 100644
--- a/pics/crystalsvg/cr16-device-mo_mount.png
+++ b/pics/crystalsvg/cr16-device-mo-mounted.png
diff --git a/pics/crystalsvg/cr16-device-mo_unmount.png b/pics/crystalsvg/cr16-device-mo-unmounted.png
index a3644d1a8..a3644d1a8 100644
--- a/pics/crystalsvg/cr16-device-mo_unmount.png
+++ b/pics/crystalsvg/cr16-device-mo-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-multimedia-player.png b/pics/crystalsvg/cr16-device-multimedia-player-unmounted.png
index 12edcdf3a..12edcdf3a 100644
--- a/pics/crystalsvg/cr16-device-multimedia-player.png
+++ b/pics/crystalsvg/cr16-device-multimedia-player-unmounted.png
diff --git a/pics/crystalsvg/cr16-device-nfs_mount.png b/pics/crystalsvg/cr16-device-nfs-mounted.png
index ebb2559af..ebb2559af 100644
--- a/pics/crystalsvg/cr16-device-nfs_mount.png
+++ b/pics/crystalsvg/cr16-device-nfs-mounted.png
diff --git a/pics/crystalsvg/cr16-device-nfs_unmount.png b/pics/crystalsvg/cr16-device-nfs-unmounted.png
index aa4beadec..aa4beadec 100644
--- a/pics/crystalsvg/cr16-device-nfs_unmount.png
+++ b/pics/crystalsvg/cr16-device-nfs-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-camera_mount.png b/pics/crystalsvg/cr22-device-camera-mounted.png
index 806929a7d..806929a7d 100644
--- a/pics/crystalsvg/cr22-device-camera_mount.png
+++ b/pics/crystalsvg/cr22-device-camera-mounted.png
diff --git a/pics/crystalsvg/cr22-device-camera_unmount.png b/pics/crystalsvg/cr22-device-camera-unmounted.png
index c983915f5..c983915f5 100644
--- a/pics/crystalsvg/cr22-device-camera_unmount.png
+++ b/pics/crystalsvg/cr22-device-camera-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-cd-r_locked.png b/pics/crystalsvg/cr22-device-cd-r-locked.png
index c1d5d0e59..c1d5d0e59 100644
--- a/pics/crystalsvg/cr22-device-cd-r_locked.png
+++ b/pics/crystalsvg/cr22-device-cd-r-locked.png
diff --git a/pics/crystalsvg/cr22-device-cd-r_mount.png b/pics/crystalsvg/cr22-device-cd-r-mounted.png
index 5cc8426bc..5cc8426bc 100644
--- a/pics/crystalsvg/cr22-device-cd-r_mount.png
+++ b/pics/crystalsvg/cr22-device-cd-r-mounted.png
diff --git a/pics/crystalsvg/cr22-device-cd-r_unlocked.png b/pics/crystalsvg/cr22-device-cd-r-unlocked.png
index dca4a70b2..dca4a70b2 100644
--- a/pics/crystalsvg/cr22-device-cd-r_unlocked.png
+++ b/pics/crystalsvg/cr22-device-cd-r-unlocked.png
diff --git a/pics/crystalsvg/cr22-device-cd-r_unmount.png b/pics/crystalsvg/cr22-device-cd-r-unmounted.png
index 9377dad53..9377dad53 100644
--- a/pics/crystalsvg/cr22-device-cd-r_unmount.png
+++ b/pics/crystalsvg/cr22-device-cd-r-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-cd-rw_locked.png b/pics/crystalsvg/cr22-device-cd-rw-locked.png
index c1d5d0e59..c1d5d0e59 100644
--- a/pics/crystalsvg/cr22-device-cd-rw_locked.png
+++ b/pics/crystalsvg/cr22-device-cd-rw-locked.png
diff --git a/pics/crystalsvg/cr22-device-cd-rw_mount.png b/pics/crystalsvg/cr22-device-cd-rw-mounted.png
index 5cc8426bc..5cc8426bc 100644
--- a/pics/crystalsvg/cr22-device-cd-rw_mount.png
+++ b/pics/crystalsvg/cr22-device-cd-rw-mounted.png
diff --git a/pics/crystalsvg/cr22-device-cd-rw_unlocked.png b/pics/crystalsvg/cr22-device-cd-rw-unlocked.png
index dca4a70b2..dca4a70b2 100644
--- a/pics/crystalsvg/cr22-device-cd-rw_unlocked.png
+++ b/pics/crystalsvg/cr22-device-cd-rw-unlocked.png
diff --git a/pics/crystalsvg/cr22-device-cd-rw_unmount.png b/pics/crystalsvg/cr22-device-cd-rw-unmounted.png
index 9377dad53..9377dad53 100644
--- a/pics/crystalsvg/cr22-device-cd-rw_unmount.png
+++ b/pics/crystalsvg/cr22-device-cd-rw-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-drive-harddisk.png b/pics/crystalsvg/cr22-device-drive-harddisk-unmounted.png
index b3d428274..b3d428274 100644
--- a/pics/crystalsvg/cr22-device-drive-harddisk.png
+++ b/pics/crystalsvg/cr22-device-drive-harddisk-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-media-flash-compact_flash.png b/pics/crystalsvg/cr22-device-media-flash-compact_flash-unmounted.png
index 829b605d5..829b605d5 100644
--- a/pics/crystalsvg/cr22-device-media-flash-compact_flash.png
+++ b/pics/crystalsvg/cr22-device-media-flash-compact_flash-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-media-flash-memory_stick.png b/pics/crystalsvg/cr22-device-media-flash-memory_stick-unmounted.png
index d7b0c5894..d7b0c5894 100644
--- a/pics/crystalsvg/cr22-device-media-flash-memory_stick.png
+++ b/pics/crystalsvg/cr22-device-media-flash-memory_stick-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-media-flash-sd_mmc.png b/pics/crystalsvg/cr22-device-media-flash-sd_mmc-unmounted.png
index 133c2da92..133c2da92 100644
--- a/pics/crystalsvg/cr22-device-media-flash-sd_mmc.png
+++ b/pics/crystalsvg/cr22-device-media-flash-sd_mmc-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-media-flash-smart_media.png b/pics/crystalsvg/cr22-device-media-flash-smart_media-unmounted.png
index 8eead817d..8eead817d 100644
--- a/pics/crystalsvg/cr22-device-media-flash-smart_media.png
+++ b/pics/crystalsvg/cr22-device-media-flash-smart_media-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-media-flash-usb.png b/pics/crystalsvg/cr22-device-media-flash-usb-unmounted.png
index 8186b3693..8186b3693 100644
--- a/pics/crystalsvg/cr22-device-media-flash-usb.png
+++ b/pics/crystalsvg/cr22-device-media-flash-usb-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-media-floppy-3_5.png b/pics/crystalsvg/cr22-device-media-floppy-3_5-unmounted.png
index f19c000e5..f19c000e5 100644
--- a/pics/crystalsvg/cr22-device-media-floppy-3_5.png
+++ b/pics/crystalsvg/cr22-device-media-floppy-3_5-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-media-floppy-5_14.png b/pics/crystalsvg/cr22-device-media-floppy-5_14-unmounted.png
index c56302b50..c56302b50 100644
--- a/pics/crystalsvg/cr22-device-media-floppy-5_14.png
+++ b/pics/crystalsvg/cr22-device-media-floppy-5_14-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-media-floppy-zip.png b/pics/crystalsvg/cr22-device-media-floppy-zip-unmounted.png
index 912cdee58..912cdee58 100644
--- a/pics/crystalsvg/cr22-device-media-floppy-zip.png
+++ b/pics/crystalsvg/cr22-device-media-floppy-zip-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-media-optical-cdaudio.png b/pics/crystalsvg/cr22-device-media-optical-cdaudio-unmounted.png
index 804b6f35e..804b6f35e 100644
--- a/pics/crystalsvg/cr22-device-media-optical-cdaudio.png
+++ b/pics/crystalsvg/cr22-device-media-optical-cdaudio-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-media-optical-cdrom.png b/pics/crystalsvg/cr22-device-media-optical-cdrom-unmounted.png
index c66d9f331..c66d9f331 100644
--- a/pics/crystalsvg/cr22-device-media-optical-cdrom.png
+++ b/pics/crystalsvg/cr22-device-media-optical-cdrom-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-media-optical-dvd.png b/pics/crystalsvg/cr22-device-media-optical-dvd-unmounted.png
index aa6a769e6..aa6a769e6 100644
--- a/pics/crystalsvg/cr22-device-media-optical-dvd.png
+++ b/pics/crystalsvg/cr22-device-media-optical-dvd-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-media-tape.png b/pics/crystalsvg/cr22-device-media-tape-unmounted.png
index 69fb1aff8..69fb1aff8 100644
--- a/pics/crystalsvg/cr22-device-media-tape.png
+++ b/pics/crystalsvg/cr22-device-media-tape-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-mo_mount.png b/pics/crystalsvg/cr22-device-mo-mounted.png
index b430b06b7..b430b06b7 100644
--- a/pics/crystalsvg/cr22-device-mo_mount.png
+++ b/pics/crystalsvg/cr22-device-mo-mounted.png
diff --git a/pics/crystalsvg/cr22-device-mo_unmount.png b/pics/crystalsvg/cr22-device-mo-unmounted.png
index d1c2f37d0..d1c2f37d0 100644
--- a/pics/crystalsvg/cr22-device-mo_unmount.png
+++ b/pics/crystalsvg/cr22-device-mo-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-multimedia-player.png b/pics/crystalsvg/cr22-device-multimedia-player-unmounted.png
index 63c550ebb..63c550ebb 100644
--- a/pics/crystalsvg/cr22-device-multimedia-player.png
+++ b/pics/crystalsvg/cr22-device-multimedia-player-unmounted.png
diff --git a/pics/crystalsvg/cr22-device-nfs_mount.png b/pics/crystalsvg/cr22-device-nfs-mounted.png
index c7418a741..c7418a741 100644
--- a/pics/crystalsvg/cr22-device-nfs_mount.png
+++ b/pics/crystalsvg/cr22-device-nfs-mounted.png
diff --git a/pics/crystalsvg/cr22-device-nfs_unmount.png b/pics/crystalsvg/cr22-device-nfs-unmounted.png
index 778e969bf..778e969bf 100644
--- a/pics/crystalsvg/cr22-device-nfs_unmount.png
+++ b/pics/crystalsvg/cr22-device-nfs-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-camera_mount.png b/pics/crystalsvg/cr32-device-camera-mounted.png
index 32534c1e1..32534c1e1 100644
--- a/pics/crystalsvg/cr32-device-camera_mount.png
+++ b/pics/crystalsvg/cr32-device-camera-mounted.png
diff --git a/pics/crystalsvg/cr32-device-camera_unmount.png b/pics/crystalsvg/cr32-device-camera-unmounted.png
index 0ebe7eabd..0ebe7eabd 100644
--- a/pics/crystalsvg/cr32-device-camera_unmount.png
+++ b/pics/crystalsvg/cr32-device-camera-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-cd-r_locked.png b/pics/crystalsvg/cr32-device-cd-r-locked.png
index 7c6fe4734..7c6fe4734 100644
--- a/pics/crystalsvg/cr32-device-cd-r_locked.png
+++ b/pics/crystalsvg/cr32-device-cd-r-locked.png
diff --git a/pics/crystalsvg/cr32-device-cd-r_mount.png b/pics/crystalsvg/cr32-device-cd-r-mounted.png
index 1ce1014cc..1ce1014cc 100644
--- a/pics/crystalsvg/cr32-device-cd-r_mount.png
+++ b/pics/crystalsvg/cr32-device-cd-r-mounted.png
diff --git a/pics/crystalsvg/cr32-device-cd-r_unlocked.png b/pics/crystalsvg/cr32-device-cd-r-unlocked.png
index a1b23d9cc..a1b23d9cc 100644
--- a/pics/crystalsvg/cr32-device-cd-r_unlocked.png
+++ b/pics/crystalsvg/cr32-device-cd-r-unlocked.png
diff --git a/pics/crystalsvg/cr32-device-cd-r_unmount.png b/pics/crystalsvg/cr32-device-cd-r-unmounted.png
index 4aae684aa..4aae684aa 100644
--- a/pics/crystalsvg/cr32-device-cd-r_unmount.png
+++ b/pics/crystalsvg/cr32-device-cd-r-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-cd-rw_locked.png b/pics/crystalsvg/cr32-device-cd-rw-locked.png
index 7c6fe4734..7c6fe4734 100644
--- a/pics/crystalsvg/cr32-device-cd-rw_locked.png
+++ b/pics/crystalsvg/cr32-device-cd-rw-locked.png
diff --git a/pics/crystalsvg/cr32-device-cd-rw_mount.png b/pics/crystalsvg/cr32-device-cd-rw-mounted.png
index 1ce1014cc..1ce1014cc 100644
--- a/pics/crystalsvg/cr32-device-cd-rw_mount.png
+++ b/pics/crystalsvg/cr32-device-cd-rw-mounted.png
diff --git a/pics/crystalsvg/cr32-device-cd-rw_unlocked.png b/pics/crystalsvg/cr32-device-cd-rw-unlocked.png
index a1b23d9cc..a1b23d9cc 100644
--- a/pics/crystalsvg/cr32-device-cd-rw_unlocked.png
+++ b/pics/crystalsvg/cr32-device-cd-rw-unlocked.png
diff --git a/pics/crystalsvg/cr32-device-cd-rw_unmount.png b/pics/crystalsvg/cr32-device-cd-rw-unmounted.png
index 4aae684aa..4aae684aa 100644
--- a/pics/crystalsvg/cr32-device-cd-rw_unmount.png
+++ b/pics/crystalsvg/cr32-device-cd-rw-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-drive-harddisk.png b/pics/crystalsvg/cr32-device-drive-harddisk-unmounted.png
index 6adb35a96..6adb35a96 100644
--- a/pics/crystalsvg/cr32-device-drive-harddisk.png
+++ b/pics/crystalsvg/cr32-device-drive-harddisk-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-media-flash-compact_flash.png b/pics/crystalsvg/cr32-device-media-flash-compact_flash-unmounted.png
index d3d84973e..d3d84973e 100644
--- a/pics/crystalsvg/cr32-device-media-flash-compact_flash.png
+++ b/pics/crystalsvg/cr32-device-media-flash-compact_flash-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-media-flash-memory_stick.png b/pics/crystalsvg/cr32-device-media-flash-memory_stick-unmounted.png
index e53410b23..e53410b23 100644
--- a/pics/crystalsvg/cr32-device-media-flash-memory_stick.png
+++ b/pics/crystalsvg/cr32-device-media-flash-memory_stick-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-media-flash-sd_mmc.png b/pics/crystalsvg/cr32-device-media-flash-sd_mmc-unmounted.png
index fd3b790e5..fd3b790e5 100644
--- a/pics/crystalsvg/cr32-device-media-flash-sd_mmc.png
+++ b/pics/crystalsvg/cr32-device-media-flash-sd_mmc-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-media-flash-smart_media.png b/pics/crystalsvg/cr32-device-media-flash-smart_media-unmounted.png
index 31eb4d977..31eb4d977 100644
--- a/pics/crystalsvg/cr32-device-media-flash-smart_media.png
+++ b/pics/crystalsvg/cr32-device-media-flash-smart_media-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-media-flash-usb.png b/pics/crystalsvg/cr32-device-media-flash-usb-unmounted.png
index 293b2d556..293b2d556 100644
--- a/pics/crystalsvg/cr32-device-media-flash-usb.png
+++ b/pics/crystalsvg/cr32-device-media-flash-usb-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-media-floppy-3_5.png b/pics/crystalsvg/cr32-device-media-floppy-3_5-unmounted.png
index aace86fcb..aace86fcb 100644
--- a/pics/crystalsvg/cr32-device-media-floppy-3_5.png
+++ b/pics/crystalsvg/cr32-device-media-floppy-3_5-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-media-floppy-5_14.png b/pics/crystalsvg/cr32-device-media-floppy-5_14-unmounted.png
index 5ed439d75..5ed439d75 100644
--- a/pics/crystalsvg/cr32-device-media-floppy-5_14.png
+++ b/pics/crystalsvg/cr32-device-media-floppy-5_14-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-media-floppy-zip.png b/pics/crystalsvg/cr32-device-media-floppy-zip-unmounted.png
index 14ddebe6f..14ddebe6f 100644
--- a/pics/crystalsvg/cr32-device-media-floppy-zip.png
+++ b/pics/crystalsvg/cr32-device-media-floppy-zip-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-media-optical-cdaudio.png b/pics/crystalsvg/cr32-device-media-optical-cdaudio-unmounted.png
index 819c95039..819c95039 100644
--- a/pics/crystalsvg/cr32-device-media-optical-cdaudio.png
+++ b/pics/crystalsvg/cr32-device-media-optical-cdaudio-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-media-optical-cdrom.png b/pics/crystalsvg/cr32-device-media-optical-cdrom-unmounted.png
index a5ab7ee14..a5ab7ee14 100644
--- a/pics/crystalsvg/cr32-device-media-optical-cdrom.png
+++ b/pics/crystalsvg/cr32-device-media-optical-cdrom-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-media-optical-dvd.png b/pics/crystalsvg/cr32-device-media-optical-dvd-unmounted.png
index 0fdec41cc..0fdec41cc 100644
--- a/pics/crystalsvg/cr32-device-media-optical-dvd.png
+++ b/pics/crystalsvg/cr32-device-media-optical-dvd-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-media-tape.png b/pics/crystalsvg/cr32-device-media-tape-unmounted.png
index 9a70c9fb5..9a70c9fb5 100644
--- a/pics/crystalsvg/cr32-device-media-tape.png
+++ b/pics/crystalsvg/cr32-device-media-tape-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-mo_mount.png b/pics/crystalsvg/cr32-device-mo-mounted.png
index e4e279130..e4e279130 100644
--- a/pics/crystalsvg/cr32-device-mo_mount.png
+++ b/pics/crystalsvg/cr32-device-mo-mounted.png
diff --git a/pics/crystalsvg/cr32-device-mo_unmount.png b/pics/crystalsvg/cr32-device-mo-unmounted.png
index 0d6bef542..0d6bef542 100644
--- a/pics/crystalsvg/cr32-device-mo_unmount.png
+++ b/pics/crystalsvg/cr32-device-mo-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-multimedia-player.png b/pics/crystalsvg/cr32-device-multimedia-player-unmounted.png
index 8a2473e16..8a2473e16 100644
--- a/pics/crystalsvg/cr32-device-multimedia-player.png
+++ b/pics/crystalsvg/cr32-device-multimedia-player-unmounted.png
diff --git a/pics/crystalsvg/cr32-device-nfs_mount.png b/pics/crystalsvg/cr32-device-nfs-mounted.png
index 23d7bbbea..23d7bbbea 100644
--- a/pics/crystalsvg/cr32-device-nfs_mount.png
+++ b/pics/crystalsvg/cr32-device-nfs-mounted.png
diff --git a/pics/crystalsvg/cr32-device-nfs_unmount.png b/pics/crystalsvg/cr32-device-nfs-unmounted.png
index 22aa23e19..22aa23e19 100644
--- a/pics/crystalsvg/cr32-device-nfs_unmount.png
+++ b/pics/crystalsvg/cr32-device-nfs-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-camera_mount.png b/pics/crystalsvg/cr48-device-camera-mounted.png
index d4c55e62c..d4c55e62c 100644
--- a/pics/crystalsvg/cr48-device-camera_mount.png
+++ b/pics/crystalsvg/cr48-device-camera-mounted.png
diff --git a/pics/crystalsvg/cr48-device-camera_unmount.png b/pics/crystalsvg/cr48-device-camera-unmounted.png
index 6f17f6065..6f17f6065 100644
--- a/pics/crystalsvg/cr48-device-camera_unmount.png
+++ b/pics/crystalsvg/cr48-device-camera-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-cd-r_locked.png b/pics/crystalsvg/cr48-device-cd-r-locked.png
index 3e7be72d7..3e7be72d7 100644
--- a/pics/crystalsvg/cr48-device-cd-r_locked.png
+++ b/pics/crystalsvg/cr48-device-cd-r-locked.png
diff --git a/pics/crystalsvg/cr48-device-cd-r_mount.png b/pics/crystalsvg/cr48-device-cd-r-mounted.png
index 00f2c11c8..00f2c11c8 100644
--- a/pics/crystalsvg/cr48-device-cd-r_mount.png
+++ b/pics/crystalsvg/cr48-device-cd-r-mounted.png
diff --git a/pics/crystalsvg/cr48-device-cd-r_unlocked.png b/pics/crystalsvg/cr48-device-cd-r-unlocked.png
index 63ff3e2a2..63ff3e2a2 100644
--- a/pics/crystalsvg/cr48-device-cd-r_unlocked.png
+++ b/pics/crystalsvg/cr48-device-cd-r-unlocked.png
diff --git a/pics/crystalsvg/cr48-device-cd-r_unmount.png b/pics/crystalsvg/cr48-device-cd-r-unmounted.png
index c9b68e49d..c9b68e49d 100644
--- a/pics/crystalsvg/cr48-device-cd-r_unmount.png
+++ b/pics/crystalsvg/cr48-device-cd-r-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-cd-rw_locked.png b/pics/crystalsvg/cr48-device-cd-rw-locked.png
index 3e7be72d7..3e7be72d7 100644
--- a/pics/crystalsvg/cr48-device-cd-rw_locked.png
+++ b/pics/crystalsvg/cr48-device-cd-rw-locked.png
diff --git a/pics/crystalsvg/cr48-device-cd-rw_mount.png b/pics/crystalsvg/cr48-device-cd-rw-mounted.png
index 00f2c11c8..00f2c11c8 100644
--- a/pics/crystalsvg/cr48-device-cd-rw_mount.png
+++ b/pics/crystalsvg/cr48-device-cd-rw-mounted.png
diff --git a/pics/crystalsvg/cr48-device-cd-rw_unlocked.png b/pics/crystalsvg/cr48-device-cd-rw-unlocked.png
index 63ff3e2a2..63ff3e2a2 100644
--- a/pics/crystalsvg/cr48-device-cd-rw_unlocked.png
+++ b/pics/crystalsvg/cr48-device-cd-rw-unlocked.png
diff --git a/pics/crystalsvg/cr48-device-cd-rw_unmount.png b/pics/crystalsvg/cr48-device-cd-rw-unmounted.png
index c9b68e49d..c9b68e49d 100644
--- a/pics/crystalsvg/cr48-device-cd-rw_unmount.png
+++ b/pics/crystalsvg/cr48-device-cd-rw-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-drive-harddisk.png b/pics/crystalsvg/cr48-device-drive-harddisk-unmounted.png
index cb990e559..cb990e559 100644
--- a/pics/crystalsvg/cr48-device-drive-harddisk.png
+++ b/pics/crystalsvg/cr48-device-drive-harddisk-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-media-flash-compact_flash.png b/pics/crystalsvg/cr48-device-media-flash-compact_flash-unmounted.png
index f0b31fad4..f0b31fad4 100644
--- a/pics/crystalsvg/cr48-device-media-flash-compact_flash.png
+++ b/pics/crystalsvg/cr48-device-media-flash-compact_flash-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-media-flash-memory_stick.png b/pics/crystalsvg/cr48-device-media-flash-memory_stick-unmounted.png
index c54b23416..c54b23416 100644
--- a/pics/crystalsvg/cr48-device-media-flash-memory_stick.png
+++ b/pics/crystalsvg/cr48-device-media-flash-memory_stick-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-media-flash-sd_mmc.png b/pics/crystalsvg/cr48-device-media-flash-sd_mmc-unmounted.png
index 88cb6a4b4..88cb6a4b4 100644
--- a/pics/crystalsvg/cr48-device-media-flash-sd_mmc.png
+++ b/pics/crystalsvg/cr48-device-media-flash-sd_mmc-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-media-flash-smart_media.png b/pics/crystalsvg/cr48-device-media-flash-smart_media-unmounted.png
index 9b6ac8e42..9b6ac8e42 100644
--- a/pics/crystalsvg/cr48-device-media-flash-smart_media.png
+++ b/pics/crystalsvg/cr48-device-media-flash-smart_media-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-media-flash-usb.png b/pics/crystalsvg/cr48-device-media-flash-usb-unmounted.png
index 9621b529d..9621b529d 100644
--- a/pics/crystalsvg/cr48-device-media-flash-usb.png
+++ b/pics/crystalsvg/cr48-device-media-flash-usb-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-media-floppy-3_5.png b/pics/crystalsvg/cr48-device-media-floppy-3_5-unmounted.png
index 7ba20efe1..7ba20efe1 100644
--- a/pics/crystalsvg/cr48-device-media-floppy-3_5.png
+++ b/pics/crystalsvg/cr48-device-media-floppy-3_5-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-media-floppy-5_14.png b/pics/crystalsvg/cr48-device-media-floppy-5_14-unmounted.png
index ff9c6420b..ff9c6420b 100644
--- a/pics/crystalsvg/cr48-device-media-floppy-5_14.png
+++ b/pics/crystalsvg/cr48-device-media-floppy-5_14-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-media-floppy-zip.png b/pics/crystalsvg/cr48-device-media-floppy-zip-unmounted.png
index 3929acae8..3929acae8 100644
--- a/pics/crystalsvg/cr48-device-media-floppy-zip.png
+++ b/pics/crystalsvg/cr48-device-media-floppy-zip-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-media-optical-cdaudio.png b/pics/crystalsvg/cr48-device-media-optical-cdaudio-unmounted.png
index c7506702d..c7506702d 100644
--- a/pics/crystalsvg/cr48-device-media-optical-cdaudio.png
+++ b/pics/crystalsvg/cr48-device-media-optical-cdaudio-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-media-optical-cdrom.png b/pics/crystalsvg/cr48-device-media-optical-cdrom-unmounted.png
index 797203b51..797203b51 100644
--- a/pics/crystalsvg/cr48-device-media-optical-cdrom.png
+++ b/pics/crystalsvg/cr48-device-media-optical-cdrom-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-media-optical-dvd.png b/pics/crystalsvg/cr48-device-media-optical-dvd-unmounted.png
index d2cf1db0f..d2cf1db0f 100644
--- a/pics/crystalsvg/cr48-device-media-optical-dvd.png
+++ b/pics/crystalsvg/cr48-device-media-optical-dvd-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-media-tape.png b/pics/crystalsvg/cr48-device-media-tape-unmounted.png
index c6af46795..c6af46795 100644
--- a/pics/crystalsvg/cr48-device-media-tape.png
+++ b/pics/crystalsvg/cr48-device-media-tape-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-mo_mount.png b/pics/crystalsvg/cr48-device-mo-mounted.png
index ddccb63c1..ddccb63c1 100644
--- a/pics/crystalsvg/cr48-device-mo_mount.png
+++ b/pics/crystalsvg/cr48-device-mo-mounted.png
diff --git a/pics/crystalsvg/cr48-device-mo_unmount.png b/pics/crystalsvg/cr48-device-mo-unmounted.png
index adde4e4cd..adde4e4cd 100644
--- a/pics/crystalsvg/cr48-device-mo_unmount.png
+++ b/pics/crystalsvg/cr48-device-mo-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-multimedia-player.png b/pics/crystalsvg/cr48-device-multimedia-player-unmounted.png
index a2ce0db4c..a2ce0db4c 100644
--- a/pics/crystalsvg/cr48-device-multimedia-player.png
+++ b/pics/crystalsvg/cr48-device-multimedia-player-unmounted.png
diff --git a/pics/crystalsvg/cr48-device-nfs_mount.png b/pics/crystalsvg/cr48-device-nfs-mounted.png
index 94f11b96f..94f11b96f 100644
--- a/pics/crystalsvg/cr48-device-nfs_mount.png
+++ b/pics/crystalsvg/cr48-device-nfs-mounted.png
diff --git a/pics/crystalsvg/cr48-device-nfs_unmount.png b/pics/crystalsvg/cr48-device-nfs-unmounted.png
index c705b334c..c705b334c 100644
--- a/pics/crystalsvg/cr48-device-nfs_unmount.png
+++ b/pics/crystalsvg/cr48-device-nfs-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-camera_mount.png b/pics/crystalsvg/cr64-device-camera-mounted.png
index 6f1dcfa5b..6f1dcfa5b 100644
--- a/pics/crystalsvg/cr64-device-camera_mount.png
+++ b/pics/crystalsvg/cr64-device-camera-mounted.png
diff --git a/pics/crystalsvg/cr64-device-camera_unmount.png b/pics/crystalsvg/cr64-device-camera-unmounted.png
index ad152c9d5..ad152c9d5 100644
--- a/pics/crystalsvg/cr64-device-camera_unmount.png
+++ b/pics/crystalsvg/cr64-device-camera-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-cd-r_locked.png b/pics/crystalsvg/cr64-device-cd-r-locked.png
index d64325016..d64325016 100644
--- a/pics/crystalsvg/cr64-device-cd-r_locked.png
+++ b/pics/crystalsvg/cr64-device-cd-r-locked.png
diff --git a/pics/crystalsvg/cr64-device-cd-r_mount.png b/pics/crystalsvg/cr64-device-cd-r-mounted.png
index 8e6039f9b..8e6039f9b 100644
--- a/pics/crystalsvg/cr64-device-cd-r_mount.png
+++ b/pics/crystalsvg/cr64-device-cd-r-mounted.png
diff --git a/pics/crystalsvg/cr64-device-cd-r_unlocked.png b/pics/crystalsvg/cr64-device-cd-r-unlocked.png
index 6d9e852f5..6d9e852f5 100644
--- a/pics/crystalsvg/cr64-device-cd-r_unlocked.png
+++ b/pics/crystalsvg/cr64-device-cd-r-unlocked.png
diff --git a/pics/crystalsvg/cr64-device-cd-r_unmount.png b/pics/crystalsvg/cr64-device-cd-r-unmounted.png
index 02418a192..02418a192 100644
--- a/pics/crystalsvg/cr64-device-cd-r_unmount.png
+++ b/pics/crystalsvg/cr64-device-cd-r-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-cd-rw_locked.png b/pics/crystalsvg/cr64-device-cd-rw-locked.png
index d64325016..d64325016 100644
--- a/pics/crystalsvg/cr64-device-cd-rw_locked.png
+++ b/pics/crystalsvg/cr64-device-cd-rw-locked.png
diff --git a/pics/crystalsvg/cr64-device-cd-rw_mount.png b/pics/crystalsvg/cr64-device-cd-rw-mounted.png
index 8e6039f9b..8e6039f9b 100644
--- a/pics/crystalsvg/cr64-device-cd-rw_mount.png
+++ b/pics/crystalsvg/cr64-device-cd-rw-mounted.png
diff --git a/pics/crystalsvg/cr64-device-cd-rw_unlocked.png b/pics/crystalsvg/cr64-device-cd-rw-unlocked.png
index 6d9e852f5..6d9e852f5 100644
--- a/pics/crystalsvg/cr64-device-cd-rw_unlocked.png
+++ b/pics/crystalsvg/cr64-device-cd-rw-unlocked.png
diff --git a/pics/crystalsvg/cr64-device-cd-rw_unmount.png b/pics/crystalsvg/cr64-device-cd-rw-unmounted.png
index 02418a192..02418a192 100644
--- a/pics/crystalsvg/cr64-device-cd-rw_unmount.png
+++ b/pics/crystalsvg/cr64-device-cd-rw-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-drive-harddisk.png b/pics/crystalsvg/cr64-device-drive-harddisk-unmounted.png
index b08600279..b08600279 100644
--- a/pics/crystalsvg/cr64-device-drive-harddisk.png
+++ b/pics/crystalsvg/cr64-device-drive-harddisk-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-media-flash-compact_flash.png b/pics/crystalsvg/cr64-device-media-flash-compact_flash-unmounted.png
index 76f6c7632..76f6c7632 100644
--- a/pics/crystalsvg/cr64-device-media-flash-compact_flash.png
+++ b/pics/crystalsvg/cr64-device-media-flash-compact_flash-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-media-flash-memory_stick.png b/pics/crystalsvg/cr64-device-media-flash-memory_stick-unmounted.png
index dd93a1642..dd93a1642 100644
--- a/pics/crystalsvg/cr64-device-media-flash-memory_stick.png
+++ b/pics/crystalsvg/cr64-device-media-flash-memory_stick-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-media-flash-sd_mmc.png b/pics/crystalsvg/cr64-device-media-flash-sd_mmc-unmounted.png
index dbdfbfb9b..dbdfbfb9b 100644
--- a/pics/crystalsvg/cr64-device-media-flash-sd_mmc.png
+++ b/pics/crystalsvg/cr64-device-media-flash-sd_mmc-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-media-flash-smart_media.png b/pics/crystalsvg/cr64-device-media-flash-smart_media-unmounted.png
index 831a982f4..831a982f4 100644
--- a/pics/crystalsvg/cr64-device-media-flash-smart_media.png
+++ b/pics/crystalsvg/cr64-device-media-flash-smart_media-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-media-flash-usb.png b/pics/crystalsvg/cr64-device-media-flash-usb-unmounted.png
index d40b2ef76..d40b2ef76 100644
--- a/pics/crystalsvg/cr64-device-media-flash-usb.png
+++ b/pics/crystalsvg/cr64-device-media-flash-usb-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-media-floppy-3_5.png b/pics/crystalsvg/cr64-device-media-floppy-3_5-unmounted.png
index 2a7d74562..2a7d74562 100644
--- a/pics/crystalsvg/cr64-device-media-floppy-3_5.png
+++ b/pics/crystalsvg/cr64-device-media-floppy-3_5-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-media-floppy-5_14.png b/pics/crystalsvg/cr64-device-media-floppy-5_14-unmounted.png
index de99c8293..de99c8293 100644
--- a/pics/crystalsvg/cr64-device-media-floppy-5_14.png
+++ b/pics/crystalsvg/cr64-device-media-floppy-5_14-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-media-floppy-zip.png b/pics/crystalsvg/cr64-device-media-floppy-zip-unmounted.png
index 61c54f1c8..61c54f1c8 100644
--- a/pics/crystalsvg/cr64-device-media-floppy-zip.png
+++ b/pics/crystalsvg/cr64-device-media-floppy-zip-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-media-optical-cdaudio.png b/pics/crystalsvg/cr64-device-media-optical-cdaudio-unmounted.png
index 145bf71e0..145bf71e0 100644
--- a/pics/crystalsvg/cr64-device-media-optical-cdaudio.png
+++ b/pics/crystalsvg/cr64-device-media-optical-cdaudio-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-media-optical-cdrom.png b/pics/crystalsvg/cr64-device-media-optical-cdrom-unmounted.png
index e968c656f..e968c656f 100644
--- a/pics/crystalsvg/cr64-device-media-optical-cdrom.png
+++ b/pics/crystalsvg/cr64-device-media-optical-cdrom-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-media-optical-dvd.png b/pics/crystalsvg/cr64-device-media-optical-dvd-unmounted.png
index ad83aeefc..ad83aeefc 100644
--- a/pics/crystalsvg/cr64-device-media-optical-dvd.png
+++ b/pics/crystalsvg/cr64-device-media-optical-dvd-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-media-tape.png b/pics/crystalsvg/cr64-device-media-tape-unmounted.png
index 433826370..433826370 100644
--- a/pics/crystalsvg/cr64-device-media-tape.png
+++ b/pics/crystalsvg/cr64-device-media-tape-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-mo_mount.png b/pics/crystalsvg/cr64-device-mo-mounted.png
index 83a4d6c08..83a4d6c08 100644
--- a/pics/crystalsvg/cr64-device-mo_mount.png
+++ b/pics/crystalsvg/cr64-device-mo-mounted.png
diff --git a/pics/crystalsvg/cr64-device-mo_unmount.png b/pics/crystalsvg/cr64-device-mo-unmounted.png
index 6b5842493..6b5842493 100644
--- a/pics/crystalsvg/cr64-device-mo_unmount.png
+++ b/pics/crystalsvg/cr64-device-mo-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-multimedia-player.png b/pics/crystalsvg/cr64-device-multimedia-player-unmounted.png
index cfade71fb..cfade71fb 100644
--- a/pics/crystalsvg/cr64-device-multimedia-player.png
+++ b/pics/crystalsvg/cr64-device-multimedia-player-unmounted.png
diff --git a/pics/crystalsvg/cr64-device-nfs_mount.png b/pics/crystalsvg/cr64-device-nfs-mounted.png
index 691c2258e..691c2258e 100644
--- a/pics/crystalsvg/cr64-device-nfs_mount.png
+++ b/pics/crystalsvg/cr64-device-nfs-mounted.png
diff --git a/pics/crystalsvg/cr64-device-nfs_unmount.png b/pics/crystalsvg/cr64-device-nfs-unmounted.png
index 8e4e7a0eb..8e4e7a0eb 100644
--- a/pics/crystalsvg/cr64-device-nfs_unmount.png
+++ b/pics/crystalsvg/cr64-device-nfs-unmounted.png
diff --git a/pics/crystalsvg/crsc-device-3floppy_mount.svgz b/pics/crystalsvg/crsc-device-3floppy-mounted.svgz
index 8c4cd8c58..8c4cd8c58 100644
--- a/pics/crystalsvg/crsc-device-3floppy_mount.svgz
+++ b/pics/crystalsvg/crsc-device-3floppy-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-3floppy_unmount.svgz b/pics/crystalsvg/crsc-device-3floppy-unmounted.svgz
index 17fa545b4..17fa545b4 100644
--- a/pics/crystalsvg/crsc-device-3floppy_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-3floppy-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-5floppy_mount.svgz b/pics/crystalsvg/crsc-device-5floppy-mounted.svgz
index 9689d2da6..9689d2da6 100644
--- a/pics/crystalsvg/crsc-device-5floppy_mount.svgz
+++ b/pics/crystalsvg/crsc-device-5floppy-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-5floppy_unmount.svgz b/pics/crystalsvg/crsc-device-5floppy-unmounted.svgz
index 1305b82dc..1305b82dc 100644
--- a/pics/crystalsvg/crsc-device-5floppy_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-5floppy-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-camera_mount.svgz b/pics/crystalsvg/crsc-device-camera-mounted.svgz
index 11b992eb4..11b992eb4 100644
--- a/pics/crystalsvg/crsc-device-camera_mount.svgz
+++ b/pics/crystalsvg/crsc-device-camera-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-camera_unmount.svgz b/pics/crystalsvg/crsc-device-camera-unmounted.svgz
index 5ff9bac65..5ff9bac65 100644
--- a/pics/crystalsvg/crsc-device-camera_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-camera-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-cdaudio_mount.svgz b/pics/crystalsvg/crsc-device-cdaudio-mounted.svgz
index 1680ab561..1680ab561 100644
--- a/pics/crystalsvg/crsc-device-cdaudio_mount.svgz
+++ b/pics/crystalsvg/crsc-device-cdaudio-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-cdaudio_unmount.svgz b/pics/crystalsvg/crsc-device-cdaudio-unmounted.svgz
index 4bd7e35cd..4bd7e35cd 100644
--- a/pics/crystalsvg/crsc-device-cdaudio_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-cdaudio-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-cdrom_mount.svgz b/pics/crystalsvg/crsc-device-cdrom-mounted.svgz
index ca1e4c847..ca1e4c847 100644
--- a/pics/crystalsvg/crsc-device-cdrom_mount.svgz
+++ b/pics/crystalsvg/crsc-device-cdrom-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-cdrom_unmount.svgz b/pics/crystalsvg/crsc-device-cdrom-unmounted.svgz
index 4b2a48b2e..4b2a48b2e 100644
--- a/pics/crystalsvg/crsc-device-cdrom_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-cdrom-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-cdwriter_mount.svgz b/pics/crystalsvg/crsc-device-cdwriter-mounted.svgz
index 0a2471edb..0a2471edb 100644
--- a/pics/crystalsvg/crsc-device-cdwriter_mount.svgz
+++ b/pics/crystalsvg/crsc-device-cdwriter-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-cdwriter_unmount.svgz b/pics/crystalsvg/crsc-device-cdwriter-unmounted.svgz
index 38a281170..38a281170 100644
--- a/pics/crystalsvg/crsc-device-cdwriter_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-cdwriter-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-compact_flash_mount.svgz b/pics/crystalsvg/crsc-device-compact_flash-mounted.svgz
index e714c6ca2..e714c6ca2 100644
--- a/pics/crystalsvg/crsc-device-compact_flash_mount.svgz
+++ b/pics/crystalsvg/crsc-device-compact_flash-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-compact_flash_unmount.svgz b/pics/crystalsvg/crsc-device-compact_flash-unmounted.svgz
index 18ad176bd..18ad176bd 100644
--- a/pics/crystalsvg/crsc-device-compact_flash_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-compact_flash-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-dvd_mount.svgz b/pics/crystalsvg/crsc-device-dvd-mounted.svgz
index 25c718faf..25c718faf 100644
--- a/pics/crystalsvg/crsc-device-dvd_mount.svgz
+++ b/pics/crystalsvg/crsc-device-dvd-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-dvd_unmount.svgz b/pics/crystalsvg/crsc-device-dvd-unmounted.svgz
index 21110e1eb..21110e1eb 100644
--- a/pics/crystalsvg/crsc-device-dvd_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-dvd-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-hdd_mount.svgz b/pics/crystalsvg/crsc-device-hdd-mounted.svgz
index e30e9c531..e30e9c531 100644
--- a/pics/crystalsvg/crsc-device-hdd_mount.svgz
+++ b/pics/crystalsvg/crsc-device-hdd-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-hdd_unmount.svgz b/pics/crystalsvg/crsc-device-hdd-unmounted.svgz
index 81ada8d07..81ada8d07 100644
--- a/pics/crystalsvg/crsc-device-hdd_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-hdd-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-ipod_mount.svgz b/pics/crystalsvg/crsc-device-ipod-mounted.svgz
index 096b5e3b3..096b5e3b3 100644
--- a/pics/crystalsvg/crsc-device-ipod_mount.svgz
+++ b/pics/crystalsvg/crsc-device-ipod-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-ipod_unmount.svgz b/pics/crystalsvg/crsc-device-ipod-unmounted.svgz
index 92bdc9cd5..92bdc9cd5 100644
--- a/pics/crystalsvg/crsc-device-ipod_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-ipod-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-memory_stick_mount.svgz b/pics/crystalsvg/crsc-device-memory_stick-mounted.svgz
index d83aec8f5..d83aec8f5 100644
--- a/pics/crystalsvg/crsc-device-memory_stick_mount.svgz
+++ b/pics/crystalsvg/crsc-device-memory_stick-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-memory_stick_unmount.svgz b/pics/crystalsvg/crsc-device-memory_stick-unmounted.svgz
index 8fb152279..8fb152279 100644
--- a/pics/crystalsvg/crsc-device-memory_stick_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-memory_stick-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-mo_mount.svgz b/pics/crystalsvg/crsc-device-mo-mounted.svgz
index 1c2a85109..1c2a85109 100644
--- a/pics/crystalsvg/crsc-device-mo_mount.svgz
+++ b/pics/crystalsvg/crsc-device-mo-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-mo_unmount.svgz b/pics/crystalsvg/crsc-device-mo-unmounted.svgz
index fafa20baf..fafa20baf 100644
--- a/pics/crystalsvg/crsc-device-mo_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-mo-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-nfs_mount.svgz b/pics/crystalsvg/crsc-device-nfs-mounted.svgz
index db6ec6e2d..db6ec6e2d 100644
--- a/pics/crystalsvg/crsc-device-nfs_mount.svgz
+++ b/pics/crystalsvg/crsc-device-nfs-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-nfs_unmount.svgz b/pics/crystalsvg/crsc-device-nfs-unmounted.svgz
index f870f20af..f870f20af 100644
--- a/pics/crystalsvg/crsc-device-nfs_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-nfs-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-sd_mmc_mount.svgz b/pics/crystalsvg/crsc-device-sd_mmc-mounted.svgz
index bdb6a5575..bdb6a5575 100644
--- a/pics/crystalsvg/crsc-device-sd_mmc_mount.svgz
+++ b/pics/crystalsvg/crsc-device-sd_mmc-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-sd_mmc_unmount.svgz b/pics/crystalsvg/crsc-device-sd_mmc-unmounted.svgz
index 2e1dc82aa..2e1dc82aa 100644
--- a/pics/crystalsvg/crsc-device-sd_mmc_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-sd_mmc-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-smartmedia_mount.svgz b/pics/crystalsvg/crsc-device-smartmedia-mounted.svgz
index ea9d38cba..ea9d38cba 100644
--- a/pics/crystalsvg/crsc-device-smartmedia_mount.svgz
+++ b/pics/crystalsvg/crsc-device-smartmedia-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-smartmedia_unmount.svgz b/pics/crystalsvg/crsc-device-smartmedia-unmounted.svgz
index 6f1b6e68a..6f1b6e68a 100644
--- a/pics/crystalsvg/crsc-device-smartmedia_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-smartmedia-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-usbpendrive_mount.svgz b/pics/crystalsvg/crsc-device-usbpendrive-mounted.svgz
index 39bddfccc..39bddfccc 100644
--- a/pics/crystalsvg/crsc-device-usbpendrive_mount.svgz
+++ b/pics/crystalsvg/crsc-device-usbpendrive-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-usbpendrive_unmount.svgz b/pics/crystalsvg/crsc-device-usbpendrive-unmounted.svgz
index 579103c68..579103c68 100644
--- a/pics/crystalsvg/crsc-device-usbpendrive_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-usbpendrive-unmounted.svgz
diff --git a/pics/crystalsvg/crsc-device-zip_mount.svgz b/pics/crystalsvg/crsc-device-zip-mounted.svgz
index dc5c361aa..dc5c361aa 100644
--- a/pics/crystalsvg/crsc-device-zip_mount.svgz
+++ b/pics/crystalsvg/crsc-device-zip-mounted.svgz
diff --git a/pics/crystalsvg/crsc-device-zip_unmount.svgz b/pics/crystalsvg/crsc-device-zip-unmounted.svgz
index 982c9144c..982c9144c 100644
--- a/pics/crystalsvg/crsc-device-zip_unmount.svgz
+++ b/pics/crystalsvg/crsc-device-zip-unmounted.svgz
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index 149ecab5f..e8b287080 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -4326,7 +4326,7 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE
 		ret = DesktopIcon("kcmpci", size);	// FIXME
 	}
 	else if (query == TDEGenericDeviceType::Disk) {
-		ret = DesktopIcon("drive-harddisk", size);
+		ret = DesktopIcon("drive-harddisk-unmounted", size);
 	}
 	else if (query == TDEGenericDeviceType::SCSI) {
 		ret = DesktopIcon("kcmscsi", size);
diff --git a/tdecore/tdehw/tdestoragedevice.cpp b/tdecore/tdehw/tdestoragedevice.cpp
index 16e6d6e4d..d797ff032 100644
--- a/tdecore/tdehw/tdestoragedevice.cpp
+++ b/tdecore/tdehw/tdestoragedevice.cpp
@@ -555,6 +555,9 @@ TQPixmap TDEStorageDevice::icon(TDEIcon::StdSizes size) {
 	if (mountPath() != TQString::null) {
 		mountString = "-mounted";
 	}
+	else {
+		mountString = "-unmounted";
+	}
 
 	TQPixmap ret = DesktopIcon("drive-harddisk" + mountString, size);
 
@@ -568,7 +571,7 @@ TQPixmap TDEStorageDevice::icon(TDEIcon::StdSizes size) {
 		ret = DesktopIcon("media-optical-cdrom" + mountString, size);
 	}
 	if (isDiskOfType(TDEDiskDeviceType::CDRW)) {
-		ret = DesktopIcon("media-optical-cdwriter" + mountString, size);
+		ret = DesktopIcon("cd-rw" + mountString, size);
 	}
 	if (isDiskOfType(TDEDiskDeviceType::DVDROM)) {
 		ret = DesktopIcon("media-optical-dvd" + mountString, size);
@@ -586,7 +589,7 @@ TQPixmap TDEStorageDevice::icon(TDEIcon::StdSizes size) {
 		ret = DesktopIcon("media-tape" + mountString, size);
 	}
 	if (isDiskOfType(TDEDiskDeviceType::Camera)) {
-		ret = DesktopIcon("camera" + TQString((mountPath() != TQString::null) ? "_mount" : "_umount"), size);
+		ret = DesktopIcon("camera" + mountString, size);
 	}
 
 	if (isDiskOfType(TDEDiskDeviceType::HDD)) {
@@ -609,10 +612,10 @@ TQPixmap TDEStorageDevice::icon(TDEIcon::StdSizes size) {
 	}
 
 	if (isDiskOfType(TDEDiskDeviceType::RAM)) {
-		ret = DesktopIcon("memory" + mountString, size);
+		ret = DesktopIcon("memory", size);  // FIXME there is only a single icon available for this device
 	}
 	if (isDiskOfType(TDEDiskDeviceType::Loop)) {
-		ret = DesktopIcon("blockdevice" + mountString, size);
+		ret = DesktopIcon("blockdevice", size);  // FIXME there is only a single icon available for this device
 	}
 
 	return ret;