diff --git a/mods/cnc/maps/funpark01/map.yaml b/mods/cnc/maps/funpark01/map.yaml
index 6b0f7fbc7b..acf4948235 100644
--- a/mods/cnc/maps/funpark01/map.yaml
+++ b/mods/cnc/maps/funpark01/map.yaml
@@ -518,6 +518,8 @@ Sequences:
 			Start: 0
 			Facings: 1
 			ZOffset: -1024
+		icon: lsticnh.tem
+			AddExtension: False
 
 VoxelSequences:
 
diff --git a/mods/cnc/maps/gdi01/map.yaml b/mods/cnc/maps/gdi01/map.yaml
index 3b11049537..b59a8322f0 100644
--- a/mods/cnc/maps/gdi01/map.yaml
+++ b/mods/cnc/maps/gdi01/map.yaml
@@ -42,7 +42,7 @@ Players:
 		Faction: nod
 		ColorRamp: 3,255,127
 		Allies: Nod
-		Enemies: GDI, Creeps
+		Enemies: GDI
 	PlayerReference@GDI:
 		Name: GDI
 		Playable: True
@@ -55,17 +55,12 @@ Players:
 		LockSpawn: True
 		LockTeam: True
 		Allies: GDI
-		Enemies: Nod, Creeps
+		Enemies: Nod
 	PlayerReference@Neutral:
 		Name: Neutral
 		OwnsWorld: True
 		NonCombatant: True
 		Faction: gdi
-	PlayerReference@Creeps:
-		Name: Creeps
-		NonCombatant: True
-		Faction: Random
-		Enemies: Nod, GDI
 
 Actors:
 	Actor0: sbag
@@ -547,6 +542,8 @@ Sequences:
 			Start: 0
 			Facings: 1
 			ZOffset: -1024
+		icon: lsticnh.tem
+			AddExtension: False
 
 VoxelSequences:
 
diff --git a/mods/cnc/maps/gdi02/map.yaml b/mods/cnc/maps/gdi02/map.yaml
index ae7dab6147..bca4a37666 100644
--- a/mods/cnc/maps/gdi02/map.yaml
+++ b/mods/cnc/maps/gdi02/map.yaml
@@ -59,11 +59,6 @@ Players:
 		OwnsWorld: True
 		NonCombatant: True
 		Faction: gdi
-	PlayerReference@Creeps:
-		Name: Creeps
-		NonCombatant: True
-		Faction: Random
-		Enemies: Nod, GDI
 
 Actors:
 	Actor0: sbag
@@ -781,6 +776,8 @@ Sequences:
 			Start: 0
 			Facings: 1
 			ZOffset: -1024
+		icon: lsticnh.tem
+			AddExtension: False
 
 VoxelSequences:
 
diff --git a/mods/cnc/maps/gdi03/map.yaml b/mods/cnc/maps/gdi03/map.yaml
index cfb7e7cc91..8e942fee38 100644
--- a/mods/cnc/maps/gdi03/map.yaml
+++ b/mods/cnc/maps/gdi03/map.yaml
@@ -60,11 +60,6 @@ Players:
 		LockTeam: True
 		Allies: GDI
 		Enemies: Nod
-	PlayerReference@Creeps:
-		Name: Creeps
-		NonCombatant: True
-		Faction: Random
-		Enemies: Nod, GDI
 
 Actors:
 	Actor0: wood
diff --git a/mods/cnc/maps/gdi04a/map.yaml b/mods/cnc/maps/gdi04a/map.yaml
index d94b9ed847..c44a639607 100644
--- a/mods/cnc/maps/gdi04a/map.yaml
+++ b/mods/cnc/maps/gdi04a/map.yaml
@@ -61,11 +61,6 @@ Players:
 		OwnsWorld: True
 		NonCombatant: True
 		Faction: gdi
-	PlayerReference@Creeps:
-		Name: Creeps
-		NonCombatant: True
-		Faction: Random
-		Enemies: Nod, GDI
 
 Actors:
 	Actor0: cycl
diff --git a/mods/cnc/maps/gdi04b/map.yaml b/mods/cnc/maps/gdi04b/map.yaml
index ccdfe6b072..f04db7258a 100644
--- a/mods/cnc/maps/gdi04b/map.yaml
+++ b/mods/cnc/maps/gdi04b/map.yaml
@@ -61,11 +61,6 @@ Players:
 		OwnsWorld: True
 		NonCombatant: True
 		Faction: gdi
-	PlayerReference@Creeps:
-		Name: Creeps
-		NonCombatant: True
-		Faction: Random
-		Enemies: Nod, GDI
 
 Actors:
 	Actor0: sbag
diff --git a/mods/cnc/maps/gdi04c/map.yaml b/mods/cnc/maps/gdi04c/map.yaml
index 54028c4faa..3860eb6c61 100644
--- a/mods/cnc/maps/gdi04c/map.yaml
+++ b/mods/cnc/maps/gdi04c/map.yaml
@@ -66,11 +66,6 @@ Players:
 		NonCombatant: True
 		Faction: gdi
 		Enemies: Nod
-	PlayerReference@Creeps:
-		Name: Creeps
-		NonCombatant: True
-		Faction: Random
-		Enemies: Nod, GDI
 
 Actors:
 	Actor0: v17
diff --git a/mods/cnc/maps/gdi05a/map.yaml b/mods/cnc/maps/gdi05a/map.yaml
index 2acd70a64e..191f56c0c3 100644
--- a/mods/cnc/maps/gdi05a/map.yaml
+++ b/mods/cnc/maps/gdi05a/map.yaml
@@ -67,11 +67,6 @@ Players:
 		OwnsWorld: True
 		NonCombatant: True
 		Faction: gdi
-	PlayerReference@Creeps:
-		Name: Creeps
-		NonCombatant: True
-		Faction: Random
-		Enemies: Nod, GDI
 
 Actors:
 	Actor0: sbag
diff --git a/mods/cnc/maps/nod01/map.yaml b/mods/cnc/maps/nod01/map.yaml
index ddf0b36d6e..6590f58336 100644
--- a/mods/cnc/maps/nod01/map.yaml
+++ b/mods/cnc/maps/nod01/map.yaml
@@ -62,11 +62,6 @@ Players:
 		LockSpawn: True
 		LockTeam: True
 		Enemies: GDI, Villagers
-	PlayerReference@Creeps:
-		Name: Creeps
-		NonCombatant: True
-		Faction: Random
-		Enemies: Nod, GDI
 
 Actors:
 	Actor46: e1
diff --git a/mods/cnc/maps/nod03a/map.yaml b/mods/cnc/maps/nod03a/map.yaml
index 619fa2b1be..8aafa2c4eb 100644
--- a/mods/cnc/maps/nod03a/map.yaml
+++ b/mods/cnc/maps/nod03a/map.yaml
@@ -60,11 +60,6 @@ Players:
 		LockTeam: True
 		Allies: Nod
 		Enemies: GDI
-	PlayerReference@Creeps:
-		Name: Creeps
-		NonCombatant: True
-		Faction: Random
-		Enemies: Nod, GDI
 
 Actors:
 	Actor0: sbag
diff --git a/mods/cnc/maps/nod03b/map.yaml b/mods/cnc/maps/nod03b/map.yaml
index e53ca1d882..692986b93d 100644
--- a/mods/cnc/maps/nod03b/map.yaml
+++ b/mods/cnc/maps/nod03b/map.yaml
@@ -60,11 +60,6 @@ Players:
 		LockTeam: True
 		Allies: Nod
 		Enemies: GDI
-	PlayerReference@Creeps:
-		Name: Creeps
-		NonCombatant: True
-		Faction: Random
-		Enemies: Nod, GDI
 
 Actors:
 	Actor117: e1