diff --git a/code/game/objects/items/weapons/implants/implant_tracking.dm b/code/game/objects/items/weapons/implants/implant_tracking.dm
index 41c711314dc..560d728abae 100644
--- a/code/game/objects/items/weapons/implants/implant_tracking.dm
+++ b/code/game/objects/items/weapons/implants/implant_tracking.dm
@@ -6,15 +6,33 @@
 	implant_data = /datum/implant_fluff/tracking
 	implant_state = "implant-nanotrasen"
 	var/warn_cooldown = 0
+	var/obj/item/gps/internal_gps
+	var/internal_gps_path = /obj/item/gps/internal/tracking_implant
 
 /obj/item/implant/tracking/Initialize(mapload)
 	. = ..()
 	GLOB.tracked_implants += src
 
 /obj/item/implant/tracking/Destroy()
+	QDEL_NULL(internal_gps)
 	GLOB.tracked_implants -= src
 	return ..()
 
+/obj/item/implant/tracking/implant(mob/target)
+	. = ..()
+	if(!.)
+		return
+	internal_gps = new internal_gps_path(src)
+
+/obj/item/implant/tracking/removed(mob/target)
+	. = ..()
+	if(.)
+		QDEL_NULL(internal_gps)
+
+/obj/item/gps/internal/tracking_implant
+	gpstag = "TRACK0"
+	local = FALSE
+
 /obj/item/implanter/tracking
 	name = "bio-chip implanter (tracking)"
 	implant_type = /obj/item/implant/tracking
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 5df4b7bd7b2..438bb0bf8a5 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -268,7 +268,7 @@
 	new /obj/item/implantcase/tracking(src)
 	new /obj/item/implanter(src)
 	new /obj/item/implantpad(src)
-	new /obj/item/locator(src)
+	new /obj/item/gps/security(src)
 
 /obj/item/storage/box/minertracker
 	name = "boxed tracking bio-chip kit"
@@ -281,7 +281,7 @@
 	new /obj/item/implantcase/tracking(src)
 	new /obj/item/implanter(src)
 	new /obj/item/implantpad(src)
-	new /obj/item/locator(src)
+	new /obj/item/gps/mining(src)
 
 /obj/item/storage/box/chemimp
 	name = "chemical bio-chip kit"
diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm
index a09d7353329..9616d6bb38c 100644
--- a/code/modules/telesci/gps.dm
+++ b/code/modules/telesci/gps.dm
@@ -146,6 +146,12 @@ GLOBAL_LIST_EMPTY(GPS_list)
 	emped = FALSE
 	update_icon(UPDATE_OVERLAYS)
 
+/obj/item/gps/security
+	icon_state = "gps-sec"
+	gpstag = "SEC0"
+	desc = "A positioning system helpful for monitoring prisoners that are implanted with a tracking implant."
+	local = TRUE
+
 /obj/item/gps/science
 	icon_state = "gps-s"
 	gpstag = "SCI0"
diff --git a/icons/obj/telescience.dmi b/icons/obj/telescience.dmi
index e7ba338a451..16848cc9e78 100644
Binary files a/icons/obj/telescience.dmi and b/icons/obj/telescience.dmi differ