diff --git a/code/datums/supplypacks/medical.dm b/code/datums/supplypacks/medical.dm
index bfaf2658bf2..2c2e26d97da 100644
--- a/code/datums/supplypacks/medical.dm
+++ b/code/datums/supplypacks/medical.dm
@@ -330,8 +330,8 @@
 	access = access_cmo
 
 /datum/supply_packs/med/defib
-	name = "Defibrilator crate"
+	name = "Defibrillator crate"
 	contains = list(/obj/item/device/defib_kit = 2)
 	cost = 30
 	containertype = /obj/structure/closet/crate/medical
-	containername = "Defibrilator crate"
\ No newline at end of file
+	containername = "Defibrillator crate"
\ No newline at end of file
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 4187cfc422f..ae255d2f7b9 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -266,22 +266,26 @@ REAGENT SCANNER
 		if(0)
 			to_chat(usr, "The scanner will now perform a basic analysis.")
 
-/obj/item/device/healthanalyzer/improved //reports bone fractures, IB, quantity of beneficial reagents in stomach; also regular health analyzer stuff
+/obj/item/device/healthanalyzer/advanced //reports bone fractures, IB, quantity of beneficial reagents in stomach; also regular health analyzer stuff
 	name = "advanced health analyzer"
 	desc = "A miracle of medical technology, this handheld scanner can produce an accurate and specific report of a patient's biosigns."
 	advscan = 1
 	origin_tech = list(TECH_MAGNET = 5, TECH_BIO = 6)
-	icon_state = "advhealth"
+	icon_state = "health1"
 
-/obj/item/device/healthanalyzer/advanced //reports all of the above, as well as radiation severity and minor brain damage
-	name = "advanced health analyzer"
+/obj/item/device/healthanalyzer/enhanced //reports all of the above, as well as radiation severity and minor brain damage
+	name = "enhanced health analyzer"
+	desc = "An even more advanced handheld health scanner, complete with a full biosign monitor and on-board radiation and neurological analysis suites."
 	advscan = 2
-	icon_state = "advhealth"
+	origin_tech = list(TECH_MAGNET = 6, TECH_BIO = 7)
+	icon_state = "health2"
 
-/obj/item/device/healthanalyzer/enhanced //reports all of the above, as well as name and quantity of nonmed reagents in stomach
+/obj/item/device/healthanalyzer/phasic //reports all of the above, as well as name and quantity of nonmed reagents in stomach
 	name = "phasic health analyzer"
+	desc = "Possibly the most advanced health analyzer to ever have existed, utilising bluespace technology to determine almost everything worth knowing about a patient."
 	advscan = 3
-	icon_state = "advhealth"
+	origin_tech = list(TECH_MAGNET = 7, TECH_BIO = 8)
+	icon_state = "health3"
 
 /obj/item/device/analyzer
 	name = "analyzer"
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index 24ba099e8f9..43b7c9e22b9 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -128,6 +128,7 @@
 	new /obj/item/weapon/storage/pill_bottle/spaceacillin(src)
 	new /obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting(src)
 	new /obj/item/stack/medical/splint(src)
+	new /obj/item/device/healthanalyzer/advanced(src)
 	return
 
 /obj/item/weapon/storage/firstaid/surgery
@@ -149,7 +150,7 @@
 	new /obj/item/weapon/surgical/bonegel(src)
 	new /obj/item/weapon/surgical/FixOVein(src)
 	new /obj/item/stack/medical/advanced/bruise_pack(src)
-	new /obj/item/device/healthanalyzer/advanced(src)
+	new /obj/item/device/healthanalyzer/enhanced(src)
 	return
 
 /obj/item/weapon/storage/firstaid/clotting
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index dc4401f0bcc..a6e158befad 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -491,6 +491,15 @@ other types of metals and chemistry for reagents).
 	build_path = /obj/item/roller/adv
 	sort_string = "MBBAF"
 
+/datum/design/item/medical/enhanced_analyzer
+	name = "enhanced health analyzer"
+	desc = "A prototype version of the regular health analyzer, able to distinguish the location of more serious injuries as well as accurately determine radiation levels."
+	id = "advanced_analyzer"
+	req_tech = list(TECH_MAGNET = 5, TECH_BIO = 6)
+	materials = list(DEFAULT_WALL_MATERIAL = 2000, "glass" = 1000, "silver" = 1000, "gold" = 1500)
+	build_path = /obj/item/device/healthanalyzer/advanced
+	sort_string = "MBBAG"
+
 /datum/design/item/implant
 	materials = list(DEFAULT_WALL_MATERIAL = 50, "glass" = 50)
 
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index c6d99196272..e0e3305d44f 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ