dom icons provided via @Presentation: take 2

xml/dom-impl/src/com/intellij/util/xml/impl/DefaultDomTargetIconProvider.java

@@ -28,6 +28,7 @@ import javax.swing.*;
  */
 public class DefaultDomTargetIconProvider extends DomIconProvider implements DumbAware {
   public Icon getIcon(@NotNull DomElement element, int flags) {
-    return ElementPresentationManager.getIconOld(element);
+    Icon icon = element.getPresentation().getIcon();
+    return icon == null ? ElementPresentationManager.getIconOld(element) : icon;
   }
 }

xml/dom-impl/src/com/intellij/util/xml/impl/DomInvocationHandler.java

@@ -541,7 +541,7 @@ public abstract class DomInvocationHandler<T extends AbstractDomChildDescription
       }
 
       public Icon getIcon() {
-        return ElementPresentationManager.getIcon(getProxy());
+        return ElementPresentationManager.getIconOld(getProxy());
       }
     };
   }