diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png
index 6642bd33d3..b4ab6a2770 100644
Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index eb58551b70..57215c4793 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -48,308 +48,308 @@ overdrive-projector-top
   index: -1
 shock-mine
   rotate: false
-  xy: 1369, 318
+  xy: 1503, 305
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 1263, 510
+  xy: 1567, 679
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 1275, 637
+  xy: 1257, 675
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 1275, 603
+  xy: 1291, 666
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 1615, 579
+  xy: 1915, 749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 579, 123
+  xy: 1915, 715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 613, 123
+  xy: 1637, 661
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 647, 123
+  xy: 1677, 703
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 571, 89
+  xy: 1711, 703
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 571, 55
+  xy: 1745, 703
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 605, 89
+  xy: 1779, 703
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 571, 21
+  xy: 1671, 669
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 605, 55
+  xy: 1705, 669
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 639, 89
+  xy: 1739, 669
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 605, 21
+  xy: 1773, 669
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 639, 55
+  xy: 1813, 695
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 639, 21
+  xy: 1847, 695
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 1297, 569
+  xy: 1881, 695
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 1331, 569
+  xy: 1807, 661
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 1297, 535
+  xy: 1841, 661
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 1331, 535
+  xy: 1875, 661
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 1297, 501
+  xy: 1915, 681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 1331, 501
+  xy: 1909, 647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 1365, 556
+  xy: 1671, 635
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1913, 281
+  xy: 1461, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1947, 315
+  xy: 1495, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1913, 247
+  xy: 1529, 203
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1947, 281
+  xy: 1495, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1981, 315
+  xy: 1529, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 2015, 315
+  xy: 1529, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1947, 247
+  xy: 1155, 88
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 1981, 281
+  xy: 1189, 88
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 2015, 281
+  xy: 1223, 88
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 1981, 247
+  xy: 1257, 88
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 2015, 247
+  xy: 1291, 88
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 1641, 213
+  xy: 1325, 88
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 1675, 213
+  xy: 1359, 88
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 1709, 213
+  xy: 1393, 88
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 1743, 213
+  xy: 1427, 88
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 1777, 213
+  xy: 1461, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 1811, 213
+  xy: 1495, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 1845, 213
+  xy: 1529, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1879, 213
+  xy: 1461, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1913, 213
+  xy: 1495, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -363,7 +363,7 @@ distributor
   index: -1
 junction
   rotate: false
-  xy: 1739, 451
+  xy: 1543, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -377,49 +377,49 @@ mass-driver-base
   index: -1
 overflow-gate
   rotate: false
-  xy: 1759, 383
+  xy: 1197, 394
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 1861, 383
+  xy: 1163, 292
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1895, 417
+  xy: 1197, 326
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1895, 383
+  xy: 1231, 360
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 1929, 417
+  xy: 1265, 394
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1199, 340
+  xy: 1401, 258
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 1471, 281
+  xy: 1087, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -580,133 +580,133 @@ water-extractor-top
   index: -1
 char1
   rotate: false
-  xy: 1309, 637
+  xy: 1325, 666
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 char2
   rotate: false
-  xy: 1309, 603
+  xy: 1359, 666
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 char3
   rotate: false
-  xy: 1332, 671
+  xy: 1393, 666
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cliffs1
   rotate: false
-  xy: 1343, 637
+  xy: 1427, 666
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal1
   rotate: false
-  xy: 1343, 603
+  xy: 1461, 666
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 1366, 692
+  xy: 1495, 645
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 1400, 692
+  xy: 1529, 645
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper1
   rotate: false
-  xy: 1399, 556
+  xy: 1705, 635
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper2
   rotate: false
-  xy: 1365, 522
+  xy: 1739, 635
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper3
   rotate: false
-  xy: 1399, 522
+  xy: 1773, 635
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters1
   rotate: false
-  xy: 1501, 519
+  xy: 1949, 681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters2
   rotate: false
-  xy: 1535, 545
+  xy: 1943, 647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters3
   rotate: false
-  xy: 1569, 545
+  xy: 1983, 715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters4
   rotate: false
-  xy: 1603, 545
+  xy: 1943, 613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters5
   rotate: false
-  xy: 1535, 511
+  xy: 1983, 681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 1535, 511
+  xy: 1983, 681
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters6
   rotate: false
-  xy: 1569, 511
+  xy: 1977, 647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 1569, 511
+  xy: 1977, 647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 1467, 485
+  xy: 1635, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -734,14 +734,14 @@ dunerocks-large
   index: -1
 dunerocks1
   rotate: false
-  xy: 1637, 477
+  xy: 1873, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dunerocks2
   rotate: false
-  xy: 1651, 621
+  xy: 1907, 579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -762,63 +762,63 @@ edge-stencil-smooth
   index: -1
 grass1
   rotate: false
-  xy: 1683, 587
+  xy: 1169, 578
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 1717, 587
+  xy: 1203, 632
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 1751, 587
+  xy: 1203, 598
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone1
   rotate: false
-  xy: 1853, 587
+  xy: 1203, 564
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone2
   rotate: false
-  xy: 1887, 587
+  xy: 1195, 530
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone3
   rotate: false
-  xy: 1921, 587
+  xy: 1195, 496
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock1
   rotate: false
-  xy: 1957, 621
+  xy: 1229, 530
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock2
   rotate: false
-  xy: 1955, 587
+  xy: 1229, 496
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock3
   rotate: false
-  xy: 1671, 553
+  xy: 1237, 632
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -832,42 +832,42 @@ ice-edge
   index: -1
 ice-snow1
   rotate: false
-  xy: 1705, 519
+  xy: 1305, 632
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow2
   rotate: false
-  xy: 1739, 553
+  xy: 1271, 598
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow3
   rotate: false
-  xy: 1705, 485
+  xy: 1339, 632
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 1671, 519
+  xy: 1237, 598
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 1705, 553
+  xy: 1237, 564
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 1671, 485
+  xy: 1271, 632
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -881,168 +881,168 @@ icerocks-large
   index: -1
 icerocks1
   rotate: false
-  xy: 1739, 519
+  xy: 1271, 564
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icerocks2
   rotate: false
-  xy: 1773, 553
+  xy: 1263, 530
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock1
   rotate: false
-  xy: 1807, 553
+  xy: 1263, 496
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock2
   rotate: false
-  xy: 1773, 485
+  xy: 1305, 564
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock3
   rotate: false
-  xy: 1807, 519
+  xy: 1297, 530
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead1
   rotate: false
-  xy: 1943, 451
+  xy: 1509, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 1977, 451
+  xy: 1543, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 2011, 451
+  xy: 1577, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock1
   rotate: false
-  xy: 1987, 961
+  xy: 1603, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock2
   rotate: false
-  xy: 673, 81
+  xy: 1603, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock3
   rotate: false
-  xy: 673, 47
+  xy: 1645, 567
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor
   rotate: false
-  xy: 741, 13
+  xy: 1747, 533
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged5
   rotate: false
-  xy: 741, 13
+  xy: 1747, 533
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2
   rotate: false
-  xy: 775, 43
+  xy: 1781, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-3
   rotate: false
-  xy: 809, 43
+  xy: 1815, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-5
   rotate: false
-  xy: 843, 43
+  xy: 1849, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged1
   rotate: false
-  xy: 877, 43
+  xy: 1781, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged2
   rotate: false
-  xy: 911, 43
+  xy: 1815, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged3
   rotate: false
-  xy: 945, 43
+  xy: 1849, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged4
   rotate: false
-  xy: 775, 9
+  xy: 1883, 545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged6
   rotate: false
-  xy: 809, 9
+  xy: 1917, 545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pine
   rotate: false
-  xy: 1997, 417
+  xy: 1265, 360
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rock1
   rotate: false
-  xy: 1727, 897
+  xy: 1937, 933
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 1727, 847
+  xy: 1987, 949
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -1056,84 +1056,84 @@ rocks-large
   index: -1
 rocks1
   rotate: false
-  xy: 1165, 340
+  xy: 1299, 258
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rocks2
   rotate: false
-  xy: 1233, 374
+  xy: 1333, 258
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water
   rotate: false
-  xy: 1233, 272
+  xy: 1469, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 1131, 272
+  xy: 1435, 326
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 1165, 272
+  xy: 1435, 292
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 1199, 272
+  xy: 1435, 258
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap1
   rotate: false
-  xy: 1267, 365
+  xy: 1503, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap2
   rotate: false
-  xy: 1301, 365
+  xy: 1469, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap3
   rotate: false
-  xy: 1267, 331
+  xy: 1537, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 1403, 349
+  xy: 1537, 271
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 1403, 315
+  xy: 1469, 237
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 1437, 349
+  xy: 1503, 237
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1147,49 +1147,49 @@ snowrocks-large
   index: -1
 snowrocks1
   rotate: false
-  xy: 1403, 281
+  xy: 1537, 237
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrocks2
   rotate: false
-  xy: 1437, 315
+  xy: 1087, 239
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-cluster1
   rotate: false
-  xy: 2001, 755
+  xy: 705, 81
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster2
   rotate: false
-  xy: 2001, 713
+  xy: 705, 39
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster3
   rotate: false
-  xy: 1143, 696
+  xy: 747, 81
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 stained-boulder1
   rotate: false
-  xy: 1505, 307
+  xy: 1155, 224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-boulder2
   rotate: false
-  xy: 1573, 341
+  xy: 1189, 224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1210,14 +1210,14 @@ stained-rocks-red-large
   index: -1
 stained-rocks-red1
   rotate: false
-  xy: 1607, 341
+  xy: 1155, 156
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-rocks-red2
   rotate: false
-  xy: 1539, 273
+  xy: 1189, 190
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1231,91 +1231,91 @@ stained-rocks-yellow-large
   index: -1
 stained-rocks-yellow1
   rotate: false
-  xy: 1573, 307
+  xy: 1257, 224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-rocks-yellow2
   rotate: false
-  xy: 1573, 273
+  xy: 1155, 122
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-rocks1
   rotate: false
-  xy: 1505, 273
+  xy: 1155, 190
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-rocks2
   rotate: false
-  xy: 1539, 307
+  xy: 1223, 224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-red1
   rotate: false
-  xy: 1539, 239
+  xy: 1189, 122
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-red2
   rotate: false
-  xy: 1573, 239
+  xy: 1223, 156
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-red3
   rotate: false
-  xy: 1607, 239
+  xy: 1257, 190
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-yellow1
   rotate: false
-  xy: 1641, 315
+  xy: 1325, 224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-yellow2
   rotate: false
-  xy: 1641, 281
+  xy: 1223, 122
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-yellow3
   rotate: false
-  xy: 1675, 315
+  xy: 1257, 156
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone1
   rotate: false
-  xy: 1607, 307
+  xy: 1189, 156
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone2
   rotate: false
-  xy: 1607, 273
+  xy: 1223, 190
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone3
   rotate: false
-  xy: 1505, 239
+  xy: 1291, 224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1329,77 +1329,77 @@ stainedrocks-large
   index: -1
 stainedrocks1
   rotate: false
-  xy: 1641, 247
+  xy: 1291, 190
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stainedrocks2
   rotate: false
-  xy: 1675, 281
+  xy: 1359, 224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 1709, 315
+  xy: 1257, 122
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar
   rotate: false
-  xy: 1743, 281
+  xy: 1325, 156
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 1811, 315
+  xy: 1359, 156
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 1777, 247
+  xy: 1393, 190
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 1811, 281
+  xy: 1359, 122
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 1879, 281
+  xy: 1461, 203
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 1913, 315
+  xy: 1461, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 1879, 247
+  xy: 1495, 203
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 1071, 103
+  xy: 1571, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1420,35 +1420,35 @@ white-tree-dead
   index: -1
 block-border
   rotate: false
-  xy: 1161, 544
+  xy: 1501, 713
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 1195, 544
+  xy: 1535, 713
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 1195, 544
+  xy: 1535, 713
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-select
   rotate: false
-  xy: 1229, 544
+  xy: 1569, 713
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 1581, 613
+  xy: 1643, 729
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1518,175 +1518,175 @@ rubble-4-1
   index: -1
 spawn
   rotate: false
-  xy: 1403, 247
+  xy: 1121, 238
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 1161, 510
+  xy: 1603, 721
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 1195, 510
+  xy: 789, 60
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 1195, 510
+  xy: 789, 60
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 1229, 510
+  xy: 1499, 679
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 1263, 544
+  xy: 1533, 679
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 1411, 658
+  xy: 1677, 771
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 1411, 624
+  xy: 1711, 771
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 1445, 655
+  xy: 1745, 771
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 1479, 655
+  xy: 1779, 771
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 1513, 655
+  xy: 1813, 763
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 1445, 621
+  xy: 1847, 763
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 1479, 621
+  xy: 1881, 763
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 1513, 621
+  xy: 1603, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 1615, 613
+  xy: 1677, 737
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 1377, 590
+  xy: 1711, 737
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 1411, 590
+  xy: 1745, 737
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 1445, 587
+  xy: 1779, 737
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 1479, 587
+  xy: 1637, 695
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 1513, 587
+  xy: 1813, 729
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 1547, 579
+  xy: 1847, 729
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 1945, 1129
+  xy: 1501, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1979, 1131
+  xy: 1569, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 2013, 1147
+  xy: 1501, 475
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 2013, 1113
+  xy: 1535, 475
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1714,84 +1714,84 @@ liquid-tank-top
   index: -1
 mechanical-pump
   rotate: false
-  xy: 741, 81
+  xy: 1713, 567
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1793, 383
+  xy: 1163, 326
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1827, 417
+  xy: 1197, 360
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1827, 383
+  xy: 1231, 394
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1861, 417
+  xy: 1299, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1929, 349
+  xy: 1333, 360
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 1963, 349
+  xy: 1367, 394
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 1997, 349
+  xy: 1299, 292
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 1063, 375
+  xy: 1333, 326
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 1063, 341
+  xy: 1367, 360
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 1097, 375
+  xy: 1401, 394
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 1063, 307
+  xy: 1333, 292
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1861,7 +1861,7 @@ trident-ship-pad
   index: -1
 battery
   rotate: false
-  xy: 1173, 578
+  xy: 1329, 700
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1875,14 +1875,14 @@ battery-large
   index: -1
 combustion-generator
   rotate: false
-  xy: 1377, 658
+  xy: 1563, 645
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 1377, 624
+  xy: 1643, 763
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1945,7 +1945,7 @@ impact-reactor-top
   index: -1
 power-node
   rotate: false
-  xy: 1691, 349
+  xy: 1231, 292
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1959,28 +1959,28 @@ power-node-large
   index: -1
 power-source
   rotate: false
-  xy: 1759, 349
+  xy: 1299, 360
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 1793, 349
+  xy: 1333, 394
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 powerinfinite
   rotate: false
-  xy: 1827, 349
+  xy: 1401, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 1861, 349
+  xy: 1265, 292
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1994,14 +1994,14 @@ rtg-generator
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 1233, 340
+  xy: 1435, 394
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 1471, 349
+  xy: 1087, 205
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2134,21 +2134,21 @@ graphite-press
   index: -1
 incinerator
   rotate: false
-  xy: 1807, 485
+  xy: 1407, 632
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 1977, 485
+  xy: 1399, 496
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 1671, 451
+  xy: 1509, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2176,21 +2176,21 @@ silicon-smelter-top
   index: -1
 lavasmelter
   rotate: false
-  xy: 1909, 451
+  xy: 1475, 543
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source
   rotate: false
-  xy: 1987, 1063
+  xy: 1611, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 673, 13
+  xy: 1747, 567
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2239,14 +2239,14 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 1097, 341
+  xy: 1367, 326
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 1097, 307
+  xy: 1367, 292
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2281,7 +2281,7 @@ silicon-smelter
   index: -1
 smelter
   rotate: false
-  xy: 1369, 250
+  xy: 1537, 305
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2372,14 +2372,14 @@ launch-pad
   index: -1
 sortedunloader
   rotate: false
-  xy: 1471, 315
+  xy: 1087, 137
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 1071, 171
+  xy: 1563, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2393,14 +2393,14 @@ vault
   index: -1
 arc-heat
   rotate: false
-  xy: 1207, 612
+  xy: 1135, 578
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-1
   rotate: false
-  xy: 1241, 578
+  xy: 1465, 700
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2596,7 +2596,7 @@ phantom-factory-top-open
   index: -1
 repair-point-base
   rotate: false
-  xy: 1165, 374
+  xy: 1163, 258
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2659,7 +2659,7 @@ wraith-factory-top-open
   index: -1
 copper-wall
   rotate: false
-  xy: 1433, 553
+  xy: 1807, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2673,7 +2673,7 @@ copper-wall-large
   index: -1
 door
   rotate: false
-  xy: 1603, 477
+  xy: 1771, 601
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2694,14 +2694,14 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 1637, 511
+  xy: 1839, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 1929, 383
+  xy: 1333, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2771,42 +2771,42 @@ scrap-wall-large4
   index: -1
 scrap-wall1
   rotate: false
-  xy: 1267, 297
+  xy: 1469, 373
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall2
   rotate: false
-  xy: 1301, 331
+  xy: 1503, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 1301, 297
+  xy: 1469, 339
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 1267, 263
+  xy: 1503, 373
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 1267, 263
+  xy: 1503, 373
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 1709, 281
+  xy: 1325, 190
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2820,7 +2820,7 @@ surge-wall-large
   index: -1
 thorium-wall
   rotate: false
-  xy: 1811, 247
+  xy: 1427, 190
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2841,7 +2841,7 @@ thruster
   index: -1
 titanium-wall
   rotate: false
-  xy: 1947, 213
+  xy: 1529, 67
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2876,7 +2876,7 @@ casing
   index: -1
 error
   rotate: false
-  xy: 1395, 1134
+  xy: 1795, 1147
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -2897,7 +2897,7 @@ laser-end
   index: -1
 minelaser
   rotate: false
-  xy: 2043, 907
+  xy: 2043, 805
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
@@ -2911,91 +2911,91 @@ minelaser-end
   index: -1
 missile
   rotate: false
-  xy: 1135, 629
+  xy: 659, 1
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 missile-back
   rotate: false
-  xy: 1135, 591
+  xy: 697, 1
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 scale_marker
   rotate: false
-  xy: 421, 111
+  xy: 2037, 849
   size: 4, 4
   orig: 4, 4
   offset: 0, 0
   index: -1
 scorch1
   rotate: false
-  xy: 1081, 1
+  xy: 1605, 241
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch2
   rotate: false
-  xy: 1111, 28
+  xy: 1597, 139
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch3
   rotate: false
-  xy: 1230, 136
+  xy: 1627, 139
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch4
   rotate: false
-  xy: 1260, 136
+  xy: 1635, 275
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch5
   rotate: false
-  xy: 1290, 161
+  xy: 1597, 37
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 shell
   rotate: false
-  xy: 1907, 1303
+  xy: 735, 1
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 shell-back
   rotate: false
-  xy: 2001, 675
+  xy: 1219, 700
   size: 36, 36
   orig: 36, 36
   offset: 0, 0
   index: -1
 shot
   rotate: false
-  xy: 1369, 284
+  xy: 1537, 339
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 transfer
   rotate: false
-  xy: 2043, 857
+  xy: 2043, 755
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 2015, 213
+  xy: 1563, 169
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3016,98 +3016,98 @@ alloy-smelter-icon-large
   index: -1
 alloy-smelter-icon-medium
   rotate: false
-  xy: 1173, 646
+  xy: 553, 181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 alloy-smelter-icon-small
   rotate: false
-  xy: 1451, 850
+  xy: 1501, 858
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 alpha-dart-mech-pad-icon-large
   rotate: false
-  xy: 511, 341
+  xy: 635, 423
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-dart-mech-pad-icon-medium
   rotate: false
-  xy: 1173, 612
+  xy: 1135, 646
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 alpha-dart-mech-pad-icon-small
   rotate: false
-  xy: 1551, 813
+  xy: 1061, 247
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 arc
   rotate: false
-  xy: 1207, 646
+  xy: 1135, 612
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 arc-icon-full
   rotate: false
-  xy: 1298, 671
+  xy: 1295, 700
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 arc-icon-large
   rotate: false
-  xy: 561, 315
+  xy: 835, 427
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 arc-icon-small
   rotate: false
-  xy: 1003, 77
+  xy: 879, 549
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 battery-icon-large
   rotate: false
-  xy: 561, 265
+  xy: 571, 69
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 battery-icon-small
   rotate: false
-  xy: 879, 549
+  xy: 885, 451
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 battery-large-icon-large
   rotate: false
-  xy: 611, 257
+  xy: 571, 19
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 battery-large-icon-medium
   rotate: false
-  xy: 1207, 578
+  xy: 1363, 700
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery-large-icon-small
   rotate: false
-  xy: 1945, 1103
+  xy: 1949, 757
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3121,280 +3121,280 @@ blast-drill-icon-full
   index: -1
 blast-drill-icon-large
   rotate: false
-  xy: 693, 423
+  xy: 1357, 1234
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 blast-drill-icon-medium
   rotate: false
-  xy: 1241, 646
+  xy: 1397, 700
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blast-drill-icon-small
   rotate: false
-  xy: 775, 89
+  xy: 1635, 249
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 blast-mixer-icon-large
   rotate: false
-  xy: 743, 427
+  xy: 1407, 1239
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 blast-mixer-icon-medium
   rotate: false
-  xy: 1241, 612
+  xy: 1431, 700
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blast-mixer-icon-small
   rotate: false
-  xy: 1111, 2
+  xy: 1627, 37
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 bridge-conduit-icon-large
   rotate: false
-  xy: 553, 215
+  xy: 1557, 1247
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 bridge-conduit-icon-small
   rotate: false
-  xy: 1349, 224
+  xy: 1636, 405
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 bridge-conveyor-icon-large
   rotate: false
-  xy: 553, 165
+  xy: 1607, 1247
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 bridge-conveyor-icon-small
   rotate: false
-  xy: 1320, 161
+  xy: 1662, 405
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 char-icon-large
   rotate: false
-  xy: 603, 157
+  xy: 1707, 1247
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 char-icon-small
   rotate: false
-  xy: 1375, 224
+  xy: 1688, 405
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 cliffs-icon-large
   rotate: false
-  xy: 677, 365
+  xy: 1757, 1247
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 cliffs-icon-small
   rotate: false
-  xy: 1349, 198
+  xy: 1662, 379
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 combustion-generator-icon-large
   rotate: false
-  xy: 661, 315
+  xy: 1807, 1247
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 combustion-generator-icon-small
   rotate: false
-  xy: 1375, 198
+  xy: 1714, 405
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 conduit-icon-full
   rotate: false
-  xy: 1547, 613
+  xy: 1210, 666
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-icon-large
   rotate: false
-  xy: 661, 265
+  xy: 1857, 1247
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 conduit-icon-small
   rotate: false
-  xy: 1401, 221
+  xy: 1688, 379
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 container-icon-large
   rotate: false
-  xy: 711, 315
+  xy: 1357, 1184
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 container-icon-medium
   rotate: false
-  xy: 1581, 579
+  xy: 1881, 729
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 container-icon-small
   rotate: false
-  xy: 1427, 221
+  xy: 1740, 405
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 conveyor-icon-large
   rotate: false
-  xy: 711, 265
+  xy: 1407, 1189
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 conveyor-icon-small
   rotate: false
-  xy: 1453, 221
+  xy: 1714, 379
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 copper-wall-icon-large
   rotate: false
-  xy: 1357, 1234
+  xy: 1457, 1189
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 copper-wall-icon-small
   rotate: false
-  xy: 1479, 221
+  xy: 1740, 379
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 copper-wall-large-icon-large
   rotate: false
-  xy: 1407, 1239
+  xy: 1507, 1197
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 copper-wall-large-icon-medium
   rotate: false
-  xy: 1467, 553
+  xy: 1841, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall-large-icon-small
   rotate: false
-  xy: 1136, 134
+  xy: 1665, 353
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 core-foundation-icon-large
   rotate: false
-  xy: 1457, 1239
+  xy: 1557, 1197
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 core-foundation-icon-medium
   rotate: false
-  xy: 1501, 553
+  xy: 1875, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 core-foundation-icon-small
   rotate: false
-  xy: 1401, 195
+  xy: 1665, 327
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 core-nucleus-icon-large
   rotate: false
-  xy: 1507, 1247
+  xy: 1607, 1197
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 core-nucleus-icon-medium
   rotate: false
-  xy: 1433, 519
+  xy: 1909, 613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 core-nucleus-icon-small
   rotate: false
-  xy: 1427, 195
+  xy: 1691, 353
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 core-shard-icon-large
   rotate: false
-  xy: 1557, 1247
+  xy: 1657, 1197
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 core-shard-icon-medium
   rotate: false
-  xy: 1467, 519
+  xy: 1949, 715
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 core-shard-icon-small
   rotate: false
-  xy: 1453, 195
+  xy: 1665, 301
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 craters-icon-large
   rotate: false
-  xy: 1607, 1247
+  xy: 1707, 1197
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 craters-icon-small
   rotate: false
-  xy: 1479, 195
+  xy: 1691, 327
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3408,21 +3408,21 @@ cryofluidmixer-icon-full
   index: -1
 cryofluidmixer-icon-large
   rotate: false
-  xy: 1807, 1247
+  xy: 1345, 1134
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 cryofluidmixer-icon-medium
   rotate: false
-  xy: 1603, 511
+  xy: 1977, 613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cryofluidmixer-icon-small
   rotate: false
-  xy: 1505, 213
+  xy: 1717, 353
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3436,21 +3436,21 @@ cultivator-icon-full
   index: -1
 cultivator-icon-large
   rotate: false
-  xy: 1857, 1247
+  xy: 1337, 1084
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 cultivator-icon-medium
   rotate: false
-  xy: 1365, 488
+  xy: 1601, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cultivator-icon-small
   rotate: false
-  xy: 1531, 213
+  xy: 1665, 275
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3471,21 +3471,21 @@ cyclone-icon-full
   index: -1
 cyclone-icon-large
   rotate: false
-  xy: 1357, 1184
+  xy: 1337, 1034
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 cyclone-icon-medium
   rotate: false
-  xy: 1399, 488
+  xy: 2011, 647
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cyclone-icon-small
   rotate: false
-  xy: 1557, 213
+  xy: 1661, 249
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3499,21 +3499,21 @@ dagger-factory-icon-full
   index: -1
 dagger-factory-icon-large
   rotate: false
-  xy: 1507, 1197
+  xy: 1327, 884
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-factory-icon-medium
   rotate: false
-  xy: 1433, 485
+  xy: 2011, 613
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dagger-factory-icon-small
   rotate: false
-  xy: 1583, 213
+  xy: 1691, 301
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3527,175 +3527,175 @@ deepwater-edge
   index: -1
 deepwater-icon-large
   rotate: false
-  xy: 1657, 1197
+  xy: 1387, 1034
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 deepwater-icon-small
   rotate: false
-  xy: 1609, 213
+  xy: 1717, 327
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 delta-mech-pad-icon-large
   rotate: false
-  xy: 1857, 1197
+  xy: 1445, 1139
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-mech-pad-icon-medium
   rotate: false
-  xy: 1501, 485
+  xy: 1669, 601
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 delta-mech-pad-icon-small
   rotate: false
-  xy: 1505, 187
+  xy: 1691, 275
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 differential-generator-icon-large
   rotate: false
-  xy: 1345, 1134
+  xy: 1495, 1139
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 differential-generator-icon-medium
   rotate: false
-  xy: 1535, 477
+  xy: 1703, 601
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 differential-generator-icon-small
   rotate: false
-  xy: 1531, 187
+  xy: 1687, 249
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 distributor-icon-large
   rotate: false
-  xy: 1337, 1084
+  xy: 1545, 1147
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 distributor-icon-medium
   rotate: false
-  xy: 1569, 477
+  xy: 1737, 601
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 distributor-icon-small
   rotate: false
-  xy: 1557, 187
+  xy: 1717, 301
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 door-icon-large
   rotate: false
-  xy: 1337, 1034
+  xy: 1595, 1147
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 door-icon-small
   rotate: false
-  xy: 1583, 187
+  xy: 1717, 275
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 door-large-icon-large
   rotate: false
-  xy: 1337, 984
+  xy: 1645, 1147
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 door-large-icon-medium
   rotate: false
-  xy: 1637, 545
+  xy: 1805, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door-large-icon-small
   rotate: false
-  xy: 1609, 187
+  xy: 1713, 249
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 dunerocks-icon-large
   rotate: false
-  xy: 1327, 934
+  xy: 1695, 1147
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dunerocks-icon-small
   rotate: false
-  xy: 1635, 187
+  xy: 1743, 353
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 duo
   rotate: false
-  xy: 1685, 621
+  xy: 1941, 579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 duo-icon-full
   rotate: false
-  xy: 1719, 621
+  xy: 1975, 579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 duo-icon-large
   rotate: false
-  xy: 1327, 884
+  xy: 1745, 1147
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 duo-icon-small
   rotate: false
-  xy: 1661, 187
+  xy: 1743, 327
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 force-projector-icon-large
   rotate: false
-  xy: 777, 377
+  xy: 1995, 1249
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 force-projector-icon-medium
   rotate: false
-  xy: 1787, 621
+  xy: 827, 89
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 force-projector-icon-small
   rotate: false
-  xy: 1687, 187
+  xy: 1743, 301
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3709,21 +3709,21 @@ fortress-factory-icon-full
   index: -1
 fortress-factory-icon-large
   rotate: false
-  xy: 827, 377
+  xy: 1945, 1233
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 fortress-factory-icon-medium
   rotate: false
-  xy: 1821, 621
+  xy: 861, 93
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 fortress-factory-icon-small
   rotate: false
-  xy: 1713, 187
+  xy: 1743, 275
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3744,21 +3744,21 @@ fuse-icon-full
   index: -1
 fuse-icon-large
   rotate: false
-  xy: 1445, 1139
+  xy: 1995, 1199
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 fuse-icon-medium
   rotate: false
-  xy: 1855, 621
+  xy: 895, 93
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 fuse-icon-small
   rotate: false
-  xy: 1739, 187
+  xy: 1739, 249
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3772,91 +3772,91 @@ ghoul-factory-icon-full
   index: -1
 ghoul-factory-icon-large
   rotate: false
-  xy: 1387, 976
+  xy: 1945, 1183
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ghoul-factory-icon-medium
   rotate: false
-  xy: 1889, 621
+  xy: 823, 55
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ghoul-factory-icon-small
   rotate: false
-  xy: 1765, 187
+  xy: 1766, 397
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 glaive-ship-pad-icon-large
   rotate: false
-  xy: 1377, 926
+  xy: 1945, 1133
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 glaive-ship-pad-icon-medium
   rotate: false
-  xy: 1923, 621
+  xy: 1169, 646
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 glaive-ship-pad-icon-small
   rotate: false
-  xy: 1791, 187
+  xy: 1792, 397
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 graphite-press-icon-large
   rotate: false
-  xy: 1377, 876
+  xy: 1995, 1149
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 graphite-press-icon-medium
   rotate: false
-  xy: 1649, 587
+  xy: 1169, 612
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 graphite-press-icon-small
   rotate: false
-  xy: 1817, 187
+  xy: 1818, 397
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 hail
   rotate: false
-  xy: 1785, 587
+  xy: 1161, 544
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hail-icon-full
   rotate: false
-  xy: 1819, 587
+  xy: 1161, 510
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hail-icon-large
   rotate: false
-  xy: 761, 315
+  xy: 1895, 1097
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 hail-icon-small
   rotate: false
-  xy: 1843, 187
+  xy: 1844, 397
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3870,42 +3870,42 @@ holostone-edge
   index: -1
 holostone-icon-large
   rotate: false
-  xy: 811, 327
+  xy: 1995, 1099
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 holostone-icon-small
   rotate: false
-  xy: 1869, 187
+  xy: 1657, 223
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 hotrock-icon-large
   rotate: false
-  xy: 811, 277
+  xy: 1995, 1049
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 hotrock-icon-small
   rotate: false
-  xy: 1895, 187
+  xy: 1657, 197
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ice-icon-large
   rotate: false
-  xy: 877, 377
+  xy: 1427, 934
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ice-icon-small
   rotate: false
-  xy: 1921, 187
+  xy: 1683, 223
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3919,42 +3919,42 @@ ice-snow-edge
   index: -1
 ice-snow-icon-large
   rotate: false
-  xy: 861, 327
+  xy: 1427, 884
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ice-snow-icon-small
   rotate: false
-  xy: 1947, 187
+  xy: 1657, 171
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 icerocks-icon-large
   rotate: false
-  xy: 861, 277
+  xy: 1101, 855
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 icerocks-icon-small
   rotate: false
-  xy: 1973, 187
+  xy: 1683, 197
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ignarock-icon-large
   rotate: false
-  xy: 911, 327
+  xy: 1101, 755
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ignarock-icon-small
   rotate: false
-  xy: 1141, 56
+  xy: 1709, 197
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3968,455 +3968,455 @@ impact-reactor-icon-full
   index: -1
 impact-reactor-icon-large
   rotate: false
-  xy: 911, 277
+  xy: 511, 391
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 impact-reactor-icon-medium
   rotate: false
-  xy: 1841, 553
+  xy: 1339, 598
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 impact-reactor-icon-small
   rotate: false
-  xy: 1141, 30
+  xy: 1735, 223
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 incinerator-icon-large
   rotate: false
-  xy: 1495, 1139
+  xy: 511, 341
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 incinerator-icon-small
   rotate: false
-  xy: 1319, 109
+  xy: 1683, 145
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 1349, 172
+  xy: 1735, 197
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-blast-compound-small
   rotate: false
-  xy: 509, 1000
+  xy: 1205, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-blast-compound-xlarge
   rotate: false
-  xy: 2007, 1257
+  xy: 511, 249
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-coal-medium
   rotate: false
-  xy: 1375, 172
+  xy: 1735, 171
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-coal-small
   rotate: false
-  xy: 681, 121
+  xy: 1223, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-coal-xlarge
   rotate: false
-  xy: 511, 249
+  xy: 477, 1716
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-copper-medium
   rotate: false
-  xy: 1401, 169
+  xy: 1735, 145
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-copper-small
   rotate: false
-  xy: 2025, 657
+  xy: 1241, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-copper-xlarge
   rotate: false
-  xy: 2007, 1215
+  xy: 587, 123
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 1427, 169
+  xy: 1709, 129
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-graphite-small
   rotate: false
-  xy: 527, 1507
+  xy: 1259, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-graphite-xlarge
   rotate: false
-  xy: 477, 1716
+  xy: 1101, 713
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-lead-medium
   rotate: false
-  xy: 1453, 169
+  xy: 1735, 119
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-lead-small
   rotate: false
-  xy: 1193, 116
+  xy: 1277, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-lead-xlarge
   rotate: false
-  xy: 1101, 713
+  xy: 1601, 755
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 1479, 169
+  xy: 2022, 1777
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-metaglass-small
   rotate: false
-  xy: 1193, 98
+  xy: 1295, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-metaglass-xlarge
   rotate: false
-  xy: 1651, 655
+  xy: 1651, 805
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 1505, 161
+  xy: 2022, 1751
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-phase-fabric-small
   rotate: false
-  xy: 1193, 80
+  xy: 1313, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-phase-fabric-xlarge
   rotate: false
-  xy: 1951, 1199
+  xy: 629, 123
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 1531, 161
+  xy: 2022, 1725
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-plastanium-small
   rotate: false
-  xy: 1193, 62
+  xy: 1331, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-plastanium-xlarge
   rotate: false
-  xy: 1693, 655
+  xy: 1693, 805
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 1557, 161
+  xy: 2022, 1699
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-pyratite-small
   rotate: false
-  xy: 1193, 44
+  xy: 1349, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-pyratite-xlarge
   rotate: false
-  xy: 1735, 655
+  xy: 671, 123
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-sand-medium
   rotate: false
-  xy: 1583, 161
+  xy: 2022, 1673
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-sand-small
   rotate: false
-  xy: 1206, 134
+  xy: 1367, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-sand-xlarge
   rotate: false
-  xy: 1777, 655
+  xy: 1735, 805
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 1609, 161
+  xy: 1769, 371
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-scrap-small
   rotate: false
-  xy: 1211, 116
+  xy: 1385, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-scrap-xlarge
   rotate: false
-  xy: 1819, 655
+  xy: 1777, 805
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 1635, 161
+  xy: 1769, 345
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-silicon-small
   rotate: false
-  xy: 1211, 98
+  xy: 1403, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-silicon-xlarge
   rotate: false
-  xy: 1861, 655
+  xy: 621, 81
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-source-icon-large
   rotate: false
-  xy: 1545, 1147
+  xy: 511, 291
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-source-icon-small
   rotate: false
-  xy: 1661, 161
+  xy: 1795, 371
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 1687, 161
+  xy: 1769, 319
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-small
   rotate: false
-  xy: 1211, 80
+  xy: 1421, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-spore-pod-xlarge
   rotate: false
-  xy: 1903, 655
+  xy: 621, 39
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 1713, 161
+  xy: 1795, 345
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-surge-alloy-small
   rotate: false
-  xy: 1211, 62
+  xy: 1439, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-surge-alloy-xlarge
   rotate: false
-  xy: 1945, 655
+  xy: 663, 81
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 1739, 161
+  xy: 1821, 371
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-thorium-small
   rotate: false
-  xy: 1211, 44
+  xy: 527, 1507
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-thorium-xlarge
   rotate: false
-  xy: 389, 3
+  xy: 663, 39
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 1765, 161
+  xy: 1769, 293
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-titanium-small
   rotate: false
-  xy: 1229, 118
+  xy: 2029, 247
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 item-titanium-xlarge
   rotate: false
-  xy: 537, 123
+  xy: 1819, 797
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 item-void-icon-large
   rotate: false
-  xy: 1595, 1147
+  xy: 561, 365
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 item-void-icon-small
   rotate: false
-  xy: 1791, 161
+  xy: 1795, 319
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 javelin-ship-pad-icon-large
   rotate: false
-  xy: 1695, 1147
+  xy: 611, 365
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-ship-pad-icon-medium
   rotate: false
-  xy: 1705, 451
+  xy: 1475, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 javelin-ship-pad-icon-small
   rotate: false
-  xy: 1817, 161
+  xy: 1821, 345
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 junction-icon-large
   rotate: false
-  xy: 1795, 1147
+  xy: 661, 373
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 junction-icon-small
   rotate: false
-  xy: 1843, 161
+  xy: 1795, 293
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 kiln-icon-large
   rotate: false
-  xy: 1845, 1147
+  xy: 661, 323
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 kiln-icon-medium
   rotate: false
-  xy: 1773, 451
+  xy: 1509, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 kiln-icon-small
   rotate: false
-  xy: 1869, 161
+  xy: 1821, 319
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4437,21 +4437,21 @@ lancer-icon-full
   index: -1
 lancer-icon-large
   rotate: false
-  xy: 811, 227
+  xy: 561, 265
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 lancer-icon-medium
   rotate: false
-  xy: 1807, 451
+  xy: 1543, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lancer-icon-small
   rotate: false
-  xy: 1895, 161
+  xy: 1821, 293
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4465,91 +4465,91 @@ laser-drill-icon-full
   index: -1
 laser-drill-icon-large
   rotate: false
-  xy: 861, 227
+  xy: 611, 265
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 laser-drill-icon-medium
   rotate: false
-  xy: 1841, 451
+  xy: 1577, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 laser-drill-icon-small
   rotate: false
-  xy: 1921, 161
+  xy: 1847, 371
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 launch-pad-icon-large
   rotate: false
-  xy: 911, 227
+  xy: 661, 273
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 launch-pad-icon-medium
   rotate: false
-  xy: 1875, 451
+  xy: 1577, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 launch-pad-icon-small
   rotate: false
-  xy: 1947, 161
+  xy: 1847, 345
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-junction-icon-large
   rotate: false
-  xy: 1945, 1291
+  xy: 711, 323
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-junction-icon-small
   rotate: false
-  xy: 1973, 161
+  xy: 1847, 319
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-router-icon-full
   rotate: false
-  xy: 2013, 1181
+  xy: 1467, 475
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-icon-large
   rotate: false
-  xy: 1907, 1241
+  xy: 711, 273
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-router-icon-small
   rotate: false
-  xy: 1999, 161
+  xy: 1847, 293
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-source-icon-large
   rotate: false
-  xy: 1957, 1241
+  xy: 761, 377
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-source-icon-small
   rotate: false
-  xy: 1162, 134
+  xy: 1769, 267
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4563,35 +4563,35 @@ liquid-tank-icon-full
   index: -1
 liquid-tank-icon-large
   rotate: false
-  xy: 1427, 926
+  xy: 761, 327
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 liquid-tank-icon-medium
   rotate: false
-  xy: 1987, 1029
+  xy: 1611, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-tank-icon-small
   rotate: false
-  xy: 1167, 108
+  xy: 1795, 267
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 magmarock-icon-large
   rotate: false
-  xy: 1427, 876
+  xy: 811, 377
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 magmarock-icon-small
   rotate: false
-  xy: 1167, 82
+  xy: 1821, 267
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4612,77 +4612,70 @@ mass-driver-icon-full
   index: -1
 mass-driver-icon-large
   rotate: false
-  xy: 1101, 855
+  xy: 761, 277
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mass-driver-icon-medium
   rotate: false
-  xy: 707, 81
+  xy: 1679, 567
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mass-driver-icon-small
   rotate: false
-  xy: 1167, 56
+  xy: 1847, 267
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 mech-icon-alpha-mech
   rotate: false
-  xy: 1101, 805
+  xy: 811, 327
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mech-icon-dart-ship
   rotate: false
-  xy: 1101, 755
+  xy: 811, 277
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mech-icon-delta-mech
   rotate: false
-  xy: 1545, 1097
-  size: 48, 48
-  orig: 48, 48
-  offset: 0, 0
-  index: -1
-mech-icon-glaive-ship
-  rotate: false
-  xy: 519, 449
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
-mech-icon-javelin-ship
-  rotate: false
-  xy: 1595, 1097
+  xy: 861, 377
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mech-icon-omega-mech
   rotate: false
-  xy: 1045, 511
+  xy: 519, 449
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 mech-icon-tau-mech
   rotate: false
-  xy: 1103, 511
+  xy: 1045, 511
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 mech-icon-trident-ship
   rotate: false
-  xy: 455, 59
+  xy: 1103, 511
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
+trident-ship
+  rotate: false
+  xy: 1103, 511
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -4696,35 +4689,35 @@ mechanical-drill-icon-full
   index: -1
 mechanical-drill-icon-large
   rotate: false
-  xy: 1645, 1097
+  xy: 861, 327
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mechanical-drill-icon-medium
   rotate: false
-  xy: 707, 47
+  xy: 1645, 533
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-drill-icon-small
   rotate: false
-  xy: 1167, 30
+  xy: 1765, 241
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 mechanical-pump-icon-large
   rotate: false
-  xy: 1695, 1097
+  xy: 861, 277
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mechanical-pump-icon-small
   rotate: false
-  xy: 2021, 1087
+  xy: 1791, 241
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4745,112 +4738,112 @@ meltdown-icon-full
   index: -1
 meltdown-icon-large
   rotate: false
-  xy: 1745, 1097
+  xy: 911, 393
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 meltdown-icon-medium
   rotate: false
-  xy: 741, 47
+  xy: 1679, 533
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 meltdown-icon-small
   rotate: false
-  xy: 2021, 1061
+  xy: 1817, 241
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 melter-icon-large
   rotate: false
-  xy: 1795, 1097
+  xy: 911, 343
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 melter-icon-small
   rotate: false
-  xy: 2021, 1035
+  xy: 1843, 241
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 mend-projector-icon-large
   rotate: false
-  xy: 1845, 1097
+  xy: 911, 293
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 mend-projector-icon-medium
   rotate: false
-  xy: 707, 13
+  xy: 1713, 533
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mend-projector-icon-small
   rotate: false
-  xy: 2021, 1009
+  xy: 1761, 215
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 metal-floor-2-icon-large
   rotate: false
-  xy: 1895, 1097
+  xy: 553, 215
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 metal-floor-2-icon-small
   rotate: false
-  xy: 2021, 983
+  xy: 1761, 189
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 metal-floor-3-icon-large
   rotate: false
-  xy: 653, 207
+  xy: 603, 215
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 metal-floor-3-icon-small
   rotate: false
-  xy: 2021, 957
+  xy: 1787, 215
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 metal-floor-5-icon-large
   rotate: false
-  xy: 653, 157
+  xy: 961, 393
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 metal-floor-5-icon-small
   rotate: false
-  xy: 2022, 1777
+  xy: 1761, 163
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 metal-floor-damaged-icon-large
   rotate: false
-  xy: 703, 215
+  xy: 961, 343
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 metal-floor-damaged-icon-small
   rotate: false
-  xy: 2022, 1751
+  xy: 1787, 189
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4864,35 +4857,35 @@ metal-floor-edge
   index: -1
 metal-floor-icon-large
   rotate: false
-  xy: 703, 165
+  xy: 961, 293
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 metal-floor-icon-small
   rotate: false
-  xy: 2022, 1725
+  xy: 1813, 215
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 multi-press-icon-large
   rotate: false
-  xy: 753, 215
+  xy: 1011, 394
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 multi-press-icon-medium
   rotate: false
-  xy: 843, 9
+  xy: 1951, 545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 multi-press-icon-small
   rotate: false
-  xy: 2022, 1699
+  xy: 1761, 137
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4906,1596 +4899,1596 @@ oil-extractor-icon-full
   index: -1
 oil-extractor-icon-large
   rotate: false
-  xy: 753, 165
+  xy: 1011, 344
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 oil-extractor-icon-medium
   rotate: false
-  xy: 877, 9
+  xy: 1985, 545
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 oil-extractor-icon-small
   rotate: false
-  xy: 2022, 1673
+  xy: 1787, 163
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 omega-mech-pad-icon-large
   rotate: false
-  xy: 803, 177
+  xy: 1011, 294
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 omega-mech-pad-icon-medium
   rotate: false
-  xy: 911, 9
+  xy: 1883, 511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 omega-mech-pad-icon-small
   rotate: false
-  xy: 1346, 146
+  xy: 1813, 189
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-coal-holostone-icon-large
   rotate: false
-  xy: 853, 177
+  xy: 911, 243
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-coal-holostone-icon-small
   rotate: false
-  xy: 1372, 146
+  xy: 1839, 215
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-coal-holostone1
   rotate: false
-  xy: 945, 9
+  xy: 1917, 511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-holostone2
   rotate: false
-  xy: 979, 43
+  xy: 1951, 511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-holostone3
   rotate: false
-  xy: 979, 9
+  xy: 1985, 511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-holostone-icon-full
   rotate: false
-  xy: 979, 9
+  xy: 1985, 511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-holostone-icon-medium
   rotate: false
-  xy: 979, 9
+  xy: 1985, 511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand-icon-large
   rotate: false
-  xy: 903, 177
+  xy: 961, 243
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-coal-sand-icon-small
   rotate: false
-  xy: 1345, 120
+  xy: 1787, 137
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 1991, 641
+  xy: 1645, 499
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 977, 409
+  xy: 1679, 499
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 1011, 410
+  xy: 1713, 499
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand-icon-full
   rotate: false
-  xy: 1011, 410
+  xy: 1713, 499
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-sand-icon-medium
   rotate: false
-  xy: 1011, 410
+  xy: 1713, 499
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stained-stone-icon-large
   rotate: false
-  xy: 803, 127
+  xy: 1011, 244
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-coal-stained-stone-icon-small
   rotate: false
-  xy: 1371, 120
+  xy: 1813, 163
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-coal-stained-stone-red-icon-large
   rotate: false
-  xy: 853, 127
+  xy: 587, 165
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-coal-stained-stone-red-icon-small
   rotate: false
-  xy: 1398, 143
+  xy: 1839, 189
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-coal-stained-stone-red1
   rotate: false
-  xy: 961, 307
+  xy: 1705, 465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stained-stone-red2
   rotate: false
-  xy: 961, 273
+  xy: 1739, 465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stained-stone-red3
   rotate: false
-  xy: 961, 239
+  xy: 1781, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stained-stone-red-icon-full
   rotate: false
-  xy: 961, 239
+  xy: 1781, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stained-stone-red-icon-medium
   rotate: false
-  xy: 961, 239
+  xy: 1781, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stained-stone1
   rotate: false
-  xy: 977, 375
+  xy: 1747, 499
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stained-stone2
   rotate: false
-  xy: 1011, 376
+  xy: 1637, 465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stained-stone3
   rotate: false
-  xy: 961, 341
+  xy: 1671, 465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stained-stone-icon-full
   rotate: false
-  xy: 961, 341
+  xy: 1671, 465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stained-stone-icon-medium
   rotate: false
-  xy: 961, 341
+  xy: 1671, 465
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone-icon-large
   rotate: false
-  xy: 903, 127
+  xy: 637, 165
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-coal-stone-icon-small
   rotate: false
-  xy: 1424, 143
+  xy: 1813, 137
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 995, 341
+  xy: 1815, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 995, 307
+  xy: 1849, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 995, 273
+  xy: 1883, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone-icon-full
   rotate: false
-  xy: 995, 273
+  xy: 1883, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal-stone-icon-medium
   rotate: false
-  xy: 995, 273
+  xy: 1883, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-holostone-icon-large
   rotate: false
-  xy: 1437, 1084
+  xy: 653, 215
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-copper-holostone-icon-small
   rotate: false
-  xy: 1450, 143
+  xy: 1839, 163
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-copper-holostone1
   rotate: false
-  xy: 995, 239
+  xy: 1917, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-holostone2
   rotate: false
-  xy: 1029, 342
+  xy: 1951, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-holostone3
   rotate: false
-  xy: 1029, 308
+  xy: 1985, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-holostone-icon-full
   rotate: false
-  xy: 1029, 308
+  xy: 1985, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-holostone-icon-medium
   rotate: false
-  xy: 1029, 308
+  xy: 1985, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand-icon-large
   rotate: false
-  xy: 1437, 1034
+  xy: 703, 223
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-copper-sand-icon-small
   rotate: false
-  xy: 1476, 143
+  xy: 1839, 137
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-copper-sand1
   rotate: false
-  xy: 1029, 274
+  xy: 1773, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand2
   rotate: false
-  xy: 1029, 240
+  xy: 1807, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand3
   rotate: false
-  xy: 1003, 205
+  xy: 1841, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand-icon-full
   rotate: false
-  xy: 1003, 205
+  xy: 1841, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-sand-icon-medium
   rotate: false
-  xy: 1003, 205
+  xy: 1841, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stained-stone-icon-large
   rotate: false
-  xy: 1437, 984
+  xy: 687, 165
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-copper-stained-stone-icon-small
   rotate: false
-  xy: 1397, 117
+  xy: 1761, 111
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-copper-stained-stone-red-icon-large
   rotate: false
-  xy: 1487, 1089
+  xy: 1545, 1097
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-copper-stained-stone-red-icon-small
   rotate: false
-  xy: 1423, 117
+  xy: 1787, 111
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-copper-stained-stone-red1
   rotate: false
-  xy: 1037, 206
+  xy: 1977, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stained-stone-red2
   rotate: false
-  xy: 1037, 172
+  xy: 1637, 431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stained-stone-red3
   rotate: false
-  xy: 1037, 138
+  xy: 1671, 431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stained-stone-red-icon-full
   rotate: false
-  xy: 1037, 138
+  xy: 1671, 431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stained-stone-red-icon-medium
   rotate: false
-  xy: 1037, 138
+  xy: 1671, 431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stained-stone1
   rotate: false
-  xy: 1003, 171
+  xy: 1875, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stained-stone2
   rotate: false
-  xy: 1003, 137
+  xy: 1909, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stained-stone3
   rotate: false
-  xy: 1003, 103
+  xy: 1943, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stained-stone-icon-full
   rotate: false
-  xy: 1003, 103
+  xy: 1943, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stained-stone-icon-medium
   rotate: false
-  xy: 1003, 103
+  xy: 1943, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone-icon-large
   rotate: false
-  xy: 1487, 1039
+  xy: 1595, 1097
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-copper-stone-icon-small
   rotate: false
-  xy: 1449, 117
+  xy: 1813, 111
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-copper-stone1
   rotate: false
-  xy: 1037, 104
+  xy: 1705, 431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone2
   rotate: false
-  xy: 1045, 477
+  xy: 1739, 431
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone3
   rotate: false
-  xy: 1079, 477
+  xy: 1773, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone-icon-full
   rotate: false
-  xy: 1079, 477
+  xy: 1773, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper-stone-icon-medium
   rotate: false
-  xy: 1079, 477
+  xy: 1773, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-holostone-icon-large
   rotate: false
-  xy: 1487, 989
+  xy: 1645, 1097
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-lead-holostone-icon-small
   rotate: false
-  xy: 1475, 117
+  xy: 1839, 111
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-lead-holostone1
   rotate: false
-  xy: 1113, 477
+  xy: 1807, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-holostone2
   rotate: false
-  xy: 1147, 476
+  xy: 1841, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-holostone3
   rotate: false
-  xy: 1181, 476
+  xy: 1875, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-holostone-icon-full
   rotate: false
-  xy: 1181, 476
+  xy: 1875, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-holostone-icon-medium
   rotate: false
-  xy: 1181, 476
+  xy: 1875, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand-icon-large
   rotate: false
-  xy: 1537, 1047
+  xy: 1695, 1097
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-lead-sand-icon-small
   rotate: false
-  xy: 1502, 135
+  xy: 1873, 383
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 1215, 476
+  xy: 1909, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 1249, 476
+  xy: 1943, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 1283, 467
+  xy: 1977, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand-icon-full
   rotate: false
-  xy: 1283, 467
+  xy: 1977, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-sand-icon-medium
   rotate: false
-  xy: 1283, 467
+  xy: 1977, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stained-stone-icon-large
   rotate: false
-  xy: 1537, 997
+  xy: 1745, 1097
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-lead-stained-stone-icon-small
   rotate: false
-  xy: 1528, 135
+  xy: 1873, 357
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-lead-stained-stone-red-icon-large
   rotate: false
-  xy: 1587, 1047
+  xy: 1795, 1097
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-lead-stained-stone-red-icon-small
   rotate: false
-  xy: 1554, 135
+  xy: 1899, 383
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-lead-stained-stone-red1
   rotate: false
-  xy: 1419, 451
+  xy: 895, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stained-stone-red2
   rotate: false
-  xy: 1453, 451
+  xy: 929, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stained-stone-red3
   rotate: false
-  xy: 1487, 451
+  xy: 963, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stained-stone-red-icon-full
   rotate: false
-  xy: 1487, 451
+  xy: 963, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stained-stone-red-icon-medium
   rotate: false
-  xy: 1487, 451
+  xy: 963, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stained-stone1
   rotate: false
-  xy: 1317, 467
+  xy: 2011, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stained-stone2
   rotate: false
-  xy: 1351, 454
+  xy: 2011, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stained-stone3
   rotate: false
-  xy: 1385, 454
+  xy: 861, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stained-stone-icon-full
   rotate: false
-  xy: 1385, 454
+  xy: 861, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stained-stone-icon-medium
   rotate: false
-  xy: 1385, 454
+  xy: 861, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone-icon-large
   rotate: false
-  xy: 1587, 997
+  xy: 1845, 1089
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-lead-stone-icon-small
   rotate: false
-  xy: 1580, 135
+  xy: 1873, 331
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 1521, 443
+  xy: 997, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 1555, 443
+  xy: 1031, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 1589, 443
+  xy: 1065, 60
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone-icon-full
   rotate: false
-  xy: 1589, 443
+  xy: 1065, 60
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead-stone-icon-medium
   rotate: false
-  xy: 1589, 443
+  xy: 1065, 60
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-holostone-icon-large
   rotate: false
-  xy: 1637, 1047
+  xy: 1895, 1047
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-scrap-holostone-icon-small
   rotate: false
-  xy: 1606, 135
+  xy: 1899, 357
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-scrap-holostone1
   rotate: false
-  xy: 1623, 443
+  xy: 785, 26
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-holostone2
   rotate: false
-  xy: 1037, 70
+  xy: 819, 21
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-holostone3
   rotate: false
-  xy: 1013, 36
+  xy: 853, 21
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-holostone-icon-full
   rotate: false
-  xy: 1013, 36
+  xy: 853, 21
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-holostone-icon-medium
   rotate: false
-  xy: 1013, 36
+  xy: 853, 21
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-sand-icon-large
   rotate: false
-  xy: 1637, 997
+  xy: 1945, 1033
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-scrap-sand-icon-small
   rotate: false
-  xy: 1632, 135
+  xy: 1925, 383
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-scrap-sand1
   rotate: false
-  xy: 1013, 2
+  xy: 887, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-sand2
   rotate: false
-  xy: 1047, 36
+  xy: 921, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-sand3
   rotate: false
-  xy: 1047, 2
+  xy: 955, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-sand-icon-full
   rotate: false
-  xy: 1047, 2
+  xy: 955, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-sand-icon-medium
   rotate: false
-  xy: 1047, 2
+  xy: 955, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-snow-icon-large
   rotate: false
-  xy: 1687, 1047
+  xy: 1995, 999
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-scrap-snow-icon-small
   rotate: false
-  xy: 1658, 135
+  xy: 1873, 305
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-scrap-snow1
   rotate: false
-  xy: 1045, 443
+  xy: 989, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-snow2
   rotate: false
-  xy: 1045, 409
+  xy: 1023, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-snow3
   rotate: false
-  xy: 1079, 443
+  xy: 1057, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-snow-icon-full
   rotate: false
-  xy: 1079, 443
+  xy: 1057, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-snow-icon-medium
   rotate: false
-  xy: 1079, 443
+  xy: 1057, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-stained-stone-icon-large
   rotate: false
-  xy: 1687, 997
+  xy: 753, 223
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-scrap-stained-stone-icon-small
   rotate: false
-  xy: 1684, 135
+  xy: 1899, 331
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-scrap-stained-stone-red-icon-large
   rotate: false
-  xy: 1737, 1047
+  xy: 803, 227
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-scrap-stained-stone-red-icon-small
   rotate: false
-  xy: 1710, 135
+  xy: 1925, 357
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-scrap-stained-stone-red1
   rotate: false
-  xy: 1147, 442
+  xy: 1907, 1239
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-stained-stone-red2
   rotate: false
-  xy: 1181, 442
+  xy: 1907, 1205
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-stained-stone-red3
   rotate: false
-  xy: 1215, 442
+  xy: 1045, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-stained-stone-red-icon-full
   rotate: false
-  xy: 1215, 442
+  xy: 1045, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-stained-stone-red-icon-medium
   rotate: false
-  xy: 1215, 442
+  xy: 1045, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-stained-stone1
   rotate: false
-  xy: 1113, 443
+  xy: 1091, 26
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-stained-stone2
   rotate: false
-  xy: 1079, 409
+  xy: 1897, 1307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-stained-stone3
   rotate: false
-  xy: 1113, 409
+  xy: 1907, 1273
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-stained-stone-icon-full
   rotate: false
-  xy: 1113, 409
+  xy: 1907, 1273
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-stained-stone-icon-medium
   rotate: false
-  xy: 1113, 409
+  xy: 1907, 1273
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-stone-icon-large
   rotate: false
-  xy: 1737, 997
+  xy: 853, 227
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-scrap-stone-icon-small
   rotate: false
-  xy: 1736, 135
+  xy: 1951, 383
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-scrap-stone1
   rotate: false
-  xy: 1249, 442
+  xy: 1079, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-stone2
   rotate: false
-  xy: 1147, 408
+  xy: 1113, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-stone3
   rotate: false
-  xy: 1181, 408
+  xy: 1147, 476
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-stone-icon-full
   rotate: false
-  xy: 1181, 408
+  xy: 1147, 476
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap-stone-icon-medium
   rotate: false
-  xy: 1181, 408
+  xy: 1147, 476
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-holostone-icon-large
   rotate: false
-  xy: 1787, 1047
+  xy: 737, 173
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-thorium-holostone-icon-small
   rotate: false
-  xy: 1762, 135
+  xy: 1873, 279
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-thorium-holostone1
   rotate: false
-  xy: 1215, 408
+  xy: 1181, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-holostone2
   rotate: false
-  xy: 1249, 408
+  xy: 1215, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-holostone3
   rotate: false
-  xy: 1283, 433
+  xy: 1249, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-holostone-icon-full
   rotate: false
-  xy: 1283, 433
+  xy: 1249, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-holostone-icon-medium
   rotate: false
-  xy: 1283, 433
+  xy: 1249, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand-icon-large
   rotate: false
-  xy: 1787, 997
+  xy: 787, 173
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-thorium-sand-icon-small
   rotate: false
-  xy: 1788, 135
+  xy: 1899, 305
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 1317, 433
+  xy: 1283, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 1283, 399
+  xy: 1317, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 1317, 399
+  xy: 1351, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand-icon-full
   rotate: false
-  xy: 1317, 399
+  xy: 1351, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-sand-icon-medium
   rotate: false
-  xy: 1317, 399
+  xy: 1351, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stained-stone-icon-large
   rotate: false
-  xy: 1837, 1047
+  xy: 837, 177
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-thorium-stained-stone-icon-small
   rotate: false
-  xy: 1814, 135
+  xy: 1925, 331
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-thorium-stained-stone-red-icon-large
   rotate: false
-  xy: 1837, 997
+  xy: 887, 177
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-thorium-stained-stone-red-icon-small
   rotate: false
-  xy: 1840, 135
+  xy: 1951, 357
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-thorium-stained-stone-red1
   rotate: false
-  xy: 1453, 417
+  xy: 1061, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stained-stone-red2
   rotate: false
-  xy: 1487, 417
+  xy: 1061, 375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stained-stone-red3
   rotate: false
-  xy: 1521, 409
+  xy: 1095, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stained-stone-red-icon-full
   rotate: false
-  xy: 1521, 409
+  xy: 1095, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stained-stone-red-icon-medium
   rotate: false
-  xy: 1521, 409
+  xy: 1095, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stained-stone1
   rotate: false
-  xy: 1351, 420
+  xy: 1385, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stained-stone2
   rotate: false
-  xy: 1385, 420
+  xy: 1419, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stained-stone3
   rotate: false
-  xy: 1419, 417
+  xy: 1061, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stained-stone-icon-full
   rotate: false
-  xy: 1419, 417
+  xy: 1061, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stained-stone-icon-medium
   rotate: false
-  xy: 1419, 417
+  xy: 1061, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone-icon-large
   rotate: false
-  xy: 1887, 1047
+  xy: 937, 193
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-thorium-stone-icon-small
   rotate: false
-  xy: 1866, 135
+  xy: 1977, 383
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 1555, 409
+  xy: 1061, 341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 1589, 409
+  xy: 1095, 409
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 1623, 409
+  xy: 1095, 375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone-icon-full
   rotate: false
-  xy: 1623, 409
+  xy: 1095, 375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium-stone-icon-medium
   rotate: false
-  xy: 1623, 409
+  xy: 1095, 375
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-holostone-icon-large
   rotate: false
-  xy: 1887, 997
+  xy: 987, 193
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-titanium-holostone-icon-small
   rotate: false
-  xy: 1892, 135
+  xy: 1899, 279
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-titanium-holostone1
   rotate: false
-  xy: 1351, 386
+  xy: 1061, 307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-holostone2
   rotate: false
-  xy: 1385, 386
+  xy: 1095, 341
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-holostone3
   rotate: false
-  xy: 1419, 383
+  xy: 1061, 273
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-holostone-icon-full
   rotate: false
-  xy: 1419, 383
+  xy: 1061, 273
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-holostone-icon-medium
   rotate: false
-  xy: 1419, 383
+  xy: 1061, 273
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand-icon-large
   rotate: false
-  xy: 953, 177
+  xy: 1037, 194
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-titanium-sand-icon-small
   rotate: false
-  xy: 1918, 135
+  xy: 1925, 305
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 1453, 383
+  xy: 1095, 307
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 1487, 383
+  xy: 1095, 273
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 1521, 375
+  xy: 1129, 442
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand-icon-full
   rotate: false
-  xy: 1521, 375
+  xy: 1129, 442
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-sand-icon-medium
   rotate: false
-  xy: 1521, 375
+  xy: 1129, 442
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stained-stone-icon-large
   rotate: false
-  xy: 953, 127
+  xy: 937, 143
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-titanium-stained-stone-icon-small
   rotate: false
-  xy: 1944, 135
+  xy: 1951, 331
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-titanium-stained-stone-red-icon-large
   rotate: false
-  xy: 703, 115
+  xy: 987, 143
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-titanium-stained-stone-red-icon-small
   rotate: false
-  xy: 1970, 135
+  xy: 1977, 357
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-titanium-stained-stone-red1
   rotate: false
-  xy: 1657, 417
+  xy: 1129, 306
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stained-stone-red2
   rotate: false
-  xy: 1657, 383
+  xy: 1129, 272
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stained-stone-red3
   rotate: false
-  xy: 1691, 417
+  xy: 1163, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stained-stone-red-icon-full
   rotate: false
-  xy: 1691, 417
+  xy: 1163, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stained-stone-red-icon-medium
   rotate: false
-  xy: 1691, 417
+  xy: 1163, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stained-stone1
   rotate: false
-  xy: 1555, 375
+  xy: 1129, 408
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stained-stone2
   rotate: false
-  xy: 1589, 375
+  xy: 1129, 374
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stained-stone3
   rotate: false
-  xy: 1623, 375
+  xy: 1129, 340
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stained-stone-icon-full
   rotate: false
-  xy: 1623, 375
+  xy: 1129, 340
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stained-stone-icon-medium
   rotate: false
-  xy: 1623, 375
+  xy: 1129, 340
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone-icon-large
   rotate: false
-  xy: 753, 115
+  xy: 1037, 144
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ore-titanium-stone-icon-small
   rotate: false
-  xy: 1996, 135
+  xy: 2003, 383
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 1691, 383
+  xy: 1197, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 1725, 417
+  xy: 1163, 394
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 1725, 383
+  xy: 1231, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone-icon-full
   rotate: false
-  xy: 1725, 383
+  xy: 1231, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium-stone-icon-medium
   rotate: false
-  xy: 1725, 383
+  xy: 1231, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overdrive-projector-icon-large
   rotate: false
-  xy: 803, 77
+  xy: 1437, 1084
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 overdrive-projector-icon-medium
   rotate: false
-  xy: 1759, 417
+  xy: 1163, 360
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overdrive-projector-icon-small
   rotate: false
-  xy: 1501, 109
+  xy: 1925, 279
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 overflow-gate-icon-large
   rotate: false
-  xy: 853, 77
+  xy: 1437, 1034
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 overflow-gate-icon-small
   rotate: false
-  xy: 1527, 109
+  xy: 1951, 305
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6509,84 +6502,84 @@ phantom-factory-icon-full
   index: -1
 phantom-factory-icon-large
   rotate: false
-  xy: 903, 77
+  xy: 1437, 984
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 phantom-factory-icon-medium
   rotate: false
-  xy: 1793, 417
+  xy: 1265, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phantom-factory-icon-small
   rotate: false
-  xy: 1553, 109
+  xy: 1977, 331
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 phase-conduit-icon-large
   rotate: false
-  xy: 953, 77
+  xy: 1487, 1089
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 phase-conduit-icon-small
   rotate: false
-  xy: 1579, 109
+  xy: 2003, 357
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 phase-conveyor-icon-large
   rotate: false
-  xy: 1537, 947
+  xy: 1487, 1039
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 phase-conveyor-icon-small
   rotate: false
-  xy: 1605, 109
+  xy: 1951, 279
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 phase-wall-icon-large
   rotate: false
-  xy: 1587, 947
+  xy: 1487, 989
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 phase-wall-icon-small
   rotate: false
-  xy: 1631, 109
+  xy: 1977, 305
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 phase-wall-large-icon-large
   rotate: false
-  xy: 1637, 947
+  xy: 1537, 1047
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 phase-wall-large-icon-medium
   rotate: false
-  xy: 1963, 417
+  xy: 1197, 292
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-large-icon-small
   rotate: false
-  xy: 1657, 109
+  xy: 2003, 331
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6600,56 +6593,56 @@ phase-weaver-icon-full
   index: -1
 phase-weaver-icon-large
   rotate: false
-  xy: 1687, 947
+  xy: 1537, 997
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 phase-weaver-icon-medium
   rotate: false
-  xy: 1963, 383
+  xy: 1231, 326
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-weaver-icon-small
   rotate: false
-  xy: 1683, 109
+  xy: 1977, 279
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 pine-icon-large
   rotate: false
-  xy: 1737, 947
+  xy: 1587, 1047
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 pine-icon-small
   rotate: false
-  xy: 1709, 109
+  xy: 2003, 305
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 plastanium-compressor-icon-large
   rotate: false
-  xy: 1787, 947
+  xy: 1587, 997
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 plastanium-compressor-icon-medium
   rotate: false
-  xy: 1997, 383
+  xy: 1299, 394
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-compressor-icon-small
   rotate: false
-  xy: 1735, 109
+  xy: 2003, 279
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6663,175 +6656,175 @@ pneumatic-drill-icon-full
   index: -1
 pneumatic-drill-icon-large
   rotate: false
-  xy: 1837, 947
+  xy: 1637, 1047
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 pneumatic-drill-icon-medium
   rotate: false
-  xy: 1657, 349
+  xy: 1367, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pneumatic-drill-icon-small
   rotate: false
-  xy: 1761, 109
+  xy: 1873, 253
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 power-node-icon-large
   rotate: false
-  xy: 1887, 947
+  xy: 1637, 997
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 power-node-icon-small
   rotate: false
-  xy: 1787, 109
+  xy: 1899, 253
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 power-node-large-icon-large
   rotate: false
-  xy: 1487, 939
+  xy: 1687, 1047
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 power-node-large-icon-medium
   rotate: false
-  xy: 1725, 349
+  xy: 1265, 326
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node-large-icon-small
   rotate: false
-  xy: 1813, 109
+  xy: 1925, 253
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 power-source-icon-large
   rotate: false
-  xy: 1477, 889
+  xy: 1687, 997
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 power-source-icon-small
   rotate: false
-  xy: 1839, 109
+  xy: 1951, 253
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 power-void-icon-large
   rotate: false
-  xy: 1477, 839
+  xy: 1737, 1047
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 power-void-icon-small
   rotate: false
-  xy: 1865, 109
+  xy: 1977, 253
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 pulse-conduit-icon-full
   rotate: false
-  xy: 1895, 349
+  xy: 1299, 326
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-icon-large
   rotate: false
-  xy: 1527, 889
+  xy: 1737, 997
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 pulse-conduit-icon-small
   rotate: false
-  xy: 1891, 109
+  xy: 2003, 253
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 pulverizer-icon-full
   rotate: false
-  xy: 1063, 273
+  xy: 1401, 360
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-icon-large
   rotate: false
-  xy: 1527, 839
+  xy: 1787, 1047
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 pulverizer-icon-small
   rotate: false
-  xy: 1917, 109
+  xy: 1869, 227
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 pyratite-mixer-icon-large
   rotate: false
-  xy: 1577, 897
+  xy: 1787, 997
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 pyratite-mixer-icon-medium
   rotate: false
-  xy: 1097, 273
+  xy: 1401, 326
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pyratite-mixer-icon-small
   rotate: false
-  xy: 1943, 109
+  xy: 1895, 227
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 repair-point
   rotate: false
-  xy: 1131, 374
+  xy: 1401, 292
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 repair-point-icon-full
   rotate: false
-  xy: 1131, 340
+  xy: 1197, 258
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 repair-point-icon-large
   rotate: false
-  xy: 1627, 897
+  xy: 1837, 989
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 repair-point-icon-small
   rotate: false
-  xy: 1969, 109
+  xy: 1921, 227
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6845,21 +6838,21 @@ revenant-factory-icon-full
   index: -1
 revenant-factory-icon-large
   rotate: false
-  xy: 1627, 847
+  xy: 1887, 997
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 revenant-factory-icon-medium
   rotate: false
-  xy: 1199, 374
+  xy: 1231, 258
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 revenant-factory-icon-small
   rotate: false
-  xy: 1995, 109
+  xy: 1947, 227
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6880,91 +6873,91 @@ ripple-icon-full
   index: -1
 ripple-icon-large
   rotate: false
-  xy: 1677, 847
+  xy: 1887, 947
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ripple-icon-medium
   rotate: false
-  xy: 1131, 306
+  xy: 1265, 258
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ripple-icon-small
   rotate: false
-  xy: 1345, 94
+  xy: 1973, 227
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 rocks-icon-large
   rotate: false
-  xy: 1777, 897
+  xy: 1987, 899
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rocks-icon-small
   rotate: false
-  xy: 1371, 94
+  xy: 1999, 227
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 rotary-pump-icon-large
   rotate: false
-  xy: 1777, 847
+  xy: 1477, 934
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rotary-pump-icon-medium
   rotate: false
-  xy: 1165, 306
+  xy: 1367, 258
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rotary-pump-icon-small
   rotate: false
-  xy: 1397, 91
+  xy: 1865, 201
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 router-icon-large
   rotate: false
-  xy: 1827, 897
+  xy: 1477, 884
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 router-icon-small
   rotate: false
-  xy: 1423, 91
+  xy: 1865, 175
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 rtg-generator-icon-large
   rotate: false
-  xy: 1827, 847
+  xy: 737, 123
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rtg-generator-icon-medium
   rotate: false
-  xy: 1199, 306
+  xy: 1435, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator-icon-small
   rotate: false
-  xy: 1449, 91
+  xy: 1891, 201
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6985,21 +6978,21 @@ salvo-icon-full
   index: -1
 salvo-icon-large
   rotate: false
-  xy: 1877, 897
+  xy: 787, 123
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 salvo-icon-medium
   rotate: false
-  xy: 1233, 306
+  xy: 1435, 360
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salvo-icon-small
   rotate: false
-  xy: 1475, 91
+  xy: 1865, 149
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7013,14 +7006,14 @@ sand-edge
   index: -1
 sand-icon-large
   rotate: false
-  xy: 1877, 847
+  xy: 837, 127
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sand-icon-small
   rotate: false
-  xy: 1501, 83
+  xy: 1891, 175
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7034,147 +7027,147 @@ sand-water-edge
   index: -1
 sand-water-icon-large
   rotate: false
-  xy: 1927, 897
+  xy: 887, 127
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sand-water-icon-small
   rotate: false
-  xy: 1527, 83
+  xy: 1917, 201
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 scrap-wall-gigantic-icon-large
   rotate: false
-  xy: 1927, 847
+  xy: 937, 93
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 scrap-wall-gigantic-icon-medium
   rotate: false
-  xy: 1301, 263
+  xy: 1537, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-gigantic-icon-small
   rotate: false
-  xy: 1553, 83
+  xy: 1865, 123
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 scrap-wall-huge-icon-large
   rotate: false
-  xy: 1577, 797
+  xy: 987, 93
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 scrap-wall-huge-icon-medium
   rotate: false
-  xy: 1335, 352
+  xy: 1469, 305
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-huge-icon-small
   rotate: false
-  xy: 1579, 83
+  xy: 1891, 149
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 scrap-wall-icon-large
   rotate: false
-  xy: 1627, 797
+  xy: 1037, 94
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 scrap-wall-icon-small
   rotate: false
-  xy: 1605, 83
+  xy: 1917, 175
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 scrap-wall-large-icon-large
   rotate: false
-  xy: 1677, 797
+  xy: 1537, 947
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 scrap-wall-large-icon-medium
   rotate: false
-  xy: 1369, 352
+  xy: 1503, 339
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-large-icon-small
   rotate: false
-  xy: 1631, 83
+  xy: 1943, 201
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 separator-icon-large
   rotate: false
-  xy: 1727, 797
+  xy: 1587, 947
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 separator-icon-medium
   rotate: false
-  xy: 1335, 284
+  xy: 1469, 271
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 separator-icon-small
   rotate: false
-  xy: 1709, 83
+  xy: 1865, 97
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 shock-mine-icon-large
   rotate: false
-  xy: 1777, 797
+  xy: 1637, 947
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 shock-mine-icon-small
   rotate: false
-  xy: 1735, 83
+  xy: 1943, 175
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 silicon-smelter-icon-large
   rotate: false
-  xy: 1877, 797
+  xy: 1737, 947
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 silicon-smelter-icon-medium
   rotate: false
-  xy: 1335, 250
+  xy: 1503, 271
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 silicon-smelter-icon-small
   rotate: false
-  xy: 1761, 83
+  xy: 1969, 201
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7188,91 +7181,91 @@ snow-edge
   index: -1
 snow-icon-large
   rotate: false
-  xy: 1927, 797
+  xy: 1787, 947
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snow-icon-small
   rotate: false
-  xy: 1787, 83
+  xy: 1917, 112
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 snowrocks-icon-large
   rotate: false
-  xy: 1937, 1047
+  xy: 1837, 939
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snowrocks-icon-small
   rotate: false
-  xy: 1813, 83
+  xy: 1943, 149
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 solar-panel-icon-large
   rotate: false
-  xy: 1937, 997
+  xy: 1527, 897
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 solar-panel-icon-small
   rotate: false
-  xy: 1839, 83
+  xy: 1969, 175
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 solar-panel-large-icon-large
   rotate: false
-  xy: 1937, 947
+  xy: 1577, 897
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 solar-panel-large-icon-medium
   rotate: false
-  xy: 1437, 281
+  xy: 1087, 171
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel-large-icon-small
   rotate: false
-  xy: 1865, 83
+  xy: 1995, 201
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 sorter-icon-large
   rotate: false
-  xy: 1977, 897
+  xy: 1627, 897
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sorter-icon-small
   rotate: false
-  xy: 1891, 83
+  xy: 1943, 123
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 spawn-icon-large
   rotate: false
-  xy: 1977, 847
+  xy: 1677, 897
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spawn-icon-small
   rotate: false
-  xy: 1917, 83
+  xy: 1969, 149
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7293,21 +7286,21 @@ spectre-icon-full
   index: -1
 spectre-icon-large
   rotate: false
-  xy: 1977, 797
+  xy: 1727, 897
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spectre-icon-medium
   rotate: false
-  xy: 1437, 247
+  xy: 1121, 204
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spectre-icon-small
   rotate: false
-  xy: 1943, 83
+  xy: 1995, 175
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7321,42 +7314,42 @@ spirit-factory-icon-full
   index: -1
 spirit-factory-icon-large
   rotate: false
-  xy: 1201, 838
+  xy: 1827, 889
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spirit-factory-icon-medium
   rotate: false
-  xy: 1471, 247
+  xy: 1121, 170
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spirit-factory-icon-small
   rotate: false
-  xy: 1969, 83
+  xy: 1969, 123
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 spore-cluster-icon-large
   rotate: false
-  xy: 1151, 788
+  xy: 1887, 897
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spore-cluster-icon-medium
   rotate: false
-  xy: 1505, 341
+  xy: 1121, 136
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-cluster-icon-small
   rotate: false
-  xy: 1995, 83
+  xy: 1995, 149
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7370,77 +7363,77 @@ spore-press-icon-full
   index: -1
 spore-press-icon-large
   rotate: false
-  xy: 1251, 838
+  xy: 1937, 883
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 spore-press-icon-medium
   rotate: false
-  xy: 1539, 341
+  xy: 1121, 102
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-press-icon-small
   rotate: false
-  xy: 1709, 57
+  xy: 1995, 123
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 stained-boulder-icon-large
   rotate: false
-  xy: 1201, 788
+  xy: 1987, 849
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 stained-boulder-icon-small
   rotate: false
-  xy: 1735, 57
+  xy: 1943, 97
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 stained-rocks-icon-large
   rotate: false
-  xy: 1251, 788
+  xy: 1527, 847
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 stained-rocks-icon-small
   rotate: false
-  xy: 1761, 57
+  xy: 1969, 97
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 stained-rocks-red-icon-large
   rotate: false
-  xy: 1151, 738
+  xy: 1577, 847
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 stained-rocks-red-icon-small
   rotate: false
-  xy: 1787, 57
+  xy: 1995, 97
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 stained-rocks-yellow-icon-large
   rotate: false
-  xy: 1201, 738
+  xy: 1627, 847
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 stained-rocks-yellow-icon-small
   rotate: false
-  xy: 1813, 57
+  xy: 1917, 86
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7454,14 +7447,14 @@ stained-stone-edge
   index: -1
 stained-stone-icon-large
   rotate: false
-  xy: 1251, 738
+  xy: 1677, 847
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 stained-stone-icon-small
   rotate: false
-  xy: 1839, 57
+  xy: 1891, 81
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7475,14 +7468,14 @@ stained-stone-red-edge
   index: -1
 stained-stone-red-icon-large
   rotate: false
-  xy: 1301, 834
+  xy: 1727, 847
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 stained-stone-red-icon-small
   rotate: false
-  xy: 1865, 57
+  xy: 1943, 71
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7496,14 +7489,14 @@ stained-stone-yellow-edge
   index: -1
 stained-stone-yellow-icon-large
   rotate: false
-  xy: 1301, 784
+  xy: 1777, 847
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 stained-stone-yellow-icon-small
   rotate: false
-  xy: 1891, 57
+  xy: 1969, 71
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7517,70 +7510,70 @@ stone-edge
   index: -1
 stone-icon-large
   rotate: false
-  xy: 1301, 734
+  xy: 1827, 839
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 stone-icon-small
   rotate: false
-  xy: 1917, 57
+  xy: 1995, 71
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 surge-tower-icon-large
   rotate: false
-  xy: 1351, 826
+  xy: 1877, 847
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 surge-tower-icon-medium
   rotate: false
-  xy: 1675, 247
+  xy: 1291, 156
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-tower-icon-small
   rotate: false
-  xy: 1943, 57
+  xy: 1917, 60
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 surge-wall-icon-large
   rotate: false
-  xy: 1401, 826
+  xy: 1927, 833
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 surge-wall-icon-small
   rotate: false
-  xy: 1969, 57
+  xy: 1943, 45
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 surge-wall-large-icon-large
   rotate: false
-  xy: 1351, 776
+  xy: 1877, 797
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 surge-wall-large-icon-medium
   rotate: false
-  xy: 1743, 315
+  xy: 1393, 224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall-large-icon-small
   rotate: false
-  xy: 1995, 57
+  xy: 1969, 45
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7601,21 +7594,21 @@ swarmer-icon-full
   index: -1
 swarmer-icon-large
   rotate: false
-  xy: 1351, 726
+  xy: 1977, 799
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 swarmer-icon-medium
   rotate: false
-  xy: 1709, 247
+  xy: 1291, 122
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 swarmer-icon-small
   rotate: false
-  xy: 1683, 46
+  xy: 1995, 45
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7629,154 +7622,154 @@ tar-edge
   index: -1
 tar-icon-large
   rotate: false
-  xy: 1401, 726
+  xy: 1977, 749
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tar-icon-small
   rotate: false
-  xy: 1709, 31
+  xy: 1657, 119
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 tau-mech-pad-icon-large
   rotate: false
-  xy: 1451, 739
+  xy: 1151, 788
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tau-mech-pad-icon-medium
   rotate: false
-  xy: 1777, 315
+  xy: 1359, 190
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tau-mech-pad-icon-small
   rotate: false
-  xy: 1735, 31
+  xy: 1683, 119
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 thermal-generator-icon-large
   rotate: false
-  xy: 1501, 739
+  xy: 1251, 838
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 thermal-generator-icon-medium
   rotate: false
-  xy: 1743, 247
+  xy: 1427, 224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-generator-icon-small
   rotate: false
-  xy: 1761, 31
+  xy: 1656, 93
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 thermal-pump-icon-large
   rotate: false
-  xy: 1551, 747
+  xy: 1201, 788
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 thermal-pump-icon-medium
   rotate: false
-  xy: 1777, 281
+  xy: 1325, 122
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-pump-icon-small
   rotate: false
-  xy: 1787, 31
+  xy: 1682, 93
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 thorium-reactor-icon-large
   rotate: false
-  xy: 1601, 747
+  xy: 1251, 788
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 thorium-reactor-icon-medium
   rotate: false
-  xy: 1845, 315
+  xy: 1393, 156
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-reactor-icon-small
   rotate: false
-  xy: 1813, 31
+  xy: 1656, 67
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 thorium-wall-icon-large
   rotate: false
-  xy: 1651, 747
+  xy: 1151, 738
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 thorium-wall-icon-small
   rotate: false
-  xy: 1839, 31
+  xy: 1682, 67
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 thorium-wall-large-icon-large
   rotate: false
-  xy: 1701, 747
+  xy: 1201, 738
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 thorium-wall-large-icon-medium
   rotate: false
-  xy: 1845, 281
+  xy: 1393, 122
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall-large-icon-small
   rotate: false
-  xy: 1865, 31
+  xy: 1709, 103
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 thruster-icon-large
   rotate: false
-  xy: 1751, 747
+  xy: 1251, 738
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 thruster-icon-medium
   rotate: false
-  xy: 1879, 315
+  xy: 1427, 156
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thruster-icon-small
   rotate: false
-  xy: 1891, 31
+  xy: 1708, 77
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7790,112 +7783,112 @@ titan-factory-icon-full
   index: -1
 titan-factory-icon-large
   rotate: false
-  xy: 1801, 747
+  xy: 1301, 834
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 titan-factory-icon-medium
   rotate: false
-  xy: 1845, 247
+  xy: 1427, 122
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titan-factory-icon-small
   rotate: false
-  xy: 1917, 31
+  xy: 1735, 93
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 titanium-conveyor-icon-large
   rotate: false
-  xy: 1851, 747
+  xy: 1351, 834
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 titanium-conveyor-icon-small
   rotate: false
-  xy: 1943, 31
+  xy: 1761, 85
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 titanium-wall-icon-large
   rotate: false
-  xy: 1901, 747
+  xy: 1301, 784
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 titanium-wall-icon-small
   rotate: false
-  xy: 1969, 31
+  xy: 1787, 85
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 titanium-wall-large-icon-large
   rotate: false
-  xy: 1951, 747
+  xy: 1401, 834
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 titanium-wall-large-icon-medium
   rotate: false
-  xy: 1981, 213
+  xy: 1563, 203
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-large-icon-small
   rotate: false
-  xy: 1995, 31
+  xy: 1813, 85
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 trident-ship-pad-icon-large
   rotate: false
-  xy: 1451, 689
+  xy: 1351, 784
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 trident-ship-pad-icon-medium
   rotate: false
-  xy: 1071, 239
+  xy: 1563, 135
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 trident-ship-pad-icon-small
   rotate: false
-  xy: 1170, 178
+  xy: 1839, 85
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 turbine-generator-icon-large
   rotate: false
-  xy: 1501, 689
+  xy: 1451, 834
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 turbine-generator-icon-medium
   rotate: false
-  xy: 1071, 205
+  xy: 1563, 101
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 turbine-generator-icon-small
   rotate: false
-  xy: 1196, 178
+  xy: 1865, 71
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7909,14 +7902,14 @@ unit-icon-chaos-array
   index: -1
 unit-icon-crawler
   rotate: false
-  xy: 1551, 697
+  xy: 1401, 784
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unit-icon-dagger
   rotate: false
-  xy: 1601, 697
+  xy: 1451, 784
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -7951,35 +7944,35 @@ unit-icon-titan
   index: -1
 unloader-icon-large
   rotate: false
-  xy: 1651, 697
+  xy: 1301, 734
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 unloader-icon-small
   rotate: false
-  xy: 1188, 152
+  xy: 1891, 55
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 vault-icon-large
   rotate: false
-  xy: 1701, 697
+  xy: 1351, 734
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 vault-icon-medium
   rotate: false
-  xy: 1071, 137
+  xy: 1099, 68
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 vault-icon-small
   rotate: false
-  xy: 1137, 2
+  xy: 1917, 34
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -8000,35 +7993,35 @@ water-extractor-icon-full
   index: -1
 water-extractor-icon-large
   rotate: false
-  xy: 1751, 697
+  xy: 1401, 734
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 water-extractor-icon-medium
   rotate: false
-  xy: 1105, 238
+  xy: 1571, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-extractor-icon-small
   rotate: false
-  xy: 1163, 4
+  xy: 1734, 67
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 water-icon-large
   rotate: false
-  xy: 1801, 697
+  xy: 1451, 734
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 water-icon-small
   rotate: false
-  xy: 1189, 4
+  xy: 1708, 51
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -8049,63 +8042,63 @@ wave-icon-full
   index: -1
 wave-icon-large
   rotate: false
-  xy: 1851, 697
+  xy: 1501, 797
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 wave-icon-medium
   rotate: false
-  xy: 1139, 238
+  xy: 1571, 355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wave-icon-small
   rotate: false
-  xy: 2022, 135
+  xy: 1760, 59
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 white-tree-dead-icon-large
   rotate: false
-  xy: 1901, 697
+  xy: 1501, 747
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 white-tree-dead-icon-medium
   rotate: false
-  xy: 1105, 204
+  xy: 1571, 321
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white-tree-dead-icon-small
   rotate: false
-  xy: 2021, 109
+  xy: 1786, 59
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 white-tree-icon-large
   rotate: false
-  xy: 1951, 697
+  xy: 1551, 797
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 white-tree-icon-medium
   rotate: false
-  xy: 1173, 238
+  xy: 1571, 287
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white-tree-icon-small
   rotate: false
-  xy: 2021, 83
+  xy: 1812, 59
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -8119,217 +8112,217 @@ wraith-factory-icon-full
   index: -1
 wraith-factory-icon-large
   rotate: false
-  xy: 1601, 647
+  xy: 1601, 797
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 wraith-factory-icon-medium
   rotate: false
-  xy: 1105, 170
+  xy: 1571, 253
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wraith-factory-icon-small
   rotate: false
-  xy: 2021, 57
+  xy: 1838, 59
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-biomatter
   rotate: false
-  xy: 1841, 519
+  xy: 1297, 496
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 1875, 553
+  xy: 1339, 564
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1841, 485
+  xy: 1331, 530
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 1875, 519
+  xy: 1373, 598
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 1909, 553
+  xy: 1441, 632
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 1875, 485
+  xy: 1331, 496
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 1909, 519
+  xy: 1373, 564
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 1943, 553
+  xy: 1365, 530
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 1909, 485
+  xy: 1407, 598
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 1943, 519
+  xy: 1365, 496
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 1943, 485
+  xy: 1407, 564
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 1977, 553
+  xy: 1399, 530
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 1977, 519
+  xy: 1441, 598
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 1989, 587
+  xy: 1441, 564
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 2011, 553
+  xy: 1433, 530
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 2011, 519
+  xy: 1433, 496
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 2011, 485
+  xy: 1475, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 1945, 1163
+  xy: 1467, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 1979, 1165
+  xy: 1535, 509
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 1979, 1097
+  xy: 1569, 475
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 1987, 995
+  xy: 1611, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 alpha-mech
   rotate: false
-  xy: 511, 291
+  xy: 685, 423
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-mech-base
   rotate: false
-  xy: 577, 365
+  xy: 735, 427
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 alpha-mech-leg
   rotate: false
-  xy: 627, 365
+  xy: 785, 427
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-mech
   rotate: false
-  xy: 1707, 1197
+  xy: 1387, 984
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-mech-base
   rotate: false
-  xy: 1757, 1197
+  xy: 1377, 934
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 delta-mech-leg
   rotate: false
-  xy: 1807, 1197
+  xy: 1377, 884
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 omega-mech
   rotate: false
-  xy: 455, 1
+  xy: 455, 59
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -8343,42 +8336,42 @@ omega-mech-armor
   index: -1
 omega-mech-base
   rotate: false
-  xy: 479, 117
+  xy: 455, 1
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 omega-mech-leg
   rotate: false
-  xy: 513, 59
+  xy: 479, 117
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 tau-mech
   rotate: false
-  xy: 635, 415
+  xy: 577, 415
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 tau-mech-base
   rotate: false
-  xy: 1451, 789
+  xy: 1151, 838
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 tau-mech-leg
   rotate: false
-  xy: 1501, 789
+  xy: 1201, 838
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dart-ship
   rotate: false
-  xy: 1607, 1197
+  xy: 1387, 1084
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -8390,30 +8383,37 @@ glaive-ship
   orig: 56, 56
   offset: 0, 0
   index: -1
+mech-icon-glaive-ship
+  rotate: false
+  xy: 421, 117
+  size: 56, 56
+  orig: 56, 56
+  offset: 0, 0
+  index: -1
 javelin-ship
   rotate: false
-  xy: 1645, 1147
+  xy: 561, 315
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
+mech-icon-javelin-ship
+  rotate: false
+  xy: 561, 315
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 javelin-ship-shield
   rotate: false
-  xy: 1745, 1147
+  xy: 611, 315
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
-trident-ship
-  rotate: false
-  xy: 519, 391
-  size: 56, 56
-  orig: 56, 56
-  offset: 0, 0
-  index: -1
 blank
   rotate: false
-  xy: 1398, 169
+  xy: 2003, 1407
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -8427,7 +8427,7 @@ circle
   index: -1
 clear
   rotate: false
-  xy: 2003, 1407
+  xy: 1173, 680
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -8441,7 +8441,7 @@ shape-3
   index: -1
 bar
   rotate: false
-  xy: 1290, 123
+  xy: 1627, 63
   size: 27, 36
   split: 9, 9, 9, 9
   orig: 27, 36
@@ -8449,7 +8449,7 @@ bar
   index: -1
 bar-top
   rotate: false
-  xy: 1139, 160
+  xy: 1627, 101
   size: 27, 36
   split: 9, 10, 9, 10
   orig: 27, 36
@@ -8457,7 +8457,7 @@ bar-top
   index: -1
 button
   rotate: false
-  xy: 1223, 709
+  xy: 789, 94
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -8521,7 +8521,7 @@ button-over
   index: -1
 button-right
   rotate: false
-  xy: 1185, 709
+  xy: 747, 52
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -8545,7 +8545,7 @@ button-right-over
   index: -1
 button-select
   rotate: false
-  xy: 1319, 135
+  xy: 1636, 379
   size: 24, 24
   split: 4, 4, 4, 4
   orig: 24, 24
@@ -8553,28 +8553,28 @@ button-select
   index: -1
 check-off
   rotate: false
-  xy: 1207, 238
+  xy: 2019, 545
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-on
   rotate: false
-  xy: 1237, 238
+  xy: 2019, 511
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-on-over
   rotate: false
-  xy: 1170, 204
+  xy: 2019, 477
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-over
   rotate: false
-  xy: 1200, 204
+  xy: 1605, 343
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
@@ -8588,7 +8588,7 @@ clear
   index: -1
 content-background
   rotate: false
-  xy: 1135, 667
+  xy: 621, 10
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -8596,7 +8596,7 @@ content-background
   index: -1
 content-background-locked
   rotate: false
-  xy: 1261, 709
+  xy: 2003, 1439
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -8604,7 +8604,7 @@ content-background-locked
   index: -1
 content-background-over
   rotate: false
-  xy: 1299, 705
+  xy: 2003, 1410
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -8626,77 +8626,77 @@ discord-banner
   index: -1
 empty-sector
   rotate: false
-  xy: 1753, 621
+  xy: 2009, 579
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-crafting
   rotate: false
-  xy: 2031, 397
+  xy: 845, 987
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-defense
   rotate: false
-  xy: 2031, 379
+  xy: 527, 1543
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-distribution
   rotate: false
-  xy: 2031, 361
+  xy: 1109, 953
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-effect
   rotate: false
-  xy: 1188, 134
+  xy: 433, 27
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-liquid
   rotate: false
-  xy: 1135, 573
+  xy: 527, 1525
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-power
   rotate: false
-  xy: 527, 1525
+  xy: 473, 1000
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-production
   rotate: false
-  xy: 893, 441
+  xy: 491, 1000
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-turret
   rotate: false
-  xy: 625, 3
+  xy: 2029, 265
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-units
   rotate: false
-  xy: 437, 1000
+  xy: 1133, 66
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-upgrade
   rotate: false
-  xy: 473, 1000
+  xy: 1169, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -8717,21 +8717,21 @@ icon-about
   index: -1
 icon-add
   rotate: false
-  xy: 561, 375
+  xy: 623, 923
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-admin
   rotate: false
-  xy: 623, 923
+  xy: 1861, 823
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-admin-small
   rotate: false
-  xy: 603, 257
+  xy: 1837, 1089
   size: 6, 6
   orig: 6, 6
   offset: 0, 0
@@ -8745,14 +8745,14 @@ icon-areaDelete
   index: -1
 icon-arrow
   rotate: false
-  xy: 1045, 391
+  xy: 571, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-16
   rotate: false
-  xy: 1045, 391
+  xy: 571, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -8773,392 +8773,392 @@ icon-arrow-left
   index: -1
 icon-arrow-right
   rotate: false
-  xy: 777, 365
+  xy: 1915, 785
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-up
   rotate: false
-  xy: 1173, 684
+  xy: 845, 1071
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-back
   rotate: false
-  xy: 471, 637
+  xy: 1571, 457
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-ban
   rotate: false
-  xy: 927, 377
+  xy: 1571, 237
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-break
   rotate: false
-  xy: 489, 637
+  xy: 471, 637
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-cancel
   rotate: false
-  xy: 1168, 160
+  xy: 589, 1
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-cancel-2
   rotate: false
-  xy: 1999, 187
+  xy: 1709, 223
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 icon-chat
   rotate: false
-  xy: 1365, 591
+  xy: 845, 1495
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-check
   rotate: false
-  xy: 2031, 433
+  xy: 489, 637
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-check-2
   rotate: false
-  xy: 1141, 108
+  xy: 1657, 145
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 icon-copy
   rotate: false
-  xy: 2031, 415
+  xy: 845, 1543
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-cursor
   rotate: false
-  xy: 961, 227
+  xy: 1109, 905
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-database
   rotate: false
-  xy: 1641, 359
+  xy: 845, 971
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-database-small
   rotate: false
-  xy: 775, 77
+  xy: 1213, 1228
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-dev-builds
   rotate: false
-  xy: 1551, 797
+  xy: 535, 1084
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-discord
   rotate: false
-  xy: 845, 971
+  xy: 623, 907
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-donate
   rotate: false
-  xy: 911, 427
+  xy: 1861, 807
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-dots
   rotate: false
-  xy: 2025, 161
+  xy: 561, 433
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-editor
   rotate: false
-  xy: 2025, 641
+  xy: 561, 417
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-egg
   rotate: false
-  xy: 535, 1084
+  xy: 903, 227
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-elevation
   rotate: false
-  xy: 845, 1543
+  xy: 477, 1698
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-eraser
   rotate: false
-  xy: 845, 987
+  xy: 713, 147
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-exit
   rotate: false
-  xy: 623, 907
+  xy: 919, 227
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-file
   rotate: false
-  xy: 527, 1543
+  xy: 1475, 648
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-image
   rotate: false
-  xy: 893, 459
+  xy: 1645, 609
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-text
   rotate: false
-  xy: 943, 377
+  xy: 2032, 2033
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-fill
   rotate: false
-  xy: 1109, 953
+  xy: 1897, 1345
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-floppy
   rotate: false
-  xy: 1214, 162
+  xy: 2032, 2017
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-floppy-16
   rotate: false
-  xy: 477, 1698
+  xy: 1133, 84
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-folder
   rotate: false
-  xy: 1993, 1199
+  xy: 2032, 2001
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-folder-parent
   rotate: false
-  xy: 959, 377
+  xy: 2032, 1985
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-generated
   rotate: false
-  xy: 927, 393
+  xy: 1101, 805
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 icon-github
   rotate: false
-  xy: 1434, 710
+  xy: 2032, 1969
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-google-play
   rotate: false
-  xy: 2032, 2033
+  xy: 2032, 1953
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-grid
   rotate: false
-  xy: 431, 27
+  xy: 885, 433
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-hold
   rotate: false
-  xy: 2023, 587
+  xy: 1323, 1373
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-holdDelete
   rotate: false
-  xy: 845, 1071
+  xy: 1345, 1194
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-home
   rotate: false
-  xy: 1229, 102
+  xy: 1044, 461
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-host
   rotate: false
-  xy: 1247, 120
+  xy: 1044, 445
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-info
   rotate: false
-  xy: 1434, 694
+  xy: 2025, 231
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-itch.io
   rotate: false
-  xy: 2032, 2017
+  xy: 1943, 29
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-item
   rotate: false
-  xy: 2031, 349
+  xy: 1323, 1361
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-items-none
   rotate: false
-  xy: 526, 1951
+  xy: 1897, 1297
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-line
   rotate: false
-  xy: 1897, 1345
+  xy: 845, 1525
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-link
   rotate: false
-  xy: 1229, 86
+  xy: 1959, 29
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-liquid-small
   rotate: false
-  xy: 845, 1495
+  xy: 2037, 987
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-load
   rotate: false
-  xy: 1263, 120
+  xy: 1975, 29
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-load-image
   rotate: false
-  xy: 1275, 585
+  xy: 1109, 935
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-load-map
   rotate: false
-  xy: 681, 139
+  xy: 433, 9
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-loading
   rotate: false
-  xy: 571, 3
+  xy: 495, 1698
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-locked
   rotate: false
-  xy: 1267, 245
+  xy: 713, 129
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-logic
   rotate: false
-  xy: 1109, 905
+  xy: 2037, 975
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-map
   rotate: false
-  xy: 2032, 2001
+  xy: 1991, 29
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-menu
   rotate: false
-  xy: 1213, 1228
+  xy: 2037, 963
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-menu-large
   rotate: false
-  xy: 1991, 623
+  xy: 845, 1507
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-missing
   rotate: false
-  xy: 1323, 1373
+  xy: 2037, 951
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -9172,329 +9172,329 @@ icon-mission-background
   index: -1
 icon-mission-battle
   rotate: false
-  xy: 1345, 1194
+  xy: 2037, 939
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-defense
   rotate: false
-  xy: 789, 365
+  xy: 2037, 927
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-done
   rotate: false
-  xy: 973, 227
+  xy: 2037, 915
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-none
   rotate: false
-  xy: 787, 77
+  xy: 2037, 903
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-paste
   rotate: false
-  xy: 2025, 195
+  xy: 1109, 917
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pause
   rotate: false
-  xy: 1323, 1361
+  xy: 2037, 891
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-pencil
   rotate: false
-  xy: 2021, 39
+  xy: 437, 1000
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pencil-small
   rotate: false
-  xy: 1229, 70
+  xy: 2007, 29
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-pick
   rotate: false
-  xy: 845, 1525
+  xy: 455, 1000
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-play
   rotate: false
-  xy: 985, 227
+  xy: 2037, 879
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-play-2
   rotate: false
-  xy: 2032, 1985
+  xy: 1864, 55
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-play-custom
   rotate: false
-  xy: 1229, 54
+  xy: 2027, 833
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-players
   rotate: false
-  xy: 537, 165
+  xy: 2037, 867
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-power-requirement
   rotate: false
-  xy: 1739, 485
+  xy: 1305, 598
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-power-small
   rotate: false
-  xy: 2035, 587
+  xy: 2037, 855
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-quit
   rotate: false
-  xy: 2032, 1969
+  xy: 2027, 817
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-redo
   rotate: false
-  xy: 1109, 935
+  xy: 509, 1000
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-refresh
   rotate: false
-  xy: 2032, 1953
+  xy: 2027, 801
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rename
   rotate: false
-  xy: 1229, 38
+  xy: 2027, 785
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-resize
   rotate: false
-  xy: 495, 1698
+  xy: 2029, 391
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-rotate
   rotate: false
-  xy: 2021, 23
+  xy: 2027, 769
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-arrow
   rotate: false
-  xy: 2027, 941
+  xy: 2027, 753
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-left
   rotate: false
-  xy: 2027, 925
+  xy: 1611, 637
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-right
   rotate: false
-  xy: 2027, 909
+  xy: 773, 10
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save
   rotate: false
-  xy: 2027, 893
+  xy: 789, 10
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save-image
   rotate: false
-  xy: 431, 9
+  xy: 2029, 373
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-save-map
   rotate: false
-  xy: 589, 3
+  xy: 2029, 355
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-settings
   rotate: false
-  xy: 1275, 671
+  xy: 1587, 241
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-spray
   rotate: false
-  xy: 2025, 177
+  xy: 2029, 337
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-terrain
   rotate: false
-  xy: 845, 1507
+  xy: 2029, 319
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tools
   rotate: false
-  xy: 2027, 877
+  xy: 887, 9
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-touch
   rotate: false
-  xy: 661, 9
+  xy: 1, 3
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 1907, 1291
+  xy: 1244, 688
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-trash
   rotate: false
-  xy: 2027, 861
+  xy: 903, 9
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-trash-16
   rotate: false
-  xy: 1109, 917
+  xy: 2029, 301
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tree
   rotate: false
-  xy: 607, 3
+  xy: 2029, 283
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tree-locked
   rotate: false
-  xy: 1773, 519
+  xy: 1373, 632
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-trello
   rotate: false
-  xy: 2027, 845
+  xy: 919, 9
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-tutorial
   rotate: false
-  xy: 2027, 829
+  xy: 935, 9
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-undo
   rotate: false
-  xy: 643, 3
+  xy: 1734, 49
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-unlocked
   rotate: false
-  xy: 455, 1000
+  xy: 1151, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-unlocks
   rotate: false
-  xy: 2027, 813
+  xy: 951, 9
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-wiki
   rotate: false
-  xy: 2027, 797
+  xy: 967, 9
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-zone
   rotate: false
-  xy: 1141, 82
+  xy: 1683, 171
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 icon-zone-locked
   rotate: false
-  xy: 1907, 1197
+  xy: 389, 1
   size: 42, 42
   orig: 42, 42
   offset: 0, 0
   index: -1
 icon-zoom
   rotate: false
-  xy: 491, 1000
+  xy: 1187, 70
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-zoom-small
   rotate: false
-  xy: 1337, 710
+  xy: 983, 9
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -9508,7 +9508,7 @@ info-banner
   index: -1
 inventory
   rotate: false
-  xy: 2023, 599
+  xy: 1709, 155
   size: 24, 40
   split: 10, 10, 10, 14
   orig: 24, 40
@@ -9523,7 +9523,7 @@ logotext
   index: -1
 pane
   rotate: false
-  xy: 2003, 1410
+  xy: 1181, 709
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -9531,7 +9531,7 @@ pane
   index: -1
 pane-2
   rotate: false
-  xy: 2003, 1439
+  xy: 1143, 709
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -9539,7 +9539,7 @@ pane-2
   index: -1
 scroll
   rotate: false
-  xy: 1683, 72
+  xy: 1917, 138
   size: 24, 35
   split: 10, 10, 6, 5
   orig: 24, 35
@@ -9547,7 +9547,7 @@ scroll
   index: -1
 scroll-horizontal
   rotate: false
-  xy: 1261, 683
+  xy: 1173, 683
   size: 35, 24
   split: 6, 5, 10, 10
   orig: 35, 24
@@ -9563,7 +9563,7 @@ scroll-knob-horizontal-black
   index: -1
 scroll-knob-vertical-black
   rotate: false
-  xy: 1657, 67
+  xy: 1891, 107
   size: 24, 40
   split: 10, 10, 6, 10
   orig: 24, 40
@@ -9571,42 +9571,42 @@ scroll-knob-vertical-black
   index: -1
 sector-select
   rotate: false
-  xy: 1335, 318
+  xy: 1537, 373
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 selection
   rotate: false
-  xy: 1433, 587
+  xy: 1061, 244
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 slider
   rotate: false
-  xy: 1136, 160
+  xy: 1766, 387
   size: 1, 8
   orig: 1, 8
   offset: 0, 0
   index: -1
 slider-knob
   rotate: false
-  xy: 1139, 198
+  xy: 1605, 417
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-down
   rotate: false
-  xy: 1105, 130
+  xy: 1605, 377
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-over
   rotate: false
-  xy: 1105, 130
+  xy: 1605, 377
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
@@ -9620,7 +9620,7 @@ slider-vertical
   index: -1
 underline
   rotate: false
-  xy: 1223, 680
+  xy: 1135, 680
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -9628,7 +9628,7 @@ underline
   index: -1
 underline-2
   rotate: false
-  xy: 1185, 680
+  xy: 1257, 709
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -9643,7 +9643,7 @@ white
   index: -1
 window-empty
   rotate: false
-  xy: 1320, 187
+  xy: 2017, 686
   size: 27, 61
   split: 8, 8, 44, 11
   orig: 27, 61
@@ -9672,42 +9672,42 @@ chaos-array-leg
   index: -1
 crawler
   rotate: false
-  xy: 1657, 1247
+  xy: 1757, 1197
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-base
   rotate: false
-  xy: 1707, 1247
+  xy: 1807, 1197
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 crawler-leg
   rotate: false
-  xy: 1757, 1247
+  xy: 1857, 1197
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger
   rotate: false
-  xy: 1407, 1189
+  xy: 1337, 984
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-base
   rotate: false
-  xy: 1457, 1189
+  xy: 1327, 934
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 dagger-leg
   rotate: false
-  xy: 1557, 1197
+  xy: 1395, 1134
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -9798,14 +9798,14 @@ lich
   index: -1
 phantom
   rotate: false
-  xy: 513, 1
+  xy: 513, 59
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
   index: -1
 power-cell
   rotate: false
-  xy: 577, 415
+  xy: 513, 1
   size: 56, 56
   orig: 56, 56
   offset: 0, 0
@@ -9826,7 +9826,7 @@ revenant
   index: -1
 spirit
   rotate: false
-  xy: 1151, 838
+  xy: 1777, 897
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -9847,42 +9847,42 @@ titan-leg
   index: -1
 wraith
   rotate: false
-  xy: 1551, 647
+  xy: 1551, 747
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 artillery-equip
   rotate: false
-  xy: 611, 307
+  xy: 537, 119
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 blaster-equip
   rotate: false
-  xy: 793, 427
+  xy: 1457, 1239
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 bomber-equip
   rotate: false
-  xy: 843, 427
+  xy: 1507, 1247
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 missiles-equip
   rotate: false
-  xy: 843, 427
+  xy: 1507, 1247
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 chain-blaster-equip
   rotate: false
-  xy: 603, 207
+  xy: 1657, 1247
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -9903,63 +9903,63 @@ eradication-equip
   index: -1
 eruption-equip
   rotate: false
-  xy: 1387, 1076
+  xy: 1845, 1139
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 flakgun-equip
   rotate: false
-  xy: 1387, 1026
+  xy: 1895, 1147
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 flamethrower-equip
   rotate: false
-  xy: 727, 365
+  xy: 1945, 1283
   size: 48, 56
   orig: 48, 56
   offset: 0, 0
   index: -1
 heal-blaster-equip
   rotate: false
-  xy: 761, 265
+  xy: 1945, 1083
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 lich-missiles-equip
   rotate: false
-  xy: 1895, 1147
+  xy: 711, 373
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 reaper-gun-equip
   rotate: false
-  xy: 1577, 847
+  xy: 1837, 1039
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 revenant-missiles-equip
   rotate: false
-  xy: 1677, 897
+  xy: 1937, 983
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 1827, 797
+  xy: 1687, 947
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 swarmer-equip
   rotate: false
-  xy: 1401, 776
+  xy: 1927, 783
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 257f713704..1ee2a9c4e8 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/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java
index db9d58e5f5..16f1740846 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -731,7 +731,7 @@ public class Blocks implements ContentList{
 
         rotaryPump = new Pump("rotary-pump"){{
             requirements(Category.liquid, ItemStack.with(Items.copper, 140, Items.lead, 100, Items.silicon, 40, Items.titanium, 70));
-            pumpAmount = 0.2f;
+            pumpAmount = 0.8f;
             consumes.power(1.50f);
             liquidCapacity = 30f;
             hasPower = true;
@@ -740,7 +740,7 @@ public class Blocks implements ContentList{
 
         thermalPump = new Pump("thermal-pump"){{
             requirements(Category.liquid, ItemStack.with(Items.copper, 160, Items.lead, 130, Items.silicon, 60, Items.titanium, 80, Items.thorium, 70));
-            pumpAmount = 0.22f;
+            pumpAmount = 1.95f;
             consumes.power(0.30f);
             liquidCapacity = 40f;
             hasPower = true;
diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java
index bcc7a59e52..e0f4ed0a96 100644
--- a/core/src/io/anuke/mindustry/content/Bullets.java
+++ b/core/src/io/anuke/mindustry/content/Bullets.java
@@ -359,6 +359,7 @@ public class Bullets implements ContentList{
             float healPercent = 3f;
 
             {
+                shootEffect = Fx.shootHeal;
                 hitEffect = Fx.hitLaser;
                 despawnEffect = Fx.hitLaser;
                 collidesTeam = true;
diff --git a/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java b/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java
index 3146027b26..bc94ecbec9 100644
--- a/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java
+++ b/core/src/io/anuke/mindustry/entities/effect/RubbleDecal.java
@@ -35,6 +35,10 @@ public class RubbleDecal extends Decal{
 
     @Override
     public void drawDecal(){
+        if(!Core.atlas.isFound(region)){
+            remove();
+            return;
+        }
         Draw.rect(region, x, y, Mathf.randomSeed(id, 0, 4) * 90);
     }
 }
diff --git a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
index b13a42a145..8ab693b898 100644
--- a/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/BlockRenderer.java
@@ -25,7 +25,7 @@ import static io.anuke.mindustry.Vars.*;
 
 public class BlockRenderer{
     private final static int initialRequests = 32 * 32;
-    private final static int expandr = 6;
+    private final static int expandr = 9;
     private final static boolean disableShadows = false;
     private final static Color shadowColor = new Color(0, 0, 0, 0.19f);
 
diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
index 37af6a825e..271edfe646 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
@@ -467,6 +467,6 @@ public class HudFragment extends Fragment{
             }
         }).growY().fillX().right().width(40f)
         .visible(() -> state.rules.waves && ((Net.server() || players[0].isAdmin) || !Net.active()) && state.enemies() == 0
-        && state.wavetime < state.rules.waveSpacing - 60);
+        && (state.wavetime < state.rules.waveSpacing - 60 || !state.rules.waveTimer));
     }
 }
diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java b/core/src/io/anuke/mindustry/world/blocks/production/Pump.java
index 8201f434be..e788e380fb 100644
--- a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java
+++ b/core/src/io/anuke/mindustry/world/blocks/production/Pump.java
@@ -19,7 +19,7 @@ public class Pump extends LiquidBlock{
 
     protected final int timerContentCheck = timers++;
 
-    /**Pump amount per tile this block is on.*/
+    /**Pump amount, total.*/
     protected float pumpAmount = 1f;
 
     public Pump(String name){
@@ -40,7 +40,7 @@ public class Pump extends LiquidBlock{
     @Override
     public void setStats(){
         super.setStats();
-        stats.add(BlockStat.liquidOutputSpeed, 60f * pumpAmount * size * size, StatUnit.liquidSecond);
+        stats.add(BlockStat.liquidOutputSpeed, 60f * pumpAmount, StatUnit.liquidSecond);
     }
 
     @Override
@@ -93,7 +93,7 @@ public class Pump extends LiquidBlock{
         }
 
         if(tile.entity.cons.valid() && liquidDrop != null){
-            float maxPump = Math.min(liquidCapacity - tile.entity.liquids.total(), tiles * pumpAmount * tile.entity.delta());
+            float maxPump = Math.min(liquidCapacity - tile.entity.liquids.total(), tiles * pumpAmount * tile.entity.delta() / size / size);
             if(hasPower){
                 maxPump *= tile.entity.power.satisfaction; // Produce slower if not at full power
             }
diff --git a/tools/build.gradle b/tools/build.gradle
index c7dc080848..3eace0a0c7 100644
--- a/tools/build.gradle
+++ b/tools/build.gradle
@@ -11,7 +11,7 @@ import java.awt.image.BufferedImage
 
 def outFolder = "../core/assets-raw/sprites_out/"
 def genFolder = "../core/assets-raw/sprites_out/generated/"
-def doAntialias = true
+def doAntialias = !project.hasProperty("disableAntialias")
 
 def antialias = {File file ->
     if(!doAntialias || file.lastModified() <= 1000) return
diff --git a/tools/src/io/anuke/mindustry/Generators.java b/tools/src/io/anuke/mindustry/Generators.java
index bb41728471..e2a030ea3f 100644
--- a/tools/src/io/anuke/mindustry/Generators.java
+++ b/tools/src/io/anuke/mindustry/Generators.java
@@ -147,10 +147,10 @@ public class Generators {
                     image.drawCenter(mech.region);
                 }
 
-                int off = (image.width() - mech.weapon.region.getWidth())/2;
+                int off = image.width()/2 - mech.weapon.region.getWidth()/2;
 
-                image.draw(mech.weapon.region, -(int)mech.weaponOffsetX + off, (int)mech.weaponOffsetY + off, false, false);
-                image.draw(mech.weapon.region, (int)mech.weaponOffsetX + off, (int)mech.weaponOffsetY + off, true, false);
+                image.draw(mech.weapon.region, -(int)mech.weaponOffsetX + off, (int)mech.weaponOffsetY + off + 4, false, false);
+                image.draw(mech.weapon.region, (int)mech.weaponOffsetX + off, (int)mech.weaponOffsetY + off + 4, true, false);
 
 
                 image.save("mech-icon-" + mech.name);
diff --git a/tools/src/io/anuke/mindustry/Image.java b/tools/src/io/anuke/mindustry/Image.java
index 36e1f6ccc1..d64214501c 100644
--- a/tools/src/io/anuke/mindustry/Image.java
+++ b/tools/src/io/anuke/mindustry/Image.java
@@ -101,21 +101,11 @@ class Image {
 
         int ofx = 0, ofy = 0;
 
-        if(x < 0){
-            ofx = x;
-            x = 0;
-        }
-
-        if(y < 0){
-            ofy = y;
-            y = 0;
-        }
-
         graphics.drawImage(ImagePacker.get(region).image,
                 x, y,
                 x + region.getWidth(),
                 y + region.getHeight(),
-                (flipx ?  region.getWidth() : 0) + ofx,
+                (flipx ? region.getWidth() : 0) + ofx,
                 (flipy ? region.getHeight() : 0) + ofy,
                 (flipx ? 0 : region.getWidth()) + ofx,
                 (flipy ? 0 : region.getHeight()) + ofy,