diff --git a/symbols/Wasserrettung_Einheiten/Bootsgruppe.j2 b/symbols/Wasserrettung_Einheiten/Bootsgruppe.j2
index 686b63ba..548ae3eb 100644
--- a/symbols/Wasserrettung_Einheiten/Bootsgruppe.j2
+++ b/symbols/Wasserrettung_Einheiten/Bootsgruppe.j2
@@ -12,9 +12,9 @@
 	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
 	<rect x="10" y="64" width="236" height="128" fill="none" stroke="#000000" stroke-width="1" />
 
-	<path d="M128 140 l16 16 l-16 16 l-16 -16 l16 -16 Z" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 123 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 133 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
 
 	<text x="22" y="90" style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 20px;" fill="#000000">Boot</text>
 
diff --git a/symbols/Wasserrettung_Einheiten/Bootstrupp.j2 b/symbols/Wasserrettung_Einheiten/Bootstrupp.j2
index 7930700a..e2181da5 100644
--- a/symbols/Wasserrettung_Einheiten/Bootstrupp.j2
+++ b/symbols/Wasserrettung_Einheiten/Bootstrupp.j2
@@ -12,9 +12,9 @@
 	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
 	<rect x="10" y="64" width="236" height="128" fill="none" stroke="#000000" stroke-width="1" />
 
-	<path d="M128 140 l16 16 l-16 16 l-16 -16 l16 -16 Z" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 123 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 133 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
 
 	<text x="22" y="90" style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 20px;" fill="#000000">Boot</text>
 
diff --git "a/symbols/Wasserrettung_Einheiten/F\303\274hrungstrupp.j2" "b/symbols/Wasserrettung_Einheiten/F\303\274hrungstrupp.j2"
index c816fd2a..a54bcb26 100644
--- "a/symbols/Wasserrettung_Einheiten/F\303\274hrungstrupp.j2"
+++ "b/symbols/Wasserrettung_Einheiten/F\303\274hrungstrupp.j2"
@@ -11,9 +11,9 @@
 
 	<rect x="11" y="65" width="234" height="25" fill="#000000" />
 
-	<path d="M128 150 l16 16 l-16 16 l-16 -16 l16 -16 Z" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 133 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 143 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
 
 	<ellipse cx="128" cy="48" rx="10" ry="10" fill="#000000" />
 </svg>
\ No newline at end of file
diff --git a/symbols/Wasserrettung_Einheiten/Logistiktrupp.j2 b/symbols/Wasserrettung_Einheiten/Logistiktrupp.j2
index 5d70e33c..5c713e1c 100644
--- a/symbols/Wasserrettung_Einheiten/Logistiktrupp.j2
+++ b/symbols/Wasserrettung_Einheiten/Logistiktrupp.j2
@@ -11,9 +11,9 @@
 
 	<rect x="11" y="166" width="234" height="25" fill="#000000" />
 
-	<path d="M128 130 l16 16 l-16 16 l-16 -16 l16 -16 Z" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 113 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 123 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
+	<path d="M128 122 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 114 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 102 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
 
 	<ellipse cx="128" cy="48" rx="10" ry="10" fill="#000000" />
 </svg>
\ No newline at end of file
diff --git "a/symbols/Wasserrettung_Einheiten/Str\303\266mungsrettungsgruppe.j2" "b/symbols/Wasserrettung_Einheiten/Str\303\266mungsrettungsgruppe.j2"
index ad6e510a..e6aad4f8 100644
--- "a/symbols/Wasserrettung_Einheiten/Str\303\266mungsrettungsgruppe.j2"
+++ "b/symbols/Wasserrettung_Einheiten/Str\303\266mungsrettungsgruppe.j2"
@@ -12,9 +12,9 @@
 	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
 	<rect x="10" y="64" width="236" height="128" fill="none" stroke="#000000" stroke-width="1" />
 
-	<path d="M128 140 l16 16 l-16 16 l-16 -16 l16 -16 Z" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 123 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 133 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
 
 	<text x="22" y="90" style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 20px;" fill="#000000">Strömungsrettung</text>
 
diff --git "a/symbols/Wasserrettung_Einheiten/Str\303\266mungsrettungstrupp.j2" "b/symbols/Wasserrettung_Einheiten/Str\303\266mungsrettungstrupp.j2"
index 8f6f198d..c6c9b78f 100644
--- "a/symbols/Wasserrettung_Einheiten/Str\303\266mungsrettungstrupp.j2"
+++ "b/symbols/Wasserrettung_Einheiten/Str\303\266mungsrettungstrupp.j2"
@@ -12,9 +12,9 @@
 	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
 	<rect x="10" y="64" width="236" height="128" fill="none" stroke="#000000" stroke-width="1" />
 
-	<path d="M128 140 l16 16 l-16 16 l-16 -16 l16 -16 Z" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 123 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 133 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
 
 	<text x="22" y="90" style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 20px;" fill="#000000">Strömungsrettung</text>
 
diff --git a/symbols/Wasserrettung_Einheiten/Tauchgruppe.j2 b/symbols/Wasserrettung_Einheiten/Tauchgruppe.j2
index 319b753a..3844617f 100644
--- a/symbols/Wasserrettung_Einheiten/Tauchgruppe.j2
+++ b/symbols/Wasserrettung_Einheiten/Tauchgruppe.j2
@@ -12,9 +12,9 @@
 	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
 	<rect x="10" y="64" width="236" height="128" fill="none" stroke="#000000" stroke-width="1" />
 
-	<path d="M128 140 l16 16 l-16 16 l-16 -16 l16 -16 Z" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 123 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 133 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
 
 	<text x="22" y="90" style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 20px;" fill="#000000">Taucher</text>
 
diff --git a/symbols/Wasserrettung_Einheiten/Tauchtrupp.j2 b/symbols/Wasserrettung_Einheiten/Tauchtrupp.j2
index 1a3b829c..ee369972 100644
--- a/symbols/Wasserrettung_Einheiten/Tauchtrupp.j2
+++ b/symbols/Wasserrettung_Einheiten/Tauchtrupp.j2
@@ -12,9 +12,9 @@
 	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
 	<rect x="10" y="64" width="236" height="128" fill="none" stroke="#000000" stroke-width="1" />
 
-	<path d="M128 140 l16 16 l-16 16 l-16 -16 l16 -16 Z" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 123 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 133 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
 
 	<text x="22" y="90" style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 20px;" fill="#000000">Taucher</text>
 
diff --git a/symbols/Wasserrettung_Einheiten/Wasserrettungsgruppe.j2 b/symbols/Wasserrettung_Einheiten/Wasserrettungsgruppe.j2
index b4f27208..ad95ecaa 100644
--- a/symbols/Wasserrettung_Einheiten/Wasserrettungsgruppe.j2
+++ b/symbols/Wasserrettung_Einheiten/Wasserrettungsgruppe.j2
@@ -9,9 +9,9 @@
 	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
 	<rect x="10" y="64" width="236" height="128" fill="none" stroke="#000000" stroke-width="1" />
 
-	<path d="M128 140 l16 16 l-16 16 l-16 -16 l16 -16 Z" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 123 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 133 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
 
 	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="#000000" />
 	<ellipse cx="192" cy="48" rx="10" ry="10" fill="#000000" />
diff --git a/symbols/Wasserrettung_Einheiten/Wasserrettungstrupp.j2 b/symbols/Wasserrettung_Einheiten/Wasserrettungstrupp.j2
index 138df328..4d580b87 100644
--- a/symbols/Wasserrettung_Einheiten/Wasserrettungstrupp.j2
+++ b/symbols/Wasserrettung_Einheiten/Wasserrettungstrupp.j2
@@ -9,9 +9,9 @@
 	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
 	<rect x="10" y="64" width="236" height="128" fill="none" stroke="#000000" stroke-width="1" />
 
-	<path d="M128 140 l16 16 l-16 16 l-16 -16 l16 -16 Z" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 123 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 133 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
 
 	<ellipse cx="128" cy="48" rx="10" ry="10" fill="#000000" />
 </svg>
\ No newline at end of file
diff --git a/symbols/Wasserrettung_Einheiten/Wasserrettungsverband.j2 b/symbols/Wasserrettung_Einheiten/Wasserrettungsverband.j2
index d09f390d..17beaaad 100644
--- a/symbols/Wasserrettung_Einheiten/Wasserrettungsverband.j2
+++ b/symbols/Wasserrettung_Einheiten/Wasserrettungsverband.j2
@@ -9,9 +9,9 @@
 	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
 	<rect x="10" y="64" width="236" height="128" fill="none" stroke="#000000" stroke-width="1" />
 
-	<path d="M128 140 l16 16 l-16 16 l-16 -16 l16 -16 Z" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 123 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 133 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
 
 	<line x1="128" y1="64" x2="128" y2="28" stroke="#000000" stroke-width="10" />
 </svg>
\ No newline at end of file
diff --git a/symbols/Wasserrettung_Einheiten/Wasserrettungszug.j2 b/symbols/Wasserrettung_Einheiten/Wasserrettungszug.j2
index fc19bcfa..7b807f88 100644
--- a/symbols/Wasserrettung_Einheiten/Wasserrettungszug.j2
+++ b/symbols/Wasserrettung_Einheiten/Wasserrettungszug.j2
@@ -9,9 +9,9 @@
 	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
 	<rect x="10" y="64" width="236" height="128" fill="none" stroke="#000000" stroke-width="1" />
 
-	<path d="M128 140 l16 16 l-16 16 l-16 -16 l16 -16 Z" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 123 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 133 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
 
 	<ellipse cx="128" cy="48" rx="10" ry="10" fill="#000000" />
 	<ellipse cx="64"  cy="48" rx="10" ry="10" fill="#000000" />
diff --git a/symbols/Wasserrettung_Einheiten/Zugtrupp.j2 b/symbols/Wasserrettung_Einheiten/Zugtrupp.j2
index 87f3c7a1..cfb7aaec 100644
--- a/symbols/Wasserrettung_Einheiten/Zugtrupp.j2
+++ b/symbols/Wasserrettung_Einheiten/Zugtrupp.j2
@@ -9,9 +9,9 @@
 	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
 	<rect x="10" y="64" width="236" height="128" fill="none" stroke="#000000" stroke-width="1" />
 
-	<path d="M128 140 l16 16 l-16 16 l-16 -16 l16 -16 Z" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 123 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
-	<path d="M53 133 c25 -30 40 -30 50 -20 c25 25 25 25 50 0 c10 -10 25 -10 50 20" stroke-width="2" stroke="#000000" fill="none" />
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
 
 	<ellipse cx="128" cy="48" rx="10" ry="10" fill="#000000" />
 	<ellipse cx="64"  cy="86" rx="10" ry="10" fill="#000000" />
diff --git a/symbols/Wasserrettung_Einrichtungen/Mobile_Wasserrettungsstation.j2 b/symbols/Wasserrettung_Einrichtungen/Mobile_Wasserrettungsstation.j2
new file mode 100644
index 00000000..1981e1bc
--- /dev/null
+++ b/symbols/Wasserrettung_Einrichtungen/Mobile_Wasserrettungsstation.j2
@@ -0,0 +1,14 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
+	<title>Mobile Wasserrettungsstation</title>
+	<defs>
+		<clipPath id="base">
+			<ellipse cx="128" cy="128" rx="64" ry="64" />
+		</clipPath>
+	</defs>
+	<ellipse fill="#FFFFFF" stroke="#000000" stroke-width="5" cx="128" cy="128" rx="64" ry="64"/>
+
+	<path d="M128 120 l24 24 l-24 24 l-24 -24 l24 -24 Z" stroke-width="5" stroke="#000000" fill="none" />
+	<path d="M96 112 c 7,0 7,-12 16,-12 8,0 8,12 16,12 8,0 8,-12 16,-12 9,0 9,12 16,12" fill="none" stroke="#000000" stroke-width="5" />
+	<path d="M96 100 c 7,0 7,-12 16,-12 8,0 8,12 16,12 8,0 8,-12 16,-12 9,0 9,12 16,12" fill="none" stroke="#000000" stroke-width="5" />
+</svg>
\ No newline at end of file
diff --git a/symbols/Wasserrettung_Einrichtungen/Wasserrettungsstation.j2 b/symbols/Wasserrettung_Einrichtungen/Wasserrettungsstation.j2
new file mode 100644
index 00000000..3afb610f
--- /dev/null
+++ b/symbols/Wasserrettung_Einrichtungen/Wasserrettungsstation.j2
@@ -0,0 +1,15 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
+	<title>Wasserrettungsstation</title>
+	<defs>
+		<clipPath id="base">
+			<ellipse cx="128" cy="128" rx="64" ry="64" />
+		</clipPath>
+	</defs>
+	<ellipse fill="#FFFFFF" stroke="#000000" stroke-width="5" cx="128" cy="128" rx="64" ry="64"/>
+	<path d="M10 80 L128 48 L246 80" stroke-width="5" stroke="#000000" fill="none"/>
+
+	<path d="M128 120 l24 24 l-24 24 l-24 -24 l24 -24 Z" stroke-width="5" stroke="#000000" fill="none" />
+	<path d="M96 112 c 7,0 7,-12 16,-12 8,0 8,12 16,12 8,0 8,-12 16,-12 9,0 9,12 16,12" fill="none" stroke="#000000" stroke-width="5" />
+	<path d="M96 100 c 7,0 7,-12 16,-12 8,0 8,12 16,12 8,0 8,-12 16,-12 9,0 9,12 16,12" fill="none" stroke="#000000" stroke-width="5" />
+</svg>
\ No newline at end of file
diff --git "a/symbols/Wasserrettung_Fahrzeuge/Anh\303\244nger_Str\303\266mungsrettung.j2" "b/symbols/Wasserrettung_Fahrzeuge/Anh\303\244nger_Str\303\266mungsrettung.j2"
new file mode 100644
index 00000000..a3de4ec6
--- /dev/null
+++ "b/symbols/Wasserrettung_Fahrzeuge/Anh\303\244nger_Str\303\266mungsrettung.j2"
@@ -0,0 +1,21 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
+	<title>Anhänger Strömungsrettung</title>
+	<defs>
+		<style type="text/css">
+		{% include './fonts/fonts.j2' %}
+		</style>
+		<clipPath id="symbol">
+			<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" />
+		</clipPath>
+	</defs>
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="#FFFFFF" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="#000000" />
+	<rect x="0" y="120.5" width="10" height="15" />
+
+	<text x="22" y="105" style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 20px;" fill="#000000">Strömungsrettung</text>
+
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+</svg>
\ No newline at end of file
diff --git "a/symbols/Wasserrettung_Fahrzeuge/Anh\303\244nger_Tauchen.j2" "b/symbols/Wasserrettung_Fahrzeuge/Anh\303\244nger_Tauchen.j2"
new file mode 100644
index 00000000..4cda06c7
--- /dev/null
+++ "b/symbols/Wasserrettung_Fahrzeuge/Anh\303\244nger_Tauchen.j2"
@@ -0,0 +1,21 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
+	<title>Anhänger Tauchen</title>
+	<defs>
+		<style type="text/css">
+		{% include './fonts/fonts.j2' %}
+		</style>
+		<clipPath id="symbol">
+			<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" />
+		</clipPath>
+	</defs>
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="#FFFFFF" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="#000000" />
+	<rect x="0" y="120.5" width="10" height="15" />
+
+	<text x="22" y="105" style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 20px;" fill="#000000">Tauchen</text>
+
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+</svg>
\ No newline at end of file
diff --git a/symbols/Wasserrettung_Fahrzeuge/Boot.j2 b/symbols/Wasserrettung_Fahrzeuge/Boot.j2
new file mode 100644
index 00000000..d492ea7c
--- /dev/null
+++ b/symbols/Wasserrettung_Fahrzeuge/Boot.j2
@@ -0,0 +1,11 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
+	<title>Boot</title>
+	<defs>
+		<clipPath id="symbol">
+			<path d="M10,64 l236,0 A118,118 180 0 1 10,64 Z" />
+		</clipPath>
+	</defs>
+	<path d="M10,64 l236,0 A118,118 180 0 1 10,64 Z" stroke="#000000" fill="#FFFFFF" stroke-width="10" clip-path="url(#symbol)" />
+	<path d="M10,64 l236,0 A118,118 180 0 1 10,64 Z" stroke="#000000" fill="none" stroke-width="1" clip-path="url(#symbol)" />
+</svg>
\ No newline at end of file
diff --git "a/symbols/Wasserrettung_Fahrzeuge/GW_Str\303\266mungsrettung.j2" "b/symbols/Wasserrettung_Fahrzeuge/GW_Str\303\266mungsrettung.j2"
new file mode 100644
index 00000000..4e596258
--- /dev/null
+++ "b/symbols/Wasserrettung_Fahrzeuge/GW_Str\303\266mungsrettung.j2"
@@ -0,0 +1,23 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
+	<title>Gerätewagen Strömungsrettung</title>
+	<defs>
+		<style type="text/css">
+		{% include './fonts/fonts.j2' %}
+		</style>
+		<clipPath id="symbol">
+			<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" />
+		</clipPath>
+	</defs>
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="#FFFFFF" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="#000000" />
+
+	<text x="22" y="105" style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 20px;" fill="#000000">GW Strömungsrettung</text>
+
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
+</svg>
\ No newline at end of file
diff --git a/symbols/Wasserrettung_Fahrzeuge/GW_Tauchen.j2 b/symbols/Wasserrettung_Fahrzeuge/GW_Tauchen.j2
new file mode 100644
index 00000000..4e985bd8
--- /dev/null
+++ b/symbols/Wasserrettung_Fahrzeuge/GW_Tauchen.j2
@@ -0,0 +1,23 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
+	<title>Gerätewagen Tauchen</title>
+	<defs>
+		<style type="text/css">
+		{% include './fonts/fonts.j2' %}
+		</style>
+		<clipPath id="symbol">
+			<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" />
+		</clipPath>
+	</defs>
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="#FFFFFF" stroke-width="10" stroke="#000000" clip-path="url(#symbol)" />
+	<path d="M10,64 L10,192 L246,192 L246,64 Q128,100 10,64 Z" fill="none" stroke-width="1" stroke="#000000" />
+
+	<text x="22" y="105" style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 20px;" fill="#000000">GW Tauchen</text>
+
+	<path d="M128 142 l18 18 l-18 18 l-18 -18 l18 -18 Z" stroke-width="4" stroke="#000000" fill="none" />
+	<path d="M103 134 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+	<path d="M103 122 c 5,0 5,-9 12,-9 6,0 6,9 12,9 6,0 6,-9 12,-9 7,0 7,9 12,9" fill="none" stroke="#000000" stroke-width="4" />
+
+	<ellipse cx="40" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
+	<ellipse cx="216" cy="210" rx="10" ry="10" stroke="#000000" fill="none" stroke-width="5" />
+</svg>
diff --git a/symbols/Wasserrettung_Fahrzeuge/Hochwasserboot.j2 b/symbols/Wasserrettung_Fahrzeuge/Hochwasserboot.j2
new file mode 100644
index 00000000..8aa40d81
--- /dev/null
+++ b/symbols/Wasserrettung_Fahrzeuge/Hochwasserboot.j2
@@ -0,0 +1,17 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
+	<title>Hochwasserboot</title>
+	<defs>
+		<style type="text/css">
+		{% include './fonts/fonts.j2' %}
+		</style>
+		<clipPath id="symbol">
+			<path d="M10,64 l236,0 A118,118 180 0 1 10,64 Z" />
+		</clipPath>
+	</defs>
+
+	<path d="M10,64 l236,0 A118,118 180 0 1 10,64 Z" stroke="#000000" fill="#FFFFFF" stroke-width="10" clip-path="url(#symbol)" />
+	<path d="M10,64 l236,0 A118,118 180 0 1 10,64 Z" stroke="#000000" fill="none" stroke-width="1" clip-path="url(#symbol)" />
+
+	<text x="128" y="110" style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 30px; text-anchor: middle;" fill="#000000">HW</text>
+</svg>
\ No newline at end of file
diff --git a/symbols/Wasserrettung_Fahrzeuge/Schlauchboot.j2 b/symbols/Wasserrettung_Fahrzeuge/Schlauchboot.j2
new file mode 100644
index 00000000..aef2f680
--- /dev/null
+++ b/symbols/Wasserrettung_Fahrzeuge/Schlauchboot.j2
@@ -0,0 +1,17 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
+	<title>Schlauchboot</title>
+	<defs>
+		<style type="text/css">
+		{% include './fonts/fonts.j2' %}
+		</style>
+		<clipPath id="symbol">
+			<path d="M10,64 l236,0 A118,118 180 0 1 10,64 Z" />
+		</clipPath>
+	</defs>
+
+	<path d="M10,64 l236,0 A118,118 180 0 1 10,64 Z" stroke="#000000" fill="#FFFFFF" stroke-width="10" clip-path="url(#symbol)" />
+	<path d="M10,64 l236,0 A118,118 180 0 1 10,64 Z" stroke="#000000" fill="none" stroke-width="1" clip-path="url(#symbol)" />
+
+	<text x="128" y="110" style="font-family: 'Roboto Slab'; font-weight: bold; font-size: 30px; text-anchor: middle;" fill="#000000">SchlB</text>
+</svg>
\ No newline at end of file
diff --git "a/symbols/Wasserrettung_Geb\303\244ude/Wasserrettungssstation.j2" "b/symbols/Wasserrettung_Geb\303\244ude/Wasserrettungssstation.j2"
new file mode 100644
index 00000000..ff1b1b90
--- /dev/null
+++ "b/symbols/Wasserrettung_Geb\303\244ude/Wasserrettungssstation.j2"
@@ -0,0 +1,15 @@
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewbox="0 0 256 256">
+	<title>Wasserrettungsstation</title>
+	<defs>
+		<clipPath id="symbol">
+			<path d="M10 64 L10 192 L246 192 L246 64 L128 16 L10 64 Z" />
+		</clipPath>
+	</defs>
+	<rect x="10" y="64" width="236" height="128" fill="#FFFFFF" stroke="#000000" stroke-width="10" clip-path="url(#symbol)" />
+	<path d="M10 64 L128 16 L246 64" stroke="#000000" stroke-width="10" fill="#FFFFFF" clip-path="url(#symbol)" />
+	
+	<path d="M128 120 l24 24 l-24 24 l-24 -24 l24 -24 Z" stroke-width="5" stroke="#000000" fill="none" />
+	<path d="M96 112 c 7,0 7,-12 16,-12 8,0 8,12 16,12 8,0 8,-12 16,-12 9,0 9,12 16,12" fill="none" stroke="#000000" stroke-width="5" />
+	<path d="M96 100 c 7,0 7,-12 16,-12 8,0 8,12 16,12 8,0 8,-12 16,-12 9,0 9,12 16,12" fill="none" stroke="#000000" stroke-width="5" />
+</svg>
\ No newline at end of file
diff --git a/symbols/Wasserrettung_Personen/Einsatzleitersdienst.j2 b/symbols/Wasserrettung_Personen/Einsatzleiter_Wasserrettungsdienst.j2
similarity index 100%
rename from symbols/Wasserrettung_Personen/Einsatzleitersdienst.j2
rename to symbols/Wasserrettung_Personen/Einsatzleiter_Wasserrettungsdienst.j2