Index: /applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml
===================================================================
--- /applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml	(revision 3565)
+++ /applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml	(revision 3566)
@@ -742,11 +742,4 @@
 
 	<rule>
-		<condition k="amenity" v="supermarket" />
-		<icon annotate="true" src="shopping.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
 		<condition k="amenity" v="pharmacy" />
 		<icon annotate="true" src="pharmacy.png" />
@@ -842,13 +835,20 @@
 
 	<rule>
-		<condition k="shop" v="bakers" />
-		<icon annotate="true" src="bakers.png" />
-        <scale_min>1</scale_min>
-        <scale_max>50000</scale_max>
-	</rule>
-
-	<rule>
-		<condition k="shop" v="butchers" />
-		<icon annotate="true" src="icon_missing.png" />
+		<condition k="shop" v="bakery" />
+		<icon annotate="true" src="bakery.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="butcher" />
+		<icon annotate="true" src="icon_missing.png" />
+        <scale_min>1</scale_min>
+        <scale_max>50000</scale_max>
+	</rule>
+
+	<rule>
+		<condition k="shop" v="supermarket" />
+		<icon annotate="true" src="shopping.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>