diff --git a/Default.style/colors.mapcss b/Default.style/colors.mapcss
index 3ddd7d7..66acfc8 100644
--- a/Default.style/colors.mapcss
+++ b/Default.style/colors.mapcss
@@ -144,3 +144,5 @@
 
 @color_railway: #E6F8E0; // l: 0.1
 @color_railway_dashes: #999; // l: 0.1
+
+@color_waterway_dam: #2b2b2b;
diff --git a/Default.style/colors_dark.mapcss b/Default.style/colors_dark.mapcss
index 3b407bc..c8e7fe6 100644
--- a/Default.style/colors_dark.mapcss
+++ b/Default.style/colors_dark.mapcss
@@ -144,3 +144,5 @@
 
 @color_railway: #1E4810;
 @color_railway_dashes: #7F7F7F;
+
+@color_waterway_dam: #2b2b2b;
diff --git a/Default.style/lines.mapcss b/Default.style/lines.mapcss
index fff4142..f05c214 100644
--- a/Default.style/lines.mapcss
+++ b/Default.style/lines.mapcss
@@ -607,6 +607,24 @@ line {
         }
     }
 
+    @if Sport
+    |z10-{
+        [waterway=dam],[waterway=weir] {
+            color: @color_waterway_dam;
+            width: 1px;
+
+            |z16- {
+                width: 2px;
+                |z20- {
+                     text: eval(locTag("name"));
+                     text-color: @color_waterway_dam;
+                     width: 3px;
+                }
+            }
+        }
+    }
+    @endif // Sport
+
     /******************** Line names *************************/
 
     // road references
diff --git a/Default.style/poi_dam.svg b/Default.style/poi_dam.svg
new file mode 100644
index 0000000..86daa08
--- /dev/null
+++ b/Default.style/poi_dam.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="9" cy="9" r="8.5" fill="#808080" stroke="white"/>
+ <path d="m11.839 6.1762s2.8093 6.1446 2.8339 6.1982" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-linejoin="round" stroke-width=".8" style="paint-order:fill markers stroke"/>
+ <path d="m7.5763 6.4319c-0.19526-0.19527-0.19526-0.51185 0-0.70711l0.79289-0.79289c0.19527-0.19527 0.19527-0.51185 0-0.70711-0.19526-0.19526-0.51184-0.19526-0.7071 0l-0.7929 0.79289c-0.58578 0.58579-0.58578 1.5355 0 2.1213l0.11716 0.11716c0.17794 0.17794 0.17794 0.46643 0 0.64437-0.49359 0.49359-0.55026 1.2366-0.2136 1.7885-0.11371 0.06489-0.22073 0.14585-0.31777 0.24289l-0.79289 0.79286c-0.19527 0.1953-0.19527 0.5119 0 0.7071 0.19526 0.1953 0.51184 0.1953 0.7071 0l0.7929-0.7929c0.19526-0.1952 0.51184-0.1952 0.7071 0l0.08579 0.0858c0.58579 0.5858 1.5355 0.5858 2.1213 0l0.08579-0.0858c0.19526-0.1952 0.51184-0.1952 0.7071 0l0.79664 0.80971c0.13862 0.10185 0.37328 0.22024 0.62367-0.0017 0.21882-0.19394 0.20434-0.53352 0.05998-0.68977l-0.77314-0.8253c-0.091723-0.097137-0.21124-0.16895-0.30288-0.24224l-0.51056-0.38074c-0.23924-0.15949-0.27275-0.49798-0.06944-0.70129 0.56846-0.56846 0.56846-1.4901 0-2.0586l-0.11716-0.11715c-0.19526-0.19527-0.19526-0.51185 0-0.70711l0.79289-0.79289c0.19525-0.19527 0.19525-0.51185 0-0.70711-0.19526-0.19526-0.51184-0.19526-0.7071 0l-0.7929 0.79289c-0.58578 0.58579-0.58578 1.5355 0 2.1213l0.11716 0.11716c0.17794 0.17794 0.17794 0.46643 0 0.64437-0.49359 0.49359-0.55026 1.2366-0.2136 1.7885-0.11371 0.06489-0.22073 0.14585-0.31777 0.24289l-0.08579 0.08578c-0.19526 0.19528-0.51184 0.19528-0.7071 0l-0.08579-0.08578c-0.04454-0.04455-0.09119-0.0857-0.13962-0.12347-0.03616-0.05647-0.08433-0.10654-0.14369-0.14611l-0.53009-0.3534c-0.23924-0.15949-0.27275-0.49798-0.06944-0.70129 0.56846-0.56846 0.56846-1.4901 0-2.0586z" fill="#ffffff"/>
+ <path d="m6.3536 13.061c-0.19526-0.1952-0.51184-0.1952-0.7071 0l-0.7929 0.7929c-0.19526 0.1953-0.51184 0.1953-0.7071 0-0.19527-0.1952-0.19527-0.5118 0-0.7071l0.79289-0.7929c0.58579-0.5857 1.5355-0.5858 2.1213 0l0.08579 0.0858c0.19526 0.1953 0.51184 0.1953 0.7071 0l0.08579-0.0858c0.58579-0.5857 1.5355-0.5858 2.1214 0l0.0857 0.0858c0.1953 0.1953 0.5119 0.1953 0.7072 0l0.0857-0.0858c0.5858-0.5857 1.5356-0.5858 2.1214 0l0.7929 0.7929c0.1952 0.1953 0.1952 0.5119 0 0.7071-0.1953 0.1953-0.5119 0.1953-0.7072 0l-0.7928-0.7929c-0.1953-0.1952-0.5119-0.1952-0.7072 0l-0.0857 0.0858c-0.5858 0.5858-1.5356 0.5858-2.1214 0l-0.08579-0.0858c-0.19526-0.1952-0.51184-0.1952-0.7071 0l-0.08579 0.0858c-0.58579 0.5858-1.5355 0.5858-2.1213 0l-0.08579-0.0858z" fill="white"/>
+ <path d="m5.7866 6.0799c-0.052065 0.010938-1.3866 4.2405-2.4116 6.2639" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-linejoin="round" stroke-width=".8" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/Default.style/poi_rapids.svg b/Default.style/poi_rapids.svg
new file mode 100644
index 0000000..bb4b026
--- /dev/null
+++ b/Default.style/poi_rapids.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12" height="8" version="1.1" viewBox="0 0 12 8" xmlns="http://www.w3.org/2000/svg">
+ <path d="m3.5635 0.77433c0.00595 4.3822e-4 0.011888 0.001091 0.017798 0.001957 0.60439 0.10903 1.313 0.28168 1.9365 0.61331 0.48445 0.25765 0.86104 0.62589 1.1712 0.86803 0.012023 0.00943 0.023333 0.019913 0.033818 0.031351 0.60139 0.6493 0.78501 0.80995 1.5592 1.7164 0.0012 0.00129 0.00238 0.0026 0.00357 0.00392 0.27613 0.33691 0.67707 0.827 1.1143 1.0248 0.49284 0.11948 0.86701 0.11091 1.0039 0.037229 0.07013-0.03775 0.08877-0.06411 0.1068-0.13324 0.01616-0.061976 0.0088-0.19218-0.02847-0.35662-0.06322-0.10388-0.11387-0.14973-0.14951-0.16068-0.04122-0.012655-0.08209-0.00454-0.18867-0.00195-0.15978 0.00387-0.1116 0.01992-0.10857 0.011757l-0.0019 0.00195c0.03753 0.16127-0.051 0.21964-0.19757 0.2606-0.14698 0.0412-0.39249-0.033788-0.42889-0.19594-0.094757-0.24147-0.065362-0.72733 0.11391-0.84256 0.13144-0.084484 0.30987-0.19482 0.60695-0.19007 0.21428 0.00342 0.41663 0.035171 0.58496 0.10562 0.38929 0.16292 0.4578 0.371 0.59334 0.62917 0.10913 0.34 0.08846 1.3-0.05162 1.5009-0.18297 0.21606-0.52333 0.41666-0.76002 0.46831-0.56861 0.070202-1.0828-0.061513-1.4416-0.20378-0.62729-0.27191-1.1691-0.99723-1.4356-1.3223-0.75239-0.88069-0.85614-1.0219-1.4464-1.6583-0.34254-0.2692-0.58473-0.5715-0.97641-0.77982-0.53834-0.28631-1.1116-0.39422-1.6878-0.49893-0.72404-0.075206-1.4663-0.044656-2.3424 0.20966-0.41923-0.25764-0.26697-0.77248-0.13884-0.91353 0.94175-0.27339 1.7625-0.30839 2.5382-0.22729z" color="#000000" fill="#7f7f7f" stroke="#ffffff" stroke-linecap="round" stroke-linejoin="round" stroke-width=".38247" style="paint-order:fill markers stroke"/>
+ <path d="m5.927 4.6807c-0.15397-0.44982-0.15386-0.37747-0.29438-0.67001-0.23407-0.28645-0.52358-0.53583-0.85357-0.75815l-0.97187-0.48136c-0.13541-0.078222-0.53491-0.0015921-0.83322 0.010398-0.28742 0.030794-0.57843-0.082369-1.2487 0.67859-0.50014 0.86123-0.67247 1.04-0.75131 1.6758-0.16105 1.0161 0.16172 1.915 0.75073 2.2143 1.6509 0.14792 3.4383 0.056159 5.0495 0.018051 0.99015-0.33868 0.8695-1.0894 0.07713-2.0699-0.17779-0.1268-0.59993-0.30177-0.92425-0.61763z" fill="#585858" stroke="#ffffff" stroke-linecap="round" stroke-linejoin="round" stroke-width=".764" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/Default.style/poi_weir.svg b/Default.style/poi_weir.svg
new file mode 100644
index 0000000..f176fa8
--- /dev/null
+++ b/Default.style/poi_weir.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="9" cy="9" r="8.5" fill="#808080" stroke="white"/>
+ <path d="m2.7656 7.1719 12.688 0.015625" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" style="paint-order:fill markers stroke"/>
+ <path d="m13.287 5.2009c-0.56029 0.074093-0.956 0.19148-1.2559 0.44531s-0.40048 0.66844-0.36719 0.9707c0.03329 0.30226 0.13514 0.54637 0.21094 0.76758 0.0758 0.2212 0.12498 0.41161 0.12305 0.53906 0.0015-0.097782-0.07812 0.20609-0.23438 0.50977-0.15625 0.30367-0.3552 0.67376-0.49414 1.0723-0.17812 0.51089-0.04899 0.98943 0.07617 1.3477 0.06258 0.17912 0.12854 0.33595 0.17188 0.45117 0.04334 0.11522 0.04994 0.20264 0.05078 0.13867a0.5 0.5 0 0 0 0.49414 0.50781 0.5 0.5 0 0 0 0.50586-0.49414c3e-3 -0.22832-0.05897-0.35951-0.11328-0.50391-0.05431-0.14439-0.11486-0.28692-0.16406-0.42774-0.09839-0.28163-0.13412-0.52886-0.07813-0.68945 0.10248-0.29391 0.27871-0.63292 0.43945-0.94531s0.33934-0.5315 0.3457-0.95117c0.0052-0.34443-0.09225-0.63516-0.17578-0.87891-0.08353-0.24375-0.15257-0.44835-0.16406-0.55273-0.0115-0.10438-0.03139-0.054551 0.01953-0.097656s0.27315-0.15503 0.74023-0.2168a0.5 0.5 0 0 0 0.43164-0.56055 0.5 0.5 0 0 0-0.5625-0.43164z" color="#000000" fill="#ffffff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round" stroke-width=".3" style="paint-order:fill markers stroke"/>
+ <path d="m7.3496 5.2441c-0.56029 0.074093-0.956 0.19148-1.2559 0.44531s-0.40048 0.66844-0.36719 0.9707c0.033289 0.30226 0.13514 0.54637 0.21094 0.76758 0.0758 0.2212 0.12498 0.41161 0.12305 0.53906 0.00148-0.097782-0.078123 0.20609-0.23438 0.50977-0.15625 0.30367-0.3552 0.67376-0.49414 1.0723-0.17812 0.51089-0.048985 0.98943 0.076172 1.3477 0.062579 0.17912 0.12854 0.33595 0.17188 0.45117 0.043339 0.11522 0.049938 0.20264 0.050781 0.13867a0.5 0.5 0 0 0 0.49414 0.50781 0.5 0.5 0 0 0 0.50586-0.49414c0.0030097-0.22832-0.058968-0.35951-0.11328-0.50391-0.054313-0.14439-0.11487-0.28692-0.16406-0.42774-0.098394-0.28163-0.13412-0.52886-0.078125-0.68945 0.10248-0.29391 0.27871-0.63292 0.43945-0.94531 0.16074-0.3124 0.33934-0.53151 0.3457-0.95117 0.0052219-0.34443-0.092255-0.63516-0.17578-0.87891s-0.15257-0.44835-0.16406-0.55273c-0.011496-0.10438-0.031389-0.054551 0.019531-0.097656 0.05092-0.043105 0.27315-0.15503 0.74023-0.2168a0.5 0.5 0 0 0 0.43164-0.56055 0.5 0.5 0 0 0-0.5625-0.43164z" color="#000000" fill="#ffffff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round" stroke-width=".3" style="paint-order:fill markers stroke"/>
+ <path d="m3.875 14.188c0.40369-0.59434 0.76315-0.86983 1.5518-0.8553 0.87673 0.01615 1.0285 0.87041 1.815 0.88714 0.82219 0.01748 0.98457-0.91976 1.9427-0.90637 0.85704 0.01197 0.86167 0.84094 1.7382 0.88544 1.092 0.05543 0.87715-0.85117 1.9893-0.8817 0.94084-0.0047 1.0115 0.40284 1.338 0.8708" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-linejoin="round" stroke-width=".8" style="paint-order:fill markers stroke"/>
+ <path d="m10.359 5.1788c-0.56029 0.074093-0.956 0.19148-1.2559 0.44531s-0.40048 0.66844-0.36719 0.9707c0.033289 0.30226 0.13514 0.54637 0.21094 0.76758 0.0758 0.2212 0.12498 0.41161 0.12305 0.53906 0.00148-0.097782-0.078123 0.20609-0.23438 0.50977-0.15625 0.30367-0.3552 0.67376-0.49414 1.0723-0.17812 0.51089-0.048985 0.98943 0.076172 1.3477 0.062579 0.17912 0.12854 0.33595 0.17188 0.45117 0.043339 0.11522 0.049938 0.20264 0.050781 0.13867a0.5 0.5 0 0 0 0.49414 0.50781 0.5 0.5 0 0 0 0.50586-0.49414c0.0030097-0.22832-0.058968-0.35951-0.11328-0.50391-0.054313-0.14439-0.11487-0.28692-0.16406-0.42774-0.098394-0.28163-0.13412-0.52886-0.078125-0.68945 0.10248-0.29391 0.27871-0.63292 0.43945-0.94531 0.16074-0.3124 0.33934-0.53151 0.3457-0.95117 0.005222-0.34443-0.092254-0.63516-0.17578-0.87891s-0.15257-0.44835-0.16406-0.55273c-0.011496-0.10438-0.031389-0.054551 0.019531-0.097656 0.05092-0.043105 0.27315-0.15503 0.74023-0.2168a0.5 0.5 0 0 0 0.43164-0.56055 0.5 0.5 0 0 0-0.5625-0.43164z" color="#000000" fill="#ffffff" stroke="#808080" stroke-linecap="round" stroke-linejoin="round" stroke-width=".3" style="paint-order:fill markers stroke"/>
+ <path d="m3.7812 12.343c0.40369-0.59434 0.76315-0.86983 1.5518-0.8553 0.87673 0.01615 1.0285 0.87041 1.815 0.88714 0.82219 0.01748 0.98457-0.91976 1.9427-0.90637 0.85704 0.01197 0.86167 0.84094 1.7382 0.88544 1.092 0.05543 0.87715-0.85117 1.9893-0.8817 0.94084-0.0047 1.0115 0.40284 1.338 0.8708" fill="none" stroke="#ffffff" stroke-linecap="round" stroke-linejoin="round" stroke-width=".8" style="paint-order:fill markers stroke"/>
+</svg>
diff --git a/Default.style/points.mapcss b/Default.style/points.mapcss
index 8f64de3..40ac33c 100644
--- a/Default.style/points.mapcss
+++ b/Default.style/points.mapcss
@@ -932,6 +932,34 @@ node,area {
             text: eval(locTag('name'));
             text-color: @color_text_activity;
         }
+
+    @if Sport
+    |z16-{
+        [waterway=dam] {
+            icon-image: "poi_dam.svg";
+            icon-tint: @color_waterway_dam;
+            text: eval(locTag("name"));
+        }
+
+        [waterway=lock_gate],[waterway=sluice_gate] {
+            icon-image: "poi_dam.svg";
+            icon-tint: @color_waterway_dam;
+            text: eval(locTag("name"));
+        }
+
+        [waterway=weir] {
+            icon-image: "poi_weir.svg";
+            icon-tint: @color_waterway_dam;
+            text: eval(locTag("name"));
+        }
+
+        [waterway=rapids] {
+            icon-image: "poi_rapids.svg";
+            icon-tint: @color_icon_tourism;
+            text: eval(locTag("name"));
+        }
+    }
+    @endif // Sport
     @endif
 
     |z15-[amenity=shelter] {