diff --git a/README.md b/README.md
index 616f6d2584..85b5a0b5e8 100644
--- a/README.md
+++ b/README.md
@@ -31,9 +31,7 @@ Server builds are bundled with each released build (in Releases). If you'd rathe
 
 ##### Troubleshooting
 
-If the terminal returns `Permission denied` or `Command not found` on Mac/Linux, run `chmod +x ./gradlew` before running `./gradlew`. 
-
-NOTE: this is a one-time procedure.
+If the terminal returns `Permission denied` or `Command not found` on Mac/Linux, run `chmod +x ./gradlew` before running `./gradlew`. *This is a one-time procedure.*
 
 ---
 
diff --git a/core/assets-raw/sprites_replacement/blocks/environment/pine.png b/core/assets-raw/sprites_replacement/blocks/environment/pine.png
index 661c4caeb7..fcdc3e71fc 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/environment/pine.png and b/core/assets-raw/sprites_replacement/blocks/environment/pine.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/environment/spore-pine.png b/core/assets-raw/sprites_replacement/blocks/environment/spore-pine.png
new file mode 100644
index 0000000000..661c4caeb7
Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/spore-pine.png differ
diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png
index 5d2c7c093d..2a3c0eb69e 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 fd8aebe2f1..844d7e5b76 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -216,140 +216,140 @@ conveyor-4-3
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1705, 799
+  xy: 1739, 803
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 1739, 803
+  xy: 449, 530
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 449, 530
+  xy: 449, 496
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 449, 496
+  xy: 449, 462
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 449, 462
+  xy: 445, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 445, 428
+  xy: 445, 394
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 445, 394
+  xy: 445, 360
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 445, 360
+  xy: 445, 326
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 445, 326
+  xy: 445, 292
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 445, 292
+  xy: 445, 258
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 445, 258
+  xy: 445, 224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 445, 224
+  xy: 445, 190
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 445, 190
+  xy: 445, 156
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 445, 156
+  xy: 445, 122
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 445, 122
+  xy: 445, 88
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 445, 88
+  xy: 1447, 761
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 1447, 761
+  xy: 1447, 727
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 1447, 727
+  xy: 1446, 693
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1446, 693
+  xy: 1446, 659
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1446, 659
+  xy: 1739, 769
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1553,7 +1553,7 @@ sortedunloader
   index: -1
 unloader
   rotate: false
-  xy: 479, 292
+  xy: 479, 258
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2001,7 +2001,7 @@ scrap-wall5
   index: -1
 surge-wall
   rotate: false
-  xy: 1705, 901
+  xy: 1705, 867
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2015,7 +2015,7 @@ surge-wall-large
   index: -1
 thorium-wall
   rotate: false
-  xy: 1739, 905
+  xy: 1739, 871
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2036,7 +2036,7 @@ thruster
   index: -1
 titanium-wall
   rotate: false
-  xy: 1739, 769
+  xy: 479, 428
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2092,7 +2092,7 @@ laser-end
   index: -1
 minelaser
   rotate: false
-  xy: 535, 474
+  xy: 2041, 1349
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
@@ -2127,35 +2127,35 @@ scale_marker
   index: -1
 scorch1
   rotate: false
-  xy: 1451, 803
+  xy: 1773, 873
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch2
   rotate: false
-  xy: 1481, 785
+  xy: 1773, 771
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch3
   rotate: false
-  xy: 453, 598
+  xy: 1451, 803
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch4
   rotate: false
-  xy: 483, 598
+  xy: 1481, 785
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
   index: -1
 scorch5
   rotate: false
-  xy: 513, 628
+  xy: 453, 598
   size: 28, 100
   orig: 28, 100
   offset: 0, 0
@@ -2183,14 +2183,14 @@ shot
   index: -1
 transfer
   rotate: false
-  xy: 2041, 1349
+  xy: 2041, 1299
   size: 4, 48
   orig: 4, 48
   offset: 0, 0
   index: -1
 transfer-arrow
   rotate: false
-  xy: 479, 394
+  xy: 479, 360
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2393,7 +2393,7 @@ char-icon-large
   index: -1
 char-icon-small
   rotate: false
-  xy: 453, 572
+  xy: 1956, 1793
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2407,7 +2407,7 @@ cliffs-icon-large
   index: -1
 cliffs-icon-small
   rotate: false
-  xy: 513, 602
+  xy: 891, 1337
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2421,7 +2421,7 @@ combustion-generator-icon-large
   index: -1
 combustion-generator-icon-small
   rotate: false
-  xy: 572, 704
+  xy: 1784, 1100
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2442,7 +2442,7 @@ conduit-icon-large
   index: -1
 conduit-icon-small
   rotate: false
-  xy: 1956, 1793
+  xy: 1810, 1100
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2463,7 +2463,7 @@ container-icon-medium
   index: -1
 container-icon-small
   rotate: false
-  xy: 891, 1337
+  xy: 1836, 1100
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2477,7 +2477,7 @@ conveyor-icon-large
   index: -1
 conveyor-icon-small
   rotate: false
-  xy: 479, 572
+  xy: 77, 8
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2491,7 +2491,7 @@ copper-wall-icon-large
   index: -1
 copper-wall-icon-small
   rotate: false
-  xy: 572, 678
+  xy: 103, 11
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2512,7 +2512,7 @@ copper-wall-large-icon-medium
   index: -1
 copper-wall-large-icon-small
   rotate: false
-  xy: 572, 652
+  xy: 479, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2533,7 +2533,7 @@ core-foundation-icon-medium
   index: -1
 core-foundation-icon-small
   rotate: false
-  xy: 598, 674
+  xy: 483, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2554,7 +2554,7 @@ core-nucleus-icon-medium
   index: -1
 core-nucleus-icon-small
   rotate: false
-  xy: 624, 674
+  xy: 483, 520
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2575,7 +2575,7 @@ core-shard-icon-medium
   index: -1
 core-shard-icon-small
   rotate: false
-  xy: 572, 626
+  xy: 483, 494
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2589,7 +2589,7 @@ craters-icon-large
   index: -1
 craters-icon-small
   rotate: false
-  xy: 598, 648
+  xy: 483, 468
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2617,7 +2617,7 @@ crawler-factory-icon-medium
   index: -1
 crawler-factory-icon-small
   rotate: false
-  xy: 624, 648
+  xy: 427, 720
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2645,7 +2645,7 @@ cryofluidmixer-icon-medium
   index: -1
 cryofluidmixer-icon-small
   rotate: false
-  xy: 650, 666
+  xy: 453, 720
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2673,7 +2673,7 @@ cultivator-icon-medium
   index: -1
 cultivator-icon-small
   rotate: false
-  xy: 676, 666
+  xy: 510, 28
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2708,7 +2708,7 @@ cyclone-icon-medium
   index: -1
 cyclone-icon-small
   rotate: false
-  xy: 702, 666
+  xy: 510, 2
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2736,7 +2736,7 @@ dagger-factory-icon-medium
   index: -1
 dagger-factory-icon-small
   rotate: false
-  xy: 728, 666
+  xy: 1785, 1074
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2750,7 +2750,7 @@ deepwater-icon-large
   index: -1
 deepwater-icon-small
   rotate: false
-  xy: 754, 666
+  xy: 1785, 1048
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2771,7 +2771,7 @@ delta-mech-pad-icon-medium
   index: -1
 delta-mech-pad-icon-small
   rotate: false
-  xy: 598, 622
+  xy: 1811, 1074
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2792,7 +2792,7 @@ differential-generator-icon-medium
   index: -1
 differential-generator-icon-small
   rotate: false
-  xy: 624, 622
+  xy: 1785, 1022
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2813,7 +2813,7 @@ distributor-icon-medium
   index: -1
 distributor-icon-small
   rotate: false
-  xy: 650, 640
+  xy: 1811, 1048
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2827,7 +2827,7 @@ door-icon-large
   index: -1
 door-icon-small
   rotate: false
-  xy: 676, 640
+  xy: 1785, 996
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2848,7 +2848,7 @@ door-large-icon-medium
   index: -1
 door-large-icon-small
   rotate: false
-  xy: 702, 640
+  xy: 1811, 1022
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2862,7 +2862,7 @@ dunerocks-icon-large
   index: -1
 dunerocks-icon-small
   rotate: false
-  xy: 728, 640
+  xy: 1811, 996
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2890,7 +2890,7 @@ duo-icon-large
   index: -1
 duo-icon-small
   rotate: false
-  xy: 754, 640
+  xy: 1837, 1074
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2911,7 +2911,7 @@ force-projector-icon-medium
   index: -1
 force-projector-icon-small
   rotate: false
-  xy: 1481, 721
+  xy: 1837, 1048
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2939,7 +2939,7 @@ fortress-factory-icon-medium
   index: -1
 fortress-factory-icon-small
   rotate: false
-  xy: 1480, 695
+  xy: 1837, 1022
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -2974,7 +2974,7 @@ fuse-icon-medium
   index: -1
 fuse-icon-small
   rotate: false
-  xy: 1480, 669
+  xy: 1837, 996
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3002,7 +3002,7 @@ ghoul-factory-icon-medium
   index: -1
 ghoul-factory-icon-small
   rotate: false
-  xy: 650, 614
+  xy: 1803, 970
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3023,7 +3023,7 @@ glaive-ship-pad-icon-medium
   index: -1
 glaive-ship-pad-icon-small
   rotate: false
-  xy: 676, 614
+  xy: 1803, 944
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3044,7 +3044,7 @@ graphite-press-icon-medium
   index: -1
 graphite-press-icon-small
   rotate: false
-  xy: 702, 614
+  xy: 1829, 970
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3058,7 +3058,7 @@ grass-icon-large
   index: -1
 grass-icon-small
   rotate: false
-  xy: 728, 614
+  xy: 1803, 918
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3086,7 +3086,7 @@ hail-icon-large
   index: -1
 hail-icon-small
   rotate: false
-  xy: 754, 614
+  xy: 1829, 944
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3100,7 +3100,7 @@ holostone-icon-large
   index: -1
 holostone-icon-small
   rotate: false
-  xy: 1784, 1100
+  xy: 1803, 892
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3114,7 +3114,7 @@ hotrock-icon-large
   index: -1
 hotrock-icon-small
   rotate: false
-  xy: 1810, 1100
+  xy: 1829, 918
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3128,7 +3128,7 @@ ice-icon-large
   index: -1
 ice-icon-small
   rotate: false
-  xy: 1836, 1100
+  xy: 1803, 866
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3142,7 +3142,7 @@ ice-snow-icon-large
   index: -1
 ice-snow-icon-small
   rotate: false
-  xy: 483, 546
+  xy: 1829, 892
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3156,7 +3156,7 @@ icerocks-icon-large
   index: -1
 icerocks-icon-small
   rotate: false
-  xy: 483, 520
+  xy: 1803, 840
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3170,7 +3170,7 @@ ignarock-icon-large
   index: -1
 ignarock-icon-small
   rotate: false
-  xy: 509, 546
+  xy: 1803, 788
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3198,7 +3198,7 @@ impact-reactor-icon-medium
   index: -1
 impact-reactor-icon-small
   rotate: false
-  xy: 509, 520
+  xy: 1829, 814
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3212,21 +3212,21 @@ incinerator-icon-large
   index: -1
 incinerator-icon-small
   rotate: false
-  xy: 509, 494
+  xy: 1829, 788
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 509, 468
+  xy: 1855, 928
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-blast-compound-small
   rotate: false
-  xy: 1821, 1010
+  xy: 1881, 943
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3240,14 +3240,14 @@ item-blast-compound-xlarge
   index: -1
 item-coal-medium
   rotate: false
-  xy: 806, 648
+  xy: 1855, 902
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-coal-small
   rotate: false
-  xy: 1807, 992
+  xy: 1881, 925
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3261,14 +3261,14 @@ item-coal-xlarge
   index: -1
 item-copper-medium
   rotate: false
-  xy: 780, 606
+  xy: 1855, 876
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-copper-small
   rotate: false
-  xy: 1839, 1064
+  xy: 1881, 907
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3282,14 +3282,14 @@ item-copper-xlarge
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 806, 622
+  xy: 1855, 850
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-graphite-small
   rotate: false
-  xy: 1839, 1046
+  xy: 1881, 889
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3303,14 +3303,14 @@ item-graphite-xlarge
   index: -1
 item-lead-medium
   rotate: false
-  xy: 832, 639
+  xy: 1855, 824
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-lead-small
   rotate: false
-  xy: 1839, 1028
+  xy: 1881, 871
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3324,14 +3324,14 @@ item-lead-xlarge
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 832, 613
+  xy: 1855, 798
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-metaglass-small
   rotate: false
-  xy: 1839, 1010
+  xy: 1881, 853
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3345,14 +3345,14 @@ item-metaglass-xlarge
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 806, 596
+  xy: 1803, 762
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-phase-fabric-small
   rotate: false
-  xy: 1825, 992
+  xy: 1881, 835
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3366,14 +3366,14 @@ item-phase-fabric-xlarge
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 832, 587
+  xy: 1829, 762
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-plastanium-small
   rotate: false
-  xy: 1843, 992
+  xy: 1881, 817
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3387,14 +3387,14 @@ item-plastanium-xlarge
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 513, 442
+  xy: 1855, 772
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-pyratite-small
   rotate: false
-  xy: 129, 7
+  xy: 1881, 799
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3408,14 +3408,14 @@ item-pyratite-xlarge
   index: -1
 item-sand-medium
   rotate: false
-  xy: 513, 416
+  xy: 1855, 746
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-sand-small
   rotate: false
-  xy: 147, 7
+  xy: 1881, 781
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3429,14 +3429,14 @@ item-sand-xlarge
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 513, 390
+  xy: 1511, 835
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-scrap-small
   rotate: false
-  xy: 165, 7
+  xy: 1881, 763
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3450,14 +3450,14 @@ item-scrap-xlarge
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 513, 364
+  xy: 1537, 835
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-silicon-small
   rotate: false
-  xy: 183, 7
+  xy: 1899, 1069
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3478,21 +3478,21 @@ item-source-icon-large
   index: -1
 item-source-icon-small
   rotate: false
-  xy: 513, 338
+  xy: 1511, 809
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 513, 312
+  xy: 1537, 809
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-small
   rotate: false
-  xy: 201, 7
+  xy: 1899, 1051
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3506,14 +3506,14 @@ item-spore-pod-xlarge
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 513, 286
+  xy: 1511, 783
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-surge-alloy-small
   rotate: false
-  xy: 1529, 843
+  xy: 1899, 1033
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3527,14 +3527,14 @@ item-surge-alloy-xlarge
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 513, 260
+  xy: 1537, 783
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-thorium-small
   rotate: false
-  xy: 1529, 825
+  xy: 1899, 1015
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3548,14 +3548,14 @@ item-thorium-xlarge
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 513, 234
+  xy: 1510, 757
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-titanium-small
   rotate: false
-  xy: 1529, 807
+  xy: 1899, 997
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -3576,7 +3576,7 @@ item-void-icon-large
   index: -1
 item-void-icon-small
   rotate: false
-  xy: 513, 208
+  xy: 1510, 731
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3597,7 +3597,7 @@ javelin-ship-pad-icon-medium
   index: -1
 javelin-ship-pad-icon-small
   rotate: false
-  xy: 513, 182
+  xy: 1536, 757
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3611,7 +3611,7 @@ junction-icon-large
   index: -1
 junction-icon-small
   rotate: false
-  xy: 513, 156
+  xy: 1536, 731
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3632,7 +3632,7 @@ kiln-icon-medium
   index: -1
 kiln-icon-small
   rotate: false
-  xy: 513, 130
+  xy: 1510, 705
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3667,7 +3667,7 @@ lancer-icon-medium
   index: -1
 lancer-icon-small
   rotate: false
-  xy: 513, 104
+  xy: 1536, 705
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3695,7 +3695,7 @@ laser-drill-icon-medium
   index: -1
 laser-drill-icon-small
   rotate: false
-  xy: 858, 633
+  xy: 1509, 679
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3716,7 +3716,7 @@ launch-pad-icon-medium
   index: -1
 launch-pad-icon-small
   rotate: false
-  xy: 858, 607
+  xy: 1509, 653
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3730,7 +3730,7 @@ liquid-junction-icon-large
   index: -1
 liquid-junction-icon-small
   rotate: false
-  xy: 884, 633
+  xy: 1535, 679
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3751,7 +3751,7 @@ liquid-router-icon-large
   index: -1
 liquid-router-icon-small
   rotate: false
-  xy: 884, 607
+  xy: 1535, 653
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3765,7 +3765,7 @@ liquid-source-icon-large
   index: -1
 liquid-source-icon-small
   rotate: false
-  xy: 910, 633
+  xy: 1563, 817
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3793,7 +3793,7 @@ liquid-tank-icon-medium
   index: -1
 liquid-tank-icon-small
   rotate: false
-  xy: 910, 607
+  xy: 1563, 791
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3807,7 +3807,7 @@ magmarock-icon-large
   index: -1
 magmarock-icon-small
   rotate: false
-  xy: 936, 633
+  xy: 1589, 799
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3842,7 +3842,7 @@ mass-driver-icon-medium
   index: -1
 mass-driver-icon-small
   rotate: false
-  xy: 936, 607
+  xy: 1615, 799
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3926,7 +3926,7 @@ mechanical-drill-icon-medium
   index: -1
 mechanical-drill-icon-small
   rotate: false
-  xy: 962, 633
+  xy: 1641, 799
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3940,7 +3940,7 @@ mechanical-pump-icon-large
   index: -1
 mechanical-pump-icon-small
   rotate: false
-  xy: 962, 607
+  xy: 1563, 765
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3975,7 +3975,7 @@ meltdown-icon-medium
   index: -1
 meltdown-icon-small
   rotate: false
-  xy: 988, 633
+  xy: 1589, 773
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -3989,7 +3989,7 @@ melter-icon-large
   index: -1
 melter-icon-small
   rotate: false
-  xy: 988, 607
+  xy: 1615, 773
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4010,7 +4010,7 @@ mend-projector-icon-medium
   index: -1
 mend-projector-icon-small
   rotate: false
-  xy: 1014, 633
+  xy: 1641, 773
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4024,7 +4024,7 @@ metal-floor-2-icon-large
   index: -1
 metal-floor-2-icon-small
   rotate: false
-  xy: 1014, 607
+  xy: 1562, 739
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4038,7 +4038,7 @@ metal-floor-3-icon-large
   index: -1
 metal-floor-3-icon-small
   rotate: false
-  xy: 1040, 633
+  xy: 1562, 713
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4052,7 +4052,7 @@ metal-floor-5-icon-large
   index: -1
 metal-floor-5-icon-small
   rotate: false
-  xy: 1040, 607
+  xy: 1667, 773
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4066,7 +4066,7 @@ metal-floor-damaged-icon-large
   index: -1
 metal-floor-damaged-icon-small
   rotate: false
-  xy: 1066, 633
+  xy: 1693, 773
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4080,7 +4080,7 @@ metal-floor-icon-large
   index: -1
 metal-floor-icon-small
   rotate: false
-  xy: 1066, 607
+  xy: 1589, 747
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4101,14 +4101,14 @@ stained-stone-yellow-icon-large
   index: -1
 moss-icon-small
   rotate: false
-  xy: 1092, 633
+  xy: 1615, 747
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 stained-stone-yellow-icon-small
   rotate: false
-  xy: 1092, 633
+  xy: 1615, 747
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4129,7 +4129,7 @@ multi-press-icon-medium
   index: -1
 multi-press-icon-small
   rotate: false
-  xy: 1092, 607
+  xy: 1641, 747
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4157,7 +4157,7 @@ oil-extractor-icon-medium
   index: -1
 oil-extractor-icon-small
   rotate: false
-  xy: 1118, 633
+  xy: 1667, 747
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4178,7 +4178,7 @@ omega-mech-pad-icon-medium
   index: -1
 omega-mech-pad-icon-small
   rotate: false
-  xy: 1118, 607
+  xy: 1693, 747
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4206,7 +4206,7 @@ ore-coal-icon-large
   index: -1
 ore-coal-icon-small
   rotate: false
-  xy: 1144, 633
+  xy: 1588, 721
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4234,7 +4234,7 @@ ore-copper-icon-large
   index: -1
 ore-copper-icon-small
   rotate: false
-  xy: 1144, 607
+  xy: 1614, 721
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4262,7 +4262,7 @@ ore-lead-icon-large
   index: -1
 ore-lead-icon-small
   rotate: false
-  xy: 1170, 633
+  xy: 1640, 721
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4290,7 +4290,7 @@ ore-scrap-icon-large
   index: -1
 ore-scrap-icon-small
   rotate: false
-  xy: 1170, 607
+  xy: 1666, 721
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4318,7 +4318,7 @@ ore-thorium-icon-large
   index: -1
 ore-thorium-icon-small
   rotate: false
-  xy: 1196, 633
+  xy: 1692, 721
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4346,7 +4346,7 @@ ore-titanium-icon-large
   index: -1
 ore-titanium-icon-small
   rotate: false
-  xy: 1196, 607
+  xy: 1562, 687
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4367,7 +4367,7 @@ overdrive-projector-icon-medium
   index: -1
 overdrive-projector-icon-small
   rotate: false
-  xy: 1222, 633
+  xy: 1588, 695
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4381,7 +4381,7 @@ overflow-gate-icon-large
   index: -1
 overflow-gate-icon-small
   rotate: false
-  xy: 1222, 607
+  xy: 1614, 695
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4409,7 +4409,7 @@ phantom-factory-icon-medium
   index: -1
 phantom-factory-icon-small
   rotate: false
-  xy: 1248, 633
+  xy: 1640, 695
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4423,7 +4423,7 @@ phase-conduit-icon-large
   index: -1
 phase-conduit-icon-small
   rotate: false
-  xy: 1248, 607
+  xy: 1666, 695
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4437,7 +4437,7 @@ phase-conveyor-icon-large
   index: -1
 phase-conveyor-icon-small
   rotate: false
-  xy: 1274, 633
+  xy: 1692, 695
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4451,7 +4451,7 @@ phase-wall-icon-large
   index: -1
 phase-wall-icon-small
   rotate: false
-  xy: 1274, 607
+  xy: 1561, 661
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4472,7 +4472,7 @@ phase-wall-large-icon-medium
   index: -1
 phase-wall-large-icon-small
   rotate: false
-  xy: 1300, 633
+  xy: 1588, 669
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4500,7 +4500,7 @@ phase-weaver-icon-medium
   index: -1
 phase-weaver-icon-small
   rotate: false
-  xy: 1300, 607
+  xy: 1614, 669
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4514,7 +4514,7 @@ pine-icon-medium
   index: -1
 pine-icon-small
   rotate: false
-  xy: 1326, 633
+  xy: 1640, 669
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4535,7 +4535,7 @@ plastanium-compressor-icon-medium
   index: -1
 plastanium-compressor-icon-small
   rotate: false
-  xy: 1326, 607
+  xy: 1666, 669
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4563,7 +4563,7 @@ pneumatic-drill-icon-medium
   index: -1
 pneumatic-drill-icon-small
   rotate: false
-  xy: 1352, 633
+  xy: 1692, 669
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4577,7 +4577,7 @@ power-node-icon-large
   index: -1
 power-node-icon-small
   rotate: false
-  xy: 1352, 607
+  xy: 1561, 635
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4598,7 +4598,7 @@ power-node-large-icon-medium
   index: -1
 power-node-large-icon-small
   rotate: false
-  xy: 1378, 633
+  xy: 1587, 643
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4612,7 +4612,7 @@ power-source-icon-large
   index: -1
 power-source-icon-small
   rotate: false
-  xy: 1378, 607
+  xy: 1613, 643
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4626,7 +4626,7 @@ power-void-icon-large
   index: -1
 power-void-icon-small
   rotate: false
-  xy: 1404, 633
+  xy: 1639, 643
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4647,7 +4647,7 @@ pulse-conduit-icon-large
   index: -1
 pulse-conduit-icon-small
   rotate: false
-  xy: 1404, 607
+  xy: 1665, 643
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4668,7 +4668,7 @@ pulverizer-icon-large
   index: -1
 pulverizer-icon-small
   rotate: false
-  xy: 1430, 633
+  xy: 1691, 643
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4689,7 +4689,7 @@ pyratite-mixer-icon-medium
   index: -1
 pyratite-mixer-icon-small
   rotate: false
-  xy: 1430, 607
+  xy: 1587, 617
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4717,7 +4717,7 @@ repair-point-icon-large
   index: -1
 repair-point-icon-small
   rotate: false
-  xy: 1456, 633
+  xy: 1613, 617
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4745,7 +4745,7 @@ revenant-factory-icon-medium
   index: -1
 revenant-factory-icon-small
   rotate: false
-  xy: 1456, 607
+  xy: 1639, 617
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4780,7 +4780,7 @@ ripple-icon-medium
   index: -1
 ripple-icon-small
   rotate: false
-  xy: 858, 581
+  xy: 1665, 617
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4794,7 +4794,7 @@ rocks-icon-large
   index: -1
 rocks-icon-small
   rotate: false
-  xy: 884, 581
+  xy: 1691, 617
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4815,7 +4815,7 @@ rotary-pump-icon-medium
   index: -1
 rotary-pump-icon-small
   rotate: false
-  xy: 910, 581
+  xy: 1509, 627
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4829,7 +4829,7 @@ router-icon-large
   index: -1
 router-icon-small
   rotate: false
-  xy: 936, 581
+  xy: 1535, 627
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4850,7 +4850,7 @@ rtg-generator-icon-medium
   index: -1
 rtg-generator-icon-small
   rotate: false
-  xy: 962, 581
+  xy: 1561, 609
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4864,7 +4864,7 @@ salt-icon-large
   index: -1
 salt-icon-small
   rotate: false
-  xy: 988, 581
+  xy: 1587, 591
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4899,7 +4899,7 @@ salvo-icon-medium
   index: -1
 salvo-icon-small
   rotate: false
-  xy: 1014, 581
+  xy: 1613, 591
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4913,7 +4913,7 @@ sand-icon-large
   index: -1
 sand-icon-small
   rotate: false
-  xy: 1040, 581
+  xy: 1639, 591
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4927,7 +4927,7 @@ sand-water-icon-large
   index: -1
 sand-water-icon-small
   rotate: false
-  xy: 1066, 581
+  xy: 1665, 591
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4941,7 +4941,7 @@ sandrocks-icon-large
   index: -1
 sandrocks-icon-small
   rotate: false
-  xy: 1092, 581
+  xy: 1691, 591
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4962,7 +4962,7 @@ scrap-wall-gigantic-icon-medium
   index: -1
 scrap-wall-gigantic-icon-small
   rotate: false
-  xy: 1118, 581
+  xy: 1773, 745
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4983,7 +4983,7 @@ scrap-wall-huge-icon-medium
   index: -1
 scrap-wall-huge-icon-small
   rotate: false
-  xy: 1144, 581
+  xy: 1799, 736
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4997,7 +4997,7 @@ scrap-wall-icon-large
   index: -1
 scrap-wall-icon-small
   rotate: false
-  xy: 1170, 581
+  xy: 1825, 736
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5018,7 +5018,7 @@ scrap-wall-large-icon-medium
   index: -1
 scrap-wall-large-icon-small
   rotate: false
-  xy: 1196, 581
+  xy: 1851, 720
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5039,7 +5039,7 @@ separator-icon-medium
   index: -1
 separator-icon-small
   rotate: false
-  xy: 1248, 581
+  xy: 1877, 720
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5053,7 +5053,7 @@ shock-mine-icon-large
   index: -1
 shock-mine-icon-small
   rotate: false
-  xy: 1274, 581
+  xy: 1719, 743
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5074,7 +5074,7 @@ silicon-smelter-icon-medium
   index: -1
 silicon-smelter-icon-small
   rotate: false
-  xy: 1300, 581
+  xy: 1745, 743
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5088,7 +5088,7 @@ snow-icon-large
   index: -1
 snow-icon-small
   rotate: false
-  xy: 1326, 581
+  xy: 1718, 717
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5102,7 +5102,7 @@ snowrocks-icon-large
   index: -1
 snowrocks-icon-small
   rotate: false
-  xy: 1352, 581
+  xy: 1718, 691
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5116,7 +5116,7 @@ solar-panel-icon-large
   index: -1
 solar-panel-icon-small
   rotate: false
-  xy: 1378, 581
+  xy: 1744, 717
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5137,7 +5137,7 @@ solar-panel-large-icon-medium
   index: -1
 solar-panel-large-icon-small
   rotate: false
-  xy: 1404, 581
+  xy: 1744, 691
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5151,7 +5151,7 @@ sorter-icon-large
   index: -1
 sorter-icon-small
   rotate: false
-  xy: 1430, 581
+  xy: 1743, 665
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5165,7 +5165,7 @@ spawn-icon-large
   index: -1
 spawn-icon-small
   rotate: false
-  xy: 1456, 581
+  xy: 1743, 639
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5200,7 +5200,7 @@ spectre-icon-medium
   index: -1
 spectre-icon-small
   rotate: false
-  xy: 1482, 601
+  xy: 1743, 613
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5228,7 +5228,7 @@ spirit-factory-icon-medium
   index: -1
 spirit-factory-icon-small
   rotate: false
-  xy: 1482, 575
+  xy: 1743, 587
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5249,7 +5249,21 @@ spore-cluster-icon-medium
   index: -1
 spore-cluster-icon-small
   rotate: false
-  xy: 513, 78
+  xy: 1770, 717
+  size: 24, 24
+  orig: 24, 24
+  offset: 0, 0
+  index: -1
+spore-pine-icon-medium
+  rotate: false
+  xy: 1569, 843
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+spore-pine-icon-small
+  rotate: false
+  xy: 1770, 691
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5270,14 +5284,14 @@ spore-press-icon-large
   index: -1
 spore-press-icon-medium
   rotate: false
-  xy: 1569, 843
+  xy: 1705, 935
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-press-icon-small
   rotate: false
-  xy: 510, 52
+  xy: 1769, 665
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5291,7 +5305,7 @@ stained-boulder-icon-large
   index: -1
 stained-boulder-icon-small
   rotate: false
-  xy: 1248, 555
+  xy: 1769, 639
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5305,7 +5319,7 @@ stained-rocks-icon-large
   index: -1
 stained-rocks-icon-small
   rotate: false
-  xy: 1274, 555
+  xy: 1769, 613
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5319,7 +5333,7 @@ stained-rocks-red-icon-large
   index: -1
 stained-rocks-red-icon-small
   rotate: false
-  xy: 1300, 555
+  xy: 1769, 587
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5333,7 +5347,7 @@ stained-rocks-yellow-icon-large
   index: -1
 stained-rocks-yellow-icon-small
   rotate: false
-  xy: 1326, 555
+  xy: 1796, 710
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5347,7 +5361,7 @@ stained-stone-red-icon-large
   index: -1
 stained-stone-red-icon-small
   rotate: false
-  xy: 1352, 555
+  xy: 1822, 710
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5361,7 +5375,7 @@ stone-icon-large
   index: -1
 stone-icon-small
   rotate: false
-  xy: 1378, 555
+  xy: 1796, 684
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5375,14 +5389,14 @@ surge-tower-icon-large
   index: -1
 surge-tower-icon-medium
   rotate: false
-  xy: 1705, 935
+  xy: 1705, 901
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-tower-icon-small
   rotate: false
-  xy: 1404, 555
+  xy: 1822, 684
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5396,7 +5410,7 @@ surge-wall-icon-large
   index: -1
 surge-wall-icon-small
   rotate: false
-  xy: 1430, 555
+  xy: 1795, 658
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5410,14 +5424,14 @@ surge-wall-large-icon-large
   index: -1
 surge-wall-large-icon-medium
   rotate: false
-  xy: 1705, 867
+  xy: 1603, 825
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall-large-icon-small
   rotate: false
-  xy: 1456, 555
+  xy: 1795, 632
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5445,14 +5459,14 @@ swarmer-icon-large
   index: -1
 swarmer-icon-medium
   rotate: false
-  xy: 1603, 825
+  xy: 1637, 825
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 swarmer-icon-small
   rotate: false
-  xy: 1482, 549
+  xy: 1821, 658
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5466,7 +5480,7 @@ tar-icon-large
   index: -1
 tar-icon-small
   rotate: false
-  xy: 77, 8
+  xy: 1795, 606
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5480,14 +5494,14 @@ tau-mech-pad-icon-large
   index: -1
 tau-mech-pad-icon-medium
   rotate: false
-  xy: 1637, 825
+  xy: 1671, 833
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tau-mech-pad-icon-small
   rotate: false
-  xy: 103, 11
+  xy: 1821, 632
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5501,14 +5515,14 @@ thermal-generator-icon-large
   index: -1
 thermal-generator-icon-medium
   rotate: false
-  xy: 1671, 833
+  xy: 1705, 833
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-generator-icon-small
   rotate: false
-  xy: 1781, 983
+  xy: 1821, 606
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5522,14 +5536,14 @@ thermal-pump-icon-large
   index: -1
 thermal-pump-icon-medium
   rotate: false
-  xy: 1705, 833
+  xy: 1739, 939
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-pump-icon-small
   rotate: false
-  xy: 1773, 957
+  xy: 1848, 694
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5543,14 +5557,14 @@ thorium-reactor-icon-large
   index: -1
 thorium-reactor-icon-medium
   rotate: false
-  xy: 1739, 939
+  xy: 1739, 905
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-reactor-icon-small
   rotate: false
-  xy: 1773, 931
+  xy: 1874, 694
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5564,7 +5578,7 @@ thorium-wall-icon-large
   index: -1
 thorium-wall-icon-small
   rotate: false
-  xy: 1773, 905
+  xy: 1795, 580
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5578,14 +5592,14 @@ thorium-wall-large-icon-large
   index: -1
 thorium-wall-large-icon-medium
   rotate: false
-  xy: 1739, 871
+  xy: 1739, 837
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall-large-icon-small
   rotate: false
-  xy: 1773, 879
+  xy: 1821, 580
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5599,14 +5613,14 @@ thruster-icon-large
   index: -1
 thruster-icon-medium
   rotate: false
-  xy: 1739, 837
+  xy: 1671, 799
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thruster-icon-small
   rotate: false
-  xy: 1773, 853
+  xy: 1848, 668
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5627,14 +5641,14 @@ titan-factory-icon-large
   index: -1
 titan-factory-icon-medium
   rotate: false
-  xy: 1671, 799
+  xy: 1705, 799
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titan-factory-icon-small
   rotate: false
-  xy: 1773, 827
+  xy: 1874, 668
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5648,7 +5662,7 @@ titanium-conveyor-icon-large
   index: -1
 titanium-conveyor-icon-small
   rotate: false
-  xy: 1773, 801
+  xy: 1847, 642
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5662,7 +5676,7 @@ titanium-wall-icon-large
   index: -1
 titanium-wall-icon-small
   rotate: false
-  xy: 1773, 775
+  xy: 1847, 616
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5676,14 +5690,14 @@ titanium-wall-large-icon-large
   index: -1
 titanium-wall-large-icon-medium
   rotate: false
-  xy: 479, 428
+  xy: 479, 394
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-large-icon-small
   rotate: false
-  xy: 1799, 957
+  xy: 1873, 642
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5697,14 +5711,14 @@ trident-ship-pad-icon-large
   index: -1
 trident-ship-pad-icon-medium
   rotate: false
-  xy: 479, 360
+  xy: 479, 326
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 trident-ship-pad-icon-small
   rotate: false
-  xy: 1799, 931
+  xy: 1847, 590
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5718,14 +5732,14 @@ turbine-generator-icon-large
   index: -1
 turbine-generator-icon-medium
   rotate: false
-  xy: 479, 326
+  xy: 479, 292
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 turbine-generator-icon-small
   rotate: false
-  xy: 1799, 905
+  xy: 1873, 616
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5788,7 +5802,7 @@ unloader-icon-large
   index: -1
 unloader-icon-small
   rotate: false
-  xy: 1799, 879
+  xy: 1873, 590
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5802,14 +5816,14 @@ vault-icon-large
   index: -1
 vault-icon-medium
   rotate: false
-  xy: 479, 258
+  xy: 479, 224
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 vault-icon-small
   rotate: false
-  xy: 1799, 853
+  xy: 1847, 564
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5830,14 +5844,14 @@ water-extractor-icon-large
   index: -1
 water-extractor-icon-medium
   rotate: false
-  xy: 479, 224
+  xy: 479, 190
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-extractor-icon-small
   rotate: false
-  xy: 1799, 827
+  xy: 1873, 564
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5851,7 +5865,7 @@ water-icon-large
   index: -1
 water-icon-small
   rotate: false
-  xy: 1799, 801
+  xy: 1900, 694
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5879,14 +5893,14 @@ wave-icon-large
   index: -1
 wave-icon-medium
   rotate: false
-  xy: 479, 190
+  xy: 479, 156
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wave-icon-small
   rotate: false
-  xy: 1799, 775
+  xy: 1900, 668
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5900,14 +5914,14 @@ white-tree-dead-icon-large
   index: -1
 white-tree-dead-icon-medium
   rotate: false
-  xy: 479, 156
+  xy: 479, 122
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white-tree-dead-icon-small
   rotate: false
-  xy: 1773, 749
+  xy: 1899, 642
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5921,14 +5935,14 @@ white-tree-icon-large
   index: -1
 white-tree-icon-medium
   rotate: false
-  xy: 479, 122
+  xy: 479, 88
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white-tree-icon-small
   rotate: false
-  xy: 1799, 749
+  xy: 1899, 616
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5949,14 +5963,14 @@ wraith-factory-icon-large
   index: -1
 wraith-factory-icon-medium
   rotate: false
-  xy: 479, 88
+  xy: 479, 54
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wraith-factory-icon-small
   rotate: false
-  xy: 539, 602
+  xy: 1899, 590
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6236,7 +6250,7 @@ trident-ship
   index: -1
 blank
   rotate: false
-  xy: 510, 85
+  xy: 87, 34
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -6250,7 +6264,7 @@ circle
   index: -1
 clear
   rotate: false
-  xy: 87, 34
+  xy: 1848, 733
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -6264,7 +6278,7 @@ shape-3
   index: -1
 bar
   rotate: false
-  xy: 543, 692
+  xy: 1481, 709
   size: 27, 36
   split: 9, 9, 9, 9
   orig: 27, 36
@@ -6368,7 +6382,7 @@ button-right-over
   index: -1
 button-select
   rotate: false
-  xy: 1755, 983
+  xy: 453, 572
   size: 24, 24
   split: 4, 4, 4, 4
   orig: 24, 24
@@ -6383,28 +6397,28 @@ check-off
   index: -1
 check-on
   rotate: false
-  xy: 479, 14
+  xy: 1755, 1043
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-on-over
   rotate: false
-  xy: 1755, 1043
+  xy: 1755, 1009
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 check-over
   rotate: false
-  xy: 1755, 1009
+  xy: 1755, 975
   size: 28, 32
   orig: 28, 32
   offset: 0, 0
   index: -1
 clear
   rotate: false
-  xy: 599, 1420
+  xy: 1719, 769
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -6470,56 +6484,56 @@ icon-defense
   index: -1
 icon-distribution
   rotate: false
-  xy: 1511, 869
+  xy: 1091, 1237
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-effect
   rotate: false
-  xy: 1091, 1237
+  xy: 479, 728
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-liquid
   rotate: false
-  xy: 427, 719
+  xy: 2030, 1885
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-power
   rotate: false
-  xy: 531, 584
+  xy: 1481, 895
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-production
   rotate: false
-  xy: 549, 584
+  xy: 1903, 1087
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-turret
   rotate: false
-  xy: 1803, 1046
+  xy: 1881, 1051
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-units
   rotate: false
-  xy: 1821, 1046
+  xy: 1881, 1015
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-upgrade
   rotate: false
-  xy: 1821, 1028
+  xy: 1881, 979
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -6561,42 +6575,42 @@ icon-admin-small
   index: -1
 icon-areaDelete
   rotate: false
-  xy: 609, 900
+  xy: 599, 1420
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow
   rotate: false
-  xy: 780, 674
+  xy: 1785, 978
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-16
   rotate: false
-  xy: 780, 674
+  xy: 1785, 978
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-arrow-down
   rotate: false
-  xy: 2037, 1173
+  xy: 609, 900
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-left
   rotate: false
-  xy: 2037, 1161
+  xy: 2037, 1173
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-arrow-right
   rotate: false
-  xy: 531, 572
+  xy: 2037, 1161
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -6638,14 +6652,14 @@ icon-cancel
   index: -1
 icon-cancel-2
   rotate: false
-  xy: 483, 494
+  xy: 1829, 866
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 icon-chat
   rotate: false
-  xy: 329, 2
+  xy: 568, 1949
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -6659,7 +6673,7 @@ icon-check
   index: -1
 icon-check-2
   rotate: false
-  xy: 483, 468
+  xy: 1803, 814
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -6673,7 +6687,7 @@ icon-copy
   index: -1
 icon-cursor
   rotate: false
-  xy: 568, 1949
+  xy: 575, 882
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -6687,7 +6701,7 @@ icon-database
   index: -1
 icon-database-small
   rotate: false
-  xy: 575, 882
+  xy: 1955, 1152
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -6743,7 +6757,7 @@ icon-elevation
   index: -1
 icon-eraser
   rotate: false
-  xy: 667, 1356
+  xy: 1511, 869
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -6757,14 +6771,14 @@ icon-exit
   index: -1
 icon-file
   rotate: false
-  xy: 1511, 851
+  xy: 1719, 781
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-file-image
   rotate: false
-  xy: 1511, 833
+  xy: 1718, 673
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -6778,7 +6792,7 @@ icon-file-text
   index: -1
 icon-fill
   rotate: false
-  xy: 1511, 815
+  xy: 1899, 572
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -6792,7 +6806,7 @@ icon-floppy
   index: -1
 icon-floppy-16
   rotate: false
-  xy: 1511, 797
+  xy: 667, 1356
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -6827,7 +6841,7 @@ icon-github
   index: -1
 icon-google-play
   rotate: false
-  xy: 1547, 845
+  xy: 1881, 747
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -6841,126 +6855,126 @@ icon-grid
   index: -1
 icon-hold
   rotate: false
-  xy: 1955, 1152
+  xy: 329, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-holdDelete
   rotate: false
-  xy: 989, 1663
+  xy: 1589, 831
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-home
   rotate: false
-  xy: 1547, 829
+  xy: 1899, 981
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-host
   rotate: false
-  xy: 1547, 813
+  xy: 1899, 965
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-info
   rotate: false
-  xy: 1511, 781
+  xy: 1899, 949
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-itch.io
   rotate: false
-  xy: 1510, 765
+  xy: 1899, 933
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-item
   rotate: false
-  xy: 543, 572
+  xy: 989, 1663
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-items-none
   rotate: false
-  xy: 1755, 973
+  xy: 219, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icon-line
   rotate: false
-  xy: 427, 737
+  xy: 2030, 1903
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-link
   rotate: false
-  xy: 1510, 749
+  xy: 1899, 917
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-liquid-small
   rotate: false
-  xy: 535, 560
+  xy: 1933, 1036
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-load
   rotate: false
-  xy: 299, 1202
+  xy: 1899, 901
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-load-image
   rotate: false
-  xy: 1783, 1082
+  xy: 2030, 1867
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-load-map
   rotate: false
-  xy: 1801, 1082
+  xy: 2030, 1849
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-loading
   rotate: false
-  xy: 1819, 1082
+  xy: 129, 7
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-locked
   rotate: false
-  xy: 1837, 1082
+  xy: 147, 7
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-logic
   rotate: false
-  xy: 341, 2
+  xy: 1917, 1004
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-map
   rotate: false
-  xy: 1529, 791
+  xy: 1899, 885
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -6974,7 +6988,7 @@ icon-menu
   index: -1
 icon-menu-large
   rotate: false
-  xy: 2030, 1903
+  xy: 165, 7
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -6995,21 +7009,21 @@ icon-mission-background
   index: -1
 icon-mission-battle
   rotate: false
-  xy: 555, 572
+  xy: 341, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-defense
   rotate: false
-  xy: 535, 548
+  xy: 1933, 1024
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-mission-done
   rotate: false
-  xy: 547, 560
+  xy: 568, 1925
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -7023,63 +7037,63 @@ icon-none
   index: -1
 icon-paste
   rotate: false
-  xy: 2030, 1885
+  xy: 183, 7
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pause
   rotate: false
-  xy: 568, 1925
+  xy: 365, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-pencil
   rotate: false
-  xy: 2030, 1867
+  xy: 201, 7
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-pencil-small
   rotate: false
-  xy: 299, 1370
+  xy: 1899, 869
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-pick
   rotate: false
-  xy: 2030, 1849
+  xy: 453, 702
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-play
   rotate: false
-  xy: 535, 536
+  xy: 377, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-play-2
   rotate: false
-  xy: 1563, 827
+  xy: 1899, 853
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-play-custom
   rotate: false
-  xy: 1579, 827
+  xy: 1899, 837
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-players
   rotate: false
-  xy: 547, 548
+  xy: 389, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -7093,154 +7107,154 @@ icon-power-requirement
   index: -1
 icon-power-small
   rotate: false
-  xy: 365, 2
+  xy: 401, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-quit
   rotate: false
-  xy: 1563, 811
+  xy: 1899, 821
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-redo
   rotate: false
-  xy: 445, 728
+  xy: 1863, 1090
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-refresh
   rotate: false
-  xy: 1579, 811
+  xy: 1899, 805
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rename
   rotate: false
-  xy: 565, 610
+  xy: 1899, 789
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-resize
   rotate: false
-  xy: 463, 728
+  xy: 1863, 1072
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-rotate
   rotate: false
-  xy: 581, 610
+  xy: 1899, 773
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-arrow
   rotate: false
-  xy: 597, 606
+  xy: 299, 1202
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-left
   rotate: false
-  xy: 613, 606
+  xy: 299, 1370
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-rotate-right
   rotate: false
-  xy: 629, 606
+  xy: 1899, 757
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save
   rotate: false
-  xy: 1481, 897
+  xy: 1921, 1080
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-save-image
   rotate: false
-  xy: 481, 728
+  xy: 1863, 1054
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-save-map
   rotate: false
-  xy: 1785, 1064
+  xy: 1863, 1036
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-settings
   rotate: false
-  xy: 535, 524
+  xy: 413, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-spray
   rotate: false
-  xy: 1785, 1046
+  xy: 1863, 1018
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-terrain
   rotate: false
-  xy: 1803, 1064
+  xy: 1863, 1000
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tools
   rotate: false
-  xy: 1862, 1092
+  xy: 1937, 1080
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-touch
   rotate: false
-  xy: 547, 536
+  xy: 425, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-touchDelete
   rotate: false
-  xy: 377, 2
+  xy: 437, 2
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 icon-trash
   rotate: false
-  xy: 1527, 775
+  xy: 1917, 1064
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-trash-16
   rotate: false
-  xy: 1785, 1028
+  xy: 1881, 1087
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-tree
   rotate: false
-  xy: 1821, 1064
+  xy: 1881, 1069
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -7254,49 +7268,49 @@ icon-tree-locked
   index: -1
 icon-trello
   rotate: false
-  xy: 1526, 759
+  xy: 1917, 1048
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-tutorial
   rotate: false
-  xy: 1526, 743
+  xy: 1933, 1064
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-undo
   rotate: false
-  xy: 1785, 1010
+  xy: 1881, 1033
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-unlocked
   rotate: false
-  xy: 1803, 1028
+  xy: 1881, 997
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-unlocks
   rotate: false
-  xy: 1547, 797
+  xy: 1917, 1032
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-wiki
   rotate: false
-  xy: 1563, 795
+  xy: 1933, 1048
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
   index: -1
 icon-zone
   rotate: false
-  xy: 505, 572
+  xy: 1829, 840
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -7310,14 +7324,14 @@ icon-zone-locked
   index: -1
 icon-zoom
   rotate: false
-  xy: 1803, 1010
+  xy: 1881, 961
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
   index: -1
 icon-zoom-small
   rotate: false
-  xy: 1579, 795
+  xy: 1917, 1016
   size: 14, 14
   orig: 14, 14
   offset: 0, 0
@@ -7331,7 +7345,7 @@ info-banner
   index: -1
 inventory
   rotate: false
-  xy: 780, 632
+  xy: 1855, 954
   size: 24, 40
   split: 10, 10, 10, 14
   orig: 24, 40
@@ -7362,7 +7376,7 @@ pane-2
   index: -1
 scroll
   rotate: false
-  xy: 1222, 570
+  xy: 1717, 590
   size: 24, 35
   split: 10, 10, 6, 5
   orig: 24, 35
@@ -7386,7 +7400,7 @@ scroll-knob-horizontal-black
   index: -1
 scroll-knob-vertical-black
   rotate: false
-  xy: 1482, 627
+  xy: 1717, 627
   size: 24, 40
   split: 10, 10, 6, 10
   orig: 24, 40
@@ -7401,35 +7415,35 @@ sector-select
   index: -1
 selection
   rotate: false
-  xy: 2046, 2020
+  xy: 1785, 975
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 slider
   rotate: false
-  xy: 2046, 2010
+  xy: 497, 736
   size: 1, 8
   orig: 1, 8
   offset: 0, 0
   index: -1
 slider-knob
   rotate: false
-  xy: 1753, 1111
+  xy: 479, 14
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-down
   rotate: false
-  xy: 479, 48
+  xy: 1753, 1111
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-over
   rotate: false
-  xy: 479, 48
+  xy: 1753, 1111
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
@@ -7466,7 +7480,7 @@ white
   index: -1
 window-empty
   rotate: false
-  xy: 543, 629
+  xy: 1480, 646
   size: 27, 61
   split: 8, 8, 44, 11
   orig: 27, 61
@@ -7795,1666 +7809,1673 @@ filter: Nearest,Nearest
 repeat: none
 alloy-smelter-icon-editor
   rotate: false
-  xy: 905, 263
+  xy: 905, 275
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 alpha-dart-mech-pad-icon-editor
   rotate: false
-  xy: 1395, 327
+  xy: 1395, 339
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 arc-icon-editor
   rotate: false
-  xy: 2015, 457
+  xy: 2015, 469
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery-icon-editor
   rotate: false
-  xy: 2015, 423
+  xy: 2015, 435
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery-large-icon-editor
   rotate: false
-  xy: 1035, 393
+  xy: 1035, 405
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 blast-drill-icon-editor
   rotate: false
-  xy: 645, 361
+  xy: 645, 373
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 blast-mixer-icon-editor
   rotate: false
-  xy: 1461, 327
+  xy: 1461, 339
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 block-border-editor
   rotate: false
-  xy: 2015, 389
+  xy: 2015, 401
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-icon-editor
   rotate: false
-  xy: 1811, 227
+  xy: 1861, 239
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-icon-editor
   rotate: false
-  xy: 1845, 227
+  xy: 1895, 239
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 char-icon-editor
   rotate: false
-  xy: 1879, 227
+  xy: 1929, 239
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-char1
   rotate: false
-  xy: 1879, 227
+  xy: 1929, 239
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 clear-editor
   rotate: false
-  xy: 645, 228
+  xy: 645, 240
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
   index: -1
 cliffs-icon-editor
   rotate: false
-  xy: 1913, 227
+  xy: 945, 45
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-icon-editor
   rotate: false
-  xy: 1947, 227
+  xy: 979, 45
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-icon-editor
   rotate: false
-  xy: 945, 33
+  xy: 1109, 75
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 container-icon-editor
   rotate: false
-  xy: 1527, 327
+  xy: 1527, 339
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 conveyor-icon-editor
   rotate: false
-  xy: 979, 33
+  xy: 1143, 75
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall-icon-editor
   rotate: false
-  xy: 1109, 63
+  xy: 1177, 75
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall-large-icon-editor
   rotate: false
-  xy: 1593, 327
+  xy: 1593, 339
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 core-foundation-icon-editor
   rotate: false
-  xy: 163, 39
+  xy: 163, 51
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 core-nucleus-icon-editor
   rotate: false
-  xy: 1, 7
+  xy: 1, 19
   size: 160, 160
   orig: 160, 160
   offset: 0, 0
   index: -1
 core-shard-icon-editor
   rotate: false
-  xy: 1133, 393
+  xy: 1133, 405
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 craters-icon-editor
   rotate: false
-  xy: 1143, 63
+  xy: 1211, 75
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-craters1
   rotate: false
-  xy: 1143, 63
+  xy: 1211, 75
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 crawler-factory-icon-editor
   rotate: false
-  xy: 1659, 327
+  xy: 1659, 339
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cryofluidmixer-icon-editor
   rotate: false
-  xy: 1725, 327
+  xy: 1725, 339
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cultivator-icon-editor
   rotate: false
-  xy: 1791, 327
+  xy: 1791, 339
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 cyclone-icon-editor
   rotate: false
-  xy: 1231, 393
+  xy: 1231, 405
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 dagger-factory-icon-editor
   rotate: false
-  xy: 1857, 327
+  xy: 1857, 339
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 deepwater-icon-editor
   rotate: false
-  xy: 1177, 63
+  xy: 1245, 75
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-deepwater
   rotate: false
-  xy: 1177, 63
+  xy: 1245, 75
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 delta-mech-pad-icon-editor
   rotate: false
-  xy: 1923, 327
+  xy: 1923, 339
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 differential-generator-icon-editor
   rotate: false
-  xy: 1329, 393
+  xy: 1329, 405
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 distributor-icon-editor
   rotate: false
-  xy: 1043, 197
+  xy: 1043, 209
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 door-icon-editor
   rotate: false
-  xy: 1211, 63
+  xy: 1279, 75
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door-large-icon-editor
   rotate: false
-  xy: 1043, 131
+  xy: 1043, 143
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dunerocks-icon-editor
   rotate: false
-  xy: 1245, 63
+  xy: 1313, 75
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 duo-icon-editor
   rotate: false
-  xy: 1279, 63
+  xy: 163, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-char2
   rotate: false
-  xy: 1313, 63
+  xy: 197, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-char3
   rotate: false
-  xy: 163, 5
+  xy: 231, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-clear
   rotate: false
-  xy: 905, 251
+  xy: 905, 263
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
 editor-craters2
   rotate: false
-  xy: 197, 5
+  xy: 265, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-craters3
   rotate: false
-  xy: 231, 5
+  xy: 299, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-craters4
   rotate: false
-  xy: 265, 5
+  xy: 333, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-craters5
   rotate: false
-  xy: 299, 5
+  xy: 367, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-stone1
   rotate: false
-  xy: 299, 5
+  xy: 367, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-icon-editor
   rotate: false
-  xy: 299, 5
+  xy: 367, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-craters6
   rotate: false
-  xy: 333, 5
+  xy: 401, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-stone2
   rotate: false
-  xy: 333, 5
+  xy: 401, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-grass1
   rotate: false
-  xy: 367, 5
+  xy: 435, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass-icon-editor
   rotate: false
-  xy: 367, 5
+  xy: 435, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-grass2
   rotate: false
-  xy: 401, 5
+  xy: 469, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-grass3
   rotate: false
-  xy: 435, 5
+  xy: 503, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-holostone1
   rotate: false
-  xy: 469, 5
+  xy: 1373, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone-icon-editor
   rotate: false
-  xy: 469, 5
+  xy: 1373, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-holostone2
   rotate: false
-  xy: 503, 5
+  xy: 1407, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-holostone3
   rotate: false
-  xy: 1373, 95
+  xy: 1441, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-hotrock1
   rotate: false
-  xy: 1407, 95
+  xy: 1475, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock-icon-editor
   rotate: false
-  xy: 1407, 95
+  xy: 1475, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-hotrock2
   rotate: false
-  xy: 1441, 95
+  xy: 1509, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-hotrock3
   rotate: false
-  xy: 1475, 95
+  xy: 1543, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice-snow1
   rotate: false
-  xy: 1611, 95
+  xy: 1963, 239
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow-icon-editor
   rotate: false
-  xy: 1611, 95
+  xy: 1963, 239
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice-snow2
   rotate: false
-  xy: 1645, 95
+  xy: 1679, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice-snow3
   rotate: false
-  xy: 1769, 185
+  xy: 1713, 123
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice1
   rotate: false
-  xy: 1509, 95
+  xy: 1577, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-icon-editor
   rotate: false
-  xy: 1509, 95
+  xy: 1577, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice2
   rotate: false
-  xy: 1543, 95
+  xy: 1611, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ice3
   rotate: false
-  xy: 1577, 95
+  xy: 1645, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ignarock1
   rotate: false
-  xy: 1679, 95
+  xy: 1753, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock-icon-editor
   rotate: false
-  xy: 1679, 95
+  xy: 1753, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ignarock2
   rotate: false
-  xy: 1753, 151
+  xy: 1713, 89
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ignarock3
   rotate: false
-  xy: 1713, 111
+  xy: 1753, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-magmarock1
   rotate: false
-  xy: 1787, 151
+  xy: 1747, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock-icon-editor
   rotate: false
-  xy: 1787, 151
+  xy: 1747, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-magmarock2
   rotate: false
-  xy: 1803, 185
+  xy: 1787, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-magmarock3
   rotate: false
-  xy: 1837, 193
+  xy: 1787, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor
   rotate: false
-  xy: 1871, 193
+  xy: 1821, 197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged5
   rotate: false
-  xy: 1871, 193
+  xy: 1821, 197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-icon-editor
   rotate: false
-  xy: 1871, 193
+  xy: 1821, 197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-2
   rotate: false
-  xy: 1905, 193
+  xy: 1821, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2-icon-editor
   rotate: false
-  xy: 1905, 193
+  xy: 1821, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-3
   rotate: false
-  xy: 1939, 193
+  xy: 1747, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-3-icon-editor
   rotate: false
-  xy: 1939, 193
+  xy: 1747, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-5
   rotate: false
-  xy: 1713, 77
+  xy: 1787, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-5-icon-editor
   rotate: false
-  xy: 1713, 77
+  xy: 1787, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged1
   rotate: false
-  xy: 1821, 151
+  xy: 1821, 129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged-icon-editor
   rotate: false
-  xy: 1821, 151
+  xy: 1821, 129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged2
   rotate: false
-  xy: 1855, 159
+  xy: 1781, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged3
   rotate: false
-  xy: 1889, 159
+  xy: 1781, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged4
   rotate: false
-  xy: 1923, 159
+  xy: 1861, 205
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-metal-floor-damaged6
   rotate: false
-  xy: 1957, 159
+  xy: 1895, 205
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-moss1
   rotate: false
-  xy: 1973, 193
+  xy: 1929, 205
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-stained-stone-yellow1
   rotate: false
-  xy: 1973, 193
+  xy: 1929, 205
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss-icon-editor
   rotate: false
-  xy: 1973, 193
+  xy: 1929, 205
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-yellow-icon-editor
   rotate: false
-  xy: 1973, 193
+  xy: 1929, 205
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-moss2
   rotate: false
-  xy: 1981, 227
+  xy: 1963, 205
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-moss3
   rotate: false
-  xy: 2015, 355
+  xy: 1855, 171
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-coal1
   rotate: false
-  xy: 2015, 321
+  xy: 1855, 137
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-coal2
   rotate: false
-  xy: 2015, 287
+  xy: 1889, 171
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-coal3
   rotate: false
-  xy: 2015, 253
+  xy: 1889, 137
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-copper1
   rotate: false
-  xy: 2015, 219
+  xy: 1923, 171
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-copper2
   rotate: false
-  xy: 2007, 185
+  xy: 1923, 137
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-copper3
   rotate: false
-  xy: 1991, 151
+  xy: 1957, 171
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-lead1
   rotate: false
-  xy: 1855, 125
+  xy: 1957, 137
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-lead2
   rotate: false
-  xy: 1889, 125
+  xy: 1989, 367
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-lead3
   rotate: false
-  xy: 1923, 125
+  xy: 1989, 333
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-scrap1
   rotate: false
-  xy: 1957, 125
+  xy: 1989, 299
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-scrap2
   rotate: false
-  xy: 1991, 117
+  xy: 1821, 95
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-scrap3
   rotate: false
-  xy: 1347, 61
+  xy: 1855, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-thorium1
   rotate: false
-  xy: 1381, 61
+  xy: 1889, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-thorium2
   rotate: false
-  xy: 1415, 61
+  xy: 1923, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-thorium3
   rotate: false
-  xy: 1449, 61
+  xy: 1957, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-titanium1
   rotate: false
-  xy: 1483, 61
+  xy: 1815, 61
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-titanium2
   rotate: false
-  xy: 1517, 61
+  xy: 1855, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-ore-titanium3
   rotate: false
-  xy: 1551, 61
+  xy: 1889, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-salt
   rotate: false
-  xy: 1585, 61
+  xy: 1923, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salt-icon-editor
   rotate: false
-  xy: 1585, 61
+  xy: 1923, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand-water
   rotate: false
-  xy: 1787, 117
+  xy: 1883, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water-icon-editor
   rotate: false
-  xy: 1787, 117
+  xy: 1883, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand1
   rotate: false
-  xy: 1619, 61
+  xy: 1957, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-icon-editor
   rotate: false
-  xy: 1619, 61
+  xy: 1957, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand2
   rotate: false
-  xy: 1653, 61
+  xy: 1815, 27
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-sand3
   rotate: false
-  xy: 1753, 117
+  xy: 1849, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-snow1
   rotate: false
-  xy: 1821, 117
+  xy: 1917, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-icon-editor
   rotate: false
-  xy: 1821, 117
+  xy: 1917, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-snow2
   rotate: false
-  xy: 1747, 83
+  xy: 1951, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-snow3
   rotate: false
-  xy: 1781, 83
+  xy: 1849, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-stained-stone-red1
   rotate: false
-  xy: 1815, 83
+  xy: 1883, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-red-icon-editor
   rotate: false
-  xy: 1815, 83
+  xy: 1883, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-stone3
   rotate: false
-  xy: 1855, 91
+  xy: 1917, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-tar
   rotate: false
-  xy: 1889, 91
+  xy: 1951, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-icon-editor
   rotate: false
-  xy: 1889, 91
+  xy: 1951, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 editor-water
   rotate: false
-  xy: 1923, 91
+  xy: 1347, 73
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-icon-editor
   rotate: false
-  xy: 1923, 91
+  xy: 1347, 73
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 force-projector-icon-editor
   rotate: false
-  xy: 1427, 393
+  xy: 1427, 405
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 fortress-factory-icon-editor
   rotate: false
-  xy: 1525, 393
+  xy: 1525, 405
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 fuse-icon-editor
   rotate: false
-  xy: 1623, 393
+  xy: 1623, 405
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 ghoul-factory-icon-editor
   rotate: false
-  xy: 1721, 393
+  xy: 1721, 405
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 glaive-ship-pad-icon-editor
   rotate: false
-  xy: 1819, 393
+  xy: 1819, 405
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 graphite-press-icon-editor
   rotate: false
-  xy: 1043, 65
+  xy: 1043, 77
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 hail-icon-editor
   rotate: false
-  xy: 1957, 91
+  xy: 1381, 73
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icerocks-icon-editor
   rotate: false
-  xy: 1991, 83
+  xy: 1415, 73
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 impact-reactor-icon-editor
   rotate: false
-  xy: 645, 231
+  xy: 645, 243
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 incinerator-icon-editor
   rotate: false
-  xy: 1747, 49
+  xy: 1449, 73
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source-icon-editor
   rotate: false
-  xy: 1781, 49
+  xy: 1483, 73
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void-icon-editor
   rotate: false
-  xy: 1815, 49
+  xy: 1517, 73
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 javelin-ship-pad-icon-editor
   rotate: false
-  xy: 1109, 229
+  xy: 1109, 241
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 junction-icon-editor
   rotate: false
-  xy: 1849, 57
+  xy: 1551, 73
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 kiln-icon-editor
   rotate: false
-  xy: 1109, 163
+  xy: 1109, 175
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 lancer-icon-editor
   rotate: false
-  xy: 1175, 229
+  xy: 1175, 241
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 laser-drill-icon-editor
   rotate: false
-  xy: 1917, 393
+  xy: 1917, 405
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 launch-pad-icon-editor
   rotate: false
-  xy: 553, 71
+  xy: 553, 83
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 liquid-junction-icon-editor
   rotate: false
-  xy: 1883, 57
+  xy: 1585, 73
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-icon-editor
   rotate: false
-  xy: 1917, 57
+  xy: 1619, 73
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source-icon-editor
   rotate: false
-  xy: 1951, 57
+  xy: 1653, 73
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-tank-icon-editor
   rotate: false
-  xy: 651, 133
+  xy: 651, 145
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 mass-driver-icon-editor
   rotate: false
-  xy: 749, 133
+  xy: 749, 145
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 mechanical-drill-icon-editor
   rotate: false
-  xy: 1109, 97
+  xy: 1109, 109
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 mechanical-pump-icon-editor
   rotate: false
-  xy: 1985, 49
+  xy: 1991, 171
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 meltdown-icon-editor
   rotate: false
-  xy: 775, 361
+  xy: 775, 373
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 melter-icon-editor
   rotate: false
-  xy: 1849, 23
+  xy: 1991, 137
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mend-projector-icon-editor
   rotate: false
-  xy: 1175, 163
+  xy: 1175, 175
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 multi-press-icon-editor
   rotate: false
-  xy: 651, 35
+  xy: 651, 47
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 oil-extractor-icon-editor
   rotate: false
-  xy: 749, 35
+  xy: 749, 47
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 omega-mech-pad-icon-editor
   rotate: false
-  xy: 847, 133
+  xy: 847, 145
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 overdrive-projector-icon-editor
   rotate: false
-  xy: 1241, 229
+  xy: 1241, 241
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 overflow-gate-icon-editor
   rotate: false
-  xy: 1883, 23
+  xy: 1991, 103
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phantom-factory-icon-editor
   rotate: false
-  xy: 1175, 97
+  xy: 1175, 109
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phase-conduit-icon-editor
   rotate: false
-  xy: 1917, 23
+  xy: 1991, 69
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-icon-editor
   rotate: false
-  xy: 1951, 23
+  xy: 1985, 35
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-icon-editor
   rotate: false
-  xy: 1985, 15
+  xy: 1985, 1
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-large-icon-editor
   rotate: false
-  xy: 1241, 163
+  xy: 1241, 175
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 phase-weaver-icon-editor
   rotate: false
-  xy: 1307, 229
+  xy: 1307, 241
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pine-icon-editor
   rotate: false
-  xy: 1703, 145
+  xy: 1703, 157
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 plastanium-compressor-icon-editor
   rotate: false
-  xy: 1241, 97
+  xy: 1241, 109
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 pneumatic-drill-icon-editor
   rotate: false
-  xy: 1307, 163
+  xy: 1307, 175
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 power-node-icon-editor
   rotate: false
-  xy: 1013, 31
+  xy: 1013, 43
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node-large-icon-editor
   rotate: false
-  xy: 1307, 97
+  xy: 1307, 109
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 power-source-icon-editor
   rotate: false
-  xy: 1047, 31
+  xy: 1047, 43
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void-icon-editor
   rotate: false
-  xy: 1081, 29
+  xy: 1081, 41
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-icon-editor
   rotate: false
-  xy: 1115, 29
+  xy: 1115, 41
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-icon-editor
   rotate: false
-  xy: 1149, 29
+  xy: 1149, 41
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pyratite-mixer-icon-editor
   rotate: false
-  xy: 553, 5
+  xy: 553, 17
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 repair-point-icon-editor
   rotate: false
-  xy: 1183, 29
+  xy: 1183, 41
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 revenant-factory-icon-editor
   rotate: false
-  xy: 293, 39
+  xy: 293, 51
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 ripple-icon-editor
   rotate: false
-  xy: 847, 35
+  xy: 847, 47
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 rocks-icon-editor
   rotate: false
-  xy: 1217, 29
+  xy: 1217, 41
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rotary-pump-icon-editor
   rotate: false
-  xy: 1395, 261
+  xy: 1395, 273
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 router-icon-editor
   rotate: false
-  xy: 1251, 29
+  xy: 1251, 41
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator-icon-editor
   rotate: false
-  xy: 1461, 261
+  xy: 1461, 273
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 salvo-icon-editor
   rotate: false
-  xy: 1527, 261
+  xy: 1527, 273
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 sandrocks-icon-editor
   rotate: false
-  xy: 1285, 29
+  xy: 1285, 41
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-gigantic-icon-editor
   rotate: false
-  xy: 775, 231
+  xy: 775, 243
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 scrap-wall-huge-icon-editor
   rotate: false
-  xy: 1003, 263
+  xy: 1003, 275
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 scrap-wall-icon-editor
   rotate: false
-  xy: 1319, 27
+  xy: 1319, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-large-icon-editor
   rotate: false
-  xy: 1593, 261
+  xy: 1593, 273
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 separator-icon-editor
   rotate: false
-  xy: 1659, 261
+  xy: 1659, 273
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 shock-mine-icon-editor
   rotate: false
-  xy: 1353, 27
+  xy: 1353, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 silicon-smelter-icon-editor
   rotate: false
-  xy: 1725, 261
+  xy: 1725, 273
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 snowrocks-icon-editor
   rotate: false
-  xy: 1387, 27
+  xy: 1387, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel-icon-editor
   rotate: false
-  xy: 1421, 27
+  xy: 1421, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel-large-icon-editor
   rotate: false
-  xy: 945, 165
+  xy: 945, 177
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 sorter-icon-editor
   rotate: false
-  xy: 1455, 27
+  xy: 1455, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spawn-icon-editor
   rotate: false
-  xy: 1489, 27
+  xy: 1489, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spectre-icon-editor
   rotate: false
-  xy: 905, 361
+  xy: 905, 373
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 spirit-factory-icon-editor
   rotate: false
-  xy: 1791, 261
+  xy: 1791, 273
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 spore-cluster-icon-editor
   rotate: false
-  xy: 1769, 219
+  xy: 1819, 231
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
+spore-pine-icon-editor
+  rotate: false
+  xy: 1769, 223
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 spore-press-icon-editor
   rotate: false
-  xy: 1857, 261
+  xy: 1857, 273
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 stained-boulder-icon-editor
   rotate: false
-  xy: 1523, 27
+  xy: 1523, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-rocks-icon-editor
   rotate: false
-  xy: 1557, 27
+  xy: 1557, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-rocks-red-icon-editor
   rotate: false
-  xy: 1591, 27
+  xy: 1591, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-rocks-yellow-icon-editor
   rotate: false
-  xy: 1625, 27
+  xy: 1625, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-tower-icon-editor
   rotate: false
-  xy: 1923, 261
+  xy: 1923, 273
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 surge-wall-icon-editor
   rotate: false
-  xy: 1659, 27
+  xy: 1659, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall-large-icon-editor
   rotate: false
-  xy: 1373, 195
+  xy: 1373, 207
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 swarmer-icon-editor
   rotate: false
-  xy: 1373, 129
+  xy: 1373, 141
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 tau-mech-pad-icon-editor
   rotate: false
-  xy: 1439, 195
+  xy: 1439, 207
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thermal-generator-icon-editor
   rotate: false
-  xy: 1439, 129
+  xy: 1439, 141
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thermal-pump-icon-editor
   rotate: false
-  xy: 945, 67
+  xy: 945, 79
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 thorium-reactor-icon-editor
   rotate: false
-  xy: 1101, 295
+  xy: 1101, 307
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 thorium-wall-icon-editor
   rotate: false
-  xy: 619, 1
+  xy: 1997, 265
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall-large-icon-editor
   rotate: false
-  xy: 1505, 195
+  xy: 1505, 207
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 thruster-icon-editor
   rotate: false
-  xy: 423, 39
+  xy: 423, 51
   size: 128, 128
   orig: 128, 128
   offset: 0, 0
   index: -1
 titan-factory-icon-editor
   rotate: false
-  xy: 1199, 295
+  xy: 1199, 307
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 titanium-conveyor-icon-editor
   rotate: false
-  xy: 653, 1
+  xy: 1997, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-icon-editor
   rotate: false
-  xy: 687, 1
+  xy: 619, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-large-icon-editor
   rotate: false
-  xy: 1505, 129
+  xy: 1505, 141
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 trident-ship-pad-icon-editor
   rotate: false
-  xy: 1571, 195
+  xy: 1571, 207
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 turbine-generator-icon-editor
   rotate: false
-  xy: 1571, 129
+  xy: 1571, 141
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 unloader-icon-editor
   rotate: false
-  xy: 721, 1
+  xy: 653, 13
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 vault-icon-editor
   rotate: false
-  xy: 1297, 295
+  xy: 1297, 307
   size: 96, 96
   orig: 96, 96
   offset: 0, 0
   index: -1
 water-extractor-icon-editor
   rotate: false
-  xy: 1637, 195
+  xy: 1637, 207
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 wave-icon-editor
   rotate: false
-  xy: 1637, 129
+  xy: 1637, 141
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 white-tree-dead-icon-editor
   rotate: false
-  xy: 1, 169
+  xy: 1, 181
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
   index: -1
 white-tree-icon-editor
   rotate: false
-  xy: 323, 169
+  xy: 323, 181
   size: 320, 320
   orig: 320, 320
   offset: 0, 0
   index: -1
 wraith-factory-icon-editor
   rotate: false
-  xy: 1703, 195
+  xy: 1703, 207
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -9467,133 +9488,133 @@ filter: Nearest,Nearest
 repeat: none
 char1
   rotate: false
-  xy: 1937, 413
+  xy: 2003, 479
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 char2
   rotate: false
-  xy: 2003, 479
+  xy: 581, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 char3
   rotate: false
-  xy: 581, 107
+  xy: 1805, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cliffs1
   rotate: false
-  xy: 1805, 231
+  xy: 249, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal1
   rotate: false
-  xy: 249, 59
+  xy: 283, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 283, 59
+  xy: 1805, 197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 1805, 197
+  xy: 317, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper1
   rotate: false
-  xy: 317, 59
+  xy: 1805, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper2
   rotate: false
-  xy: 1805, 163
+  xy: 351, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper3
   rotate: false
-  xy: 351, 59
+  xy: 1805, 129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters1
   rotate: false
-  xy: 1805, 129
+  xy: 385, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters2
   rotate: false
-  xy: 385, 59
+  xy: 419, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters3
   rotate: false
-  xy: 419, 59
+  xy: 453, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters4
   rotate: false
-  xy: 453, 59
+  xy: 487, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters5
   rotate: false
-  xy: 487, 59
+  xy: 521, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 487, 59
+  xy: 521, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters6
   rotate: false
-  xy: 521, 59
+  xy: 2003, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 521, 59
+  xy: 2003, 445
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 1937, 379
+  xy: 555, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9614,14 +9635,14 @@ dunerocks-large
   index: -1
 dunerocks1
   rotate: false
-  xy: 1971, 413
+  xy: 1937, 371
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dunerocks2
   rotate: false
-  xy: 1971, 379
+  xy: 283, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9649,21 +9670,21 @@ grass-edge
   index: -1
 grass1
   rotate: false
-  xy: 555, 59
+  xy: 317, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 1871, 305
+  xy: 351, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 283, 25
+  xy: 385, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9677,42 +9698,42 @@ holostone-edge
   index: -1
 holostone1
   rotate: false
-  xy: 317, 25
+  xy: 419, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone2
   rotate: false
-  xy: 351, 25
+  xy: 453, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone3
   rotate: false
-  xy: 385, 25
+  xy: 487, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock1
   rotate: false
-  xy: 419, 25
+  xy: 521, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock2
   rotate: false
-  xy: 453, 25
+  xy: 555, 25
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock3
   rotate: false
-  xy: 487, 25
+  xy: 1921, 337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9733,42 +9754,42 @@ ice-snow-edge
   index: -1
 ice-snow1
   rotate: false
-  xy: 1839, 231
+  xy: 1839, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow2
   rotate: false
-  xy: 1839, 197
+  xy: 1839, 129
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow3
   rotate: false
-  xy: 1839, 163
+  xy: 1955, 337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 521, 25
+  xy: 1855, 281
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 555, 25
+  xy: 1839, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 1855, 271
+  xy: 1839, 197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9782,14 +9803,14 @@ icerocks-large
   index: -1
 icerocks1
   rotate: false
-  xy: 1839, 129
+  xy: 1971, 371
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icerocks2
   rotate: false
-  xy: 1889, 271
+  xy: 1889, 297
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9803,133 +9824,133 @@ ignarock-edge
   index: -1
 ignarock1
   rotate: false
-  xy: 1873, 237
+  xy: 1923, 303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock2
   rotate: false
-  xy: 1873, 203
+  xy: 1957, 303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock3
   rotate: false
-  xy: 1873, 169
+  xy: 1989, 337
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead1
   rotate: false
-  xy: 1873, 135
+  xy: 1991, 303
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 1905, 305
+  xy: 1889, 263
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 1907, 237
+  xy: 1923, 269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock1
   rotate: false
-  xy: 1907, 203
+  xy: 1957, 269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock2
   rotate: false
-  xy: 1923, 271
+  xy: 1991, 269
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock3
   rotate: false
-  xy: 1907, 169
+  xy: 1873, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor
   rotate: false
-  xy: 1907, 135
+  xy: 1873, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged5
   rotate: false
-  xy: 1907, 135
+  xy: 1873, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2
   rotate: false
-  xy: 1941, 237
+  xy: 1873, 161
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-3
   rotate: false
-  xy: 1941, 203
+  xy: 1873, 127
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-5
   rotate: false
-  xy: 1941, 169
+  xy: 1907, 229
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged1
   rotate: false
-  xy: 1941, 135
+  xy: 1907, 195
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged2
   rotate: false
-  xy: 589, 73
+  xy: 1907, 161
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged3
   rotate: false
-  xy: 589, 39
+  xy: 1907, 127
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged4
   rotate: false
-  xy: 589, 5
+  xy: 1941, 235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged6
   rotate: false
-  xy: 1913, 345
+  xy: 1941, 201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9957,154 +9978,154 @@ stained-stone-yellow-edge
   index: -1
 moss1
   rotate: false
-  xy: 1947, 345
+  xy: 1975, 235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-yellow1
   rotate: false
-  xy: 1947, 345
+  xy: 1975, 235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss2
   rotate: false
-  xy: 1939, 311
+  xy: 1941, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss3
   rotate: false
-  xy: 1981, 345
+  xy: 1975, 201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal1
   rotate: false
-  xy: 1973, 311
+  xy: 1941, 133
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal2
   rotate: false
-  xy: 1957, 277
+  xy: 1975, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal3
   rotate: false
-  xy: 2015, 445
+  xy: 1975, 133
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper1
   rotate: false
-  xy: 2015, 411
+  xy: 2009, 235
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper2
   rotate: false
-  xy: 2015, 377
+  xy: 2009, 201
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper3
   rotate: false
-  xy: 2015, 343
+  xy: 2009, 167
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead1
   rotate: false
-  xy: 2007, 309
+  xy: 2009, 133
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead2
   rotate: false
-  xy: 1991, 275
+  xy: 589, 73
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead3
   rotate: false
-  xy: 1975, 241
+  xy: 589, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap1
   rotate: false
-  xy: 1975, 207
+  xy: 589, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap2
   rotate: false
-  xy: 1975, 173
+  xy: 1979, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap3
   rotate: false
-  xy: 1975, 139
+  xy: 2013, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium1
   rotate: false
-  xy: 2009, 241
+  xy: 2005, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium2
   rotate: false
-  xy: 2009, 207
+  xy: 1805, 95
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium3
   rotate: false
-  xy: 2009, 173
+  xy: 1839, 95
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium1
   rotate: false
-  xy: 2009, 139
+  xy: 1873, 93
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium2
   rotate: false
-  xy: 1805, 95
+  xy: 1907, 93
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium3
   rotate: false
-  xy: 1839, 95
+  xy: 1941, 99
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10139,21 +10160,21 @@ rocks-large
   index: -1
 rocks1
   rotate: false
-  xy: 1873, 101
+  xy: 1975, 99
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rocks2
   rotate: false
-  xy: 1907, 101
+  xy: 2009, 99
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salt
   rotate: false
-  xy: 1941, 101
+  xy: 1941, 65
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10174,7 +10195,7 @@ sand-edge
   index: -1
 sand-water
   rotate: false
-  xy: 1907, 67
+  xy: 623, 27
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10188,21 +10209,21 @@ sand-water-edge
   index: -1
 sand1
   rotate: false
-  xy: 1975, 105
+  xy: 1975, 65
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 2009, 105
+  xy: 2009, 65
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 1873, 67
+  xy: 623, 61
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10216,35 +10237,35 @@ sandrocks-large
   index: -1
 sandrocks1
   rotate: false
-  xy: 1941, 67
+  xy: 657, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sandrocks2
   rotate: false
-  xy: 1975, 71
+  xy: 691, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap1
   rotate: false
-  xy: 2009, 71
+  xy: 657, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap2
   rotate: false
-  xy: 1975, 37
+  xy: 725, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap3
   rotate: false
-  xy: 2009, 37
+  xy: 691, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10258,21 +10279,21 @@ snow-edge
   index: -1
 snow1
   rotate: false
-  xy: 623, 61
+  xy: 759, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 623, 27
+  xy: 725, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 657, 87
+  xy: 793, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10286,14 +10307,14 @@ snowrocks-large
   index: -1
 snowrocks1
   rotate: false
-  xy: 691, 87
+  xy: 759, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrocks2
   rotate: false
-  xy: 657, 53
+  xy: 827, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10314,21 +10335,28 @@ spore-cluster2
   index: -1
 spore-cluster3
   rotate: false
-  xy: 1871, 339
+  xy: 1937, 405
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
+spore-pine
+  rotate: false
+  xy: 1871, 331
+  size: 48, 48
+  orig: 48, 48
+  offset: 0, 0
+  index: -1
 stained-boulder1
   rotate: false
-  xy: 725, 87
+  xy: 793, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-boulder2
   rotate: false
-  xy: 691, 53
+  xy: 861, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10349,14 +10377,14 @@ stained-rocks-red-large
   index: -1
 stained-rocks-red1
   rotate: false
-  xy: 793, 87
+  xy: 861, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-rocks-red2
   rotate: false
-  xy: 759, 53
+  xy: 929, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10370,28 +10398,28 @@ stained-rocks-yellow-large
   index: -1
 stained-rocks-yellow1
   rotate: false
-  xy: 827, 87
+  xy: 895, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-rocks-yellow2
   rotate: false
-  xy: 793, 53
+  xy: 963, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-rocks1
   rotate: false
-  xy: 759, 87
+  xy: 827, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-rocks2
   rotate: false
-  xy: 725, 53
+  xy: 895, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10405,35 +10433,35 @@ stained-stone-red-edge
   index: -1
 stained-stone-red1
   rotate: false
-  xy: 861, 87
+  xy: 929, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-red3
   rotate: false
-  xy: 861, 87
+  xy: 929, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-red2
   rotate: false
-  xy: 827, 53
+  xy: 997, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-yellow2
   rotate: false
-  xy: 895, 87
+  xy: 963, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stained-stone-yellow3
   rotate: false
-  xy: 861, 53
+  xy: 1031, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10447,14 +10475,14 @@ stainedrocks-large
   index: -1
 stainedrocks1
   rotate: false
-  xy: 929, 87
+  xy: 997, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stainedrocks2
   rotate: false
-  xy: 895, 53
+  xy: 1065, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10468,14 +10496,14 @@ stone-edge
   index: -1
 stone3
   rotate: false
-  xy: 963, 87
+  xy: 1031, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar
   rotate: false
-  xy: 929, 53
+  xy: 1099, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10489,49 +10517,49 @@ tar-edge
   index: -1
 thorium1
   rotate: false
-  xy: 997, 87
+  xy: 1065, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 963, 53
+  xy: 1133, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 1031, 87
+  xy: 1099, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 997, 53
+  xy: 1167, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 1065, 87
+  xy: 1133, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 1031, 53
+  xy: 1201, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 1099, 87
+  xy: 1167, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index d5e483bf5d..9f82caa9fe 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png
index 9f94d97008..13bd277106 100644
Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ
diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png
index 2b1c5b0372..82c7ccf278 100644
Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ
diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java
index bbeb84cb88..bef48546c4 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -35,7 +35,7 @@ public class Blocks implements ContentList{
 
     //environment
     air, part, spawn, deepwater, water, tar, stone, craters, charr, sand, ice, snow,
-    holostone, rocks, icerocks, cliffs, pine, whiteTree, whiteTreeDead, sporeCluster,
+    holostone, rocks, icerocks, cliffs, sporePine, pine, whiteTree, whiteTreeDead, sporeCluster,
     iceSnow, sandWater, duneRocks, sandRocks, stainedRocks, moss, stainedRocksRed, stainedStoneRed, stainedRocksYellow, stainedStoneYellow, stainedBoulder,  grass, salt,
     metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor5, ignarock, magmarock, hotrock, snowrocks,
 
@@ -226,6 +226,10 @@ public class Blocks implements ContentList{
             variants = 2;
         }};
 
+        sporePine = new StaticWall("spore-pine"){{
+            variants = 0;
+        }};
+
         pine = new StaticWall("pine"){{
             variants = 0;
         }};
diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java
index 0e742a987c..cb2b4a3900 100644
--- a/core/src/io/anuke/mindustry/input/MobileInput.java
+++ b/core/src/io/anuke/mindustry/input/MobileInput.java
@@ -263,8 +263,7 @@ public class MobileInput extends InputHandler implements GestureListener{
 
         //rotate button
         table.addImageButton("icon-arrow", "clear-partial", 16 * 2f, () -> rotation = Mathf.mod(rotation + 1, 4))
-        .update(i -> i.getImage().setRotationOrigin(rotation * 90, Align.center))
-        .visible(() -> block != null && block.rotate);
+        .update(i -> i.getImage().setRotationOrigin(rotation * 90, Align.center)).visible(() -> block != null && block.rotate);
 
         //confirm button
         table.addImageButton("icon-check", "clear-partial", 16 * 2f, () -> {
diff --git a/core/src/io/anuke/mindustry/io/SaveFileVersion.java b/core/src/io/anuke/mindustry/io/SaveFileVersion.java
index 01b30712af..289f7b85b1 100644
--- a/core/src/io/anuke/mindustry/io/SaveFileVersion.java
+++ b/core/src/io/anuke/mindustry/io/SaveFileVersion.java
@@ -120,14 +120,15 @@ public abstract class SaveFileVersion{
             byte floorid = stream.readByte();
             byte oreid = stream.readByte();
             int consecutives = stream.readUnsignedByte();
+            Block ore = content.block(oreid);
 
             tiles[x][y] = new Tile(x, y, floorid, (byte)0);
-            tiles[x][y].setOreByte(oreid);
+            tiles[x][y].setOre(ore);
 
             for(int j = i + 1; j < i + 1 + consecutives; j++){
                 int newx = j % width, newy = j / width;
                 Tile newTile = new Tile(newx, newy, floorid, (byte)0);
-                newTile.setOreByte(oreid);
+                newTile.setOre(ore);
                 tiles[newx][newy] = newTile;
             }
 
diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java
index b42aa9a07c..3bfe361a43 100644
--- a/core/src/io/anuke/mindustry/world/Tile.java
+++ b/core/src/io/anuke/mindustry/world/Tile.java
@@ -337,8 +337,8 @@ public class Tile implements Position, TargetTrait{
         this.ore = ore;
     }
 
-    public void setOre(Block floor){
-        setOreByte(floor.id);
+    public void setOre(Block block){
+        setOreByte(block.id);
     }
 
     public void clearOre(){
diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java
index 13923fa17c..e27c0d7302 100644
--- a/core/src/io/anuke/mindustry/world/blocks/Floor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java
@@ -110,7 +110,7 @@ public class Floor extends Block{
 
         Draw.rect(variantRegions[Mathf.randomSeed(tile.pos(), 0, Math.max(0, variantRegions.length - 1))], tile.worldx(), tile.worldy());
         Floor floor = tile.oreBlock();
-        if(floor != Blocks.air){
+        if(floor != Blocks.air && floor != this){ //ore should never have itself on top, but it's possible, so prevent a crash in that case
             floor.draw(tile);
         }