diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm
index ebdaa953fbf..75b2ad94d95 100644
--- a/code/game/objects/items/flag.dm
+++ b/code/game/objects/items/flag.dm
@@ -1,5 +1,8 @@
 /obj/item/flag
 	icon = 'icons/obj/flag.dmi'
+	icon_state = "ntflag"
+	lefthand_file = 'icons/mob/inhands/flags_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/flags_righthand.dmi'
 	w_class = WEIGHT_CLASS_BULKY
 	burntime = 20
 	burn_state = FLAMMABLE
@@ -10,10 +13,25 @@
 		user.visible_message("<span class='notice'>[user] lights the [name] with [W].</span>")
 		fire_act()
 
-/obj/item/flag/proc/update_icons()
-	overlays = null
-	overlays += image('icons/obj/flag.dmi', src , "fire")
-	item_state = "[icon_state]_fire"
+/obj/item/flag/fire_act(global_overlay = FALSE)
+	..()
+	update_icon()
+
+/obj/item/flag/extinguish()
+	..()
+	update_icon()
+
+/obj/item/flag/update_icon()
+	overlays.Cut()
+	if(burn_state == ON_FIRE)
+		overlays += image('icons/obj/flag.dmi', src , "fire")
+		item_state = "[icon_state]_fire"
+	else
+		item_state = initial(icon_state)
+	if(ismob(loc))
+		var/mob/M = loc
+		M.update_inv_r_hand()
+		M.update_inv_l_hand()
 
 /obj/item/flag/nt
 	name = "Nanotrasen flag"
@@ -103,6 +121,11 @@
 	desc = "A flag proudly proclaiming the superior heritage of Drask."
 	icon_state = "draskflag"
 
+/obj/item/flag/species/plasma
+	name = "Plasmaman flag"
+	desc = "A flag proudly proclaiming the superior heritage of Plasmamen."
+	icon_state = "plasmaflag"
+
 //Department Flags
 
 /obj/item/flag/cargo
diff --git a/code/modules/store/items.dm b/code/modules/store/items.dm
index f660efc0d16..c80d3c33a94 100644
--- a/code/modules/store/items.dm
+++ b/code/modules/store/items.dm
@@ -189,6 +189,12 @@
 	typepath = /obj/item/flag/species/drask
 	cost = 1000
 
+/datum/storeitem/flag_plasma
+	name = "Plasmaman flag"
+	desc = "A flag proudly proclaiming the superior heritage of Plasmamen."
+	typepath = /obj/item/flag/species/plasma
+	cost = 1000
+
 /datum/storeitem/flag_ian
 	name = "Ian flag"
 	desc = "The banner of Ian, because SQUEEEEE."
diff --git a/icons/mob/inhands/flags_lefthand.dmi b/icons/mob/inhands/flags_lefthand.dmi
new file mode 100644
index 00000000000..c619b351106
Binary files /dev/null and b/icons/mob/inhands/flags_lefthand.dmi differ
diff --git a/icons/mob/inhands/flags_righthand.dmi b/icons/mob/inhands/flags_righthand.dmi
new file mode 100644
index 00000000000..84b4e2e8067
Binary files /dev/null and b/icons/mob/inhands/flags_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index bccdc57c656..d525b6dc4b8 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index e3b242b46f7..e6e8230f25e 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/obj/flag.dmi b/icons/obj/flag.dmi
index 10126f99102..8b7b2d4a517 100644
Binary files a/icons/obj/flag.dmi and b/icons/obj/flag.dmi differ