diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm
index fddd4b69d08..bd76e52cc7a 100644
--- a/code/game/machinery/computer/security.dm
+++ b/code/game/machinery/computer/security.dm
@@ -104,6 +104,8 @@
 							switch(crimstat)
 								if("*Arrest*")
 									background = "'background-color:#DC143C;'"
+								if("Search")
+									background = "'background-color:#FFAE00;'"
 								if("Incarcerated")
 									background = "'background-color:#CD853F;'"
 								if("Parolled")
@@ -203,6 +205,8 @@
 							switch(crimstat)
 								if("*Arrest*")
 									background = "'background-color:#DC143C;'"
+								if("Search")
+									background = "'background-color:#FFAE00;'"
 								if("Incarcerated")
 									background = "'background-color:#CD853F;'"
 								if("Parolled")
@@ -515,6 +519,7 @@ What a mess.*/
 							temp += "<ul>"
 							temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=none'>None</a></li>"
 							temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=arrest'>*Arrest*</a></li>"
+							temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=search'>Search</a></li>"
 							temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=incarcerated'>Incarcerated</a></li>"
 							temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=parolled'>Parolled</a></li>"
 							temp += "<li><a href='?src=\ref[src];choice=Change Criminal Status;criminal2=released'>Released</a></li>"
@@ -565,6 +570,8 @@ What a mess.*/
 									active2.fields["criminal"] = "None"
 								if("arrest")
 									active2.fields["criminal"] = "*Arrest*"
+								if("search")
+									active2.fields["criminal"] = "Search"
 								if("incarcerated")
 									active2.fields["criminal"] = "Incarcerated"
 								if("parolled")
@@ -620,7 +627,7 @@ What a mess.*/
 				if(3)
 					R.fields["age"] = rand(5, 85)
 				if(4)
-					R.fields["criminal"] = pick("None", "*Arrest*", "Incarcerated", "Parolled", "Released")
+					R.fields["criminal"] = pick("None", "*Arrest*", "Search", "Incarcerated", "Parolled", "Released")
 				if(5)
 					R.fields["p_stat"] = pick("*Unconcious*", "Active", "Physically Unfit")
 					if(PDA_Manifest.len)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index e1224414152..9c6e05cb000 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -533,7 +533,7 @@
 						for (var/datum/data/record/R in data_core.security)
 							if (R.fields["id"] == E.fields["id"])
 
-								var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Incarcerated", "Parolled", "Released", "Cancel")
+								var/setcriminal = input(usr, "Specify a new criminal status for this person.", "Security HUD", R.fields["criminal"]) in list("None", "*Arrest*", "Search", "Incarcerated", "Parolled", "Released", "Cancel")
 
 								if(hasHUD(usr, "security"))
 									if(setcriminal != "Cancel")
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index 65c04a8ffcd..d937c21d17f 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -1498,6 +1498,9 @@
 					if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "*Arrest*"))
 						holder.icon_state = "hudwanted"
 						break
+					else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Search"))
+						holder.icon_state = "hudsearch"
+						break
 					else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Incarcerated"))
 						holder.icon_state = "hudprisoner"
 						break
@@ -1506,7 +1509,6 @@
 						break
 					else if((R.fields["id"] == E.fields["id"]) && (R.fields["criminal"] == "Released"))
 						holder.icon_state = "hudreleased"
-						break
 		hud_list[WANTED_HUD] = holder
 
 	if (  BITTEST(hud_updateflag, IMPLOYAL_HUD) \
diff --git a/icons/hud/hud_security.dmi b/icons/hud/hud_security.dmi
index 833b216f590..18268595326 100644
Binary files a/icons/hud/hud_security.dmi and b/icons/hud/hud_security.dmi differ
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index d02090009b1..6d5bc7e690f 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/mob/hud_security_large.dmi b/icons/mob/hud_security_large.dmi
index 456732226ec..e785253a8e6 100644
Binary files a/icons/mob/hud_security_large.dmi and b/icons/mob/hud_security_large.dmi differ