Index: applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml
===================================================================
--- applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml	(revision 4417)
+++ applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml	(revision 4418)
@@ -138,5 +138,5 @@
 	<rule>
 		<condition k="highway" v="mini_roundabout" />
-		<icon annotate="true" src="vehicle/roundabout_left.png" />
+		<icon annotate="true" src="vehicle/restrictions/roundabout_left.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -381,5 +381,5 @@
 	<rule>
 		<condition k="waterway" v="mooring" />
-		<icon annotate="true" src="nautical/anchor.png" />
+		<icon annotate="true" src="nautical/marina.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -542,5 +542,5 @@
 	<rule>
 		<condition k="power" v="tower" />
-		<icon annotate="true" src="places/power/tower.png" />
+		<icon annotate="true" src="misc/landmark/power/tower.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -557,5 +557,5 @@
 	<rule>
 		<condition k="man_made" v="works" />
-		<icon annotate="true" src="places/works.png" />
+		<icon annotate="true" src="misc/landmark/works.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -564,5 +564,5 @@
 	<rule>
 		<condition k="man_made" v="beacon" />
-		<icon annotate="true" src="places/beacon.png" />
+		<icon annotate="true" src="misc/landmark/beacon.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -571,5 +571,5 @@
 	<rule>
 		<condition k="man_made" v="survey_point" />
-		<icon annotate="true" src="places/survey_point.png" />
+		<icon annotate="true" src="misc/landmark/survey_point.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -578,5 +578,5 @@
 	<rule>
 		<condition k="man_made" v="power_wind" />
-		<icon annotate="true" src="places/power/wind.png" />
+		<icon annotate="true" src="misc/landmark/power/wind.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -585,5 +585,5 @@
 	<rule>
 		<condition k="man_made" v="power_hydro" />
-		<icon annotate="true" src="places/power/hydro.png" />
+		<icon annotate="true" src="misc/landmark/power/hydro.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -592,5 +592,5 @@
 	<rule>
 		<condition k="man_made" v="power_fossil" />
-		<icon annotate="true" src="places/power/fossil.png" />
+		<icon annotate="true" src="misc/landmark/power/fossil.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -599,5 +599,5 @@
 	<rule>
 		<condition k="man_made" v="power_nuclear" />
-		<icon annotate="true" src="places/power/nuclear.png" />
+		<icon annotate="true" src="misc/landmark/power/nuclear.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -606,5 +606,5 @@
 	<rule>
 		<condition k="man_made" v="tower" />
-		<icon annotate="true" src="places/tower.png" />
+		<icon annotate="true" src="misc/landmark/tower.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -613,5 +613,5 @@
 	<rule>
 		<condition k="man_made" v="water_tower" />
-		<icon annotate="true" src="places/water_tower.png" />
+		<icon annotate="true" src="misc/landmark/water_tower.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -620,5 +620,5 @@
 	<rule>
 		<condition k="man_made" v="gasometer" />
-		<icon annotate="true" src="places/gasometer.png" />
+		<icon annotate="true" src="misc/landmark/gasometer.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -627,5 +627,5 @@
 	<rule>
 		<condition k="man_made" v="reservoir_covered" />
-		<icon annotate="true" src="places/reservoir_covered.png" />
+		<icon annotate="true" src="misc/landmark/reservoir_covered.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -634,5 +634,5 @@
 	<rule>
 		<condition k="man_made" v="lighthouse" />
-		<icon annotate="true" src="places/lighthouse.png" />
+		<icon annotate="true" src="misc/landmark/lighthouse.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -641,5 +641,5 @@
 	<rule>
 		<condition k="man_made" v="windmill" />
-		<icon annotate="true" src="places/windmill.png" />
+		<icon annotate="true" src="misc/landmark/windmill.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -772,5 +772,5 @@
 	<rule>
 		<condition k="amenity" v="biergarten" />
-		<icon annotate="true" src="food/beergarden.png"  />
+		<icon annotate="true" src="food/biergarten.png"  />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -970,5 +970,5 @@
 	<rule>
 		<condition k="amenity" v="bank" />
-		<icon annotate="true" src="money/bank.png" />
+		<icon annotate="true" src="money.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1050,5 +1050,5 @@
 	<rule>
 		<condition k="tourism" v="hotel" />
-		<icon annotate="true" src="accommodation/hotel.png" />
+		<icon annotate="true" src="accommodation.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1100,5 +1100,5 @@
 	<rule>
 		<condition k="historic" v="museum" />
-		<icon annotate="true" src="recreation/museum.png" />
+		<icon annotate="true" src="sightseeing/museum.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1121,5 +1121,5 @@
 	<rule>
 		<condition k="historic" v="ruins" />
-		<icon annotate="true" src="sightseeing/ruin.png" />
+		<icon annotate="true" src="sightseeing/ruins.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1129,5 +1129,5 @@
 	<rule>
 		<condition k="landuse" v="farm" />
-		<icon annotate="true" src="places/farm.png"  />
+		<icon annotate="true" src="misc/landmark/farm.png"  />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1137,5 +1137,5 @@
         <condition k="landuse" v="quarry"/>
         <area colour="#cccccc" />
-		<icon src="places/mine.png" />
+		<icon src="misc/landmark/mine.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1293,5 +1293,5 @@
     <rule>
         <condition k="natural" v="spring"/>
-        <icon annotate="true" src="places/spring.png"/>
+        <icon annotate="true" src="misc/landmark/spring.png"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1300,5 +1300,5 @@
     <rule>
         <condition k="natural" v="peak"/>
-        <icon annotate="true" src="places/peak_small.png"/>
+        <icon annotate="true" src="misc/landmark/peak_small.png"/>
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>