diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_accelerator.dm b/code/modules/research/xenoarchaeology/machinery/analysis_accelerator.dm
index eef561a6a1a..5b0ad099f38 100644
--- a/code/modules/research/xenoarchaeology/machinery/analysis_accelerator.dm
+++ b/code/modules/research/xenoarchaeology/machinery/analysis_accelerator.dm
@@ -1,9 +1,6 @@
 
 obj/machinery/anomaly/accelerator
 	name = "Accelerator spectrometer"
-	desc = "A specialised, complex analysis machine."
-	icon = 'virology.dmi'
-	icon_state = "analyser"
 
 obj/machinery/anomaly/accelerator/ScanResults()
 	var/results = "The scan was inconclusive. Check sample integrity and carrier consistency."
diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_base.dm b/code/modules/research/xenoarchaeology/machinery/analysis_base.dm
index 5cb2052118c..07e2232b446 100644
--- a/code/modules/research/xenoarchaeology/machinery/analysis_base.dm
+++ b/code/modules/research/xenoarchaeology/machinery/analysis_base.dm
@@ -1,7 +1,11 @@
 
 /obj/machinery/anomaly
+	name = "Analysis machine"
+	desc = "A specialised, complex analysis machine."
 	anchored = 1
 	density = 1
+	icon = 'icons/obj/virology.dmi'
+	icon_state = "analyser"
 	//
 	var/obj/item/weapon/reagent_containers/glass/held_container
 	var/obj/item/weapon/tank/fuel_container
diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_fourier_transform.dm b/code/modules/research/xenoarchaeology/machinery/analysis_fourier_transform.dm
index 4bcc084a354..6ed3dea2062 100644
--- a/code/modules/research/xenoarchaeology/machinery/analysis_fourier_transform.dm
+++ b/code/modules/research/xenoarchaeology/machinery/analysis_fourier_transform.dm
@@ -1,9 +1,6 @@
 
 obj/machinery/anomaly/fourier_transform
 	name = "Fourier Transform spectroscope"
-	desc = "A specialised, complex analysis machine."
-	icon = 'virology.dmi'
-	icon_state = "analyser"
 
 obj/machinery/anomaly/fourier_transform/ScanResults()
 	var/results = "The scan was inconclusive. Check sample integrity and carrier consistency."
diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_gas_chromatography.dm b/code/modules/research/xenoarchaeology/machinery/analysis_gas_chromatography.dm
index 69116ca117b..a540529cb72 100644
--- a/code/modules/research/xenoarchaeology/machinery/analysis_gas_chromatography.dm
+++ b/code/modules/research/xenoarchaeology/machinery/analysis_gas_chromatography.dm
@@ -1,9 +1,6 @@
 
 obj/machinery/anomaly/gas_chromatography
 	name = "Gas Chromatography spectrometer"
-	desc = "A specialised, complex analysis machine."
-	icon = 'virology.dmi'
-	icon_state = "analyser"
 
 obj/machinery/anomaly/gas_chromatography/ScanResults()
 	var/results = "The scan was inconclusive. Check sample integrity and carrier consistency."
diff --git a/code/modules/research/xenoarchaeology/machinery/analysis_hyperspectral.dm b/code/modules/research/xenoarchaeology/machinery/analysis_hyperspectral.dm
index 7825d935904..8750025a7f9 100644
--- a/code/modules/research/xenoarchaeology/machinery/analysis_hyperspectral.dm
+++ b/code/modules/research/xenoarchaeology/machinery/analysis_hyperspectral.dm
@@ -1,9 +1,16 @@
 
 obj/machinery/anomaly/hyperspectral
 	name = "Hyperspectral Imager"
-	desc = "A specialised, complex analysis machine."
-	//icon = 'icons/obj/computer.dmi'
-	//icon_state = "rdcomp"
+	icon = 'icons/obj/xenoarchaeology.dmi'
+	icon_state = "scanner"
+
+obj/machinery/anomaly/hyperspectral/process()
+	..()
+	if(scan_process)
+		icon_state = "scanner_active"
+	else if(prob(10))
+		icon_state = "scanner"
+		flick(src"scanner_active")
 
 obj/machinery/anomaly/hyperspectral/ScanResults()
 	var/results = "The scan was inconclusive. Check sample integrity and carrier consistency."
diff --git a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm
index e40f4036736..2662ae5aab3 100644
--- a/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm
+++ b/code/modules/research/xenoarchaeology/machinery/artifact_analyser.dm
@@ -2,8 +2,8 @@
 /obj/machinery/artifact_analyser
 	name = "Artifact Analyser"
 	desc = "Studies the structure of artifacts to discover their uses."
-	icon = 'virology.dmi'
-	icon_state = "analyser"
+	icon = 'icons/obj/virology.dmi'
+	icon_state = "isolator"
 	anchored = 1
 	density = 1
 	var/scan_in_progress = 0
diff --git a/icons/obj/xenoarchaeology.dmi b/icons/obj/xenoarchaeology.dmi
index 57b2d876d33..8cfe6eafca9 100644
Binary files a/icons/obj/xenoarchaeology.dmi and b/icons/obj/xenoarchaeology.dmi differ