diff --git a/code/modules/mob/living/carbon/human/species/grey.dm b/code/modules/mob/living/carbon/human/species/grey.dm
index 31fb5db6661..e5492e60293 100644
--- a/code/modules/mob/living/carbon/human/species/grey.dm
+++ b/code/modules/mob/living/carbon/human/species/grey.dm
@@ -8,10 +8,10 @@
 	butt_sprite = "grey"
 
 	has_organ = list(
-		"heart" =    /obj/item/organ/internal/heart,
-		"lungs" =    /obj/item/organ/internal/lungs,
+		"heart" =    /obj/item/organ/internal/heart/grey,
+		"lungs" =    /obj/item/organ/internal/lungs/grey,
 		"liver" =    /obj/item/organ/internal/liver/grey,
-		"kidneys" =  /obj/item/organ/internal/kidneys,
+		"kidneys" =  /obj/item/organ/internal/kidneys/grey,
 		"brain" =    /obj/item/organ/internal/brain/grey,
 		"appendix" = /obj/item/organ/internal/appendix,
 		"eyes" =     /obj/item/organ/internal/eyes/grey //5 darksight.
diff --git a/code/modules/mob/living/carbon/human/species/kidan.dm b/code/modules/mob/living/carbon/human/species/kidan.dm
index 583e098054b..a1d2fb6624d 100644
--- a/code/modules/mob/living/carbon/human/species/kidan.dm
+++ b/code/modules/mob/living/carbon/human/species/kidan.dm
@@ -20,13 +20,13 @@
 	butt_sprite = "kidan"
 
 	has_organ = list(
-		"heart" =    /obj/item/organ/internal/heart,
-		"lungs" =    /obj/item/organ/internal/lungs,
+		"heart" =    /obj/item/organ/internal/heart/kidan,
+		"lungs" =    /obj/item/organ/internal/lungs/kidan,
 		"liver" =    /obj/item/organ/internal/liver/kidan,
-		"kidneys" =  /obj/item/organ/internal/kidneys,
-		"brain" =    /obj/item/organ/internal/brain,
+		"kidneys" =  /obj/item/organ/internal/kidneys/kidan,
+		"brain" =    /obj/item/organ/internal/brain/kidan,
 		"appendix" = /obj/item/organ/internal/appendix,
-		"eyes" =     /obj/item/organ/internal/eyes, //Default darksight of 2.
+		"eyes" =     /obj/item/organ/internal/eyes/kidan, //Default darksight of 2.
 		"lantern" =  /obj/item/organ/internal/lantern
 		)
 
diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm
index 5e926a23870..cac42a29cd2 100644
--- a/code/modules/mob/living/carbon/human/species/monkey.dm
+++ b/code/modules/mob/living/carbon/human/species/monkey.dm
@@ -108,11 +108,11 @@
 	tail = "farwatail"
 	reagent_tag = PROCESS_ORG
 	has_organ = list(
-		"heart" =    /obj/item/organ/internal/heart,
-		"lungs" =    /obj/item/organ/internal/lungs,
+		"heart" =    /obj/item/organ/internal/heart/tajaran,
+		"lungs" =    /obj/item/organ/internal/lungs/tajaran,
 		"liver" =    /obj/item/organ/internal/liver/tajaran,
-		"kidneys" =  /obj/item/organ/internal/kidneys,
-		"brain" =    /obj/item/organ/internal/brain,
+		"kidneys" =  /obj/item/organ/internal/kidneys/tajaran,
+		"brain" =    /obj/item/organ/internal/brain/tajaran,
 		"appendix" = /obj/item/organ/internal/appendix,
 		"eyes" =     /obj/item/organ/internal/eyes/tajaran/farwa //Tajara monkey-forms are uniquely colourblind and have excellent darksight, which is why they need a subtype of their greater-form's organ..
 		)
@@ -132,11 +132,11 @@
 	tail = "wolpintail"
 	reagent_tag = PROCESS_ORG
 	has_organ = list(
-		"heart" =    /obj/item/organ/internal/heart,
-		"lungs" =    /obj/item/organ/internal/lungs,
+		"heart" =    /obj/item/organ/internal/heart/vulpkanin,
+		"lungs" =    /obj/item/organ/internal/lungs/vulpkanin,
 		"liver" =    /obj/item/organ/internal/liver/vulpkanin,
-		"kidneys" =  /obj/item/organ/internal/kidneys,
-		"brain" =    /obj/item/organ/internal/brain,
+		"kidneys" =  /obj/item/organ/internal/kidneys/vulpkanin,
+		"brain" =    /obj/item/organ/internal/brain/vulpkanin,
 		"appendix" = /obj/item/organ/internal/appendix,
 		"eyes" =     /obj/item/organ/internal/eyes/vulpkanin/wolpin //Vulpkanin monkey-forms are uniquely colourblind and have excellent darksight, which is why they need a subtype of their greater-form's organ..
 		)
@@ -156,6 +156,16 @@
 	reagent_tag = PROCESS_ORG
 	tail = null
 
+	has_organ = list(
+		"heart" =    /obj/item/organ/internal/heart/skrell,
+		"lungs" =    /obj/item/organ/internal/lungs/skrell,
+		"liver" =    /obj/item/organ/internal/liver/skrell,
+		"kidneys" =  /obj/item/organ/internal/kidneys/skrell,
+		"brain" =    /obj/item/organ/internal/brain/skrell,
+		"appendix" = /obj/item/organ/internal/appendix,
+		"eyes" =     /obj/item/organ/internal/eyes/skrell //Tajara monkey-forms are uniquely colourblind and have excellent darksight, which is why they need a subtype of their greater-form's organ..
+		)
+
 /datum/species/monkey/unathi
 	name = "Stok"
 	name_plural = "Stok"
@@ -171,3 +181,13 @@
 	reagent_tag = PROCESS_ORG
 
 	bodyflags = HAS_TAIL
+
+	has_organ = list(
+		"heart" =    /obj/item/organ/internal/heart/unathi,
+		"lungs" =    /obj/item/organ/internal/lungs/unathi,
+		"liver" =    /obj/item/organ/internal/liver/unathi,
+		"kidneys" =  /obj/item/organ/internal/kidneys/unathi,
+		"brain" =    /obj/item/organ/internal/brain/unathi,
+		"appendix" = /obj/item/organ/internal/appendix,
+		"eyes" =     /obj/item/organ/internal/eyes/unathi
+		)
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index df2359af3df..a8fd532a3f1 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -30,13 +30,13 @@
 		"shows their true colors, which happens to be the color of plasma!")
 
 	has_organ = list(
-		"heart" =    /obj/item/organ/internal/heart,
+		"heart" =    /obj/item/organ/internal/heart/plasmaman,
 		"lungs" =    /obj/item/organ/internal/lungs/plasmaman,
-		"liver" =    /obj/item/organ/internal/liver,
-		"kidneys" =  /obj/item/organ/internal/kidneys,
-		"brain" =    /obj/item/organ/internal/brain,
+		"liver" =    /obj/item/organ/internal/liver/plasmaman,
+		"kidneys" =  /obj/item/organ/internal/kidneys/plasmaman,
+		"brain" =    /obj/item/organ/internal/brain/plasmaman,
 		"appendix" = /obj/item/organ/internal/appendix,
-		"eyes" =     /obj/item/organ/internal/eyes
+		"eyes" =     /obj/item/organ/internal/eyes/plasmaman
 		)
 
 	speciesbox = /obj/item/storage/box/survival_plasmaman
diff --git a/code/modules/mob/living/carbon/human/species/skrell.dm b/code/modules/mob/living/carbon/human/species/skrell.dm
index a7c24cd338c..009514f4902 100644
--- a/code/modules/mob/living/carbon/human/species/skrell.dm
+++ b/code/modules/mob/living/carbon/human/species/skrell.dm
@@ -28,13 +28,13 @@
 	butt_sprite = "skrell"
 
 	has_organ = list(
-		"heart" =    /obj/item/organ/internal/heart,
-		"lungs" =    /obj/item/organ/internal/lungs,
+		"heart" =    /obj/item/organ/internal/heart/skrell,
+		"lungs" =    /obj/item/organ/internal/lungs/skrell,
 		"liver" =    /obj/item/organ/internal/liver/skrell,
-		"kidneys" =  /obj/item/organ/internal/kidneys,
-		"brain" =    /obj/item/organ/internal/brain,
+		"kidneys" =  /obj/item/organ/internal/kidneys/skrell,
+		"brain" =    /obj/item/organ/internal/brain/skrell,
 		"appendix" = /obj/item/organ/internal/appendix,
-		"eyes" =     /obj/item/organ/internal/eyes, //Default darksight of 2.
+		"eyes" =     /obj/item/organ/internal/eyes/skrell, //Default darksight of 2.
 		"headpocket" = /obj/item/organ/internal/headpocket
 		)
 
diff --git a/code/modules/mob/living/carbon/human/species/tajaran.dm b/code/modules/mob/living/carbon/human/species/tajaran.dm
index d4cdaf95944..2b0c65aa821 100644
--- a/code/modules/mob/living/carbon/human/species/tajaran.dm
+++ b/code/modules/mob/living/carbon/human/species/tajaran.dm
@@ -30,16 +30,17 @@
 	dietflags = DIET_OMNI
 	taste_sensitivity = TASTE_SENSITIVITY_SHARP
 	reagent_tag = PROCESS_ORG
+
 	flesh_color = "#AFA59E"
 	base_color = "#424242"
 	butt_sprite = "tajaran"
 
 	has_organ = list(
-		"heart" =    /obj/item/organ/internal/heart,
-		"lungs" =    /obj/item/organ/internal/lungs,
+		"heart" =    /obj/item/organ/internal/heart/tajaran,
+		"lungs" =    /obj/item/organ/internal/lungs/tajaran,
 		"liver" =    /obj/item/organ/internal/liver/tajaran,
-		"kidneys" =  /obj/item/organ/internal/kidneys,
-		"brain" =    /obj/item/organ/internal/brain,
+		"kidneys" =  /obj/item/organ/internal/kidneys/tajaran,
+		"brain" =    /obj/item/organ/internal/brain/tajaran,
 		"appendix" = /obj/item/organ/internal/appendix,
 		"eyes" =     /obj/item/organ/internal/eyes/tajaran /*Most Tajara see in full colour as a result of genetic augmentation, although it cost them their darksight (darksight = 2)
 															 unless they choose otherwise by selecting the colourblind disability in character creation (darksight = 8 but colourblind).*/
diff --git a/code/modules/mob/living/carbon/human/species/unathi.dm b/code/modules/mob/living/carbon/human/species/unathi.dm
index bcad7d9342e..f255091a7d6 100644
--- a/code/modules/mob/living/carbon/human/species/unathi.dm
+++ b/code/modules/mob/living/carbon/human/species/unathi.dm
@@ -38,11 +38,11 @@
 	brute_mod = 1.05
 
 	has_organ = list(
-		"heart" =    /obj/item/organ/internal/heart,
-		"lungs" =    /obj/item/organ/internal/lungs,
+		"heart" =    /obj/item/organ/internal/heart/unathi,
+		"lungs" =    /obj/item/organ/internal/lungs/unathi,
 		"liver" =    /obj/item/organ/internal/liver/unathi,
-		"kidneys" =  /obj/item/organ/internal/kidneys,
-		"brain" =    /obj/item/organ/internal/brain,
+		"kidneys" =  /obj/item/organ/internal/kidneys/unathi,
+		"brain" =    /obj/item/organ/internal/brain/unathi,
 		"appendix" = /obj/item/organ/internal/appendix,
 		"eyes" =     /obj/item/organ/internal/eyes/unathi //3 darksight.
 		)
diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm
index b3ac08580aa..bc21dd1ee5f 100644
--- a/code/modules/mob/living/carbon/human/species/vox.dm
+++ b/code/modules/mob/living/carbon/human/species/vox.dm
@@ -62,13 +62,13 @@
 		)
 
 	has_organ = list(
-		"heart" =    /obj/item/organ/internal/heart,
+		"heart" =    /obj/item/organ/internal/heart/vox,
 		"lungs" =    /obj/item/organ/internal/lungs/vox,
 		"liver" =    /obj/item/organ/internal/liver/vox,
-		"kidneys" =  /obj/item/organ/internal/kidneys,
-		"brain" =    /obj/item/organ/internal/brain,
+		"kidneys" =  /obj/item/organ/internal/kidneys/vox,
+		"brain" =    /obj/item/organ/internal/brain/vox,
 		"appendix" = /obj/item/organ/internal/appendix,
-		"eyes" =     /obj/item/organ/internal/eyes, //Default darksight of 2.
+		"eyes" =     /obj/item/organ/internal/eyes/vox, //Default darksight of 2.
 		"stack" =    /obj/item/organ/internal/stack //Not the same as the cortical stack implant Vox Raiders spawn with. The cortical stack implant is used
 		)												//for determining the success of the heist game-mode's 'leave nobody behind' objective, while this is just an organ.
 
diff --git a/code/modules/mob/living/carbon/human/species/vulpkanin.dm b/code/modules/mob/living/carbon/human/species/vulpkanin.dm
index 3e6ebc1d41d..2ff707ee020 100644
--- a/code/modules/mob/living/carbon/human/species/vulpkanin.dm
+++ b/code/modules/mob/living/carbon/human/species/vulpkanin.dm
@@ -22,6 +22,7 @@
 	hunger_drain = 0.11
 	taste_sensitivity = TASTE_SENSITIVITY_SHARP
 	reagent_tag = PROCESS_ORG
+
 	flesh_color = "#966464"
 	base_color = "#CF4D2F"
 	butt_sprite = "vulp"
@@ -29,11 +30,11 @@
 	scream_verb = "yelps"
 
 	has_organ = list(
-		"heart" =    /obj/item/organ/internal/heart,
-		"lungs" =    /obj/item/organ/internal/lungs,
+		"heart" =    /obj/item/organ/internal/heart/vulpkanin,
+		"lungs" =    /obj/item/organ/internal/lungs/vulpkanin,
 		"liver" =    /obj/item/organ/internal/liver/vulpkanin,
-		"kidneys" =  /obj/item/organ/internal/kidneys,
-		"brain" =    /obj/item/organ/internal/brain,
+		"kidneys" =  /obj/item/organ/internal/kidneys/vulpkanin,
+		"brain" =    /obj/item/organ/internal/brain/vulpkanin,
 		"appendix" = /obj/item/organ/internal/appendix,
 		"eyes" =     /obj/item/organ/internal/eyes/vulpkanin /*Most Vulpkanin see in full colour as a result of genetic augmentation, although it cost them their darksight (darksight = 2)
 															   unless they choose otherwise by selecting the colourblind disability in character creation (darksight = 8 but colourblind).*/
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 9e437f415a9..3026da6f66a 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -315,7 +315,8 @@
 /obj/item/organ/internal/lungs/plasmaman
 	name = "plasma filter"
 	desc = "A spongy rib-shaped mass for filtering plasma from the air."
-	icon_state = "lungs-plasma"
+	icon = 'icons/obj/species_organs/plasmaman.dmi'
+	icon_state = "lungs"
 
 	safe_oxygen_min = 0 //We don't breath this
 	safe_toxins_min = 16 //We breathe THIS!
@@ -324,6 +325,8 @@
 /obj/item/organ/internal/lungs/vox
 	name = "Vox lungs"
 	desc = "They're filled with dust....wow."
+	icon = 'icons/obj/species_organs/vox.dmi'
+	icon_state = "lungs"
 
 	safe_oxygen_min = 0 //We don't breathe this
 	safe_oxygen_max = 0.05 //This is toxic to us
@@ -331,7 +334,7 @@
 	oxy_damage_type = TOX //And it poisons us
 
 /obj/item/organ/internal/lungs/drask
-	icon = 'icons/obj/surgery_drask.dmi'
+	icon = 'icons/obj/species_organs/drask.dmi'
 
 	cold_message = "an invigorating coldness"
 	cold_level_3_threshold = 60
diff --git a/code/modules/surgery/organs/subtypes/drask.dm b/code/modules/surgery/organs/subtypes/drask.dm
index 6e11cf2993e..e457c4cddaa 100644
--- a/code/modules/surgery/organs/subtypes/drask.dm
+++ b/code/modules/surgery/organs/subtypes/drask.dm
@@ -1,29 +1,29 @@
 //DRASK ORGAN
 /obj/item/organ/internal/drask
 	name = "drask organ"
-	icon = 'icons/obj/surgery_drask.dmi'
+	icon = 'icons/obj/species_organs/drask.dmi'
 	icon_state = "innards"
 	desc = "A greenish, slightly translucent organ. It is extremely cold."
 
 /obj/item/organ/internal/heart/drask
 	name = "drask heart"
-	icon = 'icons/obj/surgery_drask.dmi'
+	icon = 'icons/obj/species_organs/drask.dmi'
 	parent_organ = "head"
 
 /obj/item/organ/internal/liver/drask
 	name = "metabolic strainer"
-	icon = 'icons/obj/surgery_drask.dmi'
+	icon = 'icons/obj/species_organs/drask.dmi'
 	icon_state = "kidneys"
 	alcohol_intensity = 0.8
 
 /obj/item/organ/internal/brain/drask
-	icon = 'icons/obj/surgery_drask.dmi'
+	icon = 'icons/obj/species_organs/drask.dmi'
 	icon_state = "brain2"
-	mmi_icon = 'icons/obj/surgery_drask.dmi'
+	mmi_icon = 'icons/obj/species_organs/drask.dmi'
 	mmi_icon_state = "mmi_full"
 
 /obj/item/organ/internal/eyes/drask
 	name = "drask eyeballs"
-	icon = 'icons/obj/surgery_drask.dmi'
+	icon = 'icons/obj/species_organs/drask.dmi'
 	desc = "Drask eyes. They look even stranger disembodied"
 	dark_view = 5
\ No newline at end of file
diff --git a/code/modules/surgery/organs/subtypes/grey.dm b/code/modules/surgery/organs/subtypes/grey.dm
index 177e4ae5be1..3e7598fa06f 100644
--- a/code/modules/surgery/organs/subtypes/grey.dm
+++ b/code/modules/surgery/organs/subtypes/grey.dm
@@ -1,9 +1,15 @@
 /obj/item/organ/internal/liver/grey
+	name = "grey liver"
+	desc = "A small, odd looking liver"
+	icon = 'icons/obj/species_organs/grey.dmi'
 	alcohol_intensity = 1.6
 
 /obj/item/organ/internal/brain/grey
-	icon_state = "brain-x"
-	mmi_icon_state = "mmi_alien"
+	desc = "A large brain"
+	icon = 'icons/obj/species_organs/grey.dmi'
+	icon_state = "brain2"
+	mmi_icon = 'icons/obj/species_organs/grey.dmi'
+	mmi_icon_state = "mmi_full"
 
 /obj/item/organ/internal/brain/grey/insert(var/mob/living/carbon/M, var/special = 0)
 	..()
@@ -15,4 +21,18 @@
 
 /obj/item/organ/internal/eyes/grey
 	name = "grey eyeballs"
-	dark_view = 5
\ No newline at end of file
+	desc = "They still look creepy and emotionless"
+	icon = 'icons/obj/species_organs/grey.dmi'
+	dark_view = 5
+
+/obj/item/organ/internal/heart/grey
+	name = "grey heart"
+	icon = 'icons/obj/species_organs/grey.dmi'
+
+/obj/item/organ/internal/lungs/grey
+	name = "grey lungs"
+	icon = 'icons/obj/species_organs/grey.dmi'
+
+/obj/item/organ/internal/kidneys/grey
+	name = "grey kidneys"
+	icon = 'icons/obj/species_organs/grey.dmi'
\ No newline at end of file
diff --git a/code/modules/surgery/organs/subtypes/kidan.dm b/code/modules/surgery/organs/subtypes/kidan.dm
index 72290fd624b..3778a7204cc 100644
--- a/code/modules/surgery/organs/subtypes/kidan.dm
+++ b/code/modules/surgery/organs/subtypes/kidan.dm
@@ -1,6 +1,9 @@
 /obj/item/organ/internal/liver/kidan
+	name = "kidan liver"
+	icon = 'icons/obj/species_organs/kidan.dmi'
 	alcohol_intensity = 0.5
 
+
 #define KIDAN_LANTERN_HUNGERCOST 0.5
 #define KIDAN_LANTERN_MINHUNGER 150
 #define KIDAN_LANTERN_LIGHT 5
@@ -8,6 +11,7 @@
 /obj/item/organ/internal/lantern
 	name = "Bioluminescent Lantern"
 	desc = "A specialized tissue that reacts with oxygen, nutriment and blood to produce light in Kidan."
+	icon = 'icons/obj/species_organs/kidan.dmi'
 	icon_state = "kid_lantern"
 	origin_tech = "biotech=2"
 	w_class = WEIGHT_CLASS_TINY
@@ -107,6 +111,28 @@
 
 	. = ..()
 
+/obj/item/organ/internal/eyes/kidan
+	name = "kidan eyeballs"
+	icon = 'icons/obj/species_organs/kidan.dmi'
+
+/obj/item/organ/internal/heart/kidan
+	name = "kidan heart"
+	icon = 'icons/obj/species_organs/kidan.dmi'
+
+/obj/item/organ/internal/brain/kidan
+	icon = 'icons/obj/species_organs/kidan.dmi'
+	icon_state = "brain2"
+	mmi_icon = 'icons/obj/species_organs/kidan.dmi'
+	mmi_icon_state = "mmi_full"
+
+/obj/item/organ/internal/lungs/kidan
+	name = "kidan lungs"
+	icon = 'icons/obj/species_organs/kidan.dmi'
+
+/obj/item/organ/internal/kidneys/kidan
+	name = "kidan kidneys"
+	icon = 'icons/obj/species_organs/kidan.dmi'
+
 #undef KIDAN_LANTERN_HUNGERCOST
 #undef KIDAN_LANTERN_MINHUNGER
 #undef KIDAN_LANTERN_LIGHT
\ No newline at end of file
diff --git a/code/modules/surgery/organs/subtypes/plasmaman.dm b/code/modules/surgery/organs/subtypes/plasmaman.dm
new file mode 100644
index 00000000000..3fd59189fb0
--- /dev/null
+++ b/code/modules/surgery/organs/subtypes/plasmaman.dm
@@ -0,0 +1,21 @@
+/obj/item/organ/internal/liver/plasmaman
+	name = "plasmaman liver"
+	icon = 'icons/obj/species_organs/plasmaman.dmi'
+
+/obj/item/organ/internal/eyes/plasmaman
+	name = "plasmaman eyeballs"
+	icon = 'icons/obj/species_organs/plasmaman.dmi'
+
+/obj/item/organ/internal/heart/plasmaman
+	name = "plasmaman heart"
+	icon = 'icons/obj/species_organs/plasmaman.dmi'
+
+/obj/item/organ/internal/brain/plasmaman
+	icon = 'icons/obj/species_organs/plasmaman.dmi'
+	icon_state = "brain2"
+	mmi_icon = 'icons/obj/species_organs/plasmaman.dmi'
+	mmi_icon_state = "mmi_full"
+
+/obj/item/organ/internal/kidneys/plasmaman
+	name = "plasmaman kidneys"
+	icon = 'icons/obj/species_organs/plasmaman.dmi'
\ No newline at end of file
diff --git a/code/modules/surgery/organs/subtypes/skrell.dm b/code/modules/surgery/organs/subtypes/skrell.dm
index 20eae88139c..0443fa4f49f 100644
--- a/code/modules/surgery/organs/subtypes/skrell.dm
+++ b/code/modules/surgery/organs/subtypes/skrell.dm
@@ -1,9 +1,12 @@
 /obj/item/organ/internal/liver/skrell
+	name = "skrell liver"
+	icon = 'icons/obj/species_organs/skrell.dmi'
 	alcohol_intensity = 4
 
 /obj/item/organ/internal/headpocket
 	name = "headpocket"
 	desc = "Allows Skrell to hide tiny objects within their head tentacles."
+	icon = 'icons/obj/species_organs/skrell.dmi'
 	icon_state = "skrell_headpocket"
 	origin_tech = "biotech=2"
 	w_class = WEIGHT_CLASS_TINY
@@ -59,3 +62,28 @@
 /obj/item/organ/internal/headpocket/hear_message(mob/living/M as mob, msg)
 	pocket.hear_message(M, msg)
 	..()
+
+/obj/item/organ/internal/heart/skrell
+	name = "skrell heart"
+	desc = "A stream lined heart"
+	icon = 'icons/obj/species_organs/skrell.dmi'
+
+/obj/item/organ/internal/brain/skrell
+	icon = 'icons/obj/species_organs/skrell.dmi'
+	desc = "A brain with a odd division in the middle."
+	icon_state = "brain2"
+	mmi_icon = 'icons/obj/species_organs/skrell.dmi'
+	mmi_icon_state = "mmi_full"
+
+/obj/item/organ/internal/lungs/skrell
+	name = "skrell lungs"
+	icon = 'icons/obj/species_organs/skrell.dmi'
+
+/obj/item/organ/internal/kidneys/skrell
+	name = "skrell kidneys"
+	icon = 'icons/obj/species_organs/skrell.dmi'
+	desc = "The smallest kidneys you have ever seen, it probably doesn't even work."
+
+/obj/item/organ/internal/eyes/skrell
+	name = "skrell eyeballs"
+	icon = 'icons/obj/species_organs/skrell.dmi'
\ No newline at end of file
diff --git a/code/modules/surgery/organs/subtypes/tajaran.dm b/code/modules/surgery/organs/subtypes/tajaran.dm
index 1857fc5e45a..d6202a377e6 100644
--- a/code/modules/surgery/organs/subtypes/tajaran.dm
+++ b/code/modules/surgery/organs/subtypes/tajaran.dm
@@ -1,7 +1,10 @@
 /obj/item/organ/internal/liver/tajaran
+	name = "tajaran liver"
+	icon = 'icons/obj/species_organs/tajaran.dmi'
 	alcohol_intensity = 1.4
 
 /obj/item/organ/internal/eyes/tajaran
+	icon = 'icons/obj/species_organs/tajaran.dmi'
 	name = "tajaran eyeballs"
 	colourblind_matrix = MATRIX_TAJ_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability.
 	replace_colours = LIST_TAJ_REPLACE
@@ -12,3 +15,21 @@
 	colourmatrix = MATRIX_TAJ_CBLIND
 	dark_view = 8
 	replace_colours = LIST_TAJ_REPLACE
+
+/obj/item/organ/internal/heart/tajaran
+	name = "tajaran heart"
+	icon = 'icons/obj/species_organs/tajaran.dmi'
+
+/obj/item/organ/internal/brain/tajaran
+	icon = 'icons/obj/species_organs/tajaran.dmi'
+	icon_state = "brain2"
+	mmi_icon = 'icons/obj/species_organs/tajaran.dmi'
+	mmi_icon_state = "mmi_full"
+
+/obj/item/organ/internal/lungs/tajaran
+	name = "tajaran lungs"
+	icon = 'icons/obj/species_organs/tajaran.dmi'
+
+/obj/item/organ/internal/kidneys/tajaran
+	name = "tajaran kidneys"
+	icon = 'icons/obj/species_organs/tajaran.dmi'
\ No newline at end of file
diff --git a/code/modules/surgery/organs/subtypes/unathi.dm b/code/modules/surgery/organs/subtypes/unathi.dm
index 219ef0447e6..26ad86d4700 100644
--- a/code/modules/surgery/organs/subtypes/unathi.dm
+++ b/code/modules/surgery/organs/subtypes/unathi.dm
@@ -1,6 +1,30 @@
 /obj/item/organ/internal/liver/unathi
+	name = "unathi liver"
+	icon = 'icons/obj/species_organs/unathi.dmi'
+	desc = "A large looking liver"
 	alcohol_intensity = 0.8
 
 /obj/item/organ/internal/eyes/unathi
 	name = "unathi eyeballs"
-	dark_view = 3
\ No newline at end of file
+	icon = 'icons/obj/species_organs/unathi.dmi'
+	dark_view = 3
+
+/obj/item/organ/internal/heart/unathi
+	name = "unathi heart"
+	desc = "A large looking heart"
+	icon = 'icons/obj/species_organs/unathi.dmi'
+
+/obj/item/organ/internal/brain/unathi
+	icon = 'icons/obj/species_organs/unathi.dmi'
+	desc = "A smallish looking brain."
+	icon_state = "brain2"
+	mmi_icon = 'icons/obj/species_organs/unathi.dmi'
+	mmi_icon_state = "mmi_full"
+
+/obj/item/organ/internal/lungs/unathi
+	name = "unathi lungs"
+	icon = 'icons/obj/species_organs/unathi.dmi'
+
+/obj/item/organ/internal/kidneys/unathi
+	name = "unathi kidneys"
+	icon = 'icons/obj/species_organs/unathi.dmi'
\ No newline at end of file
diff --git a/code/modules/surgery/organs/subtypes/vox.dm b/code/modules/surgery/organs/subtypes/vox.dm
index 8af6f8bf740..e71393b964d 100644
--- a/code/modules/surgery/organs/subtypes/vox.dm
+++ b/code/modules/surgery/organs/subtypes/vox.dm
@@ -1,9 +1,12 @@
 /obj/item/organ/internal/liver/vox
+	name = "vox liver"
+	icon = 'icons/obj/species_organs/vox.dmi'
 	alcohol_intensity = 1.6
 
 
 /obj/item/organ/internal/stack
 	name = "cortical stack"
+	icon = 'icons/obj/species_organs/vox.dmi'
 	icon_state = "cortical-stack"
 	parent_organ = "head"
 	organ_tag = "stack"
@@ -29,4 +32,23 @@
 		owner.AdjustConfused(4)
 		if(!stackdamaged)
 			stackdamaged = TRUE
-	..()
\ No newline at end of file
+	..()
+
+/obj/item/organ/internal/eyes/vox
+	name = "vox eyeballs"
+	icon = 'icons/obj/species_organs/vox.dmi'
+
+/obj/item/organ/internal/heart/vox
+	name = "vox heart"
+	icon = 'icons/obj/species_organs/vox.dmi'
+
+/obj/item/organ/internal/brain/vox
+	icon = 'icons/obj/species_organs/vox.dmi'
+	desc = "A brain with spikes on top of it. It has some odd metallic slot with wires on the side."
+	icon_state = "brain2"
+	mmi_icon = 'icons/obj/species_organs/vox.dmi'
+	mmi_icon_state = "mmi_full"
+
+/obj/item/organ/internal/kidneys/vox
+	name = "vox kidneys"
+	icon = 'icons/obj/species_organs/vox.dmi'
\ No newline at end of file
diff --git a/code/modules/surgery/organs/subtypes/vulpkanin.dm b/code/modules/surgery/organs/subtypes/vulpkanin.dm
index 959fbcc926c..2c583c8f84a 100644
--- a/code/modules/surgery/organs/subtypes/vulpkanin.dm
+++ b/code/modules/surgery/organs/subtypes/vulpkanin.dm
@@ -1,8 +1,11 @@
 /obj/item/organ/internal/liver/vulpkanin
+	name = "vulpkanin liver"
+	icon = 'icons/obj/species_organs/vulpkanin.dmi'
 	alcohol_intensity = 1.4
 
 /obj/item/organ/internal/eyes/vulpkanin
 	name = "vulpkanin eyeballs"
+	icon = 'icons/obj/species_organs/vulpkanin.dmi'
 	colourblind_matrix = MATRIX_VULP_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability.
 	replace_colours = LIST_VULP_REPLACE
 	dark_view = 8
@@ -11,4 +14,22 @@
 	name = "wolpin eyeballs"
 	colourmatrix = MATRIX_VULP_CBLIND
 	dark_view = 8
-	replace_colours = LIST_VULP_REPLACE
\ No newline at end of file
+	replace_colours = LIST_VULP_REPLACE
+
+/obj/item/organ/internal/heart/vulpkanin
+	name = "vulpkanin heart"
+	icon = 'icons/obj/species_organs/vulpkanin.dmi'
+
+/obj/item/organ/internal/brain/vulpkanin
+	icon = 'icons/obj/species_organs/vulpkanin.dmi'
+	icon_state = "brain2"
+	mmi_icon = 'icons/obj/species_organs/vulpkanin.dmi'
+	mmi_icon_state = "mmi_full"
+
+/obj/item/organ/internal/lungs/vulpkanin
+	name = "vulpkanin lungs"
+	icon = 'icons/obj/species_organs/vulpkanin.dmi'
+
+/obj/item/organ/internal/kidneys/vulpkanin
+	name = "vulpkanin kidneys"
+	icon = 'icons/obj/species_organs/vulpkanin.dmi'
\ No newline at end of file
diff --git a/icons/obj/species_organs/drask.dmi b/icons/obj/species_organs/drask.dmi
new file mode 100644
index 00000000000..95915450fcc
Binary files /dev/null and b/icons/obj/species_organs/drask.dmi differ
diff --git a/icons/obj/species_organs/grey.dmi b/icons/obj/species_organs/grey.dmi
new file mode 100644
index 00000000000..647febdc67b
Binary files /dev/null and b/icons/obj/species_organs/grey.dmi differ
diff --git a/icons/obj/species_organs/kidan.dmi b/icons/obj/species_organs/kidan.dmi
new file mode 100644
index 00000000000..8969d64c669
Binary files /dev/null and b/icons/obj/species_organs/kidan.dmi differ
diff --git a/icons/obj/species_organs/plasmaman.dmi b/icons/obj/species_organs/plasmaman.dmi
new file mode 100644
index 00000000000..e5b19f5d3a6
Binary files /dev/null and b/icons/obj/species_organs/plasmaman.dmi differ
diff --git a/icons/obj/species_organs/skrell.dmi b/icons/obj/species_organs/skrell.dmi
new file mode 100644
index 00000000000..998370f7344
Binary files /dev/null and b/icons/obj/species_organs/skrell.dmi differ
diff --git a/icons/obj/species_organs/tajaran.dmi b/icons/obj/species_organs/tajaran.dmi
new file mode 100644
index 00000000000..673e5d29a4e
Binary files /dev/null and b/icons/obj/species_organs/tajaran.dmi differ
diff --git a/icons/obj/species_organs/unathi.dmi b/icons/obj/species_organs/unathi.dmi
new file mode 100644
index 00000000000..018816c4068
Binary files /dev/null and b/icons/obj/species_organs/unathi.dmi differ
diff --git a/icons/obj/species_organs/vox.dmi b/icons/obj/species_organs/vox.dmi
new file mode 100644
index 00000000000..cb9626fa9ff
Binary files /dev/null and b/icons/obj/species_organs/vox.dmi differ
diff --git a/icons/obj/species_organs/vulpkanin.dmi b/icons/obj/species_organs/vulpkanin.dmi
new file mode 100644
index 00000000000..42d1338a8e1
Binary files /dev/null and b/icons/obj/species_organs/vulpkanin.dmi differ
diff --git a/icons/obj/surgery_drask.dmi b/icons/obj/surgery_drask.dmi
deleted file mode 100644
index 082d3e0f4f2..00000000000
Binary files a/icons/obj/surgery_drask.dmi and /dev/null differ
diff --git a/paradise.dme b/paradise.dme
index 094e49a99f0..db973f4e72e 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -2349,6 +2349,7 @@
 #include "code\modules\surgery\organs\subtypes\kidan.dm"
 #include "code\modules\surgery\organs\subtypes\machine.dm"
 #include "code\modules\surgery\organs\subtypes\nucleation.dm"
+#include "code\modules\surgery\organs\subtypes\plasmaman.dm"
 #include "code\modules\surgery\organs\subtypes\shadow.dm"
 #include "code\modules\surgery\organs\subtypes\skrell.dm"
 #include "code\modules\surgery\organs\subtypes\standard.dm"