Index: /applications/editors/josm/plugins/mappaint/styles/icon_overview.osm
===================================================================
--- /applications/editors/josm/plugins/mappaint/styles/icon_overview.osm	(revision 5992)
+++ /applications/editors/josm/plugins/mappaint/styles/icon_overview.osm	(revision 5993)
@@ -245,5 +245,5 @@
     <tag k='amenity' v='library' />
   </node>
-  <node id='-62' action='modify' visible='true' lat='7.989445464370817' lon='-56.90933073761824'>
+  <node id='-62' action='modify' visible='true' lat='7.9894454643708075' lon='-56.93951734386691'>
     <tag k='name' v='atm' />
     <tag k='amenity' v='atm' />
@@ -533,13 +533,13 @@
     <tag k='amenity' v='bicycle_rental' />
   </node>
-  <node id='-134' action='modify' visible='true' lat='12.817913067496033' lon='-57.879553474696515'>
+  <node id='-134' action='modify' visible='true' lat='12.788476991243762' lon='-57.88961567677941'>
     <tag k='name' v='car_rental' />
     <tag k='amenity' v='car_rental' />
   </node>
-  <node id='-135' action='modify' visible='true' lat='12.585460322669777' lon='-57.869193292340725'>
+  <node id='-135' action='modify' visible='true' lat='12.555997347712044' lon='-57.88931769650652'>
     <tag k='name' v='car_sharing' />
     <tag k='amenity' v='car_sharing' />
   </node>
-  <node id='-136' action='modify' visible='true' lat='8.194585929414634' lon='-56.92402372591879'>
+  <node id='-136' action='modify' visible='true' lat='8.194585929414627' lon='-56.93408592800167'>
     <tag k='name' v='bureau_de_change' />
     <tag k='amenity' v='bureau_de_change' />
@@ -645,5 +645,5 @@
     <tag k='military' v='bunker' />
   </node>
-  <node id='-162' action='modify' visible='true' lat='8.284335545002378' lon='-61.52405386732443'>
+  <node id='-162' action='modify' visible='true' lat='8.274378213869138' lon='-61.55424047357312'>
     <tag k='name' v='barracks' />
     <tag k='military' v='barracks' />
@@ -705,47 +705,47 @@
     <tag k='natural' v='coastline' />
   </node>
-  <node id='-177' action='modify' visible='true' lat='9.723518097169947' lon='-62.432150424594106'>
+  <node id='-177' action='modify' visible='true' lat='7.122856298778426' lon='-62.400472637712596'>
+    <tag k='name' v='island' />
+    <tag k='place' v='island' />
+  </node>
+  <node id='-178' action='modify' visible='true' lat='12.390634670766032' lon='-58.749762214138514'>
+    <tag k='name' v='bay' />
+    <tag k='natural' v='bay' />
+  </node>
+  <node id='-179' action='modify' visible='true' lat='12.607123746055352' lon='-58.7497622141385'>
+    <tag k='name' v='beach' />
+    <tag k='natural' v='beach' />
+  </node>
+  <node id='-180' action='modify' visible='true' lat='11.926127657912964' lon='-58.749762214138514'>
+    <tag k='name' v='glacier' />
+    <tag k='natural' v='glacier' />
+  </node>
+  <node id='-181' action='modify' visible='true' lat='12.142998524533414' lon='-58.74976221413853'>
+    <tag k='name' v='land' />
+    <tag k='natural' v='land' />
+  </node>
+  <node id='-182' action='modify' visible='true' lat='12.827791954292415' lon='-58.759824416221406'>
+    <tag k='name' v='mud' />
+    <tag k='natural' v='mud' />
+  </node>
+  <node id='-183' action='modify' visible='true' lat='9.473643881265177' lon='-62.44270968688792'>
+    <tag k='name' v='country' />
+    <tag k='place' v='country' />
+  </node>
+  <node id='-184' action='modify' visible='true' lat='9.234010270511796' lon='-62.432150424594106'>
+    <tag k='name' v='state' />
+    <tag k='place' v='state' />
+  </node>
+  <node id='-185' action='modify' visible='true' lat='9.004642887394837' lon='-62.432150424594106'>
+    <tag k='name' v='region' />
+    <tag k='place' v='region' />
+  </node>
+  <node id='-186' action='modify' visible='true' lat='8.722947931127454' lon='-62.432150424594106'>
+    <tag k='name' v='county' />
+    <tag k='place' v='county' />
+  </node>
+  <node id='-187' action='modify' visible='true' lat='9.723518097169947' lon='-62.432150424594106'>
     <tag k='name' v='continent' />
     <tag k='place' v='continent' />
   </node>
-  <node id='-178' action='modify' visible='true' lat='9.234010270511796' lon='-62.432150424594106'>
-    <tag k='name' v='state' />
-    <tag k='place' v='state' />
-  </node>
-  <node id='-179' action='modify' visible='true' lat='12.142998524533414' lon='-58.74976221413853'>
-    <tag k='name' v='land' />
-    <tag k='natural' v='land' />
-  </node>
-  <node id='-180' action='modify' visible='true' lat='8.722947931127454' lon='-62.432150424594106'>
-    <tag k='name' v='county' />
-    <tag k='place' v='county' />
-  </node>
-  <node id='-181' action='modify' visible='true' lat='12.607123746055352' lon='-58.7497622141385'>
-    <tag k='name' v='beach' />
-    <tag k='natural' v='beach' />
-  </node>
-  <node id='-182' action='modify' visible='true' lat='7.122856298778426' lon='-62.400472637712596'>
-    <tag k='name' v='island' />
-    <tag k='place' v='island' />
-  </node>
-  <node id='-183' action='modify' visible='true' lat='9.004642887394837' lon='-62.432150424594106'>
-    <tag k='name' v='region' />
-    <tag k='place' v='region' />
-  </node>
-  <node id='-184' action='modify' visible='true' lat='12.390634670766032' lon='-58.749762214138514'>
-    <tag k='name' v='bay' />
-    <tag k='natural' v='bay' />
-  </node>
-  <node id='-185' action='modify' visible='true' lat='9.473643881265177' lon='-62.44270968688792'>
-    <tag k='name' v='country' />
-    <tag k='place' v='country' />
-  </node>
-  <node id='-186' action='modify' visible='true' lat='11.926127657912964' lon='-58.749762214138514'>
-    <tag k='name' v='glacier' />
-    <tag k='natural' v='glacier' />
-  </node>
-  <node id='-187' action='modify' visible='true' lat='12.827791954292415' lon='-58.759824416221406'>
-    <tag k='name' v='mud' />
-    <tag k='natural' v='mud' />
-  </node>
 </osm>
Index: /applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml
===================================================================
--- /applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml	(revision 5992)
+++ /applications/editors/josm/plugins/mappaint/styles/standard/elemstyles.xml	(revision 5993)
@@ -459,5 +459,5 @@
     <rule>
         <condition k="railway" v="subway_entrance"/>
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="transport/underground.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -822,5 +822,5 @@
 	<rule>
 		<condition k="amenity" v="bicycle_rental" />
-		<icon annotate="true" src="vehicle/parking/bike.png" />
+		<icon annotate="true" src="vehicle/bicycle_rental.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -829,5 +829,5 @@
 	<rule>
 		<condition k="amenity" v="car_rental" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="vehicle/car_rental.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -836,5 +836,5 @@
 	<rule>
 		<condition k="amenity" v="car_sharing" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="vehicle/car_sharing.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1026,5 +1026,5 @@
 	<rule>
 		<condition k="amenity" v="townhall" />
-		<icon annotate="true" src="misc/no_icon.png" />
+		<icon annotate="true" src="public.png" />
         <scale_min>1</scale_min>
         <scale_max>50000</scale_max>
@@ -1942,4 +1942,11 @@
 
 	<rule>
+		<condition k="amenity" v="shelter" />
+		<icon annotate="true" src="vehicle/caution.png" />
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
+	
+	<rule>
 		<condition k="shop" v="laundromat" />
 		<icon annotate="true" src="vehicle/caution.png" />
@@ -2011,3 +2018,9 @@
 	</rule>
 
+	<rule>
+		<condition k="barrier" v="bollard" />
+		<icon annotate="true" src="vehicle/caution.png" />
+		<scale_min>1</scale_min>
+		<scale_max>50000</scale_max>
+	</rule>
 </rules>