Index: trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java	(revision 6278)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/NodeElemStyle.java	(revision 6280)
@@ -31,4 +31,7 @@
     private Image enabledNodeIcon;
     private Image disabledNodeIcon;
+
+    private boolean enabledNodeIconIsTemporary;
+    private boolean disabledNodeIconIsTemporary;
 
     public enum SymbolShape { SQUARE, CIRCLE, TRIANGLE, PENTAGON, HEXAGON, HEPTAGON, OCTAGON, NONAGON, DECAGON }
@@ -241,11 +244,13 @@
                 final Image nodeIcon;
                 if (painter.isInactiveMode() || n.isDisabled()) {
-                    if (disabledNodeIcon == null) {
+                    if (disabledNodeIcon == null || disabledNodeIconIsTemporary) {
                         disabledNodeIcon = mapImage.getDisplayedNodeIcon(true);
+                        disabledNodeIconIsTemporary = mapImage.isTemporary();
                     }
                     nodeIcon = disabledNodeIcon;
                 } else {
-                    if (enabledNodeIcon == null) {
+                    if (enabledNodeIcon == null || enabledNodeIconIsTemporary) {
                         enabledNodeIcon = mapImage.getDisplayedNodeIcon(false);
+                        enabledNodeIconIsTemporary = mapImage.isTemporary();
                     }
                     nodeIcon = enabledNodeIcon;