diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java
index 207e6c9ac8..774e01ae69 100644
--- a/android/src/io/anuke/mindustry/AndroidLauncher.java
+++ b/android/src/io/anuke/mindustry/AndroidLauncher.java
@@ -164,6 +164,11 @@ public class AndroidLauncher extends AndroidApplication{
 			public void endForceLandscape() {
 				setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR);
 			}
+
+			@Override
+			public boolean canDonate(){
+				return true;
+			}
 		};
 
 		try {
diff --git a/build.gradle b/build.gradle
index e6b0853ce8..a5ceeb2f48 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ allprojects {
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
         aiVersion = '1.8.1'
-        uCoreVersion = 'd28a0e7969'
+        uCoreVersion = '2e6aa0a1df'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/assets-raw/sprites/ui/info-banner.png b/core/assets-raw/sprites/ui/info-banner.png
new file mode 100644
index 0000000000..17f7b1774f
Binary files /dev/null and b/core/assets-raw/sprites/ui/info-banner.png differ
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index b0edc60fd2..4dc6e8d7da 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -352,6 +352,7 @@ setting.vsync.name=VSync
 setting.lasers.name=Show Power Lasers
 setting.previewopacity.name=Placing Preview Opacity
 setting.healthbars.name=Show Entity Health bars
+setting.minimap.name=Show Minimap
 setting.pixelate.name=Pixelate Screen
 setting.musicvol.name=Music Volume
 setting.mutemusic.name=Mute Music
@@ -425,7 +426,9 @@ item.biomatter.description=A clump of organic mush; used for conversion into oil
 item.sand.name=Sand
 item.sand.description=A common material that is used extensively in smelting, both in alloying and as a flux.
 item.blast-compound.name=Blast Compound
-item.thermite.name=Thermite
+item.blast-compound.description=A volatile compound used in bombs and explosives. While it can burned as fuel, this is not advised.
+item.pyratite.name=Pyratite
+item.pyratite.description=An extremely flammable substance used in incendiary weapons.
 
 liquid.water.name=Water
 liquid.lava.name=Lava
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 97f8d44aad..aa6a9992d5 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -13,147 +13,147 @@ background
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 706, 272
+  xy: 774, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 709, 262
+  xy: 794, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 709, 252
+  xy: 784, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 799, 230
+  xy: 655, 20
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 799, 220
+  xy: 665, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 799, 210
+  xy: 665, 81
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 warp-gate-top
   rotate: false
-  xy: 461, 132
+  xy: 491, 109
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 blast-drill
   rotate: false
-  xy: 572, 258
+  xy: 652, 275
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 blast-drill-rim
   rotate: false
-  xy: 598, 258
+  xy: 624, 249
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 blast-drill-rotator
   rotate: false
-  xy: 575, 232
+  xy: 650, 249
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 blast-drill-top
   rotate: false
-  xy: 575, 206
+  xy: 250, 135
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 carbide-drill
   rotate: false
-  xy: 709, 242
+  xy: 804, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 carbide-drill-rotator
   rotate: false
-  xy: 709, 232
+  xy: 794, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 carbide-drill-top
   rotate: false
-  xy: 709, 222
+  xy: 814, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laser-drill
   rotate: false
-  xy: 771, 298
+  xy: 517, 43
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 laser-drill-rotator
   rotate: false
-  xy: 771, 280
+  xy: 499, 41
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 laser-drill-top
   rotate: false
-  xy: 777, 316
+  xy: 535, 35
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 oil-extractor
   rotate: false
-  xy: 283, 91
+  xy: 387, 101
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 oil-extractor-liquid
   rotate: false
-  xy: 309, 95
+  xy: 413, 101
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 oil-extractor-rotator
   rotate: false
-  xy: 335, 101
+  xy: 426, 127
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 oil-extractor-top
   rotate: false
-  xy: 361, 101
+  xy: 439, 101
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -188,49 +188,49 @@ plasma-drill-top
   index: -1
 tungsten-drill
   rotate: false
-  xy: 581, 35
+  xy: 705, 83
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-drill-rotator
   rotate: false
-  xy: 581, 25
+  xy: 705, 73
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-drill-top
   rotate: false
-  xy: 553, 15
+  xy: 705, 63
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-extractor
   rotate: false
-  xy: 517, 33
+  xy: 611, 184
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 water-extractor-liquid
   rotate: false
-  xy: 517, 15
+  xy: 611, 148
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 water-extractor-rotator
   rotate: false
-  xy: 541, 125
+  xy: 611, 130
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 water-extractor-top
   rotate: false
-  xy: 559, 125
+  xy: 622, 166
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -251,637 +251,637 @@ block-icon-blackrock
   index: -1
 blackrockshadow1
   rotate: false
-  xy: 231, 87
+  xy: 751, 333
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone1
   rotate: false
-  xy: 979, 423
+  xy: 671, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-blackstone
   rotate: false
-  xy: 979, 423
+  xy: 671, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone2
   rotate: false
-  xy: 989, 423
+  xy: 157, 73
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone3
   rotate: false
-  xy: 999, 423
+  xy: 167, 73
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstoneedge
   rotate: false
-  xy: 197, 1
+  xy: 173, 33
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 coal1
   rotate: false
-  xy: 709, 212
+  xy: 804, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 709, 202
+  xy: 824, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 709, 192
+  xy: 814, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 699, 152
+  xy: 854, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 709, 152
+  xy: 844, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirtedge
   rotate: false
-  xy: 281, 1
+  xy: 215, 59
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 grass-cliff-edge
   rotate: false
-  xy: 549, 105
+  xy: 874, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-1
   rotate: false
-  xy: 569, 115
+  xy: 894, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-2
   rotate: false
-  xy: 559, 105
+  xy: 884, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-side
   rotate: false
-  xy: 549, 95
+  xy: 904, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 549, 115
+  xy: 864, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 559, 115
+  xy: 884, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grassedge
   rotate: false
-  xy: 339, 33
+  xy: 750, 259
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 ice-cliff-edge
   rotate: false
-  xy: 559, 95
+  xy: 904, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-1
   rotate: false
-  xy: 579, 105
+  xy: 924, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-2
   rotate: false
-  xy: 569, 95
+  xy: 914, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-side
   rotate: false
-  xy: 579, 95
+  xy: 934, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 579, 115
+  xy: 894, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 569, 105
+  xy: 914, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iceedge
   rotate: false
-  xy: 349, 15
+  xy: 764, 273
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 icerock2
   rotate: false
-  xy: 589, 115
+  xy: 924, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow1
   rotate: false
-  xy: 589, 105
+  xy: 944, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow1
   rotate: false
-  xy: 589, 105
+  xy: 944, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow2
   rotate: false
-  xy: 589, 95
+  xy: 934, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow2
   rotate: false
-  xy: 589, 95
+  xy: 934, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lavaedge
   rotate: false
-  xy: 365, 1
+  xy: 750, 245
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 lead1
   rotate: false
-  xy: 739, 270
+  xy: 649, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 719, 240
+  xy: 659, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 729, 250
+  xy: 669, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 739, 240
+  xy: 669, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 749, 250
+  xy: 679, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 759, 260
+  xy: 689, 113
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 769, 270
+  xy: 699, 113
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 719, 210
+  xy: 607, 99
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalflooredge
   rotate: false
-  xy: 407, 1
+  xy: 181, 82
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 oiledge
   rotate: false
-  xy: 421, 1
+  xy: 209, 90
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 739, 150
+  xy: 665, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 779, 150
+  xy: 665, 21
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 789, 150
+  xy: 675, 31
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 799, 150
+  xy: 675, 21
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 551, 85
+  xy: 657, 10
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 759, 150
+  xy: 665, 31
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 769, 150
+  xy: 675, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandedge
   rotate: false
-  xy: 433, 15
+  xy: 209, 76
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 shrubshadow
   rotate: false
-  xy: 571, 85
+  xy: 677, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge
   rotate: false
-  xy: 581, 85
+  xy: 685, 81
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-1
   rotate: false
-  xy: 551, 55
+  xy: 685, 71
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-2
   rotate: false
-  xy: 561, 65
+  xy: 685, 61
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-side
   rotate: false
-  xy: 571, 75
+  xy: 685, 51
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 551, 65
+  xy: 677, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 561, 75
+  xy: 685, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowedge
   rotate: false
-  xy: 509, 1
+  xy: 233, 69
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 spaceedge
   rotate: false
-  xy: 202, 72
+  xy: 247, 69
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 571, 65
+  xy: 685, 21
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 581, 75
+  xy: 695, 93
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 551, 35
+  xy: 695, 83
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 561, 45
+  xy: 695, 73
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 551, 45
+  xy: 685, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 561, 55
+  xy: 685, 31
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneedge
   rotate: false
-  xy: 197, 90
+  xy: 261, 69
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 571, 55
+  xy: 695, 63
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 581, 65
+  xy: 695, 53
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 551, 25
+  xy: 695, 43
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 561, 35
+  xy: 695, 33
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 571, 45
+  xy: 695, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 581, 55
+  xy: 687, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten1
   rotate: false
-  xy: 571, 35
+  xy: 697, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten2
   rotate: false
-  xy: 581, 45
+  xy: 697, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten3
   rotate: false
-  xy: 571, 25
+  xy: 705, 93
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 563, 15
+  xy: 705, 53
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 573, 15
+  xy: 705, 43
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 553, 5
+  xy: 705, 33
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 563, 5
+  xy: 705, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 wateredge
   rotate: false
-  xy: 627, 125
+  xy: 260, 55
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 block-border
   rotate: false
-  xy: 257, 73
+  xy: 671, 203
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-elevation
   rotate: false
-  xy: 267, 73
+  xy: 629, 191
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 267, 73
+  xy: 629, 191
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 699, 212
+  xy: 697, 143
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 699, 212
+  xy: 697, 143
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-slope
   rotate: false
-  xy: 699, 202
+  xy: 697, 133
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 border
   rotate: false
-  xy: 699, 192
+  xy: 764, 434
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 709, 172
+  xy: 824, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-1
   rotate: false
-  xy: 689, 152
+  xy: 834, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-2
   rotate: false
-  xy: 391, 65
+  xy: 761, 334
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cross-3
   rotate: false
-  xy: 733, 316
+  xy: 700, 344
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -895,98 +895,98 @@ cross-4
   index: -1
 enemyspawn
   rotate: false
-  xy: 539, 93
+  xy: 874, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 nuclearreactor-shadow
   rotate: false
-  xy: 697, 342
+  xy: 655, 301
   size: 26, 26
   orig: 26, 26
   offset: 0, 0
   index: -1
 place-arrow
   rotate: false
-  xy: 799, 200
+  xy: 675, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 playerspawn
   rotate: false
-  xy: 799, 190
+  xy: 665, 71
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ripples
   rotate: false
-  xy: 944, 421
+  xy: 649, 213
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 rubble-1-0
   rotate: false
-  xy: 789, 280
+  xy: 732, 254
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-1-1
   rotate: false
-  xy: 527, 143
+  xy: 694, 236
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-2-0
   rotate: false
-  xy: 532, 161
+  xy: 712, 236
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-2-1
   rotate: false
-  xy: 550, 161
+  xy: 730, 236
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rubble-3-0
   rotate: false
-  xy: 426, 127
+  xy: 513, 135
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 rubble-3-1
   rotate: false
-  xy: 426, 127
+  xy: 513, 135
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 shadow-1
   rotate: false
-  xy: 980, 433
+  xy: 647, 201
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 shadow-2
   rotate: false
-  xy: 465, 112
+  xy: 1004, 437
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 shadow-3
   rotate: false
-  xy: 725, 342
+  xy: 598, 282
   size: 26, 26
   orig: 26, 26
   offset: 0, 0
@@ -1014,140 +1014,140 @@ shadow-6
   index: -1
 shadow-round-1
   rotate: false
-  xy: 992, 433
+  xy: 659, 201
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 shadow-round-2
   rotate: false
-  xy: 1004, 437
+  xy: 575, 223
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 shadow-rounded-2
   rotate: false
-  xy: 465, 92
+  xy: 575, 203
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 699, 182
+  xy: 764, 424
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 699, 172
+  xy: 774, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 699, 162
+  xy: 784, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 709, 182
+  xy: 834, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top
   rotate: false
-  xy: 709, 162
+  xy: 844, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router
   rotate: false
-  xy: 749, 260
+  xy: 629, 110
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 759, 270
+  xy: 639, 110
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 719, 220
+  xy: 649, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 729, 230
+  xy: 659, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-tank-bottom
   rotate: false
-  xy: 480, 161
+  xy: 257, 109
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-tank-liquid
   rotate: false
-  xy: 506, 161
+  xy: 257, 83
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-tank-top
   rotate: false
-  xy: 547, 179
+  xy: 283, 91
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 799, 260
+  xy: 655, 50
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 799, 250
+  xy: 655, 40
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 799, 240
+  xy: 655, 30
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-bottom
   rotate: false
-  xy: 799, 180
+  xy: 675, 81
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top
   rotate: false
-  xy: 799, 170
+  xy: 665, 61
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1168,14 +1168,14 @@ block-icon-battery
   index: -1
 battery-large
   rotate: false
-  xy: 586, 284
+  xy: 626, 275
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-battery-large
   rotate: false
-  xy: 586, 284
+  xy: 626, 275
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -1238,35 +1238,35 @@ fusion-reactor-top
   index: -1
 nuclear-reactor-center
   rotate: false
-  xy: 257, 109
+  xy: 335, 101
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 nuclear-reactor-lights
   rotate: false
-  xy: 257, 83
+  xy: 361, 101
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 749, 150
+  xy: 675, 51
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 alloy-fuser
   rotate: false
-  xy: 655, 303
+  xy: 598, 256
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-alloy-fuser
   rotate: false
-  xy: 655, 303
+  xy: 598, 256
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -1315,196 +1315,196 @@ biomattercompressor-frame0
   index: -1
 biomattercompressor-frame1
   rotate: false
-  xy: 487, 123
+  xy: 532, 161
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 biomattercompressor-frame2
   rotate: false
-  xy: 505, 123
+  xy: 550, 161
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 biomattercompressor-liquid
   rotate: false
-  xy: 485, 105
+  xy: 539, 143
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 biomattercompressor-top
   rotate: false
-  xy: 503, 105
+  xy: 557, 143
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 blast-mixer
   rotate: false
-  xy: 485, 87
+  xy: 568, 161
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-blast-mixer
   rotate: false
-  xy: 485, 87
+  xy: 568, 161
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 centrifuge-liquid
   rotate: false
-  xy: 355, 65
+  xy: 737, 312
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-bottom
   rotate: false
-  xy: 409, 65
+  xy: 337, 65
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-liquid
   rotate: false
-  xy: 427, 65
+  xy: 355, 65
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cryofluidmixer-top
   rotate: false
-  xy: 445, 65
+  xy: 373, 65
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator
   rotate: false
-  xy: 319, 59
+  xy: 391, 65
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator-middle
   rotate: false
-  xy: 463, 56
+  xy: 409, 65
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 cultivator-top
   rotate: false
-  xy: 481, 51
+  xy: 427, 65
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 lavasmelter
   rotate: false
-  xy: 729, 260
+  xy: 639, 120
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-weaver
   rotate: false
-  xy: 159, 54
+  xy: 553, 35
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 phase-weaver-bottom
   rotate: false
-  xy: 177, 54
+  xy: 571, 35
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 phase-weaver-weave
   rotate: false
-  xy: 184, 72
+  xy: 517, 25
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 plastanium-compressor-top
   rotate: false
-  xy: 195, 54
+  xy: 535, 17
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 poweralloysmelter-top
   rotate: false
-  xy: 213, 86
+  xy: 553, 17
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 powersmelter-top
   rotate: false
-  xy: 213, 52
+  xy: 571, 17
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 silicon-smelter-top
   rotate: false
-  xy: 213, 52
+  xy: 571, 17
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 pulverizer
   rotate: false
-  xy: 799, 160
+  xy: 675, 71
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 719, 150
+  xy: 665, 51
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 561, 85
+  xy: 667, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 core-open
   rotate: false
-  xy: 707, 316
+  xy: 547, 179
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-1
   rotate: false
-  xy: 1009, 427
+  xy: 171, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-1-top
   rotate: false
-  xy: 1009, 417
+  xy: 223, 73
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-2
   rotate: false
-  xy: 503, 87
+  xy: 575, 143
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1518,14 +1518,14 @@ block-2-top
   index: -1
 block-3
   rotate: false
-  xy: 601, 232
+  xy: 276, 135
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-3-top
   rotate: false
-  xy: 601, 206
+  xy: 322, 127
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -1546,84 +1546,84 @@ block-4-top
   index: -1
 arc
   rotate: false
-  xy: 612, 284
+  xy: 586, 245
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 arc-heat
   rotate: false
-  xy: 599, 194
+  xy: 159, 47
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 cyclone
   rotate: false
-  xy: 486, 187
+  xy: 726, 344
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 mass-driver-turret
   rotate: false
-  xy: 486, 187
+  xy: 726, 344
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 duo
   rotate: false
-  xy: 539, 103
+  xy: 854, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 fuse
   rotate: false
-  xy: 512, 187
+  xy: 231, 97
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 spectre
   rotate: false
-  xy: 512, 187
+  xy: 231, 97
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 hail
   rotate: false
-  xy: 788, 433
+  xy: 213, 17
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 scatter
   rotate: false
-  xy: 788, 433
+  xy: 213, 17
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 hail-heat
   rotate: false
-  xy: 776, 421
+  xy: 207, 47
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 lancer
   rotate: false
-  xy: 407, 29
+  xy: 553, 53
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 lancer-heat
   rotate: false
-  xy: 425, 29
+  xy: 571, 53
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -1637,175 +1637,175 @@ meltdown
   index: -1
 ripple
   rotate: false
-  xy: 387, 101
+  xy: 461, 132
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ripple-heat
   rotate: false
-  xy: 413, 101
+  xy: 487, 135
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 salvo
   rotate: false
-  xy: 545, 143
+  xy: 463, 34
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 salvo-heat
   rotate: false
-  xy: 568, 161
+  xy: 481, 34
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 salvo-panel-left
   rotate: false
-  xy: 563, 143
+  xy: 499, 23
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 salvo-panel-right
   rotate: false
-  xy: 581, 143
+  xy: 201, 29
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 scorch
   rotate: false
-  xy: 968, 433
+  xy: 661, 213
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 scorch-shoot
   rotate: false
-  xy: 956, 421
+  xy: 635, 201
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 swarmer
   rotate: false
-  xy: 523, 123
+  xy: 219, 29
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 wave
   rotate: false
-  xy: 577, 125
+  xy: 629, 148
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 wave-liquid
   rotate: false
-  xy: 626, 283
+  xy: 629, 130
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 drone-factory-top
   rotate: false
-  xy: 177, 33
+  xy: 535, 89
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 drone-factory-top-open
   rotate: false
-  xy: 187, 15
+  xy: 553, 89
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 fabricator-factory-top
   rotate: false
-  xy: 195, 33
+  xy: 571, 89
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 fabricator-factory-top-open
   rotate: false
-  xy: 205, 15
+  xy: 337, 47
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 mech-factory
   rotate: false
-  xy: 231, 97
+  xy: 309, 95
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 dart-ship-factory-open
   rotate: false
-  xy: 499, 51
+  xy: 445, 65
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 delta-mech-factory-open
   rotate: false
-  xy: 159, 33
+  xy: 319, 59
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 javelin-ship-factory-open
   rotate: false
-  xy: 389, 29
+  xy: 535, 53
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 reconstructor-open
   rotate: false
-  xy: 789, 298
+  xy: 732, 272
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 repair-point-turret
   rotate: false
-  xy: 729, 150
+  xy: 675, 61
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ship-factory
   rotate: false
-  xy: 439, 101
+  xy: 465, 106
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 door-large-open
   rotate: false
-  xy: 169, 15
+  xy: 517, 97
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 door-open
   rotate: false
-  xy: 539, 113
+  xy: 864, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 beam
   rotate: false
-  xy: 572, 244
+  xy: 595, 296
   size: 1, 12
   orig: 1, 12
   offset: 0, 0
@@ -1819,7 +1819,7 @@ beam-end
   index: -1
 blank
   rotate: false
-  xy: 566, 287
+  xy: 486, 219
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -1833,7 +1833,7 @@ bullet
   index: -1
 bullet-back
   rotate: false
-  xy: 186, 99
+  xy: 759, 370
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
@@ -1847,154 +1847,154 @@ casing
   index: -1
 clear
   rotate: false
-  xy: 486, 219
+  xy: 700, 376
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 enemyarrow
   rotate: false
-  xy: 186, 90
+  xy: 177, 73
   size: 8, 7
   orig: 8, 7
   offset: 0, 0
   index: -1
 error
   rotate: false
-  xy: 309, 1
+  xy: 771, 306
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 laser
   rotate: false
-  xy: 443, 33
+  xy: 251, 83
   size: 1, 12
   orig: 1, 12
   offset: 0, 0
   index: -1
 laser-end
   rotate: false
-  xy: 302, 121
+  xy: 71, 4
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 laserfull
   rotate: false
-  xy: 71, 4
+  xy: 680, 359
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 minelaser
   rotate: false
-  xy: 676, 289
+  xy: 254, 83
   size: 1, 12
   orig: 1, 12
   offset: 0, 0
   index: -1
 minelaser-end
   rotate: false
-  xy: 487, 141
+  xy: 680, 339
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 missile
   rotate: false
-  xy: 759, 370
+  xy: 770, 370
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 missile-back
   rotate: false
-  xy: 770, 370
+  xy: 613, 202
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 scorch1
   rotate: false
-  xy: 538, 186
+  xy: 671, 346
   size: 7, 25
   orig: 7, 25
   offset: 0, 0
   index: -1
 scorch2
   rotate: false
-  xy: 452, 127
+  xy: 538, 186
   size: 7, 25
   orig: 7, 25
   offset: 0, 0
   index: -1
 scorch3
   rotate: false
-  xy: 753, 343
+  xy: 452, 127
   size: 7, 25
   orig: 7, 25
   offset: 0, 0
   index: -1
 scorch4
   rotate: false
-  xy: 755, 417
+  xy: 752, 343
   size: 7, 25
   orig: 7, 25
   offset: 0, 0
   index: -1
 scorch5
   rotate: false
-  xy: 157, 82
+  xy: 755, 417
   size: 7, 25
   orig: 7, 25
   offset: 0, 0
   index: -1
 shell
   rotate: false
-  xy: 573, 179
+  xy: 624, 202
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shell-back
   rotate: false
-  xy: 584, 179
+  xy: 673, 224
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shot
   rotate: false
-  xy: 551, 75
+  xy: 667, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 transfer
   rotate: false
-  xy: 591, 192
+  xy: 229, 59
   size: 1, 12
   orig: 1, 12
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 561, 25
+  xy: 687, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 transfer-end
   rotate: false
-  xy: 166, 90
+  xy: 573, 183
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 block-icon-arc
   rotate: false
-  xy: 566, 290
+  xy: 71, 24
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
@@ -2008,147 +2008,147 @@ block-icon-biomattercompressor
   index: -1
 block-icon-blast-drill
   rotate: false
-  xy: 250, 135
+  xy: 348, 127
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-bridge-conduit
   rotate: false
-  xy: 660, 277
+  xy: 639, 191
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 660, 277
+  xy: 639, 191
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-bridge-conveyor
   rotate: false
-  xy: 656, 267
+  xy: 649, 191
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 656, 267
+  xy: 649, 191
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-carbide-drill
   rotate: false
-  xy: 659, 257
+  xy: 659, 191
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-carbide-wall
   rotate: false
-  xy: 659, 247
+  xy: 684, 225
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 carbide-wall
   rotate: false
-  xy: 659, 247
+  xy: 684, 225
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-carbide-wall-large
   rotate: false
-  xy: 166, 72
+  xy: 283, 73
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 carbide-wall-large
   rotate: false
-  xy: 166, 72
+  xy: 283, 73
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-centrifuge
   rotate: false
-  xy: 283, 73
+  xy: 539, 125
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 centrifuge
   rotate: false
-  xy: 283, 73
+  xy: 539, 125
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-combustion-generator
   rotate: false
-  xy: 659, 237
+  xy: 684, 215
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 659, 237
+  xy: 684, 215
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-conduit
   rotate: false
-  xy: 659, 227
+  xy: 694, 226
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-conveyor
   rotate: false
-  xy: 659, 217
+  xy: 704, 226
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor
   rotate: false
-  xy: 659, 217
+  xy: 704, 226
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-core
   rotate: false
-  xy: 276, 135
+  xy: 374, 127
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 core
   rotate: false
-  xy: 276, 135
+  xy: 374, 127
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-cryofluidmixer
   rotate: false
-  xy: 301, 73
+  xy: 557, 125
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-cultivator
   rotate: false
-  xy: 319, 77
+  xy: 575, 125
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2162,175 +2162,175 @@ block-icon-cyclone
   index: -1
 block-icon-dart-ship-factory
   rotate: false
-  xy: 337, 83
+  xy: 301, 73
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 dart-ship-factory
   rotate: false
-  xy: 337, 83
+  xy: 301, 73
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-deepwater
   rotate: false
-  xy: 659, 207
+  xy: 694, 216
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 659, 207
+  xy: 694, 216
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-deflector-wall
   rotate: false
-  xy: 659, 197
+  xy: 714, 226
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deflector-wall
   rotate: false
-  xy: 659, 197
+  xy: 714, 226
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 659, 197
+  xy: 714, 226
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-wall
   rotate: false
-  xy: 659, 197
+  xy: 714, 226
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-deflector-wall-large
   rotate: false
-  xy: 355, 83
+  xy: 319, 77
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 deflector-wall-large
   rotate: false
-  xy: 355, 83
+  xy: 319, 77
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 phase-wall-large
   rotate: false
-  xy: 355, 83
+  xy: 319, 77
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-phase-wall-large
   rotate: false
-  xy: 355, 83
+  xy: 319, 77
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-delta-mech-factory
   rotate: false
-  xy: 373, 83
+  xy: 337, 83
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 delta-mech-factory
   rotate: false
-  xy: 373, 83
+  xy: 337, 83
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-dirt
   rotate: false
-  xy: 659, 187
+  xy: 704, 216
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt1
   rotate: false
-  xy: 659, 187
+  xy: 704, 216
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-door
   rotate: false
-  xy: 659, 177
+  xy: 724, 226
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 659, 177
+  xy: 724, 226
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-door-large
   rotate: false
-  xy: 391, 83
+  xy: 355, 83
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 door-large
   rotate: false
-  xy: 391, 83
+  xy: 355, 83
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-drone-factory
   rotate: false
-  xy: 409, 83
+  xy: 373, 83
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-drop-point
   rotate: false
-  xy: 659, 167
+  xy: 714, 216
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 drop-point
   rotate: false
-  xy: 659, 167
+  xy: 714, 216
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-duo
   rotate: false
-  xy: 599, 143
+  xy: 171, 47
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 block-icon-fabricator-factory
   rotate: false
-  xy: 427, 83
+  xy: 391, 83
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2351,224 +2351,224 @@ block-icon-fusion-reactor
   index: -1
 block-icon-grass
   rotate: false
-  xy: 659, 157
+  xy: 734, 226
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass1
   rotate: false
-  xy: 659, 157
+  xy: 734, 226
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-hail
   rotate: false
-  xy: 764, 432
+  xy: 183, 47
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 block-icon-ice
   rotate: false
-  xy: 666, 267
+  xy: 724, 216
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 666, 267
+  xy: 724, 216
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-icerock
   rotate: false
-  xy: 670, 277
+  xy: 734, 216
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerock1
   rotate: false
-  xy: 670, 277
+  xy: 734, 216
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-incinerator
   rotate: false
-  xy: 669, 257
+  xy: 744, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 669, 257
+  xy: 744, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-itemsource
   rotate: false
-  xy: 669, 247
+  xy: 754, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemsource
   rotate: false
-  xy: 669, 247
+  xy: 754, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-itemvoid
   rotate: false
-  xy: 669, 237
+  xy: 764, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemvoid
   rotate: false
-  xy: 669, 237
+  xy: 764, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-javelin-ship-factory
   rotate: false
-  xy: 445, 83
+  xy: 409, 83
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 javelin-ship-factory
   rotate: false
-  xy: 445, 83
+  xy: 409, 83
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-junction
   rotate: false
-  xy: 669, 227
+  xy: 744, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 669, 227
+  xy: 744, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-lancer
   rotate: false
-  xy: 71, 24
+  xy: 1004, 457
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 block-icon-laser-drill
   rotate: false
-  xy: 681, 292
+  xy: 427, 83
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-lava
   rotate: false
-  xy: 669, 217
+  xy: 754, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava
   rotate: false
-  xy: 669, 217
+  xy: 754, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-junction
   rotate: false
-  xy: 669, 207
+  xy: 764, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 669, 207
+  xy: 764, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-router
   rotate: false
-  xy: 669, 197
+  xy: 640, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-tank
   rotate: false
-  xy: 322, 127
+  xy: 400, 127
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-liquidsource
   rotate: false
-  xy: 669, 187
+  xy: 640, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidsource
   rotate: false
-  xy: 669, 187
+  xy: 640, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-mass-driver
   rotate: false
-  xy: 348, 127
+  xy: 91, 11
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 mass-driver
   rotate: false
-  xy: 348, 127
+  xy: 91, 11
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 core-top
   rotate: false
-  xy: 348, 127
+  xy: 91, 11
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-mechanical-pump
   rotate: false
-  xy: 669, 177
+  xy: 650, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 669, 177
+  xy: 650, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2582,140 +2582,140 @@ block-icon-meltdown
   index: -1
 block-icon-melter
   rotate: false
-  xy: 669, 167
+  xy: 650, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 669, 167
+  xy: 650, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-metalfloor
   rotate: false
-  xy: 669, 157
+  xy: 660, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor1
   rotate: false
-  xy: 669, 157
+  xy: 660, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-multiplexer
   rotate: false
-  xy: 699, 292
+  xy: 445, 83
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 multiplexer
   rotate: false
-  xy: 699, 292
+  xy: 445, 83
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-nuclear-reactor
   rotate: false
-  xy: 374, 127
+  xy: 117, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 nuclear-reactor
   rotate: false
-  xy: 374, 127
+  xy: 117, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-oil
   rotate: false
-  xy: 676, 267
+  xy: 660, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil
   rotate: false
-  xy: 676, 267
+  xy: 660, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-oil-extractor
   rotate: false
-  xy: 400, 127
+  xy: 143, 7
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-oilrefinery
   rotate: false
-  xy: 679, 257
+  xy: 647, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 679, 257
+  xy: 647, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-overflow-gate
   rotate: false
-  xy: 679, 247
+  xy: 647, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 679, 247
+  xy: 647, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-conduit
   rotate: false
-  xy: 679, 237
+  xy: 657, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 679, 237
+  xy: 657, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-conveyor
   rotate: false
-  xy: 679, 227
+  xy: 647, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 679, 227
+  xy: 647, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-weaver
   rotate: false
-  xy: 717, 298
+  xy: 537, 107
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -2729,154 +2729,154 @@ block-icon-plasma-drill
   index: -1
 block-icon-plastanium-compressor
   rotate: false
-  xy: 735, 298
+  xy: 555, 107
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 plastanium-compressor
   rotate: false
-  xy: 735, 298
+  xy: 555, 107
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-power-node
   rotate: false
-  xy: 679, 217
+  xy: 657, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 679, 217
+  xy: 657, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-power-node-large
   rotate: false
-  xy: 463, 74
+  xy: 573, 107
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 power-node-large
   rotate: false
-  xy: 463, 74
+  xy: 573, 107
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-powerinfinite
   rotate: false
-  xy: 679, 207
+  xy: 647, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powerinfinite
   rotate: false
-  xy: 679, 207
+  xy: 647, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-powervoid
   rotate: false
-  xy: 679, 197
+  xy: 657, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 679, 197
+  xy: 657, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulse-conduit
   rotate: false
-  xy: 679, 187
+  xy: 657, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulverizer
   rotate: false
-  xy: 679, 177
+  xy: 681, 203
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pyratite-mixer
   rotate: false
-  xy: 481, 69
+  xy: 598, 238
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 pyratite-mixer
   rotate: false
-  xy: 481, 69
+  xy: 598, 238
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-reconstructor
   rotate: false
-  xy: 499, 69
+  xy: 595, 220
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 drone-factory
   rotate: false
-  xy: 499, 69
+  xy: 595, 220
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 fabricator-factory
   rotate: false
-  xy: 499, 69
+  xy: 595, 220
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 reconstructor
   rotate: false
-  xy: 499, 69
+  xy: 595, 220
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-repair-point
   rotate: false
-  xy: 679, 167
+  xy: 669, 191
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 repair-point
   rotate: false
-  xy: 679, 167
+  xy: 669, 191
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-resupply-point
   rotate: false
-  xy: 679, 157
+  xy: 670, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 resupply-point
   rotate: false
-  xy: 679, 157
+  xy: 670, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2890,238 +2890,238 @@ block-icon-ripple
   index: -1
 block-icon-rock
   rotate: false
-  xy: 680, 282
+  xy: 670, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rock1
   rotate: false
-  xy: 680, 282
+  xy: 670, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-rotary-pump
   rotate: false
-  xy: 762, 352
+  xy: 595, 202
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 rotary-pump
   rotate: false
-  xy: 762, 352
+  xy: 595, 202
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-router
   rotate: false
-  xy: 690, 282
+  xy: 667, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 690, 282
+  xy: 667, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-rtg-generator
   rotate: false
-  xy: 700, 282
+  xy: 667, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rtg-generator
   rotate: false
-  xy: 700, 282
+  xy: 667, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-salvo
   rotate: false
-  xy: 1004, 457
+  xy: 230, 141
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 block-icon-sand
   rotate: false
-  xy: 686, 272
+  xy: 667, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 686, 272
+  xy: 667, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-scorch
   rotate: false
-  xy: 764, 420
+  xy: 195, 47
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 block-icon-separator
   rotate: false
-  xy: 696, 272
+  xy: 667, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 696, 272
+  xy: 667, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-shrub
   rotate: false
-  xy: 689, 262
+  xy: 679, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shrub
   rotate: false
-  xy: 689, 262
+  xy: 679, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-silicon-smelter
   rotate: false
-  xy: 762, 334
+  xy: 593, 184
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 silicon-smelter
   rotate: false
-  xy: 762, 334
+  xy: 593, 184
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-smelter
   rotate: false
-  xy: 689, 252
+  xy: 680, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 smelter
   rotate: false
-  xy: 689, 252
+  xy: 680, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-snow
   rotate: false
-  xy: 689, 242
+  xy: 680, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 689, 242
+  xy: 680, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-solar-panel
   rotate: false
-  xy: 689, 232
+  xy: 677, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 689, 232
+  xy: 677, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-solar-panel-large
   rotate: false
-  xy: 91, 11
+  xy: 486, 187
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 solar-panel-large
   rotate: false
-  xy: 91, 11
+  xy: 486, 187
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-solidifer
   rotate: false
-  xy: 689, 222
+  xy: 677, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solidifer
   rotate: false
-  xy: 689, 222
+  xy: 677, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-sortedunloader
   rotate: false
-  xy: 689, 212
+  xy: 677, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sortedunloader
   rotate: false
-  xy: 689, 212
+  xy: 677, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-sorter
   rotate: false
-  xy: 689, 202
+  xy: 677, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 689, 202
+  xy: 677, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-space
   rotate: false
-  xy: 689, 192
+  xy: 689, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space
   rotate: false
-  xy: 689, 192
+  xy: 689, 193
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3135,1106 +3135,1106 @@ block-icon-spectre
   index: -1
 block-icon-splitter
   rotate: false
-  xy: 689, 182
+  xy: 690, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 splitter
   rotate: false
-  xy: 689, 182
+  xy: 690, 183
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-stone
   rotate: false
-  xy: 689, 172
+  xy: 690, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 689, 172
+  xy: 690, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-swarmer
   rotate: false
-  xy: 230, 141
+  xy: 302, 141
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 block-icon-thermal-generator
   rotate: false
-  xy: 759, 316
+  xy: 683, 321
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 thermal-generator
   rotate: false
-  xy: 759, 316
+  xy: 683, 321
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-thermal-pump
   rotate: false
-  xy: 753, 298
+  xy: 683, 303
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 thermal-pump
   rotate: false
-  xy: 753, 298
+  xy: 683, 303
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-thorium-wall
   rotate: false
-  xy: 689, 162
+  xy: 687, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 689, 162
+  xy: 687, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-thorium-wall-large
   rotate: false
-  xy: 717, 280
+  xy: 701, 326
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 thorium-wall-large
   rotate: false
-  xy: 717, 280
+  xy: 701, 326
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-titanium-conveyor
   rotate: false
-  xy: 699, 262
+  xy: 687, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor
   rotate: false
-  xy: 699, 262
+  xy: 687, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-tungsten-drill
   rotate: false
-  xy: 699, 252
+  xy: 687, 143
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-tungsten-wall
   rotate: false
-  xy: 699, 242
+  xy: 687, 133
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-wall
   rotate: false
-  xy: 699, 242
+  xy: 687, 133
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-tungsten-wall-large
   rotate: false
-  xy: 735, 280
+  xy: 701, 308
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 tungsten-wall-large
   rotate: false
-  xy: 735, 280
+  xy: 701, 308
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-turbine-generator
   rotate: false
-  xy: 753, 280
+  xy: 719, 326
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 turbine-generator
   rotate: false
-  xy: 753, 280
+  xy: 719, 326
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-unloader
   rotate: false
-  xy: 699, 232
+  xy: 697, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 699, 232
+  xy: 697, 163
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-vault
   rotate: false
-  xy: 117, 7
+  xy: 512, 187
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 vault
   rotate: false
-  xy: 117, 7
+  xy: 512, 187
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-warp-gate
   rotate: false
-  xy: 143, 7
+  xy: 480, 161
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 warp-gate
   rotate: false
-  xy: 143, 7
+  xy: 480, 161
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 block-icon-water
   rotate: false
-  xy: 699, 222
+  xy: 697, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 699, 222
+  xy: 697, 153
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-water-extractor
   rotate: false
-  xy: 337, 65
+  xy: 719, 308
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 block-icon-wave
   rotate: false
-  xy: 302, 141
+  xy: 302, 121
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 liquid-icon-cryofluid
   rotate: false
-  xy: 749, 270
+  xy: 689, 123
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-lava
   rotate: false
-  xy: 719, 230
+  xy: 699, 123
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-oil
   rotate: false
-  xy: 729, 240
+  xy: 609, 109
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-water
   rotate: false
-  xy: 739, 250
+  xy: 619, 110
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 mech-icon-alpha-mech
   rotate: false
-  xy: 377, 15
+  xy: 764, 245
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-dart-ship
   rotate: false
-  xy: 379, 1
+  xy: 748, 231
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-delta-mech
   rotate: false
-  xy: 391, 15
+  xy: 762, 231
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-halberd-ship
   rotate: false
-  xy: 393, 1
+  xy: 157, 83
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-trident-ship
   rotate: false
-  xy: 393, 1
+  xy: 157, 83
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-omega-mech
   rotate: false
-  xy: 405, 15
+  xy: 181, 96
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-tau-mech
   rotate: false
-  xy: 405, 15
+  xy: 181, 96
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 729, 220
+  xy: 605, 87
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 739, 230
+  xy: 605, 77
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 749, 240
+  xy: 605, 67
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 759, 250
+  xy: 605, 57
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 769, 260
+  xy: 605, 47
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 779, 270
+  xy: 605, 37
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 719, 200
+  xy: 605, 27
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 729, 210
+  xy: 605, 17
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 739, 220
+  xy: 779, 360
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 749, 230
+  xy: 779, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 759, 240
+  xy: 779, 340
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 769, 250
+  xy: 778, 282
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 779, 260
+  xy: 778, 272
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 789, 270
+  xy: 778, 262
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 719, 190
+  xy: 778, 252
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 729, 200
+  xy: 778, 242
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 739, 210
+  xy: 776, 232
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 749, 220
+  xy: 774, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 759, 230
+  xy: 774, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 769, 240
+  xy: 1004, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 779, 250
+  xy: 1014, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 789, 260
+  xy: 617, 99
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 719, 180
+  xy: 627, 100
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 729, 190
+  xy: 637, 100
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 739, 200
+  xy: 615, 89
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 749, 210
+  xy: 615, 79
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 759, 220
+  xy: 615, 69
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 769, 230
+  xy: 615, 59
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 779, 240
+  xy: 615, 49
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 789, 250
+  xy: 615, 39
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass1
   rotate: false
-  xy: 719, 170
+  xy: 615, 29
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass2
   rotate: false
-  xy: 729, 180
+  xy: 615, 19
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass3
   rotate: false
-  xy: 739, 190
+  xy: 617, 9
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice1
   rotate: false
-  xy: 749, 200
+  xy: 689, 103
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice2
   rotate: false
-  xy: 759, 210
+  xy: 699, 103
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice3
   rotate: false
-  xy: 769, 220
+  xy: 786, 232
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 779, 230
+  xy: 784, 222
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 789, 240
+  xy: 784, 212
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 719, 160
+  xy: 625, 89
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow1
   rotate: false
-  xy: 729, 170
+  xy: 625, 79
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow2
   rotate: false
-  xy: 739, 180
+  xy: 625, 69
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow3
   rotate: false
-  xy: 749, 190
+  xy: 625, 59
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 759, 200
+  xy: 625, 49
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 769, 210
+  xy: 625, 39
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 779, 220
+  xy: 625, 29
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass1
   rotate: false
-  xy: 789, 230
+  xy: 625, 19
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass2
   rotate: false
-  xy: 729, 160
+  xy: 635, 90
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass3
   rotate: false
-  xy: 739, 170
+  xy: 635, 80
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice1
   rotate: false
-  xy: 749, 180
+  xy: 635, 70
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice2
   rotate: false
-  xy: 759, 190
+  xy: 635, 60
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice3
   rotate: false
-  xy: 769, 200
+  xy: 635, 50
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 779, 210
+  xy: 635, 40
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 789, 220
+  xy: 635, 30
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 739, 160
+  xy: 635, 20
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow1
   rotate: false
-  xy: 749, 170
+  xy: 627, 9
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow2
   rotate: false
-  xy: 759, 180
+  xy: 637, 10
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow3
   rotate: false
-  xy: 769, 190
+  xy: 647, 100
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 779, 200
+  xy: 645, 90
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 789, 210
+  xy: 645, 80
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 749, 160
+  xy: 645, 70
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass1
   rotate: false
-  xy: 759, 170
+  xy: 645, 60
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass2
   rotate: false
-  xy: 769, 180
+  xy: 645, 50
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass3
   rotate: false
-  xy: 779, 190
+  xy: 645, 40
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice1
   rotate: false
-  xy: 789, 200
+  xy: 645, 30
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice2
   rotate: false
-  xy: 759, 160
+  xy: 645, 20
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice3
   rotate: false
-  xy: 769, 170
+  xy: 657, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand1
   rotate: false
-  xy: 779, 180
+  xy: 667, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand2
   rotate: false
-  xy: 789, 190
+  xy: 677, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand3
   rotate: false
-  xy: 769, 160
+  xy: 647, 10
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow1
   rotate: false
-  xy: 779, 170
+  xy: 794, 222
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow2
   rotate: false
-  xy: 789, 180
+  xy: 794, 212
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow3
   rotate: false
-  xy: 779, 160
+  xy: 655, 90
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone1
   rotate: false
-  xy: 789, 170
+  xy: 655, 80
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone2
   rotate: false
-  xy: 789, 160
+  xy: 655, 70
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone3
   rotate: false
-  xy: 799, 270
+  xy: 655, 60
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 unit-icon-scout
   rotate: false
-  xy: 523, 1
+  xy: 232, 55
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 unit-icon-titan
   rotate: false
-  xy: 517, 51
+  xy: 604, 166
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 unit-icon-vtol
   rotate: false
-  xy: 643, 141
+  xy: 246, 55
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 vtol
   rotate: false
-  xy: 643, 141
+  xy: 246, 55
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 item-biomatter
   rotate: false
-  xy: 599, 107
+  xy: 944, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 599, 97
+  xy: 964, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-carbide
   rotate: false
-  xy: 609, 116
+  xy: 954, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 609, 106
+  xy: 974, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 609, 96
+  xy: 964, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-phase-matter
   rotate: false
-  xy: 599, 87
+  xy: 984, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 609, 86
+  xy: 994, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 643, 131
+  xy: 974, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 653, 131
+  xy: 984, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 641, 121
+  xy: 994, 425
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 651, 121
+  xy: 1004, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 719, 270
+  xy: 1014, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 719, 260
+  xy: 609, 119
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 729, 270
+  xy: 619, 120
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-tungsten
   rotate: false
-  xy: 719, 250
+  xy: 629, 120
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon
   rotate: false
-  xy: 739, 260
+  xy: 679, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-none
   rotate: false
-  xy: 739, 260
+  xy: 679, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 alpha-mech
   rotate: false
-  xy: 612, 296
+  xy: 572, 243
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 alpha-mech-base
   rotate: false
-  xy: 169, 1
+  xy: 737, 330
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 delta-mech-base
   rotate: false
-  xy: 169, 1
+  xy: 737, 330
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 omega-mech-base
   rotate: false
-  xy: 169, 1
+  xy: 737, 330
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 tau-mech-base
   rotate: false
-  xy: 169, 1
+  xy: 737, 330
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 scout-base
   rotate: false
-  xy: 169, 1
+  xy: 737, 330
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 alpha-mech-leg
   rotate: false
-  xy: 183, 1
+  xy: 159, 33
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 omega-mech-leg
   rotate: false
-  xy: 183, 1
+  xy: 159, 33
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 tau-mech-leg
   rotate: false
-  xy: 183, 1
+  xy: 159, 33
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 scout-leg
   rotate: false
-  xy: 183, 1
+  xy: 159, 33
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 delta-mech
   rotate: false
-  xy: 253, 1
+  xy: 187, 59
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 delta-mech-leg
   rotate: false
-  xy: 267, 1
+  xy: 201, 59
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 omega-mech
   rotate: false
-  xy: 435, 1
+  xy: 195, 76
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 tau-mech
   rotate: false
-  xy: 435, 1
+  xy: 195, 76
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 dart-ship
   rotate: false
-  xy: 239, 1
+  xy: 173, 59
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 halberd-ship
   rotate: false
-  xy: 351, 1
+  xy: 771, 292
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 trident-ship
   rotate: false
-  xy: 351, 1
+  xy: 771, 292
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 javelin-ship
   rotate: false
-  xy: 363, 15
+  xy: 764, 259
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-javelin-ship
   rotate: false
-  xy: 363, 15
+  xy: 764, 259
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -4347,7 +4347,7 @@ button-map-over
   index: -1
 button-select
   rotate: false
-  xy: 681, 310
+  xy: 506, 161
   size: 24, 24
   split: 4, 4, 4, 4
   orig: 24, 24
@@ -4383,14 +4383,14 @@ check-over
   index: -1
 clear
   rotate: false
-  xy: 776, 433
+  xy: 201, 17
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 cursor
   rotate: false
-  xy: 679, 373
+  xy: 566, 288
   size: 4, 4
   orig: 4, 4
   offset: 0, 0
@@ -4411,28 +4411,28 @@ discord-banner-over
   index: -1
 controller-cursor
   rotate: false
-  xy: 373, 65
+  xy: 761, 352
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-about
   rotate: false
-  xy: 303, 57
+  xy: 501, 77
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-add
   rotate: false
-  xy: 447, 49
+  xy: 169, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-admin
   rotate: false
-  xy: 447, 33
+  xy: 169, 17
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -4446,238 +4446,238 @@ icon-admin-small
   index: -1
 icon-areaDelete
   rotate: false
-  xy: 800, 433
+  xy: 225, 17
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow
   rotate: false
-  xy: 213, 33
+  xy: 355, 47
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-16
   rotate: false
-  xy: 213, 33
+  xy: 355, 47
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-down
   rotate: false
-  xy: 788, 421
+  xy: 219, 47
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-left
   rotate: false
-  xy: 812, 433
+  xy: 157, 97
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-right
   rotate: false
-  xy: 800, 421
+  xy: 169, 98
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-up
   rotate: false
-  xy: 824, 433
+  xy: 237, 43
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-back
   rotate: false
-  xy: 223, 15
+  xy: 373, 47
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-ban
   rotate: false
-  xy: 447, 17
+  xy: 185, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-break
   rotate: false
-  xy: 231, 33
+  xy: 391, 47
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-cancel
   rotate: false
-  xy: 241, 15
+  xy: 409, 47
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-chat
   rotate: false
-  xy: 812, 421
+  xy: 237, 31
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-check
   rotate: false
-  xy: 249, 33
+  xy: 427, 47
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-crafting
   rotate: false
-  xy: 836, 433
+  xy: 249, 43
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-cursor
   rotate: false
-  xy: 824, 421
+  xy: 237, 19
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-defense
   rotate: false
-  xy: 848, 433
+  xy: 249, 31
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-dev-builds
   rotate: false
-  xy: 449, 1
+  xy: 201, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-discord
   rotate: false
-  xy: 465, 4
+  xy: 217, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-distribution
   rotate: false
-  xy: 836, 421
+  xy: 261, 43
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-donate
   rotate: false
-  xy: 216, 70
+  xy: 233, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-dots
   rotate: false
-  xy: 624, 267
+  xy: 249, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-editor
   rotate: false
-  xy: 644, 285
+  xy: 265, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-egg
   rotate: false
-  xy: 660, 287
+  xy: 281, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-elevation
   rotate: false
-  xy: 259, 15
+  xy: 445, 47
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-eraser
   rotate: false
-  xy: 267, 33
+  xy: 678, 283
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-exit
   rotate: false
-  xy: 535, 71
+  xy: 297, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-file
   rotate: false
-  xy: 277, 15
+  xy: 678, 265
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-image
   rotate: false
-  xy: 285, 33
+  xy: 676, 247
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-text
   rotate: false
-  xy: 535, 55
+  xy: 313, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-fill
   rotate: false
-  xy: 303, 39
+  xy: 701, 290
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-floppy
   rotate: false
-  xy: 535, 39
+  xy: 329, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-floppy-16
   rotate: false
-  xy: 321, 41
+  xy: 719, 290
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-folder
   rotate: false
-  xy: 535, 23
+  xy: 345, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-folder-parent
   rotate: false
-  xy: 537, 7
+  xy: 361, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -4691,424 +4691,431 @@ icon-generated
   index: -1
 icon-github
   rotate: false
-  xy: 595, 127
+  xy: 377, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-google-play
   rotate: false
-  xy: 627, 251
+  xy: 393, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-grid
   rotate: false
-  xy: 339, 47
+  xy: 737, 294
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-hold
   rotate: false
-  xy: 860, 433
+  xy: 249, 19
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-holdDelete
   rotate: false
-  xy: 848, 421
+  xy: 261, 31
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-home
   rotate: false
-  xy: 627, 235
+  xy: 409, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-host
   rotate: false
-  xy: 627, 219
+  xy: 425, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-info
   rotate: false
-  xy: 872, 433
+  xy: 261, 19
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-itch.io
   rotate: false
-  xy: 627, 203
+  xy: 441, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-items-none
   rotate: false
-  xy: 599, 117
+  xy: 954, 435
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-line
   rotate: false
-  xy: 357, 47
+  xy: 696, 272
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-link
   rotate: false
-  xy: 640, 267
+  xy: 457, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-liquid
   rotate: false
-  xy: 860, 421
+  xy: 616, 237
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-load
   rotate: false
-  xy: 643, 251
+  xy: 473, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-load-image
   rotate: false
-  xy: 375, 47
+  xy: 714, 272
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-load-map
   rotate: false
-  xy: 393, 47
+  xy: 696, 254
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-loading
   rotate: false
-  xy: 411, 47
+  xy: 714, 254
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-locked
   rotate: false
-  xy: 429, 47
+  xy: 465, 88
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-logic
   rotate: false
-  xy: 884, 433
+  xy: 628, 237
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-map
   rotate: false
-  xy: 643, 235
+  xy: 489, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-menu
   rotate: false
-  xy: 872, 421
+  xy: 640, 237
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-menu-large
   rotate: false
-  xy: 463, 38
+  xy: 463, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-none
   rotate: false
-  xy: 896, 433
+  xy: 652, 237
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-pause
   rotate: false
-  xy: 884, 421
+  xy: 664, 237
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-pencil
   rotate: false
-  xy: 481, 33
+  xy: 463, 52
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pencil-small
   rotate: false
-  xy: 643, 219
+  xy: 505, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-pick
   rotate: false
-  xy: 499, 33
+  xy: 483, 88
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-play
   rotate: false
-  xy: 908, 433
+  xy: 676, 235
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-play-2
   rotate: false
-  xy: 643, 203
+  xy: 521, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-players
   rotate: false
-  xy: 896, 421
+  xy: 613, 225
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-power
   rotate: false
-  xy: 920, 433
+  xy: 613, 213
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-production
   rotate: false
-  xy: 908, 421
+  xy: 625, 225
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-quit
   rotate: false
-  xy: 611, 190
+  xy: 537, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-redo
   rotate: false
-  xy: 463, 20
+  xy: 481, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-refresh
   rotate: false
-  xy: 627, 187
+  xy: 553, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rename
   rotate: false
-  xy: 643, 187
+  xy: 569, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-resize
   rotate: false
-  xy: 481, 15
+  xy: 481, 52
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-rotate
   rotate: false
-  xy: 575, 190
+  xy: 585, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-arrow
   rotate: false
-  xy: 595, 178
+  xy: 185, 17
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-left
   rotate: false
-  xy: 611, 174
+  xy: 593, 113
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-right
   rotate: false
-  xy: 627, 171
+  xy: 591, 97
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save
   rotate: false
-  xy: 643, 171
+  xy: 589, 81
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save-image
   rotate: false
-  xy: 499, 15
+  xy: 517, 79
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-save-map
   rotate: false
-  xy: 295, 15
+  xy: 499, 59
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-settings
   rotate: false
-  xy: 932, 433
+  xy: 637, 225
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-terrain
   rotate: false
-  xy: 313, 15
+  xy: 517, 61
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tools
   rotate: false
-  xy: 586, 162
+  xy: 589, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-touch
   rotate: false
-  xy: 920, 421
+  xy: 625, 213
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 944, 433
+  xy: 649, 225
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-trash
   rotate: false
-  xy: 611, 158
+  xy: 589, 49
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-trash-16
   rotate: false
-  xy: 331, 15
+  xy: 535, 71
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-trello
   rotate: false
-  xy: 627, 155
+  xy: 589, 33
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-tutorial
   rotate: false
-  xy: 643, 155
+  xy: 589, 17
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-undo
   rotate: false
-  xy: 353, 29
+  xy: 553, 71
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-units
   rotate: false
-  xy: 932, 421
+  xy: 637, 213
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-unlocks
   rotate: false
-  xy: 611, 142
+  xy: 601, 1
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-weapon
   rotate: false
-  xy: 956, 433
+  xy: 661, 225
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-wiki
   rotate: false
-  xy: 611, 126
+  xy: 755, 317
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-zoom
   rotate: false
-  xy: 371, 29
+  xy: 571, 71
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-zoom-small
   rotate: false
-  xy: 627, 139
+  xy: 755, 301
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
+info-banner
+  rotate: false
+  xy: 566, 294
+  size: 27, 14
+  orig: 27, 14
+  offset: 0, 0
+  index: -1
 inventory
   rotate: false
   xy: 376, 153
@@ -5142,7 +5149,7 @@ pane-button
   index: -1
 scroll
   rotate: false
-  xy: 671, 336
+  xy: 572, 257
   size: 24, 35
   split: 10, 10, 6, 5
   orig: 24, 35
@@ -5218,7 +5225,7 @@ slider-knob-over
   index: -1
 slider-vertical
   rotate: false
-  xy: 465, 1
+  xy: 491, 106
   size: 8, 1
   orig: 8, 1
   offset: 0, 0
@@ -5285,119 +5292,119 @@ window-empty
   index: -1
 drone
   rotate: false
-  xy: 295, 1
+  xy: 771, 320
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 unit-icon-drone
   rotate: false
-  xy: 295, 1
+  xy: 771, 320
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 fabricator
   rotate: false
-  xy: 241, 81
+  xy: 501, 93
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 unit-icon-fabricator
   rotate: false
-  xy: 241, 81
+  xy: 501, 93
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 monsoon
   rotate: false
-  xy: 507, 141
+  xy: 517, 115
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 unit-icon-monsoon
   rotate: false
-  xy: 507, 141
+  xy: 517, 115
   size: 18, 18
   orig: 18, 18
   offset: 0, 0
   index: -1
 scout
   rotate: false
-  xy: 481, 1
+  xy: 223, 83
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 titan
   rotate: false
-  xy: 521, 105
+  xy: 586, 165
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 titan-base
   rotate: false
-  xy: 521, 87
+  xy: 593, 147
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 titan-leg
   rotate: false
-  xy: 517, 69
+  xy: 593, 129
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 vtol-flame
   rotate: false
-  xy: 968, 422
+  xy: 673, 213
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 blaster-equip
   rotate: false
-  xy: 211, 1
+  xy: 187, 33
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 chain-blaster-equip
   rotate: false
-  xy: 225, 1
+  xy: 159, 59
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 flakgun-equip
   rotate: false
-  xy: 323, 1
+  xy: 755, 287
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 flamethrower-equip
   rotate: false
-  xy: 337, 1
+  xy: 750, 273
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 missiles-equip
   rotate: false
-  xy: 419, 15
+  xy: 195, 90
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 495, 1
+  xy: 237, 83
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 1df98cc413..ae3da899bc 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/assets/ui/uiskin.json b/core/assets/ui/uiskin.json
index fc837ab9a3..99593da61d 100644
--- a/core/assets/ui/uiskin.json
+++ b/core/assets/ui/uiskin.json
@@ -53,6 +53,7 @@ io.anuke.ucore.scene.ui.Button$ButtonStyle: {
 io.anuke.ucore.scene.ui.TextButton$TextButtonStyle: {
 	default: {over: button-over, disabled: button, font: default-font, fontColor: white, disabledFontColor: grey, down: button-down, up: button, transition: 0 },
 	discord: {over: discord-banner-over, font: default-font, fontColor: white, up: discord-banner},
+	info: {font: default-font, fontColor: white, up: info-banner},
 	clear: {down: clear-down, up: clear, over: clear-over, font: default-font, fontColor: white, disabledFontColor: grey },
 	empty: {font: default-font},
 	toggle: {font: default-font, fontColor: white, checked: button-down, down: button-down, up: button, over: button-over, disabled: button, disabledFontColor: grey }
@@ -72,7 +73,7 @@ io.anuke.ucore.scene.ui.ScrollPane$ScrollPaneStyle: {
 	default: {background: border, vScroll: scroll, vScrollKnob: scroll-knob-vertical-black},
 	horizontal: {background: border, vScroll: scroll, vScrollKnob: scroll-knob-vertical, hScroll: scroll-horizontal, hScrollKnob: scroll-knob-horizontal},
 	volume: {background: button-map, vScroll: scroll, vScrollKnob: scroll-knob-vertical-black},
-	clear: {vScroll: scroll, vScrollKnob: scroll-knob-vertical},
+	clear: {vScroll: scroll, vScrollKnob: scroll-knob-vertical-black},
 	clear-black: {vScroll: scroll, vScrollKnob: scroll-knob-vertical-black}
 },
 io.anuke.ucore.scene.ui.Window$WindowStyle: {
diff --git a/core/src/io/anuke/mindustry/core/Platform.java b/core/src/io/anuke/mindustry/core/Platform.java
index 9d41c9ed8f..d9e87dcd44 100644
--- a/core/src/io/anuke/mindustry/core/Platform.java
+++ b/core/src/io/anuke/mindustry/core/Platform.java
@@ -35,6 +35,10 @@ public abstract class Platform {
 	public void onGameExit(){}
 	/**Open donation dialog. Currently android only.*/
 	public void openDonations(){}
+	/**Whether donating is supported.*/
+	public boolean canDonate(){
+		return false;
+	}
 	/**Whether discord RPC is supported.*/
 	public boolean hasDiscord(){return true;}
 	/**Return the localized name for the locale. This is basically a workaround for GWT not supporting getName().*/
diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java
index f13c8eec86..596d787636 100644
--- a/core/src/io/anuke/mindustry/core/UI.java
+++ b/core/src/io/anuke/mindustry/core/UI.java
@@ -5,17 +5,14 @@ import com.badlogic.gdx.Input.Keys;
 import com.badlogic.gdx.graphics.Colors;
 import com.badlogic.gdx.math.Interpolation;
 import com.badlogic.gdx.utils.Align;
-import com.badlogic.gdx.utils.Array;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.editor.MapEditorDialog;
+import io.anuke.mindustry.game.EventType.ResizeEvent;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.input.InputHandler;
 import io.anuke.mindustry.ui.dialogs.*;
 import io.anuke.mindustry.ui.fragments.*;
-import io.anuke.ucore.core.Core;
-import io.anuke.ucore.core.Graphics;
-import io.anuke.ucore.core.Settings;
-import io.anuke.ucore.core.Timers;
+import io.anuke.ucore.core.*;
 import io.anuke.ucore.function.Callable;
 import io.anuke.ucore.function.Consumer;
 import io.anuke.ucore.function.Listenable;
@@ -71,7 +68,6 @@ public class UI extends SceneModule{
     public final DebugFragment debugfrag = new DebugFragment();
 
     private Locale lastLocale;
-    private Array<Fragment> fragments = new Array<>();
 	
 	public UI() {
 		Dialog.setShowAction(()-> sequence(
@@ -158,7 +154,6 @@ public class UI extends SceneModule{
 
 	@Override
 	public void init(){
-
 		editor = new MapEditorDialog();
 		controls = new ControlsDialog();
 		restart = new RestartDialog();
@@ -201,8 +196,11 @@ public class UI extends SceneModule{
 		return super.hasMouse();
 	}
 
-	public void addFragment(Fragment fragment){
-		fragments.add(fragment);
+	@Override
+	public void resize(int width, int height) {
+		super.resize(width, height);
+
+		Events.fire(ResizeEvent.class);
 	}
 
 	public Locale getLocale(){
diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
index b1d6ad0b01..3f6465daaa 100644
--- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
+++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java
@@ -383,7 +383,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
 	public void build(){
 		float amount = 10f, baseSize = 60f;
 
-		float size = mobile ? (int)(Gdx.graphics.getHeight() / amount / Unit.dp.scl(1f)) :
+		float size = mobile ? (int)(Math.min(Gdx.graphics.getHeight(), Gdx.graphics.getWidth()) / amount / Unit.dp.scl(1f)) :
 				Math.min(Gdx.graphics.getDisplayMode().height / amount, baseSize);
 
 		new table(){{
diff --git a/core/src/io/anuke/mindustry/game/EventType.java b/core/src/io/anuke/mindustry/game/EventType.java
index 09025299d2..9aecf1a473 100644
--- a/core/src/io/anuke/mindustry/game/EventType.java
+++ b/core/src/io/anuke/mindustry/game/EventType.java
@@ -55,5 +55,9 @@ public class EventType {
     public interface BlockBuildEvent extends Event{
         void handle(Team team, Tile tile);
     }
+
+    public interface ResizeEvent extends Event{
+        void handle();
+    }
 }
 
diff --git a/core/src/io/anuke/mindustry/input/AndroidInput.java b/core/src/io/anuke/mindustry/input/AndroidInput.java
index 9dd97078d5..07f00577b0 100644
--- a/core/src/io/anuke/mindustry/input/AndroidInput.java
+++ b/core/src/io/anuke/mindustry/input/AndroidInput.java
@@ -690,11 +690,6 @@ public class AndroidInput extends InputHandler implements GestureListener{
             pinch2.set(initialPointer2);
         }
 
-        Vector2 vec = (vector.set(pointer1).add(pointer2).scl(0.5f)).sub(pinch1.add(pinch2).scl(0.5f));
-
-        player.x -= vec.x*Core.camera.zoom/Core.cameraScale;
-        player.y += vec.y*Core.camera.zoom/Core.cameraScale;
-
         pinch1.set(pointer1);
         pinch2.set(pointer2);
 
diff --git a/core/src/io/anuke/mindustry/ui/MobileButton.java b/core/src/io/anuke/mindustry/ui/MobileButton.java
new file mode 100644
index 0000000000..af996644d7
--- /dev/null
+++ b/core/src/io/anuke/mindustry/ui/MobileButton.java
@@ -0,0 +1,15 @@
+package io.anuke.mindustry.ui;
+
+import io.anuke.ucore.function.Listenable;
+import io.anuke.ucore.scene.ui.ImageButton;
+
+public class MobileButton extends ImageButton {
+
+    public MobileButton(String icon, float isize, String text, Listenable listener) {
+        super(icon);
+        resizeImage(isize);
+        clicked(listener);
+        row();
+        add(text);
+    }
+}
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
index fc1fa929df..027f595892 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
@@ -8,7 +8,9 @@ import io.anuke.mindustry.ui.Links.LinkEntry;
 import io.anuke.ucore.core.Core;
 import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.scene.ui.ScrollPane;
+import io.anuke.ucore.scene.ui.layout.Cell;
 import io.anuke.ucore.scene.ui.layout.Table;
+import io.anuke.ucore.scene.utils.UIUtils;
 import io.anuke.ucore.util.OS;
 
 import static io.anuke.mindustry.Vars.ios;
@@ -20,10 +22,16 @@ public class AboutDialog extends FloatingDialog {
     public AboutDialog(){
         super("$text.about.button");
 
-        addCloseButton();
+        shown(this::setup);
+        onResize(this::setup);
+    }
 
-        float h = 80f;
-        float w = 600f;
+    void setup(){
+        content().clear();
+        buttons().clear();
+
+        float h = UIUtils.portrait() ? 90f : 80f;
+        float w = UIUtils.portrait() ? 330f : 600f;
 
         Table in = new Table();
         ScrollPane pane = new ScrollPane(in, "clear");
@@ -66,12 +74,20 @@ public class AboutDialog extends FloatingDialog {
 
         content().add(pane).growX();
 
+        addCloseButton();
+
         buttons().addButton("$text.credits", this::showCredits).size(200f, 64f);
 
         if(!ios && !OS.isMac){
             buttons().addButton("$text.changelog.title", ui.changelog::show).size(200f, 64f);
         }
 
+        if(UIUtils.portrait()){
+            for(Cell<?> cell : buttons().getCells()){
+                cell.width(140f);
+            }
+        }
+
     }
 
     public void showCredits(){
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
index 46d56f1a8b..b13324ca66 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
@@ -16,6 +16,7 @@ import io.anuke.ucore.scene.event.Touchable;
 import io.anuke.ucore.scene.ui.*;
 import io.anuke.ucore.scene.ui.layout.Table;
 import io.anuke.ucore.scene.ui.layout.Unit;
+import io.anuke.ucore.scene.utils.UIUtils;
 import io.anuke.ucore.util.OS;
 
 import java.util.Arrays;
@@ -47,7 +48,7 @@ public class FileChooser extends FloatingDialog {
 	}
 
 	private void setupWidgets(){
-		getCell(content()).maxWidth(Gdx.graphics.getWidth()/Unit.dp.scl(2f));
+		//getCell(content()).maxWidth(UIUtils.portrait() ? Gdx.graphics.getWidth() : Gdx.graphics.getWidth()/Unit.dp.scl(2f));
 		content().margin(-10);
 		
 		Table content = new Table();
@@ -79,6 +80,8 @@ public class FileChooser extends FloatingDialog {
 		navigation.setTouchable(Touchable.disabled);
 
 		files = new Table();
+		files.marginRight(10);
+		files.marginLeft(3);
 
 		pane = new ScrollPane(files){
 			public float getPrefHeight(){
@@ -142,7 +145,7 @@ public class FileChooser extends FloatingDialog {
 		content.add(icontable).expandX().fillX();
 		content.row();
 
-		content.center().add(pane).width(Gdx.graphics.getWidth()/Unit.dp.scl(2)).colspan(3).grow();
+		content.center().add(pane).width(UIUtils.portrait() ?  Gdx.graphics.getWidth() : Gdx.graphics.getWidth()/Unit.dp.scl(2)).colspan(3).grow();
 		content.row();
 		
 		if(!open){
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java
index c1adf26795..e894da9207 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java
@@ -3,8 +3,10 @@ package io.anuke.mindustry.ui.dialogs;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input.Keys;
 import com.badlogic.gdx.utils.Align;
+import io.anuke.mindustry.game.EventType.ResizeEvent;
 import io.anuke.mindustry.graphics.Palette;
 import io.anuke.ucore.core.Core;
+import io.anuke.ucore.core.Events;
 import io.anuke.ucore.scene.ui.Dialog;
 import io.anuke.ucore.scene.ui.ScrollPane;
 
@@ -30,6 +32,14 @@ public class FloatingDialog extends Dialog{
 					}
 				})));
 	}
+
+	protected void onResize(Runnable run){
+		Events.on(ResizeEvent.class, () -> {
+			if(isShown()){
+				run.run();
+			}
+		});
+	}
 	
 	@Override
 	public void addCloseButton(){
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
index 4c6f9077f3..7777935928 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
@@ -18,6 +18,7 @@ import io.anuke.ucore.scene.ui.ScrollPane;
 import io.anuke.ucore.scene.ui.TextButton;
 import io.anuke.ucore.scene.ui.layout.Cell;
 import io.anuke.ucore.scene.ui.layout.Table;
+import io.anuke.ucore.scene.utils.UIUtils;
 import io.anuke.ucore.util.Bundles;
 import io.anuke.ucore.util.Log;
 import io.anuke.ucore.util.Strings;
@@ -31,7 +32,6 @@ public class JoinDialog extends FloatingDialog {
     Table local = new Table();
     Table remote = new Table();
     Table hosts = new Table();
-    float w = 500;
 
     public JoinDialog(){
         super("$text.joingame");
@@ -77,12 +77,13 @@ public class JoinDialog extends FloatingDialog {
             add.getTitleLabel().setText(renaming != null ? "$text.server.edit" : "$text.server.add");
         });
 
-        setup();
-
         shown(() -> {
+            setup();
             refreshLocal();
             refreshRemote();
         });
+
+        onResize(this::setup);
     }
 
     void setupRemote(){
@@ -93,7 +94,7 @@ public class JoinDialog extends FloatingDialog {
 
             TextButton button = buttons[0] = remote.addButton("[accent]"+server.ip, "clear", () -> {
                 if(!buttons[0].childrenPressed()) connect(server.ip, Vars.port);
-            }).width(w).height(150f).pad(4f).get();
+            }).width(targetWidth()).height(150f).pad(4f).get();
 
             button.getLabel().setWrap(true);
 
@@ -187,6 +188,8 @@ public class JoinDialog extends FloatingDialog {
     }
 
     void setup(){
+        float w = targetWidth();
+
         Player player = players[0];
 
         hosts.clear();
@@ -246,6 +249,8 @@ public class JoinDialog extends FloatingDialog {
     }
 
     void addLocalHosts(Array<Host> array){
+        float w = targetWidth();
+
         local.clear();
 
         if(array.size == 0){
@@ -310,6 +315,10 @@ public class JoinDialog extends FloatingDialog {
         });
     }
 
+    float targetWidth(){
+        return UIUtils.portrait() ? 350f : 500f;
+    }
+
     private void loadServers(){
         servers = Settings.getJson("server-list", Array.class);
     }
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LevelDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LevelDialog.java
index 28a8c74c86..1aaf99c3dd 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/LevelDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/LevelDialog.java
@@ -4,20 +4,19 @@ import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.utils.Align;
 import io.anuke.mindustry.game.Difficulty;
+import io.anuke.mindustry.game.EventType.ResizeEvent;
 import io.anuke.mindustry.game.GameMode;
 import io.anuke.mindustry.io.Map;
 import io.anuke.mindustry.ui.BorderImage;
+import io.anuke.ucore.core.Events;
 import io.anuke.ucore.core.Settings;
 import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.graphics.Draw;
 import io.anuke.ucore.scene.event.Touchable;
-import io.anuke.ucore.scene.ui.ButtonGroup;
 import io.anuke.ucore.scene.ui.ImageButton;
 import io.anuke.ucore.scene.ui.ScrollPane;
-import io.anuke.ucore.scene.ui.TextButton;
 import io.anuke.ucore.scene.ui.layout.Table;
 import io.anuke.ucore.scene.utils.Cursors;
-import io.anuke.ucore.scene.utils.Elements;
 import io.anuke.ucore.util.Bundles;
 import io.anuke.ucore.util.Mathf;
 
@@ -29,6 +28,8 @@ public class LevelDialog extends FloatingDialog{
 		super("$text.level.select");
 		addCloseButton();
 		shown(this::setup);
+
+		onResize(this::setup);
 	}
 	
 	void setup(){
@@ -39,9 +40,9 @@ public class LevelDialog extends FloatingDialog{
 		ScrollPane pane = new ScrollPane(maps, "clear-black");
 		pane.setFadeScrollBars(false);
 		
-		int maxwidth = 4;
+		int maxwidth = (Gdx.graphics.getHeight() > Gdx.graphics.getHeight() ? 2 : 4);
 		
-		Table selmode = new Table();
+		/*Table selmode = new Table();
 		ButtonGroup<TextButton> group = new ButtonGroup<>();
 		selmode.add("$text.level.mode").padRight(15f);
 		
@@ -56,7 +57,7 @@ public class LevelDialog extends FloatingDialog{
 		selmode.addButton("?", this::displayGameModeHelp).size(50f, 54f).padLeft(18f);
 		
 		content().add(selmode);
-		content().row();
+		content().row();*/
 
 		Difficulty[] ds = Difficulty.values();
 
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java
index 7c1f54d3df..7285338725 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java
@@ -6,9 +6,11 @@ import com.badlogic.gdx.utils.Array;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.core.Platform;
+import io.anuke.mindustry.game.EventType.ResizeEvent;
 import io.anuke.mindustry.io.SaveIO;
 import io.anuke.mindustry.io.Saves.SaveSlot;
 import io.anuke.ucore.core.Core;
+import io.anuke.ucore.core.Events;
 import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.scene.ui.ScrollPane;
 import io.anuke.ucore.scene.ui.TextButton;
@@ -124,8 +126,7 @@ public class LoadDialog extends FloatingDialog{
 			button.row();
 			button.label(() -> Bundles.format("text.save.autosave", color + Bundles.get(slot.isAutosave() ? "text.on" : "text.off")));
 			button.row();
-			button.add();
-			button.add(Bundles.format("text.save.date", color+slot.getDate()));
+			button.add(Bundles.format("text.save.date", color+slot.getDate())).colspan(2).padTop(5).right();
 			button.row();
 			modifyButton(button, slot);
 
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
index 6d4eef6890..bfdb98dd66 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -163,6 +163,7 @@ public class SettingsMenuDialog extends SettingsDialog{
         graphics.sliderPref("previewopacity", 50, 0, 100, i -> i + "%");
 		graphics.checkPref("indicators", true);
 		graphics.checkPref("healthbars", true);
+		graphics.checkPref("minimap", true);
 	}
 
 	private void back(){
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java
index 2789e6afaf..90e29226a0 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/UnlocksDialog.java
@@ -11,6 +11,7 @@ import io.anuke.ucore.scene.ui.Image;
 import io.anuke.ucore.scene.ui.ScrollPane;
 import io.anuke.ucore.scene.ui.Tooltip;
 import io.anuke.ucore.scene.ui.layout.Table;
+import io.anuke.ucore.scene.utils.UIUtils;
 
 import static io.anuke.mindustry.Vars.control;
 
@@ -21,6 +22,7 @@ public class UnlocksDialog extends FloatingDialog {
 
         addCloseButton();
         shown(this::rebuild);
+        onResize(this::rebuild);
     }
 
     void rebuild(){
@@ -43,7 +45,7 @@ public class UnlocksDialog extends FloatingDialog {
             table.table(list -> {
                 list.left();
 
-                int maxWidth = 14;
+                int maxWidth = UIUtils.portrait() ? 6 : 14;
                 int size = 8*6;
 
                 int count = 0;
diff --git a/core/src/io/anuke/mindustry/ui/fragments/Fragment.java b/core/src/io/anuke/mindustry/ui/fragments/Fragment.java
index 9ce9ad6a10..f28b87f8dc 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/Fragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/Fragment.java
@@ -1,18 +1,7 @@
 package io.anuke.mindustry.ui.fragments;
 
-import com.badlogic.gdx.Gdx;
-import io.anuke.mindustry.Vars;
 import io.anuke.ucore.scene.Group;
 
 public abstract class Fragment{
-
-	public Fragment(){
-		Gdx.app.postRunnable(() -> Vars.ui.addFragment(this));
-	}
-
 	public abstract void build(Group parent);
-
-	public void onResize(){
-
-	}
 }
diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
index 76288a682f..40bfeb208a 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
@@ -13,6 +13,7 @@ import io.anuke.mindustry.ui.IntFormat;
 import io.anuke.mindustry.ui.Minimap;
 import io.anuke.ucore.core.Core;
 import io.anuke.ucore.core.Inputs;
+import io.anuke.ucore.core.Settings;
 import io.anuke.ucore.scene.Element;
 import io.anuke.ucore.scene.Group;
 import io.anuke.ucore.scene.actions.Actions;
@@ -132,7 +133,7 @@ public class HudFragment extends Fragment{
 
 			Minimap minimap = new Minimap();
 
-			add(minimap);
+			add(minimap).visible(() -> Settings.getBool("minimap"));
 		}}.end();
 
 		//paused table
diff --git a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
index 6e7f249bbf..9f76c487a9 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
@@ -3,94 +3,34 @@ package io.anuke.mindustry.ui.fragments;
 import com.badlogic.gdx.Gdx;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.core.Platform;
+import io.anuke.mindustry.game.EventType.ResizeEvent;
 import io.anuke.mindustry.io.Version;
 import io.anuke.mindustry.ui.MenuButton;
+import io.anuke.mindustry.ui.MobileButton;
 import io.anuke.mindustry.ui.dialogs.FloatingDialog;
+import io.anuke.ucore.core.Events;
 import io.anuke.ucore.scene.Group;
-import io.anuke.ucore.scene.builders.imagebutton;
+import io.anuke.ucore.scene.builders.build;
 import io.anuke.ucore.scene.builders.label;
 import io.anuke.ucore.scene.builders.table;
+import io.anuke.ucore.scene.ui.layout.Table;
 
 import static io.anuke.mindustry.Vars.*;
 
 public class MenuFragment extends Fragment{
-	
+	private Table mobileContainer;
+
+	@Override
 	public void build(Group parent){
 		new table(){{
 			visible(() -> state.is(State.menu));
 
 			if(!mobile){
-				new table(){{
+				buildDesktop();
+			}else{
+				buildMobile();
 
-					float w = 200f;
-					float bw = w * 2f + 10f;
-
-					defaults().size(w, 66f).padTop(5).padRight(5);
-
-					add(new MenuButton("icon-play-2", "$text.play", MenuFragment.this::showPlaySelect)).width(bw).colspan(2);
-
-					row();
-
-					add(new MenuButton("icon-editor", "$text.editor", () -> ui.loadAnd(ui.editor::show)));
-
-					add(new MenuButton("icon-map", "$text.maps", ui.maps::show));
-
-					row();
-
-					add(new MenuButton("icon-info", "$text.about.button", ui.about::show));
-
-					add(new MenuButton("icon-tools", "$text.settings", ui.settings::show));
-
-					row();
-
-					add(new MenuButton("icon-menu", "$text.changelog.title", ui.changelog::show));
-
-					add(new MenuButton("icon-unlocks", "$text.unlocks", ui.unlocks::show));
-
-					row();
-					
-					if(!gwt){
-						add(new MenuButton("icon-exit", "$text.quit", Gdx.app::exit)).width(bw).colspan(2);
-					}
-
-					get().margin(16);
-				}}.end();
-
-			}else {
-				new table() {{
-				    float size = 120f;
-					defaults().size(size).pad(5);
-					float isize = 14f * 4;
-
-					new imagebutton("icon-play-2", isize, ui.levels::show).text("$text.play").padTop(4f);
-
-					//new imagebutton("icon-tutorial", isize, () -> ui.showInfo("The tutorial is currently not yet implemented."))
-					//		.text("$text.tutorial").padTop(4f);
-
-					new imagebutton("icon-map", isize, ui.maps::show).text("$text.maps").padTop(4f);
-
-					new imagebutton("icon-load", isize, ui.load::show).text("$text.load").padTop(4f);
-
-					new imagebutton("icon-add", isize, ui.join::show).text("$text.joingame").padTop(4f);
-
-					row();
-
-					new table(){{
-
-                        defaults().size(size).pad(5);
-
-                        new imagebutton("icon-editor", isize, () -> ui.loadAnd(ui.editor::show)).text("$text.editor").padTop(4f);
-
-                        new imagebutton("icon-tools", isize, ui.settings::show).text("$text.settings").padTop(4f);
-
-                        new imagebutton("icon-info", isize, ui.about::show).text("$text.about.button").padTop(4f);
-
-                        if (!ios) {
-                            new imagebutton("icon-donate", isize, Platform.instance::openDonations).text("$text.donate").padTop(4f);
-                        }
-
-                    }}.colspan(4).end();
-				}}.end();
+				Events.on(ResizeEvent.class, () -> buildMobile());
 			}
 		}}.end();
 
@@ -102,6 +42,14 @@ public class MenuFragment extends Fragment{
 			}}.end().visible(() -> state.is(State.menu));
 		}
 
+		//info icon
+		if(mobile) {
+			new table() {{
+				abottom().atop().aleft();
+				get().addButton("", "info", ui.about::show);
+			}}.end().visible(() -> state.is(State.menu));
+		}
+
 		//version info
 		new table(){{
 			visible(() -> state.is(State.menu));
@@ -110,6 +58,103 @@ public class MenuFragment extends Fragment{
 		}}.end();
 	}
 
+	private void buildMobile(){
+		if(mobileContainer == null){
+			mobileContainer = build.getTable();
+		}
+
+		mobileContainer.clear();
+		mobileContainer.setSize(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
+
+		float size = 120f;
+		float isize = 14f * 4;
+		mobileContainer.defaults().size(size).pad(5).padTop(4f);
+
+		MobileButton
+				play = new MobileButton("icon-play-2", isize, "$text.play", ui.levels::show),
+				maps = new MobileButton("icon-map", isize, "$text.maps", ui.maps::show),
+				load = new MobileButton("icon-load", isize, "$text.load", ui.load::show),
+				join = new MobileButton("icon-add", isize, "$text.joingame", ui.join::show),
+				editor = new MobileButton("icon-editor", isize, "$text.editor", () -> ui.loadAnd(ui.editor::show)),
+				tools = new MobileButton("icon-tools", isize, "$text.settings", ui.settings::show),
+				unlocks = new MobileButton("icon-unlocks", isize, "$text.unlocks", ui.unlocks::show),
+				donate = new MobileButton("icon-donate", isize, "$text.donate", Platform.instance::openDonations);
+
+		if(Gdx.graphics.getWidth() > Gdx.graphics.getHeight()){
+			mobileContainer.add(play);
+			mobileContainer.add(join);
+			mobileContainer.add(load);
+			mobileContainer.add(maps);
+			mobileContainer.row();
+
+			mobileContainer.table(table -> {
+				table.defaults().set(mobileContainer.defaults());
+
+				table.add(editor);
+				table.add(tools);
+				table.add(unlocks);
+
+				if(Platform.instance.canDonate()) table.add(donate);
+			}).colspan(4);
+		}else{
+			mobileContainer.add(play);
+			mobileContainer.add(maps);
+			mobileContainer.row();
+			mobileContainer.add(load);
+			mobileContainer.add(join);
+			mobileContainer.row();
+			mobileContainer.add(editor);
+			mobileContainer.add(tools);
+			mobileContainer.row();
+
+			mobileContainer.table(table -> {
+				table.defaults().set(mobileContainer.defaults());
+
+				table.add(unlocks);
+
+				if(Platform.instance.canDonate()) table.add(donate);
+			}).colspan(2);
+		}
+	}
+
+	private void buildDesktop(){
+		new table(){{
+
+			float w = 200f;
+			float bw = w * 2f + 10f;
+
+			defaults().size(w, 66f).padTop(5).padRight(5);
+
+			add(new MenuButton("icon-play-2", "$text.play", MenuFragment.this::showPlaySelect)).width(bw).colspan(2);
+
+			row();
+
+			add(new MenuButton("icon-editor", "$text.editor", () -> ui.loadAnd(ui.editor::show)));
+
+			add(new MenuButton("icon-map", "$text.maps", ui.maps::show));
+
+			row();
+
+			add(new MenuButton("icon-info", "$text.about.button", ui.about::show));
+
+			add(new MenuButton("icon-tools", "$text.settings", ui.settings::show));
+
+			row();
+
+			add(new MenuButton("icon-menu", "$text.changelog.title", ui.changelog::show));
+
+			add(new MenuButton("icon-unlocks", "$text.unlocks", ui.unlocks::show));
+
+			row();
+
+			if(!gwt){
+				add(new MenuButton("icon-exit", "$text.quit", Gdx.app::exit)).width(bw).colspan(2);
+			}
+
+			get().margin(16);
+		}}.end();
+	}
+
 	private void showPlaySelect(){
 		float w = 200f;
 		float bw = w * 2f + 10f;