Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java	(revision 786)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java	(revision 790)
@@ -87,5 +87,5 @@
 				for (int count=0; count<atts.getLength(); count++) {
 					if (atts.getQName(count).equals("src")) {
-						String imageFile = MapPaintStyles.getStyleDir()+"icons/"+atts.getValue(count); 
+						String imageFile = MapPaintStyles.getImageDir()+atts.getValue(count); 
 						File f = new File(imageFile);
 						if (f.exists()) {
@@ -94,9 +94,9 @@
 						} else {
 							try {
-								URL path = getClass().getResource("/styles/standard/icons/"+atts.getValue(count));
+								URL path = getClass().getResource(MapPaintStyles.getImageDir()+atts.getValue(count));
 								if (path == null) {
 									/* icon not found, using default */
 									System.out.println("Mappaint: Icon " + atts.getValue(count) + " not found, using default icon");
-									path = getClass().getResource("/styles/standard/icons/misc/no_icon.png");
+									path = getClass().getResource(MapPaintStyles.getImageDir()+"misc/no_icon.png");
 									curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
 								} else {
@@ -105,5 +105,5 @@
 							}
 							catch (Exception e){
-								URL path = getClass().getResource("/styles/standard/icons/amenity.png");
+								URL path = getClass().getResource(MapPaintStyles.getImageDir()+"incomming/amenity.png");
 								curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
 							}
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 786)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 790)
@@ -17,4 +17,5 @@
 
 	public static String styleDir;
+	public static String imageDir;
 	private static HashMap<String, ElemStyle> styles = new HashMap<String, ElemStyle>();
 	
@@ -22,10 +23,14 @@
 		return styleDir;
 	}
+	public static String getImageDir(){
+		return imageDir;
+	}
 
 	public static void readFromPreferences() {
 
 		String styleName = Main.pref.get("mappaint.style", "standard");
-		styleDir = Main.pref.getPreferencesDir()+"plugins/mappaint/"+styleName+"/"; //some day we will support different icon directories over options
+		styleDir = Main.pref.get("mappaint.styledir", Main.pref.getPreferencesDir()+"plugins/mappaint/"+styleName+"/");
 		String elemStylesFile = getStyleDir()+"elemstyles.xml";
+		imageDir = styleDir+"icons/";
 
 //		System.out.println("mappaint: Using style: " + styleName);
@@ -57,4 +62,5 @@
 			if (elemStylesPath != null)
 			{
+				imageDir = "/images/styles/standard/";
 				try
 				{