Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 17063)
+++ trunk/resources/data/defaultpresets.xml	(revision 17064)
@@ -4051,4 +4051,17 @@
             <preset_link preset_name="Building" />
         </item> <!-- Other Place of Worship -->
+        <separator/>
+        <item name="Monastery" icon="presets/religion/monastery.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:amenity=monastery" />
+            <space />
+            <key key="amenity" value="monastery" />
+            <text key="name" text="Name" />
+            <reference ref="religious" />
+            <combo key="community:gender" text="Community gender" values="female,male,mixed" />
+            <reference ref="oh_wheelchair" />
+            <reference ref="wikipedia_wikidata" />
+            <reference ref="link_contact_address" />
+            <preset_link preset_name="Historic monastery" text="Similar but different tags:" />
+        </item> <!-- Monastery -->
     </group> <!-- Place of Worship -->
     <group name="Public Building" icon="presets/service/townhall.svg">
@@ -5309,5 +5322,5 @@
             <link wiki="Key:building" />
             <space />
-            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,farm_auxiliary,fire_station,garage,garages,gasometer,greenhouse,hangar,hospital,industrial,kindergarten,manufacture,mosque,office,parking,public,retail,roof,ruins,school,service,shed,silo,stable,storage_tank,sty,supermarket,synagogue,temple,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
+            <combo key="building" text="Building" values="allotment_house,bakehouse,barn,basilica,bunker,cabin,carport,cathedral,chapel,church,college,commercial,construction,cowshed,farm_auxiliary,fire_station,garage,garages,gasometer,greenhouse,hangar,hospital,industrial,kindergarten,manufacture,monastery,mosque,office,parking,public,retail,roof,ruins,school,service,shed,silo,stable,storage_tank,sty,supermarket,synagogue,temple,toilets,train_station,transformer_tower,transportation,university,warehouse,yes" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <optional>
                 <text key="name" text="Name" />
@@ -6386,4 +6399,15 @@
             <reference ref="religious"/>
         </item> <!-- Church -->
+        <item name="Historic monastery" icon="presets/sightseeing/monastery.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:historic=monastery" />
+            <space />
+            <key key="historic" value="monastery" />
+            <optional>
+            <text key="name" text="Name" />
+                <reference ref="religious" />
+                <reference ref="wikipedia_wikidata" />
+            </optional>
+            <preset_link preset_name="Monastery" text="Similar but different tags:" />
+        </item> <!-- Monastery -->
         <separator/>
         <item name="Charcoal pile" icon="presets/misc/charcoal_pile.svg" type="node,closedway,multipolygon" preset_name_label="true">
Index: trunk/resources/images/presets/religion/monastery.svg
===================================================================
--- trunk/resources/images/presets/religion/monastery.svg	(revision 17064)
+++ trunk/resources/images/presets/religion/monastery.svg	(revision 17064)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   height="14"
+   width="16"
+   viewBox="0 0 16 14"
+   id="svg2"
+   sodipodi:docname="monastery5.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="12.525153"
+     inkscape:cx="8.0428562"
+     inkscape:cy="9.1168865"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid832" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <path
+     d="m 0,7 v 7 H 4.5 C 4.5,11 5.5059068,8.5 8,8.5 10.441007,8.52244 11.5,11 11.5,14 H 16 V 7 Z m 8,3 c -1,0 -2,1 -2,4 h 4 C 10,11 9,10 8,10 Z"
+     id="city-gate"
+     style="fill:#008000;fill-opacity:1;stroke:none"
+     sodipodi:nodetypes="ccccccccsccs" />
+  <path
+     style="fill:#008000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 4,3 8,0 12,3 V 6 H 4 Z"
+     id="path851"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     style="fill:#008000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 3,9 V 4 L 1.5,2.3 0,4 v 5 z"
+     id="path853"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     sodipodi:nodetypes="cccccc"
+     id="path853-3"
+     d="M 16,9 V 4 L 14.5,2.3 13,4 v 5 z"
+     style="fill:#008000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+</svg>
Index: trunk/resources/images/presets/sightseeing/monastery.svg
===================================================================
--- trunk/resources/images/presets/sightseeing/monastery.svg	(revision 17064)
+++ trunk/resources/images/presets/sightseeing/monastery.svg	(revision 17064)
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   height="14"
+   width="16"
+   viewBox="0 0 16 14"
+   id="svg2"
+   sodipodi:docname="monastery6.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)">
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     id="namedview7"
+     showgrid="true"
+     inkscape:zoom="25.050306"
+     inkscape:cx="9.7286867"
+     inkscape:cy="5.9377442"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid832" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <path
+     d="m 0,7 v 7 H 4.5 C 4.5,11 5.5059068,8.5 8,8.5 10.441007,8.52244 11.5,11 11.5,14 H 16 V 7 Z m 8,3 c -1,0 -2,1 -2,4 h 4 C 10,11 9,10 8,10 Z"
+     id="city-gate"
+     style="fill:#734a08;fill-opacity:1;stroke:none"
+     sodipodi:nodetypes="ccccccccsccs" />
+  <path
+     style="fill:#734a08;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 4,3 8,0 12,3 V 6 H 4 Z"
+     id="path851"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     style="fill:#734a08;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 3,9 V 4 L 1.5,2.3 0,4 v 5 z"
+     id="path853"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     sodipodi:nodetypes="cccccc"
+     id="path853-3"
+     d="M 16,9 V 4 L 14.5,2.3 13,4 v 5 z"
+     style="fill:#734a08;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+</svg>
Index: trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/resources/styles/standard/elemstyles.mapcss	(revision 17063)
+++ trunk/resources/styles/standard/elemstyles.mapcss	(revision 17064)
@@ -2989,4 +2989,5 @@
 }
 area[amenity=place_of_worship],
+area[amenity=monastery],
 area[amenity=grave_yard],
 area[amenity=crematorium],
@@ -3067,4 +3068,8 @@
 node[amenity=place_of_worship][religion=zoroastrian][!is_prop_set(icon-image)] {
     icon-image: "presets/misc/no_icon.svg";
+    set icon_z17;
+}
+node[amenity=monastery] {
+    icon-image: "presets/religion/monastery.svg";
     set icon_z17;
 }
@@ -3633,4 +3638,5 @@
 area[historic=manor],
 area[historic=church],
+area[historic=monastery],
 area[historic=charcoal_pile],
 area[historic=mine],
@@ -3692,4 +3698,8 @@
 node[historic=church] {
     icon-image: "presets/religion/historic_church.svg";
+    set icon_z17;
+}
+node[historic=monastery] {
+    icon-image: "presets/sightseeing/monastery.svg";
     set icon_z17;
 }