diff --git a/code/game/objects/items/weapons/candle.dm b/code/game/objects/items/weapons/candle.dm
index 768444f4884..586012aaf1d 100644
--- a/code/game/objects/items/weapons/candle.dm
+++ b/code/game/objects/items/weapons/candle.dm
@@ -28,22 +28,22 @@
 	if(W.iswelder())
 		var/obj/item/weapon/weldingtool/WT = W
 		if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool
-			light(span("notice", "\The [user] casually lights \the [name] with [W].</span>"))
+			light()
+			to_chat(user, span("notice", "\The [user] casually lights \the [name] with [W].</span>"))
 	else if(isflamesource(W))
 		light()
+		to_chat(user, span("notice", "\The [user] lights \the [name].</span>"))
 	else if(istype(W, /obj/item/weapon/flame/candle))
 		var/obj/item/weapon/flame/candle/C = W
 		if(C.lit)
 			light()
+			to_chat(user, span("notice", "\The [user] lights \the [name].</span>"))
 
-
-/obj/item/weapon/flame/candle/proc/light(var/flavor_text = span("notice", "\The [usr] lights \the [name].</span>"))
+/obj/item/weapon/flame/candle/proc/light()
 	if(!src.lit)
 		src.lit = 1
 		playsound(src.loc, 'sound/items/cigs_lighters/cig_light.ogg', 50, 1)
 		//src.damtype = "fire"
-		for(var/mob/O in viewers(usr, null))
-			O.show_message(flavor_text, 1)
 		set_light(CANDLE_LUM)
 		update_icon()
 		START_PROCESSING(SSprocessing, src)
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 154b29de0c6..3de579c1f3e 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -187,21 +187,22 @@
 	if(W.iswelder())
 		var/obj/item/weapon/weldingtool/WT = W
 		if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool
-			light(span("notice", "\The [user] casually lights \the [name] with [W].</span>"))
+			light()
+			to_chat(user, span("notice", "\The [user] casually lights \the [name] with [W].</span>"))
 	else if(isflamesource(W))
 		light()
+		to_chat(user, span("notice", "\The [user] lights \the [name].</span>"))
 	else if(istype(W, /obj/item/weapon/flame/candle))
 		var/obj/item/weapon/flame/candle/C = W
 		if(C.lit)
 			light()
+			to_chat(user, span("notice", "\The [user] lights \the [name].</span>"))
 
-/obj/item/clothing/head/pumpkin/lantern/proc/light(var/flavor_text = span("notice", "\The [usr] lights \the [name].</span>"))
+/obj/item/clothing/head/pumpkin/lantern/proc/light()
 	if(!src.lit)
 		src.lit = 1
 		playsound(src.loc, 'sound/items/cigs_lighters/cig_light.ogg', 50, 1)
 		//src.damtype = "fire"
-		for(var/mob/O in viewers(usr, null))
-			O.show_message(flavor_text, 1)
 		set_light(CANDLE_LUM)
 		update_icon()
 		START_PROCESSING(SSprocessing, src)
diff --git a/icons/obj/candle.dmi b/icons/obj/candle.dmi
index 8206cc7312f..817d4b9af8c 100644
Binary files a/icons/obj/candle.dmi and b/icons/obj/candle.dmi differ