diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index d0f8ecc7db..092eb10e0a 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1675,3 +1675,5 @@ amenity|parking|street_side|private;[amenity=parking][parking=street_side][acces
 amenity|parking|lane|private;[amenity=parking][parking=lane][access=private];;name;int_name;1591;
 amenity|compressed_air;1592;
 leisure|hackerspace;1593;
+railway|station|subway|singapore;[railway=station][transport=subway][city=singapore],[railway=station][station=subway][city=singapore];;name;int_name;1594;
+railway|subway_entrance|singapore;[railway=subway_entrance][city=singapore];;name;int_name;1595;
diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt
index 88599cceab..3c12abbeb6 100644
--- a/data/strings/types_strings.txt
+++ b/data/strings/types_strings.txt
@@ -21777,6 +21777,9 @@
   [type.railway.station.subway.shiraz]
     ref = type.railway.station.subway
 
+  [type.railway.station.subway.singapore]
+    ref = type.railway.station.subway
+
   [type.railway.station.subway.sofia]
     ref = type.railway.station.subway
 
@@ -22195,6 +22198,9 @@
   [type.railway.subway_entrance.shiraz]
     ref = type.railway.subway_entrance
 
+  [type.railway.subway_entrance.singapore]
+    ref = type.railway.subway_entrance
+
   [type.railway.subway_entrance.sofia]
     ref = type.railway.subway_entrance
 
diff --git a/data/styles/clear/include/Subways.mapcss b/data/styles/clear/include/Subways.mapcss
index a8d6fe8632..136ae11702 100644
--- a/data/styles/clear/include/Subways.mapcss
+++ b/data/styles/clear/include/Subways.mapcss
@@ -749,6 +749,12 @@ node|z14[railway=station][transport=subway][city=shiraz] {icon-image: subway-shi
 node|z15-[railway=station][transport=subway][city=shiraz] {icon-image: subway-shiraz-m.svg;}
 node|z16-[railway=subway_entrance][city=shiraz] {icon-image: subway-shiraz-s.svg;}
 
+/* Singapore Subway Station */
+node|z13[railway=station][transport=subway][city=singapore] {icon-image: subway-singapore-s.svg;icon-min-distance: 1;}
+node|z14[railway=station][transport=subway][city=singapore] {icon-image: subway-singapore-s.svg;}
+node|z15-[railway=station][transport=subway][city=singapore] {icon-image: subway-singapore-m.svg;}
+node|z16-[railway=subway_entrance][city=singapore] {icon-image: subway-singapore-s.svg;}
+
 /* Sofia Subway Station */
 node|z13[railway=station][transport=subway][city=sofia] {icon-image: subway-sofia-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=sofia] {icon-image: subway-sofia-s.svg;}
diff --git a/data/styles/clear/include/priorities_4_overlays.prio.txt b/data/styles/clear/include/priorities_4_overlays.prio.txt
index 7a0fe1597d..82f7e4d127 100644
--- a/data/styles/clear/include/priorities_4_overlays.prio.txt
+++ b/data/styles/clear/include/priorities_4_overlays.prio.txt
@@ -136,6 +136,7 @@ railway-station-subway-paris                        # icon z12- (also has captio
 railway-station-subway-roma                         # icon z12- (also has caption(optional) z14-)
 railway-station-subway-sf                           # icon z12- (also has caption(optional) z14-)
 railway-station-subway-shanghai                     # icon z12- (also has caption(optional) z14-)
+railway-station-subway-singapore                    # icon z13- (also has caption(optional) z14-)
 railway-station-subway-stockholm                    # icon z12- (also has caption(optional) z14-)
 railway-station-subway-tokyo                        # icon z14- (also has caption(optional) z14-)
 railway-station-subway-vienna                       # icon z12- (also has caption(optional) z14-)
@@ -601,6 +602,7 @@ railway-subway_entrance-sendai                      # icon z16- (also has captio
 railway-subway_entrance-sf                          # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-shanghai                    # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-shiraz                      # icon z16- (also has caption(optional) z17-)
+railway-subway_entrance-singapore                   # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-sofia                       # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-stockholm                   # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-tabriz                      # icon z16- (also has caption(optional) z17-)
@@ -1358,6 +1360,7 @@ amenity-parking_entrance-private                    # icon z19- (also has captio
 # railway-station-subway-roma                       # caption(optional) z14- (also has icon z12-)
 # railway-station-subway-sf                         # caption(optional) z14- (also has icon z12-)
 # railway-station-subway-shanghai                   # caption(optional) z14- (also has icon z12-)
+# railway-station-subway-singapore                  # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-stockholm                  # caption(optional) z14- (also has icon z12-)
 # railway-station-subway-tokyo                      # caption(optional) z14- (also has icon z14-)
 # railway-station-subway-vienna                     # caption(optional) z14- (also has icon z12-)
@@ -1722,6 +1725,7 @@ amenity-parking_entrance-private                    # icon z19- (also has captio
 # railway-subway_entrance-sf                        # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-shanghai                  # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-shiraz                    # caption(optional) z17- (also has icon z16-)
+# railway-subway_entrance-singapore                 # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-sofia                     # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-stockholm                 # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-tabriz                    # caption(optional) z17- (also has icon z16-)
diff --git a/data/styles/clear/style-clear/symbols/subway-singapore-m.svg b/data/styles/clear/style-clear/symbols/subway-singapore-m.svg
new file mode 100644
index 0000000000..5cc52f37ab
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/subway-singapore-m.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 20 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path transform="matrix(.96165 0 0 .96165 .38376 .30675)" d="m9.9102 2.125c-0.53647-0.011222-1.1215 0.080007-1.7695 0.26562l-0.076172 0.021484-0.070312 0.033203c-0.55228 0.26225-1.0391 0.59437-1.4688 0.97656l-0.92578 0.037109c-1.199 0.047318-2.2313 0.044575-3.2852 1.4004-0.55596 0.71526-1.1864 1.8983-2.0625 3.7148l-0.63477 1.3145 1.4609 0.041016c4.4278 0.11925 6.3462 4.091 9.0801 3.9414 1.3797-0.07547 2.5118-0.35777 3.4648-1.1719l0.45312 0.13476c3.1009 0.9164 4.66-3.1951 5.666-5.207l0.65625-1.3145-1.4688-0.050781c-6.1394-0.21868-5.4618-4.0623-9.0195-4.1367z" fill="#fff" opacity=".6"/><path d="m14.178 11.778 1.7741-3.1224c-4.3485-0.1194-5.6558-5.8651-8.5149-3.0059 3.4021-0.16272 3.2689 2.093 7.0311 3.7089-1.0816 2.7217-2.3069 3.2672-4.3649 3.3798-2.058 0.11257-4.1498-3.6696-8.6579-3.791 2.0981-4.3506 2.4163-4.331 4.3588-4.4076l-1.7492 3.1647c3.8861-0.19948 5.2065 5.6017 8.3488 3.0447-4.1061-0.012311-3.0172-2.847-6.9226-3.5638 0.47791-1.5783 1.4435-2.9765 2.9814-3.7068 4.4907-1.2862 3.0345 3.5065 10.093 3.7579-1.0058 2.0115-2.211 5.182-4.3778 4.5417z" fill="#efc83f" stroke-width=".96165"/></svg>
diff --git a/data/styles/clear/style-clear/symbols/subway-singapore-s.svg b/data/styles/clear/style-clear/symbols/subway-singapore-s.svg
new file mode 100644
index 0000000000..f60da83647
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/subway-singapore-s.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 18 18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.90071 0 0 .90071 -.014058 1.7947)"><path transform="matrix(.96165 0 0 .96165 .38376 .30675)" d="m9.9102 2.125c-0.53647-0.011222-1.1215 0.080007-1.7695 0.26562l-0.076172 0.021484-0.070312 0.033203c-0.55228 0.26225-1.0391 0.59437-1.4688 0.97656l-0.92578 0.037109c-1.199 0.047318-2.2313 0.044575-3.2852 1.4004-0.55596 0.71526-1.1864 1.8983-2.0625 3.7148l-0.63477 1.3145 1.4609 0.041016c4.4278 0.11925 6.3462 4.091 9.0801 3.9414 1.3797-0.07547 2.5118-0.35777 3.4648-1.1719l0.45312 0.13476c3.1009 0.9164 4.66-3.1951 5.666-5.207l0.65625-1.3145-1.4688-0.050781c-6.1394-0.21868-5.4618-4.0623-9.0195-4.1367z" fill="#fff" opacity=".6"/><path d="m14.178 11.778 1.7741-3.1224c-4.3485-0.1194-5.6558-5.8651-8.5149-3.0059 3.4021-0.16272 3.2689 2.093 7.0311 3.7089-1.0816 2.7217-2.3069 3.2672-4.3649 3.3798-2.058 0.11257-4.1498-3.6696-8.6579-3.791 2.0981-4.3506 2.4163-4.331 4.3588-4.4076l-1.7492 3.1647c3.8861-0.19948 5.2065 5.6017 8.3488 3.0447-4.1061-0.012311-3.0172-2.847-6.9226-3.5638 0.47791-1.5783 1.4435-2.9765 2.9814-3.7068 4.4907-1.2862 3.0345 3.5065 10.093 3.7579-1.0058 2.0115-2.211 5.182-4.3778 4.5417z" fill="#efc83f" stroke-width=".96165"/></g></svg>
diff --git a/data/styles/clear/style-night/symbols/subway-singapore-m.svg b/data/styles/clear/style-night/symbols/subway-singapore-m.svg
new file mode 100644
index 0000000000..1482b160ec
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-singapore-m.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 20 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path transform="matrix(.96165 0 0 .96165 .38376 .30675)" d="m9.9102 2.125c-0.53647-0.011222-1.1215 0.080007-1.7695 0.26562l-0.076172 0.021484-0.070312 0.033203c-0.55228 0.26225-1.0391 0.59437-1.4688 0.97656l-0.92578 0.037109c-1.199 0.047318-2.2313 0.044575-3.2852 1.4004-0.55596 0.71526-1.1864 1.8983-2.0625 3.7148l-0.63477 1.3145 1.4609 0.041016c4.4278 0.11925 6.3462 4.091 9.0801 3.9414 1.3797-0.07547 2.5118-0.35777 3.4648-1.1719l0.45312 0.13476c3.1009 0.9164 4.66-3.1951 5.666-5.207l0.65625-1.3145-1.4688-0.050781c-6.1394-0.21868-5.4618-4.0623-9.0195-4.1367z" fill="#fff" opacity=".6"/><path d="m14.178 11.778 1.7741-3.1224c-4.3485-0.1194-5.6558-5.8651-8.5149-3.0059 3.4021-0.16272 3.2689 2.093 7.0311 3.7089-1.0816 2.7217-2.3069 3.2672-4.3649 3.3798-2.058 0.11257-4.1498-3.6696-8.6579-3.791 2.0981-4.3506 2.4163-4.331 4.3588-4.4076l-1.7492 3.1647c3.8861-0.19948 5.2065 5.6017 8.3488 3.0447-4.1061-0.012311-3.0172-2.847-6.9226-3.5638 0.47791-1.5783 1.4435-2.9765 2.9814-3.7068 4.4907-1.2862 3.0345 3.5065 10.093 3.7579-1.0058 2.0115-2.211 5.182-4.3778 4.5417z" fill="#ebbc12" stroke-width=".96165"/></svg>
diff --git a/data/styles/clear/style-night/symbols/subway-singapore-s.svg b/data/styles/clear/style-night/symbols/subway-singapore-s.svg
new file mode 100644
index 0000000000..3983d5a3f6
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/subway-singapore-s.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 18 18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g transform="matrix(.90071 0 0 .90071 -.014058 1.7947)"><path transform="matrix(.96165 0 0 .96165 .38376 .30675)" d="m9.9102 2.125c-0.53647-0.011222-1.1215 0.080007-1.7695 0.26562l-0.076172 0.021484-0.070312 0.033203c-0.55228 0.26225-1.0391 0.59437-1.4688 0.97656l-0.92578 0.037109c-1.199 0.047318-2.2313 0.044575-3.2852 1.4004-0.55596 0.71526-1.1864 1.8983-2.0625 3.7148l-0.63477 1.3145 1.4609 0.041016c4.4278 0.11925 6.3462 4.091 9.0801 3.9414 1.3797-0.07547 2.5118-0.35777 3.4648-1.1719l0.45312 0.13476c3.1009 0.9164 4.66-3.1951 5.666-5.207l0.65625-1.3145-1.4688-0.050781c-6.1394-0.21868-5.4618-4.0623-9.0195-4.1367z" fill="#fff" opacity=".6"/><path d="m14.178 11.778 1.7741-3.1224c-4.3485-0.1194-5.6558-5.8651-8.5149-3.0059 3.4021-0.16272 3.2689 2.093 7.0311 3.7089-1.0816 2.7217-2.3069 3.2672-4.3649 3.3798-2.058 0.11257-4.1498-3.6696-8.6579-3.791 2.0981-4.3506 2.4163-4.331 4.3588-4.4076l-1.7492 3.1647c3.8861-0.19948 5.2065 5.6017 8.3488 3.0447-4.1061-0.012311-3.0172-2.847-6.9226-3.5638 0.47791-1.5783 1.4435-2.9765 2.9814-3.7068 4.4907-1.2862 3.0345 3.5065 10.093 3.7579-1.0058 2.0115-2.211 5.182-4.3778 4.5417z" fill="#ebbc12" stroke-width=".96165"/></g></svg>
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index b2d3531fc4..e3b5a15271 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -244,6 +244,7 @@ railway-station-subway-saopaulo                     # icon z13- (also has captio
 railway-station-subway-sapporo                      # icon z13- (also has caption(optional) z14-)
 railway-station-subway-sendai                       # icon z13- (also has caption(optional) z14-)
 railway-station-subway-shiraz                       # icon z13- (also has caption(optional) z14-)
+railway-station-subway-singapore                    # icon z13- (also has caption(optional) z14-)
 railway-station-subway-sofia                        # icon z13- (also has caption(optional) z14-)
 railway-station-subway-tabriz                       # icon z13- (also has caption(optional) z14-)
 railway-station-subway-taipei                       # icon z13- (also has caption(optional) z14-)
@@ -601,6 +602,7 @@ railway-subway_entrance-sendai                      # icon z16- (also has captio
 railway-subway_entrance-sf                          # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-shanghai                    # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-shiraz                      # icon z16- (also has caption(optional) z17-)
+railway-subway_entrance-singapore                   # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-sofia                       # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-stockholm                   # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-tabriz                      # icon z16- (also has caption(optional) z17-)
@@ -1462,6 +1464,7 @@ amenity-parking_entrance-private                    # icon z19- (also has captio
 # railway-station-subway-sapporo                    # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-sendai                     # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-shiraz                     # caption(optional) z14- (also has icon z13-)
+# railway-station-subway-singapore                  # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-sofia                      # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-tabriz                     # caption(optional) z14- (also has icon z13-)
 # railway-station-subway-taipei                     # caption(optional) z14- (also has icon z13-)
@@ -1724,6 +1727,7 @@ amenity-parking_entrance-private                    # icon z19- (also has captio
 # railway-subway_entrance-sf                        # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-shanghai                  # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-shiraz                    # caption(optional) z17- (also has icon z16-)
+# railway-subway_entrance-singapore                 # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-sofia                     # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-stockholm                 # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-tabriz                    # caption(optional) z17- (also has icon z16-)
diff --git a/data/styles/vehicle/include/Subways.mapcss b/data/styles/vehicle/include/Subways.mapcss
index f33ad8e2ae..55044f278a 100644
--- a/data/styles/vehicle/include/Subways.mapcss
+++ b/data/styles/vehicle/include/Subways.mapcss
@@ -736,6 +736,12 @@ node|z14[railway=station][transport=subway][city=shiraz] {icon-image: subway-shi
 node|z15-[railway=station][transport=subway][city=shiraz] {icon-image: subway-shiraz-m.svg;}
 node|z16-[railway=subway_entrance][city=shiraz] {icon-image: subway-shiraz-s.svg;}
 
+/* Singapore Subway Station */
+node|z13[railway=station][transport=subway][city=singapore] {icon-image: subway-singapore-s.svg;icon-min-distance: 1;}
+node|z14[railway=station][transport=subway][city=singapore] {icon-image: subway-singapore-s.svg;}
+node|z15-[railway=station][transport=subway][city=singapore] {icon-image: subway-singapore-m.svg;}
+node|z16-[railway=subway_entrance][city=singapore] {icon-image: subway-singapore-s.svg;}
+
 /* Sofia Subway Station */
 node|z13[railway=station][transport=subway][city=sofia] {icon-image: subway-sofia-s.svg;icon-min-distance: 1;}
 node|z14[railway=station][transport=subway][city=sofia] {icon-image: subway-sofia-s.svg;}
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index 401231cd9f..b9b6540c1b 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -402,6 +402,7 @@ railway-station-subway-sendai                       # icon z13- (also has captio
 railway-station-subway-sf                           # icon z13- (also has caption(optional) z13-)
 railway-station-subway-shanghai                     # icon z13- (also has caption(optional) z13-)
 railway-station-subway-shiraz                       # icon z13- (also has caption(optional) z13-)
+railway-station-subway-singapore                    # icon z13- (also has caption(optional) z13-)
 railway-station-subway-sofia                        # icon z13- (also has caption(optional) z13-)
 railway-station-subway-stockholm                    # icon z13- (also has caption(optional) z13-)
 railway-station-subway-tabriz                       # icon z13- (also has caption(optional) z13-)
@@ -645,6 +646,7 @@ railway-subway_entrance-sendai                      # icon z16- (also has captio
 railway-subway_entrance-sf                          # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-shanghai                    # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-shiraz                      # icon z16- (also has caption(optional) z17-)
+railway-subway_entrance-singapore                   # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-sofia                       # icon z16- (also has caption(optional) z17-)
 railway-subway_entrance-spb                         # icon z16- (also has caption(optional) z16-)
 railway-subway_entrance-stockholm                   # icon z16- (also has caption(optional) z17-)
@@ -918,6 +920,7 @@ entrance-main                                       # icon z18- (also has captio
 # railway-station-subway-sf                         # caption(optional) z13- (also has icon z13-)
 # railway-station-subway-shanghai                   # caption(optional) z13- (also has icon z13-)
 # railway-station-subway-shiraz                     # caption(optional) z13- (also has icon z13-)
+# railway-station-subway-singapore                  # caption(optional) z13- (also has icon z13-)
 # railway-station-subway-sofia                      # caption(optional) z13- (also has icon z13-)
 # railway-station-subway-stockholm                  # caption(optional) z13- (also has icon z13-)
 # railway-station-subway-tabriz                     # caption(optional) z13- (also has icon z13-)
@@ -1115,6 +1118,7 @@ entrance-main                                       # icon z18- (also has captio
 # railway-subway_entrance-sf                        # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-shanghai                  # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-shiraz                    # caption(optional) z17- (also has icon z16-)
+# railway-subway_entrance-singapore                 # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-sofia                     # caption(optional) z17- (also has icon z16-)
 # railway-subway_entrance-spb                       # caption(optional) z16- (also has icon z16-)
 # railway-subway_entrance-stockholm                 # caption(optional) z17- (also has icon z16-)