diff --git a/Meshtastic/Helpers/BLEManager.swift b/Meshtastic/Helpers/BLEManager.swift
index 278762c4..c4d0e3d9 100644
--- a/Meshtastic/Helpers/BLEManager.swift
+++ b/Meshtastic/Helpers/BLEManager.swift
@@ -756,7 +756,7 @@ class BLEManager: NSObject, CBPeripheralDelegate, ObservableObject {
 			wayPointEntity.id = Int64(waypointPacket.id)
 			wayPointEntity.name = waypointPacket.name.count >= 1 ? waypointPacket.name : "Dropped Pin"
 			wayPointEntity.longDescription = waypointPacket.description_p
-			wayPointEntity.icon	= Int32(waypointPacket.icon)
+			wayPointEntity.icon	= Int64(waypointPacket.icon)
 			wayPointEntity.latitudeI = waypointPacket.latitudeI
 			wayPointEntity.longitudeI = waypointPacket.longitudeI
 			do {
diff --git a/Meshtastic/Helpers/MeshPackets.swift b/Meshtastic/Helpers/MeshPackets.swift
index f1de489f..df86d362 100644
--- a/Meshtastic/Helpers/MeshPackets.swift
+++ b/Meshtastic/Helpers/MeshPackets.swift
@@ -1333,7 +1333,7 @@ func waypointPacket (packet: MeshPacket, context: NSManagedObjectContext) {
 				waypoint.longDescription = waypointMessage.description_p
 				waypoint.latitudeI = waypointMessage.latitudeI
 				waypoint.longitudeI = waypointMessage.longitudeI
-				waypoint.icon = Int32(waypointMessage.icon)
+				waypoint.icon = Int64(waypointMessage.icon)
 				waypoint.locked = waypointMessage.locked
 				if waypointMessage.expire != 0 {
 					waypoint.expire = Date(timeIntervalSince1970: TimeInterval(Int64(waypointMessage.expire)))
@@ -1352,7 +1352,7 @@ func waypointPacket (packet: MeshPacket, context: NSManagedObjectContext) {
 				fetchedWaypoint[0].longDescription = waypointMessage.description_p
 				fetchedWaypoint[0].latitudeI = waypointMessage.latitudeI
 				fetchedWaypoint[0].longitudeI = waypointMessage.longitudeI
-				fetchedWaypoint[0].icon = Int32(waypointMessage.icon)
+				fetchedWaypoint[0].icon = Int64(waypointMessage.icon)
 				fetchedWaypoint[0].locked = waypointMessage.locked
 				if waypointMessage.expire != 0 {
 					fetchedWaypoint[0].expire = Date(timeIntervalSince1970: TimeInterval(Int64(waypointMessage.expire)))
diff --git a/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV6.xcdatamodel/contents b/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV6.xcdatamodel/contents
index 524054e2..cab2cacc 100644
--- a/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV6.xcdatamodel/contents
+++ b/Meshtastic/Meshtastic.xcdatamodeld/MeshtasticDataModelV6.xcdatamodel/contents
@@ -269,7 +269,7 @@
     </entity>
     <entity name="WaypointEntity" representedClassName="WaypointEntity" syncable="YES" codeGenerationType="class">
         <attribute name="expire" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
-        <attribute name="icon" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
+        <attribute name="icon" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="id" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="latitudeI" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="locked" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
diff --git a/Meshtastic/Views/Map/MapViewSwiftUI.swift b/Meshtastic/Views/Map/MapViewSwiftUI.swift
index 9f2657b1..2e3570cc 100644
--- a/Meshtastic/Views/Map/MapViewSwiftUI.swift
+++ b/Meshtastic/Views/Map/MapViewSwiftUI.swift
@@ -149,7 +149,7 @@ struct MapViewSwiftUI: UIViewRepresentable {
 				
 			case _ as MKClusterAnnotation:
 				let annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: "nodeGroup") as? MKMarkerAnnotationView ?? MKMarkerAnnotationView(annotation: annotation, reuseIdentifier: "nodeGroup")
-				annotationView.markerTintColor = .systemRed
+				annotationView.markerTintColor = .brown//.systemRed
 				return annotationView
 			case _ as PositionEntity:
 				let annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: "node") as? MKMarkerAnnotationView ?? MKMarkerAnnotationView(annotation: annotation, reuseIdentifier: "Node")