diff --git a/code/game/objects/items/weapons/ecigs.dm b/code/game/objects/items/weapons/ecigs.dm
index 338e7713941..2f5e00e3b58 100644
--- a/code/game/objects/items/weapons/ecigs.dm
+++ b/code/game/objects/items/weapons/ecigs.dm
@@ -3,6 +3,10 @@
 	desc = "A battery powered cigarette."
 	icon = 'icons/obj/ecig.dmi'
 	contained_sprite = TRUE
+	item_icons = null // Needs to nuke this because Contained Sprites and all
+	sprite_sheets = null // This as well
+	icon_auto_adapt = TRUE
+	icon_supported_species_tags = list("una", "taj")
 	var/active = FALSE
 	var/obj/item/cell/cig_cell
 	var/cell_type = /obj/item/cell/crap/cig
diff --git a/html/changelogs/tajara_unathi_smoking_icons.yml b/html/changelogs/tajara_unathi_smoking_icons.yml
new file mode 100644
index 00000000000..7bdac46a76f
--- /dev/null
+++ b/html/changelogs/tajara_unathi_smoking_icons.yml
@@ -0,0 +1,8 @@
+author: Vrow
+
+delete-after: True
+
+changes:
+  - tweak: "Tweaked various smoking item icons to fit Tajara and Unathi better."
+  - tweak: "Tweaked the ecigs item icons as well, and organized the ecigs.dmi"
+  - bugfix: "Fixed missing bone pipe sprites for Tajara and Unathi."
\ No newline at end of file
diff --git a/icons/mob/species/tajaran/mask.dmi b/icons/mob/species/tajaran/mask.dmi
index c0381a3804e..853026c8ae7 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 abaca49763b..38a1c954d07 100644
Binary files a/icons/mob/species/unathi/mask.dmi and b/icons/mob/species/unathi/mask.dmi differ
diff --git a/icons/obj/ecig.dmi b/icons/obj/ecig.dmi
index 7baf890fb6d..3d5c6914e34 100644
Binary files a/icons/obj/ecig.dmi and b/icons/obj/ecig.dmi differ