diff --git a/data/core/images/terrain/masks/7hex-bl-br.png b/data/core/images/terrain/masks/7hex-bl-br.png
new file mode 100644
index 000000000000..c0ad107b0919
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-bl-br.png differ
diff --git a/data/core/images/terrain/masks/7hex-bl-l.png b/data/core/images/terrain/masks/7hex-bl-l.png
new file mode 100644
index 000000000000..3407e4366d84
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-bl-l.png differ
diff --git a/data/core/images/terrain/masks/7hex-bl.png b/data/core/images/terrain/masks/7hex-bl.png
new file mode 100644
index 000000000000..fd5e929526d7
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-bl.png differ
diff --git a/data/core/images/terrain/masks/7hex-br-bl.png b/data/core/images/terrain/masks/7hex-br-bl.png
new file mode 100644
index 000000000000..2ccb7208c0b9
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-br-bl.png differ
diff --git a/data/core/images/terrain/masks/7hex-br-r.png b/data/core/images/terrain/masks/7hex-br-r.png
new file mode 100644
index 000000000000..8395ebd6ede8
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-br-r.png differ
diff --git a/data/core/images/terrain/masks/7hex-br.png b/data/core/images/terrain/masks/7hex-br.png
new file mode 100644
index 000000000000..ae68093515d2
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-br.png differ
diff --git a/data/core/images/terrain/masks/7hex-l-bl.png b/data/core/images/terrain/masks/7hex-l-bl.png
new file mode 100644
index 000000000000..66d80a45cb7a
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-l-bl.png differ
diff --git a/data/core/images/terrain/masks/7hex-l-tl.png b/data/core/images/terrain/masks/7hex-l-tl.png
new file mode 100644
index 000000000000..9a4c9fcb3f01
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-l-tl.png differ
diff --git a/data/core/images/terrain/masks/7hex-l.png b/data/core/images/terrain/masks/7hex-l.png
new file mode 100644
index 000000000000..ef8e8d9da947
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-l.png differ
diff --git a/data/core/images/terrain/masks/7hex-r-br.png b/data/core/images/terrain/masks/7hex-r-br.png
new file mode 100644
index 000000000000..9efc6c0c61e5
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-r-br.png differ
diff --git a/data/core/images/terrain/masks/7hex-r-tr.png b/data/core/images/terrain/masks/7hex-r-tr.png
new file mode 100644
index 000000000000..3f8eb72b047c
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-r-tr.png differ
diff --git a/data/core/images/terrain/masks/7hex-r.png b/data/core/images/terrain/masks/7hex-r.png
new file mode 100644
index 000000000000..89616e2328d2
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-r.png differ
diff --git a/data/core/images/terrain/masks/7hex-tl-l.png b/data/core/images/terrain/masks/7hex-tl-l.png
new file mode 100644
index 000000000000..41941a039e89
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-tl-l.png differ
diff --git a/data/core/images/terrain/masks/7hex-tl-tr.png b/data/core/images/terrain/masks/7hex-tl-tr.png
new file mode 100644
index 000000000000..0e09132f88e1
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-tl-tr.png differ
diff --git a/data/core/images/terrain/masks/7hex-tl.png b/data/core/images/terrain/masks/7hex-tl.png
new file mode 100644
index 000000000000..a7b30343c35d
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-tl.png differ
diff --git a/data/core/images/terrain/masks/7hex-tr-r.png b/data/core/images/terrain/masks/7hex-tr-r.png
new file mode 100644
index 000000000000..db16baba4e46
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-tr-r.png differ
diff --git a/data/core/images/terrain/masks/7hex-tr-tl.png b/data/core/images/terrain/masks/7hex-tr-tl.png
new file mode 100644
index 000000000000..592f00e6ef0e
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-tr-tl.png differ
diff --git a/data/core/images/terrain/masks/7hex-tr.png b/data/core/images/terrain/masks/7hex-tr.png
new file mode 100644
index 000000000000..4e151d63425e
Binary files /dev/null and b/data/core/images/terrain/masks/7hex-tr.png differ
diff --git a/data/core/images/terrain/water/waves-mask-bl-br.png b/data/core/images/terrain/water/waves-mask-bl-br.png
deleted file mode 100644
index 1e2f00da6ed2..000000000000
Binary files a/data/core/images/terrain/water/waves-mask-bl-br.png and /dev/null differ
diff --git a/data/core/images/terrain/water/waves-mask-bl-l.png b/data/core/images/terrain/water/waves-mask-bl-l.png
deleted file mode 100644
index ce953778ee3b..000000000000
Binary files a/data/core/images/terrain/water/waves-mask-bl-l.png and /dev/null differ
diff --git a/data/core/images/terrain/water/waves-mask-br-bl.png b/data/core/images/terrain/water/waves-mask-br-bl.png
deleted file mode 100644
index 61f3a9261257..000000000000
Binary files a/data/core/images/terrain/water/waves-mask-br-bl.png and /dev/null differ
diff --git a/data/core/images/terrain/water/waves-mask-br-r.png b/data/core/images/terrain/water/waves-mask-br-r.png
deleted file mode 100644
index d0b95678cc27..000000000000
Binary files a/data/core/images/terrain/water/waves-mask-br-r.png and /dev/null differ
diff --git a/data/core/images/terrain/water/waves-mask-l-bl.png b/data/core/images/terrain/water/waves-mask-l-bl.png
deleted file mode 100644
index 756292bd2163..000000000000
Binary files a/data/core/images/terrain/water/waves-mask-l-bl.png and /dev/null differ
diff --git a/data/core/images/terrain/water/waves-mask-l-tl.png b/data/core/images/terrain/water/waves-mask-l-tl.png
deleted file mode 100644
index 88a21fb29c92..000000000000
Binary files a/data/core/images/terrain/water/waves-mask-l-tl.png and /dev/null differ
diff --git a/data/core/images/terrain/water/waves-mask-r-br.png b/data/core/images/terrain/water/waves-mask-r-br.png
deleted file mode 100644
index 32eddfc760eb..000000000000
Binary files a/data/core/images/terrain/water/waves-mask-r-br.png and /dev/null differ
diff --git a/data/core/images/terrain/water/waves-mask-r-tr.png b/data/core/images/terrain/water/waves-mask-r-tr.png
deleted file mode 100644
index 718694fc0b29..000000000000
Binary files a/data/core/images/terrain/water/waves-mask-r-tr.png and /dev/null differ
diff --git a/data/core/images/terrain/water/waves-mask-tl-l.png b/data/core/images/terrain/water/waves-mask-tl-l.png
deleted file mode 100644
index ad386108a4ee..000000000000
Binary files a/data/core/images/terrain/water/waves-mask-tl-l.png and /dev/null differ
diff --git a/data/core/images/terrain/water/waves-mask-tl-tr.png b/data/core/images/terrain/water/waves-mask-tl-tr.png
deleted file mode 100644
index b11f039a19c3..000000000000
Binary files a/data/core/images/terrain/water/waves-mask-tl-tr.png and /dev/null differ
diff --git a/data/core/images/terrain/water/waves-mask-tr-r.png b/data/core/images/terrain/water/waves-mask-tr-r.png
deleted file mode 100644
index d0443bcb3c38..000000000000
Binary files a/data/core/images/terrain/water/waves-mask-tr-r.png and /dev/null differ
diff --git a/data/core/images/terrain/water/waves-mask-tr-tl.png b/data/core/images/terrain/water/waves-mask-tr-tl.png
deleted file mode 100644
index 98731dfc9d40..000000000000
Binary files a/data/core/images/terrain/water/waves-mask-tr-tl.png and /dev/null differ
diff --git a/data/core/terrain-graphics/new-macros.cfg b/data/core/terrain-graphics/new-macros.cfg
index f3a483456ff6..539583fce8c1 100644
--- a/data/core/terrain-graphics/new-macros.cfg
+++ b/data/core/terrain-graphics/new-macros.cfg
@@ -771,14 +771,7 @@
         rotations=tr,r,br,bl,l,tl
 
         [image]
-            name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R5.png):200
-            random_start=no
-            layer={LAYER}
-            center=90,144
-            base=90,144
-        [/image]
-        [image]
-            name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R1.png):200
+            name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/masks/7hex-@R0.png):200
             random_start=no
             layer={LAYER}
             center=90,144
@@ -809,7 +802,7 @@
         rotations=tr,r,br,bl,l,tl
 
         [image]
-            name={IMAGESTEM}-convex-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R5.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
@@ -841,14 +834,7 @@
         rotations=tr,r,br,bl,l,tl
 
         [image]
-            name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R5.png):200
-            random_start=no
-            layer={LAYER}
-            center=90,144
-            base=90,144
-        [/image]
-        [image]
-            name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R1.png):200
+            name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/masks/7hex-@R0.png):200
             random_start=no
             layer={LAYER}
             center=90,144
@@ -879,7 +865,7 @@
         rotations=tr,r,br,bl,l,tl
 
         [image]
-            name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/{IMAGESTEM}-mask-@R0-@R5.png):200
+            name={IMAGESTEM}-concave-A[01~13].png~MASK(terrain/masks/7hex-@R0-@R5.png):200
             random_start=no
             layer={LAYER}
             center=90,144