Index: trunk/.classpath
===================================================================
--- trunk/.classpath	(revision 7540)
+++ trunk/.classpath	(revision 7541)
@@ -14,5 +14,5 @@
 	<classpathentry kind="lib" path="test/lib/fest/MRJToolkitStubs-1.0.jar"/>
 	<classpathentry kind="lib" path="test/lib/jfcunit.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_65"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.7.0_67"/>
 	<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
 	<classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.jar"/>
Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7540)
+++ trunk/data/defaultpresets.xml	(revision 7541)
@@ -3183,5 +3183,5 @@
             <reference ref="contact" />
         </item> <!-- Hostel -->
-        <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut.png" type="node,closedway" preset_name_label="true">
+        <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut_blue.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=alpine_hut"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:tourism=alpine_hut"
@@ -4460,5 +4460,5 @@
             <text key="name" text="Name" />
             <check key="fireplace" text="Fireplace" />
-            <combo key="shelter_type" text="Type of shelter" values="weather_shelter,public_transport,picnic_shelter,wildlife_hide" values_context="shelter" values_searchable="true" />
+            <combo key="shelter_type" text="Type of shelter" values="basic_hut,lean_to,picnic_shelter,public_transport,weather_shelter,wildlife_hide" values_context="shelter" values_searchable="true" />
         </item> <!-- Shelter -->
         <item name="Hunting Stand" icon="presets/hunting_stand.png" type="node" preset_name_label="true">
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 7540)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 7541)
@@ -2417,4 +2417,19 @@
     text: auto;
 }
+node[amenity=shelter][shelter_type=public_transport] {
+    icon-image: "accommodation/shelter_public_transport_brown.png";
+    set icon_z17;
+    text: auto;
+}
+node[amenity=shelter][shelter_type=picnic_shelter] {
+    icon-image: "accommodation/shelter_picnic_brown.png";
+    set icon_z17;
+    text: auto;
+}
+node[amenity=shelter][shelter_type=basic_hut] {
+    icon-image: "accommodation/basic_hut_blue.png";
+    set icon_z17;
+    text: auto;
+}
 node[amenity=hunting_stand] {
     icon-image: "hunting_stand.png";
@@ -2525,5 +2540,10 @@
 }
 node[tourism=alpine_hut] {
-    icon-image: "accommodation/alpine_hut.png";
+    icon-image: "accommodation/alpine_hut_blue.png";
+    set icon_z17;
+    text: auto;
+}
+node[tourism=wilderness_hut] {
+    icon-image: "accommodation/wilderness_hut_blue.png";
     set icon_z17;
     text: auto;