diff --git a/platform/icons/src/icon.png b/platform/icons/compatibilityResources/icon.png
similarity index 100%
rename from platform/icons/src/icon.png
rename to platform/icons/compatibilityResources/icon.png
diff --git a/platform/icons/src/icon@2x.png b/platform/icons/compatibilityResources/icon@2x.png
similarity index 100%
rename from platform/icons/src/icon@2x.png
rename to platform/icons/compatibilityResources/icon@2x.png
diff --git a/platform/icons/src/icon_128.png b/platform/icons/compatibilityResources/icon_128.png
similarity index 100%
rename from platform/icons/src/icon_128.png
rename to platform/icons/compatibilityResources/icon_128.png
diff --git a/platform/icons/src/icon_CE.png b/platform/icons/compatibilityResources/icon_CE.png
similarity index 100%
rename from platform/icons/src/icon_CE.png
rename to platform/icons/compatibilityResources/icon_CE.png
diff --git a/platform/icons/src/icon_CE@2x.png b/platform/icons/compatibilityResources/icon_CE@2x.png
similarity index 100%
rename from platform/icons/src/icon_CE@2x.png
rename to platform/icons/compatibilityResources/icon_CE@2x.png
diff --git a/platform/icons/src/icon_CE_128.png b/platform/icons/compatibilityResources/icon_CE_128.png
similarity index 100%
rename from platform/icons/src/icon_CE_128.png
rename to platform/icons/compatibilityResources/icon_CE_128.png
diff --git a/platform/icons/src/icon_CE_128@2x.png b/platform/icons/compatibilityResources/icon_CE_128@2x.png
similarity index 100%
rename from platform/icons/src/icon_CE_128@2x.png
rename to platform/icons/compatibilityResources/icon_CE_128@2x.png
diff --git a/platform/icons/src/icon_CE_64.png b/platform/icons/compatibilityResources/icon_CE_64.png
similarity index 100%
rename from platform/icons/src/icon_CE_64.png
rename to platform/icons/compatibilityResources/icon_CE_64.png
diff --git a/platform/icons/src/icon_CE_64@2x.png b/platform/icons/compatibilityResources/icon_CE_64@2x.png
similarity index 100%
rename from platform/icons/src/icon_CE_64@2x.png
rename to platform/icons/compatibilityResources/icon_CE_64@2x.png
diff --git a/platform/icons/src/icon_CEsmall.png b/platform/icons/compatibilityResources/icon_CEsmall.png
similarity index 100%
rename from platform/icons/src/icon_CEsmall.png
rename to platform/icons/compatibilityResources/icon_CEsmall.png
diff --git a/platform/icons/src/icon_CEsmall@2x.png b/platform/icons/compatibilityResources/icon_CEsmall@2x.png
similarity index 100%
rename from platform/icons/src/icon_CEsmall@2x.png
rename to platform/icons/compatibilityResources/icon_CEsmall@2x.png
diff --git a/platform/icons/src/icon_small.png b/platform/icons/compatibilityResources/icon_small.png
similarity index 100%
rename from platform/icons/src/icon_small.png
rename to platform/icons/compatibilityResources/icon_small.png
diff --git a/platform/icons/src/icon_small@2x.png b/platform/icons/compatibilityResources/icon_small@2x.png
similarity index 100%
rename from platform/icons/src/icon_small@2x.png
rename to platform/icons/compatibilityResources/icon_small@2x.png
diff --git a/platform/icons/src/icon_small@2x_dark.png b/platform/icons/compatibilityResources/icon_small@2x_dark.png
similarity index 100%
rename from platform/icons/src/icon_small@2x_dark.png
rename to platform/icons/compatibilityResources/icon_small@2x_dark.png
diff --git a/platform/icons/src/icon_small_dark.png b/platform/icons/compatibilityResources/icon_small_dark.png
similarity index 100%
rename from platform/icons/src/icon_small_dark.png
rename to platform/icons/compatibilityResources/icon_small_dark.png
diff --git a/platform/icons/src/icon-robots.txt b/platform/icons/src/icon-robots.txt
index 67e013c92420..0cc25d5c35fd 100644
--- a/platform/icons/src/icon-robots.txt
+++ b/platform/icons/src/icon-robots.txt
@@ -1 +1,7 @@
 skip: diff_frame*
+deprecated: icon.png; use ProductIcons.getInstance().getProductIcon() instead
+deprecated: icon_small.png; use ProductIcons.getInstance().getProductIcon() instead
+deprecated: icon_CEsmall.png; use ProductIcons.getInstance().getProductIcon() instead
+deprecated: icon_128.png
+deprecated: icon_CE.png
+deprecated: icon_CE_*.png
diff --git a/platform/platform-impl/src/com/intellij/internal/validation/TestDnd.java b/platform/platform-impl/src/com/intellij/internal/validation/TestDnd.java
index 5bf5779c1d29..226b91ec3e63 100644
--- a/platform/platform-impl/src/com/intellij/internal/validation/TestDnd.java
+++ b/platform/platform-impl/src/com/intellij/internal/validation/TestDnd.java
@@ -49,7 +49,7 @@ public class TestDnd extends AnAction {
         JBList list = new JBList(new String[]{"1111111", "222222", "333333", "44444", "555555555555555555555555"});
         DnDSupport.createBuilder(list)
           .setBeanProvider(info -> new DnDDragStartBean("something"))
-          .setImageProvider(info -> new DnDImage(IconUtil.toImage(AllIcons.Icon)))
+          .setImageProvider(info -> new DnDImage(IconUtil.toImage(AllIcons.FileTypes.Text)))
           .install();
 
         return list;
diff --git a/platform/util/ui/src/com/intellij/icons/AllIcons.java b/platform/util/ui/src/com/intellij/icons/AllIcons.java
index 5d034eb2f404..287e46697015 100644
--- a/platform/util/ui/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/ui/src/com/intellij/icons/AllIcons.java
@@ -1571,13 +1571,6 @@ public class AllIcons {
     public static final Icon Caller = AllIcons.Hierarchy.Supertypes;
 
   }
-  /** 32x32 */ public static final Icon Icon = IconLoader.getIcon("/icon.png");
-  /** 128x128 */ public static final Icon Icon_128 = IconLoader.getIcon("/icon_128.png");
-  /** 32x32 */ public static final Icon Icon_CE = IconLoader.getIcon("/icon_CE.png");
-  /** 128x128 */ public static final Icon Icon_CE_128 = IconLoader.getIcon("/icon_CE_128.png");
-  /** 64x64 */ public static final Icon Icon_CE_64 = IconLoader.getIcon("/icon_CE_64.png");
-  /** 16x16 */ public static final Icon Icon_CEsmall = IconLoader.getIcon("/icon_CEsmall.png");
-  /** 16x16 */ public static final Icon Icon_small = IconLoader.getIcon("/icon_small.png");
 
   public final static class Icons {
 
@@ -3041,4 +3034,27 @@ public class AllIcons {
     /** 16x16 */ public static final Icon Html_id = IconLoader.getIcon("/xml/html_id.svg");
 
   }
+
+  /** @deprecated use ProductIcons.getInstance().getProductIcon() instead */
+  @SuppressWarnings("unused")
+  @Deprecated
+  public static final Icon Icon = IconLoader.getIcon("/icon.png");
+
+  @SuppressWarnings("unused")
+  @Deprecated
+  public static final Icon Icon_128 = IconLoader.getIcon("/icon_128.png");
+
+  @SuppressWarnings("unused")
+  @Deprecated
+  public static final Icon Icon_CE = IconLoader.getIcon("/icon_CE.png");
+
+  /** @deprecated use ProductIcons.getInstance().getProductIcon() instead */
+  @SuppressWarnings("unused")
+  @Deprecated
+  public static final Icon Icon_CEsmall = IconLoader.getIcon("/icon_CEsmall.png");
+
+  /** @deprecated use ProductIcons.getInstance().getProductIcon() instead */
+  @SuppressWarnings("unused")
+  @Deprecated
+  public static final Icon Icon_small = IconLoader.getIcon("/icon_small.png");
 }