diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index 1319e413..e2dce270 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -125,6 +125,21 @@
 	storage_slots = 14
 	use_sound = null
 
+/obj/item/weapon/storage/pill_bottle/verb/rename()
+	set name = "Rename Label"
+	set category = "Object"
+	set src in usr
+
+	if((CLUMSY in usr.mutations) && prob(50))
+		usr << "<span class='warning'>You drop the bottle, slipping on it and giving you a bruise ankle as you stumble.</span>"
+		return
+	var/n_name = copytext(sanitize(input(usr, "What would you like to label the Pill Bottle?", "Bottle Label", null)  as text), 1, MAX_NAME_LEN)
+	if((loc == usr && usr.stat == 0))
+		name = "[(n_name ? text("[n_name]") : "Pill Bottle")]"
+	add_fingerprint(usr)
+	return
+
+
 /obj/item/weapon/storage/pill_bottle/kelotane
 	name = "bottle of kelotane pills"
 	desc = "Contains pills used to treat burns."
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index e65a9e1c..c3cd3be3 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -252,6 +252,7 @@ BLIND     // can't see anything
 	var/obj/item/clothing/tie/hastie = null
 	var/displays_id = 1
 	var/rolled_down = 0
+	var/rolled_sleeves = 0
 	var/basecolor
 
 /obj/item/clothing/under/attackby(obj/item/I, mob/user)
@@ -370,13 +371,26 @@ BLIND     // can't see anything
 	if(!istype(usr, /mob/living)) return
 	if(usr.stat) return
 
-	if(copytext(item_color,-2) != "_d")
+	if(copytext(item_color,-2) != "_d" && rolled_sleeves == 0)
 		basecolor = item_color
 	if(basecolor + "_d_s" in icon_states('icons/mob/uniform.dmi'))
 		item_color = item_color == "[basecolor]" ? "[basecolor]_d" : "[basecolor]"
 		usr.update_inv_w_uniform()
-	else
-		usr << "<span class='notice'>You cannot roll down the uniform!</span>"
+		rolled_down = 1
+
+/obj/item/clothing/under/verb/rollsleeve()
+	set name = "Roll Up Sleeves"
+	set category = "Object"
+	set src in usr
+	if(!istype(usr, /mob/living)) return
+	if(usr.stat) return
+
+	if(copytext(item_color,-2) != "_r" && rolled_down == 0)
+		basecolor = item_color
+	if(basecolor + "_r_s" in icon_states('icons/mob/uniform.dmi'))
+		item_color = item_color == "[basecolor]" ? "[basecolor]_r" : "[basecolor]"
+		usr.update_inv_w_uniform()
+		rolled_sleeves = 1
 
 /obj/item/clothing/under/proc/remove_accessory(mob/user as mob)
 	if(!hastie)
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 6107886b..d2b0aee5 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/Cryogenic2.dmi b/icons/obj/Cryogenic2.dmi
index 094af6c0..a089beb6 100644
Binary files a/icons/obj/Cryogenic2.dmi and b/icons/obj/Cryogenic2.dmi differ