diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm
index e47b188b5b9..89a9c60cb3f 100644
--- a/code/game/objects/items/weapons/tools.dm
+++ b/code/game/objects/items/weapons/tools.dm
@@ -731,7 +731,8 @@
 	. = ..()
 	var/drillcolor = pick("red", "blue", "yellow", "green")
 	icon_state = "powerdrill[drillcolor]"
-	item_state = "powerdrill[drillcolor]"
+	item_state = icon_state
+	update_tool()
 
 /obj/item/powerdrill/examine(var/mob/user)
 	. = ..()
@@ -740,24 +741,30 @@
 		for(var/tool in tools)
 			to_chat(user, "- [tool][tools[current_tool] == tool ? " (selected)" : ""]")
 
+/obj/item/powerdrill/MouseEntered(location, control, params)
+	. = ..()
+	var/list/modifiers = params2list(params)
+	if(modifiers["shift"] && get_dist(usr, src) <= 2)
+		params = replacetext(params, "shift=1;", "") // tooltip doesn't appear unless this is stripped
+		openToolTip(usr, src, params, "Impact Drill:", "[capitalize(tools[current_tool])]")
+
+/obj/item/powerdrill/MouseExited(location, control, params)
+	. = ..()
+	closeToolTip(usr)
+
 /obj/item/powerdrill/iswrench()
-	usesound = 'sound/items/air_wrench.ogg'
 	return tools[current_tool] == "wrenchbit"
 
 /obj/item/powerdrill/isscrewdriver()
-	usesound = 'sound/items/drill_use.ogg'
 	return tools[current_tool] == "screwdriverbit"
 
-/obj/item/powerdrill/iscrowbar()
-	usesound = 'sound/items/drill_use.ogg'
-	return tools[current_tool] == "crowbarbit"
-
 /obj/item/powerdrill/proc/update_tool()
+	cut_overlays()
 	if(isscrewdriver())
-		cut_overlays()
+		usesound = 'sound/items/air_wrench.ogg'
 		add_overlay("screwdriverbit")
-	if(iswrench())
-		cut_overlays()
+	else if(iswrench())
+		usesound = 'sound/items/drill_use.ogg'
 		add_overlay("wrenchbit")
 
 /obj/item/powerdrill/attack_self(var/mob/user)
diff --git a/html/changelogs/geeves-wrench_sprite.yml b/html/changelogs/geeves-wrench_sprite.yml
new file mode 100644
index 00000000000..12ebb84922a
--- /dev/null
+++ b/html/changelogs/geeves-wrench_sprite.yml
@@ -0,0 +1,7 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - tweak: "Tweaked the Impact Wrench's bit's colour and sprite to make it easier to see what you have."
+  - rscadd: "Mousing over the impact wrench while holding shift will now make a pop-up tooltip showing which bit is selected."
\ No newline at end of file
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index 665b0379b6b..af6a6fef257 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ