diff --git a/core/assets-raw/sprites/mechs/ships/halberd-ship.png b/core/assets-raw/sprites/mechs/ships/halberd-ship.png
index f279921242..9e598ee9b4 100644
Binary files a/core/assets-raw/sprites/mechs/ships/halberd-ship.png and b/core/assets-raw/sprites/mechs/ships/halberd-ship.png differ
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 228d226da8..95c778fca4 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -574,6 +574,7 @@ block.dagger-pad.name=Dagger Pad
 block.titan-pad.name=Titan Pad
 block.thermal-generator.name=Thermal Generator
 
+unit.alpha-drone.name=Alpha Drone
 unit.drone.name=Drone
 unit.drone.description=The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks.
 unit.fabricator.name=Fabricator
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 3b75685f5e..ffdd94fe23 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -13,287 +13,287 @@ background
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 813, 218
+  xy: 544, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 823, 228
+  xy: 554, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 813, 208
+  xy: 564, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 843, 208
+  xy: 831, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 843, 198
+  xy: 813, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 843, 188
+  xy: 823, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 853, 286
+  xy: 813, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 863, 279
+  xy: 823, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 873, 279
+  xy: 813, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 883, 279
+  xy: 823, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 893, 279
+  xy: 813, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 903, 279
+  xy: 823, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 913, 279
+  xy: 813, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 923, 279
+  xy: 823, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 933, 279
+  xy: 813, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 853, 276
+  xy: 823, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 853, 266
+  xy: 813, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 863, 269
+  xy: 823, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 853, 256
+  xy: 813, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 863, 259
+  xy: 823, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 873, 269
+  xy: 813, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 853, 246
+  xy: 823, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 375, 6
+  xy: 953, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 385, 16
+  xy: 963, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 385, 6
+  xy: 973, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 395, 16
+  xy: 983, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 395, 6
+  xy: 993, 215
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 405, 16
+  xy: 963, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 405, 6
+  xy: 973, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 415, 16
+  xy: 983, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 415, 6
+  xy: 993, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 419, 114
+  xy: 973, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 429, 114
+  xy: 983, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 419, 104
+  xy: 993, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 439, 114
+  xy: 983, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 419, 94
+  xy: 993, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 429, 104
+  xy: 993, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 449, 114
+  xy: 853, 157
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 429, 94
+  xy: 863, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 439, 104
+  xy: 873, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 459, 114
+  xy: 883, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -307,21 +307,21 @@ mass-driver-turret
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 225, 3
+  xy: 923, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 235, 13
+  xy: 933, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 235, 3
+  xy: 993, 275
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -545,14 +545,14 @@ block-icon-blackstone
   index: -1
 blackstone2
   rotate: false
-  xy: 560, 182
+  xy: 673, 182
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone3
   rotate: false
-  xy: 406, 71
+  xy: 1007, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -566,287 +566,287 @@ blackstoneedge
   index: -1
 coal1
   rotate: false
-  xy: 823, 218
+  xy: 564, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 813, 198
+  xy: 564, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 823, 208
+  xy: 564, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 copper1
   rotate: false
-  xy: 863, 249
+  xy: 813, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 copper2
   rotate: false
-  xy: 873, 259
+  xy: 823, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 copper3
   rotate: false
-  xy: 883, 269
+  xy: 823, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 853, 226
+  xy: 833, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 863, 229
+  xy: 833, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirtedge
   rotate: false
-  xy: 345, 37
+  xy: 361, 37
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 generic-cliff-edge
   rotate: false
-  xy: 883, 239
+  xy: 843, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge
   rotate: false
-  xy: 883, 239
+  xy: 843, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-edge-1
   rotate: false
-  xy: 893, 249
+  xy: 843, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-1
   rotate: false
-  xy: 893, 249
+  xy: 843, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-edge-2
   rotate: false
-  xy: 903, 259
+  xy: 843, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-2
   rotate: false
-  xy: 903, 259
+  xy: 843, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 generic-cliff-side
   rotate: false
-  xy: 913, 269
+  xy: 843, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-side
   rotate: false
-  xy: 913, 269
+  xy: 843, 218
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge
   rotate: false
-  xy: 873, 219
+  xy: 843, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-1
   rotate: false
-  xy: 883, 229
+  xy: 843, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-2
   rotate: false
-  xy: 893, 239
+  xy: 843, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-side
   rotate: false
-  xy: 903, 249
+  xy: 207, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 853, 206
+  xy: 843, 208
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 863, 209
+  xy: 843, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grassedge
   rotate: false
-  xy: 387, 51
+  xy: 1003, 367
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 923, 269
+  xy: 227, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 853, 196
+  xy: 237, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iceedge
   rotate: false
-  xy: 1003, 353
+  xy: 1005, 339
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 icerock2
   rotate: false
-  xy: 863, 199
+  xy: 247, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow1
   rotate: false
-  xy: 873, 209
+  xy: 257, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow1
   rotate: false
-  xy: 873, 209
+  xy: 257, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow2
   rotate: false
-  xy: 883, 219
+  xy: 267, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow2
   rotate: false
-  xy: 883, 219
+  xy: 267, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lavaedge
   rotate: false
-  xy: 191, 17
+  xy: 177, 3
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 lead1
   rotate: false
-  xy: 953, 265
+  xy: 295, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 963, 275
+  xy: 295, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 893, 199
+  xy: 305, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 913, 209
+  xy: 843, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 923, 219
+  xy: 863, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 933, 229
+  xy: 873, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 943, 235
+  xy: 883, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 953, 245
+  xy: 893, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -867,252 +867,252 @@ oiledge
   index: -1
 rock2
   rotate: false
-  xy: 534, 111
+  xy: 973, 245
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 554, 111
+  xy: 993, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 564, 112
+  xy: 903, 169
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandedge
   rotate: false
-  xy: 401, 51
+  xy: 486, 195
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 shrubshadow
   rotate: false
-  xy: 1013, 235
+  xy: 913, 169
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 1013, 225
+  xy: 923, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 1013, 215
+  xy: 933, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowedge
   rotate: false
-  xy: 486, 195
+  xy: 514, 195
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 spaceedge
   rotate: false
-  xy: 500, 195
+  xy: 528, 195
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 325, 5
+  xy: 973, 215
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 335, 15
+  xy: 983, 225
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 335, 5
+  xy: 993, 235
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 345, 15
+  xy: 933, 169
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 315, 5
+  xy: 953, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 325, 15
+  xy: 963, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneedge
   rotate: false
-  xy: 514, 195
+  xy: 542, 195
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 345, 5
+  xy: 943, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 355, 15
+  xy: 953, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 355, 5
+  xy: 963, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 365, 16
+  xy: 973, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 365, 6
+  xy: 983, 215
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 375, 16
+  xy: 993, 225
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 449, 104
+  xy: 903, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 449, 94
+  xy: 913, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 459, 104
+  xy: 923, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 459, 94
+  xy: 933, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 wateredge
   rotate: false
-  xy: 512, 181
+  xy: 540, 181
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 block-border
   rotate: false
-  xy: 541, 161
+  xy: 481, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-elevation
   rotate: false
-  xy: 553, 172
+  xy: 491, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 553, 172
+  xy: 491, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 813, 248
+  xy: 544, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 813, 248
+  xy: 544, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-slope
   rotate: false
-  xy: 823, 258
+  xy: 544, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 border
   rotate: false
-  xy: 813, 238
+  xy: 554, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 833, 188
+  xy: 793, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-1
   rotate: false
-  xy: 853, 236
+  xy: 833, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1140,7 +1140,7 @@ cross-4
   index: -1
 enemyspawn
   rotate: false
-  xy: 873, 229
+  xy: 843, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1154,21 +1154,21 @@ nuclearreactor-shadow
   index: -1
 place-arrow
   rotate: false
-  xy: 245, 13
+  xy: 943, 225
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 playerspawn
   rotate: false
-  xy: 245, 3
+  xy: 953, 235
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ripples
   rotate: false
-  xy: 315, 25
+  xy: 570, 182
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1217,7 +1217,7 @@ rubble-3-1
   index: -1
 shadow-1
   rotate: false
-  xy: 327, 25
+  xy: 582, 180
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1259,14 +1259,14 @@ shadow-6
   index: -1
 shadow-corner
   rotate: false
-  xy: 339, 25
+  xy: 594, 180
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 shadow-round-1
   rotate: false
-  xy: 351, 25
+  xy: 606, 180
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -1294,154 +1294,154 @@ shadow-rounded-2
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 823, 248
+  xy: 544, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 813, 228
+  xy: 554, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 823, 238
+  xy: 554, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 833, 268
+  xy: 713, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 833, 258
+  xy: 723, 166
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 833, 248
+  xy: 733, 166
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 833, 238
+  xy: 743, 166
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 833, 228
+  xy: 753, 166
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 833, 218
+  xy: 763, 166
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 833, 208
+  xy: 773, 166
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 833, 198
+  xy: 783, 166
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 841, 278
+  xy: 803, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 843, 268
+  xy: 813, 288
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 843, 258
+  xy: 823, 288
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 843, 248
+  xy: 811, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 843, 238
+  xy: 833, 288
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 843, 228
+  xy: 821, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 843, 218
+  xy: 813, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router
   rotate: false
-  xy: 953, 255
+  xy: 803, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 963, 265
+  xy: 813, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 973, 275
+  xy: 823, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 903, 199
+  xy: 833, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1469,70 +1469,70 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 215, 13
+  xy: 893, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 215, 3
+  xy: 903, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 225, 13
+  xy: 913, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 255, 13
+  xy: 963, 245
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 255, 3
+  xy: 973, 255
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 265, 13
+  xy: 983, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 265, 3
+  xy: 893, 169
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 275, 13
+  xy: 903, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 275, 3
+  xy: 913, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 285, 13
+  xy: 923, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1623,7 +1623,7 @@ fusion-reactor-top
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 544, 111
+  xy: 983, 255
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1812,14 +1812,14 @@ cultivator-top
   index: -1
 lavasmelter
   rotate: false
-  xy: 943, 255
+  xy: 285, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 963, 245
+  xy: 863, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1861,21 +1861,21 @@ poweralloysmelter-top
   index: -1
 pulverizer
   rotate: false
-  xy: 285, 3
+  xy: 933, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 409, 107
+  xy: 943, 215
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 1013, 255
+  xy: 983, 245
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1896,21 +1896,21 @@ core-top
   index: -1
 sortedunloader
   rotate: false
-  xy: 295, 13
+  xy: 983, 235
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-1
   rotate: false
-  xy: 521, 159
+  xy: 403, 31
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-1-top
   rotate: false
-  xy: 531, 161
+  xy: 403, 21
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1980,7 +1980,7 @@ cyclone
   index: -1
 duo
   rotate: false
-  xy: 863, 219
+  xy: 843, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2001,7 +2001,7 @@ spectre
   index: -1
 hail
   rotate: false
-  xy: 913, 259
+  xy: 217, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2078,21 +2078,21 @@ salvo-panel-right
   index: -1
 scatter
   rotate: false
-  xy: 1007, 285
+  xy: 953, 215
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 scorch
   rotate: false
-  xy: 1013, 275
+  xy: 963, 225
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 scorch-shoot
   rotate: false
-  xy: 1013, 265
+  xy: 973, 235
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2246,14 +2246,14 @@ reconstructor-open
   index: -1
 repair-point-turret
   rotate: false
-  xy: 409, 97
+  xy: 953, 225
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 resupply-point
   rotate: false
-  xy: 409, 87
+  xy: 963, 235
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2281,7 +2281,7 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 853, 216
+  xy: 841, 278
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2316,7 +2316,7 @@ bullet
   index: -1
 bullet-back
   rotate: false
-  xy: 363, 26
+  xy: 618, 181
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
@@ -2337,35 +2337,35 @@ clear
   index: -1
 command-attack
   rotate: false
-  xy: 813, 188
+  xy: 683, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 command-idle
   rotate: false
-  xy: 823, 198
+  xy: 693, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 command-retreat
   rotate: false
-  xy: 823, 188
+  xy: 703, 165
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 enemyarrow
   rotate: false
-  xy: 550, 183
+  xy: 853, 287
   size: 8, 7
   orig: 8, 7
   offset: 0, 0
   index: -1
 error
   rotate: false
-  xy: 359, 37
+  xy: 375, 37
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -2407,14 +2407,14 @@ minelaser-end
   index: -1
 missile
   rotate: false
-  xy: 374, 26
+  xy: 629, 181
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 missile-back
   rotate: false
-  xy: 385, 26
+  xy: 640, 181
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
@@ -2456,21 +2456,21 @@ scorch5
   index: -1
 shell
   rotate: false
-  xy: 396, 26
+  xy: 651, 181
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shell-back
   rotate: false
-  xy: 407, 26
+  xy: 662, 181
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shot
   rotate: false
-  xy: 1013, 245
+  xy: 993, 255
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2484,7 +2484,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 439, 94
+  xy: 893, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2498,28 +2498,28 @@ transfer-end
   index: -1
 blackstone-cliff-edge
   rotate: false
-  xy: 481, 159
+  xy: 406, 71
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone-cliff-edge-1
   rotate: false
-  xy: 491, 159
+  xy: 406, 61
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone-cliff-edge-2
   rotate: false
-  xy: 501, 159
+  xy: 403, 51
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone-cliff-side
   rotate: false
-  xy: 511, 159
+  xy: 403, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2547,28 +2547,28 @@ block-icon-blast-drill
   index: -1
 block-icon-bridge-conduit
   rotate: false
-  xy: 563, 172
+  xy: 501, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 563, 172
+  xy: 501, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-bridge-conveyor
   rotate: false
-  xy: 474, 149
+  xy: 511, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 474, 149
+  xy: 511, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2589,14 +2589,14 @@ centrifuge
   index: -1
 block-icon-combustion-generator
   rotate: false
-  xy: 474, 139
+  xy: 521, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 474, 139
+  xy: 521, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2617,14 +2617,14 @@ command-center
   index: -1
 block-icon-composite-wall
   rotate: false
-  xy: 484, 149
+  xy: 531, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 composite-wall
   rotate: false
-  xy: 484, 149
+  xy: 531, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2645,35 +2645,35 @@ composite-wall-large
   index: -1
 block-icon-conduit
   rotate: false
-  xy: 474, 129
+  xy: 541, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-conveyor
   rotate: false
-  xy: 484, 139
+  xy: 551, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 484, 139
+  xy: 551, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-copper-wall
   rotate: false
-  xy: 494, 149
+  xy: 561, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 copper-wall
   rotate: false
-  xy: 494, 149
+  xy: 561, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2750,28 +2750,28 @@ dart-ship-factory
   index: -1
 block-icon-deepwater
   rotate: false
-  xy: 484, 129
+  xy: 683, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 484, 129
+  xy: 683, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-deflector-wall
   rotate: false
-  xy: 494, 139
+  xy: 693, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deflector-wall
   rotate: false
-  xy: 494, 139
+  xy: 693, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2806,14 +2806,14 @@ delta-mech-factory
   index: -1
 block-icon-dirt
   rotate: false
-  xy: 504, 149
+  xy: 703, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt1
   rotate: false
-  xy: 504, 149
+  xy: 703, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2834,14 +2834,14 @@ distributor
   index: -1
 block-icon-door
   rotate: false
-  xy: 494, 129
+  xy: 713, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 494, 129
+  xy: 713, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2869,21 +2869,21 @@ block-icon-drone-pad
   index: -1
 block-icon-drop-point
   rotate: false
-  xy: 504, 139
+  xy: 413, 51
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 drop-point
   rotate: false
-  xy: 504, 139
+  xy: 413, 51
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-duo
   rotate: false
-  xy: 514, 149
+  xy: 413, 41
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2911,63 +2911,63 @@ block-icon-fusion-reactor
   index: -1
 block-icon-grass
   rotate: false
-  xy: 504, 129
+  xy: 413, 31
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass1
   rotate: false
-  xy: 504, 129
+  xy: 413, 31
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-hail
   rotate: false
-  xy: 514, 139
+  xy: 413, 21
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-ice
   rotate: false
-  xy: 514, 129
+  xy: 474, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 514, 129
+  xy: 474, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-icerock
   rotate: false
-  xy: 524, 149
+  xy: 474, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerock1
   rotate: false
-  xy: 524, 149
+  xy: 474, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-incinerator
   rotate: false
-  xy: 524, 139
+  xy: 484, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 524, 139
+  xy: 484, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2981,28 +2981,28 @@ block-icon-interceptor-pad
   index: -1
 block-icon-itemsource
   rotate: false
-  xy: 524, 129
+  xy: 474, 129
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemsource
   rotate: false
-  xy: 524, 129
+  xy: 474, 129
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-itemvoid
   rotate: false
-  xy: 534, 151
+  xy: 484, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemvoid
   rotate: false
-  xy: 534, 151
+  xy: 484, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3023,14 +3023,14 @@ javelin-ship-factory
   index: -1
 block-icon-junction
   rotate: false
-  xy: 534, 141
+  xy: 494, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 534, 141
+  xy: 494, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3051,35 +3051,35 @@ block-icon-laser-drill
   index: -1
 block-icon-lava
   rotate: false
-  xy: 534, 131
+  xy: 484, 129
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava
   rotate: false
-  xy: 534, 131
+  xy: 484, 129
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-junction
   rotate: false
-  xy: 544, 151
+  xy: 494, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 544, 151
+  xy: 494, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-router
   rotate: false
-  xy: 544, 141
+  xy: 504, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3093,14 +3093,14 @@ block-icon-liquid-tank
   index: -1
 block-icon-liquidsource
   rotate: false
-  xy: 544, 131
+  xy: 494, 129
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidsource
   rotate: false
-  xy: 544, 131
+  xy: 494, 129
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3128,14 +3128,14 @@ block-icon-mechanical-drill
   index: -1
 block-icon-mechanical-pump
   rotate: false
-  xy: 474, 119
+  xy: 504, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 474, 119
+  xy: 504, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3149,28 +3149,28 @@ block-icon-meltdown
   index: -1
 block-icon-melter
   rotate: false
-  xy: 484, 119
+  xy: 514, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 484, 119
+  xy: 514, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-metalfloor
   rotate: false
-  xy: 494, 119
+  xy: 504, 129
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor1
   rotate: false
-  xy: 494, 119
+  xy: 504, 129
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3184,14 +3184,14 @@ block-icon-monsoon-pad
   index: -1
 block-icon-oil
   rotate: false
-  xy: 504, 119
+  xy: 514, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil
   rotate: false
-  xy: 504, 119
+  xy: 514, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3205,56 +3205,56 @@ block-icon-oil-extractor
   index: -1
 block-icon-overflow-gate
   rotate: false
-  xy: 514, 119
+  xy: 524, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 514, 119
+  xy: 524, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-conduit
   rotate: false
-  xy: 524, 119
+  xy: 514, 129
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 524, 119
+  xy: 514, 129
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-conveyor
   rotate: false
-  xy: 534, 121
+  xy: 524, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 534, 121
+  xy: 524, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-wall
   rotate: false
-  xy: 544, 121
+  xy: 534, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 544, 121
+  xy: 534, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3310,14 +3310,14 @@ block-icon-pneumatic-drill
   index: -1
 block-icon-power-node
   rotate: false
-  xy: 551, 161
+  xy: 524, 129
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 551, 161
+  xy: 524, 129
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3338,42 +3338,42 @@ power-node-large
   index: -1
 block-icon-powerinfinite
   rotate: false
-  xy: 561, 162
+  xy: 534, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powerinfinite
   rotate: false
-  xy: 561, 162
+  xy: 534, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-powervoid
   rotate: false
-  xy: 554, 151
+  xy: 534, 129
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 554, 151
+  xy: 534, 129
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulse-conduit
   rotate: false
-  xy: 554, 141
+  xy: 474, 119
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulverizer
   rotate: false
-  xy: 554, 131
+  xy: 484, 119
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3436,14 +3436,14 @@ reconstructor
   index: -1
 block-icon-repair-point
   rotate: false
-  xy: 554, 121
+  xy: 494, 119
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 repair-point
   rotate: false
-  xy: 554, 121
+  xy: 494, 119
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3457,14 +3457,14 @@ block-icon-ripple
   index: -1
 block-icon-rock
   rotate: false
-  xy: 564, 152
+  xy: 504, 119
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rock1
   rotate: false
-  xy: 564, 152
+  xy: 504, 119
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3485,28 +3485,28 @@ rotary-pump
   index: -1
 block-icon-router
   rotate: false
-  xy: 564, 142
+  xy: 514, 119
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 564, 142
+  xy: 514, 119
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-rtg-generator
   rotate: false
-  xy: 564, 132
+  xy: 524, 119
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rtg-generator
   rotate: false
-  xy: 564, 132
+  xy: 524, 119
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3520,49 +3520,49 @@ block-icon-salvo
   index: -1
 block-icon-sand
   rotate: false
-  xy: 564, 122
+  xy: 534, 119
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 564, 122
+  xy: 534, 119
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-scorch
   rotate: false
-  xy: 571, 162
+  xy: 683, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-separator
   rotate: false
-  xy: 574, 152
+  xy: 693, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 574, 152
+  xy: 693, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-shrub
   rotate: false
-  xy: 574, 142
+  xy: 703, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shrub
   rotate: false
-  xy: 574, 142
+  xy: 703, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3583,42 +3583,42 @@ silicon-smelter
   index: -1
 block-icon-smelter
   rotate: false
-  xy: 574, 132
+  xy: 713, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 smelter
   rotate: false
-  xy: 574, 132
+  xy: 713, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-snow
   rotate: false
-  xy: 574, 122
+  xy: 723, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 574, 122
+  xy: 723, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-solar-panel
   rotate: false
-  xy: 813, 288
+  xy: 733, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 813, 288
+  xy: 733, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3639,42 +3639,42 @@ solar-panel-large
   index: -1
 block-icon-solidifer
   rotate: false
-  xy: 823, 288
+  xy: 743, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solidifer
   rotate: false
-  xy: 823, 288
+  xy: 743, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-sorter
   rotate: false
-  xy: 811, 278
+  xy: 753, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 811, 278
+  xy: 753, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-space
   rotate: false
-  xy: 833, 288
+  xy: 763, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space
   rotate: false
-  xy: 833, 288
+  xy: 763, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3688,14 +3688,14 @@ block-icon-spectre
   index: -1
 block-icon-stone
   rotate: false
-  xy: 821, 278
+  xy: 773, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 821, 278
+  xy: 773, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3751,14 +3751,14 @@ thorium-reactor
   index: -1
 block-icon-thorium-wall
   rotate: false
-  xy: 813, 268
+  xy: 783, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 813, 268
+  xy: 783, 176
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3786,14 +3786,14 @@ block-icon-titan-pad
   index: -1
 block-icon-titanium-conveyor
   rotate: false
-  xy: 831, 278
+  xy: 793, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 831, 278
+  xy: 793, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3814,14 +3814,14 @@ turbine-generator
   index: -1
 block-icon-unloader
   rotate: false
-  xy: 813, 258
+  xy: 803, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 813, 258
+  xy: 803, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3856,14 +3856,14 @@ warp-gate
   index: -1
 block-icon-water
   rotate: false
-  xy: 823, 268
+  xy: 673, 172
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 823, 268
+  xy: 673, 172
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3884,147 +3884,147 @@ block-icon-wave
   index: -1
 deepwater-cliff-edge
   rotate: false
-  xy: 863, 239
+  xy: 833, 258
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-1
   rotate: false
-  xy: 873, 249
+  xy: 833, 248
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-edge-2
   rotate: false
-  xy: 883, 259
+  xy: 833, 238
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater-cliff-side
   rotate: false
-  xy: 893, 269
+  xy: 833, 228
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge
   rotate: false
-  xy: 873, 239
+  xy: 833, 198
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge-1
   rotate: false
-  xy: 883, 249
+  xy: 833, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-edge-2
   rotate: false
-  xy: 893, 259
+  xy: 833, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt-cliff-side
   rotate: false
-  xy: 903, 269
+  xy: 833, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge
   rotate: false
-  xy: 903, 219
+  xy: 265, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge-1
   rotate: false
-  xy: 913, 229
+  xy: 275, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-edge-2
   rotate: false
-  xy: 923, 239
+  xy: 275, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava-cliff-side
   rotate: false
-  xy: 933, 249
+  xy: 285, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-cryofluid
   rotate: false
-  xy: 913, 219
+  xy: 409, 107
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-lava
   rotate: false
-  xy: 923, 229
+  xy: 409, 97
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-oil
   rotate: false
-  xy: 933, 239
+  xy: 409, 87
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-water
   rotate: false
-  xy: 943, 245
+  xy: 793, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 mech-icon-alpha-mech
   rotate: false
-  xy: 177, 3
+  xy: 191, 3
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-dart-ship
   rotate: false
-  xy: 191, 3
+  xy: 723, 186
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-delta-mech
   rotate: false
-  xy: 723, 186
+  xy: 737, 186
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-halberd-ship
   rotate: false
-  xy: 737, 186
-  size: 12, 12
-  orig: 12, 12
+  xy: 255, 49
+  size: 14, 14
+  orig: 14, 14
   offset: 0, 0
   index: -1
 mech-icon-omega-mech
   rotate: false
-  xy: 239, 33
+  xy: 255, 33
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -4038,791 +4038,791 @@ mech-icon-tau-mech
   index: -1
 mech-icon-trident-ship
   rotate: false
-  xy: 255, 49
+  xy: 271, 49
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 trident-ship
   rotate: false
-  xy: 255, 49
+  xy: 271, 49
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge
   rotate: false
-  xy: 963, 255
+  xy: 903, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-1
   rotate: false
-  xy: 973, 265
+  xy: 913, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-edge-2
   rotate: false
-  xy: 983, 275
+  xy: 923, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor-cliff-side
   rotate: false
-  xy: 913, 199
+  xy: 933, 279
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-edge
   rotate: false
-  xy: 923, 209
+  xy: 853, 277
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-edge-1
   rotate: false
-  xy: 933, 219
+  xy: 853, 267
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-edge-2
   rotate: false
-  xy: 943, 225
+  xy: 863, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil-cliff-side
   rotate: false
-  xy: 953, 235
+  xy: 853, 257
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone1
   rotate: false
-  xy: 973, 255
+  xy: 873, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone2
   rotate: false
-  xy: 983, 265
+  xy: 853, 247
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-blackstone3
   rotate: false
-  xy: 993, 275
+  xy: 863, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 923, 199
+  xy: 873, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 933, 209
+  xy: 883, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 943, 215
+  xy: 853, 237
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 953, 225
+  xy: 863, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 963, 235
+  xy: 873, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 973, 245
+  xy: 883, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 983, 255
+  xy: 893, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 993, 265
+  xy: 853, 227
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 933, 199
+  xy: 863, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 943, 205
+  xy: 873, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 953, 215
+  xy: 883, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 963, 225
+  xy: 893, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 973, 235
+  xy: 903, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 983, 245
+  xy: 853, 217
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 993, 255
+  xy: 863, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-blackstone1
   rotate: false
-  xy: 953, 205
+  xy: 873, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-blackstone2
   rotate: false
-  xy: 963, 215
+  xy: 883, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-blackstone3
   rotate: false
-  xy: 973, 225
+  xy: 893, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-grass1
   rotate: false
-  xy: 983, 235
+  xy: 903, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-grass2
   rotate: false
-  xy: 993, 245
+  xy: 913, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-grass3
   rotate: false
-  xy: 963, 205
+  xy: 853, 207
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-ice1
   rotate: false
-  xy: 973, 215
+  xy: 863, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-ice2
   rotate: false
-  xy: 983, 225
+  xy: 873, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-ice3
   rotate: false
-  xy: 993, 235
+  xy: 883, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-sand1
   rotate: false
-  xy: 973, 205
+  xy: 893, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-sand2
   rotate: false
-  xy: 983, 215
+  xy: 903, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-sand3
   rotate: false
-  xy: 993, 225
+  xy: 913, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-snow1
   rotate: false
-  xy: 983, 205
+  xy: 923, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-snow2
   rotate: false
-  xy: 993, 215
+  xy: 853, 197
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-snow3
   rotate: false
-  xy: 993, 205
+  xy: 863, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-stone1
   rotate: false
-  xy: 853, 186
+  xy: 873, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-stone2
   rotate: false
-  xy: 863, 189
+  xy: 883, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-copper-stone3
   rotate: false
-  xy: 873, 189
+  xy: 893, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone1
   rotate: false
-  xy: 883, 189
+  xy: 903, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone2
   rotate: false
-  xy: 893, 189
+  xy: 913, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-blackstone3
   rotate: false
-  xy: 903, 189
+  xy: 923, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 913, 189
+  xy: 933, 269
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 923, 189
+  xy: 943, 275
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 933, 189
+  xy: 853, 187
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 943, 195
+  xy: 863, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 953, 195
+  xy: 873, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 963, 195
+  xy: 883, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 973, 195
+  xy: 893, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 983, 195
+  xy: 903, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 993, 195
+  xy: 913, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 943, 185
+  xy: 923, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 953, 185
+  xy: 933, 259
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 963, 185
+  xy: 953, 275
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 973, 185
+  xy: 943, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 983, 185
+  xy: 853, 177
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 993, 185
+  xy: 863, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone1
   rotate: false
-  xy: 1003, 275
+  xy: 873, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone2
   rotate: false
-  xy: 1003, 265
+  xy: 883, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-blackstone3
   rotate: false
-  xy: 1003, 255
+  xy: 893, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass1
   rotate: false
-  xy: 1003, 245
+  xy: 903, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass2
   rotate: false
-  xy: 1003, 235
+  xy: 913, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass3
   rotate: false
-  xy: 1003, 225
+  xy: 923, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice1
   rotate: false
-  xy: 1003, 215
+  xy: 933, 249
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice2
   rotate: false
-  xy: 1003, 205
+  xy: 963, 275
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice3
   rotate: false
-  xy: 1003, 195
+  xy: 943, 255
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 1003, 185
+  xy: 953, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 863, 179
+  xy: 853, 167
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 873, 179
+  xy: 863, 169
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow1
   rotate: false
-  xy: 883, 179
+  xy: 873, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow2
   rotate: false
-  xy: 893, 179
+  xy: 883, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow3
   rotate: false
-  xy: 903, 179
+  xy: 893, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 913, 179
+  xy: 903, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 923, 179
+  xy: 913, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 933, 179
+  xy: 923, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone1
   rotate: false
-  xy: 943, 175
+  xy: 933, 239
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone2
   rotate: false
-  xy: 953, 175
+  xy: 973, 275
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-blackstone3
   rotate: false
-  xy: 963, 175
+  xy: 943, 245
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass1
   rotate: false
-  xy: 973, 175
+  xy: 953, 255
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass2
   rotate: false
-  xy: 983, 175
+  xy: 963, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass3
   rotate: false
-  xy: 993, 175
+  xy: 873, 169
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice1
   rotate: false
-  xy: 1003, 175
+  xy: 883, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice2
   rotate: false
-  xy: 207, 23
+  xy: 893, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice3
   rotate: false
-  xy: 217, 23
+  xy: 903, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 227, 23
+  xy: 913, 209
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 237, 23
+  xy: 923, 219
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 247, 23
+  xy: 933, 229
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow1
   rotate: false
-  xy: 257, 23
+  xy: 983, 275
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow2
   rotate: false
-  xy: 267, 23
+  xy: 943, 235
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow3
   rotate: false
-  xy: 277, 23
+  xy: 953, 245
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 287, 23
+  xy: 963, 255
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 205, 13
+  xy: 973, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 205, 3
+  xy: 883, 169
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 574, 112
+  xy: 913, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 1007, 315
+  xy: 923, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 1007, 305
+  xy: 933, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 1007, 295
+  xy: 943, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge
   rotate: false
-  xy: 1013, 205
+  xy: 943, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-1
   rotate: false
-  xy: 1013, 195
+  xy: 953, 205
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-2
   rotate: false
-  xy: 1013, 185
+  xy: 963, 215
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-side
   rotate: false
-  xy: 1013, 175
+  xy: 973, 225
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge
   rotate: false
-  xy: 295, 3
+  xy: 993, 245
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge-1
   rotate: false
-  xy: 305, 15
+  xy: 923, 169
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-edge-2
   rotate: false
-  xy: 305, 5
+  xy: 933, 179
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space-cliff-side
   rotate: false
-  xy: 315, 15
+  xy: 943, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 unit-icon-dagger
   rotate: false
-  xy: 498, 181
+  xy: 526, 181
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -4836,112 +4836,112 @@ unit-icon-titan
   index: -1
 item-biomatter
   rotate: false
-  xy: 913, 249
+  xy: 297, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 923, 259
+  xy: 307, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 933, 269
+  xy: 205, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 943, 275
+  xy: 205, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-dense-alloy
   rotate: false
-  xy: 873, 199
+  xy: 215, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 883, 209
+  xy: 215, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-phase-matter
   rotate: false
-  xy: 893, 219
+  xy: 225, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 903, 229
+  xy: 225, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 913, 239
+  xy: 235, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 923, 249
+  xy: 235, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 933, 259
+  xy: 245, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 943, 265
+  xy: 245, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 953, 275
+  xy: 255, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 883, 199
+  xy: 255, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 893, 209
+  xy: 265, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon
   rotate: false
-  xy: 903, 209
+  xy: 305, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -4969,98 +4969,98 @@ alpha-mech-leg
   index: -1
 delta-mech
   rotate: false
-  xy: 331, 37
+  xy: 347, 37
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 delta-mech-leg
   rotate: false
-  xy: 345, 51
+  xy: 361, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 omega-mech
   rotate: false
-  xy: 255, 33
+  xy: 271, 33
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 omega-mech-armor
   rotate: false
-  xy: 271, 49
+  xy: 287, 49
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 omega-mech-base
   rotate: false
-  xy: 271, 33
+  xy: 287, 33
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 omega-mech-leg
   rotate: false
-  xy: 287, 49
+  xy: 303, 49
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 tau-mech
   rotate: false
-  xy: 542, 195
+  xy: 484, 181
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 tau-mech-base
   rotate: false
-  xy: 556, 192
+  xy: 498, 181
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 tau-mech-leg
   rotate: false
-  xy: 484, 181
+  xy: 512, 181
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 dart-ship
   rotate: false
-  xy: 331, 51
+  xy: 347, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 halberd-ship
   rotate: false
-  xy: 387, 37
-  size: 12, 12
-  orig: 12, 12
+  xy: 198, 65
+  size: 14, 14
+  orig: 14, 14
   offset: 0, 0
   index: -1
 javelin-ship
   rotate: false
-  xy: 1005, 325
+  xy: 177, 17
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 mech-icon-javelin-ship
   rotate: false
-  xy: 1005, 325
+  xy: 177, 17
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 javelin-ship-shield
   rotate: false
-  xy: 177, 17
+  xy: 191, 17
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -5244,21 +5244,21 @@ controller-cursor
   index: -1
 icon-about
   rotate: false
-  xy: 198, 65
+  xy: 214, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-add
   rotate: false
-  xy: 214, 65
+  xy: 230, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-admin
   rotate: false
-  xy: 230, 65
+  xy: 246, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5307,14 +5307,14 @@ icon-arrow-left
   index: -1
 icon-arrow-right
   rotate: false
-  xy: 526, 183
+  xy: 582, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-up
   rotate: false
-  xy: 538, 183
+  xy: 594, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5328,7 +5328,7 @@ icon-back
   index: -1
 icon-ban
   rotate: false
-  xy: 246, 65
+  xy: 262, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5349,7 +5349,7 @@ icon-cancel
   index: -1
 icon-chat
   rotate: false
-  xy: 582, 192
+  xy: 606, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5363,70 +5363,70 @@ icon-check
   index: -1
 icon-crafting
   rotate: false
-  xy: 594, 192
+  xy: 618, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-cursor
   rotate: false
-  xy: 606, 192
+  xy: 630, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-defense
   rotate: false
-  xy: 618, 192
+  xy: 642, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-dev-builds
   rotate: false
-  xy: 262, 65
+  xy: 278, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-discord
   rotate: false
-  xy: 278, 65
+  xy: 294, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-distribution
   rotate: false
-  xy: 630, 192
+  xy: 654, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-donate
   rotate: false
-  xy: 294, 65
+  xy: 310, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-dots
   rotate: false
-  xy: 310, 65
+  xy: 326, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-editor
   rotate: false
-  xy: 326, 65
+  xy: 342, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-egg
   rotate: false
-  xy: 342, 65
+  xy: 358, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5447,7 +5447,7 @@ icon-eraser
   index: -1
 icon-exit
   rotate: false
-  xy: 358, 65
+  xy: 374, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5468,7 +5468,7 @@ icon-file-image
   index: -1
 icon-file-text
   rotate: false
-  xy: 374, 65
+  xy: 390, 65
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5482,7 +5482,7 @@ icon-fill
   index: -1
 icon-floppy
   rotate: false
-  xy: 390, 65
+  xy: 175, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5496,14 +5496,14 @@ icon-floppy-16
   index: -1
 icon-folder
   rotate: false
-  xy: 175, 47
+  xy: 175, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-folder-parent
   rotate: false
-  xy: 175, 31
+  xy: 863, 305
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5517,14 +5517,14 @@ icon-generated
   index: -1
 icon-github
   rotate: false
-  xy: 863, 305
+  xy: 879, 305
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-google-play
   rotate: false
-  xy: 879, 305
+  xy: 895, 305
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5538,56 +5538,56 @@ icon-grid
   index: -1
 icon-hold
   rotate: false
-  xy: 642, 192
+  xy: 666, 192
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-holdDelete
   rotate: false
-  xy: 654, 192
+  xy: 481, 169
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-home
   rotate: false
-  xy: 895, 305
+  xy: 911, 305
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-host
   rotate: false
-  xy: 911, 305
+  xy: 927, 305
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-info
   rotate: false
-  xy: 666, 192
+  xy: 493, 169
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-itch.io
   rotate: false
-  xy: 927, 305
+  xy: 863, 289
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-item
   rotate: false
-  xy: 481, 169
+  xy: 505, 169
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-items-none
   rotate: false
-  xy: 893, 229
+  xy: 277, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5601,21 +5601,21 @@ icon-line
   index: -1
 icon-link
   rotate: false
-  xy: 863, 289
+  xy: 879, 289
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-liquid
   rotate: false
-  xy: 493, 169
+  xy: 517, 169
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-load
   rotate: false
-  xy: 879, 289
+  xy: 895, 289
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5650,21 +5650,21 @@ icon-locked
   index: -1
 icon-logic
   rotate: false
-  xy: 505, 169
+  xy: 529, 169
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-map
   rotate: false
-  xy: 895, 289
+  xy: 911, 289
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-menu
   rotate: false
-  xy: 517, 169
+  xy: 541, 169
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5678,28 +5678,28 @@ icon-menu-large
   index: -1
 icon-missing
   rotate: false
-  xy: 529, 171
+  xy: 554, 180
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-none
   rotate: false
-  xy: 541, 171
+  xy: 553, 168
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-nullitem
   rotate: false
-  xy: 903, 239
+  xy: 287, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-pause
   rotate: false
-  xy: 570, 182
+  xy: 319, 25
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5713,7 +5713,7 @@ icon-pencil
   index: -1
 icon-pencil-small
   rotate: false
-  xy: 911, 289
+  xy: 927, 289
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5727,42 +5727,42 @@ icon-pick
   index: -1
 icon-play
   rotate: false
-  xy: 582, 180
+  xy: 331, 25
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-play-2
   rotate: false
-  xy: 927, 289
+  xy: 943, 301
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-players
   rotate: false
-  xy: 594, 180
+  xy: 343, 25
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-power
   rotate: false
-  xy: 606, 180
+  xy: 355, 25
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-production
   rotate: false
-  xy: 618, 180
+  xy: 367, 25
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-quit
   rotate: false
-  xy: 943, 301
+  xy: 959, 301
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5776,14 +5776,14 @@ icon-redo
   index: -1
 icon-refresh
   rotate: false
-  xy: 959, 301
+  xy: 975, 301
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rename
   rotate: false
-  xy: 975, 301
+  xy: 991, 301
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5797,35 +5797,35 @@ icon-resize
   index: -1
 icon-rotate
   rotate: false
-  xy: 991, 301
+  xy: 943, 285
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-arrow
   rotate: false
-  xy: 943, 285
+  xy: 959, 285
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-left
   rotate: false
-  xy: 959, 285
+  xy: 975, 285
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-right
   rotate: false
-  xy: 975, 285
+  xy: 991, 285
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save
   rotate: false
-  xy: 991, 285
+  xy: 191, 47
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5846,7 +5846,7 @@ icon-save-map
   index: -1
 icon-settings
   rotate: false
-  xy: 630, 180
+  xy: 379, 25
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -5860,28 +5860,28 @@ icon-terrain
   index: -1
 icon-tools
   rotate: false
-  xy: 191, 47
+  xy: 191, 31
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-touch
   rotate: false
-  xy: 642, 180
+  xy: 391, 25
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 654, 180
+  xy: 1007, 313
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-trash
   rotate: false
-  xy: 191, 31
+  xy: 207, 49
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5895,14 +5895,14 @@ icon-trash-16
   index: -1
 icon-trello
   rotate: false
-  xy: 207, 49
+  xy: 207, 33
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-tutorial
   rotate: false
-  xy: 207, 33
+  xy: 223, 49
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5916,28 +5916,28 @@ icon-undo
   index: -1
 icon-units
   rotate: false
-  xy: 666, 180
+  xy: 1007, 301
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-unlocks
   rotate: false
-  xy: 223, 49
+  xy: 223, 33
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-weapon
   rotate: false
-  xy: 303, 25
+  xy: 1007, 289
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-wiki
   rotate: false
-  xy: 223, 33
+  xy: 239, 49
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -5951,7 +5951,7 @@ icon-zoom
   index: -1
 icon-zoom-small
   rotate: false
-  xy: 239, 49
+  xy: 239, 33
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -6153,42 +6153,42 @@ unit-icon-alpha-drone
   index: -1
 dagger
   rotate: false
-  xy: 303, 37
+  xy: 319, 37
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 dagger-base
   rotate: false
-  xy: 317, 51
+  xy: 333, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 delta-mech-base
   rotate: false
-  xy: 317, 51
+  xy: 333, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 dagger-leg
   rotate: false
-  xy: 317, 37
+  xy: 333, 37
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 drone
   rotate: false
-  xy: 359, 51
+  xy: 375, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 unit-icon-drone
   rotate: false
-  xy: 359, 51
+  xy: 375, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -6209,14 +6209,14 @@ unit-icon-fabricator
   index: -1
 interceptor
   rotate: false
-  xy: 1005, 339
+  xy: 1005, 325
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 unit-icon-interceptor
   rotate: false
-  xy: 1005, 339
+  xy: 1005, 325
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
@@ -6237,7 +6237,7 @@ unit-icon-monsoon
   index: -1
 power-cell
   rotate: false
-  xy: 287, 33
+  xy: 303, 33
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -6286,42 +6286,42 @@ missiles-equip
   index: -1
 chain-blaster-equip
   rotate: false
-  xy: 303, 51
+  xy: 319, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 flakgun-equip
   rotate: false
-  xy: 373, 51
+  xy: 389, 51
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 flamethrower-equip
   rotate: false
-  xy: 373, 37
+  xy: 389, 37
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 heal-blaster-equip
   rotate: false
-  xy: 1003, 367
+  xy: 1003, 353
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 401, 37
+  xy: 500, 195
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
   index: -1
 swarmer-equip
   rotate: false
-  xy: 528, 195
+  xy: 556, 192
   size: 12, 12
   orig: 12, 12
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index ffc2ba5665..a6db8f8456 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/content/AmmoTypes.java b/core/src/io/anuke/mindustry/content/AmmoTypes.java
index 79aabc0d53..b2936ab900 100644
--- a/core/src/io/anuke/mindustry/content/AmmoTypes.java
+++ b/core/src/io/anuke/mindustry/content/AmmoTypes.java
@@ -12,7 +12,7 @@ import io.anuke.mindustry.type.ContentList;
 public class AmmoTypes implements ContentList{
     public static AmmoType bulletCopper, bulletDense, bulletThorium, bulletSilicon, bulletPyratite,
             shotgunTungsten, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, weaponMissileSwarm, bulletMech,
-            healBlaster,
+            healBlaster, bulletHalberd,
             flakLead, flakExplosive, flakPlastic, flakSurge, missileExplosive, missileIncindiary, missileSurge,
     artilleryDense, artilleryPlastic, artilleryHoming, artilleryIncindiary, artilleryExplosive,
             basicFlame, lancerLaser, lightning, spectreLaser, meltdownLaser, fuseShotgun, oil, water, lava, cryofluid;
@@ -29,6 +29,13 @@ public class AmmoTypes implements ContentList{
             inaccuracy = 5f;
         }};
 
+
+        bulletHalberd = new AmmoType(Items.pyratite, StandardBullets.halberd, 3){{
+            shootEffect = ShootFx.shootSmall;
+            smokeEffect = ShootFx.shootSmallSmoke;
+            inaccuracy = 3f;
+        }};
+
         healBlaster = new AmmoType(TurretBullets.healBullet){{
             shootEffect = ShootFx.shootHeal;
             smokeEffect = BulletFx.hitLaser;
diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java
index c646c610ad..7c265574c7 100644
--- a/core/src/io/anuke/mindustry/content/Mechs.java
+++ b/core/src/io/anuke/mindustry/content/Mechs.java
@@ -312,26 +312,30 @@ public class Mechs implements ContentList{
             }
         };
 
-        trident = new Mech("trident-ship", true){
+        trident = new Mech("trident-ship", true){{
+            drillPower = 2;
+            speed = 0.12f;
+            maxSpeed = 3.4f;
+            drag = 0.035f;
+            turnCursor = false;
+            armor = 20f;
+            trailColor = Color.valueOf("84f491");
+            weapon = Weapons.bomberTrident;
+        }};
+
+        halberd = new Mech("halberd-ship", true){
             {
+                weapon = Weapons.halberdBlaster;
                 drillPower = 4;
-                speed = 0.12f;
-                maxSpeed = 3.4f;
-                drag = 0.035f;
-                turnCursor = false;
+                mineSpeed = 1.3f;
+                speed = 0.3f;
+                maxSpeed = 3f;
+                drag = 0.06f;
                 armor = 30f;
-                trailColor = Color.valueOf("84f491");
-                weapon = Weapons.bomberTrident;
+                trailColor = Color.valueOf("feb380");
             }
         };
 
-        halberd = new Mech("halberd-ship", true){{
-            drillPower = 2;
-            speed = 0.4f;
-            maxSpeed = 3f;
-            drag = 0.1f;
-        }};
-
         starterDesktop = alpha;
         starterMobile = dart;
     }
diff --git a/core/src/io/anuke/mindustry/content/Weapons.java b/core/src/io/anuke/mindustry/content/Weapons.java
index 0a176453d4..2680fea322 100644
--- a/core/src/io/anuke/mindustry/content/Weapons.java
+++ b/core/src/io/anuke/mindustry/content/Weapons.java
@@ -8,7 +8,7 @@ import io.anuke.mindustry.type.ContentList;
 import io.anuke.mindustry.type.Weapon;
 
 public class Weapons implements ContentList{
-    public static Weapon blaster, droneBlaster, healBlaster, chainBlaster, shockgun, sapper, swarmer, bomber, bomberTrident, flakgun, flamethrower, missiles;
+    public static Weapon blaster, halberdBlaster, droneBlaster, healBlaster, chainBlaster, shockgun, sapper, swarmer, bomber, bomberTrident, flakgun, flamethrower, missiles;
 
     @Override
     public void load(){
@@ -21,6 +21,14 @@ public class Weapons implements ContentList{
             ammo = AmmoTypes.bulletMech;
         }};
 
+        halberdBlaster = new Weapon("bomber"){{
+            length = 1.5f;
+            reload = 12f;
+            roundrobin = true;
+            ejectEffect = ShootFx.shellEjectSmall;
+            ammo = AmmoTypes.bulletHalberd;
+        }};
+
         droneBlaster = new Weapon("blaster"){{
             length = 2f;
             reload = 40f;
diff --git a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java b/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java
index e45bfd4ecf..0f68c1b679 100644
--- a/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java
+++ b/core/src/io/anuke/mindustry/content/bullets/StandardBullets.java
@@ -1,5 +1,6 @@
 package io.anuke.mindustry.content.bullets;
 
+import com.badlogic.gdx.graphics.Color;
 import io.anuke.mindustry.content.fx.BulletFx;
 import io.anuke.mindustry.entities.bullet.BasicBulletType;
 import io.anuke.mindustry.entities.bullet.BulletType;
@@ -7,7 +8,7 @@ import io.anuke.mindustry.graphics.Palette;
 import io.anuke.mindustry.type.ContentList;
 
 public class StandardBullets extends BulletList implements ContentList{
-    public static BulletType copper, dense, thorium, homing, tracer, mechSmall;
+    public static BulletType copper, dense, thorium, homing, tracer, mechSmall, halberd;
 
     @Override
     public void load(){
@@ -55,6 +56,18 @@ public class StandardBullets extends BulletList implements ContentList{
             }
         };
 
+        halberd = new BasicBulletType(3.2f, 6, "bullet"){
+            {
+                bulletWidth = 10f;
+                bulletHeight = 12f;
+                frontColor = Color.valueOf("feb380");
+                backColor = Color.valueOf("ea8878");
+                incendSpread = 3f;
+                incendAmount = 1;
+                incendChance = 0.3f;
+            }
+        };
+
         mechSmall = new BasicBulletType(4f, 9, "bullet"){
             {
                 bulletWidth = 11f;
diff --git a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BulletType.java
index 7a108a51d3..283446d164 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/BulletType.java
+++ b/core/src/io/anuke/mindustry/entities/bullet/BulletType.java
@@ -41,7 +41,7 @@ public abstract class BulletType extends BaseBulletType<Bullet> implements Conte
         this.damage = damage;
         lifetime = 40f;
         hiteffect = BulletFx.hitBulletSmall;
-        despawneffect = BulletFx.despawn;
+        despawneffect = BulletFx.hitBulletSmall;
 
         types.add(this);
     }