diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 53c776717bd..d493f69f25d 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -6,8 +6,8 @@
 	in your hand.  To recharge this weapon, use a weapon recharger."
 	desc_fluff = "The NT EC-4 is an energy carbine developed and produced by Nanotrasen. Compact, light and durable, used by security forces and law enforcement for its ability to fire stun or lethal beams, depending on selection. It is widely sold and distributed across the galaxy."
 	icon = 'icons/obj/guns/ecarbine.dmi'
-	icon_state = "energystun100"
-	item_state = "energystun100"
+	icon_state = "energystun"
+	item_state = "energystun"
 	fire_sound = 'sound/weapons/Taser.ogg'
 	slot_flags = SLOT_BELT
 	accuracy = 1
@@ -27,6 +27,8 @@
 		list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="energykill", fire_sound='sound/weapons/laser1.ogg')
 		)
 
+	has_item_ratio = FALSE
+
 	var/crit_fail = 0 //Added crit_fail as a local variable
 
 /obj/item/gun/energy/gun/mounted
diff --git a/code/modules/projectiles/guns/energy/rifle.dm b/code/modules/projectiles/guns/energy/rifle.dm
index 63d280c30eb..d44f4d8e1d6 100644
--- a/code/modules/projectiles/guns/energy/rifle.dm
+++ b/code/modules/projectiles/guns/energy/rifle.dm
@@ -165,3 +165,35 @@
 		toggle_scope(2.0, usr)
 	else
 		to_chat(usr, "<span class='warning'>You can't look through the scope without stabilizing the rifle!</span>")
+
+/obj/item/gun/energy/rifle/ionrifle
+	name = "ion rifle"
+	desc = "The NT Mk70 EW Halicon is a man portable anti-armor weapon designed to disable mechanical threats, produced by Nanotrasen."
+	icon = 'icons/obj/guns/ionrifle.dmi'
+	icon_state = "ionrifle"
+	item_state = "ionrifle"
+	has_item_ratio = FALSE
+	modifystate = null
+	projectile_type = /obj/item/projectile/ion/stun
+	fire_sound = 'sound/weapons/laser1.ogg'
+	origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 4)
+	w_class = ITEMSIZE_LARGE
+	accuracy = 1
+	force = 10
+	flags = CONDUCT
+	slot_flags = SLOT_BACK
+	charge_cost = 300
+	max_shots = 4
+	can_turret = 1
+	turret_sprite_set = "ion"
+	firemodes = list()
+
+/obj/item/gun/energy/rifle/ionrifle/emp_act(severity)
+	..(max(severity, 2)) //so it doesn't EMP itself, I guess
+
+/obj/item/gun/energy/rifle/ionrifle/mounted
+	name = "mounted ion rifle"
+	self_recharge = 1
+	use_external_power = 1
+	recharge_time = 10
+	can_turret = 0
\ No newline at end of file
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index a0cc5085d76..4006365405c 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -1,48 +1,3 @@
-/obj/item/gun/energy/rifle/ionrifle
-	name = "ion rifle"
-	desc = "The NT Mk70 EW Halicon is a man portable anti-armor weapon designed to disable mechanical threats, produced by Nanotrasen."
-	icon = 'icons/obj/guns/ionrifle.dmi'
-	icon_state = "ionriflestun100"
-	item_state = "ionriflestun100" // so the human update icon uses the icon_state instead.
-	modifystate = "ionriflestun"
-	projectile_type = /obj/item/projectile/ion/stun
-	fire_sound = 'sound/weapons/laser1.ogg'
-	origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 4)
-	w_class = ITEMSIZE_LARGE
-	accuracy = 1
-	force = 10
-	flags = CONDUCT
-	slot_flags = SLOT_BACK
-	charge_cost = 300
-	max_shots = 4
-	can_turret = 1
-	turret_sprite_set = "ion"
-	firemodes = list()
-
-/obj/item/gun/energy/rifle/ionrifle/emp_act(severity)
-	..(max(severity, 2)) //so it doesn't EMP itself, I guess
-
-/obj/item/gun/energy/rifle/ionrifle/update_icon()
-	if(charge_meter && power_supply && power_supply.maxcharge)
-		var/ratio = power_supply.charge / power_supply.maxcharge
-
-		//make sure that rounding down will not give us the empty state even if we have charge for a shot left.
-		if(power_supply.charge < charge_cost)
-			ratio = 0
-		else
-			ratio = max(round(ratio, 0.25) * 100, 25)
-
-		icon_state = "[modifystate][ratio]"
-		item_state = "[modifystate][ratio]"
-	update_held_icon()
-
-/obj/item/gun/energy/rifle/ionrifle/mounted
-	name = "mounted ion rifle"
-	self_recharge = 1
-	use_external_power = 1
-	recharge_time = 10
-	can_turret = 0
-
 /obj/item/gun/energy/decloner
 	name = "biological demolecularisor"
 	desc = "A gun that discharges high amounts of controlled radiation to slowly break a target into component elements."
diff --git a/html/changelogs/alberyk-gunsprites.yml b/html/changelogs/alberyk-gunsprites.yml
new file mode 100644
index 00000000000..d79347d8412
--- /dev/null
+++ b/html/changelogs/alberyk-gunsprites.yml
@@ -0,0 +1,6 @@
+author: Alberyk, Kyres1
+
+delete-after: True
+
+changes:
+  - imageadd: "Added new sprites to blaster guns, gauss thumper, pump shotgun, ion rifle, disruptor guns, laser rifle, bolt action rifle, energy carbines, security handguns, revolvers, machine gun, marksman rifle, and some others."
diff --git a/icons/obj/guns/autorevolver.dmi b/icons/obj/guns/autorevolver.dmi
index efc8cb54722..97d8b23745b 100644
Binary files a/icons/obj/guns/autorevolver.dmi and b/icons/obj/guns/autorevolver.dmi differ
diff --git a/icons/obj/guns/blaster_carbine.dmi b/icons/obj/guns/blaster_carbine.dmi
index 62e24a5c25f..e2cb93d62e5 100644
Binary files a/icons/obj/guns/blaster_carbine.dmi and b/icons/obj/guns/blaster_carbine.dmi differ
diff --git a/icons/obj/guns/blaster_pistol.dmi b/icons/obj/guns/blaster_pistol.dmi
index e45921e2ada..b8c2d8e8977 100644
Binary files a/icons/obj/guns/blaster_pistol.dmi and b/icons/obj/guns/blaster_pistol.dmi differ
diff --git a/icons/obj/guns/blaster_revolver.dmi b/icons/obj/guns/blaster_revolver.dmi
index 88145cd88db..d777806d5d9 100644
Binary files a/icons/obj/guns/blaster_revolver.dmi and b/icons/obj/guns/blaster_revolver.dmi differ
diff --git a/icons/obj/guns/blaster_rifle.dmi b/icons/obj/guns/blaster_rifle.dmi
index d9b4e838be2..2149d60cd10 100644
Binary files a/icons/obj/guns/blaster_rifle.dmi and b/icons/obj/guns/blaster_rifle.dmi differ
diff --git a/icons/obj/guns/detective.dmi b/icons/obj/guns/detective.dmi
index 1310b8250a0..b573ad964d8 100644
Binary files a/icons/obj/guns/detective.dmi and b/icons/obj/guns/detective.dmi differ
diff --git a/icons/obj/guns/disruptorpistol/disruptorpistolc.dmi b/icons/obj/guns/disruptorpistol/disruptorpistolc.dmi
index 713c9d8f61a..aaa82cfcfd5 100644
Binary files a/icons/obj/guns/disruptorpistol/disruptorpistolc.dmi and b/icons/obj/guns/disruptorpistol/disruptorpistolc.dmi differ
diff --git a/icons/obj/guns/disruptorpistol/disruptorpistolm.dmi b/icons/obj/guns/disruptorpistol/disruptorpistolm.dmi
index 6cb24748bc5..db8437e7010 100644
Binary files a/icons/obj/guns/disruptorpistol/disruptorpistolm.dmi and b/icons/obj/guns/disruptorpistol/disruptorpistolm.dmi differ
diff --git a/icons/obj/guns/disruptorpistol/disruptorpistols.dmi b/icons/obj/guns/disruptorpistol/disruptorpistols.dmi
index 32a26731d3e..39b61f70f5c 100644
Binary files a/icons/obj/guns/disruptorpistol/disruptorpistols.dmi and b/icons/obj/guns/disruptorpistol/disruptorpistols.dmi differ
diff --git a/icons/obj/guns/dragunov.dmi b/icons/obj/guns/dragunov.dmi
index 3dc29f53aea..5e91fb00c09 100644
Binary files a/icons/obj/guns/dragunov.dmi and b/icons/obj/guns/dragunov.dmi differ
diff --git a/icons/obj/guns/ecarbine.dmi b/icons/obj/guns/ecarbine.dmi
index f24fd6152d4..da0ca4d8afa 100644
Binary files a/icons/obj/guns/ecarbine.dmi and b/icons/obj/guns/ecarbine.dmi differ
diff --git a/icons/obj/guns/gauss_thumper.dmi b/icons/obj/guns/gauss_thumper.dmi
index ec87c815b73..29aa0fb1eec 100644
Binary files a/icons/obj/guns/gauss_thumper.dmi and b/icons/obj/guns/gauss_thumper.dmi differ
diff --git a/icons/obj/guns/ionrifle.dmi b/icons/obj/guns/ionrifle.dmi
index 5b3bd8db892..f6e4a5df4a1 100644
Binary files a/icons/obj/guns/ionrifle.dmi and b/icons/obj/guns/ionrifle.dmi differ
diff --git a/icons/obj/guns/laserrifle.dmi b/icons/obj/guns/laserrifle.dmi
index a80044bfc82..8ec898222ee 100644
Binary files a/icons/obj/guns/laserrifle.dmi and b/icons/obj/guns/laserrifle.dmi differ
diff --git a/icons/obj/guns/lemat.dmi b/icons/obj/guns/lemat.dmi
index 03a44b0f63e..b87521f7920 100644
Binary files a/icons/obj/guns/lemat.dmi and b/icons/obj/guns/lemat.dmi differ
diff --git a/icons/obj/guns/mini-uzi.dmi b/icons/obj/guns/mini-uzi.dmi
index 8f8e67b7e2d..00aab653837 100644
Binary files a/icons/obj/guns/mini-uzi.dmi and b/icons/obj/guns/mini-uzi.dmi differ
diff --git a/icons/obj/guns/moistnugget.dmi b/icons/obj/guns/moistnugget.dmi
index 813e7b0f7f6..ed17a793278 100644
Binary files a/icons/obj/guns/moistnugget.dmi and b/icons/obj/guns/moistnugget.dmi differ
diff --git a/icons/obj/guns/obrez.dmi b/icons/obj/guns/obrez.dmi
index 70e576258e0..fb3e8268241 100644
Binary files a/icons/obj/guns/obrez.dmi and b/icons/obj/guns/obrez.dmi differ
diff --git a/icons/obj/guns/pockrifle.dmi b/icons/obj/guns/pockrifle.dmi
index 4c123aefda5..6a162f7cbe5 100644
Binary files a/icons/obj/guns/pockrifle.dmi and b/icons/obj/guns/pockrifle.dmi differ
diff --git a/icons/obj/guns/revolver.dmi b/icons/obj/guns/revolver.dmi
index 40d5408fdff..28500a61c91 100644
Binary files a/icons/obj/guns/revolver.dmi and b/icons/obj/guns/revolver.dmi differ
diff --git a/icons/obj/guns/secgun.dmi b/icons/obj/guns/secgun.dmi
index aba12402ae3..4cf73bc84d2 100644
Binary files a/icons/obj/guns/secgun.dmi and b/icons/obj/guns/secgun.dmi differ
diff --git a/icons/obj/guns/secgun_wood.dmi b/icons/obj/guns/secgun_wood.dmi
index a6d2cf7efc9..52936033e45 100644
Binary files a/icons/obj/guns/secgun_wood.dmi and b/icons/obj/guns/secgun_wood.dmi differ
diff --git a/icons/obj/guns/shotgun.dmi b/icons/obj/guns/shotgun.dmi
index e2ebe63a371..c34cee6a1eb 100644
Binary files a/icons/obj/guns/shotgun.dmi and b/icons/obj/guns/shotgun.dmi differ
diff --git a/icons/obj/guns/tommygun.dmi b/icons/obj/guns/tommygun.dmi
index 0eeaade7251..cf974e8dfd6 100644
Binary files a/icons/obj/guns/tommygun.dmi and b/icons/obj/guns/tommygun.dmi differ
diff --git a/icons/obj/guns/xray.dmi b/icons/obj/guns/xray.dmi
index 14f7a0501dc..15f9e9ab119 100644
Binary files a/icons/obj/guns/xray.dmi and b/icons/obj/guns/xray.dmi differ
diff --git a/icons/obj/guns/xrifle.dmi b/icons/obj/guns/xrifle.dmi
index 208b4057696..9010097358f 100644
Binary files a/icons/obj/guns/xrifle.dmi and b/icons/obj/guns/xrifle.dmi differ