Index: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java	(revision 197)
+++ src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java	(revision 198)
@@ -25,5 +25,4 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
@@ -54,5 +53,5 @@
 
 	public AddNodeAction(MapFrame mapFrame, String name, Mode mode, String desc) {
-		super(name, "node/"+mode, desc, mapFrame, ImageProvider.getCursor("crosshair", "node"));
+		super(name, "node/"+mode, desc, mapFrame, Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
 		this.mode = mode;
 		putValue("help", "Action/AddNode/"+Character.toUpperCase(mode.toString().charAt(0))+mode.toString().substring(1));
@@ -62,5 +61,4 @@
 		super.enterMode();
 		Main.map.mapView.addMouseListener(this);
-		Main.map.mapView.setCursor(Cursor.getPredefinedCursor(Cursor.CROSSHAIR_CURSOR));
 	}
 
@@ -68,5 +66,4 @@
 		super.exitMode();
 		Main.map.mapView.removeMouseListener(this);
-		Main.map.mapView.setCursor(Cursor.getDefaultCursor());
 	}
 
Index: src/org/openstreetmap/josm/actions/mapmode/MapMode.java
===================================================================
--- src/org/openstreetmap/josm/actions/mapmode/MapMode.java	(revision 197)
+++ src/org/openstreetmap/josm/actions/mapmode/MapMode.java	(revision 198)
@@ -21,6 +21,6 @@
  */
 abstract public class MapMode extends JosmAction implements MouseListener, MouseMotionListener {
-//	private final Cursor cursor;
-//	private Cursor oldCursor;
+	private final Cursor cursor;
+	private Cursor oldCursor;
 
 	/**
@@ -29,5 +29,5 @@
 	public MapMode(String name, String iconName, String tooltip, int keystroke, MapFrame mapFrame, Cursor cursor) {
 		super(name, "mapmode/"+iconName, tooltip, keystroke, 0, false);
-//		this.cursor = cursor;
+		this.cursor = cursor;
 		putValue("active", false);
 	}
@@ -40,16 +40,16 @@
 		putValue(SMALL_ICON, ImageProvider.get("mapmode", iconName));
 		putValue(SHORT_DESCRIPTION, tooltip);
-//		this.cursor = cursor;
+		this.cursor = cursor;
 	}
 
 	public void enterMode() {
 		putValue("active", true);
-//		oldCursor = Main.map.mapView.getCursor();
-//		Main.map.mapView.setCursor(cursor);
+		oldCursor = Main.map.mapView.getCursor();
+		Main.map.mapView.setCursor(cursor);
 		
 	}
 	public void exitMode() {
 		putValue("active", false);
-//		Main.map.mapView.setCursor(oldCursor);
+		Main.map.mapView.setCursor(oldCursor);
 	}