diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index d77a0a26b8a..6a605ad218a 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -109,11 +109,7 @@
 	caliber = "foam_force"
 	max_ammo = 4
 
-/obj/item/ammo_box/magazine/internal/cylinder/toy
-	name = "crossbow cylinder"
-	desc = "Oh god, this shouldn't be here"
-	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
-	caliber = "foam_force"
+/obj/item/ammo_box/magazine/internal/shot/toy/crossbow
 	max_ammo = 5
 
 ///////////EXTERNAL MAGAZINES////////////////
@@ -230,14 +226,20 @@ obj/item/ammo_box/magazine/tommygunm45
 	ammo_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
 
 /obj/item/ammo_box/magazine/toy
-	name = "foam force SMG magazine"
-	icon_state = "c20r45"
+	name = "foam force META magazine"
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
 	caliber = "foam_force"
-	max_ammo = 18
-	multiple_sprites = 2
 
-/obj/item/ammo_box/magazine/toy/riot
+/obj/item/ammo_box/magazine/toy/smg
+	name = "foam force SMG magazine"
+	icon_state = "smg9mm-20"
+	max_ammo = 20
+
+/obj/item/ammo_box/magazine/toy/smg/update_icon()
+	..()
+	icon_state = "smg9mm-[round(ammo_count(),5)]"
+
+/obj/item/ammo_box/magazine/toy/smg/riot
 	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
 
 /obj/item/ammo_box/magazine/toy/pistol
diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm
index 7560d24322f..b0e1c5cec0f 100644
--- a/code/modules/projectiles/guns/projectile/toy.dm
+++ b/code/modules/projectiles/guns/projectile/toy.dm
@@ -1,12 +1,11 @@
 /obj/item/weapon/gun/projectile/automatic/toy
 	name = "foam force SMG"
-	desc = "A bullpup three-round burst toy SMG. Ages 8 and up."
+	desc = "A prototype three-round burst toy submachine gun. Ages 8 and up."
 	icon = 'icons/obj/guns/toy.dmi'
 	icon_state = "saber"
-	item_state = "c20r"
-	mag_type = /obj/item/ammo_box/magazine/toy
+	item_state = "gun"
+	mag_type = /obj/item/ammo_box/magazine/toy/smg
 	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
-	fire_delay = 2
 	force = 0
 	throwforce = 0
 	burst_size = 3
@@ -20,7 +19,6 @@
 	name = "foam force pistol"
 	desc = "A small, easily concealable toy handgun. Ages 8 and up."
 	icon_state = "pistol"
-	item_state = "gun"
 	w_class = 2
 	mag_type = /obj/item/ammo_box/magazine/toy/pistol
 	fire_sound = 'sound/weapons/Gunshot.ogg'
@@ -51,8 +49,10 @@
 /obj/item/weapon/gun/projectile/shotgun/toy/crossbow
 	name = "foam force crossbow"
 	desc = "A weapon favored by many overactive children. Ages 8 and up."
+	icon = 'icons/obj/toy.dmi'
 	icon_state = "foamcrossbow"
 	item_state = "crossbow"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow
 	fire_sound = 'sound/items/syringeproj.ogg'
 	slot_flags = SLOT_BELT
 	w_class = 2
\ No newline at end of file
diff --git a/icons/obj/guns/toy.dmi b/icons/obj/guns/toy.dmi
index 1934606682a..2f418c7b9a1 100644
Binary files a/icons/obj/guns/toy.dmi and b/icons/obj/guns/toy.dmi differ
diff --git a/tgstation.dme b/tgstation.dme
index 1e275010267..f8ef16d8d32 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -1325,10 +1325,12 @@
 #include "code\modules\projectiles\guns\projectile\pistol.dm"
 #include "code\modules\projectiles\guns\projectile\revolver.dm"
 #include "code\modules\projectiles\guns\projectile\shotgun.dm"
+#include "code\modules\projectiles\guns\projectile\toy.dm"
 #include "code\modules\projectiles\projectile\beams.dm"
 #include "code\modules\projectiles\projectile\bullets.dm"
 #include "code\modules\projectiles\projectile\energy.dm"
 #include "code\modules\projectiles\projectile\magic.dm"
+#include "code\modules\projectiles\projectile\reusable.dm"
 #include "code\modules\projectiles\projectile\special.dm"
 #include "code\modules\reagents\Chemistry-Colours.dm"
 #include "code\modules\reagents\Chemistry-Goon-420BlazeIt.dm"