diff --git a/code/modules/mechs/interface/_interface.dm b/code/modules/mechs/interface/_interface.dm
index 433d3a4864bed..6704ed1ed5a9f 100644
--- a/code/modules/mechs/interface/_interface.dm
+++ b/code/modules/mechs/interface/_interface.dm
@@ -34,7 +34,7 @@
if(body && body.pilot_coverage >= 100)
additional_hud_elements += /obj/screen/exosuit/toggle/air
i = 0
- var/pos = 7
+ var/pos = 8
for(var/additional_hud in additional_hud_elements)
var/obj/screen/exosuit/M = new additional_hud(src)
M.screen_loc = "1:6,[pos]:[i]"
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 438c073d23539..fd7ce6915d233 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -253,7 +253,7 @@ GLOBAL_LIST_EMPTY(diversion_junctions)
return
var/ai = isAI(user)
- var/dat = "Waste Disposal UnitWaste Disposal Unit
"
+ var/dat = ""
if(!ai) // AI can't pull flush handle
if(flush)
@@ -276,8 +276,9 @@ GLOBAL_LIST_EMPTY(diversion_junctions)
user.set_machine(src)
- show_browser(user, dat, "window=disposal;size=360x170")
- onclose(user, "disposal")
+ var/datum/browser/popup = new(user, "disposal", "Waste Disposal Unit", 360, 170)
+ popup.set_content(dat)
+ popup.open()
// handle machine interaction
diff --git a/icons/mob/onmob/onmob_under.dmi b/icons/mob/onmob/onmob_under.dmi
index fd1ca0a81abb5..2cb6b7ddc48de 100644
Binary files a/icons/mob/onmob/onmob_under.dmi and b/icons/mob/onmob/onmob_under.dmi differ
diff --git a/icons/obj/weapons/flamethrower_new.dmi b/icons/obj/weapons/flamethrower_new.dmi
index f920c0319a264..c8ae070fa67c0 100644
Binary files a/icons/obj/weapons/flamethrower_new.dmi and b/icons/obj/weapons/flamethrower_new.dmi differ