diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 53f2887fe8a..4fccdeea3cd 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -638,6 +638,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 = 2
+	w_class = 2.0
+	force = 3.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 bb2a3aae357..a3fdef7a6b3 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -91,6 +91,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
 
@@ -173,6 +179,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 62a17ab8cb0..691bffb9a51 100644
--- a/code/game/objects/storage/toolbox.dm
+++ b/code/game/objects/storage/toolbox.dm
@@ -7,7 +7,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/html/changelog.html b/html/changelog.html
index c4d33c10ff5..9b352a234a1 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -47,10 +47,11 @@ should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 <div class="commit sansserif">
-	<h2 class="date">May 06, 2012</h2>
+	<h2 class="date">May 06-07, 2012</h2>
 	<h3 class="author">Cheridan updated:</h3>
 	<ul class="changes bgimages16">
 		<li class="tweak">-New booze sprites for the drinks that were removed! Re-enabled the recipes for the removed drinks. Get cracking, bartenders. -You now need 10 sheets of metal instead of 2 to make a gas canister, people can't FILL ENTIRE ROOMS WITH THEM.</li>
+		<li class="tweak">-Emergency Toolboxes now contain smaller, lighter fire extinguishers that actually fit inside them!
 	</ul>
 </div>
 
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index d494f16e9e5..b2d52605b68 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 35c426ced4e..f57f5d44e60 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 6c66fa4150c..c15c6879fe5 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ