diff --git a/apps/dispatch/app/_components/map/BaseMaps.tsx b/apps/dispatch/app/_components/map/BaseMaps.tsx
index 6648ea4a..e50e6644 100644
--- a/apps/dispatch/app/_components/map/BaseMaps.tsx
+++ b/apps/dispatch/app/_components/map/BaseMaps.tsx
@@ -122,7 +122,7 @@ const HeliportsLayer = () => {
 		};
 
 		const filterVisibleHeliports = () => {
-			const bounds = map.getBounds();
+			const bounds = map?.getBounds();
 			if (!heliports?.length) return;
 			// Filtere die Heliports, die innerhalb der Kartenansicht liegen
 			const visibleHeliports = heliports.filter((heliport) => {
diff --git a/apps/dispatch/app/_components/map/MapAdditionals.tsx b/apps/dispatch/app/_components/map/MapAdditionals.tsx
index ff7c5162..f60a2829 100644
--- a/apps/dispatch/app/_components/map/MapAdditionals.tsx
+++ b/apps/dispatch/app/_components/map/MapAdditionals.tsx
@@ -12,6 +12,7 @@ import { useDispatchConnectionStore } from "_store/dispatch/connectionStore";
 export const MapAdditionals = () => {
 	const { isOpen, missionFormValues } = usePannelStore((state) => state);
 	const dispatcherConnectionState = useDispatchConnectionStore((state) => state.status);
+
 	const { data: missions = [] } = useQuery({
 		queryKey: ["missions"],
 		queryFn: () =>
@@ -35,7 +36,8 @@ export const MapAdditionals = () => {
 			m.state === "draft" &&
 			m.hpgLocationLat &&
 			dispatcherConnectionState === "connected" &&
-			m.hpgLocationLng,
+			m.hpgLocationLng &&
+			mapStore.openMissionMarker.find((openMission) => openMission.id === m.id),
 	);
 
 	return (
@@ -56,7 +58,7 @@ export const MapAdditionals = () => {
 					key={mission.id}
 					position={[mission.hpgLocationLat!, mission.hpgLocationLng!]}
 					icon={L.icon({
-						iconUrl: "/icons/mapMarker.png",
+						iconUrl: "/icons/mapMarkerAttention.png",
 						iconSize: [40, 40],
 						iconAnchor: [20, 35],
 					})}
diff --git a/apps/dispatch/app/_components/map/MissionMarkers.tsx b/apps/dispatch/app/_components/map/MissionMarkers.tsx
index 92a0de35..ccafa9e5 100644
--- a/apps/dispatch/app/_components/map/MissionMarkers.tsx
+++ b/apps/dispatch/app/_components/map/MissionMarkers.tsx
@@ -23,7 +23,7 @@ export const MISSION_STATUS_COLORS: Record<MissionState | "attention", string> =
 	draft: "#0092b8",
 	running: "#155dfc",
 	finished: "#155dfc",
-	attention: "rgb(186,105,0)",
+	attention: "#ba6900",
 };
 
 export const MISSION_STATUS_TEXT_COLORS: Record<MissionState, string> = {
diff --git a/apps/dispatch/public/icons/mapMarkerAttention.png b/apps/dispatch/public/icons/mapMarkerAttention.png
new file mode 100644
index 00000000..69e89af3
Binary files /dev/null and b/apps/dispatch/public/icons/mapMarkerAttention.png differ
diff --git a/packages/shared-components/components/Changelog.tsx b/packages/shared-components/components/Changelog.tsx
index 72f4cd1e..7bf98e85 100644
--- a/packages/shared-components/components/Changelog.tsx
+++ b/packages/shared-components/components/Changelog.tsx
@@ -2,7 +2,7 @@
 import { useState } from "react";
 import { Button, cn } from "@repo/shared-components";
 import MDEditor from "@uiw/react-md-editor";
-import { RefreshCw } from "lucide-react";
+import { Check, RefreshCw } from "lucide-react";
 import { Changelog } from "@repo/db";
 
 export const ChangelogModal = ({
@@ -50,7 +50,8 @@ export const ChangelogModal = ({
 
 				<div className="modal-action">
 					<Button className="btn btn-info btn-outline" onClick={onClose}>
-						Weiter zum HUB
+						<Check size={20} />
+						gelesen
 					</Button>
 				</div>
 			</div>