diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 5a0dbf7981..788a72f4b6 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -1123,7 +1123,7 @@
 
 /obj/item/twohanded/electrostaff/update_icon()
 	. = ..()
-	var/final = on? "electrostaff_1" : "electrostaff_3"
+	var/final = wielded? (on? "electrostaff_1" : "electrostaff_3") : "electrostaff"
 	icon_state = final
 	item_state = final
 	set_light(7, on? 1 : 0, LIGHT_COLOR_CYAN)
diff --git a/icons/mob/inhands/weapons/estaff_lefthand.dmi b/icons/mob/inhands/weapons/estaff_lefthand.dmi
index 8b9ef642a4..47b8dc112f 100644
Binary files a/icons/mob/inhands/weapons/estaff_lefthand.dmi and b/icons/mob/inhands/weapons/estaff_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/estaff_righthand.dmi b/icons/mob/inhands/weapons/estaff_righthand.dmi
index ea20dd2246..d6096c57c7 100644
Binary files a/icons/mob/inhands/weapons/estaff_righthand.dmi and b/icons/mob/inhands/weapons/estaff_righthand.dmi differ