diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm
index d554caf3cd0..6acdd29d585 100644
--- a/code/game/machinery/bots/secbot.dm
+++ b/code/game/machinery/bots/secbot.dm
@@ -24,6 +24,7 @@
 	var/check_records = 1 //Does it check security records?
 	var/arrest_type = 0 //If true, don't handcuff
 	var/harmbaton = 0
+	var/base_icon = "secbot"
 	radio_frequency = SEC_FREQ //Security channel
 	radio_name = "Security"
 	bot_type = SEC_BOT
@@ -54,6 +55,8 @@
 /obj/machinery/bot/secbot/buzzsky
 	name = "Officer Buzzsky"
 	desc = "It's Officer Buzzsky! Rusted and falling apart, he seems less than thrilled with the crew for leaving him in his current state."
+	base_icon = "rustbot"
+	icon_state = "rustbot0"
 	declare_arrests = 0
 	arrest_type = 1
 	harmbaton = 1
@@ -72,7 +75,7 @@
 
 /obj/machinery/bot/secbot/New()
 	..()
-	icon_state = "secbot[on]"
+	icon_state = "[base_icon][on]"
 	spawn(3)
 
 		var/datum/job/detective/J = new/datum/job/detective
@@ -83,12 +86,12 @@
 
 /obj/machinery/bot/secbot/turn_on()
 	..()
-	icon_state = "secbot[on]"
+	icon_state = "[base_icon][on]"
 	updateUsrDialog()
 
 /obj/machinery/bot/secbot/turn_off()
 	..()
-	icon_state = "secbot[on]"
+	icon_state = "[base_icon][on]"
 	updateUsrDialog()
 
 /obj/machinery/bot/secbot/bot_reset()
@@ -199,7 +202,7 @@ Auto Patrol: []"},
 			oldtarget_name = user.name
 		visible_message("<span class='danger'>[src] buzzes oddly!</span>")
 		declare_arrests = 0
-		icon_state = "secbot[on]"
+		icon_state = "[base_icon][on]"
 
 /obj/machinery/bot/secbot/bot_process()
 	if (!..())
@@ -227,9 +230,9 @@ Auto Patrol: []"},
 					playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
 					if(harmbaton)
 						playsound(loc, 'sound/weapons/genhit1.ogg', 50, 1, -1)
-					icon_state = "secbot-c"
+					icon_state = "[base_icon]-c"
 					spawn(2)
-						icon_state = "secbot[on]"
+						icon_state = "[base_icon][on]"
 					var/mob/living/carbon/M = target
 					if(istype(M, /mob/living/carbon/human))
 						if( M.stuttering < 5 && !(M_HULK in M.mutations) )
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 6b8cb9477d6..20f31ae24e5 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -514,11 +514,11 @@
 	<BR><B>Suit Storage:</B> <A href='?src=\ref[src];item=s_store'>[(s_store ? s_store : "Nothing")]</A>
 	<BR><BR><A href='?src=\ref[src];pockets=left'>Left Pocket ([l_store ? (pickpocket ? l_store.name : "Full") : "Empty"])</A>
 	<BR><A href='?src=\ref[src];pockets=right'>Right Pocket ([r_store ? (pickpocket ? r_store.name : "Full") : "Empty"])</A>
-	<BR><A href='?src=\ref[src];item=pockets'>Empty Both Pockets</A>		
+	<BR><A href='?src=\ref[src];item=pockets'>Empty Both Pockets</A>
 	<BR><BR>[(handcuffed ? text("<A href='?src=\ref[src];item=handcuff'>Handcuffed</A>") : text("<A href='?src=\ref[src];item=handcuff'>Not Handcuffed</A>"))]
 	<BR>[(legcuffed ? text("<A href='?src=\ref[src];item=legcuff'>Legcuffed</A>") : text(""))]
 	[(suit) ? ((suit.hastie) ? text("<BR><A href='?src=\ref[];item=tie'>Remove Accessory</A>", src) : "") :]
-	[(internal ? text("<BR><A href='?src=\ref[src];item=internal'>Remove Internal</A>") : "")]	
+	[(internal ? text("<BR><A href='?src=\ref[src];item=internal'>Remove Internal</A>") : "")]
 	<BR><A href='?src=\ref[src];item=splints'>Remove Splints</A>
 	<BR><A href='?src=\ref[user];refresh=1'>Refresh</A>
 	<BR><A href='?src=\ref[user];mach_close=mob\ref[src]'>Close</A>
@@ -1602,6 +1602,10 @@
 	if(istype(idcard, /obj/item/weapon/card/id/syndicate))
 		threatcount -= 5
 
+	// Pingsky now actually harbors anti-human sentiment! -Dave
+	if(istype(judgebot, /obj/machinery/bot/secbot/pingsky) && istype(src, /mob/living/carbon/human/human/))
+		threatcount += 1
+
 	return threatcount
 
 /mob/living/carbon/human/canBeHandcuffed()
diff --git a/icons/obj/aibots.dmi b/icons/obj/aibots.dmi
index 00826a8344b..c5a7bc0fe64 100644
Binary files a/icons/obj/aibots.dmi and b/icons/obj/aibots.dmi differ