diff --git a/src/lib/components/common/Valves/MapSelector.svelte b/src/lib/components/common/Valves/MapSelector.svelte
index a6568ba708..b6b934dc4a 100644
--- a/src/lib/components/common/Valves/MapSelector.svelte
+++ b/src/lib/components/common/Valves/MapSelector.svelte
@@ -30,7 +30,7 @@
 
 			try {
 				map.fitBounds(markerGroupLayer.getBounds(), {
-					maxZoom: 13
+					maxZoom: Math.max(map.getZoom(), 13)
 				});
 			} catch (error) {}
 		}
diff --git a/static/marker-icon.png b/static/marker-icon.png
new file mode 100644
index 0000000000..02b33c2177
Binary files /dev/null and b/static/marker-icon.png differ
diff --git a/static/marker-shadow.png b/static/marker-shadow.png
new file mode 100644
index 0000000000..81b9505a7b
Binary files /dev/null and b/static/marker-shadow.png differ