Index: /applications/editors/josm/plugins/mappaint/src/mappaint/ElemStyleHandler.java
===================================================================
--- /applications/editors/josm/plugins/mappaint/src/mappaint/ElemStyleHandler.java	(revision 2710)
+++ /applications/editors/josm/plugins/mappaint/src/mappaint/ElemStyleHandler.java	(revision 2711)
@@ -98,5 +98,5 @@
                 {
                     if(atts.getQName(count).equals("src")) {
-												String imageFile = MapPaintPlugin.getIconsDir()+atts.getValue(count); 
+												String imageFile = MapPaintPlugin.getStyleDir()+"icons/"+atts.getValue(count); 
 												File f = new File(imageFile);
 												if (f.exists()){
Index: /applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintPlugin.java
===================================================================
--- /applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintPlugin.java	(revision 2710)
+++ /applications/editors/josm/plugins/mappaint/src/mappaint/MapPaintPlugin.java	(revision 2711)
@@ -17,13 +17,13 @@
 	public static ElemStyles elemStyles = new ElemStyles();
 	
-	public static String iconsDir;
+	public static String styleDir;
 
-	public static String getIconsDir(){
-		return iconsDir;
+	public static String getStyleDir(){
+		return styleDir;
 	}
 
 	public MapPaintPlugin() {
-		iconsDir = getPluginDir()+"icons/"; //some day we will support diferent icon directories over options
-		String elemStylesFile = getPluginDir()+"elemstyles.xml";
+		styleDir = getPluginDir()+"standard/"; //some day we will support diferent icon directories over options
+		String elemStylesFile = getStyleDir()+"elemstyles.xml";
 		File f = new File(elemStylesFile);
 		if (f.exists())
@@ -43,4 +43,25 @@
 				throw new RuntimeException(e);
 			}
+		} 
+		else{ //just for backwards compatibility
+			elemStylesFile = getPluginDir()+"elemstyles.xml";
+			f = new File(elemStylesFile);
+			if (f.exists())
+			{
+				try
+				{
+					XMLReader xmlReader = XMLReaderFactory.createXMLReader();
+					ElemStyleHandler handler = new ElemStyleHandler();
+					xmlReader.setContentHandler(handler);
+					xmlReader.setErrorHandler(handler);
+					handler.setElemStyles(elemStyles);
+					// temporary only!
+					xmlReader.parse(new InputSource(new FileReader(f)));
+				}
+				catch (Exception e)
+				{
+					throw new RuntimeException(e);
+				}
+			} 
 		}
 	}