diff --git a/core/assets-raw/sprites/blocks/environment/edge-stencil-blocky.png b/core/assets-raw/sprites/blocks/environment/edge-stencil-blocky.png
deleted file mode 100644
index e9e15f64bb..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/edge-stencil-blocky.png and /dev/null differ
diff --git a/core/assets-raw/sprites/blocks/environment/ice-edge.png b/core/assets-raw/sprites/blocks/environment/ice-edge.png
deleted file mode 100644
index 0355b50f3a..0000000000
Binary files a/core/assets-raw/sprites/blocks/environment/ice-edge.png and /dev/null differ
diff --git a/core/assets-raw/sprites_replacement/blocks/environment/edge-stencil-blocky.png b/core/assets-raw/sprites_replacement/blocks/environment/edge-stencil-blocky.png
new file mode 100644
index 0000000000..7dd02ca754
Binary files /dev/null and b/core/assets-raw/sprites_replacement/blocks/environment/edge-stencil-blocky.png differ
diff --git a/core/assets-raw/sprites_replacement/blocks/environment/edge-stencil-smooth.png b/core/assets-raw/sprites_replacement/blocks/environment/edge-stencil-smooth.png
index 55f4b9fb03..c05f1f7b08 100644
Binary files a/core/assets-raw/sprites_replacement/blocks/environment/edge-stencil-smooth.png and b/core/assets-raw/sprites_replacement/blocks/environment/edge-stencil-smooth.png differ
diff --git a/core/assets/shaders/tar.fragment b/core/assets/shaders/tar.fragment
index 98aeeeb9f6..bdbd49c4b3 100644
--- a/core/assets/shaders/tar.fragment
+++ b/core/assets/shaders/tar.fragment
@@ -56,7 +56,6 @@ void main() {
 
     if(color.r > 0.01){
         color = texture2D(u_texture, c + vec2(sin(stime/3.0 + coords.y/0.75) * v.x, 0.0)) * vec4(0.9, 0.9, 1, 1.0);
-        color.a = 1.0;
 
         float n1 = snoise(coords / 22.0 + vec2(-time) / 540.0);
         float n2 = snoise((coords + vec2(632.0)) / 8.0 + vec2(0.0, time) / 510.0);
@@ -65,7 +64,6 @@ void main() {
 
         if(r < -0.3 && r > -0.6){
             color *= 1.4;
-            color.a = 1.0;
         }
     }
 
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 3fb8820f6e..5dc2aa945d 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -9804,28 +9804,28 @@ char2
   index: -1
 char3
   rotate: false
-  xy: 1483, 669
+  xy: 1193, 571
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cliffs1
   rotate: false
-  xy: 1599, 785
+  xy: 1309, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal1
   rotate: false
-  xy: 1019, 491
+  xy: 1599, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 1309, 589
+  xy: 1019, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9860,28 +9860,28 @@ copper3
   index: -1
 craters1
   rotate: false
-  xy: 1483, 635
+  xy: 1193, 537
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters2
   rotate: false
-  xy: 1633, 785
+  xy: 1343, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters3
   rotate: false
-  xy: 1053, 491
+  xy: 1633, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters4
   rotate: false
-  xy: 1343, 589
+  xy: 1053, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9923,7 +9923,7 @@ darksand-edge
   index: -1
 darksand-tainted-water
   rotate: false
-  xy: 1377, 589
+  xy: 1087, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -9958,14 +9958,14 @@ darksand1
   index: -1
 darksand2
   rotate: false
-  xy: 1667, 785
+  xy: 1377, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand3
   rotate: false
-  xy: 1087, 491
+  xy: 1667, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10000,7 +10000,7 @@ dunerocks1
   index: -1
 dunerocks2
   rotate: false
-  xy: 1701, 785
+  xy: 1411, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10014,28 +10014,28 @@ edge-stencil-blocky
   index: -1
 edge-stencil-smooth
   rotate: false
-  xy: 323, 721
+  xy: 1, 175
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 grass-edge
   rotate: false
-  xy: 613, 819
+  xy: 323, 721
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 grass1
   rotate: false
-  xy: 1121, 491
+  xy: 1701, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 1411, 589
+  xy: 1121, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10049,28 +10049,28 @@ grass3
   index: -1
 holostone-edge
   rotate: false
-  xy: 903, 917
+  xy: 613, 819
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 holostone1
   rotate: false
-  xy: 1735, 785
+  xy: 1445, 687
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone2
   rotate: false
-  xy: 1155, 491
+  xy: 1735, 785
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone3
   rotate: false
-  xy: 1445, 589
+  xy: 1155, 491
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10098,14 +10098,14 @@ hotrock3
   index: -1
 ice-edge
   rotate: false
-  xy: 1, 77
+  xy: 903, 917
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 ice-snow-edge
   rotate: false
-  xy: 323, 623
+  xy: 1, 77
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
@@ -10224,42 +10224,42 @@ magmarock1
   index: -1
 magmarock2
   rotate: false
-  xy: 903, 425
+  xy: 1483, 719
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock3
   rotate: false
-  xy: 1193, 523
+  xy: 903, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor
   rotate: false
-  xy: 937, 425
+  xy: 1517, 719
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged5
   rotate: false
-  xy: 937, 425
+  xy: 1517, 719
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2
   rotate: false
-  xy: 1227, 523
+  xy: 937, 425
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2-edge
   rotate: false
-  xy: 613, 721
+  xy: 323, 623
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
@@ -10273,7 +10273,7 @@ metal-floor-3
   index: -1
 metal-floor-3-edge
   rotate: false
-  xy: 903, 819
+  xy: 613, 721
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
@@ -10287,14 +10287,14 @@ metal-floor-5
   index: -1
 metal-floor-5-edge
   rotate: false
-  xy: 1193, 917
+  xy: 903, 819
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 metal-floor-damaged-edge
   rotate: false
-  xy: 323, 525
+  xy: 1193, 917
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
@@ -10336,14 +10336,14 @@ metal-floor-damaged6
   index: -1
 metal-floor-edge
   rotate: false
-  xy: 613, 623
+  xy: 323, 525
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 moss-edge
   rotate: false
-  xy: 903, 721
+  xy: 613, 623
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
@@ -10357,14 +10357,14 @@ moss1
   index: -1
 moss2
   rotate: false
-  xy: 1189, 489
+  xy: 1479, 685
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss3
   rotate: false
-  xy: 1223, 489
+  xy: 1513, 685
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10420,14 +10420,14 @@ ore-lead1
   index: -1
 ore-lead2
   rotate: false
-  xy: 971, 441
+  xy: 1551, 735
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead3
   rotate: false
-  xy: 1261, 539
+  xy: 971, 441
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10441,7 +10441,7 @@ ore-scrap1
   index: -1
 ore-scrap2
   rotate: false
-  xy: 1533, 719
+  xy: 1243, 621
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10511,14 +10511,14 @@ rock1
   index: -1
 rock2
   rotate: false
-  xy: 1483, 703
+  xy: 1193, 605
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rocks-large
   rotate: false
-  xy: 1483, 753
+  xy: 1193, 655
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
@@ -10546,28 +10546,28 @@ salt
   index: -1
 salt-edge
   rotate: false
-  xy: 1193, 819
+  xy: 903, 721
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 sand-edge
   rotate: false
-  xy: 1483, 917
+  xy: 1193, 819
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 sand-water
   rotate: false
-  xy: 1517, 669
+  xy: 1227, 571
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water-edge
   rotate: false
-  xy: 323, 427
+  xy: 1483, 917
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
@@ -10595,147 +10595,147 @@ sand3
   index: -1
 sandrocks-large
   rotate: false
-  xy: 903, 459
+  xy: 1483, 753
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 sandrocks1
   rotate: false
-  xy: 1517, 635
+  xy: 1227, 537
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sandrocks2
   rotate: false
-  xy: 1309, 555
+  xy: 1019, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap1
   rotate: false
-  xy: 1343, 555
+  xy: 1053, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap2
   rotate: false
-  xy: 1377, 555
+  xy: 1087, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap3
   rotate: false
-  xy: 1411, 555
+  xy: 1121, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder1
   rotate: false
-  xy: 1087, 457
+  xy: 1377, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder2
   rotate: false
-  xy: 1121, 457
+  xy: 1411, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-edge
   rotate: false
-  xy: 613, 525
+  xy: 323, 427
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 shale1
   rotate: false
-  xy: 1445, 555
+  xy: 1155, 457
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale2
   rotate: false
-  xy: 1019, 457
+  xy: 1309, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale3
   rotate: false
-  xy: 1053, 457
+  xy: 1343, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shalerocks-large
   rotate: false
-  xy: 1193, 557
+  xy: 903, 459
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 shalerocks1
   rotate: false
-  xy: 1155, 457
+  xy: 1445, 653
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shalerocks2
   rotate: false
-  xy: 1189, 455
+  xy: 1479, 651
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow-edge
   rotate: false
-  xy: 903, 623
+  xy: 613, 525
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 1223, 455
+  xy: 1513, 651
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 971, 407
+  xy: 1551, 701
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 1005, 423
+  xy: 1547, 667
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrock1
   rotate: false
-  xy: 1549, 769
+  xy: 1259, 671
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snowrock2
   rotate: false
-  xy: 969, 475
+  xy: 1549, 769
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -10749,14 +10749,14 @@ snowrocks-large
   index: -1
 snowrocks1
   rotate: false
-  xy: 1039, 423
+  xy: 971, 407
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrocks2
   rotate: false
-  xy: 1073, 423
+  xy: 1005, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
@@ -10784,35 +10784,35 @@ spore-cluster3
   index: -1
 spore-moss-edge
   rotate: false
-  xy: 1193, 721
+  xy: 903, 623
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 spore-moss1
   rotate: false
-  xy: 1107, 423
+  xy: 1039, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss2
   rotate: false
-  xy: 1141, 423
+  xy: 1073, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss3
   rotate: false
-  xy: 1175, 421
+  xy: 1107, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-pine
   rotate: false
-  xy: 1259, 573
+  xy: 969, 475
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
@@ -10826,112 +10826,112 @@ sporerocks-large
   index: -1
 sporerocks1
   rotate: false
-  xy: 1209, 421
+  xy: 1141, 423
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sporerocks2
   rotate: false
-  xy: 1261, 505
+  xy: 1599, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone-edge
   rotate: false
-  xy: 1483, 819
+  xy: 1193, 721
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 1257, 471
+  xy: 1633, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tainted-water
   rotate: false
-  xy: 1295, 521
+  xy: 1667, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tainted-water-edge
   rotate: false
-  xy: 613, 427
+  xy: 1483, 819
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 tar
   rotate: false
-  xy: 1329, 521
+  xy: 1701, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar-edge
   rotate: false
-  xy: 903, 525
+  xy: 613, 427
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 thorium1
   rotate: false
-  xy: 1363, 521
+  xy: 1735, 751
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 1397, 521
+  xy: 1769, 739
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 1431, 521
+  xy: 1585, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 1599, 751
+  xy: 1619, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 1633, 751
+  xy: 1653, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 1667, 751
+  xy: 1687, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 1701, 751
+  xy: 1721, 717
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-edge
   rotate: false
-  xy: 1193, 623
+  xy: 903, 525
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png
index 836775df11..021fa8f554 100644
Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ
diff --git a/core/assets/sprites/sprites_fallback.atlas b/core/assets/sprites/sprites_fallback.atlas
index bac528bab2..f0c3c54515 100644
--- a/core/assets/sprites/sprites_fallback.atlas
+++ b/core/assets/sprites/sprites_fallback.atlas
@@ -9837,131 +9837,138 @@ edge-stencil-blocky
   index: -1
 edge-stencil-smooth
   rotate: false
-  xy: 291, 589
+  xy: 1, 589
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 grass-edge
   rotate: false
-  xy: 581, 519
+  xy: 291, 589
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 holostone-edge
   rotate: false
-  xy: 1, 491
+  xy: 581, 519
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 ice-edge
   rotate: false
-  xy: 291, 491
+  xy: 1, 491
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 ice-snow-edge
   rotate: false
-  xy: 581, 421
+  xy: 291, 491
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 metal-floor-2-edge
   rotate: false
-  xy: 1, 393
+  xy: 581, 421
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 metal-floor-3-edge
   rotate: false
-  xy: 291, 393
+  xy: 1, 393
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 metal-floor-5-edge
   rotate: false
-  xy: 581, 323
+  xy: 291, 393
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 metal-floor-damaged-edge
   rotate: false
-  xy: 1, 295
+  xy: 581, 323
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 metal-floor-edge
   rotate: false
-  xy: 291, 295
+  xy: 1, 295
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 moss-edge
   rotate: false
-  xy: 581, 225
+  xy: 291, 295
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 salt-edge
   rotate: false
-  xy: 1, 197
+  xy: 581, 225
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 sand-edge
   rotate: false
-  xy: 291, 197
+  xy: 1, 197
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 sand-water-edge
   rotate: false
-  xy: 581, 127
+  xy: 291, 197
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 shale-edge
   rotate: false
-  xy: 1, 99
+  xy: 581, 127
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 snow-edge
   rotate: false
-  xy: 291, 99
+  xy: 1, 99
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 spore-moss-edge
   rotate: false
-  xy: 581, 29
+  xy: 291, 99
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 stone-edge
   rotate: false
-  xy: 1, 1
+  xy: 581, 29
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
   index: -1
 tainted-water-edge
+  rotate: false
+  xy: 1, 1
+  size: 288, 96
+  orig: 288, 96
+  offset: 0, 0
+  index: -1
+tar-edge
   rotate: false
   xy: 291, 1
   size: 288, 96
@@ -9984,986 +9991,979 @@ white-tree-dead
   index: -1
 
 sprites_fallback6.png
-size: 512,512
+size: 1024,256
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
 char1
   rotate: false
-  xy: 127, 275
+  xy: 291, 157
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 char2
   rotate: false
-  xy: 161, 275
+  xy: 623, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 char3
   rotate: false
-  xy: 195, 275
+  xy: 291, 123
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 cliffs1
   rotate: false
-  xy: 229, 275
+  xy: 325, 157
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal1
   rotate: false
-  xy: 263, 273
+  xy: 657, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal2
   rotate: false
-  xy: 297, 273
+  xy: 325, 123
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 coal3
   rotate: false
-  xy: 127, 241
+  xy: 359, 157
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper1
   rotate: false
-  xy: 161, 241
+  xy: 691, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper2
   rotate: false
-  xy: 195, 241
+  xy: 359, 123
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 copper3
   rotate: false
-  xy: 229, 241
+  xy: 725, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters1
   rotate: false
-  xy: 263, 239
+  xy: 759, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters2
   rotate: false
-  xy: 297, 239
+  xy: 793, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters3
   rotate: false
-  xy: 331, 239
+  xy: 827, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters4
   rotate: false
-  xy: 365, 239
+  xy: 861, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters5
   rotate: false
-  xy: 399, 239
+  xy: 895, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone1
   rotate: false
-  xy: 399, 239
+  xy: 895, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 craters6
   rotate: false
-  xy: 433, 239
+  xy: 929, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 433, 239
+  xy: 929, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-tainted-water
   rotate: false
-  xy: 69, 233
+  xy: 427, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand-water
   rotate: false
-  xy: 103, 207
+  xy: 427, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand1
   rotate: false
-  xy: 467, 239
+  xy: 963, 223
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand2
   rotate: false
-  xy: 1, 233
+  xy: 393, 157
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 darksand3
   rotate: false
-  xy: 35, 233
+  xy: 393, 123
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 deepwater
   rotate: false
-  xy: 137, 207
+  xy: 461, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dunerocks-large
   rotate: false
-  xy: 291, 439
+  xy: 1, 93
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 dunerocks1
   rotate: false
-  xy: 171, 207
+  xy: 461, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 dunerocks2
   rotate: false
-  xy: 205, 207
+  xy: 495, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass1
   rotate: false
-  xy: 239, 205
+  xy: 495, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass2
   rotate: false
-  xy: 273, 205
+  xy: 529, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 grass3
   rotate: false
-  xy: 307, 205
+  xy: 529, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone1
   rotate: false
-  xy: 341, 205
+  xy: 563, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone2
   rotate: false
-  xy: 375, 205
+  xy: 563, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 holostone3
   rotate: false
-  xy: 409, 205
+  xy: 597, 173
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock1
   rotate: false
-  xy: 443, 205
+  xy: 597, 139
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock2
   rotate: false
-  xy: 477, 205
+  xy: 631, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 hotrock3
   rotate: false
-  xy: 1, 199
+  xy: 631, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow1
   rotate: false
-  xy: 137, 173
+  xy: 699, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow2
   rotate: false
-  xy: 171, 173
+  xy: 733, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice-snow3
   rotate: false
-  xy: 205, 173
+  xy: 733, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice1
   rotate: false
-  xy: 35, 199
+  xy: 665, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice2
   rotate: false
-  xy: 69, 199
+  xy: 665, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ice3
   rotate: false
-  xy: 103, 173
+  xy: 699, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icerocks-large
   rotate: false
-  xy: 357, 439
+  xy: 291, 191
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 icerocks1
   rotate: false
-  xy: 239, 171
+  xy: 767, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 icerocks2
   rotate: false
-  xy: 273, 171
+  xy: 767, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock1
   rotate: false
-  xy: 307, 171
+  xy: 801, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock2
   rotate: false
-  xy: 341, 171
+  xy: 801, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ignarock3
   rotate: false
-  xy: 375, 171
+  xy: 835, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead1
   rotate: false
-  xy: 409, 171
+  xy: 835, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 443, 171
+  xy: 869, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 477, 171
+  xy: 869, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock1
   rotate: false
-  xy: 1, 165
+  xy: 903, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock2
   rotate: false
-  xy: 35, 165
+  xy: 903, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 magmarock3
   rotate: false
-  xy: 69, 165
+  xy: 937, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor
   rotate: false
-  xy: 103, 139
+  xy: 937, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged5
   rotate: false
-  xy: 103, 139
+  xy: 937, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-2
   rotate: false
-  xy: 137, 139
+  xy: 971, 189
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-3
   rotate: false
-  xy: 171, 139
+  xy: 971, 155
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-5
   rotate: false
-  xy: 205, 139
+  xy: 183, 59
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged1
   rotate: false
-  xy: 239, 137
+  xy: 217, 75
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged2
   rotate: false
-  xy: 273, 137
+  xy: 251, 83
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged3
   rotate: false
-  xy: 307, 137
+  xy: 217, 41
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged4
   rotate: false
-  xy: 341, 137
+  xy: 251, 49
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 metal-floor-damaged6
   rotate: false
-  xy: 375, 137
+  xy: 217, 7
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss1
   rotate: false
-  xy: 409, 137
+  xy: 251, 15
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss2
   rotate: false
-  xy: 443, 137
+  xy: 427, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 moss3
   rotate: false
-  xy: 477, 137
+  xy: 461, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal1
   rotate: false
-  xy: 1, 131
+  xy: 495, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal2
   rotate: false
-  xy: 35, 131
+  xy: 529, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-coal3
   rotate: false
-  xy: 69, 131
+  xy: 563, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper1
   rotate: false
-  xy: 103, 105
+  xy: 597, 105
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper2
   rotate: false
-  xy: 137, 105
+  xy: 631, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-copper3
   rotate: false
-  xy: 171, 105
+  xy: 665, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead1
   rotate: false
-  xy: 205, 105
+  xy: 699, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead2
   rotate: false
-  xy: 239, 103
+  xy: 733, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-lead3
   rotate: false
-  xy: 273, 103
+  xy: 767, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap1
   rotate: false
-  xy: 307, 103
+  xy: 801, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap2
   rotate: false
-  xy: 341, 103
+  xy: 835, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-scrap3
   rotate: false
-  xy: 375, 103
+  xy: 869, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium1
   rotate: false
-  xy: 409, 103
+  xy: 903, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium2
   rotate: false
-  xy: 443, 103
+  xy: 937, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-thorium3
   rotate: false
-  xy: 477, 103
+  xy: 971, 121
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium1
   rotate: false
-  xy: 1, 97
+  xy: 631, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium2
   rotate: false
-  xy: 35, 97
+  xy: 665, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 ore-titanium3
   rotate: false
-  xy: 69, 97
+  xy: 699, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 pine
   rotate: false
-  xy: 357, 323
+  xy: 423, 207
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rock1
   rotate: false
-  xy: 407, 323
+  xy: 133, 43
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 457, 323
+  xy: 199, 109
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 rocks-large
   rotate: false
-  xy: 423, 439
+  xy: 1, 27
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 rocks1
   rotate: false
-  xy: 103, 71
+  xy: 733, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 rocks2
   rotate: false
-  xy: 137, 71
+  xy: 767, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 salt
   rotate: false
-  xy: 171, 71
+  xy: 801, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand-water
   rotate: false
-  xy: 307, 69
+  xy: 937, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 205, 71
+  xy: 835, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 239, 69
+  xy: 869, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 273, 69
+  xy: 903, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sandrocks-large
   rotate: false
-  xy: 291, 373
+  xy: 67, 93
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 sandrocks1
   rotate: false
-  xy: 341, 69
+  xy: 971, 87
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sandrocks2
   rotate: false
-  xy: 375, 69
+  xy: 291, 89
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap1
   rotate: false
-  xy: 409, 69
+  xy: 325, 89
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap2
   rotate: false
-  xy: 443, 69
+  xy: 359, 89
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 scrap3
   rotate: false
-  xy: 477, 69
+  xy: 393, 89
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder1
   rotate: false
-  xy: 103, 37
+  xy: 319, 21
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale-boulder2
   rotate: false
-  xy: 137, 37
+  xy: 353, 55
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale1
   rotate: false
-  xy: 1, 63
+  xy: 285, 55
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale2
   rotate: false
-  xy: 35, 63
+  xy: 285, 21
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shale3
   rotate: false
-  xy: 69, 63
+  xy: 319, 55
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shalerocks-large
   rotate: false
-  xy: 357, 373
+  xy: 357, 191
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 shalerocks1
   rotate: false
-  xy: 171, 37
+  xy: 353, 21
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 shalerocks2
   rotate: false
-  xy: 205, 37
+  xy: 387, 55
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 239, 35
+  xy: 387, 21
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 273, 35
+  xy: 427, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 307, 35
+  xy: 461, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrock1
   rotate: false
-  xy: 357, 273
+  xy: 473, 207
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snowrock2
   rotate: false
-  xy: 407, 273
+  xy: 523, 207
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 snowrocks-large
   rotate: false
-  xy: 423, 373
+  xy: 67, 27
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 snowrocks1
   rotate: false
-  xy: 341, 35
+  xy: 495, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 snowrocks2
   rotate: false
-  xy: 375, 35
+  xy: 529, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-cluster1
   rotate: false
-  xy: 1, 267
+  xy: 133, 1
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster2
   rotate: false
-  xy: 43, 267
+  xy: 175, 1
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-cluster3
   rotate: false
-  xy: 85, 267
+  xy: 249, 117
   size: 40, 40
   orig: 40, 40
   offset: 0, 0
   index: -1
 spore-moss1
   rotate: false
-  xy: 409, 35
+  xy: 563, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss2
   rotate: false
-  xy: 443, 35
+  xy: 597, 71
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-moss3
   rotate: false
-  xy: 477, 35
+  xy: 421, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 spore-pine
   rotate: false
-  xy: 457, 273
+  xy: 573, 207
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 sporerocks-large
   rotate: false
-  xy: 291, 307
+  xy: 133, 93
   size: 64, 64
   orig: 64, 64
   offset: 0, 0
   index: -1
 sporerocks1
   rotate: false
-  xy: 1, 29
+  xy: 455, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 sporerocks2
   rotate: false
-  xy: 35, 29
+  xy: 489, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 69, 29
+  xy: 523, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tainted-water
   rotate: false
-  xy: 103, 3
+  xy: 557, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 tar
   rotate: false
-  xy: 137, 3
+  xy: 591, 37
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-tar-edge
-  rotate: false
-  xy: 1, 407
-  size: 288, 96
-  orig: 288, 96
-  offset: 0, 0
-  index: -1
 thorium1
   rotate: false
-  xy: 171, 3
+  xy: 631, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 205, 3
+  xy: 665, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 239, 1
+  xy: 699, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 273, 1
+  xy: 733, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 307, 1
+  xy: 767, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 341, 1
+  xy: 801, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 375, 1
+  xy: 835, 53
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
 water-edge
   rotate: false
-  xy: 1, 309
+  xy: 1, 159
   size: 288, 96
   orig: 288, 96
   offset: 0, 0
diff --git a/core/assets/sprites/sprites_fallback5.png b/core/assets/sprites/sprites_fallback5.png
index 0c7a5079c3..dd26d28252 100644
Binary files a/core/assets/sprites/sprites_fallback5.png and b/core/assets/sprites/sprites_fallback5.png differ
diff --git a/core/assets/sprites/sprites_fallback6.png b/core/assets/sprites/sprites_fallback6.png
index 0b182a18e7..43e1754c02 100644
Binary files a/core/assets/sprites/sprites_fallback6.png and b/core/assets/sprites/sprites_fallback6.png differ
diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java
index 369880070d..8e3cb76916 100644
--- a/core/src/io/anuke/mindustry/content/Blocks.java
+++ b/core/src/io/anuke/mindustry/content/Blocks.java
@@ -230,6 +230,7 @@ public class Blocks implements ContentList{
             dragMultiplier = 1f;
             speedMultiplier = 1f;
             attributes.set(Attribute.water, 0.4f);
+            edgeStyle = "blocky";
         }};
 
         iceSnow = new Floor("ice-snow"){{
@@ -702,16 +703,20 @@ public class Blocks implements ContentList{
             reload = 200f;
             range = 40f;
             healPercent = 5f;
-            consumes.item(Items.phasefabric).optional(true);
+            phaseBoost = 4f;
+            phaseRangeBoost = 20f;
+            health = 80;
+            consumes.item(Items.silicon).optional(true);
         }};
 
         mendProjector = new MendProjector("mend-projector"){{
-            requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 40, Items.silicon, 80));
+            requirements(Category.effect, ItemStack.with(Items.lead, 200, Items.titanium, 50, Items.silicon, 80));
             consumes.power(1.8f);
             size = 2;
             reload = 250f;
-            range = 70f;
-            healPercent = 13f;
+            range = 85f;
+            healPercent = 14f;
+            health = 80 * size * size;
             consumes.item(Items.phasefabric).optional(true);
         }};
 
@@ -1131,7 +1136,7 @@ public class Blocks implements ContentList{
                 Items.scrap, Bullets.flakScrap,
                 Items.lead, Bullets.flakLead
             );
-            reload = 25f;
+            reload = 20f;
             range = 180f;
             size = 2;
             burstSpacing = 5f;
@@ -1317,8 +1322,8 @@ public class Blocks implements ContentList{
                 Items.surgealloy, Bullets.flakSurge
             );
             xRand = 4f;
-            reload = 8f;
-            range = 160f;
+            reload = 7f;
+            range = 170f;
             size = 3;
             recoil = 3f;
             rotatespeed = 10f;
diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java
index 1596869d4f..36a211758b 100644
--- a/core/src/io/anuke/mindustry/content/UnitTypes.java
+++ b/core/src/io/anuke/mindustry/content/UnitTypes.java
@@ -178,7 +178,7 @@ public class UnitTypes implements ContentList{
             drag = 0.01f;
             mass = 1.5f;
             isFlying = true;
-            health = 70;
+            health = 75;
             engineOffset = 5.5f;
             weapon = new Weapon("chain-blaster"){{
                 length = 1.5f;
@@ -190,7 +190,7 @@ public class UnitTypes implements ContentList{
         }};
 
         ghoul = new UnitType("ghoul", Ghoul.class, Ghoul::new){{
-            health = 250;
+            health = 220;
             speed = 0.2f;
             maxVelocity = 1.4f;
             mass = 3f;
diff --git a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java
index 7bc7acc202..be3e823a37 100644
--- a/core/src/io/anuke/mindustry/graphics/FloorRenderer.java
+++ b/core/src/io/anuke/mindustry/graphics/FloorRenderer.java
@@ -211,7 +211,7 @@ public class FloorRenderer{
         int chunksx = Mathf.ceil((float) (world.width()) / chunksize),
         chunksy = Mathf.ceil((float) (world.height()) / chunksize) ;
         cache = new Chunk[chunksx][chunksy];
-        SpriteCache sprites = new SpriteCache(world.width() * world.height() * 5, (world.width() / chunksize) * (world.height() / chunksize) * 2, false);
+        SpriteCache sprites = new SpriteCache(world.width() * world.height() * 6, (world.width() / chunksize) * (world.height() / chunksize) * 2, false);
         cbatch = new CacheBatch(sprites);
 
         Time.mark();
diff --git a/core/src/io/anuke/mindustry/type/Zone.java b/core/src/io/anuke/mindustry/type/Zone.java
index 93b5208c67..b6e88a7574 100644
--- a/core/src/io/anuke/mindustry/type/Zone.java
+++ b/core/src/io/anuke/mindustry/type/Zone.java
@@ -8,11 +8,9 @@ import io.anuke.arc.function.Supplier;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.scene.ui.layout.Table;
 import io.anuke.mindustry.content.Loadouts;
-import io.anuke.mindustry.content.StatusEffects;
 import io.anuke.mindustry.game.EventType.ZoneCompleteEvent;
 import io.anuke.mindustry.game.EventType.ZoneConfigureCompleteEvent;
 import io.anuke.mindustry.game.Rules;
-import io.anuke.mindustry.game.SpawnGroup;
 import io.anuke.mindustry.game.UnlockableContent;
 import io.anuke.mindustry.maps.generators.Generator;
 import io.anuke.mindustry.maps.generators.MapGenerator;
@@ -32,7 +30,7 @@ public class Zone extends UnlockableContent{
     public Supplier<Rules> rules = Rules::new;
     public boolean alwaysUnlocked;
     public int conditionWave = Integer.MAX_VALUE;
-    public int configureWave = 40;
+    public int configureWave = 10;
     public int launchPeriod = 10;
     public Loadout loadout = Loadouts.basicShard;
 
@@ -45,15 +43,6 @@ public class Zone extends UnlockableContent{
         this.generator = generator;
     }
 
-    protected SpawnGroup bossGroup(UnitType type){
-        return new SpawnGroup(type){{
-            begin = configureWave-1;
-            effect = StatusEffects.boss;
-            unitScaling = 1;
-            spacing = configureWave;
-        }};
-    }
-
     public boolean isBossWave(int wave){
         return wave % configureWave == 0 && wave > 0;
     }
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java
index bb5ef324f5..f26f391602 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/ZoneInfoDialog.java
@@ -124,10 +124,17 @@ public class ZoneInfoDialog extends FloatingDialog{
                 rebuildLoadout[0] = () -> {
                     load.clear();
                     float bsize = 40f;
-                    int step = 100;
+                    int step = 50;
 
                     load.left();
                     for(ItemStack stack : zone.getStartingItems()){
+                        load.addButton("x", () -> {
+                            zone.getStartingItems().remove(stack);
+                            zone.updateLaunchCost();
+                            rebuildItems.run();
+                            rebuildLoadout[0].run();
+                        }).size(bsize).pad(2);
+
                         load.addButton("-", () -> {
                             stack.amount = Math.max(stack.amount - step, 0);
                             zone.updateLaunchCost();
diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java
index 4057f34741..e2b6328563 100644
--- a/core/src/io/anuke/mindustry/world/blocks/Floor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java
@@ -1,6 +1,8 @@
 package io.anuke.mindustry.world.blocks;
 
 import io.anuke.arc.Core;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.collection.IntSet;
 import io.anuke.arc.graphics.g2d.Draw;
 import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.math.Mathf;
@@ -58,6 +60,8 @@ public class Floor extends Block{
 
     protected TextureRegion[][] edges;
     protected byte eq = 0;
+    protected Array<Block> blenders = new Array<>();
+    protected IntSet blended = new IntSet();
 
     public Floor(String name){
         super(name);
@@ -121,25 +125,34 @@ public class Floor extends Block{
     }
 
     protected void drawEdges(Tile tile, boolean sameLayer){
+        blenders.clear();
+        blended.clear();
         eq = 0;
 
         for(int i = 0; i < 8; i++){
             Point2 point = Geometry.d8[i];
             Tile other = tile.getNearby(point);
             if(other != null && doEdge(other.floor(), sameLayer) && other.floor().edges() != null){
+                if(blended.add(other.floor().id)){
+                    blenders.add(other.floor());
+                }
                 eq |= (1 << i);
             }
         }
 
-        for(int i = 0; i < 8; i++){
-            if(eq(i)){
+        blenders.sort((a, b) -> Integer.compare(a.id, b.id));
+
+        for(Block block : blenders){
+            for(int i = 0; i < 8; i++){
                 Point2 point = Geometry.d8[i];
                 Tile other = tile.getNearby(point);
-
-                TextureRegion region = edge(other.floor(), type(i), 2-(point.x + 1), 2-(point.y + 1));
-                Draw.rect(region, tile.worldx(), tile.worldy());
+                if(other != null && other.floor() == block){
+                    TextureRegion region = edge((Floor)block, type(i), 2-(point.x + 1), 2-(point.y + 1));
+                    Draw.rect(region, tile.worldx(), tile.worldy());
+                }
             }
         }
+
     }
 
     protected TextureRegion[][] edges(){
diff --git a/core/src/io/anuke/mindustry/world/consumers/Consume.java b/core/src/io/anuke/mindustry/world/consumers/Consume.java
index 1baea5fd3a..bb18472602 100644
--- a/core/src/io/anuke/mindustry/world/consumers/Consume.java
+++ b/core/src/io/anuke/mindustry/world/consumers/Consume.java
@@ -34,20 +34,7 @@ public abstract class Consume{
         return update;
     }
 
-    public abstract void build(Tile tile, Table table);/*{
-
-        Table t = new Table("flat");
-        t.margin(4);
-        buildTooltip(t);
-
-        int scale = mobile ? 4 : 3;
-
-        table.table(out -> {
-            out.addImage(getIcon()).size(10 * scale).color(Color.DARK_GRAY).padRight(-10 * scale).padBottom(-scale * 2);
-            out.addImage(getIcon()).size(10 * scale).color(Pal.accent);
-            out.addImage("icon-missing").size(10 * scale).color(Pal.remove).padLeft(-10 * scale);
-        }).size(10 * scale).get().addListener(new Tooltip<>(t));
-    }*/
+    public abstract void build(Tile tile, Table table);
 
     /**Called when a consumption is triggered manually.*/
     public void trigger(Block block, TileEntity entity){