Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 16495)
+++ /trunk/resources/data/defaultpresets.xml	(revision 16496)
@@ -4992,5 +4992,5 @@
             <reference ref="wheelchair" />
             <optional>
-                <combo key="door" text="Door" values="yes,no,folding,hinged,loadingdock,overhead,revolving,sliding,trapdoor,no" match="key" values_searchable="true" />
+                <combo key="door" text="Door" values="yes,no,folding,hinged,loadingdock,overhead,revolving,sliding,trapdoor" match="key" values_searchable="true" />
                 <text key="ref" text="Entrance number" />
                 <text key="addr:flats" text="Flat numbers" />
Index: /trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/resources/styles/standard/elemstyles.mapcss	(revision 16495)
+++ /trunk/resources/styles/standard/elemstyles.mapcss	(revision 16496)
@@ -2558,4 +2558,16 @@
 }
 
+/*******************/
+/* healthcare tags */
+/*******************/
+
+area[healthcare=laboratory] {
+    fill-color: healthcare#3771c8;
+}
+node[healthcare=laboratory] {
+    icon-image: "presets/health/laboratory.svg";
+    set icon_z17;
+}
+
 /****************/
 /* amenity tags */
@@ -3008,8 +3020,4 @@
 node[amenity=veterinary] {
     icon-image: "presets/health/veterinary.svg";
-    set icon_z17;
-}
-node[healthcare=laboratory] {
-    icon-image: "presets/health/laboratory.svg";
     set icon_z17;
 }