diff --git a/apps/dispatch/app/dispatch/_components/map/MissionMarkers.tsx b/apps/dispatch/app/dispatch/_components/map/MissionMarkers.tsx
index 50f4a5a0..8b0b8d6f 100644
--- a/apps/dispatch/app/dispatch/_components/map/MissionMarkers.tsx
+++ b/apps/dispatch/app/dispatch/_components/map/MissionMarkers.tsx
@@ -24,7 +24,7 @@ import {
 	SmartPopup,
 	useSmartPopup,
 } from "_components/SmartPopup";
-import { Mission, MissionState } from "@repo/db";
+import { HpgValidationState, Mission, MissionState } from "@repo/db";
 import Einsatzdetails, {
 	FMSStatusHistory,
 	Patientdetails,
@@ -292,6 +292,15 @@ const MissionMarker = ({ mission }: { mission: Mission }) => {
 		mission: Mission,
 		anchor: "topleft" | "topright" | "bottomleft" | "bottomright",
 	) => {
+		const markerColor =
+			mission.hpgValidationState ===
+			(HpgValidationState.POSITION_AMANDED ||
+				HpgValidationState.INVALID ||
+				HpgValidationState.HPG_DISCONNECT ||
+				HpgValidationState.HPG_BUSY ||
+				HpgValidationState.HPG_INVALID_MISSION)
+				? MISSION_STATUS_COLORS["attention"]
+				: MISSION_STATUS_COLORS[mission.state];
 		return `<div 
 						id="marker-mission-${mission.id}"
 						class="${cn(
@@ -301,7 +310,7 @@ const MissionMarker = ({ mission }: { mission: Mission }) => {
 							hideMarker ? "opacity-0 pointer-events-none" : "opacity-100",
 						)}"
 						style="
-							background-color: ${MISSION_STATUS_COLORS[mission.state]};
+							background-color: ${markerColor};
 							${openMissionMarker.some((m) => m.id === mission.id) ? "opacity: 0; pointer-events: none;" : ""}
 						">
 						
diff --git a/apps/dispatch/app/dispatch/_components/map/_components/MissionMarkerTabs.tsx b/apps/dispatch/app/dispatch/_components/map/_components/MissionMarkerTabs.tsx
index d8be0756..275c6a46 100644
--- a/apps/dispatch/app/dispatch/_components/map/_components/MissionMarkerTabs.tsx
+++ b/apps/dispatch/app/dispatch/_components/map/_components/MissionMarkerTabs.tsx
@@ -21,6 +21,7 @@ import {
 } from "lucide-react";
 import {
 	getPublicUser,
+	HpgValidationState,
 	Mission,
 	MissionLog,
 	MissionMessageLog,
@@ -176,32 +177,66 @@ const Einsatzdetails = ({ mission }: { mission: Mission }) => {
 					</div>
 
 					<div className="flex items-center gap-2 w-full">
-						{/* <button
-							className="btn btn-sm btn-info btn-outline flex-3"
-							onClick={() => sendAlertMutation.mutate(mission.id)}
-						>
-							<span className="flex items-center gap-2">
-								<BellRing size={16} /> Alarmieren
-							</span>
-						</button> */}
-						{/* <button
-							className="btn btn-sm btn-info btn-outline flex-3"
-							onClick={() => sendAlertMutation.mutate(mission.id)}
-							disabled
-						>
-							<span className="flex items-center gap-2">
-								<span className="loading loading-spinner loading-md"></span>{" "}
-								HPG-Validierung läuft...
-							</span>
-						</button> */}
-						<button
-							className="btn btn-sm btn-warning btn-outline flex-3"
-							onClick={() => sendAlertMutation.mutate(mission.id)}
-						>
-							<span className="flex items-center gap-2">
-								<BellRing size={16} /> Mit neuer Position alarmieren
-							</span>
-						</button>
+						{(mission.hpgValidationState === HpgValidationState.VALID ||
+							mission.hpgValidationState ===
+								HpgValidationState.NOT_VALIDATED) && (
+							<button
+								className="btn btn-sm btn-info btn-outline flex-3"
+								onClick={() => sendAlertMutation.mutate(mission.id)}
+							>
+								<span className="flex items-center gap-2">
+									<BellRing size={16} /> Alarmieren
+								</span>
+							</button>
+						)}
+						{(mission.hpgValidationState === HpgValidationState.PENDING ||
+							mission.hpgValidationState === HpgValidationState.HPG_BUSY ||
+							mission.hpgValidationState ===
+								HpgValidationState.HPG_DISCONNECT ||
+							mission.hpgValidationState === HpgValidationState.INVALID ||
+							HpgValidationState.HPG_INVALID_MISSION) &&
+							mission.hpgValidationState !== HpgValidationState.NOT_VALIDATED &&
+							mission.hpgValidationState !==
+								HpgValidationState.POSITION_AMANDED &&
+							mission.hpgValidationState !== HpgValidationState.VALID && (
+								<button
+									className="btn btn-sm btn-info btn-outline flex-3"
+									onClick={() => sendAlertMutation.mutate(mission.id)}
+									disabled
+								>
+									<span className="flex items-center gap-2">
+										{mission.hpgValidationState ===
+											HpgValidationState.PENDING && (
+											<div>
+												<span className="loading loading-spinner loading-md"></span>{" "}
+												HPG-Validierung läuft...
+											</div>
+										)}
+										{mission.hpgValidationState ===
+											HpgValidationState.HPG_BUSY && "HPG-Client busy"}
+										{mission.hpgValidationState ===
+											HpgValidationState.HPG_DISCONNECT &&
+											"HPG-Client nicht verbunden"}
+										{mission.hpgValidationState ===
+											HpgValidationState.INVALID && "HPG-Client fehlerhaft"}
+										{mission.hpgValidationState ===
+											HpgValidationState.HPG_INVALID_MISSION &&
+											"Fehlerhafte HPG-Mission"}
+									</span>
+								</button>
+							)}
+
+						{mission.hpgValidationState ===
+							HpgValidationState.POSITION_AMANDED && (
+							<button
+								className="btn btn-sm btn-warning btn-outline flex-3"
+								onClick={() => sendAlertMutation.mutate(mission.id)}
+							>
+								<span className="flex items-center gap-2">
+									<BellRing size={16} /> Mit neuer Position alarmieren
+								</span>
+							</button>
+						)}
 
 						<button
 							className="btn btn-sm btn-primary btn-dash flex items-center gap-2"