diff --git a/code/modules/detectivework/scanner.dm b/code/modules/detectivework/scanner.dm
index 35371f16f92..448425e454d 100644
--- a/code/modules/detectivework/scanner.dm
+++ b/code/modules/detectivework/scanner.dm
@@ -34,11 +34,11 @@
 	attack(mob/living/carbon/human/M as mob, mob/user as mob)
 		if (!ishuman(M))
 			user << "\red [M] is not human and cannot have the fingerprints."
-			flash_icon("forensic0")
+			flick("forensic0",src)
 			return 0
 		if (( !( istype(M.dna, /datum/dna) ) || M.gloves) )
 			user << "\blue No fingerprints found on [M]"
-			flash_icon("forensic0")
+			flick("forensic0",src)
 			return 0
 		else
 			if (src.amount < 1)
@@ -73,7 +73,7 @@
 			return
 		if(istype(A,/obj/item/weapon/f_card))
 			user << "The scanner displays on the screen: \"ERROR 43: Object on Excluded Object List.\""
-			flash_icon("forensic0")
+			flick("forensic0",src)
 			return
 
 		add_fingerprint(user)
@@ -84,7 +84,7 @@
 			if(!isnull(A.blood_DNA))
 				for(var/blood in A.blood_DNA)
 					user << "\blue Blood type: [A.blood_DNA[blood]]\nDNA: [blood]"
-					flash_icon("forensic2")
+					flick("forensic2",src)
 			return
 
 		//General
@@ -92,12 +92,12 @@
 			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
 			"\blue Unable to locate any fingerprints, materials, fibers, or blood on [A]!",\
 			"You hear a faint hum of electrical equipment.")
-			flash_icon("forensic0")
+			flick("forensic0",src)
 			return 0
 
 		if(add_data(A))
 			user << "\blue Object already in internal memory. Consolidating data..."
-			flash_icon("forensic2")
+			flick("forensic2",src)
 			return
 
 
@@ -122,7 +122,7 @@
 		//FIBERS
 		if(A.suit_fibers)
 			user << "\blue Fibers/Materials Data Stored: Scan with Hi-Res Forensic Scanner to retrieve."
-			flash_icon("forensic2")
+			flick("forensic2",src)
 
 		//Blood
 		if (A.blood_DNA)
@@ -134,13 +134,13 @@
 			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]" ,\
 			"You finish scanning \the [A].",\
 			"You hear a faint hum of electrical equipment.")
-			flash_icon("forensic2")
+			flick("forensic2",src)
 			return 0
 		else
 			user.visible_message("\The [user] scans \the [A] with \a [src], the air around [user.gender == MALE ? "him" : "her"] humming[prob(70) ? " gently." : "."]\n[user.gender == MALE ? "He" : "She"] seems to perk up slightly at the readout." ,\
 			"The results of the scan pique your interest.",\
 			"You hear a faint hum of electrical equipment, and someone making a thoughtful noise.")
-			flash_icon("forensic2")
+			flick("forensic2",src)
 			return 0
 		return
 
@@ -179,9 +179,4 @@
 		sum_list[3] = A.blood_DNA ? A.blood_DNA.Copy() : null
 		sum_list[4] = "\The [A] in \the [get_area(A)]"
 		stored["\ref [A]"] = sum_list
-		return 0
-
-	proc/flash_icon(var/ficon)
-		if(ficon)
-			icon_state = ficon
-			spawn(5) icon_state = initial(icon_state)
\ No newline at end of file
+		return 0
\ No newline at end of file