diff --git a/core/assets-raw/sprites/blocks/power/solar-panel.png b/core/assets-raw/sprites/blocks/power/solar-panel.png
deleted file mode 100644
index 9b960682a0..0000000000
Binary files a/core/assets-raw/sprites/blocks/power/solar-panel.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/power/solar/solar-panel-0.png b/core/assets-raw/sprites/blocks/power/solar/solar-panel-0.png
new file mode 100644
index 0000000000..bbb620edc5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/solar/solar-panel-0.png differ
diff --git a/core/assets-raw/sprites/blocks/power/solar/solar-panel-1.png b/core/assets-raw/sprites/blocks/power/solar/solar-panel-1.png
new file mode 100644
index 0000000000..4172074ad5
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/solar/solar-panel-1.png differ
diff --git a/core/assets-raw/sprites/blocks/power/solar/solar-panel-2.png b/core/assets-raw/sprites/blocks/power/solar/solar-panel-2.png
new file mode 100644
index 0000000000..8ac2f564a6
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/solar/solar-panel-2.png differ
diff --git a/core/assets-raw/sprites/blocks/power/solar/solar-panel-3.png b/core/assets-raw/sprites/blocks/power/solar/solar-panel-3.png
new file mode 100644
index 0000000000..212f335d0c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/solar/solar-panel-3.png differ
diff --git a/core/assets-raw/sprites/blocks/power/solar/solar-panel-4.png b/core/assets-raw/sprites/blocks/power/solar/solar-panel-4.png
new file mode 100644
index 0000000000..24fa162597
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/solar/solar-panel-4.png differ
diff --git a/core/assets-raw/sprites/blocks/power/solar/solar-panel-5.png b/core/assets-raw/sprites/blocks/power/solar/solar-panel-5.png
new file mode 100644
index 0000000000..977aee1325
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/solar/solar-panel-5.png differ
diff --git a/core/assets-raw/sprites/blocks/power/solar/solar-panel-6.png b/core/assets-raw/sprites/blocks/power/solar/solar-panel-6.png
new file mode 100644
index 0000000000..e30640b098
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/solar/solar-panel-6.png differ
diff --git a/core/assets-raw/sprites/blocks/power/solar/solar-panel-7.png b/core/assets-raw/sprites/blocks/power/solar/solar-panel-7.png
new file mode 100644
index 0000000000..609cc1df3d
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/solar/solar-panel-7.png differ
diff --git a/core/assets-raw/sprites/blocks/power/solar/solar-panel.png b/core/assets-raw/sprites/blocks/power/solar/solar-panel.png
new file mode 100644
index 0000000000..d950cca59c
Binary files /dev/null and b/core/assets-raw/sprites/blocks/power/solar/solar-panel.png differ
diff --git a/core/assets/sprites/fallback/sprites.atlas b/core/assets/sprites/fallback/sprites.atlas
index 514a7620f1..35bb47d466 100644
--- a/core/assets/sprites/fallback/sprites.atlas
+++ b/core/assets/sprites/fallback/sprites.atlas
@@ -537,14 +537,14 @@ mend-projector-top
   index: -1
 mender
   rotate: false
-  xy: 1991, 725
+  xy: 1983, 691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender-top
   rotate: false
-  xy: 1983, 691
+  xy: 1907, 657
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -565,7 +565,7 @@ overdrive-projector-top
   index: -1
 shock-mine
   rotate: false
-  xy: 1939, 521
+  xy: 1973, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -586,35 +586,35 @@ block-unloader
   index: -1
 bridge-arrow
   rotate: false
-  xy: 1787, 733
+  xy: 1787, 699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 1813, 665
+  xy: 1805, 631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 1805, 631
+  xy: 1805, 597
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 1805, 597
+  xy: 1839, 631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 center
   rotate: false
-  xy: 1839, 631
+  xy: 1839, 597
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -768,315 +768,315 @@ armored-conveyor-4-3
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 1299, 623
+  xy: 1297, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 1297, 589
+  xy: 1293, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 1293, 555
+  xy: 1293, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 1293, 521
+  xy: 1327, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 1327, 555
+  xy: 1327, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 1327, 521
+  xy: 1331, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 1331, 589
+  xy: 1365, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 1365, 593
+  xy: 1399, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 1399, 593
+  xy: 1311, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 1311, 487
+  xy: 1311, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 1311, 453
+  xy: 1345, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 1345, 487
+  xy: 1345, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 1345, 453
+  xy: 1321, 419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 1321, 419
+  xy: 1321, 385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 1321, 385
+  xy: 1355, 419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 1355, 419
+  xy: 1355, 385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 1355, 385
+  xy: 1346, 351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 1346, 351
+  xy: 1346, 317
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 1346, 317
+  xy: 1380, 351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor
   rotate: false
-  xy: 2009, 589
+  xy: 1973, 895
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-0
   rotate: false
-  xy: 1973, 895
+  xy: 1973, 861
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-1
   rotate: false
-  xy: 1973, 861
+  xy: 1999, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-2
   rotate: false
-  xy: 1999, 827
+  xy: 1463, 585
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-edge
   rotate: false
-  xy: 1463, 585
+  xy: 1463, 551
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-stack
   rotate: false
-  xy: 1463, 551
+  xy: 1497, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 2007, 487
+  xy: 1516, 355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 1481, 491
+  xy: 1516, 321
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 1481, 457
+  xy: 1516, 287
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 1515, 491
+  xy: 1549, 481
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 1515, 457
+  xy: 1583, 481
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 1491, 423
+  xy: 1559, 447
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 1491, 389
+  xy: 1559, 413
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 1525, 423
+  xy: 1593, 447
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 1525, 389
+  xy: 1593, 413
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 1516, 355
+  xy: 1559, 379
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 1516, 321
+  xy: 1593, 379
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 1516, 287
+  xy: 1550, 345
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 1549, 481
+  xy: 1550, 311
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 1583, 481
+  xy: 1584, 345
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 1559, 447
+  xy: 1584, 311
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 1559, 413
+  xy: 1550, 277
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 1593, 447
+  xy: 1584, 277
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 1593, 413
+  xy: 1618, 345
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 1559, 379
+  xy: 1618, 311
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cross
   rotate: false
-  xy: 1389, 385
+  xy: 1413, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1090,14 +1090,14 @@ distributor
   index: -1
 inverted-sorter
   rotate: false
-  xy: 1429, 525
+  xy: 1447, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 1897, 827
+  xy: 1931, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1139,7 +1139,7 @@ mass-driver-base
   index: -1
 overflow-gate
   rotate: false
-  xy: 1907, 623
+  xy: 1941, 657
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1167,49 +1167,49 @@ payload-router-over
   index: -1
 phase-conveyor
   rotate: false
-  xy: 1907, 589
+  xy: 1941, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 1941, 589
+  xy: 1975, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 1975, 589
+  xy: 2009, 657
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 2009, 657
+  xy: 2009, 623
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 1701, 529
+  xy: 1735, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 2007, 521
+  xy: 1769, 495
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 underflow-gate
   rotate: false
-  xy: 1550, 311
+  xy: 1627, 437
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1405,14 +1405,14 @@ block-select
   index: -1
 conduit-liquid
   rotate: false
-  xy: 1821, 733
+  xy: 1821, 699
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message
   rotate: false
-  xy: 1907, 657
+  xy: 1907, 623
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1426,161 +1426,161 @@ place-arrow
   index: -1
 bridge-conduit
   rotate: false
-  xy: 1787, 699
+  xy: 1779, 665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 1779, 665
+  xy: 1771, 631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 1779, 665
+  xy: 1771, 631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 1771, 631
+  xy: 1771, 597
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 1771, 597
+  xy: 1813, 665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 1769, 869
+  xy: 1769, 835
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 1769, 835
+  xy: 1795, 801
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 1795, 801
+  xy: 1821, 767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 1821, 767
+  xy: 1821, 733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 1821, 767
+  xy: 1821, 733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 1821, 767
+  xy: 1821, 733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 1821, 699
+  xy: 1847, 665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 1847, 665
+  xy: 1873, 631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 1873, 631
+  xy: 1873, 597
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 1873, 597
+  xy: 1419, 1047
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 1873, 597
+  xy: 1419, 1047
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 1419, 1047
+  xy: 1299, 623
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 1855, 759
+  xy: 1889, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate
   rotate: false
-  xy: 1923, 793
+  xy: 1889, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate-top
   rotate: false
-  xy: 1889, 759
+  xy: 1923, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 1923, 759
+  xy: 1889, 725
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 1889, 725
+  xy: 1923, 725
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 1923, 725
+  xy: 1965, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1608,126 +1608,126 @@ liquid-tank-top
   index: -1
 mechanical-pump
   rotate: false
-  xy: 1949, 691
+  xy: 1991, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump-liquid
   rotate: false
-  xy: 1991, 793
+  xy: 1991, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rotary-pump-liquid
   rotate: false
-  xy: 1991, 793
+  xy: 1991, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-pump-liquid
   rotate: false
-  xy: 1991, 793
+  xy: 1991, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 1941, 657
+  xy: 1941, 623
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 1941, 623
+  xy: 1975, 657
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 1975, 657
+  xy: 1975, 623
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 1975, 623
+  xy: 1907, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-cap
   rotate: false
-  xy: 1531, 593
+  xy: 1497, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-0
   rotate: false
-  xy: 1497, 559
+  xy: 1531, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-1
   rotate: false
-  xy: 1531, 559
+  xy: 1565, 583
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-2
   rotate: false
-  xy: 1565, 583
+  xy: 1599, 583
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-3
   rotate: false
-  xy: 1599, 583
+  xy: 1565, 549
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-4
   rotate: false
-  xy: 1565, 549
+  xy: 1599, 549
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 1667, 563
+  xy: 1701, 563
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 1701, 563
+  xy: 1735, 563
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 1735, 563
+  xy: 1769, 563
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 1769, 563
+  xy: 1803, 563
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1776,14 +1776,14 @@ battery-top
   index: -1
 combustion-generator
   rotate: false
-  xy: 1839, 597
+  xy: 1769, 903
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 1769, 903
+  xy: 1769, 869
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1811,28 +1811,28 @@ differential-generator-top
   index: -1
 diode
   rotate: false
-  xy: 1413, 491
+  xy: 1413, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode-arrow
   rotate: false
-  xy: 1413, 457
+  xy: 1423, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator
   rotate: false
-  xy: 1448, 355
+  xy: 1448, 321
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-top
   rotate: false
-  xy: 1448, 321
+  xy: 1429, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1888,7 +1888,7 @@ impact-reactor-plasma-3
   index: -1
 power-node
   rotate: false
-  xy: 1599, 549
+  xy: 1633, 573
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1902,14 +1902,14 @@ power-node-large
   index: -1
 power-source
   rotate: false
-  xy: 1633, 573
+  xy: 1633, 539
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 1633, 539
+  xy: 1667, 563
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1923,14 +1923,7 @@ rtg-generator
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 1735, 529
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-solar-panel
-  rotate: false
-  xy: 1973, 521
+  xy: 1769, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1942,6 +1935,69 @@ solar-panel-large
   orig: 96, 96
   offset: 0, 0
   index: -1
+solar-panel
+  rotate: false
+  xy: 2007, 521
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-0
+  rotate: false
+  xy: 1497, 525
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-1
+  rotate: false
+  xy: 1531, 525
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-2
+  rotate: false
+  xy: 1565, 515
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-3
+  rotate: false
+  xy: 1599, 515
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-4
+  rotate: false
+  xy: 1633, 505
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-5
+  rotate: false
+  xy: 1667, 495
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-6
+  rotate: false
+  xy: 1701, 495
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-7
+  rotate: false
+  xy: 1735, 495
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 surge-tower
   rotate: false
   xy: 983, 69
@@ -2119,21 +2175,21 @@ graphite-press
   index: -1
 incinerator
   rotate: false
-  xy: 1429, 559
+  xy: 1429, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 1871, 895
+  xy: 1837, 861
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 1863, 827
+  xy: 1897, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2161,21 +2217,21 @@ silicon-smelter-top
   index: -1
 liquid-source
   rotate: false
-  xy: 1957, 759
+  xy: 1957, 725
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void
   rotate: false
-  xy: 1957, 725
+  xy: 1881, 691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 1991, 759
+  xy: 1991, 725
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2224,14 +2280,14 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 1803, 563
+  xy: 1837, 563
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 1837, 563
+  xy: 1871, 563
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2343,28 +2399,28 @@ rock2
   index: -1
 sand-boulder1
   rotate: false
-  xy: 1769, 529
+  xy: 1803, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-boulder2
   rotate: false
-  xy: 1803, 529
+  xy: 1837, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder1
   rotate: false
-  xy: 2007, 555
+  xy: 1905, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder2
   rotate: false
-  xy: 1905, 521
+  xy: 1939, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2448,14 +2504,14 @@ core-shard-team
   index: -1
 unloader
   rotate: false
-  xy: 1584, 345
+  xy: 1627, 403
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-center
   rotate: false
-  xy: 1584, 311
+  xy: 1661, 461
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2553,7 +2609,7 @@ salvo-panel-right
   index: -1
 scorch-heat
   rotate: false
-  xy: 1871, 529
+  xy: 1905, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2665,7 +2721,7 @@ rally-point
   index: -1
 repair-point-base
   rotate: false
-  xy: 1667, 529
+  xy: 1701, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2679,7 +2735,7 @@ resupply-point
   index: -1
 copper-wall
   rotate: false
-  xy: 1380, 351
+  xy: 1380, 317
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2693,7 +2749,7 @@ copper-wall-large
   index: -1
 door
   rotate: false
-  xy: 1423, 423
+  xy: 1423, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2714,14 +2770,14 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 1423, 389
+  xy: 1414, 351
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 2009, 623
+  xy: 2009, 589
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2735,7 +2791,7 @@ phase-wall-large
   index: -1
 plastanium-wall
   rotate: false
-  xy: 1497, 593
+  xy: 1531, 593
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2798,35 +2854,35 @@ scrap-wall-large4
   index: -1
 scrap-wall2
   rotate: false
-  xy: 1905, 555
+  xy: 1939, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 1939, 555
+  xy: 1973, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 1973, 555
+  xy: 2007, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 1973, 555
+  xy: 2007, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 1939, 487
+  xy: 1525, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2840,7 +2896,7 @@ surge-wall-large
   index: -1
 thorium-wall
   rotate: false
-  xy: 1973, 487
+  xy: 1525, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2861,7 +2917,7 @@ thruster
   index: -1
 titanium-wall
   rotate: false
-  xy: 1593, 379
+  xy: 1618, 277
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2903,7 +2959,7 @@ circle-end
   index: -1
 circle-mid
   rotate: false
-  xy: 1323, 84
+  xy: 1323, 76
   size: 1, 199
   orig: 1, 199
   offset: 0, 0
@@ -3008,7 +3064,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 1550, 345
+  xy: 1627, 471
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3692,6 +3748,20 @@ block-snowrocks-full
   orig: 32, 32
   offset: 0, 0
   index: -1
+block-solar-panel-full
+  rotate: false
+  xy: 1753, 699
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-icon
+  rotate: false
+  xy: 1753, 699
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 block-spectre-full
   rotate: false
   xy: 1591, 1919
@@ -3708,7 +3778,7 @@ block-spore-cluster-full
   index: -1
 block-spore-moss-full
   rotate: false
-  xy: 1753, 699
+  xy: 1745, 665
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3722,14 +3792,14 @@ block-spore-press-full
   index: -1
 block-sporerocks-full
   rotate: false
-  xy: 1745, 665
+  xy: 1737, 631
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-stone-full
   rotate: false
-  xy: 1737, 631
+  xy: 1737, 597
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3743,21 +3813,21 @@ block-swarmer-full
   index: -1
 block-tendrils-full
   rotate: false
-  xy: 1737, 597
+  xy: 1787, 767
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-titanium-conveyor-full
   rotate: false
-  xy: 1787, 767
+  xy: 1787, 733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 1787, 767
+  xy: 1787, 733
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3827,56 +3897,56 @@ core-shard-team-sharded
   index: -1
 cracks-1-0
   rotate: false
-  xy: 1380, 317
+  xy: 1361, 555
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-1
   rotate: false
-  xy: 1361, 555
+  xy: 1361, 521
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-2
   rotate: false
-  xy: 1361, 521
+  xy: 1395, 559
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-3
   rotate: false
-  xy: 1395, 559
+  xy: 1395, 525
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-4
   rotate: false
-  xy: 1395, 525
+  xy: 1379, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-5
   rotate: false
-  xy: 1379, 487
+  xy: 1379, 453
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-6
   rotate: false
-  xy: 1379, 453
+  xy: 1389, 419
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-7
   rotate: false
-  xy: 1389, 419
+  xy: 1389, 385
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4156,7 +4226,7 @@ dagger-wreck2
   index: -1
 duo
   rotate: false
-  xy: 1414, 351
+  xy: 1414, 317
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4233,7 +4303,7 @@ gamma-wreck2
   index: -1
 hail
   rotate: false
-  xy: 1414, 317
+  xy: 1448, 355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4268,7 +4338,7 @@ item-blast-compound-large
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 1447, 457
+  xy: 1457, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4303,7 +4373,7 @@ item-coal-large
   index: -1
 item-coal-medium
   rotate: false
-  xy: 1457, 389
+  xy: 1482, 355
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4338,7 +4408,7 @@ item-copper-large
   index: -1
 item-copper-medium
   rotate: false
-  xy: 1482, 321
+  xy: 1448, 287
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4373,7 +4443,7 @@ item-graphite-large
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 1482, 287
+  xy: 1749, 1005
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4408,7 +4478,7 @@ item-lead-large
   index: -1
 item-lead-medium
   rotate: false
-  xy: 1749, 971
+  xy: 1775, 937
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4443,7 +4513,7 @@ item-metaglass-large
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 1783, 1005
+  xy: 1783, 971
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4478,7 +4548,7 @@ item-phase-fabric-large
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 1817, 963
+  xy: 1851, 963
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4513,7 +4583,7 @@ item-plastanium-large
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 1885, 963
+  xy: 1919, 963
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4548,7 +4618,7 @@ item-pyratite-large
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 1809, 929
+  xy: 1843, 929
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4583,7 +4653,7 @@ item-sand-large
   index: -1
 item-sand-medium
   rotate: false
-  xy: 1877, 929
+  xy: 1911, 929
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4618,7 +4688,7 @@ item-scrap-large
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 1803, 895
+  xy: 1803, 861
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4653,7 +4723,7 @@ item-silicon-large
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 1837, 895
+  xy: 1871, 895
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4688,21 +4758,21 @@ item-spore-pod-large
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 1905, 895
+  xy: 1871, 861
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod-small
   rotate: false
-  xy: 131, 1025
+  xy: 1695, 469
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-spore-pod-tiny
   rotate: false
-  xy: 2031, 977
+  xy: 2031, 1403
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4723,21 +4793,21 @@ item-surge-alloy-large
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 1905, 861
+  xy: 1945, 929
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy-small
   rotate: false
-  xy: 1550, 285
+  xy: 1661, 435
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-surge-alloy-tiny
   rotate: false
-  xy: 2031, 959
+  xy: 2031, 977
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4758,21 +4828,21 @@ item-thorium-large
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 1939, 895
+  xy: 1939, 861
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium-small
   rotate: false
-  xy: 1576, 285
+  xy: 131, 1025
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-thorium-tiny
   rotate: false
-  xy: 2031, 941
+  xy: 927, 1607
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4793,21 +4863,21 @@ item-titanium-large
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 1829, 827
+  xy: 1863, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium-small
   rotate: false
-  xy: 1979, 967
+  xy: 1721, 469
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 item-titanium-tiny
   rotate: false
-  xy: 2031, 1403
+  xy: 1319, 1591
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4835,21 +4905,21 @@ liquid-cryofluid-large
   index: -1
 liquid-cryofluid-medium
   rotate: false
-  xy: 1855, 793
+  xy: 1855, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid-small
   rotate: false
-  xy: 2005, 967
+  xy: 1661, 409
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-cryofluid-tiny
   rotate: false
-  xy: 927, 1607
+  xy: 885, 1313
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4870,21 +4940,21 @@ liquid-oil-large
   index: -1
 liquid-oil-medium
   rotate: false
-  xy: 1855, 725
+  xy: 1923, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil-small
   rotate: false
-  xy: 1979, 941
+  xy: 1747, 469
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-oil-tiny
   rotate: false
-  xy: 1319, 1591
+  xy: 677, 337
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4905,21 +4975,21 @@ liquid-slag-large
   index: -1
 liquid-slag-medium
   rotate: false
-  xy: 1957, 793
+  xy: 1957, 759
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag-small
   rotate: false
-  xy: 2005, 941
+  xy: 1773, 469
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-slag-tiny
   rotate: false
-  xy: 885, 1313
+  xy: 1173, 1219
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -4940,21 +5010,21 @@ liquid-water-large
   index: -1
 liquid-water-medium
   rotate: false
-  xy: 1915, 691
+  xy: 1949, 691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water-small
   rotate: false
-  xy: 317, 1281
+  xy: 1799, 469
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 liquid-water-tiny
   rotate: false
-  xy: 677, 337
+  xy: 1145, 493
   size: 16, 16
   orig: 16, 16
   offset: 0, 0
@@ -5136,7 +5206,7 @@ quasar-wreck2
   index: -1
 repair-point
   rotate: false
-  xy: 1871, 563
+  xy: 1667, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5164,7 +5234,7 @@ scatter
   index: -1
 scorch
   rotate: false
-  xy: 1837, 529
+  xy: 1871, 529
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5206,84 +5276,84 @@ spiroct-wreck2
   index: -1
 splash-0
   rotate: false
-  xy: 1531, 525
+  xy: 1837, 495
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-1
   rotate: false
-  xy: 1565, 515
+  xy: 1871, 495
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-10
   rotate: false
-  xy: 1871, 495
+  xy: 1491, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-11
   rotate: false
-  xy: 1905, 487
+  xy: 1491, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-2
   rotate: false
-  xy: 1599, 515
+  xy: 1905, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-3
   rotate: false
-  xy: 1633, 505
+  xy: 1939, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-4
   rotate: false
-  xy: 1667, 495
+  xy: 1973, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-5
   rotate: false
-  xy: 1701, 495
+  xy: 2007, 487
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-6
   rotate: false
-  xy: 1735, 495
+  xy: 1481, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-7
   rotate: false
-  xy: 1769, 495
+  xy: 1481, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-8
   rotate: false
-  xy: 1803, 495
+  xy: 1515, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-9
   rotate: false
-  xy: 1837, 495
+  xy: 1515, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5458,140 +5528,140 @@ zenith-wreck2
   index: -1
 item-blast-compound
   rotate: false
-  xy: 1447, 491
+  xy: 1447, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 1457, 423
+  xy: 1457, 389
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 1482, 355
+  xy: 1482, 321
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 1448, 287
+  xy: 1482, 287
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 1749, 1005
+  xy: 1749, 971
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 1775, 937
+  xy: 1783, 1005
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 1783, 971
+  xy: 1817, 963
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 1851, 963
+  xy: 1885, 963
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 1919, 963
+  xy: 1809, 929
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 1843, 929
+  xy: 1877, 929
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 1911, 929
+  xy: 1803, 895
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 1803, 861
+  xy: 1837, 895
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 1837, 861
+  xy: 1905, 895
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 1871, 861
+  xy: 1905, 861
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 1945, 929
+  xy: 1939, 895
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 1939, 861
+  xy: 1829, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 1931, 827
+  xy: 1855, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 1889, 793
+  xy: 1855, 725
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 1965, 827
+  xy: 1957, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 1881, 691
+  xy: 1915, 691
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6081,7 +6151,7 @@ spiroct-foot
   index: -1
 spiroct-joint
   rotate: false
-  xy: 1497, 525
+  xy: 1803, 495
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
diff --git a/core/assets/sprites/fallback/sprites2.png b/core/assets/sprites/fallback/sprites2.png
index 68e5843bdb..953e130278 100644
Binary files a/core/assets/sprites/fallback/sprites2.png and b/core/assets/sprites/fallback/sprites2.png differ
diff --git a/core/assets/sprites/fallback/sprites3.png b/core/assets/sprites/fallback/sprites3.png
index dfa1d65281..ed29980ef7 100644
Binary files a/core/assets/sprites/fallback/sprites3.png and b/core/assets/sprites/fallback/sprites3.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 2066ad7f01..7cafe0f247 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -104,14 +104,14 @@ mend-projector-top
   index: -1
 mender
   rotate: false
-  xy: 3420, 163
+  xy: 3454, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mender-top
   rotate: false
-  xy: 3454, 163
+  xy: 3488, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -132,7 +132,7 @@ overdrive-projector-top
   index: -1
 shock-mine
   rotate: false
-  xy: 3817, 905
+  xy: 3885, 939
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -153,35 +153,35 @@ block-unloader
   index: -1
 bridge-arrow
   rotate: false
-  xy: 3819, 1007
+  xy: 3853, 1007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 3989, 1005
+  xy: 4023, 1005
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 4023, 1005
+  xy: 4057, 997
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 4057, 997
+  xy: 2464, 279
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 center
   rotate: false
-  xy: 2464, 279
+  xy: 2498, 283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -335,315 +335,315 @@ armored-conveyor-4-3
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 2634, 287
+  xy: 2668, 287
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 2668, 287
+  xy: 2601, 253
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 2601, 253
+  xy: 2601, 219
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 2601, 219
+  xy: 2635, 253
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 2635, 253
+  xy: 2635, 219
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 2635, 219
+  xy: 2669, 253
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 2669, 253
+  xy: 2669, 219
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 2669, 219
+  xy: 3672, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 3672, 223
+  xy: 3182, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 3182, 223
+  xy: 3216, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 3216, 227
+  xy: 3250, 227
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 3250, 227
+  xy: 3284, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 3284, 231
+  xy: 3318, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 3318, 231
+  xy: 3352, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 3352, 231
+  xy: 3386, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 3386, 231
+  xy: 3420, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 3420, 231
+  xy: 3454, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 3454, 231
+  xy: 3488, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 3488, 231
+  xy: 3522, 231
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor
   rotate: false
-  xy: 3579, 948
+  xy: 3647, 982
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-0
   rotate: false
-  xy: 3647, 982
+  xy: 3579, 914
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-1
   rotate: false
-  xy: 3579, 914
+  xy: 3613, 948
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-2
   rotate: false
-  xy: 3613, 948
+  xy: 3579, 880
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-edge
   rotate: false
-  xy: 3579, 880
+  xy: 3613, 914
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plastanium-conveyor-stack
   rotate: false
-  xy: 3613, 914
+  xy: 3647, 948
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 3953, 869
+  xy: 4055, 929
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 3987, 903
+  xy: 4055, 895
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 4021, 937
+  xy: 4055, 861
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 3987, 869
+  xy: 4055, 827
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 4021, 903
+  xy: 3749, 803
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 4021, 869
+  xy: 3783, 803
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 3953, 835
+  xy: 3817, 803
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 3987, 835
+  xy: 3851, 803
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 4021, 835
+  xy: 3885, 803
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 4055, 929
+  xy: 3919, 803
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 4055, 895
+  xy: 3953, 801
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 4055, 861
+  xy: 3987, 801
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 4055, 827
+  xy: 4021, 801
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-2
   rotate: false
-  xy: 3749, 803
+  xy: 4055, 793
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 3783, 803
+  xy: 3611, 778
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 3817, 803
+  xy: 3645, 778
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 3851, 803
+  xy: 3611, 744
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 3885, 803
+  xy: 3645, 744
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 3919, 803
+  xy: 3681, 783
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cross
   rotate: false
-  xy: 3921, 973
+  xy: 3955, 971
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -657,14 +657,14 @@ distributor
   index: -1
 inverted-sorter
   rotate: false
-  xy: 3284, 197
+  xy: 3318, 197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 2574, 11
+  xy: 2608, 151
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -706,7 +706,7 @@ mass-driver-base
   index: -1
 overflow-gate
   rotate: false
-  xy: 3522, 163
+  xy: 3556, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -734,49 +734,49 @@ payload-router-over
   index: -1
 phase-conveyor
   rotate: false
-  xy: 3692, 155
+  xy: 3658, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 3658, 121
+  xy: 3692, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 3692, 121
+  xy: 3579, 982
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 3579, 982
+  xy: 3613, 982
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 3681, 817
+  xy: 3715, 817
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 3783, 837
+  xy: 3919, 905
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 underflow-gate
   rotate: false
-  xy: 4021, 801
+  xy: 3713, 749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -972,14 +972,14 @@ block-select
   index: -1
 conduit-liquid
   rotate: false
-  xy: 2533, 249
+  xy: 2533, 215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 message
   rotate: false
-  xy: 3488, 163
+  xy: 3522, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -993,161 +993,161 @@ place-arrow
   index: -1
 bridge-conduit
   rotate: false
-  xy: 3853, 1007
+  xy: 3887, 1007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 3887, 1007
+  xy: 3921, 1007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 3887, 1007
+  xy: 3921, 1007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 3921, 1007
+  xy: 3955, 1005
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 3955, 1005
+  xy: 3989, 1005
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 2465, 245
+  xy: 2465, 211
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 2465, 211
+  xy: 2499, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 2499, 249
+  xy: 2499, 215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 2499, 215
+  xy: 2533, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 2499, 215
+  xy: 2533, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 2499, 215
+  xy: 2533, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 2533, 215
+  xy: 2566, 283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 2566, 283
+  xy: 2567, 249
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 2567, 249
+  xy: 2567, 215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 2567, 215
+  xy: 2600, 287
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 2567, 215
+  xy: 2600, 287
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 2600, 287
+  xy: 2634, 287
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 2608, 117
+  xy: 2608, 83
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate
   rotate: false
-  xy: 2608, 49
+  xy: 2642, 83
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-overflow-gate-top
   rotate: false
-  xy: 2642, 83
+  xy: 2608, 15
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 2608, 15
+  xy: 2642, 49
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 2642, 49
+  xy: 2642, 15
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 2642, 15
+  xy: 2676, 151
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1175,126 +1175,126 @@ liquid-tank-top
   index: -1
 mechanical-pump
   rotate: false
-  xy: 3318, 163
+  xy: 3352, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 mechanical-pump-liquid
   rotate: false
-  xy: 3352, 163
+  xy: 3386, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rotary-pump-liquid
   rotate: false
-  xy: 3352, 163
+  xy: 3386, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thermal-pump-liquid
   rotate: false
-  xy: 3352, 163
+  xy: 3386, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 3556, 147
+  xy: 3590, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 3590, 147
+  xy: 3624, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 3624, 147
+  xy: 3658, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 3658, 155
+  xy: 3692, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-cap
   rotate: false
-  xy: 3579, 846
+  xy: 3613, 880
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-0
   rotate: false
-  xy: 3613, 880
+  xy: 3647, 914
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-1
   rotate: false
-  xy: 3647, 914
+  xy: 3579, 812
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-2
   rotate: false
-  xy: 3579, 812
+  xy: 3613, 846
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-3
   rotate: false
-  xy: 3613, 846
+  xy: 3647, 880
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 plated-conduit-top-4
   rotate: false
-  xy: 3647, 880
+  xy: 3613, 812
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 3681, 953
+  xy: 3715, 953
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 3715, 953
+  xy: 3681, 919
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 3681, 919
+  xy: 3715, 919
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 3715, 919
+  xy: 3681, 885
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1343,14 +1343,14 @@ battery-top
   index: -1
 combustion-generator
   rotate: false
-  xy: 2498, 283
+  xy: 2532, 283
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 2532, 283
+  xy: 2465, 245
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1378,28 +1378,28 @@ differential-generator-top
   index: -1
 diode
   rotate: false
-  xy: 3955, 971
+  xy: 3989, 971
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 diode-arrow
   rotate: false
-  xy: 3989, 971
+  xy: 4023, 971
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator
   rotate: false
-  xy: 2669, 185
+  xy: 3216, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 illuminator-top
   rotate: false
-  xy: 3216, 193
+  xy: 3250, 193
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1455,7 +1455,7 @@ impact-reactor-plasma-3
   index: -1
 power-node
   rotate: false
-  xy: 3613, 812
+  xy: 3647, 846
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1469,14 +1469,14 @@ power-node-large
   index: -1
 power-source
   rotate: false
-  xy: 3647, 846
+  xy: 3647, 812
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 power-void
   rotate: false
-  xy: 3647, 812
+  xy: 3681, 953
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1490,14 +1490,7 @@ rtg-generator
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 3715, 817
-  size: 32, 32
-  orig: 32, 32
-  offset: 0, 0
-  index: -1
-solar-panel
-  rotate: false
-  xy: 3885, 939
+  xy: 3749, 939
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1509,6 +1502,69 @@ solar-panel-large
   orig: 96, 96
   offset: 0, 0
   index: -1
+solar-panel
+  rotate: false
+  xy: 3783, 837
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-0
+  rotate: false
+  xy: 3817, 871
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-1
+  rotate: false
+  xy: 3851, 905
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-2
+  rotate: false
+  xy: 3919, 939
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-3
+  rotate: false
+  xy: 3817, 837
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-4
+  rotate: false
+  xy: 3851, 871
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-5
+  rotate: false
+  xy: 3885, 905
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-6
+  rotate: false
+  xy: 3851, 837
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-7
+  rotate: false
+  xy: 3885, 871
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 surge-tower
   rotate: false
   xy: 2362, 521
@@ -1686,21 +1742,21 @@ graphite-press
   index: -1
 incinerator
   rotate: false
-  xy: 3250, 193
+  xy: 3284, 197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-source
   rotate: false
-  xy: 2472, 11
+  xy: 2506, 45
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-void
   rotate: false
-  xy: 2574, 45
+  xy: 2574, 11
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1728,21 +1784,21 @@ silicon-smelter-top
   index: -1
 liquid-source
   rotate: false
-  xy: 2676, 83
+  xy: 2676, 49
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-void
   rotate: false
-  xy: 2676, 49
+  xy: 2676, 15
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 3386, 163
+  xy: 3420, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1791,14 +1847,14 @@ plastanium-compressor-top
   index: -1
 pulverizer
   rotate: false
-  xy: 3681, 885
+  xy: 3715, 885
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 3715, 885
+  xy: 3681, 851
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -1910,28 +1966,28 @@ rock2
   index: -1
 sand-boulder1
   rotate: false
-  xy: 3749, 939
+  xy: 3783, 939
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-boulder2
   rotate: false
-  xy: 3783, 939
+  xy: 3749, 905
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder1
   rotate: false
-  xy: 3749, 837
+  xy: 3783, 871
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder2
   rotate: false
-  xy: 3783, 871
+  xy: 3817, 905
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2036,14 +2092,14 @@ core-shard-team
   index: -1
 unloader
   rotate: false
-  xy: 4055, 793
+  xy: 3749, 769
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 unloader-center
   rotate: false
-  xy: 3611, 778
+  xy: 3783, 769
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2141,7 +2197,7 @@ salvo-panel-right
   index: -1
 scorch-heat
   rotate: false
-  xy: 3817, 939
+  xy: 3749, 871
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2295,7 +2351,7 @@ rally-point
   index: -1
 repair-point-base
   rotate: false
-  xy: 3715, 851
+  xy: 3681, 817
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2323,7 +2379,7 @@ tetrative-reconstructor-top
   index: -1
 copper-wall
   rotate: false
-  xy: 3522, 231
+  xy: 3672, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2337,7 +2393,7 @@ copper-wall-large
   index: -1
 door
   rotate: false
-  xy: 4023, 971
+  xy: 4057, 963
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2358,14 +2414,14 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 4057, 963
+  xy: 2601, 185
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 3613, 982
+  xy: 3579, 948
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2379,7 +2435,7 @@ phase-wall-large
   index: -1
 plastanium-wall
   rotate: false
-  xy: 3647, 948
+  xy: 3579, 846
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2442,35 +2498,35 @@ scrap-wall-large4
   index: -1
 scrap-wall2
   rotate: false
-  xy: 3749, 871
+  xy: 3783, 905
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall3
   rotate: false
-  xy: 3783, 905
+  xy: 3851, 939
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall4
   rotate: false
-  xy: 3851, 939
+  xy: 3749, 837
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap-wall5
   rotate: false
-  xy: 3851, 939
+  xy: 3749, 837
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 surge-wall
   rotate: false
-  xy: 3953, 903
+  xy: 3987, 835
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2484,7 +2540,7 @@ surge-wall-large
   index: -1
 thorium-wall
   rotate: false
-  xy: 3987, 937
+  xy: 4021, 835
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2505,7 +2561,7 @@ thruster
   index: -1
 titanium-wall
   rotate: false
-  xy: 3953, 801
+  xy: 3715, 783
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -2547,7 +2603,7 @@ circle-end
   index: -1
 circle-mid
   rotate: false
-  xy: 4089, 762
+  xy: 3651, 543
   size: 1, 199
   orig: 1, 199
   offset: 0, 0
@@ -2659,7 +2715,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 3987, 801
+  xy: 3679, 749
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3385,6 +3441,20 @@ block-snowrocks-full
   orig: 32, 32
   offset: 0, 0
   index: -1
+block-solar-panel-full
+  rotate: false
+  xy: 3887, 1041
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
+solar-panel-icon
+  rotate: false
+  xy: 3887, 1041
+  size: 32, 32
+  orig: 32, 32
+  offset: 0, 0
+  index: -1
 block-spectre-full
   rotate: false
   xy: 1809, 1273
@@ -3401,7 +3471,7 @@ block-spore-cluster-full
   index: -1
 block-spore-moss-full
   rotate: false
-  xy: 3887, 1041
+  xy: 3921, 1075
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3415,14 +3485,14 @@ block-spore-press-full
   index: -1
 block-sporerocks-full
   rotate: false
-  xy: 3921, 1075
+  xy: 3921, 1041
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 block-stone-full
   rotate: false
-  xy: 3921, 1041
+  xy: 3751, 1007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3436,7 +3506,7 @@ block-swarmer-full
   index: -1
 block-tendrils-full
   rotate: false
-  xy: 3751, 1007
+  xy: 3785, 1007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3450,14 +3520,14 @@ block-tetrative-reconstructor-full
   index: -1
 block-titanium-conveyor-full
   rotate: false
-  xy: 3785, 1007
+  xy: 3819, 1007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 3785, 1007
+  xy: 3819, 1007
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -3527,56 +3597,56 @@ core-shard-team-sharded
   index: -1
 cracks-1-0
   rotate: false
-  xy: 3672, 189
+  xy: 3683, 987
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-1
   rotate: false
-  xy: 3683, 987
+  xy: 3717, 987
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-2
   rotate: false
-  xy: 3717, 987
+  xy: 3751, 973
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-3
   rotate: false
-  xy: 3751, 973
+  xy: 3785, 973
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-4
   rotate: false
-  xy: 3785, 973
+  xy: 3819, 973
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-5
   rotate: false
-  xy: 3819, 973
+  xy: 3853, 973
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-6
   rotate: false
-  xy: 3853, 973
+  xy: 3887, 973
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cracks-1-7
   rotate: false
-  xy: 3887, 973
+  xy: 3921, 973
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4080,7 +4150,7 @@ dagger-wreck2
   index: -1
 duo
   rotate: false
-  xy: 2601, 185
+  xy: 2635, 185
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4178,7 +4248,7 @@ gamma-wreck2
   index: -1
 hail
   rotate: false
-  xy: 2635, 185
+  xy: 2669, 185
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4213,7 +4283,7 @@ item-blast-compound-large
   index: -1
 item-blast-compound-medium
   rotate: false
-  xy: 3352, 197
+  xy: 3386, 197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4248,7 +4318,7 @@ item-coal-large
   index: -1
 item-coal-medium
   rotate: false
-  xy: 3420, 197
+  xy: 3454, 197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4283,7 +4353,7 @@ item-copper-large
   index: -1
 item-copper-medium
   rotate: false
-  xy: 3488, 197
+  xy: 3522, 197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4318,7 +4388,7 @@ item-graphite-large
   index: -1
 item-graphite-medium
   rotate: false
-  xy: 3556, 215
+  xy: 3590, 215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4353,7 +4423,7 @@ item-lead-large
   index: -1
 item-lead-medium
   rotate: false
-  xy: 3556, 181
+  xy: 3590, 181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4388,7 +4458,7 @@ item-metaglass-large
   index: -1
 item-metaglass-medium
   rotate: false
-  xy: 3624, 181
+  xy: 2499, 181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4423,7 +4493,7 @@ item-phase-fabric-large
   index: -1
 item-phase-fabric-medium
   rotate: false
-  xy: 2533, 181
+  xy: 2567, 181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4458,7 +4528,7 @@ item-plastanium-large
   index: -1
 item-plastanium-medium
   rotate: false
-  xy: 2472, 147
+  xy: 2472, 113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4493,7 +4563,7 @@ item-pyratite-large
   index: -1
 item-pyratite-medium
   rotate: false
-  xy: 2506, 147
+  xy: 2472, 79
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4528,7 +4598,7 @@ item-sand-large
   index: -1
 item-sand-medium
   rotate: false
-  xy: 2506, 113
+  xy: 2540, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4563,7 +4633,7 @@ item-scrap-large
   index: -1
 item-scrap-medium
   rotate: false
-  xy: 2472, 45
+  xy: 2506, 79
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4598,7 +4668,7 @@ item-silicon-large
   index: -1
 item-silicon-medium
   rotate: false
-  xy: 2540, 113
+  xy: 2472, 11
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4633,7 +4703,7 @@ item-spore-pod-large
   index: -1
 item-spore-pod-medium
   rotate: false
-  xy: 2540, 79
+  xy: 2506, 11
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4668,7 +4738,7 @@ item-surge-alloy-large
   index: -1
 item-surge-alloy-medium
   rotate: false
-  xy: 2540, 45
+  xy: 2540, 11
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4703,7 +4773,7 @@ item-thorium-large
   index: -1
 item-thorium-medium
   rotate: false
-  xy: 2574, 147
+  xy: 2574, 113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4738,7 +4808,7 @@ item-titanium-large
   index: -1
 item-titanium-medium
   rotate: false
-  xy: 2574, 79
+  xy: 2574, 45
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4780,7 +4850,7 @@ liquid-cryofluid-large
   index: -1
 liquid-cryofluid-medium
   rotate: false
-  xy: 2642, 151
+  xy: 2608, 117
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4815,7 +4885,7 @@ liquid-oil-large
   index: -1
 liquid-oil-medium
   rotate: false
-  xy: 2642, 117
+  xy: 2608, 49
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -4850,14 +4920,14 @@ liquid-slag-large
   index: -1
 liquid-slag-medium
   rotate: false
-  xy: 2676, 117
+  xy: 2676, 83
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag-small
   rotate: false
-  xy: 3645, 786
+  xy: 3817, 777
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -4885,14 +4955,14 @@ liquid-water-large
   index: -1
 liquid-water-medium
   rotate: false
-  xy: 3284, 163
+  xy: 3318, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water-small
   rotate: false
-  xy: 3611, 752
+  xy: 3259, 1705
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
@@ -5081,7 +5151,7 @@ quasar-wreck2
   index: -1
 repair-point
   rotate: false
-  xy: 3681, 851
+  xy: 3715, 851
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5109,7 +5179,7 @@ scatter
   index: -1
 scorch
   rotate: false
-  xy: 3749, 905
+  xy: 3817, 939
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5151,84 +5221,84 @@ spiroct-wreck2
   index: -1
 splash-0
   rotate: false
-  xy: 3851, 905
+  xy: 3919, 871
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-1
   rotate: false
-  xy: 3919, 939
+  xy: 3919, 837
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-10
   rotate: false
-  xy: 3919, 837
+  xy: 4021, 869
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-11
   rotate: false
-  xy: 3953, 937
+  xy: 3953, 835
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-2
   rotate: false
-  xy: 3817, 837
+  xy: 3953, 937
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-3
   rotate: false
-  xy: 3851, 871
+  xy: 3953, 903
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-4
   rotate: false
-  xy: 3885, 905
+  xy: 3987, 937
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-5
   rotate: false
-  xy: 3851, 837
+  xy: 3953, 869
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-6
   rotate: false
-  xy: 3885, 871
+  xy: 3987, 903
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-7
   rotate: false
-  xy: 3919, 905
+  xy: 4021, 937
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-8
   rotate: false
-  xy: 3885, 837
+  xy: 3987, 869
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 splash-9
   rotate: false
-  xy: 3919, 871
+  xy: 4021, 903
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -5417,140 +5487,140 @@ zenith-wreck2
   index: -1
 item-blast-compound
   rotate: false
-  xy: 3318, 197
+  xy: 3352, 197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 3386, 197
+  xy: 3420, 197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-copper
   rotate: false
-  xy: 3454, 197
+  xy: 3488, 197
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-graphite
   rotate: false
-  xy: 3522, 197
+  xy: 3556, 215
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 3590, 215
+  xy: 3556, 181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-metaglass
   rotate: false
-  xy: 3590, 181
+  xy: 3624, 181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-phase-fabric
   rotate: false
-  xy: 2499, 181
+  xy: 2533, 181
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 2567, 181
+  xy: 2472, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 2472, 113
+  xy: 2506, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 2472, 79
+  xy: 2506, 113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-scrap
   rotate: false
-  xy: 2540, 147
+  xy: 2472, 45
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 2506, 79
+  xy: 2540, 113
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-spore-pod
   rotate: false
-  xy: 2506, 45
+  xy: 2540, 79
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 2506, 11
+  xy: 2540, 45
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 2540, 11
+  xy: 2574, 147
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 2574, 113
+  xy: 2574, 79
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-cryofluid
   rotate: false
-  xy: 2608, 151
+  xy: 2642, 151
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-oil
   rotate: false
-  xy: 2608, 83
+  xy: 2642, 117
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-slag
   rotate: false
-  xy: 2676, 151
+  xy: 2676, 117
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 liquid-water
   rotate: false
-  xy: 2676, 15
+  xy: 3284, 163
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -6075,7 +6145,7 @@ spiroct-foot
   index: -1
 spiroct-joint
   rotate: false
-  xy: 3817, 871
+  xy: 3885, 837
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 5850b6cf32..4165f35eef 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png
index 33652412a6..cf5cf3c43a 100644
Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index c47439e4bf..84c200da04 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1141,7 +1141,7 @@ public class Blocks implements ContentList{
             itemDuration = 500f;
         }};
 
-        solarPanel = new SolarGenerator("solar-panel"){{
+        solarPanel = new SeamlessSolarGenerator("solar-panel"){{
             requirements(Category.power, with(Items.lead, 10, Items.silicon, 15));
             powerProduction = 0.06f;
         }};
diff --git a/core/src/mindustry/world/blocks/power/SeamlessSolarGenerator.java b/core/src/mindustry/world/blocks/power/SeamlessSolarGenerator.java
new file mode 100644
index 0000000000..ffe00bdcf9
--- /dev/null
+++ b/core/src/mindustry/world/blocks/power/SeamlessSolarGenerator.java
@@ -0,0 +1,64 @@
+package mindustry.world.blocks.power;
+
+import arc.*;
+import arc.graphics.g2d.*;
+import mindustry.annotations.Annotations.*;
+import mindustry.world.*;
+
+import static mindustry.Vars.*;
+
+public class SeamlessSolarGenerator extends SolarGenerator{
+    @Load(value = "@-#", length = 8)
+    public TextureRegion[] edges;
+
+    public SeamlessSolarGenerator(String name){
+        super(name);
+    }
+
+    @Override
+    protected TextureRegion[] icons(){
+        return new TextureRegion[]{Core.atlas.find(name + "-icon")};
+    }
+
+    public class SeamlessSolarGeneratorEntity extends SolarGeneratorEntity{
+        boolean up, right, down, left;
+
+        @Override
+        public void onProximityUpdate(){
+            super.onProximityUpdate();
+
+            up = foreign(tile, 0, 1);
+            right = foreign(tile, 1, 0);
+            down = foreign(tile, 0, -1);
+            left = foreign(tile, -1, 0);
+        }
+
+        @Override
+        public void draw(){
+            super.draw();
+
+            // outside edges
+            if(up)    Draw.rect(edges[0], x, y);
+            if(right) Draw.rect(edges[2], x, y);
+            if(down)  Draw.rect(edges[4], x, y);
+            if(left)  Draw.rect(edges[6], x, y);
+
+            // outside corners
+            if(up && right)   Draw.rect(edges[1], x, y);
+            if(right && down) Draw.rect(edges[3], x, y);
+            if(down && left)  Draw.rect(edges[5], x, y);
+            if(left && up)    Draw.rect(edges[7], x, y);
+
+            //inside corners
+            if(!right && !down && foreign(tile, 1, -1)) Draw.rect(edges[7], x + (tilesize * 0.75f), y - (tilesize * 0.75f));
+            if(!left && !down && foreign(tile, -1, -1)) Draw.rect(edges[1], x - (tilesize * 0.75f), y - (tilesize * 0.75f));
+            if(!left && !up && foreign(tile, -1, 1)) Draw.rect(edges[3], x - (tilesize * 0.75f), y + (tilesize * 0.75f));
+            if(!right && !up && foreign(tile, 1, 1)) Draw.rect(edges[5], x + (tilesize * 0.75f), y + (tilesize * 0.75f));
+        }
+
+        private boolean foreign(Tile tile, int dx, int dy){
+            Tile other = tile.getNearby(dx, dy);
+            return other == null || other.block() != SeamlessSolarGenerator.this;
+        }
+    }
+}
\ No newline at end of file