Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 1514)
+++ trunk/styles/standard/elemstyles.xml	(revision 1515)
@@ -953,5 +953,5 @@
 		<condition k="railway" v="station"/>
 		<area colour="railwaypoint#f7efb7"/>
-		<icon annotate="true" src="transport/railway.png"/>
+		<icon annotate="true" src="transport/railway_station.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -968,5 +968,5 @@
 		<condition k="railway" v="tram_station"/>
 		<area colour="railwaypoint#f7efb7"/>
-		<icon annotate="true" src="transport/railway.png"/>
+		<icon annotate="true" src="transport/railway_station.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1804,5 +1804,5 @@
 	<rule>
 		<condition k="religion" v="bahai"/>
-		<icon annotate="true" src="religion/church/bahai.png"/>
+		<icon annotate="true" src="religion/bahai.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1811,5 +1811,5 @@
 	<rule>
 		<condition k="religion" v="buddhist"/>
-		<icon annotate="true" src="religion/church/buddhism.png"/>
+		<icon annotate="true" src="religion/buddhism.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1825,5 +1825,5 @@
 	<rule>
 		<condition k="religion" v="hindu"/>
-		<icon annotate="true" src="religion/church/hinduism.png"/>
+		<icon annotate="true" src="religion/hinduism.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1832,5 +1832,5 @@
 	<rule>
 		<condition k="religion" v="jain"/>
-		<icon annotate="true" src="religion/church/jainism.png"/>
+		<icon annotate="true" src="religion/jainism.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1839,5 +1839,5 @@
 	<rule>
 		<condition k="religion" v="jewish"/>
-		<icon annotate="true" src="religion/church/synagogue.png"/>
+		<icon annotate="true" src="religion/jewish.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1846,5 +1846,5 @@
 	<rule>
 		<condition k="religion" v="muslim"/>
-		<icon annotate="true" src="religion/church/mosque.png"/>
+		<icon annotate="true" src="religion/muslim.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1853,5 +1853,5 @@
 	<rule>
 		<condition k="religion" v="sikh"/>
-		<icon annotate="true" src="religion/church/sikhism.png"/>
+		<icon annotate="true" src="religion/sikhism.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1860,5 +1860,5 @@
 	<rule>
 		<condition k="religion" v="shinto"/>
-		<icon annotate="true" src="religion/church/shinto.png"/>
+		<icon annotate="true" src="religion/shinto.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1867,5 +1867,5 @@
 	<rule>
 		<condition k="religion" v="taoist"/>
-		<icon annotate="true" src="religion/church/taoism.png"/>
+		<icon annotate="true" src="religion/taoism.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -1882,5 +1882,5 @@
 	<rule>
 		<condition k="amenity" v="grave_yard"/>
-		<icon annotate="true" src="religion/cemetery.png"/>
+		<icon annotate="true" src="rendering/landuse/cemetery.png"/>
 		<area colour="amenity_light#f7efb7"/>
 		<scale_min>1</scale_min>
@@ -2772,5 +2772,5 @@
 		<condition k="landuse" v="vineyard"/>
 		<area colour="green#b1e0c2"/>
-		<icon annotate="true" src="misc/no_icon.png"/>
+		<icon annotate="true" src="shop/groceries/fruits.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2893,5 +2893,5 @@
 		<condition k="landuse" v="railway"/>
 		<area colour="railland#888888"/>
-		<icon src="transport/railway.png"/>
+		<icon src="transport/railway_station.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>
@@ -2918,5 +2918,5 @@
 		<condition k="landuse" v="cemetery"/>
 		<area colour="cemetery#b1efc8"/>
-		<icon src="religion/cemetery.png"/>
+		<icon src="rendering/landuse/cemetery.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>