diff --git a/data/styles/clear/style-clear/symbols/subway-singapore-m.svg b/data/styles/clear/style-clear/symbols/subway-singapore-m.svg
index 5cc52f37ab..e8a79d19b1 100644
--- a/data/styles/clear/style-clear/symbols/subway-singapore-m.svg
+++ b/data/styles/clear/style-clear/symbols/subway-singapore-m.svg
@@ -1,2 +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>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".6"/><circle cx="12" cy="12" r="11" fill="#265900"/><path d="m16.504 16.073 1.9126-3.3662c-4.688-0.12872-6.0974-6.323-9.1797-3.2406 3.6677-0.17543 3.5241 2.2564 7.5801 3.9985-1.1661 2.9342-2.487 3.5223-4.7057 3.6437-2.2187 0.12136-4.4738-3.9561-9.3339-4.087 2.2619-4.6903 2.605-4.6692 4.6991-4.7517l-1.8858 3.4118c4.1895-0.21506 5.613 6.0391 9.0007 3.2824-4.4267-0.013272-3.2528-3.0693-7.4631-3.8421 0.51523-1.7015 1.5562-3.2089 3.2142-3.9962 4.8413-1.3866 3.2714 3.7803 10.881 4.0513-1.0843 2.1686-2.3836 5.5866-4.7196 4.8963z" fill="#efc83f"/></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
index f60da83647..3d49f35719 100644
--- a/data/styles/clear/style-clear/symbols/subway-singapore-s.svg
+++ b/data/styles/clear/style-clear/symbols/subway-singapore-s.svg
@@ -1,2 +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>
+<svg version="1.1" viewBox="0 0 18 18"><path d="m9 0c-5 0-9 4-9 9s4 9 9 9 9-4 9-9-4-9-9-9z" fill="#fff" opacity=".6"/><path d="m9 17c-4.4 0-8-3.6-8-8s3.6-8 8-8 8 3.6 8 8-3.6 8-8 8z" fill="#265900"/><path d="m8.9176 5.0151c-2.4234-0.050676-3.3992 2.2382-3.7238 3.2878 3.3887 0.63748 2.2998 2.8273 5.4286 3.0263-0.80443 0.4967-1.5123 0.28233-2.1698-0.22235-1.0928-0.83878-2.2342-2.4433-4.0548-2.4843l1.4247-2.5771c-0.98858-0.058297-1.6543 0.19636-2.3519 0.87137-0.44403 0.57163-0.95058 1.5612-1.6322 2.9804 4.0712 0.11516 5.3439 3.1907 7.2515 3.0863 1.5171-0.08301 2.5569-0.3686 3.5378-2.9134-3.2109-1.3874-2.8031-3.0792-5.354-3.1195 0.74278-0.59382 1.3342-0.40764 1.984 0.07506 1.0843 0.80548 2.3127 2.4623 4.3521 2.6286l-1.4173 2.4947c2.3248 0.21586 3.1499-2.1384 3.9694-3.8958-5.3617-0.18882-4.7119-3.185-7.2442-3.238z" fill="#efc83f"/></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
index 1482b160ec..4fc6657a70 100644
--- a/data/styles/clear/style-night/symbols/subway-singapore-m.svg
+++ b/data/styles/clear/style-night/symbols/subway-singapore-m.svg
@@ -1,2 +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>
+<svg width="24" height="24" version="1.1" viewBox="0 0 24 24"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".4"/><circle cx="12" cy="12" r="11" fill="#1b3f00"/><path d="m16.504 16.073 1.9126-3.3662c-4.688-0.12872-6.0974-6.323-9.1797-3.2406 3.6677-0.17543 3.5241 2.2564 7.5801 3.9985-1.1661 2.9342-2.487 3.5223-4.7057 3.6437-2.2187 0.12136-4.4738-3.9561-9.3339-4.087 2.2619-4.6903 2.605-4.6692 4.6991-4.7517l-1.8858 3.4118c4.1895-0.21506 5.613 6.0391 9.0007 3.2824-4.4267-0.013272-3.2528-3.0693-7.4631-3.8421 0.51523-1.7015 1.5562-3.2089 3.2142-3.9962 4.8413-1.3866 3.2714 3.7803 10.881 4.0513-1.0843 2.1686-2.3836 5.5866-4.7196 4.8963z" fill="#ccab35"/></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
index 3983d5a3f6..bc681dfb96 100644
--- a/data/styles/clear/style-night/symbols/subway-singapore-s.svg
+++ b/data/styles/clear/style-night/symbols/subway-singapore-s.svg
@@ -1,2 +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>
+<svg version="1.1" viewBox="0 0 18 18"><path d="m9 0c-5 0-9 4-9 9s4 9 9 9 9-4 9-9-4-9-9-9z" fill="#fff" opacity=".4"/><path d="m9 17c-4.4 0-8-3.6-8-8s3.6-8 8-8 8 3.6 8 8-3.6 8-8 8z" fill="#1b3f00"/><path d="m8.9176 5.0151c-2.4234-0.050676-3.3992 2.2382-3.7238 3.2878 3.3887 0.63748 2.2998 2.8273 5.4286 3.0263-0.80443 0.4967-1.5123 0.28233-2.1698-0.22235-1.0928-0.83878-2.2342-2.4433-4.0548-2.4843l1.4247-2.5771c-0.98858-0.058297-1.6543 0.19636-2.3519 0.87137-0.44403 0.57163-0.95058 1.5612-1.6322 2.9804 4.0712 0.11516 5.3439 3.1907 7.2515 3.0863 1.5171-0.08301 2.5569-0.3686 3.5378-2.9134-3.2109-1.3874-2.8031-3.0792-5.354-3.1195 0.74278-0.59382 1.3342-0.40764 1.984 0.07506 1.0843 0.80548 2.3127 2.4623 4.3521 2.6286l-1.4173 2.4947c2.3248 0.21586 3.1499-2.1384 3.9694-3.8958-5.3617-0.18882-4.7119-3.185-7.2442-3.238z" fill="#ccab35"/></svg>