diff --git a/Docs/Misc/gen.sh b/Docs/Misc/gen.sh
new file mode 100755
index 000000000..8304eee24
--- /dev/null
+++ b/Docs/Misc/gen.sh
@@ -0,0 +1,2 @@
+ 
+dot -Tps geolocation_button.gv -Tsvg -O
diff --git a/Docs/Misc/geolocation_button.gv b/Docs/Misc/geolocation_button.gv
new file mode 100644
index 000000000..3881519e4
--- /dev/null
+++ b/Docs/Misc/geolocation_button.gv
@@ -0,0 +1,22 @@
+digraph G {
+   init [shape=box]
+   denied
+   init -> denied [label="geolocation permanently denied"]
+   init -> getting_location [label="previously granted flag set"]
+   init -> idle [label="previously granted flag unset"]
+   idle
+   idle -> request_permission [label="on click"]
+   request_permission
+   request_permission -> getting_location [label="granted (sets flag)"]
+   request_permission -> idle [label="not granted"]
+   request_permission -> denied [label="permanently denied"]
+   getting_location
+   location_found
+   getting_location -> location_found [label="location found"]
+   location_found -> open_lock [label="on click (zooms to location)"]
+   open_lock
+   open_lock -> location_found [label="after 3 sec"]
+   closed_lock
+   open_lock -> closed_lock [label="on click (locks zoom to location)"]
+   closed_lock -> location_found [label="on click"]
+}
diff --git a/Docs/Misc/geolocation_button.gv.svg b/Docs/Misc/geolocation_button.gv.svg
new file mode 100644
index 000000000..6dbf78848
--- /dev/null
+++ b/Docs/Misc/geolocation_button.gv.svg
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Generated by graphviz version 2.43.0 (0)
+ -->
+<!-- Title: G Pages: 1 -->
+<svg width="664pt" height="566pt"
+ viewBox="0.00 0.00 664.25 566.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 562)">
+<title>G</title>
+<polygon fill="white" stroke="transparent" points="-4,4 -4,-562 660.25,-562 660.25,4 -4,4"/>
+<!-- init -->
+<g id="node1" class="node">
+<title>init</title>
+<polygon fill="none" stroke="black" points="242.25,-558 188.25,-558 188.25,-522 242.25,-522 242.25,-558"/>
+<text text-anchor="middle" x="215.25" y="-536.3" font-family="Times,serif" font-size="14.00">init</text>
+</g>
+<!-- denied -->
+<g id="node2" class="node">
+<title>denied</title>
+<ellipse fill="none" stroke="black" cx="42.25" cy="-279" rx="42.49" ry="18"/>
+<text text-anchor="middle" x="42.25" y="-275.3" font-family="Times,serif" font-size="14.00">denied</text>
+</g>
+<!-- init&#45;&gt;denied -->
+<g id="edge1" class="edge">
+<title>init&#45;&gt;denied</title>
+<path fill="none" stroke="black" d="M188.23,-531.67C143.21,-517.82 54.16,-483.1 17.25,-417 -2.35,-381.91 14.04,-334.64 27.95,-305.79"/>
+<polygon fill="black" stroke="black" points="31.12,-307.26 32.51,-296.76 24.88,-304.1 31.12,-307.26"/>
+<text text-anchor="middle" x="132.25" y="-405.8" font-family="Times,serif" font-size="14.00">geolocation permanently denied</text>
+</g>
+<!-- getting_location -->
+<g id="node3" class="node">
+<title>getting_location</title>
+<ellipse fill="none" stroke="black" cx="366.25" cy="-279" rx="85.29" ry="18"/>
+<text text-anchor="middle" x="366.25" y="-275.3" font-family="Times,serif" font-size="14.00">getting_location</text>
+</g>
+<!-- init&#45;&gt;getting_location -->
+<g id="edge2" class="edge">
+<title>init&#45;&gt;getting_location</title>
+<path fill="none" stroke="black" d="M242.41,-538.69C294.16,-537.46 403.84,-531.59 427.25,-504 481.59,-439.95 469.34,-387.69 427.25,-315 424.07,-309.52 419.68,-304.83 414.7,-300.82"/>
+<polygon fill="black" stroke="black" points="416.68,-297.93 406.47,-295.09 412.67,-303.68 416.68,-297.93"/>
+<text text-anchor="middle" x="559.75" y="-405.8" font-family="Times,serif" font-size="14.00">previously granted flag set</text>
+</g>
+<!-- idle -->
+<g id="node4" class="node">
+<title>idle</title>
+<ellipse fill="none" stroke="black" cx="255.25" cy="-453" rx="27.9" ry="18"/>
+<text text-anchor="middle" x="255.25" y="-449.3" font-family="Times,serif" font-size="14.00">idle</text>
+</g>
+<!-- init&#45;&gt;idle -->
+<g id="edge3" class="edge">
+<title>init&#45;&gt;idle</title>
+<path fill="none" stroke="black" d="M212.27,-521.58C211.37,-511.6 211.62,-499.1 216.25,-489 218.98,-483.03 223.28,-477.64 228.03,-472.99"/>
+<polygon fill="black" stroke="black" points="230.48,-475.49 235.73,-466.29 225.89,-470.21 230.48,-475.49"/>
+<text text-anchor="middle" x="321.75" y="-492.8" font-family="Times,serif" font-size="14.00">previously granted flag unset</text>
+</g>
+<!-- location_found -->
+<g id="node6" class="node">
+<title>location_found</title>
+<ellipse fill="none" stroke="black" cx="366.25" cy="-192" rx="77.99" ry="18"/>
+<text text-anchor="middle" x="366.25" y="-188.3" font-family="Times,serif" font-size="14.00">location_found</text>
+</g>
+<!-- getting_location&#45;&gt;location_found -->
+<g id="edge8" class="edge">
+<title>getting_location&#45;&gt;location_found</title>
+<path fill="none" stroke="black" d="M366.25,-260.8C366.25,-249.16 366.25,-233.55 366.25,-220.24"/>
+<polygon fill="black" stroke="black" points="369.75,-220.18 366.25,-210.18 362.75,-220.18 369.75,-220.18"/>
+<text text-anchor="middle" x="417.25" y="-231.8" font-family="Times,serif" font-size="14.00">location found</text>
+</g>
+<!-- request_permission -->
+<g id="node5" class="node">
+<title>request_permission</title>
+<ellipse fill="none" stroke="black" cx="264.25" cy="-366" rx="102.08" ry="18"/>
+<text text-anchor="middle" x="264.25" y="-362.3" font-family="Times,serif" font-size="14.00">request_permission</text>
+</g>
+<!-- idle&#45;&gt;request_permission -->
+<g id="edge4" class="edge">
+<title>idle&#45;&gt;request_permission</title>
+<path fill="none" stroke="black" d="M282.79,-448.82C302.7,-444.93 328.29,-436.26 341.25,-417 349.95,-404.06 340.76,-393.72 326.08,-385.86"/>
+<polygon fill="black" stroke="black" points="327.44,-382.63 316.9,-381.53 324.45,-388.96 327.44,-382.63"/>
+<text text-anchor="middle" x="371.75" y="-405.8" font-family="Times,serif" font-size="14.00">on click</text>
+</g>
+<!-- request_permission&#45;&gt;denied -->
+<g id="edge7" class="edge">
+<title>request_permission&#45;&gt;denied</title>
+<path fill="none" stroke="black" d="M202.76,-351.6C180.78,-345.99 156.06,-338.72 134.25,-330 113.26,-321.61 90.96,-309.57 73.57,-299.42"/>
+<polygon fill="black" stroke="black" points="75.34,-296.4 64.96,-294.3 71.77,-302.42 75.34,-296.4"/>
+<text text-anchor="middle" x="206.25" y="-318.8" font-family="Times,serif" font-size="14.00">permanently denied</text>
+</g>
+<!-- request_permission&#45;&gt;getting_location -->
+<g id="edge5" class="edge">
+<title>request_permission&#45;&gt;getting_location</title>
+<path fill="none" stroke="black" d="M271.38,-348C276.49,-337.43 284.24,-324.16 294.25,-315 300.73,-309.07 308.39,-303.93 316.27,-299.56"/>
+<polygon fill="black" stroke="black" points="317.92,-302.64 325.2,-294.94 314.71,-296.43 317.92,-302.64"/>
+<text text-anchor="middle" x="360.75" y="-318.8" font-family="Times,serif" font-size="14.00">granted (sets flag)</text>
+</g>
+<!-- request_permission&#45;&gt;idle -->
+<g id="edge6" class="edge">
+<title>request_permission&#45;&gt;idle</title>
+<path fill="none" stroke="black" d="M257.1,-384.15C255.12,-389.74 253.24,-396.04 252.25,-402 251.02,-409.35 250.95,-417.37 251.4,-424.8"/>
+<polygon fill="black" stroke="black" points="247.92,-425.14 252.32,-434.78 254.89,-424.5 247.92,-425.14"/>
+<text text-anchor="middle" x="294.75" y="-405.8" font-family="Times,serif" font-size="14.00">not granted</text>
+</g>
+<!-- open_lock -->
+<g id="node7" class="node">
+<title>open_lock</title>
+<ellipse fill="none" stroke="black" cx="333.25" cy="-105" rx="55.79" ry="18"/>
+<text text-anchor="middle" x="333.25" y="-101.3" font-family="Times,serif" font-size="14.00">open_lock</text>
+</g>
+<!-- location_found&#45;&gt;open_lock -->
+<g id="edge9" class="edge">
+<title>location_found&#45;&gt;open_lock</title>
+<path fill="none" stroke="black" d="M359.57,-173.8C354.98,-161.97 348.79,-146.03 343.56,-132.58"/>
+<polygon fill="black" stroke="black" points="346.68,-130.94 339.8,-122.89 340.16,-133.47 346.68,-130.94"/>
+<text text-anchor="middle" x="448.25" y="-144.8" font-family="Times,serif" font-size="14.00">on click (zooms to location)</text>
+</g>
+<!-- open_lock&#45;&gt;location_found -->
+<g id="edge10" class="edge">
+<title>open_lock&#45;&gt;location_found</title>
+<path fill="none" stroke="black" d="M295.44,-118.33C275.01,-127.12 256.04,-140.15 267.25,-156 273.92,-165.44 283.37,-172.35 293.8,-177.41"/>
+<polygon fill="black" stroke="black" points="292.6,-180.7 303.17,-181.39 295.34,-174.26 292.6,-180.7"/>
+<text text-anchor="middle" x="305.25" y="-144.8" font-family="Times,serif" font-size="14.00">after 3 sec</text>
+</g>
+<!-- closed_lock -->
+<g id="node8" class="node">
+<title>closed_lock</title>
+<ellipse fill="none" stroke="black" cx="454.25" cy="-18" rx="63.09" ry="18"/>
+<text text-anchor="middle" x="454.25" y="-14.3" font-family="Times,serif" font-size="14.00">closed_lock</text>
+</g>
+<!-- open_lock&#45;&gt;closed_lock -->
+<g id="edge11" class="edge">
+<title>open_lock&#45;&gt;closed_lock</title>
+<path fill="none" stroke="black" d="M328.89,-87.05C327.23,-76.5 327.17,-63.24 334.25,-54 346.04,-38.59 364.24,-29.68 382.92,-24.6"/>
+<polygon fill="black" stroke="black" points="383.78,-28 392.71,-22.28 382.17,-21.18 383.78,-28"/>
+<text text-anchor="middle" x="447.75" y="-57.8" font-family="Times,serif" font-size="14.00">on click (locks zoom to location)</text>
+</g>
+<!-- closed_lock&#45;&gt;location_found -->
+<g id="edge12" class="edge">
+<title>closed_lock&#45;&gt;location_found</title>
+<path fill="none" stroke="black" d="M513.08,-24.74C531.5,-29.64 549.95,-38.41 561.25,-54 588.04,-90.95 580.67,-122.9 549.25,-156 535.31,-170.68 491.24,-179.37 449.85,-184.42"/>
+<polygon fill="black" stroke="black" points="449.22,-180.97 439.68,-185.6 450.02,-187.93 449.22,-180.97"/>
+<text text-anchor="middle" x="604.75" y="-101.3" font-family="Times,serif" font-size="14.00">on click</text>
+</g>
+</g>
+</svg>
diff --git a/Logic/Actors/AvailableBaseLayersImplementation.ts b/Logic/Actors/AvailableBaseLayersImplementation.ts
index 5d7116381..09f5cfe42 100644
--- a/Logic/Actors/AvailableBaseLayersImplementation.ts
+++ b/Logic/Actors/AvailableBaseLayersImplementation.ts
@@ -175,7 +175,7 @@ export default class AvailableBaseLayersImplementation implements AvailableBaseL
             // Note: if layer.geometry is null, there is global coverage for this layer
             layers.push({
                 id: props.id,
-                max_zoom: props.max_zoom ?? 25,
+                max_zoom: props.max_zoom ?? 19,
                 min_zoom: props.min_zoom ?? 1,
                 name: props.name,
                 layer: leafletLayer,
diff --git a/langs/nl.json b/langs/nl.json
index fa7a85612..33a56e19a 100644
--- a/langs/nl.json
+++ b/langs/nl.json
@@ -137,7 +137,7 @@
         "getStartedNewAccount": " of <a href='https://www.openstreetmap.org/user/new' target='_blank'>maak een nieuwe account aan</a>",
         "noTagsSelected": "Geen tags geselecteerd",
         "customThemeIntro": "<h3>Onofficiële thema's</h3>De onderstaande thema's heb je eerder bezocht en zijn gemaakt door andere OpenStreetMappers.",
-        "aboutMapcomplete": "<h3>Over MapComplete</h3><p>Met MapComplete kun je OpenStreetMap verrijken met informatie over een bepaald thema. Beantwoord enkele vragen, en binnen een paar minuten is jouw bijdrage wereldwijd beschikbaar! De <b>maker van het thema</b> bepaalt de elementen, vragen en taalversies voor het thema.</p><h3>Ontdek meer</h3><p>MapComplete <b>biedt altijd de volgende stap</b> naar meer OpenStreetMap:</p><ul><li>Indien ingebed in een website linkt het iframe naar de volledige MapComplete</li><li>De volledige versie heeft uitleg over OpenStreetMap</li><li>Bekijken kan altijd, maar wijzigen vereist een OSM-account</li><li>Als je niet aangemeld bent, wordt je gevraagd dit te doen</li><li>Als je minstens één vraag hebt beantwoord, kan je ook elementen toevoegen</li><li>Heb je genoeg changesets, dan verschijnen de OSM-tags, nog later links naar de wiki</li></ul><p></p><p>Merk je <b>een bug</b> of wil je een <b>extra feature</b>? Wil je <b>helpen vertalen</b>? Bezoek dan de <a href=\"https://github.com/pietervdvn/MapComplete\" target=\"_blank\">broncode</a> en <a href=\"https://github.com/pietervdvn/MapComplete/issues\" target=\"_blank\">issue tracker</a>. </p><p></p>Wil je <b>je vorderingen</b> zien? Volg de edits <a href=\"[osmcha_link}\" target=\"_blank\">op OsmCha</a>.<p></p>",
+        "aboutMapcomplete": "<h3>Over MapComplete</h3><p>Met MapComplete kun je OpenStreetMap verrijken met informatie over een bepaald thema. Beantwoord enkele vragen, en binnen een paar minuten is jouw bijdrage wereldwijd beschikbaar! De <b>maker van het thema</b> bepaalt de elementen, vragen en taalversies voor het thema.</p><h3>Ontdek meer</h3><p>MapComplete <b>biedt altijd de volgende stap</b> naar meer OpenStreetMap:</p><ul><li>Indien ingebed in een website linkt het iframe naar de volledige MapComplete</li><li>De volledige versie heeft uitleg over OpenStreetMap</li><li>Bekijken kan altijd, maar wijzigen vereist een OSM-account</li><li>Als je niet aangemeld bent, wordt je gevraagd dit te doen</li><li>Als je minstens één vraag hebt beantwoord, kan je ook elementen toevoegen</li><li>Heb je genoeg changesets, dan verschijnen de OSM-tags, nog later links naar de wiki</li></ul><p></p><p>Merk je <b>een bug</b> of wil je een <b>extra feature</b>? Wil je <b>helpen vertalen</b>? Bezoek dan de <a href=\"https://github.com/pietervdvn/MapComplete\" target=\"_blank\">broncode</a> en <a href=\"https://github.com/pietervdvn/MapComplete/issues\" target=\"_blank\">issue tracker</a>. </p><p></p>Wil je <b>je vorderingen</b> zien? Volg de edits <a href=\"{osmcha_link}\" target=\"_blank\">op OsmCha</a>.<p></p>",
         "backgroundMap": "Achtergrondkaart",
         "layerSelection": {
             "zoomInToSeeThisLayer": "Vergroot de kaart om deze laag te zien",