diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElementDescriptor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElementDescriptor.java
index 15f28ee10549..aba61f0ce177 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElementDescriptor.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElementDescriptor.java
@@ -37,7 +37,7 @@ class ItemElementDescriptor extends NodeDescriptor<ItemElement> {
       myElement = element;
       final String url = element.getUrl();
       myName = getPresentablePath(url).replace('/', File.separatorChar);
-      myIcon = getIconForUrl(url, element.isValid(), element.isJarDirectory());
+      setIcon(getIconForUrl(url, element.isValid(), element.isJarDirectory()));
     }
 
     public boolean update() {
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/OrderRootTypeElementDescriptor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/OrderRootTypeElementDescriptor.java
index cd179217f421..edc55c74e7a8 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/OrderRootTypeElementDescriptor.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/OrderRootTypeElementDescriptor.java
@@ -26,7 +26,7 @@ public class OrderRootTypeElementDescriptor extends NodeDescriptor<OrderRootType
                                         OrderRootTypeElement element, String text, Icon icon) {
     super(null, parentDescriptor);
     myElement = element;
-    myIcon = icon;
+    setIcon(icon);
     myName = text;
   }
 
diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyNodeDescriptor.java b/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyNodeDescriptor.java
index 092bafb4b38e..c5847afc8a01 100644
--- a/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyNodeDescriptor.java
+++ b/java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyNodeDescriptor.java
@@ -90,7 +90,7 @@ public final class CallHierarchyNodeDescriptor extends HierarchyNodeDescriptor i
 
   public final boolean update(){
     final CompositeAppearance oldText = myHighlightedText;
-    final Icon oldIcon = myIcon;
+    final Icon oldIcon = getIcon();
 
     int flags = Iconable.ICON_FLAG_VISIBILITY;
     if (isMarkReadOnly()) {
@@ -109,13 +109,14 @@ public final class CallHierarchyNodeDescriptor extends HierarchyNodeDescriptor i
       return true;
     }
 
-    myIcon = enclosingElement.getIcon(flags);
+    Icon newIcon = enclosingElement.getIcon(flags);
     if (changes && myIsBase) {
       final LayeredIcon icon = new LayeredIcon(2);
-      icon.setIcon(myIcon, 0);
+      icon.setIcon(newIcon, 0);
       icon.setIcon(AllIcons.Hierarchy.Base, 1, -AllIcons.Hierarchy.Base.getIconWidth() / 2, 0);
-      myIcon = icon;
+      newIcon = icon;
     }
+    setIcon(newIcon);
 
     myHighlightedText = new CompositeAppearance();
     TextAttributes mainTextAttributes = null;
@@ -168,7 +169,7 @@ public final class CallHierarchyNodeDescriptor extends HierarchyNodeDescriptor i
 
     if (
       !Comparing.equal(myHighlightedText, oldText) ||
-      !Comparing.equal(myIcon, oldIcon)
+      !Comparing.equal(getIcon(), oldIcon)
     ){
       changes = true;
     }
diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyNodeDescriptor.java b/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyNodeDescriptor.java
index 103a233c2805..3e0a0e164dd7 100644
--- a/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyNodeDescriptor.java
+++ b/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyNodeDescriptor.java
@@ -123,7 +123,7 @@ public final class MethodHierarchyNodeDescriptor extends HierarchyNodeDescriptor
         newIcon = icon;
       }
 
-      myIcon = newIcon;
+      setIcon(newIcon);
     }
 
     final CompositeAppearance oldText = myHighlightedText;
diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/type/TypeHierarchyNodeDescriptor.java b/java/java-impl/src/com/intellij/ide/hierarchy/type/TypeHierarchyNodeDescriptor.java
index ed1eff86cb2f..042326439e34 100644
--- a/java/java-impl/src/com/intellij/ide/hierarchy/type/TypeHierarchyNodeDescriptor.java
+++ b/java/java-impl/src/com/intellij/ide/hierarchy/type/TypeHierarchyNodeDescriptor.java
@@ -56,9 +56,9 @@ public final class TypeHierarchyNodeDescriptor extends HierarchyNodeDescriptor {
 
     if (changes && myIsBase) {
       final LayeredIcon icon = new LayeredIcon(2);
-      icon.setIcon(myIcon, 0);
+      icon.setIcon(getIcon(), 0);
       icon.setIcon(AllIcons.Hierarchy.Base, 1, -AllIcons.Hierarchy.Base.getIconWidth() / 2, 0);
-      myIcon = icon;
+      setIcon(icon);
     }
 
     final PsiClass psiClass = getPsiClass();
diff --git a/platform/lang-impl/src/com/intellij/ide/commander/TopLevelNode.java b/platform/lang-impl/src/com/intellij/ide/commander/TopLevelNode.java
index 1782c28b8ad7..e31bb60b61b4 100644
--- a/platform/lang-impl/src/com/intellij/ide/commander/TopLevelNode.java
+++ b/platform/lang-impl/src/com/intellij/ide/commander/TopLevelNode.java
@@ -33,7 +33,7 @@ public class TopLevelNode extends AbstractTreeNode {
   public TopLevelNode(Project project, Object value) {
     super(project, value);
     myName = "[ .. ]";
-    myIcon = AllIcons.Nodes.UpLevel;
+    setIcon(AllIcons.Nodes.UpLevel);
   }
 
   @NotNull
diff --git a/platform/lang-impl/src/com/intellij/ide/util/treeView/SmartElementDescriptor.java b/platform/lang-impl/src/com/intellij/ide/util/treeView/SmartElementDescriptor.java
index 662b2d14074b..7ed8f9337926 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/treeView/SmartElementDescriptor.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/treeView/SmartElementDescriptor.java
@@ -82,8 +82,8 @@ public class SmartElementDescriptor extends NodeDescriptor{
       color = CopyPasteManager.CUT_COLOR;
     }
 
-    boolean changes = !Comparing.equal(icon, myIcon) || !Comparing.equal(color, myColor);
-    myIcon = icon;
+    boolean changes = !Comparing.equal(icon, getIcon()) || !Comparing.equal(color, myColor);
+    setIcon(icon);
     myColor = color;
     return changes;
   }
diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/NodeDescriptor.java b/platform/platform-api/src/com/intellij/ide/util/treeView/NodeDescriptor.java
index f6f5103c9efc..dc5e236f6717 100644
--- a/platform/platform-api/src/com/intellij/ide/util/treeView/NodeDescriptor.java
+++ b/platform/platform-api/src/com/intellij/ide/util/treeView/NodeDescriptor.java
@@ -27,7 +27,13 @@ public abstract class NodeDescriptor<E> {
   private final NodeDescriptor myParentDescriptor;
 
   protected String myName;
-  protected Icon myIcon;
+  protected Icon myClosedIcon;
+
+  /**
+   * Unused. It's there only for API compatibility.
+   */
+  @Deprecated
+  protected Icon myOpenIcon;
   protected Color myColor;
 
   private int myIndex = -1;
@@ -80,7 +86,7 @@ public abstract class NodeDescriptor<E> {
   }
 
   public final Icon getIcon() {
-    return myIcon;
+    return myClosedIcon;
   }
 
   public final Color getColor() {
@@ -130,11 +136,15 @@ public abstract class NodeDescriptor<E> {
   }
 
   public void applyFrom(NodeDescriptor desc) {
-    myIcon = desc.myIcon;
+    setIcon(desc.getIcon());
     myName = desc.myName;
     myColor = desc.myColor;
   }
 
+  public void setIcon(Icon closedIcon) {
+    myClosedIcon = closedIcon;
+  }
+
   public abstract static class NodeComparator<T extends NodeDescriptor> implements Comparator<T> {
 
     private long myStamp;
@@ -179,4 +189,4 @@ public abstract class NodeDescriptor<E> {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java b/platform/platform-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java
index 6877de5e3c9a..c4add9f856f1 100644
--- a/platform/platform-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java
+++ b/platform/platform-api/src/com/intellij/ide/util/treeView/PresentableNodeDescriptor.java
@@ -59,7 +59,7 @@ public abstract class PresentableNodeDescriptor<E> extends NodeDescriptor<E>  {
   }
 
   protected final boolean apply(PresentationData presentation, @Nullable PresentationData before) {
-    myIcon = presentation.getIcon(false);
+    setIcon(presentation.getIcon(false));
     myName = presentation.getPresentableText();
     myColor = presentation.getForcedTextForeground();
     boolean updated = before == null || !presentation.equals(before);
@@ -231,4 +231,4 @@ public abstract class PresentableNodeDescriptor<E> extends NodeDescriptor<E>  {
     return myName;
   }
 
-}
\ No newline at end of file
+}
diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleNode.java b/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleNode.java
index 2b3aa4e9e1e2..19e127fc3efc 100644
--- a/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleNode.java
+++ b/platform/platform-api/src/com/intellij/ui/treeStructure/SimpleNode.java
@@ -93,7 +93,7 @@ public abstract class SimpleNode extends PresentableNodeDescriptor implements Co
 
     Color oldColor = myColor;
     String oldName = myName;
-    Icon oldIcon = myIcon;
+    Icon oldIcon = getIcon();
     List<ColoredFragment> oldFragments = new ArrayList<ColoredFragment>(presentation.getColoredText());
 
     myColor = UIUtil.getTreeTextForeground();
@@ -104,11 +104,11 @@ public abstract class SimpleNode extends PresentableNodeDescriptor implements Co
     myName = getName();
     presentation.setPresentableText(myName);
 
-    presentation.setChanged(!Comparing.equal(new Object[]{myIcon, myName, oldFragments, myColor},
+    presentation.setChanged(!Comparing.equal(new Object[]{getIcon(), myName, oldFragments, myColor},
                                              new Object[]{oldIcon, oldName, oldFragments, oldColor}));
 
     presentation.setForcedTextForeground(myColor);
-    presentation.setIcon(myIcon);
+    presentation.setIcon(getIcon());
   }
 
   protected void updateFileStatus() {
@@ -241,7 +241,7 @@ public abstract class SimpleNode extends PresentableNodeDescriptor implements Co
    * or update presentation dynamically by defining {@link #update(com.intellij.ide.projectView.PresentationData)}
    */
   public void setUniformIcon(Icon aIcon) {
-    myIcon = aIcon;
+    setIcon(aIcon);
   }
 
   /**
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileNodeDescriptor.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileNodeDescriptor.java
index b299a6801869..1368a2703bf3 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileNodeDescriptor.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/FileNodeDescriptor.java
@@ -58,9 +58,9 @@ public class FileNodeDescriptor extends NodeDescriptor {
 
     if (file == null) return true;
 
-    myIcon = myOriginalIcon;
+    setIcon(myOriginalIcon);
     if (myFileElement.isHidden()) {
-      myIcon = IconLoader.getTransparentIcon(myIcon);
+      setIcon(IconLoader.getTransparentIcon(getIcon()));
     }
     myColor = myFileElement.isHidden() ? SimpleTextAttributes.DARK_TEXT.getFgColor() : null;
     return changed;
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntBuildFileNodeDescriptor.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntBuildFileNodeDescriptor.java
index 90542c63b995..045841f81e11 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntBuildFileNodeDescriptor.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntBuildFileNodeDescriptor.java
@@ -54,7 +54,7 @@ final class AntBuildFileNodeDescriptor extends AntNodeDescriptor {
     if (buildModel != null) {
       AntTargetNodeDescriptor.addShortcutText(buildModel.getDefaultTargetActionId(), myAppearance);
     }
-    myIcon = AllIcons.Ant.Build;
+    setIcon(AllIcons.Ant.Build);
     myName = myBuildFile.getPresentableName();
     return !Comparing.equal(myAppearance, oldAppearence);
   }
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntTargetNodeDescriptor.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntTargetNodeDescriptor.java
index 044bd0f6028e..2b6671130582 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntTargetNodeDescriptor.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntTargetNodeDescriptor.java
@@ -66,7 +66,7 @@ final class AntTargetNodeDescriptor extends AntNodeDescriptor {
     final CompositeAppearance oldText = myHighlightedText;
     final boolean isMeta = myTarget instanceof MetaTarget;
 
-    myIcon = isMeta ? AllIcons.Ant.MetaTarget : AllIcons.Ant.Target;
+    setIcon(isMeta ? AllIcons.Ant.MetaTarget : AllIcons.Ant.Target);
 
     myHighlightedText = new CompositeAppearance();
 
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNodeDescriptor.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNodeDescriptor.java
index 9a9b1abda8d1..41762886d339 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNodeDescriptor.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleProjectStructureNodeDescriptor.java
@@ -30,7 +30,7 @@ public class GradleProjectStructureNodeDescriptor<T extends GradleEntityId> exte
   public GradleProjectStructureNodeDescriptor(@NotNull T id, @NotNull String text, @Nullable Icon icon) {
     super(null, null);
     myId = id;
-    myIcon = icon;
+    setIcon(icon);
     myName = text;
   }
 
@@ -38,7 +38,7 @@ public class GradleProjectStructureNodeDescriptor<T extends GradleEntityId> exte
   protected void update(@NotNull PresentationData presentation) {
     presentation.setAttributesKey(myAttributes);
     presentation.setPresentableText(myName);
-    presentation.setIcon(myIcon);
+    presentation.setIcon(getIcon());
   }
 
   @NotNull
diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeNodeDescriptor.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeNodeDescriptor.java
index ec3cb7b9579d..28900e5806b1 100644
--- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeNodeDescriptor.java
+++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/TreeNodeDescriptor.java
@@ -18,8 +18,6 @@ package com.intellij.designer.componentTree;
 import com.intellij.ide.util.treeView.NodeDescriptor;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
-
 /**
  * @author Alexander Lobas
  */
@@ -45,8 +43,4 @@ public final class TreeNodeDescriptor extends NodeDescriptor {
   public Object getElement() {
     return myElement;
   }
-
-  public void setIcon(Icon icon) {
-    myIcon = icon;
-  }
 }
diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsEditor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsEditor.java
index 64b483f2afb9..170e78d8719f 100644
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsEditor.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AssociationsEditor.java
@@ -387,7 +387,7 @@ class AssociationsEditor {
       public MyNodeDescriptor(NodeDescriptor<PsiFileNode> nodeDescriptor) {
         super(nodeDescriptor.getProject(), null);
         myName = nodeDescriptor.toString();
-        myIcon = LayeredIcon.create(nodeDescriptor.getIcon(), LINK_OVERLAY);
+        setIcon(LayeredIcon.create(nodeDescriptor.getIcon(), LINK_OVERLAY));
         myColor = nodeDescriptor.getColor();
         myNode = nodeDescriptor.getElement();
       }