From 496707ab19f85775ac7ea0afc0f6c047e2a12047 Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Mon, 3 Oct 2016 19:05:39 +0300
Subject: [PATCH] [styles] Remove the rest of the olympics stuff

---
 data/styles/clear/include/transport.mapcss    | 229 ------------------
 .../style-clear/symbols/olympic-airport-l.svg |  32 ---
 .../style-clear/symbols/olympic-airport-m.svg |  28 ---
 .../style-clear/symbols/olympic-airport-s.svg |  28 ---
 .../style-clear/symbols/olympic-bus-l.svg     |  28 ---
 .../style-clear/symbols/olympic-bus-m.svg     |  28 ---
 .../style-clear/symbols/olympic-bus-s.svg     |  28 ---
 .../symbols/olympic-cable-car-l.svg           |  28 ---
 .../symbols/olympic-cable-car-m.svg           |  28 ---
 .../symbols/olympic-cable-car-s.svg           |  28 ---
 .../style-clear/symbols/olympic-center-l.svg  |  28 ---
 .../style-clear/symbols/olympic-center-m.svg  |  28 ---
 .../style-clear/symbols/olympic-center-s.svg  |  28 ---
 .../style-clear/symbols/olympic-cycle-l.svg   |  28 ---
 .../style-clear/symbols/olympic-cycle-m.svg   |  28 ---
 .../style-clear/symbols/olympic-cycle-s.svg   |  28 ---
 .../symbols/olympic-funicular-l.svg           |  28 ---
 .../symbols/olympic-funicular-m.svg           |  28 ---
 .../symbols/olympic-funicular-s.svg           |  28 ---
 .../style-clear/symbols/olympic-ship-l.svg    |  28 ---
 .../style-clear/symbols/olympic-ship-m.svg    |  28 ---
 .../style-clear/symbols/olympic-ship-s.svg    |  28 ---
 .../style-clear/symbols/olympic-stadium-l.svg |  28 ---
 .../style-clear/symbols/olympic-stadium-m.svg |  28 ---
 .../symbols/olympic-stadium-main-l.svg        |  28 ---
 .../symbols/olympic-stadium-main-m.svg        |  28 ---
 .../symbols/olympic-stadium-main-s.svg        |  28 ---
 .../style-clear/symbols/olympic-stadium-s.svg |  28 ---
 .../style-clear/symbols/olympic-subway-l.svg  |  30 ---
 .../style-clear/symbols/olympic-subway-m.svg  |  28 ---
 .../style-clear/symbols/olympic-subway-s.svg  |  30 ---
 .../style-clear/symbols/olympic-subway-xs.svg |  29 ---
 .../style-clear/symbols/olympic-tourism-l.svg |  28 ---
 .../style-clear/symbols/olympic-tourism-m.svg |  28 ---
 .../style-clear/symbols/olympic-tourism-s.svg |  28 ---
 .../style-clear/symbols/olympic-train-l.svg   |  29 ---
 .../style-clear/symbols/olympic-train-m.svg   |  28 ---
 .../style-clear/symbols/olympic-train-s.svg   |  28 ---
 .../style-clear/symbols/olympic-train-xs.svg  |  28 ---
 .../style-clear/symbols/olympic-tram-l.svg    |  30 ---
 .../style-clear/symbols/olympic-tram-m.svg    |  28 ---
 .../style-clear/symbols/olympic-tram-s.svg    |  30 ---
 .../style-clear/symbols/olympic-view-l.svg    |  34 ---
 .../style-clear/symbols/olympic-view-m.svg    |  34 ---
 .../style-clear/symbols/olympic-view-s.svg    |  34 ---
 .../style-clear/symbols/olympic-water-l.svg   |  28 ---
 .../style-clear/symbols/olympic-water-m.svg   |  28 ---
 .../style-clear/symbols/olympic-water-s.svg   |  28 ---
 .../style-night/symbols/olympic-airport-l.svg |  32 ---
 .../style-night/symbols/olympic-airport-m.svg |  28 ---
 .../style-night/symbols/olympic-airport-s.svg |  28 ---
 .../style-night/symbols/olympic-bus-l.svg     |  28 ---
 .../style-night/symbols/olympic-bus-m.svg     |  28 ---
 .../style-night/symbols/olympic-bus-s.svg     |  28 ---
 .../symbols/olympic-cable-car-l.svg           |  28 ---
 .../symbols/olympic-cable-car-m.svg           |  28 ---
 .../symbols/olympic-cable-car-s.svg           |  28 ---
 .../style-night/symbols/olympic-center-l.svg  |  28 ---
 .../style-night/symbols/olympic-center-m.svg  |  28 ---
 .../style-night/symbols/olympic-center-s.svg  |  28 ---
 .../style-night/symbols/olympic-cycle-l.svg   |  28 ---
 .../style-night/symbols/olympic-cycle-m.svg   |  28 ---
 .../style-night/symbols/olympic-cycle-s.svg   |  28 ---
 .../symbols/olympic-funicular-l.svg           |  28 ---
 .../symbols/olympic-funicular-m.svg           |  28 ---
 .../symbols/olympic-funicular-s.svg           |  28 ---
 .../style-night/symbols/olympic-ship-l.svg    |  28 ---
 .../style-night/symbols/olympic-ship-m.svg    |  28 ---
 .../style-night/symbols/olympic-ship-s.svg    |  28 ---
 .../style-night/symbols/olympic-stadium-l.svg |  28 ---
 .../style-night/symbols/olympic-stadium-m.svg |  28 ---
 .../symbols/olympic-stadium-main-l.svg        |  28 ---
 .../symbols/olympic-stadium-main-m.svg        |  28 ---
 .../symbols/olympic-stadium-main-s.svg        |  28 ---
 .../style-night/symbols/olympic-stadium-s.svg |  28 ---
 .../style-night/symbols/olympic-subway-l.svg  |  30 ---
 .../style-night/symbols/olympic-subway-m.svg  |  28 ---
 .../style-night/symbols/olympic-subway-s.svg  |  30 ---
 .../style-night/symbols/olympic-subway-xs.svg |  29 ---
 .../style-night/symbols/olympic-tourism-l.svg |  28 ---
 .../style-night/symbols/olympic-tourism-m.svg |  28 ---
 .../style-night/symbols/olympic-tourism-s.svg |  28 ---
 .../style-night/symbols/olympic-train-l.svg   |  29 ---
 .../style-night/symbols/olympic-train-m.svg   |  28 ---
 .../style-night/symbols/olympic-train-s.svg   |  28 ---
 .../style-night/symbols/olympic-train-xs.svg  |  28 ---
 .../style-night/symbols/olympic-tram-l.svg    |  30 ---
 .../style-night/symbols/olympic-tram-m.svg    |  28 ---
 .../style-night/symbols/olympic-tram-s.svg    |  30 ---
 .../style-night/symbols/olympic-view-l.svg    |  34 ---
 .../style-night/symbols/olympic-view-m.svg    |  34 ---
 .../style-night/symbols/olympic-view-s.svg    |  34 ---
 .../style-night/symbols/olympic-water-l.svg   |  28 ---
 .../style-night/symbols/olympic-water-m.svg   |  28 ---
 .../style-night/symbols/olympic-water-s.svg   |  28 ---
 95 files changed, 2925 deletions(-)
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-airport-l.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-airport-m.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-airport-s.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-bus-l.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-bus-m.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-bus-s.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-cable-car-l.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-cable-car-m.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-cable-car-s.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-center-l.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-center-m.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-center-s.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-cycle-l.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-cycle-m.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-cycle-s.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-funicular-l.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-funicular-m.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-funicular-s.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-ship-l.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-ship-m.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-ship-s.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-stadium-l.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-stadium-m.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-stadium-main-l.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-stadium-main-m.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-stadium-main-s.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-stadium-s.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-subway-l.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-subway-m.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-subway-s.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-subway-xs.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-tourism-l.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-tourism-m.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-tourism-s.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-train-l.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-train-m.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-train-s.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-train-xs.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-tram-l.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-tram-m.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-tram-s.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-view-l.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-view-m.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-view-s.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-water-l.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-water-m.svg
 delete mode 100644 data/styles/clear/style-clear/symbols/olympic-water-s.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-airport-l.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-airport-m.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-airport-s.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-bus-l.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-bus-m.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-bus-s.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-cable-car-l.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-cable-car-m.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-cable-car-s.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-center-l.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-center-m.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-center-s.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-cycle-l.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-cycle-m.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-cycle-s.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-funicular-l.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-funicular-m.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-funicular-s.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-ship-l.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-ship-m.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-ship-s.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-stadium-l.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-stadium-m.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-stadium-main-l.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-stadium-main-m.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-stadium-main-s.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-stadium-s.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-subway-l.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-subway-m.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-subway-s.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-subway-xs.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-tourism-l.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-tourism-m.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-tourism-s.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-train-l.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-train-m.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-train-s.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-train-xs.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-tram-l.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-tram-m.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-tram-s.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-view-l.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-view-m.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-view-s.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-water-l.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-water-m.svg
 delete mode 100644 data/styles/clear/style-night/symbols/olympic-water-s.svg

diff --git a/data/styles/clear/include/transport.mapcss b/data/styles/clear/include/transport.mapcss
index 05df333d15..6836da6ee2 100644
--- a/data/styles/clear/include/transport.mapcss
+++ b/data/styles/clear/include/transport.mapcss
@@ -1683,232 +1683,3 @@ node|z18-[aerialway=rope_tow], {
 
 
 node|z17-[railway=level_crossing]{ icon-image: railway-crossing.svg; z-index: 2600;}
-
-
-
-/* AIRPORTS OLYMPICS */
-
-area|z10-[olympics=transport_airport],
-node|z10-[olympics=transport_airport]
-{
-  icon-image: olympic-airport-m.svg;
-  -x-me-icon-priority: 8800;
-  text-offset: 7;
-  font-size: 11;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
-  z-index: 8000;
-}
-area|z10-[olympics=transport_airport]::int_name,
-node|z10-[olympics=transport_airport]::int_name
-{
-  font-size: 10;
-  text: int_name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
-  z-index: 8000;
-}
-
-
-
-node|z10-13[olympics=transport_railway],
-area|z10-13[olympics=transport_railway]
-{
-  icon-image: olympic-train-s.svg;
-  text-offset: 6;
-  z-index: 8000;
-  font-size: 10;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.6;
-  text-halo-color: @label_halo_light;
-}
-node|z10-13[olympics=transport_railway]::int_name,
-area|z10-13[olympics=transport_railway]::int_name
-{
-  text-offset: 6;
-  z-index: 8000;
-  font-size: 9;
-  text: int_name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.6;
-  text-halo-color: @label_halo_light;
-}
-
-node|z14-[olympics=transport_railway],
-area|z14-[olympics=transport_railway]
-{
-  icon-image: olympic-train-m.svg;
-  text-offset: 8;
-  z-index: 8000;
-  font-size: 12;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.8;
-  text-halo-color: @label_halo_light;
-}
-node|z14-[olympics=transport_railway]::int_name,
-area|z14-[olympics=transport_railway]::int_name
-{
-  text-offset: 8;
-  z-index: 8000;
-  font-size: 10;
-  text: int_name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.8;
-  text-halo-color: @label_halo_light;
-}
-
-
-
-node|z12-14[olympics=transport_cable]
-{
-  icon-image: olympic-cable-car-m.svg;
-  text-offset: 8;
-  font-size: 10;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
-  z-index: 8000;
-}
-
-
-node|z15-[olympics=transport_cable]
-{
-  icon-image: olympic-cable-car-l.svg;
-  text-offset: 8;
-  font-size: 12;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
-  z-index: 8000;
-}
-
-
-node|z13-14[olympics=transport_bus],
-area|z13-14[olympics=transport_bus]
-{
-  icon-image: olympic-bus-m.svg;
-  z-index: 8000;
-}
-node|z15-[olympics=transport_bus],
-area|z15-[olympics=transport_bus],
-{
-  icon-image: olympic-bus-l.svg;
-  z-index: 8000;
-  text-offset: 10;
-  font-size: 11;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.9;
-  text-halo-color: @label_halo_light;
-  text-position: center;
-}
-
-
-node|z10-14[olympics=transport_boat] {
-  icon-image: olympic-ship-m.svg;
-  z-index: 8000;
-}
-
-node|z15-[olympics=transport_boat] {
-  icon-image: olympic-ship-l.svg;
-  z-index: 8000;
-  text-offset: 10;
-  font-size: 12;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.9;
-  text-halo-color: @label_halo_light;
-}
-
-
-node|z13-14[olympics=transport_tram],
-area|z13-14[olympics=transport_tram]
-{
-  icon-image: olympic-tram-m.svg;
-  z-index: 8000;
-}
-
-node|z15-16[olympics=transport_tram],
-area|z15-16[olympics=transport_tram]
-{
-  icon-image: olympic-tram-l.svg;
-  z-index: 8000;
-}
-
-node|z17-[olympics=transport_tram],
-area|z17-[olympics=transport_tram]
-{
-  icon-image: olympic-tram-l.svg;
-  text-offset: 8;
-  font-size: 11;
-  z-index: 8000;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.9;
-  text-halo-color: @label_halo_light;
-}
-
-
-node|z13[olympics=transport_subway]  {
-  icon-image: olympic-subway-m.svg;
-  z-index: 8000;
-}
-
-node|z14[olympics=transport_subway]  {
-  icon-image: olympic-subway-m.svg;
-  text-offset: 7;
-  font-size: 13;
-  z-index: 8000;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.8;
-  text-halo-color: @label_halo_light;
-}
-node|z14[olympics=transport_subway]::int_name  {
-  text-offset: 7;
-  font-size: 11;
-  z-index: 8000;
-  text: int_name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.8;
-  text-halo-color: @label_halo_light;
-}
-node|z15-[olympics=transport_subway]   {
-  icon-image: olympic-subway-l.svg;
-  font-size: 13;
-  z-index: 8000;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.8;
-  text-halo-color: @label_halo_light;
-}
-node|z15-[olympics=transport_subway]::int_name  {
-  font-size: 11;
-  z-index: 8000;
-  text: int_name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.9;
-  text-halo-color: @label_halo_light;
-  }
diff --git a/data/styles/clear/style-clear/symbols/olympic-airport-l.svg b/data/styles/clear/style-clear/symbols/olympic-airport-l.svg
deleted file mode 100644
index f18a65910a..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-airport-l.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-airport-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M16.8518877,10.7659797 L16.8518877,11.2615506 L9.91287512,10.2704089 L9.91287512,14.2347776 L11.8954501,16.2172593 C11.8954501,16.7128301 11.3998064,17.208401 10.9041626,17.208401 L5.94772507,17.208401 C5.45208132,17.208401 4.95643756,16.7128301 4.95643756,16.2172593 L6.93901258,14.2347776 L6.93901258,10.2702106 L0,11.2613524 L0,10.7659797 C0,10.2704089 0.303009927,10.1337304 0.495643756,10.0226234 L6.93901258,6.3056437 L6.93901258,4.32336024 C6.93901258,3.3322185 7.43465634,0.358793307 8.42594385,0.358793307 C9.41723136,0.358793307 9.91287512,3.3322185 9.91287512,4.32336024 L9.91287512,6.3056437 L16.3562439,10.0226234 C16.6322283,10.1818008 16.8518877,10.2615877 16.8518877,10.7659797 L16.8518877,10.7659797 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-214.000000, -173.000000)">
-            <g id="airport-l" transform="translate(215.000000, 174.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="g6678" transform="translate(3.956438, 2.964567)">
-                    <g id="g14771">
-                        <g id="path7712">
-                            <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                            <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-airport-m.svg b/data/styles/clear/style-clear/symbols/olympic-airport-m.svg
deleted file mode 100644
index 9064c4994c..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-airport-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-airport-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M17.338819,11.2526923 L17.338819,12.2438341 L11.8867377,11.2526923 L11.8867377,14.2261175 L13.8693127,15.4374909 L13.8693127,16.208401 L7.92158761,16.208401 L7.92158761,15.4374909 L9.90416263,14.2261175 L9.90416263,11.2526923 L4.45208132,12.2438341 L4.45208132,11.2526923 L9.90416263,8.27926713 L9.90416263,5.30584193 C9.90416263,4.535031 10.1244465,3.32355846 10.8954501,3.32355846 C11.6664438,3.32355846 11.8867377,4.535031 11.8867377,5.30584193 L11.8867377,8.27926713 L17.338819,11.2526923 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-251.000000, -175.000000)">
-            <g id="airport-m" transform="translate(252.000000, 176.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="path7712-0">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-airport-s.svg b/data/styles/clear/style-clear/symbols/olympic-airport-s.svg
deleted file mode 100644
index 1139de8a4d..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-airport-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-airport-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M12,7.62344009 L12,8.17459045 L9,8.17459024 L9,9.62143248 L10,10.6396234 L10,11.0682745 L6,11.0682745 L6,10.6396234 L7,9.62143248 L7,8.17459024 L4,8.17459045 L4,7.62344009 L7,6.24546774 L7,4.31634503 C7,3.88769397 7.55369837,3.06827451 7.99809837,3.06827451 C8.44253837,3.06827451 9,3.88769397 9,4.31634503 L9,6.24546774 L12,7.62344009 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-284.000000, -178.000000)">
-            <g id="airport-s" transform="translate(285.000000, 179.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="path7712-0-5">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-bus-l.svg b/data/styles/clear/style-clear/symbols/olympic-bus-l.svg
deleted file mode 100644
index 24c4109448..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-bus-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-bus-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M14.0354444,20 L4.99874609,20 C4.44715386,20 4,19.5439162 4,19.0008247 L4,15.1868445 C4,14.6350152 4.39522648,13.9757597 4.87738037,13.7172421 L5,13.6514969 L5,7.99036657 C5,6.89111747 5.89821238,6 6.99079514,6 L25,6 L25,8 L24.0029293,8 C23.4378814,8 23,8.44762906 23,8.99980749 L23,12.0001925 C23,12.5562834 23.4490268,13 24.0029293,13 L25,13 L25,20 L20.9645556,20 C20.987914,19.8366985 21,19.6697607 21,19.5 C21,17.5670034 19.4329966,16 17.5,16 C15.5670034,16 14,17.5670034 14,19.5 C14,19.6697607 14.012086,19.8366985 14.0354444,20 Z M14,8.99980749 C14,8.44762906 14.4378814,8 15.0029293,8 L19.9970707,8 C20.5509732,8 21,8.44371665 21,8.99980749 L21,12.0001925 C21,12.5523709 20.5621186,13 19.9970707,13 L15.0029293,13 C14.4490268,13 14,12.5562834 14,12.0001925 L14,8.99980749 Z M7,8.99539757 C7,8.44565467 7.44371665,8 7.99980749,8 L11.0001925,8 C11.5523709,8 12,8.4556644 12,8.99539757 L12,18 L7,18 L7,8.99539757 Z M17.5,22 C18.8807119,22 20,20.8807119 20,19.5 C20,18.1192881 18.8807119,17 17.5,17 C16.1192881,17 15,18.1192881 15,19.5 C15,20.8807119 16.1192881,22 17.5,22 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-214.000000, -214.000000)">
-            <g id="bus-l" transform="translate(215.000000, 215.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Mask">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-bus-m.svg b/data/styles/clear/style-clear/symbols/olympic-bus-m.svg
deleted file mode 100644
index a1ea03da57..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-bus-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-bus-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M5.99079514,5 C4.89821238,5 4,5.89112225 4,6.99037724 L4,9.9638276 L3.87738037,10.0295729 C3.39522648,10.2880905 3,10.9516483 3,11.5087848 L3,14.9912152 C3,15.5499119 3.44715386,16 3.99874609,16 L11.0354444,16 C11.012086,15.8366985 11,15.6697607 11,15.5 C11,13.5670034 12.5670034,12 14.5,12 C16.4329966,12 18,13.5670034 18,15.5 C18,15.6697607 17.987914,15.8366985 17.9645556,16 L21,16 L21,11 L20.0029293,11 C19.4490268,11 19,10.5566468 19,9.9906311 L19,8.0093689 C19,7.45190985 19.4378814,7 20.0029293,7 L21,7 L21,5 L5.99079514,5 Z M12,8.0093689 C12,7.45190985 12.4437166,7 12.9998075,7 L16.0001925,7 C16.5523709,7 17,7.44335318 17,8.0093689 L17,9.9906311 C17,10.5480902 16.5562834,11 16.0001925,11 L12.9998075,11 C12.4476291,11 12,10.5566468 12,9.9906311 L12,8.0093689 L12,8.0093689 Z M6,7.99703014 C6,7.4463856 6.44335318,7 7.0093689,7 L8.9906311,7 C9.5480902,7 10,7.45303631 10,7.99703014 L10,15 L6,15 L6,7.99703014 L6,7.99703014 Z M14.5,18 C15.8807119,18 17,16.8807119 17,15.5 C17,14.1192881 15.8807119,13 14.5,13 C13.1192881,13 12,14.1192881 12,15.5 C12,16.8807119 13.1192881,18 14.5,18 L14.5,18 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-251.000000, -216.000000)">
-            <g id="bus-m" transform="translate(252.000000, 217.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Mask">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-bus-s.svg b/data/styles/clear/style-clear/symbols/olympic-bus-s.svg
deleted file mode 100644
index 90af54482e..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-bus-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-bus-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M8.05000906,12 L3,12 L3,6.65149687 L3,4.99668948 C3,3.89394833 3.90195036,3 5.0085302,3 L15,3 L15,5 L14.0093689,5 C13.4433532,5 13,5.44724809 13,5.99895656 L13,7.00104344 C13,7.55733967 13.4519098,8 14.0093689,8 L15,8 L15,12 L12.9499909,12 C12.9827849,11.838445 13,11.6712329 13,11.5 C13,10.1192881 11.8807119,9 10.5,9 C9.11928813,9 8,10.1192881 8,11.5 C8,11.6712329 8.01721513,11.838445 8.05000906,12 Z M8,5.99895656 C8,5.44724809 8.44335318,5 9.0093689,5 L10.9906311,5 C11.5480902,5 12,5.44266033 12,5.99895656 L12,7.00104344 C12,7.55275191 11.5566468,8 10.9906311,8 L9.0093689,8 C8.45190985,8 8,7.55733967 8,7.00104344 L8,5.99895656 Z M4,5.49100518 C4,5.21983051 4.2157526,5 4.49538898,5 L6.50461102,5 C6.7782068,5 7,5.22788048 7,5.49100518 L7,11 L4,11 L4,5.49100518 Z M10.5,13 C11.3284271,13 12,12.3284271 12,11.5 C12,10.6715729 11.3284271,10 10.5,10 C9.67157288,10 9,10.6715729 9,11.5 C9,12.3284271 9.67157288,13 10.5,13 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-284.000000, -219.000000)">
-            <g id="bus-s" transform="translate(285.000000, 220.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Mask">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-cable-car-l.svg b/data/styles/clear/style-clear/symbols/olympic-cable-car-l.svg
deleted file mode 100644
index 2a9185dae1..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-cable-car-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-cable-car-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M13.357121,4.91071975 L14.4619459,6.99771849 L12.6126744,7 L11.7108116,5.32229711 L5,7 L5,5 L17,2 L17,4 L13.357121,4.91071975 Z M13.4043846,9 L14.9970707,9 C15.5621186,9 16.374141,9.24942732 16.8356673,9.5571115 L18.1643327,10.4428885 C18.6321411,10.7547607 19,11.4456547 19,11.9953976 L19,21 C19,21.5 18.5,22 18,22 L15.5,22 L13,22 L9.5,22 L7,22 C6.5,22 6,21.5 6,21 L6,11.9953976 C6,11.4556644 6.37414097,10.7505727 6.83566725,10.4428885 L8.16433275,9.5571115 C8.63214111,9.24523926 9.44902676,9 10.0029293,9 L11.5375581,9 L12.6126744,7 L14.4619459,7.00228151 L13.4043846,9 Z M9.10529494,11.4473525 C9.5994269,11.2002865 10.4437166,11 10.9998075,11 L14.0001925,11 C14.5523709,11 15.4047298,11.2023649 15.8947051,11.4473525 L16.1052949,11.5526475 C16.5994269,11.7997135 17,12.4433532 17,13.0093689 L17,14.9906311 C17,15.5480902 16.5536886,16 16.0024554,16 L8.99754465,16 C8.44661595,16 8,15.5566468 8,14.9906311 L8,13.0093689 C8,12.4519098 8.40472984,11.7976351 8.89470506,11.5526475 L9.10529494,11.4473525 Z M12,11 L13,11 L13,16 L12,16 L12,11 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-214.000000, -325.000000)">
-            <g id="cable-car-l" transform="translate(215.000000, 326.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-cable-car-m.svg b/data/styles/clear/style-clear/symbols/olympic-cable-car-m.svg
deleted file mode 100644
index 80259cf59f..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-cable-car-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-cable-car-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M12.1357593,4.11336598 L10.5,7 L9,7 L10.4037789,4.52274318 L5,5.80000003 L5,4.60000004 L16,2 L16,3.19999999 L12.1357593,4.11336598 Z M10.0002578,9.01124006 L9.06307016,9.01124006 C8.49939393,9.01124006 7.75450397,9.3375159 7.37871804,9.73999755 L7.0304515,10.1130049 L7.0304515,12.9754866 C7.0304515,13.5260735 7.47795435,13.9683281 8.02997709,13.9683281 L10.0002578,13.9683281 L10.0002578,9.01124006 Z M11.0003093,9.01124006 L12.0162029,9.01124006 C12.5706589,9.01124006 13.3214957,9.34779246 13.6836581,9.75224585 L14.0066949,10.1130049 L14.0066949,12.9754866 C14.0066949,13.5238178 13.5596871,13.9683281 13.0071693,13.9683281 L11.0003093,13.9683281 L11.0003093,9.01124006 Z M7.98774308,7 C7.43572034,7 6.63187106,7.2689333 6.18898655,7.60317655 L5.79423602,7.90109328 C5.35283296,8.2342185 4.99727577,8.96088415 5.00001573,9.5118661 L5.03723909,16.9971534 C5.05254779,17.4985767 5.55085089,18 6.04915399,18 L15.0186098,18 C15.5169129,18 16.0077475,17.6699559 15.9999073,16.9971534 L15.962684,9.5118661 C15.9599166,8.95538605 15.6013269,8.23533654 15.1584424,7.90109328 L14.7636918,7.60317655 C14.3222888,7.27005134 13.5174531,7 12.9649353,7 L7.98774308,7 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-251.000000, -327.000000)">
-            <g id="cable-car-m" transform="translate(252.000000, 328.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-cable-car-s.svg b/data/styles/clear/style-clear/symbols/olympic-cable-car-s.svg
deleted file mode 100644
index 1e4fe97aff..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-cable-car-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-cable-car-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M8.93798452,3.29457364 L11,3 L11,2 L4,3.00000001 L4,4.00000001 L7.52713179,3.49612404 L6.7,5 L8,5 L8.93798452,3.29457364 Z M7,6.14285714 L6,6.14285714 L5,6.71428571 L5,8.42857143 L7,8.42857143 L7,6.14285714 Z M8,6.14285714 L9,6.14285714 L10,6.71428571 L10,8.42857143 L8,8.42857143 L8,6.14285714 Z M4.69730425,5.61157772 L4.80269575,5.53127943 C4.35937913,5.86904447 4,6.59491021 4,7.15276589 L4,11.4285714 C4,11.7142857 4.25,12 4.5,12 L5.75,12 L8,12 L9.25,12 L10.5,12 C10.75,12 11,11.7142857 11,11.4285714 L11,7.15276589 C11,6.59500869 10.6368918,5.86620331 10.1973042,5.53127943 L10.3026958,5.61157772 C9.8593791,5.27381267 9.0566468,5 8.4906311,5 L6.5093689,5 C5.95190985,5 5.13689184,5.27665383 4.69730425,5.61157772 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-284.000000, -330.000000)">
-            <g id="cable-car-s" transform="translate(285.000000, 331.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-center-l.svg b/data/styles/clear/style-clear/symbols/olympic-center-l.svg
deleted file mode 100644
index 5c54cfd9af..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-center-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-center-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M25,12.5 C25,19.403 19.403,25 12.5,25 C5.597,25 0,19.403 0,12.5 C0,5.597 5.597,0 12.5,0 C19.403,0 25,5.597 25,12.5 L25,12.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M17.75,11.5 L17.75,10 L18.5,10 L18.5,8.5 L13.25,8.5 L13.25,7 L16.25,7 L16.25,4.75 L13.25,4.75 L13.25,4 L11.75,4 L11.75,8.5 L6.5,8.5 L6.5,10 L7.25,10 L7.25,11.5 L5,11.5 L5,19 L20,19 L20,11.5 L17.75,11.5 L17.75,11.5 Z M8.75,17.5 L7.25,17.5 L7.25,16 L8.75,16 L8.75,17.5 L8.75,17.5 Z M8.75,14.5 L7.25,14.5 L7.25,13 L8.75,13 L8.75,14.5 L8.75,14.5 Z M11.75,17.5 L10.25,17.5 L10.25,16 L11.75,16 L11.75,17.5 L11.75,17.5 Z M11.75,14.5 L10.25,14.5 L10.25,13 L11.75,13 L11.75,14.5 L11.75,14.5 Z M14.75,17.5 L13.25,17.5 L13.25,16 L14.75,16 L14.75,17.5 L14.75,17.5 Z M14.75,14.5 L13.25,14.5 L13.25,13 L14.75,13 L14.75,14.5 L14.75,14.5 Z M17.75,17.5 L16.25,17.5 L16.25,16 L17.75,16 L17.75,17.5 L17.75,17.5 Z M17.75,14.5 L16.25,14.5 L16.25,13 L17.75,13 L17.75,14.5 L17.75,14.5 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-70.000000, -132.000000)">
-            <g id="wayside_shrine-l" transform="translate(71.000000, 133.000000)">
-                <use id="Shape" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-center-m.svg b/data/styles/clear/style-clear/symbols/olympic-center-m.svg
deleted file mode 100644
index 20f7dabd81..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-center-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-center-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M21,10.5 C21,16.299 16.299,21 10.5,21 C4.701,21 0,16.299 0,10.5 C0,4.701 4.701,0 10.5,0 C16.299,0 21,4.701 21,10.5 L21,10.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M15.05,9.5 L15.05,8.2 L15.7,8.2 L15.7,6.9 L11.15,6.9 L11.15,5.6 L13.75,5.6 L13.75,3.65 L11.15,3.65 L11.15,3 L9.85,3 L9.85,6.9 L5.3,6.9 L5.3,8.2 L5.95,8.2 L5.95,9.5 L4,9.5 L4,16 L17,16 L17,9.5 L15.05,9.5 L15.05,9.5 Z M7.25,14.7 L5.95,14.7 L5.95,13.4 L7.25,13.4 L7.25,14.7 L7.25,14.7 Z M7.25,12.1 L5.95,12.1 L5.95,10.8 L7.25,10.8 L7.25,12.1 L7.25,12.1 Z M9.85,14.7 L8.55,14.7 L8.55,13.4 L9.85,13.4 L9.85,14.7 L9.85,14.7 Z M9.85,12.1 L8.55,12.1 L8.55,10.8 L9.85,10.8 L9.85,12.1 L9.85,12.1 Z M12.45,14.7 L11.15,14.7 L11.15,13.4 L12.45,13.4 L12.45,14.7 L12.45,14.7 Z M12.45,12.1 L11.15,12.1 L11.15,10.8 L12.45,10.8 L12.45,12.1 L12.45,12.1 Z M15.05,14.7 L13.75,14.7 L13.75,13.4 L15.05,13.4 L15.05,14.7 L15.05,14.7 Z M15.05,12.1 L13.75,12.1 L13.75,10.8 L15.05,10.8 L15.05,12.1 L15.05,12.1 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-107.000000, -134.000000)">
-            <g id="wayside_shrine-m" transform="translate(108.000000, 135.000000)">
-                <use id="Shape" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-center-s.svg b/data/styles/clear/style-clear/symbols/olympic-center-s.svg
deleted file mode 100644
index 5b2c475eb2..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-center-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-center-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M7.5,15 C11.6421356,15 15,11.6421356 15,7.5 C15,3.35786438 11.6421356,0 7.5,0 C3.35786438,0 0,3.35786438 0,7.5 C0,11.6421356 3.35786438,15 7.5,15 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M10.65,6.5 L10.65,5.6 L11.1,5.6 L11.1,4.7 L7.95,4.7 L7.95,3.8 L9.75,3.8 L9.75,2.45 L7.95,2.45 L7.95,2 L7.05,2 L7.05,4.7 L3.9,4.7 L3.9,5.6 L4.35,5.6 L4.35,6.5 L3,6.5 L3,11 L12,11 L12,6.5 L10.65,6.5 L10.65,6.5 Z M5.25,10.1 L4.35,10.1 L4.35,9.2 L5.25,9.2 L5.25,10.1 L5.25,10.1 Z M5.25,8.3 L4.35,8.3 L4.35,7.4 L5.25,7.4 L5.25,8.3 L5.25,8.3 Z M7.05,10.1 L6.15,10.1 L6.15,9.2 L7.05,9.2 L7.05,10.1 L7.05,10.1 Z M7.05,8.3 L6.15,8.3 L6.15,7.4 L7.05,7.4 L7.05,8.3 L7.05,8.3 Z M8.85,10.1 L7.95,10.1 L7.95,9.2 L8.85,9.2 L8.85,10.1 L8.85,10.1 Z M8.85,8.3 L7.95,8.3 L7.95,7.4 L8.85,7.4 L8.85,8.3 L8.85,8.3 Z M10.65,10.1 L9.75,10.1 L9.75,9.2 L10.65,9.2 L10.65,10.1 L10.65,10.1 Z M10.65,8.3 L9.75,8.3 L9.75,7.4 L10.65,7.4 L10.65,8.3 L10.65,8.3 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-140.000000, -137.000000)">
-            <g id="wayside_shrine-s" transform="translate(141.000000, 138.000000)">
-                <use id="Oval" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-cycle-l.svg b/data/styles/clear/style-clear/symbols/olympic-cycle-l.svg
deleted file mode 100644
index e82b3c70d7..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-cycle-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-cycle-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M25,12.5 C25,19.403 19.403,25 12.5,25 C5.597,25 0,19.403 0,12.5 C0,5.597 5.597,0 12.5,0 C19.403,0 25,5.597 25,12.5 L25,12.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M8,12.248 C6.344,12.248 5,13.592 5,15.248 C5,16.904 6.344,18.248 8,18.248 C9.656,18.248 11,16.904 11,15.248 C11,13.596 9.656,12.248 8,12.248 L8,12.248 Z M8,16.748 C7.172,16.748 6.5,16.076 6.5,15.248 C6.5,14.42 7.172,13.748 8,13.748 C8.828,13.748 9.5,14.424 9.5,15.248 C9.5,16.076 8.828,16.748 8,16.748 Z M17,12.248 C15.344,12.248 14,13.592 14,15.248 C14,16.904 15.344,18.248 17,18.248 C18.656,18.248 20,16.904 20,15.248 C20,13.596 18.656,12.248 17,12.248 Z M17,16.748 C16.172,16.748 15.5,16.076 15.5,15.248 C15.5,14.42 16.172,13.748 17,13.748 C17.828,13.748 18.5,14.424 18.5,15.248 C18.5,16.076 17.828,16.748 17,16.748 Z M12.576,14.168 L14.604,11.4 C14.732,11.224 14.78,11.004 14.732,10.792 C14.684,10.58 14.548,10.4 14.36,10.296 L12.436,9.244 L15.04,9.244 L15.956,11.08 C16.14,11.452 16.592,11.6 16.964,11.416 C17.336,11.232 17.484,10.78 17.3,10.408 L16.176,8.156 C16.048,7.9 15.788,7.74 15.504,7.74 L9.5,7.74 C9.432,7.74 9.368,7.752 9.304,7.768 C9.288,7.772 9.276,7.78 9.264,7.784 C9.196,7.808 9.128,7.84 9.068,7.884 C9.052,7.896 9.04,7.904 9.024,7.916 C8.972,7.96 8.92,8.012 8.88,8.072 C8.872,8.084 8.868,8.1 8.856,8.116 C8.852,8.124 8.844,8.128 8.84,8.132 C8.836,8.14 8.836,8.152 8.832,8.16 C8.792,8.24 8.764,8.324 8.752,8.412 L8.752,8.424 C8.744,8.504 8.756,8.588 8.776,8.668 C8.78,8.688 8.784,8.704 8.792,8.724 C8.796,8.74 8.796,8.756 8.804,8.768 L11.804,16.268 C11.92,16.56 12.204,16.74 12.5,16.74 C12.592,16.74 12.688,16.724 12.78,16.688 C13.164,16.536 13.352,16.096 13.2,15.712 L12.576,14.168 Z M11.92,12.528 L10.972,10.156 L12.888,11.204 L11.92,12.528 Z M18.876,9.248 C19.4967681,9.248 20,8.74476806 20,8.124 C20,7.50323194 19.4967681,7 18.876,7 C18.2552319,7 17.752,7.50323194 17.752,8.124 C17.752,8.74476806 18.2552319,9.248 18.876,9.248 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-70.000000, -288.000000)">
-            <g id="wayside_shrine-l" transform="translate(71.000000, 289.000000)">
-                <use id="Shape" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-cycle-m.svg b/data/styles/clear/style-clear/symbols/olympic-cycle-m.svg
deleted file mode 100644
index 807f7f72ec..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-cycle-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-cycle-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M21,10.5 C21,16.299 16.299,21 10.5,21 C4.701,21 0,16.299 0,10.5 C0,4.701 4.701,0 10.5,0 C16.299,0 21,4.701 21,10.5 L21,10.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M6.6,10.5482667 C5.1648,10.5482667 4,11.7130667 4,13.1482667 C4,14.5834667 5.1648,15.7482667 6.6,15.7482667 C8.0352,15.7482667 9.2,14.5834667 9.2,13.1482667 C9.2,11.7165333 8.0352,10.5482667 6.6,10.5482667 L6.6,10.5482667 Z M6.6,14.4482667 C5.8824,14.4482667 5.3,13.8658667 5.3,13.1482667 C5.3,12.4306667 5.8824,11.8482667 6.6,11.8482667 C7.3176,11.8482667 7.9,12.4341333 7.9,13.1482667 C7.9,13.8658667 7.3176,14.4482667 6.6,14.4482667 Z M14.4,10.5482667 C12.9648,10.5482667 11.8,11.7130667 11.8,13.1482667 C11.8,14.5834667 12.9648,15.7482667 14.4,15.7482667 C15.8352,15.7482667 17,14.5834667 17,13.1482667 C17,11.7165333 15.8352,10.5482667 14.4,10.5482667 Z M14.4,14.4482667 C13.6824,14.4482667 13.1,13.8658667 13.1,13.1482667 C13.1,12.4306667 13.6824,11.8482667 14.4,11.8482667 C15.1176,11.8482667 15.7,12.4341333 15.7,13.1482667 C15.7,13.8658667 15.1176,14.4482667 14.4,14.4482667 Z M10.5658667,12.2122667 L12.3234667,9.81333333 C12.4344,9.6608 12.476,9.47013333 12.4344,9.2864 C12.3928,9.10266667 12.2749333,8.94666667 12.112,8.85653333 L10.4445333,7.9448 L12.7013333,7.9448 L13.4952,9.536 C13.6546667,9.8584 14.0464,9.98666667 14.3688,9.8272 C14.6912,9.66773333 14.8194667,9.276 14.66,8.9536 L13.6858667,7.00186667 C13.5749333,6.78 13.3496,6.64133333 13.1034667,6.64133333 L7.9,6.64133333 C7.84106667,6.64133333 7.7856,6.65173333 7.73013333,6.6656 C7.71626667,6.66906667 7.70586667,6.676 7.69546667,6.67946667 C7.63653333,6.70026667 7.5776,6.728 7.5256,6.76613333 C7.51173333,6.77653333 7.50133333,6.78346667 7.48746667,6.79386667 C7.4424,6.832 7.39733333,6.87706667 7.36266667,6.92906667 C7.35573333,6.93946667 7.35226667,6.95333333 7.34186667,6.9672 C7.3384,6.97413333 7.33146667,6.9776 7.328,6.98106667 C7.32453333,6.988 7.32453333,6.9984 7.32106667,7.00533333 C7.2864,7.07466667 7.26213333,7.14746667 7.25173333,7.22373333 L7.25173333,7.23413333 C7.2448,7.30346667 7.2552,7.37626667 7.27253333,7.4456 C7.276,7.46293333 7.27946667,7.4768 7.2864,7.49413333 C7.28986667,7.508 7.28986667,7.52186667 7.2968,7.53226667 L9.8968,14.0322667 C9.99733333,14.2853333 10.2434667,14.4413333 10.5,14.4413333 C10.5797333,14.4413333 10.6629333,14.4274667 10.7426667,14.3962667 C11.0754667,14.2645333 11.2384,13.8832 11.1066667,13.5504 L10.5658667,12.2122667 Z M9.99733333,10.7909333 L9.17573333,8.7352 L10.8362667,9.64346667 L9.99733333,10.7909333 Z M16.0258667,7.94826667 C16.5638657,7.94826667 17,7.51213232 17,6.97413333 C17,6.43613435 16.5638657,6 16.0258667,6 C15.4878677,6 15.0517333,6.43613435 15.0517333,6.97413333 C15.0517333,7.51213232 15.4878677,7.94826667 16.0258667,7.94826667 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-107.000000, -290.000000)">
-            <g id="wayside_shrine-m" transform="translate(108.000000, 291.000000)">
-                <use id="Shape" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-cycle-s.svg b/data/styles/clear/style-clear/symbols/olympic-cycle-s.svg
deleted file mode 100644
index 538135764d..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-cycle-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-cycle-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M7.5,15 C11.6421356,15 15,11.6421356 15,7.5 C15,3.35786438 11.6421356,0 7.5,0 C3.35786438,0 0,3.35786438 0,7.5 C0,11.6421356 3.35786438,15 7.5,15 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M4.2,6.84853333 C2.9856,6.84853333 2,7.83413333 2,9.04853333 C2,10.2629333 2.9856,11.2485333 4.2,11.2485333 C5.4144,11.2485333 6.4,10.2629333 6.4,9.04853333 C6.4,7.83706667 5.4144,6.84853333 4.2,6.84853333 L4.2,6.84853333 Z M4.2,10.1485333 C3.5928,10.1485333 3.1,9.65573333 3.1,9.04853333 C3.1,8.44133333 3.5928,7.94853333 4.2,7.94853333 C4.8072,7.94853333 5.3,8.44426667 5.3,9.04853333 C5.3,9.65573333 4.8072,10.1485333 4.2,10.1485333 Z M10.8,6.84853333 C9.5856,6.84853333 8.6,7.83413333 8.6,9.04853333 C8.6,10.2629333 9.5856,11.2485333 10.8,11.2485333 C12.0144,11.2485333 13,10.2629333 13,9.04853333 C13,7.83706667 12.0144,6.84853333 10.8,6.84853333 Z M10.8,10.1485333 C10.1928,10.1485333 9.7,9.65573333 9.7,9.04853333 C9.7,8.44133333 10.1928,7.94853333 10.8,7.94853333 C11.4072,7.94853333 11.9,8.44426667 11.9,9.04853333 C11.9,9.65573333 11.4072,10.1485333 10.8,10.1485333 Z M7.55573333,8.25653333 L9.04293333,6.22666667 C9.1368,6.0976 9.172,5.93626667 9.1368,5.7808 C9.1016,5.62533333 9.00186667,5.49333333 8.864,5.41706667 L7.45306667,4.6456 L9.36266667,4.6456 L10.0344,5.992 C10.1693333,6.2648 10.5008,6.37333333 10.7736,6.2384 C11.0464,6.10346667 11.1549333,5.772 11.02,5.4992 L10.1957333,3.84773333 C10.1018667,3.66 9.9112,3.54266667 9.70293333,3.54266667 L5.3,3.54266667 C5.25013333,3.54266667 5.2032,3.55146667 5.15626667,3.5632 C5.14453333,3.56613333 5.13573333,3.572 5.12693333,3.57493333 C5.07706667,3.59253333 5.0272,3.616 4.9832,3.64826667 C4.97146667,3.65706667 4.96266667,3.66293333 4.95093333,3.67173333 C4.9128,3.704 4.87466667,3.74213333 4.84533333,3.78613333 C4.83946667,3.79493333 4.83653333,3.80666667 4.82773333,3.8184 C4.8248,3.82426667 4.81893333,3.8272 4.816,3.83013333 C4.81306667,3.836 4.81306667,3.8448 4.81013333,3.85066667 C4.7808,3.90933333 4.76026667,3.97093333 4.75146667,4.03546667 L4.75146667,4.04426667 C4.7456,4.10293333 4.7544,4.16453333 4.76906667,4.2232 C4.772,4.23786667 4.77493333,4.2496 4.7808,4.26426667 C4.78373333,4.276 4.78373333,4.28773333 4.7896,4.29653333 L6.9896,9.79653333 C7.07466667,10.0106667 7.28293333,10.1426667 7.5,10.1426667 C7.56746667,10.1426667 7.63786667,10.1309333 7.70533333,10.1045333 C7.98693333,9.99306667 8.1248,9.6704 8.01333333,9.3888 L7.55573333,8.25653333 Z M7.07466667,7.05386667 L6.37946667,5.3144 L7.78453333,6.08293333 L7.07466667,7.05386667 Z M12.1757333,4.64853333 C12.6309632,4.64853333 13,4.27949658 13,3.82426667 C13,3.36903676 12.6309632,3 12.1757333,3 C11.7205034,3 11.3514667,3.36903676 11.3514667,3.82426667 C11.3514667,4.27949658 11.7205034,4.64853333 12.1757333,4.64853333 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-140.000000, -293.000000)">
-            <g id="wayside_shrine-s" transform="translate(141.000000, 294.000000)">
-                <use id="Oval" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-funicular-l.svg b/data/styles/clear/style-clear/symbols/olympic-funicular-l.svg
deleted file mode 100644
index e1041d8e48..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-funicular-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-funicular-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M4,9.99539757 C4,9.44565467 4.43731068,8.89710337 4.9750526,8.77057586 L20.0249474,5.22942414 C20.5634541,5.10271669 21,5.4556644 21,5.99539757 L21,14.0046024 C21,14.5543453 20.5626893,15.1028966 20.0249474,15.2294241 L4.9750526,18.7705759 C4.43654592,18.8972833 4,18.5443356 4,18.0046024 L4,9.99539757 Z M6,11.1904785 C6,10.9195947 6.2157526,10.6496577 6.49538898,10.5844092 L8.50461102,10.1155908 C8.7782068,10.0517517 9,10.2150574 9,10.4904785 L9,13.5095215 C9,13.7804053 8.7842474,14.0503423 8.50461102,14.1155908 L6.49538898,14.5844092 C6.2217932,14.6482482 6,14.4849426 6,14.2095215 L6,11.1904785 Z M16,8.19047851 C16,7.91959471 16.2157526,7.64965772 16.495389,7.58440923 L18.504611,7.11559076 C18.7782068,7.05175175 19,7.21505737 19,7.49047852 L19,10.5095215 C19,10.7804053 18.7842474,11.0503423 18.504611,11.1155908 L16.495389,11.5844092 C16.2217932,11.6482482 16,11.4849426 16,11.2095215 L16,8.19047851 Z M11,9.69047851 C11,9.41959471 11.2157526,9.14965772 11.495389,9.08440923 L13.504611,8.61559076 C13.7782068,8.55175175 14,8.71505737 14,8.99047852 L14,12.0095215 C14,12.2804053 13.7842474,12.5503423 13.504611,12.6155908 L11.495389,13.0844092 C11.2217932,13.1482482 11,12.9849426 11,12.7095215 L11,9.69047851 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-214.000000, -362.000000)">
-            <g id="funicular-l" transform="translate(215.000000, 363.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Rectangle-41">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-funicular-m.svg b/data/styles/clear/style-clear/symbols/olympic-funicular-m.svg
deleted file mode 100644
index cc943a237b..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-funicular-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-funicular-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M3,8.21764909 C3,7.6679062 3.43274403,7.12416288 3.98419189,6.99916803 L17.0158081,4.04533502 C17.5593623,3.9221294 18,4.27791592 18,4.81764909 L18,12.826854 C18,13.3765968 17.567256,13.9203402 17.0158081,14.045335 L3.98419189,16.999168 C3.44063772,17.1223736 3,16.7665871 3,16.226854 L3,8.21764909 Z M4.7,8.91273003 C4.7,8.64184623 4.9157526,8.37190924 5.19538898,8.30666075 L7.20461102,7.83784228 C7.4782068,7.77400327 7.7,7.93730889 7.7,8.21273004 L7.7,11.231773 C7.7,11.5026568 7.4842474,11.7725938 7.20461102,11.8378423 L5.19538898,12.3066608 C4.9217932,12.3704998 4.7,12.2071941 4.7,11.931773 L4.7,8.91273003 Z M13.6,6.71273003 C13.6,6.44184623 13.8157526,6.17190924 14.095389,6.10666075 L16.104611,5.63784228 C16.3782068,5.57400327 16.6,5.73730889 16.6,6.01273004 L16.6,9.031773 C16.6,9.30265681 16.3842474,9.57259379 16.104611,9.63784228 L14.095389,10.1066608 C13.8217932,10.1704998 13.6,10.0071941 13.6,9.731773 L13.6,6.71273003 Z M9.2,7.91273003 C9.2,7.64184623 9.4197113,7.36732369 9.68772278,7.30032082 L11.5122772,6.84418221 C11.7816391,6.77684175 12,6.93730889 12,7.21273004 L12,10.231773 C12,10.5026568 11.7802887,10.7771793 11.5122772,10.8441822 L9.68772278,11.3003208 C9.41836093,11.3676613 9.2,11.2071941 9.2,10.931773 L9.2,7.91273003 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-251.000000, -364.000000)">
-            <g id="funicular-m" transform="translate(252.000000, 365.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Rectangle-41-Copy">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-funicular-s.svg b/data/styles/clear/style-clear/symbols/olympic-funicular-s.svg
deleted file mode 100644
index e5a071f85f..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-funicular-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-funicular-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M2,6.99077797 C2,6.44358641 2.4296875,5.85820312 2.95884204,5.68358213 L11.041158,3.01641787 C11.5707118,2.8416651 12,3.15097518 12,3.69077796 L12,7.70922203 C12,8.25641359 11.5703125,8.84179687 11.041158,9.01641787 L2.95884204,11.6835821 C2.4292882,11.8583349 2,11.5490248 2,11.009222 L2,6.99077797 Z M3,7 L5,6.3 L5,8.3 L3,9 L3,7 Z M6,5.89999998 L8,5.19999999 L8,7.19999999 L6,7.89999998 L6,5.89999998 Z M9,4.99999998 L11,4.29999999 L11,6.29999999 L9,6.99999998 L9,4.99999998 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-284.000000, -367.000000)">
-            <g id="funicular-s" transform="translate(285.000000, 368.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Rectangle-49">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-ship-l.svg b/data/styles/clear/style-clear/symbols/olympic-ship-l.svg
deleted file mode 100644
index 2477f3d8bb..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-ship-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-ship-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M10,3.3622 C9.446,3.3622 9,3.8082 9,4.3622 L7,4.3622 C6.446,4.3622 6,4.8082 6,5.3622 L6,11.4247 L4,12.3622 L6,16.3622 L6,18.3622 C7.5,18.3622 8.5,19.3627 9.5,19.3622 C10.5,19.3627 11,18.3622 12.5,18.3622 C14,18.3622 14.5,19.3617 15.5,19.3622 C16.5,19.3627 17.5,18.3622 19,18.3622 L19,16.3622 L21,12.3622 L19,11.4247 L19,5.3622 C19,4.8082 18.554,4.3622 18,4.3622 L16,4.3622 C16,3.8082 15.554,3.3622 15,3.3622 L10,3.3622 L10,3.3622 Z M8,6.3622 L17,6.3622 L17,10.4872 L12.5,8.3622 L8,10.4872 L8,6.3622 L8,6.3622 Z M6,20.3622 C5.30594,20.3622 4.66024,20.7671 4,20.9872 L4,23.01845 C4,23.01845 5,22.3627 6,22.3622 C7,22.3617 8,23.3622 9.5,23.3622 C11,23.3622 11.47352,22.3969 12.5,22.3622 C13.5,22.3627 14,23.3622 15.5,23.3622 C17,23.3622 18,22.3622 19,22.3622 C19.70165,22.3622 21,23.01845 21,23.01845 L21,20.9872 C20.3584,20.7404 19.65657,20.3622 19,20.3622 C17.5,20.3622 16.5,21.3627 15.5,21.3622 C14.5,21.3617 14,20.3622 12.5,20.3622 C11,20.3622 10.5,21.3627 9.5,21.3622 C8.5,21.3627 7.5,20.3622 6,20.3622 L6,20.3622 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-214.000000, -136.000000)">
-            <g id="ship-l" transform="translate(215.000000, 137.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="path8421-9-1-0-1-copy">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-ship-m.svg b/data/styles/clear/style-clear/symbols/olympic-ship-m.svg
deleted file mode 100644
index 8edb64fa15..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-ship-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-ship-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M9,3 C8.5,3 8,3.5 8,4 L6.82354,4 C6.3673,4 5.9706,4.5438 5.9706,5 L6,8.5 L4,9.5 L6,13 L6,14.5 L8.5,15.5 L10.5,14.5 L12.5,15.5 L15,14.5 L15,13 L17,9.5 L15,8.5 L15,5 C15,4.5438 14.63271,4 14.17647,4 L13,4 C13,3.5 12.5,3 12,3 L9,3 Z M7,5 L14,5 L14,8.0441 L10.5,6 L7,8.0441 L7,5 Z M6,16 L4,17 L4,18.5 L6,17.5 L8.5,18.5 L10.5,17.5 L12.5,18.5 L15,17.6466 L17,18.5 L17,17 L15,16 L12.5,17 L10.5,16 L8.5,17 L6,16 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-251.000000, -138.000000)">
-            <g id="ship-m" transform="translate(252.000000, 139.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="path30964-copy">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-ship-s.svg b/data/styles/clear/style-clear/symbols/olympic-ship-s.svg
deleted file mode 100644
index 500be383ec..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-ship-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-ship-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M4.5,2.5 C4.223,2.5 4,2.723 4,3 L4,6.5 L3,7 L4,9 L4,10 L6,10.5 L7.5,10 L9,10.5 L11,10 L11,9 L12,7 L11,6.5313 L11,3 C11,2.723 10.777,2.5 10.5,2.5 L9.5,2.5 L5.5,2.5 L4.5,2.5 Z M5,3.5 L10,3.5 L10,6.0625 L7.5,4.5 L5,6 L5,3.5 Z M4.5,10.9995 L3,11.4683 L3,12.4995 L3.15625,12.4375 L4.5,12 L6,12.5 L7.5,12 L9,12.5 L10.5,12 L12,12.5 L12,11.4688 L10.5,11 L9,11.4688 L7.5,11 L6,11.4688 L4.5,10.9995 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-284.000000, -141.000000)">
-            <g id="ship-s" transform="translate(285.000000, 142.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="path30937-copy">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-stadium-l.svg b/data/styles/clear/style-clear/symbols/olympic-stadium-l.svg
deleted file mode 100644
index 4b2fc2ad8f..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-stadium-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-stadium-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M25,12.5 C25,19.403 19.403,25 12.5,25 C5.597,25 0,19.403 0,12.5 C0,5.597 5.597,0 12.5,0 C19.403,0 25,5.597 25,12.5 L25,12.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M8,16.8345768 C8.87211596,17.2812616 9.89168357,17.6492508 11,17.8318236 L11,15.495389 C11,15.2217932 11.2157526,15 11.495389,15 L13.504611,15 C13.7782068,15 14,15.2157526 14,15.495389 L14,17.8318236 C15.1083164,17.6492508 16.127884,17.2812616 17,16.8345768 L17,14.4904785 C17,14.2195947 17.1990795,13.9004602 17.4438648,13.7780676 L18.5561352,13.2219324 C18.8012749,13.0993625 19,13.2150574 19,13.4904785 L19,15.4730796 C19.6232382,14.9033908 19.9852213,14.3600112 19.9995574,14 L20,9 C19.9998486,8.99268346 20,8.98535738 20,8.97802198 C20,7.8855906 16.6421356,7 12.5,7 C8.35786438,7 5,7.8855906 5,8.97802198 C5,8.98535738 5.0001514,8.99268346 5.00045342,9 L5,14 C5.01477865,14.3600112 5.37676181,14.9033908 6,15.4730796 L6,13.4904785 C6,13.2150574 6.19872505,13.0993625 6.44386482,13.2219324 L7.55613518,13.7780676 C7.80092049,13.9004602 8,14.2195947 8,14.4904785 L8,16.8345768 Z M12.5,11.5 C16.0898509,11.5 19,10.7164983 19,9.75 C19,8.78350169 16.0898509,8 12.5,8 C8.91014913,8 6,8.78350169 6,9.75 C6,10.7164983 8.91014913,11.5 12.5,11.5 Z M10.2034912,9.5 L15.2034912,9.5 L16.4937134,10.6821289 C16.4937134,10.6821289 14.5578349,10.9495239 12.7034912,10.9495239 C10.8491475,10.9495239 9,10.6821289 9,10.6821289 L10.2034912,9.5 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-71.000000, -328.000000)">
-            <g id="wayside_shrine-l" transform="translate(72.000000, 329.000000)">
-                <use id="Shape" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-stadium-m.svg b/data/styles/clear/style-clear/symbols/olympic-stadium-m.svg
deleted file mode 100644
index ebdfdfd85c..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-stadium-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-stadium-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M21,10.5 C21,16.299 16.299,21 10.5,21 C4.701,21 0,16.299 0,10.5 C0,4.701 4.701,0 10.5,0 C16.299,0 21,4.701 21,10.5 L21,10.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M6.5,14.2749245 C7.27745398,14.7353078 8.19677531,15.1172736 9.2,15.3026305 L9.2,13.2266817 C9.2,12.9496106 9.42167454,12.725 9.70130615,12.725 L11.2986938,12.725 C11.5755576,12.725 11.8,12.9480835 11.8,13.2266817 L11.8,15.3026305 C12.8032247,15.1172736 13.722546,14.7353078 14.5,14.2749245 L14.5,12.495389 C14.5,12.2217932 14.6839294,11.8773804 14.9098816,11.7267456 L15.5901184,11.2732544 C15.8164898,11.1223402 16,11.2150574 16,11.4904785 L16,13.1425319 C16.4835075,12.6748624 16.8115294,12.2166536 16.9397179,11.8583333 L17,11.8583333 L17,7.525 L16.9427258,7.525 C16.5190192,6.54650414 13.7959999,5.79166667 10.5,5.79166667 C7.20400007,5.79166667 4.4809808,6.54650414 4.05727424,7.525 L4,7.525 L4,11.8583333 L4.06028211,11.8583333 C4.18847057,12.2166536 4.51649252,12.6748624 5,13.1425319 L5,11.4904785 C5,11.2150574 5.18351024,11.1223402 5.40988159,11.2732544 L6.09011841,11.7267456 C6.31607056,11.8773804 6.5,12.2217932 6.5,12.495389 L6.5,14.2749245 Z M10.5,9.69166667 C13.6112041,9.69166667 16.1333333,9.01263187 16.1333333,8.175 C16.1333333,7.33736813 13.6112041,6.65833333 10.5,6.65833333 C7.38879591,6.65833333 4.86666667,7.33736813 4.86666667,8.175 C4.86666667,9.01263187 7.38879591,9.69166667 10.5,9.69166667 Z M8.33333333,7.95833333 L12.6666667,7.95833333 L13.7848592,8.98284505 C13.7848592,8.98284505 12.1070979,9.2145874 10.5,9.2145874 C8.89290214,9.2145874 7.29030762,8.98284505 7.29030762,8.98284505 L8.33333333,7.95833333 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-108.000000, -330.000000)">
-            <g id="wayside_shrine-m" transform="translate(109.000000, 331.000000)">
-                <use id="Shape" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-stadium-main-l.svg b/data/styles/clear/style-clear/symbols/olympic-stadium-main-l.svg
deleted file mode 100644
index 5ae7ac0067..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-stadium-main-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-stadium-main-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M25,12.5 C25,19.403 19.403,25 12.5,25 C5.597,25 0,19.403 0,12.5 C0,5.597 5.597,0 12.5,0 C19.403,0 25,5.597 25,12.5 L25,12.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M14,6.84622133 L14,8.03956761 C17.4233605,8.22283939 20,9.0210716 20,9.97802198 C20,9.98535738 19.9998486,9.99268346 19.9995466,10 L20,15 C19.9609227,15.970208 17.3974334,18.272165 14,18.8318236 L14,16.495389 C14,16.2157526 13.7782068,16 13.504611,16 L11.495389,16 C11.2157526,16 11,16.2217932 11,16.495389 L11,18.8318236 C7.60256661,18.272165 5.03907733,15.970208 5.00044263,15 L5,10 C5.0001514,9.99268346 5,9.98535738 5,9.97802198 C5,9.0210716 7.57663952,8.22283939 11,8.03956761 L11,6.84791523 C10.4120293,6.91799245 10,7 10,7 L10,5 C10,5 11.25,4.75 12.5,4.75 C13.75,4.75 15,5 15,5 L15,7 C15,7 14.5890263,6.91666374 14,6.84622133 Z M13,6.76169435 L13,8.00432588 C12.8347382,8.00145706 12.6680143,8 12.5,8 C12.3319857,8 12.1652618,8.00145706 12,8.00432588 L12,6.76273242 C12.1684039,6.7546696 12.3400054,6.75 12.5115967,6.75 C12.6756852,6.75 12.8393868,6.75427017 13,6.76169435 Z M12.5,12.5 C16.0898509,12.5 19,11.7164983 19,10.75 C19,9.78350169 16.0898509,9 12.5,9 C8.91014913,9 6,9.78350169 6,10.75 C6,11.7164983 8.91014913,12.5 12.5,12.5 Z M10,10.5 L15,10.5 L16.2902222,11.6821289 C16.2902222,11.6821289 14.3543437,11.9495239 12.5,11.9495239 C10.6456563,11.9495239 8.79650879,11.6821289 8.79650879,11.6821289 L10,10.5 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-71.000000, -367.000000)">
-            <g id="wayside_shrine-l" transform="translate(72.000000, 368.000000)">
-                <use id="Shape" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-stadium-main-m.svg b/data/styles/clear/style-clear/symbols/olympic-stadium-main-m.svg
deleted file mode 100644
index 0880852839..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-stadium-main-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-stadium-main-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M21,10.5 C21,16.299 16.299,21 10.5,21 C4.701,21 0,16.299 0,10.5 C0,4.701 4.701,0 10.5,0 C16.299,0 21,4.701 21,10.5 L21,10.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M12,5.86330785 L12,6.84518416 C14.592628,7.03362209 16.5853865,7.69977093 16.9427258,8.525 L17,8.525 L17,12.8583333 L16.9397179,12.8583333 C16.5649725,13.9058448 14.4824032,15.8070267 11.8,16.3026305 L11.8,14.2266817 C11.8,13.9480835 11.5755576,13.725 11.2986938,13.725 L9.70130615,13.725 C9.42167454,13.725 9.2,13.9496106 9.2,14.2266817 L9.2,16.3026305 C6.51759676,15.8070267 4.43502752,13.9058448 4.06028211,12.8583333 L4,12.8583333 L4,8.525 L4.05727424,8.525 C4.41461348,7.69977093 6.40737195,7.03362209 9,6.84518416 L9,5.86481354 C8.41202929,5.9271044 8,6 8,6 L8,4.22222222 C8,4.22222222 9.25,4 10.5,4 C11.75,4 13,4.22222222 13,4.22222222 L13,6 C13,6 12.5890263,5.92592332 12,5.86330785 Z M11.25,5.80073998 L11.25,6.80483645 C11.0039181,6.7961373 10.7536558,6.79166667 10.5,6.79166667 C10.2463442,6.79166667 9.99608187,6.7961373 9.75,6.80483645 L9.75,5.80197788 C9.99666521,5.78712186 10.2541424,5.77777778 10.5115967,5.77777778 C10.7618243,5.77777778 11.0111523,5.78660465 11.25,5.80073998 Z M10.5,10.6916667 C13.6112041,10.6916667 16.1333333,10.0126319 16.1333333,9.175 C16.1333333,8.33736813 13.6112041,7.65833333 10.5,7.65833333 C7.38879591,7.65833333 4.86666667,8.33736813 4.86666667,9.175 C4.86666667,10.0126319 7.38879591,10.6916667 10.5,10.6916667 Z M8.33333333,8.95833333 L12.6666667,8.95833333 L13.7848592,9.98284505 C13.7848592,9.98284505 12.1070979,10.2145874 10.5,10.2145874 C8.89290214,10.2145874 7.29030762,9.98284505 7.29030762,9.98284505 L8.33333333,8.95833333 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-108.000000, -369.000000)">
-            <g id="wayside_shrine-m" transform="translate(109.000000, 370.000000)">
-                <use id="Shape" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-stadium-main-s.svg b/data/styles/clear/style-clear/symbols/olympic-stadium-main-s.svg
deleted file mode 100644
index b6edf69782..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-stadium-main-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-stadium-main-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M7.5,15 C11.6421356,15 15,11.6421356 15,7.5 C15,3.35786438 11.6421356,0 7.5,0 C3.35786438,0 0,3.35786438 0,7.5 C0,11.6421356 3.35786438,15 7.5,15 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M5,10.61939 C5.44938571,10.8388082 5.95597474,11.0190757 6.5,11.1227384 L6.5,9.49236391 C6.5,9.22043883 6.71403503,9 7.00468445,9 L7.99531555,9 C8.27404508,9 8.5,9.22083202 8.5,9.49236391 L8.5,11.1227384 C9.04402526,11.0190757 9.55061429,10.8388082 10,10.61939 L10,9.29064941 C10,9.07491318 10.15625,8.82189941 10.3610229,8.71951294 L10.6389771,8.58053589 C10.8383645,8.48084215 11,8.57870388 11,8.79222202 L11,10.0055131 C11.4736222,9.64428751 11.8034056,9.2681041 11.93558,8.97884615 L12,8.97884615 L12,5.97884615 C11.9656127,5.16017064 9.96409301,4.5 7.5,4.5 C5.03590699,4.5 3.03438733,5.16017064 3.00043836,5.97884615 L3,8.97884615 L3.06442003,8.97884615 C3.19659437,9.2681041 3.52637785,9.64428751 4,10.0055131 L4,8.79222202 C4,8.57870388 4.16163548,8.48084215 4.36102295,8.58053589 L4.63897705,8.71951294 C4.84375,8.82189941 5,9.07491318 5,9.29064941 L5,10.61939 Z M7.5,7.5 C9.709139,7.5 11.5,6.94035594 11.5,6.25 C11.5,5.55964406 9.709139,5 7.5,5 C5.290861,5 3.5,5.55964406 3.5,6.25 C3.5,6.94035594 5.290861,7.5 7.5,7.5 Z M6,6 L9,6 L9.7741333,6.81552907 C9.7741333,6.81552907 8.61260621,7 7.5,7 C6.38739379,7 5.27790527,6.81552907 5.27790527,6.81552907 L6,6 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-141.000000, -333.000000)">
-            <g id="wayside_shrine-s" transform="translate(142.000000, 334.000000)">
-                <use id="Oval" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-stadium-s.svg b/data/styles/clear/style-clear/symbols/olympic-stadium-s.svg
deleted file mode 100644
index 03dad8e863..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-stadium-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-stadium-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M7.5,15 C11.6421356,15 15,11.6421356 15,7.5 C15,3.35786438 11.6421356,0 7.5,0 C3.35786438,0 0,3.35786438 0,7.5 C0,11.6421356 3.35786438,15 7.5,15 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M6.5,11.1227384 C4.73937855,10.7872564 3.37084716,9.64944896 3.06442003,8.97884615 L3,8.97884615 L3,5.97884615 C3.03205888,5.21632108 4.77060664,4.59130377 7,4.5091548 L7,4 L8,4 L8,4.5091548 C10.2293934,4.59130377 11.9679411,5.21632108 11.9995616,5.97884615 L12,8.97884615 L11.93558,8.97884615 C11.6291528,9.64944896 10.2606214,10.7872564 8.5,11.1227384 L8.5,9.49236391 C8.5,9.22083202 8.27404508,9 7.99531555,9 L7.00468445,9 C6.71403503,9 6.5,9.22043883 6.5,9.49236391 L6.5,11.1227384 Z M7.5,7.5 C9.709139,7.5 11.5,6.94035594 11.5,6.25 C11.5,5.55964406 9.709139,5 7.5,5 C5.290861,5 3.5,5.55964406 3.5,6.25 C3.5,6.94035594 5.290861,7.5 7.5,7.5 Z M6,3 L9,3 L9,4 L6,4 L6,3 Z M6,6 L9,6 L9.7741333,6.81552907 C9.7741333,6.81552907 8.61260621,7 7.5,7 C6.38739379,7 5.27790527,6.81552907 5.27790527,6.81552907 L6,6 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-141.000000, -372.000000)">
-            <g id="wayside_shrine-s" transform="translate(142.000000, 373.000000)">
-                <use id="Oval" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-subway-l.svg b/data/styles/clear/style-clear/symbols/olympic-subway-l.svg
deleted file mode 100644
index 3a81bdb8d3..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-subway-l.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-subway-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M3,0.3622 L0,2.3622 L0,13.3622 C0,13.8622 0.5,14.3622 1,14.3622 L3.5,14.3622 L7,14.3622 L9.5,14.3622 L12,14.3622 C12.5,14.3622 13,13.8622 13,13.3622 L13,2.3622 L10,0.3622 L3,0.3622 Z M4,2.3622 L9,2.3622 L11,3.3622 L11,6.3622 L2,6.3622 L2,3.3622 L4,2.3622 Z M3,10.3622 C3.554,10.3622 4,10.8082 4,11.3622 C4,11.9162 3.554,12.3622 3,12.3622 C2.446,12.3622 2,11.9162 2,11.3622 C2,10.8082 2.446,10.3622 3,10.3622 L3,10.3622 Z M10,10.3622 C10.554,10.3622 11,10.8082 11,11.3622 C11,11.9162 10.554,12.3622 10,12.3622 C9.446,12.3622 9,11.9162 9,11.3622 C9,10.8082 9.446,10.3622 10,10.3622 L10,10.3622 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-213.000000, -394.000000)">
-            <g id="subway-l" transform="translate(214.000000, 395.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="g24855" transform="translate(6.000000, 5.000000)">
-                    <g id="path24859">
-                        <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                        <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-subway-m.svg b/data/styles/clear/style-clear/symbols/olympic-subway-m.svg
deleted file mode 100644
index e6c959320b..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-subway-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-subway-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M6.95762217,4.03583644 L4.95762217,5.53583644 L5,15.0049207 C5.01536083,15.5049207 5.51536083,16.0049207 6.01536083,16.0049207 L15.0153608,16.0049207 C15.5153608,16.0049207 16.0078669,15.6758134 16,15.0049207 L15.9576222,5.53583644 L13.9576222,4.03583644 L6.95762217,4.03583644 Z M8.57605219,6.04136763 L12.5760522,6.04136763 L14,7.14000509 L14,10.9843851 L7,10.9843851 L7,7.14000509 L8.57605219,6.04136763 Z M8,13.6122 C8,14.026414 7.66421,14.3622 7.25,14.3622 C6.83579,14.3622 6.5,14.026414 6.5,13.6122 C6.5,13.197986 6.83579,12.8622 7.25,12.8622 C7.66421,12.8622 8,13.197986 8,13.6122 Z M13.75,12.8622 C14.16421,12.8622 14.5,13.197986 14.5,13.6122 C14.5,14.026414 14.16421,14.3622 13.75,14.3622 C13.33579,14.3622 13,14.026414 13,13.6122 C13,13.197986 13.33579,12.8622 13.75,12.8622 L13.75,12.8622 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-250.000000, -396.000000)">
-            <g id="subway-m" transform="translate(251.000000, 397.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="path24869">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-subway-s.svg b/data/styles/clear/style-clear/symbols/olympic-subway-s.svg
deleted file mode 100644
index 1ed55ea296..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-subway-s.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-subway-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M5.5,3 L4,4.14285714 L4,10.4285714 C4,10.7142857 4.25,11 4.5,11 L5.75,11 L8,11 L9.25,11 L10.5,11 C10.75,11 11,10.7142857 11,10.4285714 L11,4.14285714 L9.5,3 L5.5,3 Z M6,4.14285714 L9,4.14285714 L10,4.71428571 L10,6.42857143 L5,6.42857143 L5,4.71428571 L6,4.14285714 Z M5.5,8.71428571 C5.777,8.71428571 6,8.96914286 6,9.28571429 C6,9.60228571 5.777,9.85714286 5.5,9.85714286 C5.223,9.85714286 5,9.60228571 5,9.28571429 C5,8.96914286 5.223,8.71428571 5.5,8.71428571 L5.5,8.71428571 Z M9.5,8.71428571 C9.777,8.71428571 10,8.96914286 10,9.28571429 C10,9.60228571 9.777,9.85714286 9.5,9.85714286 C9.223,9.85714286 9,9.60228571 9,9.28571429 C9,8.96914286 9.223,8.71428571 9.5,8.71428571 L9.5,8.71428571 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-283.000000, -399.000000)">
-            <g id="subway-s" transform="translate(284.000000, 400.000000)">
-                <g id="g24875">
-                    <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                    <g id="path24879">
-                        <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                        <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-subway-xs.svg b/data/styles/clear/style-clear/symbols/olympic-subway-xs.svg
deleted file mode 100644
index f344ab5521..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-subway-xs.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="10px" height="10px" viewBox="0 0 10 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-subway-xs</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <circle id="path-1" cx="4.9874153" cy="5" r="4"></circle>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="8" height="8" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <rect id="path-4" x="3" y="3" width="4" height="4" rx="1"></rect>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-310.000000, -403.000000)">
-            <g id="subway-xs" transform="translate(310.000000, 403.000000)">
-                <circle id="Oval-139-Copy" fill-opacity="0.6" fill="#FFFFFF" cx="5" cy="5" r="5"></circle>
-                <use id="Oval-139" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Rectangle-307">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-tourism-l.svg b/data/styles/clear/style-clear/symbols/olympic-tourism-l.svg
deleted file mode 100644
index 2b80748906..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-tourism-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-tourism-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M25,12.5 C25,19.403 19.403,25 12.5,25 C5.597,25 0,19.403 0,12.5 C0,5.597 5.597,0 12.5,0 C19.403,0 25,5.597 25,12.5 L25,12.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#FCB131" offset="0%"></stop>
-            <stop stop-color="#F34320" offset="100%"></stop>
-        </linearGradient>
-        <polygon id="path-4" points="7.85984848 19 12.5 16.6047745 17.1401515 19 16.25 13.9310345 20 10.3474801 14.8106061 9.60477454 12.5 5 10.1893939 9.60477454 5 10.3474801 8.75 13.9310345"></polygon>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-71.000000, -171.000000)">
-            <g id="wayside_shrine-l" transform="translate(72.000000, 172.000000)">
-                <use id="Shape" stroke="#E74A20" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.75" fill="#E74A20" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-tourism-m.svg b/data/styles/clear/style-clear/symbols/olympic-tourism-m.svg
deleted file mode 100644
index 69c6b0d8ea..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-tourism-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-tourism-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M21,10.5 C21,16.299 16.299,21 10.5,21 C4.701,21 0,16.299 0,10.5 C0,4.701 4.701,0 10.5,0 C16.299,0 21,4.701 21,10.5 L21,10.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#FCB131" offset="0%"></stop>
-            <stop stop-color="#F34320" offset="100%"></stop>
-        </linearGradient>
-        <polygon id="path-4" points="6.47853535 16 10.5 13.9469496 14.5214646 16 13.75 11.6551724 17 8.58355438 12.5025253 7.9469496 10.5 4 8.49747475 7.9469496 4 8.58355438 7.25 11.6551724"></polygon>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-108.000000, -173.000000)">
-            <g id="wayside_shrine-m" transform="translate(109.000000, 174.000000)">
-                <use id="Shape" stroke="#E74A20" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.75" fill="#E74A20" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-tourism-s.svg b/data/styles/clear/style-clear/symbols/olympic-tourism-s.svg
deleted file mode 100644
index 3c4790c1e2..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-tourism-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-tourism-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M7.5,15 C11.6421356,15 15,11.6421356 15,7.5 C15,3.35786438 11.6421356,0 7.5,0 C3.35786438,0 0,3.35786438 0,7.5 C0,11.6421356 3.35786438,15 7.5,15 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#FCB131" offset="0%"></stop>
-            <stop stop-color="#F34320" offset="100%"></stop>
-        </linearGradient>
-        <polygon id="path-4" points="4.71590909 11 7.5 9.63129973 10.2840909 11 9.75 8.10344828 12 6.05570292 8.88636364 5.63129973 7.5 3 6.11363636 5.63129973 3 6.05570292 5.25 8.10344828"></polygon>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-141.000000, -176.000000)">
-            <g id="wayside_shrine-s" transform="translate(142.000000, 177.000000)">
-                <use id="Oval" stroke="#E74A20" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.75" fill="#E74A20" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-train-l.svg b/data/styles/clear/style-clear/symbols/olympic-train-l.svg
deleted file mode 100644
index 19c2c80cea..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-train-l.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-train-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M10.25,18 L11,18 L9.46311476,21 L15.5368852,21 L14,18 L14.75,18 L13,18 L10.25,18 Z M9.31250001,18 L9.12500001,18 L6.00000001,24 L7.875,24.1 L8.4385246,23 L16.5614754,23 L17.125,24.1 L19,24 L15.875,18 L15.6875,18 L18,18 C18.5,18 19,17.5 19,17 L19,6.9955775 C19,6.44573523 18.6321411,5.75476074 18.1643327,5.4428885 L16.8356673,4.5571115 C16.374141,4.24942732 15.5621186,4 14.9970707,4 L10.0029293,4 C9.44902676,4 8.63214111,4.24523926 8.16433275,4.5571115 L6.83566725,5.4428885 C6.37414097,5.75057268 6,6.44483697 6,6.9955775 L6,17 C6,17.5 6.5,18 7,18 L9.31250001,18 Z M9.10529494,6.44735253 C9.5994269,6.20028655 10.4437166,6 10.9998075,6 L14.0001925,6 C14.5523709,6 15.4047298,6.20236492 15.8947051,6.44735253 L16.1052949,6.55264747 C16.5994269,6.79971345 17,7.44335318 17,8.0093689 L17,9.9906311 C17,10.5480902 16.5536886,11 16.0024554,11 L8.99754465,11 C8.44661595,11 8,10.5566468 8,9.9906311 L8,8.0093689 C8,7.45190985 8.40472984,6.79763508 8.89470506,6.55264747 L9.10529494,6.44735253 Z M9,14 C9.554,14 10,14.446 10,15 C10,15.554 9.554,16 9,16 C8.446,16 8,15.554 8,15 C8,14.446 8.446,14 9,14 Z M16,14 C16.554,14 17,14.446 17,15 C17,15.554 16.554,16 16,16 C15.446,16 15,15.554 15,15 C15,14.446 15.446,14 16,14 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-214.000000, -288.000000)">
-            <g id="train-l" transform="translate(215.000000, 289.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-                <g id="g24855" transform="translate(6.000000, 4.000000)"></g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-train-m.svg b/data/styles/clear/style-clear/symbols/olympic-train-m.svg
deleted file mode 100644
index ee62c1a797..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-train-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-train-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M7.9881561,2.03459562 C7.43616181,2.03459562 6.623115,2.30963415 6.18949229,2.63587515 L5.79476211,2.93285492 C5.35338181,3.26493243 4.9976093,3.99070765 5.0000121,4.52928925 L5.0378042,13.0003074 C5.05311212,13.5001537 5.55138953,14 6.04966694,14 L15.0186604,14 C15.5169378,14 16.0077471,13.6709939 15.9999073,13.0003074 L15.9621152,4.52928925 C15.9596632,3.97968043 15.5921085,3.25909592 15.1584858,2.93285492 L14.7637556,2.63587515 C14.3223753,2.30379764 13.5068586,2.03459562 12.9650918,2.03459562 L7.9881561,2.03459562 Z M7.37916245,4.76597573 C7.75492901,4.3647599 8.49978057,4.03951021 9.06342775,4.03951021 L12.0164082,4.03951021 C12.5708357,4.03951021 13.3216338,4.37500414 13.6946598,4.79030102 L14.0067977,5.1378099 L14.0067977,7.97125292 C14.0067977,8.52892524 13.5490904,8.98100797 13.0073236,8.98100797 L8.03038793,8.98100797 C7.47839364,8.98100797 7.03091386,8.54014429 7.03091386,7.97125292 L7.03091386,5.1378099 L7.37916245,4.76597573 Z M8.02746869,11.6080149 C8.02746869,12.0221016 7.69283554,12.3577844 7.28005257,12.3577844 C6.86726959,12.3577844 6.53263645,12.0221016 6.53263645,11.6080149 C6.53263645,11.1939283 6.86726959,10.8582455 7.28005257,10.8582455 C7.69283554,10.8582455 8.02746869,11.1939283 8.02746869,11.6080149 Z M7.95833334,16 L9.00000001,14 L7.12500001,14 L4.00000001,20 L5.875,20 L6.91666667,18 L14.0833333,18 L15.125,20 L17,20 L13.875,14 L12,14 L13.0416667,16 L7.95833334,16 Z M13.757659,10.8582455 C14.1704419,10.8582455 14.5050751,11.1939283 14.5050751,11.6080149 C14.5050751,12.0221016 14.1704419,12.3577844 13.757659,12.3577844 C13.344876,12.3577844 13.0102428,12.0221016 13.0102428,11.6080149 C13.0102428,11.1939283 13.344876,10.8582455 13.757659,10.8582455 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-251.000000, -290.000000)">
-            <g id="train-m" transform="translate(252.000000, 291.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-train-s.svg b/data/styles/clear/style-clear/symbols/olympic-train-s.svg
deleted file mode 100644
index 08863e2bdb..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-train-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-train-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M5.86363637,12 L7.00000001,10 L5.50000001,10 L3,14.4 L4.5,14.4 L5.29545455,13 L9.70454545,13 L10.5,14.4 L12,14.4 L9.49999999,10 L7.99999999,10 L9.13636363,12 L5.86363637,12 Z M6.5093689,2 C5.95190985,2 5.13689184,2.27665383 4.69730425,2.61157772 L4.80269575,2.53127943 C4.35937913,2.86904447 4,3.59491021 4,4.15276589 L4,9.4285714 C4,9.7142857 4.25,10 4.5,10 L5.75,10 L8,10 L9.25,10 L10.5,10 C10.75,10 11,9.7142857 11,9.4285714 L11,4.15276589 C11,3.59500869 10.6368918,2.86620331 10.1973042,2.53127943 L10.3026958,2.61157772 C9.8593791,2.27381267 9.0566468,2 8.4906311,2 L6.5093689,2 Z M6,3.14285714 L9,3.14285714 L10,3.71428571 L10,5.42857143 L5,5.42857143 L5,3.71428571 L6,3.14285714 Z M5.5,7.71428571 C5.777,7.71428571 6,7.96914286 6,8.28571429 C6,8.60228571 5.777,8.85714286 5.5,8.85714286 C5.223,8.85714286 5,8.60228571 5,8.28571429 C5,7.96914286 5.223,7.71428571 5.5,7.71428571 Z M9.5,7.71428571 C9.777,7.71428571 10,7.96914286 10,8.28571429 C10,8.60228571 9.777,8.85714286 9.5,8.85714286 C9.223,8.85714286 9,8.60228571 9,8.28571429 C9,7.96914286 9.223,7.71428571 9.5,7.71428571 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-284.000000, -293.000000)">
-            <g id="train-s" transform="translate(285.000000, 294.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-train-xs.svg b/data/styles/clear/style-clear/symbols/olympic-train-xs.svg
deleted file mode 100644
index 5e8bb2a8b3..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-train-xs.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="10px" height="10px" viewBox="0 0 10 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-train-xs</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <circle id="path-1" cx="5" cy="5" r="5"></circle>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="10" height="10" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <rect id="path-4" x="3" y="3" width="4" height="4" rx="1"></rect>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-310.000000, -297.000000)">
-            <g id="subway-newyork-xs" transform="translate(310.000000, 297.000000)">
-                <use id="Oval-139" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Rectangle-307">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-tram-l.svg b/data/styles/clear/style-clear/symbols/olympic-tram-l.svg
deleted file mode 100644
index e5678e854c..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-tram-l.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-tram-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M4.00292933,4 C3.44902676,4 2.63214111,4.24523926 2.16433275,4.5571115 L0.835667253,5.4428885 C0.374140973,5.75057268 0,6.44483697 0,6.9955775 L0,17 C0,17.5 0.5,18 1,18 L3.5,18 L7,18 L9.5,18 L12,18 C12.5,18 13,17.5 13,17 L13,6.9955775 C13,6.44573523 12.6321411,5.75476074 12.1643327,5.4428885 L10.8356673,4.5571115 C10.374141,4.24942732 9.56211865,4 8.99707067,4 L4.00292933,4 Z M3.10529494,6.44735253 C3.5994269,6.20028655 4.44371665,6 4.99980749,6 L8.00019251,6 C8.55237094,6 9.40472984,6.20236492 9.89470506,6.44735253 L10.1052949,6.55264747 C10.5994269,6.79971345 11,7.44335318 11,8.0093689 L11,9.9906311 C11,10.5480902 10.5536886,11 10.0024554,11 L2.99754465,11 C2.44661595,11 2,10.5566468 2,9.9906311 L2,8.0093689 C2,7.45190985 2.40472984,6.79763508 2.89470506,6.55264747 L3.10529494,6.44735253 Z M3,14 C3.554,14 4,14.446 4,15 C4,15.554 3.554,16 3,16 C2.446,16 2,15.554 2,15 C2,14.446 2.446,14 3,14 L3,14 Z M10,14 C10.554,14 11,14.446 11,15 C11,15.554 10.554,16 10,16 C9.446,16 9,15.554 9,15 C9,14.446 9.446,14 10,14 Z M1,1 C1,0.44771525 1.44483697,0 1.9955775,0 L11.0044225,0 C11.5542648,0 12,0.443864822 12,1 C12,1.55228475 11.555163,2 11.0044225,2 L1.9955775,2 C1.44573523,2 1,1.55613518 1,1 Z M8,2 L9,2 L9,4 L8,4 L8,2 Z M4,2 L5,2 L5,4 L4,4 L4,2 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-214.000000, -251.000000)">
-            <g id="tram-l" transform="translate(215.000000, 252.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="g24855" transform="translate(6.000000, 3.000000)">
-                    <g id="path24859">
-                        <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                        <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-tram-m.svg b/data/styles/clear/style-clear/symbols/olympic-tram-m.svg
deleted file mode 100644
index 7d766f1a14..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-tram-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-tram-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M12.9862193,6.0347299 L12.9862193,3.9993851 L11.9896645,3.9993851 L11.9896645,6.03459562 L8.98621931,6.03459562 L8.98621931,3.9993851 L7.98966449,3.9993851 L7.98966449,6.03459562 L7.9881561,6.03459562 C7.43616181,6.03459562 6.623115,6.30963415 6.18949229,6.63587515 L5.79476211,6.93285492 C5.35338181,7.26493243 4.9976093,7.99070765 5.0000121,8.52928925 L5.0378042,17.0003074 C5.05311212,17.5001537 5.55138953,18 6.04966694,18 L15.0186604,18 C15.5169378,18 16.0077471,17.6709939 15.9999073,17.0003074 L15.9621152,8.52928925 C15.9596632,7.97968043 15.5921085,7.25909592 15.1584858,6.93285492 L14.7637556,6.63587515 C14.328076,6.30808666 13.5278622,6.04155999 12.9862193,6.0347299 Z M7.37916245,8.76597573 C7.75492901,8.3647599 8.49978057,8.03951021 9.06342775,8.03951021 L12.0164082,8.03951021 C12.5708357,8.03951021 13.3216338,8.37500414 13.6946598,8.79030102 L14.0067977,9.1378099 L14.0067977,11.9712529 C14.0067977,12.5289252 13.5490904,12.981008 13.0073236,12.981008 L8.03038793,12.981008 C7.47839364,12.981008 7.03091386,12.5401443 7.03091386,11.9712529 L7.03091386,9.1378099 L7.37916245,8.76597573 Z M8.02746869,15.6080149 C8.02746869,16.0221016 7.69283554,16.3577844 7.28005257,16.3577844 C6.86726959,16.3577844 6.53263645,16.0221016 6.53263645,15.6080149 C6.53263645,15.1939283 6.86726959,14.8582455 7.28005257,14.8582455 C7.69283554,14.8582455 8.02746869,15.1939283 8.02746869,15.6080149 Z M13.757659,14.8582455 C14.1704419,14.8582455 14.5050751,15.1939283 14.5050751,15.6080149 C14.5050751,16.0221016 14.1704419,16.3577844 13.757659,16.3577844 C13.344876,16.3577844 13.0102428,16.0221016 13.0102428,15.6080149 C13.0102428,15.1939283 13.344876,14.8582455 13.757659,14.8582455 Z M6.03435903,2.99969255 C6.03435903,2.4475776 6.49146335,2 7.02846697,2 L14.0092446,2 C14.5582752,2 15.0033525,2.44372836 15.0033525,2.99969255 C15.0033525,3.5518075 14.5462482,3.9993851 14.0092446,3.9993851 L7.02846697,3.9993851 C6.47943632,3.9993851 6.03435903,3.55565675 6.03435903,2.99969255 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-251.000000, -253.000000)">
-            <g id="tram-m" transform="translate(252.000000, 254.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="path24869">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-tram-s.svg b/data/styles/clear/style-clear/symbols/olympic-tram-s.svg
deleted file mode 100644
index da356b7355..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-tram-s.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-tram-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M9,5.0579843 C9.47176033,5.15576112 9.9815405,5.366888 10.3026958,5.61157772 L10.1973042,5.53127943 C10.6368918,5.86620331 11,6.59500869 11,7.15276589 L11,12.4285714 C11,12.7142857 10.75,13 10.5,13 L9.25,13 L8,13 L5.75,13 L4.5,13 C4.25,13 4,12.7142857 4,12.4285714 L4,7.15276589 C4,6.59491021 4.35937913,5.86904447 4.80269575,5.53127943 L4.69730425,5.61157772 C5.01506149,5.36947696 5.52898734,5.15782327 6,5.05910079 L6,4 L7,4 L7,5 L8,5 L8,4 L9,4 L9,5.0579843 Z M6,6.14285714 L9,6.14285714 L10,6.71428571 L10,8.42857143 L5,8.42857143 L5,6.71428571 L6,6.14285714 Z M5.5,10.7142857 C5.777,10.7142857 6,10.9691429 6,11.2857143 C6,11.6022857 5.777,11.8571429 5.5,11.8571429 C5.223,11.8571429 5,11.6022857 5,11.2857143 C5,10.9691429 5.223,10.7142857 5.5,10.7142857 L5.5,10.7142857 Z M9.5,10.7142857 C9.777,10.7142857 10,10.9691429 10,11.2857143 C10,11.6022857 9.777,11.8571429 9.5,11.8571429 C9.223,11.8571429 9,11.6022857 9,11.2857143 C9,10.9691429 9.223,10.7142857 9.5,10.7142857 Z M4,3.5 C4,3.22385763 4.23290253,3 4.50342274,3 L10.4965773,3 C10.77461,3 11,3.23193359 11,3.5 C11,3.77614237 10.7670975,4 10.4965773,4 L4.50342274,4 C4.22539004,4 4,3.76806641 4,3.5 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-284.000000, -256.000000)">
-            <g id="tram-s" transform="translate(285.000000, 257.000000)">
-                <g id="g24875">
-                    <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                    <g id="path24879">
-                        <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                        <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-view-l.svg b/data/styles/clear/style-clear/symbols/olympic-view-l.svg
deleted file mode 100644
index 7353f387e6..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-view-l.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-view-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M25,12.5 C25,19.403 19.403,25 12.5,25 C5.597,25 0,19.403 0,12.5 C0,5.597 5.597,0 12.5,0 C19.403,0 25,5.597 25,12.5 L25,12.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#FCB131" offset="0%"></stop>
-            <stop stop-color="#F34320" offset="100%"></stop>
-        </linearGradient>
-        <path d="M2.25,11.25 C3.07842712,11.25 3.75,10.5784271 3.75,9.75 C3.75,8.92157288 3.07842712,8.25 2.25,8.25 C1.42157288,8.25 0.75,8.92157288 0.75,9.75 C0.75,10.5784271 1.42157288,11.25 2.25,11.25 Z M7.5,11.25 C8.32842712,11.25 9,10.5784271 9,9.75 C9,8.92157288 8.32842712,8.25 7.5,8.25 C6.67157288,8.25 6,8.92157288 6,9.75 C6,10.5784271 6.67157288,11.25 7.5,11.25 Z M12.75,11.25 C13.5784271,11.25 14.25,10.5784271 14.25,9.75 C14.25,8.92157288 13.5784271,8.25 12.75,8.25 C11.9215729,8.25 11.25,8.92157288 11.25,9.75 C11.25,10.5784271 11.9215729,11.25 12.75,11.25 Z M3.75,12 L0.75,12 C0.3,12 0,12.3 0,12.75 L0,15 L4.5,15 L4.5,12.75 C4.5,12.3 4.2,12 3.75,12 Z M14.25,12 L11.25,12 C10.8,12 10.5,12.3 10.5,12.75 L10.5,15 L15,15 L15,12.75 C15,12.3 14.7,12 14.25,12 Z M9,12 L6,12 C5.55,12 5.25,12.3 5.25,12.75 L5.25,15 L9.75,15 L9.75,12.75 C9.75,12.3 9.45,12 9,12 Z M0,6.50405791 C0,7.05410154 0.448920205,7.5 1.00748397,7.5 L13.992516,7.5 C14.5489341,7.5 15,7.05330133 15,6.50405791 L15,0.995942093 C15,0.445898464 14.5510798,3.55271368e-15 13.992516,3.55271368e-15 L1.00748397,3.55271368e-15 C0.45106594,3.55271368e-15 0,0.446698666 0,0.995942093 L0,6.50405791 Z M6.5,2.30450982 C6.5,1.86019131 6.78765261,1.71573946 7.13622284,1.97716713 L8.86377716,3.27283287 C9.21515333,3.536365 9.21234739,3.96573946 8.86377716,4.22716713 L7.13622284,5.52283287 C6.78484667,5.786365 6.5,5.64689255 6.5,5.19549018 L6.5,2.30450982 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-71.000000, -208.000000)">
-            <g id="wayside_shrine-l" transform="translate(72.000000, 209.000000)">
-                <use id="Shape" stroke="#E74A20" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="noun_379599_cc" transform="translate(5.000000, 5.000000)">
-                    <g id="Group">
-                        <g transform="translate(0.000000, 0.000000)" id="Combined-Shape">
-                            <g>
-                                <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                                <use fill-opacity="0.75" fill="#E74A20" xlink:href="#path-4"></use>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-view-m.svg b/data/styles/clear/style-clear/symbols/olympic-view-m.svg
deleted file mode 100644
index 2fb401a15f..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-view-m.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-view-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M21,10.5 C21,16.299 16.299,21 10.5,21 C4.701,21 0,16.299 0,10.5 C0,4.701 4.701,0 10.5,0 C16.299,0 21,4.701 21,10.5 L21,10.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#FCB131" offset="0%"></stop>
-            <stop stop-color="#F34320" offset="100%"></stop>
-        </linearGradient>
-        <path d="M1.95,9.75 C2.66797017,9.75 3.25,9.16797017 3.25,8.45 C3.25,7.73202983 2.66797017,7.15 1.95,7.15 C1.23202983,7.15 0.65,7.73202983 0.65,8.45 C0.65,9.16797017 1.23202983,9.75 1.95,9.75 Z M6.49999995,9.75 C7.2179701,9.75 7.7999999,9.16797017 7.7999999,8.45 C7.7999999,7.73202983 7.2179701,7.15 6.49999995,7.15 C5.7820298,7.15 5.2,7.73202983 5.2,8.45 C5.2,9.16797017 5.7820298,9.75 6.49999995,9.75 Z M11.05,9.75 C11.7679702,9.75 12.35,9.16797017 12.35,8.45 C12.35,7.73202983 11.7679702,7.15 11.05,7.15 C10.3320298,7.15 9.75,7.73202983 9.75,8.45 C9.75,9.16797017 10.3320298,9.75 11.05,9.75 Z M2.99999992,10.5 L0.599999984,10.5 C0.239999994,10.5 -8.8817842e-16,10.75 -8.8817842e-16,11.125 L-8.8817842e-16,13 L3.5999999,13 L3.5999999,11.125 C3.5999999,10.75 3.35999991,10.5 2.99999992,10.5 Z M12.4000014,10.5 L10.0000015,10.5 C9.64000152,10.5 9.40000153,10.75 9.40000153,11.125 L9.40000153,13 L13.0000014,13 L13.0000014,11.125 C13.0000014,10.75 12.7600014,10.5 12.4000014,10.5 Z M7.69999687,10.5 L5.29999693,10.5 C4.93999694,10.5 4.69999695,10.75 4.69999695,11.125 L4.69999695,13 L8.29999685,13 L8.29999685,11.125 C8.29999685,10.75 8.05999686,10.5 7.69999687,10.5 Z M-8.8817842e-16,5.90014648 C-8.8817842e-16,6.23143643 0.271523476,6.5 0.592363715,6.5 L12.4076363,6.5 C12.7347897,6.5 13,6.23714179 13,5.90014648 L13,0.599853516 C13,0.268563567 12.7284765,0 12.4076363,0 L0.592363715,0 C0.265210269,0 -8.8817842e-16,0.262858212 -8.8817842e-16,0.599853516 L-8.8817842e-16,5.90014648 Z M5.5,1.69815903 C5.5,1.47826187 5.63978729,1.40752869 5.81881102,1.54523926 L7.78118888,3.05476074 C7.95726335,3.19020264 7.96021262,3.40752869 7.78118888,3.54523926 L5.81881102,5.05476074 C5.64273656,5.19020264 5.5,5.128125 5.5,4.90184097 L5.5,1.69815903 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-108.000000, -210.000000)">
-            <g id="wayside_shrine-m" transform="translate(109.000000, 211.000000)">
-                <use id="Shape" stroke="#E74A20" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="noun_379599_cc" transform="translate(4.000000, 4.000000)">
-                    <g id="Group">
-                        <g id="Combined-Shape">
-                            <g>
-                                <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                                <use fill-opacity="0.75" fill="#E74A20" xlink:href="#path-4"></use>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-view-s.svg b/data/styles/clear/style-clear/symbols/olympic-view-s.svg
deleted file mode 100644
index be766fe10b..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-view-s.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-view-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M7.5,15 C11.6421356,15 15,11.6421356 15,7.5 C15,3.35786438 11.6421356,0 7.5,0 C3.35786438,0 0,3.35786438 0,7.5 C0,11.6421356 3.35786438,15 7.5,15 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#FCB131" offset="0%"></stop>
-            <stop stop-color="#F34320" offset="100%"></stop>
-        </linearGradient>
-        <path d="M7.49999845,6.79999995 C7.99705471,6.79999995 8.39999843,6.39705624 8.39999843,5.89999998 C8.39999843,5.40294371 7.99705471,5 7.49999845,5 C7.00294219,5 6.59999847,5.40294371 6.59999847,5.89999998 C6.59999847,6.39705624 7.00294219,6.79999995 7.49999845,6.79999995 Z M1.49999845,6.79999995 C1.99705471,6.79999995 2.39999843,6.39705624 2.39999843,5.89999998 C2.39999843,5.40294371 1.99705471,5 1.49999845,5 C1.00294219,5 0.599998474,5.40294371 0.599998474,5.89999998 C0.599998474,6.39705624 1.00294219,6.79999995 1.49999845,6.79999995 Z M4.49999845,6.79999995 C4.99705471,6.79999995 5.39999843,6.39705624 5.39999843,5.89999998 C5.39999843,5.40294371 4.99705471,5 4.49999845,5 C4.00294219,5 3.59999847,5.40294371 3.59999847,5.89999998 C3.59999847,6.39705624 4.00294219,6.79999995 4.49999845,6.79999995 Z M6.5,8 C6.5,7.44771525 6.94386482,7 7.5,7 C8.05228475,7 8.5,7.44386482 8.5,8 L8.5,9 L6.5,9 L6.5,8 Z M3.5,8 C3.5,7.44771525 3.94386482,7 4.5,7 C5.05228475,7 5.5,7.44386482 5.5,8 L5.5,9 L3.5,9 L3.5,8 Z M0.5,8 C0.5,7.44771525 0.943864822,7 1.5,7 C2.05228475,7 2.5,7.44386482 2.5,8 L2.5,9 L0.5,9 L0.5,8 Z M0,4.00122768 C0,4.27669202 0.222473145,4.5 0.509665847,4.5 L8.49033415,4.5 C8.77181483,4.5 9,4.28295565 9,4.00122768 L9,0.498772323 C9,0.223307975 8.77752686,0 8.49033415,0 L0.509665847,0 C0.228185172,0 0,0.217044353 0,0.498772323 L0,4.00122768 Z M3.80000305,1.30117173 C3.80000305,1.0796107 3.94124603,1.00985565 4.11353912,1.14386139 L5.28646698,2.05613859 C5.45962817,2.19081952 5.45876007,2.40985563 5.28646698,2.54386136 L4.11353912,3.45613857 C3.94037793,3.59081949 3.80000305,3.51628414 3.80000305,3.29882823 L3.80000305,1.30117173 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-141.000000, -213.000000)">
-            <g id="wayside_shrine-s" transform="translate(142.000000, 214.000000)">
-                <use id="Oval" stroke="#E74A20" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="noun_379599_cc" transform="translate(3.000000, 3.000000)">
-                    <g id="Group">
-                        <g id="Combined-Shape">
-                            <g>
-                                <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                                <use fill-opacity="0.75" fill="#E74A20" xlink:href="#path-4"></use>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-water-l.svg b/data/styles/clear/style-clear/symbols/olympic-water-l.svg
deleted file mode 100644
index 0e97637fc1..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-water-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-water-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M25,12.5 C25,19.403 19.403,25 12.5,25 C5.597,25 0,19.403 0,12.5 C0,5.597 5.597,0 12.5,0 C19.403,0 25,5.597 25,12.5 L25,12.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M20,7 L20,8.50840224 C19.6679114,8.50840224 19.3318218,8.66444385 19.0757535,8.97252601 C18.5276074,9.63270205 17.791411,10.0008002 16.9991998,10.0008002 C16.2069885,10.0008002 15.4707922,9.63270205 14.922646,8.97252601 C14.4145105,8.3563617 13.5862897,8.3563617 13.0781542,8.97252601 C12.530008,9.63270205 11.7938117,10.0008002 11.0016004,10.0008002 C10.2053881,10.0008002 9.47319285,9.63270205 8.92504668,8.97252601 C8.41691118,8.3563617 7.58869032,8.3563617 7.08055481,8.97252601 C6.53240864,9.63270205 5.79621232,10.0008002 5.00400107,10.0008002 L5.00400107,8.4763937 C5.33208856,8.4763937 5.67217925,8.32435316 5.92824753,8.02027207 C6.4763937,7.36009603 7.21259002,7 8.00480128,7 C8.8010136,7 9.53320886,7.36009603 10.081355,8.02027207 C10.5894905,8.63643638 11.4177114,8.63643638 11.9258469,8.02027207 C12.4739931,7.36009603 13.2101894,7 14.0024006,7 C14.798613,7 15.5308082,7.36009603 16.0789544,8.02027207 C16.591091,8.63643638 17.4153107,8.63643638 17.9234463,8.02027207 C18.4715924,7.36009603 19.2037877,7 20,7 Z M20,14.4979995 L20,16.0064017 C19.6679114,16.0064017 19.3318218,16.1624433 19.0757535,16.4705255 C18.5276074,17.1307015 17.791411,17.4987997 16.9991998,17.4987997 C16.2069885,17.4987997 15.4707922,17.1307015 14.922646,16.4705255 C14.4145105,15.8543612 13.5862897,15.8543612 13.0781542,16.4705255 C12.530008,17.1307015 11.7938117,17.4987997 11.0016004,17.4987997 C10.2053881,17.4987997 9.47319285,17.1307015 8.92504668,16.4705255 C8.41691118,15.8543612 7.58869032,15.8543612 7.08055481,16.4705255 C6.53240864,17.1307015 5.79621232,17.4987997 5.00400107,17.4987997 L5.00400107,15.9743932 C5.33208856,15.9743932 5.67217925,15.8223526 5.92824753,15.5182715 C6.4763937,14.8580955 7.21259002,14.4979995 8.00480128,14.4979995 C8.8010136,14.4979995 9.53320886,14.8580955 10.081355,15.5182715 C10.5894905,16.1344358 11.4177114,16.1344358 11.9258469,15.5182715 C12.4739931,14.8580955 13.2101894,14.4979995 14.0024006,14.4979995 C14.798613,14.4979995 15.5308082,14.8580955 16.0789544,15.5182715 C16.591091,16.1344358 17.4153107,16.1344358 17.9234463,15.5182715 C18.4715924,14.8580955 19.2037877,14.4979995 20,14.4979995 Z M20,10.7570019 L20,12.2734062 C19.9559883,12.257402 19.9079755,12.257402 19.8559616,12.257402 C19.523873,12.257402 19.1877834,12.4134436 18.9317151,12.7215257 C18.383569,13.3817018 17.6473726,13.7497999 16.8551614,13.7497999 C16.0629501,13.7497999 15.3267538,13.3817018 14.7786076,12.7215257 C14.2704721,12.1053614 13.4422513,12.1053614 12.9341158,12.7215257 C12.3859696,13.3817018 11.6497733,13.7497999 10.857562,13.7497999 C10.0653508,13.7497999 9.32915444,13.3817018 8.78100827,12.7215257 C8.27287277,12.1053614 7.44465191,12.1053614 6.9365164,12.7215257 C6.45638837,13.2976794 5.83222193,13.6537743 5.14403841,13.7337957 C5.10002667,13.7417978 5.05201387,13.7417978 5,13.7417978 L5,12.2093892 C5.16004268,12.2333956 5.60016004,11.9853294 5.78020806,11.7652707 C6.32835423,11.1050947 7.06455055,10.7449987 7.8567618,10.7449987 C8.64897306,10.7449987 9.38516938,11.1050947 9.93331555,11.7652707 C10.4414511,12.381435 11.2696719,12.381435 11.7778074,11.7652707 C12.3259536,11.1050947 13.0621499,10.7449987 13.8543612,10.7449987 C14.6505735,10.7449987 15.3827687,11.1050947 15.9309149,11.7652707 C16.4430515,12.381435 17.2672713,12.381435 17.7754068,11.7652707 C18.3235529,11.1050947 19.0597493,10.7449987 19.8519605,10.7449987 C19.9079755,10.7530008 19.9519872,10.7530008 20,10.7570019 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-71.000000, -250.000000)">
-            <g id="wayside_shrine-l" transform="translate(72.000000, 251.000000)">
-                <use id="Shape" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-water-m.svg b/data/styles/clear/style-clear/symbols/olympic-water-m.svg
deleted file mode 100644
index ea8101f33d..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-water-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-water-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M21,10.5 C21,16.299 16.299,21 10.5,21 C4.701,21 0,16.299 0,10.5 C0,4.701 4.701,0 10.5,0 C16.299,0 21,4.701 21,10.5 L21,10.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M17,6 L17,7.30728194 C16.7121899,7.30728194 16.4209122,7.442518 16.1989864,7.70952254 C15.7239264,8.28167511 15.0858896,8.60069352 14.3993065,8.60069352 C13.7127234,8.60069352 13.0746866,8.28167511 12.5996266,7.70952254 C12.1592425,7.17551347 11.4414511,7.17551347 11.001067,7.70952254 C10.5260069,8.28167511 9.88797013,8.60069352 9.20138704,8.60069352 C8.51133636,8.60069352 7.87676714,8.28167511 7.40170712,7.70952254 C6.96132302,7.17551347 6.24353161,7.17551347 5.80314751,7.70952254 C5.32808749,8.28167511 4.69005068,8.60069352 4.00346759,8.60069352 L4.00346759,7.27954121 C4.28781008,7.27954121 4.58255535,7.14777274 4.80448119,6.8842358 C5.27954121,6.31208322 5.91757802,6 6.60416111,6 C7.29421179,6 7.92878101,6.31208322 8.40384102,6.8842358 C8.84422513,7.41824487 9.56201654,7.41824487 10.0024006,6.8842358 C10.4774607,6.31208322 11.1154975,6 11.8020806,6 C12.4921312,6 13.1267005,6.31208322 13.6017605,6.8842358 C14.0456122,7.41824487 14.759936,7.41824487 15.2003201,6.8842358 C15.6753801,6.31208322 16.3099493,6 17,6 Z M17,12.4982662 L17,13.8055481 C16.7121899,13.8055481 16.4209122,13.9407842 16.1989864,14.2077887 C15.7239264,14.7799413 15.0858896,15.0989597 14.3993065,15.0989597 C13.7127234,15.0989597 13.0746866,14.7799413 12.5996266,14.2077887 C12.1592425,13.6737797 11.4414511,13.6737797 11.001067,14.2077887 C10.5260069,14.7799413 9.88797013,15.0989597 9.20138704,15.0989597 C8.51133636,15.0989597 7.87676714,14.7799413 7.40170712,14.2077887 C6.96132302,13.6737797 6.24353161,13.6737797 5.80314751,14.2077887 C5.32808749,14.7799413 4.69005068,15.0989597 4.00346759,15.0989597 L4.00346759,13.7778074 C4.28781008,13.7778074 4.58255535,13.6460389 4.80448119,13.382502 C5.27954121,12.8103494 5.91757802,12.4982662 6.60416111,12.4982662 C7.29421179,12.4982662 7.92878101,12.8103494 8.40384102,13.382502 C8.84422513,13.9165111 9.56201654,13.9165111 10.0024006,13.382502 C10.4774607,12.8103494 11.1154975,12.4982662 11.8020806,12.4982662 C12.4921312,12.4982662 13.1267005,12.8103494 13.6017605,13.382502 C14.0456122,13.9165111 14.759936,13.9165111 15.2003201,13.382502 C15.6753801,12.8103494 16.3099493,12.4982662 17,12.4982662 Z M17,9.25606828 L17,10.5702854 C16.9618565,10.556415 16.9202454,10.556415 16.8751667,10.556415 C16.5873566,10.556415 16.296079,10.6916511 16.0741531,10.9586556 C15.5990931,11.5308082 14.9610563,11.8498266 14.2744732,11.8498266 C13.5878901,11.8498266 12.9498533,11.5308082 12.4747933,10.9586556 C12.0344092,10.4246466 11.3166178,10.4246466 10.8762337,10.9586556 C10.4011736,11.5308082 9.76313684,11.8498266 9.07655375,11.8498266 C8.38997066,11.8498266 7.75193385,11.5308082 7.27687383,10.9586556 C6.83648973,10.4246466 6.11869832,10.4246466 5.67831422,10.9586556 C5.26220325,11.4579888 4.721259,11.7666044 4.12483329,11.8359563 C4.08668978,11.8428914 4.04507869,11.8428914 4,11.8428914 L4,10.5148039 C4.13870365,10.5356095 4.5201387,10.3206188 4.67618031,10.1299013 C5.15124033,9.55774873 5.78927714,9.24566551 6.47586023,9.24566551 C7.16244332,9.24566551 7.80048013,9.55774873 8.27554014,10.1299013 C8.71592425,10.6639104 9.43371566,10.6639104 9.87409976,10.1299013 C10.3491598,9.55774873 10.9871966,9.24566551 11.6737797,9.24566551 C12.3638304,9.24566551 12.9983996,9.55774873 13.4734596,10.1299013 C13.9173113,10.6639104 14.6316351,10.6639104 15.0720192,10.1299013 C15.5470792,9.55774873 16.185116,9.24566551 16.8716991,9.24566551 C16.9202454,9.25260069 16.9583889,9.25260069 17,9.25606828 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-108.000000, -252.000000)">
-            <g id="wayside_shrine-m" transform="translate(109.000000, 253.000000)">
-                <use id="Shape" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/olympic-water-s.svg b/data/styles/clear/style-clear/symbols/olympic-water-s.svg
deleted file mode 100644
index 0149fa3276..0000000000
--- a/data/styles/clear/style-clear/symbols/olympic-water-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-water-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M7.5,15 C11.6421356,15 15,11.6421356 15,7.5 C15,3.35786438 11.6421356,0 7.5,0 C3.35786438,0 0,3.35786438 0,7.5 C0,11.6421356 3.35786438,15 7.5,15 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M12,4 L12,4.90504134 C11.8007469,4.90504134 11.5990931,4.99866631 11.4454521,5.1835156 C11.1165644,5.57962123 10.6748466,5.80048013 10.1995199,5.80048013 C9.72419312,5.80048013 9.28247533,5.57962123 8.95358762,5.1835156 C8.64870632,4.81381702 8.15177381,4.81381702 7.8468925,5.1835156 C7.5180048,5.57962123 7.07628701,5.80048013 6.60096026,5.80048013 C6.12323286,5.80048013 5.68391571,5.57962123 5.35502801,5.1835156 C5.05014671,4.81381702 4.55321419,4.81381702 4.24833289,5.1835156 C3.91944519,5.57962123 3.47772739,5.80048013 3.00240064,5.80048013 L3.00240064,4.88583622 C3.19925313,4.88583622 3.40330755,4.7946119 3.55694852,4.61216324 C3.88583622,4.21605762 4.32755401,4 4.80288077,4 C5.28060816,4 5.71992531,4.21605762 6.04881302,4.61216324 C6.35369432,4.98186183 6.85062683,4.98186183 7.15550814,4.61216324 C7.48439584,4.21605762 7.92611363,4 8.40144038,4 C8.87916778,4 9.31848493,4.21605762 9.64737263,4.61216324 C9.95465457,4.98186183 10.4491864,4.98186183 10.7540678,4.61216324 C11.0829555,4.21605762 11.5222726,4 12,4 Z M12,8.49879968 L12,9.40384102 C11.8007469,9.40384102 11.5990931,9.49746599 11.4454521,9.68231528 C11.1165644,10.0784209 10.6748466,10.2992798 10.1995199,10.2992798 C9.72419312,10.2992798 9.28247533,10.0784209 8.95358762,9.68231528 C8.64870632,9.3126167 8.15177381,9.3126167 7.8468925,9.68231528 C7.5180048,10.0784209 7.07628701,10.2992798 6.60096026,10.2992798 C6.12323286,10.2992798 5.68391571,10.0784209 5.35502801,9.68231528 C5.05014671,9.3126167 4.55321419,9.3126167 4.24833289,9.68231528 C3.91944519,10.0784209 3.47772739,10.2992798 3.00240064,10.2992798 L3.00240064,9.3846359 C3.19925313,9.3846359 3.40330755,9.29341158 3.55694852,9.11096292 C3.88583622,8.7148573 4.32755401,8.49879968 4.80288077,8.49879968 C5.28060816,8.49879968 5.71992531,8.7148573 6.04881302,9.11096292 C6.35369432,9.48066151 6.85062683,9.48066151 7.15550814,9.11096292 C7.48439584,8.7148573 7.92611363,8.49879968 8.40144038,8.49879968 C8.87916778,8.49879968 9.31848493,8.7148573 9.64737263,9.11096292 C9.95465457,9.48066151 10.4491864,9.48066151 10.7540678,9.11096292 C11.0829555,8.7148573 11.5222726,8.49879968 12,8.49879968 Z M12,6.25420112 L12,7.16404374 C11.973593,7.15444118 11.9447853,7.15444118 11.913577,7.15444118 C11.7143238,7.15444118 11.51267,7.24806615 11.3590291,7.43291544 C11.0301414,7.82902107 10.5884236,8.04987997 10.1130968,8.04987997 C9.63777007,8.04987997 9.19605228,7.82902107 8.86716458,7.43291544 C8.56228328,7.06321686 8.06535076,7.06321686 7.76046946,7.43291544 C7.43158176,7.82902107 6.98986396,8.04987997 6.51453721,8.04987997 C6.03921046,8.04987997 5.59749266,7.82902107 5.26860496,7.43291544 C4.96372366,7.06321686 4.46679114,7.06321686 4.16190984,7.43291544 C3.87383302,7.77860763 3.49933316,7.9922646 3.08642305,8.04027741 C3.060016,8.04507869 3.03120832,8.04507869 3,8.04507869 L3,7.1256335 C3.09602561,7.14003734 3.36009603,6.99119765 3.46812483,6.85916244 C3.79701254,6.46305682 4.23873033,6.2469992 4.71405708,6.2469992 C5.18938384,6.2469992 5.63110163,6.46305682 5.95998933,6.85916244 C6.26487063,7.22886103 6.76180315,7.22886103 7.06668445,6.85916244 C7.39557215,6.46305682 7.83728994,6.2469992 8.3126167,6.2469992 C8.79034409,6.2469992 9.22966124,6.46305682 9.55854895,6.85916244 C9.86583089,7.22886103 10.3603628,7.22886103 10.6652441,6.85916244 C10.9941318,6.46305682 11.4358496,6.2469992 11.9111763,6.2469992 C11.9447853,6.25180048 11.9711923,6.25180048 12,6.25420112 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-141.000000, -255.000000)">
-            <g id="wayside_shrine-s" transform="translate(142.000000, 256.000000)">
-                <use id="Oval" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-airport-l.svg b/data/styles/clear/style-night/symbols/olympic-airport-l.svg
deleted file mode 100644
index f18a65910a..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-airport-l.svg
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-airport-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M16.8518877,10.7659797 L16.8518877,11.2615506 L9.91287512,10.2704089 L9.91287512,14.2347776 L11.8954501,16.2172593 C11.8954501,16.7128301 11.3998064,17.208401 10.9041626,17.208401 L5.94772507,17.208401 C5.45208132,17.208401 4.95643756,16.7128301 4.95643756,16.2172593 L6.93901258,14.2347776 L6.93901258,10.2702106 L0,11.2613524 L0,10.7659797 C0,10.2704089 0.303009927,10.1337304 0.495643756,10.0226234 L6.93901258,6.3056437 L6.93901258,4.32336024 C6.93901258,3.3322185 7.43465634,0.358793307 8.42594385,0.358793307 C9.41723136,0.358793307 9.91287512,3.3322185 9.91287512,4.32336024 L9.91287512,6.3056437 L16.3562439,10.0226234 C16.6322283,10.1818008 16.8518877,10.2615877 16.8518877,10.7659797 L16.8518877,10.7659797 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-214.000000, -173.000000)">
-            <g id="airport-l" transform="translate(215.000000, 174.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="g6678" transform="translate(3.956438, 2.964567)">
-                    <g id="g14771">
-                        <g id="path7712">
-                            <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                            <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-airport-m.svg b/data/styles/clear/style-night/symbols/olympic-airport-m.svg
deleted file mode 100644
index 9064c4994c..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-airport-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-airport-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M17.338819,11.2526923 L17.338819,12.2438341 L11.8867377,11.2526923 L11.8867377,14.2261175 L13.8693127,15.4374909 L13.8693127,16.208401 L7.92158761,16.208401 L7.92158761,15.4374909 L9.90416263,14.2261175 L9.90416263,11.2526923 L4.45208132,12.2438341 L4.45208132,11.2526923 L9.90416263,8.27926713 L9.90416263,5.30584193 C9.90416263,4.535031 10.1244465,3.32355846 10.8954501,3.32355846 C11.6664438,3.32355846 11.8867377,4.535031 11.8867377,5.30584193 L11.8867377,8.27926713 L17.338819,11.2526923 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-251.000000, -175.000000)">
-            <g id="airport-m" transform="translate(252.000000, 176.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="path7712-0">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-airport-s.svg b/data/styles/clear/style-night/symbols/olympic-airport-s.svg
deleted file mode 100644
index 1139de8a4d..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-airport-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-airport-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M12,7.62344009 L12,8.17459045 L9,8.17459024 L9,9.62143248 L10,10.6396234 L10,11.0682745 L6,11.0682745 L6,10.6396234 L7,9.62143248 L7,8.17459024 L4,8.17459045 L4,7.62344009 L7,6.24546774 L7,4.31634503 C7,3.88769397 7.55369837,3.06827451 7.99809837,3.06827451 C8.44253837,3.06827451 9,3.88769397 9,4.31634503 L9,6.24546774 L12,7.62344009 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-284.000000, -178.000000)">
-            <g id="airport-s" transform="translate(285.000000, 179.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="path7712-0-5">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-bus-l.svg b/data/styles/clear/style-night/symbols/olympic-bus-l.svg
deleted file mode 100644
index 24c4109448..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-bus-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-bus-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M14.0354444,20 L4.99874609,20 C4.44715386,20 4,19.5439162 4,19.0008247 L4,15.1868445 C4,14.6350152 4.39522648,13.9757597 4.87738037,13.7172421 L5,13.6514969 L5,7.99036657 C5,6.89111747 5.89821238,6 6.99079514,6 L25,6 L25,8 L24.0029293,8 C23.4378814,8 23,8.44762906 23,8.99980749 L23,12.0001925 C23,12.5562834 23.4490268,13 24.0029293,13 L25,13 L25,20 L20.9645556,20 C20.987914,19.8366985 21,19.6697607 21,19.5 C21,17.5670034 19.4329966,16 17.5,16 C15.5670034,16 14,17.5670034 14,19.5 C14,19.6697607 14.012086,19.8366985 14.0354444,20 Z M14,8.99980749 C14,8.44762906 14.4378814,8 15.0029293,8 L19.9970707,8 C20.5509732,8 21,8.44371665 21,8.99980749 L21,12.0001925 C21,12.5523709 20.5621186,13 19.9970707,13 L15.0029293,13 C14.4490268,13 14,12.5562834 14,12.0001925 L14,8.99980749 Z M7,8.99539757 C7,8.44565467 7.44371665,8 7.99980749,8 L11.0001925,8 C11.5523709,8 12,8.4556644 12,8.99539757 L12,18 L7,18 L7,8.99539757 Z M17.5,22 C18.8807119,22 20,20.8807119 20,19.5 C20,18.1192881 18.8807119,17 17.5,17 C16.1192881,17 15,18.1192881 15,19.5 C15,20.8807119 16.1192881,22 17.5,22 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-214.000000, -214.000000)">
-            <g id="bus-l" transform="translate(215.000000, 215.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Mask">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-bus-m.svg b/data/styles/clear/style-night/symbols/olympic-bus-m.svg
deleted file mode 100644
index a1ea03da57..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-bus-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-bus-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M5.99079514,5 C4.89821238,5 4,5.89112225 4,6.99037724 L4,9.9638276 L3.87738037,10.0295729 C3.39522648,10.2880905 3,10.9516483 3,11.5087848 L3,14.9912152 C3,15.5499119 3.44715386,16 3.99874609,16 L11.0354444,16 C11.012086,15.8366985 11,15.6697607 11,15.5 C11,13.5670034 12.5670034,12 14.5,12 C16.4329966,12 18,13.5670034 18,15.5 C18,15.6697607 17.987914,15.8366985 17.9645556,16 L21,16 L21,11 L20.0029293,11 C19.4490268,11 19,10.5566468 19,9.9906311 L19,8.0093689 C19,7.45190985 19.4378814,7 20.0029293,7 L21,7 L21,5 L5.99079514,5 Z M12,8.0093689 C12,7.45190985 12.4437166,7 12.9998075,7 L16.0001925,7 C16.5523709,7 17,7.44335318 17,8.0093689 L17,9.9906311 C17,10.5480902 16.5562834,11 16.0001925,11 L12.9998075,11 C12.4476291,11 12,10.5566468 12,9.9906311 L12,8.0093689 L12,8.0093689 Z M6,7.99703014 C6,7.4463856 6.44335318,7 7.0093689,7 L8.9906311,7 C9.5480902,7 10,7.45303631 10,7.99703014 L10,15 L6,15 L6,7.99703014 L6,7.99703014 Z M14.5,18 C15.8807119,18 17,16.8807119 17,15.5 C17,14.1192881 15.8807119,13 14.5,13 C13.1192881,13 12,14.1192881 12,15.5 C12,16.8807119 13.1192881,18 14.5,18 L14.5,18 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-251.000000, -216.000000)">
-            <g id="bus-m" transform="translate(252.000000, 217.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Mask">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-bus-s.svg b/data/styles/clear/style-night/symbols/olympic-bus-s.svg
deleted file mode 100644
index 90af54482e..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-bus-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-bus-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M8.05000906,12 L3,12 L3,6.65149687 L3,4.99668948 C3,3.89394833 3.90195036,3 5.0085302,3 L15,3 L15,5 L14.0093689,5 C13.4433532,5 13,5.44724809 13,5.99895656 L13,7.00104344 C13,7.55733967 13.4519098,8 14.0093689,8 L15,8 L15,12 L12.9499909,12 C12.9827849,11.838445 13,11.6712329 13,11.5 C13,10.1192881 11.8807119,9 10.5,9 C9.11928813,9 8,10.1192881 8,11.5 C8,11.6712329 8.01721513,11.838445 8.05000906,12 Z M8,5.99895656 C8,5.44724809 8.44335318,5 9.0093689,5 L10.9906311,5 C11.5480902,5 12,5.44266033 12,5.99895656 L12,7.00104344 C12,7.55275191 11.5566468,8 10.9906311,8 L9.0093689,8 C8.45190985,8 8,7.55733967 8,7.00104344 L8,5.99895656 Z M4,5.49100518 C4,5.21983051 4.2157526,5 4.49538898,5 L6.50461102,5 C6.7782068,5 7,5.22788048 7,5.49100518 L7,11 L4,11 L4,5.49100518 Z M10.5,13 C11.3284271,13 12,12.3284271 12,11.5 C12,10.6715729 11.3284271,10 10.5,10 C9.67157288,10 9,10.6715729 9,11.5 C9,12.3284271 9.67157288,13 10.5,13 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-284.000000, -219.000000)">
-            <g id="bus-s" transform="translate(285.000000, 220.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Mask">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-cable-car-l.svg b/data/styles/clear/style-night/symbols/olympic-cable-car-l.svg
deleted file mode 100644
index 2a9185dae1..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-cable-car-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-cable-car-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M13.357121,4.91071975 L14.4619459,6.99771849 L12.6126744,7 L11.7108116,5.32229711 L5,7 L5,5 L17,2 L17,4 L13.357121,4.91071975 Z M13.4043846,9 L14.9970707,9 C15.5621186,9 16.374141,9.24942732 16.8356673,9.5571115 L18.1643327,10.4428885 C18.6321411,10.7547607 19,11.4456547 19,11.9953976 L19,21 C19,21.5 18.5,22 18,22 L15.5,22 L13,22 L9.5,22 L7,22 C6.5,22 6,21.5 6,21 L6,11.9953976 C6,11.4556644 6.37414097,10.7505727 6.83566725,10.4428885 L8.16433275,9.5571115 C8.63214111,9.24523926 9.44902676,9 10.0029293,9 L11.5375581,9 L12.6126744,7 L14.4619459,7.00228151 L13.4043846,9 Z M9.10529494,11.4473525 C9.5994269,11.2002865 10.4437166,11 10.9998075,11 L14.0001925,11 C14.5523709,11 15.4047298,11.2023649 15.8947051,11.4473525 L16.1052949,11.5526475 C16.5994269,11.7997135 17,12.4433532 17,13.0093689 L17,14.9906311 C17,15.5480902 16.5536886,16 16.0024554,16 L8.99754465,16 C8.44661595,16 8,15.5566468 8,14.9906311 L8,13.0093689 C8,12.4519098 8.40472984,11.7976351 8.89470506,11.5526475 L9.10529494,11.4473525 Z M12,11 L13,11 L13,16 L12,16 L12,11 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-214.000000, -325.000000)">
-            <g id="cable-car-l" transform="translate(215.000000, 326.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-cable-car-m.svg b/data/styles/clear/style-night/symbols/olympic-cable-car-m.svg
deleted file mode 100644
index 80259cf59f..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-cable-car-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-cable-car-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M12.1357593,4.11336598 L10.5,7 L9,7 L10.4037789,4.52274318 L5,5.80000003 L5,4.60000004 L16,2 L16,3.19999999 L12.1357593,4.11336598 Z M10.0002578,9.01124006 L9.06307016,9.01124006 C8.49939393,9.01124006 7.75450397,9.3375159 7.37871804,9.73999755 L7.0304515,10.1130049 L7.0304515,12.9754866 C7.0304515,13.5260735 7.47795435,13.9683281 8.02997709,13.9683281 L10.0002578,13.9683281 L10.0002578,9.01124006 Z M11.0003093,9.01124006 L12.0162029,9.01124006 C12.5706589,9.01124006 13.3214957,9.34779246 13.6836581,9.75224585 L14.0066949,10.1130049 L14.0066949,12.9754866 C14.0066949,13.5238178 13.5596871,13.9683281 13.0071693,13.9683281 L11.0003093,13.9683281 L11.0003093,9.01124006 Z M7.98774308,7 C7.43572034,7 6.63187106,7.2689333 6.18898655,7.60317655 L5.79423602,7.90109328 C5.35283296,8.2342185 4.99727577,8.96088415 5.00001573,9.5118661 L5.03723909,16.9971534 C5.05254779,17.4985767 5.55085089,18 6.04915399,18 L15.0186098,18 C15.5169129,18 16.0077475,17.6699559 15.9999073,16.9971534 L15.962684,9.5118661 C15.9599166,8.95538605 15.6013269,8.23533654 15.1584424,7.90109328 L14.7636918,7.60317655 C14.3222888,7.27005134 13.5174531,7 12.9649353,7 L7.98774308,7 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-251.000000, -327.000000)">
-            <g id="cable-car-m" transform="translate(252.000000, 328.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-cable-car-s.svg b/data/styles/clear/style-night/symbols/olympic-cable-car-s.svg
deleted file mode 100644
index 1e4fe97aff..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-cable-car-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-cable-car-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M8.93798452,3.29457364 L11,3 L11,2 L4,3.00000001 L4,4.00000001 L7.52713179,3.49612404 L6.7,5 L8,5 L8.93798452,3.29457364 Z M7,6.14285714 L6,6.14285714 L5,6.71428571 L5,8.42857143 L7,8.42857143 L7,6.14285714 Z M8,6.14285714 L9,6.14285714 L10,6.71428571 L10,8.42857143 L8,8.42857143 L8,6.14285714 Z M4.69730425,5.61157772 L4.80269575,5.53127943 C4.35937913,5.86904447 4,6.59491021 4,7.15276589 L4,11.4285714 C4,11.7142857 4.25,12 4.5,12 L5.75,12 L8,12 L9.25,12 L10.5,12 C10.75,12 11,11.7142857 11,11.4285714 L11,7.15276589 C11,6.59500869 10.6368918,5.86620331 10.1973042,5.53127943 L10.3026958,5.61157772 C9.8593791,5.27381267 9.0566468,5 8.4906311,5 L6.5093689,5 C5.95190985,5 5.13689184,5.27665383 4.69730425,5.61157772 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-284.000000, -330.000000)">
-            <g id="cable-car-s" transform="translate(285.000000, 331.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-center-l.svg b/data/styles/clear/style-night/symbols/olympic-center-l.svg
deleted file mode 100644
index 5c54cfd9af..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-center-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-center-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M25,12.5 C25,19.403 19.403,25 12.5,25 C5.597,25 0,19.403 0,12.5 C0,5.597 5.597,0 12.5,0 C19.403,0 25,5.597 25,12.5 L25,12.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M17.75,11.5 L17.75,10 L18.5,10 L18.5,8.5 L13.25,8.5 L13.25,7 L16.25,7 L16.25,4.75 L13.25,4.75 L13.25,4 L11.75,4 L11.75,8.5 L6.5,8.5 L6.5,10 L7.25,10 L7.25,11.5 L5,11.5 L5,19 L20,19 L20,11.5 L17.75,11.5 L17.75,11.5 Z M8.75,17.5 L7.25,17.5 L7.25,16 L8.75,16 L8.75,17.5 L8.75,17.5 Z M8.75,14.5 L7.25,14.5 L7.25,13 L8.75,13 L8.75,14.5 L8.75,14.5 Z M11.75,17.5 L10.25,17.5 L10.25,16 L11.75,16 L11.75,17.5 L11.75,17.5 Z M11.75,14.5 L10.25,14.5 L10.25,13 L11.75,13 L11.75,14.5 L11.75,14.5 Z M14.75,17.5 L13.25,17.5 L13.25,16 L14.75,16 L14.75,17.5 L14.75,17.5 Z M14.75,14.5 L13.25,14.5 L13.25,13 L14.75,13 L14.75,14.5 L14.75,14.5 Z M17.75,17.5 L16.25,17.5 L16.25,16 L17.75,16 L17.75,17.5 L17.75,17.5 Z M17.75,14.5 L16.25,14.5 L16.25,13 L17.75,13 L17.75,14.5 L17.75,14.5 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-70.000000, -132.000000)">
-            <g id="wayside_shrine-l" transform="translate(71.000000, 133.000000)">
-                <use id="Shape" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-center-m.svg b/data/styles/clear/style-night/symbols/olympic-center-m.svg
deleted file mode 100644
index 20f7dabd81..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-center-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-center-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M21,10.5 C21,16.299 16.299,21 10.5,21 C4.701,21 0,16.299 0,10.5 C0,4.701 4.701,0 10.5,0 C16.299,0 21,4.701 21,10.5 L21,10.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M15.05,9.5 L15.05,8.2 L15.7,8.2 L15.7,6.9 L11.15,6.9 L11.15,5.6 L13.75,5.6 L13.75,3.65 L11.15,3.65 L11.15,3 L9.85,3 L9.85,6.9 L5.3,6.9 L5.3,8.2 L5.95,8.2 L5.95,9.5 L4,9.5 L4,16 L17,16 L17,9.5 L15.05,9.5 L15.05,9.5 Z M7.25,14.7 L5.95,14.7 L5.95,13.4 L7.25,13.4 L7.25,14.7 L7.25,14.7 Z M7.25,12.1 L5.95,12.1 L5.95,10.8 L7.25,10.8 L7.25,12.1 L7.25,12.1 Z M9.85,14.7 L8.55,14.7 L8.55,13.4 L9.85,13.4 L9.85,14.7 L9.85,14.7 Z M9.85,12.1 L8.55,12.1 L8.55,10.8 L9.85,10.8 L9.85,12.1 L9.85,12.1 Z M12.45,14.7 L11.15,14.7 L11.15,13.4 L12.45,13.4 L12.45,14.7 L12.45,14.7 Z M12.45,12.1 L11.15,12.1 L11.15,10.8 L12.45,10.8 L12.45,12.1 L12.45,12.1 Z M15.05,14.7 L13.75,14.7 L13.75,13.4 L15.05,13.4 L15.05,14.7 L15.05,14.7 Z M15.05,12.1 L13.75,12.1 L13.75,10.8 L15.05,10.8 L15.05,12.1 L15.05,12.1 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-107.000000, -134.000000)">
-            <g id="wayside_shrine-m" transform="translate(108.000000, 135.000000)">
-                <use id="Shape" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-center-s.svg b/data/styles/clear/style-night/symbols/olympic-center-s.svg
deleted file mode 100644
index 5b2c475eb2..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-center-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-center-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M7.5,15 C11.6421356,15 15,11.6421356 15,7.5 C15,3.35786438 11.6421356,0 7.5,0 C3.35786438,0 0,3.35786438 0,7.5 C0,11.6421356 3.35786438,15 7.5,15 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M10.65,6.5 L10.65,5.6 L11.1,5.6 L11.1,4.7 L7.95,4.7 L7.95,3.8 L9.75,3.8 L9.75,2.45 L7.95,2.45 L7.95,2 L7.05,2 L7.05,4.7 L3.9,4.7 L3.9,5.6 L4.35,5.6 L4.35,6.5 L3,6.5 L3,11 L12,11 L12,6.5 L10.65,6.5 L10.65,6.5 Z M5.25,10.1 L4.35,10.1 L4.35,9.2 L5.25,9.2 L5.25,10.1 L5.25,10.1 Z M5.25,8.3 L4.35,8.3 L4.35,7.4 L5.25,7.4 L5.25,8.3 L5.25,8.3 Z M7.05,10.1 L6.15,10.1 L6.15,9.2 L7.05,9.2 L7.05,10.1 L7.05,10.1 Z M7.05,8.3 L6.15,8.3 L6.15,7.4 L7.05,7.4 L7.05,8.3 L7.05,8.3 Z M8.85,10.1 L7.95,10.1 L7.95,9.2 L8.85,9.2 L8.85,10.1 L8.85,10.1 Z M8.85,8.3 L7.95,8.3 L7.95,7.4 L8.85,7.4 L8.85,8.3 L8.85,8.3 Z M10.65,10.1 L9.75,10.1 L9.75,9.2 L10.65,9.2 L10.65,10.1 L10.65,10.1 Z M10.65,8.3 L9.75,8.3 L9.75,7.4 L10.65,7.4 L10.65,8.3 L10.65,8.3 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-140.000000, -137.000000)">
-            <g id="wayside_shrine-s" transform="translate(141.000000, 138.000000)">
-                <use id="Oval" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-cycle-l.svg b/data/styles/clear/style-night/symbols/olympic-cycle-l.svg
deleted file mode 100644
index e82b3c70d7..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-cycle-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-cycle-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M25,12.5 C25,19.403 19.403,25 12.5,25 C5.597,25 0,19.403 0,12.5 C0,5.597 5.597,0 12.5,0 C19.403,0 25,5.597 25,12.5 L25,12.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M8,12.248 C6.344,12.248 5,13.592 5,15.248 C5,16.904 6.344,18.248 8,18.248 C9.656,18.248 11,16.904 11,15.248 C11,13.596 9.656,12.248 8,12.248 L8,12.248 Z M8,16.748 C7.172,16.748 6.5,16.076 6.5,15.248 C6.5,14.42 7.172,13.748 8,13.748 C8.828,13.748 9.5,14.424 9.5,15.248 C9.5,16.076 8.828,16.748 8,16.748 Z M17,12.248 C15.344,12.248 14,13.592 14,15.248 C14,16.904 15.344,18.248 17,18.248 C18.656,18.248 20,16.904 20,15.248 C20,13.596 18.656,12.248 17,12.248 Z M17,16.748 C16.172,16.748 15.5,16.076 15.5,15.248 C15.5,14.42 16.172,13.748 17,13.748 C17.828,13.748 18.5,14.424 18.5,15.248 C18.5,16.076 17.828,16.748 17,16.748 Z M12.576,14.168 L14.604,11.4 C14.732,11.224 14.78,11.004 14.732,10.792 C14.684,10.58 14.548,10.4 14.36,10.296 L12.436,9.244 L15.04,9.244 L15.956,11.08 C16.14,11.452 16.592,11.6 16.964,11.416 C17.336,11.232 17.484,10.78 17.3,10.408 L16.176,8.156 C16.048,7.9 15.788,7.74 15.504,7.74 L9.5,7.74 C9.432,7.74 9.368,7.752 9.304,7.768 C9.288,7.772 9.276,7.78 9.264,7.784 C9.196,7.808 9.128,7.84 9.068,7.884 C9.052,7.896 9.04,7.904 9.024,7.916 C8.972,7.96 8.92,8.012 8.88,8.072 C8.872,8.084 8.868,8.1 8.856,8.116 C8.852,8.124 8.844,8.128 8.84,8.132 C8.836,8.14 8.836,8.152 8.832,8.16 C8.792,8.24 8.764,8.324 8.752,8.412 L8.752,8.424 C8.744,8.504 8.756,8.588 8.776,8.668 C8.78,8.688 8.784,8.704 8.792,8.724 C8.796,8.74 8.796,8.756 8.804,8.768 L11.804,16.268 C11.92,16.56 12.204,16.74 12.5,16.74 C12.592,16.74 12.688,16.724 12.78,16.688 C13.164,16.536 13.352,16.096 13.2,15.712 L12.576,14.168 Z M11.92,12.528 L10.972,10.156 L12.888,11.204 L11.92,12.528 Z M18.876,9.248 C19.4967681,9.248 20,8.74476806 20,8.124 C20,7.50323194 19.4967681,7 18.876,7 C18.2552319,7 17.752,7.50323194 17.752,8.124 C17.752,8.74476806 18.2552319,9.248 18.876,9.248 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-70.000000, -288.000000)">
-            <g id="wayside_shrine-l" transform="translate(71.000000, 289.000000)">
-                <use id="Shape" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-cycle-m.svg b/data/styles/clear/style-night/symbols/olympic-cycle-m.svg
deleted file mode 100644
index 807f7f72ec..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-cycle-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-cycle-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M21,10.5 C21,16.299 16.299,21 10.5,21 C4.701,21 0,16.299 0,10.5 C0,4.701 4.701,0 10.5,0 C16.299,0 21,4.701 21,10.5 L21,10.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M6.6,10.5482667 C5.1648,10.5482667 4,11.7130667 4,13.1482667 C4,14.5834667 5.1648,15.7482667 6.6,15.7482667 C8.0352,15.7482667 9.2,14.5834667 9.2,13.1482667 C9.2,11.7165333 8.0352,10.5482667 6.6,10.5482667 L6.6,10.5482667 Z M6.6,14.4482667 C5.8824,14.4482667 5.3,13.8658667 5.3,13.1482667 C5.3,12.4306667 5.8824,11.8482667 6.6,11.8482667 C7.3176,11.8482667 7.9,12.4341333 7.9,13.1482667 C7.9,13.8658667 7.3176,14.4482667 6.6,14.4482667 Z M14.4,10.5482667 C12.9648,10.5482667 11.8,11.7130667 11.8,13.1482667 C11.8,14.5834667 12.9648,15.7482667 14.4,15.7482667 C15.8352,15.7482667 17,14.5834667 17,13.1482667 C17,11.7165333 15.8352,10.5482667 14.4,10.5482667 Z M14.4,14.4482667 C13.6824,14.4482667 13.1,13.8658667 13.1,13.1482667 C13.1,12.4306667 13.6824,11.8482667 14.4,11.8482667 C15.1176,11.8482667 15.7,12.4341333 15.7,13.1482667 C15.7,13.8658667 15.1176,14.4482667 14.4,14.4482667 Z M10.5658667,12.2122667 L12.3234667,9.81333333 C12.4344,9.6608 12.476,9.47013333 12.4344,9.2864 C12.3928,9.10266667 12.2749333,8.94666667 12.112,8.85653333 L10.4445333,7.9448 L12.7013333,7.9448 L13.4952,9.536 C13.6546667,9.8584 14.0464,9.98666667 14.3688,9.8272 C14.6912,9.66773333 14.8194667,9.276 14.66,8.9536 L13.6858667,7.00186667 C13.5749333,6.78 13.3496,6.64133333 13.1034667,6.64133333 L7.9,6.64133333 C7.84106667,6.64133333 7.7856,6.65173333 7.73013333,6.6656 C7.71626667,6.66906667 7.70586667,6.676 7.69546667,6.67946667 C7.63653333,6.70026667 7.5776,6.728 7.5256,6.76613333 C7.51173333,6.77653333 7.50133333,6.78346667 7.48746667,6.79386667 C7.4424,6.832 7.39733333,6.87706667 7.36266667,6.92906667 C7.35573333,6.93946667 7.35226667,6.95333333 7.34186667,6.9672 C7.3384,6.97413333 7.33146667,6.9776 7.328,6.98106667 C7.32453333,6.988 7.32453333,6.9984 7.32106667,7.00533333 C7.2864,7.07466667 7.26213333,7.14746667 7.25173333,7.22373333 L7.25173333,7.23413333 C7.2448,7.30346667 7.2552,7.37626667 7.27253333,7.4456 C7.276,7.46293333 7.27946667,7.4768 7.2864,7.49413333 C7.28986667,7.508 7.28986667,7.52186667 7.2968,7.53226667 L9.8968,14.0322667 C9.99733333,14.2853333 10.2434667,14.4413333 10.5,14.4413333 C10.5797333,14.4413333 10.6629333,14.4274667 10.7426667,14.3962667 C11.0754667,14.2645333 11.2384,13.8832 11.1066667,13.5504 L10.5658667,12.2122667 Z M9.99733333,10.7909333 L9.17573333,8.7352 L10.8362667,9.64346667 L9.99733333,10.7909333 Z M16.0258667,7.94826667 C16.5638657,7.94826667 17,7.51213232 17,6.97413333 C17,6.43613435 16.5638657,6 16.0258667,6 C15.4878677,6 15.0517333,6.43613435 15.0517333,6.97413333 C15.0517333,7.51213232 15.4878677,7.94826667 16.0258667,7.94826667 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-107.000000, -290.000000)">
-            <g id="wayside_shrine-m" transform="translate(108.000000, 291.000000)">
-                <use id="Shape" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-cycle-s.svg b/data/styles/clear/style-night/symbols/olympic-cycle-s.svg
deleted file mode 100644
index 538135764d..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-cycle-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-cycle-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M7.5,15 C11.6421356,15 15,11.6421356 15,7.5 C15,3.35786438 11.6421356,0 7.5,0 C3.35786438,0 0,3.35786438 0,7.5 C0,11.6421356 3.35786438,15 7.5,15 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M4.2,6.84853333 C2.9856,6.84853333 2,7.83413333 2,9.04853333 C2,10.2629333 2.9856,11.2485333 4.2,11.2485333 C5.4144,11.2485333 6.4,10.2629333 6.4,9.04853333 C6.4,7.83706667 5.4144,6.84853333 4.2,6.84853333 L4.2,6.84853333 Z M4.2,10.1485333 C3.5928,10.1485333 3.1,9.65573333 3.1,9.04853333 C3.1,8.44133333 3.5928,7.94853333 4.2,7.94853333 C4.8072,7.94853333 5.3,8.44426667 5.3,9.04853333 C5.3,9.65573333 4.8072,10.1485333 4.2,10.1485333 Z M10.8,6.84853333 C9.5856,6.84853333 8.6,7.83413333 8.6,9.04853333 C8.6,10.2629333 9.5856,11.2485333 10.8,11.2485333 C12.0144,11.2485333 13,10.2629333 13,9.04853333 C13,7.83706667 12.0144,6.84853333 10.8,6.84853333 Z M10.8,10.1485333 C10.1928,10.1485333 9.7,9.65573333 9.7,9.04853333 C9.7,8.44133333 10.1928,7.94853333 10.8,7.94853333 C11.4072,7.94853333 11.9,8.44426667 11.9,9.04853333 C11.9,9.65573333 11.4072,10.1485333 10.8,10.1485333 Z M7.55573333,8.25653333 L9.04293333,6.22666667 C9.1368,6.0976 9.172,5.93626667 9.1368,5.7808 C9.1016,5.62533333 9.00186667,5.49333333 8.864,5.41706667 L7.45306667,4.6456 L9.36266667,4.6456 L10.0344,5.992 C10.1693333,6.2648 10.5008,6.37333333 10.7736,6.2384 C11.0464,6.10346667 11.1549333,5.772 11.02,5.4992 L10.1957333,3.84773333 C10.1018667,3.66 9.9112,3.54266667 9.70293333,3.54266667 L5.3,3.54266667 C5.25013333,3.54266667 5.2032,3.55146667 5.15626667,3.5632 C5.14453333,3.56613333 5.13573333,3.572 5.12693333,3.57493333 C5.07706667,3.59253333 5.0272,3.616 4.9832,3.64826667 C4.97146667,3.65706667 4.96266667,3.66293333 4.95093333,3.67173333 C4.9128,3.704 4.87466667,3.74213333 4.84533333,3.78613333 C4.83946667,3.79493333 4.83653333,3.80666667 4.82773333,3.8184 C4.8248,3.82426667 4.81893333,3.8272 4.816,3.83013333 C4.81306667,3.836 4.81306667,3.8448 4.81013333,3.85066667 C4.7808,3.90933333 4.76026667,3.97093333 4.75146667,4.03546667 L4.75146667,4.04426667 C4.7456,4.10293333 4.7544,4.16453333 4.76906667,4.2232 C4.772,4.23786667 4.77493333,4.2496 4.7808,4.26426667 C4.78373333,4.276 4.78373333,4.28773333 4.7896,4.29653333 L6.9896,9.79653333 C7.07466667,10.0106667 7.28293333,10.1426667 7.5,10.1426667 C7.56746667,10.1426667 7.63786667,10.1309333 7.70533333,10.1045333 C7.98693333,9.99306667 8.1248,9.6704 8.01333333,9.3888 L7.55573333,8.25653333 Z M7.07466667,7.05386667 L6.37946667,5.3144 L7.78453333,6.08293333 L7.07466667,7.05386667 Z M12.1757333,4.64853333 C12.6309632,4.64853333 13,4.27949658 13,3.82426667 C13,3.36903676 12.6309632,3 12.1757333,3 C11.7205034,3 11.3514667,3.36903676 11.3514667,3.82426667 C11.3514667,4.27949658 11.7205034,4.64853333 12.1757333,4.64853333 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-140.000000, -293.000000)">
-            <g id="wayside_shrine-s" transform="translate(141.000000, 294.000000)">
-                <use id="Oval" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-funicular-l.svg b/data/styles/clear/style-night/symbols/olympic-funicular-l.svg
deleted file mode 100644
index e1041d8e48..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-funicular-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-funicular-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M4,9.99539757 C4,9.44565467 4.43731068,8.89710337 4.9750526,8.77057586 L20.0249474,5.22942414 C20.5634541,5.10271669 21,5.4556644 21,5.99539757 L21,14.0046024 C21,14.5543453 20.5626893,15.1028966 20.0249474,15.2294241 L4.9750526,18.7705759 C4.43654592,18.8972833 4,18.5443356 4,18.0046024 L4,9.99539757 Z M6,11.1904785 C6,10.9195947 6.2157526,10.6496577 6.49538898,10.5844092 L8.50461102,10.1155908 C8.7782068,10.0517517 9,10.2150574 9,10.4904785 L9,13.5095215 C9,13.7804053 8.7842474,14.0503423 8.50461102,14.1155908 L6.49538898,14.5844092 C6.2217932,14.6482482 6,14.4849426 6,14.2095215 L6,11.1904785 Z M16,8.19047851 C16,7.91959471 16.2157526,7.64965772 16.495389,7.58440923 L18.504611,7.11559076 C18.7782068,7.05175175 19,7.21505737 19,7.49047852 L19,10.5095215 C19,10.7804053 18.7842474,11.0503423 18.504611,11.1155908 L16.495389,11.5844092 C16.2217932,11.6482482 16,11.4849426 16,11.2095215 L16,8.19047851 Z M11,9.69047851 C11,9.41959471 11.2157526,9.14965772 11.495389,9.08440923 L13.504611,8.61559076 C13.7782068,8.55175175 14,8.71505737 14,8.99047852 L14,12.0095215 C14,12.2804053 13.7842474,12.5503423 13.504611,12.6155908 L11.495389,13.0844092 C11.2217932,13.1482482 11,12.9849426 11,12.7095215 L11,9.69047851 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-214.000000, -362.000000)">
-            <g id="funicular-l" transform="translate(215.000000, 363.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Rectangle-41">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-funicular-m.svg b/data/styles/clear/style-night/symbols/olympic-funicular-m.svg
deleted file mode 100644
index cc943a237b..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-funicular-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-funicular-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M3,8.21764909 C3,7.6679062 3.43274403,7.12416288 3.98419189,6.99916803 L17.0158081,4.04533502 C17.5593623,3.9221294 18,4.27791592 18,4.81764909 L18,12.826854 C18,13.3765968 17.567256,13.9203402 17.0158081,14.045335 L3.98419189,16.999168 C3.44063772,17.1223736 3,16.7665871 3,16.226854 L3,8.21764909 Z M4.7,8.91273003 C4.7,8.64184623 4.9157526,8.37190924 5.19538898,8.30666075 L7.20461102,7.83784228 C7.4782068,7.77400327 7.7,7.93730889 7.7,8.21273004 L7.7,11.231773 C7.7,11.5026568 7.4842474,11.7725938 7.20461102,11.8378423 L5.19538898,12.3066608 C4.9217932,12.3704998 4.7,12.2071941 4.7,11.931773 L4.7,8.91273003 Z M13.6,6.71273003 C13.6,6.44184623 13.8157526,6.17190924 14.095389,6.10666075 L16.104611,5.63784228 C16.3782068,5.57400327 16.6,5.73730889 16.6,6.01273004 L16.6,9.031773 C16.6,9.30265681 16.3842474,9.57259379 16.104611,9.63784228 L14.095389,10.1066608 C13.8217932,10.1704998 13.6,10.0071941 13.6,9.731773 L13.6,6.71273003 Z M9.2,7.91273003 C9.2,7.64184623 9.4197113,7.36732369 9.68772278,7.30032082 L11.5122772,6.84418221 C11.7816391,6.77684175 12,6.93730889 12,7.21273004 L12,10.231773 C12,10.5026568 11.7802887,10.7771793 11.5122772,10.8441822 L9.68772278,11.3003208 C9.41836093,11.3676613 9.2,11.2071941 9.2,10.931773 L9.2,7.91273003 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-251.000000, -364.000000)">
-            <g id="funicular-m" transform="translate(252.000000, 365.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Rectangle-41-Copy">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-funicular-s.svg b/data/styles/clear/style-night/symbols/olympic-funicular-s.svg
deleted file mode 100644
index e5a071f85f..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-funicular-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-funicular-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M2,6.99077797 C2,6.44358641 2.4296875,5.85820312 2.95884204,5.68358213 L11.041158,3.01641787 C11.5707118,2.8416651 12,3.15097518 12,3.69077796 L12,7.70922203 C12,8.25641359 11.5703125,8.84179687 11.041158,9.01641787 L2.95884204,11.6835821 C2.4292882,11.8583349 2,11.5490248 2,11.009222 L2,6.99077797 Z M3,7 L5,6.3 L5,8.3 L3,9 L3,7 Z M6,5.89999998 L8,5.19999999 L8,7.19999999 L6,7.89999998 L6,5.89999998 Z M9,4.99999998 L11,4.29999999 L11,6.29999999 L9,6.99999998 L9,4.99999998 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-284.000000, -367.000000)">
-            <g id="funicular-s" transform="translate(285.000000, 368.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Rectangle-49">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-ship-l.svg b/data/styles/clear/style-night/symbols/olympic-ship-l.svg
deleted file mode 100644
index 2477f3d8bb..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-ship-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-ship-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M10,3.3622 C9.446,3.3622 9,3.8082 9,4.3622 L7,4.3622 C6.446,4.3622 6,4.8082 6,5.3622 L6,11.4247 L4,12.3622 L6,16.3622 L6,18.3622 C7.5,18.3622 8.5,19.3627 9.5,19.3622 C10.5,19.3627 11,18.3622 12.5,18.3622 C14,18.3622 14.5,19.3617 15.5,19.3622 C16.5,19.3627 17.5,18.3622 19,18.3622 L19,16.3622 L21,12.3622 L19,11.4247 L19,5.3622 C19,4.8082 18.554,4.3622 18,4.3622 L16,4.3622 C16,3.8082 15.554,3.3622 15,3.3622 L10,3.3622 L10,3.3622 Z M8,6.3622 L17,6.3622 L17,10.4872 L12.5,8.3622 L8,10.4872 L8,6.3622 L8,6.3622 Z M6,20.3622 C5.30594,20.3622 4.66024,20.7671 4,20.9872 L4,23.01845 C4,23.01845 5,22.3627 6,22.3622 C7,22.3617 8,23.3622 9.5,23.3622 C11,23.3622 11.47352,22.3969 12.5,22.3622 C13.5,22.3627 14,23.3622 15.5,23.3622 C17,23.3622 18,22.3622 19,22.3622 C19.70165,22.3622 21,23.01845 21,23.01845 L21,20.9872 C20.3584,20.7404 19.65657,20.3622 19,20.3622 C17.5,20.3622 16.5,21.3627 15.5,21.3622 C14.5,21.3617 14,20.3622 12.5,20.3622 C11,20.3622 10.5,21.3627 9.5,21.3622 C8.5,21.3627 7.5,20.3622 6,20.3622 L6,20.3622 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-214.000000, -136.000000)">
-            <g id="ship-l" transform="translate(215.000000, 137.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="path8421-9-1-0-1-copy">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-ship-m.svg b/data/styles/clear/style-night/symbols/olympic-ship-m.svg
deleted file mode 100644
index 8edb64fa15..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-ship-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-ship-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M9,3 C8.5,3 8,3.5 8,4 L6.82354,4 C6.3673,4 5.9706,4.5438 5.9706,5 L6,8.5 L4,9.5 L6,13 L6,14.5 L8.5,15.5 L10.5,14.5 L12.5,15.5 L15,14.5 L15,13 L17,9.5 L15,8.5 L15,5 C15,4.5438 14.63271,4 14.17647,4 L13,4 C13,3.5 12.5,3 12,3 L9,3 Z M7,5 L14,5 L14,8.0441 L10.5,6 L7,8.0441 L7,5 Z M6,16 L4,17 L4,18.5 L6,17.5 L8.5,18.5 L10.5,17.5 L12.5,18.5 L15,17.6466 L17,18.5 L17,17 L15,16 L12.5,17 L10.5,16 L8.5,17 L6,16 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-251.000000, -138.000000)">
-            <g id="ship-m" transform="translate(252.000000, 139.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="path30964-copy">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-ship-s.svg b/data/styles/clear/style-night/symbols/olympic-ship-s.svg
deleted file mode 100644
index 500be383ec..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-ship-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-ship-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M4.5,2.5 C4.223,2.5 4,2.723 4,3 L4,6.5 L3,7 L4,9 L4,10 L6,10.5 L7.5,10 L9,10.5 L11,10 L11,9 L12,7 L11,6.5313 L11,3 C11,2.723 10.777,2.5 10.5,2.5 L9.5,2.5 L5.5,2.5 L4.5,2.5 Z M5,3.5 L10,3.5 L10,6.0625 L7.5,4.5 L5,6 L5,3.5 Z M4.5,10.9995 L3,11.4683 L3,12.4995 L3.15625,12.4375 L4.5,12 L6,12.5 L7.5,12 L9,12.5 L10.5,12 L12,12.5 L12,11.4688 L10.5,11 L9,11.4688 L7.5,11 L6,11.4688 L4.5,10.9995 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-284.000000, -141.000000)">
-            <g id="ship-s" transform="translate(285.000000, 142.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="path30937-copy">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-stadium-l.svg b/data/styles/clear/style-night/symbols/olympic-stadium-l.svg
deleted file mode 100644
index 4b2fc2ad8f..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-stadium-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-stadium-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M25,12.5 C25,19.403 19.403,25 12.5,25 C5.597,25 0,19.403 0,12.5 C0,5.597 5.597,0 12.5,0 C19.403,0 25,5.597 25,12.5 L25,12.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M8,16.8345768 C8.87211596,17.2812616 9.89168357,17.6492508 11,17.8318236 L11,15.495389 C11,15.2217932 11.2157526,15 11.495389,15 L13.504611,15 C13.7782068,15 14,15.2157526 14,15.495389 L14,17.8318236 C15.1083164,17.6492508 16.127884,17.2812616 17,16.8345768 L17,14.4904785 C17,14.2195947 17.1990795,13.9004602 17.4438648,13.7780676 L18.5561352,13.2219324 C18.8012749,13.0993625 19,13.2150574 19,13.4904785 L19,15.4730796 C19.6232382,14.9033908 19.9852213,14.3600112 19.9995574,14 L20,9 C19.9998486,8.99268346 20,8.98535738 20,8.97802198 C20,7.8855906 16.6421356,7 12.5,7 C8.35786438,7 5,7.8855906 5,8.97802198 C5,8.98535738 5.0001514,8.99268346 5.00045342,9 L5,14 C5.01477865,14.3600112 5.37676181,14.9033908 6,15.4730796 L6,13.4904785 C6,13.2150574 6.19872505,13.0993625 6.44386482,13.2219324 L7.55613518,13.7780676 C7.80092049,13.9004602 8,14.2195947 8,14.4904785 L8,16.8345768 Z M12.5,11.5 C16.0898509,11.5 19,10.7164983 19,9.75 C19,8.78350169 16.0898509,8 12.5,8 C8.91014913,8 6,8.78350169 6,9.75 C6,10.7164983 8.91014913,11.5 12.5,11.5 Z M10.2034912,9.5 L15.2034912,9.5 L16.4937134,10.6821289 C16.4937134,10.6821289 14.5578349,10.9495239 12.7034912,10.9495239 C10.8491475,10.9495239 9,10.6821289 9,10.6821289 L10.2034912,9.5 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-71.000000, -328.000000)">
-            <g id="wayside_shrine-l" transform="translate(72.000000, 329.000000)">
-                <use id="Shape" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-stadium-m.svg b/data/styles/clear/style-night/symbols/olympic-stadium-m.svg
deleted file mode 100644
index ebdfdfd85c..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-stadium-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-stadium-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M21,10.5 C21,16.299 16.299,21 10.5,21 C4.701,21 0,16.299 0,10.5 C0,4.701 4.701,0 10.5,0 C16.299,0 21,4.701 21,10.5 L21,10.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M6.5,14.2749245 C7.27745398,14.7353078 8.19677531,15.1172736 9.2,15.3026305 L9.2,13.2266817 C9.2,12.9496106 9.42167454,12.725 9.70130615,12.725 L11.2986938,12.725 C11.5755576,12.725 11.8,12.9480835 11.8,13.2266817 L11.8,15.3026305 C12.8032247,15.1172736 13.722546,14.7353078 14.5,14.2749245 L14.5,12.495389 C14.5,12.2217932 14.6839294,11.8773804 14.9098816,11.7267456 L15.5901184,11.2732544 C15.8164898,11.1223402 16,11.2150574 16,11.4904785 L16,13.1425319 C16.4835075,12.6748624 16.8115294,12.2166536 16.9397179,11.8583333 L17,11.8583333 L17,7.525 L16.9427258,7.525 C16.5190192,6.54650414 13.7959999,5.79166667 10.5,5.79166667 C7.20400007,5.79166667 4.4809808,6.54650414 4.05727424,7.525 L4,7.525 L4,11.8583333 L4.06028211,11.8583333 C4.18847057,12.2166536 4.51649252,12.6748624 5,13.1425319 L5,11.4904785 C5,11.2150574 5.18351024,11.1223402 5.40988159,11.2732544 L6.09011841,11.7267456 C6.31607056,11.8773804 6.5,12.2217932 6.5,12.495389 L6.5,14.2749245 Z M10.5,9.69166667 C13.6112041,9.69166667 16.1333333,9.01263187 16.1333333,8.175 C16.1333333,7.33736813 13.6112041,6.65833333 10.5,6.65833333 C7.38879591,6.65833333 4.86666667,7.33736813 4.86666667,8.175 C4.86666667,9.01263187 7.38879591,9.69166667 10.5,9.69166667 Z M8.33333333,7.95833333 L12.6666667,7.95833333 L13.7848592,8.98284505 C13.7848592,8.98284505 12.1070979,9.2145874 10.5,9.2145874 C8.89290214,9.2145874 7.29030762,8.98284505 7.29030762,8.98284505 L8.33333333,7.95833333 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-108.000000, -330.000000)">
-            <g id="wayside_shrine-m" transform="translate(109.000000, 331.000000)">
-                <use id="Shape" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-stadium-main-l.svg b/data/styles/clear/style-night/symbols/olympic-stadium-main-l.svg
deleted file mode 100644
index 5ae7ac0067..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-stadium-main-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-stadium-main-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M25,12.5 C25,19.403 19.403,25 12.5,25 C5.597,25 0,19.403 0,12.5 C0,5.597 5.597,0 12.5,0 C19.403,0 25,5.597 25,12.5 L25,12.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M14,6.84622133 L14,8.03956761 C17.4233605,8.22283939 20,9.0210716 20,9.97802198 C20,9.98535738 19.9998486,9.99268346 19.9995466,10 L20,15 C19.9609227,15.970208 17.3974334,18.272165 14,18.8318236 L14,16.495389 C14,16.2157526 13.7782068,16 13.504611,16 L11.495389,16 C11.2157526,16 11,16.2217932 11,16.495389 L11,18.8318236 C7.60256661,18.272165 5.03907733,15.970208 5.00044263,15 L5,10 C5.0001514,9.99268346 5,9.98535738 5,9.97802198 C5,9.0210716 7.57663952,8.22283939 11,8.03956761 L11,6.84791523 C10.4120293,6.91799245 10,7 10,7 L10,5 C10,5 11.25,4.75 12.5,4.75 C13.75,4.75 15,5 15,5 L15,7 C15,7 14.5890263,6.91666374 14,6.84622133 Z M13,6.76169435 L13,8.00432588 C12.8347382,8.00145706 12.6680143,8 12.5,8 C12.3319857,8 12.1652618,8.00145706 12,8.00432588 L12,6.76273242 C12.1684039,6.7546696 12.3400054,6.75 12.5115967,6.75 C12.6756852,6.75 12.8393868,6.75427017 13,6.76169435 Z M12.5,12.5 C16.0898509,12.5 19,11.7164983 19,10.75 C19,9.78350169 16.0898509,9 12.5,9 C8.91014913,9 6,9.78350169 6,10.75 C6,11.7164983 8.91014913,12.5 12.5,12.5 Z M10,10.5 L15,10.5 L16.2902222,11.6821289 C16.2902222,11.6821289 14.3543437,11.9495239 12.5,11.9495239 C10.6456563,11.9495239 8.79650879,11.6821289 8.79650879,11.6821289 L10,10.5 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-71.000000, -367.000000)">
-            <g id="wayside_shrine-l" transform="translate(72.000000, 368.000000)">
-                <use id="Shape" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-stadium-main-m.svg b/data/styles/clear/style-night/symbols/olympic-stadium-main-m.svg
deleted file mode 100644
index 0880852839..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-stadium-main-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-stadium-main-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M21,10.5 C21,16.299 16.299,21 10.5,21 C4.701,21 0,16.299 0,10.5 C0,4.701 4.701,0 10.5,0 C16.299,0 21,4.701 21,10.5 L21,10.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M12,5.86330785 L12,6.84518416 C14.592628,7.03362209 16.5853865,7.69977093 16.9427258,8.525 L17,8.525 L17,12.8583333 L16.9397179,12.8583333 C16.5649725,13.9058448 14.4824032,15.8070267 11.8,16.3026305 L11.8,14.2266817 C11.8,13.9480835 11.5755576,13.725 11.2986938,13.725 L9.70130615,13.725 C9.42167454,13.725 9.2,13.9496106 9.2,14.2266817 L9.2,16.3026305 C6.51759676,15.8070267 4.43502752,13.9058448 4.06028211,12.8583333 L4,12.8583333 L4,8.525 L4.05727424,8.525 C4.41461348,7.69977093 6.40737195,7.03362209 9,6.84518416 L9,5.86481354 C8.41202929,5.9271044 8,6 8,6 L8,4.22222222 C8,4.22222222 9.25,4 10.5,4 C11.75,4 13,4.22222222 13,4.22222222 L13,6 C13,6 12.5890263,5.92592332 12,5.86330785 Z M11.25,5.80073998 L11.25,6.80483645 C11.0039181,6.7961373 10.7536558,6.79166667 10.5,6.79166667 C10.2463442,6.79166667 9.99608187,6.7961373 9.75,6.80483645 L9.75,5.80197788 C9.99666521,5.78712186 10.2541424,5.77777778 10.5115967,5.77777778 C10.7618243,5.77777778 11.0111523,5.78660465 11.25,5.80073998 Z M10.5,10.6916667 C13.6112041,10.6916667 16.1333333,10.0126319 16.1333333,9.175 C16.1333333,8.33736813 13.6112041,7.65833333 10.5,7.65833333 C7.38879591,7.65833333 4.86666667,8.33736813 4.86666667,9.175 C4.86666667,10.0126319 7.38879591,10.6916667 10.5,10.6916667 Z M8.33333333,8.95833333 L12.6666667,8.95833333 L13.7848592,9.98284505 C13.7848592,9.98284505 12.1070979,10.2145874 10.5,10.2145874 C8.89290214,10.2145874 7.29030762,9.98284505 7.29030762,9.98284505 L8.33333333,8.95833333 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-108.000000, -369.000000)">
-            <g id="wayside_shrine-m" transform="translate(109.000000, 370.000000)">
-                <use id="Shape" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-stadium-main-s.svg b/data/styles/clear/style-night/symbols/olympic-stadium-main-s.svg
deleted file mode 100644
index b6edf69782..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-stadium-main-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-stadium-main-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M7.5,15 C11.6421356,15 15,11.6421356 15,7.5 C15,3.35786438 11.6421356,0 7.5,0 C3.35786438,0 0,3.35786438 0,7.5 C0,11.6421356 3.35786438,15 7.5,15 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M5,10.61939 C5.44938571,10.8388082 5.95597474,11.0190757 6.5,11.1227384 L6.5,9.49236391 C6.5,9.22043883 6.71403503,9 7.00468445,9 L7.99531555,9 C8.27404508,9 8.5,9.22083202 8.5,9.49236391 L8.5,11.1227384 C9.04402526,11.0190757 9.55061429,10.8388082 10,10.61939 L10,9.29064941 C10,9.07491318 10.15625,8.82189941 10.3610229,8.71951294 L10.6389771,8.58053589 C10.8383645,8.48084215 11,8.57870388 11,8.79222202 L11,10.0055131 C11.4736222,9.64428751 11.8034056,9.2681041 11.93558,8.97884615 L12,8.97884615 L12,5.97884615 C11.9656127,5.16017064 9.96409301,4.5 7.5,4.5 C5.03590699,4.5 3.03438733,5.16017064 3.00043836,5.97884615 L3,8.97884615 L3.06442003,8.97884615 C3.19659437,9.2681041 3.52637785,9.64428751 4,10.0055131 L4,8.79222202 C4,8.57870388 4.16163548,8.48084215 4.36102295,8.58053589 L4.63897705,8.71951294 C4.84375,8.82189941 5,9.07491318 5,9.29064941 L5,10.61939 Z M7.5,7.5 C9.709139,7.5 11.5,6.94035594 11.5,6.25 C11.5,5.55964406 9.709139,5 7.5,5 C5.290861,5 3.5,5.55964406 3.5,6.25 C3.5,6.94035594 5.290861,7.5 7.5,7.5 Z M6,6 L9,6 L9.7741333,6.81552907 C9.7741333,6.81552907 8.61260621,7 7.5,7 C6.38739379,7 5.27790527,6.81552907 5.27790527,6.81552907 L6,6 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-141.000000, -333.000000)">
-            <g id="wayside_shrine-s" transform="translate(142.000000, 334.000000)">
-                <use id="Oval" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-stadium-s.svg b/data/styles/clear/style-night/symbols/olympic-stadium-s.svg
deleted file mode 100644
index 03dad8e863..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-stadium-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-stadium-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M7.5,15 C11.6421356,15 15,11.6421356 15,7.5 C15,3.35786438 11.6421356,0 7.5,0 C3.35786438,0 0,3.35786438 0,7.5 C0,11.6421356 3.35786438,15 7.5,15 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#A6CE39" offset="0%"></stop>
-            <stop stop-color="#009D57" offset="100%"></stop>
-        </linearGradient>
-        <path d="M6.5,11.1227384 C4.73937855,10.7872564 3.37084716,9.64944896 3.06442003,8.97884615 L3,8.97884615 L3,5.97884615 C3.03205888,5.21632108 4.77060664,4.59130377 7,4.5091548 L7,4 L8,4 L8,4.5091548 C10.2293934,4.59130377 11.9679411,5.21632108 11.9995616,5.97884615 L12,8.97884615 L11.93558,8.97884615 C11.6291528,9.64944896 10.2606214,10.7872564 8.5,11.1227384 L8.5,9.49236391 C8.5,9.22083202 8.27404508,9 7.99531555,9 L7.00468445,9 C6.71403503,9 6.5,9.22043883 6.5,9.49236391 L6.5,11.1227384 Z M7.5,7.5 C9.709139,7.5 11.5,6.94035594 11.5,6.25 C11.5,5.55964406 9.709139,5 7.5,5 C5.290861,5 3.5,5.55964406 3.5,6.25 C3.5,6.94035594 5.290861,7.5 7.5,7.5 Z M6,3 L9,3 L9,4 L6,4 L6,3 Z M6,6 L9,6 L9.7741333,6.81552907 C9.7741333,6.81552907 8.61260621,7 7.5,7 C6.38739379,7 5.27790527,6.81552907 5.27790527,6.81552907 L6,6 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-141.000000, -372.000000)">
-            <g id="wayside_shrine-s" transform="translate(142.000000, 373.000000)">
-                <use id="Oval" stroke="#098F4C" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.7" fill="#098F4C" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-subway-l.svg b/data/styles/clear/style-night/symbols/olympic-subway-l.svg
deleted file mode 100644
index 3a81bdb8d3..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-subway-l.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-subway-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M3,0.3622 L0,2.3622 L0,13.3622 C0,13.8622 0.5,14.3622 1,14.3622 L3.5,14.3622 L7,14.3622 L9.5,14.3622 L12,14.3622 C12.5,14.3622 13,13.8622 13,13.3622 L13,2.3622 L10,0.3622 L3,0.3622 Z M4,2.3622 L9,2.3622 L11,3.3622 L11,6.3622 L2,6.3622 L2,3.3622 L4,2.3622 Z M3,10.3622 C3.554,10.3622 4,10.8082 4,11.3622 C4,11.9162 3.554,12.3622 3,12.3622 C2.446,12.3622 2,11.9162 2,11.3622 C2,10.8082 2.446,10.3622 3,10.3622 L3,10.3622 Z M10,10.3622 C10.554,10.3622 11,10.8082 11,11.3622 C11,11.9162 10.554,12.3622 10,12.3622 C9.446,12.3622 9,11.9162 9,11.3622 C9,10.8082 9.446,10.3622 10,10.3622 L10,10.3622 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-213.000000, -394.000000)">
-            <g id="subway-l" transform="translate(214.000000, 395.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="g24855" transform="translate(6.000000, 5.000000)">
-                    <g id="path24859">
-                        <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                        <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-subway-m.svg b/data/styles/clear/style-night/symbols/olympic-subway-m.svg
deleted file mode 100644
index e6c959320b..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-subway-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-subway-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M6.95762217,4.03583644 L4.95762217,5.53583644 L5,15.0049207 C5.01536083,15.5049207 5.51536083,16.0049207 6.01536083,16.0049207 L15.0153608,16.0049207 C15.5153608,16.0049207 16.0078669,15.6758134 16,15.0049207 L15.9576222,5.53583644 L13.9576222,4.03583644 L6.95762217,4.03583644 Z M8.57605219,6.04136763 L12.5760522,6.04136763 L14,7.14000509 L14,10.9843851 L7,10.9843851 L7,7.14000509 L8.57605219,6.04136763 Z M8,13.6122 C8,14.026414 7.66421,14.3622 7.25,14.3622 C6.83579,14.3622 6.5,14.026414 6.5,13.6122 C6.5,13.197986 6.83579,12.8622 7.25,12.8622 C7.66421,12.8622 8,13.197986 8,13.6122 Z M13.75,12.8622 C14.16421,12.8622 14.5,13.197986 14.5,13.6122 C14.5,14.026414 14.16421,14.3622 13.75,14.3622 C13.33579,14.3622 13,14.026414 13,13.6122 C13,13.197986 13.33579,12.8622 13.75,12.8622 L13.75,12.8622 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-250.000000, -396.000000)">
-            <g id="subway-m" transform="translate(251.000000, 397.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="path24869">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-subway-s.svg b/data/styles/clear/style-night/symbols/olympic-subway-s.svg
deleted file mode 100644
index 1ed55ea296..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-subway-s.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-subway-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M5.5,3 L4,4.14285714 L4,10.4285714 C4,10.7142857 4.25,11 4.5,11 L5.75,11 L8,11 L9.25,11 L10.5,11 C10.75,11 11,10.7142857 11,10.4285714 L11,4.14285714 L9.5,3 L5.5,3 Z M6,4.14285714 L9,4.14285714 L10,4.71428571 L10,6.42857143 L5,6.42857143 L5,4.71428571 L6,4.14285714 Z M5.5,8.71428571 C5.777,8.71428571 6,8.96914286 6,9.28571429 C6,9.60228571 5.777,9.85714286 5.5,9.85714286 C5.223,9.85714286 5,9.60228571 5,9.28571429 C5,8.96914286 5.223,8.71428571 5.5,8.71428571 L5.5,8.71428571 Z M9.5,8.71428571 C9.777,8.71428571 10,8.96914286 10,9.28571429 C10,9.60228571 9.777,9.85714286 9.5,9.85714286 C9.223,9.85714286 9,9.60228571 9,9.28571429 C9,8.96914286 9.223,8.71428571 9.5,8.71428571 L9.5,8.71428571 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-283.000000, -399.000000)">
-            <g id="subway-s" transform="translate(284.000000, 400.000000)">
-                <g id="g24875">
-                    <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                    <g id="path24879">
-                        <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                        <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-subway-xs.svg b/data/styles/clear/style-night/symbols/olympic-subway-xs.svg
deleted file mode 100644
index f344ab5521..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-subway-xs.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="10px" height="10px" viewBox="0 0 10 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-subway-xs</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <circle id="path-1" cx="4.9874153" cy="5" r="4"></circle>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="8" height="8" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <rect id="path-4" x="3" y="3" width="4" height="4" rx="1"></rect>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-310.000000, -403.000000)">
-            <g id="subway-xs" transform="translate(310.000000, 403.000000)">
-                <circle id="Oval-139-Copy" fill-opacity="0.6" fill="#FFFFFF" cx="5" cy="5" r="5"></circle>
-                <use id="Oval-139" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Rectangle-307">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-tourism-l.svg b/data/styles/clear/style-night/symbols/olympic-tourism-l.svg
deleted file mode 100644
index 2b80748906..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-tourism-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-tourism-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M25,12.5 C25,19.403 19.403,25 12.5,25 C5.597,25 0,19.403 0,12.5 C0,5.597 5.597,0 12.5,0 C19.403,0 25,5.597 25,12.5 L25,12.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#FCB131" offset="0%"></stop>
-            <stop stop-color="#F34320" offset="100%"></stop>
-        </linearGradient>
-        <polygon id="path-4" points="7.85984848 19 12.5 16.6047745 17.1401515 19 16.25 13.9310345 20 10.3474801 14.8106061 9.60477454 12.5 5 10.1893939 9.60477454 5 10.3474801 8.75 13.9310345"></polygon>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-71.000000, -171.000000)">
-            <g id="wayside_shrine-l" transform="translate(72.000000, 172.000000)">
-                <use id="Shape" stroke="#E74A20" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.75" fill="#E74A20" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-tourism-m.svg b/data/styles/clear/style-night/symbols/olympic-tourism-m.svg
deleted file mode 100644
index 69c6b0d8ea..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-tourism-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-tourism-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M21,10.5 C21,16.299 16.299,21 10.5,21 C4.701,21 0,16.299 0,10.5 C0,4.701 4.701,0 10.5,0 C16.299,0 21,4.701 21,10.5 L21,10.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#FCB131" offset="0%"></stop>
-            <stop stop-color="#F34320" offset="100%"></stop>
-        </linearGradient>
-        <polygon id="path-4" points="6.47853535 16 10.5 13.9469496 14.5214646 16 13.75 11.6551724 17 8.58355438 12.5025253 7.9469496 10.5 4 8.49747475 7.9469496 4 8.58355438 7.25 11.6551724"></polygon>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-108.000000, -173.000000)">
-            <g id="wayside_shrine-m" transform="translate(109.000000, 174.000000)">
-                <use id="Shape" stroke="#E74A20" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.75" fill="#E74A20" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-tourism-s.svg b/data/styles/clear/style-night/symbols/olympic-tourism-s.svg
deleted file mode 100644
index 3c4790c1e2..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-tourism-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-tourism-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M7.5,15 C11.6421356,15 15,11.6421356 15,7.5 C15,3.35786438 11.6421356,0 7.5,0 C3.35786438,0 0,3.35786438 0,7.5 C0,11.6421356 3.35786438,15 7.5,15 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#FCB131" offset="0%"></stop>
-            <stop stop-color="#F34320" offset="100%"></stop>
-        </linearGradient>
-        <polygon id="path-4" points="4.71590909 11 7.5 9.63129973 10.2840909 11 9.75 8.10344828 12 6.05570292 8.88636364 5.63129973 7.5 3 6.11363636 5.63129973 3 6.05570292 5.25 8.10344828"></polygon>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-141.000000, -176.000000)">
-            <g id="wayside_shrine-s" transform="translate(142.000000, 177.000000)">
-                <use id="Oval" stroke="#E74A20" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.75" fill="#E74A20" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-train-l.svg b/data/styles/clear/style-night/symbols/olympic-train-l.svg
deleted file mode 100644
index 19c2c80cea..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-train-l.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-train-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M10.25,18 L11,18 L9.46311476,21 L15.5368852,21 L14,18 L14.75,18 L13,18 L10.25,18 Z M9.31250001,18 L9.12500001,18 L6.00000001,24 L7.875,24.1 L8.4385246,23 L16.5614754,23 L17.125,24.1 L19,24 L15.875,18 L15.6875,18 L18,18 C18.5,18 19,17.5 19,17 L19,6.9955775 C19,6.44573523 18.6321411,5.75476074 18.1643327,5.4428885 L16.8356673,4.5571115 C16.374141,4.24942732 15.5621186,4 14.9970707,4 L10.0029293,4 C9.44902676,4 8.63214111,4.24523926 8.16433275,4.5571115 L6.83566725,5.4428885 C6.37414097,5.75057268 6,6.44483697 6,6.9955775 L6,17 C6,17.5 6.5,18 7,18 L9.31250001,18 Z M9.10529494,6.44735253 C9.5994269,6.20028655 10.4437166,6 10.9998075,6 L14.0001925,6 C14.5523709,6 15.4047298,6.20236492 15.8947051,6.44735253 L16.1052949,6.55264747 C16.5994269,6.79971345 17,7.44335318 17,8.0093689 L17,9.9906311 C17,10.5480902 16.5536886,11 16.0024554,11 L8.99754465,11 C8.44661595,11 8,10.5566468 8,9.9906311 L8,8.0093689 C8,7.45190985 8.40472984,6.79763508 8.89470506,6.55264747 L9.10529494,6.44735253 Z M9,14 C9.554,14 10,14.446 10,15 C10,15.554 9.554,16 9,16 C8.446,16 8,15.554 8,15 C8,14.446 8.446,14 9,14 Z M16,14 C16.554,14 17,14.446 17,15 C17,15.554 16.554,16 16,16 C15.446,16 15,15.554 15,15 C15,14.446 15.446,14 16,14 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-214.000000, -288.000000)">
-            <g id="train-l" transform="translate(215.000000, 289.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-                <g id="g24855" transform="translate(6.000000, 4.000000)"></g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-train-m.svg b/data/styles/clear/style-night/symbols/olympic-train-m.svg
deleted file mode 100644
index ee62c1a797..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-train-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-train-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M7.9881561,2.03459562 C7.43616181,2.03459562 6.623115,2.30963415 6.18949229,2.63587515 L5.79476211,2.93285492 C5.35338181,3.26493243 4.9976093,3.99070765 5.0000121,4.52928925 L5.0378042,13.0003074 C5.05311212,13.5001537 5.55138953,14 6.04966694,14 L15.0186604,14 C15.5169378,14 16.0077471,13.6709939 15.9999073,13.0003074 L15.9621152,4.52928925 C15.9596632,3.97968043 15.5921085,3.25909592 15.1584858,2.93285492 L14.7637556,2.63587515 C14.3223753,2.30379764 13.5068586,2.03459562 12.9650918,2.03459562 L7.9881561,2.03459562 Z M7.37916245,4.76597573 C7.75492901,4.3647599 8.49978057,4.03951021 9.06342775,4.03951021 L12.0164082,4.03951021 C12.5708357,4.03951021 13.3216338,4.37500414 13.6946598,4.79030102 L14.0067977,5.1378099 L14.0067977,7.97125292 C14.0067977,8.52892524 13.5490904,8.98100797 13.0073236,8.98100797 L8.03038793,8.98100797 C7.47839364,8.98100797 7.03091386,8.54014429 7.03091386,7.97125292 L7.03091386,5.1378099 L7.37916245,4.76597573 Z M8.02746869,11.6080149 C8.02746869,12.0221016 7.69283554,12.3577844 7.28005257,12.3577844 C6.86726959,12.3577844 6.53263645,12.0221016 6.53263645,11.6080149 C6.53263645,11.1939283 6.86726959,10.8582455 7.28005257,10.8582455 C7.69283554,10.8582455 8.02746869,11.1939283 8.02746869,11.6080149 Z M7.95833334,16 L9.00000001,14 L7.12500001,14 L4.00000001,20 L5.875,20 L6.91666667,18 L14.0833333,18 L15.125,20 L17,20 L13.875,14 L12,14 L13.0416667,16 L7.95833334,16 Z M13.757659,10.8582455 C14.1704419,10.8582455 14.5050751,11.1939283 14.5050751,11.6080149 C14.5050751,12.0221016 14.1704419,12.3577844 13.757659,12.3577844 C13.344876,12.3577844 13.0102428,12.0221016 13.0102428,11.6080149 C13.0102428,11.1939283 13.344876,10.8582455 13.757659,10.8582455 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-251.000000, -290.000000)">
-            <g id="train-m" transform="translate(252.000000, 291.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-train-s.svg b/data/styles/clear/style-night/symbols/olympic-train-s.svg
deleted file mode 100644
index 08863e2bdb..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-train-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-train-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M5.86363637,12 L7.00000001,10 L5.50000001,10 L3,14.4 L4.5,14.4 L5.29545455,13 L9.70454545,13 L10.5,14.4 L12,14.4 L9.49999999,10 L7.99999999,10 L9.13636363,12 L5.86363637,12 Z M6.5093689,2 C5.95190985,2 5.13689184,2.27665383 4.69730425,2.61157772 L4.80269575,2.53127943 C4.35937913,2.86904447 4,3.59491021 4,4.15276589 L4,9.4285714 C4,9.7142857 4.25,10 4.5,10 L5.75,10 L8,10 L9.25,10 L10.5,10 C10.75,10 11,9.7142857 11,9.4285714 L11,4.15276589 C11,3.59500869 10.6368918,2.86620331 10.1973042,2.53127943 L10.3026958,2.61157772 C9.8593791,2.27381267 9.0566468,2 8.4906311,2 L6.5093689,2 Z M6,3.14285714 L9,3.14285714 L10,3.71428571 L10,5.42857143 L5,5.42857143 L5,3.71428571 L6,3.14285714 Z M5.5,7.71428571 C5.777,7.71428571 6,7.96914286 6,8.28571429 C6,8.60228571 5.777,8.85714286 5.5,8.85714286 C5.223,8.85714286 5,8.60228571 5,8.28571429 C5,7.96914286 5.223,7.71428571 5.5,7.71428571 Z M9.5,7.71428571 C9.777,7.71428571 10,7.96914286 10,8.28571429 C10,8.60228571 9.777,8.85714286 9.5,8.85714286 C9.223,8.85714286 9,8.60228571 9,8.28571429 C9,7.96914286 9.223,7.71428571 9.5,7.71428571 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-284.000000, -293.000000)">
-            <g id="train-s" transform="translate(285.000000, 294.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-train-xs.svg b/data/styles/clear/style-night/symbols/olympic-train-xs.svg
deleted file mode 100644
index 5e8bb2a8b3..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-train-xs.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="10px" height="10px" viewBox="0 0 10 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-train-xs</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <circle id="path-1" cx="5" cy="5" r="5"></circle>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="10" height="10" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <rect id="path-4" x="3" y="3" width="4" height="4" rx="1"></rect>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-310.000000, -297.000000)">
-            <g id="subway-newyork-xs" transform="translate(310.000000, 297.000000)">
-                <use id="Oval-139" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Rectangle-307">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-tram-l.svg b/data/styles/clear/style-night/symbols/olympic-tram-l.svg
deleted file mode 100644
index e5678e854c..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-tram-l.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-tram-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="25" height="25" rx="3"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M4.00292933,4 C3.44902676,4 2.63214111,4.24523926 2.16433275,4.5571115 L0.835667253,5.4428885 C0.374140973,5.75057268 0,6.44483697 0,6.9955775 L0,17 C0,17.5 0.5,18 1,18 L3.5,18 L7,18 L9.5,18 L12,18 C12.5,18 13,17.5 13,17 L13,6.9955775 C13,6.44573523 12.6321411,5.75476074 12.1643327,5.4428885 L10.8356673,4.5571115 C10.374141,4.24942732 9.56211865,4 8.99707067,4 L4.00292933,4 Z M3.10529494,6.44735253 C3.5994269,6.20028655 4.44371665,6 4.99980749,6 L8.00019251,6 C8.55237094,6 9.40472984,6.20236492 9.89470506,6.44735253 L10.1052949,6.55264747 C10.5994269,6.79971345 11,7.44335318 11,8.0093689 L11,9.9906311 C11,10.5480902 10.5536886,11 10.0024554,11 L2.99754465,11 C2.44661595,11 2,10.5566468 2,9.9906311 L2,8.0093689 C2,7.45190985 2.40472984,6.79763508 2.89470506,6.55264747 L3.10529494,6.44735253 Z M3,14 C3.554,14 4,14.446 4,15 C4,15.554 3.554,16 3,16 C2.446,16 2,15.554 2,15 C2,14.446 2.446,14 3,14 L3,14 Z M10,14 C10.554,14 11,14.446 11,15 C11,15.554 10.554,16 10,16 C9.446,16 9,15.554 9,15 C9,14.446 9.446,14 10,14 Z M1,1 C1,0.44771525 1.44483697,0 1.9955775,0 L11.0044225,0 C11.5542648,0 12,0.443864822 12,1 C12,1.55228475 11.555163,2 11.0044225,2 L1.9955775,2 C1.44573523,2 1,1.55613518 1,1 Z M8,2 L9,2 L9,4 L8,4 L8,2 Z M4,2 L5,2 L5,4 L4,4 L4,2 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-214.000000, -251.000000)">
-            <g id="tram-l" transform="translate(215.000000, 252.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="g24855" transform="translate(6.000000, 3.000000)">
-                    <g id="path24859">
-                        <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                        <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-tram-m.svg b/data/styles/clear/style-night/symbols/olympic-tram-m.svg
deleted file mode 100644
index 7d766f1a14..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-tram-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-tram-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="21" height="21" rx="2"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M12.9862193,6.0347299 L12.9862193,3.9993851 L11.9896645,3.9993851 L11.9896645,6.03459562 L8.98621931,6.03459562 L8.98621931,3.9993851 L7.98966449,3.9993851 L7.98966449,6.03459562 L7.9881561,6.03459562 C7.43616181,6.03459562 6.623115,6.30963415 6.18949229,6.63587515 L5.79476211,6.93285492 C5.35338181,7.26493243 4.9976093,7.99070765 5.0000121,8.52928925 L5.0378042,17.0003074 C5.05311212,17.5001537 5.55138953,18 6.04966694,18 L15.0186604,18 C15.5169378,18 16.0077471,17.6709939 15.9999073,17.0003074 L15.9621152,8.52928925 C15.9596632,7.97968043 15.5921085,7.25909592 15.1584858,6.93285492 L14.7637556,6.63587515 C14.328076,6.30808666 13.5278622,6.04155999 12.9862193,6.0347299 Z M7.37916245,8.76597573 C7.75492901,8.3647599 8.49978057,8.03951021 9.06342775,8.03951021 L12.0164082,8.03951021 C12.5708357,8.03951021 13.3216338,8.37500414 13.6946598,8.79030102 L14.0067977,9.1378099 L14.0067977,11.9712529 C14.0067977,12.5289252 13.5490904,12.981008 13.0073236,12.981008 L8.03038793,12.981008 C7.47839364,12.981008 7.03091386,12.5401443 7.03091386,11.9712529 L7.03091386,9.1378099 L7.37916245,8.76597573 Z M8.02746869,15.6080149 C8.02746869,16.0221016 7.69283554,16.3577844 7.28005257,16.3577844 C6.86726959,16.3577844 6.53263645,16.0221016 6.53263645,15.6080149 C6.53263645,15.1939283 6.86726959,14.8582455 7.28005257,14.8582455 C7.69283554,14.8582455 8.02746869,15.1939283 8.02746869,15.6080149 Z M13.757659,14.8582455 C14.1704419,14.8582455 14.5050751,15.1939283 14.5050751,15.6080149 C14.5050751,16.0221016 14.1704419,16.3577844 13.757659,16.3577844 C13.344876,16.3577844 13.0102428,16.0221016 13.0102428,15.6080149 C13.0102428,15.1939283 13.344876,14.8582455 13.757659,14.8582455 Z M6.03435903,2.99969255 C6.03435903,2.4475776 6.49146335,2 7.02846697,2 L14.0092446,2 C14.5582752,2 15.0033525,2.44372836 15.0033525,2.99969255 C15.0033525,3.5518075 14.5462482,3.9993851 14.0092446,3.9993851 L7.02846697,3.9993851 C6.47943632,3.9993851 6.03435903,3.55565675 6.03435903,2.99969255 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-251.000000, -253.000000)">
-            <g id="tram-m" transform="translate(252.000000, 254.000000)">
-                <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="path24869">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-tram-s.svg b/data/styles/clear/style-night/symbols/olympic-tram-s.svg
deleted file mode 100644
index da356b7355..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-tram-s.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-tram-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <rect id="path-1" x="0" y="0" width="15" height="15" rx="1"></rect>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M9,5.0579843 C9.47176033,5.15576112 9.9815405,5.366888 10.3026958,5.61157772 L10.1973042,5.53127943 C10.6368918,5.86620331 11,6.59500869 11,7.15276589 L11,12.4285714 C11,12.7142857 10.75,13 10.5,13 L9.25,13 L8,13 L5.75,13 L4.5,13 C4.25,13 4,12.7142857 4,12.4285714 L4,7.15276589 C4,6.59491021 4.35937913,5.86904447 4.80269575,5.53127943 L4.69730425,5.61157772 C5.01506149,5.36947696 5.52898734,5.15782327 6,5.05910079 L6,4 L7,4 L7,5 L8,5 L8,4 L9,4 L9,5.0579843 Z M6,6.14285714 L9,6.14285714 L10,6.71428571 L10,8.42857143 L5,8.42857143 L5,6.71428571 L6,6.14285714 Z M5.5,10.7142857 C5.777,10.7142857 6,10.9691429 6,11.2857143 C6,11.6022857 5.777,11.8571429 5.5,11.8571429 C5.223,11.8571429 5,11.6022857 5,11.2857143 C5,10.9691429 5.223,10.7142857 5.5,10.7142857 L5.5,10.7142857 Z M9.5,10.7142857 C9.777,10.7142857 10,10.9691429 10,11.2857143 C10,11.6022857 9.777,11.8571429 9.5,11.8571429 C9.223,11.8571429 9,11.6022857 9,11.2857143 C9,10.9691429 9.223,10.7142857 9.5,10.7142857 Z M4,3.5 C4,3.22385763 4.23290253,3 4.50342274,3 L10.4965773,3 C10.77461,3 11,3.23193359 11,3.5 C11,3.77614237 10.7670975,4 10.4965773,4 L4.50342274,4 C4.22539004,4 4,3.76806641 4,3.5 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-284.000000, -256.000000)">
-            <g id="tram-s" transform="translate(285.000000, 257.000000)">
-                <g id="g24875">
-                    <use id="Rectangle-211" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                    <g id="path24879">
-                        <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                        <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-view-l.svg b/data/styles/clear/style-night/symbols/olympic-view-l.svg
deleted file mode 100644
index 7353f387e6..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-view-l.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-view-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M25,12.5 C25,19.403 19.403,25 12.5,25 C5.597,25 0,19.403 0,12.5 C0,5.597 5.597,0 12.5,0 C19.403,0 25,5.597 25,12.5 L25,12.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#FCB131" offset="0%"></stop>
-            <stop stop-color="#F34320" offset="100%"></stop>
-        </linearGradient>
-        <path d="M2.25,11.25 C3.07842712,11.25 3.75,10.5784271 3.75,9.75 C3.75,8.92157288 3.07842712,8.25 2.25,8.25 C1.42157288,8.25 0.75,8.92157288 0.75,9.75 C0.75,10.5784271 1.42157288,11.25 2.25,11.25 Z M7.5,11.25 C8.32842712,11.25 9,10.5784271 9,9.75 C9,8.92157288 8.32842712,8.25 7.5,8.25 C6.67157288,8.25 6,8.92157288 6,9.75 C6,10.5784271 6.67157288,11.25 7.5,11.25 Z M12.75,11.25 C13.5784271,11.25 14.25,10.5784271 14.25,9.75 C14.25,8.92157288 13.5784271,8.25 12.75,8.25 C11.9215729,8.25 11.25,8.92157288 11.25,9.75 C11.25,10.5784271 11.9215729,11.25 12.75,11.25 Z M3.75,12 L0.75,12 C0.3,12 0,12.3 0,12.75 L0,15 L4.5,15 L4.5,12.75 C4.5,12.3 4.2,12 3.75,12 Z M14.25,12 L11.25,12 C10.8,12 10.5,12.3 10.5,12.75 L10.5,15 L15,15 L15,12.75 C15,12.3 14.7,12 14.25,12 Z M9,12 L6,12 C5.55,12 5.25,12.3 5.25,12.75 L5.25,15 L9.75,15 L9.75,12.75 C9.75,12.3 9.45,12 9,12 Z M0,6.50405791 C0,7.05410154 0.448920205,7.5 1.00748397,7.5 L13.992516,7.5 C14.5489341,7.5 15,7.05330133 15,6.50405791 L15,0.995942093 C15,0.445898464 14.5510798,3.55271368e-15 13.992516,3.55271368e-15 L1.00748397,3.55271368e-15 C0.45106594,3.55271368e-15 0,0.446698666 0,0.995942093 L0,6.50405791 Z M6.5,2.30450982 C6.5,1.86019131 6.78765261,1.71573946 7.13622284,1.97716713 L8.86377716,3.27283287 C9.21515333,3.536365 9.21234739,3.96573946 8.86377716,4.22716713 L7.13622284,5.52283287 C6.78484667,5.786365 6.5,5.64689255 6.5,5.19549018 L6.5,2.30450982 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-71.000000, -208.000000)">
-            <g id="wayside_shrine-l" transform="translate(72.000000, 209.000000)">
-                <use id="Shape" stroke="#E74A20" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="noun_379599_cc" transform="translate(5.000000, 5.000000)">
-                    <g id="Group">
-                        <g transform="translate(0.000000, 0.000000)" id="Combined-Shape">
-                            <g>
-                                <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                                <use fill-opacity="0.75" fill="#E74A20" xlink:href="#path-4"></use>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-view-m.svg b/data/styles/clear/style-night/symbols/olympic-view-m.svg
deleted file mode 100644
index 2fb401a15f..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-view-m.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-view-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M21,10.5 C21,16.299 16.299,21 10.5,21 C4.701,21 0,16.299 0,10.5 C0,4.701 4.701,0 10.5,0 C16.299,0 21,4.701 21,10.5 L21,10.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#FCB131" offset="0%"></stop>
-            <stop stop-color="#F34320" offset="100%"></stop>
-        </linearGradient>
-        <path d="M1.95,9.75 C2.66797017,9.75 3.25,9.16797017 3.25,8.45 C3.25,7.73202983 2.66797017,7.15 1.95,7.15 C1.23202983,7.15 0.65,7.73202983 0.65,8.45 C0.65,9.16797017 1.23202983,9.75 1.95,9.75 Z M6.49999995,9.75 C7.2179701,9.75 7.7999999,9.16797017 7.7999999,8.45 C7.7999999,7.73202983 7.2179701,7.15 6.49999995,7.15 C5.7820298,7.15 5.2,7.73202983 5.2,8.45 C5.2,9.16797017 5.7820298,9.75 6.49999995,9.75 Z M11.05,9.75 C11.7679702,9.75 12.35,9.16797017 12.35,8.45 C12.35,7.73202983 11.7679702,7.15 11.05,7.15 C10.3320298,7.15 9.75,7.73202983 9.75,8.45 C9.75,9.16797017 10.3320298,9.75 11.05,9.75 Z M2.99999992,10.5 L0.599999984,10.5 C0.239999994,10.5 -8.8817842e-16,10.75 -8.8817842e-16,11.125 L-8.8817842e-16,13 L3.5999999,13 L3.5999999,11.125 C3.5999999,10.75 3.35999991,10.5 2.99999992,10.5 Z M12.4000014,10.5 L10.0000015,10.5 C9.64000152,10.5 9.40000153,10.75 9.40000153,11.125 L9.40000153,13 L13.0000014,13 L13.0000014,11.125 C13.0000014,10.75 12.7600014,10.5 12.4000014,10.5 Z M7.69999687,10.5 L5.29999693,10.5 C4.93999694,10.5 4.69999695,10.75 4.69999695,11.125 L4.69999695,13 L8.29999685,13 L8.29999685,11.125 C8.29999685,10.75 8.05999686,10.5 7.69999687,10.5 Z M-8.8817842e-16,5.90014648 C-8.8817842e-16,6.23143643 0.271523476,6.5 0.592363715,6.5 L12.4076363,6.5 C12.7347897,6.5 13,6.23714179 13,5.90014648 L13,0.599853516 C13,0.268563567 12.7284765,0 12.4076363,0 L0.592363715,0 C0.265210269,0 -8.8817842e-16,0.262858212 -8.8817842e-16,0.599853516 L-8.8817842e-16,5.90014648 Z M5.5,1.69815903 C5.5,1.47826187 5.63978729,1.40752869 5.81881102,1.54523926 L7.78118888,3.05476074 C7.95726335,3.19020264 7.96021262,3.40752869 7.78118888,3.54523926 L5.81881102,5.05476074 C5.64273656,5.19020264 5.5,5.128125 5.5,4.90184097 L5.5,1.69815903 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-108.000000, -210.000000)">
-            <g id="wayside_shrine-m" transform="translate(109.000000, 211.000000)">
-                <use id="Shape" stroke="#E74A20" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="noun_379599_cc" transform="translate(4.000000, 4.000000)">
-                    <g id="Group">
-                        <g id="Combined-Shape">
-                            <g>
-                                <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                                <use fill-opacity="0.75" fill="#E74A20" xlink:href="#path-4"></use>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-view-s.svg b/data/styles/clear/style-night/symbols/olympic-view-s.svg
deleted file mode 100644
index be766fe10b..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-view-s.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-view-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M7.5,15 C11.6421356,15 15,11.6421356 15,7.5 C15,3.35786438 11.6421356,0 7.5,0 C3.35786438,0 0,3.35786438 0,7.5 C0,11.6421356 3.35786438,15 7.5,15 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#FCB131" offset="0%"></stop>
-            <stop stop-color="#F34320" offset="100%"></stop>
-        </linearGradient>
-        <path d="M7.49999845,6.79999995 C7.99705471,6.79999995 8.39999843,6.39705624 8.39999843,5.89999998 C8.39999843,5.40294371 7.99705471,5 7.49999845,5 C7.00294219,5 6.59999847,5.40294371 6.59999847,5.89999998 C6.59999847,6.39705624 7.00294219,6.79999995 7.49999845,6.79999995 Z M1.49999845,6.79999995 C1.99705471,6.79999995 2.39999843,6.39705624 2.39999843,5.89999998 C2.39999843,5.40294371 1.99705471,5 1.49999845,5 C1.00294219,5 0.599998474,5.40294371 0.599998474,5.89999998 C0.599998474,6.39705624 1.00294219,6.79999995 1.49999845,6.79999995 Z M4.49999845,6.79999995 C4.99705471,6.79999995 5.39999843,6.39705624 5.39999843,5.89999998 C5.39999843,5.40294371 4.99705471,5 4.49999845,5 C4.00294219,5 3.59999847,5.40294371 3.59999847,5.89999998 C3.59999847,6.39705624 4.00294219,6.79999995 4.49999845,6.79999995 Z M6.5,8 C6.5,7.44771525 6.94386482,7 7.5,7 C8.05228475,7 8.5,7.44386482 8.5,8 L8.5,9 L6.5,9 L6.5,8 Z M3.5,8 C3.5,7.44771525 3.94386482,7 4.5,7 C5.05228475,7 5.5,7.44386482 5.5,8 L5.5,9 L3.5,9 L3.5,8 Z M0.5,8 C0.5,7.44771525 0.943864822,7 1.5,7 C2.05228475,7 2.5,7.44386482 2.5,8 L2.5,9 L0.5,9 L0.5,8 Z M0,4.00122768 C0,4.27669202 0.222473145,4.5 0.509665847,4.5 L8.49033415,4.5 C8.77181483,4.5 9,4.28295565 9,4.00122768 L9,0.498772323 C9,0.223307975 8.77752686,0 8.49033415,0 L0.509665847,0 C0.228185172,0 0,0.217044353 0,0.498772323 L0,4.00122768 Z M3.80000305,1.30117173 C3.80000305,1.0796107 3.94124603,1.00985565 4.11353912,1.14386139 L5.28646698,2.05613859 C5.45962817,2.19081952 5.45876007,2.40985563 5.28646698,2.54386136 L4.11353912,3.45613857 C3.94037793,3.59081949 3.80000305,3.51628414 3.80000305,3.29882823 L3.80000305,1.30117173 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-141.000000, -213.000000)">
-            <g id="wayside_shrine-s" transform="translate(142.000000, 214.000000)">
-                <use id="Oval" stroke="#E74A20" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="noun_379599_cc" transform="translate(3.000000, 3.000000)">
-                    <g id="Group">
-                        <g id="Combined-Shape">
-                            <g>
-                                <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                                <use fill-opacity="0.75" fill="#E74A20" xlink:href="#path-4"></use>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-water-l.svg b/data/styles/clear/style-night/symbols/olympic-water-l.svg
deleted file mode 100644
index 0e97637fc1..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-water-l.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-water-l</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M25,12.5 C25,19.403 19.403,25 12.5,25 C5.597,25 0,19.403 0,12.5 C0,5.597 5.597,0 12.5,0 C19.403,0 25,5.597 25,12.5 L25,12.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="25" height="25" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M20,7 L20,8.50840224 C19.6679114,8.50840224 19.3318218,8.66444385 19.0757535,8.97252601 C18.5276074,9.63270205 17.791411,10.0008002 16.9991998,10.0008002 C16.2069885,10.0008002 15.4707922,9.63270205 14.922646,8.97252601 C14.4145105,8.3563617 13.5862897,8.3563617 13.0781542,8.97252601 C12.530008,9.63270205 11.7938117,10.0008002 11.0016004,10.0008002 C10.2053881,10.0008002 9.47319285,9.63270205 8.92504668,8.97252601 C8.41691118,8.3563617 7.58869032,8.3563617 7.08055481,8.97252601 C6.53240864,9.63270205 5.79621232,10.0008002 5.00400107,10.0008002 L5.00400107,8.4763937 C5.33208856,8.4763937 5.67217925,8.32435316 5.92824753,8.02027207 C6.4763937,7.36009603 7.21259002,7 8.00480128,7 C8.8010136,7 9.53320886,7.36009603 10.081355,8.02027207 C10.5894905,8.63643638 11.4177114,8.63643638 11.9258469,8.02027207 C12.4739931,7.36009603 13.2101894,7 14.0024006,7 C14.798613,7 15.5308082,7.36009603 16.0789544,8.02027207 C16.591091,8.63643638 17.4153107,8.63643638 17.9234463,8.02027207 C18.4715924,7.36009603 19.2037877,7 20,7 Z M20,14.4979995 L20,16.0064017 C19.6679114,16.0064017 19.3318218,16.1624433 19.0757535,16.4705255 C18.5276074,17.1307015 17.791411,17.4987997 16.9991998,17.4987997 C16.2069885,17.4987997 15.4707922,17.1307015 14.922646,16.4705255 C14.4145105,15.8543612 13.5862897,15.8543612 13.0781542,16.4705255 C12.530008,17.1307015 11.7938117,17.4987997 11.0016004,17.4987997 C10.2053881,17.4987997 9.47319285,17.1307015 8.92504668,16.4705255 C8.41691118,15.8543612 7.58869032,15.8543612 7.08055481,16.4705255 C6.53240864,17.1307015 5.79621232,17.4987997 5.00400107,17.4987997 L5.00400107,15.9743932 C5.33208856,15.9743932 5.67217925,15.8223526 5.92824753,15.5182715 C6.4763937,14.8580955 7.21259002,14.4979995 8.00480128,14.4979995 C8.8010136,14.4979995 9.53320886,14.8580955 10.081355,15.5182715 C10.5894905,16.1344358 11.4177114,16.1344358 11.9258469,15.5182715 C12.4739931,14.8580955 13.2101894,14.4979995 14.0024006,14.4979995 C14.798613,14.4979995 15.5308082,14.8580955 16.0789544,15.5182715 C16.591091,16.1344358 17.4153107,16.1344358 17.9234463,15.5182715 C18.4715924,14.8580955 19.2037877,14.4979995 20,14.4979995 Z M20,10.7570019 L20,12.2734062 C19.9559883,12.257402 19.9079755,12.257402 19.8559616,12.257402 C19.523873,12.257402 19.1877834,12.4134436 18.9317151,12.7215257 C18.383569,13.3817018 17.6473726,13.7497999 16.8551614,13.7497999 C16.0629501,13.7497999 15.3267538,13.3817018 14.7786076,12.7215257 C14.2704721,12.1053614 13.4422513,12.1053614 12.9341158,12.7215257 C12.3859696,13.3817018 11.6497733,13.7497999 10.857562,13.7497999 C10.0653508,13.7497999 9.32915444,13.3817018 8.78100827,12.7215257 C8.27287277,12.1053614 7.44465191,12.1053614 6.9365164,12.7215257 C6.45638837,13.2976794 5.83222193,13.6537743 5.14403841,13.7337957 C5.10002667,13.7417978 5.05201387,13.7417978 5,13.7417978 L5,12.2093892 C5.16004268,12.2333956 5.60016004,11.9853294 5.78020806,11.7652707 C6.32835423,11.1050947 7.06455055,10.7449987 7.8567618,10.7449987 C8.64897306,10.7449987 9.38516938,11.1050947 9.93331555,11.7652707 C10.4414511,12.381435 11.2696719,12.381435 11.7778074,11.7652707 C12.3259536,11.1050947 13.0621499,10.7449987 13.8543612,10.7449987 C14.6505735,10.7449987 15.3827687,11.1050947 15.9309149,11.7652707 C16.4430515,12.381435 17.2672713,12.381435 17.7754068,11.7652707 C18.3235529,11.1050947 19.0597493,10.7449987 19.8519605,10.7449987 C19.9079755,10.7530008 19.9519872,10.7530008 20,10.7570019 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-71.000000, -250.000000)">
-            <g id="wayside_shrine-l" transform="translate(72.000000, 251.000000)">
-                <use id="Shape" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-water-m.svg b/data/styles/clear/style-night/symbols/olympic-water-m.svg
deleted file mode 100644
index ea8101f33d..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-water-m.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-water-m</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M21,10.5 C21,16.299 16.299,21 10.5,21 C4.701,21 0,16.299 0,10.5 C0,4.701 4.701,0 10.5,0 C16.299,0 21,4.701 21,10.5 L21,10.5 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="21" height="21" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M17,6 L17,7.30728194 C16.7121899,7.30728194 16.4209122,7.442518 16.1989864,7.70952254 C15.7239264,8.28167511 15.0858896,8.60069352 14.3993065,8.60069352 C13.7127234,8.60069352 13.0746866,8.28167511 12.5996266,7.70952254 C12.1592425,7.17551347 11.4414511,7.17551347 11.001067,7.70952254 C10.5260069,8.28167511 9.88797013,8.60069352 9.20138704,8.60069352 C8.51133636,8.60069352 7.87676714,8.28167511 7.40170712,7.70952254 C6.96132302,7.17551347 6.24353161,7.17551347 5.80314751,7.70952254 C5.32808749,8.28167511 4.69005068,8.60069352 4.00346759,8.60069352 L4.00346759,7.27954121 C4.28781008,7.27954121 4.58255535,7.14777274 4.80448119,6.8842358 C5.27954121,6.31208322 5.91757802,6 6.60416111,6 C7.29421179,6 7.92878101,6.31208322 8.40384102,6.8842358 C8.84422513,7.41824487 9.56201654,7.41824487 10.0024006,6.8842358 C10.4774607,6.31208322 11.1154975,6 11.8020806,6 C12.4921312,6 13.1267005,6.31208322 13.6017605,6.8842358 C14.0456122,7.41824487 14.759936,7.41824487 15.2003201,6.8842358 C15.6753801,6.31208322 16.3099493,6 17,6 Z M17,12.4982662 L17,13.8055481 C16.7121899,13.8055481 16.4209122,13.9407842 16.1989864,14.2077887 C15.7239264,14.7799413 15.0858896,15.0989597 14.3993065,15.0989597 C13.7127234,15.0989597 13.0746866,14.7799413 12.5996266,14.2077887 C12.1592425,13.6737797 11.4414511,13.6737797 11.001067,14.2077887 C10.5260069,14.7799413 9.88797013,15.0989597 9.20138704,15.0989597 C8.51133636,15.0989597 7.87676714,14.7799413 7.40170712,14.2077887 C6.96132302,13.6737797 6.24353161,13.6737797 5.80314751,14.2077887 C5.32808749,14.7799413 4.69005068,15.0989597 4.00346759,15.0989597 L4.00346759,13.7778074 C4.28781008,13.7778074 4.58255535,13.6460389 4.80448119,13.382502 C5.27954121,12.8103494 5.91757802,12.4982662 6.60416111,12.4982662 C7.29421179,12.4982662 7.92878101,12.8103494 8.40384102,13.382502 C8.84422513,13.9165111 9.56201654,13.9165111 10.0024006,13.382502 C10.4774607,12.8103494 11.1154975,12.4982662 11.8020806,12.4982662 C12.4921312,12.4982662 13.1267005,12.8103494 13.6017605,13.382502 C14.0456122,13.9165111 14.759936,13.9165111 15.2003201,13.382502 C15.6753801,12.8103494 16.3099493,12.4982662 17,12.4982662 Z M17,9.25606828 L17,10.5702854 C16.9618565,10.556415 16.9202454,10.556415 16.8751667,10.556415 C16.5873566,10.556415 16.296079,10.6916511 16.0741531,10.9586556 C15.5990931,11.5308082 14.9610563,11.8498266 14.2744732,11.8498266 C13.5878901,11.8498266 12.9498533,11.5308082 12.4747933,10.9586556 C12.0344092,10.4246466 11.3166178,10.4246466 10.8762337,10.9586556 C10.4011736,11.5308082 9.76313684,11.8498266 9.07655375,11.8498266 C8.38997066,11.8498266 7.75193385,11.5308082 7.27687383,10.9586556 C6.83648973,10.4246466 6.11869832,10.4246466 5.67831422,10.9586556 C5.26220325,11.4579888 4.721259,11.7666044 4.12483329,11.8359563 C4.08668978,11.8428914 4.04507869,11.8428914 4,11.8428914 L4,10.5148039 C4.13870365,10.5356095 4.5201387,10.3206188 4.67618031,10.1299013 C5.15124033,9.55774873 5.78927714,9.24566551 6.47586023,9.24566551 C7.16244332,9.24566551 7.80048013,9.55774873 8.27554014,10.1299013 C8.71592425,10.6639104 9.43371566,10.6639104 9.87409976,10.1299013 C10.3491598,9.55774873 10.9871966,9.24566551 11.6737797,9.24566551 C12.3638304,9.24566551 12.9983996,9.55774873 13.4734596,10.1299013 C13.9173113,10.6639104 14.6316351,10.6639104 15.0720192,10.1299013 C15.5470792,9.55774873 16.185116,9.24566551 16.8716991,9.24566551 C16.9202454,9.25260069 16.9583889,9.25260069 17,9.25606828 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-108.000000, -252.000000)">
-            <g id="wayside_shrine-m" transform="translate(109.000000, 253.000000)">
-                <use id="Shape" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/olympic-water-s.svg b/data/styles/clear/style-night/symbols/olympic-water-s.svg
deleted file mode 100644
index 0149fa3276..0000000000
--- a/data/styles/clear/style-night/symbols/olympic-water-s.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>olympic-water-s</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <path d="M7.5,15 C11.6421356,15 15,11.6421356 15,7.5 C15,3.35786438 11.6421356,0 7.5,0 C3.35786438,0 0,3.35786438 0,7.5 C0,11.6421356 3.35786438,15 7.5,15 Z" id="path-1"></path>
-        <mask id="mask-2" maskContentUnits="userSpaceOnUse" maskUnits="objectBoundingBox" x="0" y="0" width="15" height="15" fill="white">
-            <use xlink:href="#path-1"></use>
-        </mask>
-        <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
-            <stop stop-color="#4FC7F3" offset="0%"></stop>
-            <stop stop-color="#286EB4" offset="100%"></stop>
-        </linearGradient>
-        <path d="M12,4 L12,4.90504134 C11.8007469,4.90504134 11.5990931,4.99866631 11.4454521,5.1835156 C11.1165644,5.57962123 10.6748466,5.80048013 10.1995199,5.80048013 C9.72419312,5.80048013 9.28247533,5.57962123 8.95358762,5.1835156 C8.64870632,4.81381702 8.15177381,4.81381702 7.8468925,5.1835156 C7.5180048,5.57962123 7.07628701,5.80048013 6.60096026,5.80048013 C6.12323286,5.80048013 5.68391571,5.57962123 5.35502801,5.1835156 C5.05014671,4.81381702 4.55321419,4.81381702 4.24833289,5.1835156 C3.91944519,5.57962123 3.47772739,5.80048013 3.00240064,5.80048013 L3.00240064,4.88583622 C3.19925313,4.88583622 3.40330755,4.7946119 3.55694852,4.61216324 C3.88583622,4.21605762 4.32755401,4 4.80288077,4 C5.28060816,4 5.71992531,4.21605762 6.04881302,4.61216324 C6.35369432,4.98186183 6.85062683,4.98186183 7.15550814,4.61216324 C7.48439584,4.21605762 7.92611363,4 8.40144038,4 C8.87916778,4 9.31848493,4.21605762 9.64737263,4.61216324 C9.95465457,4.98186183 10.4491864,4.98186183 10.7540678,4.61216324 C11.0829555,4.21605762 11.5222726,4 12,4 Z M12,8.49879968 L12,9.40384102 C11.8007469,9.40384102 11.5990931,9.49746599 11.4454521,9.68231528 C11.1165644,10.0784209 10.6748466,10.2992798 10.1995199,10.2992798 C9.72419312,10.2992798 9.28247533,10.0784209 8.95358762,9.68231528 C8.64870632,9.3126167 8.15177381,9.3126167 7.8468925,9.68231528 C7.5180048,10.0784209 7.07628701,10.2992798 6.60096026,10.2992798 C6.12323286,10.2992798 5.68391571,10.0784209 5.35502801,9.68231528 C5.05014671,9.3126167 4.55321419,9.3126167 4.24833289,9.68231528 C3.91944519,10.0784209 3.47772739,10.2992798 3.00240064,10.2992798 L3.00240064,9.3846359 C3.19925313,9.3846359 3.40330755,9.29341158 3.55694852,9.11096292 C3.88583622,8.7148573 4.32755401,8.49879968 4.80288077,8.49879968 C5.28060816,8.49879968 5.71992531,8.7148573 6.04881302,9.11096292 C6.35369432,9.48066151 6.85062683,9.48066151 7.15550814,9.11096292 C7.48439584,8.7148573 7.92611363,8.49879968 8.40144038,8.49879968 C8.87916778,8.49879968 9.31848493,8.7148573 9.64737263,9.11096292 C9.95465457,9.48066151 10.4491864,9.48066151 10.7540678,9.11096292 C11.0829555,8.7148573 11.5222726,8.49879968 12,8.49879968 Z M12,6.25420112 L12,7.16404374 C11.973593,7.15444118 11.9447853,7.15444118 11.913577,7.15444118 C11.7143238,7.15444118 11.51267,7.24806615 11.3590291,7.43291544 C11.0301414,7.82902107 10.5884236,8.04987997 10.1130968,8.04987997 C9.63777007,8.04987997 9.19605228,7.82902107 8.86716458,7.43291544 C8.56228328,7.06321686 8.06535076,7.06321686 7.76046946,7.43291544 C7.43158176,7.82902107 6.98986396,8.04987997 6.51453721,8.04987997 C6.03921046,8.04987997 5.59749266,7.82902107 5.26860496,7.43291544 C4.96372366,7.06321686 4.46679114,7.06321686 4.16190984,7.43291544 C3.87383302,7.77860763 3.49933316,7.9922646 3.08642305,8.04027741 C3.060016,8.04507869 3.03120832,8.04507869 3,8.04507869 L3,7.1256335 C3.09602561,7.14003734 3.36009603,6.99119765 3.46812483,6.85916244 C3.79701254,6.46305682 4.23873033,6.2469992 4.71405708,6.2469992 C5.18938384,6.2469992 5.63110163,6.46305682 5.95998933,6.85916244 C6.26487063,7.22886103 6.76180315,7.22886103 7.06668445,6.85916244 C7.39557215,6.46305682 7.83728994,6.2469992 8.3126167,6.2469992 C8.79034409,6.2469992 9.22966124,6.46305682 9.55854895,6.85916244 C9.86583089,7.22886103 10.3603628,7.22886103 10.6652441,6.85916244 C10.9941318,6.46305682 11.4358496,6.2469992 11.9111763,6.2469992 C11.9447853,6.25180048 11.9711923,6.25180048 12,6.25420112 Z" id="path-4"></path>
-    </defs>
-    <g id="POI-Clear" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Artboard-4" transform="translate(-141.000000, -255.000000)">
-            <g id="wayside_shrine-s" transform="translate(142.000000, 256.000000)">
-                <use id="Oval" stroke="#2568AA" mask="url(#mask-2)" stroke-width="2" fill="#FFFFFF" xlink:href="#path-1"></use>
-                <g id="Combined-Shape">
-                    <use fill="url(#linearGradient-3)" xlink:href="#path-4"></use>
-                    <use fill-opacity="0.6" fill="#2568AA" xlink:href="#path-4"></use>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file