diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index bf6344372cc..a3989236ddd 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -21,8 +21,10 @@
 /obj/item/weapon/melee/baton/update_icon()
 	if(status)
 		icon_state = "stunbaton_active"
+		item_state = "baton_on"
 	else
 		icon_state = "stunbaton"
+		item_state = "baton"
 
 /obj/item/weapon/melee/baton/attack_self(mob/user as mob)
 	if(status && (CLUMSY in user.mutations) && prob(50))
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index e59dff07807..3e98c9fc1fb 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 1a8828a859b..7120767e322 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ