Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7597)
+++ trunk/data/defaultpresets.xml	(revision 7598)
@@ -3702,4 +3702,10 @@
             <check key="covered" text="Covered" />
         </item> <!-- Public Grill -->
+        <item name="Firepit" icon="styles/standard/leisure/firepit.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=firepit" />
+            <space />
+            <key key="leisure" value="firepit" />
+            <text key="name" text="Name" />
+        </item> <!-- Firepit -->
         <item name="Fishing" icon="presets/fishing.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=fishing"
@@ -4312,4 +4318,17 @@
             </optional>
         </item> <!-- Toilets/Restrooms -->
+        <item name="Shower" icon="styles/standard/service/shower.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=shower" />
+            <space />
+            <key key="amenity" value="shower" />
+            <combo key="access" text="Access rights" values="public,permissive,customers" />
+            <optional>
+                <text key="description" text="Description" />
+                <combo key="fee" text="Fee" values="yes,no" />
+                <text key="operator" text="Operator" />
+                <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
+                <reference ref="oh" />
+            </optional>
+        </item> <!-- Shower -->
         <item name="Post Box" icon="styles/standard/service/post_box.png" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box"
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 7597)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 7598)
@@ -1350,5 +1350,6 @@
 area[leisure=playground],
 area[leisure=garden],
-area[leisure=common] {
+area[leisure=common],
+area[leisure=firepit] {
     fill-color: leisure#c7f1a3;
 }
@@ -1387,4 +1388,9 @@
     set icon_z17;
     text: auto;
+}
+node[leisure=firepit] { 
+    icon-image: "leisure/firepit.svg"; 
+    set icon_z17; 
+    text: auto; 
 }
 area[leisure=swimming_pool] {
@@ -2052,4 +2058,5 @@
 area[emergency=defibrillator],
 area[amenity=toilets],
+area[amenity=shower],
 area[amenity=recycling] {
     fill-color: amenity_light#f7efb7;
@@ -2074,4 +2081,9 @@
     set icon_z17;
     text: auto;
+}
+node[amenity=shower] { 
+    icon-image: "service/shower.svg"; 
+    set icon_z17; 
+    text: auto; 
 }
 node[amenity=recycling] {