diff --git a/.env.development b/.env.development
index 1ffbbf5b9..4319b2923 100644
--- a/.env.development
+++ b/.env.development
@@ -23,4 +23,4 @@ NEXT_PUBLIC_USE_MOCKS=true
# z.B. http://10.10.0.13/xyz/index.aspx -> basePath in config.json auf /xyz setzen
# basePath wird jetzt in public/config.json gepflegt
# App-Versionsnummer
-NEXT_PUBLIC_APP_VERSION=1.1.363
+NEXT_PUBLIC_APP_VERSION=1.1.364
diff --git a/.env.production b/.env.production
index ad8f3a4b5..39641d118 100644
--- a/.env.production
+++ b/.env.production
@@ -24,4 +24,4 @@ NEXT_PUBLIC_USE_MOCKS=false
# basePath wird jetzt in public/config.json gepflegt
# App-Versionsnummer
-NEXT_PUBLIC_APP_VERSION=1.1.363
+NEXT_PUBLIC_APP_VERSION=1.1.364
diff --git a/components/icons/material-symbols/AlarmIcon.js b/components/icons/material-symbols/AlarmIcon.js
new file mode 100644
index 000000000..9f7c5f9fb
--- /dev/null
+++ b/components/icons/material-symbols/AlarmIcon.js
@@ -0,0 +1,18 @@
+const AlarmIcon = ({ className = "h-8 w-8" }) => (
+
+);
+
+export default AlarmIcon;
diff --git a/components/icons/material-symbols/EditIcon.js b/components/icons/material-symbols/EditIcon.js
new file mode 100644
index 000000000..315bee6a3
--- /dev/null
+++ b/components/icons/material-symbols/EditIcon.js
@@ -0,0 +1,18 @@
+const EditIcon = ({ className = "h-8 w-8" }) => (
+
+);
+
+export default EditIcon;
diff --git a/components/icons/material-symbols/EditOffIcon.js b/components/icons/material-symbols/EditOffIcon.js
new file mode 100644
index 000000000..db54a2817
--- /dev/null
+++ b/components/icons/material-symbols/EditOffIcon.js
@@ -0,0 +1,18 @@
+const EditOffIcon = ({ className = "h-8 w-8" }) => (
+
+);
+
+export default EditOffIcon;
diff --git a/components/icons/material-symbols/ExpandIcon.js b/components/icons/material-symbols/ExpandIcon.js
new file mode 100644
index 000000000..323069d1d
--- /dev/null
+++ b/components/icons/material-symbols/ExpandIcon.js
@@ -0,0 +1,18 @@
+const ExpandIcon = ({ className = "h-8 w-8" }) => (
+
+);
+
+export default ExpandIcon;
diff --git a/components/icons/material-symbols/InfoIcon.js b/components/icons/material-symbols/InfoIcon.js
new file mode 100644
index 000000000..ea7e5a996
--- /dev/null
+++ b/components/icons/material-symbols/InfoIcon.js
@@ -0,0 +1,18 @@
+const InfoIcon = ({ className = "h-8 w-8" }) => (
+
+);
+
+export default InfoIcon;
diff --git a/components/icons/material-symbols/MapMarkerIcon.js b/components/icons/material-symbols/MapMarkerIcon.js
new file mode 100644
index 000000000..f011f7410
--- /dev/null
+++ b/components/icons/material-symbols/MapMarkerIcon.js
@@ -0,0 +1,19 @@
+const MapMarkerIcon = ({ className = "h-8 w-8" }) => (
+
+);
+
+export default MapMarkerIcon;
diff --git a/components/icons/material-symbols/MenuIcon.js b/components/icons/material-symbols/MenuIcon.js
new file mode 100644
index 000000000..a780099a5
--- /dev/null
+++ b/components/icons/material-symbols/MenuIcon.js
@@ -0,0 +1,18 @@
+const MenuIcon = ({ className = "h-8 w-8" }) => (
+
+);
+
+export default MenuIcon;
diff --git a/components/icons/material-symbols/SearchIcon.js b/components/icons/material-symbols/SearchIcon.js
new file mode 100644
index 000000000..b0d4c7f00
--- /dev/null
+++ b/components/icons/material-symbols/SearchIcon.js
@@ -0,0 +1,18 @@
+const SearchIcon = ({ className = "h-8 w-8" }) => (
+
+);
+
+export default SearchIcon;
diff --git a/components/mainComponent/MapComponent.js b/components/mainComponent/MapComponent.js
index e248e0642..81ec36c00 100644
--- a/components/mainComponent/MapComponent.js
+++ b/components/mainComponent/MapComponent.js
@@ -7,6 +7,14 @@ import "leaflet-contextmenu";
import "leaflet.smooth_marker_bouncing";
import "react-toastify/dist/ReactToastify.css";
import { Icon } from "@iconify/react";
+import EditIcon from "@/components/icons/material-symbols/EditIcon";
+import EditOffIcon from "@/components/icons/material-symbols/EditOffIcon";
+import SearchIcon from "@/components/icons/material-symbols/SearchIcon";
+import MenuIcon from "@/components/icons/material-symbols/MenuIcon";
+import InfoIcon from "@/components/icons/material-symbols/InfoIcon";
+import AlarmIcon from "@/components/icons/material-symbols/AlarmIcon";
+import MapMarkerIcon from "@/components/icons/material-symbols/MapMarkerIcon";
+import ExpandIcon from "@/components/icons/material-symbols/ExpandIcon";
import PoiUpdateModal from "@/components/pois/poiUpdateModal/PoiUpdateModal.js";
import { ToastContainer, toast } from "react-toastify";
import plusRoundIcon from "../icons/devices/overlapping/PlusRoundIcon.js";
@@ -1136,7 +1144,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
className="rounded-full bg-white/90 hover:bg-white shadow p-1"
title="Alarm"
>
-