diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 43078b5ffaa..d26f100bb99 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -716,10 +716,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 
 /obj/item/clothing/mask/smokable/cigarette/rolled/update_icon()
 	. = ..()
+	icon_on = filter ? "cigon" : "cigrollon"
+	icon_off = filter ? "cigoff" : "cigrolloff"
 	if(!lit)
 		icon_state = filter ? "cigoff" : "cigrolloff"
 	else
 		icon_state = filter ? "cigon" : "cigrollon"
+	update_clothing_icon()
 
 /obj/item/paper/cig
 	name = "rolling paper"
@@ -769,6 +772,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			return
 		if(user.unEquip(I))
 			to_chat(user, span("notice", "You stick [I] into \the [src]"))
+			playsound(src, 'sound/items/drop/gloves.ogg', 25, 1)
 			filter = 1
 			name = "filtered [name]"
 			update_icon()
@@ -786,6 +790,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			R.chem_volume = reagents.total_volume
 			reagents.trans_to_holder(R.reagents, R.chem_volume)
 			to_chat(user, span("notice", "You roll \the [src] into \the [I]"))
+			playsound(src, 'sound/bureaucracy/paperfold.ogg', 25, 1)
 			user.put_in_active_hand(R)
 			qdel(I)
 			qdel(src)
diff --git a/code/game/objects/items/weapons/storage/misc.dm b/code/game/objects/items/weapons/storage/misc.dm
index f843e1f2193..88bbd772abe 100644
--- a/code/game/objects/items/weapons/storage/misc.dm
+++ b/code/game/objects/items/weapons/storage/misc.dm
@@ -82,9 +82,15 @@
 	icon = 'icons/obj/cigs_lighters.dmi'
 	icon_state = "cigfilters_generic"
 	item_state = "cigpacket"
+	item_icons = list(
+		slot_l_hand_str = 'icons/mob/items/lefthand_cigs_lighters.dmi',
+		slot_r_hand_str = 'icons/mob/items/righthand_cigs_lighters.dmi',
+		)
 	w_class = 2
 	starts_with = list(/obj/item/paper/cig/filter = 10)
 	make_exact_fit()
+	drop_sound = 'sound/items/drop/gloves.ogg'
+	use_sound = 'sound/items/drop/paper.ogg'
 
 /obj/item/storage/fancy/cigpaper/fine
 	name = "\improper Trident cigarette paper"
diff --git a/html/changelogs/wezzy_cigs_onmob_bugfix.yml b/html/changelogs/wezzy_cigs_onmob_bugfix.yml
new file mode 100644
index 00000000000..9f95af01c1f
--- /dev/null
+++ b/html/changelogs/wezzy_cigs_onmob_bugfix.yml
@@ -0,0 +1,42 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - bugfix: "Fixes missing cigarette onmob sprites for Tajaran and Unathi."
+  - bugfix: "Fixes icon update issues with rolled cigarettes and filters."
diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi
index 7b708717e9b..8adac4bfed2 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 4d204d188e7..bda6d32b312 100644
Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index 01f77fc2397..867dfeda2a9 100644
Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ
diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/mob/species/tajaran/mask.dmi
index 47151a5c50b..6b13275b1d9 100644
Binary files a/icons/mob/species/tajaran/mask.dmi and b/icons/mob/species/tajaran/mask.dmi differ
diff --git a/icons/mob/species/unathi/mask.dmi b/icons/mob/species/unathi/mask.dmi
index 33e4d318695..3e607a5b67e 100644
Binary files a/icons/mob/species/unathi/mask.dmi and b/icons/mob/species/unathi/mask.dmi differ