diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 4e09ba28be3..18653b0ec2a 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -603,7 +603,7 @@
 	slot_flags = SLOT_BELT
 	force = 5.0
 	throwforce = 7.0
-	item_state = "wrench"
+	item_state = "crowbar"
 	w_class = 2.0
 	m_amt = 50
 	origin_tech = "engineering=1"
@@ -611,6 +611,7 @@
 /obj/item/weapon/crowbar/red
 	icon = 'items.dmi'
 	icon_state = "red_crowbar"
+	item_state = "crowbar_red"
 
 /obj/item/weapon/cane
 	name = "cane"
diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index d1da62c6fcc..5de9b3215d6 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -27,7 +27,29 @@ WELDINGTOOOL
 
 // SCREWDRIVER
 /obj/item/weapon/screwdriver/New()
-	icon_state = pick("screwdriver","screwdriver2","screwdriver3","screwdriver4","screwdriver5","screwdriver6","screwdriver7")
+	switch(pick("red","blue","purple","brown","green","cyan","yellow"))
+		if ("red")
+			icon_state = "screwdriver2"
+			item_state = "screwdriver"
+		if ("blue")
+			icon_state = "screwdriver"
+			item_state = "screwdriver_blue"
+		if ("purple")
+			icon_state = "screwdriver3"
+			item_state = "screwdriver_purple"
+		if ("brown")
+			icon_state = "screwdriver4"
+			item_state = "screwdriver_brown"
+		if ("green")
+			icon_state = "screwdriver5"
+			item_state = "screwdriver_green"
+		if ("cyan")
+			icon_state = "screwdriver6"
+			item_state = "screwdriver_cyan"
+		if ("yellow")
+			icon_state = "screwdriver7"
+			item_state = "screwdriver_yellow"
+
 	if (prob(75))
 		src.pixel_y = rand(0, 16)
 	return
@@ -303,3 +325,4 @@ WELDINGTOOOL
 	New()
 		if(prob(50))
 			icon_state = "cutters-y"
+			item_state = "cutters_yellow"
\ No newline at end of file
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index b9f54105a2f..93466d49c83 100644
Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
index d97e3d81ce0..15b34ad2ea3 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ