diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index c950eef2d58..74f3a70198d 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -756,6 +756,17 @@
 	item_state = "fire_extinguisher"
 	m_amt = 90
 
+/obj/item/weapon/extinguisher/mini
+	name = "fire extinguisher"
+	desc = "A light and compact fibreglass-framed model fire extinguisher."
+	icon_state = "miniFE0"
+	flags = FPRINT | USEDELAY | TABLEPASS
+	throwforce = 5
+	w_class = 2.0
+	force = 6.0
+	item_state = "miniFE"
+	m_amt = 0
+
 /obj/item/weapon/f_card
 	name = "finger print card"
 	desc = "Used to take fingerprints."
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index a7dba9299a6..e44d45d7905 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -92,6 +92,12 @@
 	R.my_atom = src
 	R.add_reagent("water", 50)
 
+/obj/item/weapon/extinguisher/mini/New()
+	var/datum/reagents/R = new/datum/reagents(30)
+	reagents = R
+	R.my_atom = src
+	R.add_reagent("water", 30)
+
 /obj/item/weapon/extinguisher/examine()
 	set src in usr
 
@@ -174,6 +180,19 @@
 		safety = 1
 	return
 
+/obj/item/weapon/extinguisher/mini/attack_self(mob/user as mob)
+	if (safety)
+		src.icon_state = "miniFE1"
+		src.desc = "The safety is off."
+		user << "The safety is off."
+		safety = 0
+	else
+		src.icon_state = "miniFE0"
+		src.desc = "The safety is on."
+		user << "The safety is on."
+		safety = 1
+	return
+
 /obj/item/weapon/pen/attack(mob/M as mob, mob/user as mob)
 	if(!ismob(M))
 		return
diff --git a/code/game/objects/storage/toolbox.dm b/code/game/objects/storage/toolbox.dm
index fb9df4919de..846aafcec41 100644
--- a/code/game/objects/storage/toolbox.dm
+++ b/code/game/objects/storage/toolbox.dm
@@ -1,7 +1,7 @@
 /obj/item/weapon/storage/toolbox/emergency/New()
 	..()
 	new /obj/item/weapon/crowbar/red(src)
-	new /obj/item/weapon/extinguisher(src)
+	new /obj/item/weapon/extinguisher/mini(src)
 	if(prob(50))
 		new /obj/item/device/flashlight(src)
 	new /obj/item/device/radio(src)
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index e25a53373b8..0ebbdef1e77 100644
Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
index 906ea0a9e13..a245cdc16c5 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 7ba4ecf601d..303f54015ed 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ