diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm
index 90c9d78272..f361e557d0 100644
--- a/code/game/objects/items/dna_injector.dm
+++ b/code/game/objects/items/dna_injector.dm
@@ -1,7 +1,7 @@
 /obj/item/dnainjector
 	name = "\improper DNA injector"
 	desc = "This injects the person with DNA."
-	icon = 'icons/obj/items_and_weapons.dmi'
+	icon = 'icons/obj/syringe.dmi'
 	icon_state = "dnainjector"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
diff --git a/code/game/objects/items/implants/implantcase.dm b/code/game/objects/items/implants/implantcase.dm
index 8573324b56..b2980d84d3 100644
--- a/code/game/objects/items/implants/implantcase.dm
+++ b/code/game/objects/items/implants/implantcase.dm
@@ -1,7 +1,7 @@
 /obj/item/implantcase
 	name = "implant case"
 	desc = "A glass case containing an implant."
-	icon = 'icons/obj/items_and_weapons.dmi'
+	icon = 'icons/obj/syringe.dmi'
 	icon_state = "implantcase-0"
 	item_state = "implantcase"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
diff --git a/code/game/objects/items/implants/implanter.dm b/code/game/objects/items/implants/implanter.dm
index 578d8595dd..cfeb001112 100644
--- a/code/game/objects/items/implants/implanter.dm
+++ b/code/game/objects/items/implants/implanter.dm
@@ -1,7 +1,7 @@
 /obj/item/implanter
 	name = "implanter"
 	desc = "A sterile automatic implant injector."
-	icon = 'icons/obj/items_and_weapons.dmi'
+	icon = 'icons/obj/syringe.dmi'
 	icon_state = "implanter0"
 	item_state = "syringe_0"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 6b97772b00..dcacd00fe2 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -357,8 +357,69 @@
 	item_state = "duffel-med"
 
 /obj/item/storage/backpack/duffelbag/med/surgery
-	name = "surgical duffel bag"
-	desc = "A large duffel bag for holding extra medical supplies - this one seems to be designed for holding surgical tools."
+	name = "surgical tools case"
+	desc = "A large plastic case for holding surgical tools or most other medical supplies you could imagine."
+	icon_state = "firstaid-surgery"
+	item_state = "firstaid"
+	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+	slot_flags = NONE
+
+/obj/item/storage/backpack/duffelbag/med/surgery/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	var/static/list/can_hold = typecacheof(list(
+		/obj/item/healthanalyzer,
+		/obj/item/dnainjector,
+		/obj/item/reagent_containers/dropper,
+		/obj/item/reagent_containers/glass/beaker,
+		/obj/item/reagent_containers/glass/bottle,
+		/obj/item/reagent_containers/pill,
+		/obj/item/reagent_containers/syringe,
+		/obj/item/reagent_containers/medspray,
+		/obj/item/lighter,
+		/obj/item/storage/fancy/cigarettes,
+		/obj/item/storage/pill_bottle,
+		/obj/item/stack/medical,
+		/obj/item/flashlight/pen,
+		/obj/item/extinguisher/mini,
+		/obj/item/reagent_containers/hypospray,
+		/obj/item/hypospray/mkii,
+		/obj/item/sensor_device,
+		/obj/item/radio,
+		/obj/item/clothing/gloves/,
+		/obj/item/lazarus_injector,
+		/obj/item/bikehorn/rubberducky,
+		/obj/item/clothing/mask/surgical,
+		/obj/item/clothing/mask/breath,
+		/obj/item/clothing/mask/breath/medical,
+		/obj/item/surgical_drapes,
+		/obj/item/scalpel,
+		/obj/item/circular_saw,
+		/obj/item/bonesetter,
+		/obj/item/surgicaldrill,
+		/obj/item/retractor,
+		/obj/item/cautery,
+		/obj/item/hemostat,
+		/obj/item/geiger_counter,
+		/obj/item/clothing/neck/stethoscope,
+		/obj/item/stamp,
+		/obj/item/clothing/glasses,
+		/obj/item/wrench/medical,
+		/obj/item/clothing/mask/muzzle,
+		/obj/item/storage/bag/chemistry,
+		/obj/item/storage/bag/bio,
+		/obj/item/reagent_containers/blood,
+		/obj/item/tank/internals/emergency_oxygen,
+		/obj/item/gun/syringe/syndicate,
+		/obj/item/implantcase,
+		/obj/item/implant,
+		/obj/item/implanter,
+		/obj/item/pinpointer/crew,
+		/obj/item/reagent_containers/chem_pack,
+		/obj/item/stack/sticky_tape
+		))
+	STR.can_hold = can_hold
 
 /obj/item/storage/backpack/duffelbag/med/surgery/PopulateContents()
 	new /obj/item/scalpel(src)
@@ -368,6 +429,7 @@
 	new /obj/item/surgicaldrill(src)
 	new /obj/item/cautery(src)
 	new /obj/item/bonesetter(src)
+	new /obj/item/stack/medical/bone_gel(src)
 	new /obj/item/surgical_drapes(src)
 	new /obj/item/clothing/mask/surgical(src)
 	new /obj/item/reagent_containers/medspray/sterilizine(src)
diff --git a/code/game/objects/items/storage/briefcase.dm b/code/game/objects/items/storage/briefcase.dm
index 454475625d..f64cdbc98b 100644
--- a/code/game/objects/items/storage/briefcase.dm
+++ b/code/game/objects/items/storage/briefcase.dm
@@ -105,7 +105,7 @@
 
 /obj/item/storage/briefcase/medical
 	name = "medical briefcase"
-	icon_state = "medbriefcase"
+	icon_state = "firstaid-briefcase"
 	desc = "A white with a blue cross brieface, this is meant to hold medical gear that would not be able to normally fit in a bag."
 
 /obj/item/storage/briefcase/medical/PopulateContents()
diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm
index e700bf87e0..bcfcbe20f8 100644
--- a/code/game/objects/items/storage/firstaid.dm
+++ b/code/game/objects/items/storage/firstaid.dm
@@ -18,12 +18,6 @@
 	throw_speed = 3
 	throw_range = 7
 	var/empty = FALSE
-	var/list/possible_icons = list("firstaid","firstaid2","firstaid3","firstaid4")
-
-/obj/item/storage/firstaid/Initialize(mapload)
-	. = ..()
-	if(LAZYLEN(possible_icons))
-		icon_state = pick(possible_icons)
 
 /obj/item/storage/firstaid/regular
 	icon_state = "firstaid"
@@ -45,7 +39,7 @@
 	new /obj/item/healthanalyzer(src)
 
 /obj/item/storage/firstaid/emergency
-	icon_state = "medbriefcase"
+	icon_state = "firstaid-briefcase"
 	name = "emergency first-aid kit"
 	desc = "A very simple first aid kit meant to secure and stabilize serious wounds for later treatment."
 
@@ -75,12 +69,30 @@
 	new /obj/item/stack/medical/mesh(src)
 	new /obj/item/stack/medical/mesh(src)
 
+/obj/item/storage/firstaid/brute
+	name = "trauma treatment kit"
+	desc = "A first aid kit for when you get toolboxed."
+	icon_state = "firstaid-brute"
+	item_state = "firstaid-brute"
+
+/obj/item/storage/firstaid/brute/suicide_act(mob/living/carbon/user)
+	user.visible_message("<span class='suicide'>[user] begins beating [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	return BRUTELOSS
+
+/obj/item/storage/firstaid/brute/PopulateContents()
+	if(empty)
+		return
+	for(var/i in 1 to 4)
+		new /obj/item/reagent_containers/pill/patch/styptic(src)
+	new /obj/item/stack/medical/gauze(src)
+	new /obj/item/stack/medical/gauze(src)
+	new /obj/item/healthanalyzer(src)
+
 /obj/item/storage/firstaid/fire
 	name = "burn treatment kit"
 	desc = "A specialized medical kit for when the toxins lab <i>-spontaneously-</i> burns down."
-	icon_state = "burn"
-	item_state = "firstaid-ointment"
-	possible_icons = list("burn","burn2","burn3","burn4")
+	icon_state = "firstaid-burn"
+	item_state = "firstaid-burn"
 
 /obj/item/storage/firstaid/fire/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins rubbing \the [src] against [user.p_them()]self! It looks like [user.p_theyre()] trying to start a fire!</span>")
@@ -99,9 +111,8 @@
 /obj/item/storage/firstaid/toxin
 	name = "toxin treatment kit"
 	desc = "Used to treat toxic blood content and radiation poisoning."
-	icon_state = "toxin"
+	icon_state = "firstaid-toxin"
 	item_state = "firstaid-toxin"
-	possible_icons = list("toxin","toxin2","toxin3","toxin4")
 
 /obj/item/storage/firstaid/toxin/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins licking the lead paint off \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -116,38 +127,11 @@
 		new /obj/item/storage/pill_bottle/charcoal(src)
 	new /obj/item/healthanalyzer(src)
 
-/obj/item/storage/firstaid/radbgone
-	name = "radiation treatment kit"
-	desc = "Used to treat minor toxic blood content and major radiation poisoning."
-	icon_state = "rad"
-	item_state = "firstaid-toxin"
-	possible_icons = list("rad","rad2","rad3")
-
-/obj/item/storage/firstaid/radbgone/suicide_act(mob/living/carbon/user)
-	user.visible_message("<span class='suicide'>[user] begins licking the lead paint off \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	return TOXLOSS
-
-/obj/item/storage/firstaid/radbgone/PopulateContents()
-	if(empty)
-		return
-	if(prob(50))
-		new /obj/item/reagent_containers/pill/mutarad(src)
-	if(prob(80))
-		new /obj/item/reagent_containers/pill/antirad_plus(src)
-	new /obj/item/reagent_containers/syringe/charcoal(src)
-	new /obj/item/storage/pill_bottle/charcoal(src)
-	new /obj/item/reagent_containers/pill/mutadone(src)
-	new /obj/item/reagent_containers/pill/antirad(src)
-	new /obj/item/reagent_containers/food/drinks/bottle/vodka(src)
-	new /obj/item/healthanalyzer(src)
-
-
 /obj/item/storage/firstaid/o2
 	name = "oxygen deprivation treatment kit"
 	desc = "A box full of oxygen goodies."
-	icon_state = "oxy"
+	icon_state = "firstaid-o2"
 	item_state = "firstaid-o2"
-	possible_icons = list("oxy", "oxy2", "oxy3", "oxy4")
 
 /obj/item/storage/firstaid/o2/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] begins hitting [user.p_their()] neck with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -162,31 +146,11 @@
 	new /obj/item/reagent_containers/hypospray/medipen(src)
 	new /obj/item/healthanalyzer(src)
 
-/obj/item/storage/firstaid/brute
-	name = "brute trauma treatment kit"
-	desc = "A first aid kit for when you get toolboxed."
-	icon_state = "brute"
-	item_state = "firstaid-brute"
-	possible_icons = list("brute", "brute2", "brute3", "brute4")
-
-/obj/item/storage/firstaid/brute/suicide_act(mob/living/carbon/user)
-	user.visible_message("<span class='suicide'>[user] begins beating [user.p_them()]self over the head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	return BRUTELOSS
-
-/obj/item/storage/firstaid/brute/PopulateContents()
-	if(empty)
-		return
-	for(var/i in 1 to 4)
-		new /obj/item/reagent_containers/pill/patch/styptic(src)
-	new /obj/item/stack/medical/gauze(src)
-	new /obj/item/stack/medical/gauze(src)
-	new /obj/item/healthanalyzer(src)
-
 /obj/item/storage/firstaid/tactical
-	name = "combat medical kit"
+	name = "tactical first-aid kit"
 	desc = "I hope you've got insurance."
-	icon_state = "tactical"
-	possible_icons = null
+	icon_state = "firstaid-tactical"
+	item_state = "firstaid-tactical"
 
 /obj/item/storage/firstaid/tactical/ComponentInitialize()
 	. = ..()
@@ -208,7 +172,6 @@
 	new /obj/item/clothing/glasses/hud/health/night/syndicate(src)
 
 /obj/item/storage/firstaid/tactical/nukeop
-	name = "improved combat medical kit"
 
 /obj/item/storage/firstaid/tactical/nukeop/PopulateContents()
 	if(empty)
@@ -222,6 +185,30 @@
 	new /obj/item/reagent_containers/syringe/lethal/choral(src) // what the fuck does anyone use this piece of shit for
 	new /obj/item/clothing/glasses/hud/health/night/syndicate(src)
 
+/obj/item/storage/firstaid/radbgone
+	name = "radiation treatment kit"
+	desc = "Used to treat minor toxic blood content and major radiation poisoning."
+	icon_state = "firstaid-rad"
+	item_state = "firstaid-rad"
+
+/obj/item/storage/firstaid/radbgone/suicide_act(mob/living/carbon/user)
+	user.visible_message("<span class='suicide'>[user] begins licking the lead paint off \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	return TOXLOSS
+
+/obj/item/storage/firstaid/radbgone/PopulateContents()
+	if(empty)
+		return
+	if(prob(50))
+		new /obj/item/reagent_containers/pill/mutarad(src)
+	if(prob(80))
+		new /obj/item/reagent_containers/pill/antirad_plus(src)
+	new /obj/item/reagent_containers/syringe/charcoal(src)
+	new /obj/item/storage/pill_bottle/charcoal(src)
+	new /obj/item/reagent_containers/pill/mutadone(src)
+	new /obj/item/reagent_containers/pill/antirad(src)
+	new /obj/item/reagent_containers/food/drinks/bottle/vodka(src)
+	new /obj/item/healthanalyzer(src)
+
 /*
  * Pill Bottles
  */
@@ -479,12 +466,12 @@
 	name = "hypospray kit"
 	desc = "It's a kit designed for containing a hypospray and specific treatment chemical-filled vials."
 	icon_state = "firstaid-mini"
+	item_state = "firstaid"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	throw_speed = 3
 	throw_range = 7
 	var/empty = FALSE
-	item_state = "firstaid"
 	custom_price = PRICE_ABOVE_NORMAL
 	custom_premium_price = PRICE_EXPENSIVE
 
@@ -497,7 +484,7 @@
 	/obj/item/reagent_containers/glass/bottle/vial))
 
 /obj/item/storage/hypospraykit/regular
-	icon_state = "firstaid-mini"
+	name = "first-aid hypospray kit"
 	desc = "A hypospray kit with general use vials."
 
 /obj/item/storage/hypospraykit/regular/PopulateContents()
@@ -507,11 +494,24 @@
 	new /obj/item/reagent_containers/glass/bottle/vial/small/tricord(src)
 	new /obj/item/reagent_containers/glass/bottle/vial/small/tricord(src)
 
+/obj/item/storage/hypospraykit/brute
+	name = "trauma hypospray kit"
+	icon_state = "firstaid-brute-mini"
+	item_state = "firstaid-brute"
+
+/obj/item/storage/hypospraykit/brute/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/brute(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/bicaridine(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/small/bicaridine(src)
+
+
 /obj/item/storage/hypospraykit/fire
 	name = "burn treatment hypospray kit"
 	desc = "A specialized hypospray kit for burn treatments. Apply with sass."
-	icon_state = "burn-mini"
-	item_state = "firstaid-ointment"
+	icon_state = "firstaid-burn-mini"
+	item_state = "firstaid-burn"
 
 /obj/item/storage/hypospraykit/fire/PopulateContents()
 	if(empty)
@@ -522,7 +522,7 @@
 
 /obj/item/storage/hypospraykit/toxin
 	name = "toxin treatment hypospray kit"
-	icon_state = "toxin-mini"
+	icon_state = "firstaid-toxin-mini"
 	item_state = "firstaid-toxin"
 
 /obj/item/storage/hypospraykit/toxin/PopulateContents()
@@ -534,7 +534,7 @@
 
 /obj/item/storage/hypospraykit/o2
 	name = "oxygen deprivation hypospray kit"
-	icon_state = "oxy-mini"
+	icon_state = "firstaid-o2-mini"
 	item_state = "firstaid-o2"
 
 /obj/item/storage/hypospraykit/o2/PopulateContents()
@@ -546,9 +546,39 @@
 
 /obj/item/storage/hypospraykit/enlarge
 	name = "organomegaly trauma hypospray kit"
-	icon_state = "enlarge-mini"
+	icon_state = "firstaid-enlarge-mini"
 	item_state = "firstaid-brute"
 
+/obj/item/storage/hypospraykit/tactical
+	name = "tactical first-aid hypospray kit"
+	desc = "A hypospray kit best suited for combat situations."
+	icon_state = "firstaid-tactical-mini"
+	item_state = "firstaid-tactical-mini"
+
+/obj/item/storage/hypospraykit/tactical/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/defibrillator/compact/combat/loaded(src)
+	new /obj/item/hypospray/mkii/CMO/combat(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/combat(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/combat(src)
+
+/obj/item/storage/hypospraykit/cmo
+	name = "deluxe hypospray kit"
+	desc = "A kit containing a Deluxe hypospray and Vials."
+	icon_state = "firstaid-rad-mini"
+	item_state = "firstaid-rad"
+
+/obj/item/storage/hypospraykit/cmo/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/hypospray/mkii/CMO(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/tricord(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/charcoal(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/salglu(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/dexalin(src)
+	new /obj/item/reagent_containers/glass/bottle/vial/large/synthflesh(src)
+
 /obj/item/storage/hypospraykit/enlarge/PopulateContents()
 	if(empty)
 		return
@@ -563,46 +593,6 @@
 	new /obj/item/reagent_containers/glass/bottle/vial/small/buttreduction(src)
 	new /obj/item/reagent_containers/glass/bottle/vial/small/buttreduction(src)
 
-/obj/item/storage/hypospraykit/brute
-	name = "brute trauma hypospray kit"
-	icon_state = "brute-mini"
-	item_state = "firstaid-brute"
-
-/obj/item/storage/hypospraykit/brute/PopulateContents()
-	if(empty)
-		return
-	new /obj/item/hypospray/mkii/brute(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/bicaridine(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/small/bicaridine(src)
-
-/obj/item/storage/hypospraykit/tactical
-	name = "combat hypospray kit"
-	desc = "A hypospray kit best suited for combat situations."
-	icon_state = "tactical-mini"
-
-/obj/item/storage/hypospraykit/tactical/PopulateContents()
-	if(empty)
-		return
-	new /obj/item/defibrillator/compact/combat/loaded(src)
-	new /obj/item/hypospray/mkii/CMO/combat(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/combat(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/combat(src)
-
-/obj/item/storage/hypospraykit/cmo
-	name = "deluxe hypospray kit"
-	desc = "A kit containing a Deluxe hypospray and Vials."
-	icon_state = "tactical-mini"
-
-/obj/item/storage/hypospraykit/cmo/PopulateContents()
-	if(empty)
-		return
-	new /obj/item/hypospray/mkii/CMO(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/tricord(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/charcoal(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/salglu(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/dexalin(src)
-	new /obj/item/reagent_containers/glass/bottle/vial/large/synthflesh(src)
-
 /obj/item/storage/box/vials
 	name = "box of hypovials"
 
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 229167f340..b193e5917a 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -3,6 +3,8 @@
 	desc = "Retracts stuff."
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "retractor"
+	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	custom_materials = list(/datum/material/iron=6000, /datum/material/glass=3000)
 	item_flags = SURGICAL_TOOL
 	flags_1 = CONDUCT_1
@@ -19,7 +21,6 @@
 /obj/item/retractor/advanced
 	name = "mechanical pinches"
 	desc = "An agglomerate of rods and gears."
-	icon = 'icons/obj/surgery.dmi'
 	icon_state = "retractor_a"
 	toolspeed = 0.7
 
@@ -41,8 +42,6 @@
 /obj/item/retractor/augment
 	name = "retractor"
 	desc = "Micro-mechanical manipulator for retracting stuff."
-	icon = 'icons/obj/surgery.dmi'
-	icon_state = "retractor"
 	custom_materials = list(/datum/material/iron=6000, /datum/material/glass=3000)
 	flags_1 = CONDUCT_1
 	w_class = WEIGHT_CLASS_TINY
@@ -60,6 +59,8 @@
 	desc = "You think you have seen this before."
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "hemostat"
+	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	custom_materials = list(/datum/material/iron=5000, /datum/material/glass=2500)
 	item_flags = SURGICAL_TOOL
 	flags_1 = CONDUCT_1
@@ -77,8 +78,6 @@
 /obj/item/hemostat/augment
 	name = "hemostat"
 	desc = "Tiny servos power a pair of pincers to stop bleeding."
-	icon = 'icons/obj/surgery.dmi'
-	icon_state = "hemostat"
 	custom_materials = list(/datum/material/iron=5000, /datum/material/glass=2500)
 	flags_1 = CONDUCT_1
 	w_class = WEIGHT_CLASS_TINY
@@ -98,6 +97,8 @@
 	desc = "This stops bleeding."
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "cautery"
+	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	custom_materials = list(/datum/material/iron=2500, /datum/material/glass=750)
 	item_flags = SURGICAL_TOOL
 	flags_1 = CONDUCT_1
@@ -116,8 +117,6 @@
 /obj/item/cautery/augment
 	name = "cautery"
 	desc = "A heated element that cauterizes wounds."
-	icon = 'icons/obj/surgery.dmi'
-	icon_state = "cautery"
 	custom_materials = list(/datum/material/iron=2500, /datum/material/glass=750)
 	flags_1 = CONDUCT_1
 	w_class = WEIGHT_CLASS_TINY
@@ -136,8 +135,8 @@
 	desc = "You can drill using this item. You dig?"
 	icon = 'icons/obj/surgery.dmi'
 	icon_state = "drill"
-	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	hitsound = 'sound/weapons/circsawhit.ogg'
 	custom_materials = list(/datum/material/iron=10000, /datum/material/glass=6000)
 	item_flags = SURGICAL_TOOL
@@ -157,7 +156,6 @@
 /obj/item/surgicaldrill/advanced
 	name = "searing tool"
 	desc = "It projects a high power laser used for medical application."
-	icon = 'icons/obj/surgery.dmi'
 	icon_state = "surgicaldrill_a"
 	hitsound = 'sound/items/welder.ogg'
 	heat = 3500
@@ -184,8 +182,6 @@
 /obj/item/surgicaldrill/augment
 	name = "surgical drill"
 	desc = "Effectively a small power drill contained within your arm, edges dulled to prevent tissue damage. May or may not pierce the heavens."
-	icon = 'icons/obj/surgery.dmi'
-	icon_state = "drill"
 	hitsound = 'sound/weapons/circsawhit.ogg'
 	custom_materials = list(/datum/material/iron=10000, /datum/material/glass=6000)
 	flags_1 = CONDUCT_1
@@ -229,12 +225,11 @@
 /obj/item/scalpel/advanced
 	name = "laser scalpel"
 	desc = "An advanced scalpel which uses laser technology to cut."
-	icon = 'icons/obj/surgery.dmi'
 	icon_state = "scalpel_a"
 	hitsound = 'sound/weapons/blade1.ogg'
 	force = 16
 	toolspeed = 0.7
-	light_color = LIGHT_COLOR_GREEN
+	light_color = LIGHT_COLOR_BLUE
 	sharpness = SHARP_POINTY
 	heat = 3500
 
@@ -264,8 +259,6 @@
 /obj/item/scalpel/augment
 	name = "scalpel"
 	desc = "Ultra-sharp blade attached directly to your bone for extra-accuracy."
-	icon = 'icons/obj/surgery.dmi'
-	icon_state = "scalpel"
 	flags_1 = CONDUCT_1
 	force = 10
 	w_class = WEIGHT_CLASS_TINY
@@ -327,8 +320,6 @@
 /obj/item/circular_saw/augment
 	name = "circular saw"
 	desc = "A small but very fast spinning saw. Edges dulled to prevent accidental cutting inside of the surgeon."
-	icon = 'icons/obj/surgery.dmi'
-	icon_state = "saw"
 	hitsound = 'sound/weapons/circsawhit.ogg'
 	mob_throw_hit_sound =  'sound/weapons/pierce.ogg'
 	flags_1 = CONDUCT_1
@@ -465,7 +456,7 @@
 	name = "bonesetter"
 	desc = "For setting things right."
 	icon = 'icons/obj/surgery.dmi'
-	icon_state = "bone setter"
+	icon_state = "bonesetter"
 	lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
 	custom_materials = list(/datum/material/iron=5000, /datum/material/glass=2500)
diff --git a/icons/mob/inhands/equipment/medical_lefthand.dmi b/icons/mob/inhands/equipment/medical_lefthand.dmi
index 679b6c1159..38f2a00525 100644
Binary files a/icons/mob/inhands/equipment/medical_lefthand.dmi and b/icons/mob/inhands/equipment/medical_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/medical_righthand.dmi b/icons/mob/inhands/equipment/medical_righthand.dmi
index a8f4580881..829735f11f 100644
Binary files a/icons/mob/inhands/equipment/medical_righthand.dmi and b/icons/mob/inhands/equipment/medical_righthand.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index bc887e707d..3e57f4eca4 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/icons/obj/nuke_tools.dmi b/icons/obj/nuke_tools.dmi
index 7f5c730fe5..eb724e29be 100644
Binary files a/icons/obj/nuke_tools.dmi and b/icons/obj/nuke_tools.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index 351aeb3546..2c926ef639 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 0f1ec3712d..fbd6cecc56 100755
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/icons/obj/syringe.dmi b/icons/obj/syringe.dmi
index 3515545514..cea955ac64 100644
Binary files a/icons/obj/syringe.dmi and b/icons/obj/syringe.dmi differ