diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm
index 6658985d471e9..f4c642a29fef0 100644
--- a/code/_globalvars/lists/flavor_misc.dm
+++ b/code/_globalvars/lists/flavor_misc.dm
@@ -82,36 +82,15 @@ GLOBAL_LIST_INIT(genders, list(MALE, FEMALE, NEUTER))
 
 GLOBAL_LIST_EMPTY(minimap_icons)
 GLOBAL_LIST_INIT(playable_icons, list(
-	"alpha_engi",
-	"alpha_leader",
-	"alpha_medic",
-	"alpha_private",
-	"alpha_smartgunner",
 	"boiler",
-	"bravo_engi",
-	"bravo_leader",
-	"bravo_medic",
-	"bravo_private",
-	"bravo_smartgunner",
 	"bull",
 	"captain",
 	"carrier",
-	"charlie_engi",
-	"charlie_leader",
-	"charlie_medic",
-	"charlie_private",
-	"charlie_smartgunner",
-	"chief_medical",
 	"cl",
 	"crusher",
 	"cse",
 	"defender",
 	"defiler",
-	"delta_engi",
-	"delta_leader",
-	"delta_medic",
-	"delta_private",
-	"delta_smartgunner",
 	"drone",
 	"fieldcommander",
 	"gorger",
@@ -136,29 +115,18 @@ GLOBAL_LIST_INIT(playable_icons, list(
 	"synth",
 	"warrior",
 	"warlock",
-	"whiskey_engi",
-	"whiskey_leader",
-	"whiskey_medic",
-	"whiskey_private",
-	"whiskey_smartgunner",
 	"widow",
 	"wraith",
 	"xenoking",
 	"xenoqueen",
 	"xenoshrike",
-	"xray_engi",
-	"xray_leader",
-	"xray_medic",
-	"xray_private",
-	"xray_smartgunner",
-	"yankee_engi",
-	"yankee_leader",
-	"yankee_medic",
-	"yankee_private",
-	"yankee_smartgunner",
-	"zulu_engi",
-	"zulu_leader",
-	"zulu_medic",
-	"zulu_private",
-	"zulu_smartgunner",
+))
+
+//like above but autogenerated when a new squad is created
+GLOBAL_LIST_INIT(playable_squad_icons, list(
+	"private",
+	"leader",
+	"engi",
+	"medic",
+	"smartgunner",
 ))
diff --git a/code/datums/jobs/squads.dm b/code/datums/jobs/squads.dm
index 28c77cc8d9936..3f9304d17e271 100644
--- a/code/datums/jobs/squads.dm
+++ b/code/datums/jobs/squads.dm
@@ -140,6 +140,15 @@
 	. = ..()
 	tracking_id = SSdirection.init_squad(name, squad_leader)
 
+	for(var/state in GLOB.playable_squad_icons)
+		var/icon/top = icon('icons/UI_icons/map_blips.dmi', state, frame = 1)
+		top.Blend(color, ICON_MULTIPLY)
+		var/icon/bottom = icon('icons/UI_icons/map_blips.dmi', "squad_underlay", frame = 1)
+		top.Blend(bottom, ICON_UNDERLAY)
+
+		var/icon_state = lowertext(name) + "_" + state
+		GLOB.minimap_icons[icon_state] = icon2base64(top)
+
 
 /datum/squad/proc/get_all_members()
 	return marines_list