diff --git a/code/game/jobs/job/command/cic/staffofficer.dm b/code/game/jobs/job/command/cic/staffofficer.dm
index c9c1cf7d8a..35efd56a54 100644
--- a/code/game/jobs/job/command/cic/staffofficer.dm
+++ b/code/game/jobs/job/command/cic/staffofficer.dm
@@ -70,8 +70,8 @@ OverrideTimelock(/datum/job/command/bridge, list(
 
 /datum/job/command/bridge/ai/upp
 	title = JOB_SO_UPP
-	gear_preset = /datum/equipment_preset/uscm_ship/so/upp
-	gear_preset_secondary = /datum/equipment_preset/uscm_ship/so/upp/lesser_rank
+	gear_preset = /datum/equipment_preset/uscm_ship/so/upp/equipped
+	gear_preset_secondary = /datum/equipment_preset/uscm_ship/so/upp
 
 /obj/effect/landmark/start/bridge/upp
 	name = JOB_SO_UPP
diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm
index 244bea952d..b1a0277b4d 100644
--- a/code/modules/clothing/under/marine_uniform.dm
+++ b/code/modules/clothing/under/marine_uniform.dm
@@ -507,7 +507,7 @@
 
 /obj/item/clothing/under/marine/veteran/UPP
 	name = "\improper UPP fatigues"
-	desc = "A set of UPP fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm."
+	desc = "It's a set of standard-issue UPP Armed Collective combat fatigues featuring venlar armor inserts at critical areas to protect from blades and low caliber ballistics."
 	icon_state = "upp_uniform"
 	worn_state = "upp_uniform"
 	min_cold_protection_temperature = ICE_PLANET_MIN_COLD_PROT
@@ -517,8 +517,8 @@
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE
 
 /obj/item/clothing/under/marine/veteran/UPP/boiler
-	name = "\improper UPP operations fatigues"
-	desc = "A set of UPP operations fatigues, mass produced for the armed-forces of the Union of Progressive Peoples. A rare sight, especially in ICC zones. This particular set sports the dark drab pattern of the UPP 17th battalion, 'Smoldering Sons', operating in the sparse UPP frontier in the Anglo-Japanese arm."
+	name = "\improper UPP operations boilersuit"
+	desc = "It's a deep green boilersuit common with UPP Armed Collective personnel outside of combat zones but still featuring venlar armor inserts at critical areas to protect from blades and low caliber ballistics."
 	icon_state = "upp_boiler"
 	worn_state = "upp_boiler"
 	flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE
diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm
index 648814f12a..41a443917c 100644
--- a/code/modules/gear_presets/uscm_ship.dm
+++ b/code/modules/gear_presets/uscm_ship.dm
@@ -621,6 +621,7 @@
 
 /datum/equipment_preset/uscm_ship/so/upp/load_gear(mob/living/carbon/human/new_human)
 	new_human.undershirt = "Naval Infantry Telnyashka"
+	new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/beret/naval, WEAR_HEAD)
 
 /datum/equipment_preset/uscm_ship/so/upp/lesser_rank
 	paygrade = "UO1"
diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi
index 0b80c19a35..22380df6a6 100644
Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ
diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi
index 9df8c993b8..f4fc1f8fb9 100644
Binary files a/icons/obj/items/clothing/uniforms.dmi and b/icons/obj/items/clothing/uniforms.dmi differ
diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm
index effefa6c4a..ee00c073e8 100644
--- a/maps/map_files/chapaev/chapaev.dmm
+++ b/maps/map_files/chapaev/chapaev.dmm
@@ -225,7 +225,8 @@
 	},
 /obj/item/bedsheet/brown{
 	layer = 3.4;
-	color = "#8B9490"
+	color = "#8B9490";
+	anchored = 1
 	},
 /turf/open/floor/strata{
 	icon_state = "floor2"
@@ -591,7 +592,8 @@
 	},
 /obj/item/device/flashlight/lamp/on{
 	pixel_y = 21;
-	pixel_x = 2
+	pixel_x = 2;
+	anchored = 1
 	},
 /turf/open/floor/strata{
 	icon_state = "floor2"
@@ -761,12 +763,17 @@
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 6
 	},
-/obj/structure/sign{
-	desc = "Comrade! Don't forget to return your state-issued items to your assigned locker before returning to hypersleep!";
-	icon_state = "securearea";
-	name = "Vnimanie! 注意!";
-	pixel_y = 30
+/obj/structure/closet/secure_closet/marine_personal{
+	pixel_y = 14;
+	job = "Platoon Commander";
+	can_block_movement = 0;
+	has_cryo_gear = 0
 	},
+/obj/item/clothing/under/marine/veteran/UPP,
+/obj/item/clothing/under/marine/veteran/UPP/boiler,
+/obj/item/clothing/accessory/patch/upp/platoon,
+/obj/item/clothing/accessory/patch/upp,
+/obj/item/clothing/shoes/marine/upp,
 /turf/open/floor/plating,
 /area/golden_arrow/cryo_cells)
 "gh" = (
@@ -952,7 +959,6 @@
 	},
 /area/golden_arrow/squad_two)
 "ic" = (
-/obj/effect/landmark/start/bridge/upp,
 /obj/structure/bed/chair/comfy/beige{
 	dir = 8;
 	pixel_x = -7
@@ -1074,13 +1080,14 @@
 /obj/structure/pipes/standard/simple/hidden/supply{
 	dir = 5
 	},
+/obj/structure/machinery/light/small,
 /obj/structure/sign{
 	desc = "Comrade! Don't forget to return your state-issued items to your assigned locker before returning to hypersleep!";
 	icon_state = "securearea";
 	name = "Vnimanie! 注意!";
-	pixel_y = -34
+	pixel_y = -34;
+	layer = 2
 	},
-/obj/structure/machinery/light/small,
 /turf/open/floor/strata{
 	dir = 6;
 	icon_state = "multi_tiles"
@@ -1254,15 +1261,16 @@
 	layer = 3.5;
 	pixel_y = 13
 	},
-/obj/item/bedsheet/brown{
-	layer = 3.4;
-	color = "#8B9490"
-	},
 /obj/item/bedsheet/brown{
 	pixel_y = 13;
 	color = "#8B9490"
 	},
 /obj/structure/machinery/light/small,
+/obj/item/bedsheet/brown{
+	layer = 3.4;
+	color = "#8B9490";
+	anchored = 1
+	},
 /turf/open/floor/strata{
 	icon_state = "floor2"
 	},
@@ -4073,7 +4081,8 @@
 	},
 /obj/item/bedsheet/brown{
 	layer = 3.4;
-	color = "#8B9490"
+	color = "#8B9490";
+	anchored = 1
 	},
 /obj/item/bedsheet/brown{
 	pixel_y = 13;
@@ -5386,10 +5395,6 @@
 /obj/effect/decal/warning_stripes{
 	icon_state = "S"
 	},
-/obj/structure/closet/secure_closet/guncabinet{
-	req_one_access_txt = "240";
-	req_access = null
-	},
 /turf/open/floor/strata{
 	icon_state = "multi_tiles"
 	},
@@ -5527,17 +5532,15 @@
 	},
 /area/golden_arrow/medical)
 "RJ" = (
-/obj/structure/closet/secure_closet/marine_personal{
-	pixel_x = -6;
-	pixel_y = 14;
-	job = "Platoon Commander";
-	can_block_movement = 0;
-	has_cryo_gear = 0
-	},
-/obj/item/clothing/under/marine/veteran/UPP/boiler,
 /obj/item/clothing/suit/storage/marine/faction/UPP/jacket,
-/obj/item/clothing/suit/storage/snow_suit/soviet,
 /obj/item/clothing/suit/storage/marine/veteran/lamp,
+/obj/item/storage/belt/gun/type47/np92,
+/obj/structure/closet/secure_closet/guncabinet{
+	req_one_access_txt = "240";
+	req_access = null;
+	can_block_movement = 0;
+	pixel_y = 14
+	},
 /turf/open/floor/strata{
 	icon_state = "floor2"
 	},
@@ -6370,6 +6373,16 @@
 	icon_state = "multi_tiles"
 	},
 /area/golden_arrow/dorms)
+"Xv" = (
+/obj/structure/pipes/vents/pump{
+	dir = 4
+	},
+/obj/effect/landmark/start/bridge/upp,
+/turf/open/floor/strata{
+	dir = 4;
+	icon_state = "floor3"
+	},
+/area/golden_arrow/cryo_cells)
 "XL" = (
 /obj/structure/pipes/vents/pump{
 	dir = 4
@@ -14174,7 +14187,7 @@ Cf
 Qr
 bt
 oH
-FS
+bt
 IS
 mV
 mV
@@ -14630,7 +14643,7 @@ CM
 oH
 bt
 pH
-FS
+bt
 CM
 fJ
 CM
@@ -14934,7 +14947,7 @@ CM
 oH
 bt
 oH
-FS
+bt
 CM
 BE
 ns
@@ -15697,7 +15710,7 @@ ce
 Zb
 xe
 Ez
-rE
+Xv
 sp
 cR
 us