diff --git a/win32ss/user/ntuser/metric.c b/win32ss/user/ntuser/metric.c
index 4ece647717f..e070bb0fa51 100644
--- a/win32ss/user/ntuser/metric.c
+++ b/win32ss/user/ntuser/metric.c
@@ -5,7 +5,6 @@
  * FILE:             win32ss/user/ntuser/metric.c
  * PROGRAMER:        Casper S. Hornstrup (chorns@users.sourceforge.net)
  *                   Timo Kreuzer (timo.kreuzer@reactos.org)
- *                   Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
  */
 
 #include <win32k.h>
@@ -131,10 +130,10 @@ InitMetrics(VOID)
     piSysMet[SM_CXHTHUMB] = gspv.ncm.iScrollHeight;     // 16;
     piSysMet[SM_CYVSCROLL] = gspv.ncm.iScrollHeight;    // 16
     piSysMet[SM_CXHSCROLL] = gspv.ncm.iScrollHeight;    // 16;
-    piSysMet[SM_CXICON] = gspv.nIconSize; // 32
-    piSysMet[SM_CYICON] = gspv.nIconSize; // 32
-    piSysMet[SM_CXSMICON] = gspv.nSmallIconSize; // 16
-    piSysMet[SM_CYSMICON] = gspv.nSmallIconSize; // 16
+    piSysMet[SM_CXICON] = 32;
+    piSysMet[SM_CYICON] = 32;
+    piSysMet[SM_CXSMICON] = 16;
+    piSysMet[SM_CYSMICON] = 16;
     piSysMet[SM_CXICONSPACING] = gspv.im.iHorzSpacing;  // 64;
     piSysMet[SM_CYICONSPACING] = gspv.im.iVertSpacing;  // 64;
     piSysMet[SM_CXCURSOR] = 32;
diff --git a/win32ss/user/ntuser/sysparams.c b/win32ss/user/ntuser/sysparams.c
index 538d18bb341..59cc76f13f9 100644
--- a/win32ss/user/ntuser/sysparams.c
+++ b/win32ss/user/ntuser/sysparams.c
@@ -4,7 +4,6 @@
  * PURPOSE:          System parameters functions
  * FILE:             win32ss/user/ntuser/sysparams.c
  * PROGRAMER:        Timo Kreuzer (timo.kreuzer@reactos.org)
- *                   Katayama Hirofumi MZ (katayama.hirofumi.mz@gmail.com)
  */
 
 // TODO:
@@ -206,11 +205,6 @@ SpiFixupValues(VOID)
 //                               gspv.tmMenuFont.tmExternalLeading);
     if (gspv.iDblClickTime == 0) gspv.iDblClickTime = 500;
 
-    if (gspv.nIconSize <= 0)
-        gspv.nIconSize = 32;
-    if (gspv.nSmallIconSize <= 0)
-        gspv.nSmallIconSize = 16;
-
     // FIXME: Hack!!!
     gspv.tmMenuFont.tmHeight = 11;
     gspv.tmMenuFont.tmExternalLeading = 2;
@@ -302,10 +296,6 @@ SpiUpdatePerUserSystemParameters(VOID)
     gspv.im.iTitleWrap = SpiLoadMetric(VAL_ITWRAP, 1);
     SpiLoadFont(&gspv.im.lfFont, L"IconFont", &lf1);
 
-    /* Load icon size */
-    gspv.nIconSize = SpiLoadInt(KEY_METRIC, L"Shell Icon Size", 32);
-    gspv.nSmallIconSize = SpiLoadInt(KEY_METRIC, L"Shell Small Icon Size", 16);
-
     /* Load desktop settings */
     gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0);
     gspv.iWheelScrollLines = SpiLoadInt(KEY_DESKTOP, VAL_SCRLLLINES, 3);
diff --git a/win32ss/user/ntuser/sysparams.h b/win32ss/user/ntuser/sysparams.h
index dafb7f4b181..0b564f86099 100644
--- a/win32ss/user/ntuser/sysparams.h
+++ b/win32ss/user/ntuser/sysparams.h
@@ -157,9 +157,6 @@ typedef struct _SPIVALUES
     DWORD dwForegroundFlashCount;
     DWORD dwCaretWidth;
 
-    INT nIconSize;
-    INT nSmallIconSize;
-
 //    SPI_LANGDRIVER
 //    SPI_SETDESKPATTERN
 //    SPI_SETPENWINDOWS