Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 3608)
+++ trunk/data/defaultpresets.xml	(revision 3609)
@@ -1553,5 +1553,5 @@
     </group> <!-- Bicycle -->
     <group name="Public Transport" icon="presets/bus.png">
-        <item name="Station" name_context="railway" icon="presets/station.png" type="node,closedway">
+        <item name="Station" name_context="railway" icon="styles/standard/transport/railway_station.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
@@ -1615,5 +1615,5 @@
             </optional>
         </item>
-        <item name="Bus Stop" icon="presets/bus_halt.png" type="node">
+        <item name="Bus Stop" icon="presets/bus_small.png" type="node">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_stop"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 3608)
+++ trunk/styles/standard/elemstyles.xml	(revision 3609)
@@ -1235,5 +1235,5 @@
 	<rule>
 		<condition k="railway" v="tram_stop"/>
-		<icon annotate="true" src="transport/railway_small.png"/>
+		<icon annotate="true" src="transport/tram.png"/>
 		<scale_min>1</scale_min>
 		<scale_max>50000</scale_max>