diff --git a/code/defines/procs/station_name.dm b/code/defines/procs/station_name.dm
index 3c2851e5297..fbf59a4b550 100644
--- a/code/defines/procs/station_name.dm
+++ b/code/defines/procs/station_name.dm
@@ -9,12 +9,12 @@
 		name += " "
 
 	// Prefix
-	name += pick("", "Dorf", "Alium", "Carp", "Ork", "Pete", "Control", "Nettle", "Aspie", "Class", "Race", "Fatguy", "Gentleman", "Touhou", "Capitalist", "Communist", "Bear", "Beard", "Derp", "Space", "Star", "Moon", "System", "Mining", "Neckbeard", "Research", "Supply", "Military", "Orbital", "Battle", "Science", "Asteroid", "Home", "Production", "Transport", "Delivery", "Extraplanetary", "Orbital", "Correctional", "Robot")
+	name += pick("", "Dorf", "Alium", "Carp", "Ork", "Pete", "Control", "Nettle", "Aspie", "Class", "Crab", "Fist","Corrogated","Skeleton","Race", "Fatguy", "Gentleman", "Touhou", "Capitalist", "Communist", "Bear", "Beard", "Derp", "Space", "Star", "Moon", "System", "Mining", "Neckbeard", "Research", "Supply", "Military", "Orbital", "Battle", "Science", "Asteroid", "Home", "Production", "Transport", "Delivery", "Extraplanetary", "Orbital", "Correctional", "Robot")
 	if (name)
 		name += " "
 
 	// Suffix
-	name += pick("Station", "Fortress", "Frontier", "Village", "Town", "City", "Edition", "Hive", "Complex", "Base", "Facility", "Depot", "Outpost", "Installation", "Drydock", "Observatory", "Array", "Relay", "Monitor", "Platform", "Construct", "Hangar", "Prison", "Center", "Port", "Waystation", "Factory", "Waypoint", "Stopover", "Hub", "HQ", "Office", "Object", "Fortification")
+	name += pick("Station", "Fortress", "Frontier", "Village", "Town", "City", "Edition", "Hive", "Complex", "Base", "Facility", "Depot", "Outpost", "Installation", "Drydock", "Observatory", "Array", "Relay", "Monitor", "Platform", "Construct", "Hangar", "Prison", "Center", "Port", "Waystation", "Factory", "Waypoint", "Stopover", "Hub", "HQ", "Office", "Object", "Fortification", "Colony", "Planet-Cracker")
 	name += " "
 
 	// ID Number
diff --git a/icons/obj/ships.dmi b/icons/obj/ships.dmi
new file mode 100644
index 00000000000..0928b7d722c
Binary files /dev/null and b/icons/obj/ships.dmi differ