diff --git a/core/assets-raw/sprites/blocks/extra/block-border.png b/core/assets-raw/sprites/blocks/extra/block-border.png
new file mode 100644
index 0000000000..ded2d0a62a
Binary files /dev/null and b/core/assets-raw/sprites/blocks/extra/block-border.png differ
diff --git a/core/assets-raw/sprites/blocks/extra/border.png b/core/assets-raw/sprites/blocks/extra/border.png
new file mode 100644
index 0000000000..1a5517ac49
Binary files /dev/null and b/core/assets-raw/sprites/blocks/extra/border.png differ
diff --git a/core/assets/maps/test.mmap b/core/assets/maps/test.mmap
index ea30661023..8d45478ff5 100644
Binary files a/core/assets/maps/test.mmap and b/core/assets/maps/test.mmap differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 7cc17c33b3..9623424268 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -13,98 +13,98 @@ background
   index: -1
 bridgeconduit
   rotate: false
-  xy: 772, 330
+  xy: 424, 43
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconduit-arrow
   rotate: false
-  xy: 422, 53
+  xy: 782, 330
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconduit-bridge
   rotate: false
-  xy: 424, 43
+  xy: 792, 335
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconduit-end
   rotate: false
-  xy: 782, 330
+  xy: 802, 335
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconveyor
   rotate: false
-  xy: 792, 335
+  xy: 792, 325
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconveyor-arrow
   rotate: false
-  xy: 802, 335
+  xy: 802, 325
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconveyor-bridge
   rotate: false
-  xy: 792, 325
+  xy: 437, 96
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 bridgeconveyor-end
   rotate: false
-  xy: 802, 325
+  xy: 447, 96
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-bottom
   rotate: false
-  xy: 811, 417
+  xy: 811, 397
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-top
   rotate: false
-  xy: 811, 397
+  xy: 808, 375
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduittunnel
   rotate: false
-  xy: 811, 387
+  xy: 808, 365
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyor
   rotate: false
-  xy: 808, 375
+  xy: 808, 355
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyormove
   rotate: false
-  xy: 808, 365
+  xy: 808, 345
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conveyortunnel
   rotate: false
-  xy: 808, 355
+  xy: 812, 335
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -118,98 +118,98 @@ core
   index: -1
 junction
   rotate: false
-  xy: 524, 189
+  xy: 487, 94
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit
   rotate: false
-  xy: 534, 189
+  xy: 487, 84
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit-arrow
   rotate: false
-  xy: 544, 189
+  xy: 477, 80
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit-bridge
   rotate: false
-  xy: 554, 195
+  xy: 476, 70
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit-end
   rotate: false
-  xy: 564, 195
+  xy: 487, 74
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor
   rotate: false
-  xy: 554, 185
+  xy: 486, 64
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor-arrow
   rotate: false
-  xy: 564, 185
+  xy: 484, 192
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor-bridge
   rotate: false
-  xy: 815, 457
+  xy: 494, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor-end
   rotate: false
-  xy: 825, 459
+  xy: 504, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidjunction
   rotate: false
-  xy: 895, 459
+  xy: 514, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter
   rotate: false
-  xy: 905, 459
+  xy: 524, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter-bottom
   rotate: false
-  xy: 915, 459
+  xy: 534, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter-liquid
   rotate: false
-  xy: 925, 459
+  xy: 544, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter-top
   rotate: false
-  xy: 935, 459
+  xy: 554, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -244,77 +244,77 @@ multiplexer
   index: -1
 overflowgate
   rotate: false
-  xy: 835, 449
+  xy: 895, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 poweredconveyor
   rotate: false
-  xy: 855, 449
+  xy: 915, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 poweredconveyormove
   rotate: false
-  xy: 865, 449
+  xy: 925, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulseconduit-bottom
   rotate: false
-  xy: 905, 449
+  xy: 965, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulseconduit-top
   rotate: false
-  xy: 915, 449
+  xy: 975, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 821, 417
+  xy: 875, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sortedunloader
   rotate: false
-  xy: 1004, 439
+  xy: 844, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 1014, 437
+  xy: 854, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 splitter
   rotate: false
-  xy: 822, 327
+  xy: 874, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steelconveyor
   rotate: false
-  xy: 828, 377
+  xy: 884, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steelconveyormove
   rotate: false
-  xy: 828, 367
+  xy: 894, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -328,7 +328,7 @@ teleporter-top
   index: -1
 unloader
   rotate: false
-  xy: 861, 399
+  xy: 841, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -412,49 +412,49 @@ blackstoneedge
   index: -1
 coal1
   rotate: false
-  xy: 457, 98
+  xy: 477, 100
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 467, 98
+  xy: 481, 174
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 477, 100
+  xy: 409, 29
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 812, 335
+  xy: 419, 31
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt1
   rotate: false
-  xy: 812, 325
+  xy: 429, 33
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt2
   rotate: false
-  xy: 419, 31
+  xy: 609, 190
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 dirt3
   rotate: false
-  xy: 429, 33
+  xy: 619, 190
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -468,35 +468,35 @@ dirtedge
   index: -1
 grass1
   rotate: false
-  xy: 426, 93
+  xy: 477, 90
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 426, 83
+  xy: 426, 93
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 426, 73
+  xy: 426, 83
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grassblock1
   rotate: false
-  xy: 426, 63
+  xy: 426, 73
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 grassblock2
   rotate: false
-  xy: 436, 86
+  xy: 426, 63
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -510,21 +510,21 @@ grassedge
   index: -1
 ice1
   rotate: false
-  xy: 446, 86
+  xy: 436, 86
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 436, 76
+  xy: 446, 86
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 446, 76
+  xy: 436, 76
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -538,70 +538,70 @@ iceedge
   index: -1
 icerock1
   rotate: false
-  xy: 436, 66
+  xy: 446, 76
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerock2
   rotate: false
-  xy: 446, 66
+  xy: 436, 66
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow1
   rotate: false
-  xy: 432, 53
+  xy: 446, 66
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow1
   rotate: false
-  xy: 432, 53
+  xy: 446, 66
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 icerockshadow2
   rotate: false
-  xy: 434, 43
+  xy: 456, 79
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rockshadow2
   rotate: false
-  xy: 434, 43
+  xy: 456, 79
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iron1
   rotate: false
-  xy: 444, 46
+  xy: 466, 68
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iron2
   rotate: false
-  xy: 452, 56
+  xy: 432, 53
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 iron3
   rotate: false
-  xy: 454, 46
+  xy: 434, 43
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lava
   rotate: false
-  xy: 835, 459
+  xy: 514, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -615,63 +615,63 @@ lavaedge
   index: -1
 lead1
   rotate: false
-  xy: 855, 459
+  xy: 534, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 865, 459
+  xy: 544, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 875, 459
+  xy: 494, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor1
   rotate: false
-  xy: 965, 459
+  xy: 564, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 975, 459
+  xy: 815, 457
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 985, 459
+  xy: 825, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 995, 459
+  xy: 835, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 1005, 459
+  xy: 845, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 1015, 457
+  xy: 855, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -685,14 +685,14 @@ metalflooredge
   index: -1
 mossblock
   rotate: false
-  xy: 815, 447
+  xy: 865, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil
   rotate: false
-  xy: 814, 437
+  xy: 875, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -706,56 +706,56 @@ oiledge
   index: -1
 rock1
   rotate: false
-  xy: 1015, 447
+  xy: 855, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 821, 427
+  xy: 865, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 821, 387
+  xy: 905, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 818, 377
+  xy: 915, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 818, 367
+  xy: 925, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandblock1
   rotate: false
-  xy: 818, 357
+  xy: 935, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandblock2
   rotate: false
-  xy: 818, 347
+  xy: 945, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandblock3
   rotate: false
-  xy: 824, 437
+  xy: 955, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -769,56 +769,56 @@ sandedge
   index: -1
 shrub
   rotate: false
-  xy: 894, 439
+  xy: 821, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shrubshadow
   rotate: false
-  xy: 904, 439
+  xy: 821, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 934, 439
+  xy: 821, 387
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 944, 439
+  xy: 818, 377
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 954, 439
+  xy: 818, 367
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowblock1
   rotate: false
-  xy: 964, 439
+  xy: 818, 357
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowblock2
   rotate: false
-  xy: 974, 439
+  xy: 818, 347
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowblock3
   rotate: false
-  xy: 984, 439
+  xy: 824, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -832,7 +832,7 @@ snowedge
   index: -1
 space
   rotate: false
-  xy: 822, 337
+  xy: 864, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -846,42 +846,42 @@ spaceedge
   index: -1
 stone1
   rotate: false
-  xy: 831, 427
+  xy: 944, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 831, 417
+  xy: 954, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 831, 407
+  xy: 964, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneblock1
   rotate: false
-  xy: 831, 397
+  xy: 974, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneblock2
   rotate: false
-  xy: 831, 387
+  xy: 984, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneblock3
   rotate: false
-  xy: 841, 429
+  xy: 994, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -895,49 +895,49 @@ stoneedge
   index: -1
 thorium1
   rotate: false
-  xy: 841, 409
+  xy: 828, 377
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 871, 429
+  xy: 828, 367
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 861, 419
+  xy: 828, 357
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 851, 409
+  xy: 828, 347
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 841, 399
+  xy: 832, 337
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 881, 429
+  xy: 832, 327
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 891, 419
+  xy: 841, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -949,30 +949,44 @@ wateredge
   orig: 12, 12
   offset: 0, 0
   index: -1
-block-middle
+block-border
   rotate: false
   xy: 399, 27
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
+block-middle
+  rotate: false
+  xy: 772, 330
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
 pump-liquid
   rotate: false
-  xy: 399, 27
+  xy: 772, 330
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+border
+  rotate: false
+  xy: 422, 53
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 conduit-liquid
   rotate: false
-  xy: 811, 407
+  xy: 811, 387
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 cross-1
   rotate: false
-  xy: 808, 345
+  xy: 812, 325
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1000,7 +1014,7 @@ cross-4
   index: -1
 enemyspawn
   rotate: false
-  xy: 260, 21
+  xy: 259, 11
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1014,7 +1028,7 @@ nuclearreactor-shadow
   index: -1
 playerspawn
   rotate: false
-  xy: 845, 449
+  xy: 905, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1126,14 +1140,14 @@ batterylarge
   index: -1
 combustiongenerator
   rotate: false
-  xy: 481, 174
+  xy: 811, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 combustiongenerator-top
   rotate: false
-  xy: 409, 29
+  xy: 811, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1203,7 +1217,7 @@ largesolarpanel
   index: -1
 liquidcombustiongenerator
   rotate: false
-  xy: 885, 459
+  xy: 504, 189
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1231,14 +1245,14 @@ nuclearreactor-lights
   index: -1
 powerinfinite
   rotate: false
-  xy: 875, 449
+  xy: 935, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powernode
   rotate: false
-  xy: 885, 449
+  xy: 945, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1259,28 +1273,28 @@ powernodelarge-shadow
   index: -1
 powervoid
   rotate: false
-  xy: 895, 449
+  xy: 955, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rtgenerator
   rotate: false
-  xy: 821, 407
+  xy: 885, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rtgenerator-top
   rotate: false
-  xy: 821, 397
+  xy: 895, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shieldgenerator
   rotate: false
-  xy: 854, 439
+  xy: 985, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1294,7 +1308,7 @@ shieldprojector
   index: -1
 solarpanel
   rotate: false
-  xy: 994, 439
+  xy: 834, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1315,7 +1329,7 @@ teleporter-top
   index: -1
 thermalgenerator
   rotate: false
-  xy: 851, 419
+  xy: 822, 327
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1427,63 +1441,63 @@ cultivator-top
   index: -1
 extractor
   rotate: false
-  xy: 259, 11
+  xy: 259, 1
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 fluxpump
   rotate: false
-  xy: 259, 1
+  xy: 467, 88
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 incinerator
   rotate: false
-  xy: 439, 33
+  xy: 466, 78
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 irondrill
   rotate: false
-  xy: 449, 36
+  xy: 442, 56
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 irondrill-rotator
   rotate: false
-  xy: 459, 36
+  xy: 439, 33
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titaniumdrill-rotator
   rotate: false
-  xy: 459, 36
+  xy: 439, 33
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 irondrill-top
   rotate: false
-  xy: 449, 26
+  xy: 444, 46
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemsource
   rotate: false
-  xy: 504, 189
+  xy: 485, 114
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemvoid
   rotate: false
-  xy: 514, 189
+  xy: 487, 104
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1511,21 +1525,21 @@ laserdrill-top
   index: -1
 lavasmelter
   rotate: false
-  xy: 845, 459
+  xy: 524, 199
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidsource
   rotate: false
-  xy: 945, 459
+  xy: 564, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 955, 459
+  xy: 554, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1588,7 +1602,7 @@ oilextractor-top
   index: -1
 oilrefinery
   rotate: false
-  xy: 825, 449
+  xy: 885, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1672,63 +1686,63 @@ siliconsmelter-top
   index: -1
 pulverizer
   rotate: false
-  xy: 925, 449
+  xy: 985, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 935, 449
+  xy: 995, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pump
   rotate: false
-  xy: 945, 449
+  xy: 1005, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 reinforceddrill
   rotate: false
-  xy: 955, 449
+  xy: 1015, 457
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 reinforceddrill-rotator
   rotate: false
-  xy: 965, 449
+  xy: 815, 447
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 reinforceddrill-top
   rotate: false
-  xy: 975, 449
+  xy: 814, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 834, 439
+  xy: 965, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 844, 439
+  xy: 975, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 siliconextractor
   rotate: false
-  xy: 914, 439
+  xy: 821, 407
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1742,56 +1756,56 @@ siliconsmelter
   index: -1
 smelter
   rotate: false
-  xy: 924, 439
+  xy: 821, 397
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steeldrill
   rotate: false
-  xy: 828, 357
+  xy: 904, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steeldrill-rotator
   rotate: false
-  xy: 828, 347
+  xy: 914, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steeldrill-top
   rotate: false
-  xy: 832, 337
+  xy: 924, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stonedrill
   rotate: false
-  xy: 851, 429
+  xy: 1004, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneformer
   rotate: false
-  xy: 841, 419
+  xy: 1014, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titaniumdrill
   rotate: false
-  xy: 871, 419
+  xy: 831, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titaniumdrill-top
   rotate: false
-  xy: 861, 409
+  xy: 831, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1868,7 +1882,7 @@ chainturret
   index: -1
 doubleturret
   rotate: false
-  xy: 707, 329
+  xy: 707, 309
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2064,35 +2078,35 @@ walkerfactory-top-open
   index: -1
 repairpoint
   rotate: false
-  xy: 985, 449
+  xy: 825, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 repairpoint-turret
   rotate: false
-  xy: 995, 449
+  xy: 835, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 resupplypoint
   rotate: false
-  xy: 1005, 449
+  xy: 845, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 compositewall
   rotate: false
-  xy: 811, 427
+  xy: 811, 407
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 door
   rotate: false
-  xy: 609, 190
+  xy: 707, 329
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2113,14 +2127,14 @@ door-large-open
   index: -1
 door-open
   rotate: false
-  xy: 619, 190
+  xy: 707, 319
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 duriumwall
   rotate: false
-  xy: 707, 319
+  xy: 260, 21
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2134,14 +2148,14 @@ duriumwall-large
   index: -1
 ironwall
   rotate: false
-  xy: 459, 26
+  xy: 452, 56
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steelwall
   rotate: false
-  xy: 832, 327
+  xy: 934, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2155,21 +2169,21 @@ steelwall-large
   index: -1
 stonewall
   rotate: false
-  xy: 861, 429
+  xy: 822, 337
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titaniumshieldwall
   rotate: false
-  xy: 851, 399
+  xy: 831, 407
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titaniumwall
   rotate: false
-  xy: 841, 389
+  xy: 831, 397
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2232,7 +2246,7 @@ clear
   index: -1
 enemyarrow
   rotate: false
-  xy: 707, 310
+  xy: 457, 89
   size: 8, 7
   orig: 8, 7
   offset: 0, 0
@@ -2274,7 +2288,7 @@ shell-back
   index: -1
 shot
   rotate: false
-  xy: 884, 439
+  xy: 1015, 447
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2288,7 +2302,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 891, 429
+  xy: 831, 387
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2302,91 +2316,91 @@ transfer-end
   index: -1
 item-biomatter
   rotate: false
-  xy: 485, 114
+  xy: 454, 46
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-coal
   rotate: false
-  xy: 487, 104
+  xy: 449, 36
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-densealloy
   rotate: false
-  xy: 487, 94
+  xy: 459, 36
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-iron
   rotate: false
-  xy: 477, 90
+  xy: 462, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-lead
   rotate: false
-  xy: 487, 84
+  xy: 464, 48
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-plastic
   rotate: false
-  xy: 484, 192
+  xy: 472, 58
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-rdx
   rotate: false
-  xy: 494, 199
+  xy: 474, 48
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-sand
   rotate: false
-  xy: 504, 199
+  xy: 469, 38
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-silicon
   rotate: false
-  xy: 514, 199
+  xy: 479, 38
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-steel
   rotate: false
-  xy: 524, 199
+  xy: 449, 26
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-stone
   rotate: false
-  xy: 534, 199
+  xy: 459, 26
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-thorium
   rotate: false
-  xy: 544, 199
+  xy: 469, 28
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 item-titanium
   rotate: false
-  xy: 494, 189
+  xy: 479, 28
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2856,7 +2870,7 @@ icon-itch.io
   index: -1
 icon-items-none
   rotate: false
-  xy: 442, 56
+  xy: 456, 69
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -3449,56 +3463,56 @@ blaster-equip
   index: -1
 clustergun
   rotate: false
-  xy: 437, 96
+  xy: 457, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 clustergun-equip
   rotate: false
-  xy: 447, 96
+  xy: 467, 98
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shockgun
   rotate: false
-  xy: 864, 439
+  xy: 995, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 874, 439
+  xy: 1005, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 triblaster
   rotate: false
-  xy: 881, 419
+  xy: 841, 429
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 triblaster-equip
   rotate: false
-  xy: 871, 409
+  xy: 851, 429
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 vulcan
   rotate: false
-  xy: 851, 389
+  xy: 861, 429
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 vulcan-equip
   rotate: false
-  xy: 901, 429
+  xy: 851, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 184a0d7b50..c4b4733739 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/editor/MapRenderer.java b/core/src/io/anuke/mindustry/editor/MapRenderer.java
index 8380b9d994..c1d657d382 100644
--- a/core/src/io/anuke/mindustry/editor/MapRenderer.java
+++ b/core/src/io/anuke/mindustry/editor/MapRenderer.java
@@ -1,8 +1,11 @@
 package io.anuke.mindustry.editor;
 
+import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.badlogic.gdx.utils.IntSet;
 import com.badlogic.gdx.utils.IntSet.IntSetIterator;
+import io.anuke.mindustry.content.blocks.Blocks;
+import io.anuke.mindustry.game.Team;
 import io.anuke.mindustry.io.MapTileData.TileDataMarker;
 import io.anuke.mindustry.world.Block;
 import io.anuke.ucore.core.Core;
@@ -36,7 +39,7 @@ public class MapRenderer {
 
         for(int x = 0; x < chunks.length; x ++){
             for(int y = 0; y < chunks[0].length; y ++){
-                chunks[x][y] = new IndexedRenderer(chunksize*chunksize*2);
+                chunks[x][y] = new IndexedRenderer(chunksize*chunksize*3);
             }
         }
         this.width = width;
@@ -98,14 +101,26 @@ public class MapRenderer {
         String fregion = Draw.hasRegion(floor.name) ? floor.name : (Draw.hasRegion(floor.name + "1") ? (floor.name + "1") : "clear");
 
         TextureRegion region = Draw.region(fregion);
-        mesh.draw((wx % chunksize) + (wy % chunksize)*chunksize, region, wx * tilesize, wy * tilesize, -1f, 8, 8);
+        mesh.draw((wx % chunksize) + (wy % chunksize)*chunksize, region, wx * tilesize, wy * tilesize, 8, 8);
 
-        String wregion = Draw.hasRegion(wall.name) ? wall.name : (Draw.hasRegion(wall.name + "1") ? (wall.name + "1") : "clear");
+        TextureRegion wregion = (wall == Blocks.air || wall == Blocks.blockpart) ? Draw.region("clear"): wall.getBlockIcon()[wall.getBlockIcon().length-1];
 
-        region = Draw.region(wregion);
+        region = wregion;
         mesh.draw((wx % chunksize) + (wy % chunksize)*chunksize + chunksize*chunksize, region,
-                wx * tilesize + offsetx*tilesize, wy * tilesize  + offsety * tilesize, 0f,
+                wx * tilesize + offsetx*tilesize, wy * tilesize  + offsety * tilesize,
                 region.getRegionWidth(), region.getRegionHeight());
 
+        if(wall.update || wall.destructible) {
+            mesh.setColor(Team.values()[data.team].color);
+            region = Draw.region("block-border");
+        }else{
+            region = Draw.region("clear");
+        }
+
+        mesh.draw((wx % chunksize) + (wy % chunksize)*chunksize + chunksize*chunksize*2, region,
+                wx * tilesize + offsetx*tilesize, wy * tilesize  + offsety * tilesize,
+                region.getRegionWidth(), region.getRegionHeight());
+        mesh.setColor(Color.WHITE);
+
     }
 }