diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
index a89cfaa3f2b..1feea397ac0 100644
--- a/code/datums/supplypacks.dm
+++ b/code/datums/supplypacks.dm
@@ -390,9 +390,9 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 
 /datum/supply_packs/security/armory/epistol	// costs 3/5ths of the normal e-guns for 3/4ths the total ammo, making it cheaper to arm more people, but less convient for any one person
 	name = "Energy Pistol Crate"
-	contains = list(/obj/item/weapon/gun/energy/gun/pistol,
-					/obj/item/weapon/gun/energy/gun/pistol,
-					/obj/item/weapon/gun/energy/gun/pistol)
+	contains = list(/obj/item/weapon/gun/energy/gun/mini,
+					/obj/item/weapon/gun/energy/gun/mini,
+					/obj/item/weapon/gun/energy/gun/mini)
 	cost = 15
 	containertype = /obj/structure/closet/crate/secure/plasma
 	containername = "energy gun crate"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index b31b3f78729..db2b2eb8956 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -52,7 +52,7 @@
 	new /obj/item/weapon/storage/box/ids(src)
 	new /obj/item/weapon/storage/box/PDAs(src)
 	new /obj/item/clothing/suit/armor/vest(src)
-	new /obj/item/weapon/gun/energy/gun/pistol(src)
+	new /obj/item/weapon/gun/energy/gun/mini(src)
 	new /obj/item/device/flash(src)
 	new /obj/item/clothing/accessory/petcollar(src)
 	new /obj/item/weapon/door_remote/civillian(src)
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 2070512edc2..79b6de006d9 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -30,7 +30,6 @@
 	name = "miniature energy gun"
 	desc = "A small, pistol-sized energy gun with a built-in flashlight. It has two settings: stun and kill."
 	icon_state = "mini"
-	item_state = "gun"
 	w_class = WEIGHT_CLASS_SMALL
 	ammo_x_offset = 2
 	charge_sections = 3
@@ -39,29 +38,14 @@
 /obj/item/weapon/gun/energy/gun/mini/New()
 	gun_light = new /obj/item/device/flashlight/seclite(src)
 	..()
-	power_supply.maxcharge = 600
-	power_supply.charge = 600
+	power_supply.maxcharge = 500
+	power_supply.charge = 500
 
 /obj/item/weapon/gun/energy/gun/mini/update_icon()
 	..()
 	if(gun_light && gun_light.on)
 		overlays += "mini-light"
 
-/obj/item/weapon/gun/energy/gun/pistol
-	name = "energy pistol"
-	desc = "A small, pistol-sized energy gun made to be a side arm to it's larger carbine cousin. It has two settings: stun and kill."
-	icon_state = "epistol"
-	item_state = "gun"
-	w_class = WEIGHT_CLASS_SMALL
-	ammo_x_offset = 1
-	charge_sections = 4
-	can_flashlight = 0 // Can't attach or detach a flashlight
-
-/obj/item/weapon/gun/energy/gun/pistol/New()
-	..()
-	power_supply.maxcharge = 500
-	power_supply.charge = 500
-
 /obj/item/weapon/gun/energy/gun/hos
 	name = "\improper X-01 MultiPhase Energy Gun"
 	desc = "This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi
index cc5330db825..863f3110a15 100644
Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi
index d0c1b7bacda..267431bf891 100644
Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index d8611794a40..03b8eba0f8c 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ