diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 9b10df57fa..9401579e61 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -340,7 +340,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	desc = "A brown roll of tobacco and... well, you're not quite sure. This thing's huge!"
 	icon_state = "cigaroff"
 	icon_on = "cigaron"
-	icon_off = "cigaroff"
+	icon_off = "cigaroff" //make sure to add positional sprites in icons/obj/cigarettes.dmi if you add more.
 	type_butt = /obj/item/cigbutt/cigarbutt
 	throw_speed = 0.5
 	item_state = "cigaroff"
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index aaee6f65ab..5fc5af6779 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -154,7 +154,7 @@
 		SendSignal(COMSIG_TRY_STORAGE_TAKE, W, user)
 		user.put_in_hands(W)
 		contents -= W
-		to_chat(user, "<span class='notice'>You take a [icon_type] out of the pack.</span>")
+		to_chat(user, "<span class='notice'>You take \a [W] out of the pack.</span>")
 	else
 		to_chat(user, "<span class='notice'>There are no [icon_type]s left in the pack.</span>")
 
@@ -166,18 +166,20 @@
 		else
 			icon_state = initial(icon_state)
 			add_overlay("[icon_state]_open")
-			var/i = contents.len
+			var/cig_position = 1
 			for(var/C in contents)
 				var/mutable_appearance/inserted_overlay = mutable_appearance(icon)
-				inserted_overlay.pixel_x = 1 * (i - 1)
+
 				if(istype(C, /obj/item/lighter/greyscale))
 					inserted_overlay.icon_state = "lighter_in"
 				else if(istype(C, /obj/item/lighter))
 					inserted_overlay.icon_state = "zippo_in"
 				else
 					inserted_overlay.icon_state = "cigarette"
+
+				inserted_overlay.icon_state = "[inserted_overlay.icon_state]_[cig_position]"
 				add_overlay(inserted_overlay)
-				i--
+				cig_position++
 	else
 		cut_overlays()
 
@@ -191,7 +193,7 @@
 			SendSignal(COMSIG_TRY_STORAGE_TAKE, W, M)
 			M.equip_to_slot_if_possible(W, SLOT_WEAR_MASK)
 			contents -= W
-			to_chat(user, "<span class='notice'>You take a [icon_type] out of the pack.</span>")
+			to_chat(user, "<span class='notice'>You take \a [W] out of the pack.</span>")
 		else
 			..()
 	else
@@ -294,10 +296,13 @@
 	cut_overlays()
 	if(fancy_open)
 		icon_state = "[initial(icon_state)]_open"
-		var/mutable_appearance/cigar_overlay = mutable_appearance(icon, icon_type)
-		for(var/c = contents.len, c >= 1, c--)
-			cigar_overlay.pixel_x = 3 * (c - 1)
+
+		var/cigar_position = 1 //generate sprites for cigars in the box
+		for(var/obj/item/clothing/mask/cigarette/cigar/smokes in contents)
+			var/mutable_appearance/cigar_overlay = mutable_appearance(icon, "[smokes.icon_off]_[cigar_position]")
 			add_overlay(cigar_overlay)
+			cigar_position++
+
 	else
 		icon_state = "[initial(icon_state)]"
 
diff --git a/icons/obj/cigarettes.dmi b/icons/obj/cigarettes.dmi
index 84979e4387..0f0433be7f 100644
Binary files a/icons/obj/cigarettes.dmi and b/icons/obj/cigarettes.dmi differ