Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 10449)
+++ trunk/data/defaultpresets.xml	(revision 10450)
@@ -3229,11 +3229,13 @@
                 <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" />
             </optional>
-            <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="station" value_off="" text="Railway station (legacy)" />
-            <check key="railway" value_on="halt" value_off="" text="Railway halt (legacy)" />
+            <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)" />
+            </checkgroup>
             <check key="trolleybus" text="Trolleybus" />
             <check key="share_taxi" text="Share taxi" />
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 10449)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 10450)
@@ -3629,8 +3629,16 @@
     set icon_z17;
 }
+node[public_transport=stop_position][bus=yes] {
+    icon-image: "transport/bus.svg";
+    set icon_z17;
+}
 node[public_transport=stop_position][train=yes] {
     icon-image: "transport/train.svg";
     set icon_z17;
 }
+node[public_transport=stop_position][tram=yes] {
+    icon-image: "transport/railway/tram.svg";
+    set icon_z17;
+}
 node[public_transport=stop_position][subway=yes] {
     icon-image: "transport/railway/subway.svg";
@@ -3639,12 +3647,4 @@
 node[public_transport=stop_position][monorail=yes] {
     icon-image: "transport/railway/monorail.svg";
-    set icon_z17;
-}
-node[public_transport=stop_position][tram=yes] {
-    icon-image: "transport/railway/tram.svg";
-    set icon_z17;
-}
-node[public_transport=stop_position][bus=yes] {
-    icon-image: "transport/bus.svg";
     set icon_z17;
 }