Index: src/org/openstreetmap/josm/actions/ExitAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/ExitAction.java	(revision 10)
+++ src/org/openstreetmap/josm/actions/ExitAction.java	(revision 11)
@@ -6,4 +6,6 @@
 import javax.swing.AbstractAction;
 import javax.swing.ImageIcon;
+
+import org.openstreetmap.josm.gui.Main;
 
 /**
@@ -18,5 +20,5 @@
 	 */
 	public ExitAction() {
-		super("Exit", new ImageIcon("images/exit.png"));
+		super("Exit", new ImageIcon(Main.class.getResource("/images/exit.png")));
 		putValue(MNEMONIC_KEY, KeyEvent.VK_X);
 	}
Index: src/org/openstreetmap/josm/actions/OpenGpxAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/OpenGpxAction.java	(revision 10)
+++ src/org/openstreetmap/josm/actions/OpenGpxAction.java	(revision 11)
@@ -32,5 +32,5 @@
 	 */
 	public OpenGpxAction() {
-		super("Open GPX", new ImageIcon("images/opengpx.png"));
+		super("Open GPX", new ImageIcon(Main.class.getResource("/images/opengpx.png")));
 		putValue(MNEMONIC_KEY, KeyEvent.VK_O);
 	}
Index: src/org/openstreetmap/josm/actions/PreferencesAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/PreferencesAction.java	(revision 10)
+++ src/org/openstreetmap/josm/actions/PreferencesAction.java	(revision 11)
@@ -7,4 +7,5 @@
 import javax.swing.ImageIcon;
 
+import org.openstreetmap.josm.gui.Main;
 import org.openstreetmap.josm.gui.PreferenceDialog;
 
@@ -20,5 +21,5 @@
 	 */
 	public PreferencesAction() {
-		super("Preferences", new ImageIcon("images/preference.png"));
+		super("Preferences", new ImageIcon(Main.class.getResource("/images/preference.png")));
 		putValue(MNEMONIC_KEY, KeyEvent.VK_P);
 	}
Index: src/org/openstreetmap/josm/actions/SaveGpxAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/SaveGpxAction.java	(revision 10)
+++ src/org/openstreetmap/josm/actions/SaveGpxAction.java	(revision 11)
@@ -28,5 +28,5 @@
 	 */
 	public SaveGpxAction() {
-		super("Save GPX", new ImageIcon("images/savegpx.png"));
+		super("Save GPX", new ImageIcon(Main.class.getResource("/images/savegpx.png")));
 		putValue(MNEMONIC_KEY, KeyEvent.VK_S);
 	}
Index: src/org/openstreetmap/josm/actions/mapmode/MapMode.java
===================================================================
--- src/org/openstreetmap/josm/actions/mapmode/MapMode.java	(revision 10)
+++ src/org/openstreetmap/josm/actions/mapmode/MapMode.java	(revision 11)
@@ -12,4 +12,5 @@
 
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.Main;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -45,5 +46,5 @@
 	 */
 	public MapMode(String name, String iconName, String tooltip, int mnemonic, MapFrame mapFrame) {
-		super(name, new ImageIcon("images/mapmode/"+iconName+".png"));
+		super(name, new ImageIcon(Main.class.getResource("/images/mapmode/"+iconName+".png")));
 		putValue(MNEMONIC_KEY, mnemonic);
 		putValue(ACCELERATOR_KEY, KeyStroke.getKeyStroke(mnemonic,0));
Index: src/org/openstreetmap/josm/data/osm/visitor/SelectionComponentVisitor.java
===================================================================
--- src/org/openstreetmap/josm/data/osm/visitor/SelectionComponentVisitor.java	(revision 10)
+++ src/org/openstreetmap/josm/data/osm/visitor/SelectionComponentVisitor.java	(revision 11)
@@ -13,4 +13,5 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.Track;
+import org.openstreetmap.josm.gui.Main;
 
 /**
@@ -37,5 +38,5 @@
 	public void visit(Key k) {
 		name = k.name;
-		icon = new ImageIcon("images/data/key.png");
+		icon = new ImageIcon(Main.class.getResource("/images/data/key.png"));
 	}
 
Index: src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- src/org/openstreetmap/josm/gui/MapView.java	(revision 10)
+++ src/org/openstreetmap/josm/gui/MapView.java	(revision 11)
@@ -45,5 +45,5 @@
 	public class AutoScaleAction extends AbstractAction {
 		public AutoScaleAction() {
-			super("Auto Scale", new ImageIcon("images/autoscale.png"));
+			super("Auto Scale", new ImageIcon(Main.class.getResource("/images/autoscale.png")));
 			putValue(MNEMONIC_KEY, KeyEvent.VK_A);
 		}
Index: src/org/openstreetmap/josm/gui/PreferenceDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/PreferenceDialog.java	(revision 10)
+++ src/org/openstreetmap/josm/gui/PreferenceDialog.java	(revision 11)
@@ -43,5 +43,5 @@
 	class OkAction extends AbstractAction {
 		public OkAction() {
-			super("Ok", new ImageIcon("images/ok.png"));
+			super("Ok", new ImageIcon(Main.class.getResource("/images/ok.png")));
 			putValue(MNEMONIC_KEY, KeyEvent.VK_ENTER);
 		}
Index: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(revision 10)
+++ src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(revision 11)
@@ -71,5 +71,5 @@
 		getContentPane().add(new JScrollPane(displaylist), BorderLayout.CENTER);
 
-		JButton button = new JButton("Select", new ImageIcon("images/mapmode/selection.png"));
+		JButton button = new JButton("Select", new ImageIcon(Main.class.getResource("/images/mapmode/selection.png")));
 		button.addActionListener(new ActionListener(){
 			public void actionPerformed(ActionEvent e) {
Index: src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 10)
+++ src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 11)
@@ -28,5 +28,5 @@
 	public ToggleDialog(String title, String name, String iconName, int mnemonic, String tooltip) {
 		super(Main.main, title, false);
-		putValue(SMALL_ICON, new ImageIcon("images/dialogs/"+iconName+".png"));
+		putValue(SMALL_ICON, new ImageIcon(Main.class.getResource("/images/dialogs/"+iconName+".png")));
 		putValue(NAME, name);
 		putValue(MNEMONIC_KEY, mnemonic);