diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index 41595d9a6d..4230de4583 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -626,10 +626,10 @@
 
 /obj/item/ammo_magazine/m12gdrum
 	name = "magazine (12 gauge)"
-	icon_state = "12g"
+	icon_state = "ashot-mag"
 	mag_type = MAGAZINE
 	caliber = "12g"
-	matter = list(DEFAULT_WALL_MATERIAL = 13000) //did the math. now fixed the exploityness of this thing. Have fun!
+	matter = list(DEFAULT_WALL_MATERIAL = 13000)
 	ammo_type = /obj/item/ammo_casing/a12g
 	max_ammo = 24
 	multiple_sprites = 1
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 92a0156a58..ddb92f1b41 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -296,9 +296,9 @@
 /obj/item/weapon/gun/projectile/automatic/as24/update_icon()
 	..()
 	if(ammo_magazine)
-		icon_state = "ashot-[round(ammo_magazine.stored_ammo.len,12)]"
-	else
 		icon_state = "ashot"
+	else
+		icon_state = "ashot-empty"
 	return
 
 /obj/item/weapon/gun/projectile/automatic/mini_uzi
diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi
index a3dc52cce1..1446e82e52 100644
Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ
diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi
index 80d58d104e..d2c69a374f 100644
Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ