diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h
index 430630e2d28..2c9af224560 100644
--- a/base/setup/lib/muifonts.h
+++ b/base/setup/lib/muifonts.h
@@ -17,8 +17,7 @@ MUI_SUBFONT LatinFonts[] =
     { L"Fixedsys",               L"Fixedsys Excelsior 3.01-L2" },
     { L"Helv",                   L"MS Sans Serif" },
     { L"Helvetica",              L"Arial" },
-    { L"MS Sans Serif",          L"Tahoma" },
-    { L"MS Shell Dlg",           L"Tahoma" },
+    { L"MS Shell Dlg",           L"Microsoft Sans Serif" },
     { L"MS Shell Dlg 2",         L"Tahoma" },
     { L"Segoe UI Symbol",        L"Arial" },
     { L"System",                 L"FreeSans" },
@@ -49,8 +48,7 @@ MUI_SUBFONT CyrillicFonts[] =
     { L"Fixedsys",               L"Fixedsys Excelsior 3.01-L2" },
     { L"Helv",                   L"MS Sans Serif" },
     { L"Helvetica",              L"Arial" },
-    { L"MS Sans Serif",          L"Tahoma" },
-    { L"MS Shell Dlg",           L"Tahoma" },
+    { L"MS Shell Dlg",           L"Microsoft Sans Serif" },
     { L"MS Shell Dlg 2",         L"Tahoma" },
     { L"Segoe UI Symbol",        L"Arial" },
     { L"System",                 L"FreeSans" },
@@ -81,8 +79,7 @@ MUI_SUBFONT GreekFonts[] =
     { L"Fixedsys",               L"Fixedsys Excelsior 3.01-L2" },
     { L"Helv",                   L"MS Sans Serif" },
     { L"Helvetica",              L"Arial" },
-    { L"MS Sans Serif",          L"Tahoma" },
-    { L"MS Shell Dlg",           L"Tahoma" },
+    { L"MS Shell Dlg",           L"Microsoft Sans Serif" },
     { L"MS Shell Dlg 2",         L"Tahoma" },
     { L"Segoe UI Symbol",        L"Arial" },
     { L"System",                 L"FreeSans" },
@@ -113,8 +110,7 @@ MUI_SUBFONT HebrewFonts[] =
     { L"Fixedsys",               L"Fixedsys Excelsior 3.01-L2" },
     { L"Helv",                   L"MS Sans Serif" },
     { L"Helvetica",              L"Arial" },
-    { L"MS Sans Serif",          L"Tahoma" },
-    { L"MS Shell Dlg",           L"Tahoma" },
+    { L"MS Shell Dlg",           L"Microsoft Sans Serif" },
     { L"MS Shell Dlg 2",         L"Tahoma" },
     { L"Segoe UI Symbol",        L"Arial" },
     { L"System",                 L"FreeSans" },
diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf
index 9c8abdf2d1e..4f2551db070 100644
--- a/boot/bootdata/livecd.inf
+++ b/boot/bootdata/livecd.inf
@@ -51,8 +51,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Microsoft Sans Serif"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console"
diff --git a/media/fonts/CMakeLists.txt b/media/fonts/CMakeLists.txt
index 1907488fc39..5bab6513a16 100644
--- a/media/fonts/CMakeLists.txt
+++ b/media/fonts/CMakeLists.txt
@@ -34,14 +34,14 @@ list(APPEND FONT_FILES
     SourceSansPro-Bold.ttf
     SourceSansPro-BoldIt.ttf
     SourceSansPro-It.ttf
-    #ssee874.fon # to be added (CORE-16165 and CORE-16166)
-    #ssee1255.fon # to be added (CORE-16165 and CORE-16166)
-    #ssee1256.fon # to be added (CORE-16165 and CORE-16166)
-    #ssee1257.fon # to be added (CORE-16165 and CORE-16166)
-    #sserife.fon # to be added (CORE-16165 and CORE-16166)
-    #sserifeg.fon # to be added (CORE-16165 and CORE-16166)
-    #sserifer.fon # to be added (CORE-16165 and CORE-16166)
-    #sserifet.fon # to be added (CORE-16165 and CORE-16166)
+    ssee874.fon # to be added (CORE-16165 and CORE-16166)
+    ssee1255.fon # to be added (CORE-16165 and CORE-16166)
+    ssee1256.fon # to be added (CORE-16165 and CORE-16166)
+    ssee1257.fon # to be added (CORE-16165 and CORE-16166)
+    sserife.fon # to be added (CORE-16165 and CORE-16166)
+    sserifeg.fon # to be added (CORE-16165 and CORE-16166)
+    sserifer.fon # to be added (CORE-16165 and CORE-16166)
+    sserifet.fon # to be added (CORE-16165 and CORE-16166)
     symbol.ttf
     tahoma.ttf
     tahomabd.ttf
@@ -58,7 +58,7 @@ list(APPEND FONT_FILES
     verdanaz.ttf
     verdanai.ttf
     verdana.ttf
-    #vgaoem.fon # to be added (CORE-17327)
+    vgaoem.fon # to be added (CORE-17327)
     wingding.ttf)
 
 foreach(item ${FONT_FILES})
diff --git a/media/inf/font.inf b/media/inf/font.inf
index 817e394fe79..39c4288d437 100644
--- a/media/inf/font.inf
+++ b/media/inf/font.inf
@@ -28,8 +28,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Microsoft Sans Serif"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console"
@@ -41,8 +40,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Microsoft Sans Serif"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console"
@@ -54,8 +52,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Microsoft Sans Serif"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Lucida Console"
@@ -67,8 +64,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"MS Sans Serif"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Microsoft Sans Serif"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Segoe UI Symbol",0x00000000,"Arial"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Terminal",0x00000000,"Courier New"
diff --git a/win32ss/gdi/ntgdi/text.c b/win32ss/gdi/ntgdi/text.c
index 3fe1ceec466..7746673ae75 100644
--- a/win32ss/gdi/ntgdi/text.c
+++ b/win32ss/gdi/ntgdi/text.c
@@ -44,8 +44,8 @@ IntTMWFixUp(
     DPRINT("Font Facename is '%S'.\n", lf.lfFaceName);
     if ((_wcsicmp(lf.lfFaceName, L"Courier") == 0) ||
         (_wcsicmp(lf.lfFaceName, L"FixedSys") == 0) ||
-        (_wcsicmp(lf.lfFaceName, L"Helv") == 0) ||
-        (_wcsicmp(lf.lfFaceName, L"MS Sans Serif") == 0) ||
+        //(_wcsicmp(lf.lfFaceName, L"Helv") == 0) || // Added
+        //(_wcsicmp(lf.lfFaceName, L"MS Sans Serif") == 0) || // Added
         (_wcsicmp(lf.lfFaceName, L"MS Serif") == 0) ||
         (_wcsicmp(lf.lfFaceName, L"System") == 0) ||
         (_wcsicmp(lf.lfFaceName, L"Terminal") == 0) ||