diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index f8b38d6f80b..444afbdd260 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -417,7 +417,7 @@ BREATH ANALYZER
 /obj/item/device/reagent_scanner
 	name = "reagent scanner"
 	desc = "A hand-held reagent scanner which identifies chemical agents."
-	icon_state = "spectrometer"
+	icon_state = "reagent_scanner"
 	item_state = "analyzer"
 	w_class = ITEMSIZE_SMALL
 	flags = CONDUCT
@@ -431,31 +431,27 @@ BREATH ANALYZER
 	var/details = 0
 	var/recent_fail = 0
 
-/obj/item/device/reagent_scanner/afterattack(obj/O, mob/user as mob, proximity)
+/obj/item/device/reagent_scanner/afterattack(obj/O, mob/user, proximity)
 	if(!proximity)
 		return
-	if (user.stat)
-		return
-	if (!user.IsAdvancedToolUser())
-		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
+	if(use_check_and_message(user))
 		return
 	if(!istype(O))
 		return
 	if(isemptylist(O.reagents?.reagent_volumes))
-		to_chat(user, "<span class='notice'>No active chemical agents found in [O].</span>")
+		to_chat(user, SPAN_WARNING("No active chemical agents found in [O]."))
 		return
 
 	var/dat = ""
 	var/one_percent = O.reagents.total_volume / 100
 	for (var/_R in O.reagents.reagent_volumes)
 		var/decl/reagent/R = decls_repository.get_decl(_R)
-		dat += "\n \t <span class='notice'>[R][details ? ": [O.reagents.reagent_volumes[_R] / one_percent]%" : ""]"
-	to_chat(user, "<span class='notice'>Chemicals found: [dat]</span>")
-	return
+		dat += "\n \t [R][details ? ": [O.reagents.reagent_volumes[_R] / one_percent]%" : ""]"
+	to_chat(user, SPAN_NOTICE("Chemicals found: [dat]"))
 
 /obj/item/device/reagent_scanner/adv
 	name = "advanced reagent scanner"
-	icon_state = "adv_spectrometer"
+	icon_state = "adv_reagent_scanner"
 	details = 1
 	origin_tech = list(TECH_MAGNET = 4, TECH_BIO = 2)
 
diff --git a/html/changelogs/geeves-reagent_scanner_stuff.yml b/html/changelogs/geeves-reagent_scanner_stuff.yml
new file mode 100644
index 00000000000..8bcc3f5af01
--- /dev/null
+++ b/html/changelogs/geeves-reagent_scanner_stuff.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - rscadd: "Reagent scanners and their advanced version now have unique sprites."
\ No newline at end of file
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 573c7f8bdac..a4625bb2b13 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ