diff --git a/code/__DEFINES/research/slimes.dm b/code/__DEFINES/research/slimes.dm
index 344514afb76..f54248a21a3 100644
--- a/code/__DEFINES/research/slimes.dm
+++ b/code/__DEFINES/research/slimes.dm
@@ -44,12 +44,12 @@
 #define SLIME_TYPE_BLUE "blue"
 #define SLIME_TYPE_BLUESPACE "bluespace"
 #define SLIME_TYPE_CERULEAN "cerulean"
-#define SLIME_TYPE_DARK_BLUE "dark blue"
-#define SLIME_TYPE_DARK_PURPLE "dark purple"
+#define SLIME_TYPE_DARK_BLUE "dark-blue"
+#define SLIME_TYPE_DARK_PURPLE "dark-purple"
 #define SLIME_TYPE_GOLD "gold"
 #define SLIME_TYPE_GREEN "green"
 #define SLIME_TYPE_GREY "grey"
-#define SLIME_TYPE_LIGHT_PINK "light pink"
+#define SLIME_TYPE_LIGHT_PINK "light-pink"
 #define SLIME_TYPE_METAL "metal"
 #define SLIME_TYPE_OIL "oil"
 #define SLIME_TYPE_ORANGE "orange"
diff --git a/code/modules/mob/living/basic/slime/slime.dm b/code/modules/mob/living/basic/slime/slime.dm
index 4aa4cf72c4e..4864cb82016 100644
--- a/code/modules/mob/living/basic/slime/slime.dm
+++ b/code/modules/mob/living/basic/slime/slime.dm
@@ -6,13 +6,13 @@
 /mob/living/basic/slime
 	name = "grey baby slime (123)"
 	icon = 'icons/mob/simple/slimes.dmi'
-	icon_state = "grey baby slime"
+	icon_state = "grey-baby"
 	pass_flags = PASSTABLE | PASSGRILLE
 	gender = NEUTER
 	faction = list(FACTION_SLIME, FACTION_NEUTRAL)
 
-	icon_living = "grey baby slime"
-	icon_dead = "grey baby slime dead"
+	icon_living = "grey-baby"
+	icon_dead = "grey-baby-dead"
 
 	attack_sound = 'sound/weapons/bite.ogg'
 
@@ -187,8 +187,8 @@
 
 /mob/living/basic/slime/regenerate_icons()
 	cut_overlays()
-	var/icon_text = "[slime_type.colour] [life_stage] slime"
-	icon_dead = "[icon_text] dead"
+	var/icon_text = "[slime_type.colour]-[life_stage]"
+	icon_dead = "[icon_text]-dead"
 	if(stat != DEAD)
 		icon_state = icon_text
 		if(current_mood && current_mood != SLIME_MOOD_NONE && !stat)
diff --git a/code/modules/mob_spawn/corpses/nonhuman_corpses.dm b/code/modules/mob_spawn/corpses/nonhuman_corpses.dm
index 5145c3cc6ed..571bac86e7c 100644
--- a/code/modules/mob_spawn/corpses/nonhuman_corpses.dm
+++ b/code/modules/mob_spawn/corpses/nonhuman_corpses.dm
@@ -20,7 +20,7 @@
 /obj/effect/mob_spawn/corpse/slime
 	mob_type = /mob/living/basic/slime
 	icon = 'icons/mob/simple/slimes.dmi'
-	icon_state = "grey baby slime" //sets the icon in the map editor
+	icon_state = "grey-baby-dead" //sets the icon in the map editor
 	///the color of the slime you're spawning.
 	var/slime_species = /datum/slime_type/grey
 
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index d7ad6a6b3f2..dc2b4e9812a 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -464,7 +464,7 @@
 	name = "EMP-proof slime core"
 	desc = "A yellow slime core infused with plasma. Its organic nature makes it immune to EMPs."
 	icon = 'icons/mob/simple/slimes.dmi'
-	icon_state = "yellow slime extract"
+	icon_state = "yellow-core"
 	custom_materials = null
 	maxcharge = STANDARD_CELL_CHARGE * 5
 	charge_light_type = null
diff --git a/code/modules/research/xenobiology/crossbreeding/_misc.dm b/code/modules/research/xenobiology/crossbreeding/_misc.dm
index 4053bfe7fd1..75fabc77cf1 100644
--- a/code/modules/research/xenobiology/crossbreeding/_misc.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_misc.dm
@@ -84,7 +84,7 @@ Slimecrossing Items
 	name = "hypercharged slime core"
 	desc = "A charged yellow slime extract, infused with plasma. It almost hurts to touch."
 	icon = 'icons/mob/simple/slimes.dmi'
-	icon_state = "yellow slime extract"
+	icon_state = "yellow-core"
 	rating = 7
 	custom_materials = null
 	maxcharge = 50 * STANDARD_CELL_CHARGE
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index f06665c506e..34d7f4d507a 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -4,7 +4,7 @@
 	name = "slime extract"
 	desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"."
 	icon = 'icons/mob/simple/slimes.dmi'
-	icon_state = "grey slime extract"
+	icon_state = "grey-core"
 	force = 0
 	w_class = WEIGHT_CLASS_TINY
 	throwforce = 0
@@ -93,7 +93,7 @@
 
 /obj/item/slime_extract/grey
 	name = "grey slime extract"
-	icon_state = "grey slime extract"
+	icon_state = "grey-core"
 	crossbreed_modification = "reproductive"
 	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
@@ -118,7 +118,7 @@
 
 /obj/item/slime_extract/gold
 	name = "gold slime extract"
-	icon_state = "gold slime extract"
+	icon_state = "gold-core"
 	crossbreed_modification = "symbiont"
 	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
@@ -149,7 +149,7 @@
 
 /obj/item/slime_extract/silver
 	name = "silver slime extract"
-	icon_state = "silver slime extract"
+	icon_state = "silver-core"
 	crossbreed_modification = "consuming"
 	activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
 
@@ -177,7 +177,7 @@
 
 /obj/item/slime_extract/metal
 	name = "metal slime extract"
-	icon_state = "metal slime extract"
+	icon_state = "metal-core"
 	crossbreed_modification = "industrial"
 	activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
 
@@ -201,7 +201,7 @@
 
 /obj/item/slime_extract/purple
 	name = "purple slime extract"
-	icon_state = "purple slime extract"
+	icon_state = "purple-core"
 	crossbreed_modification = "regenerative"
 	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
 
@@ -220,7 +220,7 @@
 
 /obj/item/slime_extract/darkpurple
 	name = "dark purple slime extract"
-	icon_state = "dark purple slime extract"
+	icon_state = "dark-purple-core"
 	crossbreed_modification = "self-sustaining"
 	activate_reagents = list(/datum/reagent/toxin/plasma)
 
@@ -243,7 +243,7 @@
 
 /obj/item/slime_extract/orange
 	name = "orange slime extract"
-	icon_state = "orange slime extract"
+	icon_state = "orange-core"
 	crossbreed_modification = "burning"
 	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
@@ -263,7 +263,7 @@
 
 /obj/item/slime_extract/yellow
 	name = "yellow slime extract"
-	icon_state = "yellow slime extract"
+	icon_state = "yellow-core"
 	crossbreed_modification = "charged"
 	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
@@ -286,7 +286,7 @@
 
 /obj/item/slime_extract/red
 	name = "red slime extract"
-	icon_state = "red slime extract"
+	icon_state = "red-core"
 	crossbreed_modification = "sanguine"
 	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
@@ -306,7 +306,7 @@
 
 /obj/item/slime_extract/blue
 	name = "blue slime extract"
-	icon_state = "blue slime extract"
+	icon_state = "blue-core"
 	crossbreed_modification = "stabilized"
 	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
@@ -325,7 +325,7 @@
 
 /obj/item/slime_extract/darkblue
 	name = "dark blue slime extract"
-	icon_state = "dark blue slime extract"
+	icon_state = "dark-blue-core"
 	crossbreed_modification = "chilling"
 	activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
 
@@ -348,7 +348,7 @@
 
 /obj/item/slime_extract/pink
 	name = "pink slime extract"
-	icon_state = "pink slime extract"
+	icon_state = "pink-core"
 	crossbreed_modification = "gentle"
 	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
 
@@ -376,7 +376,7 @@
 
 /obj/item/slime_extract/green
 	name = "green slime extract"
-	icon_state = "green slime extract"
+	icon_state = "green-core"
 	crossbreed_modification = "mutative"
 	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/uranium/radium)
 
@@ -400,7 +400,7 @@
 
 /obj/item/slime_extract/lightpink
 	name = "light pink slime extract"
-	icon_state = "light pink slime extract"
+	icon_state = "light-pink-core"
 	crossbreed_modification = "loyal"
 	activate_reagents = list(/datum/reagent/toxin/plasma)
 
@@ -424,7 +424,7 @@
 
 /obj/item/slime_extract/black
 	name = "black slime extract"
-	icon_state = "black slime extract"
+	icon_state = "black-core"
 	crossbreed_modification = "transformative"
 	activate_reagents = list(/datum/reagent/toxin/plasma)
 
@@ -445,7 +445,7 @@
 
 /obj/item/slime_extract/oil
 	name = "oil slime extract"
-	icon_state = "oil slime extract"
+	icon_state = "oil-core"
 	crossbreed_modification = "detonating"
 	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
 
@@ -469,7 +469,7 @@
 
 /obj/item/slime_extract/adamantine
 	name = "adamantine slime extract"
-	icon_state = "adamantine slime extract"
+	icon_state = "adamantine-core"
 	crossbreed_modification = "crystalline"
 	activate_reagents = list(/datum/reagent/toxin/plasma)
 
@@ -499,7 +499,7 @@
 
 /obj/item/slime_extract/bluespace
 	name = "bluespace slime extract"
-	icon_state = "bluespace slime extract"
+	icon_state = "bluespace-core"
 	crossbreed_modification = "warping"
 	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
 	var/teleport_ready = FALSE
@@ -535,7 +535,7 @@
 
 /obj/item/slime_extract/pyrite
 	name = "pyrite slime extract"
-	icon_state = "pyrite slime extract"
+	icon_state = "pyrite-core"
 	crossbreed_modification = "prismatic"
 	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
 
@@ -562,7 +562,7 @@
 
 /obj/item/slime_extract/cerulean
 	name = "cerulean slime extract"
-	icon_state = "cerulean slime extract"
+	icon_state = "cerulean-core"
 	crossbreed_modification = "recurring"
 	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
 
@@ -582,7 +582,7 @@
 
 /obj/item/slime_extract/sepia
 	name = "sepia slime extract"
-	icon_state = "sepia slime extract"
+	icon_state = "sepia-core"
 	crossbreed_modification = "lengthened"
 	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
 
@@ -604,7 +604,7 @@
 
 /obj/item/slime_extract/rainbow
 	name = "rainbow slime extract"
-	icon_state = "rainbow slime extract"
+	icon_state = "rainbow-core"
 	crossbreed_modification = "hyperchromatic"
 	activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,"lesser plasma",/datum/reagent/toxin/slimejelly,"holy water and uranium") //Curse this snowflake reagent list.
 
diff --git a/icons/mob/simple/slimes.dmi b/icons/mob/simple/slimes.dmi
index 922d7ec8ea8..92c8b82c8db 100644
Binary files a/icons/mob/simple/slimes.dmi and b/icons/mob/simple/slimes.dmi differ