diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm
index d7060b9895d..77aef9bb71d 100644
--- a/code/game/objects/items/contraband.dm
+++ b/code/game/objects/items/contraband.dm
@@ -54,7 +54,7 @@
 /obj/item/storage/pill_bottle/random_drug_bottle
 	name = "pill bottle (???)"
 	desc = "Huh."
-	wrapper_color = COLOR_GRAY
+	allow_wrap = FALSE
 
 /obj/item/storage/pill_bottle/random_drug_bottle/New()
 	..()
diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm
index 3ce832cf194..e51bac10005 100644
--- a/code/game/objects/items/random_items.dm
+++ b/code/game/objects/items/random_items.dm
@@ -123,7 +123,7 @@
 /obj/item/storage/pill_bottle/random_meds
 	name = "unlabelled pillbottle"
 	desc = "The sheer recklessness of this bottle's existence astounds you."
-	wrapper_color = COLOR_GRAY
+	allow_wrap = FALSE
 	var/labelled = FALSE
 
 /obj/item/storage/pill_bottle/random_meds/New()
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index ae374d0abb9..8d8cb77e597 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -286,7 +286,7 @@
 		return ..()
 
 /obj/item/storage/pill_bottle/ert
-	wrapper_color = COLOR_TEAL
+	wrapper_color = COLOR_MAROON
 
 /obj/item/storage/pill_bottle/ert/New()
 	..()
@@ -359,7 +359,7 @@
 /obj/item/storage/pill_bottle/painkillers
 	name = "Pill Bottle (Salicylic Acid)"
 	desc = "Contains various pills for minor pain relief."
-	wrapper_color = LIGHT_COLOR_RED
+	wrapper_color = COLOR_RED
 
 /obj/item/storage/pill_bottle/painkillers/New()
 	..()
@@ -373,7 +373,7 @@
 	new /obj/item/reagent_containers/food/pill/salicylic(src)
 
 /obj/item/storage/pill_bottle/fakedeath
-	wrapper_color = COLOR_GRAY
+	allow_wrap = FALSE
 
 /obj/item/storage/pill_bottle/fakedeath/New()
 	..()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 5e51f8e966c..33496dc8cdf 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -110,7 +110,7 @@
 /obj/item/storage/pill_bottle/psychiatrist
 	name = "psychiatrist's pill bottle"
 	desc = "Contains various pills to calm or sedate patients."
-	wrapper_color = COLOR_WHITE
+	wrapper_color = COLOR_PALE_BTL_GREEN
 
 /obj/item/storage/pill_bottle/psychiatrist/New()
 	..()
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index fab9fbb2fb2..c54d5cf528a 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -135,9 +135,37 @@
 			loaded_pill_bottle = null
 	else if(href_list["change_pillbottle"])
 		if(loaded_pill_bottle)
-			loaded_pill_bottle.wrapper_color = COLOR_RED;
+			var/list/wrappers = list("Default wrapper", "Red wrapper", "Green wrapper", "Pale green wrapper", "Blue wrapper", "Light blue wrapper", "Teal wrapper", "Yellow wrapper", "Orange wrapper", "Pink wrapper", "Brown wrapper")
+			var/chosen = input(usr, "Select a pillbottle wrapper", "Pillbottle wrapper", wrappers[1]) as null|anything in wrappers
+			if(!chosen)
+				return
+			var/color
+			switch(chosen)
+				if("Default wrapper")
+					loaded_pill_bottle.cut_overlays()
+					return
+				if("Red wrapper")
+					color = COLOR_RED
+				if("Green wrapper")
+					color = COLOR_GREEN
+				if("Pink wrapper")
+					color = COLOR_PINK
+				if("Teal wrapper")
+					color = COLOR_TEAL
+				if("Blue wrapper")
+					color = COLOR_BLUE
+				if("Brown wrapper")
+					color = COLOR_MAROON
+				if("Light blue wrapper")
+					color = COLOR_CYAN_BLUE
+				if("Yellow wrapper")
+					color = COLOR_YELLOW
+				if("Pale green wrapper")
+					color = COLOR_PALE_BTL_GREEN
+				if("Orange wrapper")
+					color = COLOR_ORANGE
+			loaded_pill_bottle.wrapper_color = color;
 			loaded_pill_bottle.apply_wrap();
-			usr << browse(null, "window=chem_master_iconsel")
 	else if(href_list["close"])
 		usr << browse(null, "window=chem_master")
 		onclose(usr, "chem_master")
@@ -190,7 +218,7 @@
 				dat += "<A href='?src=[UID()];main=1'>(Back)</A>"
 			else
 				dat += "<TITLE>Condimaster 3000</TITLE>Condiment infos:<BR><BR>Name:<BR>[href_list["name"]]<BR><BR>Description:<BR>[href_list["desc"]]<BR><BR><BR><A href='?src=[UID()];main=1'>(Back)</A>"
-			usr << browse(dat, "window=chem_master;size=575x400")
+			usr << browse(dat, "window=chem_master;size=575x500")
 			return
 
 		else if(href_list["add"])
@@ -393,7 +421,7 @@
 
 	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
-		ui = new(user, src, ui_key, "chem_master.tmpl", name, 575, 400)
+		ui = new(user, src, ui_key, "chem_master.tmpl", name, 575, 500)
 		ui.open()
 
 /obj/machinery/chem_master/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
diff --git a/nano/templates/chem_master.tmpl b/nano/templates/chem_master.tmpl
index a3021fbfd9c..1d040d52af7 100644
--- a/nano/templates/chem_master.tmpl
+++ b/nano/templates/chem_master.tmpl
@@ -80,25 +80,27 @@
 {{else}}
 	<span class='item'>No beaker loaded</span><br>
 {{/if}}
-<span class='item'>
-	{{if data.loaded_pill_bottle}}
-	<table>
-		<tr>
-			<td>
-				{{:helper.link('Pill Bottle (' + data.loaded_pill_bottle_contents_len + '/' + data.loaded_pill_bottle_storage_slots + ')', 'eject', {'ejectp': 1})}}
-			</td>
-			<td>
-				{{:helper.link('Change Wrapper', 'pencil', {'change_pillbottle': 1})}}
-			</td>
-		</tr>
-	</table>
-	{{else}}
+<div class='statusDisplay'>
+	<span class='item'>
+		{{if data.loaded_pill_bottle}}
 		<table>
 			<tr>
 				<td>
-					{{:helper.link('No Pill Bottle', 'eject', {}, 'disabled')}}
+					{{:helper.link('Pill Bottle (' + data.loaded_pill_bottle_contents_len + '/' + data.loaded_pill_bottle_storage_slots + ')', 'eject', {'ejectp': 1})}}
+				</td>
+				<td>
+					{{:helper.link('Change Wrapper', 'pencil', {'change_pillbottle': 1})}}
 				</td>
 			</tr>
 		</table>
-	{{/if}}
-</span>
\ No newline at end of file
+		{{else}}
+			<table>
+				<tr>
+					<td>
+						{{:helper.link('No Pill Bottle', 'eject', {}, 'disabled')}}
+					</td>
+				</tr>
+			</table>
+		{{/if}}
+	</span>
+</div>
\ No newline at end of file