diff --git a/build.gradle b/build.gradle
index 521b61b4b7..cefdf7d49c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
-        uCoreVersion = '6f251d1f32bb7a8ff5dfaa28525af57536ad549f'
+        uCoreVersion = 'f5ae8c0d58b6b7b42e95e57114220b11beb43fb3'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/assets-raw/sprites/ui/icons/icon-mission-defense.png b/core/assets-raw/sprites/ui/icons/icon-mission-defense.png
new file mode 100644
index 0000000000..84bf574eb1
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-mission-defense.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-mission-done.png b/core/assets-raw/sprites/ui/icons/icon-mission-done.png
new file mode 100644
index 0000000000..a035434400
Binary files /dev/null and b/core/assets-raw/sprites/ui/icons/icon-mission-done.png differ
diff --git a/core/assets-raw/sprites/ui/icons/icon-units.png b/core/assets-raw/sprites/ui/icons/icon-units.png
index 2066ab2cdf..c24d296e45 100644
Binary files a/core/assets-raw/sprites/ui/icons/icon-units.png and b/core/assets-raw/sprites/ui/icons/icon-units.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index e498df9613..04d73d77d0 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -27,280 +27,280 @@ overdrive-projector-top
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 426, 228
+  xy: 456, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 446, 238
+  xy: 450, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 406, 173
+  xy: 928, 364
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 416, 173
+  xy: 938, 364
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 426, 173
+  xy: 948, 364
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 848, 364
+  xy: 958, 364
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 858, 364
+  xy: 968, 368
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 868, 364
+  xy: 978, 368
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 878, 364
+  xy: 988, 368
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 888, 364
+  xy: 846, 354
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 898, 364
+  xy: 856, 354
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 908, 364
+  xy: 866, 354
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 918, 364
+  xy: 876, 354
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 928, 364
+  xy: 886, 354
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 938, 364
+  xy: 896, 354
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 948, 364
+  xy: 906, 354
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 958, 364
+  xy: 916, 354
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 968, 368
+  xy: 926, 354
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 978, 368
+  xy: 936, 354
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 988, 368
+  xy: 946, 354
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 846, 354
+  xy: 956, 354
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 224, 158
+  xy: 166, 105
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 234, 168
+  xy: 166, 95
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 224, 148
+  xy: 166, 85
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 234, 158
+  xy: 319, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 224, 138
+  xy: 319, 155
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 234, 148
+  xy: 329, 170
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 224, 128
+  xy: 339, 170
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 234, 138
+  xy: 329, 160
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 234, 128
+  xy: 349, 170
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 244, 166
+  xy: 339, 160
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 254, 166
+  xy: 359, 170
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 244, 156
+  xy: 349, 160
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 244, 146
+  xy: 359, 160
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 254, 156
+  xy: 324, 145
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 244, 136
+  xy: 324, 135
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 254, 146
+  xy: 324, 125
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 254, 136
+  xy: 324, 115
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 244, 126
+  xy: 324, 105
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 254, 126
+  xy: 324, 95
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -314,21 +314,21 @@ mass-driver-turret
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 201, 27
+  xy: 194, 102
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 201, 17
+  xy: 204, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 201, 7
+  xy: 214, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -517,49 +517,49 @@ water-extractor-top
   index: -1
 blackrock1
   rotate: false
-  xy: 160, 217
+  xy: 139, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-blackrock
   rotate: false
-  xy: 160, 217
+  xy: 139, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackrockshadow1
   rotate: false
-  xy: 149, 206
+  xy: 150, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone1
   rotate: false
-  xy: 139, 195
+  xy: 183, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-blackstone
   rotate: false
-  xy: 139, 195
+  xy: 183, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone2
   rotate: false
-  xy: 170, 217
+  xy: 139, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone3
   rotate: false
-  xy: 149, 196
+  xy: 160, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -573,56 +573,56 @@ blackstoneedge
   index: -1
 coal1
   rotate: false
-  xy: 436, 228
+  xy: 450, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 426, 218
+  xy: 448, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 446, 228
+  xy: 460, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 copper1
   rotate: false
-  xy: 856, 354
+  xy: 968, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 copper2
   rotate: false
-  xy: 866, 354
+  xy: 978, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 copper3
   rotate: false
-  xy: 876, 354
+  xy: 988, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 946, 354
+  xy: 558, 352
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 956, 354
+  xy: 568, 352
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -636,98 +636,98 @@ dirtedge
   index: -1
 generic-cliff-edge
   rotate: false
-  xy: 528, 352
+  xy: 484, 294
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge
   rotate: false
-  xy: 528, 352
+  xy: 484, 294
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-edge-1
   rotate: false
-  xy: 538, 352
+  xy: 490, 284
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-1
   rotate: false
-  xy: 538, 352
+  xy: 490, 284
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-edge-2
   rotate: false
-  xy: 548, 352
+  xy: 490, 274
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-2
   rotate: false
-  xy: 548, 352
+  xy: 490, 274
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-side
   rotate: false
-  xy: 558, 352
+  xy: 490, 264
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-side
   rotate: false
-  xy: 558, 352
+  xy: 490, 264
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge
   rotate: false
-  xy: 588, 352
+  xy: 190, 197
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-1
   rotate: false
-  xy: 598, 352
+  xy: 200, 192
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-2
   rotate: false
-  xy: 610, 354
+  xy: 210, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-side
   rotate: false
-  xy: 484, 314
+  xy: 220, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 568, 352
+  xy: 490, 254
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 578, 352
+  xy: 180, 197
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -741,14 +741,14 @@ grassedge
   index: -1
 ice2
   rotate: false
-  xy: 484, 294
+  xy: 240, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 490, 284
+  xy: 210, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -762,35 +762,35 @@ iceedge
   index: -1
 icerock2
   rotate: false
-  xy: 490, 274
+  xy: 220, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow1
   rotate: false
-  xy: 490, 264
+  xy: 230, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow1
   rotate: false
-  xy: 490, 264
+  xy: 230, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow2
   rotate: false
-  xy: 490, 254
+  xy: 240, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow2
   rotate: false
-  xy: 490, 254
+  xy: 240, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -804,56 +804,56 @@ lavaedge
   index: -1
 lead1
   rotate: false
-  xy: 966, 338
+  xy: 916, 344
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 976, 338
+  xy: 926, 344
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 986, 338
+  xy: 936, 344
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 169, 197
+  xy: 976, 338
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 159, 187
+  xy: 986, 338
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 169, 187
+  xy: 996, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 179, 197
+  xy: 1006, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 179, 187
+  xy: 482, 350
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -867,21 +867,21 @@ metalflooredge
   index: -1
 rock2
   rotate: false
-  xy: 214, 132
+  xy: 254, 106
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 206, 112
+  xy: 254, 96
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 206, 102
+  xy: 264, 145
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -895,21 +895,21 @@ sandedge
   index: -1
 shrubshadow
   rotate: false
-  xy: 220, 62
+  xy: 274, 115
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 220, 52
+  xy: 284, 125
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 211, 42
+  xy: 294, 135
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -930,42 +930,42 @@ spaceedge
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 229, 198
+  xy: 264, 95
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 219, 178
+  xy: 274, 95
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 239, 198
+  xy: 284, 95
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 229, 188
+  xy: 294, 95
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 219, 198
+  xy: 304, 115
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 219, 188
+  xy: 304, 105
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -986,70 +986,70 @@ taredge
   index: -1
 thorium1
   rotate: false
-  xy: 259, 186
+  xy: 314, 115
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 249, 176
+  xy: 314, 105
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 259, 176
+  xy: 314, 95
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 269, 175
+  xy: 156, 104
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 279, 175
+  xy: 156, 94
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 224, 168
+  xy: 156, 84
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 274, 165
+  xy: 369, 160
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 264, 155
+  xy: 379, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 264, 145
+  xy: 389, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 274, 155
+  xy: 379, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1063,63 +1063,63 @@ wateredge
   index: -1
 block-border
   rotate: false
-  xy: 149, 176
+  xy: 666, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-elevation
   rotate: false
-  xy: 149, 166
+  xy: 676, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 149, 166
+  xy: 676, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 452, 248
+  xy: 430, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 452, 248
+  xy: 430, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-slope
   rotate: false
-  xy: 416, 238
+  xy: 440, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 border
   rotate: false
-  xy: 416, 228
+  xy: 440, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 156, 76
+  xy: 848, 364
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-1
   rotate: false
-  xy: 886, 354
+  xy: 498, 352
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1154,14 +1154,14 @@ nuclearreactor-shadow
   index: -1
 place-arrow
   rotate: false
-  xy: 209, 192
+  xy: 224, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ripples
   rotate: false
-  xy: 458, 270
+  xy: 458, 258
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1210,7 +1210,7 @@ rubble-3-1
   index: -1
 shadow-1
   rotate: false
-  xy: 446, 258
+  xy: 137, 215
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1252,14 +1252,14 @@ shadow-6
   index: -1
 shadow-corner
   rotate: false
-  xy: 458, 258
+  xy: 149, 215
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 shadow-round-1
   rotate: false
-  xy: 137, 215
+  xy: 161, 215
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1294,161 +1294,161 @@ shadow-rounded-2
   index: -1
 shadow-shock-mine
   rotate: false
-  xy: 210, 52
+  xy: 294, 145
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 426, 238
+  xy: 438, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 426, 238
+  xy: 438, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 416, 218
+  xy: 456, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 436, 238
+  xy: 456, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 456, 238
+  xy: 458, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 456, 228
+  xy: 970, 378
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 456, 218
+  xy: 980, 378
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 450, 208
+  xy: 990, 378
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 460, 208
+  xy: 150, 67
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 156, 106
+  xy: 150, 57
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 156, 96
+  xy: 150, 47
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 156, 86
+  xy: 150, 37
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 166, 106
+  xy: 858, 364
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 166, 96
+  xy: 868, 364
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 166, 86
+  xy: 878, 364
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 166, 76
+  xy: 888, 364
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 970, 378
+  xy: 898, 364
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 980, 378
+  xy: 908, 364
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 990, 378
+  xy: 918, 364
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 180, 207
+  xy: 996, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 190, 207
+  xy: 1006, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 159, 197
+  xy: 966, 338
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1476,70 +1476,70 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 191, 17
+  xy: 214, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 191, 7
+  xy: 224, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 201, 37
+  xy: 234, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 209, 182
+  xy: 234, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 209, 172
+  xy: 244, 146
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 204, 162
+  xy: 254, 146
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 204, 152
+  xy: 244, 136
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 204, 142
+  xy: 244, 126
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 204, 132
+  xy: 254, 136
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 204, 122
+  xy: 244, 116
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1560,14 +1560,14 @@ block-icon-alpha-mech-pad
   index: -1
 battery
   rotate: false
-  xy: 139, 205
+  xy: 173, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-battery
   rotate: false
-  xy: 139, 205
+  xy: 173, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1644,7 +1644,7 @@ fusion-reactor-top
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 214, 122
+  xy: 244, 96
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1833,14 +1833,14 @@ cultivator-top
   index: -1
 lavasmelter
   rotate: false
-  xy: 1006, 346
+  xy: 906, 344
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 179, 177
+  xy: 149, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1875,21 +1875,21 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 214, 162
+  xy: 254, 126
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 214, 152
+  xy: 244, 106
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 210, 62
+  xy: 284, 135
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1910,21 +1910,21 @@ core-top
   index: -1
 sortedunloader
   rotate: false
-  xy: 221, 32
+  xy: 304, 135
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-1
   rotate: false
-  xy: 180, 217
+  xy: 646, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-1-top
   rotate: false
-  xy: 190, 217
+  xy: 656, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1994,7 +1994,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 518, 352
+  xy: 484, 304
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2008,7 +2008,7 @@ fuse
   index: -1
 hail
   rotate: false
-  xy: 484, 304
+  xy: 230, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2092,21 +2092,21 @@ salvo-panel-right
   index: -1
 scatter
   rotate: false
-  xy: 216, 92
+  xy: 284, 145
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 scorch
   rotate: false
-  xy: 216, 82
+  xy: 264, 115
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 scorch-shoot
   rotate: false
-  xy: 210, 72
+  xy: 274, 125
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2232,7 +2232,7 @@ reconstructor-open
   index: -1
 repair-point-turret
   rotate: false
-  xy: 214, 142
+  xy: 254, 116
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2295,7 +2295,7 @@ wraith-factory-top-open
   index: -1
 deflector-wall
   rotate: false
-  xy: 936, 354
+  xy: 548, 352
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2316,7 +2316,7 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 508, 352
+  xy: 484, 314
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2372,35 +2372,35 @@ clear
   index: -1
 command-attack
   rotate: false
-  xy: 436, 218
+  xy: 460, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 command-idle
   rotate: false
-  xy: 446, 218
+  xy: 458, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 command-patrol
   rotate: false
-  xy: 430, 208
+  xy: 438, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 command-retreat
   rotate: false
-  xy: 440, 208
+  xy: 448, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 enemyarrow
   rotate: false
-  xy: 159, 166
+  xy: 430, 199
   size: 8, 7
   orig: 8, 7
   offset: 0, 0
@@ -2505,14 +2505,14 @@ shell
   index: -1
 shell-back
   rotate: false
-  xy: 149, 216
+  xy: 139, 204
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shot
   rotate: false
-  xy: 220, 72
+  xy: 264, 105
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2526,7 +2526,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 264, 165
+  xy: 369, 170
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2540,35 +2540,35 @@ transfer-end
   index: -1
 blackstone-cliff-edge
   rotate: false
-  xy: 139, 185
+  xy: 139, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone-cliff-edge-1
   rotate: false
-  xy: 139, 175
+  xy: 139, 164
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone-cliff-edge-2
   rotate: false
-  xy: 139, 165
+  xy: 626, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone-cliff-side
   rotate: false
-  xy: 149, 186
+  xy: 636, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-arc
   rotate: false
-  xy: 626, 358
+  xy: 686, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2589,28 +2589,28 @@ block-icon-blast-drill
   index: -1
 block-icon-bridge-conduit
   rotate: false
-  xy: 636, 358
+  xy: 696, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 636, 358
+  xy: 696, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-bridge-conveyor
   rotate: false
-  xy: 646, 358
+  xy: 706, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 646, 358
+  xy: 706, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2631,14 +2631,14 @@ centrifuge
   index: -1
 block-icon-combustion-generator
   rotate: false
-  xy: 656, 358
+  xy: 716, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 656, 358
+  xy: 716, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2659,7 +2659,7 @@ command-center
   index: -1
 block-icon-conduit
   rotate: false
-  xy: 666, 358
+  xy: 726, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2680,28 +2680,28 @@ container
   index: -1
 block-icon-conveyor
   rotate: false
-  xy: 676, 358
+  xy: 736, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 676, 358
+  xy: 736, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-copper-wall
   rotate: false
-  xy: 686, 358
+  xy: 746, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 copper-wall
   rotate: false
-  xy: 686, 358
+  xy: 746, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2778,14 +2778,14 @@ dart-ship-pad
   index: -1
 block-icon-deepwater
   rotate: false
-  xy: 696, 358
+  xy: 756, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 696, 358
+  xy: 756, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2806,14 +2806,14 @@ delta-mech-pad
   index: -1
 block-icon-dense-alloy-wall
   rotate: false
-  xy: 706, 358
+  xy: 766, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dense-alloy-wall
   rotate: false
-  xy: 706, 358
+  xy: 766, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2834,14 +2834,14 @@ dense-alloy-wall-large
   index: -1
 block-icon-dirt
   rotate: false
-  xy: 716, 358
+  xy: 776, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt1
   rotate: false
-  xy: 716, 358
+  xy: 776, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2862,14 +2862,14 @@ distributor
   index: -1
 block-icon-door
   rotate: false
-  xy: 726, 358
+  xy: 786, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 726, 358
+  xy: 786, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2890,7 +2890,7 @@ door-large
   index: -1
 block-icon-duo
   rotate: false
-  xy: 736, 358
+  xy: 796, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2953,91 +2953,91 @@ glaive-ship-pad
   index: -1
 block-icon-grass
   rotate: false
-  xy: 746, 358
+  xy: 806, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass1
   rotate: false
-  xy: 746, 358
+  xy: 806, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-hail
   rotate: false
-  xy: 756, 358
+  xy: 816, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-ice
   rotate: false
-  xy: 766, 358
+  xy: 826, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 766, 358
+  xy: 826, 358
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-icerock
   rotate: false
-  xy: 776, 358
+  xy: 836, 362
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerock1
   rotate: false
-  xy: 776, 358
+  xy: 836, 362
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-incinerator
   rotate: false
-  xy: 786, 358
+  xy: 476, 334
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 786, 358
+  xy: 476, 334
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-itemsource
   rotate: false
-  xy: 796, 358
+  xy: 470, 284
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemsource
   rotate: false
-  xy: 796, 358
+  xy: 470, 284
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-itemvoid
   rotate: false
-  xy: 806, 358
+  xy: 470, 274
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemvoid
   rotate: false
-  xy: 806, 358
+  xy: 470, 274
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3058,14 +3058,14 @@ javelin-ship-pad
   index: -1
 block-icon-junction
   rotate: false
-  xy: 816, 358
+  xy: 470, 264
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 816, 358
+  xy: 470, 264
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3086,35 +3086,35 @@ block-icon-laser-drill
   index: -1
 block-icon-lava
   rotate: false
-  xy: 826, 358
+  xy: 470, 254
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava
   rotate: false
-  xy: 826, 358
+  xy: 470, 254
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-junction
   rotate: false
-  xy: 836, 362
+  xy: 144, 154
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 836, 362
+  xy: 144, 154
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-router
   rotate: false
-  xy: 476, 334
+  xy: 144, 144
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3128,14 +3128,14 @@ block-icon-liquid-tank
   index: -1
 block-icon-liquidsource
   rotate: false
-  xy: 470, 284
+  xy: 144, 134
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidsource
   rotate: false
-  xy: 470, 284
+  xy: 144, 134
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3163,14 +3163,14 @@ block-icon-mechanical-drill
   index: -1
 block-icon-mechanical-pump
   rotate: false
-  xy: 470, 274
+  xy: 144, 124
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 470, 274
+  xy: 144, 124
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3184,14 +3184,14 @@ block-icon-meltdown
   index: -1
 block-icon-melter
   rotate: false
-  xy: 470, 264
+  xy: 144, 114
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 470, 264
+  xy: 144, 114
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3212,14 +3212,14 @@ mend-projector
   index: -1
 block-icon-metalfloor
   rotate: false
-  xy: 470, 254
+  xy: 836, 352
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor1
   rotate: false
-  xy: 470, 254
+  xy: 836, 352
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3261,14 +3261,14 @@ overdrive-projector
   index: -1
 block-icon-overflow-gate
   rotate: false
-  xy: 836, 352
+  xy: 476, 324
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 836, 352
+  xy: 476, 324
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3282,42 +3282,42 @@ block-icon-phantom-factory
   index: -1
 block-icon-phase-conduit
   rotate: false
-  xy: 476, 324
+  xy: 474, 314
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 476, 324
+  xy: 474, 314
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-conveyor
   rotate: false
-  xy: 474, 314
+  xy: 474, 304
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 474, 314
+  xy: 474, 304
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-wall
   rotate: false
-  xy: 474, 304
+  xy: 474, 294
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 474, 304
+  xy: 474, 294
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3373,14 +3373,14 @@ block-icon-pneumatic-drill
   index: -1
 block-icon-power-node
   rotate: false
-  xy: 474, 294
+  xy: 480, 284
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 474, 294
+  xy: 480, 284
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3401,42 +3401,42 @@ power-node-large
   index: -1
 block-icon-powerinfinite
   rotate: false
-  xy: 480, 284
+  xy: 480, 274
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powerinfinite
   rotate: false
-  xy: 480, 284
+  xy: 480, 274
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-powervoid
   rotate: false
-  xy: 480, 274
+  xy: 480, 264
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 480, 274
+  xy: 480, 264
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulse-conduit
   rotate: false
-  xy: 480, 264
+  xy: 480, 254
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulverizer
   rotate: false
-  xy: 480, 254
+  xy: 21, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3499,14 +3499,14 @@ wraith-factory
   index: -1
 block-icon-repair-point
   rotate: false
-  xy: 21, 1
+  xy: 31, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 repair-point
   rotate: false
-  xy: 21, 1
+  xy: 31, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3527,14 +3527,14 @@ block-icon-ripple
   index: -1
 block-icon-rock
   rotate: false
-  xy: 31, 1
+  xy: 41, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rock1
   rotate: false
-  xy: 31, 1
+  xy: 41, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3555,14 +3555,14 @@ rotary-pump
   index: -1
 block-icon-router
   rotate: false
-  xy: 41, 1
+  xy: 170, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 41, 1
+  xy: 170, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3590,63 +3590,63 @@ block-icon-salvo
   index: -1
 block-icon-sand
   rotate: false
-  xy: 144, 155
+  xy: 180, 207
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 144, 155
+  xy: 180, 207
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-scorch
   rotate: false
-  xy: 144, 145
+  xy: 190, 207
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-separator
   rotate: false
-  xy: 144, 135
+  xy: 200, 202
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 144, 135
+  xy: 200, 202
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-shock-mine
   rotate: false
-  xy: 144, 125
+  xy: 422, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shock-mine
   rotate: false
-  xy: 144, 125
+  xy: 422, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-shrub
   rotate: false
-  xy: 144, 115
+  xy: 432, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shrub
   rotate: false
-  xy: 144, 115
+  xy: 432, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3667,42 +3667,42 @@ silicon-smelter
   index: -1
 block-icon-smelter
   rotate: false
-  xy: 154, 156
+  xy: 442, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 smelter
   rotate: false
-  xy: 154, 156
+  xy: 442, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-snow
   rotate: false
-  xy: 154, 146
+  xy: 452, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 154, 146
+  xy: 452, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-solar-panel
   rotate: false
-  xy: 154, 136
+  xy: 416, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 154, 136
+  xy: 416, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3723,56 +3723,56 @@ solar-panel-large
   index: -1
 block-icon-solidifer
   rotate: false
-  xy: 154, 126
+  xy: 416, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solidifer
   rotate: false
-  xy: 154, 126
+  xy: 416, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-sorter
   rotate: false
-  xy: 154, 116
+  xy: 426, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 154, 116
+  xy: 426, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-space
   rotate: false
-  xy: 159, 175
+  xy: 416, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space
   rotate: false
-  xy: 159, 175
+  xy: 416, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-spawn
   rotate: false
-  xy: 164, 156
+  xy: 436, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 spawn
   rotate: false
-  xy: 164, 156
+  xy: 436, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3793,28 +3793,28 @@ block-icon-spirit-factory
   index: -1
 block-icon-stone
   rotate: false
-  xy: 164, 146
+  xy: 426, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 164, 146
+  xy: 426, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-surge-wall
   rotate: false
-  xy: 164, 136
+  xy: 446, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 164, 136
+  xy: 446, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3842,14 +3842,14 @@ block-icon-swarmer
   index: -1
 block-icon-tar
   rotate: false
-  xy: 164, 126
+  xy: 436, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tar
   rotate: false
-  xy: 164, 126
+  xy: 436, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3912,14 +3912,14 @@ thorium-reactor
   index: -1
 block-icon-thorium-wall
   rotate: false
-  xy: 164, 116
+  xy: 426, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 164, 116
+  xy: 426, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3947,14 +3947,14 @@ block-icon-titan-factory
   index: -1
 block-icon-titanium-conveyor
   rotate: false
-  xy: 422, 248
+  xy: 446, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 422, 248
+  xy: 446, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3989,14 +3989,14 @@ turbine-generator
   index: -1
 block-icon-unloader
   rotate: false
-  xy: 432, 248
+  xy: 436, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 432, 248
+  xy: 436, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -4031,14 +4031,14 @@ warp-gate
   index: -1
 block-icon-water
   rotate: false
-  xy: 442, 248
+  xy: 446, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 442, 248
+  xy: 446, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -4066,112 +4066,112 @@ block-icon-wraith-factory
   index: -1
 deepwater-cliff-edge
   rotate: false
-  xy: 896, 354
+  xy: 508, 352
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-1
   rotate: false
-  xy: 906, 354
+  xy: 518, 352
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-2
   rotate: false
-  xy: 916, 354
+  xy: 528, 352
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-side
   rotate: false
-  xy: 926, 354
+  xy: 538, 352
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge
   rotate: false
-  xy: 968, 358
+  xy: 578, 352
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge-1
   rotate: false
-  xy: 978, 358
+  xy: 588, 352
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge-2
   rotate: false
-  xy: 988, 358
+  xy: 598, 352
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-side
   rotate: false
-  xy: 498, 352
+  xy: 610, 354
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge
   rotate: false
-  xy: 966, 348
+  xy: 866, 344
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge-1
   rotate: false
-  xy: 976, 348
+  xy: 876, 344
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge-2
   rotate: false
-  xy: 986, 348
+  xy: 886, 344
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-side
   rotate: false
-  xy: 996, 346
+  xy: 896, 344
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-cryofluid
   rotate: false
-  xy: 1006, 336
+  xy: 956, 344
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-lava
   rotate: false
-  xy: 482, 350
+  xy: 966, 348
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-oil
   rotate: false
-  xy: 160, 207
+  xy: 976, 348
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-water
   rotate: false
-  xy: 170, 207
+  xy: 986, 348
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -4227,770 +4227,770 @@ trident-ship
   index: -1
 metalfloor-cliff-edge
   rotate: false
-  xy: 189, 197
+  xy: 476, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-1
   rotate: false
-  xy: 189, 187
+  xy: 149, 194
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-2
   rotate: false
-  xy: 169, 177
+  xy: 149, 184
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-side
   rotate: false
-  xy: 169, 167
+  xy: 149, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone1
   rotate: false
-  xy: 179, 167
+  xy: 159, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone2
   rotate: false
-  xy: 189, 177
+  xy: 169, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone3
   rotate: false
-  xy: 189, 167
+  xy: 159, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 174, 157
+  xy: 159, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 174, 147
+  xy: 159, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 184, 157
+  xy: 169, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 174, 137
+  xy: 169, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 184, 147
+  xy: 169, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 174, 127
+  xy: 179, 187
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 184, 137
+  xy: 189, 187
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 174, 117
+  xy: 179, 177
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 184, 127
+  xy: 179, 167
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 184, 117
+  xy: 189, 177
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 176, 107
+  xy: 189, 167
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 176, 97
+  xy: 199, 182
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 176, 87
+  xy: 199, 172
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 176, 77
+  xy: 209, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 186, 107
+  xy: 219, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-blackstone1
   rotate: false
-  xy: 186, 97
+  xy: 229, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-blackstone2
   rotate: false
-  xy: 186, 87
+  xy: 239, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-blackstone3
   rotate: false
-  xy: 186, 77
+  xy: 249, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-grass1
   rotate: false
-  xy: 200, 202
+  xy: 259, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-grass2
   rotate: false
-  xy: 199, 192
+  xy: 209, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-grass3
   rotate: false
-  xy: 199, 182
+  xy: 219, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-ice1
   rotate: false
-  xy: 199, 172
+  xy: 229, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-ice2
   rotate: false
-  xy: 194, 157
+  xy: 239, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-ice3
   rotate: false
-  xy: 194, 147
+  xy: 199, 162
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-sand1
   rotate: false
-  xy: 194, 137
+  xy: 249, 166
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-sand2
   rotate: false
-  xy: 194, 127
+  xy: 259, 166
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-sand3
   rotate: false
-  xy: 194, 117
+  xy: 269, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-snow1
   rotate: false
-  xy: 196, 107
+  xy: 279, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-snow2
   rotate: false
-  xy: 196, 97
+  xy: 269, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-snow3
   rotate: false
-  xy: 196, 87
+  xy: 279, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-stone1
   rotate: false
-  xy: 196, 77
+  xy: 289, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-stone2
   rotate: false
-  xy: 150, 66
+  xy: 299, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-stone3
   rotate: false
-  xy: 150, 56
+  xy: 309, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone1
   rotate: false
-  xy: 160, 66
+  xy: 209, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone2
   rotate: false
-  xy: 150, 46
+  xy: 219, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone3
   rotate: false
-  xy: 160, 56
+  xy: 229, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 160, 46
+  xy: 239, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 170, 66
+  xy: 249, 156
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 170, 56
+  xy: 259, 156
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 170, 46
+  xy: 269, 155
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 180, 67
+  xy: 279, 155
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 180, 57
+  xy: 289, 155
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 190, 67
+  xy: 299, 155
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 180, 47
+  xy: 309, 155
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 190, 57
+  xy: 154, 154
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 190, 47
+  xy: 154, 144
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 200, 67
+  xy: 154, 134
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 200, 57
+  xy: 154, 124
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 200, 47
+  xy: 154, 114
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 322, 170
+  xy: 164, 155
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 332, 170
+  xy: 164, 145
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone1
   rotate: false
-  xy: 342, 170
+  xy: 164, 135
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone2
   rotate: false
-  xy: 352, 170
+  xy: 164, 125
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone3
   rotate: false
-  xy: 362, 170
+  xy: 164, 115
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass1
   rotate: false
-  xy: 372, 170
+  xy: 174, 155
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass2
   rotate: false
-  xy: 382, 171
+  xy: 174, 145
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass3
   rotate: false
-  xy: 392, 171
+  xy: 174, 135
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice1
   rotate: false
-  xy: 438, 198
+  xy: 174, 125
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice2
   rotate: false
-  xy: 438, 188
+  xy: 174, 115
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice3
   rotate: false
-  xy: 448, 198
+  xy: 184, 157
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 448, 188
+  xy: 184, 147
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 458, 198
+  xy: 184, 137
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 458, 188
+  xy: 184, 127
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow1
   rotate: false
-  xy: 446, 178
+  xy: 184, 117
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow2
   rotate: false
-  xy: 456, 178
+  xy: 194, 152
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow3
   rotate: false
-  xy: 446, 168
+  xy: 194, 142
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 456, 168
+  xy: 194, 132
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 468, 198
+  xy: 194, 122
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 468, 188
+  xy: 204, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone1
   rotate: false
-  xy: 466, 178
+  xy: 214, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone2
   rotate: false
-  xy: 466, 168
+  xy: 204, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone3
   rotate: false
-  xy: 476, 178
+  xy: 224, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass1
   rotate: false
-  xy: 476, 168
+  xy: 204, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass2
   rotate: false
-  xy: 161, 36
+  xy: 214, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass3
   rotate: false
-  xy: 161, 26
+  xy: 234, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice1
   rotate: false
-  xy: 161, 16
+  xy: 214, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice2
   rotate: false
-  xy: 161, 6
+  xy: 224, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice3
   rotate: false
-  xy: 171, 36
+  xy: 224, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 171, 26
+  xy: 234, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 171, 16
+  xy: 234, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 171, 6
+  xy: 204, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow1
   rotate: false
-  xy: 181, 37
+  xy: 214, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow2
   rotate: false
-  xy: 181, 27
+  xy: 224, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow3
   rotate: false
-  xy: 191, 37
+  xy: 234, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 181, 17
+  xy: 194, 112
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 191, 27
+  xy: 184, 107
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 181, 7
+  xy: 204, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 206, 92
+  xy: 264, 135
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 206, 82
+  xy: 274, 145
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 216, 112
+  xy: 264, 125
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 216, 102
+  xy: 274, 135
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge
   rotate: false
-  xy: 211, 32
+  xy: 304, 145
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-1
   rotate: false
-  xy: 211, 22
+  xy: 274, 105
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-2
   rotate: false
-  xy: 211, 12
+  xy: 284, 115
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-side
   rotate: false
-  xy: 221, 42
+  xy: 294, 125
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge
   rotate: false
-  xy: 221, 22
+  xy: 284, 105
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge-1
   rotate: false
-  xy: 221, 12
+  xy: 294, 115
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge-2
   rotate: false
-  xy: 211, 2
+  xy: 304, 125
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-side
   rotate: false
-  xy: 221, 2
+  xy: 294, 105
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tar-cliff-edge
   rotate: false
-  xy: 229, 178
+  xy: 304, 95
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tar-cliff-edge-1
   rotate: false
-  xy: 239, 188
+  xy: 314, 145
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tar-cliff-edge-2
   rotate: false
-  xy: 239, 178
+  xy: 314, 135
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tar-cliff-side
   rotate: false
-  xy: 249, 186
+  xy: 314, 125
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5032,112 +5032,112 @@ wraith
   index: -1
 item-biomatter
   rotate: false
-  xy: 1008, 366
+  xy: 468, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 998, 356
+  xy: 468, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1008, 356
+  xy: 406, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 846, 344
+  xy: 416, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-dense-alloy
   rotate: false
-  xy: 856, 344
+  xy: 426, 173
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 866, 344
+  xy: 436, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 876, 344
+  xy: 446, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 886, 344
+  xy: 456, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 896, 344
+  xy: 466, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 906, 344
+  xy: 998, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 916, 344
+  xy: 1008, 366
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 926, 344
+  xy: 998, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 936, 344
+  xy: 1008, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 946, 344
+  xy: 846, 344
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 956, 344
+  xy: 856, 344
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon
   rotate: false
-  xy: 996, 336
+  xy: 946, 344
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5769,7 +5769,7 @@ icon-item
   index: -1
 icon-items-none
   rotate: false
-  xy: 436, 173
+  xy: 250, 186
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5865,23 +5865,37 @@ icon-missing
   orig: 10, 10
   offset: 0, 0
   index: -1
-icon-none
+icon-mission-defense
   rotate: false
   xy: 410, 267
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
+icon-mission-done
+  rotate: false
+  xy: 410, 255
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
+icon-none
+  rotate: false
+  xy: 422, 282
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
 icon-nullitem
   rotate: false
-  xy: 998, 366
+  xy: 260, 186
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-pause
   rotate: false
-  xy: 410, 255
+  xy: 434, 282
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5909,7 +5923,7 @@ icon-pick
   index: -1
 icon-play
   rotate: false
-  xy: 422, 282
+  xy: 422, 270
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5923,21 +5937,21 @@ icon-play-2
   index: -1
 icon-players
   rotate: false
-  xy: 434, 282
+  xy: 446, 282
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-power
   rotate: false
-  xy: 422, 270
+  xy: 434, 270
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-production
   rotate: false
-  xy: 446, 282
+  xy: 422, 258
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -6028,7 +6042,7 @@ icon-save-map
   index: -1
 icon-settings
   rotate: false
-  xy: 434, 270
+  xy: 458, 282
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -6049,14 +6063,14 @@ icon-tools
   index: -1
 icon-touch
   rotate: false
-  xy: 422, 258
+  xy: 446, 270
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 458, 282
+  xy: 434, 258
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -6098,7 +6112,7 @@ icon-undo
   index: -1
 icon-units
   rotate: false
-  xy: 446, 270
+  xy: 458, 270
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -6119,7 +6133,7 @@ icon-unlocks
   index: -1
 icon-weapon
   rotate: false
-  xy: 434, 258
+  xy: 446, 258
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -6233,7 +6247,7 @@ selection
   index: -1
 slider
   rotate: false
-  xy: 462, 248
+  xy: 193, 217
   size: 1, 8
   orig: 1, 8
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 5ff4b5d82b..679dabcb08 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java
index e62742648b..4fa2d7f82c 100644
--- a/core/src/io/anuke/mindustry/core/UI.java
+++ b/core/src/io/anuke/mindustry/core/UI.java
@@ -87,22 +87,7 @@ public class UI extends SceneModule{
         Dialog.closePadR = -1;
         Dialog.closePadT = 5;
 
-        Colors.put("description", Palette.description);
-        Colors.put("turretinfo", Palette.turretinfo);
-        Colors.put("iteminfo", Palette.iteminfo);
-        Colors.put("powerinfo", Palette.powerinfo);
-        Colors.put("liquidinfo", Palette.liquidinfo);
-        Colors.put("craftinfo", Palette.craftinfo);
-        Colors.put("missingitems", Palette.missingitems);
-        Colors.put("health", Palette.health);
-        Colors.put("healthstats", Palette.healthstats);
-        Colors.put("interact", Palette.interact);
         Colors.put("accent", Palette.accent);
-        Colors.put("place", Palette.place);
-        Colors.put("remove", Palette.remove);
-        Colors.put("placeRotate", Palette.placeRotate);
-        Colors.put("range", Palette.range);
-        Colors.put("power", Palette.power);
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/graphics/Palette.java b/core/src/io/anuke/mindustry/graphics/Palette.java
index e39d55d733..2c7874bfd8 100644
--- a/core/src/io/anuke/mindustry/graphics/Palette.java
+++ b/core/src/io/anuke/mindustry/graphics/Palette.java
@@ -41,24 +41,8 @@ public class Palette{
     portal = Color.valueOf("6344d7"),
     portalDark = Color.valueOf("3f3dac"),
 
-    powerLaserFrom = Color.valueOf("e3e3e3"),
-    powerLaserTo = Color.valueOf("ffe7a8"),
-
     heal = Color.valueOf("98ffa9"),
-
-    description = Color.WHITE,
-    turretinfo = Color.ORANGE,
-    iteminfo = Color.LIGHT_GRAY,
-    powerinfo = Color.YELLOW,
-    liquidinfo = Color.ROYAL,
-    craftinfo = Color.LIGHT_GRAY,
-
-    missingitems = Color.SCARLET,
-    health = Color.YELLOW,
-    ammo = Color.valueOf("32cf6d"),
-    healthstats = Color.SCARLET,
     bar = Color.SLATE,
-    interact = Color.ORANGE,
     accent = Color.valueOf("f4ba6e"),
     accentBack = Color.valueOf("d58c4b"),
     place = Color.valueOf("6335f8"),
@@ -81,6 +65,5 @@ public class Palette{
     redDust = Color.valueOf("ffa480"),
     redderDust = Color.valueOf("ff7b69"),
 
-    plasticSmoke = Color.valueOf("f1e479"),
-    plasticBurn = Color.valueOf("e9ead3");
+    plasticSmoke = Color.valueOf("f1e479");
 }
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java
index fcedaf56bc..8ae2aec73b 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java
@@ -3,10 +3,10 @@ package io.anuke.mindustry.ui.dialogs;
 import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.math.Vector2;
 import io.anuke.mindustry.graphics.Palette;
+import io.anuke.mindustry.graphics.Shaders;
 import io.anuke.mindustry.maps.Sector;
 import io.anuke.ucore.core.Graphics;
 import io.anuke.ucore.graphics.Draw;
-import io.anuke.ucore.graphics.Fill;
 import io.anuke.ucore.scene.Element;
 import io.anuke.ucore.scene.event.InputEvent;
 import io.anuke.ucore.scene.event.InputListener;
@@ -142,23 +142,30 @@ public class SectorsDialog extends FloatingDialog{
                     Draw.colorl(!sector.complete ? 0.3f : 1f);
                     Draw.rect(sector.texture, drawX, drawY, sectorSize + 1f, sectorSize + 1f);
 
-                    Draw.color(Palette.place);
+                    String region = "icon-mission-defense";
 
                     if(sector == selected){
-                        Draw.color(Palette.place);
+                        Draw.color(Color.WHITE);
                     }else if(Mathf.inRect(mouse.x, mouse.y, drawX - padSectorSize / 2f, drawY - padSectorSize / 2f,
-                    drawX + padSectorSize / 2f, drawY + padSectorSize / 2f)){
+                        drawX + padSectorSize / 2f, drawY + padSectorSize / 2f)){
                         if(clicked){
                             selectSector(sector);
                         }
                         Draw.color(Palette.remove);
                     }else if(sector.complete){
+                        region = "icon-mission-done";
                         Draw.color(Palette.accent);
                     }else{
                         Draw.color(Color.LIGHT_GRAY);
                     }
 
-                    Fill.square(drawX, drawY, Unit.dp.scl(10f), 45f);
+                    float size = Unit.dp.scl(1f) * 10f * 5f;
+
+                    Shaders.outline.color = Color.BLACK;
+                    Shaders.outline.region = Draw.region(region);
+                    Graphics.shader(Shaders.outline);
+                    Draw.rect(region, drawX, drawY, size, size);
+                    Graphics.shader();
                 }
             }