Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 850)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 851)
@@ -38,7 +38,10 @@
 
 		String styleName = Main.pref.get("mappaint.style", "standard");
+		// fallback to standard name for internal case, as we only have one internal style
+		String internalStyleName = "standard";
 		styleDir = Main.pref.get("mappaint.styledir", Main.pref.getPreferencesDir()+"plugins/mappaint/"+styleName+"/");
 		String elemStylesFile = getStyleDir()+"elemstyles.xml";
 		imageDir = styleDir+"icons/";
+		internalImageDir = "/images/styles/"+internalStyleName+"/";
 
 //		System.out.println("mappaint: Using style: " + styleName);
@@ -65,10 +68,9 @@
 		} 
 		else {// reading the builtin file from the plugin jar file
-			URL elemStylesPath = Main.class.getResource("/styles/"+styleName+"/elemstyles.xml");
+			URL elemStylesPath = Main.class.getResource("/styles/"+internalStyleName+"/elemstyles.xml");
 
 //			System.out.println("mappaint: Using jar's elemstyles.xml: \"" + elemStylesPath + "\"");
 			if (elemStylesPath != null)
 			{
-				internalImageDir = "/images/styles/"+styleName+"/";
 				isInternal = true;
 				try