Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 17141)
+++ /trunk/resources/data/defaultpresets.xml	(revision 17142)
@@ -3321,4 +3321,14 @@
             </checkgroup>
         </item> <!-- Camp pitch -->
+        <separator/>
+        <item name="Animal boarding" icon="presets/accommodation/animal_boarding.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:amenity=animal_boarding" />
+            <space />
+            <key key="amenity" value="animal_boarding" />
+            <text key="name" text="Name" />
+            <multiselect key="animal_boarding" text="Type" values="bird;cat;dog;duck;horse;mammal;wildlife" values_searchable="true" />
+            <reference ref="oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Animal boarding -->
     </group> <!-- Accommodation -->
     <group name="Food+Drinks" icon="presets/food/restaurant.svg">
@@ -4270,4 +4280,13 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Veterinary -->
+        <item name="Animal shelter" icon="presets/health/animal_shelter.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:amenity=animal_shelter" />
+            <space />
+            <key key="amenity" value="animal_shelter" />
+            <text key="name" text="Name" />
+            <multiselect key="animal_shelter" text="Type" values="bird;cat;dog;duck;horse;mammal;wildlife" values_searchable="true" />
+            <reference ref="oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Animal shelter -->
     </group> <!-- Health -->
     <group name="Emergency" icon="presets/emergency/ambulance_station.svg">
@@ -8473,5 +8492,5 @@
             <text key="contact:instagram" text="Instagram" match="key" text_context="social_network" />
             <text key="contact:linkedin" text="Linkedin" match="key" text_context="social_network" />
-            <text key="contact:ok" text="ok" match="key" text_context="social_network" />
+            <text key="contact:ok" text="Ok" match="key" text_context="social_network" />
             <text key="contact:pinterest" text="Pinterest" match="key" text_context="social_network" />
             <text key="contact:skype" text="Skype" match="key" text_context="social_network" />
Index: /trunk/resources/images/presets/accommodation/animal_boarding.svg
===================================================================
--- /trunk/resources/images/presets/accommodation/animal_boarding.svg	(revision 17142)
+++ /trunk/resources/images/presets/accommodation/animal_boarding.svg	(revision 17142)
@@ -0,0 +1,99 @@
+<?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"
+   height="16"
+   width="16"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   version="1.1"
+   viewBox="0 0 16 16.000001"
+   sodipodi:docname="animal_boarding.svg"
+   id="svg3795">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     inkscape:document-rotation="0"
+     inkscape:document-units="px"
+     inkscape:pageopacity="0.0"
+     inkscape:window-width="1664"
+     fit-margin-bottom="0"
+     fit-margin-right="0"
+     inkscape:cy="1.7029771"
+     inkscape:cx="1.980238"
+     inkscape:current-layer="layer1"
+     borderopacity="1.0"
+     showgrid="true"
+     inkscape:window-height="988"
+     inkscape:window-x="0"
+     inkscape:zoom="24.436424"
+     inkscape:window-maximized="0"
+     fit-margin-top="0"
+     pagecolor="#ffffff"
+     fit-margin-left="0"
+     inkscape:window-y="0"
+     inkscape:pageshadow="2"
+     bordercolor="#666666"
+     id="base">
+    <inkscape:grid
+       id="grid833"
+       type="xygrid" />
+  </sodipodi:namedview>
+  <g
+     transform="translate(-223.82,-315.23)"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1"
+     id="layer1">
+    <path
+       d="m 230.73879,315.23145 c 0.0818,0.008 0.21881,0.072 0.2726,0.0402 0.0663,-0.0393 -0.0412,0.17206 0.0294,0.13012 0.0353,-0.021 0.0558,0.2743 0.0192,0.46024 -0.0366,0.18595 -0.0289,0.36014 0.0539,0.36265 0.0827,0.003 -0.19138,0.30145 0.10511,0.12437 0.0413,-0.0246 0.89486,-0.0408 0.91554,-0.0525 -0.0155,0.005 -0.0219,-0.001 0.0123,-0.0382 0.0542,-0.0592 0.039,-0.051 0.0339,-0.0488 0.005,-0.005 0.0247,-0.0239 0.0951,-0.0861 0.19093,-0.16861 0.70924,-0.64165 0.64949,-0.54924 -0.0599,0.0924 0.30598,-0.18953 0.5086,-0.29184 0.0144,-0.008 0.0208,-0.0103 0.0302,-0.0162 -0.005,0.0151 0.0183,0.0317 0.1244,0.0344 0.14674,0.005 0.0678,0.1955 -0.006,0.32535 0.01,-0.0151 0.0199,-0.0283 0.0327,-0.0469 0.34626,-0.4887 -0.1088,0.50282 -0.12715,0.66884 -0.0182,0.16604 -0.0354,0.4342 -0.0475,0.64492 -0.0123,0.21073 0.19511,1.48143 0.21953,1.62183 0.0245,0.14048 -0.0111,0.21712 0.12897,0.31289 0.14044,0.0959 0.2926,0.25504 0.42079,0.38274 0.1282,0.12771 0.67732,0.57487 0.89097,0.76645 0.21368,0.19157 0.48256,0.44761 0.60466,0.63916 0.12209,0.19158 0.20729,0.35039 0.25612,0.51001 0.0487,0.15963 0.22623,0.65786 0.25065,0.78557 0.0245,0.12771 0.25629,0.44698 0.39061,0.64492 0.13429,0.19794 0.53126,0.49204 0.71441,0.59422 0.18313,0.10222 0.6407,0.43422 0.85436,0.60665 0.21368,0.17241 0.56131,0.38908 0.61016,0.42101 0.0487,0.0319 0.53162,0.34505 0.66593,0.39615 0.13429,0.051 0.34839,0.21983 0.3659,0.24875 0.0175,0.0291 -3.6e-4,0.27695 -0.0521,0.4124 -0.0518,0.13548 -0.20275,0.35671 -0.25888,0.43345 -0.0561,0.0767 -0.12996,0.0854 -0.17744,0.12153 -0.0474,0.0362 -0.0732,0.16936 -0.24425,0.50141 -0.17094,0.33205 -0.48832,0.45983 -0.63483,0.54922 -0.14652,0.0895 -0.45121,0.0765 -0.51227,0.0765 -0.061,0 -0.0368,0.0129 -0.098,0.11471 -0.0612,0.10222 -0.42707,0.29407 -0.53696,0.28132 -0.10979,-0.0129 -0.89161,-0.22992 -1.14797,-0.29376 -0.25642,-0.0639 -1.59993,-0.51598 -2.01429,-0.55211 -0.41439,-0.036 -0.75925,0.18012 -1.0355,0.36072 -0.27627,0.18062 -0.69108,0.68701 -0.89832,0.83151 -0.2072,0.14451 -0.1573,-0.13567 -0.51775,0.0355 -0.36045,0.1711 -1.00097,0.83126 -1.3117,1.37311 -0.1848,0.3222 -0.3242,1.27098 -0.67326,2.16152 -3.43206,-1.29003 -5.88004,-4.71992 -5.88004,-8.75994 0,-0.47241 0.0343,-0.93601 0.0987,-1.38938 1.18535,-0.55021 2.21364,-1.39463 2.22564,-1.39986 0.0153,-0.008 0.0375,-0.0178 0.0667,-0.0335 0.0294,-0.0157 2.49518,-2.60508 2.53658,-2.62846 0.0414,-0.0233 1.07171,-1.15947 1.1233,-1.18942 0.0517,-0.0299 0.76157,-0.55616 0.82145,-0.59131 0.0111,-0.008 0.0268,-0.009 0.0457,-0.008 z m 2.72496,0.0344 c 0.007,-0.0237 0.0745,-0.0416 0,0 z"
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#0092da;fill-opacity:1;stroke-width:0.0914553"
+       sodipodi:nodetypes="ccsccccccscccccccccsssscccccccccccsssccsssssscscccccccccc"
+       id="path6899" />
+  </g>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2011-12-27T10:10:06</dc:date>
+        <dc:description>Dog Head profile</dc:description>
+        <dc:source>https://openclipart.org/detail/166603/dog-head-profile-by-printerkiller</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>PrinterKiller</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>Dog Head profile silhouette</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
Index: /trunk/resources/images/presets/health/animal_shelter.svg
===================================================================
--- /trunk/resources/images/presets/health/animal_shelter.svg	(revision 17142)
+++ /trunk/resources/images/presets/health/animal_shelter.svg	(revision 17142)
@@ -0,0 +1,107 @@
+<?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"
+   id="svg3795"
+   sodipodi:docname="DogProfile10.svg"
+   viewBox="0 0 16 16.000001"
+   version="1.1"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   width="16"
+   height="16">
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     id="base"
+     bordercolor="#666666"
+     inkscape:pageshadow="2"
+     inkscape:window-y="0"
+     fit-margin-left="0"
+     pagecolor="#ffffff"
+     fit-margin-top="0"
+     inkscape:window-maximized="0"
+     inkscape:zoom="45.254834"
+     inkscape:window-x="0"
+     inkscape:window-height="988"
+     showgrid="true"
+     borderopacity="1.0"
+     inkscape:current-layer="layer1"
+     inkscape:cx="6.3777936"
+     inkscape:cy="3.3565475"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1664"
+     inkscape:pageopacity="0.0"
+     inkscape:document-units="px"
+     inkscape:document-rotation="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid833" />
+  </sodipodi:namedview>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(-223.82,-315.23)">
+    <path
+       id="path6899"
+       sodipodi:nodetypes="ccsccccccscccccccccsssscccccccccccsssccsssssscscccccccccc"
+       style="color:#000000;fill:#734a08;fill-opacity:1;stroke-width:0.0726541"
+       inkscape:connector-curvature="0"
+       d="m 229.4415,315.23113 c 0.0665,0.006 0.17779,0.0559 0.22149,0.0312 0.0539,-0.0305 -0.0335,0.13365 0.0239,0.10107 0.0287,-0.0163 0.0453,0.21306 0.0156,0.35749 -0.0297,0.14444 -0.0235,0.27974 0.0438,0.28169 0.0672,0.002 -0.1555,0.23415 0.0854,0.0966 0.0336,-0.0191 0.72707,-0.0317 0.74387,-0.0408 -0.0126,0.004 -0.0178,-8.2e-4 0.01,-0.0297 0.044,-0.046 0.0317,-0.0396 0.0275,-0.0379 0.004,-0.004 0.0201,-0.0186 0.0773,-0.0669 0.15513,-0.13097 0.57626,-0.4984 0.52771,-0.42662 -0.0487,0.0718 0.24861,-0.14722 0.41324,-0.22669 0.0117,-0.006 0.0169,-0.008 0.0245,-0.0126 -0.004,0.0117 0.0149,0.0246 0.10108,0.0267 0.11922,0.004 0.0551,0.15185 -0.005,0.25271 0.008,-0.0117 0.0162,-0.022 0.0266,-0.0364 0.28134,-0.3796 -0.0884,0.39056 -0.10331,0.51952 -0.0148,0.12897 -0.0288,0.33726 -0.0386,0.50094 -0.01,0.16368 0.15853,1.1507 0.17837,1.25975 0.0199,0.10912 -0.009,0.16865 0.10479,0.24304 0.1141,0.0745 0.23773,0.1981 0.34189,0.29729 0.10416,0.0992 0.55032,0.44653 0.72391,0.59534 0.17361,0.1488 0.39208,0.34768 0.49128,0.49647 0.0992,0.14881 0.16843,0.27216 0.2081,0.39615 0.0396,0.12399 0.18381,0.51099 0.20365,0.61019 0.0199,0.0992 0.20824,0.34719 0.31737,0.50094 0.10911,0.15375 0.43165,0.38219 0.58046,0.46156 0.14879,0.0794 0.52057,0.33728 0.69417,0.47121 0.17361,0.13392 0.45606,0.30222 0.49575,0.32702 0.0396,0.0248 0.43194,0.26802 0.54107,0.30771 0.10911,0.0396 0.28306,0.17075 0.29729,0.19322 0.0142,0.0226 -2.9e-4,0.21512 -0.0423,0.32033 -0.0421,0.10523 -0.16473,0.27707 -0.21034,0.33668 -0.0456,0.0596 -0.10559,0.0663 -0.14417,0.0944 -0.0385,0.0281 -0.0595,0.13155 -0.19845,0.38947 -0.13889,0.25792 -0.39676,0.35717 -0.5158,0.4266 -0.11905,0.0695 -0.36661,0.0594 -0.41622,0.0594 -0.0496,0 -0.0299,0.01 -0.0796,0.0891 -0.0497,0.0794 -0.34699,0.22842 -0.43628,0.21852 -0.0892,-0.01 -0.72443,-0.17859 -0.93272,-0.22818 -0.20834,-0.0496 -1.29994,-0.40079 -1.63661,-0.42885 -0.33669,-0.028 -0.61689,0.13991 -0.84134,0.28019 -0.22447,0.14029 -0.5615,0.53363 -0.72988,0.64587 -0.16835,0.11225 -0.12781,-0.10538 -0.42067,0.0276 -0.29287,0.1329 -0.81329,0.64568 -1.06576,1.06656 -0.15015,0.25027 -0.26341,0.98723 -0.54702,1.67896 -2.78854,-1.00203 -4.77752,-3.66619 -4.77752,-6.80427 0,-0.36695 0.0279,-0.72705 0.0802,-1.0792 0.9631,-0.42738 1.79858,-1.08328 1.80833,-1.08734 0.0124,-0.006 0.0305,-0.0138 0.0542,-0.026 0.0239,-0.0122 2.02733,-2.02349 2.06097,-2.04165 0.0336,-0.0181 0.87076,-0.90062 0.91268,-0.92388 0.042,-0.0232 0.61877,-0.432 0.66742,-0.4593 0.009,-0.006 0.0218,-0.007 0.0371,-0.006 z m 2.21403,0.0267 c 0.006,-0.0184 0.0605,-0.0323 0,0 z" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 236.82,331.23 v -6"
+       id="path835" />
+    <path
+       style="fill:none;stroke:#ff0000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 239.82,328.23 h -6"
+       id="path841" />
+  </g>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:publisher>
+          <cc:Agent
+             rdf:about="http://openclipart.org/">
+            <dc:title>Openclipart</dc:title>
+          </cc:Agent>
+        </dc:publisher>
+        <dc:title></dc:title>
+        <dc:date>2011-12-27T10:10:06</dc:date>
+        <dc:description>Dog Head profile</dc:description>
+        <dc:source>https://openclipart.org/detail/166603/dog-head-profile-by-printerkiller</dc:source>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>PrinterKiller</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>Dog Head profile silhouette</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+</svg>
Index: /trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/resources/styles/standard/elemstyles.mapcss	(revision 17141)
+++ /trunk/resources/styles/standard/elemstyles.mapcss	(revision 17142)
@@ -3013,4 +3013,5 @@
     set icon_z17;
 }
+area[amenity=animal_boarding],
 area[amenity=place_of_worship],
 area[amenity=monastery],
@@ -3028,4 +3029,8 @@
     fill-color: amenity_light#f7efb7;
 }
+node[amenity=animal_boarding] {
+    icon-image: "presets/accommodation/animal_boarding.svg";
+    set icon_z17;
+}
 node[amenity=place_of_worship] {
     icon-image: "presets/religion/religion.svg";
@@ -3152,4 +3157,5 @@
 area[amenity=doctors],
 area[amenity=dentist],
+area[amenity=animal_shelter],
 area[amenity=veterinary] {
     fill-color: health#eeeeee;
@@ -3202,4 +3208,8 @@
 node[amenity=dentist] {
     icon-image: "presets/health/dentist.svg";
+    set icon_z17;
+}
+node[amenity=animal_shelter] {
+    icon-image: "presets/health/animal_shelter.svg";
     set icon_z17;
 }