diff --git a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
index 15df219c4db..1806ea9f36a 100644
--- a/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
+++ b/_maps/RandomRuins/SpaceRuins/hellfactory.dmm
@@ -728,9 +728,7 @@
 /area/ruin/space/has_grav/hellfactory)
 "ct" = (
 /obj/machinery/light/built/directional/south,
-/obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on"
-	},
+/obj/structure/marker_beacon/burgundy,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/hellfactory)
 "cu" = (
@@ -885,9 +883,7 @@
 /area/ruin/space/has_grav/hellfactory)
 "cR" = (
 /obj/structure/lattice/catwalk,
-/obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on"
-	},
+/obj/structure/marker_beacon/burgundy,
 /turf/template_noop,
 /area/ruin/space/has_grav/hellfactory)
 "cS" = (
@@ -897,9 +893,7 @@
 /area/ruin/space/has_grav/hellfactory)
 "cT" = (
 /obj/machinery/light/broken/directional/south,
-/obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on"
-	},
+/obj/structure/marker_beacon/burgundy,
 /obj/structure/cable,
 /turf/open/floor/iron,
 /area/ruin/space/has_grav/hellfactory)
diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
index e8e8b6daca6..045c4d122ba 100644
--- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm
+++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm
@@ -22985,9 +22985,7 @@
 	},
 /area/station/maintenance/department/medical/central)
 "hpx" = (
-/obj/structure/marker_beacon{
-	icon_state = "markerburgundy-on"
-	},
+/obj/structure/marker_beacon/burgundy,
 /turf/open/floor/plating/snowed/smoothed/icemoon,
 /area/icemoon/underground/explored)
 "hpB" = (
diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm
index fad3d3cf6ba..2b21d198e3c 100644
--- a/code/modules/mining/equipment/marker_beacons.dm
+++ b/code/modules/mining/equipment/marker_beacons.dm
@@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sort_list(list(
 	name = "marker beacon"
 	singular_name = "marker beacon"
 	desc = "Prism-brand path illumination devices. Used by miners to mark paths and warn of danger."
-	icon = 'icons/obj/lighting.dmi'
+	icon = 'icons/obj/marker.dmi'
 	icon_state = "marker"
 	merge_type = /obj/item/stack/marker_beacon
 	max_amount = 100
@@ -162,8 +162,52 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sort_list(list(
 
 
 /* Preset marker beacon types, for mapping */
+// Set the icon_state here to make it clear for mappers.
 
 /obj/structure/marker_beacon/burgundy
 	picked_color = "Burgundy"
-	// set icon_state to make it clear for mappers
 	icon_state = "markerburgundy-on"
+
+/obj/structure/marker_beacon/bronze
+	picked_color = "Bronze"
+	icon_state = "markerbronze-on"
+
+/obj/structure/marker_beacon/yellow
+	picked_color = "Yellow"
+	icon_state = "markeryellow-on"
+
+/obj/structure/marker_beacon/lime
+	picked_color = "Lime"
+	icon_state = "markerlime-on"
+
+/obj/structure/marker_beacon/olive
+	picked_color = "Olive"
+	icon_state = "markerolive-on"
+
+/obj/structure/marker_beacon/jade
+	picked_color = "Jade"
+	icon_state = "markerjade-on"
+
+/obj/structure/marker_beacon/teal
+	picked_color = "Teal"
+	icon_state = "markerteal-on"
+
+/obj/structure/marker_beacon/cerulean
+	picked_color = "Cerulean"
+	icon_state = "markercerulean-on"
+
+/obj/structure/marker_beacon/indigo
+	picked_color = "Indigo"
+	icon_state = "markerindigo-on"
+
+/obj/structure/marker_beacon/purple
+	picked_color = "Purple"
+	icon_state = "markerpurple-on"
+
+/obj/structure/marker_beacon/violet
+	picked_color = "Violet"
+	icon_state = "markerviolet-on"
+
+/obj/structure/marker_beacon/fuchsia
+	picked_color = "Fuchsia"
+	icon_state = "markerfuchsia-on"
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index a0bd3c4c9f4..6bc9429111c 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/marker.dmi b/icons/obj/marker.dmi
new file mode 100644
index 00000000000..f6043c02a3e
Binary files /dev/null and b/icons/obj/marker.dmi differ