diff --git a/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp b/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp
index 4f6d244135..f80cd8ee80 100644
--- a/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp
+++ b/src/add-ons/kernel/drivers/disk/scsi/scsi_cd/scsi_cd.cpp
@@ -740,7 +740,8 @@ cd_ioctl(void* cookie, uint32 op, void* buffer, size_t length)
 		}
 
 		case B_GET_ICON_NAME:
-			return user_strlcpy((char*)buffer, "device-cd", B_FILE_NAME_LENGTH);
+			return user_strlcpy((char*)buffer, "devices/drive-optical",
+				B_FILE_NAME_LENGTH);
 
 		case B_GET_VECTOR_ICON:
 		{
@@ -760,10 +761,6 @@ cd_ioctl(void* cookie, uint32 op, void* buffer, size_t length)
 			return user_memcpy(buffer, &iconData, sizeof(device_icon));
 		}
 
-		case B_GET_ICON:
-			return sSCSIPeripheral->get_icon(icon_type_cd,
-				(device_icon *)buffer);
-
 		case B_SCSI_GET_TOC:
 			// TODO: we pass a user buffer here!
 			return get_toc(info, (scsi_toc *)buffer);
diff --git a/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp b/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp
index 933a84796b..72dec27aca 100644
--- a/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp
+++ b/src/add-ons/kernel/drivers/disk/scsi/scsi_disk/scsi_disk.cpp
@@ -347,7 +347,8 @@ das_ioctl(void* cookie, uint32 op, void* buffer, size_t length)
 
 		case B_GET_ICON_NAME:
 			// TODO: take device type into account!
-			return user_strlcpy((char*)buffer, "device-harddisk",
+			return user_strlcpy((char*)buffer, info->removable
+				? "devices/drive-removable-media" : "devices/drive-harddisk",
 				B_FILE_NAME_LENGTH);
 
 		case B_GET_VECTOR_ICON: