diff --git a/core/assets-raw/sprites/blocks/extra/shadow-corner.png b/core/assets-raw/sprites/blocks/extra/shadow-corner.png
new file mode 100644
index 0000000000..3f8f4b5d07
Binary files /dev/null and b/core/assets-raw/sprites/blocks/extra/shadow-corner.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 9f238722c2..f46f7cbe76 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -13,245 +13,245 @@ background
   index: -1
 bridge-conveyor-arrow
   rotate: false
-  xy: 343, 25
+  xy: 333, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-bridge
   rotate: false
-  xy: 333, 5
+  xy: 343, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor-end
   rotate: false
-  xy: 343, 15
+  xy: 353, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-1
   rotate: false
-  xy: 517, 101
+  xy: 967, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-2
   rotate: false
-  xy: 512, 62
+  xy: 977, 356
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-3
   rotate: false
-  xy: 967, 356
+  xy: 967, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-0
   rotate: false
-  xy: 977, 356
+  xy: 977, 346
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-1
   rotate: false
-  xy: 967, 346
+  xy: 987, 355
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-2
   rotate: false
-  xy: 977, 346
+  xy: 997, 355
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-1-3
   rotate: false
-  xy: 987, 355
+  xy: 987, 345
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-0
   rotate: false
-  xy: 997, 355
+  xy: 997, 345
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-1
   rotate: false
-  xy: 987, 345
+  xy: 1007, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-2
   rotate: false
-  xy: 997, 345
+  xy: 1007, 339
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-2-3
   rotate: false
-  xy: 1007, 349
+  xy: 409, 48
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-0
   rotate: false
-  xy: 1007, 339
+  xy: 409, 38
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-1
   rotate: false
-  xy: 409, 48
+  xy: 961, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-2
   rotate: false
-  xy: 409, 38
+  xy: 971, 336
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-3-3
   rotate: false
-  xy: 961, 336
+  xy: 413, 28
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-0
   rotate: false
-  xy: 971, 336
+  xy: 413, 18
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-1
   rotate: false
-  xy: 413, 28
+  xy: 413, 8
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-2
   rotate: false
-  xy: 413, 18
+  xy: 981, 335
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-4-3
   rotate: false
-  xy: 413, 8
+  xy: 991, 335
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-1
   rotate: false
-  xy: 533, 81
+  xy: 533, 71
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-2
   rotate: false
-  xy: 543, 81
+  xy: 532, 61
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-3
   rotate: false
-  xy: 553, 81
+  xy: 543, 81
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-0
   rotate: false
-  xy: 522, 71
+  xy: 553, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-1
   rotate: false
-  xy: 532, 71
+  xy: 543, 71
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-2
   rotate: false
-  xy: 542, 71
+  xy: 542, 61
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-1-3
   rotate: false
-  xy: 552, 71
+  xy: 553, 81
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-0
   rotate: false
-  xy: 522, 61
+  xy: 553, 71
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-1
   rotate: false
-  xy: 532, 61
+  xy: 552, 61
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-2
   rotate: false
-  xy: 542, 61
+  xy: 563, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-2-3
   rotate: false
-  xy: 552, 61
+  xy: 563, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-0
   rotate: false
-  xy: 563, 88
+  xy: 573, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-3-1
   rotate: false
-  xy: 573, 88
+  xy: 573, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -265,56 +265,56 @@ titanium-conveyor-3-2
   index: -1
 titanium-conveyor-3-3
   rotate: false
-  xy: 593, 88
+  xy: 583, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-0
   rotate: false
-  xy: 603, 88
+  xy: 593, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-1
   rotate: false
-  xy: 613, 88
+  xy: 593, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-2
   rotate: false
-  xy: 623, 88
+  xy: 603, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-4-3
   rotate: false
-  xy: 633, 88
+  xy: 603, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-arrow
   rotate: false
-  xy: 660, 138
+  xy: 657, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-bridge
   rotate: false
-  xy: 657, 128
+  xy: 657, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor-end
   rotate: false
-  xy: 657, 118
+  xy: 657, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -356,21 +356,21 @@ blast-drill-top
   index: -1
 carbide-drill
   rotate: false
-  xy: 353, 25
+  xy: 343, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 carbide-drill-rotator
   rotate: false
-  xy: 343, 5
+  xy: 353, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 carbide-drill-top
   rotate: false
-  xy: 353, 15
+  xy: 363, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -454,21 +454,21 @@ plasma-drill-top
   index: -1
 tungsten-drill
   rotate: false
-  xy: 563, 78
+  xy: 633, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-drill-rotator
   rotate: false
-  xy: 573, 78
+  xy: 633, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-drill-top
   rotate: false
-  xy: 583, 78
+  xy: 643, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -538,14 +538,14 @@ block-icon-blackstone
   index: -1
 blackstone2
   rotate: false
-  xy: 512, 72
+  xy: 957, 359
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 blackstone3
   rotate: false
-  xy: 957, 359
+  xy: 957, 349
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -559,35 +559,35 @@ blackstoneedge
   index: -1
 coal1
   rotate: false
-  xy: 363, 25
+  xy: 353, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 353, 5
+  xy: 363, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 363, 15
+  xy: 373, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 991, 335
+  xy: 711, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 701, 161
+  xy: 721, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -601,42 +601,42 @@ dirtedge
   index: -1
 grass-cliff-edge
   rotate: false
-  xy: 795, 302
+  xy: 505, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-1
   rotate: false
-  xy: 507, 181
+  xy: 517, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-edge-2
   rotate: false
-  xy: 505, 171
+  xy: 527, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass-cliff-side
   rotate: false
-  xy: 517, 181
+  xy: 515, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 775, 302
+  xy: 795, 302
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 785, 302
+  xy: 507, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -650,42 +650,42 @@ grassedge
   index: -1
 ice-cliff-edge
   rotate: false
-  xy: 537, 181
+  xy: 547, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-1
   rotate: false
-  xy: 525, 171
+  xy: 535, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-edge-2
   rotate: false
-  xy: 547, 181
+  xy: 557, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice-cliff-side
   rotate: false
-  xy: 535, 171
+  xy: 545, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 527, 181
+  xy: 537, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 515, 171
+  xy: 525, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -699,35 +699,35 @@ iceedge
   index: -1
 icerock2
   rotate: false
-  xy: 557, 181
+  xy: 567, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow1
   rotate: false
-  xy: 545, 171
+  xy: 555, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow1
   rotate: false
-  xy: 545, 171
+  xy: 555, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow2
   rotate: false
-  xy: 567, 181
+  xy: 565, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow2
   rotate: false
-  xy: 567, 181
+  xy: 565, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -741,56 +741,56 @@ lavaedge
   index: -1
 lead1
   rotate: false
-  xy: 527, 111
+  xy: 547, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 537, 121
+  xy: 562, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 547, 131
+  xy: 560, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 547, 101
+  xy: 557, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 557, 111
+  xy: 577, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 557, 101
+  xy: 587, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 577, 178
+  xy: 597, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 587, 178
+  xy: 607, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -811,49 +811,49 @@ oiledge
   index: -1
 rock2
   rotate: false
-  xy: 677, 128
+  xy: 677, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge
   rotate: false
-  xy: 889, 317
+  xy: 736, 241
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-1
   rotate: false
-  xy: 736, 241
+  xy: 736, 231
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-edge-2
   rotate: false
-  xy: 736, 231
+  xy: 736, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand-cliff-side
   rotate: false
-  xy: 736, 221
+  xy: 736, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 677, 108
+  xy: 889, 317
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 677, 98
+  xy: 512, 61
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -867,49 +867,49 @@ sandedge
   index: -1
 shrubshadow
   rotate: false
-  xy: 731, 191
+  xy: 741, 201
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge
   rotate: false
-  xy: 737, 181
+  xy: 737, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-1
   rotate: false
-  xy: 737, 171
+  xy: 741, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-edge-2
   rotate: false
-  xy: 741, 161
+  xy: 747, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow-cliff-side
   rotate: false
-  xy: 747, 181
+  xy: 747, 171
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 741, 201
+  xy: 741, 191
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 741, 191
+  xy: 737, 181
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -930,42 +930,42 @@ spaceedge
   index: -1
 stone-cliff-edge
   rotate: false
-  xy: 883, 305
+  xy: 871, 295
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-1
   rotate: false
-  xy: 871, 295
+  xy: 881, 295
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-edge-2
   rotate: false
-  xy: 881, 295
+  xy: 893, 307
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone-cliff-side
   rotate: false
-  xy: 893, 307
+  xy: 523, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 751, 161
+  xy: 873, 305
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 873, 305
+  xy: 883, 305
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -979,91 +979,91 @@ stoneedge
   index: -1
 thorium1
   rotate: false
-  xy: 498, 58
+  xy: 523, 81
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 523, 91
+  xy: 533, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 533, 91
+  xy: 523, 71
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 543, 91
+  xy: 522, 61
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 553, 91
+  xy: 533, 81
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 523, 81
+  xy: 543, 91
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten1
   rotate: false
-  xy: 653, 88
+  xy: 613, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten2
   rotate: false
-  xy: 663, 88
+  xy: 623, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten3
   rotate: false
-  xy: 673, 88
+  xy: 623, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge
   rotate: false
-  xy: 593, 78
+  xy: 643, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-1
   rotate: false
-  xy: 603, 78
+  xy: 653, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-edge-2
   rotate: false
-  xy: 613, 78
+  xy: 653, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water-cliff-side
   rotate: false
-  xy: 623, 78
+  xy: 663, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1077,63 +1077,63 @@ wateredge
   index: -1
 block-border
   rotate: false
-  xy: 931, 335
+  xy: 941, 335
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-elevation
   rotate: false
-  xy: 941, 335
+  xy: 951, 335
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator-top
   rotate: false
-  xy: 941, 335
+  xy: 951, 335
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-middle
   rotate: false
-  xy: 323, 25
+  xy: 313, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pump-liquid
   rotate: false
-  xy: 323, 25
+  xy: 313, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-slope
   rotate: false
-  xy: 313, 5
+  xy: 323, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 border
   rotate: false
-  xy: 323, 15
+  xy: 333, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 393, 15
+  xy: 393, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-1
   rotate: false
-  xy: 981, 335
+  xy: 701, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1161,7 +1161,7 @@ cross-4
   index: -1
 enemyspawn
   rotate: false
-  xy: 731, 161
+  xy: 785, 302
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1175,14 +1175,14 @@ nuclearreactor-shadow
   index: -1
 place-arrow
   rotate: false
-  xy: 657, 108
+  xy: 672, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 playerspawn
   rotate: false
-  xy: 657, 98
+  xy: 682, 159
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1278,13 +1278,20 @@ shadow-6
   orig: 50, 50
   offset: 0, 0
   index: -1
-shadow-round-1
+shadow-corner
   rotate: false
   xy: 464, 56
   size: 10, 10
   orig: 10, 10
   offset: 0, 0
   index: -1
+shadow-round-1
+  rotate: false
+  xy: 476, 56
+  size: 10, 10
+  orig: 10, 10
+  offset: 0, 0
+  index: -1
 shadow-round-2
   rotate: false
   xy: 467, 182
@@ -1301,154 +1308,154 @@ shadow-rounded-2
   index: -1
 bridge-conduit-arrow
   rotate: false
-  xy: 333, 25
+  xy: 323, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-bridge
   rotate: false
-  xy: 323, 5
+  xy: 333, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit-end
   rotate: false
-  xy: 333, 15
+  xy: 343, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 373, 25
+  xy: 363, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-0
   rotate: false
-  xy: 363, 5
+  xy: 373, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-1
   rotate: false
-  xy: 373, 15
+  xy: 383, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-2
   rotate: false
-  xy: 383, 25
+  xy: 373, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-3
   rotate: false
-  xy: 373, 5
+  xy: 383, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-4
   rotate: false
-  xy: 383, 15
+  xy: 393, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-5
   rotate: false
-  xy: 393, 25
+  xy: 383, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom-6
   rotate: false
-  xy: 383, 5
+  xy: 393, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-0
   rotate: false
-  xy: 393, 5
+  xy: 403, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-1
   rotate: false
-  xy: 403, 25
+  xy: 403, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-2
   rotate: false
-  xy: 403, 15
+  xy: 403, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-3
   rotate: false
-  xy: 403, 5
+  xy: 517, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-4
   rotate: false
-  xy: 517, 131
+  xy: 517, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-5
   rotate: false
-  xy: 517, 121
+  xy: 517, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top-6
   rotate: false
-  xy: 517, 111
+  xy: 517, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router
   rotate: false
-  xy: 557, 131
+  xy: 547, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-bottom
   rotate: false
-  xy: 537, 101
+  xy: 557, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-liquid
   rotate: false
-  xy: 547, 111
+  xy: 547, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-router-top
   rotate: false
-  xy: 557, 121
+  xy: 557, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1476,70 +1483,70 @@ liquid-tank-top
   index: -1
 phase-conduit-arrow
   rotate: false
-  xy: 647, 98
+  xy: 662, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-bridge
   rotate: false
-  xy: 662, 158
+  xy: 660, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit-end
   rotate: false
-  xy: 662, 148
+  xy: 657, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-0
   rotate: false
-  xy: 672, 159
+  xy: 672, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-1
   rotate: false
-  xy: 682, 159
+  xy: 682, 149
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-2
   rotate: false
-  xy: 672, 149
+  xy: 667, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-3
   rotate: false
-  xy: 682, 149
+  xy: 667, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-4
   rotate: false
-  xy: 667, 128
+  xy: 667, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-5
   rotate: false
-  xy: 667, 118
+  xy: 667, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulse-conduit-top-6
   rotate: false
-  xy: 667, 108
+  xy: 670, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1644,7 +1651,7 @@ nuclear-reactor-lights
   index: -1
 rtg-generator-top
   rotate: false
-  xy: 677, 118
+  xy: 677, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1819,14 +1826,14 @@ cultivator-top
   index: -1
 lavasmelter
   rotate: false
-  xy: 550, 141
+  xy: 537, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oilrefinery
   rotate: false
-  xy: 597, 178
+  xy: 617, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1868,21 +1875,21 @@ poweralloysmelter-top
   index: -1
 pulverizer
   rotate: false
-  xy: 667, 98
+  xy: 680, 139
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 670, 138
+  xy: 677, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 736, 211
+  xy: 731, 201
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1896,21 +1903,21 @@ core-open
   index: -1
 sortedunloader
   rotate: false
-  xy: 747, 171
+  xy: 751, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-1
   rotate: false
-  xy: 957, 349
+  xy: 921, 335
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-1-top
   rotate: false
-  xy: 921, 335
+  xy: 931, 335
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1987,7 +1994,7 @@ mass-driver-turret
   index: -1
 duo
   rotate: false
-  xy: 721, 161
+  xy: 775, 302
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2190,7 +2197,7 @@ reconstructor-open
   index: -1
 repair-point-turret
   rotate: false
-  xy: 680, 139
+  xy: 677, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2211,7 +2218,7 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 711, 161
+  xy: 731, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2323,7 +2330,7 @@ missile
   index: -1
 missile-back
   rotate: false
-  xy: 476, 57
+  xy: 488, 57
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
@@ -2365,21 +2372,21 @@ scorch5
   index: -1
 shell
   rotate: false
-  xy: 487, 57
+  xy: 974, 366
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shell-back
   rotate: false
-  xy: 974, 366
+  xy: 512, 82
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
   index: -1
 shot
   rotate: false
-  xy: 731, 201
+  xy: 731, 191
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2393,7 +2400,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 643, 88
+  xy: 613, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2428,49 +2435,49 @@ block-icon-blast-drill
   index: -1
 block-icon-bridge-conduit
   rotate: false
-  xy: 951, 335
+  xy: 728, 291
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conduit
   rotate: false
-  xy: 951, 335
+  xy: 728, 291
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-bridge-conveyor
   rotate: false
-  xy: 728, 291
+  xy: 728, 281
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridge-conveyor
   rotate: false
-  xy: 728, 291
+  xy: 728, 281
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-carbide-drill
   rotate: false
-  xy: 728, 281
+  xy: 728, 271
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-carbide-wall
   rotate: false
-  xy: 728, 271
+  xy: 728, 261
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 carbide-wall
   rotate: false
-  xy: 728, 271
+  xy: 728, 261
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2505,35 +2512,35 @@ centrifuge
   index: -1
 block-icon-combustion-generator
   rotate: false
-  xy: 728, 261
+  xy: 728, 251
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustion-generator
   rotate: false
-  xy: 728, 261
+  xy: 728, 251
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-conduit
   rotate: false
-  xy: 728, 251
+  xy: 726, 241
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-conveyor
   rotate: false
-  xy: 726, 241
+  xy: 726, 231
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor-0-0
   rotate: false
-  xy: 726, 241
+  xy: 726, 231
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2589,42 +2596,42 @@ dart-ship-factory
   index: -1
 block-icon-deepwater
   rotate: false
-  xy: 726, 231
+  xy: 726, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 726, 231
+  xy: 726, 221
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-deflector-wall
   rotate: false
-  xy: 726, 221
+  xy: 726, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deflector-wall
   rotate: false
-  xy: 726, 221
+  xy: 726, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-wall
   rotate: false
-  xy: 726, 221
+  xy: 726, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-wall
   rotate: false
-  xy: 726, 221
+  xy: 726, 211
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2673,14 +2680,14 @@ delta-mech-factory
   index: -1
 block-icon-dirt
   rotate: false
-  xy: 726, 211
+  xy: 863, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt1
   rotate: false
-  xy: 726, 211
+  xy: 863, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2701,14 +2708,14 @@ distributor
   index: -1
 block-icon-door
   rotate: false
-  xy: 863, 309
+  xy: 861, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 863, 309
+  xy: 861, 299
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2736,14 +2743,14 @@ block-icon-drone-factory
   index: -1
 block-icon-drop-point
   rotate: false
-  xy: 861, 299
+  xy: 289, 53
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 drop-point
   rotate: false
-  xy: 861, 299
+  xy: 289, 53
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2778,14 +2785,14 @@ block-icon-fusion-reactor
   index: -1
 block-icon-grass
   rotate: false
-  xy: 289, 53
+  xy: 289, 43
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass1
   rotate: false
-  xy: 289, 53
+  xy: 289, 43
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2799,70 +2806,70 @@ block-icon-hail
   index: -1
 block-icon-ice
   rotate: false
-  xy: 289, 43
+  xy: 289, 33
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 289, 43
+  xy: 289, 33
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-icerock
   rotate: false
-  xy: 289, 33
+  xy: 299, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerock1
   rotate: false
-  xy: 289, 33
+  xy: 299, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-incinerator
   rotate: false
-  xy: 299, 55
+  xy: 309, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 299, 55
+  xy: 309, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-itemsource
   rotate: false
-  xy: 309, 55
+  xy: 299, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemsource
   rotate: false
-  xy: 309, 55
+  xy: 299, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-itemvoid
   rotate: false
-  xy: 299, 45
+  xy: 319, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemvoid
   rotate: false
-  xy: 299, 45
+  xy: 319, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2883,14 +2890,14 @@ javelin-ship-factory
   index: -1
 block-icon-junction
   rotate: false
-  xy: 319, 55
+  xy: 299, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 junction
   rotate: false
-  xy: 319, 55
+  xy: 299, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2911,35 +2918,35 @@ block-icon-laser-drill
   index: -1
 block-icon-lava
   rotate: false
-  xy: 299, 35
+  xy: 309, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava
   rotate: false
-  xy: 299, 35
+  xy: 309, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-junction
   rotate: false
-  xy: 309, 45
+  xy: 329, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-junction
   rotate: false
-  xy: 309, 45
+  xy: 329, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-liquid-router
   rotate: false
-  xy: 329, 55
+  xy: 309, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2953,14 +2960,14 @@ block-icon-liquid-tank
   index: -1
 block-icon-liquidsource
   rotate: false
-  xy: 309, 35
+  xy: 319, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidsource
   rotate: false
-  xy: 309, 35
+  xy: 319, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2988,14 +2995,14 @@ core-top
   index: -1
 block-icon-mechanical-pump
   rotate: false
-  xy: 319, 45
+  xy: 339, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 mechanical-pump
   rotate: false
-  xy: 319, 45
+  xy: 339, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3009,28 +3016,28 @@ block-icon-meltdown
   index: -1
 block-icon-melter
   rotate: false
-  xy: 339, 55
+  xy: 319, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 339, 55
+  xy: 319, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-metalfloor
   rotate: false
-  xy: 319, 35
+  xy: 329, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor1
   rotate: false
-  xy: 319, 35
+  xy: 329, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3051,14 +3058,14 @@ nuclear-reactor
   index: -1
 block-icon-oil
   rotate: false
-  xy: 329, 45
+  xy: 349, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil
   rotate: false
-  xy: 329, 45
+  xy: 349, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3072,42 +3079,42 @@ block-icon-oil-extractor
   index: -1
 block-icon-overflow-gate
   rotate: false
-  xy: 349, 55
+  xy: 329, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 overflow-gate
   rotate: false
-  xy: 349, 55
+  xy: 329, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-conduit
   rotate: false
-  xy: 329, 35
+  xy: 339, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conduit
   rotate: false
-  xy: 329, 35
+  xy: 339, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-phase-conveyor
   rotate: false
-  xy: 339, 45
+  xy: 359, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 phase-conveyor
   rotate: false
-  xy: 339, 45
+  xy: 359, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3142,14 +3149,14 @@ plastanium-compressor
   index: -1
 block-icon-power-node
   rotate: false
-  xy: 359, 55
+  xy: 339, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 power-node
   rotate: false
-  xy: 359, 55
+  xy: 339, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3170,42 +3177,42 @@ power-node-large
   index: -1
 block-icon-powerinfinite
   rotate: false
-  xy: 339, 35
+  xy: 349, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powerinfinite
   rotate: false
-  xy: 339, 35
+  xy: 349, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-powervoid
   rotate: false
-  xy: 349, 45
+  xy: 369, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powervoid
   rotate: false
-  xy: 349, 45
+  xy: 369, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulse-conduit
   rotate: false
-  xy: 369, 55
+  xy: 349, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-pulverizer
   rotate: false
-  xy: 349, 35
+  xy: 359, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3254,28 +3261,28 @@ reconstructor
   index: -1
 block-icon-repair-point
   rotate: false
-  xy: 359, 45
+  xy: 379, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 repair-point
   rotate: false
-  xy: 359, 45
+  xy: 379, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-resupply-point
   rotate: false
-  xy: 379, 55
+  xy: 359, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 resupply-point
   rotate: false
-  xy: 379, 55
+  xy: 359, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3289,14 +3296,14 @@ block-icon-ripple
   index: -1
 block-icon-rock
   rotate: false
-  xy: 359, 35
+  xy: 369, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rock1
   rotate: false
-  xy: 359, 35
+  xy: 369, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3317,14 +3324,14 @@ rotary-pump
   index: -1
 block-icon-rtg-generator
   rotate: false
-  xy: 369, 45
+  xy: 389, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rtg-generator
   rotate: false
-  xy: 369, 45
+  xy: 389, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3338,14 +3345,14 @@ block-icon-salvo
   index: -1
 block-icon-sand
   rotate: false
-  xy: 389, 55
+  xy: 369, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 389, 55
+  xy: 369, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3359,28 +3366,28 @@ block-icon-scorch
   index: -1
 block-icon-separator
   rotate: false
-  xy: 369, 35
+  xy: 379, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 369, 35
+  xy: 379, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-shrub
   rotate: false
-  xy: 379, 45
+  xy: 379, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shrub
   rotate: false
-  xy: 379, 45
+  xy: 379, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3401,42 +3408,42 @@ silicon-smelter
   index: -1
 block-icon-smelter
   rotate: false
-  xy: 379, 35
+  xy: 389, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 smelter
   rotate: false
-  xy: 379, 35
+  xy: 389, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-snow
   rotate: false
-  xy: 389, 45
+  xy: 389, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 389, 45
+  xy: 389, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-solar-panel
   rotate: false
-  xy: 389, 35
+  xy: 399, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solar-panel
   rotate: false
-  xy: 389, 35
+  xy: 399, 55
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3457,42 +3464,42 @@ solar-panel-large
   index: -1
 block-icon-solidifer
   rotate: false
-  xy: 399, 55
+  xy: 399, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 solidifer
   rotate: false
-  xy: 399, 55
+  xy: 399, 45
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-sorter
   rotate: false
-  xy: 399, 45
+  xy: 399, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 399, 45
+  xy: 399, 35
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-space
   rotate: false
-  xy: 399, 35
+  xy: 293, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 space
   rotate: false
-  xy: 399, 35
+  xy: 293, 23
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3506,28 +3513,28 @@ block-icon-spectre
   index: -1
 block-icon-splitter
   rotate: false
-  xy: 293, 23
+  xy: 293, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 splitter
   rotate: false
-  xy: 293, 23
+  xy: 293, 13
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-stone
   rotate: false
-  xy: 293, 13
+  xy: 293, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 293, 13
+  xy: 293, 3
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3569,14 +3576,14 @@ thermal-pump
   index: -1
 block-icon-thorium-wall
   rotate: false
-  xy: 293, 3
+  xy: 303, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium-wall
   rotate: false
-  xy: 293, 3
+  xy: 303, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3597,42 +3604,42 @@ thorium-wall-large
   index: -1
 block-icon-titanium-conveyor
   rotate: false
-  xy: 303, 25
+  xy: 303, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor-0-0
   rotate: false
-  xy: 303, 25
+  xy: 303, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium-conveyor
   rotate: false
-  xy: 303, 25
+  xy: 303, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-tungsten-drill
   rotate: false
-  xy: 303, 15
+  xy: 313, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 block-icon-tungsten-wall
   rotate: false
-  xy: 313, 25
+  xy: 303, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 tungsten-wall
   rotate: false
-  xy: 313, 25
+  xy: 303, 5
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3667,14 +3674,14 @@ turbine-generator
   index: -1
 block-icon-unloader
   rotate: false
-  xy: 303, 5
+  xy: 313, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 unloader
   rotate: false
-  xy: 303, 5
+  xy: 313, 15
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3709,14 +3716,14 @@ warp-gate
   index: -1
 block-icon-water
   rotate: false
-  xy: 313, 15
+  xy: 323, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 313, 15
+  xy: 323, 25
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3737,28 +3744,28 @@ block-icon-wave
   index: -1
 liquid-icon-cryofluid
   rotate: false
-  xy: 560, 141
+  xy: 537, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-lava
   rotate: false
-  xy: 527, 101
+  xy: 547, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-oil
   rotate: false
-  xy: 537, 111
+  xy: 557, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon-water
   rotate: false
-  xy: 547, 121
+  xy: 537, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3814,525 +3821,525 @@ mech-icon-tau-mech
   index: -1
 ore-coal-grass1
   rotate: false
-  xy: 607, 178
+  xy: 627, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass2
   rotate: false
-  xy: 617, 178
+  xy: 637, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-grass3
   rotate: false
-  xy: 627, 178
+  xy: 575, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice1
   rotate: false
-  xy: 637, 178
+  xy: 585, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice2
   rotate: false
-  xy: 575, 168
+  xy: 595, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-ice3
   rotate: false
-  xy: 585, 168
+  xy: 605, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand1
   rotate: false
-  xy: 595, 168
+  xy: 615, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand2
   rotate: false
-  xy: 605, 168
+  xy: 625, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-sand3
   rotate: false
-  xy: 615, 168
+  xy: 635, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow1
   rotate: false
-  xy: 625, 168
+  xy: 572, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow2
   rotate: false
-  xy: 635, 168
+  xy: 582, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-snow3
   rotate: false
-  xy: 572, 158
+  xy: 592, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone1
   rotate: false
-  xy: 582, 158
+  xy: 602, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone2
   rotate: false
-  xy: 592, 158
+  xy: 612, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-coal-stone3
   rotate: false
-  xy: 602, 158
+  xy: 622, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass1
   rotate: false
-  xy: 612, 158
+  xy: 632, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass2
   rotate: false
-  xy: 622, 158
+  xy: 572, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-grass3
   rotate: false
-  xy: 632, 158
+  xy: 582, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice1
   rotate: false
-  xy: 572, 148
+  xy: 592, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice2
   rotate: false
-  xy: 582, 148
+  xy: 602, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-ice3
   rotate: false
-  xy: 592, 148
+  xy: 612, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand1
   rotate: false
-  xy: 602, 148
+  xy: 622, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand2
   rotate: false
-  xy: 612, 148
+  xy: 632, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-sand3
   rotate: false
-  xy: 622, 148
+  xy: 645, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow1
   rotate: false
-  xy: 632, 148
+  xy: 655, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow2
   rotate: false
-  xy: 645, 168
+  xy: 642, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-snow3
   rotate: false
-  xy: 655, 168
+  xy: 642, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone1
   rotate: false
-  xy: 642, 158
+  xy: 652, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone2
   rotate: false
-  xy: 642, 148
+  xy: 652, 148
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-lead-stone3
   rotate: false
-  xy: 652, 158
+  xy: 570, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass1
   rotate: false
-  xy: 652, 148
+  xy: 580, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass2
   rotate: false
-  xy: 570, 138
+  xy: 590, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-grass3
   rotate: false
-  xy: 580, 138
+  xy: 600, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice1
   rotate: false
-  xy: 590, 138
+  xy: 610, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice2
   rotate: false
-  xy: 600, 138
+  xy: 620, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-ice3
   rotate: false
-  xy: 610, 138
+  xy: 630, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand1
   rotate: false
-  xy: 620, 138
+  xy: 640, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand2
   rotate: false
-  xy: 630, 138
+  xy: 650, 138
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-sand3
   rotate: false
-  xy: 640, 138
+  xy: 567, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow1
   rotate: false
-  xy: 650, 138
+  xy: 567, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow2
   rotate: false
-  xy: 567, 128
+  xy: 577, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-snow3
   rotate: false
-  xy: 567, 118
+  xy: 567, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone1
   rotate: false
-  xy: 577, 128
+  xy: 577, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone2
   rotate: false
-  xy: 567, 108
+  xy: 587, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-thorium-stone3
   rotate: false
-  xy: 577, 118
+  xy: 577, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass1
   rotate: false
-  xy: 587, 128
+  xy: 587, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass2
   rotate: false
-  xy: 577, 108
+  xy: 597, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-grass3
   rotate: false
-  xy: 587, 118
+  xy: 587, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice1
   rotate: false
-  xy: 597, 128
+  xy: 597, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice2
   rotate: false
-  xy: 587, 108
+  xy: 607, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-ice3
   rotate: false
-  xy: 597, 118
+  xy: 597, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand1
   rotate: false
-  xy: 607, 128
+  xy: 607, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand2
   rotate: false
-  xy: 597, 108
+  xy: 617, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-sand3
   rotate: false
-  xy: 607, 118
+  xy: 607, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow1
   rotate: false
-  xy: 617, 128
+  xy: 617, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow2
   rotate: false
-  xy: 607, 108
+  xy: 627, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-snow3
   rotate: false
-  xy: 617, 118
+  xy: 617, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone1
   rotate: false
-  xy: 627, 128
+  xy: 627, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone2
   rotate: false
-  xy: 617, 108
+  xy: 637, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-titanium-stone3
   rotate: false
-  xy: 627, 118
+  xy: 627, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass1
   rotate: false
-  xy: 637, 128
+  xy: 637, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass2
   rotate: false
-  xy: 627, 108
+  xy: 647, 128
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-grass3
   rotate: false
-  xy: 637, 118
+  xy: 637, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice1
   rotate: false
-  xy: 647, 128
+  xy: 647, 118
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice2
   rotate: false
-  xy: 637, 108
+  xy: 647, 108
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-ice3
   rotate: false
-  xy: 647, 118
+  xy: 567, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand1
   rotate: false
-  xy: 647, 108
+  xy: 577, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand2
   rotate: false
-  xy: 567, 98
+  xy: 587, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-sand3
   rotate: false
-  xy: 577, 98
+  xy: 597, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow1
   rotate: false
-  xy: 587, 98
+  xy: 607, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow2
   rotate: false
-  xy: 597, 98
+  xy: 617, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-snow3
   rotate: false
-  xy: 607, 98
+  xy: 627, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone1
   rotate: false
-  xy: 617, 98
+  xy: 637, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone2
   rotate: false
-  xy: 627, 98
+  xy: 647, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ore-tungsten-stone3
   rotate: false
-  xy: 637, 98
+  xy: 662, 158
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -4367,112 +4374,112 @@ vtol
   index: -1
 item-biomatter
   rotate: false
-  xy: 522, 161
+  xy: 542, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-blast-compound
   rotate: false
-  xy: 532, 161
+  xy: 552, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-carbide
   rotate: false
-  xy: 542, 161
+  xy: 562, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 552, 161
+  xy: 522, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 562, 161
+  xy: 520, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-phase-matter
   rotate: false
-  xy: 522, 151
+  xy: 532, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-plastanium
   rotate: false
-  xy: 520, 141
+  xy: 530, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-pyratite
   rotate: false
-  xy: 532, 151
+  xy: 527, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 530, 141
+  xy: 542, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 527, 131
+  xy: 540, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 542, 151
+  xy: 527, 121
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-surge-alloy
   rotate: false
-  xy: 540, 141
+  xy: 537, 131
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 527, 121
+  xy: 552, 151
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 537, 131
+  xy: 550, 141
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-tungsten
   rotate: false
-  xy: 552, 151
+  xy: 527, 111
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquid-icon
   rotate: false
-  xy: 562, 151
+  xy: 527, 101
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5132,7 +5139,7 @@ icon-item
   index: -1
 icon-items-none
   rotate: false
-  xy: 555, 171
+  xy: 522, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5237,7 +5244,7 @@ icon-none
   index: -1
 icon-nullitem
   rotate: false
-  xy: 565, 171
+  xy: 532, 161
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -5754,7 +5761,7 @@ titan-leg
   index: -1
 vtol-flame
   rotate: false
-  xy: 512, 82
+  xy: 512, 71
   size: 9, 9
   orig: 9, 9
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index c4576b9315..001b271fd3 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
index 687ee7f422..12d19e2d22 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conduit.java
@@ -36,29 +36,37 @@ public class Conduit extends LiquidBlock{
         }
     }
 
+    @Override
+    public void drawShadow(Tile tile){
+        ConduitEntity entity = tile.entity();
+
+        if(entity.blendshadowrot == -1){
+            super.drawShadow(tile);
+        }else{
+            Draw.rect("shadow-corner", tile.drawx(), tile.drawy(), (tile.getRotation() + 3 + entity.blendshadowrot) * 90);
+        }
+    }
+
     @Override
     public void onProximityUpdate(Tile tile){
         ConduitEntity entity = tile.entity();
         entity.blendbits = 0;
+        entity.blendshadowrot = -1;
 
         if(blends(tile, 2) && blends(tile, 1) && blends(tile, 3)){
             entity.blendbits = 3;
-        }else             if(blends(tile, 1) && blends(tile, 3)){
+        }else if(blends(tile, 1) && blends(tile, 3)){
             entity.blendbits = 6;
         }else if(blends(tile, 1) && blends(tile, 2)){
             entity.blendbits = 2;
         }else if(blends(tile, 3) && blends(tile, 2)){
             entity.blendbits = 4;
-        }else if(blends(tile, 0)){
-            if(blends(tile, 1)){
-                entity.blendbits = 5;
-            }else if(blends(tile, 3)){
-                entity.blendbits = 1;
-            }
         }else if(blends(tile, 1)){
             entity.blendbits = 5;
+            entity.blendshadowrot = 0;
         }else if(blends(tile, 3)){
             entity.blendbits = 1;
+            entity.blendshadowrot = 1;
         }
     }
 
@@ -122,7 +130,9 @@ public class Conduit extends LiquidBlock{
 
     public static class ConduitEntity extends TileEntity{
         public float smoothLiquid;
-        public byte blendbits;
+
+        byte blendbits;
+        int blendshadowrot;
 
         @Override
         public void write(DataOutputStream stream) throws IOException{
diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
index 510b07e205..5d3ab38b06 100644
--- a/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/distribution/Conveyor.java
@@ -32,7 +32,8 @@ public class Conveyor extends Block{
     private static ItemPos pos2 = new ItemPos();
     private final Translator tr1 = new Translator();
     private final Translator tr2 = new Translator();
-    private final TextureRegion[][] regions = new TextureRegion[7][4];
+
+    private TextureRegion[][] regions = new TextureRegion[7][4];
 
     protected float speed = 0f;
     protected float carryCapacity = 8f;
@@ -74,13 +75,25 @@ public class Conveyor extends Block{
         }
     }
 
+    @Override
+    public void drawShadow(Tile tile){
+        ConveyorEntity entity = tile.entity();
+
+        if(entity.blendshadowrot == -1){
+            super.drawShadow(tile);
+        }else{
+            Draw.rect("shadow-corner", tile.drawx(), tile.drawy(), (tile.getRotation() + 3 + entity.blendshadowrot) * 90);
+        }
+    }
+
     @Override
     public void draw(Tile tile){
         ConveyorEntity entity = tile.entity();
         byte rotation = tile.getRotation();
 
         int frame = entity.clogHeat <= 0.5f ? (int) ((Timers.time() / 4f) % 4) : 0;
-        Draw.rect(regions[entity.blendbits][frame], tile.drawx(), tile.drawy(), tilesize * entity.blendsclx, tilesize * entity.blendscly, rotation*90);
+        Draw.rect(regions[entity.blendbits][frame], tile.drawx(), tile.drawy(),
+            tilesize * entity.blendsclx, tilesize * entity.blendscly, rotation*90);
     }
 
     @Override
@@ -88,6 +101,7 @@ public class Conveyor extends Block{
         ConveyorEntity entity = tile.entity();
         entity.blendbits = 0;
         entity.blendsclx = entity.blendscly = 1;
+        entity.blendshadowrot = -1;
 
         if(blends(tile, 2) && blends(tile, 1) && blends(tile, 3)){
             entity.blendbits = 3;
@@ -98,18 +112,13 @@ public class Conveyor extends Block{
         }else if(blends(tile, 3) && blends(tile, 2)){
             entity.blendbits = 2;
             entity.blendscly = -1;
-        }else if(blends(tile, 0)){
-            if(blends(tile, 1)){
-                entity.blendbits = 1;
-                entity.blendscly = -1;
-            }else if(blends(tile, 3)){
-                entity.blendbits = 1;
-            }
         }else if(blends(tile, 1)){
             entity.blendbits = 1;
             entity.blendscly = -1;
+            entity.blendshadowrot = 0;
         }else if(blends(tile, 3)){
             entity.blendbits = 1;
+            entity.blendshadowrot = 1;
         }
     }
 
@@ -364,6 +373,8 @@ public class Conveyor extends Block{
         float minitem = 1;
         float carrying;
         float minCarry = 2f;
+
+        int blendshadowrot = -1;
         int blendbits;
         int blendsclx, blendscly;