diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index bb390e21df..94134a3480 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -687,7 +687,7 @@ deprecated|deprecated;573;x
 deprecated|deprecated;574;x
 aerialway|rope_tow;575;
 natural|pond;576;natural|water|pond
-railway|station|funicular;[railway=station][station=funicular];;name;int_name;577;
+railway|station|funicular;[railway=station][station=funicular],[railway=halt][station=funicular];;name;int_name;577;
 highway|secondary_link|tunnel;[highway=secondary_link][tunnel?];;name;int_name;578;
 deprecated|deprecated;579;x
 deprecated|deprecated;580;x
diff --git a/data/styles/default/dark/symbols/funicular-s.svg b/data/styles/default/dark/symbols/funicular-s.svg
new file mode 100644
index 0000000000..8d249cb3c5
--- /dev/null
+++ b/data/styles/default/dark/symbols/funicular-s.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
+  <rect id="Rectangle" width="16" height="16" rx="2.5" fill="#000" opacity=".6" />
+  <rect x=".66667" y=".66667" width="14.667" height="14.667" rx="2" fill="#2F6499" />
+  <path id="Shape" d="M4.001,2.661L4,7.332L2.667,6.667L2.667,8L13.333,13.333L13.333,12L12,11.333L11.989,6.681L4.001,2.661ZM5.333,6.667L5.333,4.666L6.667,5.333L6.667,7.332L5.333,6.667ZM7.331,5.667L8.664,6.332L8.664,8.332L7.331,7.668L7.331,5.667ZM9.333,6.667L10.655,7.332L10.667,9.333L9.335,8.667L9.333,6.667Z" style="fill:#000;"/>
+ </g>
+</svg>
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 4a5e442351..23345e8cde 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -416,6 +416,8 @@ node|z17-[aerialway=station],
 node|z17-[railway=level_crossing]
 {icon-image: railway-crossing-m.svg;}
 
+node|z12-14[railway=station][station=funicular],
+{icon-image: funicular-s.svg;}
 node|z15-[railway=station][station=funicular],
 {icon-image: funicular-m.svg;text-offset: 1;font-size: 10;}
 node|z17-[aerialway=station],
diff --git a/data/styles/default/light/symbols/funicular-s.svg b/data/styles/default/light/symbols/funicular-s.svg
new file mode 100644
index 0000000000..edf4550a99
--- /dev/null
+++ b/data/styles/default/light/symbols/funicular-s.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <g opacity="1">
+  <rect id="Rectangle" width="16" height="16" rx="2.5" fill="#fff" opacity=".6" />
+  <rect x=".66667" y=".66667" width="14.667" height="14.667" rx="2" fill="#2F6499" />
+  <path id="Shape" d="M4.001,2.661L4,7.332L2.667,6.667L2.667,8L13.333,13.333L13.333,12L12,11.333L11.989,6.681L4.001,2.661ZM5.333,6.667L5.333,4.666L6.667,5.333L6.667,7.332L5.333,6.667ZM7.331,5.667L8.664,6.332L8.664,8.332L7.331,7.668L7.331,5.667ZM9.333,6.667L10.655,7.332L10.667,9.333L9.335,8.667L9.333,6.667Z" style="fill:#fff;"/>
+ </g>
+</svg>