diff --git a/platform/util/src/com/intellij/openapi/util/IconLoader.java b/platform/util/src/com/intellij/openapi/util/IconLoader.java
index 5f68a522f821..45d0b12fc30c 100644
--- a/platform/util/src/com/intellij/openapi/util/IconLoader.java
+++ b/platform/util/src/com/intellij/openapi/util/IconLoader.java
@@ -251,7 +251,7 @@ public final class IconLoader {
   }
 
   @Nullable
-  private static Icon checkIcon(final Image image, @NotNull URL url) {
+  private static ImageIcon checkIcon(final Image image, @NotNull URL url) {
     if (image == null || image.getHeight(LabelHolder.ourFakeComponent) < 1) { // image wasn't loaded or broken
       return null;
     }
@@ -261,7 +261,8 @@ public final class IconLoader {
       LOG.error("Invalid icon: " + url); // # 22481
       return EMPTY_ICON;
     }
-    return icon;
+    assert icon instanceof ImageIcon;
+    return (ImageIcon)icon;
   }
 
   public static boolean isGoodSize(@NotNull final Icon icon) {
@@ -297,7 +298,7 @@ public final class IconLoader {
       graphics.dispose();
 
       Image img = ImageUtil.filter(image, UIUtil.getGrayFilter());
-      if (UIUtil.isRetina()) img = RetinaImage.createFrom(img, 2, ImageLoader.ourComponent);
+      if (UIUtil.isRetina()) img = RetinaImage.createFrom(img);
 
       disabledIcon = new JBImageIcon(img);
       ourIcon2DisabledIcon.put(icon, disabledIcon);
@@ -374,7 +375,7 @@ public final class IconLoader {
     }
 
     @NotNull
-    private synchronized Icon getRealIcon() {
+    private synchronized ImageIcon getRealIcon() {
       if (isLoaderDisabled() && (myRealIcon == null || dark != USE_DARK_ICONS || scale != SCALE || filter != IMAGE_FILTER || numberOfPatchers != ourPatchers.size())) return EMPTY_ICON;
 
       if (!isValid()) {
@@ -396,12 +397,12 @@ public final class IconLoader {
         }
       }
       Object realIcon = myRealIcon;
-      if (realIcon instanceof Icon) return (Icon)realIcon;
+      if (realIcon instanceof Icon) return (ImageIcon)realIcon;
 
-      Icon icon;
+      ImageIcon icon;
       if (realIcon instanceof Reference) {
-        icon = ((Reference<Icon>)realIcon).get();
-        if (icon != null) return icon;
+        icon = ((Reference<ImageIcon>)realIcon).get();
+        if (icon != null) return (ImageIcon)icon;
       }
 
       Image image = ImageLoader.loadFromUrl(myUrl, true, filter);
@@ -412,7 +413,7 @@ public final class IconLoader {
           realIcon = icon;
         }
         else {
-          realIcon = new SoftReference<Icon>(icon);
+          realIcon = new SoftReference<ImageIcon>(icon);
         }
         myRealIcon = realIcon;
       }
@@ -492,29 +493,13 @@ public final class IconLoader {
           Image image = getOrigImage(needRetinaImage);
 
           if (image != null) {
-            Icon realIcon = getRealIcon();
-            int width = (int)(realIcon.getIconWidth() * scale);
-            int height = (int)(realIcon.getIconHeight() * scale);
-            boolean isMacRetina = false;
+            Image iconImage = getRealIcon().getImage();
+            int width = (int)(ImageUtil.getRealWidth(iconImage) * scale);
+            int height = (int)(ImageUtil.getRealHeight(iconImage) * scale);
 
-            if (SystemInfo.isMac && UIUtil.isRetina()) {
-              if (image instanceof JBHiDPIScaledImage) {
-                Image hidpiImage = ((JBHiDPIScaledImage)image).getDelegate();
+            Image resizedImage = Scalr.resize(ImageUtil.toBufferedImage(image), Scalr.Method.ULTRA_QUALITY, width, height);
+            if (UIUtil.isRetina()) resizedImage = RetinaImage.createFrom(resizedImage);
 
-                if (hidpiImage != null && hidpiImage.getWidth(null) == 2 * realIcon.getIconWidth()) {
-
-                  image = hidpiImage;
-                  width *= 2;
-                  height *= 2;
-                  isMacRetina = true;
-                }
-              }
-            }
-
-            BufferedImage resizedImage = Scalr.resize(ImageUtil.toBufferedImage(image), Scalr.Method.ULTRA_QUALITY, width, height);
-            if (isMacRetina) {
-              resizedImage = new JBHiDPIScaledImage(resizedImage, resizedImage.getWidth() / 2, resizedImage.getHeight() / 2, resizedImage.getType());
-            }
             icon = getIcon(resizedImage);
             scaledIconsCache.put(effectiveScale, new SoftReference<Icon>(icon));
           }
diff --git a/platform/util/src/com/intellij/util/RetinaImage.java b/platform/util/src/com/intellij/util/RetinaImage.java
index 7a5d7b0ff704..fdb493685933 100644
--- a/platform/util/src/com/intellij/util/RetinaImage.java
+++ b/platform/util/src/com/intellij/util/RetinaImage.java
@@ -27,6 +27,10 @@ import java.awt.image.BufferedImage;
  */
 public class RetinaImage {
 
+  public static Image createFrom(Image image) {
+    return createFrom(image, 2, ImageLoader.ourComponent);
+  }
+
   public static Image createFrom(Image image, final int scale, Component ourComponent) {
     int w = image.getWidth(ourComponent);
     int h = image.getHeight(ourComponent);
diff --git a/platform/util/src/com/intellij/util/ui/ImageUtil.java b/platform/util/src/com/intellij/util/ui/ImageUtil.java
index 7b2095812bb9..6d9a152cfd39 100644
--- a/platform/util/src/com/intellij/util/ui/ImageUtil.java
+++ b/platform/util/src/com/intellij/util/ui/ImageUtil.java
@@ -44,6 +44,22 @@ public class ImageUtil {
     return bufferedImage;
   }
 
+  public static int getRealWidth(@NotNull Image image) {
+    if (image instanceof JBHiDPIScaledImage) {
+      Image img = ((JBHiDPIScaledImage)image).getDelegate();
+      if (img != null) image = img;
+    }
+    return image.getWidth(null);
+  }
+
+  public static int getRealHeight(@NotNull Image image) {
+    if (image instanceof JBHiDPIScaledImage) {
+      Image img = ((JBHiDPIScaledImage)image).getDelegate();
+      if (img != null) image = img;
+    }
+    return image.getHeight(null);
+  }
+
   public static Image filter(Image image, ImageFilter filter) {
     if (image == null || filter == null) return image;
     return Toolkit.getDefaultToolkit().createImage(