Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15435)
+++ trunk/data/defaultpresets.xml	(revision 15437)
@@ -2498,19 +2498,19 @@
             <space />
             <checkgroup columns="2">
-                <check key="bus" text="Bus" />
-                <check key="highway" value_on="bus_stop" value_off="" text="Bus stop (legacy)" />
-                <check key="tram" text="Tram" />
-                <check key="railway" value_on="tram_stop" value_off="" text="Tram stop (legacy)" />
-                <check key="train" text="Train" />
-                <check key="railway" value_on="halt" value_off="" text="Railway halt (legacy)" />
+                <check key="bus" text="Bus" icon="presets/transport/bus.svg" />
+                <check key="highway" value_on="bus_stop" value_off="" text="Bus stop (legacy)" icon="presets/transport/bus.svg" />
+                <check key="tram" text="Tram" icon="presets/transport/railway/tram.svg" />
+                <check key="railway" value_on="tram_stop" value_off="" text="Tram stop (legacy)" icon="presets/transport/railway/tram.svg" />
+                <check key="train" text="Train" icon="presets/transport/train.svg" />
+                <check key="railway" value_on="halt" value_off="" text="Railway halt (legacy)" icon="presets/transport/train.svg" />
             </checkgroup>
-            <check key="trolleybus" text="Trolleybus" />
-            <check key="share_taxi" text="Share taxi" />
-            <check key="subway" text="Subway" />
-            <check key="light_rail" text="Light Rail" />
-            <check key="monorail" text="Monorail" />
-            <check key="funicular" text="Funicular" />
-            <check key="aerialway" text="Aerialway" />
-            <check key="ferry" text="Ferry" />
+            <check key="trolleybus" text="Trolleybus" icon="presets/transport/trolleybus.svg" />
+            <check key="share_taxi" text="Share taxi" icon="presets/transport/share_taxi.svg" />
+            <check key="subway" text="Subway" icon="presets/transport/railway/subway.svg" />
+            <check key="light_rail" text="Light Rail" icon="presets/transport/railway/light_rail.svg" />
+            <check key="monorail" text="Monorail" icon="presets/transport/railway/monorail.svg" />
+            <check key="funicular" text="Funicular" icon="presets/transport/railway/funicular.svg" />
+            <check key="aerialway" text="Aerialway" icon="presets/transport/aerialway/station.svg" />
+            <check key="ferry" text="Ferry" icon="presets/nautical/ferry.svg" />
         </item> <!-- Stop Position -->
         <item name="Platform" type="node,way,closedway,multipolygon" icon="presets/transport/platform.svg" preset_name_label="true">
Index: trunk/data/tagging-preset.xsd
===================================================================
--- trunk/data/tagging-preset.xsd	(revision 15435)
+++ trunk/data/tagging-preset.xsd	(revision 15437)
@@ -270,4 +270,6 @@
         <attribute name="disable_off" type="boolean" />
         <attribute name="match" type="tns:match" />
+        <attribute name="icon" type="string" />
+        <attribute name="icon_size" type="integer" />
 
         <attribute name="name" use="prohibited" />