diff --git a/data/core/terrain-graphics/new-macros.cfg b/data/core/terrain-graphics/new-macros.cfg
index bb929c0402ad..962b8445908f 100644
--- a/data/core/terrain-graphics/new-macros.cfg
+++ b/data/core/terrain-graphics/new-macros.cfg
@@ -750,23 +750,19 @@
     [terrain_graphics]
         map="
 ,  2
-*,   3
+*,   2
 ,  1
 *,   *
 ,  *"
         [tile]
             pos=1
             type={TERRAINLIST}
-            set_no_flag=waves-@R0-@R5,waves-@R0-@R1
+            set_no_flag=waves_convex-@R0-@R5,waves_convex-@R0-@R1
         [/tile]
         [tile]
             pos=2
             type={ADJACENT}
         [/tile]
-        [tile]
-            pos=3
-            type={ADJACENT}
-        [/tile]
 
         rotations=tr,r,br,bl,l,tl
 
@@ -779,31 +775,28 @@
             is_water=yes
         [/image]
     [/terrain_graphics]
+
     [terrain_graphics]
         map="
 ,  2
-*,   3
+*,   2
 ,  1
 *,   *
 ,  *"
         [tile]
             pos=1
-            type={TERRAINLIST}
-            set_no_flag=waves-@R0-@R5
-        [/tile]
-        [tile]
-            pos=2
             type={ADJACENT}
+            set_no_flag=waves_concave-@R0-@R5,waves_concave-@R0-@R1
         [/tile]
         [tile]
-            pos=3
-            type=!,{TERRAINLIST},{ADJACENT}
+            pos=2
+            type={TERRAINLIST}
         [/tile]
 
         rotations=tr,r,br,bl,l,tl
 
         [image]
-            name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/masks/7hex-@R0-@R5.png):200
+            name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/masks/7hex-@R0.png):200
             random_start=no
             layer={LAYER}
             center=90,144
@@ -821,22 +814,22 @@
 ,  *"
         [tile]
             pos=1
-            type={ADJACENT}
-            set_no_flag=waves-@R0-@R5,waves-@R0-@R1
+            type={TERRAINLIST}
         [/tile]
         [tile]
             pos=2
-            type={TERRAINLIST}
+            type={ADJACENT}
+            set_no_flag=waves_convex-@R0-@R5
         [/tile]
         [tile]
             pos=3
-            type={TERRAINLIST}
+            type=!,{TERRAINLIST},{ADJACENT}
         [/tile]
 
         rotations=tr,r,br,bl,l,tl
 
         [image]
-            name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/masks/7hex-@R0.png):200
+            name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/masks/7hex-@R0-@R5.png):200
             random_start=no
             layer={LAYER}
             center=90,144
@@ -844,6 +837,7 @@
             is_water=yes
         [/image]
     [/terrain_graphics]
+
     [terrain_graphics]
         map="
 ,  2
@@ -853,22 +847,22 @@
 ,  *"
         [tile]
             pos=1
-            type={ADJACENT}
-            set_no_flag=waves-@R0-@R5
+            type={TERRAINLIST}
         [/tile]
         [tile]
             pos=2
-            type={TERRAINLIST}
+            type=!,{TERRAINLIST},{ADJACENT}
         [/tile]
         [tile]
             pos=3
-            type=!,{TERRAINLIST},{ADJACENT}
+            type={ADJACENT}
+            set_no_flag=waves_convex-@R0-@R1
         [/tile]
 
         rotations=tr,r,br,bl,l,tl
 
         [image]
-            name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/masks/7hex-@R0-@R5.png):200
+            name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/masks/7hex-@R0-@R1.png):200
             random_start=no
             layer={LAYER}
             center=90,144