--- data/defaultpresets.xml
+++ data/defaultpresets.xml
@@ -3701,6 +3701,12 @@
             <combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" />
             <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"
                   pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=fishing"
@@ -4311,6 +4317,19 @@
                 <combo key="wheelchair" text="Wheelchair" values="no,limited,yes" />
             </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"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=post_box"
--- styles/standard/elemstyles.mapcss
+++ styles/standard/elemstyles.mapcss
@@ -1349,7 +1349,8 @@
 area[leisure=park],
 area[leisure=playground],
 area[leisure=garden],
-area[leisure=common] {
+area[leisure=common],
+area[amenity=firepit] {
     fill-color: leisure#c7f1a3;
 }
 node[leisure=slipway] {
@@ -1387,6 +1388,11 @@
     set icon_z17;
     text: auto;
 }
+node[leisure=firepit] {
+    icon-image: "leisure/firepit.svg";
+    set icon_z17;
+    text: auto;
+}
 area[leisure=swimming_pool] {
     fill-color: swimming_pool#51c4ef;
 }
@@ -2051,6 +2057,7 @@
 area[emergency=aed],
 area[emergency=defibrillator],
 area[amenity=toilets],
+area[amenity=shower],
 area[amenity=recycling] {
     fill-color: amenity_light#f7efb7;
 }
@@ -2071,6 +2078,11 @@
 }
 node[amenity=toilets] {
     icon-image: "service/toilets.png";
+    set icon_z17;
+    text: auto;
+}
+node[amenity=shower] {
+    icon-image: "service/shower.svg";
     set icon_z17;
     text: auto;
 }