diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
index c279ad903e7..6c5aea84a7b 100644
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -52,6 +52,12 @@
 		if(H.mind.role_alt_title && H.mind.role_alt_title == "Virologist")
 			H.equip_if_possible(new /obj/item/clothing/under/rank/virologist(H), H.slot_w_uniform)
 			H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat/virologist(H), H.slot_wear_suit)
+		else if(H.mind.role_alt_title && H.mind.role_alt_title == "Emergency Physician")
+			H.equip_if_possible(new /obj/item/clothing/under/rank/medical(H), H.slot_w_uniform)
+			H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat/fr_jacket(H), H.slot_wear_suit)
+		else if(H.mind.role_alt_title && H.mind.role_alt_title == "Surgeon")
+			H.equip_if_possible(new /obj/item/clothing/under/rank/medical/blue(H), H.slot_w_uniform)
+			H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat(H), H.slot_wear_suit)
 		else
 			H.equip_if_possible(new /obj/item/clothing/under/rank/medical(H), H.slot_w_uniform)
 			H.equip_if_possible(new /obj/item/clothing/suit/storage/labcoat(H), H.slot_wear_suit)
diff --git a/code/game/objects/items/clothing.dm b/code/game/objects/items/clothing.dm
index 6aafd6c53a8..e52417e67da 100644
--- a/code/game/objects/items/clothing.dm
+++ b/code/game/objects/items/clothing.dm
@@ -398,10 +398,16 @@ THERMAL GLASSES
 		usr << "You unbutton the labcoat."
 	else if(src.icon_state == "fr_jacket_open")
 		src.icon_state = "fr_jacket"
-		usr << "You button up the labcoat."
+		usr << "You button up the jacket."
 	else if(src.icon_state == "fr_jacket")
 		src.icon_state = "fr_jacket_open"
-		usr << "You unbutton the labcoat."
+		usr << "You unbutton the jacket."
+	else if(src.icon_state == "fr_sleeve_open")
+		src.icon_state = "fr_sleeve"
+		usr << "You button up the jacket."
+	else if(src.icon_state == "fr_sleeve")
+		src.icon_state = "fr_sleeve_open"
+		usr << "You unbutton the jacket."
 	else
 		usr << "Sorry! The suit you're wearing doesn't have buttons!"
 	usr.update_clothing()
diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm
index 5a2a9e2a5d5..0c7f70d202b 100644
--- a/code/modules/clothing/suits/labcoat.dm
+++ b/code/modules/clothing/suits/labcoat.dm
@@ -48,5 +48,11 @@
 
 /obj/item/clothing/suit/storage/labcoat/fr_jacket
 	name = "first responder jacket"
-	desc = "\"The first moments are the most crucial.\""
+	desc = "A high-visibility jacket worn by medical first responsers."
 	icon_state = "fr_jacket_open"
+	item_state = "fr_jacket"
+
+/obj/item/clothing/suit/storage/labcoat/fr_jacket/sleeve
+	name = "first responder jacket"
+	desc = "A high-visibility jacket worn by medical first responsers. Has rolled up sleeves."
+	icon_state = "fr_sleeve_open"
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index cf186fb0405..d47291ca99c 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 510f9879d2c..6521cf5f240 100755
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ