diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 201c9e0bea..fe9df92fef 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -437,3 +437,11 @@
 	item_state = "hunter"
 	armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 15, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	resistance_flags = FIRE_PROOF | ACID_PROOF
+
+/obj/item/clothing/head/kepi
+	name = "kepi"
+	desc = "A white cap with visor. Too bad that Solar Foreign Legion isn't created."
+	icon_state = "kepi"
+
+/obj/item/clothing/head/kepi/old
+	icon_state = "kepi_old"
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index ccd902ec03..6e4b814e5a 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 93e499f595..eeb44af5af 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm
index 28c6e8e8a6..d136c4eb21 100644
--- a/modular_citadel/code/modules/client/loadout/head.dm
+++ b/modular_citadel/code/modules/client/loadout/head.dm
@@ -98,6 +98,21 @@
 	restricted_desc = "Engineering, Security, and Cargo"
 	restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
 
+// orvilike "original" kepi
+/datum/gear/orvkepi
+	name = "Federation Kepi, assistant"
+	description = "A visored cap. Intended to be used with ORV uniform."
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/kepi/orvi
+	restricted_roles = list("Assistant")
+
+/datum/gear/orvkepi/srv
+	name = "Federation Kepi, service"
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/kepi/orvi/service
+	restricted_roles = list("Assistant", "Bartender", "Botanist", "Cook", "Curator", "Janitor", "Chaplain")
+	restricted_desc = "Service and Civilian, barring Clown, Mime and Lawyer"
+
 /*Commenting out Until next Christmas or made automatic
 /datum/gear/santahatr
 	name = "Red Santa Hat"
@@ -137,3 +152,9 @@
 	path = /obj/item/clothing/head/cowboyhat/sec
 	restricted_desc = "Security"
 	restricted_roles = list("Warden","Detective","Security Officer","Head of Security")
+
+// Misc
+/datum/gear/wkepi
+	name = "white kepi"
+	category = SLOT_HEAD
+	path = /obj/item/clothing/head/kepi
diff --git a/modular_citadel/code/modules/clothing/trek.dm b/modular_citadel/code/modules/clothing/trek.dm
index c522d1af81..e04959f0d5 100644
--- a/modular_citadel/code/modules/clothing/trek.dm
+++ b/modular_citadel/code/modules/clothing/trek.dm
@@ -162,3 +162,12 @@
 /obj/item/clothing/head/caphat/formal/fedcover/black
 		icon_state = "fedcapblack"
 		item_state = "fedcapblack"
+
+//orvilike caps
+/obj/item/clothing/head/kepi/orvi
+	name = "\improper Federation kepi"
+	desc = "A visored cap worn by all officers since 2550s."
+	icon_state = "kepi_ass"
+
+/obj/item/clothing/head/kepi/orvi/service
+	icon_state = "kepi_srv"