From 5aec4ef147fadac8ce0fa8c354bc816c3a9935d5 Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Sun, 19 Jul 2020 06:07:58 +0200
Subject: [PATCH] Changed the MO icons to proper ones, added cassette icons,
 merged the Floppy drives and CD-ROM drives section of the Settings dialog
 into one, and changed the configuration file format accordingly with a
 backward compatibility measure added to correctly load older configuration
 files.

---
 src/config.c                              | 213 +++++++++++++---
 src/include/86box/language.h              |  17 +-
 src/include/86box/mo.h                    |  19 +-
 src/include/86box/resource.h              |  30 +--
 src/include/86box/win.h                   |   5 +-
 src/win/86Box.rc                          |  88 ++++---
 src/win/icons/cassette.ico                | Bin 0 -> 1150 bytes
 src/win/icons/cassette_active.ico         | Bin 0 -> 1150 bytes
 src/win/icons/cassette_empty.ico          | Bin 0 -> 1150 bytes
 src/win/icons/cassette_empty_active.ico   | Bin 0 -> 1150 bytes
 src/win/icons/floppy_and_cdrom_drives.ico | Bin 0 -> 1150 bytes
 src/win/icons/floppy_drives.ico           | Bin 1150 -> 0 bytes
 src/win/icons/mo.ico                      | Bin 1150 -> 1150 bytes
 src/win/icons/mo_active.ico               | Bin 1150 -> 1150 bytes
 src/win/icons/mo_disabled.ico             | Bin 1150 -> 1150 bytes
 src/win/icons/mo_empty.ico                | Bin 1150 -> 1150 bytes
 src/win/icons/mo_empty_active.ico         | Bin 1150 -> 1150 bytes
 src/win/icons/other_removable_devices.ico | Bin 1150 -> 1150 bytes
 src/win/win_media_menu.c                  |   2 +-
 src/win/win_new_floppy.c                  | 144 ++++++++++-
 src/win/win_settings.c                    | 297 +++++++++-------------
 src/win/win_stbar.c                       |  14 +-
 22 files changed, 545 insertions(+), 284 deletions(-)
 create mode 100644 src/win/icons/cassette.ico
 create mode 100644 src/win/icons/cassette_active.ico
 create mode 100644 src/win/icons/cassette_empty.ico
 create mode 100644 src/win/icons/cassette_empty_active.ico
 create mode 100644 src/win/icons/floppy_and_cdrom_drives.ico
 delete mode 100644 src/win/icons/floppy_drives.ico

diff --git a/src/config.c b/src/config.c
index 6ea5b8fa0..da58b02e8 100644
--- a/src/config.c
+++ b/src/config.c
@@ -111,6 +111,9 @@ typedef struct {
 
 static list_t	config_head;
 
+/* TODO: Backwards compatibility, get rid of this when enough time has passed. */
+static int	backwards_compat = 0;
+
 
 #ifdef ENABLE_CONFIG_LOG
 int config_do_log = ENABLE_CONFIG_LOG;
@@ -1003,6 +1006,7 @@ load_hard_disks(void)
 }
 
 
+/* TODO: Backwards compatibility, get rid of this when enough time has passed. */
 /* Load "Floppy Drives" section. */
 static void
 load_floppy_drives(void)
@@ -1012,6 +1016,72 @@ load_floppy_drives(void)
     wchar_t *wp;
     int c;
 
+    if (!backwards_compat)
+	return;
+
+    for (c=0; c<FDD_NUM; c++) {
+	sprintf(temp, "fdd_%02i_type", c+1);
+	p = config_get_string(cat, temp, (c < 2) ? "525_2dd" : "none");
+       	fdd_set_type(c, fdd_get_from_internal_name(p));
+	if (fdd_get_type(c) > 13)
+		fdd_set_type(c, 13);
+	config_delete_var(cat, temp);
+
+	sprintf(temp, "fdd_%02i_fn", c + 1);
+	wp = config_get_wstring(cat, temp, L"");
+	config_delete_var(cat, temp);
+
+#if 0
+	/*
+	 * NOTE:
+	 * Temporary hack to remove the absolute
+	 * path currently saved in most config
+	 * files.  We should remove this before
+	 * finalizing this release!  --FvK
+	 */
+	if (! wcsnicmp(wp, usr_path, wcslen(usr_path))) {
+		/*
+		 * Yep, its absolute and prefixed
+		 * with the EXE path.  Just strip
+		 * that off for now...
+		 */
+		wcsncpy(floppyfns[c], &wp[wcslen(usr_path)], sizeof_w(floppyfns[c]));
+	} else
+#endif
+	wcsncpy(floppyfns[c], wp, sizeof_w(floppyfns[c]));
+
+	/* if (*wp != L'\0')
+		config_log("Floppy%d: %ls\n", c, floppyfns[c]); */
+	sprintf(temp, "fdd_%02i_writeprot", c+1);
+	ui_writeprot[c] = !!config_get_int(cat, temp, 0);
+	config_delete_var(cat, temp);
+	sprintf(temp, "fdd_%02i_turbo", c + 1);
+	fdd_set_turbo(c, !!config_get_int(cat, temp, 0));
+	config_delete_var(cat, temp);
+	sprintf(temp, "fdd_%02i_check_bpb", c+1);
+	fdd_set_check_bpb(c, !!config_get_int(cat, temp, 1));
+	config_delete_var(cat, temp);
+    }
+
+    delete_section_if_empty(cat);
+}
+
+
+/* Load "Floppy and CD-ROM Drives" section. */
+static void
+load_floppy_and_cdrom_drives(void)
+{
+    char *cat = "Floppy and CD-ROM drives";
+    char temp[512], tmp2[512], *p;
+    char s[512];
+    unsigned int board = 0, dev = 0;
+    wchar_t *wp;
+    int c, d = 0;
+
+    /* TODO: Backwards compatibility, get rid of this when enough time has passed. */
+    backwards_compat = (find_section(cat) == NULL);
+
+    memset(temp, 0x00, sizeof(temp));
     for (c=0; c<FDD_NUM; c++) {
 	sprintf(temp, "fdd_%02i_type", c+1);
 	p = config_get_string(cat, temp, (c < 2) ? "525_2dd" : "none");
@@ -1072,19 +1142,6 @@ load_floppy_drives(void)
 		config_delete_var(cat, temp);
 	}
     }
-}
-
-
-/* Load "Other Removable Devices" section. */
-static void
-load_other_removable_devices(void)
-{
-    char *cat = "Other removable devices";
-    char temp[512], tmp2[512], *p;
-    char s[512];
-    unsigned int board = 0, dev = 0;
-    wchar_t *wp;
-    int c, d = 0;
 
     memset(temp, 0x00, sizeof(temp));
     for (c=0; c<CDROM_NUM; c++) {
@@ -1179,6 +1236,102 @@ load_other_removable_devices(void)
 	sprintf(temp, "cdrom_%02i_iso_path", c+1);
 	config_delete_var(cat, temp);
     }
+}
+
+
+/* Load "Other Removable Devices" section. */
+static void
+load_other_removable_devices(void)
+{
+    char *cat = "Other removable devices";
+    char temp[512], tmp2[512], *p;
+    char s[512];
+    unsigned int board = 0, dev = 0;
+    wchar_t *wp;
+    int c, d = 0;
+
+    /* TODO: Backwards compatibility, get rid of this when enough time has passed. */
+    if (backwards_compat) {
+	memset(temp, 0x00, sizeof(temp));
+	for (c=0; c<CDROM_NUM; c++) {
+		sprintf(temp, "cdrom_%02i_host_drive", c+1);
+		cdrom[c].host_drive = config_get_int(cat, temp, 0);
+		cdrom[c].prev_host_drive = cdrom[c].host_drive;
+		config_delete_var(cat, temp);
+
+		sprintf(temp, "cdrom_%02i_parameters", c+1);
+		p = config_get_string(cat, temp, NULL);
+		if (p != NULL)
+			sscanf(p, "%01u, %s", &d, s);
+		else
+			sscanf("0, none", "%01u, %s", &d, s);
+		cdrom[c].sound_on = d;
+		cdrom[c].bus_type = hdd_string_to_bus(s, 1);
+		config_delete_var(cat, temp);
+
+		sprintf(temp, "cdrom_%02i_speed", c+1);
+		cdrom[c].speed = config_get_int(cat, temp, 8);
+		config_delete_var(cat, temp);
+
+		/* Default values, needed for proper operation of the Settings dialog. */
+		cdrom[c].ide_channel = cdrom[c].scsi_device_id = c + 2;
+		config_delete_var(cat, temp);
+
+		sprintf(temp, "cdrom_%02i_ide_channel", c+1);
+		if (cdrom[c].bus_type == CDROM_BUS_ATAPI) {
+			sprintf(tmp2, "%01u:%01u", (c+2)>>1, (c+2)&1);
+			p = config_get_string(cat, temp, tmp2);
+			sscanf(p, "%01u:%01u", &board, &dev);
+			board &= 3;
+			dev &= 1;
+			cdrom[c].ide_channel = (board<<1)+dev;
+
+			if (cdrom[c].ide_channel > 7)
+				cdrom[c].ide_channel = 7;
+		} else {
+			sprintf(temp, "cdrom_%02i_scsi_id", c+1);
+			if (cdrom[c].bus_type == CDROM_BUS_SCSI) {
+				cdrom[c].scsi_device_id = config_get_int(cat, temp, c+2);
+
+				if (cdrom[c].scsi_device_id > 15)
+					cdrom[c].scsi_device_id = 15;
+			} else
+				config_delete_var(cat, temp);
+		}
+		config_delete_var(cat, temp);
+
+		sprintf(temp, "cdrom_%02i_image_path", c+1);
+		wp = config_get_wstring(cat, temp, L"");
+		config_delete_var(cat, temp);
+
+#if 0
+		/*
+		 * NOTE:
+		 * Temporary hack to remove the absolute
+		 * path currently saved in most config
+		 * files.  We should remove this before
+		 * finalizing this release!  --FvK
+		 */
+		if (! wcsnicmp(wp, usr_path, wcslen(usr_path))) {
+			/*
+			 * Yep, its absolute and prefixed
+			 * with the EXE path.  Just strip
+			 * that off for now...
+			 */
+			wcsncpy(cdrom[c].image_path, &wp[wcslen(usr_path)], sizeof_w(cdrom[c].image_path));
+		} else
+#endif
+		wcsncpy(cdrom[c].image_path, wp, sizeof_w(cdrom[c].image_path));
+
+		if (cdrom[c].host_drive && (cdrom[c].host_drive != 200))
+			cdrom[c].host_drive = 0;
+
+		if ((cdrom[c].host_drive == 0x200) &&
+		    (wcslen(cdrom[c].image_path) == 0))
+			cdrom[c].host_drive = 0;
+	}
+    }
+    backwards_compat = 0;
 
     memset(temp, 0x00, sizeof(temp));
     for (c=0; c<ZIP_NUM; c++) {
@@ -1386,6 +1539,8 @@ config_load(void)
     load_ports();			/* Ports (COM & LPT) */
     load_other_peripherals();		/* Other peripherals */
     load_hard_disks();			/* Hard disks */
+    load_floppy_and_cdrom_drives();	/* Floppy and CD-ROM drives */
+    /* TODO: Backwards compatibility, get rid of this when enough time has passed. */
     load_floppy_drives();		/* Floppy drives */
     load_other_removable_devices();	/* Other removable devices */
 
@@ -1872,10 +2027,10 @@ save_hard_disks(void)
 
 /* Save "Floppy Drives" section. */
 static void
-save_floppy_drives(void)
+save_floppy_and_cdrom_drives(void)
 {
-    char *cat = "Floppy drives";
-    char temp[512];
+    char *cat = "Floppy and CD-ROM drives";
+    char temp[512], tmp2[512];
     int c;
 
     for (c=0; c<FDD_NUM; c++) {
@@ -1917,18 +2072,6 @@ save_floppy_drives(void)
 		config_set_int(cat, temp, fdd_get_check_bpb(c));
     }
 
-    delete_section_if_empty(cat);
-}
-
-
-/* Save "Other Removable Devices" section. */
-static void
-save_other_removable_devices(void)
-{
-    char *cat = "Other removable devices";
-    char temp[512], tmp2[512];
-    int c;
-
     for (c=0; c<CDROM_NUM; c++) {
 	sprintf(temp, "cdrom_%02i_host_drive", c+1);
 	if ((cdrom[c].bus_type == 0) || (cdrom[c].host_drive != 200)) {
@@ -1978,6 +2121,18 @@ save_other_removable_devices(void)
 	}
     }
 
+    delete_section_if_empty(cat);
+}
+
+
+/* Save "Other Removable Devices" section. */
+static void
+save_other_removable_devices(void)
+{
+    char *cat = "Other removable devices";
+    char temp[512], tmp2[512];
+    int c;
+
     for (c=0; c<ZIP_NUM; c++) {
 	sprintf(temp, "zip_%02i_parameters", c+1);
 	if (zip_drives[c].bus_type == 0) {
@@ -2064,7 +2219,7 @@ config_save(void)
     save_ports();			/* Ports (COM & LPT) */
     save_other_peripherals();		/* Other peripherals */
     save_hard_disks();			/* Hard disks */
-    save_floppy_drives();		/* Floppy drives */
+    save_floppy_and_cdrom_drives();	/* Floppy and CD-ROM drives */
     save_other_removable_devices();	/* Other removable devices */
 
     config_write(cfg_path);
diff --git a/src/include/86box/language.h b/src/include/86box/language.h
index ab8b0d0c1..3413b1eb9 100644
--- a/src/include/86box/language.h
+++ b/src/include/86box/language.h
@@ -46,7 +46,7 @@
 #define IDS_2070	2070		// "Ports (COM & LPT)"
 #define IDS_2071	2071		// "Other peripherals"
 #define IDS_2072	2072		// "Hard disks"
-#define IDS_2073	2073		// "Floppy drives"
+#define IDS_2073	2073		// "Floppy and CD-ROM drives"
 #define IDS_2074	2074		// "Other removable devices"
 #define IDS_2075	2075		// "CD-ROM images (*.ISO;*.CU.."
 #define IDS_2076	2076		// "Surface-based images (*.8.."
@@ -112,7 +112,6 @@
 #define IDS_2136	2136		// "Don't Exit"
 #define IDS_2137	2137		// "Reset"
 #define IDS_2138	2138		// "Don't Reset"
-#define IDS_2139	2139		// "CD-ROM drives"
 
 #define IDS_4096	4096		// "Hard disk (%s)"
 #define IDS_4097	4097		// "%01i:%01i"
@@ -189,6 +188,16 @@
 #define IDS_5899	5899		// "2.88 MB"
 #define IDS_5900	5900		// "ZIP 100"
 #define IDS_5901	5901		// "ZIP 250"
+#define IDS_5902	5902		// "3.5\" 128Mb M.O. (ISO 10090)"
+#define IDS_5903	5903		// "3.5\" 230Mb M.O. (ISO 13963)"
+#define IDS_5904	5904		// "3.5\" 540Mb M.O. (ISO 15498)"
+#define IDS_5905	5905		// "3.5\" 640Mb M.O. (ISO 15498)"
+#define IDS_5906	5906		// "3.5\" 1.3Gb M.O. (GigaMO)"
+#define IDS_5907	5907		// "3.5\" 2.3Gb M.O. (GigaMO 2)"
+#define IDS_5908	5908		// "5.25\" 600Mb M.O."
+#define IDS_5909	5909		// "5.25\" 650Mb M.O."
+#define IDS_5910	5910		// "5.25\" 1Gb M.O."
+#define IDS_5911	5911		// "5.25\" 1.3Gb M.O."
 
 #define IDS_6144	6144		// "Perfect RPM"
 #define IDS_6145	6145		// "1%% below perfect RPM"
@@ -199,7 +208,7 @@
 
 #define IDS_LANG_ENUS	IDS_7168
 
-#define STR_NUM_2048	92
+#define STR_NUM_2048	91
 #define STR_NUM_3072	11
 #define STR_NUM_4096	18
 #define STR_NUM_4352	7
@@ -207,7 +216,7 @@
 #define STR_NUM_5120	1
 #define STR_NUM_5376	7
 #define STR_NUM_5632	7
-#define STR_NUM_5888	14
+#define STR_NUM_5888	24
 #define STR_NUM_6144	4
 #define STR_NUM_7168	1
 
diff --git a/src/include/86box/mo.h b/src/include/86box/mo.h
index 59efe6795..921a9aba3 100644
--- a/src/include/86box/mo.h
+++ b/src/include/86box/mo.h
@@ -104,17 +104,16 @@ typedef struct {
 					   media status. */
 		pad, pad0;
 
-    uint32_t	medium_size,
-		base;
-    uint16_t 	sector_size;
-    uint8_t 	type;
-
-    void	*priv;
-
     FILE	*f;
+    void	*priv;
 
     wchar_t	image_path[1024],
 		prev_image_path[1024];
+
+    uint32_t	type, medium_size,
+		base;
+    uint16_t 	sector_size;
+
 } mo_drive_t;
 
 typedef struct {
@@ -135,9 +134,9 @@ typedef struct {
     uint16_t request_length, max_transfer_len;
 
     int requested_blocks, packet_status,
-    total_length, do_page_save,
-    unit_attention, request_pos,
-    old_len, pad3;
+	total_length, do_page_save,
+	unit_attention, request_pos,
+	old_len, pad3;
 
     uint32_t sector_pos, sector_len,
 	     packet_len, pos;
diff --git a/src/include/86box/resource.h b/src/include/86box/resource.h
index 1b44bf73b..450006ae4 100644
--- a/src/include/86box/resource.h
+++ b/src/include/86box/resource.h
@@ -38,9 +38,8 @@
 #define  DLG_CFG_PERIPHERALS	117	/* sub-dialog of config */
 #define  DLG_CFG_HARD_DISKS	118	/* sub-dialog of config */
 #define  DLG_CFG_HARD_DISKS_ADD	119	/* sub-dialog of config */
-#define  DLG_CFG_FLOPPY_DRIVES	120	/* sub-dialog of config */
-#define  DLG_CFG_CDROM_DRIVES	121	/* sub-dialog of config */
-#define  DLG_CFG_OTHER_REMOVABLE_DEVICES	122	/* sub-dialog of config */
+#define  DLG_CFG_FLOPPY_AND_CDROM_DRIVES	120	/* sub-dialog of config */
+#define  DLG_CFG_OTHER_REMOVABLE_DEVICES	121	/* sub-dialog of config */
 
 /* Static text label IDs. */
 #define IDT_1700		1700	/* Language: */
@@ -101,11 +100,11 @@
 #define IDT_1766		1766	/* Board #4: */
 #define IDT_1767		1767	/* ISA RTC: */
 #define IDT_1768		1768	/* Ext FD Controller: */
-#define IDT_1769        1769    /* MO drives: */
-#define IDT_1770        1770    /* Bus: */
-#define IDT_1771        1771    /* ID: */
-#define IDT_1772        1772    /* Channel */
-#define IDT_1773        1773    /* Type: */
+#define IDT_1769		1769    /* MO drives: */
+#define IDT_1770		1770    /* Bus: */
+#define IDT_1771		1771    /* ID: */
+#define IDT_1772		1772    /* Channel */
+#define IDT_1773		1773    /* Type: */
 
 
 /*
@@ -201,7 +200,7 @@
 #define IDC_CONFIGURE_ISAMEM_3	1147
 #define IDC_CONFIGURE_ISAMEM_4	1148
 
-#define IDC_HARD_DISKS		1150	/* hard disk config */
+#define IDC_HARD_DISKS		1150	/* hard disks config */
 #define IDC_LIST_HARD_DISKS	1151
 #define IDC_BUTTON_HDD_ADD_NEW	1152
 #define IDC_BUTTON_HDD_ADD	1153
@@ -220,7 +219,7 @@
 #define IDC_COMBO_HD_TYPE	1165
 #define IDC_PBAR_IMG_CREATE	1166
 
-#define IDC_REMOV_DEVICES	1170	/* removable dev config */
+#define IDC_REMOV_DEVICES	1170	/* floppy and cd-rom drives config */
 #define IDC_LIST_FLOPPY_DRIVES	1171
 #define IDC_COMBO_FD_TYPE	1172
 #define IDC_CHECKTURBO		1173
@@ -230,7 +229,8 @@
 #define IDC_COMBO_CD_ID		1177
 #define IDC_COMBO_CD_LUN	1178
 #define IDC_COMBO_CD_CHANNEL_IDE 1179
-#define IDC_LIST_ZIP_DRIVES	1180
+
+#define IDC_LIST_ZIP_DRIVES	1180	/* other removable devices config */
 #define IDC_COMBO_ZIP_BUS	1181
 #define IDC_COMBO_ZIP_ID	1182
 #define IDC_COMBO_ZIP_LUN	1183
@@ -240,11 +240,11 @@
 #define IDC_LIST_MO_DRIVES	1187
 #define IDC_COMBO_MO_BUS	1188
 #define IDC_COMBO_MO_ID		1189
-#define IDC_COMBO_MO_LUN	1191
-#define IDC_COMBO_MO_CHANNEL_IDE 1192
-#define IDC_COMBO_MO_TYPE  1193
+#define IDC_COMBO_MO_LUN	1190
+#define IDC_COMBO_MO_CHANNEL_IDE 1191
+#define IDC_COMBO_MO_TYPE	1192
 
-#define IDC_SLIDER_GAIN		1190	/* sound gain dialog */
+#define IDC_SLIDER_GAIN		1193	/* sound gain dialog */
 
 #define IDC_EDIT_FILE_NAME	1200	/* new floppy image dialog */
 #define IDC_COMBO_DISK_SIZE	1201
diff --git a/src/include/86box/win.h b/src/include/86box/win.h
index 9d7eeb6af..5537f4f30 100644
--- a/src/include/86box/win.h
+++ b/src/include/86box/win.h
@@ -163,9 +163,8 @@ extern void	NewFloppyDialogCreate(HWND hwnd, int id, int part);
 #define SETTINGS_PAGE_PORTS			5
 #define SETTINGS_PAGE_PERIPHERALS		6
 #define SETTINGS_PAGE_HARD_DISKS		7
-#define SETTINGS_PAGE_FLOPPY_DRIVES		8
-#define SETTINGS_PAGE_CDROM_DRIVES		9
-#define SETTINGS_PAGE_OTHER_REMOVABLE_DEVICES	10
+#define SETTINGS_PAGE_FLOPPY_AND_CDROM_DRIVES	8
+#define SETTINGS_PAGE_OTHER_REMOVABLE_DEVICES	9
 
 extern void	win_settings_open(HWND hwnd);
 extern void	win_settings_open_ex(HWND hwnd, int category);
diff --git a/src/win/86Box.rc b/src/win/86Box.rc
index f2f35efe2..cda429397 100644
--- a/src/win/86Box.rc
+++ b/src/win/86Box.rc
@@ -315,20 +315,20 @@ BEGIN
                     WS_BORDER,53,45,166,14
 END
 
-DLG_CONFIG DIALOG DISCARDABLE  0, 0, 366, 251
+DLG_CONFIG DIALOG DISCARDABLE  0, 0, 366, 256
 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "86Box Settings"
 FONT 9, "Segoe UI"
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,246,230,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,307,230,50,14
+    DEFPUSHBUTTON   "OK",IDOK,246,235,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,307,235,50,14
     CONTROL         "List2",IDC_SETTINGSCATLIST,"SysListView32",LVS_LIST | 
-                    LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,7,90,207
-    CONTROL         "",-1,"Static",SS_BLACKFRAME | SS_SUNKEN,1,221,363,1
+                    LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,7,90,212
+    CONTROL         "",-1,"Static",SS_BLACKFRAME | SS_SUNKEN,1,226,363,1
 /* Leave this commented out until we get into localization. */
 #if 0
-    LTEXT           "Language:",IDT_1700,7,232,41,10
-    COMBOBOX        IDC_COMBO_LANG,48,231,108,120,CBS_DROPDOWN | WS_VSCROLL | 
+    LTEXT           "Language:",IDT_1700,7,237,41,10
+    COMBOBOX        IDC_COMBO_LANG,48,236,108,120,CBS_DROPDOWN | WS_VSCROLL | 
                     WS_TABSTOP
 #endif
 END
@@ -594,7 +594,7 @@ BEGIN
     LTEXT           "Size (MB):",IDT_1729,7,54,33,8
     LTEXT           "Type:",IDT_1730,86,54,24,8
     LTEXT           "File name:",IDT_1731,7,7,204,9
-    COMBOBOX        IDC_COMBO_HD_BUS,33,71,58,12,CBS_DROPDOWNLIST | 
+    COMBOBOX        IDC_COMBO_HD_BUS,33,71,58,12,CBS_DROPDOWNLIST |
                     WS_VSCROLL | WS_TABSTOP
     LTEXT           "Bus:",IDT_1721,7,73,24,8
     COMBOBOX        IDC_COMBO_HD_CHANNEL,134,71,77,12,CBS_DROPDOWNLIST | 
@@ -610,7 +610,7 @@ BEGIN
                     WS_BORDER,7,16,204,12
 END
 
-DLG_CFG_FLOPPY_DRIVES DIALOG DISCARDABLE  97, 0, 267, 103
+DLG_CFG_FLOPPY_AND_CDROM_DRIVES DIALOG DISCARDABLE  97, 0, 267, 222
 STYLE DS_CONTROL | WS_CHILD
 FONT 9, "Segoe UI"
 BEGIN
@@ -625,38 +625,33 @@ BEGIN
                     BS_AUTOCHECKBOX | WS_TABSTOP,131,86,64,10
     CONTROL         "Check BPB",IDC_CHECKBPB,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,196,86,64,10
-END
 
-DLG_CFG_CDROM_DRIVES DIALOG DISCARDABLE 97, 0, 267, 150
-STYLE DS_CONTROL | WS_CHILD
-FONT 9, "Segoe UI"
-BEGIN
     CONTROL         "List1",IDC_LIST_CDROM_DRIVES,"SysListView32",LVS_REPORT | 
                     LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | 
-                    WS_TABSTOP,7,18,253,60
-    LTEXT           "CD-ROM drives:",IDT_1739,7,7,50,8
-    COMBOBOX        IDC_COMBO_CD_BUS,33,85,90,12,CBS_DROPDOWNLIST | 
+                    WS_TABSTOP,7,117,253,60
+    LTEXT           "CD-ROM drives:",IDT_1739,7,107,50,8
+    COMBOBOX        IDC_COMBO_CD_BUS,33,185,90,12,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Bus:",IDT_1740,7,87,24,8
-    COMBOBOX        IDC_COMBO_CD_ID,170,85,90,12,CBS_DROPDOWNLIST | 
+    LTEXT           "Bus:",IDT_1740,7,187,24,8
+    COMBOBOX        IDC_COMBO_CD_ID,170,185,90,12,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    LTEXT           "ID:",IDT_1741,131,87,38,8
-    COMBOBOX        IDC_COMBO_CD_CHANNEL_IDE,170,85,90,12,CBS_DROPDOWNLIST | 
+    LTEXT           "ID:",IDT_1741,131,187,38,8
+    COMBOBOX        IDC_COMBO_CD_CHANNEL_IDE,170,185,90,12,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Channel:",IDT_1742,131,87,38,8
-    COMBOBOX        IDC_COMBO_CD_SPEED,33,105,90,12,CBS_DROPDOWNLIST | 
+    LTEXT           "Channel:",IDT_1742,131,187,38,8
+    COMBOBOX        IDC_COMBO_CD_SPEED,33,205,90,12,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Speed:",IDT_1758,7,107,24,8
+    LTEXT           "Speed:",IDT_1758,7,207,24,8
 END
 
-DLG_CFG_OTHER_REMOVABLE_DEVICES DIALOG DISCARDABLE  97, 0, 267, 221
+DLG_CFG_OTHER_REMOVABLE_DEVICES DIALOG DISCARDABLE  97, 0, 267, 222
 STYLE DS_CONTROL | WS_CHILD
 FONT 9, "Segoe UI"
 BEGIN
 
     CONTROL         "List1",IDC_LIST_MO_DRIVES,"SysListView32",LVS_REPORT | 
                     LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | 
-                    WS_TABSTOP,7,18,253,60
+                    WS_TABSTOP,7,17,253,60
     LTEXT           "MO drives:",IDT_1769,7,7,50,8
     COMBOBOX        IDC_COMBO_MO_BUS,33,85,90,12,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
@@ -675,17 +670,17 @@ BEGIN
                     LVS_SHOWSELALWAYS | LVS_SINGLESEL | WS_BORDER | 
                     WS_TABSTOP,7,137,253,60
     LTEXT           "ZIP drives:",IDT_1759,7,127,50,8
-    COMBOBOX        IDC_COMBO_ZIP_BUS,23,204,90,12,CBS_DROPDOWNLIST | 
+    COMBOBOX        IDC_COMBO_ZIP_BUS,23,205,90,12,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Bus:",IDT_1753,7,206,14,8
-    COMBOBOX        IDC_COMBO_ZIP_ID,149,204,61,12,CBS_DROPDOWNLIST | 
+    LTEXT           "Bus:",IDT_1753,7,207,14,8
+    COMBOBOX        IDC_COMBO_ZIP_ID,149,205,61,12,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    LTEXT           "ID:",IDT_1754,120,206,28,8
-    COMBOBOX        IDC_COMBO_ZIP_CHANNEL_IDE,149,204,61,12,CBS_DROPDOWNLIST | 
+    LTEXT           "ID:",IDT_1754,120,207,28,8
+    COMBOBOX        IDC_COMBO_ZIP_CHANNEL_IDE,149,205,61,12,CBS_DROPDOWNLIST | 
                     WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Channel:",IDT_1755,120,206,28,8
+    LTEXT           "Channel:",IDT_1755,120,207,28,8
     CONTROL         "ZIP 250",IDC_CHECK250,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,218,204,44,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,218,205,44,10
 END
 
 
@@ -720,10 +715,12 @@ END
  49                     ICON    DISCARDABLE     "win/icons/zip_active.ico"
  56                     ICON    DISCARDABLE     "win/icons/mo.ico"
  57                     ICON    DISCARDABLE     "win/icons/mo_active.ico"
- 64                     ICON    DISCARDABLE     "win/icons/hard_disk.ico"
- 65                     ICON    DISCARDABLE     "win/icons/hard_disk_active.ico"
- 80                     ICON    DISCARDABLE     "win/icons/network.ico"
- 81                     ICON    DISCARDABLE     "win/icons/network_active.ico"
+ 64                     ICON    DISCARDABLE     "win/icons/cassette.ico"
+ 65                     ICON    DISCARDABLE     "win/icons/cassette_active.ico"
+ 80                     ICON    DISCARDABLE     "win/icons/hard_disk.ico"
+ 81                     ICON    DISCARDABLE     "win/icons/hard_disk_active.ico"
+ 96                     ICON    DISCARDABLE     "win/icons/network.ico"
+ 97                     ICON    DISCARDABLE     "win/icons/network_active.ico"
 144                     ICON    DISCARDABLE     "win/icons/floppy_525_empty.ico"
 145                     ICON    DISCARDABLE     "win/icons/floppy_525_empty_active.ico"
 152                     ICON    DISCARDABLE     "win/icons/floppy_35_empty.ico"
@@ -734,13 +731,15 @@ END
 177                     ICON    DISCARDABLE     "win/icons/zip_empty_active.ico"
 184                     ICON    DISCARDABLE     "win/icons/mo_empty.ico"
 185                     ICON    DISCARDABLE     "win/icons/mo_empty_active.ico"
+192                     ICON    DISCARDABLE     "win/icons/cassette_empty.ico"
+193                     ICON    DISCARDABLE     "win/icons/cassette_empty_active.ico"
 240                     ICON    DISCARDABLE     "win/icons/machine.ico"
 241                     ICON    DISCARDABLE     "win/icons/display.ico"
 242                     ICON    DISCARDABLE     "win/icons/input_devices.ico"
 243                     ICON    DISCARDABLE     "win/icons/sound.ico"
 244                     ICON    DISCARDABLE     "win/icons/ports.ico"
 245                     ICON    DISCARDABLE     "win/icons/other_peripherals.ico"
-246                     ICON    DISCARDABLE     "win/icons/floppy_drives.ico"
+246                     ICON    DISCARDABLE     "win/icons/floppy_and_cdrom_drives.ico"
 247                     ICON    DISCARDABLE     "win/icons/other_removable_devices.ico"
 248                     ICON    DISCARDABLE     "win/icons/floppy_disabled.ico"
 249                     ICON    DISCARDABLE     "win/icons/cdrom_disabled.ico"
@@ -933,7 +932,7 @@ BEGIN
     IDS_2070	"Ports (COM & LPT)"
     IDS_2071	"Other peripherals"
     IDS_2072	"Hard disks"
-    IDS_2073	"Floppy drives"
+    IDS_2073	"Floppy & CD-ROM drives"
     IDS_2074	"Other removable devices"
     IDS_2075	"CD-ROM images (*.ISO;*.CUE)\0*.ISO;*.CUE\0All files (*.*)\0*.*\0"
     IDS_2076	"Surface images (*.86F)\0*.86F\0"
@@ -1023,7 +1022,6 @@ BEGIN
     IDS_2136	"Don't Exit"
     IDS_2137	"Reset"
     IDS_2138	"Don't Reset"
-    IDS_2139	"CD-ROM drives"
 END
 
 STRINGTABLE DISCARDABLE 
@@ -1093,6 +1091,16 @@ BEGIN
     IDS_5899	"2.88 MB"
     IDS_5900	"ZIP 100"
     IDS_5901	"ZIP 250"
+    IDS_5902	"3.5"" 128Mb M.O. (ISO 10090)"
+    IDS_5903	"3.5"" 230Mb M.O. (ISO 13963)"
+    IDS_5904	"3.5"" 540Mb M.O. (ISO 15498)"
+    IDS_5905	"3.5"" 640Mb M.O. (ISO 15498)"
+    IDS_5906	"3.5"" 1.3Gb M.O. (GigaMO)"
+    IDS_5907	"3.5"" 2.3Gb M.O. (GigaMO 2)"
+    IDS_5908	"5.25"" 600Mb M.O."
+    IDS_5909	"5.25"" 650Mb M.O."
+    IDS_5910	"5.25"" 1Gb M.O."
+    IDS_5911	"5.25"" 1.3Gb M.O."
 
     IDS_6144	"Perfect RPM"
     IDS_6145	"1%% below perfect RPM"
diff --git a/src/win/icons/cassette.ico b/src/win/icons/cassette.ico
new file mode 100644
index 0000000000000000000000000000000000000000..41d6f4348e20841df6454fabd05797d7d74a4546
GIT binary patch
literal 1150
zcmds0O-~a+7+w>902iTdXSXeF+1>U}NFtGVDVV6Fl)@H~Zd*8b(HJn%i#HQ5dh*~w
z4@wMr0HQ&N5-2KA#0pX5`%`J5EoHm2yEDF9FC4w<OrH68pZ9rY-bsdGPC&1yU|@7I
z(US~Q$uNuvfDlCf#9?C20QbK&jzejl<0yv^<v5<6w)2$Z9pydG!y4HsXJ=_u<tb{b
ztfDqs6-9PCfTal8w|T^39&*aCd^qp{F9&EXKn~0t<;!vKvT|Wv&Sz~$P9B+;nwm&B
z5;3nTiqWYkW-O5)v91J3baxx^u7s(?V`eOFaZ!sWt&s?64u^@;!4-LgHv3-><3~^W
z5AWW4mLC{-mmmB*sXw0{#v}97rI$0K+Q3{=do??z4t+`D!E{m^N>7%?7Z(hV*Q2@|
zj?~-aC$hG8K*pw0y3*O9*VonR=g!t^Ey1AHc}3RSTSNN!x>`dHHQ}dyFYtOMM^^T7
zL=XfOYMiz78`+$B|G`6itG9<<Xl$St8!yvnM+d#rdz0Soxj~ioFui`Qi$)@{v6jt~
zWzhS4k^%3L9-jC}whszgdU;KY#uIv=p#e9CWIfap#&TO*NtWA6fj~eFHV5(0=zF|*
zaAd4z@<bFxj951HX8Z$L-!G8OT+!Ib70s<&5pU&>%Gfzn3p)k1xcW1jotpo?JM(QR
zGqtdoom<*aL2q)1O+D`GH@>d#m@D9E-3w|nf9&p)rC-+m4=m0)b2U>aV;MNV-%ngF
z=Y+euTK9O|x**gTexDECrN;2O-Pr4{#*!!ypCnSBB$z^t7fXVGp>8ZmqV94!4*&K4
PM2|Iwq4aNXOhSJHAuysW

literal 0
HcmV?d00001

diff --git a/src/win/icons/cassette_active.ico b/src/win/icons/cassette_active.ico
new file mode 100644
index 0000000000000000000000000000000000000000..831d4545f301566ee5833c19d013011709d82090
GIT binary patch
literal 1150
zcmd6l%TE(Q9LJ{#4MYRsq_OO7-|TMrBa}oC3`xO6ZAw8}L?{#vUNi{CN0exyhKt4+
zNYLOxi9*zBGzENwf<mbh1RuN~g3>};pzZALjMEZ1cxpU3o6qk49^dcoZ!!SL$d#TB
z$Xx}hk^tBR0N@BDMKW7?@&Nlt?Vnc*D3T4x2IU_4W~wW7g1f}kB<yt?n7}ANU<%+r
z$cANzzsTDY@^}o!!2r?zMOu5>7n-I<8Jfm4MPZs|@SY3?(~L46GYomBGBCJDv`+w*
zJLNdVnSzs^CB@_9JIRQl6p$f3abi9+@gZJHqK!e3TFRAVta+-z1@3}v6kQ6uvtfs%
zVkqf|$%IO6HtB@jE>_y@QnkZ@s%ss{QCBC{)H<Zx`dno8m~rcL>o)m)`B<@ccZ8v+
zh0d2Q*wWs)-gNyz(Ao1Q`25p=@X+IeJ!76o*KlvtInp0J(|s9U^V~pfV|Q`W;8oP@
zZjp3)U0AJDdb|4v(d^0^dN<@1?3EQlUQV`fV1Hh;#B7dM9=8hR$1K9ZoNUo*F~R#C
zkKmjyfTmXhh-KL@nek&xKkpAn%{OnsvyBb-P*EX1TyzvyRaD>$jrI6^!)a_UFU6-$
z)?%B@D$e?YXo~0!23{olJL+<OKtI+((b1{dXjP3vFcucVVvAL<l$1hiSy{wtEsGe9
z#<02A3}5uVg$rw&;*2kdIF5sqLg9VY_a4oyhR{M_L!1w6NQ;3DxES1wv$P%#Err4x
zGe7<Qp|Nkv!(S(TL*w85Ba`!CqL*k&;ce^a6hF@`Nz=qL_FrT+X<~U5P5z3-Tf}Oy
zZ_fBaai&NuD=Q1B)hf4EqY-pEt-!LGVwS-`_9au)Yqe0X)j*zOk%8y1foCN)QxAET
ig=B8X^PHeoDc2J^zyEO)evL6cw*>$gCj#l-UcUjmX~>QM

literal 0
HcmV?d00001

diff --git a/src/win/icons/cassette_empty.ico b/src/win/icons/cassette_empty.ico
new file mode 100644
index 0000000000000000000000000000000000000000..467ff3548c5c71e9199f6a4908eccb6e3ad58f2f
GIT binary patch
literal 1150
zcmds0&rcIU6kZem08XC07}~ha?lvt=%Qn0HGfXrR<6#SlHf?Fy?Y?=lZ6WcZ5lr;p
z&3NHtVxk9$fdh@E5C~Q+ib#|n<(E)e3ZClQ<-*ac&gR=U^L_7qGjEa+gbVcb^a%97
zEEpFB;gTQ-J_1q1obeO{owWaL$g(t~$TF8DiOaIWuLcw@D?x9qC^VM>Tn>ob*L#Kg
zdwtyR_i-r@Ac$O&0$D{8L7^NEu8&MU<Q1e^7nDO$=8DIYmzzs-FJJT*LW+cUQz^_@
z7Ba_S=r~v`m$5in#`4%0D^YYxMJ$$FjeB~Yax=LchJtcIk)+J@yDGeRHElh8_Qsr@
zTQDmtH8xeR!rWTjo>`uU*_9g1d|k9F-)c}<^<Xcpud!$>YKMbCqgwlnjl&i$*1s?Z
zfeqZa#%^98fZ=o+&^B2ipJlg*GqWjpJ@pp0n{C`WY@@2GHuacv>vxXY_<V8_9!-q%
zp}{1-GnnEWfIpdd$RCeC;7%dO@828cmSwWW(J^jPy{>DF?qjI>;S=t)I<UIg0A4CH
zBbkIu)@0e?9GD{`wrP&ohGE$0Od2Zl3$WWdWsT-B#^Z62MA3M^^bxmP9o%i7u$}e^
z?zK-~@A%Zie&@GEC^Qa^^7XZ!!^=N5D6Z#MHg;^PM_Ce$ms8X1`}RI=k*9kux3~3Q
zE!;S8*Jp4wch5$%<6)DuL?VIVaOifVua8Be5vHpBETQXkFa0bQi9jsU2U=W3U5j&F
jQ&H`Yfu^cJeS@aOSvVB5{`L3NJvRiQ+x;7yE9w3LkCAgV

literal 0
HcmV?d00001

diff --git a/src/win/icons/cassette_empty_active.ico b/src/win/icons/cassette_empty_active.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7fa0ff40f30da0513ddbf3b139fa5e64e8a7e153
GIT binary patch
literal 1150
zcmd6lOH30%7{{jxO^F7=$paUa6U36;Z75C4Hr*acxOh{dkr)qKnn+X1W80lap(QaG
zjbNfCN<x$ii4lWhqG;d%NLs)sk77_7<x!wKTM8cRI$Ht<PmL#M^V@H~$N#@OlLbIS
zuYv+V@8^J+1Hc&oKrw}uXyvF*0}yEMpVt#`Q8TUyYbUj-y!UzEii5?@ti2wAOJD}1
z!6HzO(M)O5C9NfntUO+T2pFf@zsT>&pJ!Rd$+0Y98HTVdM=q3dgyjsGoa5*-Q%b-y
zs_h4gc0jA-4&*91uX8fFu1j~wF?z_+nGC8AOMR%9fofG4+S7IFwu)XADOF=tCltOc
zR8F^_ik5K<u5-C?qt}a(-;c20k6Qu(+!74nKwBGXrBP_N_f=0;r@NwE$}yE=mFe@<
zXS+FusUP|nf_(!+-p5bhNh9GYX>?&44MsvR9F54s^Am7nVH!H#);({ZydCeJ>;4@G
z2V=hBmL9XkEE^35F*H4gV>=1_De@KhF+??2FQaQ$YG8xg4Y4dCUy}!2r!~prf^P;t
zz_r~ZUfoGzp66w{M~A9k-%H}2-d=dWvx7Km9pq-Mix3FO!_Ir;LC0O<_cf9`w}Qm$
zl~8PNAFoioAlMK+UuWpcERH8q@cT*(lGXqc9S&IUk&vgM5lYR?vLrRjqA1GldN&-M
zn1UOLLloQH$5yKqGJ3r@{&@zkB~o}Jd4SfF2RNQQfbspq44bK6UWzZaz1I|p{%n~4
zu}tGq)57w)O!b&$^kV<u5L#T@#H-X({VsKHOIr!NyshR(s6F+avE5XL7231g?bv86
zyJ0FXM`p7L@q7ic3j#ft3S=>vpv6=UZB`x&HY*WqJmxDb(8lwS?i<={R%9$Qc(eL{
V|KlNLSWy&m1OSSX4Rrcs{Q-Q`p7#I%

literal 0
HcmV?d00001

diff --git a/src/win/icons/floppy_and_cdrom_drives.ico b/src/win/icons/floppy_and_cdrom_drives.ico
new file mode 100644
index 0000000000000000000000000000000000000000..8fcec1a885a3281b36f7a1c3cc81b5ad73e492b9
GIT binary patch
literal 1150
zcma)*ZERXq7{~9TiC;;U?AsFkVB$v?mzXSS>dQ=Aby;I{iE-<f&9T;|wKh%Xrpz>9
zuE-$ZbOZ`5EqL2YfeN&|T_`Q3z%BGjsimc*bhgkpSc~acDC6%fYFtc=J}3Y4B+vQ(
zp6A0khaiq{i^n6l{aJ$lG(j9A2;v1!T#2jvQRfm-!=3$~Xl`!iwY0R<c3f*W+!PAZ
zVx>5*GOISaM^s*k>c%;_yz%J2_37;FJbwGuEs;zn*}A9xq0&vMFyJHMO1lu+byX%p
zUB3+|>XowV?>+a=9vY2?N9y&W!9j9QtLs6ZNegOx5RQ}sQ+X$t1vwboMU3e`EOvLd
zDTQ+3(V<h%o5n7@Q>2?eEz{o!9|tFVaF01*v>Rab55c*7$hyER-2>yigrL3_F8V8w
zv5~?J&E0eU3$K)Nb}{z1Gl;QKBvJ|Z*$FsVC)_J;Oy%4NFRBrC@)7KN8xD^ERFXzt
zE>rn-#O4ZLu0hT&LUAVxpWlnfVg#X;Ap99WH`j~lUu>A0@nDi_htvKAs6{t=x7VOe
zr*YS2%dicnQS?Yr++K&xW5IZ09Kp>X!i8~!SNf5h3!rjv05)WYIc}}8>Qo9np%7#`
zUG9*7MBhPi>pm=F!|<lP2<?r7S<`{>wSjeskyx04BkDmP=jmBpg@$9577K(@X^Oqd
z@h%Y_ZlvJ}J208^f?3yL+TVt-{tUeK&taLjL6={Lc6}ZFkqCN5N1@PaD{UPe6nph8
zluT{dXAD>l8xTnLV|t<$VX_uuBTcX*hA~jcVj!P~VSXMYO{15hAeG5BuQW8AVfk;M
zqB@I`{9WWF=fO}N2n?QwZ}>7Svm^$0*I<6Q4@Wi&M=S=D-HvXxdQTt_bk*0_^H~1t
z!1r&W^yQ1#xmkx_XMC7+DezN3jURWGVJH;feeeL0%}p@ee5=`5mWaio*4EbJhwqQQ
zQUl0eL+R@i*t-1@G7EFKznnxg7KLd#1S1my9iK(yX9lx03Hx<^hMRr(wW?9&rKfNp
zd<mO(K1M1MLMk4wD(U9#zNHRv8-;A|XLxLGLZGp3=`Z#$M=!lvu1H=+x$7jd-_;}T
zqcJx%Rn@H5jTos$%xXYZ*?{s;BLYqD&p*i<PoIdd3O}f9$SxwOXa{RGg0<WJlojkK
oCliS!#WgI6J~^<Qtx-P7KY9w-Jp!Z&fcP(QK7#WT&-|_50jEvPg#Z8m

literal 0
HcmV?d00001

diff --git a/src/win/icons/floppy_drives.ico b/src/win/icons/floppy_drives.ico
deleted file mode 100644
index 58c96091f96ff985550d850a19ec218463eea4cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmaKqT}%^M7=~w~$=-V9wKtn=yi(ji(zpcwE{wtkHG5%X*9(zS5o;~bQVL5nL?tR&
zR}+H@CMFo$LL;pdq!bhj>k5uQVWES93Z1sJwNcwLo$2e>0ZrA!OrG=eojmV%PBIMh
z1AXh(F*I&qlxrDgJ;N|R6I7zgN}VQ#p|jjIE6Dq=28-gSj{c(Eap#FL(WTXh{o0da
z|0zOqf>5ulsqQK-6<vq(!<Jt+8Z#pXi?#|O#|3-{E<$`Cg%}M%iufUge2~I4(>`5a
z=4X)@YQf{;-E5}+q&N>DM<e1(KBV47fJgu!7hxWVE&=4G5-|wDc?eHh;a2Y9va_?}
zgg+}Q%g?HIA>P-7cyIx!x4~~*kef;-kqo~<GVPb{<w{CQP*G6<tyYV)pKxA8Jn#ys
z&wWF3-?R&IQ<8*aWO3Ec=afn%s;a8w47QZ~2aSmFa}dcF=?)^jLyEnFw48uMz9drr
z$O8E-)W3jJsZ`MEbaDn;x)VZ&79ajIBgS?jK7JnwPd5@%P9&!LvFv>aVRjJ0lmp_U
zCb(7kTv=He^m@IV!78^Sb-e(><-K@+VIQJxI)qHM2$<`^x1WK}+5lhsX+$j*kQ@fM
zkNw7#mzSfux?0X)mD_-;J0KW0Vd<|z1pj9dd^L*z;eR=U1<wfHjJd(zH9)dy$uH#8
zYBg$VYUB*IBoDZp3!#290_P55aoPj^^=p~A;fEN}7h!s!3yX9w>7H8duhD2=G#cd$
z*>6%H*{}uvi-+)H<X^m)n2_=I+Tl?bV#02M@7763*5h*j%F0TZ?RJ<Q4vZG(B6TST
z;`v|T`{z$g3^?H#8j=}z^<wPKO^n&h@HML-T8_beeE(GX?!8_wOaM$r4q(3FckqAz
z0q?a+u(o!v4*M!Luw6vQ9dOt5;2Mu6I}7rfYin!aBEOUT+r$k~L}xgR;rV%tOiscy
zK8~}`p5f@zr)aTSk&}}X%KYc+>gr^_hg>splW2>@;N*FX&CI|_?{9wo9J<j_w34q-
zD8BFw1_OEq2hm0Ev=LUq;&$WSzyP}X`q16e11r(i-Hj`)t!Y1z*?*2UpUA9#cl{%s
GuJRF^Y~gSK

diff --git a/src/win/icons/mo.ico b/src/win/icons/mo.ico
index b84f5b919d27e6d2358a6a0566f03fddbc889220..cb4650277d5056c320aad3f9fc1cab99642e18a1 100644
GIT binary patch
literal 1150
zcmbu8+fy557>Bnr{sEn7?S+<F+G+&}NCHDjfsh1pB0x?XlFd070!e^PLP!&kLk}P=
z2g^-sbq1%?;<Qr_?WkjKbjCX`yzx$N9RCE*hboU>qF3I!JHLH*-*2Dy`+e`XD@ljM
zdHAp-t|z6*rzGi^BuOs{iIm9vlNUki7i0fDZp{}DF2-YIhMa6BVl2si)RB?8N^Td+
zem^Thn~6AY7gX++i|kIOsRl!T)oQuT1LRyTwndH2sKQQMVJo7r5mI<96k@#=l_1x}
z_#5d7K3FL8{=x<Jig{{$Mbxf%yj%+f*ow()$NYlxb1^W+ilVSI7GOn|xg>j0?Rr+n
z2HDR{v6s!%`Q3E-$NAwAmc7GV35;+xG%BK-s>j8=+f7NR;&F4u?`AEe=SHcMMYn@D
zv$>yY^RI=&pQTJDrfq|ioHmv`cCzB$sn=ug?4msCChr{LvZ%eO=vfH2p!8{kpTOre
zzUp%0?dl@Z+e@O~fa-Km7Je=5I-G*HidY;PrZPH&YVASp)?t3Bm7Hm??ms(d#nRS}
zL)(Ev*TL?@E2zUmM2tqlqF%&gByY2`9aiXXZb5VMEKLn(@agn*K4CCoY-z=$X~Q7m
zo|+SW9mqZ1_|A6|?Cqgow{c7C->GMx;pmYgJbm;Sre;l@Pn!p^iMefBEq1Mr-SIf-
z0W&VKrcr&Dh<YZCCe~#iXB$rN{P7c<K7NW}ZD*aYj*K3ptX5`3kE){23xObuYM$w6
zjG0)HY&6c=<P^%e9y%MF(4Kxl_-`QH*IVabkHr2gd%au^2HA{+xisb{>2MJ4?Ivlp
zpmcW;w%RD@&mlLpp>I5cuJJk6#J5@N|Lt7nkKNQb*TPXY!VxZbJjBHNUQIJ&9qssD
z){wF}xNa~|>CoeEZbvnl*`LY&%TN9Guv}s%IZo9llM!=AZ8qdKjZiE8_BIlBC)<5S
z77Zp!0~Q_>Rqo8>>iooj`IiqXB_6+8VJDRoo~_KPMbx<p`BIhqe3hg>#I#udy3fnK
z!ZZ)7bEM7YgPQ+$SC@Zyyj0<nl`4-G%i{kkke|(y&CZa^&N4kKp5x=(OeFcZTISQ$
zMIKe=xj9#OQsdt$6h8XmojVV{dhh;sU*6yU=HAxTZ*$q)L2hb_OlpEmdXjV^`6S_S
ceV?#eeveu$zn*W^{Jas1eqH0GL-2p}H(`4c%>V!Z

literal 1150
zcmbVMS!@$m6rD=_;|KA<2Om+@@{tM$6A~~`YS+eboEkf}N#bQZGoH;$Y(!gB+AO6A
z2?;78AV@4hED4FSh@b|j)cjNe!Xg1#N(c#%rH+b2t43}?#1)lK@0gHJKA6#c@6DMx
z_r7!QeZw&C(Y<sjL*oZb?0tq=&M-_N89{`+#%W?0dbe!JYs){=;Bq^!xhg&%HX2P&
z%;rzA(NGF~kq$+=RVdQayjq8nwR&tal)z&71a|utIGq&}Ubka-t8446SVYarq6D|g
ziNUdlxIg|FHwOmMe|G>k?hWGBz!3UxUPW(j7k)T$FxS+49HBrpBC3pNEDA{!vY}uA
zWo9GZdgY$uWXFGKyYx4zye^FgRgod^+`rpAZWv0|Vt&Cv&&BTCPZ!%T{b&fYvuVss
zjbUbD2rn}!JWY+jVY7f|eUQa4WJ%0<h`+w17_S!icW+<E?W<QXJa7*q4@NNda1^7z
z-a-2JX^e~x!fG~=h8l>(mq@#>x(dckhQ;ltCLiOs$uUe%jw6+tLOMN*ne<cqH8+Qe
zsV6A2d`A2LM1hAwd^X^ReT!w0|2*>tUcPvS+^c^G%Pr#C;@RAvsB}2MhghhR2qDbF
z@2f_Itqcd6ny~-SL7Z(n2leZA$U*>(Q41Pkc6<|Ypz%uuyePx#@qiBo5vKS8FMwlN
zs-FudTU)WSu^xTD{EXV~$FZ@{fR%-(uui`hAAWok{taf7>sO%4=SPU*Q|`%!kk=6+
z4bkLw?B3IWV<!${gM9}|i&w#GS`MGJ08Uc@yylN!GwQ%mOpT{$2n(7Ij@BWBxllf@
z9ING)^eJJ);xgiKg?dGS8d0IDq(S3`$p^*fi7PCu6<H#lwjTjfSVWY*k3=GG>I{)E
zMUudC6q9PF@kBwZA>lF^^`zDl0!Mk_SV)u~J`_Yvl?Q=pFIZm<<tm6E^{W<JBz__h
zM>3H>ZM+t-h(b7zfWHPFPbKwfW&T{)ZB{s44s7$f!3O>0BY;>;#r9+ZyXxxZ>+0&U
z^Q$jVUS0;XaWhVL^`QH5AKH2@p_Q!t!ez8{|A>y>zWj4kkx>8bE_~P6@PdwTfyrdr
zmrN$6Y*uS#U1@RVTu0aZna=KPbIbW`^V#<7(PO7GM~*jV&YbVev~>2&IqbInHEVRc
NiM!&>f8br`{{bKJbZGzp

diff --git a/src/win/icons/mo_active.ico b/src/win/icons/mo_active.ico
index 26ffaa6259ec10401c594757f82f67c88abe406c..3512b20abed50c7ec2e5656e3be13c69634b03db 100644
GIT binary patch
literal 1150
zcma)*>rY!{9LEoakvX$v2{<E;O_(=`rE&`$gLQ48HwyGZ3-sP%DbN<$LaD6?Y*UbN
zo4g{68JS@-o6`gwWP77;jAk)vV)Vs)GyM~s@jAoDr`614@rCE)bH3;Ko%8)Y&-ckW
zl2jnhg9jyXeOekUl%zwFB)uRIB~kgiE<`#do;`eAm>AnV<M%P#ZelUuW6JIz-r1Qa
zWid1Da4;kAkE<!a`2>%B{wPPco}?$L-Ocr~Xj+My%`A%^i(V%yekV&FC-W{RZ@OH}
z3GItFQShyVboXB#`Ko}*vz0>`(K}<cvEb@u$!BNT=MX*zXL@^>aXOjm>80e-ex%#N
z`w#~%AGos`4*xXK(aE%}gEx9RIp^vUY9VViGhwli5=a}u`=P|1ojvT`*-PPeVSZe6
zsp#IU+x>A!ttO^#BW2PvWi=2H_a=n`Lqj9!E(^uy_fv7B0@G)v2b6A>QnXg|N!Dz^
z*4T)rrG>yLC2^CHwB3%jrVf+v>vB3!kMm0>7r(#w0K=yS_ATr)MA~#{<uw><>oL~V
zvpVoH@s4&pDiv<g&!bk6&>IM)+L+wVu>Q?DBk#pfTjk{TKcG~hda)X{Opa3MdOS)(
ztij&gME8j%`dXSv8uVNU_^EiRl#=3N9xpkBx=NP!hc#{J#oYSZS`4*ytoHi}w`wqp
zOkIjbp$Z07YUb?SJYRN%XAd9Y*x?E~Y8&$YY-iVQNT*}O)Gqei!mGV~OvV$$ygo*J
zK_Xs1vx7r8k2lj$UP<k-=cp_zBYd(Y??3PH{h7Aec)hQWMUR`aJr06KBkq<af;uhE
zrbgU4JxRrJ?3Hp9<<C%8ew119ZRYa76CM6zHPp|7+snM$!z)%RKJmUyRz**J4c#xv
z2<eTyrBsrsSKz3sA+FYNWhC;Cf9SW(bc&T=KiO_O!(wi)UXNWa6IA1<krObOSU#y@
zQmH1@s^$7voQ;ua-apW)`Q=6?#jV#etb~GM%{oToW5mZZBvM%t6Ip@|7cr54uG_}d
zWQ@)1IAM(@|Np#ydivh2sSGz~vTRMJxtvat7)=m~j1Y~C5*rm`e?M!1AUoMKADy0L
zD>K2`c=CQO|J%vr_U(5!u7CZ(wI9B?cICUPOXu!JBhlUH&=A9+0fxhagag6*0jv4P
ffKL0nSEv2;M78Yad7t-A&My@pa{LFm`v2fB*}oT+

literal 1150
zcmbVMYfMvT7(Pufnh+PW7=J)Q2riMuVntANmo{}!TA`IzpqJC0`{{+&xQ*$?MP^J)
zG{)#;aSUUX3K0nq9Y{u&EZOEj6D^uyl(7IKCc6Dtn$3)ECOmsj#r{~bKRYMScX`hD
zJn#G64#Vi^UAK;*vXBYqFw6#qVTuVv5%Yqliec#6tGO?b=~LmTvw!Qb?YVC>ntn2y
z-^Q+rau`bVDA8|5iGk`ZdX#N5pxC_;uMDrn>f5Wa{@VJ#jgdDW*E(t^!$CDIixTP_
zc1%5bh#zKVF_E0Y%{xhae|HL#$$L05)&boE9hiA03*D3s_GUXIkx%=5UR0Tl_^)Tv
zSDV1xChfnFe?A{P7x-(Rvknzy+px4^Ff=@{d}Fv53qRh&)2C0M>!sKu3|5V;!kV!)
z$hnb|>F36CAxq-2lk_{vO7VO}f9KYBxb@8_?kDeJ`oS~`6NM-mEkf;NZ5Dag^N@cs
zpYoUBZm5Uxjf!mgi*vL1dF~Mw=4P<CIFHVWPr)Wx#24aO*d}bS#w<`s&w4$uzOy^4
z|0DG){(SZemY@Gl+;WB=oE=2hbQcm26F4~f0c;1Vp-LinfrH200Gp)>C(fS5@zbYp
zvG)?xgME;BFWN)9(H6Gi!(a{C-&4SeGF(n4IG+y!&(Zqv2(T>ep97yK5@>F3#rW4>
zqUqxq>?*FnYsKfW-Eb5|uXn<;(~N3E9_rm5`2DQ5_T<4sBp*M`Ar#w>jw5Y2*L4Ov
ztp`wEx*0Ch2DmE=U^f-OW!?yjQI7z{)N~wq2)yPIptc`Ez)wDnlusi>k%g)V2uEZ@
zA__ub1!_=*s?r=Ztw0_WpCc{5(pF@NbXq<<Btb-o#s`Bz$fBU_GeqJPNdgz3n8ay1
zkr!wWiI)kgoEggpXk7v<B$^lJ_o1=g32%c7tXs>?2OphREw)JdXf%RYG>WE36T(4-
zcn)4qBb?5?sCVtn+zYFv5_U%o_POf7`aI;}ML4Wte=LeaEiFqeEv;yN|6Np9SHWz2
z3m2{qVPIq&y+dChLFgMCLC?T7T)94;>4y{vtsfo2;r6y?bcG8{CeyK4EIMzgtW0e$
zFHK##a&;-*KalS3xt#94*q81+cOmu3XWgmz<^EJp|IlwWR?E$;TlF2J&3pMD_`mf(
D=5tpL

diff --git a/src/win/icons/mo_disabled.ico b/src/win/icons/mo_disabled.ico
index 08f66d4f7999b10fc2faed1f1eae621bb25f7daa..7cb3b6fcfd85286b3bd459d06f3f5d6a42626de3 100644
GIT binary patch
literal 1150
zcma)4>rb0i9DbL$Y#&Uv#6*q8fNs;7xQrRO%^8TLt_9L&9i?jv?c35&dcR-Z-rlFT
zw=J}_tx&cV%b>HmEMyT07*G?kFg_T~Ak56pzkv_?CST@h^^@^~@5ytXbAIPMzuS2!
z>KGZPPg7)Wr>0(_s8=b9I!{1M#PYYD5Y<o4{{5}wrrDc*A7T?aEHOUJT5U+_^(|zL
z2F%%PC=+N0D~s>Ex!ZXE-TlM%Hy$<Q{9DzgFQak{34;MO;$z9{B<#ep$BC-Ti7#C)
zED)wYD_2jR*gr~#AMdT_%3LkGb+5bgx91dfaHT+e7ffc{aoMr#v!dp+5uFV;?RJ!%
zPRtT+d;MX93;(*;+tWD8g;rKKVo@w4*6tlY{^Ywl%La0jdd!(8QL*c>=$ayIMA2kG
z&S*rI;QYDAhjSJWS75(hz1-XQbB1}aT4!@;YkT^v;&#(vg#t->99bQWS(65Fvet>k
z&<u-^pEBaD*S4P(n7j2Qrx;mwX|<>4_oGDUV28wCD;kV2i$w59rC@HzkkV<9w_2eR
z3_?frYQoY_iq)=<o;>Fq3*VR}H#o+<vw!l$-chsu__!J>z5rU`5b5y{>X8sqlN0dB
z<!}>!9)%ofT7!wJ^NX*X+G@Pr{>$O1mp2={3-MO}8JQgNPY0mj@gXDpZ7P8@$-z1z
zf#tdc4(SLo8X7B%A6*wdz}YiraPI7TQ1tUao{wUc<Df}wS}24@IEZ@C4|Yrm1F30B
zEFvrh<O(cUEx6Kg370QkLifckObUlv`l5b{4Xf4QbQ7fKMwILhlu~IVy*_Zh0ODRh
zDu}{)Z3M%eeGqnkjJ}Qzu%ptJ{;tOt$(zl%?Qmep<Hjw!4FRndZm9$TwF*v&2yQiv
zjQAR?eSC;JdokGgAu8nGB<WLYiCDNE4&sj6i>lj$&rK%y$bB=fANC;uELV95(^`Bb
zlc6vqhOJ+KltPIOF8+@`8rsfhQ40i7v{(@%vAr}6E1yR&0GoghMx#S*RF0BNf$W$H
zKTM~v&Lvv<$e1$tu#m;>7X{S90g^N6MQR$UnF7+;BGS1c0yY<tr2Ykq8Jn3Twu>`h
zl}eVRPyIMQ$L!7)@TgqGb}5hbd<JPQjd+|xf*{F}y+4TiOaME@Jbs=pVY`sS{h3Up
zseh2kC=b40AN}K}EyvTX4a?^8qCF8$u!(3Cv2X-27GRk`gfSTyMy(2a)vD0-0ba1`
U^IDpE>e!1H6!jly+W!as0@Q)*;{X5v

literal 1150
zcmbVMOK%fb6rM_5kqxS<cH0f2Edo~AM1X)l(pIgis%6!xQX7P$nvl>WRj}naj`Q$?
ziN_w#)Al5UsqL?IX?TP<!EXnw2nud8F-{zCDHx?^oHVPhs?m4Px#!;RyzafjFmKRz
z@E}9ud(0PaGR!*+!@N%*6IpicBp8O)-s;#zdrpJLJ7xEbk5Afc_JG521w#Y<u=ZHc
zW4VAHE6E=$=(}Xar=Luu4<Am|jvQHT9y)aM@mF8Uu}ROQGomWGEK2ZtreM^cVxzu^
zC+h~DtgW|Ym2|(qlJ4lpwnkkKjT<+YQ(jN1(A8CVVX^3GNfdNG$YIoB!_Lmmf8y-f
zN-Yq0YMeMxX(_QriS>JM)jwZ2c5Goo2=n??pBDptm(bedmsd*3%1R!MO#{v5b98o=
zn`>1gb>p{s>C~x8%QhS@1z0|H{CK7*OJdST{2%*z@p_NHR(*`>9~Btu>!{UgIC-*M
zyM4<jJb%_eB59Pmx>j0OhKt70qYE1n)gEA3*nS$=&wYDq6Wd#LGzi<<4T$1K`plWi
zi^aufh3cQ1siDEFao|9vb-sHxZT2q2ad3}}?DJp#-NdU`P3*jWxo?X`x6-FiS8AP|
zD}R0X!F=ue?`G19Btj6w-~uehU89&^SitYMZy}S<LecY(1rAAd1c`_nKdTc+UXu|P
zW%zwQgo8ndLKs3=03Qm``FXIE%V92=!0Mw_M1QGcsCxk4b}!?yHHELw-vu}5z?k)O
zumKJ{A0jSKK7_U(o@!9F8Q|9h7Sney=$=J??*;hnA0yyAhbj9x_#NNCWwU^%m?kew
zK19Lv!IMssz;n}-&ouQc1Vt7RiOPr))QAj4RiG$TgUJ=i2gMH)SJ=~KSt8!9Z%GuP
z(tcG{A(Kw$Olzi;c4Lv=<_RLqy)wm;$+x*z;HfW^n?(Hy^Fd6rK5(obp@5lN5J9@H
zW^6N7EEa_pi&2hIL{ypVbRJZLd8b&vxBV{ME+?iu6Le?22oaYLafn0|%xE#_@%Z(4
zJb}5nS&WU1!eJZ6y<!=q2dl`JA0S6CWwvx5h5M`Rxk_~=;yRE_T%#xauHA0`Ow(dP
zm(!_T?(fyIh2r&0v7|3$bNW&yuiss~r`<^}X_;J6%NEPg3Af8}@uKA;;=cXwf8hVh
Fe*i6W)!zUB

diff --git a/src/win/icons/mo_empty.ico b/src/win/icons/mo_empty.ico
index 9583502bd46307fbb0534f81a08110ad716fc038..77308788fa757e428b9cff9254015d1cb9c92961 100644
GIT binary patch
literal 1150
zcmbu8OHUhD7=|ZOe?V4US4ygO(JG`WiPA=bVo<O_SRsI88+^k8-!J1Ewz22IHojpT
z+vSo3N&;?JG)XI}3ZkSpRJB=j+eH`sFX?But8RNn@4PeLnddv-IcJWdT#)PHMMduK
zD4w?z<!wb#-WN$oBLBq2lws-nZ+pI3*Y2;RC@i`;OsCiig{dqr_to%u*$#)<5gn#i
z__kKzv{~mEjdnDq^>X>F^OU?^x{~8Csfw!{B~%V#DqqB6?Dt%a@<jTdX?cF`H2JA>
zkCS?p9^aDOEq{Q=u?R=05ZzQ*xG?u45q4CSt)7QMJO~A-IF0N^7C0-caZ)Vw`D0DX
zY%VRc9av&7vdp8HN8Cr-?`6~HqakYfee8urF(Y3!Ch7QGd|fPMdgJfK<Bpug!n$LD
zhTFlG-$_xP-9{tM$tjv1A654v4<+}ZYNQh%L7me{JrQS*Z+m?Nrlv^D&XT@sqT+VZ
zlzMIB2He8i#p{bpv^<Mc>@$R>4Ol-LrDR#4#}^mu*v7_j=_ha*COFQoQdwFgVKx(&
zd<l!0s>4Y)u5x#H1l`9s85+1j&|vKIX_FcA$S4-w7$)(PN=fQ<5t^AMcxRgE><l%h
zgXgk;*FOA!%a<<k?&bHe4D0&5W?jG`V>|SEoO%Pt*%h>TD_)tC$2cW!1ha+xP>`Dg
zSNY`1RjyyT#*%)r&$pL7TF!2#ENj%3b?!u>bShQWlPSun48`OMd#s_}o?&uu2>ta>
zrTzi5x!FGdWg?Yt1_C^cMmbExc@PPcak+@kPLr|QP^YJe+a1)5w+Ri6VH~`HVeljN
z<lj`JeOD^vj&oTa$CDhy6WsIrNy+yC-7t}fae}vW<Qy)Zm`t=LjD&~BsaUL>m5cxK
zYpdtY2Hi}Sb}&Ri#!fmMgvNBDQNrV6q@8ZMb7ndw3ypaj-`C|FluLa+KX1+c(rWPf
z^A_D)MrxL|sMM)!w5T@PR5#mX!ZFrm{`<iIFKg?Zw>QwN*8chVVRt+IdaK26J8jP8
zY@9Z0RLfP0#WE$)dRg9AvOG;^__f{S_uUTXtxcY8)bcWY<(pc~`p1jYxxapV75($o
zS@7l2qe!V((n@P<6moeA8ffWEKJE9W({@`fX}7K38P#PEQpsSCS1!DH^MCX=MWNjt

literal 1150
zcmbVM%Wo245ML8-UW_q%_2_@42V*>V(s<EGBi2^2K0u(9QeLhs`}}r+t=1Lzsfk8g
zEn1+owx)^NrbVCy!9LVFOCLuMW-~kU&9}e#&3rT8a@+xW4j<;|eS$l8kmHVV9Cwn0
zT;$pDlj1nqJ9218x@&qxqG3;DczDF^_9VRC`xtQb!`b6NkK-zOoTRTg(09X$JFY(X
ze0LEH`VbBeC*sl2$Vg<wpE7idsT!h@Fsh9@zBg8}xKhR9@=8}P+4kaB%*|Esdi+g(
zqA&?b;9=+tM#_MuDwdQKFz9t-dwcsIvWdd<AC%`ez{evt4mx8{WXXCMi^A1+1HX3h
zv!7=2pFfq+T&<$hX`|I_ptV-T)<z5MRt=$m53-m5Q&lic&Bq9TtFITock#<h->~%c
zGpZ{qsMTs{)a$5!Uq<^!6SaC3ey@jWcm$R38r7cQdARSm_H%EotrA}YO_EltiFUh#
zR=bV$^>wT@S25^&KzISFB2x|;M6!cE-#&hGql2xj4z_=9?)&!6rnCMN(NGAoBtq9z
zD5?x0!DBcuh}RPnc=h%TrpiU=RvAnYkT-nDrGj{7gphy2Agc`VSPXJ9+2vPc1(GOI
z{~{=qN*K%Mu<&I8>E{g$Tz28o<qx>&e2EKJ-a)wS#gOwX_=Et7`04B^hSH5=*JGHY
zz>6H-Pmbeu@G<&(uOjX_jfDR^!k+VpdoLp3c0eLd8)w&`Ds~KsY|<q5xk{pawp1Te
zkxDb9NsJVOZs^cyZe$xv{a1-!Cakh+Go}%4C$>htG3a~4F!uV~?HALu9WL7M;uO1w
zGzY}RD7HNliX@YW(5OGMl*A)G27!-5OxU?4k)(OGxoxgYCJi%_p&Zjl8I1hY530eQ
zDLx+U-iu(sk8mV}hqM+6D~SS9DIKF`239uvG@H#~Z0s?Hh6dqv-^0hsEN12xP@bJf
ziNw~$nK?|)Ep*og)tSp$KtA_`uJCb>$8*LsGs%G8Z{F<hHH*`gr&E;~t57Uig{iXj
i?)^t|e6nCpl`3YjGMf$s1K#V`9j6F;bnid#zxprWR_m4k

diff --git a/src/win/icons/mo_empty_active.ico b/src/win/icons/mo_empty_active.ico
index a07edb47ddde88f812b50f2fde37ec8812b77d7e..1f6700f5437946b719782dad8849547868583c39 100644
GIT binary patch
literal 1150
zcma))ZD?Cn7{_l%SGvhYzf5GGWSi(fStqo`7i=-jmb5WpZPS>WHn~Yd^PZdco0~Mb
z|GX#7i%D#|YHQXuTUF-J;+E;ELgz~nQNO4t2>MA7bRYaGdOe9UVfev&_}%|K&prR=
zJm=w1R2Lb2eH3{=NLjln>VAr%9wCqriToWWLXD7r_deIki^6J{LvqfHO`gM&n?=rI
z=}@xUu*|YpAxthl^V+f7eLo%gy!ZD9-aU3_GIst(JC|KIgS5?tCdsiG@)7l6E9gVR
z@53v8Kh}vpmmPYe>uXA+e)yLIUmg%or%v0dBzM)}#D?F4EzXT5#}XflRgVWNJ|C8d
z9(n!HFVv^Rdk;si9Q|%v5F+Jy3znVpSo2tL$!{fUN6leF*=|RP&~=%3-=@Tat%G83
zt5@v4(cPK%Z1()N76>pgnns41Maj%y$zeo_e4AA&7!^uXtacn(x$n-2>nB9TzTz&&
zcaDoat34mpY<4)6N(9wv@Xu?IGn-IxyP=nj!A$%HqSA$d9r_DeZ2Z``i+o@H=i%aE
zd1}@Gy;KI1d>p2+acsvIkei=FP^(3N<O|YT<QXGoi|5`--cJ0w@y*5`+-~USbL`-&
z?f&x`Ews;$f|f|3A-a=GBTs5@PffrzIRUSF3I!vBYkU}kk3EW0Cr{#`QxAh4k$~7K
zK{pGA?9IsKFv`cU9SuX6(ZNQ}WK}7NssJsGb+-#o_n*a+XU<~i%pm6FijKc#u?jJR
z0a^1L>A4+sj~De^9+?n_EEhp46vi47@LiaKVqh5Zp{Fq1-w$D0-SJ-za`B4OiI=@z
zYz6~($-^RIG9jRzK*XSjZ$gQHfk8oa0q$WbR0B_7Y~XRMk-JICr>>`yvF%tC8-WlS
zfgoORIKYwhPRR&7<1)C;OAupBxT4XZI<5jcB14YW;bu1Vk3X@nS1F+xiK6CmBT4oS
zF$~;N31JkhObXs;Msr$=x`sw+MvwOvb7*DL9e;dA7yYnW!v2d@G-DA`GwDTc5xHU&
z`BDw}at#sIj|@5gy32`Mg$(v;MF={bK+31yzqrirFIDl$N)3DU3R;x{^4UC6sVvfj
zOqR^UQC#IC__$WVXBX?(tCn%KSctd%Zx#x=uij}*fB(U*_uJi@u3KA|Jn2+gNGB3V
q#^Oi{fWSxMyu-%x27N4K&@W7mN}>%e<ZAn=E>WbY|DYZJAN&O#Pw5i?

literal 1150
zcmbVMTTc^d7#<8J8e?KMMmHpy)x>0fi}B72FU)4W*lfHYF<JFSV~G_(5wqK7D5cPr
zmZ8(mdD;#FW823=z!Qh12TDCP@jwI-q-%{RJHAucUTnNFljnO6-}k(S?=TG0K;N!i
z42?fACmR`N55q7&6UarL4L=Enp}8M+Y@lY-5bO`QgT1|em&+Yt*}u@)(GF*e11*jV
zXmOIf=s??LCyu#}=6<}jcXj*3_VuRGrpgJ|FJu0o-xJq0Q<W9;2Lo7KeuuZqD|o%I
zh}UlxYI2_R_OZ4?L%zXco-=i9nc8BV>OECbWXTkwJi1vIEX(>P_7Cs>z}zS9|8O93
zpel)iIS}ecN84q5+2ofV&t;xHE?{+K5!LDkG;owV!B|^|wp!bUwpoovW6j<f+WAFQ
z<V=Y8SKC^#zR7<x{|fUjpJ8!f0ZU6u*f+56<H6)X>&W<#I-2w*>rmgJ6@_|_a2#CM
zJL<Jp-mjqYei^HTN@W$D_d1KmCy!f!a-fdG<A<#?q0=+=-o<zxzOJr1f9+EhpFdY&
zt*_O6{+z$aX4z_ZHvF&i?!|x3a%ZxdB14iz@DUEZ-foOPdW5kD_mM5+pqT}z5|51D
zg>>A9n|dEI!zx5sMK~0K7>z=fL`b3pAr_<a3t~E-$4DlP@{2MOx0ca)t^;S!{f#Tm
zJNV=L1o&$#dYr$5i|`PH7;y!PA=Tmt)Prse0k_kboO+0Bz8h$7y@0U$1R|bh1l-LC
zv!~&8IUrC@n<r8XS+ZjYq?05F{2<jc2w9FnQ)R>xDiQ=eu0qo_Xd3lkb7hJ_`9<PN
zo4Tqh#M_9i$TD<Vuj@Kg(&?OO&X&qXF4Ai}Nrt^vrCch-w%1Am?F-eW(Ef-*6oXs{
zJQqeRV%HW$l<upY+s>6tCSW9!RAT~hT_r!A2lZgzDK6Y!dlx>h2Z3N82FQ*PSBUY5
z$2ANYNtmhBXeyP)$jA-!^mK!D{fU`k33E@&D3qQePq1Zf?g?g}lxwz5eWp_;kVy~I
z6W;4~yMHr`WYp{N7+2a`jofT;G+UfAr*nC8I$JO&CTEO?Q`1H^Uo>*XQlii2WiMTF
O{7T&2|NRHPSAGRBu)u%-

diff --git a/src/win/icons/other_removable_devices.ico b/src/win/icons/other_removable_devices.ico
index ff389b15cfdfa36ec6c6741abefe3ef0a2db0d4f..0f40fef8518ab7d693a174dadd3ab6b6de3f76a7 100644
GIT binary patch
delta 498
zcmeyz@sDGI7Lx<Z<Ukg=iC$X-Ix^G$RfLECZ;Xui9~T?*e=;AV0e`Z$&;OdR(EmMg
zk^d9o;wSqu8uB#9#QdxY3i#g^8Tfy47o!PJLqx>29Cz3MWxgK&C!b<8;V$s<{vBpv
z`9Idqb}}cEDR+XM!+%$O!~bpuMw2~({8(H2|1SClAUwGf$j|ri{1@lw_&?pvb@E9j
zQ~u7V=s#5<AwU}<{}&Y%P3C1btY46w`D;o_%K!H0nE#o9f&XJeL;r^b1^u_NF#A7!
z?)?ArmM;H4YyP7DQ)kToKV|xy{|lC_{?yRY_Q=P}eRV*9Z_tE<xF4&F3;*{gCH~Lx
z@%f(;9`QfH*YAI#pFa=>{jUeQvDMG-|AMUa|3J0>7*Ihy!>ruwuiI-Y{;w%7{y!l-
z<$r#D;s4ycqW^gXCI7P%QvUY>4P0H6_kVL$>Hog8ls~BY85ow;*6csIV9uG73+Fyw
z*VFkVCp+g~c1Gs^tn|$P8A-{1a)N`t6a@JFjCFPXULO_t1XaHi1H%J`|Nmi_0mvo_
J^8?jEF#tKb;y3^R

delta 441
zcmeyz@sDGI78e5x1A`DZ2v0N=o9MMgfB_0-&YZ~_7aQ|;G9RM>KS*rDh7G)@PMr!*
zh)<a8%V@~6ZQC~X-MhEN-@JbD-sCPu6P}G5H)`+PvH9Ae13UjsKE-Ily?6KS&dr<F
z|J$;8{bWuiQ|?V04qjZjV%PuGt9DNI1oHdmUw&IX<?{c!ITt5)0{OMuZ#+%db^U+J
z;Zu`OGMVysTs^um`_`&|?H7Ch7nc-I=4CdlUv++2;PTTApAId{_&>Ec^M7eU;s3bU
z*#FKBcK>HDTJnFv$~FJzEME41=Da2Ur_EXLcfqpNUm9B49{G5=uMP<C4LW&pq41eC
zZL{~aReoFBH|_tvU3>o@J9^~*`SYj$zkU1S|DQj<{=a|!>fiP27oQwGd>{$rOIVNq
zX+sd3@#Ml;YFlS5n7eD^_Rq(UAOC;y#EJjs&Yk}M;`zh>zkmPw_vzEehxhK?%sqVg
zu;4^PaaG3sn>L96Ibp!?+X=+)&z(E_>+ap_51&7OHtX))yQXK(oZ*^iC?fa(XgUlZ
Y0J0k<8cI%d;NoEbxd9jp4e|^O0A+XSW&i*H

diff --git a/src/win/win_media_menu.c b/src/win/win_media_menu.c
index 6340d36b4..cb3994a19 100644
--- a/src/win/win_media_menu.c
+++ b/src/win/win_media_menu.c
@@ -477,7 +477,7 @@ media_menu_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
 		break;
 
 	case IDM_MO_IMAGE_NEW:
-		NewFloppyDialogCreate(hwnd, id | 0x80, 0);	/* NewZIPDialogCreate */
+		NewFloppyDialogCreate(hwnd, id | 0x100, 0);	/* NewZIPDialogCreate */
 		break;
 
 	case IDM_MO_IMAGE_EXISTING_WP:
diff --git a/src/win/win_new_floppy.c b/src/win/win_new_floppy.c
index 33c83299f..f09d0d6f2 100644
--- a/src/win/win_new_floppy.c
+++ b/src/win/win_new_floppy.c
@@ -30,6 +30,7 @@
 #include <86box/random.h>
 #include <86box/ui.h>
 #include <86box/scsi_device.h>
+#include <86box/mo.h>
 #include <86box/zip.h>
 #include <86box/win.h>
 
@@ -173,6 +174,7 @@ create_86f(WCHAR *file_name, disk_size_t disk_size, uint8_t rpm_mode)
 
 
 static int	is_zip;
+static int	is_mo;
 
 
 static int
@@ -204,7 +206,7 @@ create_sector_image(WCHAR *file_name, disk_size_t disk_size, uint8_t is_fdi)
     fat2_offs = fat1_offs + fat_size;
     zero_bytes = fat2_offs + fat_size + root_dir_bytes;
 
-    if (!is_zip && is_fdi) {
+    if (!is_zip && !is_mo && is_fdi) {
 	empty = (unsigned char *) malloc(base);
 	memset(empty, 0, base);
 
@@ -222,7 +224,7 @@ create_sector_image(WCHAR *file_name, disk_size_t disk_size, uint8_t is_fdi)
     empty = (unsigned char *) malloc(total_size);
     memset(empty, 0x00, zero_bytes);
 
-    if (!is_zip) {
+    if (!is_zip && !is_mo) {
 	memset(empty + zero_bytes, 0xF6, total_size - zero_bytes);
 
 	empty[0x00] = 0xEB;			/* Jump to make MS-DOS happy. */
@@ -352,10 +354,21 @@ create_zip_sector_image(WCHAR *file_name, disk_size_t disk_size, uint8_t is_zdi,
 	fwrite(empty, 1, 2048, f);
 	SendMessage(h, PBM_SETPOS, (WPARAM) 1, (LPARAM) 0);
 
+	while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) {
+		TranslateMessage(&msg); 
+		DispatchMessage(&msg); 
+	}
+
 	fwrite(&empty[0x0800], 1, 2048, f);
 	free(empty);
 
 	SendMessage(h, PBM_SETPOS, (WPARAM) 2, (LPARAM) 0);
+
+	while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) {
+		TranslateMessage(&msg); 
+		DispatchMessage(&msg); 
+	}
+
 	pbar_max -= 2;
     }
 
@@ -507,6 +520,106 @@ create_zip_sector_image(WCHAR *file_name, disk_size_t disk_size, uint8_t is_zdi,
 }
 
 
+static int
+create_mo_sector_image(WCHAR *file_name, int8_t disk_size, uint8_t is_mdi, HWND hwnd)
+{
+    HWND h;
+    FILE *f;
+    const mo_type_t *dp = &mo_types[disk_size];
+    uint8_t *empty;
+    uint32_t total_size = 0;
+    uint32_t total_sectors = 0;
+    uint32_t sector_bytes = 0;
+    uint16_t base = 0x1000;
+    uint32_t pbar_max = 0;
+    uint32_t i;
+    MSG msg;
+    
+    f = plat_fopen(file_name, L"wb");
+    if (!f)
+	return 0;
+
+    sector_bytes = dp->bytes_per_sector;
+    total_sectors = dp->sectors;
+    total_size = total_sectors * sector_bytes;
+
+    pbar_max = dp->sectors >> 11;
+    if (is_mdi)
+	pbar_max += base;
+    pbar_max >>= 11;
+    pbar_max--;
+
+    h = GetDlgItem(hwnd, IDC_COMBO_RPM_MODE);
+    EnableWindow(h, FALSE);
+    ShowWindow(h, SW_HIDE);
+    h = GetDlgItem(hwnd, IDT_1751);
+    EnableWindow(h, FALSE);
+    ShowWindow(h, SW_HIDE);
+    h = GetDlgItem(hwnd, IDC_PBAR_IMG_CREATE);
+    SendMessage(h, PBM_SETRANGE32, (WPARAM) 0, (LPARAM) pbar_max);
+    SendMessage(h, PBM_SETPOS, (WPARAM) 0, (LPARAM) 0);
+    EnableWindow(h, TRUE);
+    ShowWindow(h, SW_SHOW);
+    h = GetDlgItem(hwnd, IDT_1757);
+    EnableWindow(h, TRUE);
+    ShowWindow(h, SW_SHOW);
+
+    h = GetDlgItem(hwnd, IDC_PBAR_IMG_CREATE);
+    pbar_max++;
+
+    if (is_mdi) {
+	empty = (unsigned char *) malloc(base);
+	memset(empty, 0, base);
+
+	*(uint32_t *) &(empty[0x08]) = (uint32_t) base;
+	*(uint32_t *) &(empty[0x0C]) = total_size;
+	*(uint16_t *) &(empty[0x10]) = (uint16_t) sector_bytes;
+	*(uint8_t *)  &(empty[0x14]) = (uint8_t)  25;
+	*(uint8_t *)  &(empty[0x18]) = (uint8_t)  64;
+	*(uint8_t *)  &(empty[0x1C]) = (uint8_t)  (dp->sectors / 64) / 25;
+
+	fwrite(empty, 1, 2048, f);
+	SendMessage(h, PBM_SETPOS, (WPARAM) 1, (LPARAM) 0);
+
+	while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) {
+		TranslateMessage(&msg); 
+		DispatchMessage(&msg); 
+	}
+
+	fwrite(&empty[0x0800], 1, 2048, f);
+	free(empty);
+
+	SendMessage(h, PBM_SETPOS, (WPARAM) 2, (LPARAM) 0);
+
+	while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) {
+		TranslateMessage(&msg); 
+		DispatchMessage(&msg); 
+	}
+
+	pbar_max -= 2;
+    }
+
+    empty = (unsigned char *) malloc(total_size);
+    memset(empty, 0x00, total_size);
+
+    for (i = 0; i < pbar_max; i++) {
+	fwrite(&empty[i << 11], 1, 2048, f);
+	SendMessage(h, PBM_SETPOS, (WPARAM) i + 2, (LPARAM) 0);
+
+	while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE | PM_NOYIELD)) {
+		TranslateMessage(&msg); 
+		DispatchMessage(&msg); 
+	}
+    }
+
+    free(empty);
+
+    fclose(f);
+
+    return 1;
+}
+
+
 static int	fdd_id, sb_part;
 
 static int	file_type = 0;		/* 0 = IMG, 1 = Japanese FDI, 2 = 86F */
@@ -562,7 +675,7 @@ NewFloppyDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
     uint8_t disk_size, rpm_mode;
     int ret;
     FILE *f;
-    int zip_types;
+    int zip_types, mo_types;
     wchar_t *twcs;
 
     switch (message) {
@@ -574,6 +687,11 @@ NewFloppyDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 			zip_types = zip_drives[fdd_id].is_250 ? 2 : 1;
 			for (i = 0; i < zip_types; i++)
 		                SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_5900 + i));
+		} else if (is_mo) {
+			mo_types = 10;
+			/* TODO: Proper string ID's. */
+			for (i = 0; i < mo_types; i++)
+		                SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_5902 + i));
 		} else {
 			for (i = 0; i < 12; i++)
 		                SendMessage(h, CB_ADDSTRING, 0, win_get_string(IDS_5888 + i));
@@ -606,22 +724,24 @@ NewFloppyDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 				disk_size = SendMessage(h, CB_GETCURSEL, 0, 0);
 				if (is_zip)
 					disk_size += 12;
-				if (file_type == 2) {
+				if (!is_zip && !is_mo && (file_type == 2)) {
 					h = GetDlgItem(hdlg, IDC_COMBO_RPM_MODE);
 					rpm_mode = SendMessage(h, CB_GETCURSEL, 0, 0);
 					ret = create_86f(fd_file_name, disk_sizes[disk_size], rpm_mode);
 				} else {
 					if (is_zip)
 						ret = create_zip_sector_image(fd_file_name, disk_sizes[disk_size], file_type, hdlg);
+					if (is_mo)
+						ret = create_mo_sector_image(fd_file_name, disk_size, file_type, hdlg);
 					else
 						ret = create_sector_image(fd_file_name, disk_sizes[disk_size], file_type);
 				}
 				if (ret) {
 					if (is_zip)
-						//ui_sb_mount_zip_img(fdd_id, sb_part, 0, fd_file_name);
 						zip_mount(fdd_id, fd_file_name, 0);
+					else if (is_mo)
+						mo_mount(fdd_id, fd_file_name, 0);
 					else
-						//ui_sb_mount_floppy_img(fdd_id, sb_part, 0, fd_file_name);
 						floppy_mount(fdd_id, fd_file_name, 0);
 				} else {
 					new_floppy_msgbox_header(hdlg, MBX_ERROR, (wchar_t *) IDS_4108, (wchar_t *) IDS_4115);
@@ -639,7 +759,7 @@ NewFloppyDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 						if (wcslen(wopenfilestring) && (wcslen(wopenfilestring) <= 256)) {
 							twcs = &wopenfilestring[wcslen(wopenfilestring)];
 							twcs[0] = L'.';
-							if (!is_zip && (filterindex == 3)) {
+							if (!is_zip && !is_mo && (filterindex == 3)) {
 								twcs[1] = L'8';
 								twcs[2] = L'6';
 								twcs[3] = L'f';
@@ -671,6 +791,11 @@ NewFloppyDialogProcedure(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 							file_type = 1;
 						else
 							file_type = 0;
+					} else if (is_mo) {
+						if (((wcs_len >= 4) && !wcsicmp(ext, L".MDI")))
+							file_type = 1;
+						else
+							file_type = 0;
 					} else {
 						if (((wcs_len >= 4) && !wcsicmp(ext, L".FDI")))
 							file_type = 1;
@@ -717,5 +842,10 @@ NewFloppyDialogCreate(HWND hwnd, int id, int part)
     fdd_id = id & 0x7f;
     sb_part = part;
     is_zip = !!(id & 0x80);
+    is_mo = !!(id & 0x100);
+    if (is_zip && is_mo) {
+	fatal("Attempting to create a new image dialog that is for both ZIP and MO at the same time\n");
+	return;
+    }
     DialogBox(hinstance, (LPCTSTR)DLG_NEW_FLOPPY, hwnd, NewFloppyDialogProcedure);
 }
diff --git a/src/win/win_settings.c b/src/win/win_settings.c
index f13cc4f29..ebf20dbd3 100644
--- a/src/win/win_settings.c
+++ b/src/win/win_settings.c
@@ -322,13 +322,13 @@ win_settings_init(void)
 	else if (zip_drives[i].bus_type == ZIP_BUS_SCSI)
 		scsi_tracking[zip_drives[i].scsi_device_id >> 3] |= (1 << ((zip_drives[i].scsi_device_id & 0x07) << 3));
     }
-	memcpy(temp_mo_drives, mo_drives, MO_NUM * sizeof(mo_drive_t));
-	for (i = 0; i < MO_NUM; i++) {
-	if (mo_drives[i].bus_type == MO_BUS_ATAPI)
-		ide_tracking |= (1 << (mo_drives[i].ide_channel << 3));
-	else if (mo_drives[i].bus_type == MO_BUS_SCSI)
-		scsi_tracking[mo_drives[i].scsi_device_id >> 3] |= (1 << ((mo_drives[i].scsi_device_id & 0x07) << 3));
-	}
+    memcpy(temp_mo_drives, mo_drives, MO_NUM * sizeof(mo_drive_t));
+    for (i = 0; i < MO_NUM; i++) {
+    if (mo_drives[i].bus_type == MO_BUS_ATAPI)
+	ide_tracking |= (1 << (mo_drives[i].ide_channel << 3));
+    else if (mo_drives[i].bus_type == MO_BUS_SCSI)
+	scsi_tracking[mo_drives[i].scsi_device_id >> 3] |= (1 << ((mo_drives[i].scsi_device_id & 0x07) << 3));
+    }
 
     temp_deviceconfig = 0;
 }
@@ -411,7 +411,7 @@ win_settings_changed(void)
     /* Other removable devices category */
     i = i || memcmp(cdrom, temp_cdrom, CDROM_NUM * sizeof(cdrom_t));
     i = i || memcmp(zip_drives, temp_zip_drives, ZIP_NUM * sizeof(zip_drive_t));
-	i = i || memcmp(mo_drives, temp_mo_drives, MO_NUM * sizeof(mo_drive_t));
+    i = i || memcmp(mo_drives, temp_mo_drives, MO_NUM * sizeof(mo_drive_t));
 
     i = i || !!temp_deviceconfig;
 
@@ -540,7 +540,7 @@ win_settings_save(void)
 	zip_drives[i].f = NULL;
 	zip_drives[i].priv = NULL;
     }
-	memcpy(mo_drives, temp_mo_drives, MO_NUM * sizeof(mo_drive_t));
+    memcpy(mo_drives, temp_mo_drives, MO_NUM * sizeof(mo_drive_t));
     for (i = 0; i < MO_NUM; i++) {
 	mo_drives[i].f = NULL;
 	mo_drives[i].priv = NULL;
@@ -3518,7 +3518,7 @@ win_settings_hard_disks_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lPar
 {
     HWND h = NULL;
     int old_sel = 0, b = 0, assign = 0;
-    const uint8_t hd_icons[2] = { 64, 0 };
+    const uint8_t hd_icons[2] = { 80, 0 };
 
     switch (message) {
 	case WM_INITDIALOG:
@@ -3754,7 +3754,7 @@ win_settings_cdrom_drives_recalc_list(HWND hwndList)
     WCHAR szText[256];
 
     lvI.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
-   lvI.stateMask = lvI.iSubItem = lvI.state = 0;
+    lvI.stateMask = lvI.iSubItem = lvI.state = 0;
 
     for (i = 0; i < 4; i++) {
 	fsid = combo_id_to_format_string_id(temp_cdrom[i].bus_type);
@@ -4007,6 +4007,7 @@ win_settings_mo_drives_init_columns(HWND hwndList)
     return TRUE;
 }
 
+
 static BOOL
 win_settings_zip_drives_init_columns(HWND hwndList)
 {
@@ -4150,6 +4151,7 @@ win_settings_cdrom_drives_update_item(HWND hwndList, int i)
 	return;
 }
 
+
 static void
 win_settings_mo_drives_update_item(HWND hwndList, int i)
 {
@@ -4296,7 +4298,7 @@ static void cdrom_recalc_location_controls(HWND hdlg, int assign_id)
     int i = 0;
     HWND h;
 
-    int bus = temp_cdrom[lv1_current_sel].bus_type;
+    int bus = temp_cdrom[lv2_current_sel].bus_type;
 
     for (i = IDT_1741; i < (IDT_1742 + 1); i++) {
 	h = GetDlgItem(hdlg, i);
@@ -4319,7 +4321,7 @@ static void cdrom_recalc_location_controls(HWND hdlg, int assign_id)
     } else {
 	ShowWindow(h, SW_SHOW);
 	EnableWindow(h, TRUE);
-	SendMessage(h, CB_SETCURSEL, temp_cdrom[lv1_current_sel].speed - 1, 0);
+	SendMessage(h, CB_SETCURSEL, temp_cdrom[lv2_current_sel].speed - 1, 0);
     }
 
     h = GetDlgItem(hdlg, IDT_1758);
@@ -4338,12 +4340,12 @@ static void cdrom_recalc_location_controls(HWND hdlg, int assign_id)
 		EnableWindow(h, TRUE);
 
 		if (assign_id)
-			temp_cdrom[lv1_current_sel].ide_channel = next_free_ide_channel();
+			temp_cdrom[lv2_current_sel].ide_channel = next_free_ide_channel();
 
 		h = GetDlgItem(hdlg, IDC_COMBO_CD_CHANNEL_IDE);
 		ShowWindow(h, SW_SHOW);
 		EnableWindow(h, TRUE);
-		SendMessage(h, CB_SETCURSEL, temp_cdrom[lv1_current_sel].ide_channel, 0);
+		SendMessage(h, CB_SETCURSEL, temp_cdrom[lv2_current_sel].ide_channel, 0);
 		break;
 	case CDROM_BUS_SCSI:		/* SCSI */
 		h = GetDlgItem(hdlg, IDT_1741);
@@ -4351,12 +4353,12 @@ static void cdrom_recalc_location_controls(HWND hdlg, int assign_id)
 		EnableWindow(h, TRUE);
 
 		if (assign_id)
-			next_free_scsi_id((uint8_t *) &temp_cdrom[lv1_current_sel].scsi_device_id);
+			next_free_scsi_id((uint8_t *) &temp_cdrom[lv2_current_sel].scsi_device_id);
 
 		h = GetDlgItem(hdlg, IDC_COMBO_CD_ID);
 		ShowWindow(h, SW_SHOW);
 		EnableWindow(h, TRUE);
-		SendMessage(h, CB_SETCURSEL, temp_cdrom[lv1_current_sel].scsi_device_id, 0);
+		SendMessage(h, CB_SETCURSEL, temp_cdrom[lv2_current_sel].scsi_device_id, 0);
 		break;
     }
 }
@@ -4364,15 +4366,15 @@ static void cdrom_recalc_location_controls(HWND hdlg, int assign_id)
 static void
 mo_add_locations(HWND hdlg)
 {
-	LPTSTR lptsTemp;
-	char *temp;
+    LPTSTR lptsTemp;
+    char *temp;
     HWND h;
     int i = 0;
 
-	lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
-	temp = (char*) malloc(30*sizeof(char));
+    lptsTemp = (LPTSTR) malloc(512 * sizeof(WCHAR));
+    temp = (char*) malloc(30*sizeof(char));
 
-	h = GetDlgItem(hdlg, IDC_COMBO_MO_BUS);
+    h = GetDlgItem(hdlg, IDC_COMBO_MO_BUS);
     for (i = MO_BUS_DISABLED; i <= MO_BUS_SCSI; i++) {
 	if ((i == MO_BUS_DISABLED) || (i >= MO_BUS_ATAPI))
 		SendMessage(h, CB_ADDSTRING, 0, win_get_string(combo_id_to_string_id(i)));
@@ -4390,21 +4392,21 @@ mo_add_locations(HWND hdlg)
 	SendMessage(h, CB_ADDSTRING, 0, (LPARAM) lptsTemp);
     }
 
-	h = GetDlgItem(hdlg, IDC_COMBO_MO_TYPE);
-	for (int i=0; i < KNOWN_MO_DRIVE_TYPES; i++) {
-		memset(temp, 0, 30);
-		memcpy(temp, mo_drive_types[i].vendor, 8);
-		temp[strlen(temp)] = ' ';
-		memcpy(temp + strlen(temp), mo_drive_types[i].model, 16);
-		temp[strlen(temp)] = ' ';
-		memcpy(temp + strlen(temp), mo_drive_types[i].revision, 4);
+    h = GetDlgItem(hdlg, IDC_COMBO_MO_TYPE);
+    for (int i=0; i < KNOWN_MO_DRIVE_TYPES; i++) {
+	memset(temp, 0, 30);
+	memcpy(temp, mo_drive_types[i].vendor, 8);
+	temp[strlen(temp)] = ' ';
+	memcpy(temp + strlen(temp), mo_drive_types[i].model, 16);
+	temp[strlen(temp)] = ' ';
+	memcpy(temp + strlen(temp), mo_drive_types[i].revision, 4);
 
-		mbstowcs(lptsTemp, temp, strlen(temp)+1);
-		SendMessage(h, CB_ADDSTRING, 0, (LPARAM) lptsTemp);
-	}
+	mbstowcs(lptsTemp, temp, strlen(temp)+1);
+	SendMessage(h, CB_ADDSTRING, 0, (LPARAM) lptsTemp);
+    }
 
-	free(temp);
-	free(lptsTemp);
+    free(temp);
+    free(lptsTemp);
 }
 
 
@@ -4639,12 +4641,14 @@ static LRESULT CALLBACK
 #else
 static BOOL CALLBACK
 #endif
-win_settings_floppy_drives_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
+win_settings_floppy_and_cdrom_drives_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     HWND h = NULL;
-    int i = 0, old_sel = 0;
+    int i = 0, old_sel = 0, b = 0, assign = 0;
+    uint32_t b2 = 0;
     WCHAR szText[256];
     const uint8_t fd_icons[15] = { 248, 16, 16, 16, 16, 16, 16, 24, 24, 24, 24, 24, 24, 24, 0 };
+    const uint8_t cd_icons[3] = { 249, 32, 0 };
 
     switch (message) {
 	case WM_INITDIALOG:
@@ -4673,6 +4677,33 @@ win_settings_floppy_drives_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM l
 		h = GetDlgItem(hdlg, IDC_CHECKBPB);
 		SendMessage(h, BM_SETCHECK, temp_fdd_check_bpb[lv1_current_sel], 0);
 
+		lv2_current_sel = 0;
+		h = GetDlgItem(hdlg, IDC_LIST_CDROM_DRIVES);
+		win_settings_cdrom_drives_init_columns(h);
+		image_list_init(h, (const uint8_t *) cd_icons);
+		win_settings_cdrom_drives_recalc_list(h);
+		ListView_SetItemState(h, 0, LVIS_FOCUSED | LVIS_SELECTED, 0x000F);
+		cdrom_add_locations(hdlg);
+
+		h = GetDlgItem(hdlg, IDC_COMBO_CD_BUS);
+
+		switch (temp_cdrom[lv2_current_sel].bus_type) {
+			case CDROM_BUS_DISABLED:
+			default:
+				b = 0;
+				break;
+			case CDROM_BUS_ATAPI:
+				b = 1;
+				break;
+			case CDROM_BUS_SCSI:
+				b = 2;
+				break;
+		}
+
+		SendMessage(h, CB_SETCURSEL, b, 0);
+
+		cdrom_recalc_location_controls(hdlg, 0);
+
 		ignore_change = 0;
 		return TRUE;
 
@@ -4700,6 +4731,39 @@ win_settings_floppy_drives_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM l
 			h = GetDlgItem(hdlg, IDC_CHECKBPB);
 			SendMessage(h, BM_SETCHECK, temp_fdd_check_bpb[lv1_current_sel], 0);
 			ignore_change = 0;
+		} else if ((((LPNMHDR)lParam)->code == LVN_ITEMCHANGED) && (((LPNMHDR)lParam)->idFrom == IDC_LIST_CDROM_DRIVES)) {
+			old_sel = lv2_current_sel;
+			lv2_current_sel = get_selected_drive(hdlg, IDC_LIST_CDROM_DRIVES);
+			if (lv2_current_sel == old_sel)
+				return FALSE;
+			else if (lv2_current_sel == -1) {
+				ignore_change = 1;
+				lv2_current_sel = old_sel;
+				ListView_SetItemState(h, lv2_current_sel, LVIS_FOCUSED | LVIS_SELECTED, 0x000F);
+				ignore_change = 0;
+				return FALSE;
+			}
+			ignore_change = 1;
+
+			h = GetDlgItem(hdlg, IDC_COMBO_CD_BUS);
+
+			switch (temp_cdrom[lv2_current_sel].bus_type) {
+				case CDROM_BUS_DISABLED:
+				default:
+					b = 0;
+					break;
+				case CDROM_BUS_ATAPI:
+					b = 1;
+					break;
+				case CDROM_BUS_SCSI:
+					b = 2;
+					break;
+			}
+
+			SendMessage(h, CB_SETCURSEL, b, 0);
+
+			mo_recalc_location_controls(hdlg, 0);
+			ignore_change = 0;
 		}
 		break;
 
@@ -4729,109 +4793,7 @@ win_settings_floppy_drives_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM l
 				h = GetDlgItem(hdlg, IDC_LIST_FLOPPY_DRIVES);
 				win_settings_floppy_drives_update_item(h, lv1_current_sel);
 				break;
-		}
-		ignore_change = 0;
 
-	default:
-		return FALSE;
-    }
-
-    return FALSE;
-}
-
-
-#if defined(__amd64__) || defined(__aarch64__)
-static LRESULT CALLBACK
-#else
-static BOOL CALLBACK
-#endif
-win_settings_cdrom_drives_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
-{
-    HWND h = NULL;
-    int old_sel = 0, b = 0, assign = 0;
-    uint32_t b2 = 0;
-    const uint8_t cd_icons[3] = { 249, 32, 0 };
-
-    switch (message) {
-	case WM_INITDIALOG:
-		ignore_change = 1;
-
-		lv1_current_sel = 0;
-		h = GetDlgItem(hdlg, IDC_LIST_CDROM_DRIVES);
-		win_settings_cdrom_drives_init_columns(h);
-		image_list_init(h, (const uint8_t *) cd_icons);
-		win_settings_cdrom_drives_recalc_list(h);
-		ListView_SetItemState(h, 0, LVIS_FOCUSED | LVIS_SELECTED, 0x000F);
-		cdrom_add_locations(hdlg);
-
-		h = GetDlgItem(hdlg, IDC_COMBO_CD_BUS);
-
-		switch (temp_cdrom[lv1_current_sel].bus_type) {
-			case CDROM_BUS_DISABLED:
-			default:
-				b = 0;
-				break;
-			case CDROM_BUS_ATAPI:
-				b = 1;
-				break;
-			case CDROM_BUS_SCSI:
-				b = 2;
-				break;
-		}
-
-		SendMessage(h, CB_SETCURSEL, b, 0);
-
-		cdrom_recalc_location_controls(hdlg, 0);
-
-		ignore_change = 0;
-		return TRUE;
-
-	case WM_NOTIFY:
-		if (ignore_change)
-			return FALSE;
-
-		if ((((LPNMHDR)lParam)->code == LVN_ITEMCHANGED) && (((LPNMHDR)lParam)->idFrom == IDC_LIST_CDROM_DRIVES)) {
-			old_sel = lv1_current_sel;
-			lv1_current_sel = get_selected_drive(hdlg, IDC_LIST_CDROM_DRIVES);
-			if (lv1_current_sel == old_sel)
-				return FALSE;
-			else if (lv1_current_sel == -1) {
-				ignore_change = 1;
-				lv1_current_sel = old_sel;
-				ListView_SetItemState(h, lv1_current_sel, LVIS_FOCUSED | LVIS_SELECTED, 0x000F);
-				ignore_change = 0;
-				return FALSE;
-			}
-			ignore_change = 1;
-
-			h = GetDlgItem(hdlg, IDC_COMBO_CD_BUS);
-
-			switch (temp_cdrom[lv1_current_sel].bus_type) {
-				case CDROM_BUS_DISABLED:
-				default:
-					b = 0;
-					break;
-				case CDROM_BUS_ATAPI:
-					b = 1;
-					break;
-				case CDROM_BUS_SCSI:
-					b = 2;
-					break;
-			}
-
-			SendMessage(h, CB_SETCURSEL, b, 0);
-
-			mo_recalc_location_controls(hdlg, 0);
-			ignore_change = 0;
-		}
-		break;
-
-	case WM_COMMAND:
-		if (ignore_change)
-			return FALSE;
-
-		ignore_change = 1;
-		switch (LOWORD(wParam)) {
 			case IDC_COMBO_CD_BUS:
 				h = GetDlgItem(hdlg, IDC_COMBO_CD_BUS);
 				b = SendMessage(h, CB_GETCURSEL, 0, 0);
@@ -4846,42 +4808,42 @@ win_settings_cdrom_drives_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lP
 						b2 = CDROM_BUS_SCSI;
 						break;
 				}
-				if (b2 == temp_cdrom[lv1_current_sel].bus_type)
+				if (b2 == temp_cdrom[lv2_current_sel].bus_type)
 					break;
-				cdrom_untrack(lv1_current_sel);
-				assign = (temp_cdrom[lv1_current_sel].bus_type == b2) ? 0 : 1;
-				if (temp_cdrom[lv1_current_sel].bus_type == CDROM_BUS_DISABLED)
-					temp_cdrom[lv1_current_sel].speed = 8;
-				temp_cdrom[lv1_current_sel].bus_type = b2;
+				cdrom_untrack(lv2_current_sel);
+				assign = (temp_cdrom[lv2_current_sel].bus_type == b2) ? 0 : 1;
+				if (temp_cdrom[lv2_current_sel].bus_type == CDROM_BUS_DISABLED)
+					temp_cdrom[lv2_current_sel].speed = 8;
+				temp_cdrom[lv2_current_sel].bus_type = b2;
 				cdrom_recalc_location_controls(hdlg, assign);
-				cdrom_track(lv1_current_sel);
+				cdrom_track(lv2_current_sel);
 				h = GetDlgItem(hdlg, IDC_LIST_CDROM_DRIVES);
-				win_settings_cdrom_drives_update_item(h, lv1_current_sel);
+				win_settings_cdrom_drives_update_item(h, lv2_current_sel);
 				break;
 
 			case IDC_COMBO_CD_ID:
 				h = GetDlgItem(hdlg, IDC_COMBO_CD_ID);
-				cdrom_untrack(lv1_current_sel);
-				temp_cdrom[lv1_current_sel].scsi_device_id = SendMessage(h, CB_GETCURSEL, 0, 0);
-				cdrom_track(lv1_current_sel);
+				cdrom_untrack(lv2_current_sel);
+				temp_cdrom[lv2_current_sel].scsi_device_id = SendMessage(h, CB_GETCURSEL, 0, 0);
+				cdrom_track(lv2_current_sel);
 				h = GetDlgItem(hdlg, IDC_LIST_CDROM_DRIVES);
-				win_settings_cdrom_drives_update_item(h, lv1_current_sel);
+				win_settings_cdrom_drives_update_item(h, lv2_current_sel);
 				break;
 
 			case IDC_COMBO_CD_CHANNEL_IDE:
 				h = GetDlgItem(hdlg, IDC_COMBO_CD_CHANNEL_IDE);
-				cdrom_untrack(lv1_current_sel);
-				temp_cdrom[lv1_current_sel].ide_channel = SendMessage(h, CB_GETCURSEL, 0, 0);
-				cdrom_track(lv1_current_sel);
+				cdrom_untrack(lv2_current_sel);
+				temp_cdrom[lv2_current_sel].ide_channel = SendMessage(h, CB_GETCURSEL, 0, 0);
+				cdrom_track(lv2_current_sel);
 				h = GetDlgItem(hdlg, IDC_LIST_CDROM_DRIVES);
-				win_settings_cdrom_drives_update_item(h, lv1_current_sel);
+				win_settings_cdrom_drives_update_item(h, lv2_current_sel);
 				break;
 
 			case IDC_COMBO_CD_SPEED:
 				h = GetDlgItem(hdlg, IDC_COMBO_CD_SPEED);
-				temp_cdrom[lv1_current_sel].speed = SendMessage(h, CB_GETCURSEL, 0, 0) + 1;
+				temp_cdrom[lv2_current_sel].speed = SendMessage(h, CB_GETCURSEL, 0, 0) + 1;
 				h = GetDlgItem(hdlg, IDC_LIST_CDROM_DRIVES);
-				win_settings_cdrom_drives_update_item(h, lv1_current_sel);
+				win_settings_cdrom_drives_update_item(h, lv2_current_sel);
 				break;
 		}
 		ignore_change = 0;
@@ -4893,6 +4855,7 @@ win_settings_cdrom_drives_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lP
     return FALSE;
 }
 
+
 #if defined(__amd64__) || defined(__aarch64__)
 static LRESULT CALLBACK
 #else
@@ -4903,7 +4866,7 @@ win_settings_other_removable_devices_proc(HWND hdlg, UINT message, WPARAM wParam
     HWND h = NULL;
     int old_sel = 0, b = 0, assign = 0;
     uint32_t b2 = 0;
-	const uint8_t mo_icons[3] = { 251, 56, 0 };
+    const uint8_t mo_icons[3] = { 251, 56, 0 };
     const uint8_t zip_icons[3] = { 250, 48, 0 };
 
     switch (message) {
@@ -5195,11 +5158,8 @@ void win_settings_show_child(HWND hwndParent, DWORD child_id)
 	case SETTINGS_PAGE_HARD_DISKS:
 		hwndChildDialog = CreateDialog(hinstance, (LPCWSTR)DLG_CFG_HARD_DISKS, hwndParent, win_settings_hard_disks_proc);
 		break;
-	case SETTINGS_PAGE_FLOPPY_DRIVES:
-		hwndChildDialog = CreateDialog(hinstance, (LPCWSTR)DLG_CFG_FLOPPY_DRIVES, hwndParent, win_settings_floppy_drives_proc);
-		break;
-	case SETTINGS_PAGE_CDROM_DRIVES:
-		hwndChildDialog = CreateDialog(hinstance, (LPCWSTR)DLG_CFG_CDROM_DRIVES, hwndParent, win_settings_cdrom_drives_proc);
+	case SETTINGS_PAGE_FLOPPY_AND_CDROM_DRIVES:
+		hwndChildDialog = CreateDialog(hinstance, (LPCWSTR)DLG_CFG_FLOPPY_AND_CDROM_DRIVES, hwndParent, win_settings_floppy_and_cdrom_drives_proc);
 		break;
 	case SETTINGS_PAGE_OTHER_REMOVABLE_DEVICES:
 		hwndChildDialog = CreateDialog(hinstance, (LPCWSTR)DLG_CFG_OTHER_REMOVABLE_DEVICES, hwndParent, win_settings_other_removable_devices_proc);
@@ -5222,13 +5182,8 @@ win_settings_main_insert_categories(HWND hwndList)
     lvI.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_STATE;
     lvI.stateMask = lvI.iSubItem = lvI.state = 0;
 
-    for (i = 0; i < 11; i++) {
-		if (i <= 8)
-			lvI.pszText = plat_get_string(IDS_2065+i);
-		else if (i == 9)
-			lvI.pszText = plat_get_string(IDS_2139);
-		else if (i == 10)
-			lvI.pszText = plat_get_string(IDS_2074);
+    for (i = 0; i < 10; i++) {
+		lvI.pszText = plat_get_string(IDS_2065+i);
 		lvI.iItem = i;
 		lvI.iImage = i;
 
@@ -5275,7 +5230,7 @@ win_settings_main_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
     HWND h = NULL;
     int category, i = 0, j = 0;
-    const uint8_t cat_icons[12] = { 240, 241, 242, 243, 80, 244, 245, 64, 246, 32, 247, 0 };
+    const uint8_t cat_icons[12] = { 240, 241, 242, 243, 96, 244, 245, 80, 246, 247, 0 };
 
     hwndParentDialog = hdlg;
 
diff --git a/src/win/win_stbar.c b/src/win/win_stbar.c
index afd47a384..67add30f1 100644
--- a/src/win/win_stbar.c
+++ b/src/win/win_stbar.c
@@ -259,6 +259,7 @@ StatusBarCreateZIPTip(int part)
     wcscpy(sbTips[part], tempTip);
 }
 
+
 static void
 StatusBarCreateMOTip(int part)
 {
@@ -287,6 +288,7 @@ StatusBarCreateMOTip(int part)
     wcscpy(sbTips[part], tempTip);
 }
 
+
 static void
 StatusBarCreateDiskTip(int part)
 {
@@ -677,12 +679,12 @@ ui_sb_update_panes(void)
 			break;
 
 		case SB_HDD:		/* Hard disk */
-			sb_part_icons[i] = 64;
+			sb_part_icons[i] = 80;
 			StatusBarCreateDiskTip(i);
 			break;
 
 		case SB_NETWORK:	/* Network */
-			sb_part_icons[i] = 80;
+			sb_part_icons[i] = 96;
 			StatusBarCreateNetworkTip(i);
 			break;
 
@@ -806,12 +808,14 @@ StatusBarCreate(HWND hwndParent, uintptr_t idStatus, HINSTANCE hInst)
 	hIcon[i] = LoadIconEx((PCTSTR) (uintptr_t) i);
     for (i = 48; i < 50; i++)
 	hIcon[i] = LoadIconEx((PCTSTR) (uintptr_t) i);
-	for (i = 56; i < 58; i++)
+    for (i = 56; i < 58; i++)
 	hIcon[i] = LoadIconEx((PCTSTR) (uintptr_t) i);
     for (i = 64; i < 66; i++)
 	hIcon[i] = LoadIconEx((PCTSTR) (uintptr_t) i);
     for (i = 80; i < 82; i++)
 	hIcon[i] = LoadIconEx((PCTSTR) (uintptr_t) i);
+    for (i = 96; i < 98; i++)
+	hIcon[i] = LoadIconEx((PCTSTR) (uintptr_t) i);
     for (i = 144; i < 146; i++)
 	hIcon[i] = LoadIconEx((PCTSTR) (uintptr_t) i);
     for (i = 152; i < 154; i++)
@@ -820,7 +824,9 @@ StatusBarCreate(HWND hwndParent, uintptr_t idStatus, HINSTANCE hInst)
 	hIcon[i] = LoadIconEx((PCTSTR) (uintptr_t) i);
     for (i = 176; i < 178; i++)
 	hIcon[i] = LoadIconEx((PCTSTR) (uintptr_t) i);
-	for (i = 184; i < 186; i++)
+    for (i = 184; i < 186; i++)
+	hIcon[i] = LoadIconEx((PCTSTR) (uintptr_t) i);
+    for (i = 192; i < 194; i++)
 	hIcon[i] = LoadIconEx((PCTSTR) (uintptr_t) i);
     for (i = 243; i < 244; i++)
 	hIcon[i] = LoadIconEx((PCTSTR) (uintptr_t) i);