diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm
index 98d7250b2c7..f1246ee87a6 100644
--- a/_maps/templates/battlecruiser_starfury.dmm
+++ b/_maps/templates/battlecruiser_starfury.dmm
@@ -2465,16 +2465,13 @@
 	pixel_x = 2
 	},
 /obj/item/ammo_box/magazine/m10mm{
-	icon_state = "9x19p-8";
 	pixel_x = -3;
 	pixel_y = 6
 	},
 /obj/item/ammo_box/magazine/m10mm{
-	icon_state = "9x19p-8";
 	pixel_y = 3
 	},
 /obj/item/ammo_box/magazine/m10mm{
-	icon_state = "9x19p-8";
 	pixel_x = 3
 	},
 /obj/structure/extinguisher_cabinet/directional/east,
@@ -2701,16 +2698,13 @@
 "iv" = (
 /obj/structure/table,
 /obj/item/ammo_box/magazine/m10mm{
-	icon_state = "9x19p-8";
 	pixel_x = -3;
 	pixel_y = 6
 	},
 /obj/item/ammo_box/magazine/m10mm{
-	icon_state = "9x19p-8";
 	pixel_y = 3
 	},
 /obj/item/ammo_box/magazine/m10mm{
-	icon_state = "9x19p-8";
 	pixel_x = 3
 	},
 /obj/item/assembly/flash/handheld,
diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm
index b3a47a15ad8..b2bbcab5e29 100644
--- a/code/__DEFINES/combat.dm
+++ b/code/__DEFINES/combat.dm
@@ -216,7 +216,7 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 #define AMMO_BOX_ONE_SPRITE 0
 ///ammo box will have a different state for each bullet; <icon_state>-<bullets left>
 #define AMMO_BOX_PER_BULLET 1
-///ammo box will have a different state for full and empty; <icon_state>-max_ammo and <icon_state>-0
+/// Ammo box will have a different sprite for any ammo at all, and no ammo, <icon_state>-full <icon_state>-empty
 #define AMMO_BOX_FULL_EMPTY 2
 
 #define SUPPRESSED_NONE 0
diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
index 861f4ce4559..efd997b84bd 100644
--- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm
+++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm
@@ -177,7 +177,7 @@
 		if(AMMO_BOX_PER_BULLET)
 			icon_state = "[multiple_sprite_use_base ? base_icon_state : initial(icon_state)]-[shells_left]"
 		if(AMMO_BOX_FULL_EMPTY)
-			icon_state = "[multiple_sprite_use_base ? base_icon_state : initial(icon_state)]-[shells_left ? "[max_ammo]" : "0"]"
+			icon_state = "[multiple_sprite_use_base ? base_icon_state : initial(icon_state)]-[shells_left ? "full" : "empty"]"
 	return ..()
 
 /// Updates the amount of material in this ammo box according to how many bullets are left in it.
diff --git a/code/modules/projectiles/boxes_magazines/external/pistol.dm b/code/modules/projectiles/boxes_magazines/external/pistol.dm
index df180fed926..7329ed9eab8 100644
--- a/code/modules/projectiles/boxes_magazines/external/pistol.dm
+++ b/code/modules/projectiles/boxes_magazines/external/pistol.dm
@@ -1,7 +1,7 @@
 /obj/item/ammo_box/magazine/m10mm
 	name = "pistol magazine (10mm)"
 	desc = "A gun magazine."
-	icon_state = "9x19p-8"
+	icon_state = "9x19p-full"
 	base_icon_state = "9x19p"
 	ammo_type = /obj/item/ammo_casing/c10mm
 	caliber = CALIBER_10MM
@@ -42,7 +42,7 @@
 
 /obj/item/ammo_box/magazine/m9mm
 	name = "pistol magazine (9mm)"
-	icon_state = "9x19p-8"
+	icon_state = "9x19p-full"
 	base_icon_state = "9x19p"
 	ammo_type = /obj/item/ammo_casing/c9mm
 	caliber = CALIBER_9MM
diff --git a/code/modules/projectiles/boxes_magazines/external/rifle.dm b/code/modules/projectiles/boxes_magazines/external/rifle.dm
index 14c1d1550bd..c7846419043 100644
--- a/code/modules/projectiles/boxes_magazines/external/rifle.dm
+++ b/code/modules/projectiles/boxes_magazines/external/rifle.dm
@@ -1,7 +1,7 @@
 /obj/item/ammo_box/magazine/m10mm/rifle
 	name = "rifle magazine (10mm)"
 	desc = "A well-worn magazine fitted for the surplus rifle."
-	icon_state = "75-8"
+	icon_state = "75-full"
 	base_icon_state = "75"
 	ammo_type = /obj/item/ammo_casing/c10mm
 	max_ammo = 10
diff --git a/icons/obj/weapons/guns/ammo.dmi b/icons/obj/weapons/guns/ammo.dmi
index 243c3267957..dedbeb7a7d0 100644
Binary files a/icons/obj/weapons/guns/ammo.dmi and b/icons/obj/weapons/guns/ammo.dmi differ