diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientEventHandler.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientEventHandler.kt
index 63149283f..6f2c1922e 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientEventHandler.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/ClientEventHandler.kt
@@ -62,8 +62,8 @@ fun onPostScreenInit(event: ScreenEvent.Init.Post) {
 
 	if (player.hasExoSuit) {
 		val widget = Panel2Widget(LargeRectangleButtonPanel(screen, null,
-			x = screen.guiLeft + screen.xSize + 2f,
-			y = screen.guiTop.toFloat(),
+			x = screen.guiLeft + screen.xSize - 2f - LargeRectangleButtonPanel.SIZE,
+			y = screen.guiTop.toFloat() - LargeRectangleButtonPanel.SIZE - 2,
 			skinElement = Widgets18.RETURN_ARROW_LEFT,
 			skinElementWinding = UVWindingOrder.FLOP,
 			onPress = {
@@ -80,8 +80,8 @@ fun onPostScreenInit(event: ScreenEvent.Init.Post) {
 		event.addListener(widget)
 
 		tickWhileClient({ minecraft.screen == screen }) {
-			widget.panel.x = screen.guiLeft + screen.xSize + 2f
-			widget.panel.y = screen.guiTop.toFloat()
+			widget.panel.x = screen.guiLeft + screen.xSize - 2f - LargeRectangleButtonPanel.SIZE
+			widget.panel.y = screen.guiTop.toFloat() - LargeRectangleButtonPanel.SIZE - 2f
 		}
 	}
 }
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoSuitInventoryScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoSuitInventoryScreen.kt
index 4142a4f18..33dcb5634 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoSuitInventoryScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoSuitInventoryScreen.kt
@@ -152,7 +152,7 @@ class ExoSuitInventoryScreen(menu: ExoSuitInventoryMenu) : MatteryScreen<ExoSuit
 		scrollPanel.dock = Dock.RIGHT
 		scrollPanel.setDockMargin(right = 3f)
 
-		LargeRectangleButtonPanel(this, frame, x = frame.width + 2f, skinElement = Widgets18.RETURN_ARROW_LEFT, onPress = {
+		LargeRectangleButtonPanel(this, frame, x = frame.width - 2f - LargeRectangleButtonPanel.SIZE, y = -LargeRectangleButtonPanel.SIZE - 2f, skinElement = Widgets18.RETURN_ARROW_LEFT, onPress = {
 			shouldOpenVanillaInventory = true
 			val minecraft = minecraft!!