diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c
index 5ac9d6d39fd..6e423b2032d 100644
--- a/dlls/user/sysparams.c
+++ b/dlls/user/sysparams.c
@@ -174,6 +174,8 @@ static const WCHAR METRICS_SMCAPTIONWIDTH_VALNAME[]=  {'S','m','C','a','p','t','
 static const WCHAR METRICS_SMCAPTIONHEIGHT_VALNAME[]= {'S','m','C','a','p','t','i','o','n','H','e','i','g','h','t',0};
 static const WCHAR METRICS_MENUWIDTH_VALNAME[]=       {'M','e','n','u','W','i','d','t','h',0};
 static const WCHAR METRICS_MENUHEIGHT_VALNAME[]=      {'M','e','n','u','H','e','i','g','h','t',0};
+static const WCHAR METRICS_ICONSIZE_VALNAME[]=        {'S','h','e','l','l',' ','I','c','o','n',' ','S','i','z','e',0};
+static const WCHAR METRICS_BORDERWIDTH_VALNAME[]=     {'B','o','r','d','e','r','W','i','d','t','h',0};
 
 /* volatile registry branch under CURRENT_USER_REGKEY for temporary values storage */
 static const WCHAR WINE_CURRENT_USER_REGKEY[] = {'W','i','n','e',0};
@@ -617,12 +619,12 @@ void SYSPARAMS_Init(void)
 
     sysMetrics[SM_CXCURSOR] = 32;
     sysMetrics[SM_CYCURSOR] = 32;
-    sysMetrics[SM_CXBORDER] = 1;
+    sysMetrics[SM_CXBORDER] = SYSPARAMS_GetRegistryMetric( hkey, METRICS_BORDERWIDTH_VALNAME, 1 );
     sysMetrics[SM_CYBORDER] = sysMetrics[SM_CXBORDER];
     sysMetrics[SM_CYVTHUMB] = sysMetrics[SM_CXVSCROLL];
     sysMetrics[SM_CXHTHUMB] = sysMetrics[SM_CYVTHUMB];
-    sysMetrics[SM_CXICON] = 32;
-    sysMetrics[SM_CYICON] = 32;
+    sysMetrics[SM_CXICON] = SYSPARAMS_GetRegistryMetric( hkey, METRICS_ICONSIZE_VALNAME, 32 );
+    sysMetrics[SM_CYICON] = sysMetrics[SM_CXICON];
     sysMetrics[SM_CYKANJIWINDOW] = 0;
     sysMetrics[SM_MOUSEPRESENT] = 1;
     sysMetrics[SM_CYVSCROLL] = SYSPARAMS_GetRegistryMetric (hkey, METRICS_SCROLLHEIGHT_VALNAME, sysMetrics[SM_CXVSCROLL]);
diff --git a/tools/wine.inf b/tools/wine.inf
index 9fd0f94a79e..9405357b201 100644
--- a/tools/wine.inf
+++ b/tools/wine.inf
@@ -33,6 +33,7 @@ AddReg=\
     CurrentVersion,\
     Debugger,\
     Desktop,\
+    Metrics,\
     DirectX,\
     Environment,\
     Fonts,\
@@ -46,6 +47,7 @@ AddReg=\
 MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions"
 Mci32Str="Software\Microsoft\Windows NT\CurrentVersion\MCI32"
 Desktop="Control Panel\desktop"
+Metrics="Control Panel\desktop\WindowMetrics"
 CurrentVersion="Software\Microsoft\Windows\CurrentVersion"
 FontSubStr="Software\Microsoft\Windows NT\CurrentVersion\FontSubstitutes"
 
@@ -122,6 +124,18 @@ HKCU,%Desktop%,"SmoothScroll",1,00,00,00,00
 HKCU,%Desktop%,"UserPreferencemask",1,00,00,00,00
 HKCU,%Desktop%,"LowPowerActive",,"0"
 
+[Metrics]
+HKCU,%Metrics%,"ScrollWidth",,"16"
+HKCU,%Metrics%,"ScrollHeight",,"16"
+HKCU,%Metrics%,"CaptionWidth",,"18"
+HKCU,%Metrics%,"CaptionHeight",,"18"
+HKCU,%Metrics%,"SmCaptionWidth",,"13"
+HKCU,%Metrics%,"SmCaptionHeight",,"15"
+HKCU,%Metrics%,"MenuWidth",,"18"
+HKCU,%Metrics%,"MenuHeight",,"18"
+HKCU,%Metrics%,"BorderWidth",,"1"
+HKCU,%Metrics%,"Shell Icon Size",,"32"
+
 [DirectX]
 HKLM,Software\Microsoft\DirectX,"Version",,"4.09.00.0902"
 HKLM,Software\Microsoft\DirectMusic,GMFilePath,,"%12%\gm.dls"