diff --git a/core/assets-raw/sprites/ui/button-trans.9.png b/core/assets-raw/sprites/ui/button-trans.9.png
new file mode 100644
index 0000000000..39d840e1a2
Binary files /dev/null and b/core/assets-raw/sprites/ui/button-trans.9.png differ
diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 0bd99ac30f..2e926f6b58 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -861,10 +861,12 @@ unit.chaos-array.name = Chaos Array
 unit.eradicator.name = Eradicator
 unit.lich.name = Lich
 unit.reaper.name = Reaper
-tutorial.begin = Your mission here is to eradicate the[lightgray] enemy[].\n\nBegin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.
-tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\nPlace one on a copper vein.
-tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.
-tutorial.morecopper = More copper is required.\n\nEither mine it manually, or place more drills.
+tutorial.intro = Begin by[accent] mining copper[]. Tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
+tutorial.drill = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\n\nClick the drill tab in the bottom right, then select the[accent] mechanical drill[]. Place it on a copper vein by clicking.
+tutorial.drill.mobile = Mining manually is inefficient.\n[accent]Drills []can mine automatically.\n\nTap the drill tab in the bottom right, then select the[accent] mechanical drill[]. Place it on a copper vein by tapping, then press the[accent] checkmark[] below to confirm your selection.\nPress the[accent] X button[] to cancel placement.
+
+tutorial.conveyor = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.[yellow] Hold down the mouse to place in a line.[]\nHold[accent] CTRL[] while selecting a line to place diagonally.\n\n[accent]{0}/{1} conveyors
+tutorial.conveyor.mobile = [accent]Conveyors[] are used to transport items to the core.\nMake a line of conveyors from the drill to the core.[yellow] Place in a line by holding down your finger for a few seconds[] and dragging in a direction.\n\n[accent]{0}/{1} conveyors
 tutorial.turret = Defensive structures must be built to repel the[lightgray] enemy[].\nBuild a duo turret near your base.
 tutorial.drillturret = Duo turrets require[accent] copper ammo []to shoot.\nPlace a drill next to the turret to supply it with mined copper.
 tutorial.waves = The[lightgray] enemy[] approaches.\n\nDefend your core for 2 waves. Build more turrets.
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index ae8102bec2..a6a50c258e 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -8543,14 +8543,14 @@ alloy-smelter-icon-large
   index: -1
 alloy-smelter-icon-medium
   rotate: false
-  xy: 1115, 890
+  xy: 203, 40
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 alloy-smelter-icon-small
   rotate: false
-  xy: 2023, 698
+  xy: 1294, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -8564,21 +8564,21 @@ arc-icon-large
   index: -1
 arc-icon-medium
   rotate: false
-  xy: 1149, 890
+  xy: 1152, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 arc-icon-small
   rotate: false
-  xy: 2023, 672
+  xy: 1320, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 bar
   rotate: false
-  xy: 1745, 618
+  xy: 1265, 586
   size: 27, 36
   split: 9, 9, 9, 9
   orig: 27, 36
@@ -8586,7 +8586,7 @@ bar
   index: -1
 bar-top
   rotate: false
-  xy: 1716, 618
+  xy: 1236, 586
   size: 27, 36
   split: 9, 10, 9, 10
   orig: 27, 36
@@ -8601,14 +8601,14 @@ battery-icon-large
   index: -1
 battery-icon-medium
   rotate: false
-  xy: 1183, 890
+  xy: 1186, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery-icon-small
   rotate: false
-  xy: 1774, 630
+  xy: 1346, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -8622,14 +8622,14 @@ battery-large-icon-large
   index: -1
 battery-large-icon-medium
   rotate: false
-  xy: 1217, 890
+  xy: 1220, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 battery-large-icon-small
   rotate: false
-  xy: 1800, 630
+  xy: 1372, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -8643,14 +8643,14 @@ blast-drill-icon-large
   index: -1
 blast-drill-icon-medium
   rotate: false
-  xy: 1251, 890
+  xy: 1254, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blast-drill-icon-small
   rotate: false
-  xy: 1826, 630
+  xy: 1398, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -8664,14 +8664,14 @@ blast-mixer-icon-large
   index: -1
 blast-mixer-icon-medium
   rotate: false
-  xy: 1285, 890
+  xy: 1288, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 blast-mixer-icon-small
   rotate: false
-  xy: 1852, 630
+  xy: 1424, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -8685,14 +8685,14 @@ bridge-conduit-icon-large
   index: -1
 bridge-conduit-icon-medium
   rotate: false
-  xy: 1319, 890
+  xy: 1322, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-icon-small
   rotate: false
-  xy: 1878, 630
+  xy: 1450, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -8706,21 +8706,21 @@ bridge-conveyor-icon-large
   index: -1
 bridge-conveyor-icon-medium
   rotate: false
-  xy: 1353, 890
+  xy: 1356, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-icon-small
   rotate: false
-  xy: 255, 1
+  xy: 1476, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 button
   rotate: false
-  xy: 251, 95
+  xy: 301, 145
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -8824,7 +8824,7 @@ button-right-over
   index: -1
 button-select
   rotate: false
-  xy: 281, 1
+  xy: 1502, 598
   size: 24, 24
   split: 4, 4, 4, 4
   orig: 24, 24
@@ -8854,6 +8854,14 @@ button-square-over
   orig: 36, 27
   offset: 0, 0
   index: -1
+button-trans
+  rotate: false
+  xy: 251, 95
+  size: 36, 27
+  split: 12, 12, 12, 12
+  orig: 36, 27
+  offset: 0, 0
+  index: -1
 char-icon-large
   rotate: false
   xy: 287, 974
@@ -8863,63 +8871,63 @@ char-icon-large
   index: -1
 char-icon-medium
   rotate: false
-  xy: 1387, 890
+  xy: 1390, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 char-icon-small
   rotate: false
-  xy: 1904, 630
+  xy: 1528, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 check-disabled
   rotate: false
-  xy: 1421, 890
+  xy: 1424, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-off
   rotate: false
-  xy: 1455, 890
+  xy: 1458, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-on
   rotate: false
-  xy: 1489, 890
+  xy: 1492, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-on-disabled
   rotate: false
-  xy: 1523, 890
+  xy: 1526, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-on-over
   rotate: false
-  xy: 1557, 890
+  xy: 1560, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 check-over
   rotate: false
-  xy: 1591, 890
+  xy: 1594, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 clear
   rotate: false
-  xy: 389, 262
+  xy: 1861, 656
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
@@ -8933,14 +8941,14 @@ cliffs-icon-large
   index: -1
 cliffs-icon-medium
   rotate: false
-  xy: 1625, 890
+  xy: 1628, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cliffs-icon-small
   rotate: false
-  xy: 765, 336
+  xy: 1554, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -8954,14 +8962,14 @@ coal-centrifuge-icon-large
   index: -1
 coal-centrifuge-icon-medium
   rotate: false
-  xy: 1659, 890
+  xy: 1662, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal-centrifuge-icon-small
   rotate: false
-  xy: 983, 585
+  xy: 1580, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -8975,14 +8983,14 @@ combustion-generator-icon-large
   index: -1
 combustion-generator-icon-medium
   rotate: false
-  xy: 1693, 890
+  xy: 1696, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-icon-small
   rotate: false
-  xy: 1015, 599
+  xy: 1606, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -8996,14 +9004,14 @@ conduit-icon-large
   index: -1
 conduit-icon-medium
   rotate: false
-  xy: 1727, 890
+  xy: 1730, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-icon-small
   rotate: false
-  xy: 1041, 599
+  xy: 1632, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9017,14 +9025,14 @@ container-icon-large
   index: -1
 container-icon-medium
   rotate: false
-  xy: 1761, 890
+  xy: 1764, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 container-icon-small
   rotate: false
-  xy: 1067, 599
+  xy: 1658, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9038,14 +9046,14 @@ conveyor-icon-large
   index: -1
 conveyor-icon-medium
   rotate: false
-  xy: 1795, 890
+  xy: 1798, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-icon-small
   rotate: false
-  xy: 2021, 864
+  xy: 1684, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9059,14 +9067,14 @@ copper-wall-icon-large
   index: -1
 copper-wall-icon-medium
   rotate: false
-  xy: 1829, 890
+  xy: 1832, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall-icon-small
   rotate: false
-  xy: 2023, 838
+  xy: 1710, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9080,14 +9088,14 @@ copper-wall-large-icon-large
   index: -1
 copper-wall-large-icon-medium
   rotate: false
-  xy: 1863, 890
+  xy: 1866, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper-wall-large-icon-small
   rotate: false
-  xy: 2023, 812
+  xy: 1736, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9101,14 +9109,14 @@ core-foundation-icon-large
   index: -1
 core-foundation-icon-medium
   rotate: false
-  xy: 1897, 890
+  xy: 1900, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 core-foundation-icon-small
   rotate: false
-  xy: 1774, 604
+  xy: 1762, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9122,14 +9130,14 @@ core-nucleus-icon-large
   index: -1
 core-nucleus-icon-medium
   rotate: false
-  xy: 1931, 890
+  xy: 1934, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 core-nucleus-icon-small
   rotate: false
-  xy: 1800, 604
+  xy: 1788, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9143,14 +9151,14 @@ core-shard-icon-large
   index: -1
 core-shard-icon-medium
   rotate: false
-  xy: 1965, 890
+  xy: 1968, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 core-shard-icon-small
   rotate: false
-  xy: 1826, 604
+  xy: 1814, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9164,14 +9172,14 @@ craters-icon-large
   index: -1
 craters-icon-medium
   rotate: false
-  xy: 1999, 890
+  xy: 2002, 890
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters-icon-small
   rotate: false
-  xy: 1852, 604
+  xy: 255, 1
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9185,14 +9193,14 @@ crawler-factory-icon-large
   index: -1
 crawler-factory-icon-medium
   rotate: false
-  xy: 202, 40
+  xy: 401, 261
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 crawler-factory-icon-small
   rotate: false
-  xy: 1878, 604
+  xy: 281, 1
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9206,14 +9214,14 @@ cryofluidmixer-icon-large
   index: -1
 cryofluidmixer-icon-medium
   rotate: false
-  xy: 401, 261
+  xy: 389, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cryofluidmixer-icon-small
   rotate: false
-  xy: 1904, 604
+  xy: 2021, 864
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9227,14 +9235,14 @@ cultivator-icon-large
   index: -1
 cultivator-icon-medium
   rotate: false
-  xy: 389, 227
+  xy: 389, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cultivator-icon-small
   rotate: false
-  xy: 794, 399
+  xy: 2023, 838
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9255,14 +9263,14 @@ cyclone-icon-large
   index: -1
 cyclone-icon-medium
   rotate: false
-  xy: 389, 193
+  xy: 451, 311
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cyclone-icon-small
   rotate: false
-  xy: 794, 373
+  xy: 2023, 812
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9276,14 +9284,14 @@ dagger-factory-icon-large
   index: -1
 dagger-factory-icon-medium
   rotate: false
-  xy: 451, 311
+  xy: 501, 361
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dagger-factory-icon-small
   rotate: false
-  xy: 794, 347
+  xy: 765, 336
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9297,14 +9305,14 @@ dark-metal-icon-large
   index: -1
 dark-metal-icon-medium
   rotate: false
-  xy: 501, 361
+  xy: 551, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-metal-icon-small
   rotate: false
-  xy: 1009, 573
+  xy: 1847, 630
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9318,14 +9326,14 @@ dark-panel-1-icon-large
   index: -1
 dark-panel-1-icon-medium
   rotate: false
-  xy: 551, 411
+  xy: 601, 461
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-1-icon-small
   rotate: false
-  xy: 1035, 573
+  xy: 1015, 567
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9339,14 +9347,14 @@ dark-panel-2-icon-large
   index: -1
 dark-panel-2-icon-medium
   rotate: false
-  xy: 601, 461
+  xy: 651, 511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-2-icon-small
   rotate: false
-  xy: 1061, 573
+  xy: 1041, 567
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9360,14 +9368,14 @@ dark-panel-3-icon-large
   index: -1
 dark-panel-3-icon-medium
   rotate: false
-  xy: 651, 511
+  xy: 701, 561
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-3-icon-small
   rotate: false
-  xy: 791, 321
+  xy: 1067, 567
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9381,14 +9389,14 @@ dark-panel-4-icon-large
   index: -1
 dark-panel-4-icon-medium
   rotate: false
-  xy: 701, 561
+  xy: 751, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-4-icon-small
   rotate: false
-  xy: 1093, 598
+  xy: 1093, 567
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9402,14 +9410,14 @@ dark-panel-5-icon-large
   index: -1
 dark-panel-5-icon-medium
   rotate: false
-  xy: 751, 611
+  xy: 801, 661
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-5-icon-small
   rotate: false
-  xy: 1119, 598
+  xy: 1294, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9423,14 +9431,14 @@ dark-panel-6-icon-large
   index: -1
 dark-panel-6-icon-medium
   rotate: false
-  xy: 801, 661
+  xy: 851, 711
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dark-panel-6-icon-small
   rotate: false
-  xy: 1145, 598
+  xy: 1320, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9444,14 +9452,14 @@ darksand-icon-large
   index: -1
 darksand-icon-medium
   rotate: false
-  xy: 851, 711
+  xy: 901, 761
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-icon-small
   rotate: false
-  xy: 1171, 598
+  xy: 1346, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9465,14 +9473,14 @@ darksand-tainted-water-icon-large
   index: -1
 darksand-tainted-water-icon-medium
   rotate: false
-  xy: 901, 761
+  xy: 951, 811
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-tainted-water-icon-small
   rotate: false
-  xy: 1197, 598
+  xy: 1372, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9486,14 +9494,14 @@ darksand-water-icon-large
   index: -1
 darksand-water-icon-medium
   rotate: false
-  xy: 951, 811
+  xy: 251, 61
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-water-icon-small
   rotate: false
-  xy: 1223, 598
+  xy: 1398, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9507,14 +9515,14 @@ dart-mech-pad-icon-large
   index: -1
 dart-mech-pad-icon-medium
   rotate: false
-  xy: 251, 61
+  xy: 301, 111
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dart-mech-pad-icon-small
   rotate: false
-  xy: 1249, 598
+  xy: 1424, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9528,14 +9536,14 @@ deepwater-icon-large
   index: -1
 deepwater-icon-medium
   rotate: false
-  xy: 301, 111
+  xy: 1001, 861
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater-icon-small
   rotate: false
-  xy: 1275, 598
+  xy: 1450, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9549,14 +9557,14 @@ delta-mech-pad-icon-large
   index: -1
 delta-mech-pad-icon-medium
   rotate: false
-  xy: 1001, 861
+  xy: 1035, 861
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 delta-mech-pad-icon-small
   rotate: false
-  xy: 1301, 598
+  xy: 1476, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9570,14 +9578,14 @@ differential-generator-icon-large
   index: -1
 differential-generator-icon-medium
   rotate: false
-  xy: 1035, 861
+  xy: 1069, 861
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 differential-generator-icon-small
   rotate: false
-  xy: 1327, 598
+  xy: 1502, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9598,14 +9606,14 @@ distributor-icon-large
   index: -1
 distributor-icon-medium
   rotate: false
-  xy: 1069, 861
+  xy: 51, 11
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 distributor-icon-small
   rotate: false
-  xy: 1353, 598
+  xy: 1528, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9619,14 +9627,14 @@ door-icon-large
   index: -1
 door-icon-medium
   rotate: false
-  xy: 1103, 856
+  xy: 85, 11
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door-icon-small
   rotate: false
-  xy: 1379, 598
+  xy: 1554, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9640,14 +9648,14 @@ door-large-icon-large
   index: -1
 door-large-icon-medium
   rotate: false
-  xy: 1137, 856
+  xy: 119, 11
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 door-large-icon-small
   rotate: false
-  xy: 1405, 598
+  xy: 1580, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9661,14 +9669,14 @@ draug-factory-icon-large
   index: -1
 draug-factory-icon-medium
   rotate: false
-  xy: 1171, 856
+  xy: 153, 11
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 draug-factory-icon-small
   rotate: false
-  xy: 1431, 598
+  xy: 1606, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9682,14 +9690,14 @@ dunerocks-icon-large
   index: -1
 dunerocks-icon-medium
   rotate: false
-  xy: 1205, 856
+  xy: 351, 153
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dunerocks-icon-small
   rotate: false
-  xy: 1457, 598
+  xy: 1632, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9703,21 +9711,21 @@ duo-icon-large
   index: -1
 duo-icon-medium
   rotate: false
-  xy: 1239, 856
+  xy: 187, 6
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 duo-icon-small
   rotate: false
-  xy: 1483, 598
+  xy: 1658, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 flat-down-base
   rotate: false
-  xy: 301, 145
+  xy: 89, 45
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -9732,14 +9740,14 @@ force-projector-icon-large
   index: -1
 force-projector-icon-medium
   rotate: false
-  xy: 1273, 856
+  xy: 221, 6
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 force-projector-icon-small
   rotate: false
-  xy: 1509, 598
+  xy: 1684, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9753,14 +9761,14 @@ fortress-factory-icon-large
   index: -1
 fortress-factory-icon-medium
   rotate: false
-  xy: 1307, 856
+  xy: 423, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 fortress-factory-icon-small
   rotate: false
-  xy: 1535, 598
+  xy: 1710, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9774,14 +9782,14 @@ fuse-icon-large
   index: -1
 fuse-icon-medium
   rotate: false
-  xy: 1341, 856
+  xy: 423, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 fuse-icon-small
   rotate: false
-  xy: 1561, 598
+  xy: 1736, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9795,14 +9803,14 @@ ghoul-factory-icon-large
   index: -1
 ghoul-factory-icon-medium
   rotate: false
-  xy: 1375, 856
+  xy: 435, 261
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ghoul-factory-icon-small
   rotate: false
-  xy: 1587, 598
+  xy: 1762, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9816,14 +9824,14 @@ glaive-ship-pad-icon-large
   index: -1
 glaive-ship-pad-icon-medium
   rotate: false
-  xy: 1409, 856
+  xy: 1103, 861
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 glaive-ship-pad-icon-small
   rotate: false
-  xy: 1087, 572
+  xy: 1788, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9837,14 +9845,14 @@ graphite-press-icon-large
   index: -1
 graphite-press-icon-medium
   rotate: false
-  xy: 1443, 856
+  xy: 1137, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 graphite-press-icon-small
   rotate: false
-  xy: 1113, 572
+  xy: 1814, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9858,14 +9866,14 @@ grass-icon-large
   index: -1
 grass-icon-medium
   rotate: false
-  xy: 1477, 856
+  xy: 1171, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass-icon-small
   rotate: false
-  xy: 1139, 572
+  xy: 794, 399
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9879,14 +9887,14 @@ hail-icon-large
   index: -1
 hail-icon-medium
   rotate: false
-  xy: 1511, 856
+  xy: 1205, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hail-icon-small
   rotate: false
-  xy: 1165, 572
+  xy: 794, 373
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9900,14 +9908,14 @@ holostone-icon-large
   index: -1
 holostone-icon-medium
   rotate: false
-  xy: 1545, 856
+  xy: 1239, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone-icon-small
   rotate: false
-  xy: 1191, 572
+  xy: 794, 347
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9921,14 +9929,14 @@ hotrock-icon-large
   index: -1
 hotrock-icon-medium
   rotate: false
-  xy: 1579, 856
+  xy: 1273, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock-icon-small
   rotate: false
-  xy: 1217, 572
+  xy: 1865, 694
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9942,14 +9950,14 @@ ice-icon-large
   index: -1
 ice-icon-medium
   rotate: false
-  xy: 1613, 856
+  xy: 1307, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-icon-small
   rotate: false
-  xy: 1243, 572
+  xy: 1891, 696
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9963,14 +9971,14 @@ ice-snow-icon-large
   index: -1
 ice-snow-icon-medium
   rotate: false
-  xy: 1647, 856
+  xy: 1341, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow-icon-small
   rotate: false
-  xy: 1269, 572
+  xy: 791, 321
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -9984,14 +9992,14 @@ icerocks-icon-large
   index: -1
 icerocks-icon-medium
   rotate: false
-  xy: 1681, 856
+  xy: 1375, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icerocks-icon-small
   rotate: false
-  xy: 1295, 572
+  xy: 1840, 598
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -10012,7 +10020,7 @@ icon-about-med
   index: -1
 icon-about-small
   rotate: false
-  xy: 1715, 856
+  xy: 1409, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10033,7 +10041,7 @@ icon-add-med
   index: -1
 icon-add-small
   rotate: false
-  xy: 1749, 856
+  xy: 1443, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10047,7 +10055,7 @@ icon-admin
   index: -1
 icon-admin-med
   rotate: false
-  xy: 1909, 756
+  xy: 1875, 722
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
@@ -10061,14 +10069,14 @@ icon-admin-small
   index: -1
 icon-admin-small-med
   rotate: false
-  xy: 651, 411
+  xy: 1909, 756
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-admin-small-small
   rotate: false
-  xy: 1783, 856
+  xy: 1477, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10089,28 +10097,28 @@ icon-arrow-16
   index: -1
 icon-arrow-16-med
   rotate: false
-  xy: 637, 379
+  xy: 651, 411
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-arrow-med
   rotate: false
-  xy: 637, 379
+  xy: 651, 411
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-arrow-16-small
   rotate: false
-  xy: 1817, 856
+  xy: 1511, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-arrow-small
   rotate: false
-  xy: 1817, 856
+  xy: 1511, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10124,14 +10132,14 @@ icon-arrow-down
   index: -1
 icon-arrow-down-med
   rotate: false
-  xy: 901, 661
+  xy: 637, 379
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-arrow-down-small
   rotate: false
-  xy: 1851, 856
+  xy: 1545, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10145,14 +10153,14 @@ icon-arrow-left
   index: -1
 icon-arrow-left-med
   rotate: false
-  xy: 887, 629
+  xy: 901, 661
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-arrow-left-small
   rotate: false
-  xy: 1885, 856
+  xy: 1579, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10166,14 +10174,14 @@ icon-arrow-right
   index: -1
 icon-arrow-right-med
   rotate: false
-  xy: 1909, 724
+  xy: 887, 629
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-arrow-right-small
   rotate: false
-  xy: 1919, 856
+  xy: 1613, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10194,7 +10202,7 @@ icon-arrow-up-med
   index: -1
 icon-arrow-up-small
   rotate: false
-  xy: 1953, 856
+  xy: 1647, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10215,7 +10223,7 @@ icon-back-med
   index: -1
 icon-back-small
   rotate: false
-  xy: 1987, 856
+  xy: 1681, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10236,7 +10244,7 @@ icon-ban-med
   index: -1
 icon-ban-small
   rotate: false
-  xy: 51, 11
+  xy: 1715, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10257,7 +10265,7 @@ icon-break-med
   index: -1
 icon-break-small
   rotate: false
-  xy: 85, 11
+  xy: 1749, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10278,7 +10286,7 @@ icon-cancel-med
   index: -1
 icon-cancel-small
   rotate: false
-  xy: 119, 11
+  xy: 1783, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10299,7 +10307,7 @@ icon-changelog-med
   index: -1
 icon-changelog-small
   rotate: false
-  xy: 351, 153
+  xy: 1817, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10320,7 +10328,7 @@ icon-chat-med
   index: -1
 icon-chat-small
   rotate: false
-  xy: 423, 227
+  xy: 1851, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10334,14 +10342,14 @@ icon-check
   index: -1
 icon-check-med
   rotate: false
-  xy: 1941, 724
+  xy: 1973, 756
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-check-small
   rotate: false
-  xy: 423, 193
+  xy: 1885, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10355,14 +10363,14 @@ icon-copy
   index: -1
 icon-copy-med
   rotate: false
-  xy: 1973, 756
+  xy: 715, 411
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-copy-small
   rotate: false
-  xy: 435, 261
+  xy: 1919, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10376,14 +10384,14 @@ icon-crafting
   index: -1
 icon-crafting-med
   rotate: false
-  xy: 715, 411
+  xy: 669, 347
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-crafting-small
   rotate: false
-  xy: 153, 11
+  xy: 1953, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10397,14 +10405,14 @@ icon-cursor
   index: -1
 icon-cursor-med
   rotate: false
-  xy: 669, 347
+  xy: 701, 379
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-cursor-small
   rotate: false
-  xy: 187, 6
+  xy: 1987, 856
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10418,14 +10426,14 @@ icon-database
   index: -1
 icon-database-med
   rotate: false
-  xy: 701, 379
+  xy: 919, 597
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-database-small
   rotate: false
-  xy: 221, 6
+  xy: 457, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10439,14 +10447,14 @@ icon-defense
   index: -1
 icon-defense-med
   rotate: false
-  xy: 919, 597
+  xy: 701, 347
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-defense-small
   rotate: false
-  xy: 457, 227
+  xy: 457, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10460,14 +10468,14 @@ icon-dev-builds
   index: -1
 icon-dev-builds-med
   rotate: false
-  xy: 1973, 724
+  xy: 1161, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-dev-builds-small
   rotate: false
-  xy: 457, 193
+  xy: 255, 27
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10481,14 +10489,14 @@ icon-diagonal
   index: -1
 icon-diagonal-med
   rotate: false
-  xy: 701, 347
+  xy: 1193, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-diagonal-small
   rotate: false
-  xy: 255, 27
+  xy: 285, 61
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10502,14 +10510,14 @@ icon-discord
   index: -1
 icon-discord-med
   rotate: false
-  xy: 1127, 688
+  xy: 1225, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-discord-small
   rotate: false
-  xy: 285, 61
+  xy: 289, 27
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10523,14 +10531,14 @@ icon-distribution
   index: -1
 icon-distribution-med
   rotate: false
-  xy: 1159, 688
+  xy: 1257, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-distribution-small
   rotate: false
-  xy: 289, 27
+  xy: 389, 159
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10544,14 +10552,14 @@ icon-donate
   index: -1
 icon-donate-med
   rotate: false
-  xy: 1191, 688
+  xy: 1289, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-donate-small
   rotate: false
-  xy: 389, 159
+  xy: 423, 159
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10565,14 +10573,14 @@ icon-dots
   index: -1
 icon-dots-med
   rotate: false
-  xy: 1223, 688
+  xy: 1321, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-dots-small
   rotate: false
-  xy: 423, 159
+  xy: 457, 159
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10586,14 +10594,14 @@ icon-editor
   index: -1
 icon-editor-med
   rotate: false
-  xy: 1255, 688
+  xy: 1353, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-editor-small
   rotate: false
-  xy: 457, 159
+  xy: 535, 361
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10607,14 +10615,14 @@ icon-effect
   index: -1
 icon-effect-med
   rotate: false
-  xy: 1287, 688
+  xy: 1385, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-effect-small
   rotate: false
-  xy: 535, 361
+  xy: 585, 411
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10628,14 +10636,14 @@ icon-elevation
   index: -1
 icon-elevation-med
   rotate: false
-  xy: 1319, 688
+  xy: 1417, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-elevation-small
   rotate: false
-  xy: 585, 411
+  xy: 569, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10649,14 +10657,14 @@ icon-eraser
   index: -1
 icon-eraser-med
   rotate: false
-  xy: 1351, 688
+  xy: 1449, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-eraser-small
   rotate: false
-  xy: 569, 377
+  xy: 569, 343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10670,14 +10678,14 @@ icon-exit
   index: -1
 icon-exit-med
   rotate: false
-  xy: 1383, 688
+  xy: 1481, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-exit-small
   rotate: false
-  xy: 569, 343
+  xy: 603, 377
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10698,28 +10706,28 @@ icon-file-image
   index: -1
 icon-file-image-med
   rotate: false
-  xy: 1415, 688
+  xy: 1513, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-file-image-small
   rotate: false
-  xy: 603, 377
+  xy: 603, 343
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-file-med
   rotate: false
-  xy: 1447, 688
+  xy: 1545, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-file-small
   rotate: false
-  xy: 603, 343
+  xy: 639, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10733,14 +10741,14 @@ icon-file-text
   index: -1
 icon-file-text-med
   rotate: false
-  xy: 1479, 688
+  xy: 1577, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-file-text-small
   rotate: false
-  xy: 639, 477
+  xy: 673, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10754,14 +10762,14 @@ icon-fill
   index: -1
 icon-fill-med
   rotate: false
-  xy: 1511, 688
+  xy: 1609, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-fill-small
   rotate: false
-  xy: 673, 477
+  xy: 685, 511
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10782,28 +10790,28 @@ icon-floppy-16
   index: -1
 icon-floppy-16-med
   rotate: false
-  xy: 1543, 688
+  xy: 1641, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-floppy-16-small
   rotate: false
-  xy: 685, 511
+  xy: 635, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-floppy-med
   rotate: false
-  xy: 1575, 688
+  xy: 1673, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-floppy-small
   rotate: false
-  xy: 635, 443
+  xy: 669, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10817,7 +10825,7 @@ icon-folder
   index: -1
 icon-folder-med
   rotate: false
-  xy: 1607, 688
+  xy: 1705, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
@@ -10831,21 +10839,21 @@ icon-folder-parent
   index: -1
 icon-folder-parent-med
   rotate: false
-  xy: 1639, 688
+  xy: 1737, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-folder-parent-small
   rotate: false
-  xy: 669, 443
+  xy: 707, 477
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-folder-small
   rotate: false
-  xy: 707, 477
+  xy: 703, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10859,14 +10867,14 @@ icon-github
   index: -1
 icon-github-med
   rotate: false
-  xy: 1671, 688
+  xy: 1769, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-github-small
   rotate: false
-  xy: 703, 443
+  xy: 785, 611
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10880,14 +10888,14 @@ icon-google-play
   index: -1
 icon-google-play-med
   rotate: false
-  xy: 1703, 688
+  xy: 1801, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-google-play-small
   rotate: false
-  xy: 785, 611
+  xy: 835, 661
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10901,14 +10909,14 @@ icon-grid
   index: -1
 icon-grid-med
   rotate: false
-  xy: 1735, 688
+  xy: 1833, 688
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-grid-small
   rotate: false
-  xy: 835, 661
+  xy: 819, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10922,14 +10930,14 @@ icon-home
   index: -1
 icon-home-med
   rotate: false
-  xy: 1767, 688
+  xy: 1157, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-home-small
   rotate: false
-  xy: 819, 627
+  xy: 819, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10943,14 +10951,14 @@ icon-host
   index: -1
 icon-host-med
   rotate: false
-  xy: 1799, 688
+  xy: 1189, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-host-small
   rotate: false
-  xy: 819, 593
+  xy: 853, 627
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10964,14 +10972,14 @@ icon-info
   index: -1
 icon-info-med
   rotate: false
-  xy: 1831, 688
+  xy: 1221, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-info-small
   rotate: false
-  xy: 853, 627
+  xy: 853, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10985,14 +10993,14 @@ icon-itch.io
   index: -1
 icon-itch.io-med
   rotate: false
-  xy: 1863, 688
+  xy: 1253, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-itch.io-small
   rotate: false
-  xy: 853, 593
+  xy: 889, 727
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11006,14 +11014,14 @@ icon-item
   index: -1
 icon-item-med
   rotate: false
-  xy: 1123, 656
+  xy: 1285, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-item-small
   rotate: false
-  xy: 889, 727
+  xy: 923, 727
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11027,14 +11035,14 @@ icon-line
   index: -1
 icon-line-med
   rotate: false
-  xy: 1155, 656
+  xy: 1317, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-line-small
   rotate: false
-  xy: 923, 727
+  xy: 935, 761
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11048,14 +11056,14 @@ icon-link
   index: -1
 icon-link-med
   rotate: false
-  xy: 1187, 656
+  xy: 1349, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-link-small
   rotate: false
-  xy: 935, 761
+  xy: 885, 693
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11076,28 +11084,28 @@ icon-liquid-consume
   index: -1
 icon-liquid-consume-med
   rotate: false
-  xy: 1219, 656
+  xy: 1381, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-liquid-consume-small
   rotate: false
-  xy: 885, 693
+  xy: 919, 693
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-liquid-med
   rotate: false
-  xy: 1251, 656
+  xy: 1413, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-liquid-small
   rotate: false
-  xy: 919, 693
+  xy: 957, 727
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11118,14 +11126,14 @@ icon-load-image
   index: -1
 icon-load-image-med
   rotate: false
-  xy: 1283, 656
+  xy: 1445, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-load-image-small
   rotate: false
-  xy: 957, 727
+  xy: 953, 693
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11139,28 +11147,28 @@ icon-load-map
   index: -1
 icon-load-map-med
   rotate: false
-  xy: 1315, 656
+  xy: 1477, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-load-map-small
   rotate: false
-  xy: 953, 693
+  xy: 335, 111
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-load-med
   rotate: false
-  xy: 1347, 656
+  xy: 1509, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-load-small
   rotate: false
-  xy: 335, 111
+  xy: 319, 77
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11174,14 +11182,14 @@ icon-loading
   index: -1
 icon-loading-med
   rotate: false
-  xy: 1379, 656
+  xy: 1541, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-loading-small
   rotate: false
-  xy: 319, 77
+  xy: 353, 77
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11195,14 +11203,14 @@ icon-locked
   index: -1
 icon-locked-med
   rotate: false
-  xy: 1411, 656
+  xy: 1573, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-locked-small
   rotate: false
-  xy: 353, 77
+  xy: 323, 43
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11216,14 +11224,14 @@ icon-map
   index: -1
 icon-map-med
   rotate: false
-  xy: 1443, 656
+  xy: 1605, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-map-small
   rotate: false
-  xy: 323, 43
+  xy: 357, 43
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11244,28 +11252,28 @@ icon-menu-large
   index: -1
 icon-menu-large-med
   rotate: false
-  xy: 1475, 656
+  xy: 1637, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-menu-large-small
   rotate: false
-  xy: 357, 43
+  xy: 323, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-menu-med
   rotate: false
-  xy: 1507, 656
+  xy: 1669, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-menu-small
   rotate: false
-  xy: 323, 9
+  xy: 357, 9
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11279,14 +11287,14 @@ icon-missing
   index: -1
 icon-missing-med
   rotate: false
-  xy: 1539, 656
+  xy: 1701, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-missing-small
   rotate: false
-  xy: 357, 9
+  xy: 369, 119
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11300,14 +11308,14 @@ icon-mode-attack
   index: -1
 icon-mode-attack-med
   rotate: false
-  xy: 1571, 656
+  xy: 1733, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-mode-attack-small
   rotate: false
-  xy: 369, 119
+  xy: 403, 125
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11321,14 +11329,14 @@ icon-mode-pvp
   index: -1
 icon-mode-pvp-med
   rotate: false
-  xy: 1603, 656
+  xy: 1765, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-mode-pvp-small
   rotate: false
-  xy: 403, 125
+  xy: 437, 125
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11342,14 +11350,14 @@ icon-mode-survival
   index: -1
 icon-mode-survival-med
   rotate: false
-  xy: 1635, 656
+  xy: 1797, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-mode-survival-small
   rotate: false
-  xy: 437, 125
+  xy: 471, 125
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11363,14 +11371,14 @@ icon-none
   index: -1
 icon-none-med
   rotate: false
-  xy: 1667, 656
+  xy: 1829, 656
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-none-small
   rotate: false
-  xy: 471, 125
+  xy: 387, 85
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11384,14 +11392,14 @@ icon-paste
   index: -1
 icon-paste-med
   rotate: false
-  xy: 1699, 656
+  xy: 2005, 756
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-paste-small
   rotate: false
-  xy: 387, 85
+  xy: 421, 91
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11405,14 +11413,14 @@ icon-pause
   index: -1
 icon-pause-med
   rotate: false
-  xy: 1731, 656
+  xy: 951, 629
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-pause-small
   rotate: false
-  xy: 421, 91
+  xy: 455, 91
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11426,14 +11434,14 @@ icon-pencil
   index: -1
 icon-pencil-med
   rotate: false
-  xy: 1763, 656
+  xy: 951, 597
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-pencil-small
   rotate: false
-  xy: 455, 91
+  xy: 391, 51
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11447,14 +11455,14 @@ icon-pick
   index: -1
 icon-pick-med
   rotate: false
-  xy: 1795, 656
+  xy: 733, 379
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-pick-small
   rotate: false
-  xy: 391, 51
+  xy: 391, 17
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11475,14 +11483,14 @@ icon-play-2
   index: -1
 icon-play-2-med
   rotate: false
-  xy: 1827, 656
+  xy: 733, 347
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-play-2-small
   rotate: false
-  xy: 391, 17
+  xy: 425, 57
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11496,28 +11504,28 @@ icon-play-custom
   index: -1
 icon-play-custom-med
   rotate: false
-  xy: 1859, 656
+  xy: 983, 643
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-play-custom-small
   rotate: false
-  xy: 425, 57
+  xy: 425, 23
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-play-med
   rotate: false
-  xy: 2005, 756
+  xy: 983, 611
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-play-small
   rotate: false
-  xy: 425, 23
+  xy: 459, 57
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11531,14 +11539,14 @@ icon-players
   index: -1
 icon-players-med
   rotate: false
-  xy: 2005, 724
+  xy: 1015, 625
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-players-small
   rotate: false
-  xy: 459, 57
+  xy: 459, 23
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11552,14 +11560,14 @@ icon-power
   index: -1
 icon-power-med
   rotate: false
-  xy: 951, 629
+  xy: 1047, 625
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-power-small
   rotate: false
-  xy: 459, 23
+  xy: 489, 91
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11573,14 +11581,14 @@ icon-production
   index: -1
 icon-production-med
   rotate: false
-  xy: 951, 597
+  xy: 1079, 625
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-production-small
   rotate: false
-  xy: 489, 91
+  xy: 493, 57
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11594,14 +11602,14 @@ icon-quit
   index: -1
 icon-quit-med
   rotate: false
-  xy: 733, 379
+  xy: 1111, 625
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-quit-small
   rotate: false
-  xy: 493, 57
+  xy: 493, 23
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11615,14 +11623,14 @@ icon-redo
   index: -1
 icon-redo-med
   rotate: false
-  xy: 733, 347
+  xy: 1143, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-redo-small
   rotate: false
-  xy: 493, 23
+  xy: 485, 311
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11636,14 +11644,14 @@ icon-refresh
   index: -1
 icon-refresh-med
   rotate: false
-  xy: 1895, 688
+  xy: 1175, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-refresh-small
   rotate: false
-  xy: 485, 311
+  xy: 469, 277
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11657,14 +11665,14 @@ icon-rename
   index: -1
 icon-rename-med
   rotate: false
-  xy: 1891, 656
+  xy: 1207, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-rename-small
   rotate: false
-  xy: 469, 277
+  xy: 519, 327
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11678,14 +11686,14 @@ icon-resize
   index: -1
 icon-resize-med
   rotate: false
-  xy: 1927, 692
+  xy: 1239, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-resize-small
   rotate: false
-  xy: 519, 327
+  xy: 503, 277
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11706,14 +11714,14 @@ icon-rotate-arrow
   index: -1
 icon-rotate-arrow-med
   rotate: false
-  xy: 1959, 692
+  xy: 1271, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-rotate-arrow-small
   rotate: false
-  xy: 503, 277
+  xy: 491, 243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11727,21 +11735,21 @@ icon-rotate-left
   index: -1
 icon-rotate-left-med
   rotate: false
-  xy: 1991, 692
+  xy: 1303, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-rotate-left-small
   rotate: false
-  xy: 491, 243
+  xy: 491, 209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-rotate-med
   rotate: false
-  xy: 983, 643
+  xy: 1335, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
@@ -11755,21 +11763,21 @@ icon-rotate-right
   index: -1
 icon-rotate-right-med
   rotate: false
-  xy: 983, 611
+  xy: 1367, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-rotate-right-small
   rotate: false
-  xy: 491, 209
+  xy: 491, 175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-rotate-small
   rotate: false
-  xy: 491, 175
+  xy: 525, 243
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11790,14 +11798,14 @@ icon-save-image
   index: -1
 icon-save-image-med
   rotate: false
-  xy: 1015, 625
+  xy: 1399, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-save-image-small
   rotate: false
-  xy: 525, 243
+  xy: 525, 209
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11811,28 +11819,28 @@ icon-save-map
   index: -1
 icon-save-map-med
   rotate: false
-  xy: 1047, 625
+  xy: 1431, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-save-map-small
   rotate: false
-  xy: 525, 209
+  xy: 525, 175
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-save-med
   rotate: false
-  xy: 1079, 625
+  xy: 1463, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-save-small
   rotate: false
-  xy: 525, 175
+  xy: 505, 141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11846,14 +11854,14 @@ icon-settings
   index: -1
 icon-settings-med
   rotate: false
-  xy: 1111, 624
+  xy: 1495, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-settings-small
   rotate: false
-  xy: 505, 141
+  xy: 539, 141
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11867,14 +11875,14 @@ icon-spray
   index: -1
 icon-spray-med
   rotate: false
-  xy: 1143, 624
+  xy: 1527, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-spray-small
   rotate: false
-  xy: 539, 141
+  xy: 523, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11888,14 +11896,14 @@ icon-terrain
   index: -1
 icon-terrain-med
   rotate: false
-  xy: 1175, 624
+  xy: 1559, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-terrain-small
   rotate: false
-  xy: 523, 107
+  xy: 557, 107
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11909,14 +11917,14 @@ icon-tools
   index: -1
 icon-tools-med
   rotate: false
-  xy: 1207, 624
+  xy: 1591, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-tools-small
   rotate: false
-  xy: 557, 107
+  xy: 527, 73
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11937,28 +11945,28 @@ icon-trash-16
   index: -1
 icon-trash-16-med
   rotate: false
-  xy: 1239, 624
+  xy: 1623, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-trash-16-small
   rotate: false
-  xy: 527, 73
+  xy: 527, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icon-trash-med
   rotate: false
-  xy: 1271, 624
+  xy: 1655, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-trash-small
   rotate: false
-  xy: 527, 39
+  xy: 561, 73
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11972,14 +11980,14 @@ icon-tree
   index: -1
 icon-tree-med
   rotate: false
-  xy: 1303, 624
+  xy: 1687, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-tree-small
   rotate: false
-  xy: 561, 73
+  xy: 561, 39
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -11993,14 +12001,14 @@ icon-trello
   index: -1
 icon-trello-med
   rotate: false
-  xy: 1335, 624
+  xy: 1719, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-trello-small
   rotate: false
-  xy: 561, 39
+  xy: 527, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -12014,14 +12022,14 @@ icon-turret
   index: -1
 icon-turret-med
   rotate: false
-  xy: 1367, 624
+  xy: 1751, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-turret-small
   rotate: false
-  xy: 527, 5
+  xy: 561, 5
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -12035,14 +12043,14 @@ icon-tutorial
   index: -1
 icon-tutorial-med
   rotate: false
-  xy: 1399, 624
+  xy: 1783, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-tutorial-small
   rotate: false
-  xy: 561, 5
+  xy: 737, 443
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -12056,14 +12064,14 @@ icon-undo
   index: -1
 icon-undo-med
   rotate: false
-  xy: 1431, 624
+  xy: 1815, 624
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-undo-small
   rotate: false
-  xy: 737, 443
+  xy: 735, 561
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -12077,14 +12085,14 @@ icon-units
   index: -1
 icon-units-med
   rotate: false
-  xy: 1463, 624
+  xy: 983, 579
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-units-small
   rotate: false
-  xy: 735, 561
+  xy: 719, 527
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -12098,14 +12106,14 @@ icon-unlocks
   index: -1
 icon-unlocks-med
   rotate: false
-  xy: 1495, 624
+  xy: 1015, 593
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-unlocks-small
   rotate: false
-  xy: 719, 527
+  xy: 769, 577
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -12119,14 +12127,14 @@ icon-upgrade
   index: -1
 icon-upgrade-med
   rotate: false
-  xy: 1527, 624
+  xy: 1047, 593
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-upgrade-small
   rotate: false
-  xy: 769, 577
+  xy: 753, 527
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -12140,14 +12148,14 @@ icon-wiki
   index: -1
 icon-wiki-med
   rotate: false
-  xy: 1559, 624
+  xy: 1079, 593
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-wiki-small
   rotate: false
-  xy: 753, 527
+  xy: 741, 493
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -12161,14 +12169,14 @@ icon-zoom
   index: -1
 icon-zoom-med
   rotate: false
-  xy: 1591, 624
+  xy: 1111, 593
   size: 30, 30
   orig: 30, 30
   offset: 0, 0
   index: -1
 icon-zoom-small
   rotate: false
-  xy: 741, 493
+  xy: 775, 493
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -12182,14 +12190,14 @@ ignarock-icon-large
   index: -1
 ignarock-icon-medium
   rotate: false
-  xy: 775, 493
+  xy: 771, 459
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock-icon-small
   rotate: false
-  xy: 1321, 572
+  xy: 1840, 572
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12203,14 +12211,14 @@ impact-reactor-icon-large
   index: -1
 impact-reactor-icon-medium
   rotate: false
-  xy: 771, 459
+  xy: 771, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 impact-reactor-icon-small
   rotate: false
-  xy: 1347, 572
+  xy: 1865, 668
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12224,14 +12232,14 @@ incinerator-icon-large
   index: -1
 incinerator-icon-medium
   rotate: false
-  xy: 771, 425
+  xy: 985, 811
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 incinerator-icon-small
   rotate: false
-  xy: 1373, 572
+  xy: 1891, 670
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12245,7 +12253,7 @@ info-banner
   index: -1
 inventory
   rotate: false
-  xy: 1399, 556
+  xy: 805, 451
   size: 24, 40
   split: 10, 10, 10, 14
   orig: 24, 40
@@ -12260,14 +12268,14 @@ item-source-icon-large
   index: -1
 item-source-icon-medium
   rotate: false
-  xy: 985, 811
+  xy: 969, 777
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source-icon-small
   rotate: false
-  xy: 1425, 572
+  xy: 805, 425
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12281,14 +12289,14 @@ item-void-icon-large
   index: -1
 item-void-icon-medium
   rotate: false
-  xy: 969, 777
+  xy: 1019, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void-icon-small
   rotate: false
-  xy: 1451, 572
+  xy: 820, 399
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12302,14 +12310,14 @@ javelin-ship-pad-icon-large
   index: -1
 javelin-ship-pad-icon-medium
   rotate: false
-  xy: 1019, 827
+  xy: 1053, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 javelin-ship-pad-icon-small
   rotate: false
-  xy: 1477, 572
+  xy: 820, 373
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12323,14 +12331,14 @@ junction-icon-large
   index: -1
 junction-icon-medium
   rotate: false
-  xy: 1053, 827
+  xy: 1087, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction-icon-small
   rotate: false
-  xy: 1503, 572
+  xy: 820, 347
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12351,7 +12359,7 @@ kiln-icon-medium
   index: -1
 kiln-icon-small
   rotate: false
-  xy: 1529, 572
+  xy: 817, 321
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12372,7 +12380,7 @@ lancer-icon-medium
   index: -1
 lancer-icon-small
   rotate: false
-  xy: 1555, 572
+  xy: 1873, 642
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12393,7 +12401,7 @@ laser-drill-icon-medium
   index: -1
 laser-drill-icon-small
   rotate: false
-  xy: 1581, 572
+  xy: 1899, 644
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12407,14 +12415,14 @@ launch-pad-icon-large
   index: -1
 launch-pad-icon-medium
   rotate: false
-  xy: 991, 709
+  xy: 1071, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 launch-pad-icon-small
   rotate: false
-  xy: 1425, 546
+  xy: 1873, 616
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12428,14 +12436,14 @@ launch-pad-large-icon-large
   index: -1
 launch-pad-large-icon-medium
   rotate: false
-  xy: 1037, 759
+  xy: 991, 709
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 launch-pad-large-icon-small
   rotate: false
-  xy: 1451, 546
+  xy: 1899, 618
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12449,14 +12457,14 @@ liquid-junction-icon-large
   index: -1
 liquid-junction-icon-medium
   rotate: false
-  xy: 1025, 725
+  xy: 1037, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction-icon-small
   rotate: false
-  xy: 1477, 546
+  xy: 1866, 590
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12470,14 +12478,14 @@ liquid-router-icon-large
   index: -1
 liquid-router-icon-medium
   rotate: false
-  xy: 1071, 793
+  xy: 1071, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-icon-small
   rotate: false
-  xy: 1503, 546
+  xy: 1866, 564
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12491,14 +12499,14 @@ liquid-source-icon-large
   index: -1
 liquid-source-icon-medium
   rotate: false
-  xy: 1071, 759
+  xy: 1025, 725
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-source-icon-small
   rotate: false
-  xy: 1529, 546
+  xy: 1892, 590
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12519,7 +12527,7 @@ liquid-tank-icon-medium
   index: -1
 liquid-tank-icon-small
   rotate: false
-  xy: 1555, 546
+  xy: 1892, 564
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12533,14 +12541,14 @@ magmarock-icon-large
   index: -1
 magmarock-icon-medium
   rotate: false
-  xy: 1025, 691
+  xy: 1105, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock-icon-small
   rotate: false
-  xy: 1581, 546
+  xy: 1918, 592
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12554,14 +12562,14 @@ mass-driver-icon-large
   index: -1
 mass-driver-icon-medium
   rotate: false
-  xy: 1059, 691
+  xy: 1105, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mass-driver-icon-small
   rotate: false
-  xy: 1613, 590
+  xy: 1918, 566
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12582,7 +12590,7 @@ mechanical-drill-icon-medium
   index: -1
 mechanical-drill-icon-small
   rotate: false
-  xy: 1639, 590
+  xy: 887, 571
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12596,14 +12604,14 @@ mechanical-pump-icon-large
   index: -1
 mechanical-pump-icon-medium
   rotate: false
-  xy: 1093, 691
+  xy: 1025, 691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump-icon-small
   rotate: false
-  xy: 1665, 590
+  xy: 913, 571
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12617,14 +12625,14 @@ meltdown-icon-large
   index: -1
 meltdown-icon-medium
   rotate: false
-  xy: 987, 675
+  xy: 1059, 691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 meltdown-icon-small
   rotate: false
-  xy: 1691, 590
+  xy: 939, 571
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12638,14 +12646,14 @@ melter-icon-large
   index: -1
 melter-icon-medium
   rotate: false
-  xy: 1021, 657
+  xy: 1093, 691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter-icon-small
   rotate: false
-  xy: 1717, 592
+  xy: 637, 321
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12659,14 +12667,14 @@ mend-projector-icon-large
   index: -1
 mend-projector-icon-medium
   rotate: false
-  xy: 1055, 657
+  xy: 1127, 725
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mend-projector-icon-small
   rotate: false
-  xy: 1743, 592
+  xy: 663, 321
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12680,14 +12688,14 @@ mender-icon-large
   index: -1
 mender-icon-medium
   rotate: false
-  xy: 1089, 657
+  xy: 1127, 691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender-icon-small
   rotate: false
-  xy: 1607, 564
+  xy: 689, 321
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12701,14 +12709,14 @@ metal-floor-2-icon-large
   index: -1
 metal-floor-2-icon-medium
   rotate: false
-  xy: 1105, 822
+  xy: 987, 675
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2-icon-small
   rotate: false
-  xy: 1633, 564
+  xy: 715, 321
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12722,14 +12730,14 @@ metal-floor-3-icon-large
   index: -1
 metal-floor-3-icon-medium
   rotate: false
-  xy: 1105, 788
+  xy: 1021, 657
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-3-icon-small
   rotate: false
-  xy: 1659, 564
+  xy: 843, 321
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12743,14 +12751,14 @@ metal-floor-5-icon-large
   index: -1
 metal-floor-5-icon-medium
   rotate: false
-  xy: 1139, 822
+  xy: 1055, 657
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-5-icon-small
   rotate: false
-  xy: 1685, 564
+  xy: 1236, 560
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12764,14 +12772,14 @@ metal-floor-damaged-icon-large
   index: -1
 metal-floor-damaged-icon-medium
   rotate: false
-  xy: 1139, 788
+  xy: 1089, 657
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged-icon-small
   rotate: false
-  xy: 1607, 538
+  xy: 1262, 560
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12785,14 +12793,14 @@ metal-floor-icon-large
   index: -1
 metal-floor-icon-medium
   rotate: false
-  xy: 1173, 822
+  xy: 1123, 657
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-icon-small
   rotate: false
-  xy: 1633, 538
+  xy: 1288, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12806,14 +12814,14 @@ moss-icon-large
   index: -1
 moss-icon-medium
   rotate: false
-  xy: 1173, 788
+  xy: 1139, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss-icon-small
   rotate: false
-  xy: 1659, 538
+  xy: 1314, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12827,14 +12835,14 @@ multi-press-icon-large
   index: -1
 multi-press-icon-medium
   rotate: false
-  xy: 1207, 822
+  xy: 1139, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 multi-press-icon-small
   rotate: false
-  xy: 1685, 538
+  xy: 1340, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12848,14 +12856,14 @@ oil-extractor-icon-large
   index: -1
 oil-extractor-icon-medium
   rotate: false
-  xy: 1207, 788
+  xy: 1173, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 oil-extractor-icon-small
   rotate: false
-  xy: 1769, 578
+  xy: 1366, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12869,14 +12877,14 @@ omega-mech-pad-icon-large
   index: -1
 omega-mech-pad-icon-medium
   rotate: false
-  xy: 1241, 822
+  xy: 1173, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 omega-mech-pad-icon-small
   rotate: false
-  xy: 1795, 578
+  xy: 1392, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12890,14 +12898,14 @@ overdrive-projector-icon-large
   index: -1
 overdrive-projector-icon-medium
   rotate: false
-  xy: 1241, 788
+  xy: 1207, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overdrive-projector-icon-small
   rotate: false
-  xy: 1821, 578
+  xy: 1418, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12911,21 +12919,21 @@ overflow-gate-icon-large
   index: -1
 overflow-gate-icon-medium
   rotate: false
-  xy: 1275, 822
+  xy: 1207, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 overflow-gate-icon-small
   rotate: false
-  xy: 1847, 578
+  xy: 1444, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 pane
   rotate: false
-  xy: 351, 216
+  xy: 1039, 895
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -12933,7 +12941,7 @@ pane
   index: -1
 pane-2
   rotate: false
-  xy: 89, 45
+  xy: 351, 216
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -12948,14 +12956,14 @@ pebbles-icon-large
   index: -1
 pebbles-icon-medium
   rotate: false
-  xy: 1275, 788
+  xy: 1241, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pebbles-icon-small
   rotate: false
-  xy: 1873, 578
+  xy: 1470, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12969,14 +12977,14 @@ phantom-factory-icon-large
   index: -1
 phantom-factory-icon-medium
   rotate: false
-  xy: 1309, 822
+  xy: 1241, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phantom-factory-icon-small
   rotate: false
-  xy: 1899, 578
+  xy: 1496, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -12990,14 +12998,14 @@ phase-conduit-icon-large
   index: -1
 phase-conduit-icon-medium
   rotate: false
-  xy: 1309, 788
+  xy: 1275, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-icon-small
   rotate: false
-  xy: 1711, 564
+  xy: 1522, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13011,14 +13019,14 @@ phase-conveyor-icon-large
   index: -1
 phase-conveyor-icon-medium
   rotate: false
-  xy: 1343, 822
+  xy: 1275, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-icon-small
   rotate: false
-  xy: 1711, 538
+  xy: 1548, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13032,14 +13040,14 @@ phase-wall-icon-large
   index: -1
 phase-wall-icon-medium
   rotate: false
-  xy: 1343, 788
+  xy: 1309, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-icon-small
   rotate: false
-  xy: 1737, 566
+  xy: 1574, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13053,14 +13061,14 @@ phase-wall-large-icon-large
   index: -1
 phase-wall-large-icon-medium
   rotate: false
-  xy: 1377, 822
+  xy: 1309, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall-large-icon-small
   rotate: false
-  xy: 1737, 540
+  xy: 1600, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13074,14 +13082,14 @@ phase-weaver-icon-large
   index: -1
 phase-weaver-icon-medium
   rotate: false
-  xy: 1377, 788
+  xy: 1343, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-weaver-icon-small
   rotate: false
-  xy: 1763, 552
+  xy: 1626, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13095,14 +13103,14 @@ pine-icon-large
   index: -1
 pine-icon-medium
   rotate: false
-  xy: 1411, 822
+  xy: 1343, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pine-icon-small
   rotate: false
-  xy: 1789, 552
+  xy: 1652, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13116,14 +13124,14 @@ plastanium-compressor-icon-large
   index: -1
 plastanium-compressor-icon-medium
   rotate: false
-  xy: 1411, 788
+  xy: 1377, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-compressor-icon-small
   rotate: false
-  xy: 1815, 552
+  xy: 1678, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13137,14 +13145,14 @@ pneumatic-drill-icon-large
   index: -1
 pneumatic-drill-icon-medium
   rotate: false
-  xy: 1445, 822
+  xy: 1377, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pneumatic-drill-icon-small
   rotate: false
-  xy: 1841, 552
+  xy: 1704, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13158,14 +13166,14 @@ power-node-icon-large
   index: -1
 power-node-icon-medium
   rotate: false
-  xy: 1445, 788
+  xy: 1411, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node-icon-small
   rotate: false
-  xy: 1867, 552
+  xy: 1730, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13179,14 +13187,14 @@ power-node-large-icon-large
   index: -1
 power-node-large-icon-medium
   rotate: false
-  xy: 1479, 822
+  xy: 1411, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-node-large-icon-small
   rotate: false
-  xy: 1893, 552
+  xy: 1756, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13200,14 +13208,14 @@ power-source-icon-large
   index: -1
 power-source-icon-medium
   rotate: false
-  xy: 1479, 788
+  xy: 1445, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-source-icon-small
   rotate: false
-  xy: 1763, 526
+  xy: 1782, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13221,14 +13229,14 @@ power-void-icon-large
   index: -1
 power-void-icon-medium
   rotate: false
-  xy: 1513, 822
+  xy: 1445, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void-icon-small
   rotate: false
-  xy: 1789, 526
+  xy: 1808, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13242,14 +13250,14 @@ pulse-conduit-icon-large
   index: -1
 pulse-conduit-icon-medium
   rotate: false
-  xy: 1513, 788
+  xy: 1479, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-icon-small
   rotate: false
-  xy: 1815, 526
+  xy: 1834, 546
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13263,14 +13271,14 @@ pulverizer-icon-large
   index: -1
 pulverizer-icon-medium
   rotate: false
-  xy: 1547, 822
+  xy: 1479, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-icon-small
   rotate: false
-  xy: 1841, 526
+  xy: 1860, 538
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13284,14 +13292,14 @@ pyratite-mixer-icon-large
   index: -1
 pyratite-mixer-icon-medium
   rotate: false
-  xy: 1547, 788
+  xy: 1513, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pyratite-mixer-icon-small
   rotate: false
-  xy: 1867, 526
+  xy: 1886, 538
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13305,14 +13313,14 @@ repair-point-icon-large
   index: -1
 repair-point-icon-medium
   rotate: false
-  xy: 1581, 822
+  xy: 1513, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 repair-point-icon-small
   rotate: false
-  xy: 1893, 526
+  xy: 1912, 538
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13326,14 +13334,14 @@ revenant-factory-icon-large
   index: -1
 revenant-factory-icon-medium
   rotate: false
-  xy: 1581, 788
+  xy: 1547, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 revenant-factory-icon-small
   rotate: false
-  xy: 1737, 514
+  xy: 1938, 540
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13347,14 +13355,14 @@ ripple-icon-large
   index: -1
 ripple-icon-medium
   rotate: false
-  xy: 1615, 822
+  xy: 1547, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ripple-icon-small
   rotate: false
-  xy: 1763, 500
+  xy: 1907, 728
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13368,14 +13376,14 @@ rock-icon-large
   index: -1
 rock-icon-medium
   rotate: false
-  xy: 1615, 788
+  xy: 1581, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rock-icon-small
   rotate: false
-  xy: 1789, 500
+  xy: 1933, 730
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13389,14 +13397,14 @@ rocks-icon-large
   index: -1
 rocks-icon-medium
   rotate: false
-  xy: 1649, 822
+  xy: 1581, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rocks-icon-small
   rotate: false
-  xy: 1815, 500
+  xy: 1959, 730
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13410,14 +13418,14 @@ rotary-pump-icon-large
   index: -1
 rotary-pump-icon-medium
   rotate: false
-  xy: 1649, 788
+  xy: 1615, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rotary-pump-icon-small
   rotate: false
-  xy: 1841, 500
+  xy: 1985, 730
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13431,14 +13439,14 @@ router-icon-large
   index: -1
 router-icon-medium
   rotate: false
-  xy: 1683, 822
+  xy: 1615, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router-icon-small
   rotate: false
-  xy: 1867, 500
+  xy: 2011, 730
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13452,14 +13460,14 @@ rtg-generator-icon-large
   index: -1
 rtg-generator-icon-medium
   rotate: false
-  xy: 1683, 788
+  xy: 1649, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rtg-generator-icon-small
   rotate: false
-  xy: 1893, 500
+  xy: 1917, 702
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13473,14 +13481,14 @@ salt-icon-large
   index: -1
 salt-icon-medium
   rotate: false
-  xy: 1717, 822
+  xy: 1649, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salt-icon-small
   rotate: false
-  xy: 1919, 552
+  xy: 1917, 676
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13494,14 +13502,14 @@ saltrocks-icon-large
   index: -1
 saltrocks-icon-medium
   rotate: false
-  xy: 1717, 788
+  xy: 1683, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 saltrocks-icon-small
   rotate: false
-  xy: 1919, 526
+  xy: 1943, 704
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13515,14 +13523,14 @@ salvo-icon-large
   index: -1
 salvo-icon-medium
   rotate: false
-  xy: 1751, 822
+  xy: 1683, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salvo-icon-small
   rotate: false
-  xy: 1919, 500
+  xy: 1969, 704
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13536,14 +13544,14 @@ sand-boulder-icon-large
   index: -1
 sand-boulder-icon-medium
   rotate: false
-  xy: 1751, 788
+  xy: 1717, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-boulder-icon-small
   rotate: false
-  xy: 1925, 578
+  xy: 1943, 678
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13557,14 +13565,14 @@ sand-icon-large
   index: -1
 sand-icon-medium
   rotate: false
-  xy: 1785, 822
+  xy: 1717, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-icon-small
   rotate: false
-  xy: 1945, 552
+  xy: 1995, 704
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13578,14 +13586,14 @@ sand-water-icon-large
   index: -1
 sand-water-icon-medium
   rotate: false
-  xy: 1785, 788
+  xy: 1751, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water-icon-small
   rotate: false
-  xy: 1945, 526
+  xy: 1969, 678
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13599,14 +13607,14 @@ sandrocks-icon-large
   index: -1
 sandrocks-icon-medium
   rotate: false
-  xy: 1819, 822
+  xy: 1751, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sandrocks-icon-small
   rotate: false
-  xy: 1945, 500
+  xy: 1995, 678
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13620,14 +13628,14 @@ scatter-icon-large
   index: -1
 scatter-icon-medium
   rotate: false
-  xy: 1819, 788
+  xy: 1785, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scatter-icon-small
   rotate: false
-  xy: 1923, 662
+  xy: 2021, 704
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13641,14 +13649,14 @@ scorch-icon-large
   index: -1
 scorch-icon-medium
   rotate: false
-  xy: 1853, 822
+  xy: 1785, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scorch-icon-small
   rotate: false
-  xy: 1949, 666
+  xy: 2021, 678
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13662,14 +13670,14 @@ scrap-wall-gigantic-icon-large
   index: -1
 scrap-wall-gigantic-icon-medium
   rotate: false
-  xy: 1853, 788
+  xy: 1819, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-gigantic-icon-small
   rotate: false
-  xy: 1975, 666
+  xy: 1925, 650
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13683,14 +13691,14 @@ scrap-wall-huge-icon-large
   index: -1
 scrap-wall-huge-icon-medium
   rotate: false
-  xy: 1887, 822
+  xy: 1819, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-huge-icon-small
   rotate: false
-  xy: 1930, 636
+  xy: 1925, 624
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13704,14 +13712,14 @@ scrap-wall-icon-large
   index: -1
 scrap-wall-icon-medium
   rotate: false
-  xy: 1887, 788
+  xy: 1853, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-icon-small
   rotate: false
-  xy: 1930, 610
+  xy: 1951, 652
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13725,21 +13733,21 @@ scrap-wall-large-icon-large
   index: -1
 scrap-wall-large-icon-medium
   rotate: false
-  xy: 1921, 822
+  xy: 1853, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall-large-icon-small
   rotate: false
-  xy: 1956, 640
+  xy: 1977, 652
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 scroll
   rotate: false
-  xy: 1982, 629
+  xy: 1977, 615
   size: 24, 35
   split: 10, 10, 6, 5
   orig: 24, 35
@@ -13747,7 +13755,7 @@ scroll
   index: -1
 scroll-horizontal
   rotate: false
-  xy: 165, 48
+  xy: 1115, 898
   size: 35, 24
   split: 6, 5, 10, 10
   orig: 35, 24
@@ -13763,7 +13771,7 @@ scroll-knob-horizontal-black
   index: -1
 scroll-knob-vertical-black
   rotate: false
-  xy: 1956, 598
+  xy: 1951, 610
   size: 24, 40
   split: 10, 10, 6, 10
   orig: 24, 40
@@ -13771,7 +13779,7 @@ scroll-knob-vertical-black
   index: -1
 selection
   rotate: false
-  xy: 1123, 688
+  xy: 1157, 688
   size: 1, 1
   orig: 1, 1
   offset: 0, 0
@@ -13785,14 +13793,14 @@ separator-icon-large
   index: -1
 separator-icon-medium
   rotate: false
-  xy: 1921, 788
+  xy: 1887, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 separator-icon-small
   rotate: false
-  xy: 1982, 603
+  xy: 2003, 652
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13806,14 +13814,14 @@ shale-boulder-icon-large
   index: -1
 shale-boulder-icon-medium
   rotate: false
-  xy: 1955, 822
+  xy: 1887, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder-icon-small
   rotate: false
-  xy: 2008, 646
+  xy: 2003, 626
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13827,14 +13835,14 @@ shale-icon-large
   index: -1
 shale-icon-medium
   rotate: false
-  xy: 1955, 788
+  xy: 1921, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-icon-small
   rotate: false
-  xy: 2008, 620
+  xy: 1944, 584
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13848,14 +13856,14 @@ shalerocks-icon-large
   index: -1
 shalerocks-icon-medium
   rotate: false
-  xy: 1989, 822
+  xy: 1921, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shalerocks-icon-small
   rotate: false
-  xy: 2008, 594
+  xy: 2003, 600
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13869,14 +13877,14 @@ shock-mine-icon-large
   index: -1
 shock-mine-icon-medium
   rotate: false
-  xy: 1989, 788
+  xy: 1955, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shock-mine-icon-small
   rotate: false
-  xy: 1982, 577
+  xy: 1977, 589
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13890,14 +13898,14 @@ shrubs-icon-large
   index: -1
 shrubs-icon-medium
   rotate: false
-  xy: 1127, 754
+  xy: 1955, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shrubs-icon-small
   rotate: false
-  xy: 2008, 568
+  xy: 2003, 574
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13911,14 +13919,14 @@ silicon-smelter-icon-large
   index: -1
 silicon-smelter-icon-medium
   rotate: false
-  xy: 1127, 720
+  xy: 1989, 822
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 silicon-smelter-icon-small
   rotate: false
-  xy: 1971, 551
+  xy: 1938, 514
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13932,28 +13940,28 @@ slider
   index: -1
 slider-knob
   rotate: false
-  xy: 1623, 616
+  xy: 1143, 584
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-down
   rotate: false
-  xy: 1654, 616
+  xy: 1174, 584
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-knob-over
   rotate: false
-  xy: 1685, 616
+  xy: 1205, 584
   size: 29, 38
   orig: 29, 38
   offset: 0, 0
   index: -1
 slider-vertical
   rotate: false
-  xy: 165, 45
+  xy: 1115, 895
   size: 8, 1
   orig: 8, 1
   offset: 0, 0
@@ -13967,14 +13975,14 @@ snow-icon-large
   index: -1
 snow-icon-medium
   rotate: false
-  xy: 1161, 754
+  xy: 1989, 788
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-icon-small
   rotate: false
-  xy: 1971, 525
+  xy: 803, 567
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -13988,14 +13996,14 @@ snow-pine-icon-large
   index: -1
 snow-pine-icon-medium
   rotate: false
-  xy: 1161, 720
+  xy: 1161, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-pine-icon-small
   rotate: false
-  xy: 1971, 499
+  xy: 829, 567
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14009,14 +14017,14 @@ snowrock-icon-large
   index: -1
 snowrock-icon-medium
   rotate: false
-  xy: 1195, 754
+  xy: 1161, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrock-icon-small
   rotate: false
-  xy: 1997, 542
+  xy: 855, 567
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14030,14 +14038,14 @@ snowrocks-icon-large
   index: -1
 snowrocks-icon-medium
   rotate: false
-  xy: 1195, 720
+  xy: 1195, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrocks-icon-small
   rotate: false
-  xy: 2023, 542
+  xy: 787, 541
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14051,14 +14059,14 @@ solar-panel-icon-large
   index: -1
 solar-panel-icon-medium
   rotate: false
-  xy: 1229, 754
+  xy: 1195, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel-icon-small
   rotate: false
-  xy: 1997, 516
+  xy: 813, 541
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14072,14 +14080,14 @@ solar-panel-large-icon-large
   index: -1
 solar-panel-large-icon-medium
   rotate: false
-  xy: 1229, 720
+  xy: 1229, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 solar-panel-large-icon-small
   rotate: false
-  xy: 2023, 516
+  xy: 839, 541
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14093,14 +14101,14 @@ sorter-icon-large
   index: -1
 sorter-icon-medium
   rotate: false
-  xy: 1263, 754
+  xy: 1229, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter-icon-small
   rotate: false
-  xy: 1997, 490
+  xy: 865, 541
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14114,14 +14122,14 @@ spawn-icon-large
   index: -1
 spawn-icon-medium
   rotate: false
-  xy: 1263, 720
+  xy: 1263, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spawn-icon-small
   rotate: false
-  xy: 2023, 490
+  xy: 891, 545
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14135,14 +14143,14 @@ spectre-icon-large
   index: -1
 spectre-icon-medium
   rotate: false
-  xy: 1297, 754
+  xy: 1263, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spectre-icon-small
   rotate: false
-  xy: 637, 321
+  xy: 917, 545
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14156,14 +14164,14 @@ spirit-factory-icon-large
   index: -1
 spirit-factory-icon-medium
   rotate: false
-  xy: 1297, 720
+  xy: 1297, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spirit-factory-icon-small
   rotate: false
-  xy: 663, 321
+  xy: 943, 545
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14177,14 +14185,14 @@ spore-cluster-icon-large
   index: -1
 spore-cluster-icon-medium
   rotate: false
-  xy: 1331, 754
+  xy: 1297, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-cluster-icon-small
   rotate: false
-  xy: 689, 321
+  xy: 809, 515
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14198,14 +14206,14 @@ spore-moss-icon-large
   index: -1
 spore-moss-icon-medium
   rotate: false
-  xy: 1331, 720
+  xy: 1331, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss-icon-small
   rotate: false
-  xy: 715, 321
+  xy: 835, 515
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14219,14 +14227,14 @@ spore-pine-icon-large
   index: -1
 spore-pine-icon-medium
   rotate: false
-  xy: 1365, 754
+  xy: 1331, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-pine-icon-small
   rotate: false
-  xy: 887, 571
+  xy: 861, 515
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14240,14 +14248,14 @@ spore-press-icon-large
   index: -1
 spore-press-icon-medium
   rotate: false
-  xy: 1365, 720
+  xy: 1365, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-press-icon-small
   rotate: false
-  xy: 913, 571
+  xy: 891, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14261,14 +14269,14 @@ sporerocks-icon-large
   index: -1
 sporerocks-icon-medium
   rotate: false
-  xy: 1399, 754
+  xy: 1365, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sporerocks-icon-small
   rotate: false
-  xy: 939, 571
+  xy: 917, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14282,14 +14290,14 @@ stone-icon-large
   index: -1
 stone-icon-medium
   rotate: false
-  xy: 1399, 720
+  xy: 1399, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-icon-small
   rotate: false
-  xy: 805, 467
+  xy: 943, 519
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14303,14 +14311,14 @@ surge-tower-icon-large
   index: -1
 surge-tower-icon-medium
   rotate: false
-  xy: 1433, 754
+  xy: 1399, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-tower-icon-small
   rotate: false
-  xy: 805, 441
+  xy: 969, 553
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14324,14 +14332,14 @@ surge-wall-icon-large
   index: -1
 surge-wall-icon-medium
   rotate: false
-  xy: 1433, 720
+  xy: 1433, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall-icon-small
   rotate: false
-  xy: 817, 321
+  xy: 969, 527
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14345,14 +14353,14 @@ surge-wall-large-icon-large
   index: -1
 surge-wall-large-icon-medium
   rotate: false
-  xy: 1467, 754
+  xy: 1433, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall-large-icon-small
   rotate: false
-  xy: 787, 530
+  xy: 969, 501
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14366,14 +14374,14 @@ swarmer-icon-large
   index: -1
 swarmer-icon-medium
   rotate: false
-  xy: 1467, 720
+  xy: 1467, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 swarmer-icon-small
   rotate: false
-  xy: 809, 504
+  xy: 995, 541
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14387,14 +14395,14 @@ tainted-water-icon-large
   index: -1
 tainted-water-icon-medium
   rotate: false
-  xy: 1501, 754
+  xy: 1467, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tainted-water-icon-small
   rotate: false
-  xy: 813, 530
+  xy: 1021, 541
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14408,14 +14416,14 @@ tar-icon-large
   index: -1
 tar-icon-medium
   rotate: false
-  xy: 1501, 720
+  xy: 1501, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-icon-small
   rotate: false
-  xy: 835, 504
+  xy: 995, 515
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14429,14 +14437,14 @@ tau-mech-pad-icon-large
   index: -1
 tau-mech-pad-icon-medium
   rotate: false
-  xy: 1535, 754
+  xy: 1501, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tau-mech-pad-icon-small
   rotate: false
-  xy: 861, 567
+  xy: 1047, 541
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14450,14 +14458,14 @@ tendrils-icon-large
   index: -1
 tendrils-icon-medium
   rotate: false
-  xy: 1535, 720
+  xy: 1535, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tendrils-icon-small
   rotate: false
-  xy: 839, 530
+  xy: 1021, 515
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14471,14 +14479,14 @@ thermal-generator-icon-large
   index: -1
 thermal-generator-icon-medium
   rotate: false
-  xy: 1569, 754
+  xy: 1535, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-generator-icon-small
   rotate: false
-  xy: 831, 478
+  xy: 1073, 541
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14492,14 +14500,14 @@ thermal-pump-icon-large
   index: -1
 thermal-pump-icon-medium
   rotate: false
-  xy: 1569, 720
+  xy: 1569, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-pump-icon-small
   rotate: false
-  xy: 831, 452
+  xy: 1047, 515
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14513,14 +14521,14 @@ thorium-reactor-icon-large
   index: -1
 thorium-reactor-icon-medium
   rotate: false
-  xy: 1603, 754
+  xy: 1569, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-reactor-icon-small
   rotate: false
-  xy: 865, 541
+  xy: 1073, 515
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14534,14 +14542,14 @@ thorium-wall-icon-large
   index: -1
 thorium-wall-icon-medium
   rotate: false
-  xy: 1603, 720
+  xy: 1603, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall-icon-small
   rotate: false
-  xy: 891, 545
+  xy: 1099, 541
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14555,14 +14563,14 @@ thorium-wall-large-icon-large
   index: -1
 thorium-wall-large-icon-medium
   rotate: false
-  xy: 1637, 754
+  xy: 1603, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium-wall-large-icon-small
   rotate: false
-  xy: 917, 545
+  xy: 1099, 515
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14576,14 +14584,14 @@ thruster-icon-large
   index: -1
 thruster-icon-medium
   rotate: false
-  xy: 1637, 720
+  xy: 1637, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thruster-icon-small
   rotate: false
-  xy: 943, 545
+  xy: 995, 489
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14597,14 +14605,14 @@ titan-factory-icon-large
   index: -1
 titan-factory-icon-medium
   rotate: false
-  xy: 1671, 754
+  xy: 1637, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titan-factory-icon-small
   rotate: false
-  xy: 831, 426
+  xy: 1021, 489
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14618,14 +14626,14 @@ titanium-conveyor-icon-large
   index: -1
 titanium-conveyor-icon-medium
   rotate: false
-  xy: 1671, 720
+  xy: 1671, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-icon-small
   rotate: false
-  xy: 820, 400
+  xy: 1047, 489
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14639,14 +14647,14 @@ titanium-wall-icon-large
   index: -1
 titanium-wall-icon-medium
   rotate: false
-  xy: 1705, 754
+  xy: 1671, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-icon-small
   rotate: false
-  xy: 820, 374
+  xy: 1073, 489
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14660,14 +14668,14 @@ titanium-wall-large-icon-large
   index: -1
 titanium-wall-large-icon-medium
   rotate: false
-  xy: 1705, 720
+  xy: 1705, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-wall-large-icon-small
   rotate: false
-  xy: 820, 348
+  xy: 1099, 489
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14681,14 +14689,14 @@ trident-ship-pad-icon-large
   index: -1
 trident-ship-pad-icon-medium
   rotate: false
-  xy: 1739, 754
+  xy: 1705, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 trident-ship-pad-icon-small
   rotate: false
-  xy: 865, 515
+  xy: 831, 489
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14702,21 +14710,21 @@ turbine-generator-icon-large
   index: -1
 turbine-generator-icon-medium
   rotate: false
-  xy: 1739, 720
+  xy: 1739, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 turbine-generator-icon-small
   rotate: false
-  xy: 891, 519
+  xy: 831, 463
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 underline
   rotate: false
-  xy: 1077, 895
+  xy: 165, 45
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -14724,7 +14732,7 @@ underline
   index: -1
 underline-2
   rotate: false
-  xy: 1039, 895
+  xy: 127, 45
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -14732,7 +14740,7 @@ underline-2
   index: -1
 underline-disabled
   rotate: false
-  xy: 127, 45
+  xy: 351, 187
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -14740,7 +14748,7 @@ underline-disabled
   index: -1
 underline-red
   rotate: false
-  xy: 351, 187
+  xy: 1077, 895
   size: 36, 27
   split: 12, 12, 12, 12
   orig: 36, 27
@@ -14755,14 +14763,14 @@ unloader-icon-large
   index: -1
 unloader-icon-medium
   rotate: false
-  xy: 1773, 754
+  xy: 1739, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-icon-small
   rotate: false
-  xy: 917, 519
+  xy: 857, 489
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14776,14 +14784,14 @@ vault-icon-large
   index: -1
 vault-icon-medium
   rotate: false
-  xy: 1773, 720
+  xy: 1773, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 vault-icon-small
   rotate: false
-  xy: 943, 519
+  xy: 831, 437
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14797,14 +14805,14 @@ water-extractor-icon-large
   index: -1
 water-extractor-icon-medium
   rotate: false
-  xy: 1807, 754
+  xy: 1773, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-extractor-icon-small
   rotate: false
-  xy: 846, 400
+  xy: 857, 463
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14818,14 +14826,14 @@ water-icon-large
   index: -1
 water-icon-medium
   rotate: false
-  xy: 1807, 720
+  xy: 1807, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-icon-small
   rotate: false
-  xy: 846, 374
+  xy: 857, 437
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14839,14 +14847,14 @@ wave-icon-large
   index: -1
 wave-icon-medium
   rotate: false
-  xy: 1841, 754
+  xy: 1807, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wave-icon-small
   rotate: false
-  xy: 846, 348
+  xy: 846, 411
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14860,14 +14868,14 @@ white-tree-dead-icon-large
   index: -1
 white-tree-dead-icon-medium
   rotate: false
-  xy: 1841, 720
+  xy: 1841, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white-tree-dead-icon-small
   rotate: false
-  xy: 843, 322
+  xy: 846, 385
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -14881,21 +14889,21 @@ white-tree-icon-large
   index: -1
 white-tree-icon-medium
   rotate: false
-  xy: 1875, 754
+  xy: 1841, 720
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 white-tree-icon-small
   rotate: false
-  xy: 861, 489
+  xy: 846, 359
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 whiteui
   rotate: false
-  xy: 1103, 890
+  xy: 187, 40
   size: 3, 3
   orig: 3, 3
   offset: 0, 0
@@ -14917,14 +14925,14 @@ wraith-factory-icon-large
   index: -1
 wraith-factory-icon-medium
   rotate: false
-  xy: 1875, 720
+  xy: 1875, 754
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 wraith-factory-icon-small
   rotate: false
-  xy: 857, 463
+  xy: 872, 411
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index af7586c1ec..47d8021cfa 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/assets/sprites/sprites4.png b/core/assets/sprites/sprites4.png
index 241e98b1c7..dac4f7486a 100644
Binary files a/core/assets/sprites/sprites4.png and b/core/assets/sprites/sprites4.png differ
diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java
index 4b5b52b1f1..9a67f8cd39 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -4,8 +4,9 @@ import io.anuke.arc.*;
 import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.input.*;
+import io.anuke.arc.math.geom.*;
 import io.anuke.arc.scene.ui.*;
-import io.anuke.arc.scene.ui.layout.UnitScl;
+import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.core.GameState.*;
@@ -20,6 +21,7 @@ import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.*;
 import io.anuke.mindustry.ui.dialogs.*;
 import io.anuke.mindustry.world.*;
+import io.anuke.mindustry.world.blocks.storage.*;
 
 import java.io.*;
 
@@ -226,6 +228,57 @@ public class Control implements ApplicationListener{
         });
     }
 
+    public void playTutorial(Zone zone){
+        ui.loadAnd(() -> {
+            logic.reset();
+            Net.reset();
+
+            world.beginMapLoad();
+
+            world.createTiles(zone.generator.width, zone.generator.height);
+            zone.generator.generate(world.getTiles());
+
+            Tile coreb = null;
+
+            out:
+            for(int x = 0; x < world.width(); x++){
+                for(int y = 0; y < world.height(); y++){
+                    if(world.rawTile(x, y).block() instanceof CoreBlock){
+                        coreb = world.rawTile(x, y);
+                        break out;
+                    }
+                }
+            }
+
+            Geometry.circle(coreb.x, coreb.y, 10, (cx, cy) -> {
+                Tile tile = world.ltile(cx, cy);
+                if(tile != null && tile.getTeam() == defaultTeam && !(tile.block() instanceof CoreBlock)){
+                    world.removeBlock(tile);
+                }
+            });
+
+            Geometry.circle(coreb.x, coreb.y, 5, (cx, cy) -> world.tile(cx, cy).clearOverlay());
+
+            world.endMapLoad();
+
+            zone.rules.accept(state.rules);
+            state.rules.zone = zone;
+            for(Tile core : state.teams.get(defaultTeam).cores){
+                for(ItemStack stack : zone.getStartingItems()){
+                    core.entity.items.add(stack.item, stack.amount);
+                }
+            }
+            Tile core = state.teams.get(defaultTeam).cores.first();
+            core.entity.items.clear();
+
+            state.set(State.playing);
+            control.saves.zoneSave();
+            logic.play();
+            state.rules.waveTimer = false;
+            state.rules.tutorial = true;
+        });
+    }
+
     public boolean isHighScore(){
         return hiscore;
     }
@@ -258,10 +311,7 @@ public class Control implements ApplicationListener{
 
         //play tutorial on stop
         if(!settings.getBool("tutorial", false)){
-            Core.app.post(() -> {
-                playZone(Zones.groundZero);
-                state.rules.tutorial = true;
-            });
+            Core.app.post(() -> playTutorial(Zones.groundZero));
         }
 
         //display UI scale changed dialog
@@ -333,6 +383,10 @@ public class Control implements ApplicationListener{
                 }
             }
 
+            if(state.rules.tutorial){
+                tutorial.update();
+            }
+
             //auto-update rpc every 5 seconds
             if(timer.get(0, 60 * 5)){
                 Platform.instance.updateRPC();
diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java
index d9e9e599b8..4d6fb7eb3a 100644
--- a/core/src/io/anuke/mindustry/core/UI.java
+++ b/core/src/io/anuke/mindustry/core/UI.java
@@ -158,6 +158,12 @@ public class UI implements ApplicationListener{
 
         Core.scene.act();
         Core.scene.draw();
+
+        //draw overlay for buttons
+        if(state.rules.tutorial){
+            control.tutorial.draw();
+            Draw.flush();
+        }
     }
 
     @Override
diff --git a/core/src/io/anuke/mindustry/game/EventType.java b/core/src/io/anuke/mindustry/game/EventType.java
index 8bc340ce2e..ebafef861c 100644
--- a/core/src/io/anuke/mindustry/game/EventType.java
+++ b/core/src/io/anuke/mindustry/game/EventType.java
@@ -48,6 +48,11 @@ public class EventType{
 
     }
 
+    /** Called when the player places a line, mobile or desktop.*/
+    public static class LineConfirmEvent{
+
+    }
+
     public static class GameOverEvent{
         public final Team winner;
 
diff --git a/core/src/io/anuke/mindustry/game/Tutorial.java b/core/src/io/anuke/mindustry/game/Tutorial.java
index 3dba893fba..d287a62a85 100644
--- a/core/src/io/anuke/mindustry/game/Tutorial.java
+++ b/core/src/io/anuke/mindustry/game/Tutorial.java
@@ -1,32 +1,147 @@
 package io.anuke.mindustry.game;
 
 import io.anuke.arc.*;
+import io.anuke.arc.collection.*;
+import io.anuke.arc.function.*;
+import io.anuke.arc.graphics.g2d.*;
 import io.anuke.arc.math.*;
+import io.anuke.arc.scene.*;
+import io.anuke.arc.scene.ui.*;
+import io.anuke.arc.scene.ui.layout.*;
+import io.anuke.arc.util.*;
+import io.anuke.mindustry.*;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.game.EventType.*;
+import io.anuke.mindustry.graphics.*;
+import io.anuke.mindustry.type.*;
+import io.anuke.mindustry.world.*;
 
 /** Handles tutorial state. */
 public class Tutorial{
+    private static final int mineCopper = 16;
+
+    private ObjectSet<String> events = new ObjectSet<>();
+    private ObjectIntMap<Block> blocksPlaced = new ObjectIntMap<>();
     public TutorialStage stage = TutorialStage.values()[0];
 
+    public Tutorial(){
+        Events.on(BlockBuildEndEvent.class, event -> {
+            if(!event.breaking){
+                blocksPlaced.getAndIncrement(event.tile.block(), 0, 1);
+            }
+        });
+
+        Events.on(LineConfirmEvent.class, event -> events.add("lineconfirm"));
+    }
+
+    public void update(){
+        if(stage.done.get()){
+            next();
+        }
+    }
+
+    public void draw(){
+        stage.draw();
+    }
+
     /** Resets tutorial state. */
     public void reset(){
         stage = TutorialStage.values()[0];
+        blocksPlaced.clear();
+        events.clear();
     }
 
     /** Goes on to the next tutorial step. */
     public void next(){
         stage = TutorialStage.values()[Mathf.clamp(stage.ordinal() + 1, 0, TutorialStage.values().length)];
+        blocksPlaced.clear();
+        events.clear();
     }
 
     public enum TutorialStage{
-        intro;
+        intro(
+        line -> Core.bundle.format(line, item(Items.copper), mineCopper),
+        () -> item(Items.copper) >= mineCopper
+        ),
+        drill(() -> placed(Blocks.mechanicalDrill, 1)){
+            void draw(){
+                outline("category-production");
+                outline("block-mechanical-drill");
+            }
+        },
+        conveyor(
+        line -> Core.bundle.format(line, placed(Blocks.conveyor), 3),
+        () -> placed(Blocks.conveyor, 3) && event("lineconfirm")){
+            void draw(){
+                outline("category-distribution");
+                outline("block-conveyor");
+            }
+        },
+        turret(() -> placed(Blocks.duo, 1)){
+            void draw(){
+                outline("category-turrets");
+                outline("block-duo");
+            }
+        };
 
-        public final String text;
+        protected final String line = Core.bundle.has("tutorial." + name() + ".mobile") && Vars.mobile ? "tutorial." + name() + ".mobile" : "tutorial." + name();
+        protected final Function<String, String> text;
+        protected final BooleanProvider done;
 
-        TutorialStage(){
-            text = Core.bundle.get("tutorial." + name());
+        TutorialStage(Function<String, String> text, BooleanProvider done){
+            this.text = text;
+            this.done = done;
         }
 
+        TutorialStage(BooleanProvider done){
+            this.text = line -> Core.bundle.get(line);
+            this.done = done;
+        }
 
+        public String text(){
+            return text.get(line);
+        }
+
+        void draw(){
+
+        }
+
+        //utility
+
+        static boolean event(String name){
+            return Vars.control.tutorial.events.contains(name);
+        }
+
+        static boolean placed(Block block, int amount){
+            return placed(block) >= amount;
+        }
+
+        static int placed(Block block){
+            return Vars.control.tutorial.blocksPlaced.get(block, 0);
+        }
+
+        static int item(Item item){
+            return Vars.state.teams.get(Vars.defaultTeam).cores.isEmpty() ? 0 : Vars.state.teams.get(Vars.defaultTeam).cores.first().entity.items.get(item);
+        }
+
+        static boolean toggled(String name){
+            Element element = Core.scene.findVisible(name);
+            if(element instanceof Button){
+                return ((Button)element).isChecked();
+            }
+            return false;
+        }
+
+        static void outline(String name){
+            Element element = Core.scene.findVisible(name);
+            if(element != null && !toggled(name)){
+                element.localToStageCoordinates(Tmp.v1.setZero());
+                float sin = Mathf.sin(11f, UnitScl.dp.scl(4f));
+                Lines.stroke(UnitScl.dp.scl(7f), Pal.place);
+                Lines.rect(Tmp.v1.x - sin, Tmp.v1.y - sin, element.getWidth() + sin*2, element.getHeight() + sin*2);
+                Draw.reset();
+            }
+        }
     }
 
 }
diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java
index 898928503a..ae574d906f 100644
--- a/core/src/io/anuke/mindustry/input/DesktopInput.java
+++ b/core/src/io/anuke/mindustry/input/DesktopInput.java
@@ -10,6 +10,7 @@ import io.anuke.arc.scene.ui.*;
 import io.anuke.arc.util.*;
 import io.anuke.mindustry.content.*;
 import io.anuke.mindustry.core.GameState.*;
+import io.anuke.mindustry.game.EventType.*;
 import io.anuke.mindustry.graphics.*;
 import io.anuke.mindustry.input.PlaceUtils.*;
 import io.anuke.mindustry.net.Net;
@@ -242,6 +243,7 @@ public class DesktopInput extends InputHandler{
                     rotation = l.rotation;
                     tryPlaceBlock(l.x, l.y);
                 });
+                Events.fire(new LineConfirmEvent());
             }else if(mode == breaking){ //touch up while breaking, break everything in selection
                 NormalizeResult result = PlaceUtils.normalizeArea(selectX, selectY, cursorX, cursorY, rotation, false, maxLength);
                 for(int x = 0; x <= Math.abs(result.x2 - result.x); x++){
diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java
index 36c3a5c689..815e3bf61f 100644
--- a/core/src/io/anuke/mindustry/input/MobileInput.java
+++ b/core/src/io/anuke/mindustry/input/MobileInput.java
@@ -1,34 +1,25 @@
 package io.anuke.mindustry.input;
 
-import io.anuke.arc.Core;
-import io.anuke.arc.collection.Array;
-import io.anuke.arc.function.BooleanProvider;
-import io.anuke.arc.graphics.Color;
+import io.anuke.arc.*;
+import io.anuke.arc.collection.*;
+import io.anuke.arc.graphics.*;
 import io.anuke.arc.graphics.g2d.*;
-import io.anuke.arc.input.GestureDetector;
-import io.anuke.arc.input.GestureDetector.GestureListener;
-import io.anuke.arc.input.KeyCode;
-import io.anuke.arc.math.Interpolation;
-import io.anuke.arc.math.Mathf;
+import io.anuke.arc.input.*;
+import io.anuke.arc.input.GestureDetector.*;
+import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
-import io.anuke.arc.scene.actions.Actions;
-import io.anuke.arc.scene.event.Touchable;
 import io.anuke.arc.scene.ui.layout.*;
 import io.anuke.arc.util.*;
-import io.anuke.mindustry.content.Blocks;
-import io.anuke.mindustry.content.Fx;
-import io.anuke.mindustry.core.GameState.State;
-import io.anuke.mindustry.entities.Effects;
-import io.anuke.mindustry.entities.Units;
+import io.anuke.mindustry.content.*;
+import io.anuke.mindustry.core.GameState.*;
+import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.traits.BuilderTrait.*;
-import io.anuke.mindustry.entities.traits.TargetTrait;
-import io.anuke.mindustry.entities.type.TileEntity;
-import io.anuke.mindustry.entities.type.Unit;
-import io.anuke.mindustry.graphics.Pal;
-import io.anuke.mindustry.input.PlaceUtils.NormalizeDrawResult;
-import io.anuke.mindustry.input.PlaceUtils.NormalizeResult;
-import io.anuke.mindustry.world.Block;
-import io.anuke.mindustry.world.Tile;
+import io.anuke.mindustry.entities.traits.*;
+import io.anuke.mindustry.entities.type.*;
+import io.anuke.mindustry.game.EventType.*;
+import io.anuke.mindustry.graphics.*;
+import io.anuke.mindustry.input.PlaceUtils.*;
+import io.anuke.mindustry.world.*;
 
 import static io.anuke.mindustry.Vars.*;
 import static io.anuke.mindustry.input.PlaceMode.*;
@@ -171,24 +162,6 @@ public class MobileInput extends InputHandler implements GestureListener{
         removals.add(request);
     }
 
-    void showGuide(String type, BooleanProvider done){
-        if(!Core.settings.getBool(type, false)){
-            Core.scene.table("guideDim", t -> {
-                t.margin(10f);
-                t.touchable(Touchable.disabled);
-                t.top().table("button", s -> s.add("$" + type).growX().wrap().labelAlign(Align.center, Align.center)).growX();
-                t.update(() -> {
-                    if((done.get() || state.is(State.menu)) && t.getUserObject() == null){
-                        t.actions(Actions.delay(1f), Actions.fadeOut(1f, Interpolation.fade), Actions.remove());
-                        t.setUserObject("ha");
-                    }
-                });
-            });
-            Core.settings.put(type, true);
-            data.modified();
-        }
-    }
-
     boolean isLinePlacing(){
         return mode == placing && lineMode && Mathf.dst(lineStartX * tilesize, lineStartY * tilesize, Core.input.mouseWorld().x, Core.input.mouseWorld().y) >= 3 * tilesize;
     }
@@ -281,9 +254,6 @@ public class MobileInput extends InputHandler implements GestureListener{
         table.addImageButton("icon-break-small", "clear-toggle-partial", iconsizesmall, () -> {
             mode = mode == breaking ? block == null ? none : placing : breaking;
             lastBlock = block;
-            if(mode == breaking){
-                showGuide("removearea", this::isAreaBreaking);
-            }
         }).update(l -> l.setChecked(mode == breaking));
 
         //diagonal swap button
@@ -516,6 +486,7 @@ public class MobileInput extends InputHandler implements GestureListener{
                     request.scale = 1f;
                     selection.add(request);
                 });
+                Events.fire(new LineConfirmEvent());
             }else if(mode == breaking){
                 //normalize area
                 NormalizeResult result = PlaceUtils.normalizeArea(lineStartX, lineStartY, tileX, tileY, rotation, false, maxLength);
@@ -652,10 +623,6 @@ public class MobileInput extends InputHandler implements GestureListener{
             mode = placing;
         }
 
-        if(block != null){
-            showGuide("placeline", this::isLinePlacing);
-        }
-
         if(block == null && mode == placing){
             mode = none;
         }
diff --git a/core/src/io/anuke/mindustry/ui/TreeLayout.java b/core/src/io/anuke/mindustry/ui/TreeLayout.java
index 1a7395f928..7e373ba231 100644
--- a/core/src/io/anuke/mindustry/ui/TreeLayout.java
+++ b/core/src/io/anuke/mindustry/ui/TreeLayout.java
@@ -1,7 +1,7 @@
 package io.anuke.mindustry.ui;
 
-import io.anuke.arc.collection.FloatArray;
-import io.anuke.arc.math.geom.Rectangle;
+import io.anuke.arc.collection.*;
+import io.anuke.arc.math.geom.*;
 
 /**
  * Algorithm taken from <a href="https://github.com/abego/treelayout">TreeLayout</a>.
diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
index 42ca862481..4448e93f6b 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
@@ -312,16 +312,21 @@ public class HudFragment extends Fragment{
             .update(label -> label.getColor().set(Color.ORANGE).lerp(Color.SCARLET, Mathf.absin(Time.time(), 2f, 1f)))).touchable(Touchable.disabled);
         });
 
+        parent.fill(t -> {
+             t.top().visible(() -> state.rules.tutorial);
+             t.table("button-trans", f -> f.labelWrap(() -> control.tutorial.stage.text()).width(400f).pad(3f));
+        });
+
         //paused table
         parent.fill(t -> {
             t.top().visible(() -> state.isPaused());
-            t.table("button", top -> top.add("$paused").pad(6f));
+            t.table("button-trans", top -> top.add("$paused").pad(5f));
         });
 
         //'saving' indicator
         parent.fill(t -> {
             t.bottom().visible(() -> control.saves.isSaving());
-            t.add("$saveload");
+            t.add("$saveload").style("outline");
         });
 
         blockfrag.build(parent);
diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
index a54f6c7039..98f17da60d 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
@@ -146,7 +146,7 @@ public class PlacementFragment extends Fragment{
                             if(unlocked(block)){
                                 input.block = input.block == block ? null : block;
                             }
-                        }).size(46f).group(group).get();
+                        }).size(46f).group(group).name("block-" + block.name).get();
 
                         button.getStyle().imageUp = new TextureRegionDrawable(block.icon(Icon.medium));
 
@@ -282,7 +282,7 @@ public class PlacementFragment extends Fragment{
                         categories.addImageButton("icon-" + cat.name() + "-med", "clear-toggle-trans", iconsizemed, () -> {
                             currentCategory = cat;
                             rebuildCategory.run();
-                        }).group(group).update(i -> i.setChecked(currentCategory == cat));
+                        }).group(group).update(i -> i.setChecked(currentCategory == cat)).name("category-" + cat.name());
                     }
                 }).touchable(Touchable.enabled);
 
diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
index 7da7edfbde..2d617d7f34 100644
--- a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
+++ b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
@@ -43,7 +43,7 @@ public class PlayerListFragment extends Fragment{
                 }
             });
 
-            cont.table("button", pane -> {
+            cont.table("button-trans", pane -> {
                 pane.label(() -> Core.bundle.format(playerGroup.size() == 1 ? "players.single" : "players", playerGroup.size()));
                 pane.row();
                 pane.pane(content).grow().get().setScrollingDisabled(true, false);
diff --git a/core/src/io/anuke/mindustry/world/blocks/BlockPart.java b/core/src/io/anuke/mindustry/world/blocks/BlockPart.java
index 21da5964dd..633685f1d4 100644
--- a/core/src/io/anuke/mindustry/world/blocks/BlockPart.java
+++ b/core/src/io/anuke/mindustry/world/blocks/BlockPart.java
@@ -54,7 +54,8 @@ public class BlockPart extends Block{
 
     @Override
     public Tile linked(Tile tile){
-        return tile.getNearby(-dx, -dy);
+        Tile out = tile.getNearby(-dx, -dy);
+        return out == null ? tile : out;
     }
 
     @Override
diff --git a/tools/src/io/anuke/mindustry/Generators.java b/tools/src/io/anuke/mindustry/Generators.java
index deabc56a7b..3a7b050c6a 100644
--- a/tools/src/io/anuke/mindustry/Generators.java
+++ b/tools/src/io/anuke/mindustry/Generators.java
@@ -209,9 +209,9 @@ public class Generators{
 
                 int off = image.width / 2 - mech.weapon.region.getWidth() / 2;
 
-                image.draw(mech.weapon.region, -(int)mech.weaponOffsetX + off, (int)mech.weaponOffsetY + off, false, false);
-                image.draw(mech.weapon.region, (int)mech.weaponOffsetX + off, (int)mech.weaponOffsetY + off, true, false);
-
+                for(int i : Mathf.signs){
+                    image.draw(mech.weapon.region, i * (int)mech.weaponOffsetX*4 + off, -(int)mech.weaponOffsetY*4 + off, i > 0, false);
+                }
 
                 image.save("mech-icon-" + mech.name);
             }