diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index f1d918d9d28..24a200915f0 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -67,6 +67,10 @@
 	if(ammo_type.len > 1)
 		select_fire(user)
 		update_icon()
+		if(istype(user,/mob/living/carbon/human)) //This has to be here or else if you toggle modes by clicking the gun in hand
+			var/mob/living/carbon/human/H = user //Otherwise the mob icon doesn't update, blame shitty human update_icons() code
+			H.update_inv_l_hand()
+			H.update_inv_r_hand()
 
 /obj/item/weapon/gun/energy/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, params)
 	newshot() //prepare a new shot
diff --git a/code/modules/projectiles/guns/projectile/saw.dm b/code/modules/projectiles/guns/projectile/saw.dm
index 4cb8a59b305..097f5fb4a58 100644
--- a/code/modules/projectiles/guns/projectile/saw.dm
+++ b/code/modules/projectiles/guns/projectile/saw.dm
@@ -131,28 +131,6 @@ obj/item/projectile/bullet/saw/incen/Move()
 	..()
 	icon_state = "a762-[round(ammo_count(),10)]"
 
-/obj/item/ammo_box/magazine/mm556x45/buckshot //adminbus
-	name = "box magazine (buckshot)"
-	icon_state = "b762"
-	caliber = "shotgun"
-	ammo_type = /obj/item/ammo_casing/shotgun/buckshot
-	max_ammo = 300
-
-/obj/item/ammo_box/magazine/mm556x45/buckshot/update_icon()
-	..()
-	icon_state = "b762-[round(ammo_count(),10)]"
-
-/obj/item/ammo_box/magazine/m556x45/he // also adminbus
-	name = "box magazine (40mm high explosive)"
-	icon_state = "g762"
-	caliber = "40mm"
-	ammo_type =/obj/item/ammo_casing/a40mm
-	max_ammo = 25
-
-/obj/item/ammo_box/magazine/mm556x45/he/update_icon()
-	..()
-	icon_state = "g762-[round(ammo_count(),5)]"
-
 //casings//
 
 /obj/item/ammo_casing/mm556x45
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index 33caf3aff5d..b6bbd8ab349 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ