diff --git a/code/modules/wiremod/marker.dm b/code/modules/wiremod/marker.dm
index 1bae6b6569c..50a683d7edd 100644
--- a/code/modules/wiremod/marker.dm
+++ b/code/modules/wiremod/marker.dm
@@ -2,6 +2,7 @@
 	name = "circuit multitool"
 	desc = "A circuit multitool. Used to mark entities which can then be uploaded to components by pressing the upload button on a port. \
 	Acts as a normal multitool otherwise. Use in hand to clear marked entity so that you can mark another entity."
+	icon_state = "multitool_circuit"
 
 	/// The marked atom of this multitool
 	var/atom/marked_atom
@@ -34,14 +35,24 @@
 	say("Marked [target].")
 	marked_atom = target
 	RegisterSignal(marked_atom, COMSIG_PARENT_QDELETING, .proc/cleanup_marked_atom)
+	update_icon()
+	flick("multitool_circuit_flick", src)
+	playsound(src.loc, 'sound/misc/compiler-stage2.ogg', 30, TRUE)
 	return TRUE
 
+/obj/item/multitool/circuit/update_overlays()
+	. = ..()
+	cut_overlays()
+	if(marked_atom)
+		. += "marked_overlay"
+
 /// Clears the current marked atom
 /obj/item/multitool/circuit/proc/clear_marked_atom()
 	if(!marked_atom)
 		return
 	UnregisterSignal(marked_atom, COMSIG_PARENT_QDELETING)
 	marked_atom = null
+	update_icon()
 
 /obj/item/multitool/circuit/proc/cleanup_marked_atom(datum/source)
 	SIGNAL_HANDLER
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 7b70285723b..303035439b8 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ