diff --git a/android/sdk/src/main/res/values-de/types_strings.xml b/android/sdk/src/main/res/values-de/types_strings.xml
index 9da61de53..275d638d3 100644
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -27,6 +27,7 @@
Sitzbank
Sitzbank ohne Rückenlehne
Fahrradständer
+ Bootsverleih
Fahrradverleih
Fahrrad-Reparaturstation
Bordell
diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml
index 2381d0deb..71c92366c 100644
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -30,6 +30,7 @@
Backless Bench
Bicycle Parking
Covered Bicycle Parking
+ Boat Rental
Bicycle Rental
Bicycle Repair Station
Biergarten
diff --git a/data/categories-strings/en.json/localize.json b/data/categories-strings/en.json/localize.json
index ace255127..808ae5f7d 100644
--- a/data/categories-strings/en.json/localize.json
+++ b/data/categories-strings/en.json/localize.json
@@ -129,6 +129,7 @@
"leisure-garden": "3Garden",
"leisure-firepit": "5Firepit",
"amenity-bench|amenity-bench-backless": "Bench",
+"amenity-boat_rental": "4Boat Rental|boat|3rental",
"amenity-bicycle_rental": "4Bicycle Rental|cycle|bike|3rental|U+1F6B2|U+1F6B4|U+1F6B5|bicycle hire|bike rental",
"amenity-bicycle_repair_station": "4Bicycle Repair Station|cycle|bike|4repair of bicycles",
"amenity-car_sharing": "Car Share|3carsharing|car|sharing|U+1F697|U+1F698|U+1F699|carpool|carsharing services|car sharing|4rideshare",
diff --git a/data/editor.config b/data/editor.config
index 5c9565f2f..1c251478c 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -258,6 +258,10 @@
+
+
+
+
@@ -1126,6 +1130,7 @@
+
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 46f638f3b..18a5c6a1d 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -988,7 +988,7 @@ natural|salt_pond;861;landuse|salt_pond
amenity|conference_centre;862;
amenity|exhibition_centre;863;
deprecated:railway|siding|tunnel:06.2023;864;x
-deprecated:railway|yard|tunnel:06.2023;865;x
+amenity|boat_rental;865;
area:highway|footway;866;
junction|circular;867;
area:highway|residential;868;
diff --git a/data/styles/default/dark/symbols/boat_rental-m.svg b/data/styles/default/dark/symbols/boat_rental-m.svg
new file mode 100644
index 000000000..d1d603eb8
--- /dev/null
+++ b/data/styles/default/dark/symbols/boat_rental-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/marina-m.svg b/data/styles/default/dark/symbols/marina-m.svg
index a32e0ff4e..8f56cb5c8 100644
--- a/data/styles/default/dark/symbols/marina-m.svg
+++ b/data/styles/default/dark/symbols/marina-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/slipway-m.svg b/data/styles/default/dark/symbols/slipway-m.svg
new file mode 100644
index 000000000..a0991f96a
--- /dev/null
+++ b/data/styles/default/dark/symbols/slipway-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 1a07fac18..ef909b251 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -865,9 +865,11 @@ node|z17-[amenity=vending_machine][vending=parking_tickets],
node|z17-[amenity=vending_machine][vending=public_transport_tickets],
node|z17-[amenity=payment_terminal],
node|z17-[amenity=shower],
+node|z17-[amenity=slipway],
node|z17-[amenity=motorcycle_rental],
node|z17-[amenity=bicycle_rental],
node|z17-[amenity=bicycle_repair_station],
+node|z17-[amenity=boat_rental],
node|z17-[amenity=post_office],
node|z17-[amenity=library],
node|z18-[post_office=post_partner],
@@ -1472,6 +1474,11 @@ node|z17-[amenity=motorcycle_rental],
node|z18-[amenity=motorcycle_rental],
{font-size: 11;}
+node|z17-[amenity=boat_rental],
+{icon-image: boat-rental.svg;}
+node|z18-[amenity=boat_rental],
+{font-size: 11;}
+
node|z17-[amenity=bicycle_rental],
{icon-image: bicycle-rental.svg;}
node|z18-[amenity=bicycle_rental],
@@ -1540,6 +1547,9 @@ node|z15-[power=plant][plant:source=wind],
node|z16-[power=plant][plant:source=wind],
{text: name;text-color: @neutral_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light; text-offset: 1; font-size: 10;}
+node|z17-[leisure=slipway],
+{icon-image: slipway-m.svg;}
+
node|z17-[amenity=shower],
{icon-image: shower-m.svg;}
diff --git a/data/styles/default/include/Icons_Label_Colors.mapcss b/data/styles/default/include/Icons_Label_Colors.mapcss
index 15df65027..5ec04761e 100644
--- a/data/styles/default/include/Icons_Label_Colors.mapcss
+++ b/data/styles/default/include/Icons_Label_Colors.mapcss
@@ -1,6 +1,7 @@
/* Setting the colors for all POI icons */
/* Please add new items so that they fit in the existing alphabetical order */
+node[amenity=boat_rental],
node[amenity=car_rental],
node[amenity=car_sharing],
node[amenity=internet_cafe],
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 9f0a80bb6..e22ce5cef 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -773,6 +773,7 @@ shop-health_food # icon z16- (also has captio
=== 2700
amenity-bicycle_rental # icon z17- (also has caption(optional) z17-)
+amenity-boat_rental # icon z17- (also has caption(optional) z17-)
amenity-car_sharing # icon z18- (also has caption(optional) z18-)
amenity-taxi # icon z16- (also has caption(optional) z16-)
=== 2600
@@ -1318,7 +1319,7 @@ landuse-railway # caption z15- (also has are
landuse-residential # caption z17-
landuse-retail # caption z16- (also has area z13-)
leisure-common # caption z17-
-leisure-slipway # caption z17-
+leisure-slipway # icon z17- (also has caption(optional) z17-)
leisure-track # caption z16- (also has line z15-)
leisure-track-area # caption z16- (also has area z15-)
man_made-petroleum_well # icon z17- (also has caption(optional) z18-)
@@ -1812,6 +1813,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# === -7300
# amenity-bicycle_rental # caption(optional) z17- (also has icon z17-)
+# amenity-boat_rental # caption(optional) z17- (also has icon z17-)
# amenity-car_sharing # caption(optional) z18- (also has icon z18-)
# amenity-taxi # caption(optional) z16- (also has icon z16-)
# === -7400
@@ -2282,6 +2284,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# landuse-industrial-mine # caption(optional) z15- (also has icon z15-, area z13-)
# landuse-landfill # caption(optional) z15- (also has icon z15-, area z13-)
# landuse-quarry # caption(optional) z15- (also has icon z15-, area z13-)
+# leisure-slipway # caption(optional) z17- (also has icon z17-)
# man_made-petroleum_well # caption(optional) z18- (also has icon z17-)
# power-generator-wind # caption(optional) z18- (also has icon z15-, area z13-)
# === -9880
diff --git a/data/styles/default/light/symbols/boat_rental-m.svg b/data/styles/default/light/symbols/boat_rental-m.svg
new file mode 100644
index 000000000..c1e64b03e
--- /dev/null
+++ b/data/styles/default/light/symbols/boat_rental-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/marina-m.svg b/data/styles/default/light/symbols/marina-m.svg
index ed4323c67..43c280858 100644
--- a/data/styles/default/light/symbols/marina-m.svg
+++ b/data/styles/default/light/symbols/marina-m.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/slipway-m.svg b/data/styles/default/light/symbols/slipway-m.svg
new file mode 100644
index 000000000..2893bcd9b
--- /dev/null
+++ b/data/styles/default/light/symbols/slipway-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 140570f49..911edcbeb 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -773,6 +773,7 @@ shop-health_food # icon z16- (also has captio
=== 2700
amenity-bicycle_rental # icon z17- (also has caption(optional) z17-)
+amenity-boat_rental # icon z17- (also has caption(optional) z17-)
amenity-car_sharing # icon z18- (also has caption(optional) z18-)
amenity-taxi # icon z16- (also has caption(optional) z16-)
=== 2600
@@ -1321,7 +1322,7 @@ landuse-railway # caption z15- (also has are
landuse-residential # caption z17-
landuse-retail # caption z16- (also has area z13-)
leisure-common # caption z17-
-leisure-slipway # caption z17-
+leisure-slipway # icon z17- (also has caption(optional) z17-)
leisure-track # caption z16- (also has line z15-)
leisure-track-area # caption z16- (also has area z15-)
man_made-petroleum_well # icon z14- (also has caption(optional) z18-)
@@ -1815,6 +1816,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# === -7300
# amenity-bicycle_rental # caption(optional) z17- (also has icon z17-)
+# amenity-boat_rental # caption(optional) z17- (also has icon z17-)
# amenity-car_sharing # caption(optional) z18- (also has icon z18-)
# amenity-taxi # caption(optional) z16- (also has icon z16-)
# === -7400
@@ -2288,6 +2290,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# landuse-industrial-mine # caption(optional) z15- (also has icon z15-, area z13-)
# landuse-landfill # caption(optional) z15- (also has icon z15-, area z13-)
# landuse-quarry # caption(optional) z15- (also has icon z15-, area z13-)
+# leisure-slipway # caption(optional) z17- (also has icon z17-)
# man_made-petroleum_well # caption(optional) z18- (also has icon z14-)
# power-generator-wind # caption(optional) z16- (also has icon z13-, area z13-)
# === -9880
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
index e9ea9ab3b..3e649eef9 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -26,6 +26,7 @@
"type.amenity.bench" = "Sitzbank";
"type.amenity.bench.backless" = "Sitzbank ohne Rückenlehne";
"type.amenity.bicycle_parking" = "Fahrradständer";
+"type.amenity.boat_rental" = "Bootsverleih";
"type.amenity.bicycle_rental" = "Fahrradverleih";
"type.amenity.bicycle_repair_station" = "Fahrrad-Reparaturstation";
"type.amenity.biergarten" = "Biergarten";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
index 844d19345..d4a819650 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
@@ -26,6 +26,7 @@
"type.amenity.bench" = "Bench";
"type.amenity.bench.backless" = "Backless Bench";
"type.amenity.bicycle_parking" = "Bicycle Parking";
+"type.amenity.boat_rental" = "Boat Rental";
"type.amenity.bicycle_rental" = "Bicycle Rental";
"type.amenity.bicycle_repair_station" = "Bicycle Repair Station";
"type.amenity.biergarten" = "Biergarten";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index 7be7fac7a..631b0e284 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -31,6 +31,7 @@
"type.amenity.bench.backless" = "Backless Bench";
"type.amenity.bicycle_parking" = "Bicycle Parking";
"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
+"type.amenity.boat_rental" = "Boat Rental";
"type.amenity.bicycle_rental" = "Bicycle Rental";
"type.amenity.bicycle_repair_station" = "Bicycle Repair Station";
"type.amenity.biergarten" = "Biergarten";