diff --git a/data/styles/default/dark/symbols/barrier-entrance-s.svg b/data/styles/default/dark/symbols/barrier-entrance-s.svg
deleted file mode 100644
index 5047016c25..0000000000
--- a/data/styles/default/dark/symbols/barrier-entrance-s.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/data/styles/default/dark/symbols/entrance-barrier-s.svg b/data/styles/default/dark/symbols/entrance-barrier-s.svg
new file mode 100644
index 0000000000..1bede73f3c
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-barrier-s.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/data/styles/default/dark/symbols/entrance-exit-s.svg b/data/styles/default/dark/symbols/entrance-exit-s.svg
new file mode 100644
index 0000000000..eefebd4083
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-exit-s.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/data/styles/default/dark/symbols/entrance-main-s.svg b/data/styles/default/dark/symbols/entrance-main-s.svg
new file mode 100644
index 0000000000..4a3d4faeca
--- /dev/null
+++ b/data/styles/default/dark/symbols/entrance-main-s.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/data/styles/default/dark/symbols/entrance-s.svg b/data/styles/default/dark/symbols/entrance-s.svg
index edca24108f..8bfcb8933c 100644
--- a/data/styles/default/dark/symbols/entrance-s.svg
+++ b/data/styles/default/dark/symbols/entrance-s.svg
@@ -1,6 +1,5 @@
-
\ No newline at end of file
+
+
diff --git a/data/styles/default/dark/symbols/exit-s.svg b/data/styles/default/dark/symbols/exit-s.svg
deleted file mode 100644
index 4dc6036481..0000000000
--- a/data/styles/default/dark/symbols/exit-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/default/dark/symbols/main_entrance-s.svg b/data/styles/default/dark/symbols/main_entrance-s.svg
deleted file mode 100644
index ab091c4526..0000000000
--- a/data/styles/default/dark/symbols/main_entrance-s.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss
index 2b80f1c42e..6384a4c8e0 100644
--- a/data/styles/default/include/Basemap_label.mapcss
+++ b/data/styles/default/include/Basemap_label.mapcss
@@ -702,9 +702,9 @@ node|z19-[entrance],
node|z19-[amenity=loading_dock],
{icon-image: entrance-s.svg; font-size: 10; text-offset: 1;}
node|z19-[entrance=exit],
-{icon-image: exit-s.svg; font-size: 10; text-offset: 1;}
+{icon-image: entrance-exit-s.svg; font-size: 10; text-offset: 1;}
node|z18-[entrance=main],
-{icon-image: main_entrance-s.svg; font-size: 10; text-offset: 1;}
+{icon-image: entrance-main-s.svg; font-size: 10; text-offset: 1;}
/* 8.3 Airports */
area|z14-[aeroway=terminal]
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 6127cb9b2d..1eb86a566a 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -1493,7 +1493,7 @@ node|z16-[barrier=turnstile],
{icon-image: dot-m.svg;font-size: 11;}
node|z16-[barrier=entrance],
-{icon-image: barrier-entrance-s.svg; font-size: 11;}
+{icon-image: entrance-barrier-s.svg; font-size: 11;}
node|z16-[barrier=gate],
node|z16-[barrier=kissing_gate],
diff --git a/data/styles/default/light/symbols/barrier-entrance-s.svg b/data/styles/default/light/symbols/barrier-entrance-s.svg
deleted file mode 100644
index 571b7687e8..0000000000
--- a/data/styles/default/light/symbols/barrier-entrance-s.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/data/styles/default/light/symbols/entrance-barrier-s.svg b/data/styles/default/light/symbols/entrance-barrier-s.svg
new file mode 100644
index 0000000000..cb399f697c
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-barrier-s.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/data/styles/default/light/symbols/entrance-exit-s.svg b/data/styles/default/light/symbols/entrance-exit-s.svg
new file mode 100644
index 0000000000..3758c7d6d7
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-exit-s.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/data/styles/default/light/symbols/entrance-main-s.svg b/data/styles/default/light/symbols/entrance-main-s.svg
new file mode 100644
index 0000000000..56c0dc2a50
--- /dev/null
+++ b/data/styles/default/light/symbols/entrance-main-s.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/data/styles/default/light/symbols/entrance-s.svg b/data/styles/default/light/symbols/entrance-s.svg
index 61c3031db7..1e93eed0b0 100644
--- a/data/styles/default/light/symbols/entrance-s.svg
+++ b/data/styles/default/light/symbols/entrance-s.svg
@@ -1,6 +1,5 @@
-