diff --git a/code/game/hud.dm b/code/game/hud.dm
index 8a7c2ecb62..e3c0082975 100644
--- a/code/game/hud.dm
+++ b/code/game/hud.dm
@@ -30,7 +30,7 @@
 #define ui_inv1 "6:16,1:5"			//borgs
 #define ui_inv2 "7:16,1:5"			//borgs
 #define ui_inv3 "8:16,1:5"			//borgs
-#define ui_borg_store "9:14,1:5"	//borgs
+#define ui_borg_store "9:16,1:5"	//borgs
 
 #define ui_monkey_mask "5:14,1:5"	//monkey
 #define ui_monkey_back "6:14,1:5"	//monkey
@@ -53,6 +53,11 @@
 #define ui_oxygen "14:28,11:23"
 #define ui_pressure "14:28,10:21"
 
+#define ui_alien_toxin "14:28,13:25"
+#define ui_alien_fire "14:28,12:25"
+#define ui_alien_oxygen "14:28,11:25"
+
+
 //Middle right (status indicators)
 #define ui_nutrition "14:28,5:11"
 #define ui_temp "14:28,6:13"
diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm
index 75e2287c74..e38437fccb 100644
--- a/code/modules/chemical/Chemistry-Tools.dm
+++ b/code/modules/chemical/Chemistry-Tools.dm
@@ -2254,6 +2254,23 @@
 		..()
 		reagents.add_reagent("adminordrazine", 30)
 
+/obj/item/weapon/reagent_containers/glass/bottle/capsaicin
+	name = "Capsaicin Bottle"
+	desc = "A small bottle. Contains hot sauce."
+	icon = 'chemical.dmi'
+	icon_state = "bottle3"
+	New()
+		..()
+		reagents.add_reagent("capsaicin", 30)
+
+/obj/item/weapon/reagent_containers/glass/bottle/frostoil
+	name = "Frost Oil Bottle"
+	desc = "A small bottle. Contains cold sauce."
+	icon = 'chemical.dmi'
+	icon_state = "bottle17"
+	New()
+		..()
+		reagents.add_reagent("frostoil", 30)
 
 /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone
 	name = "beaker"
@@ -2535,6 +2552,7 @@
 	name = "Space Milk"
 	desc = "It's milk. White and nutritious goodness!"
 	icon_state = "milk"
+	item_state = "carton"
 	New()
 		..()
 		reagents.add_reagent("milk", 50)
@@ -2545,6 +2563,7 @@
 	name = "SoyMilk"
 	desc = "It's soy milk. White and nutritious goodness!"
 	icon_state = "soymilk"
+	item_state = "carton"
 	New()
 		..()
 		reagents.add_reagent("soymilk", 50)
@@ -2565,6 +2584,7 @@
 	name = "Duke Purple Tea"
 	desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
 	icon_state = "tea"
+	item_state = "coffee"
 	New()
 		..()
 		reagents.add_reagent("tea", 30)
@@ -2585,6 +2605,7 @@
 	name = "Dutch Hot Coco"
 	desc = "Made in Space South America."
 	icon_state = "tea"
+	item_state = "coffee"
 	New()
 		..()
 		reagents.add_reagent("hot_coco", 30)
@@ -2625,6 +2646,7 @@
 	name = "Magm-Ale"
 	desc = "A true dorf's drink of choice."
 	icon_state = "alebottle"
+	item_state = "beer"
 	New()
 		..()
 		reagents.add_reagent("ale", 30)
@@ -2714,6 +2736,7 @@
 /obj/item/weapon/reagent_containers/food/drinks/bottle
 	amount_per_transfer_from_this = 10
 	volume = 100
+	item_state = "beer" //Generic held-item sprite until unique ones are made.
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/gin
 	name = "Griffeater Gin"
@@ -2825,6 +2848,7 @@
 	name = "Orange Juice"
 	desc = "Full of vitamins and deliciousness!"
 	icon_state = "orangejuice"
+	item_state = "carton"
 	New()
 		..()
 		reagents.add_reagent("orangejuice", 100)
@@ -2833,6 +2857,7 @@
 	name = "Milk Cream"
 	desc = "It's cream. Made from milk. What else did you think you'd find in there?"
 	icon_state = "cream"
+	item_state = "carton"
 	New()
 		..()
 		reagents.add_reagent("cream", 100)
@@ -2841,6 +2866,7 @@
 	name = "Tomato Juice"
 	desc = "Well, at least it LOOKS like tomato juice. You can't tell with all that redness."
 	icon_state = "tomatojuice"
+	item_state = "carton"
 	New()
 		..()
 		reagents.add_reagent("tomatojuice", 100)
@@ -2849,6 +2875,7 @@
 	name = "Lime Juice"
 	desc = "Sweet-sour goodness."
 	icon_state = "limejuice"
+	item_state = "carton"
 	New()
 		..()
 		reagents.add_reagent("limejuice", 100)
diff --git a/code/modules/mob/living/carbon/alien/humanoid/hud.dm b/code/modules/mob/living/carbon/alien/humanoid/hud.dm
index 7bf902556d..7481456b4e 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/hud.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/hud.dm
@@ -227,19 +227,19 @@
 	mymob.oxygen.icon = 'screen1_alien.dmi'
 	mymob.oxygen.icon_state = "oxy0"
 	mymob.oxygen.name = "oxygen"
-	mymob.oxygen.screen_loc = ui_oxygen
+	mymob.oxygen.screen_loc = ui_alien_oxygen
 
 	mymob.toxin = new /obj/screen( null )
 	mymob.toxin.icon = 'screen1_alien.dmi'
 	mymob.toxin.icon_state = "tox0"
 	mymob.toxin.name = "toxin"
-	mymob.toxin.screen_loc = ui_toxin
+	mymob.toxin.screen_loc = ui_alien_toxin
 
 	mymob.fire = new /obj/screen( null )
 	mymob.fire.icon = 'screen1_alien.dmi'
 	mymob.fire.icon_state = "fire0"
 	mymob.fire.name = "fire"
-	mymob.fire.screen_loc = ui_fire
+	mymob.fire.screen_loc = ui_alien_fire
 
 	mymob.healths = new /obj/screen( null )
 	mymob.healths.icon = 'screen1_alien.dmi'
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index f4be4caebf..ce4d1321c3 100644
Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
index ff8667fd96..40068b102a 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ
diff --git a/icons/mob/screen1_alien.dmi b/icons/mob/screen1_alien.dmi
index 1aa3f5904f..ba10c2ff26 100644
Binary files a/icons/mob/screen1_alien.dmi and b/icons/mob/screen1_alien.dmi differ
diff --git a/icons/mob/screen1_robot.dmi b/icons/mob/screen1_robot.dmi
index 156822545c..9f664385ee 100644
Binary files a/icons/mob/screen1_robot.dmi and b/icons/mob/screen1_robot.dmi differ