diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h
index 31846a47170..abf76017c9d 100644
--- a/base/setup/lib/muifonts.h
+++ b/base/setup/lib/muifonts.h
@@ -16,7 +16,7 @@ MUI_SUBFONT LatinFonts[] =
     { L"Courier New TUR,162",    L"Courier New,162" },
     { L"Fixedsys",               L"Fixedsys Excelsior 3.01-L2" },
     { L"Helv",                   L"Tahoma" },
-    { L"Helvetica",              L"Liberation Sans" },
+    { L"Helvetica",              L"Arial" },
     { L"MS Sans Serif",          L"Tahoma" },
     { L"MS Shell Dlg",           L"Tahoma" },
     { L"MS Shell Dlg 2",         L"Tahoma" },
@@ -48,7 +48,7 @@ MUI_SUBFONT CyrillicFonts[] =
     { L"Courier New TUR,162",    L"Courier New,162" },
     { L"Fixedsys",               L"Fixedsys Excelsior 3.01-L2" },
     { L"Helv",                   L"Tahoma" },
-    { L"Helvetica",              L"Liberation Sans" },
+    { L"Helvetica",              L"Arial" },
     { L"MS Sans Serif",          L"Tahoma" },
     { L"MS Shell Dlg",           L"Tahoma" },
     { L"MS Shell Dlg 2",         L"Tahoma" },
@@ -80,7 +80,7 @@ MUI_SUBFONT GreekFonts[] =
     { L"Courier New TUR,162",    L"Courier New,162" },
     { L"Fixedsys",               L"Fixedsys Excelsior 3.01-L2" },
     { L"Helv",                   L"DejaVu Sans" },
-    { L"Helvetica",              L"Liberation Sans" },
+    { L"Helvetica",              L"Arial" },
     { L"MS Sans Serif",          L"DejaVu Sans" },
     { L"MS Shell Dlg",           L"DejaVu Sans" },
     { L"MS Shell Dlg 2",         L"DejaVu Sans" },
@@ -153,7 +153,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] =
     { L"Fixedsys",               L"Fixedsys Excelsior 3.01-L2" },
     { L"Franklin Gothic Medium", L"Droid Sans Fallback" },
     { L"Helv",                   L"Droid Sans Fallback" },
-    { L"Helvetica",              L"Liberation Sans" },
+    { L"Helvetica",              L"Arial" },
     { L"MS Sans Serif",          L"Droid Sans Fallback" },
     { L"MS Shell Dlg",           L"Droid Sans Fallback" },
     { L"MS Shell Dlg 2",         L"Droid Sans Fallback" },
@@ -206,7 +206,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] =
     { L"Fixedsys",        L"Fixedsys Excelsior 3.01-L2" },
     { L"Franklin Gothic Medium", L"Droid Sans Fallback" },
     { L"Helv",            L"Droid Sans Fallback" },
-    { L"Helvetica",       L"Liberation Sans" },
+    { L"Helvetica",       L"Arial" },
     { L"MS Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Shell Dlg",    L"Droid Sans Fallback" },
     { L"MS Shell Dlg 2",  L"Droid Sans Fallback" },
@@ -255,7 +255,7 @@ MUI_SUBFONT JapaneseFonts[] =
     { L"Fixedsys",        L"Fixedsys Excelsior 3.01-L2" },
     { L"Franklin Gothic Medium", L"Droid Sans Fallback" },
     { L"Helv",            L"Droid Sans Fallback" },
-    { L"Helvetica",       L"Liberation Sans" },
+    { L"Helvetica",       L"Arial" },
     { L"MS Gothic",       L"Droid Sans Fallback" },
     { L"MS Mincho",       L"Droid Sans Fallback" },
     { L"MS PGothic",      L"Droid Sans Fallback" },
@@ -313,7 +313,7 @@ MUI_SUBFONT KoreanFonts[] =
     { L"Gungsuh",         L"Droid Sans Fallback" },
     { L"GungsuhChe",      L"Droid Sans Fallback" },
     { L"Helv",            L"Droid Sans Fallback" },
-    { L"Helvetica",       L"Liberation Sans" },
+    { L"Helvetica",       L"Arial" },
     { L"MS Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Shell Dlg",    L"Droid Sans Fallback" },
     { L"MS Shell Dlg 2",  L"Droid Sans Fallback" },
@@ -392,7 +392,7 @@ MUI_SUBFONT HindiFonts[] =
     { L"Courier New TUR,162",    L"Courier New,162" },
     { L"Fixedsys",               L"Fixedsys Excelsior 3.01-L2" },
     { L"Helv",                   L"Tahoma" },
-    { L"Helvetica",              L"Liberation Sans" },
+    { L"Helvetica",              L"Arial" },
     { L"MS Sans Serif",          L"FreeSans" },
     { L"MS Shell Dlg",           L"FreeSans" },
     { L"MS Shell Dlg 2",         L"FreeSans" },
diff --git a/media/inf/font.inf b/media/inf/font.inf
index 2985b462645..8c23423b3c5 100644
--- a/media/inf/font.inf
+++ b/media/inf/font.inf
@@ -27,7 +27,7 @@ HKLM,"System\CurrentControlSet\Hardware Profiles\Current\Software\Fonts","LogPix
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans"
+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 2",0x00000000,"Tahoma"
@@ -40,7 +40,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans"
+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 2",0x00000000,"Tahoma"
@@ -53,7 +53,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Tms Rmn",0x
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Courier",0x00000000,"FreeMono"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0x00000000,"Fixedsys Excelsior 3.01-L2"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"DejaVu Sans"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"DejaVu Sans"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"DejaVu Sans"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"DejaVu Sans"
@@ -83,7 +83,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","Franklin Gothic Medium",0x00000000,"Droid Sans Fallback"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Droid Sans Fallback"
-HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Arial"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Droid Sans Fallback"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Droid Sans Fallback"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Droid Sans Fallback"