diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties
index 2bcf2d22de..a7cba12f74 100755
--- a/core/assets/icons/icons.properties
+++ b/core/assets/icons/icons.properties
@@ -1,6 +1,6 @@
 63743=spawn|block-spawn-ui
 63742=deepwater|block-deepwater-ui
-63741=water|block-shallow-water-ui
+63741=shallow-water|block-shallow-water-ui
 63740=tainted-water|block-tainted-water-ui
 63739=darksand-tainted-water|block-darksand-tainted-water-ui
 63738=sand-water|block-sand-water-ui
@@ -357,7 +357,6 @@
 63357=crux|team-crux
 63358=derelict|team-derelict
 63350=deep-water|block-deep-water-ui
-63349=shallow-water|block-shallow-water-ui
 63348=molten-slag|block-molten-slag-ui
 63347=crater-stone|block-crater-stone-ui
 63346=deep-tainted-water|block-deep-tainted-water-ui
diff --git a/core/assets/maps/coastline.msav b/core/assets/maps/coastline.msav
index eacc6615ea..66c343f4d6 100644
Binary files a/core/assets/maps/coastline.msav and b/core/assets/maps/coastline.msav differ
diff --git a/core/src/mindustry/maps/filters/RiverNoiseFilter.java b/core/src/mindustry/maps/filters/RiverNoiseFilter.java
index 3fb6efab5e..eb91954b43 100644
--- a/core/src/mindustry/maps/filters/RiverNoiseFilter.java
+++ b/core/src/mindustry/maps/filters/RiverNoiseFilter.java
@@ -8,7 +8,7 @@ import static mindustry.maps.filters.FilterOption.*;
 
 public class RiverNoiseFilter extends GenerateFilter{
     float scl = 40, threshold = 0f, threshold2 = 0.1f, octaves = 1, falloff = 0.5f;
-    Block floor = Blocks.water, floor2 = Blocks.deepwater, block = Blocks.sandWall;
+    Block floor = Blocks.water, floor2 = Blocks.deepwater, block = Blocks.sandWall, target = Blocks.air;
 
     @Override
     public FilterOption[] options(){
@@ -18,6 +18,7 @@ public class RiverNoiseFilter extends GenerateFilter{
             new SliderOption("threshold2", () -> threshold2, f -> threshold2 = f, -1f, 1f),
             new SliderOption("octaves", () -> octaves, f -> octaves = f, 1f, 10f),
             new SliderOption("falloff", () -> falloff, f -> falloff = f, 0f, 1f),
+            new BlockOption("target", () -> target, b -> target = b, anyOptional),
             new BlockOption("block", () -> block, b -> block = b, wallsOnly),
             new BlockOption("floor", () -> floor, b -> floor = b, floorsOnly),
             new BlockOption("floor2", () -> floor2, b -> floor2 = b, floorsOnly)
@@ -26,14 +27,14 @@ public class RiverNoiseFilter extends GenerateFilter{
 
     @Override
     public char icon(){
-        return Iconc.blockWater;
+        return Iconc.blockShallowWater;
     }
 
     @Override
     public void apply(GenerateInput in){
         float noise = rnoise(in.x, in.y, (int)octaves, scl, falloff, 1f);
 
-        if(noise >= threshold){
+        if(noise >= threshold && (target == Blocks.air || in.floor == target || in.block == target)){
             in.floor = floor;
 
             if(in.block.solid){