diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index b4e518cbe3..5867211af8 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1018,11 +1018,11 @@
 		user.client.pixel_y = 0
 
 /obj/item/twohanded/electrostaff
-	icon = 'icons/obj/estaff.dmi'
-	icon_state = "electrostaff_3"
-	item_state = "electrostaff_3"
-	lefthand_file = 'icons/mob/inhands/weapons/estaff_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/estaff_righthand.dmi'
+	icon = 'icons/obj/items_and_weapons.dmi'
+	icon_state = "electrostaff"
+	item_state = "electrostaff"
+	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
 	name = "riot suppression electrostaff"
 	desc = "A large quarterstaff, with massive silver electrodes mounted at the end."
 	w_class = WEIGHT_CLASS_HUGE
@@ -1123,9 +1123,11 @@
 
 /obj/item/twohanded/electrostaff/update_icon()
 	. = ..()
-	var/final = wielded? (on? "electrostaff_1" : "electrostaff_3") : "electrostaff"
-	icon_state = final
-	item_state = final
+	if(!wielded)
+		icon_state = "electrostaff"
+		item_state = "electrostaff"
+	else
+		icon_state = item_state = (on? "electrostaff_1" : "electrostaff_3")
 	set_light(7, on? 1 : 0, LIGHT_COLOR_CYAN)
 
 /obj/item/twohanded/electrostaff/examine(mob/living/user)
diff --git a/icons/mob/inhands/weapons/estaff_lefthand.dmi b/icons/mob/inhands/weapons/estaff_lefthand.dmi
deleted file mode 100644
index 47b8dc112f..0000000000
Binary files a/icons/mob/inhands/weapons/estaff_lefthand.dmi and /dev/null differ
diff --git a/icons/mob/inhands/weapons/estaff_righthand.dmi b/icons/mob/inhands/weapons/estaff_righthand.dmi
deleted file mode 100644
index d6096c57c7..0000000000
Binary files a/icons/mob/inhands/weapons/estaff_righthand.dmi and /dev/null differ
diff --git a/icons/mob/inhands/weapons/staves_lefthand.dmi b/icons/mob/inhands/weapons/staves_lefthand.dmi
index 8b96b84236..ca1694b1f1 100644
Binary files a/icons/mob/inhands/weapons/staves_lefthand.dmi and b/icons/mob/inhands/weapons/staves_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/staves_righthand.dmi b/icons/mob/inhands/weapons/staves_righthand.dmi
index 202bab9e21..4d366d950f 100644
Binary files a/icons/mob/inhands/weapons/staves_righthand.dmi and b/icons/mob/inhands/weapons/staves_righthand.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 30c43985fa..41f2693800 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/estaff.dmi b/icons/obj/estaff.dmi
deleted file mode 100644
index 4c1a678802..0000000000
Binary files a/icons/obj/estaff.dmi and /dev/null differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 7058b9918b..bdad12b0b6 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ