diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index caeb1f168c..2708e78535 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -16,7 +16,7 @@
 
 /obj/effect/landmark/start
 	name = "start"
-	icon = 'icons/mob/screen_gen.dmi'
+	icon = 'icons/mob/landmarks.dmi'
 	icon_state = "x"
 	anchored = TRUE
 	var/jobspawn_override = FALSE
@@ -40,9 +40,9 @@
 
 // START LANDMARKS FOLLOW. Don't change the names unless
 // you are refactoring shitty landmark code.
-
 /obj/effect/landmark/start/assistant
 	name = "Assistant"
+	icon_state = "Assistant"
 
 /obj/effect/landmark/start/assistant/override
 	jobspawn_override = TRUE
@@ -50,102 +50,135 @@
 
 /obj/effect/landmark/start/janitor
 	name = "Janitor"
+	icon_state = "Janitor"
 
 /obj/effect/landmark/start/cargo_technician
 	name = "Cargo Technician"
+	icon_state = "Cargo Technician"
 
 /obj/effect/landmark/start/bartender
 	name = "Bartender"
+	icon_state = "Bartender"
 
 /obj/effect/landmark/start/clown
 	name = "Clown"
+	icon_state = "Clown"
 
 /obj/effect/landmark/start/mime
 	name = "Mime"
+	icon_state = "Mime"
 
 /obj/effect/landmark/start/quartermaster
 	name = "Quartermaster"
+	icon_state = "Quartermaster"
 
 /obj/effect/landmark/start/atmospheric_technician
 	name = "Atmospheric Technician"
+	icon_state = "Atmospheric Technician"
 
 /obj/effect/landmark/start/cook
 	name = "Cook"
+	icon_state = "Cook"
 
 /obj/effect/landmark/start/shaft_miner
 	name = "Shaft Miner"
+	icon_state = "Shaft Miner"
 
 /obj/effect/landmark/start/security_officer
 	name = "Security Officer"
+	icon_state = "Security Officer"
 
 /obj/effect/landmark/start/botanist
 	name = "Botanist"
+	icon_state = "Botanist"
 
 /obj/effect/landmark/start/head_of_security
 	name = "Head of Security"
-
-/obj/effect/landmark/start/ai
-	name = "AI"
-	delete_after_roundstart = FALSE
+	icon_state = "Head of Security"
 
 /obj/effect/landmark/start/captain
 	name = "Captain"
+	icon_state = "Captain"
 
 /obj/effect/landmark/start/detective
 	name = "Detective"
+	icon_state = "Detective"
 
 /obj/effect/landmark/start/warden
 	name = "Warden"
+	icon_state = "Warden"
 
 /obj/effect/landmark/start/chief_engineer
 	name = "Chief Engineer"
-
-/obj/effect/landmark/start/cyborg
-	name = "Cyborg"
+	icon_state = "Chief Engineer"
 
 /obj/effect/landmark/start/head_of_personnel
 	name = "Head of Personnel"
+	icon_state = "Head of Personnel"
 
 /obj/effect/landmark/start/librarian
 	name = "Curator"
+	icon_state = "Curator"
 
 /obj/effect/landmark/start/lawyer
 	name = "Lawyer"
+	icon_state = "Lawyer"
 
 /obj/effect/landmark/start/station_engineer
 	name = "Station Engineer"
+	icon_state = "Station Engineer"
 
 /obj/effect/landmark/start/medical_doctor
 	name = "Medical Doctor"
+	icon_state = "Medical Doctor"
 
 /obj/effect/landmark/start/scientist
 	name = "Scientist"
+	icon_state = "Scientist"
 
 /obj/effect/landmark/start/chemist
 	name = "Chemist"
+	icon_state = "Chemist"
 
 /obj/effect/landmark/start/roboticist
 	name = "Roboticist"
+	icon_state = "Roboticist"
 
 /obj/effect/landmark/start/research_director
 	name = "Research Director"
+	icon_state = "Research Director"
 
 /obj/effect/landmark/start/geneticist
 	name = "Geneticist"
+	icon_state = "Geneticist"
 
 /obj/effect/landmark/start/chief_medical_officer
 	name = "Chief Medical Officer"
+	icon_state = "Chief Medical Officer"
 
 /obj/effect/landmark/start/virologist
 	name = "Virologist"
+	icon_state = "Virologist"
 
 /obj/effect/landmark/start/chaplain
 	name = "Chaplain"
+	icon_state = "Chaplain"
+
+/obj/effect/landmark/start/cyborg
+	name = "Cyborg"
+	icon_state = "Cyborg"
+
+/obj/effect/landmark/start/ai
+	name = "AI"
+	icon_state = "AI"
+	delete_after_roundstart = FALSE
+
 
 //Department Security spawns
 
 /obj/effect/landmark/start/depsec
 	name = "department_sec"
+	icon_state = "Security Officer"
 
 /obj/effect/landmark/start/depsec/New()
 	..()
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 5d0c2fe833..dcb9137416 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -45,7 +45,8 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
 	/client/proc/manipulate_organs,
 	/client/proc/start_line_profiling,
 	/client/proc/stop_line_profiling,
-	/client/proc/show_line_profiling
+	/client/proc/show_line_profiling,
+	/client/proc/create_mapping_job_icons
 ))
 
 /obj/effect/debugging/mapfix_marker
@@ -265,3 +266,31 @@ GLOBAL_VAR_INIT(say_disabled, FALSE)
 		message_admins("[src.ckey] used 'Disable all communication verbs', killing all communication methods.")
 	else
 		message_admins("[src.ckey] used 'Disable all communication verbs', restoring all communication methods.")
+
+//This generates the icon states for job starting location landmarks.
+/client/proc/create_mapping_job_icons()
+	set name = "Generate job landmarks icons"
+	set category = "Mapping"
+	var/icon/final = icon()
+	var/mob/living/carbon/human/dummy/D = new(locate(1,1,1)) //spawn on 1,1,1 so we don't have runtimes when items are deleted
+	D.setDir(SOUTH)
+	for(var/job in subtypesof(/datum/job))
+		var/datum/job/JB = new job
+		switch(JB.title)
+			if("AI")
+				final.Insert(icon('icons/mob/ai.dmi', "ai", SOUTH, 1), "AI")
+			if("Cyborg")
+				final.Insert(icon('icons/mob/robots.dmi', "robot", SOUTH, 1), "Cyborg")
+			else
+				for(var/obj/item/I in D)
+					qdel(I)
+				randomize_human(D)
+				JB.equip(D, TRUE, FALSE)
+				COMPILE_OVERLAYS(D)
+				var/icon/I = icon(getFlatIcon(D), frame = 1)
+				final.Insert(I, JB.title)
+	qdel(D)
+	//Also add the x
+	for(var/x_number in 1 to 4)
+		final.Insert(icon('icons/mob/screen_gen.dmi', "x[x_number == 1 ? "" : x_number]"), "x[x_number == 1 ? "" : x_number]")
+	fcopy(final, "icons/mob/landmarks.dmi")
\ No newline at end of file
diff --git a/icons/mob/landmarks.dmi b/icons/mob/landmarks.dmi
new file mode 100644
index 0000000000..120745ed44
Binary files /dev/null and b/icons/mob/landmarks.dmi differ