--- old/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java	2018-09-21 15:20:15.755998400 -0700
+++ new/src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolderManager2.java	2018-09-21 15:20:14.577144900 -0700
@@ -126,9 +126,9 @@
                     new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);
             img.setRGB(0, 0, size, size, iconBits, 0, size);
 
-            STANDARD_VIEW_BUTTONS[iconIndex] = (size == 16)
+            STANDARD_VIEW_BUTTONS[iconIndex] = (size == SMALL_ICON_SIZE)
                     ? img
-                    : new MultiResolutionIconImage(16, img);
+                    : new MultiResolutionIconImage(SMALL_ICON_SIZE, img);
         }
 
         return STANDARD_VIEW_BUTTONS[iconIndex];
@@ -379,7 +379,8 @@
             try {
                 int i = Integer.parseInt(name);
                 if (i >= 0) {
-                    return Win32ShellFolder2.getShell32Icon(i, key.startsWith("shell32LargeIcon "));
+                    return Win32ShellFolder2.getShell32Icon(i, key.startsWith("shell32LargeIcon ")?
+                                                                LARGE_ICON_SIZE : SMALL_ICON_SIZE);
                 }
             } catch (NumberFormatException ex) {
             }