diff --git a/reactos/subsystems/mvdm/ntvdm/ntvdm.rc b/reactos/subsystems/mvdm/ntvdm/ntvdm.rc
index a39a6e34085..12dcfd0fbd5 100644
--- a/reactos/subsystems/mvdm/ntvdm/ntvdm.rc
+++ b/reactos/subsystems/mvdm/ntvdm/ntvdm.rc
@@ -12,12 +12,23 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #include <reactos/version.rc>
 
 /* Icons */
-1  ICON "res/ntvdm.ico"
-// 2  ICON "res/ntvdm_2.ico" // TODO: Swyter's icon, see CORE-10340
-3  ICON "res/pc_xt.ico"
-4  ICON "res/pc_at.ico"
-5  ICON "res/ros_dos.ico"
-6  ICON "res/vdm_dos.ico"
+
+/* Icons for the PC-AT (most recent IBM-PC version) */
+1  ICON "res/ntvdm_pc_at_grey.ico"
+2  ICON "res/ntvdm_pc_at_brown.ico"
+3  ICON "res/ntvdm_pc_at_flat.ico"
+4  ICON "res/ntvdm_pc_at_3d.ico"
+5  ICON "res/pc_at.ico"
+/* Icons for the PC-XT (older IBM-PC version) */
+6  ICON "res/ntvdm_pc_xt_grey.ico"
+7  ICON "res/ntvdm_pc_xt_brown.ico"
+8  ICON "res/ntvdm_pc_xt_flat.ico"
+9  ICON "res/ntvdm_pc_xt_3d.ico"
+10 ICON "res/pc_xt.ico"
+/* Embedded products */
+11 ICON "res/ros_dos.ico"
+12 ICON "res/vdm_dos.ico"
+
 
 /* UTF-8 */
 #pragma code_page(65001)
diff --git a/reactos/subsystems/mvdm/ntvdm/res/README.txt b/reactos/subsystems/mvdm/ntvdm/res/README.txt
index 9853769869d..6a550548842 100644
--- a/reactos/subsystems/mvdm/ntvdm/res/README.txt
+++ b/reactos/subsystems/mvdm/ntvdm/res/README.txt
@@ -1,12 +1,28 @@
-
-ntvdm.ico
----------
-(C) 2013 Hermès Bélusca-Maïto.
+
+ntvdm_pc_at_flat.ico and ntvdm_pc_xt_flat.ico
+---------------------------------------------
+(C) 2013, 2016 Hermès Bélusca-Maïto.
 Distributed under CC-BY-SA 4.0 International License Terms.
 
+ntvdm_pc_at_brown.ico and ntvdm_pc_xt_brown.ico;
+ntvdm_pc_at_grey.ico  and ntvdm_pc_xt_grey.ico
+------------------------------------------------
+Tango-style versions of ntvdm_pc_at_flat.ico and ntvdm_pc_xt_flat.ico.
+(C) 2013, 2016 Hermès Bélusca-Maïto.
+(C) 2015, 2016 Ismael Ferreras Morezuelas.
+Distributed under CC-BY-SA 4.0 International License Terms.
+
+ntvdm_pc_at_3d.ico and ntvdm_pc_xt_3d.ico
+-----------------------------------------
+From pifmgr.dll icon-set.
+(C) 2016 DSP2003.
+http://dsp2003.deviantart.com | http://wks.arai-kibou.ru
+Distributed under CC-BY-SA 4.0 International License Terms.
+Adapted for PC-AT and XT style by Hermès Bélusca-Maïto.
+
 pc_at.ico and pc_xt.ico
 -----------------------
-Tango-style PC icons
+Tango-style PC icons.
 (C) 2015 Henry Tang Ih and Jared Smudde.
 Adapted for PC-AT and XT style by Hermès Bélusca-Maïto.
 16-colour conversion by Hermès Bélusca-Maïto.
diff --git a/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_3d.ico b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_3d.ico
new file mode 100644
index 00000000000..de199310880
Binary files /dev/null and b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_3d.ico differ
diff --git a/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_brown.ico b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_brown.ico
new file mode 100644
index 00000000000..52ac3204ab0
Binary files /dev/null and b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_brown.ico differ
diff --git a/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_flat.ico
similarity index 60%
rename from reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico
rename to reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_flat.ico
index 161c1b07a9a..753ff96abb9 100644
Binary files a/reactos/subsystems/mvdm/ntvdm/res/ntvdm.ico and b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_flat.ico differ
diff --git a/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_grey.ico b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_grey.ico
new file mode 100644
index 00000000000..e25ba9b9797
Binary files /dev/null and b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_at_grey.ico differ
diff --git a/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_3d.ico b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_3d.ico
new file mode 100644
index 00000000000..6d45060a49f
Binary files /dev/null and b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_3d.ico differ
diff --git a/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_brown.ico b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_brown.ico
new file mode 100644
index 00000000000..4f74b330bc2
Binary files /dev/null and b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_brown.ico differ
diff --git a/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_flat.ico b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_flat.ico
new file mode 100644
index 00000000000..0d306bc67a6
Binary files /dev/null and b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_flat.ico differ
diff --git a/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_grey.ico b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_grey.ico
new file mode 100644
index 00000000000..73dc6bc24aa
Binary files /dev/null and b/reactos/subsystems/mvdm/ntvdm/res/ntvdm_pc_xt_grey.ico differ
diff --git a/reactos/subsystems/mvdm/ntvdm/res/pc_at.ico b/reactos/subsystems/mvdm/ntvdm/res/pc_at.ico
index ee4a274067a..3238b874765 100644
Binary files a/reactos/subsystems/mvdm/ntvdm/res/pc_at.ico and b/reactos/subsystems/mvdm/ntvdm/res/pc_at.ico differ
diff --git a/reactos/subsystems/mvdm/ntvdm/res/pc_xt.ico b/reactos/subsystems/mvdm/ntvdm/res/pc_xt.ico
index a9c7a1c129f..38d2ad793b1 100644
Binary files a/reactos/subsystems/mvdm/ntvdm/res/pc_xt.ico and b/reactos/subsystems/mvdm/ntvdm/res/pc_xt.ico differ
diff --git a/reactos/subsystems/mvdm/pifmgr/res/13.ico b/reactos/subsystems/mvdm/pifmgr/res/13.ico
index 2cd529d6f4f..de199310880 100644
Binary files a/reactos/subsystems/mvdm/pifmgr/res/13.ico and b/reactos/subsystems/mvdm/pifmgr/res/13.ico differ