diff --git a/code/game/atom_procs.dm b/code/game/atom_procs.dm
index d3209d848cc..32cc5fb1b4c 100644
--- a/code/game/atom_procs.dm
+++ b/code/game/atom_procs.dm
@@ -161,8 +161,8 @@
 		if (istype (src, /obj/item))
 			var/obj/item/source2 = src
 			source2.blood_DNA = null
-			var/icon/I = new /icon(source2.icon_old, source2.icon_state)
-			source2.icon = I
+//			var/icon/I = new /icon(source2.icon_old, source2.icon_state)
+			source2.icon = source2.icon_old
 		if (istype(src, /turf/simulated))
 			var/obj/item/source2 = src
 			source2.blood_DNA = null
diff --git a/code/game/objects/items/weapons/guns_ammo.dm b/code/game/objects/items/weapons/guns_ammo.dm
index 909e9e596f5..aa1959212f1 100644
--- a/code/game/objects/items/weapons/guns_ammo.dm
+++ b/code/game/objects/items/weapons/guns_ammo.dm
@@ -953,6 +953,12 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
 		var/ratio = src.charges / maximum_charges
 		ratio = round(ratio, 0.25) * 100
 		src.icon_state = text("energy[]", ratio)
+		overlays = null
+		switch (mode)
+			if (1)
+				overlays += "energykill"
+			if (2)
+				overlays += "energystun"
 
 	afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag)
 		if ((usr.mutations & 16) && prob(50))
@@ -1016,6 +1022,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
 		else if (mode == 2)
 			mode = 1
 			user << "\blue You set the gun to kill"
+		update_icon()
 
 	attack(mob/M as mob, mob/user as mob)
 		..()
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index 5a5e33b32c7..21a3418ad08 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ