From 41bf3b42cb14af256c52f1eedcafb2446ffdfb62 Mon Sep 17 00:00:00 2001
From: itomko <igor.n.tomko@gmail.com>
Date: Tue, 9 Jan 2018 12:39:27 +0300
Subject: [PATCH] Fix Dark Icons

---
 .../clear/style-clear/symbols/subway-bengaluru-l.svg   |  8 ++++++++
 .../clear/style-clear/symbols/subway-bengaluru-m.svg   |  8 ++++++++
 .../clear/style-clear/symbols/subway-bengaluru-s.svg   |  8 ++++++++
 .../clear/style-clear/symbols/subway-nagoya-l.svg      |  5 ++---
 .../clear/style-clear/symbols/subway-nagoya-m.svg      |  5 ++---
 .../clear/style-clear/symbols/subway-nagoya-s.svg      |  5 ++---
 .../symbols/{subway-wien-l.svg => subway-vienna-l.svg} |  0
 .../symbols/{subway-wien-m.svg => subway-vienna-m.svg} |  0
 .../symbols/{subway-wien-s.svg => subway-vienna-s.svg} |  0
 .../{subway-adana-l copy.svg => subway-adana-l.svg}    |  0
 .../{subway-adana-m copy.svg => subway-adana-m.svg}    |  0
 .../{subway-adana-s copy.svg => subway-adana-s.svg}    |  0
 ...{subway-algeria-l copy.svg => subway-algeria-l.svg} |  0
 ...{subway-algeria-m copy.svg => subway-algeria-m.svg} |  0
 ...{subway-algeria-s copy.svg => subway-algeria-s.svg} |  0
 ...ubway-alicante-l copy.svg => subway-alicante-l.svg} |  0
 ...ubway-alicante-m copy.svg => subway-alicante-m.svg} |  0
 ...ubway-alicante-s copy.svg => subway-alicante-s.svg} |  0
 .../{subway-almaty-l copy.svg => subway-almaty-l.svg}  |  0
 .../{subway-almaty-m copy.svg => subway-almaty-m.svg}  |  0
 .../{subway-almaty-s copy.svg => subway-almaty-s.svg}  |  0
 ...way-amsterdam-l copy.svg => subway-amsterdam-l.svg} |  0
 ...way-amsterdam-m copy.svg => subway-amsterdam-m.svg} |  0
 ...way-amsterdam-s copy.svg => subway-amsterdam-s.svg} |  0
 .../{subway-ankara-l copy.svg => subway-ankara-l.svg}  |  0
 .../{subway-ankara-m copy.svg => subway-ankara-m.svg}  |  0
 .../{subway-ankara-s copy.svg => subway-ankara-s.svg}  |  0
 .../{subway-athens-l copy.svg => subway-athens-l.svg}  |  0
 .../{subway-athens-m copy.svg => subway-athens-m.svg}  |  0
 .../{subway-athens-s copy.svg => subway-athens-s.svg}  |  0
 .../{subway-baku-l copy.svg => subway-baku-l.svg}      |  0
 .../{subway-baku-m copy.svg => subway-baku-m.svg}      |  0
 .../{subway-baku-s copy.svg => subway-baku-s.svg}      |  0
 ...{subway-bangkok-l copy.svg => subway-bangkok-l.svg} |  0
 ...{subway-bangkok-m copy.svg => subway-bangkok-m.svg} |  0
 ...{subway-bangkok-s copy.svg => subway-bangkok-s.svg} |  0
 .../style-night/symbols/subway-barcelona-l copy.svg    |  7 -------
 .../clear/style-night/symbols/subway-barcelona-l.svg   |  8 ++++----
 .../style-night/symbols/subway-barcelona-m copy.svg    |  7 -------
 .../clear/style-night/symbols/subway-barcelona-m.svg   |  8 ++++----
 .../style-night/symbols/subway-barcelona-s copy.svg    |  7 -------
 .../clear/style-night/symbols/subway-barcelona-s.svg   | 10 +++++-----
 ...{subway-beijing-l copy.svg => subway-beijing-l.svg} |  0
 ...{subway-beijing-m copy.svg => subway-beijing-m.svg} |  0
 ...{subway-beijing-s copy.svg => subway-beijing-s.svg} |  0
 ...bway-nagoya-l copy 2.svg => subway-bengaluru-l.svg} |  0
 ...bway-nagoya-m copy 2.svg => subway-bengaluru-m.svg} |  0
 ...bway-nagoya-s copy 2.svg => subway-bengaluru-s.svg} |  0
 .../clear/style-night/symbols/subway-berlin-l copy.svg |  7 -------
 .../clear/style-night/symbols/subway-berlin-l.svg      |  8 ++++----
 .../clear/style-night/symbols/subway-berlin-m copy.svg |  7 -------
 .../clear/style-night/symbols/subway-berlin-m.svg      |  6 +++---
 .../clear/style-night/symbols/subway-berlin-s copy.svg |  7 -------
 .../clear/style-night/symbols/subway-berlin-s.svg      |  8 ++++----
 ...ubway-brasilia-l copy.svg => subway-brasilia-l.svg} |  0
 ...ubway-brasilia-m copy.svg => subway-brasilia-m.svg} |  0
 ...ubway-brasilia-s copy.svg => subway-brasilia-s.svg} |  0
 ...{subway-brescia-l copy.svg => subway-brescia-l.svg} |  0
 ...{subway-brescia-m copy.svg => subway-brescia-m.svg} |  0
 ...{subway-brescia-s copy.svg => subway-brescia-s.svg} |  0
 ...{subway-brussel-l copy.svg => subway-brussel-l.svg} |  0
 ...{subway-brussel-m copy.svg => subway-brussel-m.svg} |  0
 ...{subway-brussel-s copy.svg => subway-brussel-s.svg} |  0
 ...way-bucharest-l copy.svg => subway-bucharest-l.svg} |  0
 ...way-bucharest-m copy.svg => subway-bucharest-m.svg} |  0
 ...way-bucharest-s copy.svg => subway-bucharest-s.svg} |  0
 ...ubway-budapest-l copy.svg => subway-budapest-l.svg} |  0
 ...ubway-budapest-m copy.svg => subway-budapest-m.svg} |  0
 ...ubway-budapest-s copy.svg => subway-budapest-s.svg} |  0
 ...buenosaires-l copy.svg => subway-buenosaires-l.svg} |  0
 ...buenosaires-m copy.svg => subway-buenosaires-m.svg} |  0
 ...buenosaires-s copy.svg => subway-buenosaires-s.svg} |  0
 ...ubway-bursaray-l copy.svg => subway-bursaray-l.svg} |  0
 ...ubway-bursaray-m copy.svg => subway-bursaray-m.svg} |  0
 ...ubway-bursaray-s copy.svg => subway-bursaray-s.svg} |  0
 .../{subway-cairo-l copy.svg => subway-cairo-l.svg}    |  0
 .../{subway-cairo-m copy.svg => subway-cairo-m.svg}    |  0
 .../{subway-cairo-s copy.svg => subway-cairo-s.svg}    |  0
 ...{subway-caracas-l copy.svg => subway-caracas-l.svg} |  0
 ...{subway-caracas-m copy.svg => subway-caracas-m.svg} |  0
 ...{subway-caracas-s copy.svg => subway-caracas-s.svg} |  0
 ...{subway-catania-l copy.svg => subway-catania-l.svg} |  0
 ...{subway-catania-m copy.svg => subway-catania-m.svg} |  0
 ...{subway-catania-s copy.svg => subway-catania-s.svg} |  0
 ...way-changchun-l copy.svg => subway-changchun-l.svg} |  0
 ...way-changchun-m copy.svg => subway-changchun-m.svg} |  0
 ...way-changchun-s copy.svg => subway-changchun-s.svg} |  0
 ...{subway-chengdu-l copy.svg => subway-chengdu-l.svg} |  0
 ...{subway-chengdu-m copy.svg => subway-chengdu-m.svg} |  0
 ...{subway-chengdu-s copy.svg => subway-chengdu-s.svg} |  0
 ...{subway-chicago-l copy.svg => subway-chicago-l.svg} |  0
 ...{subway-chicago-m copy.svg => subway-chicago-m.svg} |  0
 ...{subway-chicago-s copy.svg => subway-chicago-s.svg} |  0
 ...way-chongqing-l copy.svg => subway-chongqing-l.svg} |  0
 ...way-chongqing-m copy.svg => subway-chongqing-m.svg} |  0
 ...way-chongqing-s copy.svg => subway-chongqing-s.svg} |  0
 .../{subway-dalian-l copy.svg => subway-dalian-l.svg}  |  0
 .../{subway-dalian-m copy.svg => subway-dalian-m.svg}  |  0
 .../{subway-dalian-s copy.svg => subway-dalian-s.svg}  |  0
 .../{subway-delhi-l copy.svg => subway-delhi-l.svg}    |  0
 .../{subway-delhi-m copy.svg => subway-delhi-m.svg}    |  0
 .../{subway-delhi-s copy.svg => subway-delhi-s.svg}    |  0
 .../{subway-dnepro-l copy.svg => subway-dnepro-l.svg}  |  0
 .../{subway-dnepro-m copy.svg => subway-dnepro-m.svg}  |  0
 .../{subway-dnepro-s copy.svg => subway-dnepro-s.svg}  |  0
 .../{subway-dubai-l copy.svg => subway-dubai-l.svg}    |  0
 .../{subway-dubai-m copy.svg => subway-dubai-m.svg}    |  0
 .../{subway-dubai-s copy.svg => subway-dubai-s.svg}    |  0
 ...ubway-edmonton-l copy.svg => subway-edmonton-l.svg} |  0
 ...ubway-edmonton-m copy.svg => subway-edmonton-m.svg} |  0
 ...ubway-edmonton-s copy.svg => subway-edmonton-s.svg} |  0
 .../{subway-ekb-l copy.svg => subway-ekb-l.svg}        |  0
 .../{subway-ekb-m copy.svg => subway-ekb-m.svg}        |  0
 .../{subway-ekb-s copy.svg => subway-ekb-s.svg}        |  0
 .../{subway-foshan-l copy.svg => subway-foshan-l.svg}  |  0
 .../{subway-foshan-m copy.svg => subway-foshan-m.svg}  |  0
 .../{subway-foshan-s copy.svg => subway-foshan-s.svg}  |  0
 ...{subway-fukuoka-l copy.svg => subway-fukuoka-l.svg} |  0
 ...{subway-fukuoka-m copy.svg => subway-fukuoka-m.svg} |  0
 ...{subway-fukuoka-s copy.svg => subway-fukuoka-s.svg} |  0
 ...{subway-glasgow-l copy.svg => subway-glasgow-l.svg} |  0
 ...{subway-glasgow-m copy.svg => subway-glasgow-m.svg} |  0
 ...{subway-glasgow-s copy.svg => subway-glasgow-s.svg} |  0
 ...guadalajara-l copy.svg => subway-guadalajara-l.svg} |  0
 ...guadalajara-m copy.svg => subway-guadalajara-m.svg} |  0
 ...guadalajara-s copy.svg => subway-guadalajara-s.svg} |  0
 ...way-guangzhou-l copy.svg => subway-guangzhou-l.svg} |  0
 ...way-guangzhou-m copy.svg => subway-guangzhou-m.svg} |  0
 ...way-guangzhou-s copy.svg => subway-guangzhou-s.svg} |  0
 .../{subway-haagse-l copy.svg => subway-haagse-l.svg}  |  0
 .../{subway-haagse-m copy.svg => subway-haagse-m.svg}  |  0
 .../{subway-haagse-s copy.svg => subway-haagse-s.svg}  |  0
 ...ubway-helsinki-l copy.svg => subway-helsinki-l.svg} |  0
 ...ubway-helsinki-m copy.svg => subway-helsinki-m.svg} |  0
 ...ubway-helsinki-s copy.svg => subway-helsinki-s.svg} |  0
 ...ubway-hirosima-l copy.svg => subway-hirosima-l.svg} |  0
 ...ubway-hirosima-m copy.svg => subway-hirosima-m.svg} |  0
 ...ubway-hirosima-s copy.svg => subway-hirosima-s.svg} |  0
 ...{subway-isfahan-l copy.svg => subway-isfahan-l.svg} |  0
 ...{subway-isfahan-m copy.svg => subway-isfahan-m.svg} |  0
 ...{subway-isfahan-s copy.svg => subway-isfahan-s.svg} |  0
 ...ubway-istanbul-l copy.svg => subway-istanbul-l.svg} |  0
 ...ubway-istanbul-m copy.svg => subway-istanbul-m.svg} |  0
 ...ubway-istanbul-s copy.svg => subway-istanbul-s.svg} |  0
 .../{subway-izmir-l copy.svg => subway-izmir-l.svg}    |  0
 .../{subway-izmir-m copy.svg => subway-izmir-m.svg}    |  0
 .../{subway-izmir-s copy.svg => subway-izmir-s.svg}    |  0
 .../{subway-kazan-l copy.svg => subway-kazan-l.svg}    |  0
 .../{subway-kazan-m copy.svg => subway-kazan-m.svg}    |  0
 .../{subway-kazan-s copy.svg => subway-kazan-s.svg}    |  0
 ...{subway-kharkiv-l copy.svg => subway-kharkiv-l.svg} |  0
 ...{subway-kharkiv-m copy.svg => subway-kharkiv-m.svg} |  0
 ...{subway-kharkiv-s copy.svg => subway-kharkiv-s.svg} |  0
 .../clear/style-night/symbols/subway-kiev-l copy.svg   |  6 ------
 .../styles/clear/style-night/symbols/subway-kiev-l.svg |  6 +++---
 .../clear/style-night/symbols/subway-kiev-m copy.svg   |  6 ------
 .../styles/clear/style-night/symbols/subway-kiev-m.svg |  6 +++---
 .../clear/style-night/symbols/subway-kiev-s copy.svg   |  6 ------
 .../styles/clear/style-night/symbols/subway-kiev-s.svg |  6 +++---
 .../{subway-kobe-l copy.svg => subway-kobe-l.svg}      |  0
 .../{subway-kobe-m copy.svg => subway-kobe-m.svg}      |  0
 .../{subway-kobe-s copy.svg => subway-kobe-s.svg}      |  0
 ...{subway-kolkata-l copy.svg => subway-kolkata-l.svg} |  0
 ...{subway-kolkata-m copy.svg => subway-kolkata-m.svg} |  0
 ...{subway-kolkata-s copy.svg => subway-kolkata-s.svg} |  0
 ...way-kryvyirih-l copy.svg => subway-kryvyirih-l.svg} |  0
 ...way-kryvyirih-m copy.svg => subway-kryvyirih-m.svg} |  0
 ...way-kryvyirih-s copy.svg => subway-kryvyirih-s.svg} |  0
 ...{subway-kunming-l copy.svg => subway-kunming-l.svg} |  0
 ...{subway-kunming-m copy.svg => subway-kunming-m.svg} |  0
 ...{subway-kunming-s copy.svg => subway-kunming-s.svg} |  0
 .../{subway-kyoto-l copy.svg => subway-kyoto-l.svg}    |  0
 .../{subway-kyoto-m copy.svg => subway-kyoto-m.svg}    |  0
 .../{subway-kyoto-s copy.svg => subway-kyoto-s.svg}    |  0
 ...ubway-lausanne-l copy.svg => subway-lausanne-l.svg} |  0
 ...ubway-lausanne-m copy.svg => subway-lausanne-m.svg} |  0
 .../{subway-lille-l copy.svg => subway-lille-l.svg}    |  0
 .../{subway-lille-m copy.svg => subway-lille-m.svg}    |  0
 .../{subway-lille-s copy.svg => subway-lille-s.svg}    |  0
 .../{subway-lima-l copy.svg => subway-lima-l.svg}      |  0
 .../{subway-lima-m copy.svg => subway-lima-m.svg}      |  0
 .../{subway-lima-s copy.svg => subway-lima-s.svg}      |  0
 .../{subway-lisboa-l copy.svg => subway-lisboa-l.svg}  |  0
 .../{subway-lisboa-m copy.svg => subway-lisboa-m.svg}  |  0
 .../{subway-lisboa-s copy.svg => subway-lisboa-s.svg}  |  0
 .../clear/style-night/symbols/subway-london-l copy.svg |  7 -------
 .../clear/style-night/symbols/subway-london-l.svg      |  9 ++++-----
 .../clear/style-night/symbols/subway-london-m copy.svg |  7 -------
 .../clear/style-night/symbols/subway-london-m.svg      |  8 ++++----
 .../clear/style-night/symbols/subway-london-s copy.svg |  7 -------
 .../clear/style-night/symbols/subway-london-s.svg      |  8 ++++----
 ...y-losangeles-l copy.svg => subway-losangeles-l.svg} |  0
 ...y-losangeles-m copy.svg => subway-losangeles-m.svg} |  0
 ...y-losangeles-s copy.svg => subway-losangeles-s.svg} |  0
 ...{subway-lucknow-l copy.svg => subway-lucknow-l.svg} |  0
 ...{subway-lucknow-m copy.svg => subway-lucknow-m.svg} |  0
 ...{subway-lucknow-s copy.svg => subway-lucknow-s.svg} |  0
 .../{subway-lyon-l copy.svg => subway-lyon-l.svg}      |  0
 .../{subway-lyon-m copy.svg => subway-lyon-m.svg}      |  0
 .../{subway-lyon-s copy.svg => subway-lyon-s.svg}      |  0
 .../clear/style-night/symbols/subway-madrid-l copy.svg |  7 -------
 .../clear/style-night/symbols/subway-madrid-l.svg      |  8 ++++----
 .../clear/style-night/symbols/subway-madrid-m copy.svg |  7 -------
 .../clear/style-night/symbols/subway-madrid-m.svg      |  8 ++++----
 .../clear/style-night/symbols/subway-madrid-s copy.svg |  7 -------
 .../clear/style-night/symbols/subway-madrid-s.svg      |  8 ++++----
 .../{subway-malaga-l copy.svg => subway-malaga-l.svg}  |  0
 .../{subway-malaga-m copy.svg => subway-malaga-m.svg}  |  0
 .../{subway-malaga-s copy.svg => subway-malaga-s.svg}  |  0
 .../{subway-manila-l copy.svg => subway-manila-l.svg}  |  0
 .../{subway-manila-m copy.svg => subway-manila-m.svg}  |  0
 .../{subway-manila-s copy.svg => subway-manila-s.svg}  |  0
 ...way-maracaibo-l copy.svg => subway-maracaibo-l.svg} |  0
 ...way-maracaibo-m copy.svg => subway-maracaibo-m.svg} |  0
 ...way-maracaibo-s copy.svg => subway-maracaibo-s.svg} |  0
 ...way-marseille-l copy.svg => subway-marseille-l.svg} |  0
 ...way-marseille-m copy.svg => subway-marseille-m.svg} |  0
 ...way-marseille-s copy.svg => subway-marseille-s.svg} |  0
 ...{subway-mashhad-l copy.svg => subway-mashhad-l.svg} |  0
 ...{subway-mashhad-m copy.svg => subway-mashhad-m.svg} |  0
 ...{subway-mashhad-s copy.svg => subway-mashhad-s.svg} |  0
 ...achusetts-l copy.svg => subway-massachusetts-l.svg} |  0
 ...achusetts-m copy.svg => subway-massachusetts-m.svg} |  0
 ...achusetts-s copy.svg => subway-massachusetts-s.svg} |  0
 .../{subway-mecca-l copy.svg => subway-mecca-l.svg}    |  0
 .../{subway-mecca-m copy.svg => subway-mecca-m.svg}    |  0
 .../{subway-mecca-s copy.svg => subway-mecca-s.svg}    |  0
 ...ubway-medellin-l copy.svg => subway-medellin-l.svg} |  0
 ...ubway-medellin-m copy.svg => subway-medellin-m.svg} |  0
 ...ubway-medellin-s copy.svg => subway-medellin-s.svg} |  0
 .../{subway-mexico-l copy.svg => subway-mexico-l.svg}  |  0
 .../{subway-mexico-m copy.svg => subway-mexico-m.svg}  |  0
 .../{subway-mexico-s copy.svg => subway-mexico-s.svg}  |  0
 .../{subway-milan-l copy.svg => subway-milan-l.svg}    |  0
 .../{subway-milan-m copy.svg => subway-milan-m.svg}    |  0
 .../{subway-milan-s copy.svg => subway-milan-s.svg}    |  0
 ...minatomirai-l copy.svg => subway-minatomirai-l.svg} |  0
 ...minatomirai-m copy.svg => subway-minatomirai-m.svg} |  0
 ...minatomirai-s copy.svg => subway-minatomirai-s.svg} |  0
 .../clear/style-night/symbols/subway-minsk-l copy.svg  |  6 ------
 .../clear/style-night/symbols/subway-minsk-l.svg       |  6 +++---
 .../clear/style-night/symbols/subway-minsk-m copy.svg  |  6 ------
 .../clear/style-night/symbols/subway-minsk-m.svg       |  6 +++---
 .../clear/style-night/symbols/subway-minsk-s copy.svg  |  6 ------
 .../clear/style-night/symbols/subway-minsk-s.svg       |  6 +++---
 ...ubway-montreal-l copy.svg => subway-montreal-l.svg} |  0
 ...ubway-montreal-m copy.svg => subway-montreal-m.svg} |  0
 ...ubway-montreal-s copy.svg => subway-montreal-s.svg} |  0
 .../clear/style-night/symbols/subway-moscow-l copy.svg |  6 ------
 .../clear/style-night/symbols/subway-moscow-l.svg      |  6 +++---
 .../clear/style-night/symbols/subway-moscow-m copy.svg |  6 ------
 .../clear/style-night/symbols/subway-moscow-m.svg      |  6 +++---
 .../clear/style-night/symbols/subway-moscow-s copy.svg |  6 ------
 .../clear/style-night/symbols/subway-moscow-s.svg      |  8 ++++----
 .../{subway-nagoya-l copy.svg => subway-nagoya-l.svg}  |  0
 .../{subway-nagoya-m copy.svg => subway-nagoya-m.svg}  |  0
 .../{subway-nagoya-s copy.svg => subway-nagoya-s.svg}  |  0
 .../style-night/symbols/subway-newyork-l copy.svg      |  7 -------
 .../clear/style-night/symbols/subway-newyork-l.svg     |  6 +++---
 .../style-night/symbols/subway-newyork-m copy.svg      |  7 -------
 .../clear/style-night/symbols/subway-newyork-m.svg     |  6 +++---
 .../style-night/symbols/subway-newyork-s copy.svg      |  7 -------
 .../clear/style-night/symbols/subway-newyork-s.svg     |  4 ++--
 .../{subway-nnov-l copy.svg => subway-nnov-l.svg}      |  0
 .../{subway-nnov-m copy.svg => subway-nnov-m.svg}      |  0
 .../{subway-nnov-s copy.svg => subway-nnov-s.svg}      |  0
 ...novosibirsk-l copy.svg => subway-novosibirsk-l.svg} |  0
 ...novosibirsk-m copy.svg => subway-novosibirsk-m.svg} |  0
 ...novosibirsk-s copy.svg => subway-novosibirsk-s.svg} |  0
 .../{subway-omsk-l copy.svg => subway-omsk-l.svg}      |  0
 .../{subway-omsk-m copy.svg => subway-omsk-m.svg}      |  0
 .../{subway-omsk-s copy.svg => subway-omsk-s.svg}      |  0
 .../{subway-osaka-l copy.svg => subway-osaka-l.svg}    |  0
 .../{subway-osaka-m copy.svg => subway-osaka-m.svg}    |  0
 .../{subway-osaka-s copy.svg => subway-osaka-s.svg}    |  0
 .../{subway-oslo-l copy.svg => subway-oslo-l.svg}      |  0
 .../{subway-oslo-m copy.svg => subway-oslo-m.svg}      |  0
 .../{subway-oslo-s copy.svg => subway-oslo-s.svg}      |  0
 .../{subway-palma-l copy.svg => subway-palma-l.svg}    |  0
 .../{subway-palma-m copy.svg => subway-palma-m.svg}    |  0
 .../{subway-palma-s copy.svg => subway-palma-s.svg}    |  0
 .../{subway-panama-l copy.svg => subway-panama-l.svg}  |  0
 .../{subway-panama-m copy.svg => subway-panama-m.svg}  |  0
 .../{subway-panama-s copy.svg => subway-panama-s.svg}  |  0
 .../clear/style-night/symbols/subway-paris-l copy.svg  |  8 --------
 .../clear/style-night/symbols/subway-paris-l.svg       |  9 +++++----
 .../clear/style-night/symbols/subway-paris-m copy.svg  |  8 --------
 .../clear/style-night/symbols/subway-paris-m.svg       |  9 +++++----
 .../clear/style-night/symbols/subway-paris-s copy.svg  |  8 --------
 .../clear/style-night/symbols/subway-paris-s.svg       |  9 +++++----
 ...{subway-perugia-l copy.svg => subway-perugia-l.svg} |  0
 ...{subway-perugia-m copy.svg => subway-perugia-m.svg} |  0
 ...{subway-perugia-s copy.svg => subway-perugia-s.svg} |  0
 ...iladelphia-l copy.svg => subway-philadelphia-l.svg} |  0
 ...iladelphia-m copy.svg => subway-philadelphia-m.svg} |  0
 ...iladelphia-s copy.svg => subway-philadelphia-s.svg} |  0
 ...y-pittsburgh-l copy.svg => subway-pittsburgh-l.svg} |  0
 ...y-pittsburgh-m copy.svg => subway-pittsburgh-m.svg} |  0
 ...y-pittsburgh-s copy.svg => subway-pittsburgh-s.svg} |  0
 .../{subway-porto-l copy.svg => subway-porto-l.svg}    |  0
 .../{subway-porto-m copy.svg => subway-porto-m.svg}    |  0
 .../{subway-porto-s copy.svg => subway-porto-s.svg}    |  0
 ...way-pyongyang-l copy.svg => subway-pyongyang-l.svg} |  0
 ...way-pyongyang-m copy.svg => subway-pyongyang-m.svg} |  0
 ...way-pyongyang-s copy.svg => subway-pyongyang-s.svg} |  0
 .../{subway-rennes-l copy.svg => subway-rennes-l.svg}  |  0
 .../{subway-rennes-m copy.svg => subway-rennes-m.svg}  |  0
 .../{subway-rennes-s copy.svg => subway-rennes-s.svg}  |  0
 ...seau-paris-l copy.svg => subway-reseau-paris-l.svg} |  0
 ...seau-paris-m copy.svg => subway-reseau-paris-m.svg} |  0
 ...seau-paris-s copy.svg => subway-reseau-paris-s.svg} |  0
 ...odejaneiro-l copy.svg => subway-riodejaneiro-l.svg} |  0
 ...odejaneiro-m copy.svg => subway-riodejaneiro-m.svg} |  0
 ...odejaneiro-s copy.svg => subway-riodejaneiro-s.svg} |  0
 .../clear/style-night/symbols/subway-rome-l copy.svg   |  7 -------
 .../styles/clear/style-night/symbols/subway-rome-l.svg |  6 +++---
 .../clear/style-night/symbols/subway-rome-m copy.svg   |  7 -------
 .../styles/clear/style-night/symbols/subway-rome-m.svg |  6 +++---
 .../clear/style-night/symbols/subway-rome-s copy.svg   |  7 -------
 .../styles/clear/style-night/symbols/subway-rome-s.svg |  6 +++---
 ...way-rotterdam-l copy.svg => subway-rotterdam-l.svg} |  0
 ...way-rotterdam-m copy.svg => subway-rotterdam-m.svg} |  0
 ...way-rotterdam-s copy.svg => subway-rotterdam-s.svg} |  0
 .../{subway-samara-l copy.svg => subway-samara-l.svg}  |  0
 .../{subway-samara-m copy.svg => subway-samara-m.svg}  |  0
 .../{subway-samara-s copy.svg => subway-samara-s.svg}  |  0
 ...nfrancisco-l copy.svg => subway-sanfrancisco-l.svg} |  0
 ...nfrancisco-m copy.svg => subway-sanfrancisco-m.svg} |  0
 ...nfrancisco-s copy.svg => subway-sanfrancisco-s.svg} |  0
 ...ubway-santiago-l copy.svg => subway-santiago-l.svg} |  0
 ...ubway-santiago-m copy.svg => subway-santiago-m.svg} |  0
 ...ubway-santiago-s copy.svg => subway-santiago-s.svg} |  0
 ...ntodomingo-l copy.svg => subway-santodomingo-l.svg} |  0
 ...ntodomingo-m copy.svg => subway-santodomingo-m.svg} |  0
 ...ntodomingo-s copy.svg => subway-santodomingo-s.svg} |  0
 ...ubway-saopaulo-l copy.svg => subway-saopaulo-l.svg} |  0
 ...ubway-saopaulo-m copy.svg => subway-saopaulo-m.svg} |  0
 ...ubway-saopaulo-s copy.svg => subway-saopaulo-s.svg} |  0
 ...{subway-sapporo-l copy.svg => subway-sapporo-l.svg} |  0
 ...{subway-sapporo-m copy.svg => subway-sapporo-m.svg} |  0
 ...{subway-sapporo-s copy.svg => subway-sapporo-s.svg} |  0
 ...{subway-seattle-l copy.svg => subway-seattle-l.svg} |  0
 ...{subway-seattle-m copy.svg => subway-seattle-m.svg} |  0
 ...{subway-seattle-s copy.svg => subway-seattle-s.svg} |  0
 .../{subway-sendai-l copy.svg => subway-sendai-l.svg}  |  0
 .../{subway-sendai-m copy.svg => subway-sendai-m.svg}  |  0
 .../{subway-sendai-s copy.svg => subway-sendai-s.svg}  |  0
 ...ubway-shanghai-l copy.svg => subway-shanghai-l.svg} |  0
 ...ubway-shanghai-m copy.svg => subway-shanghai-m.svg} |  0
 ...ubway-shanghai-s copy.svg => subway-shanghai-s.svg} |  0
 .../{subway-shiraz-l copy.svg => subway-shiraz-l.svg}  |  0
 .../{subway-shiraz-m copy.svg => subway-shiraz-m.svg}  |  0
 .../{subway-shiraz-s copy.svg => subway-shiraz-s.svg}  |  0
 .../{subway-sofia-l copy.svg => subway-sofia-l.svg}    |  0
 .../{subway-sofia-m copy.svg => subway-sofia-m.svg}    |  0
 .../{subway-sofia-s copy.svg => subway-sofia-s.svg}    |  0
 ...y-southkorea-l copy.svg => subway-southkorea-l.svg} |  0
 ...y-southkorea-m copy.svg => subway-southkorea-m.svg} |  0
 ...y-southkorea-s copy.svg => subway-southkorea-s.svg} |  0
 .../clear/style-night/symbols/subway-spb-l copy.svg    |  7 -------
 data/styles/clear/style-night/symbols/subway-spb-l.svg |  8 ++++----
 .../clear/style-night/symbols/subway-spb-m copy.svg    |  7 -------
 data/styles/clear/style-night/symbols/subway-spb-m.svg |  8 ++++----
 .../clear/style-night/symbols/subway-spb-s copy.svg    |  7 -------
 data/styles/clear/style-night/symbols/subway-spb-s.svg |  6 +++---
 ...{subway-stlouis-l copy.svg => subway-stlouis-l.svg} |  0
 ...{subway-stlouis-m copy.svg => subway-stlouis-m.svg} |  0
 ...{subway-stlouis-s copy.svg => subway-stlouis-s.svg} |  0
 ...way-stockholm-l copy.svg => subway-stockholm-l.svg} |  0
 ...way-stockholm-m copy.svg => subway-stockholm-m.svg} |  0
 ...way-stockholm-s copy.svg => subway-stockholm-s.svg} |  0
 .../{subway-tabriz-l copy.svg => subway-tabriz-l.svg}  |  0
 .../{subway-tabriz-m copy.svg => subway-tabriz-m.svg}  |  0
 .../{subway-tabriz-s copy.svg => subway-tabriz-s.svg}  |  0
 .../{subway-taipei-l copy.svg => subway-taipei-l.svg}  |  0
 .../{subway-taipei-m copy.svg => subway-taipei-m.svg}  |  0
 .../{subway-taipei-s copy.svg => subway-taipei-s.svg}  |  0
 ...{subway-taoyuan-l copy.svg => subway-taoyuan-l.svg} |  0
 ...{subway-taoyuan-m copy.svg => subway-taoyuan-m.svg} |  0
 ...{subway-taoyuan-s copy.svg => subway-taoyuan-s.svg} |  0
 ...ubway-tashkent-l copy.svg => subway-tashkent-l.svg} |  0
 ...ubway-tashkent-m copy.svg => subway-tashkent-m.svg} |  0
 ...ubway-tashkent-s copy.svg => subway-tashkent-s.svg} |  0
 ...{subway-tbilisi-l copy.svg => subway-tbilisi-l.svg} |  0
 ...{subway-tbilisi-m copy.svg => subway-tbilisi-m.svg} |  0
 ...{subway-tbilisi-s copy.svg => subway-tbilisi-s.svg} |  0
 ...{subway-tianjin-l copy.svg => subway-tianjin-l.svg} |  0
 ...{subway-tianjin-m copy.svg => subway-tianjin-m.svg} |  0
 ...{subway-tianjin-s copy.svg => subway-tianjin-s.svg} |  0
 .../{subway-tokyo-l copy.svg => subway-tokyo-l.svg}    |  0
 .../{subway-tokyo-m copy.svg => subway-tokyo-m.svg}    |  0
 .../{subway-tokyo-s copy.svg => subway-tokyo-s.svg}    |  0
 ...tyneandwear-l copy.svg => subway-tyneandwear-l.svg} |  0
 ...tyneandwear-m copy.svg => subway-tyneandwear-m.svg} |  0
 ...tyneandwear-s copy.svg => subway-tyneandwear-s.svg} |  0
 ...ubway-valencia-l copy.svg => subway-valencia-l.svg} |  0
 ...ubway-valencia-m copy.svg => subway-valencia-m.svg} |  0
 ...ubway-valencia-s copy.svg => subway-valencia-s.svg} |  0
 ...way-volgograd-l copy.svg => subway-volgograd-l.svg} |  0
 ...way-volgograd-m copy.svg => subway-volgograd-m.svg} |  0
 ...way-volgograd-s copy.svg => subway-volgograd-s.svg} |  0
 .../{subway-warsaw-l copy.svg => subway-warsaw-l.svg}  |  0
 .../{subway-warsaw-m copy.svg => subway-warsaw-m.svg}  |  0
 .../{subway-warsaw-s copy.svg => subway-warsaw-s.svg}  |  0
 ...ubway-warszawa-l copy.svg => subway-warszawa-l.svg} |  0
 ...ubway-warszawa-m copy.svg => subway-warszawa-m.svg} |  0
 ...ubway-warszawa-s copy.svg => subway-warszawa-s.svg} |  0
 ...y-washington-l copy.svg => subway-washington-l.svg} |  0
 ...y-washington-m copy.svg => subway-washington-m.svg} |  0
 ...y-washington-s copy.svg => subway-washington-s.svg} |  0
 .../{subway-wien-l copy.svg => subway-wien-l.svg}      |  0
 .../{subway-wien-m copy.svg => subway-wien-m.svg}      |  0
 .../{subway-wien-s copy.svg => subway-wien-s.svg}      |  0
 .../{subway-wuhan-l copy.svg => subway-wuhan-l.svg}    |  0
 .../{subway-wuhan-m copy.svg => subway-wuhan-m.svg}    |  0
 .../{subway-wuhan-s copy.svg => subway-wuhan-s.svg}    |  0
 ...{subway-yerevan-l copy.svg => subway-yerevan-l.svg} |  0
 ...{subway-yerevan-m copy.svg => subway-yerevan-m.svg} |  0
 ...{subway-yerevan-s copy.svg => subway-yerevan-s.svg} |  0
 ...ubway-yokohama-l copy.svg => subway-yokohama-l.svg} |  0
 ...ubway-yokohama-m copy.svg => subway-yokohama-m.svg} |  0
 ...ubway-yokohama-s copy.svg => subway-yokohama-s.svg} |  0
 422 files changed, 149 insertions(+), 351 deletions(-)
 create mode 100644 data/styles/clear/style-clear/symbols/subway-bengaluru-l.svg
 create mode 100644 data/styles/clear/style-clear/symbols/subway-bengaluru-m.svg
 create mode 100644 data/styles/clear/style-clear/symbols/subway-bengaluru-s.svg
 rename data/styles/clear/style-clear/symbols/{subway-wien-l.svg => subway-vienna-l.svg} (100%)
 rename data/styles/clear/style-clear/symbols/{subway-wien-m.svg => subway-vienna-m.svg} (100%)
 rename data/styles/clear/style-clear/symbols/{subway-wien-s.svg => subway-vienna-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-adana-l copy.svg => subway-adana-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-adana-m copy.svg => subway-adana-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-adana-s copy.svg => subway-adana-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-algeria-l copy.svg => subway-algeria-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-algeria-m copy.svg => subway-algeria-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-algeria-s copy.svg => subway-algeria-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-alicante-l copy.svg => subway-alicante-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-alicante-m copy.svg => subway-alicante-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-alicante-s copy.svg => subway-alicante-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-almaty-l copy.svg => subway-almaty-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-almaty-m copy.svg => subway-almaty-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-almaty-s copy.svg => subway-almaty-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-amsterdam-l copy.svg => subway-amsterdam-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-amsterdam-m copy.svg => subway-amsterdam-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-amsterdam-s copy.svg => subway-amsterdam-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-ankara-l copy.svg => subway-ankara-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-ankara-m copy.svg => subway-ankara-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-ankara-s copy.svg => subway-ankara-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-athens-l copy.svg => subway-athens-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-athens-m copy.svg => subway-athens-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-athens-s copy.svg => subway-athens-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-baku-l copy.svg => subway-baku-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-baku-m copy.svg => subway-baku-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-baku-s copy.svg => subway-baku-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-bangkok-l copy.svg => subway-bangkok-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-bangkok-m copy.svg => subway-bangkok-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-bangkok-s copy.svg => subway-bangkok-s.svg} (100%)
 delete mode 100644 data/styles/clear/style-night/symbols/subway-barcelona-l copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-barcelona-m copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-barcelona-s copy.svg
 rename data/styles/clear/style-night/symbols/{subway-beijing-l copy.svg => subway-beijing-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-beijing-m copy.svg => subway-beijing-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-beijing-s copy.svg => subway-beijing-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-nagoya-l copy 2.svg => subway-bengaluru-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-nagoya-m copy 2.svg => subway-bengaluru-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-nagoya-s copy 2.svg => subway-bengaluru-s.svg} (100%)
 delete mode 100644 data/styles/clear/style-night/symbols/subway-berlin-l copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-berlin-m copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-berlin-s copy.svg
 rename data/styles/clear/style-night/symbols/{subway-brasilia-l copy.svg => subway-brasilia-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-brasilia-m copy.svg => subway-brasilia-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-brasilia-s copy.svg => subway-brasilia-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-brescia-l copy.svg => subway-brescia-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-brescia-m copy.svg => subway-brescia-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-brescia-s copy.svg => subway-brescia-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-brussel-l copy.svg => subway-brussel-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-brussel-m copy.svg => subway-brussel-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-brussel-s copy.svg => subway-brussel-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-bucharest-l copy.svg => subway-bucharest-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-bucharest-m copy.svg => subway-bucharest-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-bucharest-s copy.svg => subway-bucharest-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-budapest-l copy.svg => subway-budapest-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-budapest-m copy.svg => subway-budapest-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-budapest-s copy.svg => subway-budapest-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-buenosaires-l copy.svg => subway-buenosaires-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-buenosaires-m copy.svg => subway-buenosaires-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-buenosaires-s copy.svg => subway-buenosaires-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-bursaray-l copy.svg => subway-bursaray-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-bursaray-m copy.svg => subway-bursaray-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-bursaray-s copy.svg => subway-bursaray-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-cairo-l copy.svg => subway-cairo-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-cairo-m copy.svg => subway-cairo-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-cairo-s copy.svg => subway-cairo-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-caracas-l copy.svg => subway-caracas-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-caracas-m copy.svg => subway-caracas-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-caracas-s copy.svg => subway-caracas-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-catania-l copy.svg => subway-catania-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-catania-m copy.svg => subway-catania-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-catania-s copy.svg => subway-catania-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-changchun-l copy.svg => subway-changchun-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-changchun-m copy.svg => subway-changchun-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-changchun-s copy.svg => subway-changchun-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-chengdu-l copy.svg => subway-chengdu-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-chengdu-m copy.svg => subway-chengdu-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-chengdu-s copy.svg => subway-chengdu-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-chicago-l copy.svg => subway-chicago-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-chicago-m copy.svg => subway-chicago-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-chicago-s copy.svg => subway-chicago-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-chongqing-l copy.svg => subway-chongqing-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-chongqing-m copy.svg => subway-chongqing-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-chongqing-s copy.svg => subway-chongqing-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-dalian-l copy.svg => subway-dalian-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-dalian-m copy.svg => subway-dalian-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-dalian-s copy.svg => subway-dalian-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-delhi-l copy.svg => subway-delhi-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-delhi-m copy.svg => subway-delhi-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-delhi-s copy.svg => subway-delhi-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-dnepro-l copy.svg => subway-dnepro-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-dnepro-m copy.svg => subway-dnepro-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-dnepro-s copy.svg => subway-dnepro-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-dubai-l copy.svg => subway-dubai-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-dubai-m copy.svg => subway-dubai-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-dubai-s copy.svg => subway-dubai-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-edmonton-l copy.svg => subway-edmonton-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-edmonton-m copy.svg => subway-edmonton-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-edmonton-s copy.svg => subway-edmonton-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-ekb-l copy.svg => subway-ekb-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-ekb-m copy.svg => subway-ekb-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-ekb-s copy.svg => subway-ekb-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-foshan-l copy.svg => subway-foshan-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-foshan-m copy.svg => subway-foshan-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-foshan-s copy.svg => subway-foshan-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-fukuoka-l copy.svg => subway-fukuoka-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-fukuoka-m copy.svg => subway-fukuoka-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-fukuoka-s copy.svg => subway-fukuoka-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-glasgow-l copy.svg => subway-glasgow-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-glasgow-m copy.svg => subway-glasgow-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-glasgow-s copy.svg => subway-glasgow-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-guadalajara-l copy.svg => subway-guadalajara-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-guadalajara-m copy.svg => subway-guadalajara-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-guadalajara-s copy.svg => subway-guadalajara-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-guangzhou-l copy.svg => subway-guangzhou-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-guangzhou-m copy.svg => subway-guangzhou-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-guangzhou-s copy.svg => subway-guangzhou-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-haagse-l copy.svg => subway-haagse-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-haagse-m copy.svg => subway-haagse-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-haagse-s copy.svg => subway-haagse-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-helsinki-l copy.svg => subway-helsinki-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-helsinki-m copy.svg => subway-helsinki-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-helsinki-s copy.svg => subway-helsinki-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-hirosima-l copy.svg => subway-hirosima-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-hirosima-m copy.svg => subway-hirosima-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-hirosima-s copy.svg => subway-hirosima-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-isfahan-l copy.svg => subway-isfahan-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-isfahan-m copy.svg => subway-isfahan-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-isfahan-s copy.svg => subway-isfahan-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-istanbul-l copy.svg => subway-istanbul-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-istanbul-m copy.svg => subway-istanbul-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-istanbul-s copy.svg => subway-istanbul-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-izmir-l copy.svg => subway-izmir-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-izmir-m copy.svg => subway-izmir-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-izmir-s copy.svg => subway-izmir-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kazan-l copy.svg => subway-kazan-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kazan-m copy.svg => subway-kazan-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kazan-s copy.svg => subway-kazan-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kharkiv-l copy.svg => subway-kharkiv-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kharkiv-m copy.svg => subway-kharkiv-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kharkiv-s copy.svg => subway-kharkiv-s.svg} (100%)
 delete mode 100644 data/styles/clear/style-night/symbols/subway-kiev-l copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-kiev-m copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-kiev-s copy.svg
 rename data/styles/clear/style-night/symbols/{subway-kobe-l copy.svg => subway-kobe-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kobe-m copy.svg => subway-kobe-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kobe-s copy.svg => subway-kobe-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kolkata-l copy.svg => subway-kolkata-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kolkata-m copy.svg => subway-kolkata-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kolkata-s copy.svg => subway-kolkata-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kryvyirih-l copy.svg => subway-kryvyirih-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kryvyirih-m copy.svg => subway-kryvyirih-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kryvyirih-s copy.svg => subway-kryvyirih-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kunming-l copy.svg => subway-kunming-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kunming-m copy.svg => subway-kunming-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kunming-s copy.svg => subway-kunming-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kyoto-l copy.svg => subway-kyoto-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kyoto-m copy.svg => subway-kyoto-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-kyoto-s copy.svg => subway-kyoto-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lausanne-l copy.svg => subway-lausanne-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lausanne-m copy.svg => subway-lausanne-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lille-l copy.svg => subway-lille-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lille-m copy.svg => subway-lille-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lille-s copy.svg => subway-lille-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lima-l copy.svg => subway-lima-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lima-m copy.svg => subway-lima-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lima-s copy.svg => subway-lima-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lisboa-l copy.svg => subway-lisboa-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lisboa-m copy.svg => subway-lisboa-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lisboa-s copy.svg => subway-lisboa-s.svg} (100%)
 delete mode 100644 data/styles/clear/style-night/symbols/subway-london-l copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-london-m copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-london-s copy.svg
 rename data/styles/clear/style-night/symbols/{subway-losangeles-l copy.svg => subway-losangeles-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-losangeles-m copy.svg => subway-losangeles-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-losangeles-s copy.svg => subway-losangeles-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lucknow-l copy.svg => subway-lucknow-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lucknow-m copy.svg => subway-lucknow-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lucknow-s copy.svg => subway-lucknow-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lyon-l copy.svg => subway-lyon-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lyon-m copy.svg => subway-lyon-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-lyon-s copy.svg => subway-lyon-s.svg} (100%)
 delete mode 100644 data/styles/clear/style-night/symbols/subway-madrid-l copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-madrid-m copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-madrid-s copy.svg
 rename data/styles/clear/style-night/symbols/{subway-malaga-l copy.svg => subway-malaga-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-malaga-m copy.svg => subway-malaga-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-malaga-s copy.svg => subway-malaga-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-manila-l copy.svg => subway-manila-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-manila-m copy.svg => subway-manila-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-manila-s copy.svg => subway-manila-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-maracaibo-l copy.svg => subway-maracaibo-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-maracaibo-m copy.svg => subway-maracaibo-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-maracaibo-s copy.svg => subway-maracaibo-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-marseille-l copy.svg => subway-marseille-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-marseille-m copy.svg => subway-marseille-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-marseille-s copy.svg => subway-marseille-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-mashhad-l copy.svg => subway-mashhad-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-mashhad-m copy.svg => subway-mashhad-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-mashhad-s copy.svg => subway-mashhad-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-massachusetts-l copy.svg => subway-massachusetts-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-massachusetts-m copy.svg => subway-massachusetts-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-massachusetts-s copy.svg => subway-massachusetts-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-mecca-l copy.svg => subway-mecca-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-mecca-m copy.svg => subway-mecca-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-mecca-s copy.svg => subway-mecca-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-medellin-l copy.svg => subway-medellin-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-medellin-m copy.svg => subway-medellin-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-medellin-s copy.svg => subway-medellin-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-mexico-l copy.svg => subway-mexico-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-mexico-m copy.svg => subway-mexico-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-mexico-s copy.svg => subway-mexico-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-milan-l copy.svg => subway-milan-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-milan-m copy.svg => subway-milan-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-milan-s copy.svg => subway-milan-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-minatomirai-l copy.svg => subway-minatomirai-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-minatomirai-m copy.svg => subway-minatomirai-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-minatomirai-s copy.svg => subway-minatomirai-s.svg} (100%)
 delete mode 100644 data/styles/clear/style-night/symbols/subway-minsk-l copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-minsk-m copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-minsk-s copy.svg
 rename data/styles/clear/style-night/symbols/{subway-montreal-l copy.svg => subway-montreal-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-montreal-m copy.svg => subway-montreal-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-montreal-s copy.svg => subway-montreal-s.svg} (100%)
 delete mode 100644 data/styles/clear/style-night/symbols/subway-moscow-l copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-moscow-m copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-moscow-s copy.svg
 rename data/styles/clear/style-night/symbols/{subway-nagoya-l copy.svg => subway-nagoya-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-nagoya-m copy.svg => subway-nagoya-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-nagoya-s copy.svg => subway-nagoya-s.svg} (100%)
 delete mode 100644 data/styles/clear/style-night/symbols/subway-newyork-l copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-newyork-m copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-newyork-s copy.svg
 rename data/styles/clear/style-night/symbols/{subway-nnov-l copy.svg => subway-nnov-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-nnov-m copy.svg => subway-nnov-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-nnov-s copy.svg => subway-nnov-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-novosibirsk-l copy.svg => subway-novosibirsk-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-novosibirsk-m copy.svg => subway-novosibirsk-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-novosibirsk-s copy.svg => subway-novosibirsk-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-omsk-l copy.svg => subway-omsk-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-omsk-m copy.svg => subway-omsk-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-omsk-s copy.svg => subway-omsk-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-osaka-l copy.svg => subway-osaka-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-osaka-m copy.svg => subway-osaka-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-osaka-s copy.svg => subway-osaka-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-oslo-l copy.svg => subway-oslo-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-oslo-m copy.svg => subway-oslo-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-oslo-s copy.svg => subway-oslo-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-palma-l copy.svg => subway-palma-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-palma-m copy.svg => subway-palma-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-palma-s copy.svg => subway-palma-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-panama-l copy.svg => subway-panama-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-panama-m copy.svg => subway-panama-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-panama-s copy.svg => subway-panama-s.svg} (100%)
 delete mode 100644 data/styles/clear/style-night/symbols/subway-paris-l copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-paris-m copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-paris-s copy.svg
 rename data/styles/clear/style-night/symbols/{subway-perugia-l copy.svg => subway-perugia-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-perugia-m copy.svg => subway-perugia-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-perugia-s copy.svg => subway-perugia-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-philadelphia-l copy.svg => subway-philadelphia-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-philadelphia-m copy.svg => subway-philadelphia-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-philadelphia-s copy.svg => subway-philadelphia-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-pittsburgh-l copy.svg => subway-pittsburgh-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-pittsburgh-m copy.svg => subway-pittsburgh-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-pittsburgh-s copy.svg => subway-pittsburgh-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-porto-l copy.svg => subway-porto-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-porto-m copy.svg => subway-porto-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-porto-s copy.svg => subway-porto-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-pyongyang-l copy.svg => subway-pyongyang-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-pyongyang-m copy.svg => subway-pyongyang-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-pyongyang-s copy.svg => subway-pyongyang-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-rennes-l copy.svg => subway-rennes-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-rennes-m copy.svg => subway-rennes-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-rennes-s copy.svg => subway-rennes-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-reseau-paris-l copy.svg => subway-reseau-paris-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-reseau-paris-m copy.svg => subway-reseau-paris-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-reseau-paris-s copy.svg => subway-reseau-paris-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-riodejaneiro-l copy.svg => subway-riodejaneiro-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-riodejaneiro-m copy.svg => subway-riodejaneiro-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-riodejaneiro-s copy.svg => subway-riodejaneiro-s.svg} (100%)
 delete mode 100644 data/styles/clear/style-night/symbols/subway-rome-l copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-rome-m copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-rome-s copy.svg
 rename data/styles/clear/style-night/symbols/{subway-rotterdam-l copy.svg => subway-rotterdam-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-rotterdam-m copy.svg => subway-rotterdam-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-rotterdam-s copy.svg => subway-rotterdam-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-samara-l copy.svg => subway-samara-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-samara-m copy.svg => subway-samara-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-samara-s copy.svg => subway-samara-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-sanfrancisco-l copy.svg => subway-sanfrancisco-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-sanfrancisco-m copy.svg => subway-sanfrancisco-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-sanfrancisco-s copy.svg => subway-sanfrancisco-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-santiago-l copy.svg => subway-santiago-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-santiago-m copy.svg => subway-santiago-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-santiago-s copy.svg => subway-santiago-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-santodomingo-l copy.svg => subway-santodomingo-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-santodomingo-m copy.svg => subway-santodomingo-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-santodomingo-s copy.svg => subway-santodomingo-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-saopaulo-l copy.svg => subway-saopaulo-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-saopaulo-m copy.svg => subway-saopaulo-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-saopaulo-s copy.svg => subway-saopaulo-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-sapporo-l copy.svg => subway-sapporo-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-sapporo-m copy.svg => subway-sapporo-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-sapporo-s copy.svg => subway-sapporo-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-seattle-l copy.svg => subway-seattle-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-seattle-m copy.svg => subway-seattle-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-seattle-s copy.svg => subway-seattle-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-sendai-l copy.svg => subway-sendai-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-sendai-m copy.svg => subway-sendai-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-sendai-s copy.svg => subway-sendai-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-shanghai-l copy.svg => subway-shanghai-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-shanghai-m copy.svg => subway-shanghai-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-shanghai-s copy.svg => subway-shanghai-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-shiraz-l copy.svg => subway-shiraz-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-shiraz-m copy.svg => subway-shiraz-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-shiraz-s copy.svg => subway-shiraz-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-sofia-l copy.svg => subway-sofia-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-sofia-m copy.svg => subway-sofia-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-sofia-s copy.svg => subway-sofia-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-southkorea-l copy.svg => subway-southkorea-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-southkorea-m copy.svg => subway-southkorea-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-southkorea-s copy.svg => subway-southkorea-s.svg} (100%)
 delete mode 100644 data/styles/clear/style-night/symbols/subway-spb-l copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-spb-m copy.svg
 delete mode 100644 data/styles/clear/style-night/symbols/subway-spb-s copy.svg
 rename data/styles/clear/style-night/symbols/{subway-stlouis-l copy.svg => subway-stlouis-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-stlouis-m copy.svg => subway-stlouis-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-stlouis-s copy.svg => subway-stlouis-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-stockholm-l copy.svg => subway-stockholm-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-stockholm-m copy.svg => subway-stockholm-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-stockholm-s copy.svg => subway-stockholm-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tabriz-l copy.svg => subway-tabriz-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tabriz-m copy.svg => subway-tabriz-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tabriz-s copy.svg => subway-tabriz-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-taipei-l copy.svg => subway-taipei-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-taipei-m copy.svg => subway-taipei-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-taipei-s copy.svg => subway-taipei-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-taoyuan-l copy.svg => subway-taoyuan-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-taoyuan-m copy.svg => subway-taoyuan-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-taoyuan-s copy.svg => subway-taoyuan-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tashkent-l copy.svg => subway-tashkent-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tashkent-m copy.svg => subway-tashkent-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tashkent-s copy.svg => subway-tashkent-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tbilisi-l copy.svg => subway-tbilisi-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tbilisi-m copy.svg => subway-tbilisi-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tbilisi-s copy.svg => subway-tbilisi-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tianjin-l copy.svg => subway-tianjin-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tianjin-m copy.svg => subway-tianjin-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tianjin-s copy.svg => subway-tianjin-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tokyo-l copy.svg => subway-tokyo-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tokyo-m copy.svg => subway-tokyo-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tokyo-s copy.svg => subway-tokyo-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tyneandwear-l copy.svg => subway-tyneandwear-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tyneandwear-m copy.svg => subway-tyneandwear-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-tyneandwear-s copy.svg => subway-tyneandwear-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-valencia-l copy.svg => subway-valencia-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-valencia-m copy.svg => subway-valencia-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-valencia-s copy.svg => subway-valencia-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-volgograd-l copy.svg => subway-volgograd-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-volgograd-m copy.svg => subway-volgograd-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-volgograd-s copy.svg => subway-volgograd-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-warsaw-l copy.svg => subway-warsaw-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-warsaw-m copy.svg => subway-warsaw-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-warsaw-s copy.svg => subway-warsaw-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-warszawa-l copy.svg => subway-warszawa-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-warszawa-m copy.svg => subway-warszawa-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-warszawa-s copy.svg => subway-warszawa-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-washington-l copy.svg => subway-washington-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-washington-m copy.svg => subway-washington-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-washington-s copy.svg => subway-washington-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-wien-l copy.svg => subway-wien-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-wien-m copy.svg => subway-wien-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-wien-s copy.svg => subway-wien-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-wuhan-l copy.svg => subway-wuhan-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-wuhan-m copy.svg => subway-wuhan-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-wuhan-s copy.svg => subway-wuhan-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-yerevan-l copy.svg => subway-yerevan-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-yerevan-m copy.svg => subway-yerevan-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-yerevan-s copy.svg => subway-yerevan-s.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-yokohama-l copy.svg => subway-yokohama-l.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-yokohama-m copy.svg => subway-yokohama-m.svg} (100%)
 rename data/styles/clear/style-night/symbols/{subway-yokohama-s copy.svg => subway-yokohama-s.svg} (100%)

diff --git a/data/styles/clear/style-clear/symbols/subway-bengaluru-l.svg b/data/styles/clear/style-clear/symbols/subway-bengaluru-l.svg
new file mode 100644
index 0000000000..f7bd90cbe6
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/subway-bengaluru-l.svg
@@ -0,0 +1,8 @@
+<svg width="28" height="28" viewBox="0 0 28 28">
+  <g fill="none">
+    <rect width="28" height="28" fill="#FFF" opacity=".6"/>
+    <rect width="26" height="26" x="1" y="1" fill="#FFF"/>
+    <path fill="#6A1B9A" d="M12.8312317,17.5636008 C12.7414042,18.6800565 12.5404677,19.9131292 12.2,21.275 C12.2,21.275 10.325,27.125 7.4,25.475 C7.4,25.475 9.425,25.25 10.625,21.95 C11.7494578,18.8015182 12.0497106,15.9527474 11.4508669,13.1041209 C8.94162461,13.235489 7.25,12.5 7.25,12.5 C8.50470591,12.7214187 9.83204328,12.724943 11.3034875,12.5105729 C11.3023432,12.5070668 11.3011809,12.5035427 11.3,12.5 C11.6,12.425 11.975,12.35 12.275,12.275 L12.2806751,12.2920254 C12.3041695,12.2863503 12.3272995,12.2806751 12.35,12.275 C12.95,12.125 13.475,11.9 14.075,11.675 C14.075,11.9 14.075,12.2 14.15,12.575 C13.625,12.725 13.1,12.875 12.575,12.95 C12.5511518,12.9547696 12.5273036,12.959236 12.5034746,12.9634375 C12.7599597,13.9579688 12.9079427,15.1149543 12.885505,16.4609305 C17.387094,14.8060256 20,16.25 20,16.25 C18.8878318,16.1291122 17.9081627,16.1329293 17.0182793,16.2338135 C17.3779642,17.2628509 17.856047,18.2840705 18.5,19.25 C18.3618844,19.1809422 17.0792132,18.4760202 16.1156995,16.3741032 C14.9065666,16.6143902 13.8553976,17.0391358 12.8312317,17.5636008 Z M16.3722682,10.377383 C17.6030734,9.53212626 18.725698,8.43966526 19.7,7.1 C21.8,4.25 20.9,2.45 20.9,2.45 C23.9,3.95 20,8.75 20,8.75 C18.7390528,10.0709923 17.4781056,11.0074071 16.2941317,11.6362176 C16.2755499,12.4848447 16.3258203,13.3800587 16.475,14.3 C16.1,14.3 15.8,14.375 15.5,14.45 C15.125,12.875 15.05,10.7 15.5,8 C15.5,8 17,2 20,3.5 C20,3.5 18.05,3.875 17,7.25 C16.737782,8.11157342 16.4942737,9.17895392 16.3722682,10.377383 Z M10.325,17.3 C8.75,17.75 3.875,22.475 6.575,24.5 C6.575,24.5 5.975,22.625 8.525,20.15 C8.975,19.7 9.575,19.25 10.175,18.8 C10.25,18.275 10.325,17.75 10.325,17.3 Z M11.075,11.45 C10.7,10.325 10.175,9.2 9.5,8 C9.65,8.075 11.075,8.975 11.975,11.225 L11.075,11.45 Z M8,8 C5,8.75 6.5,11.75 6.5,11.75 C6.5,11.75 5,11 5,9.5 C5,7.25 8,8 8,8 Z M20.75,15.5 C22.25,16.25 23.75,18.5 22.25,20 C20.375,21.875 18.5,20 18.5,20 C18.5,20 19.85,20.6 20.75,20 C23,18.5 20.75,15.5 20.75,15.5 Z"/>
+    <path fill="#8BC34A" d="M18.875,6.5 C18.6678932,6.5 18.5,6.33210678 18.5,6.125 C18.5,5.91789322 18.6678932,5.75 18.875,5.75 C19.0821068,5.75 19.25,5.91789322 19.25,6.125 C19.25,6.33210678 19.0821068,6.5 18.875,6.5 Z M13.625,14.75 C13.4178932,14.75 13.25,14.5821068 13.25,14.375 C13.25,14.1678932 13.4178932,14 13.625,14 C13.8321068,14 14,14.1678932 14,14.375 C14,14.5821068 13.8321068,14.75 13.625,14.75 Z M19.625,18.5 C19.4178932,18.5 19.25,18.3321068 19.25,18.125 C19.25,17.9178932 19.4178932,17.75 19.625,17.75 C19.8321068,17.75 20,17.9178932 20,18.125 C20,18.3321068 19.8321068,18.5 19.625,18.5 Z M8.375,22.25 C8.16789322,22.25 8,22.0821068 8,21.875 C8,21.6678932 8.16789322,21.5 8.375,21.5 C8.58210678,21.5 8.75,21.6678932 8.75,21.875 C8.75,22.0821068 8.58210678,22.25 8.375,22.25 Z M8.375,11 C8.16789322,11 8,10.8321068 8,10.625 C8,10.4178932 8.16789322,10.25 8.375,10.25 C8.58210678,10.25 8.75,10.4178932 8.75,10.625 C8.75,10.8321068 8.58210678,11 8.375,11 Z"/>
+  </g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/subway-bengaluru-m.svg b/data/styles/clear/style-clear/symbols/subway-bengaluru-m.svg
new file mode 100644
index 0000000000..25bf05951e
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/subway-bengaluru-m.svg
@@ -0,0 +1,8 @@
+<svg width="24" height="24" viewBox="0 0 24 24">
+  <g fill="none">
+    <rect width="24" height="24" fill="#FFF" opacity=".6"/>
+    <rect width="22" height="22" x="1" y="1" fill="#FFF"/>
+    <path fill="#6A1B9A" d="M10.5464027,13.8097784 C11.4760724,13.4570691 12.3099091,13.2696661 13.0376312,13.1869078 C13.0374331,13.1863337 13.0372351,13.1857595 13.037037,13.1851852 C13.0423254,13.1851852 13.0476137,13.1851852 13.0529016,13.1851848 C13.3026634,13.157226 13.5398658,13.141594 13.7640907,13.1358212 C13.7944303,13.1286704 13.823734,13.1204837 13.8518519,13.1111111 C13.8541943,13.1187241 13.856546,13.1263372 13.858907,13.1339502 C15.5227276,13.1111639 16.4444444,13.6296296 16.4444444,13.6296296 C15.5387961,13.5367426 14.7423458,13.5384939 14.0208607,13.6166261 C14.3080986,14.4130847 14.6962067,15.2183618 15.1851852,16.0740741 C15.0504688,16.0067159 13.9969847,15.4493482 13.2500861,13.7335967 C12.232008,13.9340731 11.3574886,14.2949676 10.5068304,14.7524416 C10.4373666,15.6717081 10.274721,16.6788939 10,17.7777778 C10,17.7777778 8.44444444,22.6666667 6,21.2592593 C6,21.2592593 7.7037037,21.1111111 8.66666667,18.2962963 C9.62962963,15.7037037 9.85185185,13.3333333 9.33333333,10.962963 C9.32278445,10.9418652 9.31373784,10.9192652 9.30576562,10.8955908 C7.28510165,11.0177444 5.85185185,10.4444444 5.85185185,10.4444444 C6.86903558,10.6624124 8.02874938,10.6665852 9.19119182,10.4569629 C9.18924469,10.452735 9.18724353,10.4485611 9.18518519,10.4444444 C9.48148148,10.3703704 9.7037037,10.2962963 10,10.2222222 C10.0019479,10.2280659 10.0038958,10.2338583 10.0058423,10.2396023 C10.0281804,10.2338089 10.0509007,10.2280156 10.0740741,10.2222222 C10.5185185,10.0740741 11.037037,9.92592593 11.4814815,9.7037037 C11.5555556,10 11.5555556,10.2962963 11.5555556,10.5185185 C11.1111111,10.6666667 10.6666667,10.7407407 10.2962963,10.8148148 C10.2498989,10.8264142 10.2035015,10.8361971 10.1571042,10.8444482 C10.4097578,11.6863092 10.5542409,12.6718092 10.5464027,13.8097784 Z M13.4179728,8.63181705 C14.4165727,7.94185643 15.3772943,7.05255851 16.1481481,5.92592593 C17.9259259,3.55555556 17.1851852,2.07407407 17.1851852,2.07407407 C19.6296296,3.40740741 16.3703704,7.33333333 16.3703704,7.33333333 C15.3753254,8.38691031 14.3340295,9.16298117 13.3561228,9.69809268 C13.3457454,10.4314445 13.4020496,11.2068857 13.5555556,12 C13.2592593,12 12.962963,12.0740741 12.7407407,12.0740741 C12.4444444,10.7407407 12.3703704,8.96296296 12.7407407,6.74074074 C12.7407407,6.74074074 13.9259259,1.77777778 16.4444444,3.03703704 C16.4444444,3.03703704 14.8148148,3.33333333 13.9259259,6.14814815 C13.7118052,6.82619709 13.5148774,7.67617483 13.4179728,8.63181705 Z M8.37037037,14.4444444 C7.11111111,14.8148148 3.03703704,18.7407407 5.25925926,20.3703704 C5.25925926,20.3703704 4.74074074,18.8148148 6.88888889,16.7407407 C7.25925926,16.3703704 7.7037037,16 8.22222222,15.6296296 C8.2962963,15.2592593 8.37037037,14.8148148 8.37037037,14.4444444 Z M9.03703704,9.62962963 C8.74074074,8.66666667 8.2962963,7.7037037 7.7037037,6.74074074 C7.85185185,6.81481481 8.96296296,7.55555556 9.77777778,9.40740741 L9.03703704,9.62962963 Z M6.51851852,6.74074074 C4,7.40740741 5.25925926,9.85185185 5.25925926,9.85185185 C5.25925926,9.85185185 4,9.25925926 4,8 C4,6.14814815 6.51851852,6.74074074 6.51851852,6.74074074 Z M17.037037,12.962963 C18.2962963,13.6296296 19.5555556,15.4814815 18.2962963,16.6666667 C16.7407407,18.2222222 15.1851852,16.6666667 15.1851852,16.6666667 C15.1851852,16.6666667 16.2962963,17.1851852 17.037037,16.6666667 C18.8888889,15.4814815 17.037037,12.962963 17.037037,12.962963 Z"/>
+    <path fill="#8BC34A" d="M15.4814815,5.7037037 C15.2769316,5.7037037 15.1111111,5.53788324 15.1111111,5.33333333 C15.1111111,5.12878343 15.2769316,4.96296296 15.4814815,4.96296296 C15.6860314,4.96296296 15.8518519,5.12878343 15.8518519,5.33333333 C15.8518519,5.53788324 15.6860314,5.7037037 15.4814815,5.7037037 Z M11.037037,12.3703704 C10.8324871,12.3703704 10.6666667,12.2045499 10.6666667,12 C10.6666667,11.7954501 10.8324871,11.6296296 11.037037,11.6296296 C11.2415869,11.6296296 11.4074074,11.7954501 11.4074074,12 C11.4074074,12.2045499 11.2415869,12.3703704 11.037037,12.3703704 Z M16.2222222,15.3333333 C16.0176723,15.3333333 15.8518519,15.1675129 15.8518519,14.962963 C15.8518519,14.7584131 16.0176723,14.5925926 16.2222222,14.5925926 C16.4267721,14.5925926 16.5925926,14.7584131 16.5925926,14.962963 C16.5925926,15.1675129 16.4267721,15.3333333 16.2222222,15.3333333 Z M7.33333333,19.037037 C7.12878343,19.037037 6.96296296,18.8712166 6.96296296,18.6666667 C6.96296296,18.4621168 7.12878343,18.2962963 7.33333333,18.2962963 C7.53788324,18.2962963 7.7037037,18.4621168 7.7037037,18.6666667 C7.7037037,18.8712166 7.53788324,19.037037 7.33333333,19.037037 Z M6.59259259,9.40740741 C6.38804269,9.40740741 6.22222222,9.24158694 6.22222222,9.03703704 C6.22222222,8.83248713 6.38804269,8.66666667 6.59259259,8.66666667 C6.7971425,8.66666667 6.96296296,8.83248713 6.96296296,9.03703704 C6.96296296,9.24158694 6.7971425,9.40740741 6.59259259,9.40740741 Z"/>
+  </g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/subway-bengaluru-s.svg b/data/styles/clear/style-clear/symbols/subway-bengaluru-s.svg
new file mode 100644
index 0000000000..448609caca
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/subway-bengaluru-s.svg
@@ -0,0 +1,8 @@
+<svg width="18" height="18" viewBox="0 0 18 18">
+  <g fill="none">
+    <rect width="18" height="18" fill="#FFF" opacity=".6"/>
+    <rect width="16" height="16" x="1" y="1" fill="#FFF"/>
+    <path fill="#6A1B9A" d="M8.38983754,10.9343636 C8.34470793,11.5702725 8.24434312,12.2798138 8.06666667,13.0666667 C8.06666667,13.0666667 7,16.3333333 5.4,15.4 C5.4,15.4 6.53333333,15.2666667 7.2,13.4 C7.86666667,11.6666667 8,10.0666667 7.66666667,8.4 C6.26666667,8.53333333 5.26666667,8.06666667 5.26666667,8.06666667 C5.93333333,8.2 6.73333333,8.2 7.6,8.06666667 C7.73333333,8.06666667 7.93333333,8 8.13333333,8 C8.46666667,7.93333333 8.8,7.8 9.06666667,7.66666667 C9.06666667,7.8 9.06666667,8 9.13333333,8.13333333 C8.8,8.2 8.53333333,8.33333333 8.26666667,8.33333333 C8.25819722,8.33615648 8.24972778,8.33886008 8.24125833,8.34144918 C8.24857814,8.36096612 8.2569082,8.38048306 8.26666667,8.4 C8.36543509,8.92676492 8.43168617,9.56734051 8.41724463,10.329756 C10.936308,9.40716683 12.4,10.2 12.4,10.2 C11.7571784,10.1335012 11.1954285,10.1407039 10.6853438,10.2044544 C10.8759743,10.7807473 11.1299282,11.3570403 11.5333333,11.9333333 C11.4714559,11.8714559 10.7203914,11.4649849 10.1863488,10.2874691 C9.53485838,10.4234526 8.96074338,10.6535053 8.38983754,10.9343636 Z M10.4021448,6.85353623 C11.0387483,6.40058192 11.6801736,5.79442369 12.2,5.06666667 C13.4,3.46666667 12.8666667,2.46666667 12.8666667,2.46666667 C14.5333333,3.33333333 12.4,6 12.4,6 C11.7078095,6.74543592 11.015619,7.23571508 10.3573933,7.60669679 C10.3495755,8.07556236 10.3798695,8.56758307 10.4666667,9.06666667 C10.2666667,9.06666667 10.0666667,9.13333333 9.93333333,9.13333333 C9.73333333,8.2 9.66666667,7.06666667 9.93333333,5.53333333 C9.86666667,5.6 10.7333333,2.26666667 12.4,3.06666667 C12.4,3.06666667 11.2666667,3.26666667 10.7333333,5.13333333 C10.6014149,5.59504776 10.4694965,6.18728069 10.4021448,6.85353623 Z M6.93333333,10.8 C6.06666667,11.0666667 3.33333333,13.6666667 4.86666667,14.8 C4.86666667,14.8 4.46666667,13.7333333 5.93333333,12.3333333 C6.2,12.0666667 6.53333333,11.8666667 6.86666667,11.6 C6.86666667,11.3333333 6.93333333,11.0666667 6.93333333,10.8 Z M7.4,7.53333333 C7.2,6.86666667 6.86666667,6.26666667 6.53333333,5.6 C6.6,5.66666667 7.4,6.13333333 7.93333333,7.4 L7.4,7.53333333 Z M5.66666667,5.6 C4,6 4.86666667,7.73333333 4.86666667,7.73333333 C4.86666667,7.73333333 4,7.33333333 4,6.46666667 C4,5.2 5.66666667,5.6 5.66666667,5.6 Z M12.8,9.8 C13.6666667,10.2 14.4666667,11.4666667 13.6,12.3333333 C12.5333333,13.4 11.5333333,12.3333333 11.5333333,12.3333333 C11.5333333,12.3333333 12.3333333,12.6666667 12.8,12.3333333 C14.0666667,11.4666667 12.8,9.8 12.8,9.8 Z"/>
+    <path fill="#8BC34A" d="M11.6666667,4.66666667 C11.4825718,4.66666667 11.3333333,4.51742825 11.3333333,4.33333333 C11.3333333,4.14923842 11.4825718,4 11.6666667,4 C11.8507616,4 12,4.14923842 12,4.33333333 C12,4.51742825 11.8507616,4.66666667 11.6666667,4.66666667 Z M9,9.33333333 C8.81590508,9.33333333 8.66666667,9.18409492 8.66666667,9 C8.66666667,8.81590508 8.81590508,8.66666667 9,8.66666667 C9.18409492,8.66666667 9.33333333,8.81590508 9.33333333,9 C9.33333333,9.18409492 9.18409492,9.33333333 9,9.33333333 Z M12.3333333,11.3333333 C12.1492384,11.3333333 12,11.1840949 12,11 C12,10.8159051 12.1492384,10.6666667 12.3333333,10.6666667 C12.5174282,10.6666667 12.6666667,10.8159051 12.6666667,11 C12.6666667,11.1840949 12.5174282,11.3333333 12.3333333,11.3333333 Z M5.66666667,14 C5.48257175,14 5.33333333,13.8507616 5.33333333,13.6666667 C5.33333333,13.4825718 5.48257175,13.3333333 5.66666667,13.3333333 C5.85076158,13.3333333 6,13.4825718 6,13.6666667 C6,13.8507616 5.85076158,14 5.66666667,14 Z M5.66666667,7.33333333 C5.48257175,7.33333333 5.33333333,7.18409492 5.33333333,7 C5.33333333,6.81590508 5.48257175,6.66666667 5.66666667,6.66666667 C5.85076158,6.66666667 6,6.81590508 6,7 C6,7.18409492 5.85076158,7.33333333 5.66666667,7.33333333 Z"/>
+  </g>
+</svg>
diff --git a/data/styles/clear/style-clear/symbols/subway-nagoya-l.svg b/data/styles/clear/style-clear/symbols/subway-nagoya-l.svg
index f7bd90cbe6..fce7e449c4 100644
--- a/data/styles/clear/style-clear/symbols/subway-nagoya-l.svg
+++ b/data/styles/clear/style-clear/symbols/subway-nagoya-l.svg
@@ -1,8 +1,7 @@
 <svg width="28" height="28" viewBox="0 0 28 28">
   <g fill="none">
     <rect width="28" height="28" fill="#FFF" opacity=".6"/>
-    <rect width="26" height="26" x="1" y="1" fill="#FFF"/>
-    <path fill="#6A1B9A" d="M12.8312317,17.5636008 C12.7414042,18.6800565 12.5404677,19.9131292 12.2,21.275 C12.2,21.275 10.325,27.125 7.4,25.475 C7.4,25.475 9.425,25.25 10.625,21.95 C11.7494578,18.8015182 12.0497106,15.9527474 11.4508669,13.1041209 C8.94162461,13.235489 7.25,12.5 7.25,12.5 C8.50470591,12.7214187 9.83204328,12.724943 11.3034875,12.5105729 C11.3023432,12.5070668 11.3011809,12.5035427 11.3,12.5 C11.6,12.425 11.975,12.35 12.275,12.275 L12.2806751,12.2920254 C12.3041695,12.2863503 12.3272995,12.2806751 12.35,12.275 C12.95,12.125 13.475,11.9 14.075,11.675 C14.075,11.9 14.075,12.2 14.15,12.575 C13.625,12.725 13.1,12.875 12.575,12.95 C12.5511518,12.9547696 12.5273036,12.959236 12.5034746,12.9634375 C12.7599597,13.9579688 12.9079427,15.1149543 12.885505,16.4609305 C17.387094,14.8060256 20,16.25 20,16.25 C18.8878318,16.1291122 17.9081627,16.1329293 17.0182793,16.2338135 C17.3779642,17.2628509 17.856047,18.2840705 18.5,19.25 C18.3618844,19.1809422 17.0792132,18.4760202 16.1156995,16.3741032 C14.9065666,16.6143902 13.8553976,17.0391358 12.8312317,17.5636008 Z M16.3722682,10.377383 C17.6030734,9.53212626 18.725698,8.43966526 19.7,7.1 C21.8,4.25 20.9,2.45 20.9,2.45 C23.9,3.95 20,8.75 20,8.75 C18.7390528,10.0709923 17.4781056,11.0074071 16.2941317,11.6362176 C16.2755499,12.4848447 16.3258203,13.3800587 16.475,14.3 C16.1,14.3 15.8,14.375 15.5,14.45 C15.125,12.875 15.05,10.7 15.5,8 C15.5,8 17,2 20,3.5 C20,3.5 18.05,3.875 17,7.25 C16.737782,8.11157342 16.4942737,9.17895392 16.3722682,10.377383 Z M10.325,17.3 C8.75,17.75 3.875,22.475 6.575,24.5 C6.575,24.5 5.975,22.625 8.525,20.15 C8.975,19.7 9.575,19.25 10.175,18.8 C10.25,18.275 10.325,17.75 10.325,17.3 Z M11.075,11.45 C10.7,10.325 10.175,9.2 9.5,8 C9.65,8.075 11.075,8.975 11.975,11.225 L11.075,11.45 Z M8,8 C5,8.75 6.5,11.75 6.5,11.75 C6.5,11.75 5,11 5,9.5 C5,7.25 8,8 8,8 Z M20.75,15.5 C22.25,16.25 23.75,18.5 22.25,20 C20.375,21.875 18.5,20 18.5,20 C18.5,20 19.85,20.6 20.75,20 C23,18.5 20.75,15.5 20.75,15.5 Z"/>
-    <path fill="#8BC34A" d="M18.875,6.5 C18.6678932,6.5 18.5,6.33210678 18.5,6.125 C18.5,5.91789322 18.6678932,5.75 18.875,5.75 C19.0821068,5.75 19.25,5.91789322 19.25,6.125 C19.25,6.33210678 19.0821068,6.5 18.875,6.5 Z M13.625,14.75 C13.4178932,14.75 13.25,14.5821068 13.25,14.375 C13.25,14.1678932 13.4178932,14 13.625,14 C13.8321068,14 14,14.1678932 14,14.375 C14,14.5821068 13.8321068,14.75 13.625,14.75 Z M19.625,18.5 C19.4178932,18.5 19.25,18.3321068 19.25,18.125 C19.25,17.9178932 19.4178932,17.75 19.625,17.75 C19.8321068,17.75 20,17.9178932 20,18.125 C20,18.3321068 19.8321068,18.5 19.625,18.5 Z M8.375,22.25 C8.16789322,22.25 8,22.0821068 8,21.875 C8,21.6678932 8.16789322,21.5 8.375,21.5 C8.58210678,21.5 8.75,21.6678932 8.75,21.875 C8.75,22.0821068 8.58210678,22.25 8.375,22.25 Z M8.375,11 C8.16789322,11 8,10.8321068 8,10.625 C8,10.4178932 8.16789322,10.25 8.375,10.25 C8.58210678,10.25 8.75,10.4178932 8.75,10.625 C8.75,10.8321068 8.58210678,11 8.375,11 Z"/>
+    <rect width="26" height="26" x="1" y="1" fill="#212121"/>
+    <path fill="#FFF" d="M22.5,23.4 C22.3,23.6 22.1,23.8 21.9,24 L17.6,24 L17.3,23 L15.4,17.3 L20,21.2 L22.5,23.4 Z M13.2,17.3 L11.2,23.2 L10.9,24 L6.1,24 C6,23.9 5.9,23.8 5.8,23.7 L8.4,21.5 L13.2,17.3 Z M14,3 C20.6,3 26,8.4 26.1,15 C26.1,17.9 25.1,20.5 23.5,22.5 L22.1,21.3 L21,20.3 C22.1,18.8 22.8,17 22.8,15 C22.8,10.2 18.9,6.3 14.1,6.3 C9.3,6.3 5.4,10.2 5.4,15 C5.4,17.1 6.1,19 7.4,20.5 L6.3,21.4 L4.8,22.7 C3.1,20.6 2,18 2,15 C2,8.4 7.4,3 14,3 Z"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/subway-nagoya-m.svg b/data/styles/clear/style-clear/symbols/subway-nagoya-m.svg
index 25bf05951e..9718765a11 100644
--- a/data/styles/clear/style-clear/symbols/subway-nagoya-m.svg
+++ b/data/styles/clear/style-clear/symbols/subway-nagoya-m.svg
@@ -1,8 +1,7 @@
 <svg width="24" height="24" viewBox="0 0 24 24">
   <g fill="none">
     <rect width="24" height="24" fill="#FFF" opacity=".6"/>
-    <rect width="22" height="22" x="1" y="1" fill="#FFF"/>
-    <path fill="#6A1B9A" d="M10.5464027,13.8097784 C11.4760724,13.4570691 12.3099091,13.2696661 13.0376312,13.1869078 C13.0374331,13.1863337 13.0372351,13.1857595 13.037037,13.1851852 C13.0423254,13.1851852 13.0476137,13.1851852 13.0529016,13.1851848 C13.3026634,13.157226 13.5398658,13.141594 13.7640907,13.1358212 C13.7944303,13.1286704 13.823734,13.1204837 13.8518519,13.1111111 C13.8541943,13.1187241 13.856546,13.1263372 13.858907,13.1339502 C15.5227276,13.1111639 16.4444444,13.6296296 16.4444444,13.6296296 C15.5387961,13.5367426 14.7423458,13.5384939 14.0208607,13.6166261 C14.3080986,14.4130847 14.6962067,15.2183618 15.1851852,16.0740741 C15.0504688,16.0067159 13.9969847,15.4493482 13.2500861,13.7335967 C12.232008,13.9340731 11.3574886,14.2949676 10.5068304,14.7524416 C10.4373666,15.6717081 10.274721,16.6788939 10,17.7777778 C10,17.7777778 8.44444444,22.6666667 6,21.2592593 C6,21.2592593 7.7037037,21.1111111 8.66666667,18.2962963 C9.62962963,15.7037037 9.85185185,13.3333333 9.33333333,10.962963 C9.32278445,10.9418652 9.31373784,10.9192652 9.30576562,10.8955908 C7.28510165,11.0177444 5.85185185,10.4444444 5.85185185,10.4444444 C6.86903558,10.6624124 8.02874938,10.6665852 9.19119182,10.4569629 C9.18924469,10.452735 9.18724353,10.4485611 9.18518519,10.4444444 C9.48148148,10.3703704 9.7037037,10.2962963 10,10.2222222 C10.0019479,10.2280659 10.0038958,10.2338583 10.0058423,10.2396023 C10.0281804,10.2338089 10.0509007,10.2280156 10.0740741,10.2222222 C10.5185185,10.0740741 11.037037,9.92592593 11.4814815,9.7037037 C11.5555556,10 11.5555556,10.2962963 11.5555556,10.5185185 C11.1111111,10.6666667 10.6666667,10.7407407 10.2962963,10.8148148 C10.2498989,10.8264142 10.2035015,10.8361971 10.1571042,10.8444482 C10.4097578,11.6863092 10.5542409,12.6718092 10.5464027,13.8097784 Z M13.4179728,8.63181705 C14.4165727,7.94185643 15.3772943,7.05255851 16.1481481,5.92592593 C17.9259259,3.55555556 17.1851852,2.07407407 17.1851852,2.07407407 C19.6296296,3.40740741 16.3703704,7.33333333 16.3703704,7.33333333 C15.3753254,8.38691031 14.3340295,9.16298117 13.3561228,9.69809268 C13.3457454,10.4314445 13.4020496,11.2068857 13.5555556,12 C13.2592593,12 12.962963,12.0740741 12.7407407,12.0740741 C12.4444444,10.7407407 12.3703704,8.96296296 12.7407407,6.74074074 C12.7407407,6.74074074 13.9259259,1.77777778 16.4444444,3.03703704 C16.4444444,3.03703704 14.8148148,3.33333333 13.9259259,6.14814815 C13.7118052,6.82619709 13.5148774,7.67617483 13.4179728,8.63181705 Z M8.37037037,14.4444444 C7.11111111,14.8148148 3.03703704,18.7407407 5.25925926,20.3703704 C5.25925926,20.3703704 4.74074074,18.8148148 6.88888889,16.7407407 C7.25925926,16.3703704 7.7037037,16 8.22222222,15.6296296 C8.2962963,15.2592593 8.37037037,14.8148148 8.37037037,14.4444444 Z M9.03703704,9.62962963 C8.74074074,8.66666667 8.2962963,7.7037037 7.7037037,6.74074074 C7.85185185,6.81481481 8.96296296,7.55555556 9.77777778,9.40740741 L9.03703704,9.62962963 Z M6.51851852,6.74074074 C4,7.40740741 5.25925926,9.85185185 5.25925926,9.85185185 C5.25925926,9.85185185 4,9.25925926 4,8 C4,6.14814815 6.51851852,6.74074074 6.51851852,6.74074074 Z M17.037037,12.962963 C18.2962963,13.6296296 19.5555556,15.4814815 18.2962963,16.6666667 C16.7407407,18.2222222 15.1851852,16.6666667 15.1851852,16.6666667 C15.1851852,16.6666667 16.2962963,17.1851852 17.037037,16.6666667 C18.8888889,15.4814815 17.037037,12.962963 17.037037,12.962963 Z"/>
-    <path fill="#8BC34A" d="M15.4814815,5.7037037 C15.2769316,5.7037037 15.1111111,5.53788324 15.1111111,5.33333333 C15.1111111,5.12878343 15.2769316,4.96296296 15.4814815,4.96296296 C15.6860314,4.96296296 15.8518519,5.12878343 15.8518519,5.33333333 C15.8518519,5.53788324 15.6860314,5.7037037 15.4814815,5.7037037 Z M11.037037,12.3703704 C10.8324871,12.3703704 10.6666667,12.2045499 10.6666667,12 C10.6666667,11.7954501 10.8324871,11.6296296 11.037037,11.6296296 C11.2415869,11.6296296 11.4074074,11.7954501 11.4074074,12 C11.4074074,12.2045499 11.2415869,12.3703704 11.037037,12.3703704 Z M16.2222222,15.3333333 C16.0176723,15.3333333 15.8518519,15.1675129 15.8518519,14.962963 C15.8518519,14.7584131 16.0176723,14.5925926 16.2222222,14.5925926 C16.4267721,14.5925926 16.5925926,14.7584131 16.5925926,14.962963 C16.5925926,15.1675129 16.4267721,15.3333333 16.2222222,15.3333333 Z M7.33333333,19.037037 C7.12878343,19.037037 6.96296296,18.8712166 6.96296296,18.6666667 C6.96296296,18.4621168 7.12878343,18.2962963 7.33333333,18.2962963 C7.53788324,18.2962963 7.7037037,18.4621168 7.7037037,18.6666667 C7.7037037,18.8712166 7.53788324,19.037037 7.33333333,19.037037 Z M6.59259259,9.40740741 C6.38804269,9.40740741 6.22222222,9.24158694 6.22222222,9.03703704 C6.22222222,8.83248713 6.38804269,8.66666667 6.59259259,8.66666667 C6.7971425,8.66666667 6.96296296,8.83248713 6.96296296,9.03703704 C6.96296296,9.24158694 6.7971425,9.40740741 6.59259259,9.40740741 Z"/>
+    <rect width="22" height="22" x="1" y="1" fill="#212121"/>
+    <path fill="#FFF" d="M18.3,18.5 C18.1,18.7 17.9,18.9 17.7,19 L14.8,19 L14.6,18.5 L13,14 L16.7,17.2 L18.3,18.5 Z M11.4,14 L9.9,18.7 L9.7,19 L6.4,19 C6.3,18.9 6.1,18.8 6,18.6 L7.5,17.3 L11.4,14 Z M12,3 C17,3 21,7 21,12 C21,14.1 20.3,16 19.1,17.5 L18.7,17.2 L17.6,16.2 C18.5,15 19,13.6 19,12 C19,8.1 15.9,5 12,5 C8.1,5 5,8.1 5,12 C5,13.7 5.6,15.2 6.5,16.4 L5.4,17.3 L5,17.7 C3.8,16.1 3,14.2 3,12 C3,7 7,3 12,3 Z"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/subway-nagoya-s.svg b/data/styles/clear/style-clear/symbols/subway-nagoya-s.svg
index 448609caca..9c509a54b6 100644
--- a/data/styles/clear/style-clear/symbols/subway-nagoya-s.svg
+++ b/data/styles/clear/style-clear/symbols/subway-nagoya-s.svg
@@ -1,8 +1,7 @@
 <svg width="18" height="18" viewBox="0 0 18 18">
   <g fill="none">
     <rect width="18" height="18" fill="#FFF" opacity=".6"/>
-    <rect width="16" height="16" x="1" y="1" fill="#FFF"/>
-    <path fill="#6A1B9A" d="M8.38983754,10.9343636 C8.34470793,11.5702725 8.24434312,12.2798138 8.06666667,13.0666667 C8.06666667,13.0666667 7,16.3333333 5.4,15.4 C5.4,15.4 6.53333333,15.2666667 7.2,13.4 C7.86666667,11.6666667 8,10.0666667 7.66666667,8.4 C6.26666667,8.53333333 5.26666667,8.06666667 5.26666667,8.06666667 C5.93333333,8.2 6.73333333,8.2 7.6,8.06666667 C7.73333333,8.06666667 7.93333333,8 8.13333333,8 C8.46666667,7.93333333 8.8,7.8 9.06666667,7.66666667 C9.06666667,7.8 9.06666667,8 9.13333333,8.13333333 C8.8,8.2 8.53333333,8.33333333 8.26666667,8.33333333 C8.25819722,8.33615648 8.24972778,8.33886008 8.24125833,8.34144918 C8.24857814,8.36096612 8.2569082,8.38048306 8.26666667,8.4 C8.36543509,8.92676492 8.43168617,9.56734051 8.41724463,10.329756 C10.936308,9.40716683 12.4,10.2 12.4,10.2 C11.7571784,10.1335012 11.1954285,10.1407039 10.6853438,10.2044544 C10.8759743,10.7807473 11.1299282,11.3570403 11.5333333,11.9333333 C11.4714559,11.8714559 10.7203914,11.4649849 10.1863488,10.2874691 C9.53485838,10.4234526 8.96074338,10.6535053 8.38983754,10.9343636 Z M10.4021448,6.85353623 C11.0387483,6.40058192 11.6801736,5.79442369 12.2,5.06666667 C13.4,3.46666667 12.8666667,2.46666667 12.8666667,2.46666667 C14.5333333,3.33333333 12.4,6 12.4,6 C11.7078095,6.74543592 11.015619,7.23571508 10.3573933,7.60669679 C10.3495755,8.07556236 10.3798695,8.56758307 10.4666667,9.06666667 C10.2666667,9.06666667 10.0666667,9.13333333 9.93333333,9.13333333 C9.73333333,8.2 9.66666667,7.06666667 9.93333333,5.53333333 C9.86666667,5.6 10.7333333,2.26666667 12.4,3.06666667 C12.4,3.06666667 11.2666667,3.26666667 10.7333333,5.13333333 C10.6014149,5.59504776 10.4694965,6.18728069 10.4021448,6.85353623 Z M6.93333333,10.8 C6.06666667,11.0666667 3.33333333,13.6666667 4.86666667,14.8 C4.86666667,14.8 4.46666667,13.7333333 5.93333333,12.3333333 C6.2,12.0666667 6.53333333,11.8666667 6.86666667,11.6 C6.86666667,11.3333333 6.93333333,11.0666667 6.93333333,10.8 Z M7.4,7.53333333 C7.2,6.86666667 6.86666667,6.26666667 6.53333333,5.6 C6.6,5.66666667 7.4,6.13333333 7.93333333,7.4 L7.4,7.53333333 Z M5.66666667,5.6 C4,6 4.86666667,7.73333333 4.86666667,7.73333333 C4.86666667,7.73333333 4,7.33333333 4,6.46666667 C4,5.2 5.66666667,5.6 5.66666667,5.6 Z M12.8,9.8 C13.6666667,10.2 14.4666667,11.4666667 13.6,12.3333333 C12.5333333,13.4 11.5333333,12.3333333 11.5333333,12.3333333 C11.5333333,12.3333333 12.3333333,12.6666667 12.8,12.3333333 C14.0666667,11.4666667 12.8,9.8 12.8,9.8 Z"/>
-    <path fill="#8BC34A" d="M11.6666667,4.66666667 C11.4825718,4.66666667 11.3333333,4.51742825 11.3333333,4.33333333 C11.3333333,4.14923842 11.4825718,4 11.6666667,4 C11.8507616,4 12,4.14923842 12,4.33333333 C12,4.51742825 11.8507616,4.66666667 11.6666667,4.66666667 Z M9,9.33333333 C8.81590508,9.33333333 8.66666667,9.18409492 8.66666667,9 C8.66666667,8.81590508 8.81590508,8.66666667 9,8.66666667 C9.18409492,8.66666667 9.33333333,8.81590508 9.33333333,9 C9.33333333,9.18409492 9.18409492,9.33333333 9,9.33333333 Z M12.3333333,11.3333333 C12.1492384,11.3333333 12,11.1840949 12,11 C12,10.8159051 12.1492384,10.6666667 12.3333333,10.6666667 C12.5174282,10.6666667 12.6666667,10.8159051 12.6666667,11 C12.6666667,11.1840949 12.5174282,11.3333333 12.3333333,11.3333333 Z M5.66666667,14 C5.48257175,14 5.33333333,13.8507616 5.33333333,13.6666667 C5.33333333,13.4825718 5.48257175,13.3333333 5.66666667,13.3333333 C5.85076158,13.3333333 6,13.4825718 6,13.6666667 C6,13.8507616 5.85076158,14 5.66666667,14 Z M5.66666667,7.33333333 C5.48257175,7.33333333 5.33333333,7.18409492 5.33333333,7 C5.33333333,6.81590508 5.48257175,6.66666667 5.66666667,6.66666667 C5.85076158,6.66666667 6,6.81590508 6,7 C6,7.18409492 5.85076158,7.33333333 5.66666667,7.33333333 Z"/>
+    <rect width="16" height="16" x="1" y="1" fill="#212121"/>
+    <path fill="#FFF" d="M14.1,14.8 C14,14.8 14,14.9 13.9,15 L11.1,15 L11,14.6 L9.8,11.1 L11.2,12.3 L12.6,13.5 L14.1,14.8 Z M8.5,11.1 L7.3,14.7 L7.2,15 L4.1,15 C4.1,15 4.1,15 4,14.9 L5.5,13.6 L7.1,12.3 L8.5,11.1 Z M9,3 C12.9,3 16,6.1 16,10 C16,11.3 15.6,12.6 14.9,13.7 L14.6,13.4 L13.4,12.4 C13.8,11.7 14,10.9 14,10 C14,7.2 11.8,5 9,5 C6.2,5 4,7.2 4,10 C4,11 4.3,11.8 4.7,12.6 L3.5,13.6 L3.2,13.9 C2.4,12.8 2,11.5 2,10 C2,6.1 5.1,3 9,3 Z"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-clear/symbols/subway-wien-l.svg b/data/styles/clear/style-clear/symbols/subway-vienna-l.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-wien-l.svg
rename to data/styles/clear/style-clear/symbols/subway-vienna-l.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-wien-m.svg b/data/styles/clear/style-clear/symbols/subway-vienna-m.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-wien-m.svg
rename to data/styles/clear/style-clear/symbols/subway-vienna-m.svg
diff --git a/data/styles/clear/style-clear/symbols/subway-wien-s.svg b/data/styles/clear/style-clear/symbols/subway-vienna-s.svg
similarity index 100%
rename from data/styles/clear/style-clear/symbols/subway-wien-s.svg
rename to data/styles/clear/style-clear/symbols/subway-vienna-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-adana-l copy.svg b/data/styles/clear/style-night/symbols/subway-adana-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-adana-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-adana-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-adana-m copy.svg b/data/styles/clear/style-night/symbols/subway-adana-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-adana-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-adana-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-adana-s copy.svg b/data/styles/clear/style-night/symbols/subway-adana-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-adana-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-adana-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-algeria-l copy.svg b/data/styles/clear/style-night/symbols/subway-algeria-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-algeria-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-algeria-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-algeria-m copy.svg b/data/styles/clear/style-night/symbols/subway-algeria-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-algeria-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-algeria-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-algeria-s copy.svg b/data/styles/clear/style-night/symbols/subway-algeria-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-algeria-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-algeria-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-alicante-l copy.svg b/data/styles/clear/style-night/symbols/subway-alicante-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-alicante-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-alicante-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-alicante-m copy.svg b/data/styles/clear/style-night/symbols/subway-alicante-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-alicante-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-alicante-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-alicante-s copy.svg b/data/styles/clear/style-night/symbols/subway-alicante-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-alicante-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-alicante-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-almaty-l copy.svg b/data/styles/clear/style-night/symbols/subway-almaty-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-almaty-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-almaty-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-almaty-m copy.svg b/data/styles/clear/style-night/symbols/subway-almaty-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-almaty-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-almaty-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-almaty-s copy.svg b/data/styles/clear/style-night/symbols/subway-almaty-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-almaty-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-almaty-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-amsterdam-l copy.svg b/data/styles/clear/style-night/symbols/subway-amsterdam-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-amsterdam-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-amsterdam-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-amsterdam-m copy.svg b/data/styles/clear/style-night/symbols/subway-amsterdam-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-amsterdam-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-amsterdam-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-amsterdam-s copy.svg b/data/styles/clear/style-night/symbols/subway-amsterdam-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-amsterdam-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-amsterdam-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-ankara-l copy.svg b/data/styles/clear/style-night/symbols/subway-ankara-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-ankara-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-ankara-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-ankara-m copy.svg b/data/styles/clear/style-night/symbols/subway-ankara-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-ankara-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-ankara-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-ankara-s copy.svg b/data/styles/clear/style-night/symbols/subway-ankara-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-ankara-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-ankara-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-athens-l copy.svg b/data/styles/clear/style-night/symbols/subway-athens-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-athens-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-athens-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-athens-m copy.svg b/data/styles/clear/style-night/symbols/subway-athens-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-athens-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-athens-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-athens-s copy.svg b/data/styles/clear/style-night/symbols/subway-athens-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-athens-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-athens-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-baku-l copy.svg b/data/styles/clear/style-night/symbols/subway-baku-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-baku-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-baku-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-baku-m copy.svg b/data/styles/clear/style-night/symbols/subway-baku-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-baku-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-baku-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-baku-s copy.svg b/data/styles/clear/style-night/symbols/subway-baku-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-baku-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-baku-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bangkok-l copy.svg b/data/styles/clear/style-night/symbols/subway-bangkok-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bangkok-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-bangkok-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bangkok-m copy.svg b/data/styles/clear/style-night/symbols/subway-bangkok-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bangkok-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-bangkok-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bangkok-s copy.svg b/data/styles/clear/style-night/symbols/subway-bangkok-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bangkok-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-bangkok-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-barcelona-l copy.svg b/data/styles/clear/style-night/symbols/subway-barcelona-l copy.svg
deleted file mode 100644
index 42b1e01086..0000000000
--- a/data/styles/clear/style-night/symbols/subway-barcelona-l copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="33" height="23" viewBox="0 0 33 23">
-  <g fill="none" transform="translate(0 -5)">
-    <polygon fill="#FFF" points="5.293 5.293 24.581 8.419 27.707 27.707 8.419 24.581" opacity=".4" transform="rotate(-45 16.5 16.5)"/>
-    <polygon fill="maroon" points="6 6 23.874 9.126 27 27 9.126 23.874" transform="rotate(-45 16.5 16.5)"/>
-    <polygon fill="#FFF" points="21 21 21 18.429 15.169 16.5 21 14.571 21 12 12 12 12 14 17.162 14 12 15.857 12 17.143 17.162 19 12 19 12 21" opacity=".6" transform="rotate(-90 16.5 16.5)"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-barcelona-l.svg b/data/styles/clear/style-night/symbols/subway-barcelona-l.svg
index d115e1f690..42b1e01086 100644
--- a/data/styles/clear/style-night/symbols/subway-barcelona-l.svg
+++ b/data/styles/clear/style-night/symbols/subway-barcelona-l.svg
@@ -1,7 +1,7 @@
 <svg width="33" height="23" viewBox="0 0 33 23">
-  <g fill="none" fill-rule="evenodd" transform="translate(0 -5)">
-    <polygon fill="#FFF" points="5.293 5.293 24.581 8.419 27.707 27.707 8.419 24.581" opacity=".6" transform="rotate(-45 16.5 16.5)"/>
-    <polygon fill="#B32C2C" points="6 6 23.874 9.126 27 27 9.126 23.874" transform="rotate(-45 16.5 16.5)"/>
-    <polygon fill="#FFF" points="21 21 21 18.429 15.169 16.5 21 14.571 21 12 12 12 12 14 17.162 14 12 15.857 12 17.143 17.162 19 12 19 12 21" transform="rotate(-90 16.5 16.5)"/>
+  <g fill="none" transform="translate(0 -5)">
+    <polygon fill="#FFF" points="5.293 5.293 24.581 8.419 27.707 27.707 8.419 24.581" opacity=".4" transform="rotate(-45 16.5 16.5)"/>
+    <polygon fill="maroon" points="6 6 23.874 9.126 27 27 9.126 23.874" transform="rotate(-45 16.5 16.5)"/>
+    <polygon fill="#FFF" points="21 21 21 18.429 15.169 16.5 21 14.571 21 12 12 12 12 14 17.162 14 12 15.857 12 17.143 17.162 19 12 19 12 21" opacity=".6" transform="rotate(-90 16.5 16.5)"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-barcelona-m copy.svg b/data/styles/clear/style-night/symbols/subway-barcelona-m copy.svg
deleted file mode 100644
index 71e9756bee..0000000000
--- a/data/styles/clear/style-night/symbols/subway-barcelona-m copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="27" height="19" viewBox="0 0 27 19">
-  <g fill="none" transform="translate(0 -4)">
-    <polygon fill="#FFF" points="4.293 4.293 20.176 6.824 22.707 22.707 6.824 20.176" opacity=".4" transform="rotate(-45 13.5 13.5)"/>
-    <polygon fill="maroon" points="5 5 19.469 7.531 22 22 7.531 19.469" transform="rotate(-45 13.5 13.5)"/>
-    <polygon fill="#FFF" points="17 17 17 15 12.635 13.499 17 12 17 10 10 10 10 11.555 14.015 11.525 10 13 10 14 14.015 15.445 12.372 15.445 10 15.445 10 17" opacity=".6" transform="rotate(-90 13.5 13.5)"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-barcelona-m.svg b/data/styles/clear/style-night/symbols/subway-barcelona-m.svg
index 4b6de46aeb..71e9756bee 100644
--- a/data/styles/clear/style-night/symbols/subway-barcelona-m.svg
+++ b/data/styles/clear/style-night/symbols/subway-barcelona-m.svg
@@ -1,7 +1,7 @@
 <svg width="27" height="19" viewBox="0 0 27 19">
-  <g fill="none" fill-rule="evenodd" transform="translate(0 -4)">
-    <polygon fill="#FFF" points="4.293 4.293 20.176 6.824 22.707 22.707 6.824 20.176" opacity=".6" transform="rotate(-45 13.5 13.5)"/>
-    <polygon fill="#B32C2C" points="5 5 19.469 7.531 22 22 7.531 19.469" transform="rotate(-45 13.5 13.5)"/>
-    <polygon fill="#FFF" points="17 17 17 15 12.635 13.499 17 12 17 10 10 10 10 11.555 14.015 11.525 10 13 10 14 14.015 15.445 12.372 15.445 10 15.445 10 17" transform="rotate(-90 13.5 13.5)"/>
+  <g fill="none" transform="translate(0 -4)">
+    <polygon fill="#FFF" points="4.293 4.293 20.176 6.824 22.707 22.707 6.824 20.176" opacity=".4" transform="rotate(-45 13.5 13.5)"/>
+    <polygon fill="maroon" points="5 5 19.469 7.531 22 22 7.531 19.469" transform="rotate(-45 13.5 13.5)"/>
+    <polygon fill="#FFF" points="17 17 17 15 12.635 13.499 17 12 17 10 10 10 10 11.555 14.015 11.525 10 13 10 14 14.015 15.445 12.372 15.445 10 15.445 10 17" opacity=".6" transform="rotate(-90 13.5 13.5)"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-barcelona-s copy.svg b/data/styles/clear/style-night/symbols/subway-barcelona-s copy.svg
deleted file mode 100644
index 4a03cd2f06..0000000000
--- a/data/styles/clear/style-night/symbols/subway-barcelona-s copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="21" height="15" viewBox="0 0 21 15">
-  <g fill="none">
-    <polygon fill="#FFF" points="0 7.5 10.5 0 21 7.5 10.5 15" opacity=".4"/>
-    <polygon fill="maroon" points="1 7.5 10.5 1 20 7.5 10.5 14"/>
-    <polygon fill="#FFF" points="13 10 13 8.571 9.882 7.499 13 6.429 13 5 8 5 8 6.111 10.868 6.089 8 7.143 8 7.857 10.868 8.889 9.694 8.889 8 8.889 8 10" opacity=".6" transform="rotate(-90 10.5 7.5)"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-barcelona-s.svg b/data/styles/clear/style-night/symbols/subway-barcelona-s.svg
index 3c0256cb1a..4a03cd2f06 100644
--- a/data/styles/clear/style-night/symbols/subway-barcelona-s.svg
+++ b/data/styles/clear/style-night/symbols/subway-barcelona-s.svg
@@ -1,7 +1,7 @@
-<svg width="21" height="17" viewBox="0 0 21 17">
-  <g fill="none" fill-rule="evenodd">
-    <polygon fill="#FFF" points="0 8.5 10.5 1 21 8.5 10.5 16" opacity=".6"/>
-    <polygon fill="#B32C2C" points="1 8.5 10.5 2 20 8.5 10.5 15"/>
-    <polygon fill="#FFF" points="13 11 13 9.571 9.882 8.499 13 7.429 13 6 8 6 8 7.111 10.868 7.089 8 8.143 8 8.857 10.868 9.889 9.694 9.889 8 9.889 8 11" transform="rotate(-90 10.5 8.5)"/>
+<svg width="21" height="15" viewBox="0 0 21 15">
+  <g fill="none">
+    <polygon fill="#FFF" points="0 7.5 10.5 0 21 7.5 10.5 15" opacity=".4"/>
+    <polygon fill="maroon" points="1 7.5 10.5 1 20 7.5 10.5 14"/>
+    <polygon fill="#FFF" points="13 10 13 8.571 9.882 7.499 13 6.429 13 5 8 5 8 6.111 10.868 6.089 8 7.143 8 7.857 10.868 8.889 9.694 8.889 8 8.889 8 10" opacity=".6" transform="rotate(-90 10.5 7.5)"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-beijing-l copy.svg b/data/styles/clear/style-night/symbols/subway-beijing-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-beijing-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-beijing-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-beijing-m copy.svg b/data/styles/clear/style-night/symbols/subway-beijing-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-beijing-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-beijing-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-beijing-s copy.svg b/data/styles/clear/style-night/symbols/subway-beijing-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-beijing-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-beijing-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-nagoya-l copy 2.svg b/data/styles/clear/style-night/symbols/subway-bengaluru-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-nagoya-l copy 2.svg
rename to data/styles/clear/style-night/symbols/subway-bengaluru-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-nagoya-m copy 2.svg b/data/styles/clear/style-night/symbols/subway-bengaluru-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-nagoya-m copy 2.svg
rename to data/styles/clear/style-night/symbols/subway-bengaluru-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-nagoya-s copy 2.svg b/data/styles/clear/style-night/symbols/subway-bengaluru-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-nagoya-s copy 2.svg
rename to data/styles/clear/style-night/symbols/subway-bengaluru-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-berlin-l copy.svg b/data/styles/clear/style-night/symbols/subway-berlin-l copy.svg
deleted file mode 100644
index 04d38c4913..0000000000
--- a/data/styles/clear/style-night/symbols/subway-berlin-l copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="21" height="21" viewBox="0 0 21 21">
-  <g fill="none">
-    <rect width="21" height="21" fill="#FFF" opacity=".4" rx="1"/>
-    <rect width="19" height="19" x="1" y="1" fill="#142433" rx="1"/>
-    <path fill="#FFF" d="M14.6120386,17.1479476 C15.080502,16.8537691 15.741216,16.2446361 16.0284581,15.8421052 C16.448241,15.2538364 16.7530942,14.547041 16.9161838,13.783933 C16.9793566,13.4883442 16.9870747,12.9690008 17,8.14394673 L17,3 L13,3 L13,7.69540626 L13,10.891197 L13,13 C13,13 12.8947108,13.8778027 12.74109,14.1454241 C12.5483239,14.4812398 12.1926709,14.800785 11.8216015,14.971562 C10.8007105,15.4414056 9.30687889,15.2722362 8.59880422,14.6065956 C8.23819101,14.2675938 8,13 8,13 L8,7.79922785 L8,3 L4,3 L4.01423629,7.86219812 C4.01423629,12.9113456 4.02453241,13.337575 4.16190947,13.9754436 C4.50119535,15.5508141 5.54667035,16.8046612 7.147229,17.5557626 C8.32036755,18.1062871 9.83907519,18.3538472 11.2493779,18.2244419 C12.5059211,18.1091449 13.6798338,17.7333381 14.6120386,17.1479476 Z" opacity=".6"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-berlin-l.svg b/data/styles/clear/style-night/symbols/subway-berlin-l.svg
index da4359d59d..04d38c4913 100644
--- a/data/styles/clear/style-night/symbols/subway-berlin-l.svg
+++ b/data/styles/clear/style-night/symbols/subway-berlin-l.svg
@@ -1,7 +1,7 @@
 <svg width="21" height="21" viewBox="0 0 21 21">
-  <g fill="none" fill-rule="evenodd">
-    <rect width="21" height="21" fill="#FFF" opacity=".6" rx="1"/>
-    <rect width="19" height="19" x="1" y="1" fill="#1E354C" rx="1"/>
-    <path fill="#FFF" d="M14.6120386,17.1479476 C15.080502,16.8537691 15.741216,16.2446361 16.0284581,15.8421052 C16.448241,15.2538364 16.7530942,14.547041 16.9161838,13.783933 C16.9793566,13.4883442 16.9870747,12.9690008 17,8.14394673 L16.9999996,3 L13,3 L13,7.69540626 L13,10.891197 L13,13 C13,13 12.8947108,13.8778027 12.74109,14.1454241 C12.5483239,14.4812398 12.1926709,14.800785 11.8216015,14.971562 C10.8007105,15.4414056 9.30687889,15.2722362 8.59880422,14.6065956 C8.23819101,14.2675938 8,13 8,13 L8,7.79922785 L8,3 L4,3 L4.01423629,7.86219812 C4.01423629,12.9113456 4.02453241,13.337575 4.16190947,13.9754436 C4.50119535,15.5508141 5.54667035,16.8046612 7.147229,17.5557626 C8.32036755,18.1062871 9.83907519,18.3538472 11.2493779,18.2244419 C12.5059211,18.1091449 13.6798338,17.7333381 14.6120386,17.1479476 Z" opacity=".6"/>
+  <g fill="none">
+    <rect width="21" height="21" fill="#FFF" opacity=".4" rx="1"/>
+    <rect width="19" height="19" x="1" y="1" fill="#142433" rx="1"/>
+    <path fill="#FFF" d="M14.6120386,17.1479476 C15.080502,16.8537691 15.741216,16.2446361 16.0284581,15.8421052 C16.448241,15.2538364 16.7530942,14.547041 16.9161838,13.783933 C16.9793566,13.4883442 16.9870747,12.9690008 17,8.14394673 L17,3 L13,3 L13,7.69540626 L13,10.891197 L13,13 C13,13 12.8947108,13.8778027 12.74109,14.1454241 C12.5483239,14.4812398 12.1926709,14.800785 11.8216015,14.971562 C10.8007105,15.4414056 9.30687889,15.2722362 8.59880422,14.6065956 C8.23819101,14.2675938 8,13 8,13 L8,7.79922785 L8,3 L4,3 L4.01423629,7.86219812 C4.01423629,12.9113456 4.02453241,13.337575 4.16190947,13.9754436 C4.50119535,15.5508141 5.54667035,16.8046612 7.147229,17.5557626 C8.32036755,18.1062871 9.83907519,18.3538472 11.2493779,18.2244419 C12.5059211,18.1091449 13.6798338,17.7333381 14.6120386,17.1479476 Z" opacity=".6"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-berlin-m copy.svg b/data/styles/clear/style-night/symbols/subway-berlin-m copy.svg
deleted file mode 100644
index 16fc539576..0000000000
--- a/data/styles/clear/style-night/symbols/subway-berlin-m copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="19" height="19" viewBox="0 0 19 19">
-  <g fill="none">
-    <rect width="19" height="19" fill="#FFF" opacity=".4" rx="1"/>
-    <rect width="17" height="17" x="1" y="1" fill="#142433" rx="1"/>
-    <path fill="#FFF" d="M12.9673714,15.2121547 C13.3637636,14.947366 13.9228293,14.3990881 14.1658803,14.0367719 C14.5210812,13.5072738 14.7790339,12.8710904 14.9170329,12.1842204 C14.9704867,11.9181623 14.9770174,11.4507037 14.9879542,7.10769434 L15,3 L12,3 L12,6.7039651 C12,9.58313946 12.0242275,11.2946753 12,11.511947 C11.9565973,11.9011846 11.5142479,12.2687121 11.384261,12.5095969 C11.2211512,12.8118631 10.9202141,13.0994843 10.6062323,13.2531999 C9.74240145,13.676104 8.47839002,13.5238354 7.8792499,12.9246953 C7.57411564,12.6195613 7.24449569,12.1282199 7,11.511947 C7,10.4474487 7,7.92156982 7,6.79741445 L7,3 L4,3 L4,6.8540937 C4,11.3988085 4.0087121,11.7824556 4.12495423,12.3565983 C4.4120423,13.7745821 5.29667501,14.9031642 6.65099391,15.5792271 C7.64364963,16.0747518 8.92870998,16.2975795 10.1220431,16.1811024 C11.185272,16.0773241 12.1785828,15.7390621 12.9673714,15.2121547 Z" opacity=".6"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-berlin-m.svg b/data/styles/clear/style-night/symbols/subway-berlin-m.svg
index 416fcda67f..16fc539576 100644
--- a/data/styles/clear/style-night/symbols/subway-berlin-m.svg
+++ b/data/styles/clear/style-night/symbols/subway-berlin-m.svg
@@ -1,7 +1,7 @@
 <svg width="19" height="19" viewBox="0 0 19 19">
-  <g fill="none" fill-rule="evenodd">
-    <rect width="19" height="19" fill="#FFF" opacity=".6" rx="1"/>
-    <rect width="17" height="17" x="1" y="1" fill="#1E354C" rx="1"/>
+  <g fill="none">
+    <rect width="19" height="19" fill="#FFF" opacity=".4" rx="1"/>
+    <rect width="17" height="17" x="1" y="1" fill="#142433" rx="1"/>
     <path fill="#FFF" d="M12.9673714,15.2121547 C13.3637636,14.947366 13.9228293,14.3990881 14.1658803,14.0367719 C14.5210812,13.5072738 14.7790339,12.8710904 14.9170329,12.1842204 C14.9704867,11.9181623 14.9770174,11.4507037 14.9879542,7.10769434 L15,3 L12,3 L12,6.7039651 C12,9.58313946 12.0242275,11.2946753 12,11.511947 C11.9565973,11.9011846 11.5142479,12.2687121 11.384261,12.5095969 C11.2211512,12.8118631 10.9202141,13.0994843 10.6062323,13.2531999 C9.74240145,13.676104 8.47839002,13.5238354 7.8792499,12.9246953 C7.57411564,12.6195613 7.24449569,12.1282199 7,11.511947 C7,10.4474487 7,7.92156982 7,6.79741445 L7,3 L4,3 L4,6.8540937 C4,11.3988085 4.0087121,11.7824556 4.12495423,12.3565983 C4.4120423,13.7745821 5.29667501,14.9031642 6.65099391,15.5792271 C7.64364963,16.0747518 8.92870998,16.2975795 10.1220431,16.1811024 C11.185272,16.0773241 12.1785828,15.7390621 12.9673714,15.2121547 Z" opacity=".6"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-berlin-s copy.svg b/data/styles/clear/style-night/symbols/subway-berlin-s copy.svg
deleted file mode 100644
index 9003af3013..0000000000
--- a/data/styles/clear/style-night/symbols/subway-berlin-s copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="13" height="13" viewBox="0 0 13 13">
-  <g fill="none">
-    <rect width="13" height="13" fill="#FFF" opacity=".4" rx="1"/>
-    <rect width="11" height="11" x="1" y="1" fill="#142433" rx="1"/>
-    <path fill="#FFF" d="M8.70650908,10.394899 C8.95875865,10.23456 9.31452773,9.90255794 9.46919653,9.68316241 C9.69523348,9.3625323 9.8593852,8.97730038 9.94720273,8.56137587 C9.98121882,8.40026811 9.98537472,8.11720509 9.99233451,5.48735671 L10,3 L8,3 L8,5.24288413 L8,8.15429014 C8,8.15429014 7.78179413,8.61253865 7.69907519,8.75840305 C7.59527806,8.9414361 7.40377262,9.1156011 7.20396601,9.20868141 C6.65425547,9.46476505 5.84988456,9.37256094 5.46861357,9.00976004 C5.27443722,8.82499047 5.06467908,8.52746556 5,8.15429014 C4.99501288,8.06307785 5.06297094,6.9901584 5,5.29947107 L5,3 L3,3 L3,5.33379239 C3,8.08578068 3.00554407,8.31809284 3.07951633,8.66575687 C3.26220873,9.52439706 3.82515683,10.2077942 4.68699613,10.6171746 C5.31868613,10.9172326 6.1364518,11.0521628 6.89584559,10.9816317 C7.57244582,10.9187902 8.20455266,10.7139604 8.70650908,10.394899 Z" opacity=".6"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-berlin-s.svg b/data/styles/clear/style-night/symbols/subway-berlin-s.svg
index cb3c43cae7..9003af3013 100644
--- a/data/styles/clear/style-night/symbols/subway-berlin-s.svg
+++ b/data/styles/clear/style-night/symbols/subway-berlin-s.svg
@@ -1,7 +1,7 @@
 <svg width="13" height="13" viewBox="0 0 13 13">
-  <g fill="none" fill-rule="evenodd">
-    <rect width="13" height="13" fill="#FFF" opacity=".6" rx="1"/>
-    <rect width="11" height="11" x="1" y="1" fill="#1E354C" rx="1"/>
-    <path fill="#FFF" d="M8.70650908,10.394899 C8.95875865,10.23456 9.31452773,9.90255795 9.46919653,9.68316242 C9.69523348,9.36253231 9.8593852,8.97730039 9.94720273,8.56137588 C9.98121882,8.40026812 9.98537472,8.1172051 9.99233451,5.48735671 L10,3 L8,3 L8,5.24288413 L8,8.15429015 C8,8.15429015 7.78179413,8.61253866 7.69907519,8.75840306 C7.59527806,8.94143611 7.40377262,9.11560111 7.20396601,9.20868142 C6.65425547,9.46476506 5.84988456,9.37256095 5.46861357,9.00976005 C5.27443722,8.82499048 5.06467908,8.52746557 5,8.15429015 C4.99501288,8.06307786 5.06297094,6.99015841 5,5.29947107 L5,3 L3,3 L3,5.33379239 C3,8.08578069 3.00554407,8.31809285 3.07951633,8.66575688 C3.26220873,9.52439707 3.82515683,10.2077942 4.68699613,10.6171746 C5.31868613,10.9172326 6.1364518,11.0521628 6.89584559,10.9816317 C7.57244582,10.9187902 8.20455266,10.7139604 8.70650908,10.394899 Z" opacity=".6"/>
+  <g fill="none">
+    <rect width="13" height="13" fill="#FFF" opacity=".4" rx="1"/>
+    <rect width="11" height="11" x="1" y="1" fill="#142433" rx="1"/>
+    <path fill="#FFF" d="M8.70650908,10.394899 C8.95875865,10.23456 9.31452773,9.90255794 9.46919653,9.68316241 C9.69523348,9.3625323 9.8593852,8.97730038 9.94720273,8.56137587 C9.98121882,8.40026811 9.98537472,8.11720509 9.99233451,5.48735671 L10,3 L8,3 L8,5.24288413 L8,8.15429014 C8,8.15429014 7.78179413,8.61253865 7.69907519,8.75840305 C7.59527806,8.9414361 7.40377262,9.1156011 7.20396601,9.20868141 C6.65425547,9.46476505 5.84988456,9.37256094 5.46861357,9.00976004 C5.27443722,8.82499047 5.06467908,8.52746556 5,8.15429014 C4.99501288,8.06307785 5.06297094,6.9901584 5,5.29947107 L5,3 L3,3 L3,5.33379239 C3,8.08578068 3.00554407,8.31809284 3.07951633,8.66575687 C3.26220873,9.52439706 3.82515683,10.2077942 4.68699613,10.6171746 C5.31868613,10.9172326 6.1364518,11.0521628 6.89584559,10.9816317 C7.57244582,10.9187902 8.20455266,10.7139604 8.70650908,10.394899 Z" opacity=".6"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-brasilia-l copy.svg b/data/styles/clear/style-night/symbols/subway-brasilia-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-brasilia-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-brasilia-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-brasilia-m copy.svg b/data/styles/clear/style-night/symbols/subway-brasilia-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-brasilia-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-brasilia-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-brasilia-s copy.svg b/data/styles/clear/style-night/symbols/subway-brasilia-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-brasilia-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-brasilia-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-brescia-l copy.svg b/data/styles/clear/style-night/symbols/subway-brescia-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-brescia-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-brescia-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-brescia-m copy.svg b/data/styles/clear/style-night/symbols/subway-brescia-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-brescia-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-brescia-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-brescia-s copy.svg b/data/styles/clear/style-night/symbols/subway-brescia-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-brescia-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-brescia-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-brussel-l copy.svg b/data/styles/clear/style-night/symbols/subway-brussel-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-brussel-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-brussel-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-brussel-m copy.svg b/data/styles/clear/style-night/symbols/subway-brussel-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-brussel-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-brussel-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-brussel-s copy.svg b/data/styles/clear/style-night/symbols/subway-brussel-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-brussel-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-brussel-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bucharest-l copy.svg b/data/styles/clear/style-night/symbols/subway-bucharest-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bucharest-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-bucharest-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bucharest-m copy.svg b/data/styles/clear/style-night/symbols/subway-bucharest-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bucharest-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-bucharest-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bucharest-s copy.svg b/data/styles/clear/style-night/symbols/subway-bucharest-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bucharest-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-bucharest-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-budapest-l copy.svg b/data/styles/clear/style-night/symbols/subway-budapest-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-budapest-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-budapest-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-budapest-m copy.svg b/data/styles/clear/style-night/symbols/subway-budapest-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-budapest-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-budapest-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-budapest-s copy.svg b/data/styles/clear/style-night/symbols/subway-budapest-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-budapest-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-budapest-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-buenosaires-l copy.svg b/data/styles/clear/style-night/symbols/subway-buenosaires-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-buenosaires-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-buenosaires-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-buenosaires-m copy.svg b/data/styles/clear/style-night/symbols/subway-buenosaires-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-buenosaires-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-buenosaires-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-buenosaires-s copy.svg b/data/styles/clear/style-night/symbols/subway-buenosaires-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-buenosaires-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-buenosaires-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bursaray-l copy.svg b/data/styles/clear/style-night/symbols/subway-bursaray-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bursaray-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-bursaray-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bursaray-m copy.svg b/data/styles/clear/style-night/symbols/subway-bursaray-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bursaray-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-bursaray-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-bursaray-s copy.svg b/data/styles/clear/style-night/symbols/subway-bursaray-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-bursaray-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-bursaray-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-cairo-l copy.svg b/data/styles/clear/style-night/symbols/subway-cairo-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-cairo-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-cairo-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-cairo-m copy.svg b/data/styles/clear/style-night/symbols/subway-cairo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-cairo-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-cairo-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-cairo-s copy.svg b/data/styles/clear/style-night/symbols/subway-cairo-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-cairo-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-cairo-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-caracas-l copy.svg b/data/styles/clear/style-night/symbols/subway-caracas-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-caracas-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-caracas-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-caracas-m copy.svg b/data/styles/clear/style-night/symbols/subway-caracas-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-caracas-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-caracas-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-caracas-s copy.svg b/data/styles/clear/style-night/symbols/subway-caracas-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-caracas-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-caracas-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-catania-l copy.svg b/data/styles/clear/style-night/symbols/subway-catania-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-catania-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-catania-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-catania-m copy.svg b/data/styles/clear/style-night/symbols/subway-catania-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-catania-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-catania-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-catania-s copy.svg b/data/styles/clear/style-night/symbols/subway-catania-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-catania-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-catania-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-changchun-l copy.svg b/data/styles/clear/style-night/symbols/subway-changchun-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-changchun-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-changchun-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-changchun-m copy.svg b/data/styles/clear/style-night/symbols/subway-changchun-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-changchun-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-changchun-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-changchun-s copy.svg b/data/styles/clear/style-night/symbols/subway-changchun-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-changchun-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-changchun-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-chengdu-l copy.svg b/data/styles/clear/style-night/symbols/subway-chengdu-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-chengdu-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-chengdu-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-chengdu-m copy.svg b/data/styles/clear/style-night/symbols/subway-chengdu-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-chengdu-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-chengdu-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-chengdu-s copy.svg b/data/styles/clear/style-night/symbols/subway-chengdu-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-chengdu-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-chengdu-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-chicago-l copy.svg b/data/styles/clear/style-night/symbols/subway-chicago-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-chicago-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-chicago-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-chicago-m copy.svg b/data/styles/clear/style-night/symbols/subway-chicago-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-chicago-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-chicago-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-chicago-s copy.svg b/data/styles/clear/style-night/symbols/subway-chicago-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-chicago-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-chicago-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-chongqing-l copy.svg b/data/styles/clear/style-night/symbols/subway-chongqing-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-chongqing-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-chongqing-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-chongqing-m copy.svg b/data/styles/clear/style-night/symbols/subway-chongqing-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-chongqing-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-chongqing-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-chongqing-s copy.svg b/data/styles/clear/style-night/symbols/subway-chongqing-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-chongqing-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-chongqing-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-dalian-l copy.svg b/data/styles/clear/style-night/symbols/subway-dalian-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-dalian-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-dalian-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-dalian-m copy.svg b/data/styles/clear/style-night/symbols/subway-dalian-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-dalian-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-dalian-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-dalian-s copy.svg b/data/styles/clear/style-night/symbols/subway-dalian-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-dalian-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-dalian-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-delhi-l copy.svg b/data/styles/clear/style-night/symbols/subway-delhi-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-delhi-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-delhi-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-delhi-m copy.svg b/data/styles/clear/style-night/symbols/subway-delhi-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-delhi-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-delhi-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-delhi-s copy.svg b/data/styles/clear/style-night/symbols/subway-delhi-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-delhi-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-delhi-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-dnepro-l copy.svg b/data/styles/clear/style-night/symbols/subway-dnepro-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-dnepro-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-dnepro-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-dnepro-m copy.svg b/data/styles/clear/style-night/symbols/subway-dnepro-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-dnepro-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-dnepro-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-dnepro-s copy.svg b/data/styles/clear/style-night/symbols/subway-dnepro-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-dnepro-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-dnepro-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-dubai-l copy.svg b/data/styles/clear/style-night/symbols/subway-dubai-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-dubai-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-dubai-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-dubai-m copy.svg b/data/styles/clear/style-night/symbols/subway-dubai-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-dubai-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-dubai-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-dubai-s copy.svg b/data/styles/clear/style-night/symbols/subway-dubai-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-dubai-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-dubai-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-edmonton-l copy.svg b/data/styles/clear/style-night/symbols/subway-edmonton-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-edmonton-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-edmonton-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-edmonton-m copy.svg b/data/styles/clear/style-night/symbols/subway-edmonton-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-edmonton-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-edmonton-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-edmonton-s copy.svg b/data/styles/clear/style-night/symbols/subway-edmonton-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-edmonton-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-edmonton-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-ekb-l copy.svg b/data/styles/clear/style-night/symbols/subway-ekb-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-ekb-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-ekb-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-ekb-m copy.svg b/data/styles/clear/style-night/symbols/subway-ekb-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-ekb-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-ekb-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-ekb-s copy.svg b/data/styles/clear/style-night/symbols/subway-ekb-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-ekb-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-ekb-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-foshan-l copy.svg b/data/styles/clear/style-night/symbols/subway-foshan-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-foshan-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-foshan-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-foshan-m copy.svg b/data/styles/clear/style-night/symbols/subway-foshan-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-foshan-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-foshan-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-foshan-s copy.svg b/data/styles/clear/style-night/symbols/subway-foshan-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-foshan-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-foshan-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-fukuoka-l copy.svg b/data/styles/clear/style-night/symbols/subway-fukuoka-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-fukuoka-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-fukuoka-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-fukuoka-m copy.svg b/data/styles/clear/style-night/symbols/subway-fukuoka-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-fukuoka-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-fukuoka-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-fukuoka-s copy.svg b/data/styles/clear/style-night/symbols/subway-fukuoka-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-fukuoka-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-fukuoka-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-glasgow-l copy.svg b/data/styles/clear/style-night/symbols/subway-glasgow-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-glasgow-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-glasgow-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-glasgow-m copy.svg b/data/styles/clear/style-night/symbols/subway-glasgow-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-glasgow-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-glasgow-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-glasgow-s copy.svg b/data/styles/clear/style-night/symbols/subway-glasgow-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-glasgow-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-glasgow-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-guadalajara-l copy.svg b/data/styles/clear/style-night/symbols/subway-guadalajara-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-guadalajara-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-guadalajara-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-guadalajara-m copy.svg b/data/styles/clear/style-night/symbols/subway-guadalajara-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-guadalajara-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-guadalajara-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-guadalajara-s copy.svg b/data/styles/clear/style-night/symbols/subway-guadalajara-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-guadalajara-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-guadalajara-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-guangzhou-l copy.svg b/data/styles/clear/style-night/symbols/subway-guangzhou-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-guangzhou-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-guangzhou-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-guangzhou-m copy.svg b/data/styles/clear/style-night/symbols/subway-guangzhou-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-guangzhou-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-guangzhou-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-guangzhou-s copy.svg b/data/styles/clear/style-night/symbols/subway-guangzhou-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-guangzhou-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-guangzhou-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-haagse-l copy.svg b/data/styles/clear/style-night/symbols/subway-haagse-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-haagse-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-haagse-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-haagse-m copy.svg b/data/styles/clear/style-night/symbols/subway-haagse-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-haagse-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-haagse-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-haagse-s copy.svg b/data/styles/clear/style-night/symbols/subway-haagse-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-haagse-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-haagse-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-helsinki-l copy.svg b/data/styles/clear/style-night/symbols/subway-helsinki-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-helsinki-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-helsinki-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-helsinki-m copy.svg b/data/styles/clear/style-night/symbols/subway-helsinki-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-helsinki-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-helsinki-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-helsinki-s copy.svg b/data/styles/clear/style-night/symbols/subway-helsinki-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-helsinki-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-helsinki-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-hirosima-l copy.svg b/data/styles/clear/style-night/symbols/subway-hirosima-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-hirosima-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-hirosima-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-hirosima-m copy.svg b/data/styles/clear/style-night/symbols/subway-hirosima-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-hirosima-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-hirosima-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-hirosima-s copy.svg b/data/styles/clear/style-night/symbols/subway-hirosima-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-hirosima-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-hirosima-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-isfahan-l copy.svg b/data/styles/clear/style-night/symbols/subway-isfahan-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-isfahan-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-isfahan-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-isfahan-m copy.svg b/data/styles/clear/style-night/symbols/subway-isfahan-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-isfahan-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-isfahan-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-isfahan-s copy.svg b/data/styles/clear/style-night/symbols/subway-isfahan-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-isfahan-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-isfahan-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-istanbul-l copy.svg b/data/styles/clear/style-night/symbols/subway-istanbul-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-istanbul-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-istanbul-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-istanbul-m copy.svg b/data/styles/clear/style-night/symbols/subway-istanbul-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-istanbul-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-istanbul-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-istanbul-s copy.svg b/data/styles/clear/style-night/symbols/subway-istanbul-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-istanbul-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-istanbul-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-izmir-l copy.svg b/data/styles/clear/style-night/symbols/subway-izmir-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-izmir-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-izmir-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-izmir-m copy.svg b/data/styles/clear/style-night/symbols/subway-izmir-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-izmir-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-izmir-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-izmir-s copy.svg b/data/styles/clear/style-night/symbols/subway-izmir-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-izmir-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-izmir-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kazan-l copy.svg b/data/styles/clear/style-night/symbols/subway-kazan-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kazan-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-kazan-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kazan-m copy.svg b/data/styles/clear/style-night/symbols/subway-kazan-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kazan-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-kazan-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kazan-s copy.svg b/data/styles/clear/style-night/symbols/subway-kazan-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kazan-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-kazan-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kharkiv-l copy.svg b/data/styles/clear/style-night/symbols/subway-kharkiv-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kharkiv-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-kharkiv-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kharkiv-m copy.svg b/data/styles/clear/style-night/symbols/subway-kharkiv-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kharkiv-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-kharkiv-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kharkiv-s copy.svg b/data/styles/clear/style-night/symbols/subway-kharkiv-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kharkiv-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-kharkiv-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kiev-l copy.svg b/data/styles/clear/style-night/symbols/subway-kiev-l copy.svg
deleted file mode 100644
index 272bbcd590..0000000000
--- a/data/styles/clear/style-night/symbols/subway-kiev-l copy.svg	
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="23" height="15" viewBox="0 0 23 15">
-  <g fill="none">
-    <polygon fill="#FFF" points="8.679 1.447 8.679 1.447 12.333 6.947 10.667 6.947 14.321 1.447 15.249 .049 16.037 1.531 21.883 12.531 22.664 14 21 14 16.908 14 16.307 14 16.025 13.469 13.832 9.344 15.504 9.49 12.289 13.615 11.5 14.627 10.711 13.615 7.496 9.49 9.168 9.344 6.975 13.469 6.693 14 6.092 14 2 14 .336 14 1.117 12.531 6.963 1.531 7.751 .049" opacity=".4"/>
-    <polygon fill="#004D21" points="7.846 2 11.5 7.5 15.154 2 21 13 16.908 13 14.715 8.875 11.5 13 8.285 8.875 6.092 13 2 13"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-kiev-l.svg b/data/styles/clear/style-night/symbols/subway-kiev-l.svg
index 7a35cdf701..272bbcd590 100644
--- a/data/styles/clear/style-night/symbols/subway-kiev-l.svg
+++ b/data/styles/clear/style-night/symbols/subway-kiev-l.svg
@@ -1,6 +1,6 @@
 <svg width="23" height="15" viewBox="0 0 23 15">
-  <g fill="none" fill-rule="evenodd">
-    <polygon fill="#FFF" fill-rule="nonzero" points="8.679 1.447 8.679 1.447 12.333 6.947 10.667 6.947 14.321 1.447 15.249 .049 16.037 1.531 21.883 12.531 22.664 14 21 14 16.908 14 16.307 14 16.025 13.469 13.832 9.344 15.504 9.49 12.289 13.615 11.5 14.627 10.711 13.615 7.496 9.49 9.168 9.344 6.975 13.469 6.693 14 6.092 14 2 14 .336 14 1.117 12.531 6.963 1.531 7.751 .049" opacity=".6"/>
-    <polygon fill="#00662C" points="7.846 2 11.5 7.5 15.154 2 21 13 16.908 13 14.715 8.875 11.5 13 8.285 8.875 6.092 13 2 13"/>
+  <g fill="none">
+    <polygon fill="#FFF" points="8.679 1.447 8.679 1.447 12.333 6.947 10.667 6.947 14.321 1.447 15.249 .049 16.037 1.531 21.883 12.531 22.664 14 21 14 16.908 14 16.307 14 16.025 13.469 13.832 9.344 15.504 9.49 12.289 13.615 11.5 14.627 10.711 13.615 7.496 9.49 9.168 9.344 6.975 13.469 6.693 14 6.092 14 2 14 .336 14 1.117 12.531 6.963 1.531 7.751 .049" opacity=".4"/>
+    <polygon fill="#004D21" points="7.846 2 11.5 7.5 15.154 2 21 13 16.908 13 14.715 8.875 11.5 13 8.285 8.875 6.092 13 2 13"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-kiev-m copy.svg b/data/styles/clear/style-night/symbols/subway-kiev-m copy.svg
deleted file mode 100644
index 272bbcd590..0000000000
--- a/data/styles/clear/style-night/symbols/subway-kiev-m copy.svg	
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="23" height="15" viewBox="0 0 23 15">
-  <g fill="none">
-    <polygon fill="#FFF" points="8.679 1.447 8.679 1.447 12.333 6.947 10.667 6.947 14.321 1.447 15.249 .049 16.037 1.531 21.883 12.531 22.664 14 21 14 16.908 14 16.307 14 16.025 13.469 13.832 9.344 15.504 9.49 12.289 13.615 11.5 14.627 10.711 13.615 7.496 9.49 9.168 9.344 6.975 13.469 6.693 14 6.092 14 2 14 .336 14 1.117 12.531 6.963 1.531 7.751 .049" opacity=".4"/>
-    <polygon fill="#004D21" points="7.846 2 11.5 7.5 15.154 2 21 13 16.908 13 14.715 8.875 11.5 13 8.285 8.875 6.092 13 2 13"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-kiev-m.svg b/data/styles/clear/style-night/symbols/subway-kiev-m.svg
index 7a35cdf701..272bbcd590 100644
--- a/data/styles/clear/style-night/symbols/subway-kiev-m.svg
+++ b/data/styles/clear/style-night/symbols/subway-kiev-m.svg
@@ -1,6 +1,6 @@
 <svg width="23" height="15" viewBox="0 0 23 15">
-  <g fill="none" fill-rule="evenodd">
-    <polygon fill="#FFF" fill-rule="nonzero" points="8.679 1.447 8.679 1.447 12.333 6.947 10.667 6.947 14.321 1.447 15.249 .049 16.037 1.531 21.883 12.531 22.664 14 21 14 16.908 14 16.307 14 16.025 13.469 13.832 9.344 15.504 9.49 12.289 13.615 11.5 14.627 10.711 13.615 7.496 9.49 9.168 9.344 6.975 13.469 6.693 14 6.092 14 2 14 .336 14 1.117 12.531 6.963 1.531 7.751 .049" opacity=".6"/>
-    <polygon fill="#00662C" points="7.846 2 11.5 7.5 15.154 2 21 13 16.908 13 14.715 8.875 11.5 13 8.285 8.875 6.092 13 2 13"/>
+  <g fill="none">
+    <polygon fill="#FFF" points="8.679 1.447 8.679 1.447 12.333 6.947 10.667 6.947 14.321 1.447 15.249 .049 16.037 1.531 21.883 12.531 22.664 14 21 14 16.908 14 16.307 14 16.025 13.469 13.832 9.344 15.504 9.49 12.289 13.615 11.5 14.627 10.711 13.615 7.496 9.49 9.168 9.344 6.975 13.469 6.693 14 6.092 14 2 14 .336 14 1.117 12.531 6.963 1.531 7.751 .049" opacity=".4"/>
+    <polygon fill="#004D21" points="7.846 2 11.5 7.5 15.154 2 21 13 16.908 13 14.715 8.875 11.5 13 8.285 8.875 6.092 13 2 13"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-kiev-s copy.svg b/data/styles/clear/style-night/symbols/subway-kiev-s copy.svg
deleted file mode 100644
index fbd52fb87e..0000000000
--- a/data/styles/clear/style-night/symbols/subway-kiev-s copy.svg	
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="19" height="11" viewBox="0 0 19 11">
-  <g fill="none">
-    <polygon fill="#FFF" points="7.457 .46 10.342 4.96 8.658 4.96 11.543 .46 12.4 0 13.274 .544 17.89 9.544 18.637 11 17 11 13.769 11 13.158 11 12.879 10.456 11.149 7.081 12.838 7.226 10.299 10.601 9.5 11 8.701 10.601 6.162 7.226 7.851 7.081 6.121 10.456 5.842 11 5.231 11 2 11 .363 11 1.11 9.544 5.726 .544 6.575 0" opacity=".4"/>
-    <polygon fill="#004D21" points="6.615 1 9.5 5.5 12.385 1 17 10 13.769 10 12.038 6.625 9.5 10 6.962 6.625 5.231 10 2 10"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-kiev-s.svg b/data/styles/clear/style-night/symbols/subway-kiev-s.svg
index adb297e026..fbd52fb87e 100644
--- a/data/styles/clear/style-night/symbols/subway-kiev-s.svg
+++ b/data/styles/clear/style-night/symbols/subway-kiev-s.svg
@@ -1,6 +1,6 @@
 <svg width="19" height="11" viewBox="0 0 19 11">
-  <g fill="none" fill-rule="evenodd">
-    <polygon fill="#FFF" fill-rule="nonzero" points="7.457 .46 10.342 4.96 8.658 4.96 11.543 .46 12.4 0 13.274 .544 17.89 9.544 18.637 11 17 11 13.769 11 13.158 11 12.879 10.456 11.149 7.081 12.838 7.226 10.299 10.601 9.5 11 8.701 10.601 6.162 7.226 7.851 7.081 6.121 10.456 5.842 11 5.231 11 2 11 .363 11 1.11 9.544 5.726 .544 6.575 0" opacity=".6"/>
-    <polygon fill="#00662C" points="6.615 1 9.5 5.5 12.385 1 17 10 13.769 10 12.038 6.625 9.5 10 6.962 6.625 5.231 10 2 10"/>
+  <g fill="none">
+    <polygon fill="#FFF" points="7.457 .46 10.342 4.96 8.658 4.96 11.543 .46 12.4 0 13.274 .544 17.89 9.544 18.637 11 17 11 13.769 11 13.158 11 12.879 10.456 11.149 7.081 12.838 7.226 10.299 10.601 9.5 11 8.701 10.601 6.162 7.226 7.851 7.081 6.121 10.456 5.842 11 5.231 11 2 11 .363 11 1.11 9.544 5.726 .544 6.575 0" opacity=".4"/>
+    <polygon fill="#004D21" points="6.615 1 9.5 5.5 12.385 1 17 10 13.769 10 12.038 6.625 9.5 10 6.962 6.625 5.231 10 2 10"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-kobe-l copy.svg b/data/styles/clear/style-night/symbols/subway-kobe-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kobe-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-kobe-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kobe-m copy.svg b/data/styles/clear/style-night/symbols/subway-kobe-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kobe-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-kobe-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kobe-s copy.svg b/data/styles/clear/style-night/symbols/subway-kobe-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kobe-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-kobe-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kolkata-l copy.svg b/data/styles/clear/style-night/symbols/subway-kolkata-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kolkata-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-kolkata-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kolkata-m copy.svg b/data/styles/clear/style-night/symbols/subway-kolkata-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kolkata-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-kolkata-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kolkata-s copy.svg b/data/styles/clear/style-night/symbols/subway-kolkata-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kolkata-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-kolkata-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kryvyirih-l copy.svg b/data/styles/clear/style-night/symbols/subway-kryvyirih-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kryvyirih-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-kryvyirih-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kryvyirih-m copy.svg b/data/styles/clear/style-night/symbols/subway-kryvyirih-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kryvyirih-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-kryvyirih-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kryvyirih-s copy.svg b/data/styles/clear/style-night/symbols/subway-kryvyirih-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kryvyirih-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-kryvyirih-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kunming-l copy.svg b/data/styles/clear/style-night/symbols/subway-kunming-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kunming-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-kunming-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kunming-m copy.svg b/data/styles/clear/style-night/symbols/subway-kunming-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kunming-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-kunming-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kunming-s copy.svg b/data/styles/clear/style-night/symbols/subway-kunming-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kunming-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-kunming-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kyoto-l copy.svg b/data/styles/clear/style-night/symbols/subway-kyoto-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kyoto-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-kyoto-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kyoto-m copy.svg b/data/styles/clear/style-night/symbols/subway-kyoto-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kyoto-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-kyoto-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-kyoto-s copy.svg b/data/styles/clear/style-night/symbols/subway-kyoto-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-kyoto-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-kyoto-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lausanne-l copy.svg b/data/styles/clear/style-night/symbols/subway-lausanne-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lausanne-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-lausanne-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lausanne-m copy.svg b/data/styles/clear/style-night/symbols/subway-lausanne-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lausanne-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-lausanne-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lille-l copy.svg b/data/styles/clear/style-night/symbols/subway-lille-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lille-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-lille-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lille-m copy.svg b/data/styles/clear/style-night/symbols/subway-lille-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lille-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-lille-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lille-s copy.svg b/data/styles/clear/style-night/symbols/subway-lille-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lille-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-lille-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lima-l copy.svg b/data/styles/clear/style-night/symbols/subway-lima-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lima-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-lima-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lima-m copy.svg b/data/styles/clear/style-night/symbols/subway-lima-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lima-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-lima-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lima-s copy.svg b/data/styles/clear/style-night/symbols/subway-lima-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lima-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-lima-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lisboa-l copy.svg b/data/styles/clear/style-night/symbols/subway-lisboa-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lisboa-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-lisboa-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lisboa-m copy.svg b/data/styles/clear/style-night/symbols/subway-lisboa-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lisboa-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-lisboa-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lisboa-s copy.svg b/data/styles/clear/style-night/symbols/subway-lisboa-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lisboa-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-lisboa-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-london-l copy.svg b/data/styles/clear/style-night/symbols/subway-london-l copy.svg
deleted file mode 100644
index bbbfd98b8a..0000000000
--- a/data/styles/clear/style-night/symbols/subway-london-l copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="27" height="21" viewBox="0 0 27 21">
-  <g fill="none">
-    <path fill="#FFF" d="M3.59746998,7 C5.03889741,2.9218267 8.92823411,0 13.5,0 C18.0717659,0 21.9611026,2.9218267 23.40253,7 L27,7 L27,14 L23.40253,14 C21.9611026,18.0781733 18.0717659,21 13.5,21 C8.92823411,21 5.0388974,18.0781733 3.59746997,14 L0,14 L0,7 L3.59746998,7 Z" opacity=".4"/>
-    <path fill="#941818" d="M13.5,20 C8.25329488,20 4,15.7467051 4,10.5 C4,5.25329488 8.25329488,1 13.5,1 C18.7467051,1 23,5.25329488 23,10.5 C23,15.7467051 18.7467051,20 13.5,20 Z M13.5,16 C16.5375661,16 19,13.5375661 19,10.5 C19,7.46243388 16.5375661,5 13.5,5 C10.4624339,5 8,7.46243388 8,10.5 C8,13.5375661 10.4624339,16 13.5,16 Z"/>
-    <rect width="25" height="5" x="1" y="8" fill="#021C40"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-london-l.svg b/data/styles/clear/style-night/symbols/subway-london-l.svg
index eef07caa9c..bbbfd98b8a 100644
--- a/data/styles/clear/style-night/symbols/subway-london-l.svg
+++ b/data/styles/clear/style-night/symbols/subway-london-l.svg
@@ -1,8 +1,7 @@
 <svg width="27" height="21" viewBox="0 0 27 21">
-  <g fill="none" fill-rule="evenodd">
-    <rect width="27" height="7" y="7" fill="#FFF" opacity=".6"/>
-    <path fill="#FFF" d="M13.5,21 C7.70101013,21 3,16.2989899 3,10.5 C3,4.70101013 7.70101013,0 13.5,0 C19.2989899,0 24,4.70101013 24,10.5 C24,16.2989899 19.2989899,21 13.5,21 Z M13.5,15 C15.9852814,15 18,12.9852814 18,10.5 C18,8.01471863 15.9852814,6 13.5,6 C11.0147186,6 9,8.01471863 9,10.5 C9,12.9852814 11.0147186,15 13.5,15 Z" opacity=".6"/>
-    <path fill="#B32C2C" d="M13.5,20 C8.25329488,20 4,15.7467051 4,10.5 C4,5.25329488 8.25329488,1 13.5,1 C18.7467051,1 23,5.25329488 23,10.5 C23,15.7467051 18.7467051,20 13.5,20 Z M13.5,16 C16.5375661,16 19,13.5375661 19,10.5 C19,7.46243388 16.5375661,5 13.5,5 C10.4624339,5 8,7.46243388 8,10.5 C8,13.5375661 10.4624339,16 13.5,16 Z"/>
-    <rect width="25" height="5" x="1" y="8" fill="#022659"/>
+  <g fill="none">
+    <path fill="#FFF" d="M3.59746998,7 C5.03889741,2.9218267 8.92823411,0 13.5,0 C18.0717659,0 21.9611026,2.9218267 23.40253,7 L27,7 L27,14 L23.40253,14 C21.9611026,18.0781733 18.0717659,21 13.5,21 C8.92823411,21 5.0388974,18.0781733 3.59746997,14 L0,14 L0,7 L3.59746998,7 Z" opacity=".4"/>
+    <path fill="#941818" d="M13.5,20 C8.25329488,20 4,15.7467051 4,10.5 C4,5.25329488 8.25329488,1 13.5,1 C18.7467051,1 23,5.25329488 23,10.5 C23,15.7467051 18.7467051,20 13.5,20 Z M13.5,16 C16.5375661,16 19,13.5375661 19,10.5 C19,7.46243388 16.5375661,5 13.5,5 C10.4624339,5 8,7.46243388 8,10.5 C8,13.5375661 10.4624339,16 13.5,16 Z"/>
+    <rect width="25" height="5" x="1" y="8" fill="#021C40"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-london-m copy.svg b/data/styles/clear/style-night/symbols/subway-london-m copy.svg
deleted file mode 100644
index dd4e240939..0000000000
--- a/data/styles/clear/style-night/symbols/subway-london-m copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="23" height="17" viewBox="0 0 23 17">
-  <g fill="none">
-    <path fill="#FFF" d="M3.75173932,5 L0,5 L0,12 L3.75173932,12 C5.08572869,14.9485251 8.05329052,17 11.5,17 C14.9467095,17 17.9142713,14.9485251 19.2482607,12 L23,12 L23,5 L19.2482607,5 C17.9142713,2.05147494 14.9467095,0 11.5,0 C8.05329052,0 5.08572869,2.05147494 3.75173932,5 Z" opacity=".4"/>
-    <path fill="#941818" d="M11.5,16 C7.35786438,16 4,12.6421356 4,8.5 C4,4.35786438 7.35786438,1 11.5,1 C15.6421356,1 19,4.35786438 19,8.5 C19,12.6421356 15.6421356,16 11.5,16 Z M11.5,13 C13.9852814,13 16,10.9852814 16,8.5 C16,6.01471863 13.9852814,4 11.5,4 C9.01471863,4 7,6.01471863 7,8.5 C7,10.9852814 9.01471863,13 11.5,13 Z"/>
-    <rect width="21" height="5" x="1" y="6" fill="#021C40"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-london-m.svg b/data/styles/clear/style-night/symbols/subway-london-m.svg
index 73753d4cbf..dd4e240939 100644
--- a/data/styles/clear/style-night/symbols/subway-london-m.svg
+++ b/data/styles/clear/style-night/symbols/subway-london-m.svg
@@ -1,7 +1,7 @@
 <svg width="23" height="17" viewBox="0 0 23 17">
-  <g fill="none" fill-rule="evenodd">
-    <path fill="#FFF" d="M3.75173932,5 L0,5 L0,12 L3.75173932,12 C5.08572869,14.9485251 8.05329052,17 11.5,17 C14.9467095,17 17.9142713,14.9485251 19.2482607,12 L23,12 L23,5 L19.2482607,5 C17.9142713,2.05147494 14.9467095,0 11.5,0 C8.05329052,0 5.08572869,2.05147494 3.75173932,5 Z" opacity=".6"/>
-    <path fill="#B32C2C" d="M11.5,16 C7.35786438,16 4,12.6421356 4,8.5 C4,4.35786438 7.35786438,1 11.5,1 C15.6421356,1 19,4.35786438 19,8.5 C19,12.6421356 15.6421356,16 11.5,16 Z M11.5,13 C13.9852814,13 16,10.9852814 16,8.5 C16,6.01471863 13.9852814,4 11.5,4 C9.01471863,4 7,6.01471863 7,8.5 C7,10.9852814 9.01471863,13 11.5,13 Z"/>
-    <rect width="21" height="5" x="1" y="6" fill="#022659"/>
+  <g fill="none">
+    <path fill="#FFF" d="M3.75173932,5 L0,5 L0,12 L3.75173932,12 C5.08572869,14.9485251 8.05329052,17 11.5,17 C14.9467095,17 17.9142713,14.9485251 19.2482607,12 L23,12 L23,5 L19.2482607,5 C17.9142713,2.05147494 14.9467095,0 11.5,0 C8.05329052,0 5.08572869,2.05147494 3.75173932,5 Z" opacity=".4"/>
+    <path fill="#941818" d="M11.5,16 C7.35786438,16 4,12.6421356 4,8.5 C4,4.35786438 7.35786438,1 11.5,1 C15.6421356,1 19,4.35786438 19,8.5 C19,12.6421356 15.6421356,16 11.5,16 Z M11.5,13 C13.9852814,13 16,10.9852814 16,8.5 C16,6.01471863 13.9852814,4 11.5,4 C9.01471863,4 7,6.01471863 7,8.5 C7,10.9852814 9.01471863,13 11.5,13 Z"/>
+    <rect width="21" height="5" x="1" y="6" fill="#021C40"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-london-s copy.svg b/data/styles/clear/style-night/symbols/subway-london-s copy.svg
deleted file mode 100644
index 17b099e758..0000000000
--- a/data/styles/clear/style-night/symbols/subway-london-s copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="17" height="13" viewBox="0 0 17 13">
-  <g fill="none">
-    <path fill="#FFF" d="M2.49816335,4 C3.47772297,1.65104815 5.79605001,0 8.5,0 C11.20395,0 13.522277,1.65104815 14.5018367,4 L17,4 L17,9 L14.5018367,9 C13.522277,11.3489518 11.20395,13 8.5,13 C5.79605001,13 3.47772297,11.3489518 2.49816335,9 L0,9 L0,4 L2.49816335,4 Z" opacity=".4"/>
-    <path fill="#941818" d="M8.5,12 C5.46243388,12 3,9.53756612 3,6.5 C3,3.46243388 5.46243388,1 8.5,1 C11.5375661,1 14,3.46243388 14,6.5 C14,9.53756612 11.5375661,12 8.5,12 Z M8.5,10 C10.4329966,10 12,8.43299662 12,6.5 C12,4.56700338 10.4329966,3 8.5,3 C6.56700338,3 5,4.56700338 5,6.5 C5,8.43299662 6.56700338,10 8.5,10 Z"/>
-    <rect width="15" height="3" x="1" y="5" fill="#021C40"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-london-s.svg b/data/styles/clear/style-night/symbols/subway-london-s.svg
index 1710227400..17b099e758 100644
--- a/data/styles/clear/style-night/symbols/subway-london-s.svg
+++ b/data/styles/clear/style-night/symbols/subway-london-s.svg
@@ -1,7 +1,7 @@
 <svg width="17" height="13" viewBox="0 0 17 13">
-  <g fill="none" fill-rule="evenodd">
-    <path fill="#FFF" d="M2.49816335,4 L0,4 L0,9 L2.49816335,9 C3.47772297,11.3489518 5.79605001,13 8.5,13 C11.20395,13 13.522277,11.3489518 14.5018367,9 L17,9 L17,4 L14.5018367,4 C13.522277,1.65104815 11.20395,0 8.5,0 C5.79605001,0 3.47772297,1.65104815 2.49816335,4 Z" opacity=".6"/>
-    <path fill="#B32C2C" d="M8.5,12 C5.46243388,12 3,9.53756612 3,6.5 C3,3.46243388 5.46243388,1 8.5,1 C11.5375661,1 14,3.46243388 14,6.5 C14,9.53756612 11.5375661,12 8.5,12 Z M8.5,10 C10.4329966,10 12,8.43299662 12,6.5 C12,4.56700338 10.4329966,3 8.5,3 C6.56700338,3 5,4.56700338 5,6.5 C5,8.43299662 6.56700338,10 8.5,10 Z"/>
-    <rect width="15" height="3" x="1" y="5" fill="#022659"/>
+  <g fill="none">
+    <path fill="#FFF" d="M2.49816335,4 C3.47772297,1.65104815 5.79605001,0 8.5,0 C11.20395,0 13.522277,1.65104815 14.5018367,4 L17,4 L17,9 L14.5018367,9 C13.522277,11.3489518 11.20395,13 8.5,13 C5.79605001,13 3.47772297,11.3489518 2.49816335,9 L0,9 L0,4 L2.49816335,4 Z" opacity=".4"/>
+    <path fill="#941818" d="M8.5,12 C5.46243388,12 3,9.53756612 3,6.5 C3,3.46243388 5.46243388,1 8.5,1 C11.5375661,1 14,3.46243388 14,6.5 C14,9.53756612 11.5375661,12 8.5,12 Z M8.5,10 C10.4329966,10 12,8.43299662 12,6.5 C12,4.56700338 10.4329966,3 8.5,3 C6.56700338,3 5,4.56700338 5,6.5 C5,8.43299662 6.56700338,10 8.5,10 Z"/>
+    <rect width="15" height="3" x="1" y="5" fill="#021C40"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-losangeles-l copy.svg b/data/styles/clear/style-night/symbols/subway-losangeles-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-losangeles-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-losangeles-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-losangeles-m copy.svg b/data/styles/clear/style-night/symbols/subway-losangeles-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-losangeles-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-losangeles-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-losangeles-s copy.svg b/data/styles/clear/style-night/symbols/subway-losangeles-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-losangeles-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-losangeles-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lucknow-l copy.svg b/data/styles/clear/style-night/symbols/subway-lucknow-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lucknow-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-lucknow-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lucknow-m copy.svg b/data/styles/clear/style-night/symbols/subway-lucknow-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lucknow-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-lucknow-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lucknow-s copy.svg b/data/styles/clear/style-night/symbols/subway-lucknow-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lucknow-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-lucknow-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lyon-l copy.svg b/data/styles/clear/style-night/symbols/subway-lyon-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lyon-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-lyon-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lyon-m copy.svg b/data/styles/clear/style-night/symbols/subway-lyon-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lyon-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-lyon-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-lyon-s copy.svg b/data/styles/clear/style-night/symbols/subway-lyon-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-lyon-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-lyon-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-madrid-l copy.svg b/data/styles/clear/style-night/symbols/subway-madrid-l copy.svg
deleted file mode 100644
index 2dd00e25f6..0000000000
--- a/data/styles/clear/style-night/symbols/subway-madrid-l copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="33" height="23" viewBox="0 0 33 23">
-  <g fill="none" transform="translate(0 -5)">
-    <polygon fill="#FFF" points="5.293 5.293 24.581 8.419 27.707 27.707 8.419 24.581" opacity=".4" transform="rotate(-45 16.5 16.5)"/>
-    <path fill="#941818" d="M1.6507576,16.5 L16.5,6.07181023 L31.3492424,16.5 L16.5,26.9281898 L1.6507576,16.5 Z M8.72182541,16.5 L16.5,21.9623851 L24.2781746,16.5 L16.5,11.0376149 L8.72182541,16.5 Z"/>
-    <rect width="21" height="7" x="6" y="13" fill="#021C40"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-madrid-l.svg b/data/styles/clear/style-night/symbols/subway-madrid-l.svg
index 6351ec11a7..2dd00e25f6 100644
--- a/data/styles/clear/style-night/symbols/subway-madrid-l.svg
+++ b/data/styles/clear/style-night/symbols/subway-madrid-l.svg
@@ -1,7 +1,7 @@
 <svg width="33" height="23" viewBox="0 0 33 23">
-  <g fill="none" fill-rule="evenodd" transform="translate(0 -5)">
-    <polygon fill="#FFF" points="5.293 5.293 24.581 8.419 27.707 27.707 8.419 24.581" opacity=".6" transform="rotate(-45 16.5 16.5)"/>
-    <path fill="#B32D2D" d="M1.6507576,16.5 L16.5,6.07181023 L31.3492424,16.5 L16.5,26.9281898 L1.6507576,16.5 Z M8.72182541,16.5 L16.5,21.9623851 L24.2781746,16.5 L16.5,11.0376149 L8.72182541,16.5 Z"/>
-    <rect width="21" height="7" x="6" y="13" fill="#14489E"/>
+  <g fill="none" transform="translate(0 -5)">
+    <polygon fill="#FFF" points="5.293 5.293 24.581 8.419 27.707 27.707 8.419 24.581" opacity=".4" transform="rotate(-45 16.5 16.5)"/>
+    <path fill="#941818" d="M1.6507576,16.5 L16.5,6.07181023 L31.3492424,16.5 L16.5,26.9281898 L1.6507576,16.5 Z M8.72182541,16.5 L16.5,21.9623851 L24.2781746,16.5 L16.5,11.0376149 L8.72182541,16.5 Z"/>
+    <rect width="21" height="7" x="6" y="13" fill="#021C40"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-madrid-m copy.svg b/data/styles/clear/style-night/symbols/subway-madrid-m copy.svg
deleted file mode 100644
index 15d9830132..0000000000
--- a/data/styles/clear/style-night/symbols/subway-madrid-m copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="27" height="19" viewBox="0 0 27 19">
-  <g fill="none" transform="translate(0 -4)">
-    <polygon fill="#FFF" points="4.293 4.293 20.176 6.824 22.707 22.707 6.824 20.176" opacity=".4" transform="rotate(-45 13.5 13.5)"/>
-    <path fill="#941818" d="M1.47918472,13.5 L13.5,5.05813209 L25.5208153,13.5 L13.5,21.9418679 L1.47918472,13.5 Z M7.13603897,13.5 L13.5,17.9692242 L19.863961,13.5 L13.5,9.03077581 L7.13603897,13.5 Z"/>
-    <rect width="15" height="5" x="6" y="11" fill="#021C40"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-madrid-m.svg b/data/styles/clear/style-night/symbols/subway-madrid-m.svg
index c08cae054a..15d9830132 100644
--- a/data/styles/clear/style-night/symbols/subway-madrid-m.svg
+++ b/data/styles/clear/style-night/symbols/subway-madrid-m.svg
@@ -1,7 +1,7 @@
 <svg width="27" height="19" viewBox="0 0 27 19">
-  <g fill="none" fill-rule="evenodd" transform="translate(0 -4)">
-    <polygon fill="#FFF" points="4.293 4.293 20.176 6.824 22.707 22.707 6.824 20.176" opacity=".6" transform="rotate(-45 13.5 13.5)"/>
-    <path fill="#B32D2D" d="M1.47918472,13.5 L13.5,5.05813209 L25.5208153,13.5 L13.5,21.9418679 L1.47918472,13.5 Z M7.13603897,13.5 L13.5,17.9692242 L19.863961,13.5 L13.5,9.03077581 L7.13603897,13.5 Z"/>
-    <rect width="15" height="5" x="6" y="11" fill="#14489E"/>
+  <g fill="none" transform="translate(0 -4)">
+    <polygon fill="#FFF" points="4.293 4.293 20.176 6.824 22.707 22.707 6.824 20.176" opacity=".4" transform="rotate(-45 13.5 13.5)"/>
+    <path fill="#941818" d="M1.47918472,13.5 L13.5,5.05813209 L25.5208153,13.5 L13.5,21.9418679 L1.47918472,13.5 Z M7.13603897,13.5 L13.5,17.9692242 L19.863961,13.5 L13.5,9.03077581 L7.13603897,13.5 Z"/>
+    <rect width="15" height="5" x="6" y="11" fill="#021C40"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-madrid-s copy.svg b/data/styles/clear/style-night/symbols/subway-madrid-s copy.svg
deleted file mode 100644
index f91a1579d1..0000000000
--- a/data/styles/clear/style-night/symbols/subway-madrid-s copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="21" height="15" viewBox="0 0 21 15">
-  <g fill="none" transform="translate(-1 -4)">
-    <polygon fill="#FFF" points="4.075 4.075 16.803 6.197 18.925 18.925 6.197 16.803" opacity=".4" transform="rotate(-45 11.5 11.5)"/>
-    <path fill="#941818" d="M2,11.5 L11.5,5 L21,11.5 L11.5,18 L2,11.5 Z M5.96446609,11.5 L11.5,15.0355339 L17.0355339,11.5 L11.5,7.96446609 L5.96446609,11.5 Z"/>
-    <rect width="11" height="3" x="6" y="10" fill="#021C40"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-madrid-s.svg b/data/styles/clear/style-night/symbols/subway-madrid-s.svg
index 2ce8acd316..f91a1579d1 100644
--- a/data/styles/clear/style-night/symbols/subway-madrid-s.svg
+++ b/data/styles/clear/style-night/symbols/subway-madrid-s.svg
@@ -1,7 +1,7 @@
 <svg width="21" height="15" viewBox="0 0 21 15">
-  <g fill="none" fill-rule="evenodd" transform="translate(0 -3)">
-    <polygon fill="#FFF" points="3.075 3.075 15.803 5.197 17.925 17.925 5.197 15.803" opacity=".6" transform="rotate(-45 10.5 10.5)"/>
-    <path fill="#B32D2D" d="M1,10.5 L10.5,4 L20,10.5 L10.5,17 L1,10.5 Z M4.96446609,10.5 L10.5,14.0355339 L16.0355339,10.5 L10.5,6.96446609 L4.96446609,10.5 Z"/>
-    <rect width="11" height="3" x="5" y="9" fill="#14489E"/>
+  <g fill="none" transform="translate(-1 -4)">
+    <polygon fill="#FFF" points="4.075 4.075 16.803 6.197 18.925 18.925 6.197 16.803" opacity=".4" transform="rotate(-45 11.5 11.5)"/>
+    <path fill="#941818" d="M2,11.5 L11.5,5 L21,11.5 L11.5,18 L2,11.5 Z M5.96446609,11.5 L11.5,15.0355339 L17.0355339,11.5 L11.5,7.96446609 L5.96446609,11.5 Z"/>
+    <rect width="11" height="3" x="6" y="10" fill="#021C40"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-malaga-l copy.svg b/data/styles/clear/style-night/symbols/subway-malaga-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-malaga-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-malaga-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-malaga-m copy.svg b/data/styles/clear/style-night/symbols/subway-malaga-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-malaga-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-malaga-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-malaga-s copy.svg b/data/styles/clear/style-night/symbols/subway-malaga-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-malaga-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-malaga-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-manila-l copy.svg b/data/styles/clear/style-night/symbols/subway-manila-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-manila-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-manila-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-manila-m copy.svg b/data/styles/clear/style-night/symbols/subway-manila-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-manila-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-manila-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-manila-s copy.svg b/data/styles/clear/style-night/symbols/subway-manila-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-manila-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-manila-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-maracaibo-l copy.svg b/data/styles/clear/style-night/symbols/subway-maracaibo-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-maracaibo-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-maracaibo-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-maracaibo-m copy.svg b/data/styles/clear/style-night/symbols/subway-maracaibo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-maracaibo-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-maracaibo-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-maracaibo-s copy.svg b/data/styles/clear/style-night/symbols/subway-maracaibo-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-maracaibo-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-maracaibo-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-marseille-l copy.svg b/data/styles/clear/style-night/symbols/subway-marseille-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-marseille-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-marseille-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-marseille-m copy.svg b/data/styles/clear/style-night/symbols/subway-marseille-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-marseille-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-marseille-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-marseille-s copy.svg b/data/styles/clear/style-night/symbols/subway-marseille-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-marseille-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-marseille-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-mashhad-l copy.svg b/data/styles/clear/style-night/symbols/subway-mashhad-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-mashhad-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-mashhad-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-mashhad-m copy.svg b/data/styles/clear/style-night/symbols/subway-mashhad-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-mashhad-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-mashhad-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-mashhad-s copy.svg b/data/styles/clear/style-night/symbols/subway-mashhad-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-mashhad-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-mashhad-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-massachusetts-l copy.svg b/data/styles/clear/style-night/symbols/subway-massachusetts-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-massachusetts-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-massachusetts-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-massachusetts-m copy.svg b/data/styles/clear/style-night/symbols/subway-massachusetts-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-massachusetts-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-massachusetts-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-massachusetts-s copy.svg b/data/styles/clear/style-night/symbols/subway-massachusetts-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-massachusetts-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-massachusetts-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-mecca-l copy.svg b/data/styles/clear/style-night/symbols/subway-mecca-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-mecca-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-mecca-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-mecca-m copy.svg b/data/styles/clear/style-night/symbols/subway-mecca-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-mecca-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-mecca-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-mecca-s copy.svg b/data/styles/clear/style-night/symbols/subway-mecca-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-mecca-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-mecca-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-medellin-l copy.svg b/data/styles/clear/style-night/symbols/subway-medellin-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-medellin-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-medellin-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-medellin-m copy.svg b/data/styles/clear/style-night/symbols/subway-medellin-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-medellin-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-medellin-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-medellin-s copy.svg b/data/styles/clear/style-night/symbols/subway-medellin-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-medellin-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-medellin-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-mexico-l copy.svg b/data/styles/clear/style-night/symbols/subway-mexico-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-mexico-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-mexico-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-mexico-m copy.svg b/data/styles/clear/style-night/symbols/subway-mexico-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-mexico-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-mexico-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-mexico-s copy.svg b/data/styles/clear/style-night/symbols/subway-mexico-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-mexico-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-mexico-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-milan-l copy.svg b/data/styles/clear/style-night/symbols/subway-milan-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-milan-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-milan-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-milan-m copy.svg b/data/styles/clear/style-night/symbols/subway-milan-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-milan-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-milan-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-milan-s copy.svg b/data/styles/clear/style-night/symbols/subway-milan-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-milan-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-milan-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-minatomirai-l copy.svg b/data/styles/clear/style-night/symbols/subway-minatomirai-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-minatomirai-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-minatomirai-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-minatomirai-m copy.svg b/data/styles/clear/style-night/symbols/subway-minatomirai-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-minatomirai-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-minatomirai-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-minatomirai-s copy.svg b/data/styles/clear/style-night/symbols/subway-minatomirai-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-minatomirai-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-minatomirai-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-minsk-l copy.svg b/data/styles/clear/style-night/symbols/subway-minsk-l copy.svg
deleted file mode 100644
index fa89641e71..0000000000
--- a/data/styles/clear/style-night/symbols/subway-minsk-l copy.svg	
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="23" height="12" viewBox="0 0 23 12">
-  <g fill="none">
-    <polygon fill="#FFF" points="1 0 8 0 8.45 0 8.748 .337 12.248 4.287 10.752 4.287 14.252 .337 14.55 0 15 0 22 0 23 0 23 1 23 10 23 11 22 11 14 11 14 10 11.5 12 9 10 9 11 1 11 0 11 0 10 0 1 0 0" opacity=".4"/>
-    <polygon fill="#80120E" points="1 1 8 1 11.5 4.95 15 1 22 1 22 10 15 10 15 7.429 11.5 11 8 7.429 8 10 1 10"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-minsk-l.svg b/data/styles/clear/style-night/symbols/subway-minsk-l.svg
index e93c7786ed..fa89641e71 100644
--- a/data/styles/clear/style-night/symbols/subway-minsk-l.svg
+++ b/data/styles/clear/style-night/symbols/subway-minsk-l.svg
@@ -1,6 +1,6 @@
 <svg width="23" height="12" viewBox="0 0 23 12">
-  <g fill="none" fill-rule="evenodd">
-    <polygon fill="#FFF" fill-rule="nonzero" points="1 0 8 0 8.45 0 8.748 .337 12.248 4.287 10.752 4.287 14.252 .337 14.55 0 15 0 22 0 23 0 23 1 23 10 23 11 22 11 14 11 14 10 11.5 12 9 10 9 11 1 11 0 11 0 10 0 1 0 0" opacity=".6"/>
-    <polygon fill="#992626" points="1 1 8 1 11.5 4.95 15 1 22 1 22 10 15 10 15 7.429 11.5 11 8 7.429 8 10 1 10"/>
+  <g fill="none">
+    <polygon fill="#FFF" points="1 0 8 0 8.45 0 8.748 .337 12.248 4.287 10.752 4.287 14.252 .337 14.55 0 15 0 22 0 23 0 23 1 23 10 23 11 22 11 14 11 14 10 11.5 12 9 10 9 11 1 11 0 11 0 10 0 1 0 0" opacity=".4"/>
+    <polygon fill="#80120E" points="1 1 8 1 11.5 4.95 15 1 22 1 22 10 15 10 15 7.429 11.5 11 8 7.429 8 10 1 10"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-minsk-m copy.svg b/data/styles/clear/style-night/symbols/subway-minsk-m copy.svg
deleted file mode 100644
index 6fea2cd83c..0000000000
--- a/data/styles/clear/style-night/symbols/subway-minsk-m copy.svg	
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="19" height="10" viewBox="0 0 19 10">
-  <g fill="none">
-    <polygon fill="#FFF" points="1 0 6.667 0 7.098 0 7.394 .313 9.5 2.5 11.606 .313 11.902 0 12.333 0 18 0 19 0 19 1 19 8 19 9 18 9 12.333 9 11.333 9 9.5 10 7.667 9 6.667 9 1 9 0 9 0 8 0 1 0 0" opacity=".4"/>
-    <polygon fill="#80120E" points="1 1 6.667 1 9.5 4 12.333 1 18 1 18 8 13 8 13 6 9.5 9 6 6 6 8 1 8"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-minsk-m.svg b/data/styles/clear/style-night/symbols/subway-minsk-m.svg
index 0fdfed0a5a..6fea2cd83c 100644
--- a/data/styles/clear/style-night/symbols/subway-minsk-m.svg
+++ b/data/styles/clear/style-night/symbols/subway-minsk-m.svg
@@ -1,6 +1,6 @@
 <svg width="19" height="10" viewBox="0 0 19 10">
-  <g fill="none" fill-rule="evenodd">
-    <polygon fill="#FFF" fill-rule="nonzero" points="1 0 6.667 0 7.098 0 7.394 .313 9.5 2.5 11.606 .313 11.902 0 12.333 0 18 0 19 0 19 1 19 8 19 9 18 9 12.333 9 11.333 9 9.5 10 7.667 9 6.667 9 1 9 0 9 0 8 0 1 0 0" opacity=".6"/>
-    <polygon fill="#992626" points="1 1 6.667 1 9.5 4 12.333 1 18 1 18 8 13 8 13 6 9.5 9 6 6 6 8 1 8"/>
+  <g fill="none">
+    <polygon fill="#FFF" points="1 0 6.667 0 7.098 0 7.394 .313 9.5 2.5 11.606 .313 11.902 0 12.333 0 18 0 19 0 19 1 19 8 19 9 18 9 12.333 9 11.333 9 9.5 10 7.667 9 6.667 9 1 9 0 9 0 8 0 1 0 0" opacity=".4"/>
+    <polygon fill="#80120E" points="1 1 6.667 1 9.5 4 12.333 1 18 1 18 8 13 8 13 6 9.5 9 6 6 6 8 1 8"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-minsk-s copy.svg b/data/styles/clear/style-night/symbols/subway-minsk-s copy.svg
deleted file mode 100644
index 540ce4af6a..0000000000
--- a/data/styles/clear/style-night/symbols/subway-minsk-s copy.svg	
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="17" height="9" viewBox="0 0 17 9">
-  <g fill="none">
-    <polygon fill="#FFF" points="1 0 6 0 6.414 0 6.707 .293 8.495 2.091 10.293 .293 10.586 0 11 0 16 0 17 0 17 1 17 7 17 8 16 8 11 8 10 8 8.5 9 7 8 6 8 1 8 0 8 0 7 0 1 0 0" opacity=".4"/>
-    <polygon fill="#80120E" points="1 1 6 1 8.5 3.5 11 1 16 1 16 7 11 7 11 5 8.5 8 6 5 6 7 1 7"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-minsk-s.svg b/data/styles/clear/style-night/symbols/subway-minsk-s.svg
index f7dd39bac8..540ce4af6a 100644
--- a/data/styles/clear/style-night/symbols/subway-minsk-s.svg
+++ b/data/styles/clear/style-night/symbols/subway-minsk-s.svg
@@ -1,6 +1,6 @@
 <svg width="17" height="9" viewBox="0 0 17 9">
-  <g fill="none" fill-rule="evenodd">
-    <polygon fill="#FFF" fill-rule="nonzero" points="1 0 6 0 6.414 0 6.707 .293 8.495 2.091 10.293 .293 10.586 0 11 0 16 0 17 0 17 1 17 7 17 8 16 8 11 8 10 8 8.5 9 7 8 6 8 1 8 0 8 0 7 0 1 0 0" opacity=".6"/>
-    <polygon fill="#992626" points="1 1 6 1 8.5 3.5 11 1 16 1 16 7 11 7 11 5 8.5 8 6 5 6 7 1 7"/>
+  <g fill="none">
+    <polygon fill="#FFF" points="1 0 6 0 6.414 0 6.707 .293 8.495 2.091 10.293 .293 10.586 0 11 0 16 0 17 0 17 1 17 7 17 8 16 8 11 8 10 8 8.5 9 7 8 6 8 1 8 0 8 0 7 0 1 0 0" opacity=".4"/>
+    <polygon fill="#80120E" points="1 1 6 1 8.5 3.5 11 1 16 1 16 7 11 7 11 5 8.5 8 6 5 6 7 1 7"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-montreal-l copy.svg b/data/styles/clear/style-night/symbols/subway-montreal-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-montreal-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-montreal-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-montreal-m copy.svg b/data/styles/clear/style-night/symbols/subway-montreal-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-montreal-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-montreal-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-montreal-s copy.svg b/data/styles/clear/style-night/symbols/subway-montreal-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-montreal-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-montreal-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-moscow-l copy.svg b/data/styles/clear/style-night/symbols/subway-moscow-l copy.svg
deleted file mode 100644
index a4be386aac..0000000000
--- a/data/styles/clear/style-night/symbols/subway-moscow-l copy.svg	
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="26" height="23" viewBox="0 0 26 23">
-  <g fill="none">
-    <polygon fill="#FFF" points="13.887 20.441 12.997 22.17 12.109 20.441 10.04 16 10.04 17 10.04 19.997 10.04 20.997 9.04 20.997 1.002 20.997 .002 20.997 .002 19.997 .002 17 .002 16 1.002 16 2.386 16 7.731 2.491 8.571 .371 9.561 2.425 12.997 9.625 16.444 2.425 17.434 .373 18.274 2.491 23.683 16 25.002 16 26.002 16 26.002 17 26.002 19.997 26.002 20.997 25.002 20.997 16.965 20.997 15.965 20.997 15.965 19.997 15.965 17 15.965 16" opacity=".4"/>
-    <polygon fill="#8C2323" points="16.553 13.081 18.044 17 16.965 17 16.965 19.997 25.002 19.997 25.002 17 22.952 17 17.344 2.86 12.999 11.863 8.66 2.86 3.052 17 1.002 17 1.002 19.997 9.04 19.997 9.04 17 7.96 17 9.452 13.081 12.998 19.984"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-moscow-l.svg b/data/styles/clear/style-night/symbols/subway-moscow-l.svg
index 6d607cdc6f..a4be386aac 100644
--- a/data/styles/clear/style-night/symbols/subway-moscow-l.svg
+++ b/data/styles/clear/style-night/symbols/subway-moscow-l.svg
@@ -1,6 +1,6 @@
 <svg width="26" height="23" viewBox="0 0 26 23">
-  <g fill="none" fill-rule="evenodd">
-    <polygon fill="#FFF" fill-rule="nonzero" points="13.887 20.441 12.997 22.17 12.109 20.441 10.04 16 10.04 17 10.04 19.997 10.04 20.997 9.04 20.997 1.002 20.997 .002 20.997 .002 19.997 .002 17 .002 16 1.002 16 2.386 16 7.731 2.491 8.571 .371 9.561 2.425 12.997 9.625 16.444 2.425 17.434 .373 18.274 2.491 23.683 16 25.002 16 26.002 16 26.002 17 26.002 19.997 26.002 20.997 25.002 20.997 16.965 20.997 15.965 20.997 15.965 19.997 15.965 17 15.965 16" opacity=".6"/>
-    <polygon fill="#B32C2C" points="16.553 13.081 18.044 17 16.965 17 16.965 19.997 25.002 19.997 25.002 17 22.952 17 17.344 2.86 12.999 11.863 8.66 2.86 3.052 17 1.002 17 1.002 19.997 9.04 19.997 9.04 17 7.96 17 9.452 13.081 12.998 19.984"/>
+  <g fill="none">
+    <polygon fill="#FFF" points="13.887 20.441 12.997 22.17 12.109 20.441 10.04 16 10.04 17 10.04 19.997 10.04 20.997 9.04 20.997 1.002 20.997 .002 20.997 .002 19.997 .002 17 .002 16 1.002 16 2.386 16 7.731 2.491 8.571 .371 9.561 2.425 12.997 9.625 16.444 2.425 17.434 .373 18.274 2.491 23.683 16 25.002 16 26.002 16 26.002 17 26.002 19.997 26.002 20.997 25.002 20.997 16.965 20.997 15.965 20.997 15.965 19.997 15.965 17 15.965 16" opacity=".4"/>
+    <polygon fill="#8C2323" points="16.553 13.081 18.044 17 16.965 17 16.965 19.997 25.002 19.997 25.002 17 22.952 17 17.344 2.86 12.999 11.863 8.66 2.86 3.052 17 1.002 17 1.002 19.997 9.04 19.997 9.04 17 7.96 17 9.452 13.081 12.998 19.984"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-moscow-m copy.svg b/data/styles/clear/style-night/symbols/subway-moscow-m copy.svg
deleted file mode 100644
index 53a29fcee8..0000000000
--- a/data/styles/clear/style-night/symbols/subway-moscow-m copy.svg	
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="22" height="19" viewBox="0 0 22 19">
-  <g fill="none">
-    <path fill="#FFF" d="M11,19.0210339 L11,8.1499939 L13.7203656,2.5600347 L14.714791,0.5303093 L15.5479603,2.63137952 L19.9924927,13.785091 L21,13.785091 L22,13.785091 L22,14.7850911 L21.9999999,17.0699997 L21.9999999,18.0699998 L20.9999999,18.0699997 L14.3018444,18.0699993 L13.3018445,18.0699993 L13.3018445,17.0699993 L13.3018445,14.699118 L11.8808374,17.4670062 L11,19.0210339 Z M11,19 L11,8.1499939 L8.27963446,2.5600347 L7.28520902,0.5303093 L6.4520397,2.63137952 L2.00750736,13.785091 L1.00000004,13.785091 L-3.55271368e-15,13.785091 L3.72533044e-08,14.7850911 L1.22373709e-07,17.0699997 L1.59627017e-07,18.0699998 L1.00000018,18.0699997 L7.6981556,18.0699993 L8.69815555,18.0699993 L8.69815555,17.0699993 L8.69815555,14.699118 L10.1191627,17.4670062 L11,19 Z" opacity=".4"/>
-    <polygon fill="#8C2323" points="11.003 16.987 13.958 11.392 15.202 14.699 14.302 14.699 14.302 17.07 21 17.07 21 14.785 19.292 14.785 14.618 3 11 10.385 7.382 3 2.708 14.785 1 14.785 1 17 7.698 17 7.698 14.699 6.798 14.699 8.042 11.392 10.997 16.987 10.997 17 11 16.994 11.003 17"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-moscow-m.svg b/data/styles/clear/style-night/symbols/subway-moscow-m.svg
index be73bfc71a..53a29fcee8 100644
--- a/data/styles/clear/style-night/symbols/subway-moscow-m.svg
+++ b/data/styles/clear/style-night/symbols/subway-moscow-m.svg
@@ -1,6 +1,6 @@
 <svg width="22" height="19" viewBox="0 0 22 19">
-  <g fill="none" fill-rule="evenodd" transform="translate(0 -1)">
-    <path fill="#FFF" fill-rule="nonzero" d="M11,19.0210339 L11,8.1499939 L13.7203656,2.5600347 L14.714791,0.5303093 L15.5479603,2.63137952 L19.9924927,13.785091 L21,13.785091 L22,13.785091 L22,14.7850911 L21.9999999,17.0699997 L21.9999999,18.0699998 L20.9999999,18.0699997 L14.3018444,18.0699993 L13.3018445,18.0699993 L13.3018445,17.0699993 L13.3018445,14.699118 L11.8808374,17.4670062 L11,19.0210339 Z M11,19 L11,8.1499939 L8.27963446,2.5600347 L7.28520902,0.5303093 L6.4520397,2.63137952 L2.00750736,13.785091 L1.00000004,13.785091 L-3.55271368e-15,13.785091 L3.72533044e-08,14.7850911 L1.22373709e-07,17.0699997 L1.59627017e-07,18.0699998 L1.00000018,18.0699997 L7.6981556,18.0699993 L8.69815555,18.0699993 L8.69815555,17.0699993 L8.69815555,14.699118 L10.1191627,17.4670062 L11,19 Z" opacity=".6"/>
-    <path fill="#B32C2C" d="M11.0034167,16.9870613 L13.9584565,11.3918334 L15.2016042,14.699118 L14.3018445,14.699118 L14.3018445,17.0699993 L20.9999999,17.0699997 L21,14.785091 L19.2917017,14.785091 L14.6183804,3 L11,10.3854894 L7.38161965,3 L2.70829831,14.785091 L1,14.785091 L1.00000009,17 L7.69815551,17 L7.69815551,14.699118 L6.79839578,14.699118 L8.04154346,11.3918334 L10.9965833,16.9870613 L10.9965833,17 L11,16.9935307 L11.0034167,17 L11.0034167,16.9870613 Z"/>
+  <g fill="none">
+    <path fill="#FFF" d="M11,19.0210339 L11,8.1499939 L13.7203656,2.5600347 L14.714791,0.5303093 L15.5479603,2.63137952 L19.9924927,13.785091 L21,13.785091 L22,13.785091 L22,14.7850911 L21.9999999,17.0699997 L21.9999999,18.0699998 L20.9999999,18.0699997 L14.3018444,18.0699993 L13.3018445,18.0699993 L13.3018445,17.0699993 L13.3018445,14.699118 L11.8808374,17.4670062 L11,19.0210339 Z M11,19 L11,8.1499939 L8.27963446,2.5600347 L7.28520902,0.5303093 L6.4520397,2.63137952 L2.00750736,13.785091 L1.00000004,13.785091 L-3.55271368e-15,13.785091 L3.72533044e-08,14.7850911 L1.22373709e-07,17.0699997 L1.59627017e-07,18.0699998 L1.00000018,18.0699997 L7.6981556,18.0699993 L8.69815555,18.0699993 L8.69815555,17.0699993 L8.69815555,14.699118 L10.1191627,17.4670062 L11,19 Z" opacity=".4"/>
+    <polygon fill="#8C2323" points="11.003 16.987 13.958 11.392 15.202 14.699 14.302 14.699 14.302 17.07 21 17.07 21 14.785 19.292 14.785 14.618 3 11 10.385 7.382 3 2.708 14.785 1 14.785 1 17 7.698 17 7.698 14.699 6.798 14.699 8.042 11.392 10.997 16.987 10.997 17 11 16.994 11.003 17"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-moscow-s copy.svg b/data/styles/clear/style-night/symbols/subway-moscow-s copy.svg
deleted file mode 100644
index 48d8c522a7..0000000000
--- a/data/styles/clear/style-night/symbols/subway-moscow-s copy.svg	
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg width="15" height="14" viewBox="0 0 15 14">
-  <g fill="none">
-    <path fill="#FFF" d="M9.4334494,7.92375208 L10.3711432,10.0320781 L9.6713698,10.0320781 L9.6713698,11.431419 L13.8716843,11.431419 L13.8716841,10.0320778 L13.1702367,10.0320778 L10.016514,2.96456693 L7.92277341,7.22935918 L5.82903279,2.96456693 L2.6753101,10.0320778 L1.9738627,10.0320778 L1.97386254,11.431419 L6.17417703,11.431419 L6.17417703,10.0320781 L5.47440364,10.0320781 L6.41209742,7.92375208 L7.92050179,11.4227804 L9.4334494,7.92375208 Z M8.52768269,8.32648013 L10.3433445,8.31706663 L8.83039689,11.8160949 L7.91913325,13.923595 L7.01017677,11.8150991 L5.50177239,8.31607083 L7.31786413,8.32648013 L6.38017035,10.4348061 L5.47440364,10.0320781 L5.47440364,9.0409363 L6.17417703,9.0409363 L7.16546454,9.0409363 L7.16546454,10.0320781 L7.16546454,11.431419 L7.16546454,12.4225608 L6.17417703,12.4225608 L1.97386254,12.4225608 L0.98257491,12.4225608 L0.98257502,11.4314189 L0.98257519,10.0320776 L0.9825753,9.040936 L1.9738627,9.040936 L2.6753101,9.040936 L2.6753101,10.0320778 L1.77003831,9.6282388 L4.923761,2.56072793 L5.78619948,0.62799829 L6.71889537,2.52782971 L8.812636,6.79262197 L7.03291083,6.79262197 L9.1266514,2.52782971 L10.0593473,0.62799829 L10.9217858,2.56072793 L14.0755085,9.6282388 L13.1702367,10.0320778 L13.1702367,9.040936 L13.8716841,9.040936 L14.8629715,9.040936 L14.8629716,10.0320776 L14.8629718,11.4314189 L14.8629719,12.4225608 L13.8716843,12.4225608 L9.6713698,12.4225608 L8.68008228,12.4225608 L8.68008228,11.431419 L8.68008228,10.0320781 L8.68008228,9.0409363 L9.6713698,9.0409363 L10.3711432,9.0409363 L10.3711432,10.0320781 L9.4653765,10.4348061 L8.52768269,8.32648013 Z" opacity=".4"/>
-    <polygon fill="#8C2323" points="9.433 7.924 10.371 10.032 9.671 10.032 9.671 11.431 13.872 11.431 13.872 10.032 13.17 10.032 10.017 2.965 7.923 7.229 5.829 2.965 2.675 10.032 1.974 10.032 1.974 11.431 6.174 11.431 6.174 10.032 5.474 10.032 6.412 7.924 7.921 11.423"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-moscow-s.svg b/data/styles/clear/style-night/symbols/subway-moscow-s.svg
index 108b261f19..48d8c522a7 100644
--- a/data/styles/clear/style-night/symbols/subway-moscow-s.svg
+++ b/data/styles/clear/style-night/symbols/subway-moscow-s.svg
@@ -1,6 +1,6 @@
-<svg width="14" height="14" viewBox="0 0 14 14">
-  <g fill="none" fill-rule="evenodd" transform="translate(-2 -1)">
-    <path fill="#FFF" fill-rule="nonzero" d="M10.4334494,8.92375208 L11.3711432,11.0320781 L10.6713698,11.0320781 L10.6713698,12.431419 L14.8716843,12.431419 L14.8716841,11.0320778 L14.1702367,11.0320778 L11.016514,3.96456693 L8.92277341,8.22935918 L6.82903279,3.96456693 L3.6753101,11.0320778 L2.9738627,11.0320778 L2.97386254,12.431419 L7.17417703,12.431419 L7.17417703,11.0320781 L6.47440364,11.0320781 L7.41209742,8.92375208 L8.92050179,12.4227804 L10.4334494,8.92375208 L10.4334494,8.92375208 Z M9.52768269,9.32648013 L9.52768269,9.32648013 L11.3433445,9.31706663 L9.83039689,12.8160949 L8.91913325,14.923595 L8.01017677,12.8150991 L6.50177239,9.31607083 L8.31786413,9.32648013 L7.38017035,11.4348061 L6.47440364,11.0320781 L6.47440364,10.0409363 L7.17417703,10.0409363 L8.16546454,10.0409363 L8.16546454,11.0320781 L8.16546454,12.431419 L8.16546454,13.4225608 L7.17417703,13.4225608 L2.97386254,13.4225608 L1.98257491,13.4225608 L1.98257502,12.4314189 L1.98257519,11.0320776 L1.9825753,10.040936 L2.9738627,10.040936 L3.6753101,10.040936 L3.6753101,11.0320778 L2.77003831,10.6282388 L5.923761,3.56072793 L6.78619948,1.62799829 L7.71889537,3.52782971 L9.812636,7.79262197 L8.03291083,7.79262197 L10.1266514,3.52782971 L11.0593473,1.62799829 L11.9217858,3.56072793 L15.0755085,10.6282388 L14.1702367,11.0320778 L14.1702367,10.040936 L14.8716841,10.040936 L15.8629715,10.040936 L15.8629716,11.0320776 L15.8629718,12.4314189 L15.8629719,13.4225608 L14.8716843,13.4225608 L10.6713698,13.4225608 L9.68008228,13.4225608 L9.68008228,12.431419 L9.68008228,11.0320781 L9.68008228,10.0409363 L10.6713698,10.0409363 L11.3711432,10.0409363 L11.3711432,11.0320781 L10.4653765,11.4348061 L9.52768269,9.32648013 Z" opacity=".6"/>
-    <polygon fill="#B32C2C" points="10.433 8.924 11.371 11.032 10.671 11.032 10.671 12.431 14.872 12.431 14.872 11.032 14.17 11.032 11.017 3.965 8.923 8.229 6.829 3.965 3.675 11.032 2.974 11.032 2.974 12.431 7.174 12.431 7.174 11.032 6.474 11.032 7.412 8.924 8.921 12.423"/>
+<svg width="15" height="14" viewBox="0 0 15 14">
+  <g fill="none">
+    <path fill="#FFF" d="M9.4334494,7.92375208 L10.3711432,10.0320781 L9.6713698,10.0320781 L9.6713698,11.431419 L13.8716843,11.431419 L13.8716841,10.0320778 L13.1702367,10.0320778 L10.016514,2.96456693 L7.92277341,7.22935918 L5.82903279,2.96456693 L2.6753101,10.0320778 L1.9738627,10.0320778 L1.97386254,11.431419 L6.17417703,11.431419 L6.17417703,10.0320781 L5.47440364,10.0320781 L6.41209742,7.92375208 L7.92050179,11.4227804 L9.4334494,7.92375208 Z M8.52768269,8.32648013 L10.3433445,8.31706663 L8.83039689,11.8160949 L7.91913325,13.923595 L7.01017677,11.8150991 L5.50177239,8.31607083 L7.31786413,8.32648013 L6.38017035,10.4348061 L5.47440364,10.0320781 L5.47440364,9.0409363 L6.17417703,9.0409363 L7.16546454,9.0409363 L7.16546454,10.0320781 L7.16546454,11.431419 L7.16546454,12.4225608 L6.17417703,12.4225608 L1.97386254,12.4225608 L0.98257491,12.4225608 L0.98257502,11.4314189 L0.98257519,10.0320776 L0.9825753,9.040936 L1.9738627,9.040936 L2.6753101,9.040936 L2.6753101,10.0320778 L1.77003831,9.6282388 L4.923761,2.56072793 L5.78619948,0.62799829 L6.71889537,2.52782971 L8.812636,6.79262197 L7.03291083,6.79262197 L9.1266514,2.52782971 L10.0593473,0.62799829 L10.9217858,2.56072793 L14.0755085,9.6282388 L13.1702367,10.0320778 L13.1702367,9.040936 L13.8716841,9.040936 L14.8629715,9.040936 L14.8629716,10.0320776 L14.8629718,11.4314189 L14.8629719,12.4225608 L13.8716843,12.4225608 L9.6713698,12.4225608 L8.68008228,12.4225608 L8.68008228,11.431419 L8.68008228,10.0320781 L8.68008228,9.0409363 L9.6713698,9.0409363 L10.3711432,9.0409363 L10.3711432,10.0320781 L9.4653765,10.4348061 L8.52768269,8.32648013 Z" opacity=".4"/>
+    <polygon fill="#8C2323" points="9.433 7.924 10.371 10.032 9.671 10.032 9.671 11.431 13.872 11.431 13.872 10.032 13.17 10.032 10.017 2.965 7.923 7.229 5.829 2.965 2.675 10.032 1.974 10.032 1.974 11.431 6.174 11.431 6.174 10.032 5.474 10.032 6.412 7.924 7.921 11.423"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-nagoya-l copy.svg b/data/styles/clear/style-night/symbols/subway-nagoya-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-nagoya-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-nagoya-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-nagoya-m copy.svg b/data/styles/clear/style-night/symbols/subway-nagoya-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-nagoya-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-nagoya-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-nagoya-s copy.svg b/data/styles/clear/style-night/symbols/subway-nagoya-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-nagoya-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-nagoya-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-newyork-l copy.svg b/data/styles/clear/style-night/symbols/subway-newyork-l copy.svg
deleted file mode 100644
index 53100b6adc..0000000000
--- a/data/styles/clear/style-night/symbols/subway-newyork-l copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="28" height="28" viewBox="0 0 28 28">
-  <g fill="none">
-    <rect width="28" height="28" fill="#FFF" opacity=".4" rx="14"/>
-    <rect width="26" height="26" x="1" y="1" fill="#000" rx="13"/>
-    <path fill="#FFF" d="M11,6 L18,6 L21,8 L21,19 C21,19.5 20.5,20 20,20 L17.5,20 L15,20 L11.5,20 L9,20 C8.5,20 8,19.5 8,19 L8,8 L11,6 Z M12,8 L10,9 L10,13 L14,13 L14,8 L12,8 Z M17,8 L15,8 L15,13 L19,13 L19,9 L17,8 Z M20,17.75 C20,17.3345 19.6655,17 19.25,17 C18.8345,17 18.5,17.3345 18.5,17.75 C18.5,18.1655 18.8345,18.5 19.25,18.5 C19.6655,18.5 20,18.1655 20,17.75 Z M9.75,17 C9.3345,17 9,17.3345 9,17.75 C9,18.1655 9.3345,18.5 9.75,18.5 C10.1655,18.5 10.5,18.1655 10.5,17.75 C10.5,17.3345 10.1655,17 9.75,17 Z" opacity=".6"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-newyork-l.svg b/data/styles/clear/style-night/symbols/subway-newyork-l.svg
index 44172c9ba9..53100b6adc 100644
--- a/data/styles/clear/style-night/symbols/subway-newyork-l.svg
+++ b/data/styles/clear/style-night/symbols/subway-newyork-l.svg
@@ -1,7 +1,7 @@
 <svg width="28" height="28" viewBox="0 0 28 28">
-  <g fill="none" fill-rule="evenodd">
+  <g fill="none">
     <rect width="28" height="28" fill="#FFF" opacity=".4" rx="14"/>
-    <rect width="26" height="26" x="1" y="1" fill="#3D3C36" rx="13"/>
-    <path fill="#FFF" d="M11,6 L8,8 L8,19 C8,19.5 8.5,20 9,20 L11.5,20 L15,20 L17.5,20 L20,20 C20.5,20 21,19.5 21,19 L21,8 L18,6 L11,6 Z M12,8 L14,8 L14,13 L10,13 L10,9 L12,8 Z M17,8 L15,8 L15,13 L19,13 L19,9 L17,8 Z M20,17.75 C20,18.1655 19.6655,18.5 19.25,18.5 C18.8345,18.5 18.5,18.1655 18.5,17.75 C18.5,17.3345 18.8345,17 19.25,17 C19.6655,17 20,17.3345 20,17.75 Z M9.75,17 C10.1655,17 10.5,17.3345 10.5,17.75 C10.5,18.1655 10.1655,18.5 9.75,18.5 C9.3345,18.5 9,18.1655 9,17.75 C9,17.3345 9.3345,17 9.75,17 L9.75,17 Z" opacity=".6"/>
+    <rect width="26" height="26" x="1" y="1" fill="#000" rx="13"/>
+    <path fill="#FFF" d="M11,6 L18,6 L21,8 L21,19 C21,19.5 20.5,20 20,20 L17.5,20 L15,20 L11.5,20 L9,20 C8.5,20 8,19.5 8,19 L8,8 L11,6 Z M12,8 L10,9 L10,13 L14,13 L14,8 L12,8 Z M17,8 L15,8 L15,13 L19,13 L19,9 L17,8 Z M20,17.75 C20,17.3345 19.6655,17 19.25,17 C18.8345,17 18.5,17.3345 18.5,17.75 C18.5,18.1655 18.8345,18.5 19.25,18.5 C19.6655,18.5 20,18.1655 20,17.75 Z M9.75,17 C9.3345,17 9,17.3345 9,17.75 C9,18.1655 9.3345,18.5 9.75,18.5 C10.1655,18.5 10.5,18.1655 10.5,17.75 C10.5,17.3345 10.1655,17 9.75,17 Z" opacity=".6"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-newyork-m copy.svg b/data/styles/clear/style-night/symbols/subway-newyork-m copy.svg
deleted file mode 100644
index a2a1255090..0000000000
--- a/data/styles/clear/style-night/symbols/subway-newyork-m copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24">
-  <g fill="none">
-    <rect width="24" height="24" fill="#FFF" opacity=".4" rx="12"/>
-    <rect width="22" height="22" x="1" y="1" fill="#000" rx="11"/>
-    <path fill="#FFF" d="M7.99230772,6 L6,7.50387445 L6.04221484,16.997417 C6.05751659,17.4987085 6.55559352,18 7.05367046,18 L17.0190552,18 C17.5171322,18 18.007744,17.6700426 17.9999074,16.997417 L17.9576925,7.50387445 L15.9653848,6 L7.99230772,6 Z M9.60451305,8.01071141 L14.5891285,8.01071141 L16.0075996,9.11218662 L16.0075996,12.9664965 L8.03452257,12.9664965 L8.03452257,9.11218662 L9.60451305,8.01071141 Z M10.0306764,15.601099 C10.0306764,16.0163829 9.69617793,16.3530362 9.28356104,16.3530362 C8.87094414,16.3530362 8.53644564,16.0163829 8.53644564,15.601099 C8.53644564,15.1858151 8.87094414,14.8491618 9.28356104,14.8491618 C9.69617793,14.8491618 10.0306764,15.1858151 10.0306764,15.601099 Z M16.5056766,15.601099 C16.5056766,16.0163829 16.1711781,16.3530362 15.7585612,16.3530362 C15.3459443,16.3530362 15.0114458,16.0163829 15.0114458,15.601099 C15.0114458,15.1858151 15.3459443,14.8491618 15.7585612,14.8491618 C16.1711781,14.8491618 16.5056766,15.1858151 16.5056766,15.601099 Z M11.0019231,8.01071141 L12.9980769,8.01071141 L12.9980769,13.0236262 L11.0019231,13.0236262 L11.0019231,8.01071141 Z" opacity=".6"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-newyork-m.svg b/data/styles/clear/style-night/symbols/subway-newyork-m.svg
index 09c7268dec..a2a1255090 100644
--- a/data/styles/clear/style-night/symbols/subway-newyork-m.svg
+++ b/data/styles/clear/style-night/symbols/subway-newyork-m.svg
@@ -1,7 +1,7 @@
 <svg width="24" height="24" viewBox="0 0 24 24">
-  <g fill="none" fill-rule="evenodd">
+  <g fill="none">
     <rect width="24" height="24" fill="#FFF" opacity=".4" rx="12"/>
-    <rect width="22" height="22" x="1" y="1" fill="#3D3C36" rx="11"/>
-    <path fill="#FFF" d="M7.99230773,6 L6,7.50387445 L6.04221484,16.997417 C6.05751659,17.4987085 6.55559352,18 7.05367046,18 L17.0190552,18 C17.5171322,18 18.007744,17.6700426 17.9999074,16.997417 L17.9576925,7.50387445 L15.9653848,6 L7.99230773,6 Z M9.60451305,8.01071141 L14.5891285,8.01071141 L16.0075996,9.11218662 L16.0075996,12.9664965 L8.03452257,12.9664965 L8.03452257,9.11218662 L9.60451305,8.01071141 Z M10.0306764,15.601099 C10.0306764,16.0163829 9.69617793,16.3530362 9.28356104,16.3530362 C8.87094414,16.3530362 8.53644564,16.0163829 8.53644564,15.601099 C8.53644564,15.1858151 8.87094414,14.8491618 9.28356104,14.8491618 C9.69617793,14.8491618 10.0306764,15.1858151 10.0306764,15.601099 Z M16.5056766,15.601099 C16.5056766,16.0163829 16.1711781,16.3530362 15.7585612,16.3530362 C15.3459443,16.3530362 15.0114458,16.0163829 15.0114458,15.601099 C15.0114458,15.1858151 15.3459443,14.8491618 15.7585612,14.8491618 C16.1711781,14.8491618 16.5056766,15.1858151 16.5056766,15.601099 Z M11.0019231,8.01071141 L12.9980769,8.01071141 L12.9980769,13.0236262 L11.0019231,13.0236262 L11.0019231,8.01071141 Z" opacity=".6"/>
+    <rect width="22" height="22" x="1" y="1" fill="#000" rx="11"/>
+    <path fill="#FFF" d="M7.99230772,6 L6,7.50387445 L6.04221484,16.997417 C6.05751659,17.4987085 6.55559352,18 7.05367046,18 L17.0190552,18 C17.5171322,18 18.007744,17.6700426 17.9999074,16.997417 L17.9576925,7.50387445 L15.9653848,6 L7.99230772,6 Z M9.60451305,8.01071141 L14.5891285,8.01071141 L16.0075996,9.11218662 L16.0075996,12.9664965 L8.03452257,12.9664965 L8.03452257,9.11218662 L9.60451305,8.01071141 Z M10.0306764,15.601099 C10.0306764,16.0163829 9.69617793,16.3530362 9.28356104,16.3530362 C8.87094414,16.3530362 8.53644564,16.0163829 8.53644564,15.601099 C8.53644564,15.1858151 8.87094414,14.8491618 9.28356104,14.8491618 C9.69617793,14.8491618 10.0306764,15.1858151 10.0306764,15.601099 Z M16.5056766,15.601099 C16.5056766,16.0163829 16.1711781,16.3530362 15.7585612,16.3530362 C15.3459443,16.3530362 15.0114458,16.0163829 15.0114458,15.601099 C15.0114458,15.1858151 15.3459443,14.8491618 15.7585612,14.8491618 C16.1711781,14.8491618 16.5056766,15.1858151 16.5056766,15.601099 Z M11.0019231,8.01071141 L12.9980769,8.01071141 L12.9980769,13.0236262 L11.0019231,13.0236262 L11.0019231,8.01071141 Z" opacity=".6"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-newyork-s copy.svg b/data/styles/clear/style-night/symbols/subway-newyork-s copy.svg
deleted file mode 100644
index 4fd4a4636b..0000000000
--- a/data/styles/clear/style-night/symbols/subway-newyork-s copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16">
-  <g fill="none">
-    <rect width="16" height="16" fill="#FFF" opacity=".4" rx="8"/>
-    <rect width="14" height="14" x="1" y="1" fill="#000" rx="7"/>
-    <path fill="#FFF" d="M5.5,4 L4,5.14285714 L4,11.4285714 C4,11.7142857 4.25,12 4.5,12 L5.75,12 L9,12 L10.25,12 L11.5,12 C11.75,12 12,11.7142857 12,11.4285714 L12,5.14285714 L10.5,4 L5.5,4 Z M6,5.14285714 L10,5.14285714 L11,5.71428571 L11,7.42857143 L5,7.42857143 L5,5.71428571 L6,5.14285714 Z M6,10.2857143 C6,10.6022857 5.777,10.8571429 5.5,10.8571429 C5.223,10.8571429 5,10.6022857 5,10.2857143 C5,9.96914286 5.223,9.71428571 5.5,9.71428571 C5.777,9.71428571 6,9.96914286 6,10.2857143 Z M11,10.2857143 C11,10.6022857 10.777,10.8571429 10.5,10.8571429 C10.223,10.8571429 10,10.6022857 10,10.2857143 C10,9.96914286 10.223,9.71428571 10.5,9.71428571 C10.777,9.71428571 11,9.96914286 11,10.2857143 Z" opacity=".6"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-newyork-s.svg b/data/styles/clear/style-night/symbols/subway-newyork-s.svg
index 7757b1be42..4fd4a4636b 100644
--- a/data/styles/clear/style-night/symbols/subway-newyork-s.svg
+++ b/data/styles/clear/style-night/symbols/subway-newyork-s.svg
@@ -1,7 +1,7 @@
 <svg width="16" height="16" viewBox="0 0 16 16">
-  <g fill="none" fill-rule="evenodd">
+  <g fill="none">
     <rect width="16" height="16" fill="#FFF" opacity=".4" rx="8"/>
-    <rect width="14" height="14" x="1" y="1" fill="#3D3C36" rx="7"/>
+    <rect width="14" height="14" x="1" y="1" fill="#000" rx="7"/>
     <path fill="#FFF" d="M5.5,4 L4,5.14285714 L4,11.4285714 C4,11.7142857 4.25,12 4.5,12 L5.75,12 L9,12 L10.25,12 L11.5,12 C11.75,12 12,11.7142857 12,11.4285714 L12,5.14285714 L10.5,4 L5.5,4 Z M6,5.14285714 L10,5.14285714 L11,5.71428571 L11,7.42857143 L5,7.42857143 L5,5.71428571 L6,5.14285714 Z M6,10.2857143 C6,10.6022857 5.777,10.8571429 5.5,10.8571429 C5.223,10.8571429 5,10.6022857 5,10.2857143 C5,9.96914286 5.223,9.71428571 5.5,9.71428571 C5.777,9.71428571 6,9.96914286 6,10.2857143 Z M11,10.2857143 C11,10.6022857 10.777,10.8571429 10.5,10.8571429 C10.223,10.8571429 10,10.6022857 10,10.2857143 C10,9.96914286 10.223,9.71428571 10.5,9.71428571 C10.777,9.71428571 11,9.96914286 11,10.2857143 Z" opacity=".6"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-nnov-l copy.svg b/data/styles/clear/style-night/symbols/subway-nnov-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-nnov-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-nnov-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-nnov-m copy.svg b/data/styles/clear/style-night/symbols/subway-nnov-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-nnov-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-nnov-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-nnov-s copy.svg b/data/styles/clear/style-night/symbols/subway-nnov-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-nnov-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-nnov-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-novosibirsk-l copy.svg b/data/styles/clear/style-night/symbols/subway-novosibirsk-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-novosibirsk-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-novosibirsk-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-novosibirsk-m copy.svg b/data/styles/clear/style-night/symbols/subway-novosibirsk-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-novosibirsk-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-novosibirsk-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-novosibirsk-s copy.svg b/data/styles/clear/style-night/symbols/subway-novosibirsk-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-novosibirsk-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-novosibirsk-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-omsk-l copy.svg b/data/styles/clear/style-night/symbols/subway-omsk-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-omsk-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-omsk-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-omsk-m copy.svg b/data/styles/clear/style-night/symbols/subway-omsk-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-omsk-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-omsk-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-omsk-s copy.svg b/data/styles/clear/style-night/symbols/subway-omsk-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-omsk-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-omsk-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-osaka-l copy.svg b/data/styles/clear/style-night/symbols/subway-osaka-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-osaka-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-osaka-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-osaka-m copy.svg b/data/styles/clear/style-night/symbols/subway-osaka-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-osaka-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-osaka-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-osaka-s copy.svg b/data/styles/clear/style-night/symbols/subway-osaka-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-osaka-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-osaka-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-oslo-l copy.svg b/data/styles/clear/style-night/symbols/subway-oslo-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-oslo-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-oslo-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-oslo-m copy.svg b/data/styles/clear/style-night/symbols/subway-oslo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-oslo-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-oslo-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-oslo-s copy.svg b/data/styles/clear/style-night/symbols/subway-oslo-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-oslo-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-oslo-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-palma-l copy.svg b/data/styles/clear/style-night/symbols/subway-palma-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-palma-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-palma-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-palma-m copy.svg b/data/styles/clear/style-night/symbols/subway-palma-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-palma-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-palma-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-palma-s copy.svg b/data/styles/clear/style-night/symbols/subway-palma-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-palma-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-palma-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-panama-l copy.svg b/data/styles/clear/style-night/symbols/subway-panama-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-panama-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-panama-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-panama-m copy.svg b/data/styles/clear/style-night/symbols/subway-panama-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-panama-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-panama-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-panama-s copy.svg b/data/styles/clear/style-night/symbols/subway-panama-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-panama-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-panama-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-paris-l copy.svg b/data/styles/clear/style-night/symbols/subway-paris-l copy.svg
deleted file mode 100644
index d0c8d9ac3c..0000000000
--- a/data/styles/clear/style-night/symbols/subway-paris-l copy.svg	
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="25" height="25" viewBox="0 0 25 25">
-  <g fill="none">
-    <circle cx="12.5" cy="12.5" r="12.5" fill="#FFF" opacity=".4"/>
-    <circle cx="12.5" cy="12.5" r="11.5" fill="#0A234D"/>
-    <circle cx="12.5" cy="12.5" r="10.5" fill="#A3A3A3"/>
-    <path fill="#0A234D" d="M19,18.0711264 L19,7.26890274 C19,6.65013066 18.6420368,6 17.5634855,6 C16.7482197,6 16.4203275,6.34058907 16.0614451,7.02214054 L12.5329599,13.9862974 L12.5007879,13.9862974 L8.94006505,7.02214054 C8.58065738,6.34058907 8.25447227,6 7.43717108,6 C6.35947333,6 6,6.65013066 6,7.26890274 L6,18.0711264 C6,18.6609042 6.49059081,19 7.07776341,19 C7.60000101,19 8.18809281,18.6609042 8.18809281,18.0711264 L8.18809281,10.023854 L8.22124971,10.023854 L11.4548026,16.2763451 C11.6834867,16.7098278 11.9780907,16.9584566 12.5007879,16.9584566 C13.0225659,16.9584566 13.3171699,16.7098278 13.5462479,16.2763451 L16.7792755,10.023854 L16.8124981,10.023854 L16.8124981,18.0711264 C16.8124981,18.6609042 17.399605,19 17.9223679,19 C18.5113789,19 19,18.6609042 19,18.0711264 Z"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-paris-l.svg b/data/styles/clear/style-night/symbols/subway-paris-l.svg
index 6a9e7ad361..d0c8d9ac3c 100644
--- a/data/styles/clear/style-night/symbols/subway-paris-l.svg
+++ b/data/styles/clear/style-night/symbols/subway-paris-l.svg
@@ -1,7 +1,8 @@
 <svg width="25" height="25" viewBox="0 0 25 25">
-  <g fill="none" fill-rule="evenodd">
-    <circle cx="12.5" cy="12.5" r="12.5" fill="#0D2F66"/>
-    <circle cx="12.5" cy="12.5" r="11.5" fill="#FFF" opacity=".6"/>
-    <path fill="#0D2F66" d="M19,18.0711264 L19,7.26890274 C19,6.65013066 18.6420368,6 17.5634855,6 C16.7482197,6 16.4203275,6.34058907 16.0614451,7.02214054 L12.5329599,13.9862974 L12.5007879,13.9862974 L8.94006505,7.02214054 C8.58065738,6.34058907 8.25447227,6 7.43717108,6 C6.35947333,6 6,6.65013066 6,7.26890274 L6,18.0711264 C6,18.6609042 6.49059081,19 7.07776341,19 C7.60000101,19 8.18809281,18.6609042 8.18809281,18.0711264 L8.18809281,10.023854 L8.22124971,10.023854 L11.4548026,16.2763451 C11.6834867,16.7098278 11.9780907,16.9584566 12.5007879,16.9584566 C13.0225659,16.9584566 13.3171699,16.7098278 13.5462479,16.2763451 L16.7792755,10.023854 L16.8124981,10.023854 L16.8124981,18.0711264 C16.8124981,18.6609042 17.399605,19 17.9223679,19 C18.5113789,19 19,18.6609042 19,18.0711264 L19,18.0711264 Z"/>
+  <g fill="none">
+    <circle cx="12.5" cy="12.5" r="12.5" fill="#FFF" opacity=".4"/>
+    <circle cx="12.5" cy="12.5" r="11.5" fill="#0A234D"/>
+    <circle cx="12.5" cy="12.5" r="10.5" fill="#A3A3A3"/>
+    <path fill="#0A234D" d="M19,18.0711264 L19,7.26890274 C19,6.65013066 18.6420368,6 17.5634855,6 C16.7482197,6 16.4203275,6.34058907 16.0614451,7.02214054 L12.5329599,13.9862974 L12.5007879,13.9862974 L8.94006505,7.02214054 C8.58065738,6.34058907 8.25447227,6 7.43717108,6 C6.35947333,6 6,6.65013066 6,7.26890274 L6,18.0711264 C6,18.6609042 6.49059081,19 7.07776341,19 C7.60000101,19 8.18809281,18.6609042 8.18809281,18.0711264 L8.18809281,10.023854 L8.22124971,10.023854 L11.4548026,16.2763451 C11.6834867,16.7098278 11.9780907,16.9584566 12.5007879,16.9584566 C13.0225659,16.9584566 13.3171699,16.7098278 13.5462479,16.2763451 L16.7792755,10.023854 L16.8124981,10.023854 L16.8124981,18.0711264 C16.8124981,18.6609042 17.399605,19 17.9223679,19 C18.5113789,19 19,18.6609042 19,18.0711264 Z"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-paris-m copy.svg b/data/styles/clear/style-night/symbols/subway-paris-m copy.svg
deleted file mode 100644
index 9d458b6814..0000000000
--- a/data/styles/clear/style-night/symbols/subway-paris-m copy.svg	
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="19" height="19" viewBox="0 0 19 19">
-  <g fill="none">
-    <circle cx="9.5" cy="9.5" r="9.5" fill="#FFF" opacity=".4"/>
-    <circle cx="9.5" cy="9.5" r="8.5" fill="#0A234D"/>
-    <circle cx="9.5" cy="9.5" r="7.5" fill="#A3A3A3"/>
-    <path fill="#0A234D" d="M14,13.3569336 L14,5.87847113 C14,5.45009046 13.7521793,5 13.00549,5 C12.4410752,5 12.2140729,5.23579244 11.9656158,5.70763576 L9.52281841,10.5289751 L9.50054546,10.5289751 L7.03542965,5.70763576 C6.78660896,5.23579244 6.56078849,5 5.9949646,5 C5.24886615,5 5,5.45009046 5,5.87847113 L5,13.3569336 C5,13.7652414 5.33963979,14 5.7461439,14 C6.10769301,14 6.51483348,13.7652414 6.51483348,13.3569336 L6.51483348,7.78574505 L6.53778826,7.78574505 L8.77640178,12.1143928 C8.93472156,12.4144962 9.13867817,12.5866238 9.50054546,12.5866238 C9.86177638,12.5866238 10.065733,12.4144962 10.2243255,12.1143928 L12.4625754,7.78574505 L12.4855756,7.78574505 L12.4855756,13.3569336 C12.4855756,13.7652414 12.8920343,14 13.253947,14 C13.6617239,14 14,13.7652414 14,13.3569336 Z"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-paris-m.svg b/data/styles/clear/style-night/symbols/subway-paris-m.svg
index 05f524e3eb..9d458b6814 100644
--- a/data/styles/clear/style-night/symbols/subway-paris-m.svg
+++ b/data/styles/clear/style-night/symbols/subway-paris-m.svg
@@ -1,7 +1,8 @@
 <svg width="19" height="19" viewBox="0 0 19 19">
-  <g fill="none" fill-rule="evenodd">
-    <circle cx="9.5" cy="9.5" r="9.5" fill="#0D2F66"/>
-    <circle cx="9.5" cy="9.5" r="8.5" fill="#FFF" opacity=".6"/>
-    <path fill="#0D2F66" d="M14,13.3569336 L14,5.87847113 C14,5.45009046 13.7521793,5 13.00549,5 C12.4410752,5 12.2140729,5.23579244 11.9656158,5.70763576 L9.52281841,10.5289751 L9.50054546,10.5289751 L7.03542965,5.70763576 C6.78660896,5.23579244 6.56078849,5 5.9949646,5 C5.24886615,5 5,5.45009046 5,5.87847113 L5,13.3569336 C5,13.7652414 5.33963979,14 5.7461439,14 C6.10769301,14 6.51483348,13.7652414 6.51483348,13.3569336 L6.51483348,7.78574505 L6.53778826,7.78574505 L8.77640178,12.1143928 C8.93472156,12.4144962 9.13867817,12.5866238 9.50054546,12.5866238 C9.86177638,12.5866238 10.065733,12.4144962 10.2243255,12.1143928 L12.4625754,7.78574505 L12.4855756,7.78574505 L12.4855756,13.3569336 C12.4855756,13.7652414 12.8920343,14 13.253947,14 C13.6617239,14 14,13.7652414 14,13.3569336 L14,13.3569336 Z"/>
+  <g fill="none">
+    <circle cx="9.5" cy="9.5" r="9.5" fill="#FFF" opacity=".4"/>
+    <circle cx="9.5" cy="9.5" r="8.5" fill="#0A234D"/>
+    <circle cx="9.5" cy="9.5" r="7.5" fill="#A3A3A3"/>
+    <path fill="#0A234D" d="M14,13.3569336 L14,5.87847113 C14,5.45009046 13.7521793,5 13.00549,5 C12.4410752,5 12.2140729,5.23579244 11.9656158,5.70763576 L9.52281841,10.5289751 L9.50054546,10.5289751 L7.03542965,5.70763576 C6.78660896,5.23579244 6.56078849,5 5.9949646,5 C5.24886615,5 5,5.45009046 5,5.87847113 L5,13.3569336 C5,13.7652414 5.33963979,14 5.7461439,14 C6.10769301,14 6.51483348,13.7652414 6.51483348,13.3569336 L6.51483348,7.78574505 L6.53778826,7.78574505 L8.77640178,12.1143928 C8.93472156,12.4144962 9.13867817,12.5866238 9.50054546,12.5866238 C9.86177638,12.5866238 10.065733,12.4144962 10.2243255,12.1143928 L12.4625754,7.78574505 L12.4855756,7.78574505 L12.4855756,13.3569336 C12.4855756,13.7652414 12.8920343,14 13.253947,14 C13.6617239,14 14,13.7652414 14,13.3569336 Z"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-paris-s copy.svg b/data/styles/clear/style-night/symbols/subway-paris-s copy.svg
deleted file mode 100644
index a7876a5318..0000000000
--- a/data/styles/clear/style-night/symbols/subway-paris-s copy.svg	
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg width="15" height="15" viewBox="0 0 15 15">
-  <g fill="none">
-    <circle cx="7.5" cy="7.5" r="7.5" fill="#FFF" opacity=".4"/>
-    <circle cx="7.5" cy="7.5" r="6.5" fill="#0A234D"/>
-    <circle cx="7.5" cy="7.5" r="5.5" fill="#A3A3A3"/>
-    <path fill="#0A234D" d="M11,10.4998373 L11,4.68325532 C11,4.35007036 10.8072506,4 10.2264922,4 C9.7875029,4 9.61094557,4.18339412 9.41770119,4.55038337 L7.51774765,8.30031397 L7.50042425,8.30031397 L5.58311195,4.55038337 C5.38958474,4.18339412 5.21394661,4 4.77386135,4 C4.19356256,4 4,4.35007036 4,4.68325532 L4,10.4998373 C4,10.8174099 4.26416428,11 4.58033414,11 C4.86153901,11 5.17820382,10.8174099 5.17820382,10.4998373 L5.17820382,6.1666906 L5.19605754,6.1666906 L6.93720139,9.53341661 C7.06033899,9.76683035 7.21897191,9.90070739 7.50042425,9.90070739 C7.78138163,9.90070739 7.94001455,9.76683035 8.06336428,9.53341661 L9.8042253,6.1666906 L9.82211436,6.1666906 L9.82211436,10.4998373 C9.82211436,10.8174099 10.1382489,11 10.4197366,11 C10.7368963,11 11,10.8174099 11,10.4998373 Z"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-paris-s.svg b/data/styles/clear/style-night/symbols/subway-paris-s.svg
index b42b9af0a7..a7876a5318 100644
--- a/data/styles/clear/style-night/symbols/subway-paris-s.svg
+++ b/data/styles/clear/style-night/symbols/subway-paris-s.svg
@@ -1,7 +1,8 @@
 <svg width="15" height="15" viewBox="0 0 15 15">
-  <g fill="none" fill-rule="evenodd">
-    <circle cx="7.5" cy="7.5" r="7.5" fill="#0D2F66"/>
-    <circle cx="7.5" cy="7.5" r="6.5" fill="#FFF" opacity=".6"/>
-    <path fill="#0D2F66" d="M11,10.4998373 L11,4.68325532 C11,4.35007036 10.8072506,4 10.2264922,4 C9.7875029,4 9.61094557,4.18339412 9.41770119,4.55038337 L7.51774765,8.30031397 L7.50042425,8.30031397 L5.58311195,4.55038337 C5.38958474,4.18339412 5.21394661,4 4.77386135,4 C4.19356256,4 4,4.35007036 4,4.68325532 L4,10.4998373 C4,10.8174099 4.26416428,11 4.58033414,11 C4.86153901,11 5.17820382,10.8174099 5.17820382,10.4998373 L5.17820382,6.1666906 L5.19605754,6.1666906 L6.93720139,9.53341661 C7.06033899,9.76683035 7.21897191,9.90070739 7.50042425,9.90070739 C7.78138163,9.90070739 7.94001455,9.76683035 8.06336428,9.53341661 L9.8042253,6.1666906 L9.82211436,6.1666906 L9.82211436,10.4998373 C9.82211436,10.8174099 10.1382489,11 10.4197366,11 C10.7368963,11 11,10.8174099 11,10.4998373 L11,10.4998373 Z"/>
+  <g fill="none">
+    <circle cx="7.5" cy="7.5" r="7.5" fill="#FFF" opacity=".4"/>
+    <circle cx="7.5" cy="7.5" r="6.5" fill="#0A234D"/>
+    <circle cx="7.5" cy="7.5" r="5.5" fill="#A3A3A3"/>
+    <path fill="#0A234D" d="M11,10.4998373 L11,4.68325532 C11,4.35007036 10.8072506,4 10.2264922,4 C9.7875029,4 9.61094557,4.18339412 9.41770119,4.55038337 L7.51774765,8.30031397 L7.50042425,8.30031397 L5.58311195,4.55038337 C5.38958474,4.18339412 5.21394661,4 4.77386135,4 C4.19356256,4 4,4.35007036 4,4.68325532 L4,10.4998373 C4,10.8174099 4.26416428,11 4.58033414,11 C4.86153901,11 5.17820382,10.8174099 5.17820382,10.4998373 L5.17820382,6.1666906 L5.19605754,6.1666906 L6.93720139,9.53341661 C7.06033899,9.76683035 7.21897191,9.90070739 7.50042425,9.90070739 C7.78138163,9.90070739 7.94001455,9.76683035 8.06336428,9.53341661 L9.8042253,6.1666906 L9.82211436,6.1666906 L9.82211436,10.4998373 C9.82211436,10.8174099 10.1382489,11 10.4197366,11 C10.7368963,11 11,10.8174099 11,10.4998373 Z"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-perugia-l copy.svg b/data/styles/clear/style-night/symbols/subway-perugia-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-perugia-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-perugia-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-perugia-m copy.svg b/data/styles/clear/style-night/symbols/subway-perugia-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-perugia-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-perugia-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-perugia-s copy.svg b/data/styles/clear/style-night/symbols/subway-perugia-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-perugia-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-perugia-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-philadelphia-l copy.svg b/data/styles/clear/style-night/symbols/subway-philadelphia-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-philadelphia-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-philadelphia-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-philadelphia-m copy.svg b/data/styles/clear/style-night/symbols/subway-philadelphia-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-philadelphia-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-philadelphia-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-philadelphia-s copy.svg b/data/styles/clear/style-night/symbols/subway-philadelphia-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-philadelphia-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-philadelphia-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-pittsburgh-l copy.svg b/data/styles/clear/style-night/symbols/subway-pittsburgh-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-pittsburgh-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-pittsburgh-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-pittsburgh-m copy.svg b/data/styles/clear/style-night/symbols/subway-pittsburgh-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-pittsburgh-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-pittsburgh-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-pittsburgh-s copy.svg b/data/styles/clear/style-night/symbols/subway-pittsburgh-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-pittsburgh-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-pittsburgh-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-porto-l copy.svg b/data/styles/clear/style-night/symbols/subway-porto-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-porto-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-porto-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-porto-m copy.svg b/data/styles/clear/style-night/symbols/subway-porto-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-porto-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-porto-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-porto-s copy.svg b/data/styles/clear/style-night/symbols/subway-porto-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-porto-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-porto-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-pyongyang-l copy.svg b/data/styles/clear/style-night/symbols/subway-pyongyang-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-pyongyang-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-pyongyang-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-pyongyang-m copy.svg b/data/styles/clear/style-night/symbols/subway-pyongyang-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-pyongyang-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-pyongyang-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-pyongyang-s copy.svg b/data/styles/clear/style-night/symbols/subway-pyongyang-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-pyongyang-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-pyongyang-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-rennes-l copy.svg b/data/styles/clear/style-night/symbols/subway-rennes-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-rennes-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-rennes-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-rennes-m copy.svg b/data/styles/clear/style-night/symbols/subway-rennes-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-rennes-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-rennes-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-rennes-s copy.svg b/data/styles/clear/style-night/symbols/subway-rennes-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-rennes-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-rennes-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-reseau-paris-l copy.svg b/data/styles/clear/style-night/symbols/subway-reseau-paris-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-reseau-paris-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-reseau-paris-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-reseau-paris-m copy.svg b/data/styles/clear/style-night/symbols/subway-reseau-paris-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-reseau-paris-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-reseau-paris-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-reseau-paris-s copy.svg b/data/styles/clear/style-night/symbols/subway-reseau-paris-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-reseau-paris-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-reseau-paris-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-riodejaneiro-l copy.svg b/data/styles/clear/style-night/symbols/subway-riodejaneiro-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-riodejaneiro-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-riodejaneiro-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-riodejaneiro-m copy.svg b/data/styles/clear/style-night/symbols/subway-riodejaneiro-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-riodejaneiro-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-riodejaneiro-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-riodejaneiro-s copy.svg b/data/styles/clear/style-night/symbols/subway-riodejaneiro-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-riodejaneiro-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-riodejaneiro-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-rome-l copy.svg b/data/styles/clear/style-night/symbols/subway-rome-l copy.svg
deleted file mode 100644
index 58cc88f379..0000000000
--- a/data/styles/clear/style-night/symbols/subway-rome-l copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="21" height="21" viewBox="0 0 21 21">
-  <g fill="none">
-    <rect width="21" height="21" fill="#FFF" opacity=".4"/>
-    <rect width="19" height="19" x="1" y="1" fill="#99111C"/>
-    <polyline fill="#FFF" points="5.958 6 8.807 6 10.492 12.776 12.178 6 15.037 6 17 16 15.046 16 13.562 8.423 11.488 16 9.512 16 7.438 8.423 5.954 16 4 16" opacity=".6"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-rome-l.svg b/data/styles/clear/style-night/symbols/subway-rome-l.svg
index 6d12e33a32..58cc88f379 100644
--- a/data/styles/clear/style-night/symbols/subway-rome-l.svg
+++ b/data/styles/clear/style-night/symbols/subway-rome-l.svg
@@ -1,7 +1,7 @@
 <svg width="21" height="21" viewBox="0 0 21 21">
-  <g fill="none" fill-rule="evenodd">
-    <rect width="21" height="21" fill="#FFF" opacity=".6"/>
-    <rect width="19" height="19" x="1" y="1" fill="#B32C2C"/>
+  <g fill="none">
+    <rect width="21" height="21" fill="#FFF" opacity=".4"/>
+    <rect width="19" height="19" x="1" y="1" fill="#99111C"/>
     <polyline fill="#FFF" points="5.958 6 8.807 6 10.492 12.776 12.178 6 15.037 6 17 16 15.046 16 13.562 8.423 11.488 16 9.512 16 7.438 8.423 5.954 16 4 16" opacity=".6"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-rome-m copy.svg b/data/styles/clear/style-night/symbols/subway-rome-m copy.svg
deleted file mode 100644
index ed6df94c52..0000000000
--- a/data/styles/clear/style-night/symbols/subway-rome-m copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="19" height="19" viewBox="0 0 19 19">
-  <g fill="none">
-    <rect width="19" height="19" fill="#FFF" opacity=".4"/>
-    <rect width="17" height="17" x="1" y="1" fill="#99111C"/>
-    <polyline fill="#FFF" points="5.657 6 8.068 6 9.494 11.759 10.92 6 13.339 6 15 14.5 13.347 14.5 12.091 8.059 10.336 14.5 8.664 14.5 6.909 8.059 5.653 14.5 4 14.5" opacity=".6"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-rome-m.svg b/data/styles/clear/style-night/symbols/subway-rome-m.svg
index b90e5b713a..ed6df94c52 100644
--- a/data/styles/clear/style-night/symbols/subway-rome-m.svg
+++ b/data/styles/clear/style-night/symbols/subway-rome-m.svg
@@ -1,7 +1,7 @@
 <svg width="19" height="19" viewBox="0 0 19 19">
-  <g fill="none" fill-rule="evenodd">
-    <rect width="19" height="19" fill="#FFF" opacity=".6"/>
-    <rect width="17" height="17" x="1" y="1" fill="#B32C2C"/>
+  <g fill="none">
+    <rect width="19" height="19" fill="#FFF" opacity=".4"/>
+    <rect width="17" height="17" x="1" y="1" fill="#99111C"/>
     <polyline fill="#FFF" points="5.657 6 8.068 6 9.494 11.759 10.92 6 13.339 6 15 14.5 13.347 14.5 12.091 8.059 10.336 14.5 8.664 14.5 6.909 8.059 5.653 14.5 4 14.5" opacity=".6"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-rome-s copy.svg b/data/styles/clear/style-night/symbols/subway-rome-s copy.svg
deleted file mode 100644
index f85d24875f..0000000000
--- a/data/styles/clear/style-night/symbols/subway-rome-s copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="13" height="13" viewBox="0 0 13 13">
-  <g fill="none">
-    <rect width="13" height="13" fill="#FFF" opacity=".4"/>
-    <rect width="11" height="11" x="1" y="1" fill="#99111C"/>
-    <polyline fill="#FFF" points="4.054 4 5.588 4 6.496 7.665 7.403 4 8.943 4 10 9.409 8.948 9.409 8.149 5.311 7.032 9.409 5.968 9.409 4.851 5.311 4.052 9.409 3 9.409" opacity=".6"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-rome-s.svg b/data/styles/clear/style-night/symbols/subway-rome-s.svg
index c31d4fd1de..f85d24875f 100644
--- a/data/styles/clear/style-night/symbols/subway-rome-s.svg
+++ b/data/styles/clear/style-night/symbols/subway-rome-s.svg
@@ -1,7 +1,7 @@
 <svg width="13" height="13" viewBox="0 0 13 13">
-  <g fill="none" fill-rule="evenodd">
-    <rect width="13" height="13" fill="#FFF" opacity=".6"/>
-    <rect width="11" height="11" x="1" y="1" fill="#B32C2C"/>
+  <g fill="none">
+    <rect width="13" height="13" fill="#FFF" opacity=".4"/>
+    <rect width="11" height="11" x="1" y="1" fill="#99111C"/>
     <polyline fill="#FFF" points="4.054 4 5.588 4 6.496 7.665 7.403 4 8.943 4 10 9.409 8.948 9.409 8.149 5.311 7.032 9.409 5.968 9.409 4.851 5.311 4.052 9.409 3 9.409" opacity=".6"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-rotterdam-l copy.svg b/data/styles/clear/style-night/symbols/subway-rotterdam-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-rotterdam-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-rotterdam-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-rotterdam-m copy.svg b/data/styles/clear/style-night/symbols/subway-rotterdam-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-rotterdam-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-rotterdam-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-rotterdam-s copy.svg b/data/styles/clear/style-night/symbols/subway-rotterdam-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-rotterdam-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-rotterdam-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-samara-l copy.svg b/data/styles/clear/style-night/symbols/subway-samara-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-samara-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-samara-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-samara-m copy.svg b/data/styles/clear/style-night/symbols/subway-samara-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-samara-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-samara-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-samara-s copy.svg b/data/styles/clear/style-night/symbols/subway-samara-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-samara-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-samara-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sanfrancisco-l copy.svg b/data/styles/clear/style-night/symbols/subway-sanfrancisco-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sanfrancisco-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-sanfrancisco-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sanfrancisco-m copy.svg b/data/styles/clear/style-night/symbols/subway-sanfrancisco-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sanfrancisco-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-sanfrancisco-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sanfrancisco-s copy.svg b/data/styles/clear/style-night/symbols/subway-sanfrancisco-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sanfrancisco-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-sanfrancisco-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-santiago-l copy.svg b/data/styles/clear/style-night/symbols/subway-santiago-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-santiago-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-santiago-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-santiago-m copy.svg b/data/styles/clear/style-night/symbols/subway-santiago-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-santiago-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-santiago-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-santiago-s copy.svg b/data/styles/clear/style-night/symbols/subway-santiago-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-santiago-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-santiago-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-santodomingo-l copy.svg b/data/styles/clear/style-night/symbols/subway-santodomingo-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-santodomingo-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-santodomingo-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-santodomingo-m copy.svg b/data/styles/clear/style-night/symbols/subway-santodomingo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-santodomingo-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-santodomingo-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-santodomingo-s copy.svg b/data/styles/clear/style-night/symbols/subway-santodomingo-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-santodomingo-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-santodomingo-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-saopaulo-l copy.svg b/data/styles/clear/style-night/symbols/subway-saopaulo-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-saopaulo-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-saopaulo-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-saopaulo-m copy.svg b/data/styles/clear/style-night/symbols/subway-saopaulo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-saopaulo-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-saopaulo-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-saopaulo-s copy.svg b/data/styles/clear/style-night/symbols/subway-saopaulo-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-saopaulo-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-saopaulo-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sapporo-l copy.svg b/data/styles/clear/style-night/symbols/subway-sapporo-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sapporo-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-sapporo-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sapporo-m copy.svg b/data/styles/clear/style-night/symbols/subway-sapporo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sapporo-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-sapporo-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sapporo-s copy.svg b/data/styles/clear/style-night/symbols/subway-sapporo-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sapporo-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-sapporo-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-seattle-l copy.svg b/data/styles/clear/style-night/symbols/subway-seattle-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-seattle-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-seattle-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-seattle-m copy.svg b/data/styles/clear/style-night/symbols/subway-seattle-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-seattle-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-seattle-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-seattle-s copy.svg b/data/styles/clear/style-night/symbols/subway-seattle-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-seattle-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-seattle-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sendai-l copy.svg b/data/styles/clear/style-night/symbols/subway-sendai-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sendai-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-sendai-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sendai-m copy.svg b/data/styles/clear/style-night/symbols/subway-sendai-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sendai-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-sendai-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sendai-s copy.svg b/data/styles/clear/style-night/symbols/subway-sendai-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sendai-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-sendai-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-shanghai-l copy.svg b/data/styles/clear/style-night/symbols/subway-shanghai-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-shanghai-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-shanghai-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-shanghai-m copy.svg b/data/styles/clear/style-night/symbols/subway-shanghai-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-shanghai-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-shanghai-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-shanghai-s copy.svg b/data/styles/clear/style-night/symbols/subway-shanghai-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-shanghai-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-shanghai-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-shiraz-l copy.svg b/data/styles/clear/style-night/symbols/subway-shiraz-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-shiraz-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-shiraz-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-shiraz-m copy.svg b/data/styles/clear/style-night/symbols/subway-shiraz-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-shiraz-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-shiraz-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-shiraz-s copy.svg b/data/styles/clear/style-night/symbols/subway-shiraz-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-shiraz-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-shiraz-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sofia-l copy.svg b/data/styles/clear/style-night/symbols/subway-sofia-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sofia-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-sofia-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sofia-m copy.svg b/data/styles/clear/style-night/symbols/subway-sofia-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sofia-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-sofia-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-sofia-s copy.svg b/data/styles/clear/style-night/symbols/subway-sofia-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-sofia-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-sofia-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-southkorea-l copy.svg b/data/styles/clear/style-night/symbols/subway-southkorea-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-southkorea-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-southkorea-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-southkorea-m copy.svg b/data/styles/clear/style-night/symbols/subway-southkorea-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-southkorea-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-southkorea-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-southkorea-s copy.svg b/data/styles/clear/style-night/symbols/subway-southkorea-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-southkorea-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-southkorea-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-spb-l copy.svg b/data/styles/clear/style-night/symbols/subway-spb-l copy.svg
deleted file mode 100644
index 19ad85d4b8..0000000000
--- a/data/styles/clear/style-night/symbols/subway-spb-l copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="27" height="27" viewBox="0 0 27 27">
-  <g fill="none">
-    <circle cx="13.5" cy="13.5" r="13.5" fill="#FFF" opacity=".4"/>
-    <circle cx="13.5" cy="13.5" r="12.5" fill="#162833"/>
-    <path fill="#FFF" d="M16.1784037,4 L13.5104998,14.539264 L10.9925935,4 C10.9925935,4 8.20360239,4.48781067 6.37468714,6.12869812 C4.42582609,7.87299063 2.74683748,10.5486682 3.03166051,14.7912518 C3.2565413,18.1468776 5.77505919,20.9999406 5.77505919,20.9999406 L11.172207,20.9851386 C11.172207,20.9851386 6.98966185,18.7973322 5.98525428,15.3529834 C4.7859478,11.2877852 6.02984607,9.1830264 7.46900331,7.83782162 C8.05367098,7.33519939 8.90815085,7.21692229 9.22294501,8.29607813 C10.3023153,11.7404269 13.4954793,20.8816635 13.4954793,20.8816635 C13.5104998,20.8817134 16.4787035,11.5342267 17.5730244,8.08987799 C17.9028402,7.01072215 18.7573298,7.1290088 19.3269758,7.63162148 C20.7661331,8.9768358 22.4300303,11.2877852 21.2307141,15.3530333 C20.2263173,18.797382 16.0437722,20.9851884 16.0437722,20.9851884 L21.23092,21 C21.23092,21 23.7644487,18.1321849 23.9743186,14.7913017 C24.2291705,10.5486682 22.5501217,7.87299063 20.5863003,6.12869812 C18.7573948,4.50256282 16.1784037,4 16.1784037,4 Z" opacity=".6"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-spb-l.svg b/data/styles/clear/style-night/symbols/subway-spb-l.svg
index 57ebe2cd57..19ad85d4b8 100644
--- a/data/styles/clear/style-night/symbols/subway-spb-l.svg
+++ b/data/styles/clear/style-night/symbols/subway-spb-l.svg
@@ -1,7 +1,7 @@
 <svg width="27" height="27" viewBox="0 0 27 27">
-  <g fill="none" fill-rule="evenodd">
-    <circle cx="13.5" cy="13.5" r="13.5" fill="#FFF" opacity=".6"/>
-    <circle cx="13.5" cy="13.5" r="12.5" fill="#37627D"/>
-    <path fill="#FFF" d="M16.1784037,4 L13.5104998,14.539264 L10.9925935,4 C10.9925935,4 8.20360238,4.48781067 6.37468714,6.12869812 C4.42582609,7.87299063 2.74683748,10.5486682 3.03166051,14.7912518 C3.2565413,18.1468776 5.77505919,20.9999406 5.77505919,20.9999406 L11.172207,20.9851386 C11.172207,20.9851386 6.98966184,18.7973322 5.98525428,15.3529834 C4.7859478,11.2877852 6.02984607,9.1830264 7.4690033,7.83782162 C8.05367097,7.33519939 8.90815084,7.21692229 9.222945,8.29607813 C10.3023153,11.7404269 13.4954793,20.8816635 13.4954793,20.8816635 C13.5104998,20.8817134 16.4787035,11.5342267 17.5730244,8.08987799 C17.9028402,7.01072215 18.7573298,7.1290088 19.3269758,7.63162148 C20.7661331,8.9768358 22.4300303,11.2877852 21.2307141,15.3530333 C20.2263173,18.797382 16.0437722,20.9851884 16.0437722,20.9851884 L21.23092,21 C21.23092,21 23.7644487,18.1321849 23.9743186,14.7913017 C24.2291705,10.5486682 22.5501217,7.87299063 20.5863003,6.12869812 C18.7573948,4.50256282 16.1784037,4 16.1784037,4 Z" opacity=".6"/>
+  <g fill="none">
+    <circle cx="13.5" cy="13.5" r="13.5" fill="#FFF" opacity=".4"/>
+    <circle cx="13.5" cy="13.5" r="12.5" fill="#162833"/>
+    <path fill="#FFF" d="M16.1784037,4 L13.5104998,14.539264 L10.9925935,4 C10.9925935,4 8.20360239,4.48781067 6.37468714,6.12869812 C4.42582609,7.87299063 2.74683748,10.5486682 3.03166051,14.7912518 C3.2565413,18.1468776 5.77505919,20.9999406 5.77505919,20.9999406 L11.172207,20.9851386 C11.172207,20.9851386 6.98966185,18.7973322 5.98525428,15.3529834 C4.7859478,11.2877852 6.02984607,9.1830264 7.46900331,7.83782162 C8.05367098,7.33519939 8.90815085,7.21692229 9.22294501,8.29607813 C10.3023153,11.7404269 13.4954793,20.8816635 13.4954793,20.8816635 C13.5104998,20.8817134 16.4787035,11.5342267 17.5730244,8.08987799 C17.9028402,7.01072215 18.7573298,7.1290088 19.3269758,7.63162148 C20.7661331,8.9768358 22.4300303,11.2877852 21.2307141,15.3530333 C20.2263173,18.797382 16.0437722,20.9851884 16.0437722,20.9851884 L21.23092,21 C21.23092,21 23.7644487,18.1321849 23.9743186,14.7913017 C24.2291705,10.5486682 22.5501217,7.87299063 20.5863003,6.12869812 C18.7573948,4.50256282 16.1784037,4 16.1784037,4 Z" opacity=".6"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-spb-m copy.svg b/data/styles/clear/style-night/symbols/subway-spb-m copy.svg
deleted file mode 100644
index 7d322f13ef..0000000000
--- a/data/styles/clear/style-night/symbols/subway-spb-m copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="23" height="23" viewBox="0 0 23 23">
-  <g fill="none">
-    <path fill="#FFF" d="M11.5,23 C17.8512746,23 23,17.8512746 23,11.5 C23,5.14872538 17.8512746,0 11.5,0 C5.14872538,0 0,5.14872538 0,11.5 C0,17.8512746 5.14872538,23 11.5,23 Z" opacity=".4"/>
-    <path fill="#162833" d="M11.5,22 C17.2989899,22 22,17.2989899 22,11.5 C22,5.70101013 17.2989899,1 11.5,1 C5.70101013,1 1,5.70101013 1,11.5 C1,17.2989899 5.70101013,22 11.5,22 Z"/>
-    <path fill="#FFF" d="M13.6682315,4 L11.5084999,12.6793939 L9.47019475,4 C9.47019475,4 7.21244002,4.40172644 5.73188959,5.75304551 C4.15424017,7.18952169 2.79505891,9.39302087 3.02562994,12.8869133 C3.20767629,15.6503698 5.24647648,17.9999511 5.24647648,17.9999511 L9.61559614,17.9877612 C9.61559614,17.9877612 6.22972625,16.1860382 5.41663441,13.3495158 C4.44576727,10.0017055 5.45273253,7.93896291 6.61776458,6.83114721 C7.09106698,6.41722302 7.78278878,6.31981836 8.03762215,7.20853493 C8.91139815,10.0450574 11.4963404,17.9025464 11.4963404,17.9025464 C11.5084999,17.9025875 13.9113314,9.95759848 14.7972103,7.12107599 C15.064204,6.23235942 15.7559336,6.32977195 16.2170757,6.74368827 C17.3821077,7.85151184 18.7290721,10.0017055 17.7581971,13.3495568 C16.945114,16.1860793 13.5592441,17.9878022 13.5592441,17.9878022 L17.7583638,18 C17.7583638,18 19.8093156,15.6382699 19.9792103,12.8869543 C20.185519,9.39302087 18.826289,7.18952169 17.2365289,5.75304551 C15.7559863,4.41387526 13.6682315,4 13.6682315,4 Z" opacity=".6"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-spb-m.svg b/data/styles/clear/style-night/symbols/subway-spb-m.svg
index 145ef93121..7d322f13ef 100644
--- a/data/styles/clear/style-night/symbols/subway-spb-m.svg
+++ b/data/styles/clear/style-night/symbols/subway-spb-m.svg
@@ -1,7 +1,7 @@
 <svg width="23" height="23" viewBox="0 0 23 23">
-  <g fill="none" fill-rule="evenodd">
-    <path fill="#FFF" d="M11.5,23 C17.8512746,23 23,17.8512746 23,11.5 C23,5.14872538 17.8512746,0 11.5,0 C5.14872538,0 0,5.14872538 0,11.5 C0,17.8512746 5.14872538,23 11.5,23 Z" opacity=".6"/>
-    <path fill="#37627D" d="M11.5,22 C17.2989899,22 22,17.2989899 22,11.5 C22,5.70101013 17.2989899,1 11.5,1 C5.70101013,1 1,5.70101013 1,11.5 C1,17.2989899 5.70101013,22 11.5,22 Z"/>
-    <path fill="#FFF" d="M13.6682315,4 L11.5084999,12.6793939 L9.47019474,4 C9.47019474,4 7.21244002,4.40172644 5.73188959,5.75304551 C4.15424017,7.18952169 2.79505891,9.39302087 3.02562994,12.8869133 C3.20767629,15.6503698 5.24647648,17.9999511 5.24647648,17.9999511 L9.61559613,17.9877612 C9.61559613,17.9877612 6.22972625,16.1860382 5.41663441,13.3495158 C4.44576727,10.0017055 5.45273253,7.93896291 6.61776458,6.83114721 C7.09106698,6.41722302 7.78278878,6.31981836 8.03762215,7.20853493 C8.91139814,10.0450574 11.4963404,17.9025464 11.4963404,17.9025464 C11.5084999,17.9025875 13.9113314,9.95759848 14.7972103,7.12107599 C15.064204,6.23235942 15.7559336,6.32977195 16.2170757,6.74368827 C17.3821077,7.85151184 18.7290721,10.0017055 17.7581971,13.3495568 C16.945114,16.1860793 13.5592441,17.9878022 13.5592441,17.9878022 L17.7583638,18 C17.7583638,18 19.8093156,15.6382699 19.9792103,12.8869543 C20.185519,9.39302087 18.826289,7.18952169 17.2365289,5.75304551 C15.7559863,4.41387526 13.6682315,4 13.6682315,4 Z" opacity=".6"/>
+  <g fill="none">
+    <path fill="#FFF" d="M11.5,23 C17.8512746,23 23,17.8512746 23,11.5 C23,5.14872538 17.8512746,0 11.5,0 C5.14872538,0 0,5.14872538 0,11.5 C0,17.8512746 5.14872538,23 11.5,23 Z" opacity=".4"/>
+    <path fill="#162833" d="M11.5,22 C17.2989899,22 22,17.2989899 22,11.5 C22,5.70101013 17.2989899,1 11.5,1 C5.70101013,1 1,5.70101013 1,11.5 C1,17.2989899 5.70101013,22 11.5,22 Z"/>
+    <path fill="#FFF" d="M13.6682315,4 L11.5084999,12.6793939 L9.47019475,4 C9.47019475,4 7.21244002,4.40172644 5.73188959,5.75304551 C4.15424017,7.18952169 2.79505891,9.39302087 3.02562994,12.8869133 C3.20767629,15.6503698 5.24647648,17.9999511 5.24647648,17.9999511 L9.61559614,17.9877612 C9.61559614,17.9877612 6.22972625,16.1860382 5.41663441,13.3495158 C4.44576727,10.0017055 5.45273253,7.93896291 6.61776458,6.83114721 C7.09106698,6.41722302 7.78278878,6.31981836 8.03762215,7.20853493 C8.91139815,10.0450574 11.4963404,17.9025464 11.4963404,17.9025464 C11.5084999,17.9025875 13.9113314,9.95759848 14.7972103,7.12107599 C15.064204,6.23235942 15.7559336,6.32977195 16.2170757,6.74368827 C17.3821077,7.85151184 18.7290721,10.0017055 17.7581971,13.3495568 C16.945114,16.1860793 13.5592441,17.9878022 13.5592441,17.9878022 L17.7583638,18 C17.7583638,18 19.8093156,15.6382699 19.9792103,12.8869543 C20.185519,9.39302087 18.826289,7.18952169 17.2365289,5.75304551 C15.7559863,4.41387526 13.6682315,4 13.6682315,4 Z" opacity=".6"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-spb-s copy.svg b/data/styles/clear/style-night/symbols/subway-spb-s copy.svg
deleted file mode 100644
index d758c0713a..0000000000
--- a/data/styles/clear/style-night/symbols/subway-spb-s copy.svg	
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg width="17" height="17" viewBox="0 0 17 17">
-  <g fill="none">
-    <circle cx="8.5" cy="8.5" r="8.5" fill="#FFF" opacity=".4"/>
-    <circle cx="8.5" cy="8.5" r="7.5" fill="#162833"/>
-    <path fill="#FFF" d="M9.90297335,4 L8.50549991,8.706565 L7.1865966,4 C7.1865966,4 5.72569648,4.25950031 4.76769327,5.13240207 C3.74686128,6.06031215 2.86739106,7.4836905 3.01658408,9.74061478 C3.13437878,11.5257047 4.6222691,13.0434467 4.6222691,13.0434467 L7.28067985,13.0355724 C7.28067985,13.0355724 5.28982287,11.8717266 4.76370462,10.0394387 C4.13549647,7.87687807 4.7557289,7.20442326 5.50957316,6.4888156 C5.81582766,6.221436 6.26341235,6.15851621 6.42830453,6.732594 C6.99368899,8.56488182 8.49763202,12.9805269 8.49763202,12.9805269 C8.50549991,12.9805534 9.97593993,8.59505327 10.5491557,6.76276545 C10.7219163,6.18868767 11.1695061,6.25161253 11.4678921,6.51898705 C12.2217364,7.23459979 12.9776349,7.87687807 12.3494217,10.0394653 C11.8233091,11.8717531 9.83245208,13.035599 9.83245208,13.035599 L12.3808628,13.0434783 C12.3808628,13.0434783 13.876616,11.5178886 13.9865479,9.7406413 C14.1200417,7.4836905 13.2405399,6.06031215 12.2118716,5.13240207 C11.2538735,4.267348 9.90297335,4 9.90297335,4 Z" opacity=".6"/>
-  </g>
-</svg>
diff --git a/data/styles/clear/style-night/symbols/subway-spb-s.svg b/data/styles/clear/style-night/symbols/subway-spb-s.svg
index fd3d50ee5f..d758c0713a 100644
--- a/data/styles/clear/style-night/symbols/subway-spb-s.svg
+++ b/data/styles/clear/style-night/symbols/subway-spb-s.svg
@@ -1,7 +1,7 @@
 <svg width="17" height="17" viewBox="0 0 17 17">
-  <g fill="none" fill-rule="evenodd">
-    <circle cx="8.5" cy="8.5" r="8.5" fill="#FFF" opacity=".6"/>
-    <circle cx="8.5" cy="8.5" r="7.5" fill="#37627D"/>
+  <g fill="none">
+    <circle cx="8.5" cy="8.5" r="8.5" fill="#FFF" opacity=".4"/>
+    <circle cx="8.5" cy="8.5" r="7.5" fill="#162833"/>
     <path fill="#FFF" d="M9.90297335,4 L8.50549991,8.706565 L7.1865966,4 C7.1865966,4 5.72569648,4.25950031 4.76769327,5.13240207 C3.74686128,6.06031215 2.86739106,7.4836905 3.01658408,9.74061478 C3.13437878,11.5257047 4.6222691,13.0434467 4.6222691,13.0434467 L7.28067985,13.0355724 C7.28067985,13.0355724 5.28982287,11.8717266 4.76370462,10.0394387 C4.13549647,7.87687807 4.7557289,7.20442326 5.50957316,6.4888156 C5.81582766,6.221436 6.26341235,6.15851621 6.42830453,6.732594 C6.99368899,8.56488182 8.49763202,12.9805269 8.49763202,12.9805269 C8.50549991,12.9805534 9.97593993,8.59505327 10.5491557,6.76276545 C10.7219163,6.18868767 11.1695061,6.25161253 11.4678921,6.51898705 C12.2217364,7.23459979 12.9776349,7.87687807 12.3494217,10.0394653 C11.8233091,11.8717531 9.83245208,13.035599 9.83245208,13.035599 L12.3808628,13.0434783 C12.3808628,13.0434783 13.876616,11.5178886 13.9865479,9.7406413 C14.1200417,7.4836905 13.2405399,6.06031215 12.2118716,5.13240207 C11.2538735,4.267348 9.90297335,4 9.90297335,4 Z" opacity=".6"/>
   </g>
 </svg>
diff --git a/data/styles/clear/style-night/symbols/subway-stlouis-l copy.svg b/data/styles/clear/style-night/symbols/subway-stlouis-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-stlouis-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-stlouis-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-stlouis-m copy.svg b/data/styles/clear/style-night/symbols/subway-stlouis-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-stlouis-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-stlouis-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-stlouis-s copy.svg b/data/styles/clear/style-night/symbols/subway-stlouis-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-stlouis-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-stlouis-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-stockholm-l copy.svg b/data/styles/clear/style-night/symbols/subway-stockholm-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-stockholm-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-stockholm-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-stockholm-m copy.svg b/data/styles/clear/style-night/symbols/subway-stockholm-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-stockholm-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-stockholm-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-stockholm-s copy.svg b/data/styles/clear/style-night/symbols/subway-stockholm-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-stockholm-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-stockholm-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tabriz-l copy.svg b/data/styles/clear/style-night/symbols/subway-tabriz-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tabriz-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-tabriz-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tabriz-m copy.svg b/data/styles/clear/style-night/symbols/subway-tabriz-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tabriz-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-tabriz-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tabriz-s copy.svg b/data/styles/clear/style-night/symbols/subway-tabriz-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tabriz-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-tabriz-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-taipei-l copy.svg b/data/styles/clear/style-night/symbols/subway-taipei-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-taipei-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-taipei-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-taipei-m copy.svg b/data/styles/clear/style-night/symbols/subway-taipei-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-taipei-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-taipei-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-taipei-s copy.svg b/data/styles/clear/style-night/symbols/subway-taipei-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-taipei-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-taipei-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-taoyuan-l copy.svg b/data/styles/clear/style-night/symbols/subway-taoyuan-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-taoyuan-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-taoyuan-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-taoyuan-m copy.svg b/data/styles/clear/style-night/symbols/subway-taoyuan-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-taoyuan-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-taoyuan-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-taoyuan-s copy.svg b/data/styles/clear/style-night/symbols/subway-taoyuan-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-taoyuan-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-taoyuan-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tashkent-l copy.svg b/data/styles/clear/style-night/symbols/subway-tashkent-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tashkent-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-tashkent-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tashkent-m copy.svg b/data/styles/clear/style-night/symbols/subway-tashkent-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tashkent-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-tashkent-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tashkent-s copy.svg b/data/styles/clear/style-night/symbols/subway-tashkent-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tashkent-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-tashkent-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tbilisi-l copy.svg b/data/styles/clear/style-night/symbols/subway-tbilisi-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tbilisi-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-tbilisi-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tbilisi-m copy.svg b/data/styles/clear/style-night/symbols/subway-tbilisi-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tbilisi-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-tbilisi-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tbilisi-s copy.svg b/data/styles/clear/style-night/symbols/subway-tbilisi-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tbilisi-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-tbilisi-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tianjin-l copy.svg b/data/styles/clear/style-night/symbols/subway-tianjin-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tianjin-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-tianjin-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tianjin-m copy.svg b/data/styles/clear/style-night/symbols/subway-tianjin-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tianjin-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-tianjin-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tianjin-s copy.svg b/data/styles/clear/style-night/symbols/subway-tianjin-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tianjin-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-tianjin-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tokyo-l copy.svg b/data/styles/clear/style-night/symbols/subway-tokyo-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tokyo-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-tokyo-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tokyo-m copy.svg b/data/styles/clear/style-night/symbols/subway-tokyo-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tokyo-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-tokyo-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tokyo-s copy.svg b/data/styles/clear/style-night/symbols/subway-tokyo-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tokyo-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-tokyo-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tyneandwear-l copy.svg b/data/styles/clear/style-night/symbols/subway-tyneandwear-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tyneandwear-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-tyneandwear-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tyneandwear-m copy.svg b/data/styles/clear/style-night/symbols/subway-tyneandwear-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tyneandwear-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-tyneandwear-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-tyneandwear-s copy.svg b/data/styles/clear/style-night/symbols/subway-tyneandwear-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-tyneandwear-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-tyneandwear-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-valencia-l copy.svg b/data/styles/clear/style-night/symbols/subway-valencia-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-valencia-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-valencia-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-valencia-m copy.svg b/data/styles/clear/style-night/symbols/subway-valencia-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-valencia-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-valencia-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-valencia-s copy.svg b/data/styles/clear/style-night/symbols/subway-valencia-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-valencia-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-valencia-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-volgograd-l copy.svg b/data/styles/clear/style-night/symbols/subway-volgograd-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-volgograd-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-volgograd-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-volgograd-m copy.svg b/data/styles/clear/style-night/symbols/subway-volgograd-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-volgograd-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-volgograd-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-volgograd-s copy.svg b/data/styles/clear/style-night/symbols/subway-volgograd-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-volgograd-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-volgograd-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-warsaw-l copy.svg b/data/styles/clear/style-night/symbols/subway-warsaw-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-warsaw-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-warsaw-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-warsaw-m copy.svg b/data/styles/clear/style-night/symbols/subway-warsaw-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-warsaw-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-warsaw-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-warsaw-s copy.svg b/data/styles/clear/style-night/symbols/subway-warsaw-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-warsaw-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-warsaw-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-warszawa-l copy.svg b/data/styles/clear/style-night/symbols/subway-warszawa-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-warszawa-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-warszawa-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-warszawa-m copy.svg b/data/styles/clear/style-night/symbols/subway-warszawa-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-warszawa-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-warszawa-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-warszawa-s copy.svg b/data/styles/clear/style-night/symbols/subway-warszawa-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-warszawa-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-warszawa-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-washington-l copy.svg b/data/styles/clear/style-night/symbols/subway-washington-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-washington-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-washington-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-washington-m copy.svg b/data/styles/clear/style-night/symbols/subway-washington-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-washington-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-washington-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-washington-s copy.svg b/data/styles/clear/style-night/symbols/subway-washington-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-washington-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-washington-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-wien-l copy.svg b/data/styles/clear/style-night/symbols/subway-wien-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-wien-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-wien-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-wien-m copy.svg b/data/styles/clear/style-night/symbols/subway-wien-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-wien-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-wien-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-wien-s copy.svg b/data/styles/clear/style-night/symbols/subway-wien-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-wien-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-wien-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-wuhan-l copy.svg b/data/styles/clear/style-night/symbols/subway-wuhan-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-wuhan-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-wuhan-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-wuhan-m copy.svg b/data/styles/clear/style-night/symbols/subway-wuhan-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-wuhan-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-wuhan-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-wuhan-s copy.svg b/data/styles/clear/style-night/symbols/subway-wuhan-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-wuhan-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-wuhan-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-yerevan-l copy.svg b/data/styles/clear/style-night/symbols/subway-yerevan-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-yerevan-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-yerevan-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-yerevan-m copy.svg b/data/styles/clear/style-night/symbols/subway-yerevan-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-yerevan-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-yerevan-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-yerevan-s copy.svg b/data/styles/clear/style-night/symbols/subway-yerevan-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-yerevan-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-yerevan-s.svg
diff --git a/data/styles/clear/style-night/symbols/subway-yokohama-l copy.svg b/data/styles/clear/style-night/symbols/subway-yokohama-l.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-yokohama-l copy.svg
rename to data/styles/clear/style-night/symbols/subway-yokohama-l.svg
diff --git a/data/styles/clear/style-night/symbols/subway-yokohama-m copy.svg b/data/styles/clear/style-night/symbols/subway-yokohama-m.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-yokohama-m copy.svg
rename to data/styles/clear/style-night/symbols/subway-yokohama-m.svg
diff --git a/data/styles/clear/style-night/symbols/subway-yokohama-s copy.svg b/data/styles/clear/style-night/symbols/subway-yokohama-s.svg
similarity index 100%
rename from data/styles/clear/style-night/symbols/subway-yokohama-s copy.svg
rename to data/styles/clear/style-night/symbols/subway-yokohama-s.svg