diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index ac95154625e..1e683c65069 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -20,6 +20,7 @@
 	burn_state = FLAMMABLE
 	var/icon_type = "donut"
 	var/spawn_type = null
+	var/fancy_open = FALSE
 
 /obj/item/weapon/storage/fancy/New()
 	..()
@@ -27,16 +28,23 @@
 		new spawn_type(src)
 
 /obj/item/weapon/storage/fancy/update_icon(itemremoved = 0)
-	var/total_contents = src.contents.len - itemremoved
-	src.icon_state = "[src.icon_type]box[total_contents]"
-	return
+	if(fancy_open)
+		var/total_contents = src.contents.len - itemremoved
+		icon_state = "[icon_type]box[total_contents]"
+	else
+		icon_state = "[icon_type]box"
 
 /obj/item/weapon/storage/fancy/examine(mob/user)
 	..()
-	if(contents.len == 1)
-		user << "There is one [src.icon_type] left."
-	else
-		user << "There are [contents.len <= 0 ? "no" : "[src.contents.len]"] [src.icon_type]s left."
+	if(fancy_open)
+		if(contents.len == 1)
+			user << "There is one [src.icon_type] left."
+		else
+			user << "There are [contents.len <= 0 ? "no" : "[src.contents.len]"] [src.icon_type]s left."
+
+/obj/item/weapon/storage/fancy/CtrlClick(mob/user)
+	fancy_open = !fancy_open
+	update_icon()
 
 /*
  * Donut Box
@@ -50,6 +58,7 @@
 	storage_slots = 6
 	can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/donut)
 	spawn_type = /obj/item/weapon/reagent_containers/food/snacks/donut
+	fancy_open = TRUE
 
 /*
  * Egg Box
@@ -105,21 +114,39 @@
 		cig.desc = "\An [name] brand [cig.name]."
 	name = "\improper [name] packet"
 
+/obj/item/weapon/storage/fancy/cigarettes/AltClick(mob/user)
+	if(user.get_active_hand())
+		return
+	for(var/obj/item/weapon/lighter/lighter in src)
+		remove_from_storage(lighter, user.loc)
+		user.put_in_active_hand(lighter)
+		break
+
 /obj/item/weapon/storage/fancy/cigarettes/update_icon()
-	cut_overlays()
-	icon_state = initial(icon_state)
-	if(!contents.len)
-		icon_state += "_empty"
+	if(fancy_open || !contents.len)
+		cut_overlays()
+		if(!contents.len)
+			icon_state = "[initial(icon_state)]_empty"
+		else
+			icon_state = initial(icon_state)
+			add_overlay("[icon_state]_open")
+			var/i = contents.len
+			for(var/C in contents)
+				if(istype(C, /obj/item/weapon/lighter/greyscale))
+					add_overlay(image(icon = src.icon, icon_state = "lighter_in", pixel_x = 1 * (i -1)))
+				else if(istype(C, /obj/item/weapon/lighter))
+					add_overlay(image(icon = src.icon, icon_state = "zippo_in", pixel_x = 1 * (i -1)))
+				else
+					add_overlay(image(icon = src.icon, icon_state = "cigarette", pixel_x = 1 * (i -1)))
+				i--
 	else
-		add_overlay("[icon_state]_open")
-		for(var/c = contents.len, c >= 1, c--)
-			add_overlay(image(icon = src.icon, icon_state = "cigarette", pixel_x = 1 * (c -1)))
-	return
+		cut_overlays()
 
 /obj/item/weapon/storage/fancy/cigarettes/remove_from_storage(obj/item/W, atom/new_location)
 	if(istype(W,/obj/item/clothing/mask/cigarette))
 		if(reagents)
 			reagents.trans_to(W,(reagents.total_volume/contents.len))
+	fancy_open = TRUE
 	..()
 
 /obj/item/weapon/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
@@ -214,7 +241,6 @@
 	cut_overlays()
 	if(!contents.len)
 		add_overlay("[icon_state]_empty")
-	return
 
 /////////////
 //CIGAR BOX//
@@ -226,17 +252,20 @@
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cigarcase"
 	w_class = 3
-	storage_slots = 7
+	storage_slots = 5
 	can_hold = list(/obj/item/clothing/mask/cigarette/cigar)
 	icon_type = "premium cigar"
 	spawn_type = /obj/item/clothing/mask/cigarette/cigar
 
 /obj/item/weapon/storage/fancy/cigarettes/cigars/update_icon()
-	cut_overlays()
-	add_overlay("[icon_state]_open")
-	for(var/c = contents.len, c >= 1, c--)
-		add_overlay(image(icon = src.icon, icon_state = icon_type, pixel_x = 4 * (c -1)))
-	return
+	if(fancy_open)
+		cut_overlays()
+		add_overlay("[icon_state]_open")
+		for(var/c = contents.len, c >= 1, c--)
+			add_overlay(image(icon = src.icon, icon_state = icon_type, pixel_x = 4 * (c -1)))
+	else
+		cut_overlays()
+		icon_state = "cigarcase"
 
 /obj/item/weapon/storage/fancy/cigarettes/cigars/cohiba
 	name = "\improper cohiba robusto cigar case"
diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi
index 517f220f2ba..6a6c59da390 100644
Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ
diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi
index 6825f6c652d..0c04e2546d3 100644
Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ