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 e7d675476..6ba60865c 100644
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -349,7 +349,12 @@
Eingang
Haupteingang
- Ausgang
+ Hauseingang
+ Garageneingang
+ Serviceeingang
+ (Nur) Eingang
+ (Nur) Ausgang
+ Notausgang
Kostenlos
Medizinisches Labor
Physiotherapie
diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml
index b034ee350..479a8e9fc 100644
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -383,7 +383,12 @@
Entrance
Main Entrance
- Exit
+ House Entrance
+ Garage Entrance
+ Service Entrance
+ Entry (Only)
+ Exit (Only)
+ Emergency Exit
$
Free
Medical Laboratory
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 87d969254..8af466b1b 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -462,7 +462,7 @@ place|country;349;
deprecated:highway|path|alpine_hiking:04.2024;[highway=path][sac_scale=alpine_hiking];x;name;int_name;350;highway|path|expert
tourism|zoo|petting;[tourism=zoo][zoo=petting_zoo];;name;int_name;351;
sport|scuba_diving;352;
-deprecated:highway|cycleway|permissive:12.2023;[highway=cycleway][access=permissive];x;name;int_name;353;highway|cycleway
+entrance|emergency;[entrance=emergency],[exit=emergency];;name;int_name;353;
highway|unclassified|area;[highway=unclassified][area?];;name;int_name;354;
natural|volcano;355;
amenity|parking|underground|fee;[amenity=parking][location=underground][fee],[amenity=parking][parking=underground][fee];;name;int_name;356;
@@ -564,8 +564,8 @@ deprecated:railway|yard:06.2023;447;x
natural|water|ditch;[natural=water][water=ditch];;name;int_name;448;
natural|water|moat;[natural=water][water=moat];;name;int_name;449;
natural|water|wastewater;[natural=water][water=wastewater];;name;int_name;450;
-deprecated:railway|razed:06.2023;451;x
-deprecated:highway|footway|demanding_mountain_hiking:04.2024;[highway=footway][sac_scale=demanding_mountain_hiking];x;name;int_name;452;highway|path|difficult
+entrance|service;451;
+entrance|entry;[entrance=entrance];;ref;addr:flats;452;
amenity|shelter|basic_hut;[amenity=shelter][shelter_type=basic_hut];;name;int_name;453;
amenity|shelter|lean_to;[amenity=shelter][shelter_type=lean_to];;name;int_name;454;
landuse|orchard;455;
@@ -1117,8 +1117,8 @@ junction|roundabout;990;
highway|speed_camera;991;
shop|beauty;992;
shop|sports;993;
-deprecated:route|ferry|motor_vehicle:09.2021;[route=ferry][motor_vehicle];x;name;int_name;994;route|ferry
-deprecated:railway|rail|motor_vehicle:06.2023;[railway=rail][motor_vehicle],[railway=rail][motorcar];x;name;int_name;995;railway|rail
+entrance|house;[entrance=home],[entrance=staircase];;ref;addr:flats;994;
+entrance|garage;[entrance=garage];;ref;addr:flats;995;
hwtag|nofoot;996;
place|city|capital|2;[place=city][capital=2],[place=city][capital?][admin_level=2];;name;int_name;997;
place|city|capital|3;[place=city][capital=3],[place=city][capital?][admin_level=3];;name;int_name;998;
diff --git a/data/styles/default/dark/symbols/emergency-exit-m.svg b/data/styles/default/dark/symbols/emergency-exit-m.svg
new file mode 100644
index 000000000..94156d225
--- /dev/null
+++ b/data/styles/default/dark/symbols/emergency-exit-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/entrance-barrier-m.svg b/data/styles/default/dark/symbols/entrance-barrier-m.svg
new file mode 100644
index 000000000..7b475739c
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-barrier-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/entrance-barrier-s.svg b/data/styles/default/dark/symbols/entrance-barrier-s.svg
deleted file mode 100644
index 1bede73f3..000000000
--- a/data/styles/default/dark/symbols/entrance-barrier-s.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
diff --git a/data/styles/default/dark/symbols/entrance-barrier-xs.svg b/data/styles/default/dark/symbols/entrance-barrier-xs.svg
new file mode 100644
index 000000000..d9cf3e2ac
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-barrier-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/entrance-emergency-m.svg b/data/styles/default/dark/symbols/entrance-emergency-m.svg
new file mode 100644
index 000000000..dccd04d76
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-emergency-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/entrance-emergency-s.svg b/data/styles/default/dark/symbols/entrance-emergency-s.svg
deleted file mode 100644
index 72029679b..000000000
--- a/data/styles/default/dark/symbols/entrance-emergency-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/data/styles/default/dark/symbols/entrance-emergency-xs.svg b/data/styles/default/dark/symbols/entrance-emergency-xs.svg
new file mode 100644
index 000000000..af4d8b36c
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-emergency-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/entrance-entry-m.svg b/data/styles/default/dark/symbols/entrance-entry-m.svg
new file mode 100644
index 000000000..73495b2ef
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-entry-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/entrance-entry-xs.svg b/data/styles/default/dark/symbols/entrance-entry-xs.svg
new file mode 100644
index 000000000..4f4f87b94
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-entry-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/entrance-exit-m.svg b/data/styles/default/dark/symbols/entrance-exit-m.svg
new file mode 100644
index 000000000..e1b8aa976
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-exit-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/entrance-exit-s.svg b/data/styles/default/dark/symbols/entrance-exit-s.svg
deleted file mode 100644
index eefebd408..000000000
--- a/data/styles/default/dark/symbols/entrance-exit-s.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
diff --git a/data/styles/default/dark/symbols/entrance-exit-xs.svg b/data/styles/default/dark/symbols/entrance-exit-xs.svg
new file mode 100644
index 000000000..1944faf30
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-exit-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/entrance-m.svg b/data/styles/default/dark/symbols/entrance-m.svg
new file mode 100644
index 000000000..bfeafd0c5
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/entrance-main-m.svg b/data/styles/default/dark/symbols/entrance-main-m.svg
new file mode 100644
index 000000000..5085ae457
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-main-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/entrance-main-s.svg b/data/styles/default/dark/symbols/entrance-main-s.svg
deleted file mode 100644
index 4a3d4faec..000000000
--- a/data/styles/default/dark/symbols/entrance-main-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/data/styles/default/dark/symbols/entrance-main-xs.svg b/data/styles/default/dark/symbols/entrance-main-xs.svg
new file mode 100644
index 000000000..cb6b813c6
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-main-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/entrance-s.svg b/data/styles/default/dark/symbols/entrance-s.svg
deleted file mode 100644
index 8bfcb8933..000000000
--- a/data/styles/default/dark/symbols/entrance-s.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
diff --git a/data/styles/default/dark/symbols/entrance-service-m.svg b/data/styles/default/dark/symbols/entrance-service-m.svg
new file mode 100644
index 000000000..08efa0b8e
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-service-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/entrance-service-xs.svg b/data/styles/default/dark/symbols/entrance-service-xs.svg
new file mode 100644
index 000000000..24c52aa65
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-service-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/entrance-xs.svg b/data/styles/default/dark/symbols/entrance-xs.svg
new file mode 100644
index 000000000..7b785b066
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/square-m.svg b/data/styles/default/dark/symbols/square-m.svg
deleted file mode 100644
index be4d751da..000000000
--- a/data/styles/default/dark/symbols/square-m.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss
index c69da61f9..996c85e07 100644
--- a/data/styles/default/include/Basemap_label.mapcss
+++ b/data/styles/default/include/Basemap_label.mapcss
@@ -666,12 +666,17 @@ node|z16-[addr:housenumber][addr:street]::int_name,
node|z18-[entrance=main],
node|z18-[emergency=emergency_ward_entrance],
-node|z19-[entrance],
+node|z19-[entrance!=emergency],
+node|z19-[entrance=entry],
node|z19-[entrance=exit],
+node|z19-[entrance=house],
+node|z19-[entrance=service],
node|z19-[amenity=loading_dock],
+node|z20-[entrance=emergency],
{text: name; text-color: @building_label;}
node|z18-[entrance=main]::flats,
-node|z19-[entrance]::flats,
+node|z19-[entrance!=emergency]::flats,
+node|z19-[entrance=entry]::flats,
node|z19-[entrance=exit]::flats,
{text: int_name; text-color: @building_label; font-size: 8; text-offset: 1;}
@@ -706,21 +711,39 @@ node|z18-[addr:housenumber][addr:street],
node|z16-[addr:housenumber][addr:street]::int_name,
{font-size: 8;}
-node|z17[entrance],
-node|z18[amenity=loading_dock],
-node|z16[entrance=main],
-node|z16[emergency=emergency_ward_entrance],
-{icon-image: square-m.svg;}
+node|z17-[entrance],
+{icon-image: entrance-xs.svg;}
+node|z17[entrance=entrance],
+{icon-image: entrance-entry-xs.svg;}
+node|z17[entrance=exit],
+{icon-image: entrance-exit-xs.svg;}
+node|z17-[entrance=main],
+{icon-image: entrance-main-xs.svg;}
+node|z16-[emergency=emergency_ward_entrance],
+{icon-image: entrance-emergency-xs.svg;}
node|z18-[entrance],
-node|z19-[amenity=loading_dock],
-{icon-image: entrance-s.svg; font-size: 10; text-offset: 1;}
+{icon-image: entrance-m.svg; font-size: 10; text-offset: 1;}
+node|z18-[entrance=entrance],
+{icon-image: entrance-entry-m.svg; font-size: 10; text-offset: 1;}
node|z18-[entrance=exit],
-{icon-image: entrance-exit-s.svg; font-size: 10; text-offset: 1;}
-node|z17-[entrance=main],
-{icon-image: entrance-main-s.svg; font-size: 10; text-offset: 1;}
-node|z17-[emergency=emergency_ward_entrance],
-{icon-image: entrance-emergency-s.svg; font-size: 10; text-offset: 1;}
+{icon-image: entrance-exit-m.svg; font-size: 10; text-offset: 1;}
+node|z18-[entrance=main],
+{icon-image: entrance-main-m.svg; font-size: 10; text-offset: 1;}
+node|z18-[emergency=emergency_ward_entrance],
+{icon-image: entrance-emergency-m.svg; font-size: 10; text-offset: 1;}
+node|z19-[entrance=service],
+node|z19-[amenity=loading_dock],
+{icon-image: entrance-service-m.svg; font-size: 10; text-offset: 1;}
+node|z20-[entrance=emergency],
+{icon-image: emergency-exit-m.svg; font-size: 10; text-offset: 1;}
+
+node|z17[entrance=home],
+node|z17[entrance=staircase],
+node|z17-18[entrance=garage],
+node|z17-18[entrance=service],
+node|z17-19[entrance=emergency],
+{icon-image: none;}
/* 8.3 Airports */
area|z14-[aeroway=terminal]
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 9ab821096..4c73b7a9f 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -1363,7 +1363,7 @@ node|z17-[barrier=wicket_gate],
{icon-image: dot-m.svg;font-size: 11;}
node|z16-[barrier=entrance],
-{icon-image: entrance-barrier-s.svg; font-size: 11;}
+{icon-image: entrance-barrier-xs.svg; font-size: 11;}
node|z17-[highway=ladder],
{icon-image: ladder-m.svg;font-size: 11;}
@@ -1544,7 +1544,7 @@ node|z17-[amenity=telephone]
{icon-image: phone-m.svg;}
node|z17-[emergency=phone]
-{icon-image: emergency-phone-m.svg;}
+{icon-image: emergency-phone-m.svg; text-offset: 1;}
node|z16-[amenity=recycling][recycling_type=centre],
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 287050960..dd4790333 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -1296,9 +1296,15 @@ power-plant-wind # icon z15- (also has captio
=== 230
barrier-entrance # icon z16- (also has caption(optional) z16-)
-entrance-main # icon z16- (also has caption(optional) z18-)
+entrance-main # icon z17- (also has caption(optional) z18-)
+=== 225
+
+entrance # icon z17- (also has caption(optional) z19-)
+entrance-entry # icon z17- (also has caption(optional) z19-)
+entrance-exit # icon z17- (also has caption(optional) z19-)
=== 220
+entrance-emergency # icon z20- (also has caption(optional) z20-)
highway-traffic_signals # icon z19-
=== 215
@@ -2286,9 +2292,17 @@ leisure-swimming_pool-private # icon z17- (also has captio
# === -9770
# barrier-entrance # caption(optional) z16- (also has icon z16-)
-# entrance-main # caption(optional) z18- (also has icon z16-)
+# entrance-main # caption(optional) z18- (also has icon z17-)
+# === -9775
+
+# entrance # caption(optional) z19- (also has icon z17-)
+# entrance-entry # caption(optional) z19- (also has icon z17-)
+# entrance-exit # caption(optional) z19- (also has icon z17-)
# === -9780
+# entrance-emergency # caption(optional) z20- (also has icon z20-)
+# === -9785
+
# historic-anchor # caption(optional) z18- (also has icon z18-)
# historic-cannon # caption(optional) z18- (also has icon z18-)
# historic-memorial-plaque # caption(optional) z18- (also has icon z18-)
@@ -2330,11 +2344,14 @@ tourism-information # icon z16- (also has captio
tourism-information-board # icon z16- (also has caption(optional) z16-)
tourism-information-guidepost # icon z16- (also has caption(optional) z16-)
tourism-information-map # icon z16- (also has caption(optional) z16-)
-=== -9950
+=== -9940
amenity # caption z19-
amenity-telephone # icon z17- (also has caption(optional) z19-)
-entrance # icon z17- (also has caption(optional) z19-)
+entrance-house # icon z19- (also has caption(optional) z19-)
+=== -9950
+
+entrance-garage # icon z19- (also has caption(optional) z19-)
=== -9960
amenity-food_sharing # icon z18- (also has caption(optional) z18-)
@@ -2363,7 +2380,7 @@ amenity-lounger # icon z18- (also has captio
amenity-waste_disposal # icon z18- (also has caption(optional) z18-)
emergency-assembly_point # icon z18- (also has caption(optional) z18-)
emergency-defibrillator # icon z18- (also has caption(optional) z18-)
-emergency-phone # icon z17-
+emergency-phone # icon z17- (also has caption(optional) z19-)
man_made-telescope # icon z18- (also has caption(optional) z18-)
=== -9980
@@ -2376,8 +2393,8 @@ power-substation # icon z17- (also has captio
# amenity-bench-backless # caption(optional) z19- (also has icon z18-)
# amenity-food_sharing # caption(optional) z18- (also has icon z18-)
# amenity-give_box # caption(optional) z18- (also has icon z18-)
-amenity-loading_dock # icon z18- (also has caption(optional) z19-)
-# amenity-loading_dock # caption(optional) z19- (also has icon z18-)
+amenity-loading_dock # icon z19- (also has caption(optional) z19-)
+# amenity-loading_dock # caption(optional) z19- (also has icon z19-)
# amenity-lounger # caption(optional) z19- (also has icon z18-)
# amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-)
# amenity-telephone # caption(optional) z19- (also has icon z17-)
@@ -2395,9 +2412,11 @@ amenity-loading_dock # icon z18- (also has captio
# emergency-assembly_point # caption(optional) z18- (also has icon z18-)
# emergency-defibrillator # caption(optional) z18- (also has icon z18-)
# emergency-fire_hydrant # caption(optional) z19- (also has icon z19-)
-# entrance # caption(optional) z19- (also has icon z17-)
-entrance-exit # icon z17- (also has caption(optional) z19-)
-# entrance-exit # caption(optional) z19- (also has icon z17-)
+# emergency-phone # caption(optional) z19- (also has icon z17-)
+# entrance-garage # caption(optional) z19- (also has icon z19-)
+# entrance-house # caption(optional) z19- (also has icon z19-)
+entrance-service # icon z19- (also has caption(optional) z19-)
+# entrance-service # caption(optional) z19- (also has icon z19-)
# man_made-cairn # caption(optional) z19- (also has icon z19-)
# man_made-survey_point # caption(optional) z18- (also has icon z18-)
# man_made-telescope # caption(optional) z18- (also has icon z18-)
diff --git a/data/styles/default/light/symbols/emergency-exit-m.svg b/data/styles/default/light/symbols/emergency-exit-m.svg
new file mode 100644
index 000000000..1a49b42db
--- /dev/null
+++ b/data/styles/default/light/symbols/emergency-exit-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/entrance-barrier-m.svg b/data/styles/default/light/symbols/entrance-barrier-m.svg
new file mode 100644
index 000000000..a9b4977d2
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-barrier-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/entrance-barrier-s.svg b/data/styles/default/light/symbols/entrance-barrier-s.svg
deleted file mode 100644
index 1e4b437ed..000000000
--- a/data/styles/default/light/symbols/entrance-barrier-s.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
diff --git a/data/styles/default/light/symbols/entrance-barrier-xs.svg b/data/styles/default/light/symbols/entrance-barrier-xs.svg
new file mode 100644
index 000000000..4319c3a94
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-barrier-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/entrance-emergency-m.svg b/data/styles/default/light/symbols/entrance-emergency-m.svg
new file mode 100644
index 000000000..ef1dbcf5a
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-emergency-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/entrance-emergency-s.svg b/data/styles/default/light/symbols/entrance-emergency-s.svg
deleted file mode 100644
index 3c42eafed..000000000
--- a/data/styles/default/light/symbols/entrance-emergency-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/data/styles/default/light/symbols/entrance-emergency-xs.svg b/data/styles/default/light/symbols/entrance-emergency-xs.svg
new file mode 100644
index 000000000..6091aee35
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-emergency-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/entrance-entry-m.svg b/data/styles/default/light/symbols/entrance-entry-m.svg
new file mode 100644
index 000000000..9cde79c9c
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-entry-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/entrance-entry-xs.svg b/data/styles/default/light/symbols/entrance-entry-xs.svg
new file mode 100644
index 000000000..e9f23e86d
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-entry-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/entrance-exit-m.svg b/data/styles/default/light/symbols/entrance-exit-m.svg
new file mode 100644
index 000000000..cad2be484
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-exit-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/entrance-exit-s.svg b/data/styles/default/light/symbols/entrance-exit-s.svg
deleted file mode 100644
index c9b6c1a6b..000000000
--- a/data/styles/default/light/symbols/entrance-exit-s.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
diff --git a/data/styles/default/light/symbols/entrance-exit-xs.svg b/data/styles/default/light/symbols/entrance-exit-xs.svg
new file mode 100644
index 000000000..4f3c60f5a
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-exit-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/entrance-m.svg b/data/styles/default/light/symbols/entrance-m.svg
new file mode 100644
index 000000000..9701d9d6a
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/entrance-main-m.svg b/data/styles/default/light/symbols/entrance-main-m.svg
new file mode 100644
index 000000000..b476a24ca
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-main-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/entrance-main-s.svg b/data/styles/default/light/symbols/entrance-main-s.svg
deleted file mode 100644
index 1ce9334c7..000000000
--- a/data/styles/default/light/symbols/entrance-main-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
diff --git a/data/styles/default/light/symbols/entrance-main-xs.svg b/data/styles/default/light/symbols/entrance-main-xs.svg
new file mode 100644
index 000000000..f3cbfe19b
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-main-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/entrance-s.svg b/data/styles/default/light/symbols/entrance-s.svg
deleted file mode 100644
index a9020b79a..000000000
--- a/data/styles/default/light/symbols/entrance-s.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
diff --git a/data/styles/default/light/symbols/entrance-service-m.svg b/data/styles/default/light/symbols/entrance-service-m.svg
new file mode 100644
index 000000000..0e4087572
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-service-m.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/entrance-service-xs.svg b/data/styles/default/light/symbols/entrance-service-xs.svg
new file mode 100644
index 000000000..fda59bc4e
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-service-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/entrance-xs.svg b/data/styles/default/light/symbols/entrance-xs.svg
new file mode 100644
index 000000000..242c59888
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-xs.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/data/styles/default/light/symbols/square-m.svg b/data/styles/default/light/symbols/square-m.svg
deleted file mode 100644
index 3aa3b21de..000000000
--- a/data/styles/default/light/symbols/square-m.svg
+++ /dev/null
@@ -1 +0,0 @@
-
\ 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 dd6dd245a..60e0afe09 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1299,9 +1299,15 @@ power-pole # icon z15-
=== 230
barrier-entrance # icon z16- (also has caption(optional) z16-)
-entrance-main # icon z16- (also has caption(optional) z18-)
+entrance-main # icon z17- (also has caption(optional) z18-)
+=== 225
+
+entrance # icon z17- (also has caption(optional) z19-)
+entrance-entry # icon z17- (also has caption(optional) z19-)
+entrance-exit # icon z17- (also has caption(optional) z19-)
=== 220
+entrance-emergency # icon z20- (also has caption(optional) z20-)
highway-traffic_signals # icon z19-
=== 215
@@ -2292,9 +2298,17 @@ leisure-swimming_pool-private # icon z17- (also has captio
# === -9770
# barrier-entrance # caption(optional) z16- (also has icon z16-)
-# entrance-main # caption(optional) z18- (also has icon z16-)
+# entrance-main # caption(optional) z18- (also has icon z17-)
+# === -9775
+
+# entrance # caption(optional) z19- (also has icon z17-)
+# entrance-entry # caption(optional) z19- (also has icon z17-)
+# entrance-exit # caption(optional) z19- (also has icon z17-)
# === -9780
+# entrance-emergency # caption(optional) z20- (also has icon z20-)
+# === -9785
+
# historic-anchor # caption(optional) z18- (also has icon z18-)
# historic-cannon # caption(optional) z18- (also has icon z18-)
# historic-memorial-plaque # caption(optional) z18- (also has icon z18-)
@@ -2336,11 +2350,14 @@ tourism-information # icon z15- (also has captio
tourism-information-board # icon z15- (also has caption(optional) z15-)
tourism-information-guidepost # icon z15- (also has caption(optional) z15-)
tourism-information-map # icon z15- (also has caption(optional) z15-)
-=== -9950
+=== -9940
amenity # caption z19-
amenity-telephone # icon z17- (also has caption(optional) z19-)
-entrance # icon z17- (also has caption(optional) z19-)
+entrance-house # icon z19- (also has caption(optional) z19-)
+=== -9950
+
+entrance-garage # icon z19- (also has caption(optional) z19-)
=== -9960
amenity-food_sharing # icon z18- (also has caption(optional) z18-)
@@ -2369,7 +2386,7 @@ amenity-lounger # icon z18- (also has captio
amenity-waste_disposal # icon z18- (also has caption(optional) z18-)
emergency-assembly_point # icon z18- (also has caption(optional) z18-)
emergency-defibrillator # icon z18- (also has caption(optional) z18-)
-emergency-phone # icon z17-
+emergency-phone # icon z17- (also has caption(optional) z19-)
man_made-telescope # icon z18- (also has caption(optional) z18-)
=== -9980
@@ -2382,8 +2399,8 @@ power-substation # icon z17- (also has captio
# amenity-bench-backless # caption(optional) z19- (also has icon z18-)
# amenity-food_sharing # caption(optional) z18- (also has icon z18-)
# amenity-give_box # caption(optional) z18- (also has icon z18-)
-amenity-loading_dock # icon z18- (also has caption(optional) z19-)
-# amenity-loading_dock # caption(optional) z19- (also has icon z18-)
+amenity-loading_dock # icon z19- (also has caption(optional) z19-)
+# amenity-loading_dock # caption(optional) z19- (also has icon z19-)
# amenity-lounger # caption(optional) z19- (also has icon z18-)
# amenity-parking_space-disabled # caption(optional) z19- (also has icon z18-)
# amenity-telephone # caption(optional) z19- (also has icon z17-)
@@ -2401,9 +2418,11 @@ amenity-loading_dock # icon z18- (also has captio
# emergency-assembly_point # caption(optional) z18- (also has icon z18-)
# emergency-defibrillator # caption(optional) z18- (also has icon z18-)
# emergency-fire_hydrant # caption(optional) z19- (also has icon z19-)
-# entrance # caption(optional) z19- (also has icon z17-)
-entrance-exit # icon z17- (also has caption(optional) z19-)
-# entrance-exit # caption(optional) z19- (also has icon z17-)
+# emergency-phone # caption(optional) z19- (also has icon z17-)
+# entrance-garage # caption(optional) z19- (also has icon z19-)
+# entrance-house # caption(optional) z19- (also has icon z19-)
+entrance-service # icon z19- (also has caption(optional) z19-)
+# entrance-service # caption(optional) z19- (also has icon z19-)
# man_made-cairn # caption(optional) z17- (also has icon z17-)
# man_made-survey_point # caption(optional) z15- (also has icon z14-)
# man_made-telescope # caption(optional) z18- (also has icon z18-)
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index 3ebe94a48..071efc7cc 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -757,11 +757,19 @@ building-has_parts # caption z18- (also has are
building-garage # caption z18- (also has area z15-)
building-guardhouse # icon z18- (also has area z15-)
-=== 30
+=== 40
entrance-main # icon z18- (also has caption(optional) z18-)
+=== 30
+
+entrance # icon z19- (also has caption(optional) z19-)
+entrance-entry # icon z19- (also has caption(optional) z19-)
+entrance-exit # icon z19- (also has caption(optional) z19-)
=== 20
+entrance-emergency # icon z19- (also has caption(optional) z19-)
+=== 10
+
#
# All automatic optional captions priorities are below 0.
# They follow the order of their correspoding icons.
@@ -1232,13 +1240,27 @@ entrance-main # icon z18- (also has captio
# leisure-park-private # caption(optional) z14- (also has icon z14-, area z10-)
# === -9900
+entrance-garage # icon z19- (also has caption(optional) z19-)
+=== -9910
+
+entrance-house # icon z19- (also has caption(optional) z19-)
+=== -9920
+
# entrance-main # caption(optional) z18- (also has icon z18-)
+# === -9970
+
+# entrance # caption(optional) z19- (also has icon z19-)
+# entrance-entry # caption(optional) z19- (also has icon z19-)
+# entrance-exit # caption(optional) z19- (also has icon z19-)
# === -9980
+# entrance-emergency # caption(optional) z19- (also has icon z19-)
+# === -9990
+
amenity-loading_dock # icon z19- (also has caption(optional) z19-)
# amenity-loading_dock # caption(optional) z19- (also has icon z19-)
-entrance # icon z19- (also has caption(optional) z19-)
-# entrance # caption(optional) z19- (also has icon z19-)
-entrance-exit # icon z19- (also has caption(optional) z19-)
-# entrance-exit # caption(optional) z19- (also has icon z19-)
+# entrance-garage # caption(optional) z19- (also has icon z19-)
+# entrance-house # caption(optional) z19- (also has icon z19-)
+entrance-service # icon z19- (also has caption(optional) z19-)
+# entrance-service # caption(optional) z19- (also has icon z19-)
=== -10000
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
index 47c0c8f7c..df6eae4e3 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -375,7 +375,12 @@
/* This is for main/primary entrances, for secondary entrances see type.entrance */
"type.entrance.main" = "Haupteingang";
-"type.entrance.exit" = "Ausgang";
+"type.entrance.house" = "Hauseingang";
+"type.entrance.garage" = "Garageneingang";
+"type.entrance.service" = "Serviceeingang";
+"type.entrance.entry" = "(Nur) Eingang";
+"type.entrance.exit" = "(Nur) Ausgang";
+"type.entrance.emergency" = "Notausgang";
"type.fee.yes" = "$";
"type.fee.no" = "Kostenlos";
"type.healthcare.laboratory" = "Medizinisches Labor";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
index 7bc6af6d6..670cf765d 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
@@ -383,7 +383,12 @@
/* This is for main/primary entrances, for secondary entrances see type.entrance */
"type.entrance.main" = "Main Entrance";
-"type.entrance.exit" = "Exit";
+"type.entrance.house" = "House Entrance";
+"type.entrance.garage" = "Garage Entrance";
+"type.entrance.service" = "Service Entrance";
+"type.entrance.entry" = "Entry (Only)";
+"type.entrance.exit" = "Exit (Only)";
+"type.entrance.emergency" = "Emergency Exit";
"type.fee.yes" = "$";
"type.fee.no" = "Free";
"type.healthcare.laboratory" = "Medical Laboratory";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index e2b27fd49..c72693d2b 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -402,7 +402,12 @@
/* This is for main/primary entrances, for secondary entrances see type.entrance */
"type.entrance.main" = "Main Entrance";
-"type.entrance.exit" = "Exit";
+"type.entrance.house" = "House Entrance";
+"type.entrance.garage" = "Garage Entrance";
+"type.entrance.service" = "Service Entrance";
+"type.entrance.entry" = "Entry (Only)";
+"type.entrance.exit" = "Exit (Only)";
+"type.entrance.emergency" = "Emergency Exit";
"type.fee.yes" = "$";
"type.fee.no" = "Free";
"type.healthcare.laboratory" = "Medical Laboratory";