diff --git a/platform/util/src/com/intellij/openapi/util/IconLoader.java b/platform/util/src/com/intellij/openapi/util/IconLoader.java
index 5fdd9a1e3457..862bfd23eca1 100644
--- a/platform/util/src/com/intellij/openapi/util/IconLoader.java
+++ b/platform/util/src/com/intellij/openapi/util/IconLoader.java
@@ -173,7 +173,7 @@ public final class IconLoader {
   }
 
   @Nullable
-  private static Icon findIcon(URL url) {
+  public static Icon findIcon(URL url) {
     if (url == null) return null;
     Icon icon = ourIconsCache.get(url);
     if (icon == null) {
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/SizedIcon.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/SizedIcon.java
index de0ac962a424..7564eec28be5 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/SizedIcon.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/utils/SizedIcon.java
@@ -32,6 +32,12 @@ public class SizedIcon implements Icon {
     myImage = icon.getImage();
   }
 
+  public SizedIcon(int maxWidth, int maxHeight, Image image) {
+    myWidth = Math.min(maxWidth, image.getWidth(null));
+    myHeight = Math.min(maxHeight, image.getHeight(null));
+    myImage = image;
+  }
+
   @Override
   public void paintIcon(Component c, Graphics g, int x, int y) {
     g.drawImage(myImage, x, y, myWidth, myHeight, null);