From 95b3956658c76cbb20999b26d9d1db9068c29da3 Mon Sep 17 00:00:00 2001
From: Constantin Shalnev <c.shalnev@corp.mail.ru>
Date: Thu, 1 Oct 2015 12:04:57 +0300
Subject: [PATCH] Updated style 20150930

---
 data/styles/clear/include/POI.mapcss          | 40 ++++++++----
 data/styles/clear/include/labels.mapcss       | 64 +++++++++++++++++--
 data/styles/clear/include/landuse.mapcss      | 27 +++++++-
 data/styles/clear/include/natural.mapcss      | 17 ++++-
 data/styles/clear/include/other.mapcss        |  2 +
 data/styles/clear/include/roads.mapcss        | 53 +++++++--------
 data/styles/clear/style-clear/colors.mapcss   |  7 +-
 .../clear/style-clear/symbols/cemetery-l.svg  | 14 ++++
 .../clear/style-clear/symbols/cemetery-m.svg  | 14 ++++
 .../clear/style-clear/symbols/cemetery-s.svg  | 14 ++++
 .../style-clear/symbols/drinking-water-l.svg  |  4 +-
 .../style-clear/symbols/drinking-water-m.svg  |  4 +-
 .../style-clear/symbols/drinking-water-s.svg  |  4 +-
 .../clear/style-clear/symbols/fountain-l.svg  | 18 ++++--
 .../clear/style-clear/symbols/fountain-m.svg  | 14 ++--
 .../clear/style-clear/symbols/fountain-s.svg  | 16 +++--
 .../clear/style-clear/symbols/military-l.svg  | 19 ++++++
 .../clear/style-clear/symbols/military-m.svg  | 19 ++++++
 .../clear/style-clear/symbols/military-s.svg  | 19 ++++++
 .../clear/style-clear/symbols/npark-l.svg     |  7 +-
 .../clear/style-clear/symbols/npark-m.svg     |  7 +-
 .../clear/style-clear/symbols/npark-s.svg     |  7 +-
 .../clear/style-clear/symbols/nparkF-l.svg    | 16 +++++
 .../clear/style-clear/symbols/nparkF-m.svg    | 16 +++++
 .../clear/style-clear/symbols/nparkF-s.svg    | 16 +++++
 .../clear/style-clear/symbols/waterfall-l.svg | 19 +++---
 .../clear/style-clear/symbols/waterfall-m.svg | 21 +++---
 .../clear/style-clear/symbols/waterfall-s.svg | 20 +++---
 data/styles/clear/style-night/colors.mapcss   |  3 +-
 .../style-night/symbols/alcohol-l copy.svg    |  4 +-
 .../style-night/symbols/alcohol-m copy.svg    |  4 +-
 .../style-night/symbols/alcohol-s copy.svg    |  4 +-
 .../symbols/america-football-l copy.svg       |  4 +-
 .../symbols/america-football-m copy.svg       |  4 +-
 .../clear/style-night/symbols/atm-l.svg       |  4 +-
 .../clear/style-night/symbols/atm-m.svg       |  4 +-
 .../style-night/symbols/atm-s copy 2.svg      |  4 +-
 .../clear/style-night/symbols/bank-l.svg      |  4 +-
 .../clear/style-night/symbols/bank-m.svg      |  4 +-
 .../style-night/symbols/bank-s copy 5.svg     |  4 +-
 .../clear/style-night/symbols/banknote-l.svg  |  8 +--
 .../clear/style-night/symbols/banknote-m.svg  |  8 +--
 .../clear/style-night/symbols/bar-l.svg       |  4 +-
 .../clear/style-night/symbols/bar-m.svg       |  4 +-
 .../clear/style-night/symbols/bar-s.svg       |  4 +-
 .../style-night/symbols/baseball-l copy.svg   |  4 +-
 .../style-night/symbols/baseball-m copy.svg   |  4 +-
 .../style-night/symbols/baseball-s copy.svg   |  4 +-
 .../style-night/symbols/basketball-l copy.svg |  4 +-
 .../style-night/symbols/basketball-m copy.svg |  4 +-
 .../style-night/symbols/basketball-s copy.svg |  4 +-
 .../clear/style-night/symbols/bicycle-l.svg   |  4 +-
 .../clear/style-night/symbols/bicycle-m.svg   |  4 +-
 .../clear/style-night/symbols/bicycle-s.svg   |  4 +-
 .../clear/style-night/symbols/cafe-l.svg      |  4 +-
 .../clear/style-night/symbols/cafe-m.svg      |  4 +-
 .../clear/style-night/symbols/cafe-s.svg      |  4 +-
 .../clear/style-night/symbols/campsite-l.svg  |  4 +-
 .../clear/style-night/symbols/campsite-m.svg  |  4 +-
 .../clear/style-night/symbols/campsite-s.svg  |  4 +-
 .../clear/style-night/symbols/cave-l.svg      |  4 +-
 .../clear/style-night/symbols/cave-m.svg      |  4 +-
 .../clear/style-night/symbols/cave-s.svg      |  4 +-
 .../clear/style-night/symbols/cemetery-l.svg  | 14 ++++
 .../clear/style-night/symbols/cemetery-m.svg  | 14 ++++
 .../clear/style-night/symbols/cemetery-s.svg  | 14 ++++
 .../clear/style-night/symbols/cinema-l.svg    |  4 +-
 .../clear/style-night/symbols/cinema-m.svg    |  4 +-
 .../clear/style-night/symbols/cinema-s.svg    |  4 +-
 .../clear/style-night/symbols/college-l.svg   |  4 +-
 .../clear/style-night/symbols/college-m.svg   |  4 +-
 .../clear/style-night/symbols/college-s.svg   |  4 +-
 .../style-night/symbols/drinking-water-l.svg  |  6 +-
 .../style-night/symbols/drinking-water-m.svg  |  6 +-
 .../style-night/symbols/drinking-water-s.svg  |  6 +-
 .../clear/style-night/symbols/embassy-l.svg   |  4 +-
 .../clear/style-night/symbols/embassy-m.svg   |  4 +-
 .../clear/style-night/symbols/embassy-s.svg   |  4 +-
 .../clear/style-night/symbols/fastfood-l.svg  |  4 +-
 .../clear/style-night/symbols/fastfood-m.svg  |  4 +-
 .../clear/style-night/symbols/fastfood-s.svg  |  4 +-
 .../clear/style-night/symbols/fountain-l.svg  |  9 +--
 .../clear/style-night/symbols/fountain-m.svg  |  9 +--
 .../clear/style-night/symbols/fountain-s.svg  |  9 +--
 .../clear/style-night/symbols/fuel-l copy.svg |  4 +-
 .../clear/style-night/symbols/fuel-m copy.svg |  4 +-
 .../clear/style-night/symbols/fuel-s copy.svg |  4 +-
 .../clear/style-night/symbols/gallery-l.svg   |  4 +-
 .../clear/style-night/symbols/gallery-m.svg   |  4 +-
 .../clear/style-night/symbols/gallery-s.svg   |  4 +-
 .../clear/style-night/symbols/golf-l copy.svg |  4 +-
 .../clear/style-night/symbols/golf-m copy.svg |  4 +-
 .../clear/style-night/symbols/golf-s copy.svg |  4 +-
 .../clear/style-night/symbols/grocery-l.svg   |  4 +-
 .../clear/style-night/symbols/grocery-m.svg   |  4 +-
 .../clear/style-night/symbols/grocery-s.svg   |  4 +-
 .../clear/style-night/symbols/hospital-l.svg  |  4 +-
 .../clear/style-night/symbols/hospital-m.svg  |  4 +-
 .../clear/style-night/symbols/hospital-s.svg  |  4 +-
 .../clear/style-night/symbols/hotel-l.svg     |  4 +-
 .../clear/style-night/symbols/hotel-m.svg     |  4 +-
 .../clear/style-night/symbols/hotel-s.svg     |  4 +-
 .../symbols/information-l copy.svg            |  4 +-
 .../style-night/symbols/information-m.svg     |  4 +-
 .../symbols/information-s copy.svg            |  4 +-
 .../style-night/symbols/kindergarten-l.svg    |  4 +-
 .../style-night/symbols/kindergarten-m.svg    |  4 +-
 .../style-night/symbols/kindergarten-s.svg    |  4 +-
 .../clear/style-night/symbols/library-l.svg   |  4 +-
 .../clear/style-night/symbols/library-m.svg   |  4 +-
 .../clear/style-night/symbols/library-s.svg   |  4 +-
 .../style-night/symbols/lighthouse-l.svg      |  4 +-
 .../style-night/symbols/lighthouse-m.svg      |  4 +-
 .../style-night/symbols/lighthouse-s.svg      |  4 +-
 .../clear/style-night/symbols/mail-l.svg      |  4 +-
 .../clear/style-night/symbols/mail-m.svg      |  4 +-
 .../clear/style-night/symbols/mail-s.svg      |  4 +-
 .../clear/style-night/symbols/military-l.svg  | 14 ++++
 .../clear/style-night/symbols/military-m.svg  | 14 ++++
 .../clear/style-night/symbols/military-s.svg  | 14 ++++
 .../clear/style-night/symbols/monument-l.svg  |  6 +-
 .../clear/style-night/symbols/monument-m.svg  |  6 +-
 .../clear/style-night/symbols/monument-s.svg  |  6 +-
 .../clear/style-night/symbols/museum-l.svg    |  4 +-
 .../clear/style-night/symbols/museum-m.svg    |  4 +-
 .../clear/style-night/symbols/museum-s.svg    |  4 +-
 .../clear/style-night/symbols/nparkF-l.svg    | 14 ++++
 .../clear/style-night/symbols/nparkF-m.svg    | 14 ++++
 .../clear/style-night/symbols/nparkF-s.svg    | 14 ++++
 .../clear/style-night/symbols/peak-l.svg      |  4 +-
 .../clear/style-night/symbols/peak-m.svg      |  4 +-
 .../clear/style-night/symbols/peak-s.svg      |  4 +-
 .../clear/style-night/symbols/pharmacy-l.svg  |  4 +-
 .../clear/style-night/symbols/pharmacy-m.svg  |  4 +-
 .../clear/style-night/symbols/phone-l.svg     |  4 +-
 .../clear/style-night/symbols/phone-m.svg     |  4 +-
 .../clear/style-night/symbols/phone-s.svg     |  4 +-
 .../style-night/symbols/pitch-l copy.svg      |  4 +-
 .../style-night/symbols/pitch-m copy.svg      |  4 +-
 .../style-night/symbols/pitch-s copy.svg      |  4 +-
 .../symbols/place-of-worship-l copy.svg       |  4 +-
 .../symbols/place-of-worship-m copy.svg       |  4 +-
 .../symbols/place-of-worship-s copy.svg       |  4 +-
 .../clear/style-night/symbols/police-l.svg    |  4 +-
 .../clear/style-night/symbols/police-m.svg    |  4 +-
 .../clear/style-night/symbols/police-s.svg    |  4 +-
 .../clear/style-night/symbols/pub-l.svg       |  4 +-
 .../clear/style-night/symbols/pub-m.svg       |  4 +-
 .../clear/style-night/symbols/pub-s.svg       |  4 +-
 .../style-night/symbols/recycling-l copy.svg  |  4 +-
 .../style-night/symbols/recycling-m copy.svg  |  4 +-
 .../style-night/symbols/recycling-s copy.svg  |  4 +-
 .../style-night/symbols/restaurant-l.svg      |  4 +-
 .../style-night/symbols/restaurant-m.svg      |  4 +-
 .../style-night/symbols/restaurant-s.svg      |  4 +-
 .../clear/style-night/symbols/school-l.svg    |  4 +-
 .../clear/style-night/symbols/school-m.svg    |  4 +-
 .../clear/style-night/symbols/school-s.svg    |  4 +-
 .../clear/style-night/symbols/shop-l copy.svg |  4 +-
 .../clear/style-night/symbols/shop-m copy.svg |  4 +-
 .../clear/style-night/symbols/shop-s copy.svg |  4 +-
 .../style-night/symbols/skiing-l copy.svg     |  4 +-
 .../style-night/symbols/skiing-m copy.svg     |  4 +-
 .../style-night/symbols/skiing-s copy.svg     |  4 +-
 .../style-night/symbols/soccer-l copy.svg     |  4 +-
 .../style-night/symbols/soccer-m copy.svg     |  4 +-
 .../style-night/symbols/soccer-s copy.svg     |  4 +-
 .../style-night/symbols/swimming-l copy.svg   |  4 +-
 .../style-night/symbols/swimming-m copy.svg   |  4 +-
 .../style-night/symbols/swimming-s copy.svg   |  4 +-
 .../style-night/symbols/tennis-l copy.svg     |  4 +-
 .../style-night/symbols/tennis-m copy.svg     |  4 +-
 .../style-night/symbols/tennis-s copy.svg     |  4 +-
 .../clear/style-night/symbols/theatre-l.svg   |  4 +-
 .../clear/style-night/symbols/theatre-m.svg   |  4 +-
 .../clear/style-night/symbols/theatre-s.svg   |  4 +-
 .../style-night/symbols/toilets-l copy.svg    |  4 +-
 .../style-night/symbols/toilets-m copy.svg    |  4 +-
 .../style-night/symbols/toilets-s copy.svg    |  4 +-
 .../clear/style-night/symbols/tourism-l.svg   |  4 +-
 .../clear/style-night/symbols/tourism-m.svg   |  4 +-
 .../clear/style-night/symbols/tourism-s.svg   |  4 +-
 .../clear/style-night/symbols/townhall-l.svg  |  4 +-
 .../clear/style-night/symbols/townhall-m.svg  |  4 +-
 .../clear/style-night/symbols/townhall-s.svg  |  4 +-
 .../clear/style-night/symbols/volcano-l.svg   |  8 +--
 .../clear/style-night/symbols/volcano-m.svg   |  8 +--
 .../clear/style-night/symbols/volcano-s.svg   |  8 +--
 .../clear/style-night/symbols/waterfall-l.svg | 21 +++---
 .../clear/style-night/symbols/waterfall-m.svg | 21 +++---
 .../clear/style-night/symbols/waterfall-s.svg | 20 +++---
 .../clear/style-night/symbols/zoo-l.svg       |  4 +-
 .../clear/style-night/symbols/zoo-m.svg       |  4 +-
 .../clear/style-night/symbols/zoo-s.svg       |  4 +-
 194 files changed, 875 insertions(+), 473 deletions(-)
 create mode 100644 data/styles/clear/style-clear/symbols/cemetery-l.svg
 create mode 100644 data/styles/clear/style-clear/symbols/cemetery-m.svg
 create mode 100644 data/styles/clear/style-clear/symbols/cemetery-s.svg
 create mode 100644 data/styles/clear/style-clear/symbols/military-l.svg
 create mode 100644 data/styles/clear/style-clear/symbols/military-m.svg
 create mode 100644 data/styles/clear/style-clear/symbols/military-s.svg
 create mode 100644 data/styles/clear/style-clear/symbols/nparkF-l.svg
 create mode 100644 data/styles/clear/style-clear/symbols/nparkF-m.svg
 create mode 100644 data/styles/clear/style-clear/symbols/nparkF-s.svg
 create mode 100644 data/styles/clear/style-night/symbols/cemetery-l.svg
 create mode 100644 data/styles/clear/style-night/symbols/cemetery-m.svg
 create mode 100644 data/styles/clear/style-night/symbols/cemetery-s.svg
 create mode 100644 data/styles/clear/style-night/symbols/military-l.svg
 create mode 100644 data/styles/clear/style-night/symbols/military-m.svg
 create mode 100644 data/styles/clear/style-night/symbols/military-s.svg
 create mode 100644 data/styles/clear/style-night/symbols/nparkF-l.svg
 create mode 100644 data/styles/clear/style-night/symbols/nparkF-m.svg
 create mode 100644 data/styles/clear/style-night/symbols/nparkF-s.svg

diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss
index 511f7b45e2..78bccd0e9c 100644
--- a/data/styles/clear/include/POI.mapcss
+++ b/data/styles/clear/include/POI.mapcss
@@ -58,13 +58,13 @@ node|z17-[natural=volcano],{ icon-image: volcano-l.svg; text-offset: 8; font-siz
 node|z15-16[natural=peak] { icon-image: peak-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
 node|z17-[natural=peak] { icon-image: peak-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; }
 
-node|z12-14[boundary=national_park],area|z12-14[boundary=national_park] { icon-image: npark-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 1000;}
-node|z15-16[boundary=national_park],area|z15-16[boundary=national_park] { icon-image: npark-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 1000;}
-node|z17-[boundary=national_park],area|z17-[boundary=national_park] { icon-image: npark-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 1000;}
+node|z12-14[boundary=national_park],area|z12-14[boundary=national_park] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 1000;}
+node|z15-16[boundary=national_park],area|z15-16[boundary=national_park] { icon-image: nparkf-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 1000;}
+node|z17-[boundary=national_park],area|z17-[boundary=national_park] { icon-image: nparkf-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 1000;}
 
-node|z12-14[leisure=nature_reserve],area|z12-14[leisure=nature_reserve] { icon-image: npark-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 1000; }
-node|z15-16[leisure=nature_reserve],area|z15-16[leisure=nature_reserve] { icon-image: npark-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 1000; }
-node|z17-[leisure=nature_reserve],area|z17-[leisure=nature_reserve] { icon-image: npark-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 1000; }
+node|z12-14[leisure=nature_reserve],area|z12-14[leisure=nature_reserve] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 1000; }
+node|z15-16[leisure=nature_reserve],area|z15-16[leisure=nature_reserve] { icon-image: nparkf-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 1000; }
+node|z17-[leisure=nature_reserve],area|z17-[leisure=nature_reserve] { icon-image: nparkf-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 1000; }
 
 
 /* AMENITY */
@@ -74,6 +74,8 @@ node|z19-[amenity], area|z19-[amenity] { icon-image: none.svg;  text-offset: 8;
 
 
 /* AMENITY */
+node|z15-[natural=spring],area|z17-[natural=spring]{ icon-image: drinking-water-m.svg; z-index: 1000; text-offset:8; font-size: 10;  text: name; text-color: @poi_label; z-index: 100;  }
+
 node|z16[amenity=place_of_worship], area|z16[amenity=place_of_worship] { icon-image: place-of-worship-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
 node|z16[amenity=theatre], area|z16[amenity=theatre] { icon-image: theatre-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
 node|z16[amenity=kindergarten], area|z16[amenity=kindergarten] { icon-image: kindergarten-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
@@ -82,6 +84,7 @@ node|z16[amenity=college], area|z16[amenity=college] { icon-image: college-m.svg
 node|z16[amenity=hospital], area|z16[amenity=hospital] { icon-image: hospital-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
 node|z16[amenity=university], area|z16[amenity=university] { icon-image: college-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; z-index: 4; }
 node|z16[amenity=fuel], area|z16[amenity=fuel] { icon-image: fuel-m.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z16-[natural=spring],area|z16-[natural=spring]{ icon-image: drinking-water-m.svg; z-index: 1000; text-offset:8; font-size: 10;  text: name; text-color: @poi_label; z-index: 100;  }
 
 
 node|z17[amenity=place_of_worship], area|z17[amenity=place_of_worship] { icon-image: place-of-worship-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
@@ -101,6 +104,10 @@ node|z17[amenity=bicycle_rental], area|z17[amenity=bicycle_rental] { icon-image:
 node|z17[amenity=post_office] { icon-image: mail-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
 node|z17[amenity=cafe], area|z17[amenity=cafe] { icon-image: cafe-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
 node|z17[amenity=restaurant], area|z17[amenity=restaurant] { icon-image: restaurant-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z17-[amenity=fountain],area|z17-[amenity=fountain] { icon-image: fountain-l.svg; z-index: 1000; text-offset: 8; font-size: 10;  text: name; text-color: @poi_label; }
+node|z17-[amenity=drinking_water],area|z17-[amenity=drinking_water],node|z17-[amenity=water_point] ,area|z17-[amenity=water_point]{ icon-image: drinking-water-l.svg; }
+node|z17-[natural=spring],area|z17-[natural=spring]{ icon-image: drinking-water-l.svg; z-index: 1000; text-offset:8; font-size: 10;  text: name; text-color: @poi_label; z-index: 100;  }
+
 
 node|z18-[amenity=place_of_worship], area|z18-[amenity=place_of_worship] { icon-image: place-of-worship-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
 node|z18-[amenity=theatre], area|z18-[amenity=theatre] { icon-image: theatre-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
@@ -126,10 +133,13 @@ node|z18-[amenity=bar], area|z18-[amenity=bar] { icon-image: bar-l.svg; text-off
 node|z18-[amenity=pub], area|z18-[amenity=pub] { icon-image: pub-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
 node|z18-[amenity=bureau_de_change] { icon-image: banknote-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
 node|z18-[amenity=bench] { icon-image: bench.svg; }
-node|z18-[amenity=fountain] { icon-image: fountain-l.svg; z-index: 1000; text-offset: 8; font-size: 10;  text: name; text-color: @poi_label; }
+node|z18-[amenity=fountain],area|z18-[amenity=fountain] { icon-image: fountain-l.svg; z-index: 1000; text-offset: 8; font-size: 10;  text: name; text-color: @poi_label; }
+node|z18-[amenity=drinking_water],area|z18-[amenity=drinking_water],node|z18-[amenity=water_point],area|z18-[amenity=water_point] { icon-image: drinking-water-l.svg; }
+node|z18-[natural=spring],area|z18-[natural=spring]{ icon-image: drinking-water-l.svg; z-index: 1000; text-offset: 8; font-size: 10;  text: name; text-color: @poi_label; }
 node|z18-[amenity=library] { icon-image: library-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+node|z18-[amenity=waste_disposal], area|z18-[amenity=waste_disposal] { icon-image: recycling-l.svg; text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
+
 node|z19-[amenity=telephone] { icon-image: phone-l.svg;  }
-node|z19-[amenity=drinking_water] { icon-image: drinking-water-l.svg; }
 node|z19-[amenity=recycling], area|z19-[amenity=recycling], { icon-image: recycling-l.svg; }
 
 /* LEISURE */
@@ -174,11 +184,17 @@ node|z17-[building=hospital], area|z17-[building=hospital] { icon-image: hospita
 
 
 /* PARKINGS */
-node|z17[amenity=parking] { icon-image: parking-s.svg; }
-node|z17[amenity=parking][access=permissive],
-node|z17[amenity=parking][access=private] { icon-image: zero-icon.svg; }
+area|z16-[amenity=parking] {fill-color: @parking;fill-oppacity:1;z-index: 0;}
+
+node|z17[amenity=parking] { icon-image: parking-s.svg; z-index: 4;  }
+node|z17[amenity=parking] { icon-image: parking-s.svg;  z-index: 4; }
+node|z17[amenity=parking][access=permissive],
+node|z17[amenity=parking][access=private] { icon-image: zero-icon.svg; z-index: 4;  }
+
+
+
+node|z18-[amenity=parking], area|z18-[amenity=parking] { icon-image: parking-m.svg;  text-offset: 8; font-size: 10; text: name; text-color: @poi_label;  z-index: 4; }
 
-node|z18-[amenity=parking], area|z18-[amenity=parking] { icon-image: parking-m.svg;  text-offset: 8; font-size: 10; text: name; text-color: @poi_label; }
 
 /* MAN MADE */
 
diff --git a/data/styles/clear/include/labels.mapcss b/data/styles/clear/include/labels.mapcss
index e245f83c6e..506a8798bc 100644
--- a/data/styles/clear/include/labels.mapcss
+++ b/data/styles/clear/include/labels.mapcss
@@ -783,9 +783,11 @@ node|z8-9[place=region],
 
 
 area|z16[building],
-node|z16[building]
+node|z16[building],
+area|z16[addr:housenumber][addr:street],
+node|z16[addr:housenumber][addr:street]
 {
-  text: "addr:housename";
+  text: "addr:housenumber";
   font-size: 8;
   text-color: @housename;
   text-position: center;
@@ -793,9 +795,11 @@ node|z16[building]
 }
 
 area|z17[building],
-node|z17[building]
+node|z17[building],
+area|z17[addr:housenumber][addr:street],
+node|z17[addr:housenumber][addr:street]
 {
-  text: name;
+  text: "addr:housenumber";
   font-size: 9;
   text-color: @building_label;
   text-position: center;
@@ -804,9 +808,11 @@ node|z17[building]
 
 
 area|z18-[building],
-node|z18-[building]
+node|z18-[building],
+area|z18-[addr:housenumber][addr:street],
+node|z18-[addr:housenumber][addr:street]
 {
-  text: name;
+  text: "addr:housenumber";
   font-size: 10;
   text-color: @building_label;
   text-position: center;
@@ -1009,3 +1015,49 @@ area|z18-[leisure=garden] {
   text-halo-color: @label_halo_light;
   text-halo-radius: 0;
 }
+/* BEACH LABELS */
+
+area|z15-[leisure=beach_resort],
+area|z15-[natural=beach], {
+  text: name;
+  font-size: 10;
+  text-color: @poi_label;
+}
+
+/* MILITARY */
+
+area|z17-[landuse=military],
+node|z17-[landuse=military] {
+  icon-image: military-l.svg;
+  text-offset: 10;
+  text: name;
+  font-size: 10;
+  text-color: @poi_label;
+  z-index: 1000;
+}
+/* CEMETRY */
+
+area|z15-[landuse=cemetery] {
+  icon-image: cemetery-m.svg;
+  text-offset: 10;
+  text: name;
+  font-size: 10;
+  text-color: @poi_label;
+  z-index: 1000;
+}
+area|z17-[landuse=cemetery] {
+  icon-image: cemetery-l.svg;
+  text-offset: 10;
+  text: name;
+  font-size: 10;
+  text-color: @poi_label;
+  z-index: 1000;
+}
+area|z17-[amenity=grave_yard] {
+  icon-image: cemetry-l.svg;
+  text-offset: 10;
+  text: name;
+  font-size: 10;
+  text-color: @poi_label;
+  z-index: 1000;
+}
diff --git a/data/styles/clear/include/landuse.mapcss b/data/styles/clear/include/landuse.mapcss
index 3545eb35d5..c90ab82eaf 100644
--- a/data/styles/clear/include/landuse.mapcss
+++ b/data/styles/clear/include/landuse.mapcss
@@ -43,12 +43,23 @@ area|z15-[landuse=industrial] {
 
 
 /* CEMETRY */
-area|z12-[landuse=cemetery] {
+
+area|z14[landuse=cemetery] {
   fill-color: @park;
-  fill-opacity: 0.5;
-  z-index: 150;
+  fill-opacity: 0.85;
+  z-index: -10;
+}
+area|z14[amenity=grave_yard] {
+  fill-color: @park;
+  fill-opacity: 0.85;
+  z-index: -10;
 }
 
+area|z15-[amenity=grave_yard], area|z15-[landuse=cemetery] {
+  fill-color: @park;
+  fill-opacity: 1;
+  z-index: -1000;
+}
 
 /* UNIVERSITY */
 area|z14[amenity=university] {
@@ -71,3 +82,13 @@ area|z17-[leisure=playground]  {
   fill-opacity: 1;
   z-index: 150;
 }
+/* PARKINGS
+area|z16-[amenity=parking] {fill-color: @parking;fill-oppacity:1;z-index: 3;}
+*/
+/* MILITARY */
+/* area|z14[landuse=military] {
+  fill-color: ;
+  fill-opacity: 0.5;
+  z-index: 10;
+}
+*/
diff --git a/data/styles/clear/include/natural.mapcss b/data/styles/clear/include/natural.mapcss
index 317dcd428c..5b4228b234 100644
--- a/data/styles/clear/include/natural.mapcss
+++ b/data/styles/clear/include/natural.mapcss
@@ -116,7 +116,11 @@ line|z15-[waterway=stream] {
 }
 
 line|z15-[waterway=stream][intermittent=yes] {
-	dashes: 5,5;
+	dashes: 5.5;
+	width: 1;
+	opacity: 1;
+	color: @river;
+	z-index: 50;
 }
 
 line|z17-[waterway=ditch] {
@@ -130,7 +134,7 @@ line|z17-[waterway=ditch] {
 line|z15-[waterway=dam] {
 	width: 1;
 	opacity: 0.8;
-	color: @dark;
+	color: @bridge_casing;
 	z-index: 283;
 }
 
@@ -239,6 +243,13 @@ area|z15-[leisure=beach_resort],
 area|z15-[natural=beach],
 {
   fill-color: @beach;
-  fill-opacity: 0.7;
+  fill-opacity: 0.85;
+  z-index: 40;
+}
+area|z17-[leisure=beach_resort],
+area|z17-[natural=beach],
+{
+  fill-color: @beach;
+  fill-opacity: 1;
   z-index: 40;
 }
diff --git a/data/styles/clear/include/other.mapcss b/data/styles/clear/include/other.mapcss
index 668979148a..6ad38ada94 100644
--- a/data/styles/clear/include/other.mapcss
+++ b/data/styles/clear/include/other.mapcss
@@ -80,6 +80,8 @@ line|z14-[piste:type=downhill][piste:difficulty=easy] { color:  @piste_easy; }
 line|z14-[piste:type=downhill][piste:difficulty=intermediate] { color: @piste_intermadiate; }
 line|z14-[piste:type=downhill][piste:difficulty=advanced] { color: @piste_advanced; }
 line|z14-[piste:type=downhill][piste:difficulty=expert] { color: @piste_expert; }
+line|z14-[piste:type=downhill][piste:difficulty=freeride] { color: @piste_expert; }
+
 
 
 /*
diff --git a/data/styles/clear/include/roads.mapcss b/data/styles/clear/include/roads.mapcss
index 9523d01bf3..6f9fbcdf61 100644
--- a/data/styles/clear/include/roads.mapcss
+++ b/data/styles/clear/include/roads.mapcss
@@ -320,15 +320,6 @@ line|z13[highway=pedestrian]
   opacity: 0.7;
 }
 
-line|z13[highway=cycleway]
-{
-  color: @cycleway;
-  width: 0.1;
-  opacity: 0.6;
-  z-index: 1000;
-/*  dashes: 1,1;
-  opacity: 0.8;*/
-}
 
 line|z13[highway=construction]
 {
@@ -436,7 +427,7 @@ line|z14[highway=road]
 line|z14[highway=service]
 {
   color: @unclassified;
-  width: 0;
+  width: 0.2;
   opacity: 0.4;
   z-index: 600;
 }
@@ -445,23 +436,23 @@ line|z14[highway=track][tracktype=grade1],
 {
   color: @track;
   opacity: 1;
-  width: 1;
+  width: 0.8;
 }
-line|z14[highway=track][tracktype=grade2][tracktype=grade3][tracktype=grade4][tracktype=grade5][tracktype=grade],
+line|z14[highway=track],
 line|z14[highway=path]
 {
   color: @track;
   opacity: 1;
-  dashes: 1.4,1;
-  width: 1;
+  dashes: 0.1,0.1;
+  width: 0.1;
 }
 
 line|z14[highway=bridleway]
 {
   color: @bridleway;
   opacity: 1;
-  width: 0.5;
-  dashes: 1.4,1;
+  width: 0.1;
+  dashes: 0.1,0.1;
 }
 
 line|z14[highway=pedestrian]
@@ -489,11 +480,11 @@ line|z14[highway=construction]
   dashes: 5,5;
 }
 
-line|z15[highway=cycleway]
+line|z14[highway=cycleway]
 {
   color: @cycleway;
-  width: 0.6;
-  opacity: 0.9;
+  width: 0.4;
+  opacity: 0.8;
   z-index: 1000;
 
 }
@@ -621,25 +612,25 @@ line|z15[highway=track][tracktype=grade1],
 {
   color: @track;
   opacity: 1;
-  width: 2.1;
-  z-index: 600;
+  width: 1.6;
+  z-index: 1000;
 }
-line|z15[highway=track][tracktype=grade2][tracktype=grade3][tracktype=grade4][tracktype=grade5][tracktype=grade],
+line|z15[highway=track],
 line|z15[highway=path]
 {
   color: @track;
   opacity: 1;
-  dashes: 2,1;
-  width: 1;
-  z-index: 600;
+  dashes: 2,0.5;
+  width: 0.8;
+  z-index: 1000;
 }
 
 line|z15[highway=bridleway]
 {
   color: @bridleway;
   opacity: 1;
-  dashes: 2,1;
-  width: 0.9;
+  dashes: 2,0.5;
+  width: 0.8;
   z-index: 600;
 }
 
@@ -815,7 +806,7 @@ line|z16[highway=track][tracktype=grade1],
   opacity: 1;
   width: 3.5;
 }
-line|z16[highway=track][tracktype=grade2][tracktype=grade3][tracktype=grade4][tracktype=grade5][tracktype=grade],
+line|z16[highway=track],
 line|z16[highway=path]
 {
   color: @track;
@@ -1055,7 +1046,7 @@ line|z17[highway=track][tracktype=grade1],
   opacity: 1;
   width: 6;
 }
-line|z17[highway=track][tracktype=grade2][tracktype=grade3][tracktype=grade4][tracktype=grade5][tracktype=grade],
+line|z17[highway=track],
 line|z17[highway=path]
 {
   color: @track;
@@ -1273,7 +1264,7 @@ line|z18[highway=track][tracktype=grade1],
   width: 7.4;
   z-index: 600;
 }
-line|z18[highway=track][tracktype=grade2][tracktype=grade3][tracktype=grade4][tracktype=grade5][tracktype=grade],
+line|z18[highway=track],
 line|z18[highway=path]
 {
   color: @track;
@@ -1493,7 +1484,7 @@ line|z19-[highway=track][tracktype=grade1],
   opacity: 1;
   width: 8.2;
 }
-line|z19-[highway=track][tracktype=grade2][tracktype=grade3][tracktype=grade4][tracktype=grade5][tracktype=grade],
+line|z19-[highway=track],
 line|z19-[highway=path]
 {
   color: @track;
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
index 1a73755bd5..a7d17a1cf7 100644
--- a/data/styles/clear/style-clear/colors.mapcss
+++ b/data/styles/clear/style-clear/colors.mapcss
@@ -88,10 +88,10 @@
 /* NATURAL */
 @glacier: #FFFFFF;
 @water: #83C6D2;
-@river: #65A4C3;
+@river: #6ea4bd;
 @forest: #AABB66;
 @park: #AABB66; /*  #A4B275 #BCCC74*/
-@beach: #FAEE99;
+@beach: #ffeeaa;
 
 /* BUILDINGS */
 @housename: #7F7F7F;
@@ -104,6 +104,7 @@
 @hospital: #FFAAAA;
 @industrial: #D1D1D1;
 @sport: #CCCCAA;
+@parking: #EeEeCC;
 
 /* BARRIERS */
 @fence: #BBBBAA;
@@ -159,7 +160,7 @@
 @building_label: #7F7F7F;
 
 /* PISTE */
-@piste: grey;
+@piste: #c867f6;
 @piste_novice: #40A90B;
 @piste_easy: #40A90B;
 @piste_intermadiate: #DF4741;
diff --git a/data/styles/clear/style-clear/symbols/cemetery-l.svg b/data/styles/clear/style-clear/symbols/cemetery-l.svg
new file mode 100644
index 0000000000..bdc54a6307
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/cemetery-l.svg
@@ -0,0 +1,14 @@
+<?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>cementry-l</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="cementry-l" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <path d="M13.5,6 C10.426354,6 9,7.75 9,10.375 L9,14.75 L9,18.25 C8.5,18.25 8,18.6875 8,19.125 L8,20 L19,20 L19,19.125 C19,18.6875 18.5,18.25 18,18.25 L18,10.375 C18,7.75 16.5,6 13.5,6 L13.5,6 Z" id="rect12479-9-copy-3" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/cemetery-m.svg b/data/styles/clear/style-clear/symbols/cemetery-m.svg
new file mode 100644
index 0000000000..3a839809bd
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/cemetery-m.svg
@@ -0,0 +1,14 @@
+<?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>cementry-m</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="cementry-m" sketch:type="MSLayerGroup">
+            <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <path d="M11.5,5 C8.98519873,5 7.81818182,6.5 7.81818182,8.75 L7.81818182,12.5 L7.81818182,15.5 C7.40909091,15.5 7,15.875 7,16.25 L7,17 L16,17 L16,16.25 C16,15.875 15.5909091,15.5 15.1818182,15.5 L15.1818182,8.75 C15.1818182,6.5 13.9545455,5 11.5,5 L11.5,5 Z" id="rect12479-9-copy-2" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/cemetery-s.svg b/data/styles/clear/style-clear/symbols/cemetery-s.svg
new file mode 100644
index 0000000000..b8ca3e075a
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/cemetery-s.svg
@@ -0,0 +1,14 @@
+<?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>cementry-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="cementry-s" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <path d="M8.5,4 C6.54404345,4 5.63636364,5.125 5.63636364,6.8125 L5.63636364,9.625 L5.63636364,11.875 C5.31818182,11.875 5,12.15625 5,12.4375 L5,13 L12,13 L12,12.4375 C12,12.15625 11.6818182,11.875 11.3636364,11.875 L11.3636364,6.8125 C11.3636364,5.125 10.4090909,4 8.5,4 L8.5,4 Z" id="rect12479-9-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/drinking-water-l.svg b/data/styles/clear/style-clear/symbols/drinking-water-l.svg
index cdafe88307..3f2a51e554 100644
--- a/data/styles/clear/style-clear/symbols/drinking-water-l.svg
+++ b/data/styles/clear/style-clear/symbols/drinking-water-l.svg
@@ -1,13 +1,13 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>drinking-water-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="drinking-water-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#2E89B0" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M13.5,5 C12,7 7,13 7,16.5 C7,20 10.27126,23 13.5,23 C16.72874,23 20,20 20,16.5 C20,13 15,7 13.5,5 Z" id="path7962-4-3-5-3-9-copy-2" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/drinking-water-m.svg b/data/styles/clear/style-clear/symbols/drinking-water-m.svg
index f22a0e7a20..8121e3adac 100644
--- a/data/styles/clear/style-clear/symbols/drinking-water-m.svg
+++ b/data/styles/clear/style-clear/symbols/drinking-water-m.svg
@@ -1,13 +1,13 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>drinking-water-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="drinking-water-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#2E89B0" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11.5,18 C9.16814,18 7,16 7,13.5 C7,10.9722 10.41667,6.4444 11.5,5 C12.58334,6.4444 16,10.9722 16,13.5 C16,16 13.83187,18 11.5,18 L11.5,18 Z" id="path12622-2-4-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/drinking-water-s.svg b/data/styles/clear/style-clear/symbols/drinking-water-s.svg
index 5930b88473..4766fb21e3 100644
--- a/data/styles/clear/style-clear/symbols/drinking-water-s.svg
+++ b/data/styles/clear/style-clear/symbols/drinking-water-s.svg
@@ -1,13 +1,13 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>drinking-water-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="drinking-water-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#2E89B0" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.5,12 C7.34687857,12 6,11.3 6,9.55 C6,8.325 7.96428571,5.7 8.5,5 C9.03571429,5.7 11,8.325 11,9.55 C11,11.3 9.65312143,12 8.5,12 L8.5,12 Z" id="path4133-5-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/fountain-l.svg b/data/styles/clear/style-clear/symbols/fountain-l.svg
index 8d4bca6ef3..04e019472f 100644
--- a/data/styles/clear/style-clear/symbols/fountain-l.svg
+++ b/data/styles/clear/style-clear/symbols/fountain-l.svg
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="25px" height="25px" viewBox="0 0 25 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+<svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>fountain-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="fountain-l" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-38" opacity="0.504605877" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="12.5"></circle>
-            <path d="M12.5,4 C11,6 6,12 6,15.5 C6,19 9.27126,22 12.5,22 C15.72874,22 19,19 19,15.5 C19,12 14,6 12.5,4 Z" id="path7962-4-3-5-3-9-copy-2" fill="#4793C7" sketch:type="MSShapeGroup"></path>
+        <g id="fountain-l" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+            <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#2E89B0" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <g id="Group-Copy-5-+-Shape-Copy-11-+-Shape-Copy-10" transform="translate(6.000000, 4.981000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
+                <g id="Group-Copy-5" transform="translate(7.600000, 11.000000) rotate(-180.000000) translate(-7.600000, -11.000000) translate(0.600000, 6.000000)">
+                    <path d="M7.02764657,3.17294479 C3.37301411,3.17294479 0.524714973,5.9247436 0.524714973,9.04282528 L13.5305779,9.04282528 C13.5305781,5.9247436 10.6870909,3.17294479 7.02764657,3.17294479 Z" id="Shape"></path>
+                    <path d="M2.59334183,1.28785871e-14 L7.08607912,3.5806222 L11.5788164,1.28785871e-14 L2.59334183,1.28785871e-14 Z" id="Shape"></path>
+                </g>
+                <path d="M1.02268589,4.06525492 L1.02268589,4.99332002 L3.57363728,4.99332002 L3.57363725,4.58817401 C3.57363725,3.77379182 4.05968473,3.03656162 4.78131646,2.85654029 C5.6120609,2.64222919 6.4403255,3.24801524 6.62383322,4.20527151 L7.78935526,8.83724883 L7.82407294,8.83724883 L7.82407294,4.06525492 C7.82407294,1.9335738 6.27085585,0.00886919877 4.42337942,0.00886919877 C2.57342316,0.00886919877 1.02268589,1.9335738 1.02268589,4.06525492 Z" id="Shape-Copy-11"></path>
+                <path d="M11.6040647,4.57462015 L11.4549047,4.57462 L11.4549047,4.99456423 L14.0442215,4.99456438 L14.0442215,4.04884358 C14.0442215,1.91716247 12.4730616,0.00886919877 10.6255852,0.00886919877 C8.77810878,0.00886919877 7.20694888,1.91716232 7.20694888,4.04884343 L7.20694888,8.82083734 L7.24166656,8.82083734 L8.4071886,4.18886002 C8.59069632,3.23160375 9.41896092,2.6258177 10.2497054,2.8401288 C10.9713371,3.02300761 11.4549047,3.75738033 11.4549047,4.57462 L11.6040647,4.57462015 Z" id="Shape-Copy-10"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/fountain-m.svg b/data/styles/clear/style-clear/symbols/fountain-m.svg
index 432fe98dce..e6b41558e9 100644
--- a/data/styles/clear/style-clear/symbols/fountain-m.svg
+++ b/data/styles/clear/style-clear/symbols/fountain-m.svg
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="21px" height="21px" viewBox="0 0 21 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+<svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>fountain-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="fountain-m" sketch:type="MSLayerGroup">
-            <ellipse id="Oval-1-Copy-40" opacity="0.5" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="10.5" cy="10.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M10.5,17 C8.16814,17 6,15 6,12.5 C6,9.9722 9.41667,5.4444 10.5,4 C11.58334,5.4444 15,9.9722 15,12.5 C15,15 12.83187,17 10.5,17 L10.5,17 Z" id="path12622-2-4-copy" fill="#4793C7" sketch:type="MSShapeGroup"></path>
+            <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#2E89B0" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <g id="Group-Copy-3" transform="translate(11.500000, 11.500000) rotate(-180.000000) translate(-11.500000, -11.500000) translate(5.000000, 4.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
+                <path d="M0.961853028,11.1696817 L0.961853028,9.96929222 L3.02430686,9.96929222 L3.02430684,10.8027749 C3.02430684,11.3741872 3.41727807,11.8914656 4.00072005,12.0177778 C4.67238007,12.1681494 5.34203512,11.7430989 5.49040181,11.0714389 L6.43273079,7.82140643 L6.46080016,7.82140643 L6.46080016,11.1696817 C6.46080016,12.6653783 5.20501827,14.0158497 3.7113266,14.0158497 C2.21562997,14.0158497 0.961853028,12.6653783 0.961853028,11.1696817 Z" id="Shape"></path>
+                <path d="M10.0158093,10.8007698 L9.89521288,10.8007699 L9.89521281,9.95468956 L11.9886852,9.95468946 L11.9886853,11.1696816 C11.9886853,12.6653782 10.7183966,14.0043345 9.2247049,14.0043345 C7.73101323,14.0043345 6.46072451,12.6653783 6.46072451,11.1696817 L6.46072451,7.82140643 L6.48879389,7.82140643 L7.43112286,11.0714389 C7.57948955,11.7430989 8.24914461,12.1681494 8.92080462,12.0177778 C9.5042466,11.8894607 9.89521288,11.3741872 9.89521288,10.8007699 L10.0158093,10.8007698 Z" id="Shape"></path>
+                <path d="M6.52341142,3.4407187 C3.47788438,3.4407187 1.02903229,5.4118435 1.02903229,8.01024489 L12.058291,8.01024489 C12.0582912,5.4118435 9.57294838,3.4407187 6.52341142,3.4407187 Z" id="Shape"></path>
+                <path d="M2.99445152,0.981847245 L6.46021604,3.77852197 L9.92598039,0.981847245 L2.99445152,0.981847245 Z" id="Shape"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/fountain-s.svg b/data/styles/clear/style-clear/symbols/fountain-s.svg
index 8e69c8dacd..83113ccbdc 100644
--- a/data/styles/clear/style-clear/symbols/fountain-s.svg
+++ b/data/styles/clear/style-clear/symbols/fountain-s.svg
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+<svg width="17px" height="18px" viewBox="0 0 17 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>fountain-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="fountain-s" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-42" opacity="0.496443563" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="7.5" cy="7.5" r="7.5"></circle>
-            <path d="M7.5,11 C6.34687857,11 5,10.3 5,8.55 C5,7.325 6.96428571,4.7 7.5,4 C8.03571429,4.7 10,7.325 10,8.55 C10,10.3 8.65312143,11 7.5,11 L7.5,11 Z" id="path4133-5-copy" fill="#4794C7" sketch:type="MSShapeGroup"></path>
+        <g id="fountain-s" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+            <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#2E89B0" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <g id="Group-Copy-4" transform="translate(9.000000, 8.481000) rotate(-180.000000) translate(-9.000000, -8.481000) translate(5.000000, 2.981000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
+                <path d="M0.985084491,7.84017683 L0.985084491,7.00761746 L1.99146469,7.00761746 L1.99146467,7.58569967 C1.99146467,7.98201656 2.16917753,8.87545298 2.56937999,8.98860453 C3.22088619,9.17280863 3.69833201,8.14471231 3.80104741,7.67886614 L4.45342901,5.42472695 L4.47286165,5.42472695 L4.47286165,7.74700484 C4.47286165,8.33301661 4.19543194,8.97338695 3.7676012,9.41969992 C3.43807225,9.76346449 3.01931677,9.99210308 2.56937999,9.99210308 C1.53389769,9.99210308 0.985084491,8.87755366 0.985084491,7.84017683 Z" id="Shape"></path>
+                <path d="M6.97523876,6.99009226 L7.99509092,6.99009226 L7.9950909,7.74700484 C7.9950909,8.55254564 7.64858161,9.47450624 6.97384192,9.84635874 C6.77965067,9.95337853 6.55827216,10.014833 6.31014212,10.014833 C5.35223991,10.014833 4.49224192,9.02872794 4.49224192,7.99135111 L4.47280928,5.42472695 L4.49224192,5.42472695 L5.14462352,7.67886614 C5.24733892,8.14471231 5.72767612,9.10470723 6.2339501,8.9899206 C6.68092436,8.8885789 6.97523874,7.88884456 6.97523874,7.49113709 L6.97523876,6.99009226 Z" id="Shape"></path>
+                <path d="M4.51620791,2.38639427 C2.40776611,2.38639427 0.982888617,3.94517029 0.982888617,6 L7.99542413,6 C7.99542425,3.94517029 6.6274258,2.38639427 4.51620791,2.38639427 Z" id="Shape"></path>
+                <path d="M2,1 L4.50000006,2.62068596 L7,1 L2,1 Z" id="Shape"></path>
+            </g>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/military-l.svg b/data/styles/clear/style-clear/symbols/military-l.svg
new file mode 100644
index 0000000000..6125af9799
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/military-l.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>millitary-l</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="millitary-l" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+            <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <g id="Group-Copy" transform="translate(4.000000, 6.000000)" sketch:type="MSShapeGroup">
+                <path d="M14.519926,13.4797756 L3.8651208,13.4797756 C2.73199224,13.4797756 1.79055556,11.956136 1.79055556,10.84295 C1.79055556,9.72869669 2.70986579,8.8247 3.84299435,8.8247 L14.6142279,8.8247 C15.7473564,8.82576729 16.6666667,9.72976399 16.6666667,10.84295 C16.6666667,11.956136 15.6530546,13.4797756 14.519926,13.4797756 Z" id="Shape" stroke="#FFFFFF"></path>
+                <path d="M18.4583333,10.3951 L18.4583333,10.3951 C18.4583333,8.1647875 17.3605556,6.3586 16.0072222,6.3586 L3.13166667,6.3586 C1.77722222,6.3586 0.679444444,8.1647875 0.679444444,10.3951 L0.679444444,10.3951 L18.4583333,10.3951 L18.4583333,10.3951 Z" id="Shape" fill="#FFFFFF"></path>
+                <rect id="Rectangle-path" fill="#FFFFFF" x="9.56833333" y="3.6247" width="9.42293549" height="1.3753"></rect>
+                <path d="M13.4502684,7.46750297 L4.02733294,7.46750297 L4.02733294,0.967502973 L11.4141499,0.967502973 L13.4502684,7.46750297 Z" id="Shape" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/military-m.svg b/data/styles/clear/style-clear/symbols/military-m.svg
new file mode 100644
index 0000000000..d6dba43a82
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/military-m.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>millitary-m</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="millitary-m" sketch:type="MSLayerGroup">
+            <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <g id="Group" transform="translate(3.000000, 6.000000)" sketch:type="MSShapeGroup">
+                <path d="M13.0480196,9.49635906 L3.45869491,9.49635906 C2.43887921,9.49635906 1.6115,8.42779693 1.6115,7.5715 C1.6115,6.71438207 2.43887921,6.019 3.45869491,6.019 L13.1528051,6.019 C14.1726208,6.01982099 15,6.71520307 15,7.5715 C15,8.42779693 14.0678353,9.49635906 13.0480196,9.49635906 Z" id="Shape" stroke="#FFFFFF"></path>
+                <path d="M16.6125,7.227 L16.6125,7.227 C16.6125,5.511375 15.6245,4.122 14.4065,4.122 L2.8185,4.122 C1.5995,4.122 0.6115,5.511375 0.6115,7.227 L0.6115,7.227 L16.6125,7.227 L16.6125,7.227 Z" id="Shape" fill="#FFFFFF"></path>
+                <path d="M8.6115,2.019 L17.0532028,2.019 L17.0532028,3.00950677 L8.6115,3.00950677 L8.6115,2.019 Z" id="Rectangle-path" fill="#FFFFFF"></path>
+                <path d="M11.8475,5.019 L3.6115,5.019 L3.6115,0.019 L10.2945,0.019 L11.8475,5.019 Z" id="Shape" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/military-s.svg b/data/styles/clear/style-clear/symbols/military-s.svg
new file mode 100644
index 0000000000..1336e0c9cd
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/military-s.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="17px" height="18px" viewBox="0 0 17 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>millitary-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="millitary-s" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+            <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <g id="Group-Copy-2" transform="translate(2.000000, 3.981000)" sketch:type="MSShapeGroup">
+                <path d="M9.37082092,7.5060979 L3.26790069,7.5060979 C2.61886084,7.5060979 2.02560464,6.84830391 2.02560464,6.21068686 C2.02560464,5.57245849 2.55217241,5.05466209 3.20121226,5.05466209 L9.37082095,5.05466209 C10.0198608,5.05527342 10.5464286,5.57306982 10.5464286,6.21068686 C10.5464286,6.84830391 10.0198608,7.5060979 9.37082092,7.5060979 Z" id="Shape" stroke="#FFFFFF"></path>
+                <path d="M11.8294799,5.97345007 L12.014549,5.97345007 C12.014549,4.69595893 11.2389406,3.99793641 10.4405343,3.99793641 L6.93149801,3.99793641 L2.84453085,3.99793641 C2.04546905,3.99793641 0.946738914,4.69595893 0.946738914,5.97345007 L1.34072847,5.97344998 C1.34072847,5.97344998 1.8195899,5.97344998 2.05902061,5.97344999 C5.18451051,5.97345002 11.4354903,5.97345007 11.4354903,5.97345007 L11.8294799,5.97345007 Z" id="Shape" fill="#FFFFFF"></path>
+                <path d="M6.48060476,2.02130911 L12.0034124,2.02130908 L12.0034122,2.99999997 L6.48060464,3 L6.48060476,2.02130911 Z" id="Rectangle-path" fill="#FFFFFF"></path>
+                <path d="M9.1242681,4.18273549 L3.01284849,4.27727902 L3.00678353,0.946005395 L7.53179704,0.946005395 L9.1242681,4.18273549 Z" id="Shape" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/npark-l.svg b/data/styles/clear/style-clear/symbols/npark-l.svg
index 56d7a5b372..48e9fe068a 100644
--- a/data/styles/clear/style-clear/symbols/npark-l.svg
+++ b/data/styles/clear/style-clear/symbols/npark-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>npark-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -9,7 +9,10 @@
             <g id="npark-l" sketch:type="MSShapeGroup">
                 <circle id="Oval-1-Copy-44" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
                 <circle id="Oval-1-Copy-45" fill="#3A7921" cx="13.5" cy="13.5" r="12.5"></circle>
-                <path d="M20,13.5002001 C20,12.4301001 19.320222,11.5131001 18.375,11.1565001 C18.76954,10.7145001 19,10.1393001 19,9.50020008 C19,8.11950008 17.880712,7.00020008 16.5,7.00020008 C16.303249,7.00020008 16.121152,7.01920008 15.9375,7.06220008 C15.728193,5.89300008 14.729365,4.99970008 13.5,5.00000008 C12.270635,5.00020008 11.271807,5.89350008 11.0625,7.06270008 C10.878848,7.01970008 10.696751,7.00070008 10.5,7.00070008 C9.119288,7.00070008 8,8.12000008 8,9.50070008 C8,10.1398001 8.23046,10.7150001 8.625,11.1570001 C7.679778,11.5136001 7,12.4301001 7,13.5002001 C7,14.8809001 8,16.0007001 9.5,16.0007001 L10,16.0007001 L12,19.5007001 L12,23.0002001 L15,23.0002001 L15,19.5002001 L17,16.0007001 L17.71875,15.9857001 C19,16.0002001 20,14.8052001 20,13.5002001 L20,13.5002001 Z M12,16.0002001 L15,16.0002001 L14,18.0002001 L13,18.0002001 L12,16.0002001 Z" id="path4390-3-copy" fill="#B8E986"></path>
+                <g id="Shape-Copy-7-+-Shape-Copy-6-Copy" transform="translate(5.000000, 6.000000)" fill="#FFFFFF">
+                    <path d="M13.5582294,1.30575109 C13.3777058,1.30575109 13.215857,1.32691593 13.0527633,1.35430572 C11.904882,1.59209892 11.0445935,2.60303125 11.0445935,3.81814203 C11.0445935,3.89408645 11.0670033,3.96256093 11.0732283,4.03726037 L0.88131168,14.9973583 L9.12170553,14.9973583 C13.0944704,14.9973583 16.0731103,11.1847511 16.0731103,7.21447626 L16.0731103,4.74068003 L17.0482533,3.81814189 L16.0258007,3.32761575 C15.7967224,2.17350951 14.7783202,1.30575109 13.5582294,1.30575109 Z M13.7325281,3.11596736 C13.7325281,2.72628531 14.0462657,2.41254769 14.4347028,2.41254769 C14.8231398,2.41254769 15.1393674,2.72628531 15.1393674,3.11596736 C15.1393674,3.5056494 14.8243848,3.81814203 14.4347028,3.81814203 C14.0450207,3.81814203 13.7325281,3.5056494 13.7325281,3.11596736 Z" id="Shape-Copy-7"></path>
+                    <path d="M2.04829175,0.0607605348 C2.04829175,0.0607605348 9.49831522,2.18097945 11.0782082,3.76336244 C12.6605912,5.34699043 12.6605912,7.91416095 11.0782082,9.49654395 C9.49707023,11.0776819 6.92989971,11.0776819 5.34751672,9.49654395 C3.76513372,7.91416095 2.04829175,0.0607605348 2.04829175,0.0607605348 L2.04829175,0.0607605348 Z" id="Shape-Copy-6"></path>
+                </g>
             </g>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/npark-m.svg b/data/styles/clear/style-clear/symbols/npark-m.svg
index e9e5426c61..0a1605465f 100644
--- a/data/styles/clear/style-clear/symbols/npark-m.svg
+++ b/data/styles/clear/style-clear/symbols/npark-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>npark-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -9,7 +9,10 @@
             <g id="npark-m" transform="translate(37.000000, 2.000000)" sketch:type="MSShapeGroup">
                 <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
                 <ellipse id="Oval-1-Copy-40" fill="#3A7921" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-                <path d="M16,12 C16,11 15,10 14.5,10 C14.80686,9.6563 15.11108,8.9972 15.11108,8.5001 C15.11108,7.4263 14,6.5 13,6.5 C13,5.5 12.5,5 11.5,5 C10.5,5 10,5.5 10,6.5 C9,6.5 7.88892,7.4266 7.88892,8.5005 C7.88892,8.9976 8.19314,9.6563 8.5,10 C8,10 7,11 7,12 C7,13 7.5,14.056 9.05557,14.056 L9.44446,14.056 L9.49996,15 L10.99996,16.5 L10.99992,19 L11.99992,19 L11.99996,16.4996 L13.49996,15 L13.55546,14.056 L14.11448,14.044 C15.5,14 16,13 16,12 L16,12 Z M10.5,14 L12.5,14 L12.5,14.5 L11.5,15.5 L10.5,14.5 L10.5,14 Z" id="path4390-3-6" fill="#B8E986"></path>
+                <g id="Shape-Copy-7-+-Shape-Copy-6" transform="translate(5.000000, 5.000000)" fill="#FFFFFF">
+                    <path d="M10.245,1 C10.1,1 9.97,1.017 9.839,1.039 C8.917,1.23 8.226,2.042 8.226,3.018 C8.226,3.079 8.244,3.134 8.249,3.194 L0.062659502,11.9973583 L6.68149996,11.9973583 C9.87249996,11.9973583 12.265,8.935 12.265,5.746 L12.265,3.759 L13.0482533,3.01799989 L12.227,2.624 C12.043,1.697 11.225,1 10.245,1 Z M10.385,2.454 C10.385,2.141 10.637,1.889 10.949,1.889 C11.261,1.889 11.515,2.141 11.515,2.454 C11.515,2.767 11.262,3.018 10.949,3.018 C10.636,3.018 10.385,2.767 10.385,2.454 Z" id="Shape-Copy-7"></path>
+                    <path d="M1,8.8817842e-16 C1,8.8817842e-16 6.984,1.703 8.253,2.974 C9.524,4.246 9.524,6.308 8.253,7.579 C6.983,8.849 4.921,8.849 3.65,7.579 C2.379,6.308 1,8.8817842e-16 1,8.8817842e-16 L1,8.8817842e-16 Z" id="Shape-Copy-6"></path>
+                </g>
             </g>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/npark-s.svg b/data/styles/clear/style-clear/symbols/npark-s.svg
index 4342a5dbc2..05a52d92f9 100644
--- a/data/styles/clear/style-clear/symbols/npark-s.svg
+++ b/data/styles/clear/style-clear/symbols/npark-s.svg
@@ -1,7 +1,7 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
-    <title>npark-s </title>
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>npark-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
@@ -9,7 +9,8 @@
             <g id="npark-s" transform="translate(71.000000, 5.000000)" sketch:type="MSShapeGroup">
                 <circle id="Oval-1-Copy-43" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
                 <circle id="Oval-1-Copy-42" fill="#3A7921" cx="8.5" cy="8.5" r="7.5"></circle>
-                <path d="M7.84375,4.00711111 C7.28125,4.05411111 7,4.75711111 7,5.50711111 C6,5.00711111 5.5,5.25711111 5.5,6.25711111 C5.5,7.25711111 6.5,7.50711111 6.5,7.50711111 C6.5,7.50711111 5,7.26101111 5,8.75711111 C5,9.44741111 5.80965,10.0071111 6.5,10.0071111 L6.5,11.0071111 L8,11.0071111 L8,14.0071111 L9,14.0071111 L9,11.0071111 L10.5,11.0071111 L10.5,10.0071111 C11.5,10.0071111 12,9.40951111 12,8.75711111 C12,7.26111111 10.5,7.50711111 10.5,7.50711111 C10.5,7.50711111 11.5,7.25711111 11.5,6.25711111 C11.5,5.25711111 10.5,5.00711111 10,5.50711111 C10,4.50711111 9.5,4.00711111 8.5,4.00711111 C8.25,4.00711111 8.03125,3.99111111 7.84375,4.00711111 L7.84375,4.00711111 Z M7.5,10.0071111 L9.5,10.0071111 L9,11.0071111 L8,11.0071111 L7.5,10.0071111 Z" id="path4390-3-8" fill="#B8E986"></path>
+                <path d="M11.2992835,4.7523635 C11.1953392,4.7523635 11.1021478,4.76515368 11.0082395,4.78170568 C10.3472972,4.9254071 9.85194892,5.53632627 9.85194892,6.27063304 C9.85194892,6.31652722 9.86485235,6.35790721 9.86843664,6.40304902 L4,13.0263745 L8.74476304,13.0263745 C11.0322542,13.0263745 12.7473349,10.7223679 12.7473349,8.32308067 L12.7473349,6.82813439 L13.5925798,6.27063304 L12.7200943,5.97420182 C12.5881926,5.27676086 12.0018035,4.7523635 11.2992835,4.7523635 Z M11.3996435,5.84630003 C11.3996435,5.61081025 11.5802915,5.42121465 11.8039509,5.42121465 C12.0276103,5.42121465 12.2096921,5.61081025 12.2096921,5.84630003 C12.2096921,6.0817898 12.0283272,6.27063304 11.8039509,6.27063304 C11.5795746,6.27063304 11.3996435,6.0817898 11.3996435,5.84630003 Z" id="Shape-Copy-9" fill="#FFFFFF"></path>
+                <path d="M9.91622198,6.23752905 C10.8273474,7.19453542 10.8273474,8.74590896 9.91622198,9.70216296 C9.00581341,10.6576646 7.52765399,10.6576646 6.61652856,9.70216296 C5.70540314,8.74590896 5.03686793,4.38378521 5.03686793,4.02240729 C5.35044612,4.02240729 9.00653027,5.28127504 9.91622198,6.23752905 Z" id="Shape-Copy-8" fill="#FFFFFF"></path>
             </g>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/nparkF-l.svg b/data/styles/clear/style-clear/symbols/nparkF-l.svg
new file mode 100644
index 0000000000..27d832ec07
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/nparkF-l.svg
@@ -0,0 +1,16 @@
+<?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>nparkF-l</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="Natural" sketch:type="MSLayerGroup">
+            <g id="nparkF-l" sketch:type="MSShapeGroup">
+                <circle id="Oval-1-Copy-44" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
+                <circle id="Oval-1-Copy-45" fill="#3A7921" cx="13.5" cy="13.5" r="12.5"></circle>
+                <path d="M13.5,5.10483141 L8,9.97647667 L11.0555556,9.97647667 L8,14.0035477 L11.0555556,14.0035477 L8,18.0769231 L12.983552,18.0769231 L12.983552,21.9999997 L14.0407867,21.9999997 L14.0407867,18.0769231 L19,18.0769231 L15.9444447,14.0035477 L19,14.0035477 L15.9444447,9.97647686 L19,9.97647686 L13.5,5.10483141 Z" id="rect4152-3-3-5-copy-2" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/nparkF-m.svg b/data/styles/clear/style-clear/symbols/nparkF-m.svg
new file mode 100644
index 0000000000..bb4fc09983
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/nparkF-m.svg
@@ -0,0 +1,16 @@
+<?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>nparkF-m </title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="Natural" sketch:type="MSLayerGroup" transform="translate(-37.000000, -2.000000)">
+            <g id="nparkF-m" transform="translate(37.000000, 2.000000)" sketch:type="MSShapeGroup">
+                <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+                <ellipse id="Oval-1-Copy-40" fill="#3A7921" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+                <path d="M11.5,5 L7.5,9 L10,9 L7,12 L9.5,12 L7,15 L11,15 L11,18 L12,18 L12,15 L16,15 L13.5,12 L16,12 L13,9 L15.5,9 L11.5,5 Z" id="rect4152-3-3-5" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/nparkF-s.svg b/data/styles/clear/style-clear/symbols/nparkF-s.svg
new file mode 100644
index 0000000000..6e68d478d6
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/nparkF-s.svg
@@ -0,0 +1,16 @@
+<?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>nparkF-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="Natural" sketch:type="MSLayerGroup" transform="translate(-71.000000, -5.000000)">
+            <g id="nparkF-s" transform="translate(71.000000, 5.000000)" sketch:type="MSShapeGroup">
+                <circle id="Oval-1-Copy-43" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#3A7921" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M8.5,3.91287426 L5,7.07692303 L7.04377508,7.07692303 L5,9.04385843 L7.04377508,9.04385843 L5,11.0009678 L5.68400832,11.0009678 L7.99911189,11.0009678 L7.99911189,13.0164069 L8.99568152,13.0164073 L8.99568152,11.0009681 L12,11.0009678 L9.9828372,9.04385843 L12,9.04385843 L9.9828372,7.07692303 L12,7.07692303 L8.5,3.91287426 Z" id="rect4152-3-3-5-copy" fill="#FFFFFF"></path>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/waterfall-l.svg b/data/styles/clear/style-clear/symbols/waterfall-l.svg
index 8d8dcd7434..919661137a 100644
--- a/data/styles/clear/style-clear/symbols/waterfall-l.svg
+++ b/data/styles/clear/style-clear/symbols/waterfall-l.svg
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="25px" height="25px" viewBox="0 0 25 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+<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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>waterfall-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="waterfall-l" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-38" opacity="0.5" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="12.5"></circle>
-            <path d="M4,16.4166667 L4,17.7708667 C4,17.7708667 5,17.3336667 6,17.3333333 C7,17.333 8,18 9.5,18 C11,18 11.47352,17.3564667 12.5,17.3333333 C13.5,17.3336667 14,18 15.5,18 C17,18 18,17.3333333 19,17.3333333 C19.70165,17.3333333 21,17.7708667 21,17.7708667 L21,16.4166667 C20.3584,16.2521333 19.65657,16 19,16 C17.5,16 16.5,16.667 15.5,16.6666667 C14.5,16.6663333 14,16 12.5,16 C11,16 10.5,16.667 9.5,16.6666667 C8.5,16.667 7.5,16 6,16 C5.30594,16 4.66024,16.2699333 4,16.4166667 Z" id="path4758-copy" fill="#4793C7" sketch:type="MSShapeGroup"></path>
-            <path d="M6,19 C5.30594,19 4.66024,19.2699333 4,19.4166667 L4,20.7708667 C4,20.7708667 5,20.3336667 6,20.3333333 C7,20.333 8,21 9.5,21 C11,21 11.47352,20.3564667 12.5,20.3333333 C13.5,20.3336667 14,21 15.5,21 C17,21 18,20.3333333 19,20.3333333 C19.70165,20.3333333 21,20.7708667 21,20.7708667 L21,19.4166667 C20.3584,19.2521333 19.65657,19 19,19 C17.5,19 16.5,19.667 15.5,19.6666667 C14.5,19.6663333 14,19 12.5,19 C11,19 10.5,19.667 9.5,19.6666667 C8.5,19.667 7.5,19 6,19 L6,19 Z" id="path4758-copy-6" fill="#4793C7" sketch:type="MSShapeGroup"></path>
-            <path d="M12.1875,3 L11.17185,3 C11.17185,3 11.49975,3.69515724 11.5,4.39031449 C11.50025,5.08547173 11,5.78062897 11,6.82336484 C11,7.8661007 11.48265,8.19527156 11.5,8.90883657 C11.49975,9.60399381 11,9.95157243 11,10.9943083 C11,12.0370442 11.5,12.7322014 11.5,13.4273586 C11.5,13.9151157 11.17185,14.8176731 11.17185,14.8176731 L12.1875,14.8176731 C12.3109,14.3716602 12.5,13.883778 12.5,13.4273586 C12.5,12.3846228 11.99975,11.6894655 12,10.9943083 C12.00025,10.2991511 12.5,9.95157243 12.5,8.90883657 C12.5,7.8661007 11.99975,7.51852208 12,6.82336484 C11.99975,6.12820759 12.5,5.43305035 12.5,4.39031449 C12.5,3.90783365 12.29755,3.45897062 12.1875,3 Z" id="path4758-copy-2" fill="#4793C7" sketch:type="MSShapeGroup"></path>
-            <path d="M10.1875,3 L9.17185,3 C9.17185,3 9.49975,3.69515724 9.5,4.39031449 C9.50025,5.08547173 9,5.78062897 9,6.82336484 C9,7.8661007 9.48265,8.19527156 9.5,8.90883657 C9.49975,9.60399381 9,9.95157243 9,10.9943083 C9,12.0370442 9.5,12.7322014 9.5,13.4273586 C9.5,13.9151157 9.17185,14.8176731 9.17185,14.8176731 L10.1875,14.8176731 C10.3109,14.3716602 10.5,13.883778 10.5,13.4273586 C10.5,12.3846228 9.99975,11.6894655 10,10.9943083 C10.00025,10.2991511 10.5,9.95157243 10.5,8.90883657 C10.5,7.8661007 9.99975,7.51852208 10,6.82336484 C9.99975,6.12820759 10.5,5.43305035 10.5,4.39031449 C10.5,3.90783365 10.29755,3.45897062 10.1875,3 Z" id="path4758-copy-5" fill="#4793C7" sketch:type="MSShapeGroup"></path>
-            <path d="M14.1875,3 L13.17185,3 C13.17185,3 13.49975,3.69515724 13.5,4.39031449 C13.50025,5.08547173 13,5.78062897 13,6.82336484 C13,7.8661007 13.48265,8.19527156 13.5,8.90883657 C13.49975,9.60399381 13,9.95157243 13,10.9943083 C13,12.0370442 13.5,12.7322014 13.5,13.4273586 C13.5,13.9151157 13.17185,14.8176731 13.17185,14.8176731 L14.1875,14.8176731 C14.3109,14.3716602 14.5,13.883778 14.5,13.4273586 C14.5,12.3846228 13.99975,11.6894655 14,10.9943083 C14.00025,10.2991511 14.5,9.95157243 14.5,8.90883657 C14.5,7.8661007 13.99975,7.51852208 14,6.82336484 C13.99975,6.12820759 14.5,5.43305035 14.5,4.39031449 C14.5,3.90783365 14.29755,3.45897062 14.1875,3 Z" id="path4758-copy-3" fill="#4793C7" sketch:type="MSShapeGroup"></path>
-            <path d="M16.1875,3 L15.17185,3 C15.17185,3 15.49975,3.69515724 15.5,4.39031449 C15.50025,5.08547173 15,5.78062897 15,6.82336484 C15,7.8661007 15.48265,8.19527156 15.5,8.90883657 C15.49975,9.60399381 15,9.95157243 15,10.9943083 C15,12.0370442 15.5,12.7322014 15.5,13.4273586 C15.5,13.9151157 15.17185,14.8176731 15.17185,14.8176731 L16.1875,14.8176731 C16.3109,14.3716602 16.5,13.883778 16.5,13.4273586 C16.5,12.3846228 15.99975,11.6894655 16,10.9943083 C16.00025,10.2991511 16.5,9.95157243 16.5,8.90883657 C16.5,7.8661007 15.99975,7.51852208 16,6.82336484 C15.99975,6.12820759 16.5,5.43305035 16.5,4.39031449 C16.5,3.90783365 16.29755,3.45897062 16.1875,3 Z" id="path4758-copy-4" fill="#4793C7" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#2E89B0" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <path d="M5,17.4166667 L5,18.7708667 C5,18.7708667 6,18.3336667 7,18.3333333 C8,18.333 9,19 10.5,19 C12,19 12.47352,18.3564667 13.5,18.3333333 C14.5,18.3336667 15,19 16.5,19 C18,19 19,18.3333333 20,18.3333333 C20.70165,18.3333333 22,18.7708667 22,18.7708667 L22,17.4166667 C21.3584,17.2521333 20.65657,17 20,17 C18.5,17 17.5,17.667 16.5,17.6666667 C15.5,17.6663333 15,17 13.5,17 C12,17 11.5,17.667 10.5,17.6666667 C9.5,17.667 8.5,17 7,17 C6.30594,17 5.66024,17.2699333 5,17.4166667 Z" id="path4758-copy-12" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M7,20 C6.30594,20 5.66024,20.2699333 5,20.4166667 L5,21.7708667 C5,21.7708667 6,21.3336667 7,21.3333333 C8,21.333 9,22 10.5,22 C12,22 12.47352,21.3564667 13.5,21.3333333 C14.5,21.3336667 15,22 16.5,22 C18,22 19,21.3333333 20,21.3333333 C20.70165,21.3333333 22,21.7708667 22,21.7708667 L22,20.4166667 C21.3584,20.2521333 20.65657,20 20,20 C18.5,20 17.5,20.667 16.5,20.6666667 C15.5,20.6663333 15,20 13.5,20 C12,20 11.5,20.667 10.5,20.6666667 C9.5,20.667 8.5,20 7,20 L7,20 Z" id="path4758-copy-7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M13.1875,4 L12.17185,4 C12.17185,4 12.49975,4.69515724 12.5,5.39031449 C12.50025,6.08547173 12,6.78062897 12,7.82336484 C12,8.8661007 12.48265,9.19527156 12.5,9.90883657 C12.49975,10.6039938 12,10.9515724 12,11.9943083 C12,13.0370442 12.5,13.7322014 12.5,14.4273586 C12.5,14.9151157 12.17185,15.8176731 12.17185,15.8176731 L13.1875,15.8176731 C13.3109,15.3716602 13.5,14.883778 13.5,14.4273586 C13.5,13.3846228 12.99975,12.6894655 13,11.9943083 C13.00025,11.2991511 13.5,10.9515724 13.5,9.90883657 C13.5,8.8661007 12.99975,8.51852208 13,7.82336484 C12.99975,7.12820759 13.5,6.43305035 13.5,5.39031449 C13.5,4.90783365 13.29755,4.45897062 13.1875,4 Z" id="path4758-copy-8" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.1875,4 L10.17185,4 C10.17185,4 10.49975,4.69515724 10.5,5.39031449 C10.50025,6.08547173 10,6.78062897 10,7.82336484 C10,8.8661007 10.48265,9.19527156 10.5,9.90883657 C10.49975,10.6039938 10,10.9515724 10,11.9943083 C10,13.0370442 10.5,13.7322014 10.5,14.4273586 C10.5,14.9151157 10.17185,15.8176731 10.17185,15.8176731 L11.1875,15.8176731 C11.3109,15.3716602 11.5,14.883778 11.5,14.4273586 C11.5,13.3846228 10.99975,12.6894655 11,11.9943083 C11.00025,11.2991511 11.5,10.9515724 11.5,9.90883657 C11.5,8.8661007 10.99975,8.51852208 11,7.82336484 C10.99975,7.12820759 11.5,6.43305035 11.5,5.39031449 C11.5,4.90783365 11.29755,4.45897062 11.1875,4 Z" id="path4758-copy-9" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M15.1875,4 L14.17185,4 C14.17185,4 14.49975,4.69515724 14.5,5.39031449 C14.50025,6.08547173 14,6.78062897 14,7.82336484 C14,8.8661007 14.48265,9.19527156 14.5,9.90883657 C14.49975,10.6039938 14,10.9515724 14,11.9943083 C14,13.0370442 14.5,13.7322014 14.5,14.4273586 C14.5,14.9151157 14.17185,15.8176731 14.17185,15.8176731 L15.1875,15.8176731 C15.3109,15.3716602 15.5,14.883778 15.5,14.4273586 C15.5,13.3846228 14.99975,12.6894655 15,11.9943083 C15.00025,11.2991511 15.5,10.9515724 15.5,9.90883657 C15.5,8.8661007 14.99975,8.51852208 15,7.82336484 C14.99975,7.12820759 15.5,6.43305035 15.5,5.39031449 C15.5,4.90783365 15.29755,4.45897062 15.1875,4 Z" id="path4758-copy-10" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M17.1875,4 L16.17185,4 C16.17185,4 16.49975,4.69515724 16.5,5.39031449 C16.50025,6.08547173 16,6.78062897 16,7.82336484 C16,8.8661007 16.48265,9.19527156 16.5,9.90883657 C16.49975,10.6039938 16,10.9515724 16,11.9943083 C16,13.0370442 16.5,13.7322014 16.5,14.4273586 C16.5,14.9151157 16.17185,15.8176731 16.17185,15.8176731 L17.1875,15.8176731 C17.3109,15.3716602 17.5,14.883778 17.5,14.4273586 C17.5,13.3846228 16.99975,12.6894655 17,11.9943083 C17.00025,11.2991511 17.5,10.9515724 17.5,9.90883657 C17.5,8.8661007 16.99975,8.51852208 17,7.82336484 C16.99975,7.12820759 17.5,6.43305035 17.5,5.39031449 C17.5,4.90783365 17.29755,4.45897062 17.1875,4 Z" id="path4758-copy-11" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/waterfall-m.svg b/data/styles/clear/style-clear/symbols/waterfall-m.svg
index d95abd516e..f3fd3c201e 100644
--- a/data/styles/clear/style-clear/symbols/waterfall-m.svg
+++ b/data/styles/clear/style-clear/symbols/waterfall-m.svg
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="22px" viewBox="0 0 23 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+<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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>waterfall-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="waterfall-m" sketch:type="MSLayerGroup" transform="translate(0.000000, -0.500000)">
-            <circle id="Oval-1-Copy-38" opacity="0.5" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.6481481"></circle>
-            <path d="M5.96296296,14.4814815 C5.37172667,14.4814815 4.82168593,14.7114247 4.25925926,14.8364198 L4.25925926,15.9899975 C4.25925926,15.9899975 5.11111111,15.6175679 5.96296296,15.617284 C6.81481481,15.617 7.66666667,16.1851852 8.94444444,16.1851852 C10.2222222,16.1851852 10.6255911,15.6369901 11.5,15.617284 C12.3518519,15.6175679 12.7777778,16.1851852 14.0555556,16.1851852 C15.3333333,16.1851852 16.1851852,15.617284 17.037037,15.617284 C17.6347389,15.617284 18.7407407,15.9899975 18.7407407,15.9899975 L18.7407407,14.8364198 C18.1941926,14.6962617 17.5963374,14.4814815 17.037037,14.4814815 C15.7592593,14.4814815 14.9074074,15.0496667 14.0555556,15.0493827 C13.2037037,15.0490988 12.7777778,14.4814815 11.5,14.4814815 C10.2222222,14.4814815 9.7962963,15.0496667 8.94444444,15.0493827 C8.09259259,15.0496667 7.24074074,14.4814815 5.96296296,14.4814815 L5.96296296,14.4814815 Z" id="path4758-copy" fill="#4793C7" sketch:type="MSShapeGroup"></path>
-            <path d="M5.96296296,17.037037 C5.37172667,17.037037 4.82168593,17.2669802 4.25925926,17.3919753 L4.25925926,18.5455531 C4.25925926,18.5455531 5.11111111,18.1731235 5.96296296,18.1728395 C6.81481481,18.1725556 7.66666667,18.7407407 8.94444444,18.7407407 C10.2222222,18.7407407 10.6255911,18.1925457 11.5,18.1728395 C12.3518519,18.1731235 12.7777778,18.7407407 14.0555556,18.7407407 C15.3333333,18.7407407 16.1851852,18.1728395 17.037037,18.1728395 C17.6347389,18.1728395 18.7407407,18.5455531 18.7407407,18.5455531 L18.7407407,17.3919753 C18.1941926,17.2518173 17.5963374,17.037037 17.037037,17.037037 C15.7592593,17.037037 14.9074074,17.6052222 14.0555556,17.6049383 C13.2037037,17.6046543 12.7777778,17.037037 11.5,17.037037 C10.2222222,17.037037 9.7962963,17.6052222 8.94444444,17.6049383 C8.09259259,17.6052222 7.24074074,17.037037 5.96296296,17.037037 L5.96296296,17.037037 Z" id="path4758-copy-6" fill="#4793C7" sketch:type="MSShapeGroup"></path>
-            <path d="M11.2337963,3.40740741 L10.368613,3.40740741 C10.368613,3.40740741 10.6479352,3.99957839 10.6481481,4.59174938 C10.6483611,5.18392036 10.2222222,5.77609135 10.2222222,6.66434782 C10.2222222,7.5526043 10.6333685,7.83300911 10.6481481,8.44086078 C10.6479352,9.03303176 10.2222222,9.32911726 10.2222222,10.2173737 C10.2222222,11.1056302 10.6481481,11.6978012 10.6481481,12.2899722 C10.6481481,12.705469 10.368613,13.4743142 10.368613,13.4743142 L11.2337963,13.4743142 C11.3389148,13.0943772 11.5,12.6787739 11.5,12.2899722 C11.5,11.4017157 11.0738611,10.8095447 11.0740741,10.2173737 C11.074287,9.62520275 11.5,9.32911726 11.5,8.44086078 C11.5,7.5526043 11.0738611,7.25651881 11.0740741,6.66434782 C11.0738611,6.07217684 11.5,5.48000585 11.5,4.59174938 C11.5,4.18074718 11.3275426,3.79838238 11.2337963,3.40740741 Z" id="path4758-copy-2" fill="#4793C7" sketch:type="MSShapeGroup"></path>
-            <path d="M9.53009259,3.40740741 L8.66490926,3.40740741 C8.66490926,3.40740741 8.94423148,3.99957839 8.94444444,4.59174938 C8.94465741,5.18392036 8.51851852,5.77609135 8.51851852,6.66434782 C8.51851852,7.5526043 8.92966481,7.83300911 8.94444444,8.44086078 C8.94423148,9.03303176 8.51851852,9.32911726 8.51851852,10.2173737 C8.51851852,11.1056302 8.94444444,11.6978012 8.94444444,12.2899722 C8.94444444,12.705469 8.66490926,13.4743142 8.66490926,13.4743142 L9.53009259,13.4743142 C9.63521111,13.0943772 9.7962963,12.6787739 9.7962963,12.2899722 C9.7962963,11.4017157 9.37015741,10.8095447 9.37037037,10.2173737 C9.37058333,9.62520275 9.7962963,9.32911726 9.7962963,8.44086078 C9.7962963,7.5526043 9.37015741,7.25651881 9.37037037,6.66434782 C9.37015741,6.07217684 9.7962963,5.48000585 9.7962963,4.59174938 C9.7962963,4.18074718 9.62383889,3.79838238 9.53009259,3.40740741 Z" id="path4758-copy-5" fill="#4793C7" sketch:type="MSShapeGroup"></path>
-            <path d="M12.9375,3.40740741 L12.0723167,3.40740741 C12.0723167,3.40740741 12.3516389,3.99957839 12.3518519,4.59174938 C12.3520648,5.18392036 11.9259259,5.77609135 11.9259259,6.66434782 C11.9259259,7.5526043 12.3370722,7.83300911 12.3518519,8.44086078 C12.3516389,9.03303176 11.9259259,9.32911726 11.9259259,10.2173737 C11.9259259,11.1056302 12.3518519,11.6978012 12.3518519,12.2899722 C12.3518519,12.705469 12.0723167,13.4743142 12.0723167,13.4743142 L12.9375,13.4743142 C13.0426185,13.0943772 13.2037037,12.6787739 13.2037037,12.2899722 C13.2037037,11.4017157 12.7775648,10.8095447 12.7777778,10.2173737 C12.7779907,9.62520275 13.2037037,9.32911726 13.2037037,8.44086078 C13.2037037,7.5526043 12.7775648,7.25651881 12.7777778,6.66434782 C12.7775648,6.07217684 13.2037037,5.48000585 13.2037037,4.59174938 C13.2037037,4.18074718 13.0312463,3.79838238 12.9375,3.40740741 Z" id="path4758-copy-3" fill="#4793C7" sketch:type="MSShapeGroup"></path>
-            <path d="M14.6412037,3.40740741 L13.7760204,3.40740741 C13.7760204,3.40740741 14.0553426,3.99957839 14.0555556,4.59174938 C14.0557685,5.18392036 13.6296296,5.77609135 13.6296296,6.66434782 C13.6296296,7.5526043 14.0407759,7.83300911 14.0555556,8.44086078 C14.0553426,9.03303176 13.6296296,9.32911726 13.6296296,10.2173737 C13.6296296,11.1056302 14.0555556,11.6978012 14.0555556,12.2899722 C14.0555556,12.705469 13.7760204,13.4743142 13.7760204,13.4743142 L14.6412037,13.4743142 C14.7463222,13.0943772 14.9074074,12.6787739 14.9074074,12.2899722 C14.9074074,11.4017157 14.4812685,10.8095447 14.4814815,10.2173737 C14.4816944,9.62520275 14.9074074,9.32911726 14.9074074,8.44086078 C14.9074074,7.5526043 14.4812685,7.25651881 14.4814815,6.66434782 C14.4812685,6.07217684 14.9074074,5.48000585 14.9074074,4.59174938 C14.9074074,4.18074718 14.73495,3.79838238 14.6412037,3.40740741 Z" id="path4758-copy-4" fill="#4793C7" sketch:type="MSShapeGroup"></path>
+        <g id="waterfall-m" sketch:type="MSLayerGroup">
+            <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#2E89B0" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <path d="M6.53367864,14 C6.00144614,14 5.50629799,14.2069955 5,14.3195164 L5,15.3579702 C5,15.3579702 5.76683932,15.022708 6.53367864,15.0224524 C7.30051796,15.0221968 8.06735728,15.5336786 9.21761626,15.5336786 C10.3678752,15.5336786 10.730989,15.040192 11.5181342,15.0224524 C12.2849735,15.022708 12.6683932,15.5336786 13.8186522,15.5336786 C14.9689111,15.5336786 15.7357505,15.0224524 16.5025898,15.0224524 C17.0406426,15.0224524 18.0362684,15.3579702 18.0362684,15.3579702 L18.0362684,14.3195164 C17.5442643,14.1933458 17.0060735,14 16.5025898,14 C15.3523308,14 14.5854915,14.5114818 13.8186522,14.5112262 C13.0518129,14.5109706 12.6683932,14 11.5181342,14 C10.3678752,14 9.98445557,14.5114818 9.21761626,14.5112262 C8.45077694,14.5114818 7.68393762,14 6.53367864,14 L6.53367864,14 Z" id="path4758-copy-18" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M5,16.3195164 L5,17.3579702 C5,17.3579702 5.76683932,17.022708 6.53367864,17.0224524 C7.30051796,17.0221968 8.06735728,17.5336786 9.21761626,17.5336786 C10.3678752,17.5336786 10.730989,17.040192 11.5181342,17.0224524 C12.2849735,17.022708 12.6683932,17.5336786 13.8186522,17.5336786 C14.9689111,17.5336786 15.7357505,17.0224524 16.5025898,17.0224524 C17.0406426,17.0224524 18.0362684,17.3579702 18.0362684,17.3579702 L18.0362684,16.3195164 C17.5442643,16.1933458 17.0060735,16 16.5025898,16 C15.3523308,16 14.5854915,16.5114818 13.8186522,16.5112262 C13.0518129,16.5109706 12.6683932,16 11.5181342,16 C10.3678752,16 9.98445557,16.5114818 9.21761626,16.5112262 C8.45077694,16.5114818 7.68393762,16 6.53367864,16 C6.00144615,16 5.50629799,16.2069955 5,16.3195164 Z" id="path4758-copy-13" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10.9106217,4 L10.1317813,4 C10.1317813,4 10.3832279,4.53307391 10.3834197,5.06614781 C10.3836114,5.59922172 10,6.13229563 10,6.93190649 C10,7.73151735 10.370115,7.98393851 10.3834197,8.53112821 C10.3832279,9.06420212 10,9.33073907 10,10.1303499 C10,10.9299608 10.3834197,11.4630347 10.3834197,11.9961086 C10.3834197,12.3701399 10.1317813,13.0622564 10.1317813,13.0622564 L10.9106217,13.0622564 C11.0052497,12.7202362 11.150259,12.3461089 11.150259,11.9961086 C11.150259,11.1964977 10.7666476,10.6634238 10.7668393,10.1303499 C10.767031,9.59727602 11.150259,9.33073907 11.150259,8.53112821 C11.150259,7.73151735 10.7666476,7.4649804 10.7668393,6.93190649 C10.7666476,6.39883258 11.150259,5.86575867 11.150259,5.06614781 C11.150259,4.69616254 10.9950124,4.35195672 10.9106217,4 Z" id="path4758-copy-14" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.91062169,4 L8.13178134,4 C8.13178134,4 8.38322795,4.53307391 8.38341966,5.06614781 C8.38361137,5.59922172 8,6.13229563 8,6.93190649 C8,7.73151735 8.370115,7.98393851 8.38341966,8.53112821 C8.38322795,9.06420212 8,9.33073907 8,10.1303499 C8,10.9299608 8.38341966,11.4630347 8.38341966,11.9961086 C8.38341966,12.3701399 8.13178134,13.0622564 8.13178134,13.0622564 L8.91062169,13.0622564 C9.00524966,12.7202362 9.15025898,12.3461089 9.15025898,11.9961086 C9.15025898,11.1964977 8.76664761,10.6634238 8.76683932,10.1303499 C8.76703103,9.59727602 9.15025898,9.33073907 9.15025898,8.53112821 C9.15025898,7.73151735 8.76664761,7.4649804 8.76683932,6.93190649 C8.76664761,6.39883258 9.15025898,5.86575867 9.15025898,5.06614781 C9.15025898,4.69616254 8.99501236,4.35195672 8.91062169,4 Z" id="path4758-copy-15" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M12.9106217,4 L12.1317813,4 C12.1317813,4 12.3832279,4.53307391 12.3834197,5.06614781 C12.3836114,5.59922172 12,6.13229563 12,6.93190649 C12,7.73151735 12.370115,7.98393851 12.3834197,8.53112821 C12.3832279,9.06420212 12,9.33073907 12,10.1303499 C12,10.9299608 12.3834197,11.4630347 12.3834197,11.9961086 C12.3834197,12.3701399 12.1317813,13.0622564 12.1317813,13.0622564 L12.9106217,13.0622564 C13.0052497,12.7202362 13.150259,12.3461089 13.150259,11.9961086 C13.150259,11.1964977 12.7666476,10.6634238 12.7668393,10.1303499 C12.767031,9.59727602 13.150259,9.33073907 13.150259,8.53112821 C13.150259,7.73151735 12.7666476,7.4649804 12.7668393,6.93190649 C12.7666476,6.39883258 13.150259,5.86575867 13.150259,5.06614781 C13.150259,4.69616254 12.9950124,4.35195672 12.9106217,4 Z" id="path4758-copy-16" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M14.9126485,4 L14.1338081,4 C14.1338081,4 14.3852547,4.53307391 14.3854464,5.06614781 C14.3856382,5.59922172 14.0020268,6.13229563 14.0020268,6.93190649 C14.0020268,7.73151735 14.3721418,7.98393851 14.3854464,8.53112821 C14.3852547,9.06420212 14.0020268,9.33073907 14.0020268,10.1303499 C14.0020268,10.9299608 14.3854464,11.4630347 14.3854464,11.9961086 C14.3854464,12.3701399 14.1338081,13.0622564 14.1338081,13.0622564 L14.9126485,13.0622564 C15.0072765,12.7202362 15.1522858,12.3461089 15.1522858,11.9961086 C15.1522858,11.1964977 14.7686744,10.6634238 14.7688661,10.1303499 C14.7690578,9.59727602 15.1522858,9.33073907 15.1522858,8.53112821 C15.1522858,7.73151735 14.7686744,7.4649804 14.7688661,6.93190649 C14.7686744,6.39883258 15.1522858,5.86575867 15.1522858,5.06614781 C15.1522858,4.69616254 14.9970391,4.35195672 14.9126485,4 Z" id="path4758-copy-17" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/waterfall-s.svg b/data/styles/clear/style-clear/symbols/waterfall-s.svg
index e013e276ec..85c9eb9474 100644
--- a/data/styles/clear/style-clear/symbols/waterfall-s.svg
+++ b/data/styles/clear/style-clear/symbols/waterfall-s.svg
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="16px" viewBox="0 0 17 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+<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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>waterfall-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="waterfall-s" sketch:type="MSLayerGroup" transform="translate(0.000000, -0.500000)">
-            <circle id="Oval-1-Copy-38" opacity="0.5" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.87037037"></circle>
-            <path d="M4.40740741,10.7037037 C3.97040667,10.7037037 3.56385481,10.8736617 3.14814815,10.9660494 L3.14814815,11.8186938 C3.14814815,11.8186938 3.77777778,11.5434198 4.40740741,11.5432099 C5.03703704,11.543 5.66666667,11.962963 6.61111111,11.962963 C7.55555556,11.962963 7.85369778,11.5577753 8.5,11.5432099 C9.12962963,11.5434198 9.44444444,11.962963 10.3888889,11.962963 C11.3333333,11.962963 11.962963,11.5432099 12.5925926,11.5432099 C13.0343722,11.5432099 13.8518519,11.8186938 13.8518519,11.8186938 L13.8518519,10.9660494 C13.4478815,10.8624543 13.0059885,10.7037037 12.5925926,10.7037037 C11.6481481,10.7037037 11.0185185,11.1236667 10.3888889,11.1234568 C9.75925926,11.1232469 9.44444444,10.7037037 8.5,10.7037037 C7.55555556,10.7037037 7.24074074,11.1236667 6.61111111,11.1234568 C5.98148148,11.1236667 5.35185185,10.7037037 4.40740741,10.7037037 L4.40740741,10.7037037 Z" id="path4758-copy" fill="#4793C7" sketch:type="MSShapeGroup"></path>
-            <path d="M4.40740741,12.5925926 C3.97040667,12.5925926 3.56385481,12.7625506 3.14814815,12.8549383 L3.14814815,13.7075827 C3.14814815,13.7075827 3.77777778,13.4323086 4.40740741,13.4320988 C5.03703704,13.4318889 5.66666667,13.8518519 6.61111111,13.8518519 C7.55555556,13.8518519 7.85369778,13.4466642 8.5,13.4320988 C9.12962963,13.4323086 9.44444444,13.8518519 10.3888889,13.8518519 C11.3333333,13.8518519 11.962963,13.4320988 12.5925926,13.4320988 C13.0343722,13.4320988 13.8518519,13.7075827 13.8518519,13.7075827 L13.8518519,12.8549383 C13.4478815,12.7513432 13.0059885,12.5925926 12.5925926,12.5925926 C11.6481481,12.5925926 11.0185185,13.0125556 10.3888889,13.0123457 C9.75925926,13.0121358 9.44444444,12.5925926 8.5,12.5925926 C7.55555556,12.5925926 7.24074074,13.0125556 6.61111111,13.0123457 C5.98148148,13.0125556 5.35185185,12.5925926 4.40740741,12.5925926 L4.40740741,12.5925926 Z" id="path4758-copy-6" fill="#4793C7" sketch:type="MSShapeGroup"></path>
-            <path d="M8.30324074,2.51851852 L7.66375741,2.51851852 C7.66375741,2.51851852 7.87021296,2.95621012 7.87037037,3.39390171 C7.87052778,3.83159331 7.55555556,4.26928491 7.55555556,4.92582231 C7.55555556,5.5823597 7.8594463,5.78961543 7.87037037,6.2388971 C7.87021296,6.6765887 7.55555556,6.89543449 7.55555556,7.55197189 C7.55555556,8.20850929 7.87037037,8.64620088 7.87037037,9.08389248 C7.87037037,9.39099879 7.66375741,9.95927568 7.66375741,9.95927568 L8.30324074,9.95927568 C8.38093704,9.67845275 8.5,9.37126765 8.5,9.08389248 C8.5,8.42735509 8.18502778,7.98966349 8.18518519,7.55197189 C8.18534259,7.11428029 8.5,6.89543449 8.5,6.2388971 C8.5,5.5823597 8.18502778,5.3635139 8.18518519,4.92582231 C8.18502778,4.48813071 8.5,4.05043911 8.5,3.39390171 C8.5,3.09011748 8.37253148,2.80750002 8.30324074,2.51851852 Z" id="path4758-copy-2" fill="#4793C7" sketch:type="MSShapeGroup"></path>
-            <path d="M7.04398148,2.51851852 L6.40449815,2.51851852 C6.40449815,2.51851852 6.6109537,2.95621012 6.61111111,3.39390171 C6.61126852,3.83159331 6.2962963,4.26928491 6.2962963,4.92582231 C6.2962963,5.5823597 6.60018704,5.78961543 6.61111111,6.2388971 C6.6109537,6.6765887 6.2962963,6.89543449 6.2962963,7.55197189 C6.2962963,8.20850929 6.61111111,8.64620088 6.61111111,9.08389248 C6.61111111,9.39099879 6.40449815,9.95927568 6.40449815,9.95927568 L7.04398148,9.95927568 C7.12167778,9.67845275 7.24074074,9.37126765 7.24074074,9.08389248 C7.24074074,8.42735509 6.92576852,7.98966349 6.92592593,7.55197189 C6.92608333,7.11428029 7.24074074,6.89543449 7.24074074,6.2388971 C7.24074074,5.5823597 6.92576852,5.3635139 6.92592593,4.92582231 C6.92576852,4.48813071 7.24074074,4.05043911 7.24074074,3.39390171 C7.24074074,3.09011748 7.11327222,2.80750002 7.04398148,2.51851852 Z" id="path4758-copy-5" fill="#4793C7" sketch:type="MSShapeGroup"></path>
-            <path d="M9.5625,2.51851852 L8.92301667,2.51851852 C8.92301667,2.51851852 9.12947222,2.95621012 9.12962963,3.39390171 C9.12978704,3.83159331 8.81481481,4.26928491 8.81481481,4.92582231 C8.81481481,5.5823597 9.11870556,5.78961543 9.12962963,6.2388971 C9.12947222,6.6765887 8.81481481,6.89543449 8.81481481,7.55197189 C8.81481481,8.20850929 9.12962963,8.64620088 9.12962963,9.08389248 C9.12962963,9.39099879 8.92301667,9.95927568 8.92301667,9.95927568 L9.5625,9.95927568 C9.6401963,9.67845275 9.75925926,9.37126765 9.75925926,9.08389248 C9.75925926,8.42735509 9.44428704,7.98966349 9.44444444,7.55197189 C9.44460185,7.11428029 9.75925926,6.89543449 9.75925926,6.2388971 C9.75925926,5.5823597 9.44428704,5.3635139 9.44444444,4.92582231 C9.44428704,4.48813071 9.75925926,4.05043911 9.75925926,3.39390171 C9.75925926,3.09011748 9.63179074,2.80750002 9.5625,2.51851852 Z" id="path4758-copy-3" fill="#4793C7" sketch:type="MSShapeGroup"></path>
-            <path d="M10.8217593,2.51851852 L10.1822759,2.51851852 C10.1822759,2.51851852 10.3887315,2.95621012 10.3888889,3.39390171 C10.3890463,3.83159331 10.0740741,4.26928491 10.0740741,4.92582231 C10.0740741,5.5823597 10.3779648,5.78961543 10.3888889,6.2388971 C10.3887315,6.6765887 10.0740741,6.89543449 10.0740741,7.55197189 C10.0740741,8.20850929 10.3888889,8.64620088 10.3888889,9.08389248 C10.3888889,9.39099879 10.1822759,9.95927568 10.1822759,9.95927568 L10.8217593,9.95927568 C10.8994556,9.67845275 11.0185185,9.37126765 11.0185185,9.08389248 C11.0185185,8.42735509 10.7035463,7.98966349 10.7037037,7.55197189 C10.7038611,7.11428029 11.0185185,6.89543449 11.0185185,6.2388971 C11.0185185,5.5823597 10.7035463,5.3635139 10.7037037,4.92582231 C10.7035463,4.48813071 11.0185185,4.05043911 11.0185185,3.39390171 C11.0185185,3.09011748 10.89105,2.80750002 10.8217593,2.51851852 Z" id="path4758-copy-4" fill="#4793C7" sketch:type="MSShapeGroup"></path>
+        <g id="waterfall-s" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#2E89B0" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <path d="M5.05882353,10 C4.69138,10 4.34953882,10.1368898 4,10.2113019 L4,10.89805 C4,10.89805 4.52941176,10.6763352 5.05882353,10.6761661 C5.58823529,10.6759971 6.11764706,11.0142492 6.91176471,11.0142492 C7.70588235,11.0142492 7.95656941,10.6878976 8.5,10.6761661 C9.02941176,10.6763352 9.29411765,11.0142492 10.0882353,11.0142492 C10.8823529,11.0142492 11.4117647,10.6761661 11.9411765,10.6761661 C12.3126382,10.6761661 13,10.89805 13,10.89805 L13,10.2113019 C12.6603294,10.127863 12.2887724,10 11.9411765,10 C11.1470588,10 10.6176471,10.3382521 10.0882353,10.3380831 C9.55882353,10.337914 9.29411765,10 8.5,10 C7.70588235,10 7.44117647,10.3382521 6.91176471,10.3380831 C6.38235294,10.3382521 5.85294118,10 5.05882353,10 L5.05882353,10 Z" id="path4758-copy-24" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M5.05882353,12 C4.69138,12 4.34953882,12.1368898 4,12.2113019 L4,12.89805 C4,12.89805 4.52941176,12.6763352 5.05882353,12.6761661 C5.58823529,12.6759971 6.11764706,13.0142492 6.91176471,13.0142492 C7.70588235,13.0142492 7.95656941,12.6878976 8.5,12.6761661 C9.02941176,12.6763352 9.29411765,13.0142492 10.0882353,13.0142492 C10.8823529,13.0142492 11.4117647,12.6761661 11.9411765,12.6761661 C12.3126382,12.6761661 13,12.89805 13,12.89805 L13,12.2113019 C12.6603294,12.127863 12.2887724,12 11.9411765,12 C11.1470588,12 10.6176471,12.3382521 10.0882353,12.3380831 C9.55882353,12.337914 9.29411765,12 8.5,12 C7.70588235,12 7.44117647,12.3382521 6.91176471,12.3380831 C6.38235294,12.3382521 5.85294118,12 5.05882353,12 L5.05882353,12 Z" id="path4758-copy-19" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6.92033348,3 L6.13318679,3 C6.13318679,3 6.38731508,3.35253134 6.38750883,3.70506267 C6.38770259,4.05759401 6,4.41012534 6,4.93892234 C6,5.46771935 6.37406228,5.63464998 6.38750883,5.99651635 C6.38731508,6.34904769 6,6.52531335 6,7.05411036 C6,7.58290736 6.38750883,7.93543869 6.38750883,8.28797003 C6.38750883,8.53532364 6.13318679,8.9930327 6.13318679,8.9930327 L6.92033348,8.9930327 C7.01597066,8.7668486 7.1625265,8.51943153 7.1625265,8.28797003 C7.1625265,7.75917303 6.77482391,7.40664169 6.77501767,7.05411036 C6.77521142,6.70157902 7.1625265,6.52531335 7.1625265,5.99651635 C7.1625265,5.46771935 6.77482391,5.29145368 6.77501767,4.93892234 C6.77482391,4.58639101 7.1625265,4.23385967 7.1625265,3.70506267 C7.1625265,3.46038477 7.00562417,3.23275529 6.92033348,3 Z" id="path4758-copy-20" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.92033348,3 L8.13318679,3 C8.13318679,3 8.38731508,3.35253134 8.38750883,3.70506267 C8.38770259,4.05759401 8,4.41012534 8,4.93892234 C8,5.46771935 8.37406228,5.63464998 8.38750883,5.99651635 C8.38731508,6.34904769 8,6.52531335 8,7.05411036 C8,7.58290736 8.38750883,7.93543869 8.38750883,8.28797003 C8.38750883,8.53532364 8.13318679,8.9930327 8.13318679,8.9930327 L8.92033348,8.9930327 C9.01597066,8.7668486 9.1625265,8.51943153 9.1625265,8.28797003 C9.1625265,7.75917303 8.77482391,7.40664169 8.77501767,7.05411036 C8.77521142,6.70157902 9.1625265,6.52531335 9.1625265,5.99651635 C9.1625265,5.46771935 8.77482391,5.29145368 8.77501767,4.93892234 C8.77482391,4.58639101 9.1625265,4.23385967 9.1625265,3.70506267 C9.1625265,3.46038477 9.00562417,3.23275529 8.92033348,3 Z" id="path4758-copy-22" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10.9203335,3 L10.1331868,3 C10.1331868,3 10.3873151,3.35253134 10.3875088,3.70506267 C10.3877026,4.05759401 10,4.41012534 10,4.93892234 C10,5.46771935 10.3740623,5.63464998 10.3875088,5.99651635 C10.3873151,6.34904769 10,6.52531335 10,7.05411036 C10,7.58290736 10.3875088,7.93543869 10.3875088,8.28797003 C10.3875088,8.53532364 10.1331868,8.9930327 10.1331868,8.9930327 L10.9203335,8.9930327 C11.0159707,8.7668486 11.1625265,8.51943153 11.1625265,8.28797003 C11.1625265,7.75917303 10.7748239,7.40664169 10.7750177,7.05411036 C10.7752114,6.70157902 11.1625265,6.52531335 11.1625265,5.99651635 C11.1625265,5.46771935 10.7748239,5.29145368 10.7750177,4.93892234 C10.7748239,4.58639101 11.1625265,4.23385967 11.1625265,3.70506267 C11.1625265,3.46038477 11.0056242,3.23275529 10.9203335,3 Z" id="path4758-copy-23" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss
index af19ac5300..1410ae5e60 100644
--- a/data/styles/clear/style-night/colors.mapcss
+++ b/data/styles/clear/style-night/colors.mapcss
@@ -91,7 +91,7 @@
 @water: #002222;
 @river: #062026;
 @forest: #1B2500;
-@park: #1B2500; 
+@park: #1B2500;
 @beach: #28281A;
 
 /* BUILDINGS */
@@ -105,6 +105,7 @@
 @hospital: #3B2D23;
 @industrial: #141400;
 @sport: #111100;
+@parking: #001111;
 
 /* BARRIERS */
 @fence: #444444;
diff --git a/data/styles/clear/style-night/symbols/alcohol-l copy.svg b/data/styles/clear/style-night/symbols/alcohol-l copy.svg
index 4acb36a65f..fbb59b7d79 100644
--- a/data/styles/clear/style-night/symbols/alcohol-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/alcohol-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>alcohol-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="alcohol-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M9,4 C8.44599,4 8.5,4.6273 8.5,5 L8.5,7.5 C8.5,8 8.00236,8.7488 7.5,9 C6.5,9.5 6,10 6,11 L6,20 C6,20.554 6.44599,21 7,21 L12,21 C12.55401,21 13,20.554 13,20 L13,11 C13,10 12.5,9.5 11.5,9 C11.00136,8.7507 10.5,8 10.5,7.5 L10.5,5 C10.5,4.5 10.554,4 10,4 L9,4 Z M15,11 L15,14 C15,15 16,16 17,16 L18,16 L18,18.5 C18,19 17,20 16,20 C15,20 15,21 15,21 L22,21 C22,21 22,20 21,20 C20,20 19,19 19,18.5 L19,16 L20,16 C21,16 22,15 22,14 L22,11 L15,11 Z" id="rect7216-copy-2" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M9,4 C8.44599,4 8.5,4.6273 8.5,5 L8.5,7.5 C8.5,8 8.00236,8.7488 7.5,9 C6.5,9.5 6,10 6,11 L6,20 C6,20.554 6.44599,21 7,21 L12,21 C12.55401,21 13,20.554 13,20 L13,11 C13,10 12.5,9.5 11.5,9 C11.00136,8.7507 10.5,8 10.5,7.5 L10.5,5 C10.5,4.5 10.554,4 10,4 L9,4 Z M15,11 L15,14 C15,15 16,16 17,16 L18,16 L18,18.5 C18,19 17,20 16,20 C15,20 15,21 15,21 L22,21 C22,21 22,20 21,20 C20,20 19,19 19,18.5 L19,16 L20,16 C21,16 22,15 22,14 L22,11 L15,11 Z" id="rect7216-copy-2" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/alcohol-m copy.svg b/data/styles/clear/style-night/symbols/alcohol-m copy.svg
index 52ab3bd24d..cfffd1e1aa 100644
--- a/data/styles/clear/style-night/symbols/alcohol-m copy.svg	
+++ b/data/styles/clear/style-night/symbols/alcohol-m copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>alcohol-m copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="alcohol-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M8.5,4 L8,4.5 L8,7.5 L6,10 L6,18 L12,18 L12,10 L10,7.5 L10,4.5 L9.5,4 L8.5,4 L8.5,4 Z M13,10 L13,13 C13,13 13,14 14,14 L15,14 L15,17 L13.5,17.5 L13,18 L18,18 L17.5,17.5 L16,17 L16,14 L17,14 C18,14 18,13 18,13 L18,10 L13,10 L13,10 Z" id="path5792-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.5,4 L8,4.5 L8,7.5 L6,10 L6,18 L12,18 L12,10 L10,7.5 L10,4.5 L9.5,4 L8.5,4 L8.5,4 Z M13,10 L13,13 C13,13 13,14 14,14 L15,14 L15,17 L13.5,17.5 L13,18 L18,18 L17.5,17.5 L16,17 L16,14 L17,14 C18,14 18,13 18,13 L18,10 L13,10 L13,10 Z" id="path5792-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/alcohol-s copy.svg b/data/styles/clear/style-night/symbols/alcohol-s copy.svg
index 1c2cd81d92..4a185c5c41 100644
--- a/data/styles/clear/style-night/symbols/alcohol-s copy.svg	
+++ b/data/styles/clear/style-night/symbols/alcohol-s copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>alcohol-s copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="alcohol-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M6,3 L6,5 L4,7 L4,12.4063 L4.59375,13 L8.625,13 L9,12.5 L9,7 L7,5 L7,3 L6,3 L6,3 Z M10,7 L10,9 L11,10 L11,12 L10,13 L13,13 L12,12 L12,10 L13,9 L13,7 L10,7 L10,7 Z" id="path5715-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6,3 L6,5 L4,7 L4,12.4063 L4.59375,13 L8.625,13 L9,12.5 L9,7 L7,5 L7,3 L6,3 L6,3 Z M10,7 L10,9 L11,10 L11,12 L10,13 L13,13 L12,12 L12,10 L13,9 L13,7 L10,7 L10,7 Z" id="path5715-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/america-football-l copy.svg b/data/styles/clear/style-night/symbols/america-football-l copy.svg
index 15ed219eaa..fb7324c948 100644
--- a/data/styles/clear/style-night/symbols/america-football-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/america-football-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>america-football-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="america-football-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M13.5,7 C7,7 4,13.5 4,13.5 C4,13.5 7,20 13.5,20 C20,20 23,13.5 23,13.5 C23,13.5 20,7 13.5,7 L13.5,7 Z M10.5,12 C10.777,12 11,12.223 11,12.5 L11,13 L13,13 L13,12.5 C13,12.223 13.223,12 13.5,12 C13.777,12 14,12.223 14,12.5 L14,13 L16,13 L16,12.5 C16,12.223 16.223,12 16.5,12 C16.777,12 17,12.223 17,12.5 L17,13 L18.5,13 C18.777,13 19,13.223 19,13.5 C19,13.777 18.777,14 18.5,14 L17,14 L17,14.5 C17,14.777 16.777,15 16.5,15 C16.223,15 16,14.777 16,14.5 L16,14 L14,14 L14,14.5 C14,14.777 13.777,15 13.5,15 C13.223,15 13,14.777 13,14.5 L13,14 L11,14 L11,14.5 C11,14.777 10.777,15 10.5,15 C10.223,15 10,14.777 10,14.5 L10,14 L8.5,14 C8.223,14 8,13.777 8,13.5 C8,13.223 8.223,13 8.5,13 L10,13 L10,12.5 C10,12.223 10.223,12 10.5,12 L10.5,12 Z" id="path14961-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M13.5,7 C7,7 4,13.5 4,13.5 C4,13.5 7,20 13.5,20 C20,20 23,13.5 23,13.5 C23,13.5 20,7 13.5,7 L13.5,7 Z M10.5,12 C10.777,12 11,12.223 11,12.5 L11,13 L13,13 L13,12.5 C13,12.223 13.223,12 13.5,12 C13.777,12 14,12.223 14,12.5 L14,13 L16,13 L16,12.5 C16,12.223 16.223,12 16.5,12 C16.777,12 17,12.223 17,12.5 L17,13 L18.5,13 C18.777,13 19,13.223 19,13.5 C19,13.777 18.777,14 18.5,14 L17,14 L17,14.5 C17,14.777 16.777,15 16.5,15 C16.223,15 16,14.777 16,14.5 L16,14 L14,14 L14,14.5 C14,14.777 13.777,15 13.5,15 C13.223,15 13,14.777 13,14.5 L13,14 L11,14 L11,14.5 C11,14.777 10.777,15 10.5,15 C10.223,15 10,14.777 10,14.5 L10,14 L8.5,14 C8.223,14 8,13.777 8,13.5 C8,13.223 8.223,13 8.5,13 L10,13 L10,12.5 C10,12.223 10.223,12 10.5,12 L10.5,12 Z" id="path14961-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/america-football-m copy.svg b/data/styles/clear/style-night/symbols/america-football-m copy.svg
index 5678ba9099..0483f8dae5 100644
--- a/data/styles/clear/style-night/symbols/america-football-m copy.svg	
+++ b/data/styles/clear/style-night/symbols/america-football-m copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>america-football-m copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="america-football-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11.5,7 C6.71053,7 5,11.5 5,11.5 C5,11.5 6.71053,16 11.5,16 C16.28947,16 18,11.5 18,11.5 C18,11.5 16.28947,7 11.5,7 L11.5,7 Z M9.25,10 C9.3885,10 9.5,10.1115 9.5,10.25 L9.5,11 L11.25,11 L11.25,10.25 C11.25,10.1115 11.3615,10 11.5,10 C11.6385,10 11.75,10.1115 11.75,10.25 L11.75,11 L13.5,11 L13.5,10.25 C13.5,10.1115 13.6115,10 13.75,10 C13.8885,10 14.03359,10.1156 14,10.25 L14,11 L14.5625,11 C14.80872,11 15,11.223 15,11.5 C15,11.777 14.80872,12 14.5625,12 L14,12 L14,12.75 C14,12.8885 13.8885,13 13.75,13 C13.6115,13 13.53359,12.8844 13.5,12.75 L13.5,12 L11.75,12 L11.75,12.75 C11.75,12.8885 11.6385,13 11.5,13 C11.3615,13 11.25,12.8885 11.25,12.75 L11.25,12 L9.5,12 L9.5,12.75 C9.5,12.8885 9.3885,13 9.25,13 C9.1115,13 9,12.8885 9,12.75 L9,12 L8.4375,12 C8.19128,12 8,11.777 8,11.5 C8,11.223 8.19128,11 8.4375,11 L9,11 L9,10.25 C9,10.1115 9.1115,10 9.25,10 L9.25,10 Z" id="path11300-2-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.5,7 C6.71053,7 5,11.5 5,11.5 C5,11.5 6.71053,16 11.5,16 C16.28947,16 18,11.5 18,11.5 C18,11.5 16.28947,7 11.5,7 L11.5,7 Z M9.25,10 C9.3885,10 9.5,10.1115 9.5,10.25 L9.5,11 L11.25,11 L11.25,10.25 C11.25,10.1115 11.3615,10 11.5,10 C11.6385,10 11.75,10.1115 11.75,10.25 L11.75,11 L13.5,11 L13.5,10.25 C13.5,10.1115 13.6115,10 13.75,10 C13.8885,10 14.03359,10.1156 14,10.25 L14,11 L14.5625,11 C14.80872,11 15,11.223 15,11.5 C15,11.777 14.80872,12 14.5625,12 L14,12 L14,12.75 C14,12.8885 13.8885,13 13.75,13 C13.6115,13 13.53359,12.8844 13.5,12.75 L13.5,12 L11.75,12 L11.75,12.75 C11.75,12.8885 11.6385,13 11.5,13 C11.3615,13 11.25,12.8885 11.25,12.75 L11.25,12 L9.5,12 L9.5,12.75 C9.5,12.8885 9.3885,13 9.25,13 C9.1115,13 9,12.8885 9,12.75 L9,12 L8.4375,12 C8.19128,12 8,11.777 8,11.5 C8,11.223 8.19128,11 8.4375,11 L9,11 L9,10.25 C9,10.1115 9.1115,10 9.25,10 L9.25,10 Z" id="path11300-2-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/atm-l.svg b/data/styles/clear/style-night/symbols/atm-l.svg
index 1c4bda57fb..d5d4c4a519 100644
--- a/data/styles/clear/style-night/symbols/atm-l.svg
+++ b/data/styles/clear/style-night/symbols/atm-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>atm-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="atm-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M6,9 C5.446,9 5,9.446 5,10 L5,19 C5,19.554 5.446,20 6,20 L21,20 C21.554,20 22,19.554 22,19 L22,10 C22,9.446 21.554,9 21,9 L6,9 Z M5.5,11 L21,11 L21,13 L5.5,13 L5.5,11 Z M6,16 L9,16 L9,18 L6,18 L6,16 Z M14,17 L21,17 L21,18 L14,18 L14,17 Z" id="rect10401-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6,9 C5.446,9 5,9.446 5,10 L5,19 C5,19.554 5.446,20 6,20 L21,20 C21.554,20 22,19.554 22,19 L22,10 C22,9.446 21.554,9 21,9 L6,9 Z M5.5,11 L21,11 L21,13 L5.5,13 L5.5,11 Z M6,16 L9,16 L9,18 L6,18 L6,16 Z M14,17 L21,17 L21,18 L14,18 L14,17 Z" id="rect10401-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/atm-m.svg b/data/styles/clear/style-night/symbols/atm-m.svg
index 761ea70ae8..fcdfcc2cfb 100644
--- a/data/styles/clear/style-night/symbols/atm-m.svg
+++ b/data/styles/clear/style-night/symbols/atm-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>atm-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="atm-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M5.72222,8 C5.32211,8 5,8.3221 5,8.7223 L5,15.2778 C5,15.6779 5.32211,16 5.72222,16 L17.27778,16 C17.67789,16 18,15.6779 18,15.2778 L18,8.7223 C18,8.3221 17.67789,8 17.27778,8 L5.72222,8 Z M5.5,9.5 L17.5,9.5 L17.5,11 L5.5,11 L5.5,9.5 Z M6,13.5 L8,13.5 L8,15 L6,15 L6,13.5 Z M12,14.2777 L17,14.2777 L17,15 L12,15 L12,14.2777 Z" id="rect10401-9-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M5.72222,8 C5.32211,8 5,8.3221 5,8.7223 L5,15.2778 C5,15.6779 5.32211,16 5.72222,16 L17.27778,16 C17.67789,16 18,15.6779 18,15.2778 L18,8.7223 C18,8.3221 17.67789,8 17.27778,8 L5.72222,8 Z M5.5,9.5 L17.5,9.5 L17.5,11 L5.5,11 L5.5,9.5 Z M6,13.5 L8,13.5 L8,15 L6,15 L6,13.5 Z M12,14.2777 L17,14.2777 L17,15 L12,15 L12,14.2777 Z" id="rect10401-9-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/atm-s copy 2.svg b/data/styles/clear/style-night/symbols/atm-s copy 2.svg
index 4df4b5cdc5..a7eda11b21 100644
--- a/data/styles/clear/style-night/symbols/atm-s copy 2.svg	
+++ b/data/styles/clear/style-night/symbols/atm-s copy 2.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>atm-s copy 2</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="atm-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M4.5,5 C4.223,5 4,5.223 4,5.5 L4,10.5 C4,10.777 4.223,11 4.5,11 L12.5,11 C12.777,11 13,10.777 13,10.5 L13,5.5 C13,5.223 12.777,5 12.5,5 L4.5,5 Z M4.5,6 L12.5,6 L12.5,7 L4.5,7 L4.5,6 Z M4.5,9 L6,9 L6,10 L4.5,10 L4.5,9 Z M9,9.5 L12,9.5 L12,10 L9,10 L9,9.5 Z" id="rect10401-7-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M4.5,5 C4.223,5 4,5.223 4,5.5 L4,10.5 C4,10.777 4.223,11 4.5,11 L12.5,11 C12.777,11 13,10.777 13,10.5 L13,5.5 C13,5.223 12.777,5 12.5,5 L4.5,5 Z M4.5,6 L12.5,6 L12.5,7 L4.5,7 L4.5,6 Z M4.5,9 L6,9 L6,10 L4.5,10 L4.5,9 Z M9,9.5 L12,9.5 L12,10 L9,10 L9,9.5 Z" id="rect10401-7-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bank-l.svg b/data/styles/clear/style-night/symbols/bank-l.svg
index 466b3f7d10..1901c94ced 100644
--- a/data/styles/clear/style-night/symbols/bank-l.svg
+++ b/data/styles/clear/style-night/symbols/bank-l.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>bank-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="bank-l-copy-2" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.500000)">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M13.5,5.5 C13.5,5.5 6.00625,9.08651786 6.00397727,9.54568452 L6,10.5 L21,10.5 L21,9.55133929 C20.99375,9.08651786 13.5,5.5 13.5,5.5 Z M20.0365553,19.5 L19.5,10.5 L7.5,10.5 L7.04839683,19.5 L7.00334852,19.5 C6.44921444,19.5 6,19.9438648 6,20.5 L6,21.5 L21,21.5 L21,20.5 C21,19.9477153 20.5521239,19.5 20.0365553,19.5 L20.0365553,19.5 Z" id="Imported-Layers-Copy-3" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M13.5,5.5 C13.5,5.5 6.00625,9.08651786 6.00397727,9.54568452 L6,10.5 L21,10.5 L21,9.55133929 C20.99375,9.08651786 13.5,5.5 13.5,5.5 Z M20.0365553,19.5 L19.5,10.5 L7.5,10.5 L7.04839683,19.5 L7.00334852,19.5 C6.44921444,19.5 6,19.9438648 6,20.5 L6,21.5 L21,21.5 L21,20.5 C21,19.9477153 20.5521239,19.5 20.0365553,19.5 L20.0365553,19.5 Z" id="Imported-Layers-Copy-3" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M14,10.0429192 L14,9 L13,9 L13,10.0112011 C12.1840525,10.0616568 11.5515095,10.2825733 11.102356,10.673955 C10.5867284,11.1232606 10.3289185,11.6874564 10.3289185,12.3665595 C10.3289185,13.110829 10.5956801,13.6578761 11.1292114,14.007717 C11.4443172,14.2169357 12.0136474,14.4107172 12.8372192,14.5890675 L13,14.6240494 L13,16.6791338 C12.5841018,16.6204224 12.2756117,16.4742166 12.0745239,16.2405145 C11.9277133,16.0690238 11.8292442,15.8100768 11.7791138,15.4636656 L10.2000122,15.4636656 C10.2000122,16.2525227 10.4954194,16.8724522 11.0862427,17.3234727 C11.574049,17.6958525 12.2119635,17.9145044 13,17.9794324 L13,19 L14,19 L14,17.9813452 C14.7805086,17.9183206 15.4017809,17.6956013 15.8638306,17.3131833 C16.417056,16.8553032 16.6936646,16.2799606 16.6936646,15.5871383 C16.6936646,14.911465 16.4573388,14.3952858 15.9846802,14.0385852 C15.6803167,13.8087877 15.2291493,13.6252954 14.6311646,13.4881029 L14,13.3429133 L14,11.4183449 C14.078905,11.443386 14.1532254,11.4730695 14.2229614,11.5073955 C14.6096821,11.6994651 14.8173623,12.0235776 14.8460083,12.4797428 L16.4358521,12.4797428 C16.4072061,11.6737366 16.0983713,11.0589517 15.5093384,10.6353698 C15.0733979,10.3218788 14.570288,10.1243961 14,10.0429192 Z M14,14.8444083 L14,16.6758666 C14.1524217,16.6553077 14.2876142,16.6250886 14.4055786,16.585209 C14.867495,16.4274376 15.0984497,16.1341929 15.0984497,15.7054662 C15.0984497,15.4550899 14.9838675,15.2613083 14.7546997,15.1241158 C14.5795105,15.0218598 14.3279456,14.9286245 14,14.8444083 Z M13,13.1108495 L13,11.328331 C12.6938917,11.3560047 12.4409026,11.4345563 12.2410278,11.5639871 C11.9867948,11.7286182 11.8596802,11.9584122 11.8596802,12.2533762 C11.8596802,12.5243315 11.9850044,12.7266874 12.2356567,12.8604502 C12.3677376,12.9335468 12.6225168,13.0170127 13,13.1108495 Z" id="Rectangle-11-Copy" fill="#3D3D37" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/bank-m.svg b/data/styles/clear/style-night/symbols/bank-m.svg
index 0119785c6a..22920356d1 100644
--- a/data/styles/clear/style-night/symbols/bank-m.svg
+++ b/data/styles/clear/style-night/symbols/bank-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>bank-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="bank-2-m" sketch:type="MSLayerGroup" transform="translate(0.000000, 1.000000)">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11.5,4 C11.5,4 5.00541667,6.86921429 5.00344697,7.23654762 L5,8 L18,8 L18,7.24107143 C17.9945833,6.86921429 11.5,4 11.5,4 Z M17.0365553,16 L16.5,8 L6.5,8 L6.04839683,16 L6.00334852,16 C5.44921444,16 5,16.4438648 5,17 L5,18 L18,18 L18,17 C18,16.4477153 17.5521239,16 17.0365553,16 L17.0365553,16 Z" id="Imported-Layers-Copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.5,4 C11.5,4 5.00541667,6.86921429 5.00344697,7.23654762 L5,8 L18,8 L18,7.24107143 C17.9945833,6.86921429 11.5,4 11.5,4 Z M17.0365553,16 L16.5,8 L6.5,8 L6.04839683,16 L6.00334852,16 C5.44921444,16 5,16.4438648 5,17 L5,18 L18,18 L18,17 C18,16.4477153 17.5521239,16 17.0365553,16 L17.0365553,16 Z" id="Imported-Layers-Copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M12,8.0429192 L12,7 L11,7 L11,8.01120106 C10.1840525,8.06165681 9.5515095,8.2825733 9.10235596,8.67395498 C8.58672838,9.12326055 8.32891846,9.68745641 8.32891846,10.3665595 C8.32891846,11.110829 8.59568011,11.6578761 9.12921143,12.007717 C9.44431717,12.2169357 10.0136474,12.4107172 10.8372192,12.5890675 L11,12.6240494 L11,14.6791338 C10.5841018,14.6204224 10.2756117,14.4742166 10.0745239,14.2405145 C9.9277133,14.0690238 9.82924423,13.8100768 9.77911377,13.4636656 L8.20001221,13.4636656 C8.20001221,14.2525227 8.49541941,14.8724522 9.08624268,15.3234727 C9.57404901,15.6958525 10.2119635,15.9145044 11,15.9794324 L11,17 L12,17 L12,15.9813452 C12.7805086,15.9183206 13.4017809,15.6956013 13.8638306,15.3131833 C14.417056,14.8553032 14.6936646,14.2799606 14.6936646,13.5871383 C14.6936646,12.911465 14.4573388,12.3952858 13.9846802,12.0385852 C13.6803167,11.8087877 13.2291493,11.6252954 12.6311646,11.4881029 L12,11.3429133 L12,9.4183449 C12.078905,9.44338597 12.1532254,9.47306949 12.2229614,9.5073955 C12.6096821,9.69946505 12.8173623,10.0235776 12.8460083,10.4797428 L14.4358521,10.4797428 C14.4072061,9.67373659 14.0983713,9.05895174 13.5093384,8.63536977 C13.0733979,8.32187875 12.570288,8.12439609 12,8.0429192 Z M12,12.8444083 L12,14.6758666 C12.1524217,14.6553077 12.2876142,14.6250886 12.4055786,14.585209 C12.867495,14.4274376 13.0984497,14.1341929 13.0984497,13.7054662 C13.0984497,13.4550899 12.9838675,13.2613083 12.7546997,13.1241158 C12.5795105,13.0218598 12.3279456,12.9286245 12,12.8444083 Z M11,11.1108495 L11,9.32833103 C10.6938917,9.35600465 10.4409026,9.43455629 10.2410278,9.56398714 C9.98679479,9.72861819 9.85968018,9.95841224 9.85968018,10.2533762 C9.85968018,10.5243315 9.98500444,10.7266874 10.2356567,10.8604502 C10.3677376,10.9335468 10.6225168,11.0170127 11,11.1108495 Z" id="Rectangle-11" fill="#3D3D37" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/bank-s copy 5.svg b/data/styles/clear/style-night/symbols/bank-s copy 5.svg
index b78ea2790d..99064b5637 100644
--- a/data/styles/clear/style-night/symbols/bank-s copy 5.svg	
+++ b/data/styles/clear/style-night/symbols/bank-s copy 5.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>bank-s copy 5</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="america-football-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.5,6 C5.25,6 4,9 4,9 C4,9 5.25,12 8.5,12 C11.75,12 13,9 13,9 C13,9 11.75,6 8.5,6 L8.5,6 Z M7.5,8.5 L8.5,8.5 L9,8.5 L10,8.5 L10.5,8.5 L11,8.5 C11.1385,8.5 11.25,8.6115 11.25,8.75 C11.25,8.8885 11.1385,9 11,9 L10.5,9 L10,9 L9,9 L8.5,9 L7.5,9 L7,9 L6.25,9 C6.1115,9 6,8.8885 6,8.75 C6,8.6115 6.1115,8.5 6.25,8.5 L7,8.5 L7.5,8.5 Z" id="path11300-6-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.5,6 C5.25,6 4,9 4,9 C4,9 5.25,12 8.5,12 C11.75,12 13,9 13,9 C13,9 11.75,6 8.5,6 L8.5,6 Z M7.5,8.5 L8.5,8.5 L9,8.5 L10,8.5 L10.5,8.5 L11,8.5 C11.1385,8.5 11.25,8.6115 11.25,8.75 C11.25,8.8885 11.1385,9 11,9 L10.5,9 L10,9 L9,9 L8.5,9 L7.5,9 L7,9 L6.25,9 C6.1115,9 6,8.8885 6,8.75 C6,8.6115 6.1115,8.5 6.25,8.5 L7,8.5 L7.5,8.5 Z" id="path11300-6-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/banknote-l.svg b/data/styles/clear/style-night/symbols/banknote-l.svg
index 3acb6a3111..5af731b345 100644
--- a/data/styles/clear/style-night/symbols/banknote-l.svg
+++ b/data/styles/clear/style-night/symbols/banknote-l.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>banknote-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,10 +8,10 @@
         <g id="banknote-l-copy" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.500000)">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M5,9 L22,9 L22,18 L5,18 L5,9 Z M12.5,17 C13.8807119,17 15,15.4329966 15,13.5 C15,11.5670034 13.8807119,10 12.5,10 C11.1192881,10 10,11.5670034 10,13.5 C10,15.4329966 11.1192881,17 12.5,17 Z" id="Rectangle-12-Copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M5,9 L22,9 L22,18 L5,18 L5,9 Z M12.5,17 C13.8807119,17 15,15.4329966 15,13.5 C15,11.5670034 13.8807119,10 12.5,10 C11.1192881,10 10,11.5670034 10,13.5 C10,15.4329966 11.1192881,17 12.5,17 Z" id="Rectangle-12-Copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M19.5,19 C20.8807119,19 22,18.5522847 22,18 C22,17.4477153 20.8807119,17 19.5,17 C18.1192881,17 17,17.4477153 17,18 C17,18.5522847 18.1192881,19 19.5,19 L19.5,19 Z M19.5,20 L19.5,20 C17.6125116,20 16,19.3549954 16,18 C16,16.6450046 17.6125116,16 19.5,16 C21.3874884,16 23,16.6450046 23,18 C23,19.3549954 21.3874884,20 19.5,20 L19.5,20 Z" id="Shape-Copy-4" fill="#3D3D37" sketch:type="MSShapeGroup"></path>
-            <ellipse id="Oval-304-Copy-2" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="19.5" cy="16" rx="2.5" ry="1"></ellipse>
-            <ellipse id="Oval-304-Copy-3" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="19.5" cy="18" rx="2.5" ry="1"></ellipse>
+            <ellipse id="Oval-304-Copy-2" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="19.5" cy="16" rx="2.5" ry="1"></ellipse>
+            <ellipse id="Oval-304-Copy-3" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="19.5" cy="18" rx="2.5" ry="1"></ellipse>
             <path d="M19.5,17 C20.8807119,17 22,16.5522847 22,16 C22,15.4477153 20.8807119,15 19.5,15 C18.1192881,15 17,15.4477153 17,16 C17,16.5522847 18.1192881,17 19.5,17 L19.5,17 Z M19.5,18 L19.5,18 C17.6125116,18 16,17.3549954 16,16 C16,14.6450046 17.6125116,14 19.5,14 C21.3874884,14 23,14.6450046 23,16 C23,17.3549954 21.3874884,18 19.5,18 L19.5,18 Z" id="Shape-Copy-3" fill="#3D3D37" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/banknote-m.svg b/data/styles/clear/style-night/symbols/banknote-m.svg
index 49deb8352f..9c652e10f5 100644
--- a/data/styles/clear/style-night/symbols/banknote-m.svg
+++ b/data/styles/clear/style-night/symbols/banknote-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>banknote-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -9,10 +9,10 @@
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
         </g>
-        <path d="M3,7 L20,7 L20,16 L3,16 L3,7 Z M10.5,15 C11.8807119,15 13,13.4329966 13,11.5 C13,9.56700338 11.8807119,8 10.5,8 C9.11928813,8 8,9.56700338 8,11.5 C8,13.4329966 9.11928813,15 10.5,15 Z" id="Rectangle-12" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        <path d="M3,7 L20,7 L20,16 L3,16 L3,7 Z M10.5,15 C11.8807119,15 13,13.4329966 13,11.5 C13,9.56700338 11.8807119,8 10.5,8 C9.11928813,8 8,9.56700338 8,11.5 C8,13.4329966 9.11928813,15 10.5,15 Z" id="Rectangle-12" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         <path d="M16.5,17 C17.8807119,17 19,16.5522847 19,16 C19,15.4477153 17.8807119,15 16.5,15 C15.1192881,15 14,15.4477153 14,16 C14,16.5522847 15.1192881,17 16.5,17 L16.5,17 Z M16.5,18 L16.5,18 C14.6125116,18 13,17.3549954 13,16 C13,14.6450046 14.6125116,14 16.5,14 C18.3874884,14 20,14.6450046 20,16 C20,17.3549954 18.3874884,18 16.5,18 L16.5,18 Z" id="Shape-Copy-6" fill="#3D3D37" sketch:type="MSShapeGroup"></path>
-        <ellipse id="Oval-304" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="16.5" cy="14" rx="2.5" ry="1"></ellipse>
-        <ellipse id="Oval-304-Copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="16.5" cy="16" rx="2.5" ry="1"></ellipse>
+        <ellipse id="Oval-304" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="16.5" cy="14" rx="2.5" ry="1"></ellipse>
+        <ellipse id="Oval-304-Copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="16.5" cy="16" rx="2.5" ry="1"></ellipse>
         <path d="M16.5,15 C17.8807119,15 19,14.5522847 19,14 C19,13.4477153 17.8807119,13 16.5,13 C15.1192881,13 14,13.4477153 14,14 C14,14.5522847 15.1192881,15 16.5,15 L16.5,15 Z M16.5,16 L16.5,16 C14.6125116,16 13,15.3549954 13,14 C13,12.6450046 14.6125116,12 16.5,12 C18.3874884,12 20,12.6450046 20,14 C20,15.3549954 18.3874884,16 16.5,16 L16.5,16 Z" id="Shape-Copy-7" fill="#3D3D37" sketch:type="MSShapeGroup"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bar-l.svg b/data/styles/clear/style-night/symbols/bar-l.svg
index fc36ebf844..5b3ce6091a 100644
--- a/data/styles/clear/style-night/symbols/bar-l.svg
+++ b/data/styles/clear/style-night/symbols/bar-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>bar-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="bar-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M7,7 C6.5,7 6,7.0006 6,7.25 C6,7.5006 6.34281,7.7979 6.5,8 L13,14.8125 L13,21 L10,22 C9.5,22.1667 9,22.5 9,23 L18,23 C18,22.5 17.5,22.1667 17,22 L14,21 L14,14.8125 L20.5,8 C20.65719,7.7979 21,7.5006 21,7.25 C21,7.0006 20.5,7 20,7 L7,7 Z" id="path15601-4" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M7,7 C6.5,7 6,7.0006 6,7.25 C6,7.5006 6.34281,7.7979 6.5,8 L13,14.8125 L13,21 L10,22 C9.5,22.1667 9,22.5 9,23 L18,23 C18,22.5 17.5,22.1667 17,22 L14,21 L14,14.8125 L20.5,8 C20.65719,7.7979 21,7.5006 21,7.25 C21,7.0006 20.5,7 20,7 L7,7 Z" id="path15601-4" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bar-m.svg b/data/styles/clear/style-night/symbols/bar-m.svg
index 27b38e7535..793d5f4492 100644
--- a/data/styles/clear/style-night/symbols/bar-m.svg
+++ b/data/styles/clear/style-night/symbols/bar-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>bar-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="bar-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M6,6 C5.59375,6 5,6.047 5,6.25 C5,6.4536 5.37228,6.8358 5.5,7 L11,13 L11,17 L8.1875,18.1875 C7.78125,18.3229 7.5,18.5 7.5,19 L15.5,19 C15.5,18.5 15.09375,18.3229 14.6875,18.1875 L12,17 L12,13 L17.5,7 C17.62772,6.8358 18,6.4536 18,6.25 C18,6.0474 17.40625,6 17,6 L6,6 Z" id="path15601-4-0" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6,6 C5.59375,6 5,6.047 5,6.25 C5,6.4536 5.37228,6.8358 5.5,7 L11,13 L11,17 L8.1875,18.1875 C7.78125,18.3229 7.5,18.5 7.5,19 L15.5,19 C15.5,18.5 15.09375,18.3229 14.6875,18.1875 L12,17 L12,13 L17.5,7 C17.62772,6.8358 18,6.4536 18,6.25 C18,6.0474 17.40625,6 17,6 L6,6 Z" id="path15601-4-0" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bar-s.svg b/data/styles/clear/style-night/symbols/bar-s.svg
index c59f356169..b852dec087 100644
--- a/data/styles/clear/style-night/symbols/bar-s.svg
+++ b/data/styles/clear/style-night/symbols/bar-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>bar-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="bar-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M4.5,5 C4.21875,5 4,5.0003 4,5.1406 C4,5.2816 4.19283,5.4488 4.28125,5.5625 L8,10 L8,12.5 C7,13 5.5,13.5 5.5,14 L11.5,14 C11.5,13.5 10,13 9,12.5 L9,10 L12.71875,5.5625 C12.80715,5.4488 13,5.2816 13,5.1406 C13,5.0003 12.78125,5 12.5,5 L4.5,5 Z" id="path15601-4-2" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M4.5,5 C4.21875,5 4,5.0003 4,5.1406 C4,5.2816 4.19283,5.4488 4.28125,5.5625 L8,10 L8,12.5 C7,13 5.5,13.5 5.5,14 L11.5,14 C11.5,13.5 10,13 9,12.5 L9,10 L12.71875,5.5625 C12.80715,5.4488 13,5.2816 13,5.1406 C13,5.0003 12.78125,5 12.5,5 L4.5,5 Z" id="path15601-4-2" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/baseball-l copy.svg b/data/styles/clear/style-night/symbols/baseball-l copy.svg
index 959fd30a16..7240c1d0e7 100644
--- a/data/styles/clear/style-night/symbols/baseball-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/baseball-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>baseball-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="baseball-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M6,6 C5,7 5,8 5,8 L15,18 L16.5,17.5 L20.5,21.5 C20.81628,21.8163 21.00625,22 21.40625,22 C21.53125,22 21.6875,22 21.84375,21.8438 C22.00005,21.6875 22,21.5313 22,21.4063 C22,21.0063 21.78212,20.7821 21.5,20.5 L17.5,16.5 L18,15 L8,5 C8,5 7,5 6,6 L6,6 Z M9.5,15 C8.67157,15 8,15.6716 8,16.5 C8,17.3284 8.67157,18 9.5,18 C10.32843,18 11,17.3284 11,16.5 C11,15.6716 10.32843,15 9.5,15 L9.5,15 Z" id="path9336-3-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6,6 C5,7 5,8 5,8 L15,18 L16.5,17.5 L20.5,21.5 C20.81628,21.8163 21.00625,22 21.40625,22 C21.53125,22 21.6875,22 21.84375,21.8438 C22.00005,21.6875 22,21.5313 22,21.4063 C22,21.0063 21.78212,20.7821 21.5,20.5 L17.5,16.5 L18,15 L8,5 C8,5 7,5 6,6 L6,6 Z M9.5,15 C8.67157,15 8,15.6716 8,16.5 C8,17.3284 8.67157,18 9.5,18 C10.32843,18 11,17.3284 11,16.5 C11,15.6716 10.32843,15 9.5,15 L9.5,15 Z" id="path9336-3-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/baseball-m copy.svg b/data/styles/clear/style-night/symbols/baseball-m copy.svg
index 180f611627..0bb1f75cc9 100644
--- a/data/styles/clear/style-night/symbols/baseball-m copy.svg	
+++ b/data/styles/clear/style-night/symbols/baseball-m copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>baseball-m copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="baseball-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M8,5 C8,5 7,5 6.5,5.5 C6,6 6,7 6,7 C8.5,10.5 13.07972,13.1418 14,14 L16.59375,16.4063 L16,17 L16,18 L17,18 L18,17 L19,16 L19,15 L18,15 L17.40625,15.5938 L15,13 C12.63789,10.4672 11.5,7.5 8,5 L8,5 Z M9.75,14 C9.05964,14 8.5,14.5596 8.5,15.25 C8.5,15.9404 9.05964,16.5 9.75,16.5 C10.44036,16.5 11,15.9404 11,15.25 C11,14.5596 10.44036,14 9.75,14 L9.75,14 Z" id="path20837-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8,5 C8,5 7,5 6.5,5.5 C6,6 6,7 6,7 C8.5,10.5 13.07972,13.1418 14,14 L16.59375,16.4063 L16,17 L16,18 L17,18 L18,17 L19,16 L19,15 L18,15 L17.40625,15.5938 L15,13 C12.63789,10.4672 11.5,7.5 8,5 L8,5 Z M9.75,14 C9.05964,14 8.5,14.5596 8.5,15.25 C8.5,15.9404 9.05964,16.5 9.75,16.5 C10.44036,16.5 11,15.9404 11,15.25 C11,14.5596 10.44036,14 9.75,14 L9.75,14 Z" id="path20837-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/baseball-s copy.svg b/data/styles/clear/style-night/symbols/baseball-s copy.svg
index 81cf2f66ea..f52b22faa7 100644
--- a/data/styles/clear/style-night/symbols/baseball-s copy.svg	
+++ b/data/styles/clear/style-night/symbols/baseball-s copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>baseball-s copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="baseball-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M4,4 L4,5.5 C5.5,7.5 8.58739,9.0874 10.5,11 L11.5,12 L11.5,13 L12.5,13 L13,12.5 L13,11.5 L12,11.5 L11,10.5 C9.21569,8.7157 7.5,5.5 5.5,4 L4,4 Z M6,9.5 C5.44772,9.5 5,9.9477 5,10.5 C5,11.0523 5.44772,11.5 6,11.5 C6.55228,11.5 7,11.0523 7,10.5 C7,9.9477 6.55228,9.5 6,9.5 L6,9.5 Z" id="path20839-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M4,4 L4,5.5 C5.5,7.5 8.58739,9.0874 10.5,11 L11.5,12 L11.5,13 L12.5,13 L13,12.5 L13,11.5 L12,11.5 L11,10.5 C9.21569,8.7157 7.5,5.5 5.5,4 L4,4 Z M6,9.5 C5.44772,9.5 5,9.9477 5,10.5 C5,11.0523 5.44772,11.5 6,11.5 C6.55228,11.5 7,11.0523 7,10.5 C7,9.9477 6.55228,9.5 6,9.5 L6,9.5 Z" id="path20839-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/basketball-l copy.svg b/data/styles/clear/style-night/symbols/basketball-l copy.svg
index 7ca819dac8..dcccf8d321 100644
--- a/data/styles/clear/style-night/symbols/basketball-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/basketball-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>basketball-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="basketball-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M9.5,6 L5,10 L5,18 C5,18.5 5.5,19 6,19 L9.5625,19 L11.5,22.5 C11.77778,23 12,23 12.5,23 L14.5,23 C15,23 15.22222,23 15.5,22.5 L17.4375,19 L21,19 C21.5,19 22,18.5 22,18 L22,10 L17.5,6 L9.5,6 L9.5,6 Z M9,10 L18,10 L18,16 L9,16 L9,10 L9,10 Z M10,11 L10,15 L17,15 L17,11 L10,11 L10,11 Z M10.5625,19 L12,19 L12,20 L13,20 L13,19 L14,19 L14,20 L15,20 L15,19 L16.4375,19 L15.875,20 L15,20 L15,21 L15.34375,21 L15,21.625 L15,21 L14,21 L14,22 L13,22 L13,21 L12,21 L12,21.625 L11.65625,21 L12,21 L12,20 L11.125,20 L10.5625,19 L10.5625,19 Z M13,21 L14,21 L14,20 L13,20 L13,21 L13,21 Z" id="rect5769-7-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M9.5,6 L5,10 L5,18 C5,18.5 5.5,19 6,19 L9.5625,19 L11.5,22.5 C11.77778,23 12,23 12.5,23 L14.5,23 C15,23 15.22222,23 15.5,22.5 L17.4375,19 L21,19 C21.5,19 22,18.5 22,18 L22,10 L17.5,6 L9.5,6 L9.5,6 Z M9,10 L18,10 L18,16 L9,16 L9,10 L9,10 Z M10,11 L10,15 L17,15 L17,11 L10,11 L10,11 Z M10.5625,19 L12,19 L12,20 L13,20 L13,19 L14,19 L14,20 L15,20 L15,19 L16.4375,19 L15.875,20 L15,20 L15,21 L15.34375,21 L15,21.625 L15,21 L14,21 L14,22 L13,22 L13,21 L12,21 L12,21.625 L11.65625,21 L12,21 L12,20 L11.125,20 L10.5625,19 L10.5625,19 Z M13,21 L14,21 L14,20 L13,20 L13,21 L13,21 Z" id="rect5769-7-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/basketball-m copy.svg b/data/styles/clear/style-night/symbols/basketball-m copy.svg
index ebf0b5f85b..cede007376 100644
--- a/data/styles/clear/style-night/symbols/basketball-m copy.svg	
+++ b/data/styles/clear/style-night/symbols/basketball-m copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>basketball-m copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="basketball-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M8,6 L5,8 L5,15 C5,15.5 5.5,16 6,16 L8.5,16 L10.5,19 L11.5,19 L12.5,19 L14.5,16 L17,16 C17.5,16 18,15.5 18,15 L18,8.5 L15,6 L8,6 L8,6 Z M8,9 L15,9 L15,14 L8,14 L8,9 L8,9 Z M9,10 L9,13 L14,13 L14,10 L9,10 L9,10 Z M9.5,16 L11,16 L11,17 L12,17 L12,16 L13.5,16 L12.8125,17 L12,17 L12,18 L11,18 L11,17 L10.1875,17 L9.5,16 L9.5,16 Z" id="rect5769-7-5-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8,6 L5,8 L5,15 C5,15.5 5.5,16 6,16 L8.5,16 L10.5,19 L11.5,19 L12.5,19 L14.5,16 L17,16 C17.5,16 18,15.5 18,15 L18,8.5 L15,6 L8,6 L8,6 Z M8,9 L15,9 L15,14 L8,14 L8,9 L8,9 Z M9,10 L9,13 L14,13 L14,10 L9,10 L9,10 Z M9.5,16 L11,16 L11,17 L12,17 L12,16 L13.5,16 L12.8125,17 L12,17 L12,18 L11,18 L11,17 L10.1875,17 L9.5,16 L9.5,16 Z" id="rect5769-7-5-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/basketball-s copy.svg b/data/styles/clear/style-night/symbols/basketball-s copy.svg
index 2f4b7e5d7c..074bfe5220 100644
--- a/data/styles/clear/style-night/symbols/basketball-s copy.svg	
+++ b/data/styles/clear/style-night/symbols/basketball-s copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>basketball-s copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="basketball-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M6,4.3622 L4,6.3622 L4,10.8622 C4,11.1122 4.25,11.3622 4.5,11.3622 L6,11.3622 L7,12.3622 L8,13.3622 L9,13.3622 L10,12.3622 L11,11.3622 L12.5,11.3622 C12.75,11.3622 13,11.1122 13,10.8622 L13,6.3622 L11,4.3622 L6,4.3622 L6,4.3622 Z M6,6.3622 L11,6.3622 L11,9.3622 L6,9.3622 L6,6.3622 L6,6.3622 Z M6.6875,7.0497 L6.6875,8.6747 L10.3125,8.6747 L10.3125,7.0497 L6.6875,7.0497 L6.6875,7.0497 Z M7,10.3622 L8,10.3622 L8,11.3622 L9,11.3622 L9,10.3622 L10,10.3622 L10,11.3622 L9,12.3622 L8,12.3622 L7,11.3622 L7,10.3622 L7,10.3622 Z" id="rect5769-7-3-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6,4.3622 L4,6.3622 L4,10.8622 C4,11.1122 4.25,11.3622 4.5,11.3622 L6,11.3622 L7,12.3622 L8,13.3622 L9,13.3622 L10,12.3622 L11,11.3622 L12.5,11.3622 C12.75,11.3622 13,11.1122 13,10.8622 L13,6.3622 L11,4.3622 L6,4.3622 L6,4.3622 Z M6,6.3622 L11,6.3622 L11,9.3622 L6,9.3622 L6,6.3622 L6,6.3622 Z M6.6875,7.0497 L6.6875,8.6747 L10.3125,8.6747 L10.3125,7.0497 L6.6875,7.0497 L6.6875,7.0497 Z M7,10.3622 L8,10.3622 L8,11.3622 L9,11.3622 L9,10.3622 L10,10.3622 L10,11.3622 L9,12.3622 L8,12.3622 L7,11.3622 L7,10.3622 L7,10.3622 Z" id="rect5769-7-3-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bicycle-l.svg b/data/styles/clear/style-night/symbols/bicycle-l.svg
index 92a7e10599..843cd3d53f 100644
--- a/data/styles/clear/style-night/symbols/bicycle-l.svg
+++ b/data/styles/clear/style-night/symbols/bicycle-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>bicycle-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="bicycle-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M15.875,5.3622 C15.31346,5.4382 15.23786,6.4201 15.78125,6.581 L18,7.456 L18,9.3622 L11,9.3622 L11,8.3622 L12.375,8.3622 C12.70519,8.3622 13,8.0674 13,7.7372 C13,7.407 12.70519,7.1075 12.375,7.1122 L8.5,7.1122 C8.438,7.1022 8.37453,7.1022 8.3125,7.1122 C7.98523,7.1612 7.73216,7.5037 7.78125,7.831 C7.83035,8.1582 8.17274,8.4113 8.5,8.3622 L10,8.3622 L10,9.3622 L8.9375,12.4872 C8.63782,12.4152 8.32165,12.3622 8,12.3622 C5.79086,12.3622 4,14.1531 4,16.3622 C4,18.5713 5.79086,20.3622 8,20.3622 C10.20914,20.3622 12,18.5713 12,16.3622 C12,16.0618 11.93779,15.7687 11.875,15.4872 L13,15.4872 C13.19854,15.4772 13.39085,15.372 13.5,15.206 L16.875,10.3622 L17,10.3622 L18,10.3622 L18.6875,12.3935 C16.62561,12.5541 15,14.2591 15,16.3622 C15,18.5713 16.79086,20.3622 19,20.3622 C21.20914,20.3622 23,18.5713 23,16.3622 C23,14.534 21.76891,13.027 20.09375,12.5497 L19,9.3622 L19,7.0185 C19,6.9136 18.9577,6.8075 18.9063,6.706 C18.9023,6.696 18.9103,6.682 18.9063,6.675 C18.8914,6.643 18.8634,6.611 18.8438,6.581 C18.8118,6.536 18.7892,6.495 18.7501,6.456 C18.7332,6.44 18.7061,6.439 18.6876,6.425 C18.6693,6.41 18.6443,6.407 18.6251,6.394 C18.5927,6.375 18.5674,6.344 18.5314,6.332 L18.5002,6.301 L18.0627,6.1448 L16.21895,5.3948 C16.15394,5.3698 16.06966,5.3668 16.0002,5.3638 C15.9532,5.3638 15.9214,5.3528 15.8752,5.3638 L15.875,5.3622 Z M11,10.3622 L15.40625,10.3622 L12.6875,14.2372 L11.375,14.2372 C11.06533,13.7431 10.67588,13.3363 10.1875,13.0185 L11,10.3622 L11,10.3622 Z M8,13.8622 C9.38071,13.8622 10.5,14.9815 10.5,16.3622 C10.5,17.7429 9.38071,18.8622 8,18.8622 C6.61929,18.8622 5.5,17.7429 5.5,16.3622 C5.5,14.9815 6.61929,13.8622 8,13.8622 L8,13.8622 Z M19,13.8622 C20.38071,13.8622 21.5,14.9815 21.5,16.3622 C21.5,17.7429 20.38071,18.8622 19,18.8622 C17.61929,18.8622 16.5,17.7429 16.5,16.3622 C16.5,16.1896 16.5292,16.0249 16.5625,15.8622 C16.79562,14.723 17.79188,13.8622 19,13.8622 L19,13.8622 Z" id="path5421-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M15.875,5.3622 C15.31346,5.4382 15.23786,6.4201 15.78125,6.581 L18,7.456 L18,9.3622 L11,9.3622 L11,8.3622 L12.375,8.3622 C12.70519,8.3622 13,8.0674 13,7.7372 C13,7.407 12.70519,7.1075 12.375,7.1122 L8.5,7.1122 C8.438,7.1022 8.37453,7.1022 8.3125,7.1122 C7.98523,7.1612 7.73216,7.5037 7.78125,7.831 C7.83035,8.1582 8.17274,8.4113 8.5,8.3622 L10,8.3622 L10,9.3622 L8.9375,12.4872 C8.63782,12.4152 8.32165,12.3622 8,12.3622 C5.79086,12.3622 4,14.1531 4,16.3622 C4,18.5713 5.79086,20.3622 8,20.3622 C10.20914,20.3622 12,18.5713 12,16.3622 C12,16.0618 11.93779,15.7687 11.875,15.4872 L13,15.4872 C13.19854,15.4772 13.39085,15.372 13.5,15.206 L16.875,10.3622 L17,10.3622 L18,10.3622 L18.6875,12.3935 C16.62561,12.5541 15,14.2591 15,16.3622 C15,18.5713 16.79086,20.3622 19,20.3622 C21.20914,20.3622 23,18.5713 23,16.3622 C23,14.534 21.76891,13.027 20.09375,12.5497 L19,9.3622 L19,7.0185 C19,6.9136 18.9577,6.8075 18.9063,6.706 C18.9023,6.696 18.9103,6.682 18.9063,6.675 C18.8914,6.643 18.8634,6.611 18.8438,6.581 C18.8118,6.536 18.7892,6.495 18.7501,6.456 C18.7332,6.44 18.7061,6.439 18.6876,6.425 C18.6693,6.41 18.6443,6.407 18.6251,6.394 C18.5927,6.375 18.5674,6.344 18.5314,6.332 L18.5002,6.301 L18.0627,6.1448 L16.21895,5.3948 C16.15394,5.3698 16.06966,5.3668 16.0002,5.3638 C15.9532,5.3638 15.9214,5.3528 15.8752,5.3638 L15.875,5.3622 Z M11,10.3622 L15.40625,10.3622 L12.6875,14.2372 L11.375,14.2372 C11.06533,13.7431 10.67588,13.3363 10.1875,13.0185 L11,10.3622 L11,10.3622 Z M8,13.8622 C9.38071,13.8622 10.5,14.9815 10.5,16.3622 C10.5,17.7429 9.38071,18.8622 8,18.8622 C6.61929,18.8622 5.5,17.7429 5.5,16.3622 C5.5,14.9815 6.61929,13.8622 8,13.8622 L8,13.8622 Z M19,13.8622 C20.38071,13.8622 21.5,14.9815 21.5,16.3622 C21.5,17.7429 20.38071,18.8622 19,18.8622 C17.61929,18.8622 16.5,17.7429 16.5,16.3622 C16.5,16.1896 16.5292,16.0249 16.5625,15.8622 C16.79562,14.723 17.79188,13.8622 19,13.8622 L19,13.8622 Z" id="path5421-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bicycle-m.svg b/data/styles/clear/style-night/symbols/bicycle-m.svg
index f23e3cd49f..60802d583d 100644
--- a/data/styles/clear/style-night/symbols/bicycle-m.svg
+++ b/data/styles/clear/style-night/symbols/bicycle-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>bicycle-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -9,7 +9,7 @@
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <g id="bicycle-18-copy" transform="translate(2.000000, 2.000000)" sketch:type="MSShapeGroup">
-                <path d="M12,3.3622 L12,4.3622 L13,4.8622 L13,6.3622 L8,6.3622 L8,5.3622 L9,5.3622 L9,4.8622 L8,4.3622 L6,4.3622 L6,5.3622 L7,5.3622 L7,6.3622 L5.75,8.4872 C5.50461,8.42232 5.26579,8.3622 5,8.3622 C3.34314,8.3622 2,9.70534 2,11.3622 C2,13.01906 3.34314,14.3622 5,14.3622 C6.65686,14.3622 8,13.01906 8,11.3622 L9,11.3622 L11.5,7.3622 L13,7.3622 L13.53125,8.4247 C12.10342,8.65517 11,9.86933 11,11.3622 C11,13.01905 12.34315,14.3622 14,14.3622 C15.65685,14.3622 17,13.01905 17,11.3622 C17,9.92281 15.97744,8.71559 14.625,8.4247 L14,6.8622 L14,4.3622 L13.5,3.8622 L12,3.3622 L12,3.3622 Z M7.5,7.3622 L10.5,7.3622 L8.5,10.3622 L7.8125,10.3622 C7.60043,9.77101 7.22517,9.24652 6.71875,8.89345 L7.5,7.3622 L7.5,7.3622 Z M5,9.6122 C5.9665,9.6122 6.75,10.3957 6.75,11.3622 C6.75,12.3287 5.9665,13.1122 5,13.1122 C4.0335,13.1122 3.25,12.3287 3.25,11.3622 C3.25,10.3957 4.0335,9.6122 5,9.6122 L5,9.6122 Z M14,9.6122 C14.9665,9.6122 15.75,10.3957 15.75,11.3622 C15.75,12.3287 14.9665,13.1122 14,13.1122 C13.0335,13.1122 12.25,12.3287 12.25,11.3622 C12.25,10.3957 13.0335,9.6122 14,9.6122 L14,9.6122 Z" id="path5430" opacity="0.41" fill="#FFFFFF"></path>
+                <path d="M12,3.3622 L12,4.3622 L13,4.8622 L13,6.3622 L8,6.3622 L8,5.3622 L9,5.3622 L9,4.8622 L8,4.3622 L6,4.3622 L6,5.3622 L7,5.3622 L7,6.3622 L5.75,8.4872 C5.50461,8.42232 5.26579,8.3622 5,8.3622 C3.34314,8.3622 2,9.70534 2,11.3622 C2,13.01906 3.34314,14.3622 5,14.3622 C6.65686,14.3622 8,13.01906 8,11.3622 L9,11.3622 L11.5,7.3622 L13,7.3622 L13.53125,8.4247 C12.10342,8.65517 11,9.86933 11,11.3622 C11,13.01905 12.34315,14.3622 14,14.3622 C15.65685,14.3622 17,13.01905 17,11.3622 C17,9.92281 15.97744,8.71559 14.625,8.4247 L14,6.8622 L14,4.3622 L13.5,3.8622 L12,3.3622 L12,3.3622 Z M7.5,7.3622 L10.5,7.3622 L8.5,10.3622 L7.8125,10.3622 C7.60043,9.77101 7.22517,9.24652 6.71875,8.89345 L7.5,7.3622 L7.5,7.3622 Z M5,9.6122 C5.9665,9.6122 6.75,10.3957 6.75,11.3622 C6.75,12.3287 5.9665,13.1122 5,13.1122 C4.0335,13.1122 3.25,12.3287 3.25,11.3622 C3.25,10.3957 4.0335,9.6122 5,9.6122 L5,9.6122 Z M14,9.6122 C14.9665,9.6122 15.75,10.3957 15.75,11.3622 C15.75,12.3287 14.9665,13.1122 14,13.1122 C13.0335,13.1122 12.25,12.3287 12.25,11.3622 C12.25,10.3957 13.0335,9.6122 14,9.6122 L14,9.6122 Z" id="path5430" opacity="0.400186567" fill="#FFFFFF"></path>
                 <rect id="rect15834-7" opacity="0.3" x="0" y="0.3622" width="18" height="17.999969"></rect>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/bicycle-s.svg b/data/styles/clear/style-night/symbols/bicycle-s.svg
index 10fdaf6ff1..0b342c88a8 100644
--- a/data/styles/clear/style-night/symbols/bicycle-s.svg
+++ b/data/styles/clear/style-night/symbols/bicycle-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>bicycle-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="bicycle-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M9,5.0005 L9,6.0005 L10,6.0005 L10,7.0005 L8,7.0005 L8,6.0005 L7,6.0005 L7,7.0005 L6.5,7.5005 L6,8.0005 L5,8.0005 L4,10.0005 L5,12.0005 L6,12.0005 L7,12.0005 L8,10.0005 L9.5,8.0005 L10.5,8.0005 L8.99995,10 L10,12.0005 L9.99995,12 L10.99995,12 L11.99995,12 L12,12.0005 L12.99995,10 L12,8.0005 L11.99995,8 L11.49995,8 L10.99995,7 L10.99995,6 L9.99995,5 L8.99995,5 L9,5.0005 Z M7,8.0005 L8,8.0005 L8,9.0005 L7,9.0005 L7,10.0005 L7,11.0005 L5,11.0005 L5,10.0005 L5,9.0005 L7,9.0005 L7,8.0005 Z M10,9.0005 L12,9.0005 L12,10.0005 L12,11.0005 L10,11.0005 L10,10.0005 L10,9.0005 Z" id="path5464-7-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M9,5.0005 L9,6.0005 L10,6.0005 L10,7.0005 L8,7.0005 L8,6.0005 L7,6.0005 L7,7.0005 L6.5,7.5005 L6,8.0005 L5,8.0005 L4,10.0005 L5,12.0005 L6,12.0005 L7,12.0005 L8,10.0005 L9.5,8.0005 L10.5,8.0005 L8.99995,10 L10,12.0005 L9.99995,12 L10.99995,12 L11.99995,12 L12,12.0005 L12.99995,10 L12,8.0005 L11.99995,8 L11.49995,8 L10.99995,7 L10.99995,6 L9.99995,5 L8.99995,5 L9,5.0005 Z M7,8.0005 L8,8.0005 L8,9.0005 L7,9.0005 L7,10.0005 L7,11.0005 L5,11.0005 L5,10.0005 L5,9.0005 L7,9.0005 L7,8.0005 Z M10,9.0005 L12,9.0005 L12,10.0005 L12,11.0005 L10,11.0005 L10,10.0005 L10,9.0005 Z" id="path5464-7-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cafe-l.svg b/data/styles/clear/style-night/symbols/cafe-l.svg
index e12fe7ad35..2f489b6838 100644
--- a/data/styles/clear/style-night/symbols/cafe-l.svg
+++ b/data/styles/clear/style-night/symbols/cafe-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>cafe-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="cafe-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M8,7 C7.44599,7 7,7.446 7,8 L7,17 C7,17.554 7.44599,18 8,18 L19,18 C19.55401,18 20,17.554 20,17 L20,16 L20.5,16 C21,16 21,15.5 21,15.5 L21,15 L22,15 C23,15 24,14 24,13 L24,12 L24,10 C24,9.5 23.5,9 23,9 L20,9 L20,8 C20,7.446 19.55401,7 19,7 L8,7 Z M20,10 L22.5,10 C23,10 23,10.5 23,10.5 L23,13 C23,13.5 22.5,14 22,14 L21,14 L20,14 L20,10 Z M5,19 L6,20 L7,21 L20,21 L21,20 L22,19 L5,19 Z" id="rect9826-2-1" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8,7 C7.44599,7 7,7.446 7,8 L7,17 C7,17.554 7.44599,18 8,18 L19,18 C19.55401,18 20,17.554 20,17 L20,16 L20.5,16 C21,16 21,15.5 21,15.5 L21,15 L22,15 C23,15 24,14 24,13 L24,12 L24,10 C24,9.5 23.5,9 23,9 L20,9 L20,8 C20,7.446 19.55401,7 19,7 L8,7 Z M20,10 L22.5,10 C23,10 23,10.5 23,10.5 L23,13 C23,13.5 22.5,14 22,14 L21,14 L20,14 L20,10 Z M5,19 L6,20 L7,21 L20,21 L21,20 L22,19 L5,19 Z" id="rect9826-2-1" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cafe-m.svg b/data/styles/clear/style-night/symbols/cafe-m.svg
index a91c1bf7ee..97aeadd975 100644
--- a/data/styles/clear/style-night/symbols/cafe-m.svg
+++ b/data/styles/clear/style-night/symbols/cafe-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>cafe-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="cafe-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M7,6.3622 C6.5,6.3622 6,6.8622 6,7.3622 L6,13.3622 C6,13.8622 6.5,14.3622 7,14.3622 L14,14.3622 C14.40011,14.3622 15,13.8622 15,13.3622 L15,12.9178 L15.36111,12.9178 C15.72222,12.9178 15.72222,12.5567 15.72222,12.5567 L15.72222,12.1956 L16.16667,12.1956 C16.88889,12.1956 18,11.8622 18,10.7512 L18,8.8622 C18,8.3622 17.75,7.8622 17.25,7.8622 L15,7.8622 L15,7.3622 C15,6.8622 14.5,6.3622 14,6.3622 L7,6.3622 Z M15,8.5845 L16.88889,8.5845 C17.25,8.5845 17.25,8.8622 17.25,8.8622 L17.25,10.7512 C17.25,11.3232 16.52775,11.3576 16.16667,11.3622 L15.72222,11.3622 L15,11.3622 L15,8.5845 Z M5,15.3622 L7,17.3622 L14,17.3622 L16,15.3622 L5,15.3622 Z" id="rect9826-2-1-5-9" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M7,6.3622 C6.5,6.3622 6,6.8622 6,7.3622 L6,13.3622 C6,13.8622 6.5,14.3622 7,14.3622 L14,14.3622 C14.40011,14.3622 15,13.8622 15,13.3622 L15,12.9178 L15.36111,12.9178 C15.72222,12.9178 15.72222,12.5567 15.72222,12.5567 L15.72222,12.1956 L16.16667,12.1956 C16.88889,12.1956 18,11.8622 18,10.7512 L18,8.8622 C18,8.3622 17.75,7.8622 17.25,7.8622 L15,7.8622 L15,7.3622 C15,6.8622 14.5,6.3622 14,6.3622 L7,6.3622 Z M15,8.5845 L16.88889,8.5845 C17.25,8.5845 17.25,8.8622 17.25,8.8622 L17.25,10.7512 C17.25,11.3232 16.52775,11.3576 16.16667,11.3622 L15.72222,11.3622 L15,11.3622 L15,8.5845 Z M5,15.3622 L7,17.3622 L14,17.3622 L16,15.3622 L5,15.3622 Z" id="rect9826-2-1-5-9" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cafe-s.svg b/data/styles/clear/style-night/symbols/cafe-s.svg
index 19270e7b94..92c042667d 100644
--- a/data/styles/clear/style-night/symbols/cafe-s.svg
+++ b/data/styles/clear/style-night/symbols/cafe-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>cafe-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="cafe-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M5.5,5 C5.22299,5 5,5.223 5,5.5 L5,10 C5,10.277 5.22299,10.5 5.5,10.5 L11.5,10.5 C11.777,10.5 12,10.277 12,10 L12,9.5 L12.25,9.5 C12.5,9.5 12.5,9.25 12.5,9.25 L12.5,9 L13,9 C13.5,9 14,8.5 14,8 L14,7.5 L14,6.5 C14,6.25 13.75,6 13.5,6 L12,6 L12,5.5 C12,5.223 11.777,5 11.5,5 L5.5,5 Z M12,6.5 L13.25,6.5 C13.5,6.5 13.5,6.75 13.5,6.75 L13.5,8 C13.5,8.25 13.25,8.5 13,8.5 L12.5,8.5 L12,8.5 L12,6.5 Z M4,11 L6,12 L11,12 L13,11 L4,11 Z" id="rect9826-2-1-5" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M5.5,5 C5.22299,5 5,5.223 5,5.5 L5,10 C5,10.277 5.22299,10.5 5.5,10.5 L11.5,10.5 C11.777,10.5 12,10.277 12,10 L12,9.5 L12.25,9.5 C12.5,9.5 12.5,9.25 12.5,9.25 L12.5,9 L13,9 C13.5,9 14,8.5 14,8 L14,7.5 L14,6.5 C14,6.25 13.75,6 13.5,6 L12,6 L12,5.5 C12,5.223 11.777,5 11.5,5 L5.5,5 Z M12,6.5 L13.25,6.5 C13.5,6.5 13.5,6.75 13.5,6.75 L13.5,8 C13.5,8.25 13.25,8.5 13,8.5 L12.5,8.5 L12,8.5 L12,6.5 Z M4,11 L6,12 L11,12 L13,11 L4,11 Z" id="rect9826-2-1-5" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/campsite-l.svg b/data/styles/clear/style-night/symbols/campsite-l.svg
index b80a2ac4a6..d906f5931b 100644
--- a/data/styles/clear/style-night/symbols/campsite-l.svg
+++ b/data/styles/clear/style-night/symbols/campsite-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>campsite-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="campsite-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M13.5,6.00000003 C13,5.99990003 12.773906,6.23940003 12.625,6.50000003 L6.40625,18 L5.0625,18 C4.4759168,18 4,18.446005 4,19 C4,19.553995 4.4759168,20 5.0625,20 L7,20 L20,20 L21.9375,20 C22.524083,20 23,19.553995 23,19 C23,18.446005 22.524083,18 21.9375,18 L20.59375,18 L14.375,6.50000003 C14.226094,6.23940003 14,5.99990003 13.5,6.00000003 L13.5,6.00000003 Z M13.5,11 L17,18 L10,18 L13.5,11 Z" id="path11349-0" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M13.5,6.00000003 C13,5.99990003 12.773906,6.23940003 12.625,6.50000003 L6.40625,18 L5.0625,18 C4.4759168,18 4,18.446005 4,19 C4,19.553995 4.4759168,20 5.0625,20 L7,20 L20,20 L21.9375,20 C22.524083,20 23,19.553995 23,19 C23,18.446005 22.524083,18 21.9375,18 L20.59375,18 L14.375,6.50000003 C14.226094,6.23940003 14,5.99990003 13.5,6.00000003 L13.5,6.00000003 Z M13.5,11 L17,18 L10,18 L13.5,11 Z" id="path11349-0" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/campsite-m.svg b/data/styles/clear/style-night/symbols/campsite-m.svg
index 5ab1b5bba1..8599f22779 100644
--- a/data/styles/clear/style-night/symbols/campsite-m.svg
+++ b/data/styles/clear/style-night/symbols/campsite-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>campsite-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="campsite-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11.5,6.00040004 C11.13889,6.00030004 10.9756,6.17330004 10.86806,6.36150004 L7,14.5 L5.5,14.5 C5,14.5 5,15.2778 5,15.2778 C5,15.2778 5,16 5.5,16 L17.5,16 C18,16 18,15.2778 18,15.2778 C18,15.2778 18,14.5001 17.5,14.5 L16,14.4996 L12.13194,6.36110004 C12.0244,6.17290004 11.86111,5.99990004 11.5,6.00000004 L11.5,6.00040004 Z M11.5,9.00000004 L14,14.5 L9,14.5 L11.5,9.00000004 Z" id="path11349-0-7-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.5,6.00040004 C11.13889,6.00030004 10.9756,6.17330004 10.86806,6.36150004 L7,14.5 L5.5,14.5 C5,14.5 5,15.2778 5,15.2778 C5,15.2778 5,16 5.5,16 L17.5,16 C18,16 18,15.2778 18,15.2778 C18,15.2778 18,14.5001 17.5,14.5 L16,14.4996 L12.13194,6.36110004 C12.0244,6.17290004 11.86111,5.99990004 11.5,6.00000004 L11.5,6.00040004 Z M11.5,9.00000004 L14,14.5 L9,14.5 L11.5,9.00000004 Z" id="path11349-0-7-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/campsite-s.svg b/data/styles/clear/style-night/symbols/campsite-s.svg
index dcd7977735..b5df92c40c 100644
--- a/data/styles/clear/style-night/symbols/campsite-s.svg
+++ b/data/styles/clear/style-night/symbols/campsite-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>campsite-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="campsite-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.53125,5 C8.28125,5 8.1682,5.1197 8.09375,5.25 L5.23437,11 L4.5,11 C4.20671,11 4,11.223 4,11.5 C4,11.777 4.20671,12 4.5,12 L5.53125,12 L11.53125,12 L12.46875,12 C12.76204,12 13,11.777 13,11.5 C13,11.223 12.76204,11 12.46875,11 L11.82812,11 L8.96875,5.25 C8.89425,5.1197 8.78125,5 8.53125,5 L8.53125,5 Z M8.53125,7.5 L10.03125,11 L7.03125,11 L8.53125,7.5 Z" id="path11349-0-3-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.53125,5 C8.28125,5 8.1682,5.1197 8.09375,5.25 L5.23437,11 L4.5,11 C4.20671,11 4,11.223 4,11.5 C4,11.777 4.20671,12 4.5,12 L5.53125,12 L11.53125,12 L12.46875,12 C12.76204,12 13,11.777 13,11.5 C13,11.223 12.76204,11 12.46875,11 L11.82812,11 L8.96875,5.25 C8.89425,5.1197 8.78125,5 8.53125,5 L8.53125,5 Z M8.53125,7.5 L10.03125,11 L7.03125,11 L8.53125,7.5 Z" id="path11349-0-3-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cave-l.svg b/data/styles/clear/style-night/symbols/cave-l.svg
index 0fe5814414..54d30490af 100644
--- a/data/styles/clear/style-night/symbols/cave-l.svg
+++ b/data/styles/clear/style-night/symbols/cave-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>cave-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -10,7 +10,7 @@
                 <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
                 <circle id="Oval-1-Copy-38" fill="#3D3D37" cx="13.5" cy="13.5" r="12.5"></circle>
             </g>
-            <path d="M13.5012442,19 C9.74937728,19 6,14.0836163 6,8.01400679 C6,7.32151952 6.05228215,6.65662139 6.12448132,6 L10.8946054,6 C10.877178,6.44418506 10.8497921,6.88285229 10.8497921,7.34083192 C10.8497921,13.0352292 11.6464726,15.6479202 13.5012442,15.6479202 C15.3560158,15.6479202 16.1526963,13.0352292 16.1526963,7.34083192 C16.1526963,6.88285229 16.1278,6.44418506 16.107883,6 L20.8755174,6 C20.9502062,6.65662139 20.9999988,7.32151952 20.9999988,8.01400679 C21.0024884,14.0836163 17.2556007,19 13.5012442,19 L13.5012442,19 Z" id="Shape" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" transform="translate(13.500000, 12.500000) rotate(-180.000000) translate(-13.500000, -12.500000) "></path>
+            <path d="M13.5012442,19 C9.74937728,19 6,14.0836163 6,8.01400679 C6,7.32151952 6.05228215,6.65662139 6.12448132,6 L10.8946054,6 C10.877178,6.44418506 10.8497921,6.88285229 10.8497921,7.34083192 C10.8497921,13.0352292 11.6464726,15.6479202 13.5012442,15.6479202 C15.3560158,15.6479202 16.1526963,13.0352292 16.1526963,7.34083192 C16.1526963,6.88285229 16.1278,6.44418506 16.107883,6 L20.8755174,6 C20.9502062,6.65662139 20.9999988,7.32151952 20.9999988,8.01400679 C21.0024884,14.0836163 17.2556007,19 13.5012442,19 L13.5012442,19 Z" id="Shape" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup" transform="translate(13.500000, 12.500000) rotate(-180.000000) translate(-13.500000, -12.500000) "></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cave-m.svg b/data/styles/clear/style-night/symbols/cave-m.svg
index e5357c23d9..d6c3c200b1 100644
--- a/data/styles/clear/style-night/symbols/cave-m.svg
+++ b/data/styles/clear/style-night/symbols/cave-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>cave-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="cave-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
-            <path d="M18,14.2958404 C18,14.8817912 17.9546888,15.4443973 17.8921162,16 L13.7580086,16 C13.7731124,15.6241511 13.7968468,15.2529711 13.7968468,14.8654499 C13.7968468,10.0471138 13.1063904,7.83637521 11.4989217,7.83637521 C9.89145295,7.83637521 9.20099658,10.0471138 9.20099658,14.8654499 C9.20099658,15.2529711 9.22257334,15.6241511 9.23983475,16 L5.10788488,16 C5.0431546,15.4443973 5.00000107,14.8817912 5.00000107,14.2958404 C4.9978434,9.16001698 8.24514603,5 11.4989217,5 C14.7505397,5 18,9.16001698 18,14.2958404 Z" id="Shape-Copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M18,14.2958404 C18,14.8817912 17.9546888,15.4443973 17.8921162,16 L13.7580086,16 C13.7731124,15.6241511 13.7968468,15.2529711 13.7968468,14.8654499 C13.7968468,10.0471138 13.1063904,7.83637521 11.4989217,7.83637521 C9.89145295,7.83637521 9.20099658,10.0471138 9.20099658,14.8654499 C9.20099658,15.2529711 9.22257334,15.6241511 9.23983475,16 L5.10788488,16 C5.0431546,15.4443973 5.00000107,14.8817912 5.00000107,14.2958404 C4.9978434,9.16001698 8.24514603,5 11.4989217,5 C14.7505397,5 18,9.16001698 18,14.2958404 Z" id="Shape-Copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cave-s.svg b/data/styles/clear/style-night/symbols/cave-s.svg
index ae6398b0d7..6b7046485c 100644
--- a/data/styles/clear/style-night/symbols/cave-s.svg
+++ b/data/styles/clear/style-night/symbols/cave-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>cave-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="cave-s-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" rx="8.5" ry="8.5"></ellipse>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.49925348,4 C10.7503736,4 13,7.02546689 13,10.7606112 C13,11.1867572 12.9686307,11.5959253 12.9253112,12 L10.0632368,12 C10.0736932,11.7266553 10.0901247,11.4567063 10.0901247,11.1748727 C10.0901247,7.67062818 9.61211646,6.06281834 8.49925348,6.06281834 C7.38639051,6.06281834 6.90838225,7.67062818 6.90838225,11.1748727 C6.90838225,11.4567063 6.92332,11.7266553 6.93527021,12 L4.07468953,12 C4.02987626,11.5959253 4.00000074,11.1867572 4.00000074,10.7606112 C3.99850697,7.02546689 6.24663956,4 8.49925348,4 L8.49925348,4 Z" id="Shape-Copy-2" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.49925348,4 C10.7503736,4 13,7.02546689 13,10.7606112 C13,11.1867572 12.9686307,11.5959253 12.9253112,12 L10.0632368,12 C10.0736932,11.7266553 10.0901247,11.4567063 10.0901247,11.1748727 C10.0901247,7.67062818 9.61211646,6.06281834 8.49925348,6.06281834 C7.38639051,6.06281834 6.90838225,7.67062818 6.90838225,11.1748727 C6.90838225,11.4567063 6.92332,11.7266553 6.93527021,12 L4.07468953,12 C4.02987626,11.5959253 4.00000074,11.1867572 4.00000074,10.7606112 C3.99850697,7.02546689 6.24663956,4 8.49925348,4 L8.49925348,4 Z" id="Shape-Copy-2" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cemetery-l.svg b/data/styles/clear/style-night/symbols/cemetery-l.svg
new file mode 100644
index 0000000000..d15896e2a4
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/cemetery-l.svg
@@ -0,0 +1,14 @@
+<?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>cemetery-l</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="cemetery-l" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <path d="M13.5,6 C10.426354,6 9,7.75 9,10.375 L9,14.75 L9,18.25 C8.5,18.25 8,18.6875 8,19.125 L8,20 L19,20 L19,19.125 C19,18.6875 18.5,18.25 18,18.25 L18,10.375 C18,7.75 16.5,6 13.5,6 L13.5,6 Z" id="rect12479-9-copy-3" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cemetery-m.svg b/data/styles/clear/style-night/symbols/cemetery-m.svg
new file mode 100644
index 0000000000..b49b6d9304
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/cemetery-m.svg
@@ -0,0 +1,14 @@
+<?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>cemetery-m</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="cemetery-m" sketch:type="MSLayerGroup">
+            <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <path d="M11.5,5 C8.98519873,5 7.81818182,6.5 7.81818182,8.75 L7.81818182,12.5 L7.81818182,15.5 C7.40909091,15.5 7,15.875 7,16.25 L7,17 L16,17 L16,16.25 C16,15.875 15.5909091,15.5 15.1818182,15.5 L15.1818182,8.75 C15.1818182,6.5 13.9545455,5 11.5,5 L11.5,5 Z" id="rect12479-9-copy-2" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cemetery-s.svg b/data/styles/clear/style-night/symbols/cemetery-s.svg
new file mode 100644
index 0000000000..a82105c7a5
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/cemetery-s.svg
@@ -0,0 +1,14 @@
+<?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>cemetery-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="cemetery-s" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <path d="M8.5,4 C6.54404345,4 5.63636364,5.125 5.63636364,6.8125 L5.63636364,9.625 L5.63636364,11.875 C5.31818182,11.875 5,12.15625 5,12.4375 L5,13 L12,13 L12,12.4375 C12,12.15625 11.6818182,11.875 11.3636364,11.875 L11.3636364,6.8125 C11.3636364,5.125 10.4090909,4 8.5,4 L8.5,4 Z" id="rect12479-9-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cinema-l.svg b/data/styles/clear/style-night/symbols/cinema-l.svg
index 9c25eeec13..da33c96268 100644
--- a/data/styles/clear/style-night/symbols/cinema-l.svg
+++ b/data/styles/clear/style-night/symbols/cinema-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>cinema-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="cinema-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M19,5 L16.75,5.6563 L17.84375,8.625 L20,8 L19,5 Z M15.375,6.0313 L12.4375,6.875 L12.5,7 L13.0625,8.5313 L13.5625,9.8438 L16.5,9 L15.375,6.0313 Z M11.09375,7.25 L8.5,8 L9.625,10.9688 L12.21875,10.2188 L11.5625,8.5313 L11.09375,7.25 Z M7.15625,8.375 L5,9 L6,12 L8.25,11.3438 L7.15625,8.375 Z M6,12 L6,21 C6,21.554 6.44599,22 7,22 L20,22 C20.55401,22 21,21.554 21,21 L21,12 L6,12 Z M8,14 L19,14 L19,17 L8,17 L8,14 Z" id="rect7568-8-4-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M19,5 L16.75,5.6563 L17.84375,8.625 L20,8 L19,5 Z M15.375,6.0313 L12.4375,6.875 L12.5,7 L13.0625,8.5313 L13.5625,9.8438 L16.5,9 L15.375,6.0313 Z M11.09375,7.25 L8.5,8 L9.625,10.9688 L12.21875,10.2188 L11.5625,8.5313 L11.09375,7.25 Z M7.15625,8.375 L5,9 L6,12 L8.25,11.3438 L7.15625,8.375 Z M6,12 L6,21 C6,21.554 6.44599,22 7,22 L20,22 C20.55401,22 21,21.554 21,21 L21,12 L6,12 Z M8,14 L19,14 L19,17 L8,17 L8,14 Z" id="rect7568-8-4-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cinema-m.svg b/data/styles/clear/style-night/symbols/cinema-m.svg
index 81cad3b5d7..2414ecbc03 100644
--- a/data/styles/clear/style-night/symbols/cinema-m.svg
+++ b/data/styles/clear/style-night/symbols/cinema-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>cinema-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="cinema-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M16.23529,4.65997314 L14.5147,5.16177314 L15.3511,7.43207314 L17,6.95407314 L16.23529,4.65997314 Z M13.46323,5.44857314 L11.21691,6.09377314 L12.0772,8.36397314 L14.32353,7.71877314 L13.46323,5.44857314 Z M10.18933,6.38057314 L8.20588,6.95407314 L9.06617,9.22427314 L11.04963,8.65077314 L10.18933,6.38057314 Z M7.17831,7.24087314 L5,8.01107314 L6,10.0110731 L8.0147,9.51107314 L7.17831,7.24087314 Z M6,10.0110731 L6,17.0110731 C6,17.5110731 6.5,18.0110731 7,18.0110731 L17,18.0110731 C17.5,18.0110731 18,17.5110731 18,17.0110731 L18,10.0110731 L6,10.0110731 Z M8,12.0110731 L16,12.0110731 L16,14.0110731 L8,14.0110731 L8,12.0110731 Z" id="rect7568-8-4-7-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M16.23529,4.65997314 L14.5147,5.16177314 L15.3511,7.43207314 L17,6.95407314 L16.23529,4.65997314 Z M13.46323,5.44857314 L11.21691,6.09377314 L12.0772,8.36397314 L14.32353,7.71877314 L13.46323,5.44857314 Z M10.18933,6.38057314 L8.20588,6.95407314 L9.06617,9.22427314 L11.04963,8.65077314 L10.18933,6.38057314 Z M7.17831,7.24087314 L5,8.01107314 L6,10.0110731 L8.0147,9.51107314 L7.17831,7.24087314 Z M6,10.0110731 L6,17.0110731 C6,17.5110731 6.5,18.0110731 7,18.0110731 L17,18.0110731 C17.5,18.0110731 18,17.5110731 18,17.0110731 L18,10.0110731 L6,10.0110731 Z M8,12.0110731 L16,12.0110731 L16,14.0110731 L8,14.0110731 L8,12.0110731 Z" id="rect7568-8-4-7-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cinema-s.svg b/data/styles/clear/style-night/symbols/cinema-s.svg
index ce1b90f24e..00b1d99db6 100644
--- a/data/styles/clear/style-night/symbols/cinema-s.svg
+++ b/data/styles/clear/style-night/symbols/cinema-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>cinema-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="cinema-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M11.5,4.5 L4.5,6.5 L5,8 L12,6 L11.5,4.5 L11.5,4.5 Z M5,8 L5,12.5 C5,12.8077 5.19231,13 5.5,13 L11.5,13 C11.80769,13 12,12.8077 12,12.5 L12,8 L5,8 L5,8 Z M6,9 L11,9 L11,10 L6,10 L6,9 L6,9 Z" id="rect7568-8-4-7-5-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.5,4.5 L4.5,6.5 L5,8 L12,6 L11.5,4.5 L11.5,4.5 Z M5,8 L5,12.5 C5,12.8077 5.19231,13 5.5,13 L11.5,13 C11.80769,13 12,12.8077 12,12.5 L12,8 L5,8 L5,8 Z M6,9 L11,9 L11,10 L6,10 L6,9 L6,9 Z" id="rect7568-8-4-7-5-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/college-l.svg b/data/styles/clear/style-night/symbols/college-l.svg
index 286b0e244c..c263632efe 100644
--- a/data/styles/clear/style-night/symbols/college-l.svg
+++ b/data/styles/clear/style-night/symbols/college-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>college-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="college-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M13.5,7 L4,12 L13.5,17 L19,14.21875 L19,18 C19,20 21,20 21,20 L21,19 C21,19 20,18.94281 20,18 L20,13.65625 L23,12 L13.5,7 Z M9,16 L9,18 C9,18.4967 9.3250891,19.1625 10,19.5 L13.5,21 L16.5,19.5 C17.174911,19.1625 18.047132,18.494459 18,18 L18,16 L13.5,18.1875 L9,16 Z" id="path7442-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M13.5,7 L4,12 L13.5,17 L19,14.21875 L19,18 C19,20 21,20 21,20 L21,19 C21,19 20,18.94281 20,18 L20,13.65625 L23,12 L13.5,7 Z M9,16 L9,18 C9,18.4967 9.3250891,19.1625 10,19.5 L13.5,21 L16.5,19.5 C17.174911,19.1625 18.047132,18.494459 18,18 L18,16 L13.5,18.1875 L9,16 Z" id="path7442-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/college-m.svg b/data/styles/clear/style-night/symbols/college-m.svg
index a77af0922c..e74b461dee 100644
--- a/data/styles/clear/style-night/symbols/college-m.svg
+++ b/data/styles/clear/style-night/symbols/college-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>college-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="college-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11.5,6 L5,9.5 L11.5,13 L16,10.6563 L16,14.2188 C16,16 17.5,15.75 17.5,15.75 L17.5,15 C17.5,15 16.71875,15 16.71875,14.2188 L16.71875,10.25 L18,9.5 L11.5,6 Z M8,12.5 L8,13.9375 C8,14.2963 8.51257,14.7562 9,15 L11.5,16 L14,15 C14.48743,14.7562 15,14.2963 15,13.9375 L15,12.5 L11.5,14 L8,12.5 Z" id="path7442-0-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.5,6 L5,9.5 L11.5,13 L16,10.6563 L16,14.2188 C16,16 17.5,15.75 17.5,15.75 L17.5,15 C17.5,15 16.71875,15 16.71875,14.2188 L16.71875,10.25 L18,9.5 L11.5,6 Z M8,12.5 L8,13.9375 C8,14.2963 8.51257,14.7562 9,15 L11.5,16 L14,15 C14.48743,14.7562 15,14.2963 15,13.9375 L15,12.5 L11.5,14 L8,12.5 Z" id="path7442-0-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/college-s.svg b/data/styles/clear/style-night/symbols/college-s.svg
index 1131961f95..b50a356bf3 100644
--- a/data/styles/clear/style-night/symbols/college-s.svg
+++ b/data/styles/clear/style-night/symbols/college-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>college-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="college-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.5,5 L4,7.5 L8.5,10 L11,8.5 L11,9.75 L8.5,11 L6,9.75 L6,11 L8.5,12.5 L11,11 C11,11.5 12,11.5 12,11.5 L12,11 C12,11 11.5,10.971 11.5,10.5 L11.5,8.5 L13,7.5 L8.5,5 Z" id="path7442-3-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.5,5 L4,7.5 L8.5,10 L11,8.5 L11,9.75 L8.5,11 L6,9.75 L6,11 L8.5,12.5 L11,11 C11,11.5 12,11.5 12,11.5 L12,11 C12,11 11.5,10.971 11.5,10.5 L11.5,8.5 L13,7.5 L8.5,5 Z" id="path7442-3-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/drinking-water-l.svg b/data/styles/clear/style-night/symbols/drinking-water-l.svg
index 9de9b96beb..f3c516fa1b 100644
--- a/data/styles/clear/style-night/symbols/drinking-water-l.svg
+++ b/data/styles/clear/style-night/symbols/drinking-water-l.svg
@@ -1,14 +1,14 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>drinking-water-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="drinking-water-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M13.5,5 C12,7 7,13 7,16.5 C7,20 10.27126,23 13.5,23 C16.72874,23 20,20 20,16.5 C20,13 15,7 13.5,5 Z" id="path7962-4-3-5-3-9-copy-2" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-38" fill="#133655" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <path d="M13.5,5 C12,7 7,13 7,16.5 C7,20 10.27126,23 13.5,23 C16.72874,23 20,20 20,16.5 C20,13 15,7 13.5,5 Z" id="path7962-4-3-5-3-9-copy-2" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/drinking-water-m.svg b/data/styles/clear/style-night/symbols/drinking-water-m.svg
index 636b1e7604..d7f41ae306 100644
--- a/data/styles/clear/style-night/symbols/drinking-water-m.svg
+++ b/data/styles/clear/style-night/symbols/drinking-water-m.svg
@@ -1,14 +1,14 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>drinking-water-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="drinking-water-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11.5,18 C9.16814,18 7,16 7,13.5 C7,10.9722 10.41667,6.4444 11.5,5 C12.58334,6.4444 16,10.9722 16,13.5 C16,16 13.83187,18 11.5,18 L11.5,18 Z" id="path12622-2-4-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <ellipse id="Oval-1-Copy-40" fill="#133655" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <path d="M11.5,18 C9.16814,18 7,16 7,13.5 C7,10.9722 10.41667,6.4444 11.5,5 C12.58334,6.4444 16,10.9722 16,13.5 C16,16 13.83187,18 11.5,18 L11.5,18 Z" id="path12622-2-4-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/drinking-water-s.svg b/data/styles/clear/style-night/symbols/drinking-water-s.svg
index 5dc30383a7..302759bc8f 100644
--- a/data/styles/clear/style-night/symbols/drinking-water-s.svg
+++ b/data/styles/clear/style-night/symbols/drinking-water-s.svg
@@ -1,14 +1,14 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>drinking-water-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="drinking-water-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.5,12 C7.34687857,12 6,11.3 6,9.55 C6,8.325 7.96428571,5.7 8.5,5 C9.03571429,5.7 11,8.325 11,9.55 C11,11.3 9.65312143,12 8.5,12 L8.5,12 Z" id="path4133-5-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-42" fill="#133655" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <path d="M8.5,12 C7.34687857,12 6,11.3 6,9.55 C6,8.325 7.96428571,5.7 8.5,5 C9.03571429,5.7 11,8.325 11,9.55 C11,11.3 9.65312143,12 8.5,12 L8.5,12 Z" id="path4133-5-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/embassy-l.svg b/data/styles/clear/style-night/symbols/embassy-l.svg
index d50df5280d..a9e0af8f0f 100644
--- a/data/styles/clear/style-night/symbols/embassy-l.svg
+++ b/data/styles/clear/style-night/symbols/embassy-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>embassy-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="embassy-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M12,5.16554271 L10,6.16554271 L8,7.16554271 L8,22.1655427 C8,22.6655427 8.5,23.1655427 9,23.1655427 C9.5,23.1655427 10,22.6655427 10,22.1655427 L10,13.1655427 C10,13.1655427 11.000008,12.6655427 12.00008,12.1655427 C14,11.1656427 16.211251,15.0598427 18.00012,14.1654427 C20.0002,13.1654427 21.00012,12.6655427 21.00012,12.6655427 L21.00012,5.66554271 C21.00012,5.66554271 20,6.16554271 18,7.16554271 C16.211131,8.05994271 14.00016,4.16554271 12,5.16554271 L12,5.16554271 Z" id="rect9498-4-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M12,5.16554271 L10,6.16554271 L8,7.16554271 L8,22.1655427 C8,22.6655427 8.5,23.1655427 9,23.1655427 C9.5,23.1655427 10,22.6655427 10,22.1655427 L10,13.1655427 C10,13.1655427 11.000008,12.6655427 12.00008,12.1655427 C14,11.1656427 16.211251,15.0598427 18.00012,14.1654427 C20.0002,13.1654427 21.00012,12.6655427 21.00012,12.6655427 L21.00012,5.66554271 C21.00012,5.66554271 20,6.16554271 18,7.16554271 C16.211131,8.05994271 14.00016,4.16554271 12,5.16554271 L12,5.16554271 Z" id="rect9498-4-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/embassy-m.svg b/data/styles/clear/style-night/symbols/embassy-m.svg
index d410fc7776..207919dedb 100644
--- a/data/styles/clear/style-night/symbols/embassy-m.svg
+++ b/data/styles/clear/style-night/symbols/embassy-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>embassy-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="embassy-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <path d="M11.5,22 C17.2989899,22 22,17.2989899 22,11.5 C22,5.70101013 17.2989899,1 11.5,1 C5.70101013,1 1,5.70101013 1,11.5 C1,17.2989899 5.70101013,22 11.5,22 Z" id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup"></path>
-            <path d="M11,5 L8,6.5 L8,19 L9,19 L9,11 L11,10 L14.5,12 L17,11 L17,6 L14.5,7 L11,5 Z" id="rect9498-4-99-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11,5 L8,6.5 L8,19 L9,19 L9,11 L11,10 L14.5,12 L17,11 L17,6 L14.5,7 L11,5 Z" id="rect9498-4-99-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/embassy-s.svg b/data/styles/clear/style-night/symbols/embassy-s.svg
index 2ec85ef372..2047b14330 100644
--- a/data/styles/clear/style-night/symbols/embassy-s.svg
+++ b/data/styles/clear/style-night/symbols/embassy-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>embassy-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="embassy-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.5,4 L6,5 L6,13 L7,13 L7,8 L8.5,7.5 L11,9 L13,8 L13,4.5 L11,5.5 L8.5,4 Z" id="rect9498-4-99-4-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.5,4 L6,5 L6,13 L7,13 L7,8 L8.5,7.5 L11,9 L13,8 L13,4.5 L11,5.5 L8.5,4 Z" id="rect9498-4-99-4-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/fastfood-l.svg b/data/styles/clear/style-night/symbols/fastfood-l.svg
index 93c3bb016f..bb90910f53 100644
--- a/data/styles/clear/style-night/symbols/fastfood-l.svg
+++ b/data/styles/clear/style-night/symbols/fastfood-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>fastfood-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="fastfood-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <g id="g16674-copy" transform="translate(4.000000, 7.000000)" fill="#FFFFFF" opacity="0.41" sketch:type="MSShapeGroup">
+            <g id="g16674-copy" transform="translate(4.000000, 7.000000)" fill="#FFFFFF" opacity="0.400186567" sketch:type="MSShapeGroup">
                 <path d="M8,0 C5,0 1,1.5 1,4 L1,6 L18,6 L18,4 C17.99998,1.5 14,0 11,0 L8,0 Z M7.5,1 C7.777,1 8,1.223 8,1.5 C8,1.777 7.777,2 7.5,2 C7.223,2 7,1.777 7,1.5 C7,1.223 7.223,1 7.5,1 L7.5,1 Z M11.5,1 C11.777,1 12,1.223 12,1.5 C12,1.777 11.777,2 11.5,2 C11.223,2 11,1.777 11,1.5 C11,1.223 11.223,1 11.5,1 L11.5,1 Z M5.5,3 C5.777,3 6,3.223 6,3.5 C6,3.777 5.777,4 5.5,4 C5.223,4 5,3.777 5,3.5 C5,3.223 5.223,3 5.5,3 L5.5,3 Z M9.5,3 C9.777,3 10,3.223 10,3.5 C10,3.777 9.777,4 9.5,4 C9.223,4 9,3.777 9,3.5 C9,3.223 9.223,3 9.5,3 L9.5,3 Z M13.5,3 C13.777,3 14,3.223 14,3.5 C14,3.777 13.777,4 13.5,4 C13.223,4 13,3.777 13,3.5 C13,3.223 13.223,3 13.5,3 L13.5,3 Z M1,7 C0.49997,7 -9.99999997e-06,7.5 0,8 C9.99999997e-06,8.5 0.49997,9 1,9 L18,9 C18.50001,9 18.99999,8.5 19,8 C19,7.5 18.5,7 18,7 L1,7 Z M1,10 L1,11 C1,12 2,13 3,13 L16,13 C17,13 18,12 18,11 L18,10 L1,10 Z" id="rect13326-2-5-2-3"></path>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/fastfood-m.svg b/data/styles/clear/style-night/symbols/fastfood-m.svg
index 0554d70680..cf19682b26 100644
--- a/data/styles/clear/style-night/symbols/fastfood-m.svg
+++ b/data/styles/clear/style-night/symbols/fastfood-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>fastfood-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="fastfood-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11,7 C8.94737,7 5.5,7.7895 5.5,9.5 L5.5,11 L17.5,11 L17.5,9.5 C17.5,7.7895 14.05263,7 12,7 L11,7 Z M9,8.125 C9.20711,8.125 9.375,8.2929 9.375,8.5 C9.375,8.7071 9.20711,8.875 9,8.875 C8.79289,8.875 8.625,8.7071 8.625,8.5 C8.625,8.2929 8.79289,8.125 9,8.125 L9,8.125 Z M14,8.125 C14.20711,8.125 14.375,8.2929 14.375,8.5 C14.375,8.7071 14.20711,8.875 14,8.875 C13.79289,8.875 13.625,8.7071 13.625,8.5 C13.625,8.2929 13.79289,8.125 14,8.125 L14,8.125 Z M7,9.125 C7.20711,9.125 7.375,9.2929 7.375,9.5 C7.375,9.7071 7.20711,9.875 7,9.875 C6.79289,9.875 6.625,9.7071 6.625,9.5 C6.625,9.2929 6.79289,9.125 7,9.125 L7,9.125 Z M11.375,9.125 C11.58211,9.125 11.75,9.2929 11.75,9.5 C11.75,9.7071 11.58211,9.875 11.375,9.875 C11.16789,9.875 11,9.7071 11,9.5 C11,9.2929 11.16789,9.125 11.375,9.125 L11.375,9.125 Z M16,9.125 C16.20711,9.125 16.375,9.2929 16.375,9.5 C16.375,9.7071 16.20711,9.875 16,9.875 C15.79289,9.875 15.625,9.7071 15.625,9.5 C15.625,9.2929 15.79289,9.125 16,9.125 L16,9.125 Z M5.5,12 C5.15787,12 4.99999,12.1579 5,12.5 C5.00001,12.8422 5.15787,13 5.5,13 L17.5,13 C17.84211,13 17.99999,12.8422 18,12.5 C18.00001,12.1579 17.84211,12 17.5,12 L6.5,12 L5.5,12 Z M5.5,14.625 C5.5,15.3092 6.19079,16 6.875,16 L16.125,16 C16.80921,16 17.5,15.3092 17.5,14.625 L17.5,14 L5.5,14 L5.5,14.625 Z" id="rect13326-2-5-2-3-6-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11,7 C8.94737,7 5.5,7.7895 5.5,9.5 L5.5,11 L17.5,11 L17.5,9.5 C17.5,7.7895 14.05263,7 12,7 L11,7 Z M9,8.125 C9.20711,8.125 9.375,8.2929 9.375,8.5 C9.375,8.7071 9.20711,8.875 9,8.875 C8.79289,8.875 8.625,8.7071 8.625,8.5 C8.625,8.2929 8.79289,8.125 9,8.125 L9,8.125 Z M14,8.125 C14.20711,8.125 14.375,8.2929 14.375,8.5 C14.375,8.7071 14.20711,8.875 14,8.875 C13.79289,8.875 13.625,8.7071 13.625,8.5 C13.625,8.2929 13.79289,8.125 14,8.125 L14,8.125 Z M7,9.125 C7.20711,9.125 7.375,9.2929 7.375,9.5 C7.375,9.7071 7.20711,9.875 7,9.875 C6.79289,9.875 6.625,9.7071 6.625,9.5 C6.625,9.2929 6.79289,9.125 7,9.125 L7,9.125 Z M11.375,9.125 C11.58211,9.125 11.75,9.2929 11.75,9.5 C11.75,9.7071 11.58211,9.875 11.375,9.875 C11.16789,9.875 11,9.7071 11,9.5 C11,9.2929 11.16789,9.125 11.375,9.125 L11.375,9.125 Z M16,9.125 C16.20711,9.125 16.375,9.2929 16.375,9.5 C16.375,9.7071 16.20711,9.875 16,9.875 C15.79289,9.875 15.625,9.7071 15.625,9.5 C15.625,9.2929 15.79289,9.125 16,9.125 L16,9.125 Z M5.5,12 C5.15787,12 4.99999,12.1579 5,12.5 C5.00001,12.8422 5.15787,13 5.5,13 L17.5,13 C17.84211,13 17.99999,12.8422 18,12.5 C18.00001,12.1579 17.84211,12 17.5,12 L6.5,12 L5.5,12 Z M5.5,14.625 C5.5,15.3092 6.19079,16 6.875,16 L16.125,16 C16.80921,16 17.5,15.3092 17.5,14.625 L17.5,14 L5.5,14 L5.5,14.625 Z" id="rect13326-2-5-2-3-6-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/fastfood-s.svg b/data/styles/clear/style-night/symbols/fastfood-s.svg
index 9986c8c983..f8121dd1af 100644
--- a/data/styles/clear/style-night/symbols/fastfood-s.svg
+++ b/data/styles/clear/style-night/symbols/fastfood-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>fastfood-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="fastfood-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.05044132,5 C6.62939132,5 4.3512,5.8723 4.44736,7.0526 L4.44736,8.25 L12.5,8.25 L12.5,7.0526 C12.5,5.8684 10.4050722,5 8.98402216,5 L8.05044132,5 Z M4,9 L4,10 L13,10 L13,9 L4,9 Z M4.49996,10.75 C4.49996,11.2237 5.02628,12 5.49996,12 L11.49996,12 C11.97364,12 12.49996,11.2237 12.49996,10.75 L4.49996,10.75 Z" id="rect13326-2-5-2-3-1-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.05044132,5 C6.62939132,5 4.3512,5.8723 4.44736,7.0526 L4.44736,8.25 L12.5,8.25 L12.5,7.0526 C12.5,5.8684 10.4050722,5 8.98402216,5 L8.05044132,5 Z M4,9 L4,10 L13,10 L13,9 L4,9 Z M4.49996,10.75 C4.49996,11.2237 5.02628,12 5.49996,12 L11.49996,12 C11.97364,12 12.49996,11.2237 12.49996,10.75 L4.49996,10.75 Z" id="rect13326-2-5-2-3-1-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/fountain-l.svg b/data/styles/clear/style-night/symbols/fountain-l.svg
index a1f36f8cd0..1e8e65f5f7 100644
--- a/data/styles/clear/style-night/symbols/fountain-l.svg
+++ b/data/styles/clear/style-night/symbols/fountain-l.svg
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="25px" height="25px" viewBox="0 0 25 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>fountain-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="fountain-l-copy" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-38" opacity="0.3" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="12.5"></circle>
-            <path d="M12.5,4 C11,6 6,12 6,15.5 C6,19 9.27126,22 12.5,22 C15.72874,22 19,19 19,15.5 C19,12 14,6 12.5,4 Z" id="path7962-4-3-5-3-9-copy-2" fill="#295675" sketch:type="MSShapeGroup"></path>
+        <g id="fountain-l" sketch:type="MSLayerGroup" transform="translate(-1.000000, -1.000000)">
+            <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#133655" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <path d="M13.2069489,11.9381747 L7.06942208,11.9381747 C7.06942187,14.8998487 9.63479656,17.5310648 13.0280788,17.7875843 L9.02118359,20.981 L18.0066582,20.981 L14.0089146,17.794878 L14.0089146,17.794878 C17.4513122,17.5862935 20.075285,14.9309517 20.075285,11.9381747 L13.8240729,11.9381747 L13.8240729,11.9381747 L13.8240729,11.4872581 L14.4071886,9.16986002 C14.5906963,8.21260375 15.4189609,7.6068177 16.2497054,7.8211288 C16.9713371,8.00400761 17.4549047,8.73838033 17.4549047,9.55562 L17.6040647,9.55562015 L17.4549047,9.55562 L17.4549047,9.97556423 L20.0442215,9.97556438 L20.0442215,9.02984358 C20.0442215,6.89816247 18.4730616,4.9898692 16.6255852,4.9898692 C15.2681696,4.9898692 14.0599217,6.0200488 13.5144344,7.4120991 C12.9715913,6.02218898 11.7763987,4.9898692 10.4233794,4.9898692 C8.57342316,4.9898692 7.02268589,6.9145738 7.02268589,9.04625492 L7.02268589,9.97432002 L9.57363728,9.97432002 L9.57363725,9.56917401 C9.57363725,8.75479182 10.0596847,8.01756162 10.7813165,7.83754029 C11.6120609,7.62322919 12.4403255,8.22901524 12.6238332,9.18627151 L13.2069489,11.5036696 L13.2069489,11.9381747 Z" id="Shape" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/fountain-m.svg b/data/styles/clear/style-night/symbols/fountain-m.svg
index 3a59ce03ea..365b2f2ec5 100644
--- a/data/styles/clear/style-night/symbols/fountain-m.svg
+++ b/data/styles/clear/style-night/symbols/fountain-m.svg
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="21px" height="21px" viewBox="0 0 21 21" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>fountain-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="fountain-m-copy" sketch:type="MSLayerGroup">
-            <ellipse id="Oval-1-Copy-40" opacity="0.2" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="10.5" cy="10.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M10.5,17 C8.16814,17 6,15 6,12.5 C6,9.9722 9.41667,5.4444 10.5,4 C11.58334,5.4444 15,9.9722 15,12.5 C15,15 12.83187,17 10.5,17 L10.5,17 Z" id="path12622-2-4-copy" fill="#295675" sketch:type="MSShapeGroup"></path>
+        <g id="fountain-m" sketch:type="MSLayerGroup" transform="translate(-1.000000, -1.019000)">
+            <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#133655" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <path d="M11.1316441,15.5508237 C8.24183572,15.4086379 5.94170881,13.4894614 5.94170898,10.9897551 L11.4564534,10.9897551 L10.5688771,7.92856109 C10.4205105,7.25690108 9.75085539,6.83185056 9.07919538,6.98222221 C8.4957534,7.11053935 8.10478712,7.62581285 8.10478712,8.19923005 L7.98419069,8.19923016 L8.10478712,8.19923005 L8.10478719,9.04531044 L6.01131478,9.04531054 L6.01131471,7.83031839 C6.01131471,6.33462176 7.28160343,4.99566549 8.7752951,4.99566549 C10.2642654,4.99566549 11.5312427,6.32617042 11.5392374,7.81613977 C11.5471408,6.32609794 12.799703,4.98415035 14.2886734,4.98415035 C15.78437,4.98415035 17.038147,6.33462166 17.038147,7.83031828 L17.038147,9.03070778 L14.9756931,9.03070778 L14.9756932,8.1972251 C14.9756932,7.62581285 14.5827219,7.10853439 13.9992799,6.98222221 C13.3276199,6.83185056 12.6579649,7.25690108 12.5095982,7.92856109 L11.6220219,10.9897551 L11.6220219,10.9897551 L16.9709677,10.9897551 C16.9709677,13.4551243 14.7664478,15.355803 11.9394199,15.5439615 L15.0055485,18.0181528 L8.07401961,18.0181528 L11.1316441,15.5508237 Z" id="Shape" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/fountain-s.svg b/data/styles/clear/style-night/symbols/fountain-s.svg
index 6b390d027e..7fcbf1dc62 100644
--- a/data/styles/clear/style-night/symbols/fountain-s.svg
+++ b/data/styles/clear/style-night/symbols/fountain-s.svg
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>fountain-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="fountain-s-copy" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-42" opacity="0.2" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="7.5" cy="7.5" r="7.5"></circle>
-            <path d="M7.5,11 C6.34687857,11 5,10.3 5,8.55 C5,7.325 6.96428571,4.7 7.5,4 C8.03571429,4.7 10,7.325 10,8.55 C10,10.3 8.65312143,11 7.5,11 L7.5,11 Z" id="path4133-5-copy" fill="#295675" sketch:type="MSShapeGroup"></path>
+        <g id="fountain-s" sketch:type="MSLayerGroup" transform="translate(-1.000000, -1.000000)">
+            <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#133655" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <path d="M8.15815787,11.5819215 C6.23298,11.4299033 5.00457575,9.92816918 5.00457587,7.981 L8.34126545,7.981 L7.85537648,6.30213386 C7.75266108,5.83628769 7.27232388,4.87629277 6.7660499,4.9910794 C6.31907564,5.0924211 6.02476126,6.09215544 6.02476126,6.48986291 L6.02476124,6.99090774 L5.00490908,6.99090774 L5.0049091,6.23399516 C5.0049091,5.42845436 5.35141839,4.50649376 6.02615808,4.13464126 C6.22034933,4.02762147 6.44172784,3.96616704 6.68985788,3.96616704 C7.64776009,3.96616704 8.50775808,4.95227206 8.50775808,5.98964889 L8.52283517,7.981 L8.52713835,7.981 L8.52713835,6.23399516 C8.52713835,5.64798339 8.80456806,5.00761305 9.2323988,4.56130008 C9.56192775,4.21753551 9.98068323,3.98889692 10.43062,3.98889692 C11.4661023,3.98889692 12.0149155,5.10344634 12.0149155,6.14082317 L12.0149155,6.97338254 L11.0085353,6.97338254 L11.0085353,6.39530033 C11.0085353,5.99898344 10.8308225,5.10554702 10.43062,4.99239547 C9.77911381,4.80819137 9.30166799,5.83628769 9.19895259,6.30213386 L8.71306362,7.981 L8.71306362,7.981 L12.0171114,7.981 C12.0171114,9.91848393 10.7503288,11.414953 8.83818848,11.579553 L11,12.981 L6,12.981 L8.15815787,11.5819215 Z" id="Shape" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/fuel-l copy.svg b/data/styles/clear/style-night/symbols/fuel-l copy.svg
index b1fe364325..d014711684 100644
--- a/data/styles/clear/style-night/symbols/fuel-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/fuel-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>fuel-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="fuel-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M8,4.5 C7.4459904,4.5 7,4.946 7,5.5 L7,21.5 C7,22 7.5,22.5 8,22.5 L17,22.5 C17.5,22.5 18,22 18,21.5 L18,16.5 L18.5,16.5 C19,16.5 19,17 19,17 L19,19 C19,20 19.5,20.5 20.5,20.5 C21.5,20.5 22,20 22,19 L22,13.5 C22,12.5 20,11.5 20,10.5 L20,7.5 L19,7.5 L18,6.5 L18,5.5 C18,4.946 17.55401,4.5 17,4.5 L8,4.5 Z M9,6.5 L16,6.5 L16,10.5 L9,10.5 L9,6.5 Z M18,9.5 L19,9.5 L19,11 C19,12 21,13 21,14 L21,19 C21,19.5 20.5,19.5 20.5,19.5 C20.5,19.5 20,19.5 20,19 L20,16.5 C20,16 19.5,15.5 19,15.5 L18,15.5 L18,9.5 Z" id="rect7223-2-4-9-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8,4.5 C7.4459904,4.5 7,4.946 7,5.5 L7,21.5 C7,22 7.5,22.5 8,22.5 L17,22.5 C17.5,22.5 18,22 18,21.5 L18,16.5 L18.5,16.5 C19,16.5 19,17 19,17 L19,19 C19,20 19.5,20.5 20.5,20.5 C21.5,20.5 22,20 22,19 L22,13.5 C22,12.5 20,11.5 20,10.5 L20,7.5 L19,7.5 L18,6.5 L18,5.5 C18,4.946 17.55401,4.5 17,4.5 L8,4.5 Z M9,6.5 L16,6.5 L16,10.5 L9,10.5 L9,6.5 Z M18,9.5 L19,9.5 L19,11 C19,12 21,13 21,14 L21,19 C21,19.5 20.5,19.5 20.5,19.5 C20.5,19.5 20,19.5 20,19 L20,16.5 C20,16 19.5,15.5 19,15.5 L18,15.5 L18,9.5 Z" id="rect7223-2-4-9-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/fuel-m copy.svg b/data/styles/clear/style-night/symbols/fuel-m copy.svg
index 7992da7fa9..94ebece22a 100644
--- a/data/styles/clear/style-night/symbols/fuel-m copy.svg	
+++ b/data/styles/clear/style-night/symbols/fuel-m copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>fuel-m copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="fuel-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M8,5 C7.5,5 7,5.5 7,6 L7,17 C7,17.5 7.5,18 8,18 L14,18 C14.5,18 15,17.5 15,17 L15,14 L15.25,14 C15.38687,14 15.5,14.096 15.5,14.25 L15.5,15 C15.5,15.5 16,16 16.5,16 L17,16 C17.5,16 18,15.5928 18,15 L18,11.5 C18,10.5 17,10.5 17,9.5002 L17,8.0002 L16,8.0002 L15,7 L15,6.0002 C15,5.5002 14.5,5.0002 14,5.0002 L8,5 Z M8,6.5 L14,6.5 L14,9 L8,9 L8,6.5 Z M15,10 L16,10 C16,11 17,11 17,12 L17,14.75 C17,15 16.75002,15 16.75002,15 C16.75002,15 16.5,15 16.50002,14.75 L16.50002,14 C16.50002,13.4094 16.00064,12.9986 15.50002,13 L14.99993,12.9998 L15,10 Z" id="rect7223-2-4-9-4-2-3-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8,5 C7.5,5 7,5.5 7,6 L7,17 C7,17.5 7.5,18 8,18 L14,18 C14.5,18 15,17.5 15,17 L15,14 L15.25,14 C15.38687,14 15.5,14.096 15.5,14.25 L15.5,15 C15.5,15.5 16,16 16.5,16 L17,16 C17.5,16 18,15.5928 18,15 L18,11.5 C18,10.5 17,10.5 17,9.5002 L17,8.0002 L16,8.0002 L15,7 L15,6.0002 C15,5.5002 14.5,5.0002 14,5.0002 L8,5 Z M8,6.5 L14,6.5 L14,9 L8,9 L8,6.5 Z M15,10 L16,10 C16,11 17,11 17,12 L17,14.75 C17,15 16.75002,15 16.75002,15 C16.75002,15 16.5,15 16.50002,14.75 L16.50002,14 C16.50002,13.4094 16.00064,12.9986 15.50002,13 L14.99993,12.9998 L15,10 Z" id="rect7223-2-4-9-4-2-3-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/fuel-s copy.svg b/data/styles/clear/style-night/symbols/fuel-s copy.svg
index 55233495f4..2b9e616afa 100644
--- a/data/styles/clear/style-night/symbols/fuel-s copy.svg	
+++ b/data/styles/clear/style-night/symbols/fuel-s copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>fuel-s copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="fuel-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M5.5,4 C5.22299,4 5,4.223 5,4.5 L5,12.5 C5,12.75 5.25,13 5.5,13 L9.5,13 C9.75,13 10,12.75 10,12.5 L10,12 L11.25,12 C11.75,12 12,11.75 12,11.25 L12,8.5 C12,8 11,7.5 11,7 L11,6.75 L11,6 L10,5 L10,4.5 C10,4.223 9.777,4 9.5,4 L5.5,4 L5.5,4 Z M6,5 L9,5 L9,7 L6,7 L6,5 L6,5 Z M10,6.5 L10.5,6.5 L10.5,7.25 C10.5,7.75 11.5,8.25 11.5,8.75 L11.5,11 L11.5,11.25 C11.5,11.5 11.25,11.5 11.25,11.5 L10.5,11.5 L10.5,10 L10,10 L10,6.5 L10,6.5 Z" id="rect7223-2-4-9-3-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M5.5,4 C5.22299,4 5,4.223 5,4.5 L5,12.5 C5,12.75 5.25,13 5.5,13 L9.5,13 C9.75,13 10,12.75 10,12.5 L10,12 L11.25,12 C11.75,12 12,11.75 12,11.25 L12,8.5 C12,8 11,7.5 11,7 L11,6.75 L11,6 L10,5 L10,4.5 C10,4.223 9.777,4 9.5,4 L5.5,4 L5.5,4 Z M6,5 L9,5 L9,7 L6,7 L6,5 L6,5 Z M10,6.5 L10.5,6.5 L10.5,7.25 C10.5,7.75 11.5,8.25 11.5,8.75 L11.5,11 L11.5,11.25 C11.5,11.5 11.25,11.5 11.25,11.5 L10.5,11.5 L10.5,10 L10,10 L10,6.5 L10,6.5 Z" id="rect7223-2-4-9-3-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/gallery-l.svg b/data/styles/clear/style-night/symbols/gallery-l.svg
index 3f4cb085e2..ef1558f56b 100644
--- a/data/styles/clear/style-night/symbols/gallery-l.svg
+++ b/data/styles/clear/style-night/symbols/gallery-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>gallery-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="art-gallery-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M12,6 C7,6 4,10 4,12 C4,14 5,15.5 7,15.5 C9,15.5 10,16 10,17.5 C10,19.5 11.5,21 13.5,21 C20,21 23,17.5 23,14 C23,8 18,6 12,6 L12,6 Z M10.75,8 C11.44034,8 12,8.55966 12,9.25 C12,9.94034 11.44034,10.5 10.75,10.5 C10.05966,10.5 9.5,9.94034 9.5,9.25 C9.5,8.55966 10.05966,8 10.75,8 L10.75,8 Z M14.75,8 C15.44033,8 16,8.55967 16,9.25 C16,9.94033 15.44033,10.5 14.75,10.5 C14.05967,10.5 13.5,9.94033 13.5,9.25 C13.5,8.55967 14.05967,8 14.75,8 L14.75,8 Z M18.75,10 C19.44034,10 20,10.55966 20,11.25 C20,11.94034 19.44034,12.5 18.75,12.5 C18.05966,12.5 17.5,11.94034 17.5,11.25 C17.5,10.55966 18.05966,10 18.75,10 L18.75,10 Z M7.25,11 C7.94034,11 8.5,11.55966 8.5,12.25 C8.5,12.94034 7.94034,13.5 7.25,13.5 C6.55966,13.5 6,12.94034 6,12.25 C6,11.55966 6.55966,11 7.25,11 L7.25,11 Z M13.5,16 C14.32843,16 15,16.67157 15,17.5 C15,18.32843 14.32843,19 13.5,19 C12.67157,19 12,18.32843 12,17.5 C12,16.67157 12.67157,16 13.5,16 L13.5,16 Z" id="path6511" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M12,6 C7,6 4,10 4,12 C4,14 5,15.5 7,15.5 C9,15.5 10,16 10,17.5 C10,19.5 11.5,21 13.5,21 C20,21 23,17.5 23,14 C23,8 18,6 12,6 L12,6 Z M10.75,8 C11.44034,8 12,8.55966 12,9.25 C12,9.94034 11.44034,10.5 10.75,10.5 C10.05966,10.5 9.5,9.94034 9.5,9.25 C9.5,8.55966 10.05966,8 10.75,8 L10.75,8 Z M14.75,8 C15.44033,8 16,8.55967 16,9.25 C16,9.94033 15.44033,10.5 14.75,10.5 C14.05967,10.5 13.5,9.94033 13.5,9.25 C13.5,8.55967 14.05967,8 14.75,8 L14.75,8 Z M18.75,10 C19.44034,10 20,10.55966 20,11.25 C20,11.94034 19.44034,12.5 18.75,12.5 C18.05966,12.5 17.5,11.94034 17.5,11.25 C17.5,10.55966 18.05966,10 18.75,10 L18.75,10 Z M7.25,11 C7.94034,11 8.5,11.55966 8.5,12.25 C8.5,12.94034 7.94034,13.5 7.25,13.5 C6.55966,13.5 6,12.94034 6,12.25 C6,11.55966 6.55966,11 7.25,11 L7.25,11 Z M13.5,16 C14.32843,16 15,16.67157 15,17.5 C15,18.32843 14.32843,19 13.5,19 C12.67157,19 12,18.32843 12,17.5 C12,16.67157 12.67157,16 13.5,16 L13.5,16 Z" id="path6511" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/gallery-m.svg b/data/styles/clear/style-night/symbols/gallery-m.svg
index c01dc5f3e8..404cb5eb0a 100644
--- a/data/styles/clear/style-night/symbols/gallery-m.svg
+++ b/data/styles/clear/style-night/symbols/gallery-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>gallery-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="art-gallery-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M10.5000045,7 C6.61111446,7 4.00000442,10.44444 4.00000442,12.0000001 C4.00000442,13.5000001 4.99999444,14.5000001 6.50000446,14.5000001 C8.05556448,14.5000001 9.5000045,14.8333301 9.5000045,16.0000001 C9.5000045,17.5555601 10.9444445,18.5000002 12.5000045,18.5000002 C17.0000046,18.5000002 19.0000046,15.7222201 19.0000046,13.0000001 C19.0000046,7.50000001 14.3660046,7 10.5000045,7 L10.5000045,7 Z M9.00000449,8.50000002 C9.5522845,8.50000002 10.0000045,8.94772003 10.0000045,9.50000003 C10.0000045,10.05228 9.5522845,10.5 9.00000449,10.5 C8.44772449,10.5 8.00000448,10.05228 8.00000448,9.50000003 C8.00000448,8.94772003 8.44772449,8.50000002 9.00000449,8.50000002 L9.00000449,8.50000002 Z M12.0000045,8.50000002 C12.5522745,8.50000002 13.0000046,8.94773003 13.0000046,9.50000003 C13.0000046,10.05227 12.5522745,10.5 12.0000045,10.5 C11.4477345,10.5 11.0000045,10.05227 11.0000045,9.50000003 C11.0000045,8.94773003 11.4477345,8.50000002 12.0000045,8.50000002 L12.0000045,8.50000002 Z M15.0000046,10 C15.5446246,10 15.9687546,10.45538 15.9687546,11.0000001 C15.9687546,11.5446201 15.5446246,11.9687501 15.0000046,11.9687501 C14.4553846,11.9687501 14.0000046,11.5446201 14.0000046,11.0000001 C14.0000046,10.45538 14.4553846,10 15.0000046,10 L15.0000046,10 Z M7.00000447,11.0000001 C7.55229447,11.0000001 8.00000448,11.4477101 8.00000448,12.0000001 C8.00000448,12.5522901 7.55229447,13.0000001 7.00000447,13.0000001 C6.44771446,13.0000001 6.00000445,12.5522901 6.00000445,12.0000001 C6.00000445,11.4477101 6.44771446,11.0000001 7.00000447,11.0000001 L7.00000447,11.0000001 Z M12.2500045,14.5000001 C12.9403545,14.5000001 13.5000046,15.0596501 13.5000046,15.7500001 C13.5000046,16.4403501 12.9403545,17.0000001 12.2500045,17.0000001 C11.5596545,17.0000001 11.0000045,16.4403501 11.0000045,15.7500001 C11.0000045,15.0596501 11.5596545,14.5000001 12.2500045,14.5000001 L12.2500045,14.5000001 Z" id="path6511-1" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10.5000045,7 C6.61111446,7 4.00000442,10.44444 4.00000442,12.0000001 C4.00000442,13.5000001 4.99999444,14.5000001 6.50000446,14.5000001 C8.05556448,14.5000001 9.5000045,14.8333301 9.5000045,16.0000001 C9.5000045,17.5555601 10.9444445,18.5000002 12.5000045,18.5000002 C17.0000046,18.5000002 19.0000046,15.7222201 19.0000046,13.0000001 C19.0000046,7.50000001 14.3660046,7 10.5000045,7 L10.5000045,7 Z M9.00000449,8.50000002 C9.5522845,8.50000002 10.0000045,8.94772003 10.0000045,9.50000003 C10.0000045,10.05228 9.5522845,10.5 9.00000449,10.5 C8.44772449,10.5 8.00000448,10.05228 8.00000448,9.50000003 C8.00000448,8.94772003 8.44772449,8.50000002 9.00000449,8.50000002 L9.00000449,8.50000002 Z M12.0000045,8.50000002 C12.5522745,8.50000002 13.0000046,8.94773003 13.0000046,9.50000003 C13.0000046,10.05227 12.5522745,10.5 12.0000045,10.5 C11.4477345,10.5 11.0000045,10.05227 11.0000045,9.50000003 C11.0000045,8.94773003 11.4477345,8.50000002 12.0000045,8.50000002 L12.0000045,8.50000002 Z M15.0000046,10 C15.5446246,10 15.9687546,10.45538 15.9687546,11.0000001 C15.9687546,11.5446201 15.5446246,11.9687501 15.0000046,11.9687501 C14.4553846,11.9687501 14.0000046,11.5446201 14.0000046,11.0000001 C14.0000046,10.45538 14.4553846,10 15.0000046,10 L15.0000046,10 Z M7.00000447,11.0000001 C7.55229447,11.0000001 8.00000448,11.4477101 8.00000448,12.0000001 C8.00000448,12.5522901 7.55229447,13.0000001 7.00000447,13.0000001 C6.44771446,13.0000001 6.00000445,12.5522901 6.00000445,12.0000001 C6.00000445,11.4477101 6.44771446,11.0000001 7.00000447,11.0000001 L7.00000447,11.0000001 Z M12.2500045,14.5000001 C12.9403545,14.5000001 13.5000046,15.0596501 13.5000046,15.7500001 C13.5000046,16.4403501 12.9403545,17.0000001 12.2500045,17.0000001 C11.5596545,17.0000001 11.0000045,16.4403501 11.0000045,15.7500001 C11.0000045,15.0596501 11.5596545,14.5000001 12.2500045,14.5000001 L12.2500045,14.5000001 Z" id="path6511-1" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/gallery-s.svg b/data/styles/clear/style-night/symbols/gallery-s.svg
index 61cf91c39e..138837d8ec 100644
--- a/data/styles/clear/style-night/symbols/gallery-s.svg
+++ b/data/styles/clear/style-night/symbols/gallery-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>gallery-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="art-gallery-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8,5 C5.5,5 4,6.5 4,8 C4,9 4.5,10 6,10 C7,10 7,10.25 7,11 C7,12.5 8.5,13 9.5,13 C12,13 13,10.75 13,9 C13,5.5 10.48528,5 8,5 L8,5 Z M7.375,6 C7.72017,6 8,6.2798 8,6.625 C8,6.9702 7.72017,7.25 7.375,7.25 C7.02983,7.25 6.75,6.9702 6.75,6.625 C6.75,6.2798 7.02983,6 7.375,6 L7.375,6 Z M9.375,6 C9.72017,6 10,6.2798 10,6.625 C10,6.9702 9.72017,7.25 9.375,7.25 C9.02983,7.25 8.75,6.9702 8.75,6.625 C8.75,6.2798 9.02983,6 9.375,6 L9.375,6 Z M5.625,6.75 C5.97017,6.75 6.25,7.0298 6.25,7.375 C6.25,7.7202 5.97017,8 5.625,8 C5.27983,8 5,7.7202 5,7.375 C5,7.0298 5.27983,6.75 5.625,6.75 L5.625,6.75 Z M11.375,7 C11.72017,7 12,7.2798 12,7.625 C12,7.9702 11.72017,8.25 11.375,8.25 C11.02983,8.25 10.75,7.9702 10.75,7.625 C10.75,7.2798 11.02983,7 11.375,7 L11.375,7 Z M9,9.5 C9.55228,9.5 10,9.9477 10,10.5 C10,11.0523 9.55228,11.5 9,11.5 C8.44772,11.5 8,11.0523 8,10.5 C8,9.9477 8.44772,9.5 9,9.5 L9,9.5 Z" id="path6558" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8,5 C5.5,5 4,6.5 4,8 C4,9 4.5,10 6,10 C7,10 7,10.25 7,11 C7,12.5 8.5,13 9.5,13 C12,13 13,10.75 13,9 C13,5.5 10.48528,5 8,5 L8,5 Z M7.375,6 C7.72017,6 8,6.2798 8,6.625 C8,6.9702 7.72017,7.25 7.375,7.25 C7.02983,7.25 6.75,6.9702 6.75,6.625 C6.75,6.2798 7.02983,6 7.375,6 L7.375,6 Z M9.375,6 C9.72017,6 10,6.2798 10,6.625 C10,6.9702 9.72017,7.25 9.375,7.25 C9.02983,7.25 8.75,6.9702 8.75,6.625 C8.75,6.2798 9.02983,6 9.375,6 L9.375,6 Z M5.625,6.75 C5.97017,6.75 6.25,7.0298 6.25,7.375 C6.25,7.7202 5.97017,8 5.625,8 C5.27983,8 5,7.7202 5,7.375 C5,7.0298 5.27983,6.75 5.625,6.75 L5.625,6.75 Z M11.375,7 C11.72017,7 12,7.2798 12,7.625 C12,7.9702 11.72017,8.25 11.375,8.25 C11.02983,8.25 10.75,7.9702 10.75,7.625 C10.75,7.2798 11.02983,7 11.375,7 L11.375,7 Z M9,9.5 C9.55228,9.5 10,9.9477 10,10.5 C10,11.0523 9.55228,11.5 9,11.5 C8.44772,11.5 8,11.0523 8,10.5 C8,9.9477 8.44772,9.5 9,9.5 L9,9.5 Z" id="path6558" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/golf-l copy.svg b/data/styles/clear/style-night/symbols/golf-l copy.svg
index 10612de98c..d037a46fe1 100644
--- a/data/styles/clear/style-night/symbols/golf-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/golf-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>golf-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="golf-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M10,5.5 L10,17.9375 C8,17.9995 7,19.5 7,20.5 C7,21 7.5,21 7.5,21 L19.5,21 C19.5,21 20,21 20,20.5 C20,18 18.5,16 17,16 C15.42767,16 14.55691,18.7803 13,19 C12.31729,19.096 11.6576,18.6547 11,18.3125 L11,11 L18,8 L11.50162,5.215 C11.12515,5.0537 10.75012,5 10.5,5 C10.15852,5 10,5 10,5.5 Z" id="rect8138-7-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10,5.5 L10,17.9375 C8,17.9995 7,19.5 7,20.5 C7,21 7.5,21 7.5,21 L19.5,21 C19.5,21 20,21 20,20.5 C20,18 18.5,16 17,16 C15.42767,16 14.55691,18.7803 13,19 C12.31729,19.096 11.6576,18.6547 11,18.3125 L11,11 L18,8 L11.50162,5.215 C11.12515,5.0537 10.75012,5 10.5,5 C10.15852,5 10,5 10,5.5 Z" id="rect8138-7-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/golf-m copy.svg b/data/styles/clear/style-night/symbols/golf-m copy.svg
index d33be8ff85..741feeb482 100644
--- a/data/styles/clear/style-night/symbols/golf-m copy.svg	
+++ b/data/styles/clear/style-night/symbols/golf-m copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>golf-m copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="golf-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M9,5.3823 L9,14.6581 C7.47058,14.7051 7,15.7353 7,16.5 C7,16.8823 7.5,17 7.5,17 L15.5,17 C15.5,17 16,16.8823 16,16.5 C16,14.5882 15.14706,13 14,13 C12.79763,13 12.48469,15.3025 11.29411,15.4706 C10.77204,15.5446 10.26758,15.2065 9.7647,14.9449 L9.7647,9.5882 L15.11765,7.2941 L10.1483,5.1644 C9.86043,5.041 9.57362,5 9.38235,5 C9.12122,5 9,5 9,5.3823 Z" id="rect8138-7-4-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M9,5.3823 L9,14.6581 C7.47058,14.7051 7,15.7353 7,16.5 C7,16.8823 7.5,17 7.5,17 L15.5,17 C15.5,17 16,16.8823 16,16.5 C16,14.5882 15.14706,13 14,13 C12.79763,13 12.48469,15.3025 11.29411,15.4706 C10.77204,15.5446 10.26758,15.2065 9.7647,14.9449 L9.7647,9.5882 L15.11765,7.2941 L10.1483,5.1644 C9.86043,5.041 9.57362,5 9.38235,5 C9.12122,5 9,5 9,5.3823 Z" id="rect8138-7-4-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/golf-s copy.svg b/data/styles/clear/style-night/symbols/golf-s copy.svg
index e0eceb48ef..45986e5734 100644
--- a/data/styles/clear/style-night/symbols/golf-s copy.svg	
+++ b/data/styles/clear/style-night/symbols/golf-s copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>golf-s copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="golf-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M7,4 C6.80487,4 6.5,4.2143 6.5,4.5 L6.5,11.25 C5.35714,11.285 5,12.1429 5,12.7143 C5,13 5.28571,13 5.28571,13 L11.71429,13 C11.71429,13 12,13 12,12.7143 C12,11.2857 11.35714,10.1429 10.5,10.1429 C9.60152,10.1429 9.31823,11.7316 8.42857,11.8571 C8.03845,11.9121 7.37578,11.6598 7,11.4643 L7,7.5 L11,6 L7,4 Z" id="rect8138-7-8-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M7,4 C6.80487,4 6.5,4.2143 6.5,4.5 L6.5,11.25 C5.35714,11.285 5,12.1429 5,12.7143 C5,13 5.28571,13 5.28571,13 L11.71429,13 C11.71429,13 12,13 12,12.7143 C12,11.2857 11.35714,10.1429 10.5,10.1429 C9.60152,10.1429 9.31823,11.7316 8.42857,11.8571 C8.03845,11.9121 7.37578,11.6598 7,11.4643 L7,7.5 L11,6 L7,4 Z" id="rect8138-7-8-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/grocery-l.svg b/data/styles/clear/style-night/symbols/grocery-l.svg
index 983589f69e..c6245b94e0 100644
--- a/data/styles/clear/style-night/symbols/grocery-l.svg
+++ b/data/styles/clear/style-night/symbols/grocery-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>grocery-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="grocery-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M21,5.999983 C20.416667,5.999983 19.899101,6.163382 19.53125,6.531233 C19.163399,6.899084 19,7.41665 19,7.999983 L5,7.999983 L7,16.999983 L19,16.999983 L19,17.999983 L8,17.999983 C7,17.999983 7,18.999983 8,18.999983 L9.5,18.999983 L17.5,18.999983 L19,18.999983 C19.5,18.999983 20,18.499983 20,17.999983 L20,16.999983 L20,8.999983 L20,7.999983 C20,7.999983 20.0866,7.350882 20.21875,7.218733 C20.350899,7.086584 20.583333,6.999983 21,6.999983 L21.4,6.999983 C21.9,6.999983 22,6.75131 22,6.499983 C22,6.252562 21.9,5.999983 21.4,5.999983 L21,5.999983 L21,5.999983 Z M17.5,18.999983 C16.671573,18.999983 16,19.671556 16,20.499983 C16,21.32841 16.671573,21.999983 17.5,21.999983 C18.328427,21.999983 19,21.32841 19,20.499983 C19,19.671556 18.328427,18.999983 17.5,18.999983 L17.5,18.999983 Z M9.5,18.999983 C8.6715729,18.999983 8,19.671556 8,20.499983 C8,21.32841 8.6715729,21.999983 9.5,21.999983 C10.328427,21.999983 11,21.32841 11,20.499983 C11,19.671556 10.328427,18.999983 9.5,18.999983 L9.5,18.999983 Z" id="rect7842-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M21,5.999983 C20.416667,5.999983 19.899101,6.163382 19.53125,6.531233 C19.163399,6.899084 19,7.41665 19,7.999983 L5,7.999983 L7,16.999983 L19,16.999983 L19,17.999983 L8,17.999983 C7,17.999983 7,18.999983 8,18.999983 L9.5,18.999983 L17.5,18.999983 L19,18.999983 C19.5,18.999983 20,18.499983 20,17.999983 L20,16.999983 L20,8.999983 L20,7.999983 C20,7.999983 20.0866,7.350882 20.21875,7.218733 C20.350899,7.086584 20.583333,6.999983 21,6.999983 L21.4,6.999983 C21.9,6.999983 22,6.75131 22,6.499983 C22,6.252562 21.9,5.999983 21.4,5.999983 L21,5.999983 L21,5.999983 Z M17.5,18.999983 C16.671573,18.999983 16,19.671556 16,20.499983 C16,21.32841 16.671573,21.999983 17.5,21.999983 C18.328427,21.999983 19,21.32841 19,20.499983 C19,19.671556 18.328427,18.999983 17.5,18.999983 L17.5,18.999983 Z M9.5,18.999983 C8.6715729,18.999983 8,19.671556 8,20.499983 C8,21.32841 8.6715729,21.999983 9.5,21.999983 C10.328427,21.999983 11,21.32841 11,20.499983 C11,19.671556 10.328427,18.999983 9.5,18.999983 L9.5,18.999983 Z" id="rect7842-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/grocery-m.svg b/data/styles/clear/style-night/symbols/grocery-m.svg
index 4d14209a71..c04a9b9531 100644
--- a/data/styles/clear/style-night/symbols/grocery-m.svg
+++ b/data/styles/clear/style-night/symbols/grocery-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>grocery-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -9,7 +9,7 @@
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
         </g>
-        <g id="g21554-copy" sketch:type="MSLayerGroup" transform="translate(5.000000, 7.000000)" fill="#FFFFFF" opacity="0.41">
+        <g id="g21554-copy" sketch:type="MSLayerGroup" transform="translate(5.000000, 7.000000)" fill="#FFFFFF" opacity="0.400186567">
             <path d="M11.5,0 C10.5,0 10,0.5 10,1.5 L0,1.5 L1.05882,7.5 L10.23529,7.5 L10.23529,8.5 L1.82353,8.5 C1.05882,8.5 1.05918,9.2411 1.82353,9.2647 L2.97059,9.2647 L9.08823,9.2647 L10.23529,9.2647 C10.61765,9.2647 11,8.8823 11,8.5 L11,7.5 L11,2.5588 L11,1.5 C11,1 11.23836,0.7647 11.7647,0.7647 L13,0.7647 L13,0 L11.5,0 Z M9,9.2059 C8.3665,9.2059 7.85294,9.7195 7.85294,10.3529 C7.85294,10.9864 8.3665,11.5 9,11.5 C9.63351,11.5 10.14706,10.9864 10.14706,10.3529 C10.14706,9.7195 9.63351,9.2059 9,9.2059 L9,9.2059 Z M3,9.2059 C2.36649,9.2059 1.85294,9.7195 1.85294,10.3529 C1.85294,10.9864 2.36649,11.5 3,11.5 C3.6335,11.5 4.14706,10.9864 4.14706,10.3529 C4.14706,9.7195 3.6335,9.2059 3,9.2059 L3,9.2059 Z" id="rect7842-0" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/grocery-s.svg b/data/styles/clear/style-night/symbols/grocery-s.svg
index 710d3362fb..abdabc0ce7 100644
--- a/data/styles/clear/style-night/symbols/grocery-s.svg
+++ b/data/styles/clear/style-night/symbols/grocery-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>grocery-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="grocery-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M12.5,5.3622 C12.20834,5.3622 11.94955,5.4442 11.76562,5.6279 C11.5817,5.8118 11.5,6.0706 11.5,6.3622 L4,6.3622 L5,10.3622 L11.5,10.3622 L11.5,11.3622 L5.36742,11.3622 C4.86742,11.3622 4.86742,11.8622 5.36742,11.8622 L6.25,11.8622 L10.75,11.8622 L11.5,11.8622 C11.75,11.8622 12,11.6122 12,11.3622 L12,10.8622 L12,6.8622 L12,6.3622 C12,6.3622 12.0433,6.0377 12.10937,5.9716 C12.17547,5.9056 12.29166,5.8622 12.5,5.8622 L13,5.8622 L13,5.3622 L12.5,5.3622 L12.5,5.3622 Z M10.75,11.8622 C10.33578,11.8622 10,12.198 10,12.6122 C10,13.0264 10.33578,13.3622 10.75,13.3622 C11.16422,13.3622 11.5,13.0264 11.5,12.6122 C11.5,12.198 11.16422,11.8622 10.75,11.8622 L10.75,11.8622 Z M6.25,11.8622 C5.83578,11.8622 5.5,12.198 5.5,12.6122 C5.5,13.0264 5.83578,13.3622 6.25,13.3622 C6.66422,13.3622 7,13.0264 7,12.6122 C7,12.198 6.66422,11.8622 6.25,11.8622 L6.25,11.8622 Z" id="rect7842-7" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M12.5,5.3622 C12.20834,5.3622 11.94955,5.4442 11.76562,5.6279 C11.5817,5.8118 11.5,6.0706 11.5,6.3622 L4,6.3622 L5,10.3622 L11.5,10.3622 L11.5,11.3622 L5.36742,11.3622 C4.86742,11.3622 4.86742,11.8622 5.36742,11.8622 L6.25,11.8622 L10.75,11.8622 L11.5,11.8622 C11.75,11.8622 12,11.6122 12,11.3622 L12,10.8622 L12,6.8622 L12,6.3622 C12,6.3622 12.0433,6.0377 12.10937,5.9716 C12.17547,5.9056 12.29166,5.8622 12.5,5.8622 L13,5.8622 L13,5.3622 L12.5,5.3622 L12.5,5.3622 Z M10.75,11.8622 C10.33578,11.8622 10,12.198 10,12.6122 C10,13.0264 10.33578,13.3622 10.75,13.3622 C11.16422,13.3622 11.5,13.0264 11.5,12.6122 C11.5,12.198 11.16422,11.8622 10.75,11.8622 L10.75,11.8622 Z M6.25,11.8622 C5.83578,11.8622 5.5,12.198 5.5,12.6122 C5.5,13.0264 5.83578,13.3622 6.25,13.3622 C6.66422,13.3622 7,13.0264 7,12.6122 C7,12.198 6.66422,11.8622 6.25,11.8622 L6.25,11.8622 Z" id="rect7842-7" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/hospital-l.svg b/data/styles/clear/style-night/symbols/hospital-l.svg
index 22576c7c8f..57e6c322c4 100644
--- a/data/styles/clear/style-night/symbols/hospital-l.svg
+++ b/data/styles/clear/style-night/symbols/hospital-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>hospital-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="hospital-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#C15746" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M12,5.3622 C11.446,5.3622 11,5.8082 11,6.3622 L11,10.3622 L7,10.3622 C6.446,10.3622 6,10.8082 6,11.3622 L6,14.3622 C6,14.9162 6.446,15.3622 7,15.3622 L11,15.3622 L11,19.3622 C11,19.9162 11.446,20.3622 12,20.3622 L15,20.3622 C15.554,20.3622 16,19.9162 16,19.3622 L16,15.3622 L20,15.3622 C20.554,15.3622 21,14.9162 21,14.3622 L21,11.3622 C21,10.8082 20.554,10.3622 20,10.3622 L16,10.3622 L16,6.3622 C16,5.8082 15.554,5.3622 15,5.3622 L12,5.3622 Z" id="rect8206-4-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M12,5.3622 C11.446,5.3622 11,5.8082 11,6.3622 L11,10.3622 L7,10.3622 C6.446,10.3622 6,10.8082 6,11.3622 L6,14.3622 C6,14.9162 6.446,15.3622 7,15.3622 L11,15.3622 L11,19.3622 C11,19.9162 11.446,20.3622 12,20.3622 L15,20.3622 C15.554,20.3622 16,19.9162 16,19.3622 L16,15.3622 L20,15.3622 C20.554,15.3622 21,14.9162 21,14.3622 L21,11.3622 C21,10.8082 20.554,10.3622 20,10.3622 L16,10.3622 L16,6.3622 C16,5.8082 15.554,5.3622 15,5.3622 L12,5.3622 Z" id="rect8206-4-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/hospital-m.svg b/data/styles/clear/style-night/symbols/hospital-m.svg
index 61cb21e598..cd09db6d03 100644
--- a/data/styles/clear/style-night/symbols/hospital-m.svg
+++ b/data/styles/clear/style-night/symbols/hospital-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>hospital-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="hospital-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#C15746" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M10,5 C9.446,5 9,5.446 9,6 L9,9 L6,9 C5.446,9 5,9.446 5,10 L5,13 C5,13.554 5.474429,14.1752 6,14 L9,14 L9,17 C9,17.554 9.446,18 10,18 L13,18 C13.554,18 14,17.554 14,17 L14,14 L17,14 C17.554,14 18,13.554 18,13 L18,10 C18,9.446 17.554,9 17,9 L14,9 L14,6 C14,5.446 13.554,5 13,5 L10,5 Z" id="rect8206-4-3-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10,5 C9.446,5 9,5.446 9,6 L9,9 L6,9 C5.446,9 5,9.446 5,10 L5,13 C5,13.554 5.474429,14.1752 6,14 L9,14 L9,17 C9,17.554 9.446,18 10,18 L13,18 C13.554,18 14,17.554 14,17 L14,14 L17,14 C17.554,14 18,13.554 18,13 L18,10 C18,9.446 17.554,9 17,9 L14,9 L14,6 C14,5.446 13.554,5 13,5 L10,5 Z" id="rect8206-4-3-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/hospital-s.svg b/data/styles/clear/style-night/symbols/hospital-s.svg
index 5c22db281d..e837b367b1 100644
--- a/data/styles/clear/style-night/symbols/hospital-s.svg
+++ b/data/styles/clear/style-night/symbols/hospital-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>hospital-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="hospital-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#C15746" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M4,8 C4,7.446 4.446,7 5,7 L7,7 L7,5 C7,4.446 7.446,4 8,4 L9,4 C9.554,4 10,4.446 10,5 L10,7 L12,7 C12.554,7 13,7.446 13,8 L13,9 C13,9.554 12.554,10 12,10 L10,10 L10,12 C10,12.554 9.554,13 9,13 L8,13 C7.446,13 7,12.554 7,12 L7,10 L5,10 C4.446,10 4,9.554 4,9 L4,8 Z" id="path5535" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M4,8 C4,7.446 4.446,7 5,7 L7,7 L7,5 C7,4.446 7.446,4 8,4 L9,4 C9.554,4 10,4.446 10,5 L10,7 L12,7 C12.554,7 13,7.446 13,8 L13,9 C13,9.554 12.554,10 12,10 L10,10 L10,12 C10,12.554 9.554,13 9,13 L8,13 C7.446,13 7,12.554 7,12 L7,10 L5,10 C4.446,10 4,9.554 4,9 L4,8 Z" id="path5535" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/hotel-l.svg b/data/styles/clear/style-night/symbols/hotel-l.svg
index aa6eca8547..49ac5a51ba 100644
--- a/data/styles/clear/style-night/symbols/hotel-l.svg
+++ b/data/styles/clear/style-night/symbols/hotel-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>hotel-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="hotel-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M7,8 C5.89543,8 5,8.8954 5,10 C5,11.1046 5.89543,12 7,12 C8.10457,12 9,11.1046 9,10 C9,8.8954 8.10457,8 7,8 L7,8 Z M10,10 C10,11.6569 8.65686,13 7,13 L5.5,13 C5.24741,13 4.9987,13 5,13.5 C5.00035,13.636 5,14.1157 5,14.5 C5,15 5.38857,15 5.5,15 L22,15 L22,13 C22,12 22,10 17,10 L10,10 Z M6,16 C5.5,16 5,16.5 5,17 C4.99976,17.9907 5,19.1445 5,20 C5,20.5 5.5,21 6,21 C6.5,21 7,20.5 7,20 L7,18 L20,18 L20,20 C20,20.5 20.5,21 21,21 C21.5,21 22,20.5 22,20 L22,17 C22,16.5 21.5,16 21,16 L6,16 Z" id="path4536" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M7,8 C5.89543,8 5,8.8954 5,10 C5,11.1046 5.89543,12 7,12 C8.10457,12 9,11.1046 9,10 C9,8.8954 8.10457,8 7,8 L7,8 Z M10,10 C10,11.6569 8.65686,13 7,13 L5.5,13 C5.24741,13 4.9987,13 5,13.5 C5.00035,13.636 5,14.1157 5,14.5 C5,15 5.38857,15 5.5,15 L22,15 L22,13 C22,12 22,10 17,10 L10,10 Z M6,16 C5.5,16 5,16.5 5,17 C4.99976,17.9907 5,19.1445 5,20 C5,20.5 5.5,21 6,21 C6.5,21 7,20.5 7,20 L7,18 L20,18 L20,20 C20,20.5 20.5,21 21,21 C21.5,21 22,20.5 22,20 L22,17 C22,16.5 21.5,16 21,16 L6,16 Z" id="path4536" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/hotel-m.svg b/data/styles/clear/style-night/symbols/hotel-m.svg
index 7fd4565e1e..4d277f6679 100644
--- a/data/styles/clear/style-night/symbols/hotel-m.svg
+++ b/data/styles/clear/style-night/symbols/hotel-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>hotel-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="hotel-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M6.49999,7.75 C5.67157,7.75 5,8.4215 5,9.25 C5,10.0784 5.67157,10.7499 6.49999,10.7499 C7.32842,10.7499 7.99998,10.0784 7.99998,9.25 C7.99998,8.4215 7.32842,7.75 6.49999,7.75 L6.49999,7.75 Z M9,8.9999 C9,10.9999 8,11.9999 6.5,11.9999 L5.5,11.9999 C5,11.9999 5,12.4999 5,12.4999 C5,12.4999 5,12.9999 5.5,12.9999 L18,12.9999 L18,11.2498 C18,10.4998 18,8.9999 14.25003,8.9999 L9,8.9999 Z M5.74999,13.9999 C5.37499,13.9999 4.99999,14.3749 4.99999,14.7499 C4.99981,15.4929 4.99999,15.6083 4.99999,16.2499 C4.99999,16.6249 5.37499,16.9999 5.74999,16.9999 C6.12499,16.9999 6.49998,16.6249 6.49998,16.2499 L6.5,14.9999 L16.50002,14.9999 L16.5,16.2499 C16.49999,16.6249 16.875,16.9999 17.25,16.9999 C17.625,16.9999 17.99999,16.6249 17.99999,16.2499 L17.99999,14.7499 C17.99999,14.3749 17.625,13.9999 17.25,13.9999 L5.74999,13.9999 Z" id="path4536-7" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6.49999,7.75 C5.67157,7.75 5,8.4215 5,9.25 C5,10.0784 5.67157,10.7499 6.49999,10.7499 C7.32842,10.7499 7.99998,10.0784 7.99998,9.25 C7.99998,8.4215 7.32842,7.75 6.49999,7.75 L6.49999,7.75 Z M9,8.9999 C9,10.9999 8,11.9999 6.5,11.9999 L5.5,11.9999 C5,11.9999 5,12.4999 5,12.4999 C5,12.4999 5,12.9999 5.5,12.9999 L18,12.9999 L18,11.2498 C18,10.4998 18,8.9999 14.25003,8.9999 L9,8.9999 Z M5.74999,13.9999 C5.37499,13.9999 4.99999,14.3749 4.99999,14.7499 C4.99981,15.4929 4.99999,15.6083 4.99999,16.2499 C4.99999,16.6249 5.37499,16.9999 5.74999,16.9999 C6.12499,16.9999 6.49998,16.6249 6.49998,16.2499 L6.5,14.9999 L16.50002,14.9999 L16.5,16.2499 C16.49999,16.6249 16.875,16.9999 17.25,16.9999 C17.625,16.9999 17.99999,16.6249 17.99999,16.2499 L17.99999,14.7499 C17.99999,14.3749 17.625,13.9999 17.25,13.9999 L5.74999,13.9999 Z" id="path4536-7" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/hotel-s.svg b/data/styles/clear/style-night/symbols/hotel-s.svg
index 27fadaabb8..f62a343c2b 100644
--- a/data/styles/clear/style-night/symbols/hotel-s.svg
+++ b/data/styles/clear/style-night/symbols/hotel-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>hotel-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="hotel-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M5,6 C4.44771,6 4,6.4477 4,7 C4,7.5523 4.44771,8 5,8 C5.55228,8 6,7.5523 6,7 C6,6.4477 5.55228,6 5,6 L5,6 Z M7,7 C7,8 6.5,9 5,9 L4.25,9 C4.1237,9 3.99935,9 4,9.25 C4.00017,9.318 4,9.5579 4,9.75 C4,10 4.19428,10 4.25,10 L13,10 L13,8.5 C13,8 13,7 10.5,7 L7,7 Z M4.5,11 C4.25,11 4,11.25 4,11.5 C3.99988,11.9954 4,12.0723 4,12.5 C4,12.75 4.25,13 4.5,13 C4.75,13 5,12.75 5,12.5 L5,12 L12,12 L12,12.5 C12,12.75 12.25,13 12.5,13 C12.75,13 13,12.75 13,12.5 L13,11.5 C13,11.25 12.75,11 12.5,11 L4.5,11 Z" id="path4536-6" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M5,6 C4.44771,6 4,6.4477 4,7 C4,7.5523 4.44771,8 5,8 C5.55228,8 6,7.5523 6,7 C6,6.4477 5.55228,6 5,6 L5,6 Z M7,7 C7,8 6.5,9 5,9 L4.25,9 C4.1237,9 3.99935,9 4,9.25 C4.00017,9.318 4,9.5579 4,9.75 C4,10 4.19428,10 4.25,10 L13,10 L13,8.5 C13,8 13,7 10.5,7 L7,7 Z M4.5,11 C4.25,11 4,11.25 4,11.5 C3.99988,11.9954 4,12.0723 4,12.5 C4,12.75 4.25,13 4.5,13 C4.75,13 5,12.75 5,12.5 L5,12 L12,12 L12,12.5 C12,12.75 12.25,13 12.5,13 C12.75,13 13,12.75 13,12.5 L13,11.5 C13,11.25 12.75,11 12.5,11 L4.5,11 Z" id="path4536-6" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/information-l copy.svg b/data/styles/clear/style-night/symbols/information-l copy.svg
index 699d4a8b43..220667de02 100644
--- a/data/styles/clear/style-night/symbols/information-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/information-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>information-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="information-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M11.0635378,11.7954545 L11.0635378,11.2941176 C11.4659448,11.0935825 11.7483321,11.0100272 12.1013216,10.9231283 C12.454311,10.8362295 12.8284742,10.7593586 13.2238224,10.6925134 C13.6191706,10.6256681 14.010983,10.5688505 14.3992714,10.5220588 C14.7875598,10.4752671 15.1299545,10.4518717 15.4264656,10.4518717 L15.8076923,10.6925134 L13.9015588,19.4358289 L15.3841071,19.4358289 L15.3841071,20.1176471 C15.2005526,20.2379685 14.9852322,20.3516037 14.7381396,20.4585561 C14.491047,20.5655086 14.2298387,20.6590905 13.9545069,20.7393048 C13.6791752,20.8195191 13.4003177,20.8830212 13.1179261,20.9298128 C12.8355346,20.9766045 12.5672666,21 12.3131142,21 C11.7765702,21 11.5118332,20.9030758 11.3070993,20.7092246 C11.1023654,20.5153734 11,20.304814 11,20.0775401 C11,19.8101591 11.021179,19.5494665 11.0635378,19.2954545 C11.1058965,19.0414426 11.162374,18.7606967 11.2329719,18.4532086 L12.5672653,12.1363636 L11.0635378,11.7954545 Z M14.3653846,9.00802139 C15.1619492,9.00802139 15.8076923,8.33465287 15.8076923,7.5040107 C15.8076923,6.67336852 15.1619492,6 14.3653846,6 C13.5688201,6 12.9230769,6.67336852 12.9230769,7.5040107 C12.9230769,8.33465287 13.5688201,9.00802139 14.3653846,9.00802139 Z" id="i" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.0635378,11.7954545 L11.0635378,11.2941176 C11.4659448,11.0935825 11.7483321,11.0100272 12.1013216,10.9231283 C12.454311,10.8362295 12.8284742,10.7593586 13.2238224,10.6925134 C13.6191706,10.6256681 14.010983,10.5688505 14.3992714,10.5220588 C14.7875598,10.4752671 15.1299545,10.4518717 15.4264656,10.4518717 L15.8076923,10.6925134 L13.9015588,19.4358289 L15.3841071,19.4358289 L15.3841071,20.1176471 C15.2005526,20.2379685 14.9852322,20.3516037 14.7381396,20.4585561 C14.491047,20.5655086 14.2298387,20.6590905 13.9545069,20.7393048 C13.6791752,20.8195191 13.4003177,20.8830212 13.1179261,20.9298128 C12.8355346,20.9766045 12.5672666,21 12.3131142,21 C11.7765702,21 11.5118332,20.9030758 11.3070993,20.7092246 C11.1023654,20.5153734 11,20.304814 11,20.0775401 C11,19.8101591 11.021179,19.5494665 11.0635378,19.2954545 C11.1058965,19.0414426 11.162374,18.7606967 11.2329719,18.4532086 L12.5672653,12.1363636 L11.0635378,11.7954545 Z M14.3653846,9.00802139 C15.1619492,9.00802139 15.8076923,8.33465287 15.8076923,7.5040107 C15.8076923,6.67336852 15.1619492,6 14.3653846,6 C13.5688201,6 12.9230769,6.67336852 12.9230769,7.5040107 C12.9230769,8.33465287 13.5688201,9.00802139 14.3653846,9.00802139 Z" id="i" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/information-m.svg b/data/styles/clear/style-night/symbols/information-m.svg
index e1c1159eb2..464df06c13 100644
--- a/data/styles/clear/style-night/symbols/information-m.svg
+++ b/data/styles/clear/style-night/symbols/information-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>information-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="information-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M9.06353778,9.79545455 L9.06353778,9.29411765 C9.46594481,9.09358249 9.74833213,9.01002717 10.1013216,8.92312834 C10.454311,8.83622951 10.8284742,8.75935862 11.2238224,8.69251337 C11.6191706,8.62566811 12.010983,8.5688505 12.3992714,8.52205882 C12.7875598,8.47526714 13.1299545,8.45187166 13.4264656,8.45187166 L13.8076923,8.69251337 L11.9015588,17.4358289 L13.3841071,17.4358289 L13.3841071,18.1176471 C13.2005526,18.2379685 12.9852322,18.3516037 12.7381396,18.4585561 C12.491047,18.5655086 12.2298387,18.6590905 11.9545069,18.7393048 C11.6791752,18.8195191 11.4003177,18.8830212 11.1179261,18.9298128 C10.8355346,18.9766045 10.5672666,19 10.3131142,19 C9.77657023,19 9.51183317,18.9030758 9.30709929,18.7092246 C9.10236541,18.5153734 9,18.304814 9,18.0775401 C9,17.8101591 9.02117905,17.5494665 9.06353778,17.2954545 C9.10589652,17.0414426 9.16237398,16.7606967 9.23297187,16.4532086 L10.5672653,10.1363636 L9.06353778,9.79545455 Z M12.3653846,7.00802139 C13.1619492,7.00802139 13.8076923,6.33465287 13.8076923,5.5040107 C13.8076923,4.67336852 13.1619492,4 12.3653846,4 C11.5688201,4 10.9230769,4.67336852 10.9230769,5.5040107 C10.9230769,6.33465287 11.5688201,7.00802139 12.3653846,7.00802139 Z" id="i-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M9.06353778,9.79545455 L9.06353778,9.29411765 C9.46594481,9.09358249 9.74833213,9.01002717 10.1013216,8.92312834 C10.454311,8.83622951 10.8284742,8.75935862 11.2238224,8.69251337 C11.6191706,8.62566811 12.010983,8.5688505 12.3992714,8.52205882 C12.7875598,8.47526714 13.1299545,8.45187166 13.4264656,8.45187166 L13.8076923,8.69251337 L11.9015588,17.4358289 L13.3841071,17.4358289 L13.3841071,18.1176471 C13.2005526,18.2379685 12.9852322,18.3516037 12.7381396,18.4585561 C12.491047,18.5655086 12.2298387,18.6590905 11.9545069,18.7393048 C11.6791752,18.8195191 11.4003177,18.8830212 11.1179261,18.9298128 C10.8355346,18.9766045 10.5672666,19 10.3131142,19 C9.77657023,19 9.51183317,18.9030758 9.30709929,18.7092246 C9.10236541,18.5153734 9,18.304814 9,18.0775401 C9,17.8101591 9.02117905,17.5494665 9.06353778,17.2954545 C9.10589652,17.0414426 9.16237398,16.7606967 9.23297187,16.4532086 L10.5672653,10.1363636 L9.06353778,9.79545455 Z M12.3653846,7.00802139 C13.1619492,7.00802139 13.8076923,6.33465287 13.8076923,5.5040107 C13.8076923,4.67336852 13.1619492,4 12.3653846,4 C11.5688201,4 10.9230769,4.67336852 10.9230769,5.5040107 C10.9230769,6.33465287 11.5688201,7.00802139 12.3653846,7.00802139 Z" id="i-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/information-s copy.svg b/data/styles/clear/style-night/symbols/information-s copy.svg
index 4a5e2aa2ba..420523ccf4 100644
--- a/data/styles/clear/style-night/symbols/information-s copy.svg	
+++ b/data/styles/clear/style-night/symbols/information-s copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>information-s copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="information-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M7.03964758,7.89163498 L7.03964758,7.55893536 C7.29074956,7.42585525 7.46695925,7.37040586 7.68722467,7.31273764 C7.90749009,7.25506942 8.14096793,7.20405599 8.3876652,7.15969582 C8.63436247,7.11533565 8.87885341,7.07763007 9.12114537,7.04657795 C9.36343733,7.01552583 9.57709159,7 9.76211454,7 L10,7.15969582 L8.81057269,11.9619772 L9.73568282,11.9619772 L9.73568282,12.4144487 C9.6211448,12.494297 9.48678491,12.5697081 9.33259912,12.6406844 C9.17841333,12.7116607 9.01541936,12.773764 8.84361233,12.8269962 C8.67180531,12.8802284 8.49779824,12.9223699 8.3215859,12.9534221 C8.14537357,12.9844742 7.97797436,13 7.81938326,13 C7.48457982,13 7.3193839,12.9356787 7.19162996,12.8070342 C7.06387601,12.6783897 7,12.5386573 7,12.3878327 C7,12.210392 7.01321573,12.0373899 7.03964758,11.8688213 C7.06607943,11.7002526 7.10132137,11.5139427 7.14537445,11.3098859 L7.97797357,8.11787072 L7.03964758,7.89163498 Z M9,6 C9.55228475,6 10,5.55228475 10,5 C10,4.44771525 9.55228475,4 9,4 C8.44771525,4 8,4.44771525 8,5 C8,5.55228475 8.44771525,6 9,6 Z" id="i-copy-2" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M7.03964758,7.89163498 L7.03964758,7.55893536 C7.29074956,7.42585525 7.46695925,7.37040586 7.68722467,7.31273764 C7.90749009,7.25506942 8.14096793,7.20405599 8.3876652,7.15969582 C8.63436247,7.11533565 8.87885341,7.07763007 9.12114537,7.04657795 C9.36343733,7.01552583 9.57709159,7 9.76211454,7 L10,7.15969582 L8.81057269,11.9619772 L9.73568282,11.9619772 L9.73568282,12.4144487 C9.6211448,12.494297 9.48678491,12.5697081 9.33259912,12.6406844 C9.17841333,12.7116607 9.01541936,12.773764 8.84361233,12.8269962 C8.67180531,12.8802284 8.49779824,12.9223699 8.3215859,12.9534221 C8.14537357,12.9844742 7.97797436,13 7.81938326,13 C7.48457982,13 7.3193839,12.9356787 7.19162996,12.8070342 C7.06387601,12.6783897 7,12.5386573 7,12.3878327 C7,12.210392 7.01321573,12.0373899 7.03964758,11.8688213 C7.06607943,11.7002526 7.10132137,11.5139427 7.14537445,11.3098859 L7.97797357,8.11787072 L7.03964758,7.89163498 Z M9,6 C9.55228475,6 10,5.55228475 10,5 C10,4.44771525 9.55228475,4 9,4 C8.44771525,4 8,4.44771525 8,5 C8,5.55228475 8.44771525,6 9,6 Z" id="i-copy-2" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/kindergarten-l.svg b/data/styles/clear/style-night/symbols/kindergarten-l.svg
index ba3b963404..9fb398e91f 100644
--- a/data/styles/clear/style-night/symbols/kindergarten-l.svg
+++ b/data/styles/clear/style-night/symbols/kindergarten-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>kindergarten-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="kindergarten-l-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-46" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <g id="icons2-01" transform="translate(5.000000, 7.000000)" fill="#FFFFFF" opacity="0.41" sketch:type="MSShapeGroup">
+            <g id="icons2-01" transform="translate(5.000000, 7.000000)" fill="#FFFFFF" opacity="0.400186567" sketch:type="MSShapeGroup">
                 <path d="M16.4031178,8.51254099 C16.3324747,8.49406439 16.2610957,8.48371749 16.1875092,8.48371749 C15.8239916,8.48371749 15.5016824,8.73056492 15.405284,9.08309853 C15.1896754,9.87537531 14.8430827,10.6077879 14.3949406,11.2566862 C13.9394398,9.27895053 12.5863384,4.15700956 12.5863384,4.00919673 C12.5863384,3.62488336 12.8968737,3.3107811 13.2802596,3.3107811 C13.4568674,3.3107811 13.6165502,3.37803594 13.7401756,3.48520024 L14.3831667,4.45286156 C14.5053204,4.66497298 14.7356463,4.8068733 14.9998221,4.8068733 C15.3949819,4.8068733 15.7202345,4.48316319 15.7202345,4.08332948 L15.7165552,1.59859578 C15.6952151,1.59859578 15.6488556,1.59416139 15.6488556,1.59416139 C15.4177938,1.56164257 15.2389784,1.36135618 15.2389784,1.12116033 C15.2389784,1.01916948 15.2676772,0.926047392 15.3206595,0.84918472 L16.3567583,0.416093122 L12.9114355,0 C10.7744818,0 9.04372596,1.73901797 9.04372596,3.88452122 C9.04372596,4.12397801 9.06359433,4.82461084 9.10848213,5.05298166 L2.42240732,5.05298166 C2.12364589,5.05298166 1.88007438,5.29465564 1.88007438,5.59545476 C1.88007438,5.8955148 2.12364589,6.13792785 2.42240732,6.13792785 L3.94270564,6.13792785 L2.67333749,11.3505474 C2.19355312,10.677999 1.82046926,9.91602383 1.59382266,9.08457665 C1.49742427,8.73204305 1.17658687,8.48519562 0.812333395,8.48519562 C0.739482701,8.48519562 0.666632007,8.49554252 0.597460641,8.51401912 C0.388474811,8.57166613 0.214074665,8.70765393 0.106638288,8.89685436 C-0.000798089125,9.08605478 -0.0280251162,9.30555684 0.0293724003,9.514712 C1.07135808,13.3341956 4.55420995,16 8.49992128,16 C12.4463685,16 15.9284845,13.3327174 16.9704702,9.514712 C17.0286035,9.30407871 16.9999048,9.08457665 16.8932043,8.89537623 C16.7857679,8.7061758 16.6113678,8.57092706 16.4031178,8.51254099 Z M8.49992128,14.3688854 C6.80007175,14.3688854 5.20913033,13.7584184 3.95815882,12.7259458 C4.37392288,10.585616 6.24522909,8.96928265 8.49992128,8.96928265 C10.7546135,8.96928265 12.6259197,10.586355 13.0409479,12.7266848 C11.7914481,13.7584184 10.2005067,14.3688854 8.49992128,14.3688854 L8.49992128,14.3688854 Z" id="Shape"></path>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/kindergarten-m.svg b/data/styles/clear/style-night/symbols/kindergarten-m.svg
index 54095cb778..fdb67df3c1 100644
--- a/data/styles/clear/style-night/symbols/kindergarten-m.svg
+++ b/data/styles/clear/style-night/symbols/kindergarten-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="25px" height="25px" viewBox="0 0 25 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>kindergarten-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="kindergarten-m-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-38" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="12.5"></circle>
             <circle id="Oval-1-Copy-47" fill="#3D3D37" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="11.5"></circle>
-            <path d="M19.4733392,14.5186499 C19.4110071,14.5024828 19.3480256,14.4934293 19.2830963,14.4934293 C18.9623455,14.4934293 18.6779551,14.7094208 18.5928977,15.0178877 C18.4026548,15.7111299 18.0968377,16.3519909 17.7014182,16.9197769 C17.2995057,15.1892582 16.2820633,10.7950599 16.2820633,10.6657236 C16.2820633,10.3294494 16.556065,10.05461 16.8943467,10.05461 C17.0501771,10.05461 17.1910737,10.1134579 17.300155,10.2072267 L17.7910295,11.0664304 C17.8988121,11.2520279 18.1020409,11.3761906 18.3351371,11.3761906 C18.6838076,11.3761906 18.9707952,11.0929443 18.9707952,10.7430898 L18.9675487,8.46894781 C18.9487192,8.46894781 18.5714799,7.88046797 18.618229,7.81321313 L19.7324338,7.23425798 L16.3924431,7.0701765 C14.5068957,7.0701765 12.9797582,8.59181722 12.9797582,10.4691326 C12.9797582,10.6786573 12.9972891,11.291711 13.036896,11.4915355 L7.13741822,11.4915355 C6.8738052,11.4915355 6.65888915,11.7030002 6.65888915,11.9661994 C6.65888915,12.228752 6.8738052,12.4408634 7.13741822,12.4408634 L8.47885792,12.4408634 L7.3588272,17.0019054 C6.93548805,16.4134256 6.60629641,15.7466974 6.40631411,15.0191811 C6.3212567,14.7107142 6.03816488,14.4947227 5.71676476,14.4947227 C5.65248474,14.4947227 5.58820471,14.5037762 5.52717115,14.5199432 C5.34277189,14.5703844 5.18888941,14.6893737 5.09409261,14.8549241 C4.9992958,15.0204744 4.97527196,15.2125387 5.02591682,15.3955495 C5.94531596,18.7375976 9.01842055,21.0701765 12.4999305,21.0701765 C15.9820898,21.0701765 19.0545451,18.7363043 19.9739443,15.3955495 C20.0252384,15.2112454 19.999916,15.0191811 19.9057685,14.8536307 C19.8109717,14.6880803 19.6570892,14.5697377 19.4733392,14.5186499 Z M12.4999305,19.6429512 C11.0000633,19.6429512 9.59629147,19.1087926 8.49249308,18.205379 C8.85934372,16.3325905 10.5104963,14.9182988 12.4999305,14.9182988 C14.4893648,14.9182988 16.1405174,16.3332371 16.5067187,18.2060257 C15.4042189,19.1087926 14.0004471,19.6429512 12.4999305,19.6429512 L12.4999305,19.6429512 Z" id="Shape" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M19.4733392,14.5186499 C19.4110071,14.5024828 19.3480256,14.4934293 19.2830963,14.4934293 C18.9623455,14.4934293 18.6779551,14.7094208 18.5928977,15.0178877 C18.4026548,15.7111299 18.0968377,16.3519909 17.7014182,16.9197769 C17.2995057,15.1892582 16.2820633,10.7950599 16.2820633,10.6657236 C16.2820633,10.3294494 16.556065,10.05461 16.8943467,10.05461 C17.0501771,10.05461 17.1910737,10.1134579 17.300155,10.2072267 L17.7910295,11.0664304 C17.8988121,11.2520279 18.1020409,11.3761906 18.3351371,11.3761906 C18.6838076,11.3761906 18.9707952,11.0929443 18.9707952,10.7430898 L18.9675487,8.46894781 C18.9487192,8.46894781 18.5714799,7.88046797 18.618229,7.81321313 L19.7324338,7.23425798 L16.3924431,7.0701765 C14.5068957,7.0701765 12.9797582,8.59181722 12.9797582,10.4691326 C12.9797582,10.6786573 12.9972891,11.291711 13.036896,11.4915355 L7.13741822,11.4915355 C6.8738052,11.4915355 6.65888915,11.7030002 6.65888915,11.9661994 C6.65888915,12.228752 6.8738052,12.4408634 7.13741822,12.4408634 L8.47885792,12.4408634 L7.3588272,17.0019054 C6.93548805,16.4134256 6.60629641,15.7466974 6.40631411,15.0191811 C6.3212567,14.7107142 6.03816488,14.4947227 5.71676476,14.4947227 C5.65248474,14.4947227 5.58820471,14.5037762 5.52717115,14.5199432 C5.34277189,14.5703844 5.18888941,14.6893737 5.09409261,14.8549241 C4.9992958,15.0204744 4.97527196,15.2125387 5.02591682,15.3955495 C5.94531596,18.7375976 9.01842055,21.0701765 12.4999305,21.0701765 C15.9820898,21.0701765 19.0545451,18.7363043 19.9739443,15.3955495 C20.0252384,15.2112454 19.999916,15.0191811 19.9057685,14.8536307 C19.8109717,14.6880803 19.6570892,14.5697377 19.4733392,14.5186499 Z M12.4999305,19.6429512 C11.0000633,19.6429512 9.59629147,19.1087926 8.49249308,18.205379 C8.85934372,16.3325905 10.5104963,14.9182988 12.4999305,14.9182988 C14.4893648,14.9182988 16.1405174,16.3332371 16.5067187,18.2060257 C15.4042189,19.1087926 14.0004471,19.6429512 12.4999305,19.6429512 L12.4999305,19.6429512 Z" id="Shape" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/kindergarten-s.svg b/data/styles/clear/style-night/symbols/kindergarten-s.svg
index f0ee93f2cd..5ca5995ca3 100644
--- a/data/styles/clear/style-night/symbols/kindergarten-s.svg
+++ b/data/styles/clear/style-night/symbols/kindergarten-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>kindergarten-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="kindergarten-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-38" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-48" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M13.6137821,9.83659341 C13.5680719,9.82542179 13.5218855,9.81916567 13.4742706,9.81916567 C13.2390534,9.81916567 13.0305004,9.96841861 12.968125,10.1815733 C12.8286135,10.6606126 12.6043476,11.1034559 12.3143733,11.4958034 C12.0196375,10.2999925 11.0735131,7.1635443 11.0735131,7.07417129 C11.0735131,6.84180145 11.1744477,6.65188379 11.4225209,6.65188379 C11.5367965,6.65188379 11.6401207,6.69254851 11.7201136,6.75734395 L12.3067549,7.38196355 C12.3857956,7.51021383 12.53483,7.59601192 12.7057672,7.59601192 C12.9614589,7.59601192 13.1719164,7.40028502 13.1719164,7.15853101 L13.1695357,5.65617063 C13.1557274,5.65617063 12.8790852,5.24952341 12.9133679,5.20304944 L13.5837848,4.94118651 L11.3544583,4.68960147 C9.97172354,4.68960147 8.85182268,5.74107499 8.85182268,7.03832431 C8.85182268,7.18310859 8.86467868,7.60673668 8.89372373,7.74481799 L4.56744003,7.74481799 C4.37412381,7.74481799 4.21651871,7.89094287 4.21651871,8.07281696 C4.21651871,8.25424418 4.37412381,8.40081592 4.56744003,8.40081592 L5.55116247,8.40081592 L4.72980661,11.5525553 C4.4193579,11.1459081 4.1779507,10.6851902 4.03129701,10.182467 C3.96892158,9.96931234 3.76132091,9.8200594 3.52562749,9.8200594 C3.47848881,9.8200594 3.43135012,9.82631552 3.38659218,9.83748714 C3.25136605,9.87234262 3.1385189,9.95456579 3.06900125,10.0689633 C2.99948359,10.1833607 2.9818661,10.3160796 3.01900567,10.4425425 C3.6932317,12.7519412 5.94684173,14.3637835 8.49994906,14.3637835 C11.0535325,14.3637835 13.3066664,12.7510474 13.9808925,10.4425425 C14.0185082,10.3151859 13.9999384,10.182467 13.9308969,10.0680695 C13.8613792,9.95367206 13.7485321,9.87189575 13.6137821,9.83659341 Z M5.56116159,12.3841712 C5.83018539,11.09005 7.04103059,10.112756 8.49994906,10.112756 C9.95886754,10.112756 11.1697127,11.0904968 11.4382604,12.3846181 C10.6297605,13.0084417 9.60032785,13.3775523 8.49994906,13.3775523 C7.40004643,13.3775523 6.37061375,13.0084417 5.56116159,12.3841712 Z" id="Shape" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M13.6137821,9.83659341 C13.5680719,9.82542179 13.5218855,9.81916567 13.4742706,9.81916567 C13.2390534,9.81916567 13.0305004,9.96841861 12.968125,10.1815733 C12.8286135,10.6606126 12.6043476,11.1034559 12.3143733,11.4958034 C12.0196375,10.2999925 11.0735131,7.1635443 11.0735131,7.07417129 C11.0735131,6.84180145 11.1744477,6.65188379 11.4225209,6.65188379 C11.5367965,6.65188379 11.6401207,6.69254851 11.7201136,6.75734395 L12.3067549,7.38196355 C12.3857956,7.51021383 12.53483,7.59601192 12.7057672,7.59601192 C12.9614589,7.59601192 13.1719164,7.40028502 13.1719164,7.15853101 L13.1695357,5.65617063 C13.1557274,5.65617063 12.8790852,5.24952341 12.9133679,5.20304944 L13.5837848,4.94118651 L11.3544583,4.68960147 C9.97172354,4.68960147 8.85182268,5.74107499 8.85182268,7.03832431 C8.85182268,7.18310859 8.86467868,7.60673668 8.89372373,7.74481799 L4.56744003,7.74481799 C4.37412381,7.74481799 4.21651871,7.89094287 4.21651871,8.07281696 C4.21651871,8.25424418 4.37412381,8.40081592 4.56744003,8.40081592 L5.55116247,8.40081592 L4.72980661,11.5525553 C4.4193579,11.1459081 4.1779507,10.6851902 4.03129701,10.182467 C3.96892158,9.96931234 3.76132091,9.8200594 3.52562749,9.8200594 C3.47848881,9.8200594 3.43135012,9.82631552 3.38659218,9.83748714 C3.25136605,9.87234262 3.1385189,9.95456579 3.06900125,10.0689633 C2.99948359,10.1833607 2.9818661,10.3160796 3.01900567,10.4425425 C3.6932317,12.7519412 5.94684173,14.3637835 8.49994906,14.3637835 C11.0535325,14.3637835 13.3066664,12.7510474 13.9808925,10.4425425 C14.0185082,10.3151859 13.9999384,10.182467 13.9308969,10.0680695 C13.8613792,9.95367206 13.7485321,9.87189575 13.6137821,9.83659341 Z M5.56116159,12.3841712 C5.83018539,11.09005 7.04103059,10.112756 8.49994906,10.112756 C9.95886754,10.112756 11.1697127,11.0904968 11.4382604,12.3846181 C10.6297605,13.0084417 9.60032785,13.3775523 8.49994906,13.3775523 C7.40004643,13.3775523 6.37061375,13.0084417 5.56116159,12.3841712 Z" id="Shape" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/library-l.svg b/data/styles/clear/style-night/symbols/library-l.svg
index 909d07d9cc..a7a2000fe0 100644
--- a/data/styles/clear/style-night/symbols/library-l.svg
+++ b/data/styles/clear/style-night/symbols/library-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>library-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="library-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M5,7 L5,17 C8,20 12,19 12,21 L13,21 L13,12 C13,9 8,9 5,7 L5,7 Z M22,7 C19,9 14,9 14,12 L14,21 L15,21 C15,19 19,20 22,17 L22,7 Z" id="path7994-9-9-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M5,7 L5,17 C8,20 12,19 12,21 L13,21 L13,12 C13,9 8,9 5,7 L5,7 Z M22,7 C19,9 14,9 14,12 L14,21 L15,21 C15,19 19,20 22,17 L22,7 Z" id="path7994-9-9-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/library-m.svg b/data/styles/clear/style-night/symbols/library-m.svg
index 33f9ab2212..ac3e1f0f19 100644
--- a/data/styles/clear/style-night/symbols/library-m.svg
+++ b/data/styles/clear/style-night/symbols/library-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>library-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="library-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M5,7 L5,14.6471 C7,17.1471 10,16.1177 10,17.6471 L11,17.6471 L11,10.7647 C11,8.4706 8,9.1471 5,7 L5,7 Z M18,7 C15,9.1471 12,8.4706 12,10.7647 L12,17.6471 L13,17.6471 C13,16.1177 16,17.1471 18,14.6471 L18,7 Z" id="path7994-9-9-2-1-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M5,7 L5,14.6471 C7,17.1471 10,16.1177 10,17.6471 L11,17.6471 L11,10.7647 C11,8.4706 8,9.1471 5,7 L5,7 Z M18,7 C15,9.1471 12,8.4706 12,10.7647 L12,17.6471 L13,17.6471 C13,16.1177 16,17.1471 18,14.6471 L18,7 Z" id="path7994-9-9-2-1-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/library-s.svg b/data/styles/clear/style-night/symbols/library-s.svg
index 33b006efdc..b7e7f337d3 100644
--- a/data/styles/clear/style-night/symbols/library-s.svg
+++ b/data/styles/clear/style-night/symbols/library-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>library-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="library-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M4,5.3622 L4,11.3622 C5.5,12.8622 7.75,12.3622 7.75,13.3622 L8.25,13.3622 L8.25,7.8622 C8.25,6.3622 5.5,6.3622 4,5.3622 L4,5.3622 Z M13,5.3622 C11.5,6.3622 8.75,6.3622 8.75,7.8622 L8.75,13.3622 L9.25,13.3622 C9.25,12.3622 11.5,12.8622 13,11.3622 L13,5.3622 Z" id="path7994-9-9-2-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M4,5.3622 L4,11.3622 C5.5,12.8622 7.75,12.3622 7.75,13.3622 L8.25,13.3622 L8.25,7.8622 C8.25,6.3622 5.5,6.3622 4,5.3622 L4,5.3622 Z M13,5.3622 C11.5,6.3622 8.75,6.3622 8.75,7.8622 L8.75,13.3622 L9.25,13.3622 C9.25,12.3622 11.5,12.8622 13,11.3622 L13,5.3622 Z" id="path7994-9-9-2-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/lighthouse-l.svg b/data/styles/clear/style-night/symbols/lighthouse-l.svg
index ea4c6d2cd7..e249735f9f 100644
--- a/data/styles/clear/style-night/symbols/lighthouse-l.svg
+++ b/data/styles/clear/style-night/symbols/lighthouse-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>lighthouse-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="lighthouse-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M13,4 L10.5,5.5 C9.986461,5.8081 10,6.5 10,6.5 L10,10 L9,10 L9,12 L10,13 L10,14 L9,23 L17,23 L16,14 L16,13 L17,12 L17,10 L16,10 L16,6.5 C16,6.5 16.005,5.803 15.5,5.5 L13,4 Z M14,8 L14,10 L12,10 L12,8 C12,8 12,7 13,7 C14,7 14,8 14,8 L14,8 Z" id="rect4650-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M13,4 L10.5,5.5 C9.986461,5.8081 10,6.5 10,6.5 L10,10 L9,10 L9,12 L10,13 L10,14 L9,23 L17,23 L16,14 L16,13 L17,12 L17,10 L16,10 L16,6.5 C16,6.5 16.005,5.803 15.5,5.5 L13,4 Z M14,8 L14,10 L12,10 L12,8 C12,8 12,7 13,7 C14,7 14,8 14,8 L14,8 Z" id="rect4650-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/lighthouse-m.svg b/data/styles/clear/style-night/symbols/lighthouse-m.svg
index 0257501711..f41eff8f9a 100644
--- a/data/styles/clear/style-night/symbols/lighthouse-m.svg
+++ b/data/styles/clear/style-night/symbols/lighthouse-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>lighthouse-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="lighthouse-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11.5,4 L9.0000002,6 L9.0000002,9 L8,9 L8,10 L9.0000002,11 L8,19 L15,19 L14,11 L15,10 L15,9 L14,9 L14,6 L11.5,4 Z M11.5,6 L12.5,7 L12.5,9 L10.5,9 L10.5,7 L11.5,6 Z" id="rect4650" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.5,4 L9.0000002,6 L9.0000002,9 L8,9 L8,10 L9.0000002,11 L8,19 L15,19 L14,11 L15,10 L15,9 L14,9 L14,6 L11.5,4 Z M11.5,6 L12.5,7 L12.5,9 L10.5,9 L10.5,7 L11.5,6 Z" id="rect4650" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/lighthouse-s.svg b/data/styles/clear/style-night/symbols/lighthouse-s.svg
index 86973d83e7..58779c960c 100644
--- a/data/styles/clear/style-night/symbols/lighthouse-s.svg
+++ b/data/styles/clear/style-night/symbols/lighthouse-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>lighthouse-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="lighthouse-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8,4 L7,5 L7,7 L6,7 L6,8 L7,9 L7,10 L6,14 L11,14 L10,10 L10,9 L11,8 L11,7 L10,7 L10,5 L9,4 L8,4 Z M8,5 L9,5 L9,7 L8,7 L8,5 Z" id="path5217" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8,4 L7,5 L7,7 L6,7 L6,8 L7,9 L7,10 L6,14 L11,14 L10,10 L10,9 L11,8 L11,7 L10,7 L10,5 L9,4 L8,4 Z M8,5 L9,5 L9,7 L8,7 L8,5 Z" id="path5217" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/mail-l.svg b/data/styles/clear/style-night/symbols/mail-l.svg
index 98002978b3..94df13c7db 100644
--- a/data/styles/clear/style-night/symbols/mail-l.svg
+++ b/data/styles/clear/style-night/symbols/mail-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>mail-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="mail-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M6,8 C5,8 5.5,8.3393 6,8.75 L13,14.5 L21,8.75 C21.5,8.3393 22,8 21,8 L13,8 L6,8 Z M5,9.5 L5,18 C5,18.5 5.50625,19 5.90625,19 L21.09375,19 C21.49375,19 22,18.5 22,18 L22,9.5 L13,16 L5,9.5 Z" id="path7085" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6,8 C5,8 5.5,8.3393 6,8.75 L13,14.5 L21,8.75 C21.5,8.3393 22,8 21,8 L13,8 L6,8 Z M5,9.5 L5,18 C5,18.5 5.50625,19 5.90625,19 L21.09375,19 C21.49375,19 22,18.5 22,18 L22,9.5 L13,16 L5,9.5 Z" id="path7085" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/mail-m.svg b/data/styles/clear/style-night/symbols/mail-m.svg
index 43fd9a769d..16e2c8f7cf 100644
--- a/data/styles/clear/style-night/symbols/mail-m.svg
+++ b/data/styles/clear/style-night/symbols/mail-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>mail-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="mail-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M6,7 C5.1875,7 5.40625,7.3382 5.8125,7.6719 L11.5,12 L17.1875,7.6719 C17.60585,7.3535 17.8125,7 17,7 L6,7 Z M5,8.5 L5,15 C5,15.5 5.5,16 6,16 L17,16 C17.5,16 18,15.5 18,15 L18,8.5 L11.5,13.5 L5,8.5 Z" id="path7085-23-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6,7 C5.1875,7 5.40625,7.3382 5.8125,7.6719 L11.5,12 L17.1875,7.6719 C17.60585,7.3535 17.8125,7 17,7 L6,7 Z M5,8.5 L5,15 C5,15.5 5.5,16 6,16 L17,16 C17.5,16 18,15.5 18,15 L18,8.5 L11.5,13.5 L5,8.5 Z" id="path7085-23-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/mail-s.svg b/data/styles/clear/style-night/symbols/mail-s.svg
index d918e7e085..950553d058 100644
--- a/data/styles/clear/style-night/symbols/mail-s.svg
+++ b/data/styles/clear/style-night/symbols/mail-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>mail-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="mail-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M4,6 L8.5,9 L13,6 L4,6 Z M4,7 L4,11.5 C4,11.75 4.3,12 4.5,12 L12.5,12 C12.7,12 13.05423,11.744 13,11.5 L13.00003,7 L8.5,10.5 L4,7 Z" id="path7085-2-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M4,6 L8.5,9 L13,6 L4,6 Z M4,7 L4,11.5 C4,11.75 4.3,12 4.5,12 L12.5,12 C12.7,12 13.05423,11.744 13,11.5 L13.00003,7 L8.5,10.5 L4,7 Z" id="path7085-2-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/military-l.svg b/data/styles/clear/style-night/symbols/military-l.svg
new file mode 100644
index 0000000000..f0e228dc12
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/military-l.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>military-l</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="military-l-copy" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+            <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <path d="M17.1029057,12.3396 L20.0072222,12.3396 C21.3605556,12.3396 22.4583333,14.1457875 22.4583333,16.3761 L20.615822,16.3761 C20.6490971,16.5201634 20.6666667,16.6700577 20.6666667,16.82395 C20.6666667,17.937136 19.6530546,19.4607756 18.519926,19.4607756 L7.8651208,19.4607756 C6.73199224,19.4607756 5.79055556,17.937136 5.79055556,16.82395 C5.79055556,16.670046 5.80809411,16.5201534 5.84131218,16.3761 L5.84131218,16.3761 L4.67944444,16.3761 C4.67944444,14.1457875 5.77722222,12.3396 7.13166667,12.3396 L8.02733294,12.3396 L8.02733294,6.94850297 L15.4141499,6.94850297 L16.2465142,9.6057 L22.9912688,9.6057 L22.9912688,10.981 L16.6773256,10.981 L17.1029057,12.3396 Z" id="Shape" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/military-m.svg b/data/styles/clear/style-night/symbols/military-m.svg
new file mode 100644
index 0000000000..77f53d8ff1
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/military-m.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>military-m copy</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="military-m" sketch:type="MSLayerGroup">
+            <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <path d="M14.5688918,10.122 L17.4065,10.122 C18.6245,10.122 19.6125,11.511375 19.6125,13.227 L17.9542398,13.227 C17.9841874,13.337818 18,13.4531213 18,13.5715 C18,14.4277969 17.0678353,15.4963591 16.0480196,15.4963591 L6.45869491,15.4963591 C5.43887921,15.4963591 4.6115,14.4277969 4.6115,13.5715 C4.6115,13.4531123 4.6272847,13.3378103 4.65718096,13.227 L4.65718096,13.227 L3.6115,13.227 C3.6115,11.511375 4.5995,10.122 5.8185,10.122 L6.6115,10.122 L6.6115,6.019 L13.2945,6.019 L13.9157,8.019 L20.0532028,8.019 L20.0532028,9.00950677 L14.2233514,9.00950677 L14.5688918,10.122 Z" id="Shape" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/military-s.svg b/data/styles/clear/style-night/symbols/military-s.svg
new file mode 100644
index 0000000000..e21dca17c3
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/military-s.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="17px" height="18px" viewBox="0 0 17 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>military-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="military-s-copy" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+            <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <path d="M11.033347,7.97893641 L12.4405343,7.97893641 C13.2389406,7.97893641 14.014549,8.67695893 14.014549,9.95445007 L13.8294799,9.95445007 L13.4354903,9.95445007 C13.4354903,9.95445007 13.0925936,9.95445007 12.5215828,9.95445006 C12.5378674,10.0310317 12.5464286,10.1103852 12.5464286,10.1916869 C12.5464286,10.8293039 12.0198608,11.4870979 11.3708209,11.4870979 L5.26790069,11.4870979 C4.61886084,11.4870979 4.02560464,10.8293039 4.02560464,10.1916869 C4.02560464,10.1103795 4.03415063,10.0310267 4.05040709,9.95444999 L4.05040709,9.95444999 C3.80830543,9.95444998 3.34072847,9.95444998 3.34072847,9.95444998 L2.94673891,9.95445007 C2.94673891,8.67695893 4.04546905,7.97893641 4.84453085,7.97893641 L5.01233991,7.97893641 L5.00678353,4.9270054 L9.53179704,4.9270054 L10.0608464,6.0023091 L14.0034124,6.00230908 L14.0034122,6.98099997 L10.5423623,6.98099999 L11.033347,7.97893641 Z" id="Shape" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/monument-l.svg b/data/styles/clear/style-night/symbols/monument-l.svg
index 34c955350d..cedc15769a 100644
--- a/data/styles/clear/style-night/symbols/monument-l.svg
+++ b/data/styles/clear/style-night/symbols/monument-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>monument-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,12 +8,12 @@
         <g id="monument-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M11,7 L11,16 L9,16 C8.44599,16 8,16.446 8,17 L8,19 L7,19 C6.44601,19 6,19.446 6,20 L6,21 L21,21 L21,20 C21,19.446 20.55399,19 20,19 L19,19 L19,17 C19,16.446 18.55401,16 18,16 L16,16 L16,7 C16,6 13.5,4 13.5,4 C13.5,4 10.90946,6.0041 11,7 Z" id="path11719" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11,7 L11,16 L9,16 C8.44599,16 8,16.446 8,17 L8,19 L7,19 C6.44601,19 6,19.446 6,20 L6,21 L21,21 L21,20 C21,19.446 20.55399,19 20,19 L19,19 L19,17 C19,16.446 18.55401,16 18,16 L16,16 L16,7 C16,6 13.5,4 13.5,4 C13.5,4 10.90946,6.0041 11,7 Z" id="path11719" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
         <g id="monument-l-copy-2" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M11,7 L11,16 L9,16 C8.44599,16 8,16.446 8,17 L8,19 L7,19 C6.44601,19 6,19.446 6,20 L6,21 L21,21 L21,20 C21,19.446 20.55399,19 20,19 L19,19 L19,17 C19,16.446 18.55401,16 18,16 L16,16 L16,7 C16,6 13.5,4 13.5,4 C13.5,4 10.90946,6.0041 11,7 Z" id="path11719" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11,7 L11,16 L9,16 C8.44599,16 8,16.446 8,17 L8,19 L7,19 C6.44601,19 6,19.446 6,20 L6,21 L21,21 L21,20 C21,19.446 20.55399,19 20,19 L19,19 L19,17 C19,16.446 18.55401,16 18,16 L16,16 L16,7 C16,6 13.5,4 13.5,4 C13.5,4 10.90946,6.0041 11,7 Z" id="path11719" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/monument-m.svg b/data/styles/clear/style-night/symbols/monument-m.svg
index 9f2da1eb67..3dc39f9562 100644
--- a/data/styles/clear/style-night/symbols/monument-m.svg
+++ b/data/styles/clear/style-night/symbols/monument-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>monument-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,12 +8,12 @@
         <g id="monument-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M10,6.5 L10,14 L9,14 C8.56908,14 8,14.5136 8,14.9445 L8,16.5 L7,16.5 C6.5,16.5 6,17 6,17.5 L6,18 L17,18 L17,17.5 C17,17 16.5,16.5 16,16.5 L15,16.5 L15,15 C15,14.5 14.5,14 14,14 L13,14 L13,6.5 C13,5.7223 11.44444,4 11.44444,4 C11.44444,4 10,5.7223 10,6.5 Z" id="path11719-5" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10,6.5 L10,14 L9,14 C8.56908,14 8,14.5136 8,14.9445 L8,16.5 L7,16.5 C6.5,16.5 6,17 6,17.5 L6,18 L17,18 L17,17.5 C17,17 16.5,16.5 16,16.5 L15,16.5 L15,15 C15,14.5 14.5,14 14,14 L13,14 L13,6.5 C13,5.7223 11.44444,4 11.44444,4 C11.44444,4 10,5.7223 10,6.5 Z" id="path11719-5" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
         <g id="monument-m-copy-2" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M10,6.5 L10,14 L9,14 C8.56908,14 8,14.5136 8,14.9445 L8,16.5 L7,16.5 C6.5,16.5 6,17 6,17.5 L6,18 L17,18 L17,17.5 C17,17 16.5,16.5 16,16.5 L15,16.5 L15,15 C15,14.5 14.5,14 14,14 L13,14 L13,6.5 C13,5.7223 11.44444,4 11.44444,4 C11.44444,4 10,5.7223 10,6.5 Z" id="path11719-5" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10,6.5 L10,14 L9,14 C8.56908,14 8,14.5136 8,14.9445 L8,16.5 L7,16.5 C6.5,16.5 6,17 6,17.5 L6,18 L17,18 L17,17.5 C17,17 16.5,16.5 16,16.5 L15,16.5 L15,15 C15,14.5 14.5,14 14,14 L13,14 L13,6.5 C13,5.7223 11.44444,4 11.44444,4 C11.44444,4 10,5.7223 10,6.5 Z" id="path11719-5" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/monument-s.svg b/data/styles/clear/style-night/symbols/monument-s.svg
index 8737d3798f..cfdd33f8e9 100644
--- a/data/styles/clear/style-night/symbols/monument-s.svg
+++ b/data/styles/clear/style-night/symbols/monument-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>monument-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,12 +8,12 @@
         <g id="monument-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.5,4 C8.5,4 7,5.5 7,6 L7,10 L6.5,10 C6.22299,10 6.03629,10.2254 6,10.5 L6,12 L5.5,12 C5.223,12 5,12.223 5,12.5 L5,13 L12,13 L12,12.5 C12,12.223 11.77699,12 11.5,12 L11,12 L11,10.5 C11,10.223 10.777,10 10.5,10 L10,10 L10,6 C10,5.5 8.5,4 8.5,4 L8.5,4 Z" id="path11719-7" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.5,4 C8.5,4 7,5.5 7,6 L7,10 L6.5,10 C6.22299,10 6.03629,10.2254 6,10.5 L6,12 L5.5,12 C5.223,12 5,12.223 5,12.5 L5,13 L12,13 L12,12.5 C12,12.223 11.77699,12 11.5,12 L11,12 L11,10.5 C11,10.223 10.777,10 10.5,10 L10,10 L10,6 C10,5.5 8.5,4 8.5,4 L8.5,4 Z" id="path11719-7" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
         <g id="monument-s-copy-2" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.5,4 C8.5,4 7,5.5 7,6 L7,10 L6.5,10 C6.22299,10 6.03629,10.2254 6,10.5 L6,12 L5.5,12 C5.223,12 5,12.223 5,12.5 L5,13 L12,13 L12,12.5 C12,12.223 11.77699,12 11.5,12 L11,12 L11,10.5 C11,10.223 10.777,10 10.5,10 L10,10 L10,6 C10,5.5 8.5,4 8.5,4 L8.5,4 Z" id="path11719-7" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.5,4 C8.5,4 7,5.5 7,6 L7,10 L6.5,10 C6.22299,10 6.03629,10.2254 6,10.5 L6,12 L5.5,12 C5.223,12 5,12.223 5,12.5 L5,13 L12,13 L12,12.5 C12,12.223 11.77699,12 11.5,12 L11,12 L11,10.5 C11,10.223 10.777,10 10.5,10 L10,10 L10,6 C10,5.5 8.5,4 8.5,4 L8.5,4 Z" id="path11719-7" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/museum-l.svg b/data/styles/clear/style-night/symbols/museum-l.svg
index 4dc715f022..d7680e1faa 100644
--- a/data/styles/clear/style-night/symbols/museum-l.svg
+++ b/data/styles/clear/style-night/symbols/museum-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>museum-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="museum-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M13.5,3.3622 L7,8.3622 L20,8.3622 L13.5,3.3622 Z M8,9.3622 C7.44599,9.3622 7.07835,9.8138 7,10.3622 L7,17.3622 L5.25,20.3622 C5.10167,20.6165 5,20.7189 5,20.8622 C5,21.3622 5.63165,21.3622 6,21.3622 L21,21.3622 C21.35499,21.3622 22,21.3622 22,20.8622 C22,20.716 21.9134,20.6423 21.75,20.3622 L20,17.3622 L20,10.3622 C20,9.8082 19.55401,9.3622 19,9.3622 L8,9.3622 Z M10,11.3622 L11.5,11.3622 C12,11.3622 12.5,12.3622 12.5,12.3622 L13.5,14.8622 L14.5,12.3622 C14.72318,11.8042 15,11.3622 15.5,11.3622 L17,11.3622 C17.554,11.3622 18,11.8082 18,12.3622 L18,17.3622 C18,17.8622 17.5,18.3622 17,18.3622 C16.5,18.3622 16,17.8622 16,17.3622 L16,13.3622 L14.5,16.3622 C14.5,16.3622 14,17.3622 13.5,17.3622 C13,17.3622 12.5,16.3622 12.5,16.3622 L11,13.3622 L11,17.3622 C11,17.8622 10.5,18.3622 10,18.3622 C9.5,18.3622 9,17.8622 9,17.3622 L9,16.3622 L9,12.3622 C9,11.8082 9.446,11.3622 10,11.3622 L10,11.3622 Z" id="rect7645-6-5-0" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M13.5,3.3622 L7,8.3622 L20,8.3622 L13.5,3.3622 Z M8,9.3622 C7.44599,9.3622 7.07835,9.8138 7,10.3622 L7,17.3622 L5.25,20.3622 C5.10167,20.6165 5,20.7189 5,20.8622 C5,21.3622 5.63165,21.3622 6,21.3622 L21,21.3622 C21.35499,21.3622 22,21.3622 22,20.8622 C22,20.716 21.9134,20.6423 21.75,20.3622 L20,17.3622 L20,10.3622 C20,9.8082 19.55401,9.3622 19,9.3622 L8,9.3622 Z M10,11.3622 L11.5,11.3622 C12,11.3622 12.5,12.3622 12.5,12.3622 L13.5,14.8622 L14.5,12.3622 C14.72318,11.8042 15,11.3622 15.5,11.3622 L17,11.3622 C17.554,11.3622 18,11.8082 18,12.3622 L18,17.3622 C18,17.8622 17.5,18.3622 17,18.3622 C16.5,18.3622 16,17.8622 16,17.3622 L16,13.3622 L14.5,16.3622 C14.5,16.3622 14,17.3622 13.5,17.3622 C13,17.3622 12.5,16.3622 12.5,16.3622 L11,13.3622 L11,17.3622 C11,17.8622 10.5,18.3622 10,18.3622 C9.5,18.3622 9,17.8622 9,17.3622 L9,16.3622 L9,12.3622 C9,11.8082 9.446,11.3622 10,11.3622 L10,11.3622 Z" id="rect7645-6-5-0" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/museum-m.svg b/data/styles/clear/style-night/symbols/museum-m.svg
index 8275e8b18d..6b82071537 100644
--- a/data/styles/clear/style-night/symbols/museum-m.svg
+++ b/data/styles/clear/style-night/symbols/museum-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>museum-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="museum-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11.5,5.3622 L7,8.3622 L16,8.3622 L11.5,5.3622 Z M8,9.3622 C7.5,9.3622 7,9.8622 7,10.3067 L7,15.3622 L6,16.8622 C6,17.2233 6.23397,17.3622 6.5,17.3622 L16.5,17.3622 C16.75638,17.3622 17,17.2233 17,16.8622 L16,15.3622 L16,10.3067 C16,9.8622 15.5,9.3622 15,9.3622 L8,9.3622 Z M10,10.8622 C10.5,10.8622 10.5,10.8622 11,11.8622 L11.5,12.8622 L12,11.8622 C12.5,10.8622 12.5,10.8622 13,10.8622 C13.5,10.8622 14,11.3622 14,11.8622 L14,15.3622 C14,15.7233 13.86111,15.8622 13.5,15.8622 C13.13889,15.8622 13,15.7233 13,15.3622 L13,12.4733 L12,14.3622 C11.7353,14.8622 11.2647,14.8622 11,14.3622 L10,12.4733 L10,15.3622 C10,15.7233 9.86111,15.8622 9.5,15.8622 C9.13889,15.8622 8.99995,15.7233 8.99995,15.3622 L8.99995,14.64 L9,11.8622 C9.00001,11.3622 9.5,10.8622 10,10.8622 L10,10.8622 Z" id="rect7645-6-5-0-1" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.5,5.3622 L7,8.3622 L16,8.3622 L11.5,5.3622 Z M8,9.3622 C7.5,9.3622 7,9.8622 7,10.3067 L7,15.3622 L6,16.8622 C6,17.2233 6.23397,17.3622 6.5,17.3622 L16.5,17.3622 C16.75638,17.3622 17,17.2233 17,16.8622 L16,15.3622 L16,10.3067 C16,9.8622 15.5,9.3622 15,9.3622 L8,9.3622 Z M10,10.8622 C10.5,10.8622 10.5,10.8622 11,11.8622 L11.5,12.8622 L12,11.8622 C12.5,10.8622 12.5,10.8622 13,10.8622 C13.5,10.8622 14,11.3622 14,11.8622 L14,15.3622 C14,15.7233 13.86111,15.8622 13.5,15.8622 C13.13889,15.8622 13,15.7233 13,15.3622 L13,12.4733 L12,14.3622 C11.7353,14.8622 11.2647,14.8622 11,14.3622 L10,12.4733 L10,15.3622 C10,15.7233 9.86111,15.8622 9.5,15.8622 C9.13889,15.8622 8.99995,15.7233 8.99995,15.3622 L8.99995,14.64 L9,11.8622 C9.00001,11.3622 9.5,10.8622 10,10.8622 L10,10.8622 Z" id="rect7645-6-5-0-1" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/museum-s.svg b/data/styles/clear/style-night/symbols/museum-s.svg
index 4ef7fb78e0..52ea6ab9f9 100644
--- a/data/styles/clear/style-night/symbols/museum-s.svg
+++ b/data/styles/clear/style-night/symbols/museum-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>museum-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -9,7 +9,7 @@
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <g id="museum-12-copy" transform="translate(2.000000, 2.000000)" sketch:type="MSShapeGroup">
-                <g id="g21713" transform="translate(2.000000, 1.000000)" fill="#FFFFFF" opacity="0.41">
+                <g id="g21713" transform="translate(2.000000, 1.000000)" fill="#FFFFFF" opacity="0.400186567">
                     <path d="M4.5,0.3622 L1,2.3622 L8,2.3622 L4.5,0.3622 Z M1.5,3.3622 C1.22299,3.3622 1,3.5852 1,3.8622 L1,7.3622 L1,8.3622 L0,9.3622 L9,9.3622 L8,8.3622 L8,7.3622 L8,3.8622 C8,3.5852 7.777,3.3622 7.5,3.3622 L1.5,3.3622 Z M2.5,4.3622 L3.25,4.3622 C3.5,4.3622 3.75,4.8622 3.75,4.8622 L4.5,6.3622 L5.25,4.8622 C5.38438,4.5935 5.5,4.3622 5.75,4.3622 L6.5,4.3622 C6.777,4.3622 7,4.5852 7,4.8622 L7,7.3622 C7,7.6122 6.75,7.8622 6.5,7.8622 C6.25,7.8622 6,7.6122 6,7.3622 L6,5.3622 L5.25,6.8622 C5.13059,7.101 5,7.3622 4.5,7.3622 C4,7.3622 3.8694,7.101 3.75,6.8622 L3,5.3622 L3,7.3622 C3,7.6122 2.75,7.8622 2.5,7.8622 C2.25,7.8622 2,7.6122 2,7.3622 L2,6.8622 L2,4.8622 C2,4.5852 2.223,4.3622 2.5,4.3622 L2.5,4.3622 Z" id="rect7645-6-5-0-0"></path>
                 </g>
                 <rect id="rect22246" opacity="0.5" x="0" y="0.3622" width="11.999998" height="12.000007"></rect>
diff --git a/data/styles/clear/style-night/symbols/nparkF-l.svg b/data/styles/clear/style-night/symbols/nparkF-l.svg
new file mode 100644
index 0000000000..d2fc5c3415
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/nparkF-l.svg
@@ -0,0 +1,14 @@
+<?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>nparkF-l</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="nparkF-l" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-52" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <ellipse id="Oval-1-Copy-53" fill="#1B430B" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="12.5" ry="12.5"></ellipse>
+            <path d="M13.5,5 L8,9.87164526 L11.0555556,9.87164526 L8,13.8987163 L11.0555556,13.8987163 L8,17.9720917 L12.983552,17.9720917 L12.983552,21.8951683 L14.0407867,21.8951683 L14.0407867,17.9720917 L19,17.9720917 L15.9444447,13.8987163 L19,13.8987163 L15.9444447,9.87164545 L19,9.87164545 L13.5,5 Z" id="rect4152-3-3-5-copy-2" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/nparkF-m.svg b/data/styles/clear/style-night/symbols/nparkF-m.svg
new file mode 100644
index 0000000000..4acd240520
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/nparkF-m.svg
@@ -0,0 +1,14 @@
+<?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>nparkF-m </title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="nparkF-m" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-54" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
+            <circle id="Oval-1-Copy-49" fill="#1B430B" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <path d="M11.5,5 L7.5,9 L10,9 L7,12 L9.5,12 L7,15 L11,15 L11,18 L12,18 L12,15 L16,15 L13.5,12 L16,12 L13,9 L15.5,9 L11.5,5 Z" id="rect4152-3-3-5" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/nparkF-s.svg b/data/styles/clear/style-night/symbols/nparkF-s.svg
new file mode 100644
index 0000000000..ce83354621
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/nparkF-s.svg
@@ -0,0 +1,14 @@
+<?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
+    <title>nparkF-s</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="nparkF-s" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-50" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <ellipse id="Oval-1-Copy-51" fill="#1B430B" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" rx="7.5" ry="7.5"></ellipse>
+            <path d="M8.5,4 L5,7.16404878 L7.04377508,7.16404878 L5,9.13098417 L7.04377508,9.13098417 L5,11.0880935 L5.68400832,11.0880935 L7.99911189,11.0880935 L7.99911189,13.1035326 L8.99568152,13.103533 L8.99568152,11.0880939 L12,11.0880935 L9.9828372,9.13098417 L12,9.13098417 L9.9828372,7.16404878 L12,7.16404878 L8.5,4 Z" id="rect4152-3-3-5-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/peak-l.svg b/data/styles/clear/style-night/symbols/peak-l.svg
index 02109fe1bb..7e6f2db5ad 100644
--- a/data/styles/clear/style-night/symbols/peak-l.svg
+++ b/data/styles/clear/style-night/symbols/peak-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>peak-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="peak-l-copy-2" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M13.5,6.99999995 C13.1578947,6.9999312 13.0031988,7.16458745 12.9013158,7.34374995 L7.08552632,16.96875 C7.02524737,17.0748312 7,17.1938375 7,17.3125 C7,17.828125 7.34210526,18.0001375 7.68421053,18 L19.3157895,18 C19.6578947,18.0001375 20,17.828125 20,17.3125 C20,17.1938375 19.9747868,17.0748312 19.9144737,16.96875 L14.0986842,7.34374995 C13.9968012,7.16458745 13.8421053,6.9999312 13.5,6.99999995 L13.5,6.99999995 Z" id="path11349" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M13.5,6.99999995 C13.1578947,6.9999312 13.0031988,7.16458745 12.9013158,7.34374995 L7.08552632,16.96875 C7.02524737,17.0748312 7,17.1938375 7,17.3125 C7,17.828125 7.34210526,18.0001375 7.68421053,18 L19.3157895,18 C19.6578947,18.0001375 20,17.828125 20,17.3125 C20,17.1938375 19.9747868,17.0748312 19.9144737,16.96875 L14.0986842,7.34374995 C13.9968012,7.16458745 13.8421053,6.9999312 13.5,6.99999995 L13.5,6.99999995 Z" id="path11349" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/peak-m.svg b/data/styles/clear/style-night/symbols/peak-m.svg
index cb90eaa73e..d57db16930 100644
--- a/data/styles/clear/style-night/symbols/peak-m.svg
+++ b/data/styles/clear/style-night/symbols/peak-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>peak-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="peak-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11.5,7.00000002 C11.2631579,6.99995002 11.1560607,7.11970001 11.0855263,7.25000001 L7.05921053,14.2499999 C7.01747895,14.3271499 7,14.4136999 7,14.4999999 C7,14.8749999 7.23684211,15.0000999 7.47368421,14.9999999 L15.5263158,14.9999999 C15.7631579,15.0000999 16,14.8749999 16,14.4999999 C16,14.4136999 15.9825447,14.3271499 15.9407895,14.2499999 L11.9144737,7.25000001 C11.8439393,7.11970001 11.7368421,6.99995002 11.5,7.00000002 L11.5,7.00000002 Z" id="path11349-copy-2" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.5,7.00000002 C11.2631579,6.99995002 11.1560607,7.11970001 11.0855263,7.25000001 L7.05921053,14.2499999 C7.01747895,14.3271499 7,14.4136999 7,14.4999999 C7,14.8749999 7.23684211,15.0000999 7.47368421,14.9999999 L15.5263158,14.9999999 C15.7631579,15.0000999 16,14.8749999 16,14.4999999 C16,14.4136999 15.9825447,14.3271499 15.9407895,14.2499999 L11.9144737,7.25000001 C11.8439393,7.11970001 11.7368421,6.99995002 11.5,7.00000002 L11.5,7.00000002 Z" id="path11349-copy-2" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/peak-s.svg b/data/styles/clear/style-night/symbols/peak-s.svg
index 735e981ca2..40c2ae4fc1 100644
--- a/data/styles/clear/style-night/symbols/peak-s.svg
+++ b/data/styles/clear/style-night/symbols/peak-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>peak-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="peak-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.5,5.00000001 C8.31578947,4.99996251 8.23249168,5.08977501 8.17763158,5.18750001 L5.04605263,10.4375 C5.01359474,10.4953625 5,10.560275 5,10.625 C5,10.90625 5.18421053,11.000075 5.36842105,11 L11.6315789,11 C11.8157895,11.000075 12,10.90625 12,10.625 C12,10.560275 11.9864237,10.4953625 11.9539474,10.4375 L8.82236842,5.18750001 C8.76750832,5.08977501 8.68421053,4.99996251 8.5,5.00000001 L8.5,5.00000001 Z" id="path11349-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.5,5.00000001 C8.31578947,4.99996251 8.23249168,5.08977501 8.17763158,5.18750001 L5.04605263,10.4375 C5.01359474,10.4953625 5,10.560275 5,10.625 C5,10.90625 5.18421053,11.000075 5.36842105,11 L11.6315789,11 C11.8157895,11.000075 12,10.90625 12,10.625 C12,10.560275 11.9864237,10.4953625 11.9539474,10.4375 L8.82236842,5.18750001 C8.76750832,5.08977501 8.68421053,4.99996251 8.5,5.00000001 L8.5,5.00000001 Z" id="path11349-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/pharmacy-l.svg b/data/styles/clear/style-night/symbols/pharmacy-l.svg
index ad43bedf09..03567fe39f 100644
--- a/data/styles/clear/style-night/symbols/pharmacy-l.svg
+++ b/data/styles/clear/style-night/symbols/pharmacy-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>pharmacy-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="pharmacy-l-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
             <circle id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M13.6088328,15.2221062 L19.0047692,15.2221062 C19.8372528,15.2221062 20.5024476,14.4307366 20.5024476,13.4442123 C20.5024476,12.4646326 19.8305064,11.6663185 19.0047692,11.6663185 L13.5767344,11.6663185 L13.6088328,15.2221062 Z M5.02773961,13.4442123 C5.02773961,11.480405 6.35952442,9.88842468 8.02297041,9.88842468 L19.0047692,9.88842468 C20.6589895,9.88842468 22,11.484401 22,13.4442123 C22,15.4080196 20.6682152,17 19.0047692,17 L8.02297041,17 C6.36875012,17 5.02773961,15.4040237 5.02773961,13.4442123 L5.02773961,13.4442123 Z" id="Shape-Copy-5" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" transform="translate(13.513870, 13.444212) rotate(-45.000000) translate(-13.513870, -13.444212) "></path>
+            <path d="M13.6088328,15.2221062 L19.0047692,15.2221062 C19.8372528,15.2221062 20.5024476,14.4307366 20.5024476,13.4442123 C20.5024476,12.4646326 19.8305064,11.6663185 19.0047692,11.6663185 L13.5767344,11.6663185 L13.6088328,15.2221062 Z M5.02773961,13.4442123 C5.02773961,11.480405 6.35952442,9.88842468 8.02297041,9.88842468 L19.0047692,9.88842468 C20.6589895,9.88842468 22,11.484401 22,13.4442123 C22,15.4080196 20.6682152,17 19.0047692,17 L8.02297041,17 C6.36875012,17 5.02773961,15.4040237 5.02773961,13.4442123 L5.02773961,13.4442123 Z" id="Shape-Copy-5" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup" transform="translate(13.513870, 13.444212) rotate(-45.000000) translate(-13.513870, -13.444212) "></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/pharmacy-m.svg b/data/styles/clear/style-night/symbols/pharmacy-m.svg
index 3c9051401b..f7fddf48f5 100644
--- a/data/styles/clear/style-night/symbols/pharmacy-m.svg
+++ b/data/styles/clear/style-night/symbols/pharmacy-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>pharmacy-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -9,7 +9,7 @@
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
         </g>
-        <g id="Shape-+-Rectangle-10" sketch:type="MSLayerGroup" transform="translate(12.511733, 11.704650) rotate(-45.000000) translate(-12.511733, -11.704650) translate(4.511733, 8.204650)" fill="#FFFFFF" opacity="0.41">
+        <g id="Shape-+-Rectangle-10" sketch:type="MSLayerGroup" transform="translate(12.511733, 11.704650) rotate(-45.000000) translate(-12.511733, -11.704650) translate(4.511733, 8.204650)" fill="#FFFFFF" opacity="0.400186567">
             <path d="M7.56643381,4.5 L12.3528298,4.5 C13.0885747,4.5 13.6764706,3.83232553 13.6764706,3 C13.6764706,2.17353354 13.0826123,1.5 12.3528298,1.5 L7.56431598,1.5 L7.56643381,4.5 Z M6.25277607e-13,3 C6.25277607e-13,1.34314575 1.17702484,2.27373675e-13 2.6471702,2.27373675e-13 L12.3528298,2.27373675e-13 C13.8148215,2.27373675e-13 15,1.34651712 15,3 C15,4.65685425 13.8229752,6 12.3528298,6 L2.6471702,6 C1.18517847,6 6.25277607e-13,4.65348288 6.25277607e-13,3 L6.25277607e-13,3 Z" id="Shape" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/phone-l.svg b/data/styles/clear/style-night/symbols/phone-l.svg
index f41d502688..df87477b5b 100644
--- a/data/styles/clear/style-night/symbols/phone-l.svg
+++ b/data/styles/clear/style-night/symbols/phone-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>phone-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="phone-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M16,6 C15,6 14.67371,6.3263 14,7 L6,15 C5.5,15.5 5,16 5,17 L5,18.5 C5,19.5 5.5,20 6,20.5 L6.5625,21.0625 L10.0625,17.5625 L9.5,17 C8.99991,16.5 9.5,16 9.5,16 L15,10.5 C15,10.5 15.5,10 16,10.5 L16.5625,11.0625 L20.0625,7.5625 L19.5,7 C19,6.5 18.5,6 17.5,6 L16,6 L16,6 Z M20.4375,7.9375 L16.9375,11.4375 L17.5,12 C17.85356,12.3535 18.64645,12.3536 19,12 L21,10 C21.35359,9.6463 21.35357,8.8535 21,8.5 L20.4375,7.9375 Z M10.4375,17.9375 L6.9375,21.4375 L7.5,22 C7.85362,22.3537 8.6464,22.3534 9,22 L11,20 C11.35372,19.6464 11.35352,18.8534 11,18.5 L10.4375,17.9375 Z" id="path5722-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M16,6 C15,6 14.67371,6.3263 14,7 L6,15 C5.5,15.5 5,16 5,17 L5,18.5 C5,19.5 5.5,20 6,20.5 L6.5625,21.0625 L10.0625,17.5625 L9.5,17 C8.99991,16.5 9.5,16 9.5,16 L15,10.5 C15,10.5 15.5,10 16,10.5 L16.5625,11.0625 L20.0625,7.5625 L19.5,7 C19,6.5 18.5,6 17.5,6 L16,6 L16,6 Z M20.4375,7.9375 L16.9375,11.4375 L17.5,12 C17.85356,12.3535 18.64645,12.3536 19,12 L21,10 C21.35359,9.6463 21.35357,8.8535 21,8.5 L20.4375,7.9375 Z M10.4375,17.9375 L6.9375,21.4375 L7.5,22 C7.85362,22.3537 8.6464,22.3534 9,22 L11,20 C11.35372,19.6464 11.35352,18.8534 11,18.5 L10.4375,17.9375 Z" id="path5722-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/phone-m.svg b/data/styles/clear/style-night/symbols/phone-m.svg
index a88881cdf2..f6e6796f3c 100644
--- a/data/styles/clear/style-night/symbols/phone-m.svg
+++ b/data/styles/clear/style-night/symbols/phone-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>phone-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="phone-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M13.4999986,5.27166656 L4.99999863,13.7716665 L4.99999863,16.2716665 L6.31249862,17.5841665 L9.3124986,14.5841665 L8.4999986,13.7716665 L13.4999986,8.77166653 L14.3124986,9.58416653 L17.3124985,6.58416655 L15.9999985,5.27166656 L13.4999986,5.27166656 L13.4999986,5.27166656 Z M17.6874985,6.95916655 L14.6874986,9.95916652 L14.9999985,10.2716665 L15.9999985,10.2716665 L17.9999985,8.27166654 L17.9999985,7.27166654 L17.6874985,6.95916655 L17.6874985,6.95916655 Z M9.68749859,14.9591665 L6.68749862,17.9591665 L6.99999862,18.2716665 L7.99999861,18.2716665 L9.99999859,16.2716665 L9.99999859,15.2716665 L9.68749859,14.9591665 L9.68749859,14.9591665 Z" id="path5849-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M13.4999986,5.27166656 L4.99999863,13.7716665 L4.99999863,16.2716665 L6.31249862,17.5841665 L9.3124986,14.5841665 L8.4999986,13.7716665 L13.4999986,8.77166653 L14.3124986,9.58416653 L17.3124985,6.58416655 L15.9999985,5.27166656 L13.4999986,5.27166656 L13.4999986,5.27166656 Z M17.6874985,6.95916655 L14.6874986,9.95916652 L14.9999985,10.2716665 L15.9999985,10.2716665 L17.9999985,8.27166654 L17.9999985,7.27166654 L17.6874985,6.95916655 L17.6874985,6.95916655 Z M9.68749859,14.9591665 L6.68749862,17.9591665 L6.99999862,18.2716665 L7.99999861,18.2716665 L9.99999859,16.2716665 L9.99999859,15.2716665 L9.68749859,14.9591665 L9.68749859,14.9591665 Z" id="path5849-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/phone-s.svg b/data/styles/clear/style-night/symbols/phone-s.svg
index d240ec7a45..bac0cf88dd 100644
--- a/data/styles/clear/style-night/symbols/phone-s.svg
+++ b/data/styles/clear/style-night/symbols/phone-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>phone-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="phone-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M9.82352941,4 L4,9.5 L4,11.5 L5.05882353,12.5 L6.11764706,12.5 L7.17647059,11.5 L7.17647059,10.5 L6.11764706,9.5 L9.82352941,6 L10.8823529,7 L11.9411765,7 L13,6 L13,5 L11.9411765,4 L9.82352941,4 Z" id="path6264-3-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M9.82352941,4 L4,9.5 L4,11.5 L5.05882353,12.5 L6.11764706,12.5 L7.17647059,11.5 L7.17647059,10.5 L6.11764706,9.5 L9.82352941,6 L10.8823529,7 L11.9411765,7 L13,6 L13,5 L11.9411765,4 L9.82352941,4 Z" id="path6264-3-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/pitch-l copy.svg b/data/styles/clear/style-night/symbols/pitch-l copy.svg
index 682381a750..33cc5bce21 100644
--- a/data/styles/clear/style-night/symbols/pitch-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/pitch-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>pitch-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="pitch-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M13,4 C11.89543,4 11,4.8954 11,6 C11,7.1046 11.89543,8 13,8 C14.10457,8 15,7.1046 15,6 C15,4.8954 14.10457,4 13,4 L13,4 Z M7.25,8 L7.75,10 C8,11 8.59716,11 9.34375,11 L11,11 C11.59375,12 11.31467,13.4718 11.5,15 L10.59375,15 C9.59375,15 8,16 9,18 L10.5,21 C11.5,23 13,21.5 12.5,20.5 L11,17.5 C10.75,17 11.2643,17 11.5,17 L13.96793,17 C13.96793,17 15.15167,19.6276 16.54603,21.4285 C17.06075,22.0933 17.63089,23 18.34453,23 C18.84453,23 19.70137,22.2273 18.78944,21.139 C17.0817,19.101 16,17 16,16 C16,14.8368 15.79566,12.3873 15.5,11 L17,11 C17.488,11.9781 18.25,13.5 18.25,13.5 C18.80274,14.4574 20,14.3851 20,13.5 C20,13.3785 20,13.1111 19.86048,12.8232 L18.25,9.5 C18.14722,9.2879 17.99658,9 17.25,9 L9.5,9 L8.75,6.5 C8.45,5.5 7,5.5 7,6.5 C7,7 7.17716,7.6071 7.25,8 L7.25,8 Z" id="path10527-1-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M13,4 C11.89543,4 11,4.8954 11,6 C11,7.1046 11.89543,8 13,8 C14.10457,8 15,7.1046 15,6 C15,4.8954 14.10457,4 13,4 L13,4 Z M7.25,8 L7.75,10 C8,11 8.59716,11 9.34375,11 L11,11 C11.59375,12 11.31467,13.4718 11.5,15 L10.59375,15 C9.59375,15 8,16 9,18 L10.5,21 C11.5,23 13,21.5 12.5,20.5 L11,17.5 C10.75,17 11.2643,17 11.5,17 L13.96793,17 C13.96793,17 15.15167,19.6276 16.54603,21.4285 C17.06075,22.0933 17.63089,23 18.34453,23 C18.84453,23 19.70137,22.2273 18.78944,21.139 C17.0817,19.101 16,17 16,16 C16,14.8368 15.79566,12.3873 15.5,11 L17,11 C17.488,11.9781 18.25,13.5 18.25,13.5 C18.80274,14.4574 20,14.3851 20,13.5 C20,13.3785 20,13.1111 19.86048,12.8232 L18.25,9.5 C18.14722,9.2879 17.99658,9 17.25,9 L9.5,9 L8.75,6.5 C8.45,5.5 7,5.5 7,6.5 C7,7 7.17716,7.6071 7.25,8 L7.25,8 Z" id="path10527-1-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/pitch-m copy.svg b/data/styles/clear/style-night/symbols/pitch-m copy.svg
index ae95f4039b..79dbc17340 100644
--- a/data/styles/clear/style-night/symbols/pitch-m copy.svg	
+++ b/data/styles/clear/style-night/symbols/pitch-m copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>pitch-m copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="pitch-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11.224255,5 C10.468495,5 9.855835,5.6126 9.855835,6.3684 C9.855835,7.1242 10.468495,7.7368 11.224255,7.7368 C11.980015,7.7368 12.592675,7.1242 12.592675,6.3684 C12.592675,5.6126 11.980015,5 11.224255,5 L11.224255,5 Z M7.290045,7.7368 L7.632155,9.1053 C7.803205,9.7895 8.211785,9.7895 8.722615,9.7895 L9.855835,9.7895 C10.262085,10.4737 10.071135,11.586 10.197945,12.6316 L9.577875,12.6316 C8.893665,12.6316 7.803225,13.3158 8.487415,14.6842 L9.513735,16.7369 C10.197925,18.1053 11.224245,17.079 10.882155,16.3948 L9.855835,14.3421 C9.684785,14 10.036675,14 10.197945,14 L11.886525,14 C11.886525,14 12.696455,15.6926 13.650485,16.9248 C14.002665,17.3796 14.392765,18 14.881045,18 C15.223145,18 15.809405,17.4713 15.185455,16.7267 C14.017005,15.3323 13.276885,13.8947 13.276885,13.2105 C13.276885,12.4147 13.137075,10.7387 12.934785,9.7895 L13.961105,9.7895 C14.294995,10.4587 14.881045,11.5 14.881045,11.5 C15.259235,12.1551 15.881045,12.1056 15.881045,11.5 C15.881045,11.417 15.871045,11.2383 15.785545,11.0369 L14.816325,8.7632 C14.753025,8.6148 14.642935,8.4211 14.132115,8.4211 L8.829485,8.4211 L8.316325,6.7105 C8.111065,6.0263 7.118955,6.0263 7.118955,6.7105 C7.118955,7.0526 7.240165,7.468 7.290005,7.7368 L7.290045,7.7368 Z" id="path10527-1-3-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.224255,5 C10.468495,5 9.855835,5.6126 9.855835,6.3684 C9.855835,7.1242 10.468495,7.7368 11.224255,7.7368 C11.980015,7.7368 12.592675,7.1242 12.592675,6.3684 C12.592675,5.6126 11.980015,5 11.224255,5 L11.224255,5 Z M7.290045,7.7368 L7.632155,9.1053 C7.803205,9.7895 8.211785,9.7895 8.722615,9.7895 L9.855835,9.7895 C10.262085,10.4737 10.071135,11.586 10.197945,12.6316 L9.577875,12.6316 C8.893665,12.6316 7.803225,13.3158 8.487415,14.6842 L9.513735,16.7369 C10.197925,18.1053 11.224245,17.079 10.882155,16.3948 L9.855835,14.3421 C9.684785,14 10.036675,14 10.197945,14 L11.886525,14 C11.886525,14 12.696455,15.6926 13.650485,16.9248 C14.002665,17.3796 14.392765,18 14.881045,18 C15.223145,18 15.809405,17.4713 15.185455,16.7267 C14.017005,15.3323 13.276885,13.8947 13.276885,13.2105 C13.276885,12.4147 13.137075,10.7387 12.934785,9.7895 L13.961105,9.7895 C14.294995,10.4587 14.881045,11.5 14.881045,11.5 C15.259235,12.1551 15.881045,12.1056 15.881045,11.5 C15.881045,11.417 15.871045,11.2383 15.785545,11.0369 L14.816325,8.7632 C14.753025,8.6148 14.642935,8.4211 14.132115,8.4211 L8.829485,8.4211 L8.316325,6.7105 C8.111065,6.0263 7.118955,6.0263 7.118955,6.7105 C7.118955,7.0526 7.240165,7.468 7.290005,7.7368 L7.290045,7.7368 Z" id="path10527-1-3-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/pitch-s copy.svg b/data/styles/clear/style-night/symbols/pitch-s copy.svg
index 8e92cf7dc3..4dc6dc7e53 100644
--- a/data/styles/clear/style-night/symbols/pitch-s copy.svg	
+++ b/data/styles/clear/style-night/symbols/pitch-s copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>pitch-s copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="pitch-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M7.99993334,3.5 C7.44765334,3.5 6.99993334,3.9477 6.99993334,4.5 C6.99993334,5.0523 7.44765334,5.5 7.99993334,5.5 C8.55221334,5.5 8.99993334,5.0523 8.99993334,4.5 C8.99993334,3.9477 8.55221334,3.5 7.99993334,3.5 L7.99993334,3.5 Z M5.40618334,4.7188 C5.18754334,4.7188 4.99993334,4.8517 4.99993334,5.125 C4.99993334,5.3982 5.08503334,5.7541 5.12493334,5.9688 L5.40618334,6.9688 C5.55469334,7.5123 5.87307334,7.5 6.28118334,7.5 L7.18743334,7.5 C7.51198334,8.0467 7.39862334,8.6646 7.49993334,9.5 L6.99993334,9.5 C6.45332334,9.5 5.54710334,9.8131 6.09368334,10.9063 L6.90618334,12.5625 C7.10253334,12.9552 7.30084334,12.9977 7.49993334,13 C7.85502334,13 8.15100334,12.6426 7.99993334,12.2813 L7.37493334,10.7813 C7.25706334,10.4994 7.52734334,10.5 7.65618334,10.5 L8.99993334,10.5 C8.99993334,10.5 9.45651334,11.7032 10.2186833,12.6875 C10.5000333,13.0509 10.7973433,13.5 11.1874333,13.5 C11.4607333,13.5 11.9359033,13.1261 11.4374333,12.5313 C10.5039533,11.4172 9.99993334,10.0466 9.99993334,9.5 C9.99993334,8.8643 9.81778334,8.2583 9.65618334,7.5 L10.4686833,7.5 C10.7354333,8.0347 11.1874333,8.875 11.1874333,8.875 C11.4895733,9.3983 11.9999333,9.3588 11.9999333,8.875 C11.9999333,8.808 12.0059333,8.6608 11.9374333,8.5 L11.1874333,6.7813 C11.1371333,6.6627 11.0642833,6.5 10.6561833,6.5 L6.37493334,6.5 L5.96868334,5.125 C5.88668334,4.8517 5.62482334,4.7188 5.40618334,4.7188 L5.40618334,4.7188 Z" id="path10527-1-3-2-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M7.99993334,3.5 C7.44765334,3.5 6.99993334,3.9477 6.99993334,4.5 C6.99993334,5.0523 7.44765334,5.5 7.99993334,5.5 C8.55221334,5.5 8.99993334,5.0523 8.99993334,4.5 C8.99993334,3.9477 8.55221334,3.5 7.99993334,3.5 L7.99993334,3.5 Z M5.40618334,4.7188 C5.18754334,4.7188 4.99993334,4.8517 4.99993334,5.125 C4.99993334,5.3982 5.08503334,5.7541 5.12493334,5.9688 L5.40618334,6.9688 C5.55469334,7.5123 5.87307334,7.5 6.28118334,7.5 L7.18743334,7.5 C7.51198334,8.0467 7.39862334,8.6646 7.49993334,9.5 L6.99993334,9.5 C6.45332334,9.5 5.54710334,9.8131 6.09368334,10.9063 L6.90618334,12.5625 C7.10253334,12.9552 7.30084334,12.9977 7.49993334,13 C7.85502334,13 8.15100334,12.6426 7.99993334,12.2813 L7.37493334,10.7813 C7.25706334,10.4994 7.52734334,10.5 7.65618334,10.5 L8.99993334,10.5 C8.99993334,10.5 9.45651334,11.7032 10.2186833,12.6875 C10.5000333,13.0509 10.7973433,13.5 11.1874333,13.5 C11.4607333,13.5 11.9359033,13.1261 11.4374333,12.5313 C10.5039533,11.4172 9.99993334,10.0466 9.99993334,9.5 C9.99993334,8.8643 9.81778334,8.2583 9.65618334,7.5 L10.4686833,7.5 C10.7354333,8.0347 11.1874333,8.875 11.1874333,8.875 C11.4895733,9.3983 11.9999333,9.3588 11.9999333,8.875 C11.9999333,8.808 12.0059333,8.6608 11.9374333,8.5 L11.1874333,6.7813 C11.1371333,6.6627 11.0642833,6.5 10.6561833,6.5 L6.37493334,6.5 L5.96868334,5.125 C5.88668334,4.8517 5.62482334,4.7188 5.40618334,4.7188 L5.40618334,4.7188 Z" id="path10527-1-3-2-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/place-of-worship-l copy.svg b/data/styles/clear/style-night/symbols/place-of-worship-l copy.svg
index 01d9b7ec34..b9c734e16b 100644
--- a/data/styles/clear/style-night/symbols/place-of-worship-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/place-of-worship-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>place-of-worship-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="place-of-worship-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M13.5,5 C13.5,5 11,6 11,7 L11,9 C11,10 9,10 9,11 L9,20 L18,20 L18,11 C18,10 16,10 16,8.8125 L16,7 C16,6 13.5,5 13.5,5 L13.5,5 Z M5,13 L5,20 L7,20 L7,13 C7,12 6,12 6,12 C6,12 5,12 5,13 L5,13 Z M20,13 L20,20 L22,20 L22,13 C22,12 21,12 21,12 C21,12 20,12 20,13 L20,13 Z" id="path8846-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M13.5,5 C13.5,5 11,6 11,7 L11,9 C11,10 9,10 9,11 L9,20 L18,20 L18,11 C18,10 16,10 16,8.8125 L16,7 C16,6 13.5,5 13.5,5 L13.5,5 Z M5,13 L5,20 L7,20 L7,13 C7,12 6,12 6,12 C6,12 5,12 5,13 L5,13 Z M20,13 L20,20 L22,20 L22,13 C22,12 21,12 21,12 C21,12 20,12 20,13 L20,13 Z" id="path8846-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/place-of-worship-m copy.svg b/data/styles/clear/style-night/symbols/place-of-worship-m copy.svg
index 17b88480fc..de777c411e 100644
--- a/data/styles/clear/style-night/symbols/place-of-worship-m copy.svg	
+++ b/data/styles/clear/style-night/symbols/place-of-worship-m copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>place-of-worship-m copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="place-of-worship-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11.5,5 L10,6.5 L10,8 L8,10 L8,16.5 L15,16.5 L15,10 L13,8 L13,6.5 L11.5,5 Z M5,11 L5,16.5 L6.5,16.5 L6.5,11 L5,11 Z M16.5,11 L16.5,16.5 L18,16.5 L18,11 L16.5,11 Z" id="path9064-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.5,5 L10,6.5 L10,8 L8,10 L8,16.5 L15,16.5 L15,10 L13,8 L13,6.5 L11.5,5 Z M5,11 L5,16.5 L6.5,16.5 L6.5,11 L5,11 Z M16.5,11 L16.5,16.5 L18,16.5 L18,11 L16.5,11 Z" id="path9064-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/place-of-worship-s copy.svg b/data/styles/clear/style-night/symbols/place-of-worship-s copy.svg
index 34c0a0a2fa..76ec2fa124 100644
--- a/data/styles/clear/style-night/symbols/place-of-worship-s copy.svg	
+++ b/data/styles/clear/style-night/symbols/place-of-worship-s copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>place-of-worship-s copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="place-of-worship-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.5,4 L7,4.9411 L7,6 L6,7 L6,12 L11,12 L11,7 L10,6 L10,5.0404 L8.5,4 Z M4,8 L4,12 L5,12 L5,8 L4,8 Z M12,8 L12,12 L13,12 L13,8 L12,8 Z" id="path8846-6-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.5,4 L7,4.9411 L7,6 L6,7 L6,12 L11,12 L11,7 L10,6 L10,5.0404 L8.5,4 Z M4,8 L4,12 L5,12 L5,8 L4,8 Z M12,8 L12,12 L13,12 L13,8 L12,8 Z" id="path8846-6-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/police-l.svg b/data/styles/clear/style-night/symbols/police-l.svg
index fefb56e911..a81098cb64 100644
--- a/data/styles/clear/style-night/symbols/police-l.svg
+++ b/data/styles/clear/style-night/symbols/police-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>police-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="police-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M11,4 L10,5 L10,6 L17,6 L17,5 L16,4 L11,4 L11,4 Z M10,7 L10,7.5 C10,9.433 11.56702,11 13.5,11 C15.43298,11 17,9.433 17,7.5 L17,7 L10,7 L10,7 Z M9,12 C7.5,12 7,14.5 7,16 L7,22 L9.6875,22 L16.5,12 L9,12 L9,12 Z M18,12 L11.1875,22 L20,22 L20,16 C20,14.5 19.5,12 18,12 L18,12 Z" id="rect7805-5-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11,4 L10,5 L10,6 L17,6 L17,5 L16,4 L11,4 L11,4 Z M10,7 L10,7.5 C10,9.433 11.56702,11 13.5,11 C15.43298,11 17,9.433 17,7.5 L17,7 L10,7 L10,7 Z M9,12 C7.5,12 7,14.5 7,16 L7,22 L9.6875,22 L16.5,12 L9,12 L9,12 Z M18,12 L11.1875,22 L20,22 L20,16 C20,14.5 19.5,12 18,12 L18,12 Z" id="rect7805-5-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/police-m.svg b/data/styles/clear/style-night/symbols/police-m.svg
index e9672c13ff..8cbb6f9b42 100644
--- a/data/styles/clear/style-night/symbols/police-m.svg
+++ b/data/styles/clear/style-night/symbols/police-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>police-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="police-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M10,4 L9,4.5 L9,5.5 L14,5.5 L14,4.5 L13,4 L10,4 Z M9,6.5 C8.9667,6.6627 9,6.8274 9,7 C9,8.3807 10.11931,9.5 11.5,9.5 C12.88069,9.5 14,8.3807 14,7 L14,6.5 L9,6.5 Z M9,10.5 C7.91667,10.5 7.01415,12.2917 7,13.375 L7,17.5 L8.53125,17.5 L13,10.5 L9,10.5 Z M14.5,10.5 L10.03125,17.5 L16,17.5 L16,13.375 C16,12.2916 15.58334,10.5 14.5,10.5 L14.5,10.5 Z" id="rect7805-5-4-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10,4 L9,4.5 L9,5.5 L14,5.5 L14,4.5 L13,4 L10,4 Z M9,6.5 C8.9667,6.6627 9,6.8274 9,7 C9,8.3807 10.11931,9.5 11.5,9.5 C12.88069,9.5 14,8.3807 14,7 L14,6.5 L9,6.5 Z M9,10.5 C7.91667,10.5 7.01415,12.2917 7,13.375 L7,17.5 L8.53125,17.5 L13,10.5 L9,10.5 Z M14.5,10.5 L10.03125,17.5 L16,17.5 L16,13.375 C16,12.2916 15.58334,10.5 14.5,10.5 L14.5,10.5 Z" id="rect7805-5-4-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/police-s.svg b/data/styles/clear/style-night/symbols/police-s.svg
index 45e66adbc4..1c2a4d30e1 100644
--- a/data/styles/clear/style-night/symbols/police-s.svg
+++ b/data/styles/clear/style-night/symbols/police-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>police-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="police-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M7,5 L10,5 L10,4 L7,4 L7,5 Z M7,5.75 C7,6.7165 7.53351,7.5 8.5,7.5 C9.46649,7.5 10,6.7165 10,5.75 L10,5.5 L7,5.5 L7,5.75 Z M6,8 C5.5,8 5,9.5 5,10 L5,13 L6.59375,13 L10,8 L6,8 Z M11,8 L7.59375,13 L12,13 L12,10 C12,9.5 11.5,8 11,8 L11,8 Z" id="path5442-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M7,5 L10,5 L10,4 L7,4 L7,5 Z M7,5.75 C7,6.7165 7.53351,7.5 8.5,7.5 C9.46649,7.5 10,6.7165 10,5.75 L10,5.5 L7,5.5 L7,5.75 Z M6,8 C5.5,8 5,9.5 5,10 L5,13 L6.59375,13 L10,8 L6,8 Z M11,8 L7.59375,13 L12,13 L12,10 C12,9.5 11.5,8 11,8 L11,8 Z" id="path5442-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/pub-l.svg b/data/styles/clear/style-night/symbols/pub-l.svg
index 2c68f0ef47..6f10864cc2 100644
--- a/data/styles/clear/style-night/symbols/pub-l.svg
+++ b/data/styles/clear/style-night/symbols/pub-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>pub-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="pub-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M6,6 L8,22 C8.0625,22.5 8.5,23 9,23 L18,23 C18.5,23 18.9375,22.5 19,22 L21,6 L6,6 Z M8.25,8 L18.75,8 L18.28125,12 L8.71875,12 L8.25,8 Z" id="path10133-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6,6 L8,22 C8.0625,22.5 8.5,23 9,23 L18,23 C18.5,23 18.9375,22.5 19,22 L21,6 L6,6 Z M8.25,8 L18.75,8 L18.28125,12 L8.71875,12 L8.25,8 Z" id="path10133-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/pub-m.svg b/data/styles/clear/style-night/symbols/pub-m.svg
index 4be96a0df9..8a6b256f1d 100644
--- a/data/styles/clear/style-night/symbols/pub-m.svg
+++ b/data/styles/clear/style-night/symbols/pub-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>pub-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="pub-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M6,5 L7.5,18 C7.5577,18.5 8,19 8.5,19 L14.5,19 C15,19 15.44231,18.5 15.5,18 L17,5 L6,5 Z M8,7 L15,7 L14.6,10 L8.4,10 L8,7 Z" id="path10185-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6,5 L7.5,18 C7.5577,18.5 8,19 8.5,19 L14.5,19 C15,19 15.44231,18.5 15.5,18 L17,5 L6,5 Z M8,7 L15,7 L14.6,10 L8.4,10 L8,7 Z" id="path10185-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/pub-s.svg b/data/styles/clear/style-night/symbols/pub-s.svg
index 70a1006820..7dce8d2d90 100644
--- a/data/styles/clear/style-night/symbols/pub-s.svg
+++ b/data/styles/clear/style-night/symbols/pub-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>pub-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="pub-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M5,4.3622 L6,12.8622 C6.0357,13.1479 6.21428,13.3622 6.5,13.3622 L10.5,13.3622 C10.78572,13.3622 10.94996,13.1457 11,12.8622 L12,4.3622 L5,4.3622 Z M6.5,5.3622 L10.5,5.3622 L10.25,7.3622 L6.75,7.3622 L6.5,5.3622 Z" id="path10133-9-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M5,4.3622 L6,12.8622 C6.0357,13.1479 6.21428,13.3622 6.5,13.3622 L10.5,13.3622 C10.78572,13.3622 10.94996,13.1457 11,12.8622 L12,4.3622 L5,4.3622 Z M6.5,5.3622 L10.5,5.3622 L10.25,7.3622 L6.75,7.3622 L6.5,5.3622 Z" id="path10133-9-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/recycling-l copy.svg b/data/styles/clear/style-night/symbols/recycling-l copy.svg
index 6074a758c3..46e990f7a6 100644
--- a/data/styles/clear/style-night/symbols/recycling-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/recycling-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>recycling-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="recycling-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M11.5,5 C11.223,5 11,5.223 11,5.5 L11,7 L8,7 C7.446,7 7,7.446 7,8 C7,8.554 7.446,9 8,9 L19,9 C19.554,9 20,8.554 20,8 C20,7.446 19.554,7 19,7 L16,7 L16,5.5 C16,5.223 15.77701,5 15.5,5 L11.5,5 Z M12,6 L15,6 L15,7 L12,7 L12,6 Z M8,10 C7.446,10 6.92453,10.4212 7.01563,10.9285714 L9,22.0714286 C9.0904,22.5788929 9.446,23 10,23 L17,23 C17.554,23 17.9089,22.5788 18,22.0714286 L19.98437,10.9285714 C20.07477,10.4211071 19.554,10 19,10 L8,10 Z" id="rect5636-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.5,5 C11.223,5 11,5.223 11,5.5 L11,7 L8,7 C7.446,7 7,7.446 7,8 C7,8.554 7.446,9 8,9 L19,9 C19.554,9 20,8.554 20,8 C20,7.446 19.554,7 19,7 L16,7 L16,5.5 C16,5.223 15.77701,5 15.5,5 L11.5,5 Z M12,6 L15,6 L15,7 L12,7 L12,6 Z M8,10 C7.446,10 6.92453,10.4212 7.01563,10.9285714 L9,22.0714286 C9.0904,22.5788929 9.446,23 10,23 L17,23 C17.554,23 17.9089,22.5788 18,22.0714286 L19.98437,10.9285714 C20.07477,10.4211071 19.554,10 19,10 L8,10 Z" id="rect5636-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/recycling-m copy.svg b/data/styles/clear/style-night/symbols/recycling-m copy.svg
index c04f39f775..18f049454d 100644
--- a/data/styles/clear/style-night/symbols/recycling-m copy.svg	
+++ b/data/styles/clear/style-night/symbols/recycling-m copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>recycling-m copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="recycling-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M9.518,5 C9.31389,5 9.25,5.1643 9.25,5.3684 L9.25,7 L6.73685,7 C6.32863,7 6,7.092 6,7.5 C6,7.9083 6.32863,8 6.73685,8 L16.26316,8 C16.67137,8 17,7.908 17,7.5 C17,7.0918 16.67137,7 16.26316,7 L13.75,7 L13.75,5.3684 C13.75,5.1643 13.58611,5 13.382,5 L9.518,5 Z M10,5.7368 L13,5.7368 L13,7 L10,7 L10,5.7368 Z M6.73685,9 C6.32863,9 5.94851,9.3343 6.01563,9.7369 L7.42105,18.2632 C7.48745,18.6659 7.74968,19 8.1579,19 L14.78947,19 C15.19769,19 15.45919,18.6658 15.52632,18.2632 L16.98437,9.7369 C17.05317,9.3346 16.67137,9 16.26316,9 L6.73685,9 Z" id="path5652-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M9.518,5 C9.31389,5 9.25,5.1643 9.25,5.3684 L9.25,7 L6.73685,7 C6.32863,7 6,7.092 6,7.5 C6,7.9083 6.32863,8 6.73685,8 L16.26316,8 C16.67137,8 17,7.908 17,7.5 C17,7.0918 16.67137,7 16.26316,7 L13.75,7 L13.75,5.3684 C13.75,5.1643 13.58611,5 13.382,5 L9.518,5 Z M10,5.7368 L13,5.7368 L13,7 L10,7 L10,5.7368 Z M6.73685,9 C6.32863,9 5.94851,9.3343 6.01563,9.7369 L7.42105,18.2632 C7.48745,18.6659 7.74968,19 8.1579,19 L14.78947,19 C15.19769,19 15.45919,18.6658 15.52632,18.2632 L16.98437,9.7369 C17.05317,9.3346 16.67137,9 16.26316,9 L6.73685,9 Z" id="path5652-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/recycling-s copy.svg b/data/styles/clear/style-night/symbols/recycling-s copy.svg
index 75293cf692..531d456370 100644
--- a/data/styles/clear/style-night/symbols/recycling-s copy.svg	
+++ b/data/styles/clear/style-night/symbols/recycling-s copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>recycling-s copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="recycling-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M6.5,4 L6.5,6 L5,6 L5,7 L12,7 L12,6 L10.5,6 L10.5,4 L6.5,4 Z M7,5 L10,5 L10,6 L7.01005,6 L7,5 Z M5,7.5 L6,14 L6.32584,14 L10.58899,14 L11,14 L12,7.5 L5,7.5 Z" id="path5654-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6.5,4 L6.5,6 L5,6 L5,7 L12,7 L12,6 L10.5,6 L10.5,4 L6.5,4 Z M7,5 L10,5 L10,6 L7.01005,6 L7,5 Z M5,7.5 L6,14 L6.32584,14 L10.58899,14 L11,14 L12,7.5 L5,7.5 Z" id="path5654-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/restaurant-l.svg b/data/styles/clear/style-night/symbols/restaurant-l.svg
index 59d22e857f..d2633d200c 100644
--- a/data/styles/clear/style-night/symbols/restaurant-l.svg
+++ b/data/styles/clear/style-night/symbols/restaurant-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>restaurant-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="restaurant-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M8.5,4 C8,4 8,4.5 8,4.5 L8,10.5 C8,11 8.5,11.5 9,12 C9.5,12.5 9.5,13 9.5,13.5 L9.5,15 C9.5,15.5 9,21.5 9,21.5 C8.9617,21.9985 9.5,23 10.5,23 C11.5,23 12.03846,22 12,21.5 C12,21.5 11.5,15.5 11.5,15 L11.5,13.5 C11.5,13 11.5,12.5 12,12 C12.46054,11.539461 13,11 13,10.5 L13,4.5 C13,4.5 13,4 12.5,4 C12,4 12,4.5 12,4.5 L12,9 C12,9 12,9.5 11.5,9.5 C11,9.5 11,9 11,9 L11,4.5 C11,4.5 11,4 10.5,4 C10,4 10,4.5 10,4.5 L10,9 C10,9 10,9.5 9.5,9.5 C9,9.5 9,9 9,9 L9,4.5 C9,4.5 9,4 8.5,4 L8.5,4 Z M19,4 C18,4 16.13246,4.2351 15.5,5.5 C15,6.5 15,9 15,10 L15,15 C15,15.5 15.5,16 16,16 L17,16 L17,22 C17,22.5 17.5,23 18,23 C18.5,23 19,22.5 19,22 L19,4 Z" id="path5304" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.5,4 C8,4 8,4.5 8,4.5 L8,10.5 C8,11 8.5,11.5 9,12 C9.5,12.5 9.5,13 9.5,13.5 L9.5,15 C9.5,15.5 9,21.5 9,21.5 C8.9617,21.9985 9.5,23 10.5,23 C11.5,23 12.03846,22 12,21.5 C12,21.5 11.5,15.5 11.5,15 L11.5,13.5 C11.5,13 11.5,12.5 12,12 C12.46054,11.539461 13,11 13,10.5 L13,4.5 C13,4.5 13,4 12.5,4 C12,4 12,4.5 12,4.5 L12,9 C12,9 12,9.5 11.5,9.5 C11,9.5 11,9 11,9 L11,4.5 C11,4.5 11,4 10.5,4 C10,4 10,4.5 10,4.5 L10,9 C10,9 10,9.5 9.5,9.5 C9,9.5 9,9 9,9 L9,4.5 C9,4.5 9,4 8.5,4 L8.5,4 Z M19,4 C18,4 16.13246,4.2351 15.5,5.5 C15,6.5 15,9 15,10 L15,15 C15,15.5 15.5,16 16,16 L17,16 L17,22 C17,22.5 17.5,23 18,23 C18.5,23 19,22.5 19,22 L19,4 Z" id="path5304" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/restaurant-m.svg b/data/styles/clear/style-night/symbols/restaurant-m.svg
index 20bde85bc0..16d7ab55fc 100644
--- a/data/styles/clear/style-night/symbols/restaurant-m.svg
+++ b/data/styles/clear/style-night/symbols/restaurant-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>restaurant-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="restaurant-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M8,5 L7,5 L7,9.5 C7,10.2777 8,10.2222 8,11 L8,18 C8,18.3889 8.5,19 9,19 C9.5,19 10,18.5 10,18 L10,11 C10,10.2222 11,10.2777 11,9.5 L11,5 L10,5 L10,8 L9.5,8 L9.5,5 L8.5,5 L8.5,8 L8,8 L8,5 Z M16,5 C15.22222,5 13.99192,5.5162 13.5,6.5 C13.11111,7.2777 13,9 13,10 L13,13 C13,13.5 13.61111,14 14,14 L14,18 C14,18.5 14.5,19 15,19 C15.5,19 16,18.5 16,18 L16,5 Z" id="rect6396-83" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8,5 L7,5 L7,9.5 C7,10.2777 8,10.2222 8,11 L8,18 C8,18.3889 8.5,19 9,19 C9.5,19 10,18.5 10,18 L10,11 C10,10.2222 11,10.2777 11,9.5 L11,5 L10,5 L10,8 L9.5,8 L9.5,5 L8.5,5 L8.5,8 L8,8 L8,5 Z M16,5 C15.22222,5 13.99192,5.5162 13.5,6.5 C13.11111,7.2777 13,9 13,10 L13,13 C13,13.5 13.61111,14 14,14 L14,18 C14,18.5 14.5,19 15,19 C15.5,19 16,18.5 16,18 L16,5 Z" id="rect6396-83" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/restaurant-s.svg b/data/styles/clear/style-night/symbols/restaurant-s.svg
index 60fa7d4162..556e07bcb2 100644
--- a/data/styles/clear/style-night/symbols/restaurant-s.svg
+++ b/data/styles/clear/style-night/symbols/restaurant-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>restaurant-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="restaurant-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M5.5,4 L5,4 L5,7 C5,7.5 6,7.5 6,8 L6,14 L7,14 L7,8 C7,7.5 8,7.5 8,7 L8,4 L7.5,4 L7.5,6 L6.75,6 L6.75,4 L6.25,4 L6.25,6 L5.5,6 L5.5,4 Z M12,4 C11.5,4 10.56623,4.1176 10.25,4.75 C10,5.25 10,6 10,7 L10,9.5 L11,9.5 L11,14 L12,14 L12,4 Z" id="rect6396-8-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M5.5,4 L5,4 L5,7 C5,7.5 6,7.5 6,8 L6,14 L7,14 L7,8 C7,7.5 8,7.5 8,7 L8,4 L7.5,4 L7.5,6 L6.75,6 L6.75,4 L6.25,4 L6.25,6 L5.5,6 L5.5,4 Z M12,4 C11.5,4 10.56623,4.1176 10.25,4.75 C10,5.25 10,6 10,7 L10,9.5 L11,9.5 L11,14 L12,14 L12,4 Z" id="rect6396-8-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/school-l.svg b/data/styles/clear/style-night/symbols/school-l.svg
index 02d6e88497..00577370a8 100644
--- a/data/styles/clear/style-night/symbols/school-l.svg
+++ b/data/styles/clear/style-night/symbols/school-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>school-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="school-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M15.75,4 C14.7805,4 14,4.7805 14,5.75 C14,6.7195 14.7805,7.5 15.75,7.5 C16.7195,7.5 17.5,6.7195 17.5,5.75 C17.5,4.7805 16.7195,4 15.75,4 L15.75,4 Z M7.75,6 C6.7805,6 6,6.7805 6,7.75 C6,8.7195 6.7805,9.5 7.75,9.5 C8.7195,9.5 9.5,8.7195 9.5,7.75 C9.5,6.7805 8.7195,6 7.75,6 L7.75,6 Z M17,8 C16.627322,8 16.013592,8.1345 15.5,8.5 L12.25,10.8125 C11.368196,11.44 12.17732,12.5443 13,12 L15.125,10.59375 C15.125,10.59375 16.526043,13.598 16,15 C15.98243,15.04683 15.96749,15.08933 15.96875,15.125 L13.78125,20.9375 C13.530309,21.606628 14.013036,22.006672 14.5,22 C14.81932,21.9956 15.124779,21.806965 15.28125,21.4375 L18,15 C18,15 18.5,17.9998 20.5,18 C21.70185,18.0001 22.583333,18 23.25,18 C24,18 24,17.25 24,17.25 C24,17.25 24,16.5 23.25,16.5 C22.75,16.5 21.5,16.4998 21,16.5 C19.932813,16.5004 20,14.8975 20,14 C20,12.4998 19,10 19,10 L22,12 C22.906394,12.6043 23.691522,11.5343 22.8125,10.875 L19.5,8.5 C18.896477,8.0701 18.703177,8.0001 18,8 L17,8 L17,8 Z M6.5,10 C6,10 5.763524,10.2365 5.5,10.5 L3.375,12.625 C3.1014,12.8986 3,13.1435 3,13.5 C3,14 3.764327,14.2356 4.1875,13.8125 L6,12 C7,12 7.375,14.5 7,15.5 L5.5,19.5 C5.084539,20.6079 6.644264,20.9486 7,20 L8.5,16 C8.5,16 9,17 10,17 L13,17 C14,17 14,15.5 13,15.5 L10.5,15.5 C10,15.5 10,14.5 10,14 C10,12 9,10 8,10 L6.5,10 Z" id="rect6848-8-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M15.75,4 C14.7805,4 14,4.7805 14,5.75 C14,6.7195 14.7805,7.5 15.75,7.5 C16.7195,7.5 17.5,6.7195 17.5,5.75 C17.5,4.7805 16.7195,4 15.75,4 L15.75,4 Z M7.75,6 C6.7805,6 6,6.7805 6,7.75 C6,8.7195 6.7805,9.5 7.75,9.5 C8.7195,9.5 9.5,8.7195 9.5,7.75 C9.5,6.7805 8.7195,6 7.75,6 L7.75,6 Z M17,8 C16.627322,8 16.013592,8.1345 15.5,8.5 L12.25,10.8125 C11.368196,11.44 12.17732,12.5443 13,12 L15.125,10.59375 C15.125,10.59375 16.526043,13.598 16,15 C15.98243,15.04683 15.96749,15.08933 15.96875,15.125 L13.78125,20.9375 C13.530309,21.606628 14.013036,22.006672 14.5,22 C14.81932,21.9956 15.124779,21.806965 15.28125,21.4375 L18,15 C18,15 18.5,17.9998 20.5,18 C21.70185,18.0001 22.583333,18 23.25,18 C24,18 24,17.25 24,17.25 C24,17.25 24,16.5 23.25,16.5 C22.75,16.5 21.5,16.4998 21,16.5 C19.932813,16.5004 20,14.8975 20,14 C20,12.4998 19,10 19,10 L22,12 C22.906394,12.6043 23.691522,11.5343 22.8125,10.875 L19.5,8.5 C18.896477,8.0701 18.703177,8.0001 18,8 L17,8 L17,8 Z M6.5,10 C6,10 5.763524,10.2365 5.5,10.5 L3.375,12.625 C3.1014,12.8986 3,13.1435 3,13.5 C3,14 3.764327,14.2356 4.1875,13.8125 L6,12 C7,12 7.375,14.5 7,15.5 L5.5,19.5 C5.084539,20.6079 6.644264,20.9486 7,20 L8.5,16 C8.5,16 9,17 10,17 L13,17 C14,17 14,15.5 13,15.5 L10.5,15.5 C10,15.5 10,14.5 10,14 C10,12 9,10 8,10 L6.5,10 Z" id="rect6848-8-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/school-m.svg b/data/styles/clear/style-night/symbols/school-m.svg
index 8f1b0aa13a..7ea1532cc0 100644
--- a/data/styles/clear/style-night/symbols/school-m.svg
+++ b/data/styles/clear/style-night/symbols/school-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>school-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="school-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M12.75,5 C12.05964,5 11.5,5.5596 11.5,6.25 C11.5,6.9404 12.05964,7.5 12.75,7.5 C13.44036,7.5 14,6.9404 14,6.25 C14,5.5596 13.44036,5 12.75,5 L12.75,5 Z M7.0625,6 C6.37214,6 5.8125,6.5596 5.8125,7.25 C5.8125,7.9404 6.37214,8.5 7.0625,8.5 C7.75286,8.5 8.3125,7.9404 8.3125,7.25 C8.3125,6.5596 7.75286,6 7.0625,6 L7.0625,6 Z M13.75,8 C13.47049,8 13.01019,8.1009 12.625,8.375 L10.1875,10.125 C9.52615,10.5956 10.133,11.4082 10.75,11 L12.34375,9.9375 C12.34375,9.9375 12.78038,10.2936 13,11 L12.9688,12.8438 L11.3438,17.1875 C11.15559,17.6894 11.50983,18.005 11.87505,18 C12.11454,18 12.35144,17.8396 12.4688,17.5625 L14.50005,13 C14.50005,13 14.87505,14.9999 16.37505,15 C17.27644,15.0001 18.00005,15 18.50005,15 C19.00005,15 19.00005,14.5 19.00005,14.5 C19.00005,14.5 19.00005,14 18.50005,14 C18.12505,14 16.87505,13.9999 16.50005,14 C16.50005,14 16.00005,14 16.00005,13 C16.00005,12.2963 15.21983,10.5016 15.00005,10 L15.00005,9.5 L17.50005,10.875 C18.17985,11.3283 18.78432,10.5258 18.12505,10.0313 L15.50005,8.5 C14.98309,8.2096 14.41782,8 13.75005,8 L13.75,8 Z M6.625,9 C6.25,9 6.07264,9.1774 5.875,9.375 L4.28125,10.9688 C4.07605,11.174 4,11.3576 4,11.625 C4,12 4.55763,12.1923 4.875,11.875 L6.25,10.5 C6.5648,10.5 7,10.539 7,11 L7,13.125 L5.875,16.125 C5.5634,16.9559 6.7332,17.2115 7,16.5 L8.125,13.5 C8.125,13.5 8.5,14 9.25,14 L11.4375,14 C12.1875,14 12.1875,13 11.4375,13 L9.5,13 C9.5,13 9,13 9,12.5 L9,11.75 C9,10.25 8.5,9 7.75,9 L6.625,9 L6.625,9 Z" id="path17507-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M12.75,5 C12.05964,5 11.5,5.5596 11.5,6.25 C11.5,6.9404 12.05964,7.5 12.75,7.5 C13.44036,7.5 14,6.9404 14,6.25 C14,5.5596 13.44036,5 12.75,5 L12.75,5 Z M7.0625,6 C6.37214,6 5.8125,6.5596 5.8125,7.25 C5.8125,7.9404 6.37214,8.5 7.0625,8.5 C7.75286,8.5 8.3125,7.9404 8.3125,7.25 C8.3125,6.5596 7.75286,6 7.0625,6 L7.0625,6 Z M13.75,8 C13.47049,8 13.01019,8.1009 12.625,8.375 L10.1875,10.125 C9.52615,10.5956 10.133,11.4082 10.75,11 L12.34375,9.9375 C12.34375,9.9375 12.78038,10.2936 13,11 L12.9688,12.8438 L11.3438,17.1875 C11.15559,17.6894 11.50983,18.005 11.87505,18 C12.11454,18 12.35144,17.8396 12.4688,17.5625 L14.50005,13 C14.50005,13 14.87505,14.9999 16.37505,15 C17.27644,15.0001 18.00005,15 18.50005,15 C19.00005,15 19.00005,14.5 19.00005,14.5 C19.00005,14.5 19.00005,14 18.50005,14 C18.12505,14 16.87505,13.9999 16.50005,14 C16.50005,14 16.00005,14 16.00005,13 C16.00005,12.2963 15.21983,10.5016 15.00005,10 L15.00005,9.5 L17.50005,10.875 C18.17985,11.3283 18.78432,10.5258 18.12505,10.0313 L15.50005,8.5 C14.98309,8.2096 14.41782,8 13.75005,8 L13.75,8 Z M6.625,9 C6.25,9 6.07264,9.1774 5.875,9.375 L4.28125,10.9688 C4.07605,11.174 4,11.3576 4,11.625 C4,12 4.55763,12.1923 4.875,11.875 L6.25,10.5 C6.5648,10.5 7,10.539 7,11 L7,13.125 L5.875,16.125 C5.5634,16.9559 6.7332,17.2115 7,16.5 L8.125,13.5 C8.125,13.5 8.5,14 9.25,14 L11.4375,14 C12.1875,14 12.1875,13 11.4375,13 L9.5,13 C9.5,13 9,13 9,12.5 L9,11.75 C9,10.25 8.5,9 7.75,9 L6.625,9 L6.625,9 Z" id="path17507-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/school-s.svg b/data/styles/clear/style-night/symbols/school-s.svg
index bdac855234..facec15ba5 100644
--- a/data/styles/clear/style-night/symbols/school-s.svg
+++ b/data/styles/clear/style-night/symbols/school-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>school-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="school-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M10,3.5 C9.44772,3.5 9,3.9477 9,4.5 C9,5.0523 9.44772,5.5 10,5.5 C10.55228,5.5 11,5.0523 11,4.5 C11,3.9477 10.55228,3.5 10,3.5 L10,3.5 Z M6,4.5 C5.44772,4.5 5,4.9477 5,5.5 C5,6.0523 5.44772,6.5 6,6.5 C6.55228,6.5 7,6.0523 7,5.5 C7,4.9477 6.55228,4.5 6,4.5 L6,4.5 Z M10.5,6 L10,6 L8,7 L8,8 L10,7 L10,8 L10,9.5625 L9,13 L10,13 L11,9.5 C11,9.5 11.25,10.9999 12.25,11 C12.85093,11.0001 13.66667,11 14,11 L14,10.25 C13.75,10.25 12.75,10.2499 12.5,10.25 C11.96641,10.2502 12,9.4488 12,9 C12,8.2499 11.5,7 11.5,7 L13,7.9375 C13.4532,8.2396 13.84576,7.7046 13.40625,7.375 L11.75,6.25 C11.44824,6.0351 11.35159,6.0001 11,6 L10.5,6 Z M5.75,7 C5.5,7 5.38176,7.1183 5.25,7.25 L4.1875,8.3125 C4.0507,8.4493 4,8.5718 4,8.75 C4,9 4.38216,9.1178 4.59375,8.9063 L5.5,8 L6,8 L6,9 L5,11.75 C4.79782,12.306 5.57214,12.4743 5.75,12 L6.25463,10.7 L9,10.7 L9,10 L7.5,10 L7.5,8 C7.5,7.5 7,7 6.5,7 L5.75,7 Z" id="path17501-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10,3.5 C9.44772,3.5 9,3.9477 9,4.5 C9,5.0523 9.44772,5.5 10,5.5 C10.55228,5.5 11,5.0523 11,4.5 C11,3.9477 10.55228,3.5 10,3.5 L10,3.5 Z M6,4.5 C5.44772,4.5 5,4.9477 5,5.5 C5,6.0523 5.44772,6.5 6,6.5 C6.55228,6.5 7,6.0523 7,5.5 C7,4.9477 6.55228,4.5 6,4.5 L6,4.5 Z M10.5,6 L10,6 L8,7 L8,8 L10,7 L10,8 L10,9.5625 L9,13 L10,13 L11,9.5 C11,9.5 11.25,10.9999 12.25,11 C12.85093,11.0001 13.66667,11 14,11 L14,10.25 C13.75,10.25 12.75,10.2499 12.5,10.25 C11.96641,10.2502 12,9.4488 12,9 C12,8.2499 11.5,7 11.5,7 L13,7.9375 C13.4532,8.2396 13.84576,7.7046 13.40625,7.375 L11.75,6.25 C11.44824,6.0351 11.35159,6.0001 11,6 L10.5,6 Z M5.75,7 C5.5,7 5.38176,7.1183 5.25,7.25 L4.1875,8.3125 C4.0507,8.4493 4,8.5718 4,8.75 C4,9 4.38216,9.1178 4.59375,8.9063 L5.5,8 L6,8 L6,9 L5,11.75 C4.79782,12.306 5.57214,12.4743 5.75,12 L6.25463,10.7 L9,10.7 L9,10 L7.5,10 L7.5,8 C7.5,7.5 7,7 6.5,7 L5.75,7 Z" id="path17501-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/shop-l copy.svg b/data/styles/clear/style-night/symbols/shop-l copy.svg
index 525c8ce118..edcb1fb60c 100644
--- a/data/styles/clear/style-night/symbols/shop-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/shop-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>shop-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="shop-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M12,4 C11,4 10.11384,5.0065 10,6 L9.65625,9 L8,9 C7.5,9 7,9.5 7,10 L6,20 C6,20.5 6.5,21 7,21 L20,21 C20.5,21 21,20.5 21,20 L20,10 C20,9.5 19.5,9 19,9 L17.34375,9 L17,6 C16.88616,5.0065 16,4 15,4 L12,4 Z M12,5 L15,5 C15.5,5 15.94308,5.5033 16,6 L16.34375,9 L10.65625,9 L11,6 C11.0569,5.5033 11.5,5 12,5 L12,5 Z" id="rect13131-6-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M12,4 C11,4 10.11384,5.0065 10,6 L9.65625,9 L8,9 C7.5,9 7,9.5 7,10 L6,20 C6,20.5 6.5,21 7,21 L20,21 C20.5,21 21,20.5 21,20 L20,10 C20,9.5 19.5,9 19,9 L17.34375,9 L17,6 C16.88616,5.0065 16,4 15,4 L12,4 Z M12,5 L15,5 C15.5,5 15.94308,5.5033 16,6 L16.34375,9 L10.65625,9 L11,6 C11.0569,5.5033 11.5,5 12,5 L12,5 Z" id="rect13131-6-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/shop-m copy.svg b/data/styles/clear/style-night/symbols/shop-m copy.svg
index 408590805e..f8d9bbf85a 100644
--- a/data/styles/clear/style-night/symbols/shop-m copy.svg	
+++ b/data/styles/clear/style-night/symbols/shop-m copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>shop-m copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="shop-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M10.26471,4 C9.5,4 8.64996,4.7502 8.5,5.5 L8,8 L7,8 C6.61765,8 6,8.6177 6,9 L5,17.2353 C5,17.6176 5.5,18 6,18 L17,18 C17.5,18 18,17.6176 18,17.2353 L17,9 C17,8.6177 16.38235,8 16,8 L15,8 L14.5,5.5 C14.35004,4.7502 13.50001,4 12.7353,4 L10.26471,4 Z M10.26471,4.7647 L12.7353,4.7647 C13.11766,4.7647 13.66033,5.1251 13.7353,5.5 L14.2353,8 L8.7647,8 L9.26471,5.5 C9.33971,5.1251 9.88235,4.7647 10.26471,4.7647 L10.26471,4.7647 Z" id="rect13131-6-2-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10.26471,4 C9.5,4 8.64996,4.7502 8.5,5.5 L8,8 L7,8 C6.61765,8 6,8.6177 6,9 L5,17.2353 C5,17.6176 5.5,18 6,18 L17,18 C17.5,18 18,17.6176 18,17.2353 L17,9 C17,8.6177 16.38235,8 16,8 L15,8 L14.5,5.5 C14.35004,4.7502 13.50001,4 12.7353,4 L10.26471,4 Z M10.26471,4.7647 L12.7353,4.7647 C13.11766,4.7647 13.66033,5.1251 13.7353,5.5 L14.2353,8 L8.7647,8 L9.26471,5.5 C9.33971,5.1251 9.88235,4.7647 10.26471,4.7647 L10.26471,4.7647 Z" id="rect13131-6-2-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/shop-s copy.svg b/data/styles/clear/style-night/symbols/shop-s copy.svg
index f409def020..fe4aae72fe 100644
--- a/data/styles/clear/style-night/symbols/shop-s copy.svg	
+++ b/data/styles/clear/style-night/symbols/shop-s copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>shop-s copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="shop-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M7.17188,3.8622 C6.67188,3.8622 6.24623,4.3678 6.17188,4.8622 L6,6.3622 L5,6.3622 C4.75,6.3622 4.5,6.6122 4.5,6.8622 L4,11.8622 C4,12.1122 4.25,12.3622 4.5,12.3622 L12.5,12.3622 C12.75,12.3622 13,12.1122 13,11.8622 L12.5,6.8622 C12.5,6.6122 12.25,6.3622 12,6.3622 L11,6.3622 L10.82813,4.8622 C10.77123,4.3655 10.32813,3.8622 9.82813,3.8622 L7.17188,3.8622 Z M7.17188,4.3622 L9.82813,4.3622 C10.07813,4.3622 10.29603,4.5821 10.32813,4.8622 L10.5,6.3622 L6.5,6.3622 L6.67188,4.8622 C6.70038,4.6139 6.92188,4.3622 7.17188,4.3622 L7.17188,4.3622 Z" id="rect13131-6-6-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M7.17188,3.8622 C6.67188,3.8622 6.24623,4.3678 6.17188,4.8622 L6,6.3622 L5,6.3622 C4.75,6.3622 4.5,6.6122 4.5,6.8622 L4,11.8622 C4,12.1122 4.25,12.3622 4.5,12.3622 L12.5,12.3622 C12.75,12.3622 13,12.1122 13,11.8622 L12.5,6.8622 C12.5,6.6122 12.25,6.3622 12,6.3622 L11,6.3622 L10.82813,4.8622 C10.77123,4.3655 10.32813,3.8622 9.82813,3.8622 L7.17188,3.8622 Z M7.17188,4.3622 L9.82813,4.3622 C10.07813,4.3622 10.29603,4.5821 10.32813,4.8622 L10.5,6.3622 L6.5,6.3622 L6.67188,4.8622 C6.70038,4.6139 6.92188,4.3622 7.17188,4.3622 L7.17188,4.3622 Z" id="rect13131-6-6-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/skiing-l copy.svg b/data/styles/clear/style-night/symbols/skiing-l copy.svg
index a0ed64edaf..5e55a85694 100644
--- a/data/styles/clear/style-night/symbols/skiing-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/skiing-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>skiing-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="skiing-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M12.0000004,6 C11.0000004,6 10.0000004,6.5 10.0000004,8 C10.0000004,8.5367 10.0436904,8.6282 10.1562504,9.0938 L10.8437504,11.9375 L7.12500038,14.2188 L3.75000038,12.25 C3.63768258,12.184 3.49123818,12.182 3.31250038,12.219 C3.13376248,12.256 2.99962988,12.4677 3.00000038,12.6877 C3.00037088,12.9077 3.09635138,13.0351 3.25000038,13.1252 L17.7500004,21.6252 C18.2055714,21.8882 18.6165844,21.9941 19.0000004,22.0002 C19.2682244,22.0002 19.5317824,21.9652 19.7500004,21.8752 C20.2801524,21.6573 20.6118634,21.2634 20.8437504,21.0315 C20.9599364,20.9152 21.0000004,20.7734 21.0000004,20.6252 C21.0000004,20.4137 20.8712294,20.189 20.5937504,20.1565 C20.4146934,20.1355 20.2692694,20.2005 20.1562504,20.344 C19.9215064,20.6416 19.6284844,20.8648 19.3750004,20.969 C19.1215164,21.0732 18.8411854,21.0915 18.2500004,20.7502 L8.96875038,15.3127 L12.5625004,13.219 C12.8952264,12.991 13.0645144,12.5482 12.9687504,12.1565 L12.5625004,10.5002 L16.1380974,12.605 L16.8125004,15.1757 C16.8896004,15.4635 17.1024014,15.7117 17.3750004,15.832 L19.6562504,16.832 C21.2623304,17.536 21.4911994,16.0061 20.4687504,15.563 L18.5937504,14.7505 L17.0000004,8.501 L13.9375004,6.751 C13.1512284,6.2971 12.5000004,6.001 12.0000004,6.001 L12.0000004,6 Z M20.0000004,8 C18.8954304,8 18.0000004,8.8954 18.0000004,10 C18.0000004,11.1046 18.8954304,12 20.0000004,12 C21.1045704,12 22.0000004,11.1046 22.0000004,10 C22.0000004,8.8954 21.1045704,8 20.0000004,8 L20.0000004,8 Z" id="rect10364-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M12.0000004,6 C11.0000004,6 10.0000004,6.5 10.0000004,8 C10.0000004,8.5367 10.0436904,8.6282 10.1562504,9.0938 L10.8437504,11.9375 L7.12500038,14.2188 L3.75000038,12.25 C3.63768258,12.184 3.49123818,12.182 3.31250038,12.219 C3.13376248,12.256 2.99962988,12.4677 3.00000038,12.6877 C3.00037088,12.9077 3.09635138,13.0351 3.25000038,13.1252 L17.7500004,21.6252 C18.2055714,21.8882 18.6165844,21.9941 19.0000004,22.0002 C19.2682244,22.0002 19.5317824,21.9652 19.7500004,21.8752 C20.2801524,21.6573 20.6118634,21.2634 20.8437504,21.0315 C20.9599364,20.9152 21.0000004,20.7734 21.0000004,20.6252 C21.0000004,20.4137 20.8712294,20.189 20.5937504,20.1565 C20.4146934,20.1355 20.2692694,20.2005 20.1562504,20.344 C19.9215064,20.6416 19.6284844,20.8648 19.3750004,20.969 C19.1215164,21.0732 18.8411854,21.0915 18.2500004,20.7502 L8.96875038,15.3127 L12.5625004,13.219 C12.8952264,12.991 13.0645144,12.5482 12.9687504,12.1565 L12.5625004,10.5002 L16.1380974,12.605 L16.8125004,15.1757 C16.8896004,15.4635 17.1024014,15.7117 17.3750004,15.832 L19.6562504,16.832 C21.2623304,17.536 21.4911994,16.0061 20.4687504,15.563 L18.5937504,14.7505 L17.0000004,8.501 L13.9375004,6.751 C13.1512284,6.2971 12.5000004,6.001 12.0000004,6.001 L12.0000004,6 Z M20.0000004,8 C18.8954304,8 18.0000004,8.8954 18.0000004,10 C18.0000004,11.1046 18.8954304,12 20.0000004,12 C21.1045704,12 22.0000004,11.1046 22.0000004,10 C22.0000004,8.8954 21.1045704,8 20.0000004,8 L20.0000004,8 Z" id="rect10364-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/skiing-m copy.svg b/data/styles/clear/style-night/symbols/skiing-m copy.svg
index 298c225331..0560d08008 100644
--- a/data/styles/clear/style-night/symbols/skiing-m copy.svg	
+++ b/data/styles/clear/style-night/symbols/skiing-m copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>skiing-m copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="skiing-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M10,6 C9,6 8.5,6.5 8.5,7.5 C8.5,7.8954 8.63581,8.1569 8.71875,8.5 L9.5,10.5 L6.6875,12.46875 L4,11 L4,12 L15,18 L16,18 L17,17 L16.5,16.5 L16,16 L16,17 L15,17 L8,13.1875 L10.46875,11.53125 C10.71392,11.36325 11.07056,11.2887 11,11 L10.46875,9.53125 L13,11 L13.625,12.96875 C13.6818,13.18085 13.83039,13.38015 14.03125,13.46875 L15.71875,14.1875 C16.90217,14.7062 17.06588,13.5765 16.3125,13.25 L14.9375,12.65625 L14,10 L14,8 L11.5,6.59375 C10.92064,6.25935 10.5,6 10,6 L10,6 Z M16.5,7.5 C15.6861,7.5 15,8.1861 15,9 C15,9.814 15.6861,10.5 16.5,10.5 C17.31389,10.5 18,9.814 18,9 C18,8.1861 17.31389,7.5 16.5,7.5 L16.5,7.5 Z" id="rect10364-0-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10,6 C9,6 8.5,6.5 8.5,7.5 C8.5,7.8954 8.63581,8.1569 8.71875,8.5 L9.5,10.5 L6.6875,12.46875 L4,11 L4,12 L15,18 L16,18 L17,17 L16.5,16.5 L16,16 L16,17 L15,17 L8,13.1875 L10.46875,11.53125 C10.71392,11.36325 11.07056,11.2887 11,11 L10.46875,9.53125 L13,11 L13.625,12.96875 C13.6818,13.18085 13.83039,13.38015 14.03125,13.46875 L15.71875,14.1875 C16.90217,14.7062 17.06588,13.5765 16.3125,13.25 L14.9375,12.65625 L14,10 L14,8 L11.5,6.59375 C10.92064,6.25935 10.5,6 10,6 L10,6 Z M16.5,7.5 C15.6861,7.5 15,8.1861 15,9 C15,9.814 15.6861,10.5 16.5,10.5 C17.31389,10.5 18,9.814 18,9 C18,8.1861 17.31389,7.5 16.5,7.5 L16.5,7.5 Z" id="rect10364-0-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/skiing-s copy.svg b/data/styles/clear/style-night/symbols/skiing-s copy.svg
index ff49aec2b8..cf20798524 100644
--- a/data/styles/clear/style-night/symbols/skiing-s copy.svg	
+++ b/data/styles/clear/style-night/symbols/skiing-s copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>skiing-s copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="skiing-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8,5 C7.5,5 7,6 7,6.5 L7,8.5 L5.375,9.2813 L4,8.5 L4,9 L11,13 L11,12.5 L6.3125,9.8125 L8,9.1875 L8,7 L8.5,7 L9,7 L10,8.5 L10,10 L11,11 L12,11 L12,10 L11,10 L11,8.5 L10.5,6 L9,5 L8,5 L8,5 Z M12.5,6.5 C11.94773,6.5 11.5,6.9477 11.5,7.5 C11.5,8.0523 11.94773,8.5 12.5,8.5 C12.68732,8.5 12.85013,8.433 13,8.3438 L13,6.6563 C12.85013,6.5663 12.68732,6.5 12.5,6.5 L12.5,6.5 Z" id="rect10364-5-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8,5 C7.5,5 7,6 7,6.5 L7,8.5 L5.375,9.2813 L4,8.5 L4,9 L11,13 L11,12.5 L6.3125,9.8125 L8,9.1875 L8,7 L8.5,7 L9,7 L10,8.5 L10,10 L11,11 L12,11 L12,10 L11,10 L11,8.5 L10.5,6 L9,5 L8,5 L8,5 Z M12.5,6.5 C11.94773,6.5 11.5,6.9477 11.5,7.5 C11.5,8.0523 11.94773,8.5 12.5,8.5 C12.68732,8.5 12.85013,8.433 13,8.3438 L13,6.6563 C12.85013,6.5663 12.68732,6.5 12.5,6.5 L12.5,6.5 Z" id="rect10364-5-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/soccer-l copy.svg b/data/styles/clear/style-night/symbols/soccer-l copy.svg
index 8f78325d34..b373c1eb96 100644
--- a/data/styles/clear/style-night/symbols/soccer-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/soccer-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>soccer-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="soccer-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M13.5,5 C8.81676,5 5,8.8168 5,13.5 C5,18.1832 8.81676,22 13.5,22 C18.18324,22 22,18.1832 22,13.5 C22,8.8168 18.18324,5 13.5,5 L13.5,5 Z M13.5,6.5 C16.16601,6.5 18.47358,7.9738 19.65625,10.1563 C18.54025,10.8967 17.51446,11.2836 17.5,12 C17.4899,12.4999 17.5,12.6412 17.5,13 C17.5,13.5 17.76049,14.1434 18.5,14.5 L20.25,15.3438 C20.04966,16.0846 19.72761,16.7544 19.3125,17.375 L18,16.5 C17.25,16 16.5,15.6667 16,16 L14.5,17 C13.80662,17.4623 13.87903,18 14,18.5 L14.46875,20.4375 C14.15151,20.4815 13.82962,20.4995 13.5,20.4995 C12.80671,20.4995 12.13146,20.4045 11.5,20.2183 L11.5,18.4995 C11.5,17.4995 11,16.9995 10.5,16.4995 C10,15.9995 9.5,15.4995 8.5,15.4995 L6.78125,15.4995 C6.59519,14.8685 6.5,14.1933 6.5,13.5 C6.5,9.6222 9.62216,6.5 13.5,6.5 L13.5,6.5 Z M10.5,10 L10,12 C9.8581107,12.5676 9.47997,13.1533 10,13.5 L11.5,14.5 C12.5,15.1667 12.94098,14.7795 13.5,14.5 L14.5,14 C15.24536,13.6273 15.5,13.5 15.5,12.5 L15.5,10.5 C15.5,10 15.5082,9.7016 14.5,9.5 L12,9 C10.95274,8.7905 10.755655,8.977 10.5,10 L10.5,10 Z" id="path10911-4-1-7-6-7-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M13.5,5 C8.81676,5 5,8.8168 5,13.5 C5,18.1832 8.81676,22 13.5,22 C18.18324,22 22,18.1832 22,13.5 C22,8.8168 18.18324,5 13.5,5 L13.5,5 Z M13.5,6.5 C16.16601,6.5 18.47358,7.9738 19.65625,10.1563 C18.54025,10.8967 17.51446,11.2836 17.5,12 C17.4899,12.4999 17.5,12.6412 17.5,13 C17.5,13.5 17.76049,14.1434 18.5,14.5 L20.25,15.3438 C20.04966,16.0846 19.72761,16.7544 19.3125,17.375 L18,16.5 C17.25,16 16.5,15.6667 16,16 L14.5,17 C13.80662,17.4623 13.87903,18 14,18.5 L14.46875,20.4375 C14.15151,20.4815 13.82962,20.4995 13.5,20.4995 C12.80671,20.4995 12.13146,20.4045 11.5,20.2183 L11.5,18.4995 C11.5,17.4995 11,16.9995 10.5,16.4995 C10,15.9995 9.5,15.4995 8.5,15.4995 L6.78125,15.4995 C6.59519,14.8685 6.5,14.1933 6.5,13.5 C6.5,9.6222 9.62216,6.5 13.5,6.5 L13.5,6.5 Z M10.5,10 L10,12 C9.8581107,12.5676 9.47997,13.1533 10,13.5 L11.5,14.5 C12.5,15.1667 12.94098,14.7795 13.5,14.5 L14.5,14 C15.24536,13.6273 15.5,13.5 15.5,12.5 L15.5,10.5 C15.5,10 15.5082,9.7016 14.5,9.5 L12,9 C10.95274,8.7905 10.755655,8.977 10.5,10 L10.5,10 Z" id="path10911-4-1-7-6-7-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/soccer-m copy.svg b/data/styles/clear/style-night/symbols/soccer-m copy.svg
index 86930d483c..634c408455 100644
--- a/data/styles/clear/style-night/symbols/soccer-m copy.svg	
+++ b/data/styles/clear/style-night/symbols/soccer-m copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>soccer-m copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="soccer-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11.5,5.3622 C7.91871,5.3622 5,8.281 5,11.8622 C5,15.4434 7.91871,18.3622 11.5,18.3622 C15.08129,18.3622 18,15.4434 18,11.8622 C18,8.281 15.08129,5.3622 11.5,5.3622 L11.5,5.3622 Z M11.5,6.5093 C13.53872,6.5093 15.30332,7.6363 16.20772,9.3053 C15.35429,9.8714 14.56988,10.1673 14.55883,10.7151 C14.55183,11.0976 14.55883,11.2054 14.55883,11.4798 C14.55883,11.8622 14.75801,12.3541 15.32354,12.6268 L16.66176,13.2721 C16.50857,13.8387 16.26227,14.3509 15.94486,14.8254 L14.94117,14.1562 C14.36765,13.7739 13.79413,13.5192 13.41176,13.7739 L12.26471,14.5387 C11.73447,14.8922 11.78985,15.3035 11.88235,15.6857 L12.2408,17.1674 C11.99821,17.2004 11.75205,17.2144 11.5,17.2144 C10.96983,17.2144 10.45347,17.1404 9.9706,16.9994 L9.9706,15.6848 C9.9706,14.9202 9.58824,14.5378 9.20587,14.1555 C8.82354,13.7731 8.44117,13.3908 7.67646,13.3908 L6.36212,13.3908 C6.21985,12.9081 6.14706,12.392 6.14706,11.8617 C6.14706,8.8962 8.5346,6.5087 11.5,6.5087 L11.5,6.5093 Z M9.20587,9.1857 L8.82354,10.7151 C8.71506,11.1493 8.42585,11.5971 8.82354,11.8622 L9.9706,12.6268 C10.73529,13.1367 11.07252,12.8407 11.5,12.6268 L12.26471,12.2446 C12.83469,11.9595 13.0294,11.8622 13.0294,11.0976 L13.0294,9.5682 C13.0294,9.1857 13.0354,8.9576 12.26471,8.8035 L10.35294,8.4209 C9.5521,8.2609 9.40138,8.4029 9.20587,9.1857 L9.20587,9.1857 Z" id="path10911-4-1-7-6-7-3-4-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.5,5.3622 C7.91871,5.3622 5,8.281 5,11.8622 C5,15.4434 7.91871,18.3622 11.5,18.3622 C15.08129,18.3622 18,15.4434 18,11.8622 C18,8.281 15.08129,5.3622 11.5,5.3622 L11.5,5.3622 Z M11.5,6.5093 C13.53872,6.5093 15.30332,7.6363 16.20772,9.3053 C15.35429,9.8714 14.56988,10.1673 14.55883,10.7151 C14.55183,11.0976 14.55883,11.2054 14.55883,11.4798 C14.55883,11.8622 14.75801,12.3541 15.32354,12.6268 L16.66176,13.2721 C16.50857,13.8387 16.26227,14.3509 15.94486,14.8254 L14.94117,14.1562 C14.36765,13.7739 13.79413,13.5192 13.41176,13.7739 L12.26471,14.5387 C11.73447,14.8922 11.78985,15.3035 11.88235,15.6857 L12.2408,17.1674 C11.99821,17.2004 11.75205,17.2144 11.5,17.2144 C10.96983,17.2144 10.45347,17.1404 9.9706,16.9994 L9.9706,15.6848 C9.9706,14.9202 9.58824,14.5378 9.20587,14.1555 C8.82354,13.7731 8.44117,13.3908 7.67646,13.3908 L6.36212,13.3908 C6.21985,12.9081 6.14706,12.392 6.14706,11.8617 C6.14706,8.8962 8.5346,6.5087 11.5,6.5087 L11.5,6.5093 Z M9.20587,9.1857 L8.82354,10.7151 C8.71506,11.1493 8.42585,11.5971 8.82354,11.8622 L9.9706,12.6268 C10.73529,13.1367 11.07252,12.8407 11.5,12.6268 L12.26471,12.2446 C12.83469,11.9595 13.0294,11.8622 13.0294,11.0976 L13.0294,9.5682 C13.0294,9.1857 13.0354,8.9576 12.26471,8.8035 L10.35294,8.4209 C9.5521,8.2609 9.40138,8.4029 9.20587,9.1857 L9.20587,9.1857 Z" id="path10911-4-1-7-6-7-3-4-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/soccer-s copy.svg b/data/styles/clear/style-night/symbols/soccer-s copy.svg
index 201286dab6..3aaa716941 100644
--- a/data/styles/clear/style-night/symbols/soccer-s copy.svg	
+++ b/data/styles/clear/style-night/symbols/soccer-s copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>soccer-s copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="soccer-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.5,4 C6.02064,4 4,6.0207 4,8.5 C4,10.9793 6.02064,13 8.5,13 C10.97936,13 13,10.9793 13,8.5 C13,6.0207 10.97936,4 8.5,4 L8.5,4 Z M8.5,4.7941 C9.91142,4.7941 11.13307,5.5744 11.75919,6.7299 C11.16836,7.1218 10.6253,7.3266 10.61765,7.7059 C10.61265,7.9706 10.61765,8.0453 10.61765,8.2353 C10.61765,8.5 10.75555,8.8406 11.14706,9.0294 L12.07353,9.4761 C11.96747,9.8683 11.79696,10.2229 11.57721,10.5515 L10.88235,10.0882 C10.48529,9.8235 10.08824,9.6471 9.82353,9.8235 L9.02941,10.3529 C8.66233,10.5977 8.70066,10.8824 8.76471,11.1471 L9.01286,12.1728 C8.84492,12.1958 8.6745,12.2058 8.5,12.2058 C8.13296,12.2058 7.77548,12.1548 7.44118,12.0569 L7.44118,11.1469 C7.44118,10.6175 7.17647,10.3528 6.91176,10.0881 C6.64706,9.8234 6.38235,9.5587 5.85294,9.5587 L4.94301,9.5587 C4.84451,9.2245 4.79412,8.8672 4.79412,8.5001 C4.79412,6.4471 6.44703,4.7942 8.5,4.7942 L8.5,4.7941 Z M6.91176,6.6471 L6.64706,7.7059 C6.57196,8.0064 6.37174,8.3165 6.64706,8.5 L7.44118,9.0294 C7.97059,9.3824 8.20405,9.1774 8.5,9.0294 L9.02941,8.7647 C9.42401,8.5674 9.55882,8.5 9.55882,7.9706 L9.55882,6.9118 C9.55882,6.6471 9.56282,6.4891 9.02941,6.3824 L7.70588,6.1176 C7.15145,6.0068 7.04711,6.1046 6.91176,6.6471 L6.91176,6.6471 Z" id="path10911-4-1-7-6-7-3-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.5,4 C6.02064,4 4,6.0207 4,8.5 C4,10.9793 6.02064,13 8.5,13 C10.97936,13 13,10.9793 13,8.5 C13,6.0207 10.97936,4 8.5,4 L8.5,4 Z M8.5,4.7941 C9.91142,4.7941 11.13307,5.5744 11.75919,6.7299 C11.16836,7.1218 10.6253,7.3266 10.61765,7.7059 C10.61265,7.9706 10.61765,8.0453 10.61765,8.2353 C10.61765,8.5 10.75555,8.8406 11.14706,9.0294 L12.07353,9.4761 C11.96747,9.8683 11.79696,10.2229 11.57721,10.5515 L10.88235,10.0882 C10.48529,9.8235 10.08824,9.6471 9.82353,9.8235 L9.02941,10.3529 C8.66233,10.5977 8.70066,10.8824 8.76471,11.1471 L9.01286,12.1728 C8.84492,12.1958 8.6745,12.2058 8.5,12.2058 C8.13296,12.2058 7.77548,12.1548 7.44118,12.0569 L7.44118,11.1469 C7.44118,10.6175 7.17647,10.3528 6.91176,10.0881 C6.64706,9.8234 6.38235,9.5587 5.85294,9.5587 L4.94301,9.5587 C4.84451,9.2245 4.79412,8.8672 4.79412,8.5001 C4.79412,6.4471 6.44703,4.7942 8.5,4.7942 L8.5,4.7941 Z M6.91176,6.6471 L6.64706,7.7059 C6.57196,8.0064 6.37174,8.3165 6.64706,8.5 L7.44118,9.0294 C7.97059,9.3824 8.20405,9.1774 8.5,9.0294 L9.02941,8.7647 C9.42401,8.5674 9.55882,8.5 9.55882,7.9706 L9.55882,6.9118 C9.55882,6.6471 9.56282,6.4891 9.02941,6.3824 L7.70588,6.1176 C7.15145,6.0068 7.04711,6.1046 6.91176,6.6471 L6.91176,6.6471 Z" id="path10911-4-1-7-6-7-3-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/swimming-l copy.svg b/data/styles/clear/style-night/symbols/swimming-l copy.svg
index 6d5096d414..b400f1fa28 100644
--- a/data/styles/clear/style-night/symbols/swimming-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/swimming-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>swimming-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="swimming-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M16.125,6 C15.96683,6 15.69115,6.093 15.5625,6.1563 L11.5625,8.0938 C11.03008,8.3459 10.83636,9.1208 11.1875,9.5938 L12.40625,11.25 L7.6875,14.9063 C8.81645,15.1353 9.6636,15.8442 10.5,15.8438 C11.5,15.8443 12,14.8438 13.5,14.8438 C15,14.8438 15.5,15.8433 16.5,15.8438 C16.9128,15.844 17.33328,15.6689 17.78125,15.4688 L13.5625,9.3438 L16.59375,7.8125 C17.19573,7.5115 17.15614,6.9953 17.09375,6.6875 C17.03465,6.3957 16.67472,6 16.125,6 L16.125,6 Z M18,9 C16.89543,9 16,9.8954 16,11 C16,12.1046 16.89543,13 18,13 C19.10457,13 20,12.1046 20,11 C20,9.8954 19.10457,9 18,9 L18,9 Z M7,17 C6.30594,17 5.66024,17.4049 5,17.625 L5,19.6563 C5,19.6563 6,19.0005 7,19 C8,18.9995 9,20 10.5,20 C12,20 12.47352,19.0347 13.5,19 C14.5,19.0005 15,20 16.5,20 C18,20 19,19 20,19 C20.70165,19 22,19.6563 22,19.6563 L22,17.625 C21.3584,17.3782 20.65657,17 20,17 C18.5,17 17.5,18.0005 16.5,18 C15.5,17.9995 15,17 13.5,17 C12,17 11.5,18.0005 10.5,18 C9.5,18.0005 8.5,17 7,17 L7,17 Z" id="path4758-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M16.125,6 C15.96683,6 15.69115,6.093 15.5625,6.1563 L11.5625,8.0938 C11.03008,8.3459 10.83636,9.1208 11.1875,9.5938 L12.40625,11.25 L7.6875,14.9063 C8.81645,15.1353 9.6636,15.8442 10.5,15.8438 C11.5,15.8443 12,14.8438 13.5,14.8438 C15,14.8438 15.5,15.8433 16.5,15.8438 C16.9128,15.844 17.33328,15.6689 17.78125,15.4688 L13.5625,9.3438 L16.59375,7.8125 C17.19573,7.5115 17.15614,6.9953 17.09375,6.6875 C17.03465,6.3957 16.67472,6 16.125,6 L16.125,6 Z M18,9 C16.89543,9 16,9.8954 16,11 C16,12.1046 16.89543,13 18,13 C19.10457,13 20,12.1046 20,11 C20,9.8954 19.10457,9 18,9 L18,9 Z M7,17 C6.30594,17 5.66024,17.4049 5,17.625 L5,19.6563 C5,19.6563 6,19.0005 7,19 C8,18.9995 9,20 10.5,20 C12,20 12.47352,19.0347 13.5,19 C14.5,19.0005 15,20 16.5,20 C18,20 19,19 20,19 C20.70165,19 22,19.6563 22,19.6563 L22,17.625 C21.3584,17.3782 20.65657,17 20,17 C18.5,17 17.5,18.0005 16.5,18 C15.5,17.9995 15,17 13.5,17 C12,17 11.5,18.0005 10.5,18 C9.5,18.0005 8.5,17 7,17 L7,17 Z" id="path4758-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/swimming-m copy.svg b/data/styles/clear/style-night/symbols/swimming-m copy.svg
index 292777a09b..5de33c50d9 100644
--- a/data/styles/clear/style-night/symbols/swimming-m copy.svg	
+++ b/data/styles/clear/style-night/symbols/swimming-m copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>swimming-m copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="swimming-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M13.75,7 C13.63577,7 13.43667,7.048 13.34375,7.094 L10.46875,8.5003 C10.08422,8.6823 9.9339,9.2524 10.1875,9.594 L11.0625,10.7815 L7.34375,12.9378 L9.34375,13.7503 L11.5,12.8753 L13.65625,13.7503 L14.5,12.8753 L11.90625,9.4065 L14.09375,8.2815 C14.52851,8.0641 14.51381,7.6913 14.46875,7.469 C14.42605,7.2583 14.14702,7.0003 13.75,7.0003 L13.75,7 Z M15.5,9.375 C14.67157,9.375 14,10.0466 14,10.875 C14,11.7034 14.67157,12.375 15.5,12.375 C16.32843,12.375 17,11.7034 17,10.875 C17,10.0466 16.32843,9.375 15.5,9.375 L15.5,9.375 Z M11.5,13.875 L9.5,14.875 L7,13.9375 L5,14.875 L5,16.375 L7,15.375 L9.5,16.375 L11.5,15.3125 L13.5,16.375 L15.5,15.3125 L18,16.375 L18,14.875 L15.5,13.875 L13.5,14.875 L11.5,13.875 L11.5,13.875 Z" id="path16388" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M13.75,7 C13.63577,7 13.43667,7.048 13.34375,7.094 L10.46875,8.5003 C10.08422,8.6823 9.9339,9.2524 10.1875,9.594 L11.0625,10.7815 L7.34375,12.9378 L9.34375,13.7503 L11.5,12.8753 L13.65625,13.7503 L14.5,12.8753 L11.90625,9.4065 L14.09375,8.2815 C14.52851,8.0641 14.51381,7.6913 14.46875,7.469 C14.42605,7.2583 14.14702,7.0003 13.75,7.0003 L13.75,7 Z M15.5,9.375 C14.67157,9.375 14,10.0466 14,10.875 C14,11.7034 14.67157,12.375 15.5,12.375 C16.32843,12.375 17,11.7034 17,10.875 C17,10.0466 16.32843,9.375 15.5,9.375 L15.5,9.375 Z M11.5,13.875 L9.5,14.875 L7,13.9375 L5,14.875 L5,16.375 L7,15.375 L9.5,16.375 L11.5,15.3125 L13.5,16.375 L15.5,15.3125 L18,16.375 L18,14.875 L15.5,13.875 L13.5,14.875 L11.5,13.875 L11.5,13.875 Z" id="path16388" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/swimming-s copy.svg b/data/styles/clear/style-night/symbols/swimming-s copy.svg
index d61e97de35..790a4ecf66 100644
--- a/data/styles/clear/style-night/symbols/swimming-s copy.svg	
+++ b/data/styles/clear/style-night/symbols/swimming-s copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>swimming-s copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="swimming-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M10.5,4.3622 L10,4.666 L7.78125,5.956 C7.51504,6.082 7.41818,6.4694 7.59375,6.706 L8.20312,7.5341 L6,9.3622 L7,9.5966 L8.5,9.1281 L10,9.5966 L11,9.3622 L8.78125,6.581 L11.01562,5.1903 L11.00002,4.3622 L10.5,4.3622 Z M11.5,6.4092 C10.94772,6.4092 10.5,6.8569 10.5,7.4092 C10.5,7.9614 10.94772,8.4092 11.5,8.4092 C12.05228,8.4092 12.5,7.9614 12.5,7.4092 C12.5,6.8569 12.05228,6.4092 11.5,6.4092 L11.5,6.4092 Z M5.5,10.3623 L4,10.8308 L4,11.862 L4.15625,11.815 L5.5,11.3619 L7,11.8617 L8.5,11.3619 L10,11.8617 L11.5,11.3619 L13,11.8619 L13,10.8307 L11.5,10.3622 L10,10.8307 L8.5,10.3622 L7,10.8307 L5.5,10.3622 L5.5,10.3623 Z" id="path8421-9-1-0-7-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10.5,4.3622 L10,4.666 L7.78125,5.956 C7.51504,6.082 7.41818,6.4694 7.59375,6.706 L8.20312,7.5341 L6,9.3622 L7,9.5966 L8.5,9.1281 L10,9.5966 L11,9.3622 L8.78125,6.581 L11.01562,5.1903 L11.00002,4.3622 L10.5,4.3622 Z M11.5,6.4092 C10.94772,6.4092 10.5,6.8569 10.5,7.4092 C10.5,7.9614 10.94772,8.4092 11.5,8.4092 C12.05228,8.4092 12.5,7.9614 12.5,7.4092 C12.5,6.8569 12.05228,6.4092 11.5,6.4092 L11.5,6.4092 Z M5.5,10.3623 L4,10.8308 L4,11.862 L4.15625,11.815 L5.5,11.3619 L7,11.8617 L8.5,11.3619 L10,11.8617 L11.5,11.3619 L13,11.8619 L13,10.8307 L11.5,10.3622 L10,10.8307 L8.5,10.3622 L7,10.8307 L5.5,10.3622 L5.5,10.3623 Z" id="path8421-9-1-0-7-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/tennis-l copy.svg b/data/styles/clear/style-night/symbols/tennis-l copy.svg
index a34491298e..be78bddbd9 100644
--- a/data/styles/clear/style-night/symbols/tennis-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/tennis-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>tennis-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="tennis-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M11,5 C7.68629,5 5,7.6863 5,11 C5,14.3137 7.68629,17 11,17 L16,17 L20.5,21.5 C20.81628,21.8163 21.00625,22 21.40625,22 C21.53125,22 21.6875,22 21.84375,21.8438 C22.00005,21.6875 22,21.5313 22,21.4063 C22,21.0063 21.78212,20.7821 21.5,20.5 L17,16 L17,11 C17,7.6863 14.31371,5 11,5 L11,5 Z M16,13 L16,16 L13,16 L16,13 Z M6.5,17 C5.67157,17 5,17.6716 5,18.5 C5,19.3284 5.67157,20 6.5,20 C7.32843,20 8,19.3284 8,18.5 C8,17.6716 7.32843,17 6.5,17 L6.5,17 Z" id="path11507" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11,5 C7.68629,5 5,7.6863 5,11 C5,14.3137 7.68629,17 11,17 L16,17 L20.5,21.5 C20.81628,21.8163 21.00625,22 21.40625,22 C21.53125,22 21.6875,22 21.84375,21.8438 C22.00005,21.6875 22,21.5313 22,21.4063 C22,21.0063 21.78212,20.7821 21.5,20.5 L17,16 L17,11 C17,7.6863 14.31371,5 11,5 L11,5 Z M16,13 L16,16 L13,16 L16,13 Z M6.5,17 C5.67157,17 5,17.6716 5,18.5 C5,19.3284 5.67157,20 6.5,20 C7.32843,20 8,19.3284 8,18.5 C8,17.6716 7.32843,17 6.5,17 L6.5,17 Z" id="path11507" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/tennis-m copy.svg b/data/styles/clear/style-night/symbols/tennis-m copy.svg
index cb1aebdf34..48428b3eb3 100644
--- a/data/styles/clear/style-night/symbols/tennis-m copy.svg	
+++ b/data/styles/clear/style-night/symbols/tennis-m copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>tennis-m copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="tennis-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M9.5,5 C6.96598,5 5,6.966 5,9.5 C5,12.034 7.14246,13.9984 9.67648,14 L13,14 L17,18 L18,18 L18,17 L14,13 L14,9.6764 C14,7.1424 12.03401,5 9.5,5 L9.5,5 Z M13,10.7058 L13,13 L10.5,13 L13,10.7058 Z M6.14706,14 C5.51355,14 5,14.5135 5,15.147 C5,15.7805 5.51355,16.2941 6.14706,16.2941 C6.78056,16.2941 7.29412,15.7805 7.29412,15.147 C7.29412,14.5135 6.78056,14 6.14706,14 L6.14706,14 Z" id="path11507-7-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M9.5,5 C6.96598,5 5,6.966 5,9.5 C5,12.034 7.14246,13.9984 9.67648,14 L13,14 L17,18 L18,18 L18,17 L14,13 L14,9.6764 C14,7.1424 12.03401,5 9.5,5 L9.5,5 Z M13,10.7058 L13,13 L10.5,13 L13,10.7058 Z M6.14706,14 C5.51355,14 5,14.5135 5,15.147 C5,15.7805 5.51355,16.2941 6.14706,16.2941 C6.78056,16.2941 7.29412,15.7805 7.29412,15.147 C7.29412,14.5135 6.78056,14 6.14706,14 L6.14706,14 Z" id="path11507-7-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/tennis-s copy.svg b/data/styles/clear/style-night/symbols/tennis-s copy.svg
index af81d17288..ec6249c9dc 100644
--- a/data/styles/clear/style-night/symbols/tennis-s copy.svg	
+++ b/data/styles/clear/style-night/symbols/tennis-s copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>tennis-s copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="tennis-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M4.00003,6.9999 C4.00003,8.6568 5.34317,9.9999 7.00003,9.9999 L9.50003,9.9999 L12.5,13 L13,13 L12.99997,12.5001 L10,9.5 L10,7 C10,5.3431 8.65685,4 7.00001,4 C5.34317,3.9999 4.00003,5.343 4.00003,6.9999 L4.00003,6.9999 Z M9,7.5 L9,9 L7.5,9 L9,7.5 Z M4.75003,10.5 C4.33581,10.5 4.00003,10.8358 4.00003,11.25 C4.00003,11.6642 4.33581,12 4.75003,12 C5.16424,12 5.50003,11.6642 5.50003,11.25 C5.50003,10.8358 5.16424,10.5 4.75003,10.5 L4.75003,10.5 Z" id="path11507-3-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M4.00003,6.9999 C4.00003,8.6568 5.34317,9.9999 7.00003,9.9999 L9.50003,9.9999 L12.5,13 L13,13 L12.99997,12.5001 L10,9.5 L10,7 C10,5.3431 8.65685,4 7.00001,4 C5.34317,3.9999 4.00003,5.343 4.00003,6.9999 L4.00003,6.9999 Z M9,7.5 L9,9 L7.5,9 L9,7.5 Z M4.75003,10.5 C4.33581,10.5 4.00003,10.8358 4.00003,11.25 C4.00003,11.6642 4.33581,12 4.75003,12 C5.16424,12 5.50003,11.6642 5.50003,11.25 C5.50003,10.8358 5.16424,10.5 4.75003,10.5 L4.75003,10.5 Z" id="path11507-3-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/theatre-l.svg b/data/styles/clear/style-night/symbols/theatre-l.svg
index 92bcf8c0b1..b49419e41c 100644
--- a/data/styles/clear/style-night/symbols/theatre-l.svg
+++ b/data/styles/clear/style-night/symbols/theatre-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>theatre-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="theatre-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M6,5 C5.5286,5 5,5.5 5,6 L5,13 C5,15.216 6,18 10,18 C10.35868,18 10.68618,17.983 11,17.938 L11,15.0005 L7,15.0005 C7,15.0005 7.5,13.0005 10,13.0005 C10.5,13.0005 10.69653,13.0745 11,13.188 L11,11.0005 C11,10.0838 11.36529,9.3179 12,9.0005 C13,8.5005 13.40372,8.7024 14,9.0005 L15,9.5005 L15,6.0005 C15,5.5005 14.4714,5.0005 14,5.0005 C13,5.0005 12,6.0005 10,6.0005 C8,6.0005 7,5.0005 6,5.0005 L6,5 Z M7.75,8.5 C8.44036,8.5 9,9.0596 9,9.75 C9,10.4404 8.44036,11 7.75,11 C7.05964,11 6.5,10.4404 6.5,9.75 C6.5,9.0596 7.05964,8.5 7.75,8.5 L7.75,8.5 Z M13,10 C12.5286,10 12,10.5 12,11 L12,18 C12,20.216 13,23 17,23 C21,23 22,20.216 22,18 L22,11 C22,10.5 21.4714,10 21,10 C20,10 19,11 17,11 C15,11 14,10 13,10 L13,10 Z M14.75,13.5 C15.44036,13.5 16,14.0596 16,14.75 C16,15.4404 15.44036,16 14.75,16 C14.05964,16 13.5,15.4404 13.5,14.75 C13.5,14.0596 14.05964,13.5 14.75,13.5 L14.75,13.5 Z M19.25,13.5 C19.94036,13.5 20.5,14.0596 20.5,14.75 C20.5,15.4404 19.94036,16 19.25,16 C18.55964,16 18,15.4404 18,14.75 C18,14.0596 18.55964,13.5 19.25,13.5 L19.25,13.5 Z M14,19 L20,19 C20,19 19.5,21 17,21 C14.5,21 14,19 14,19 L14,19 Z" id="path6342-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6,5 C5.5286,5 5,5.5 5,6 L5,13 C5,15.216 6,18 10,18 C10.35868,18 10.68618,17.983 11,17.938 L11,15.0005 L7,15.0005 C7,15.0005 7.5,13.0005 10,13.0005 C10.5,13.0005 10.69653,13.0745 11,13.188 L11,11.0005 C11,10.0838 11.36529,9.3179 12,9.0005 C13,8.5005 13.40372,8.7024 14,9.0005 L15,9.5005 L15,6.0005 C15,5.5005 14.4714,5.0005 14,5.0005 C13,5.0005 12,6.0005 10,6.0005 C8,6.0005 7,5.0005 6,5.0005 L6,5 Z M7.75,8.5 C8.44036,8.5 9,9.0596 9,9.75 C9,10.4404 8.44036,11 7.75,11 C7.05964,11 6.5,10.4404 6.5,9.75 C6.5,9.0596 7.05964,8.5 7.75,8.5 L7.75,8.5 Z M13,10 C12.5286,10 12,10.5 12,11 L12,18 C12,20.216 13,23 17,23 C21,23 22,20.216 22,18 L22,11 C22,10.5 21.4714,10 21,10 C20,10 19,11 17,11 C15,11 14,10 13,10 L13,10 Z M14.75,13.5 C15.44036,13.5 16,14.0596 16,14.75 C16,15.4404 15.44036,16 14.75,16 C14.05964,16 13.5,15.4404 13.5,14.75 C13.5,14.0596 14.05964,13.5 14.75,13.5 L14.75,13.5 Z M19.25,13.5 C19.94036,13.5 20.5,14.0596 20.5,14.75 C20.5,15.4404 19.94036,16 19.25,16 C18.55964,16 18,15.4404 18,14.75 C18,14.0596 18.55964,13.5 19.25,13.5 L19.25,13.5 Z M14,19 L20,19 C20,19 19.5,21 17,21 C14.5,21 14,19 14,19 L14,19 Z" id="path6342-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/theatre-m.svg b/data/styles/clear/style-night/symbols/theatre-m.svg
index 85369c8acb..2f7aeaa3f0 100644
--- a/data/styles/clear/style-night/symbols/theatre-m.svg
+++ b/data/styles/clear/style-night/symbols/theatre-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>theatre-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="theatre-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M5.78125,5.3622 C5.39236,5.3622 5,5.7546 5,6.1435 L5,11.6435 C5,13.3671 5.76389,15.4247 8.875,15.4247 C9.15397,15.4247 8.75591,15.3977 9,15.3627 L9,13.3627 L6.5,13.3627 C6.5,13.3627 7.0555,11.3627 9,11.3627 L9,9.7065 C9,8.9935 9.10973,8.2525 9.5,7.8622 C9.89026,7.4719 10.38818,6.5542 12,7.3617 L13,7.8622 L13,6.144 C13,5.7551 12.60764,5.3627 12.21875,5.3627 C11.49653,5.3627 10,6.3627 9,6.3627 C8,6.3627 6.50347,5.3627 5.78125,5.3627 L5.78125,5.3622 Z M7,7.3622 C7.55228,7.3622 8,7.8099 8,8.3622 C8,8.9145 7.55228,9.3622 7,9.3622 C6.44772,9.3622 6,8.9145 6,8.3622 C6,7.8099 6.44772,7.3622 7,7.3622 L7,7.3622 Z M10.78125,8.3622 C10.4146,8.3622 10,8.7546 10,9.1435 L10,14.3622 C10,16.0858 10.88889,18.3622 14,18.3622 C17.11111,18.3622 18,16.0858 18,14.3622 L18,9.1435 C18,8.7546 17.5854,8.3622 17.21875,8.3622 C16.49653,8.3622 15,9.3622 14,9.3622 C13,9.3622 11.50347,8.3622 10.78125,8.3622 L10.78125,8.3622 Z M12,10.3622 C12.55228,10.3622 13,10.8099 13,11.3622 C13,11.9145 12.55228,12.3622 12,12.3622 C11.44772,12.3622 11,11.9145 11,11.3622 C11,10.8099 11.44772,10.3622 12,10.3622 L12,10.3622 Z M16,10.3622 C16.55228,10.3622 17,10.8099 17,11.3622 C17,11.9145 16.55228,12.3622 16,12.3622 C15.44772,12.3622 15,11.9145 15,11.3622 C15,10.8099 15.44772,10.3622 16,10.3622 L16,10.3622 Z M11.5,14.3622 L14.0625,14.3622 L16.5,14.3622 C16.5,14.3622 15.94445,16.3622 14,16.3622 C12.05556,16.3622 11.5,14.3622 11.5,14.3622 L11.5,14.3622 Z" id="path6342-3-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M5.78125,5.3622 C5.39236,5.3622 5,5.7546 5,6.1435 L5,11.6435 C5,13.3671 5.76389,15.4247 8.875,15.4247 C9.15397,15.4247 8.75591,15.3977 9,15.3627 L9,13.3627 L6.5,13.3627 C6.5,13.3627 7.0555,11.3627 9,11.3627 L9,9.7065 C9,8.9935 9.10973,8.2525 9.5,7.8622 C9.89026,7.4719 10.38818,6.5542 12,7.3617 L13,7.8622 L13,6.144 C13,5.7551 12.60764,5.3627 12.21875,5.3627 C11.49653,5.3627 10,6.3627 9,6.3627 C8,6.3627 6.50347,5.3627 5.78125,5.3627 L5.78125,5.3622 Z M7,7.3622 C7.55228,7.3622 8,7.8099 8,8.3622 C8,8.9145 7.55228,9.3622 7,9.3622 C6.44772,9.3622 6,8.9145 6,8.3622 C6,7.8099 6.44772,7.3622 7,7.3622 L7,7.3622 Z M10.78125,8.3622 C10.4146,8.3622 10,8.7546 10,9.1435 L10,14.3622 C10,16.0858 10.88889,18.3622 14,18.3622 C17.11111,18.3622 18,16.0858 18,14.3622 L18,9.1435 C18,8.7546 17.5854,8.3622 17.21875,8.3622 C16.49653,8.3622 15,9.3622 14,9.3622 C13,9.3622 11.50347,8.3622 10.78125,8.3622 L10.78125,8.3622 Z M12,10.3622 C12.55228,10.3622 13,10.8099 13,11.3622 C13,11.9145 12.55228,12.3622 12,12.3622 C11.44772,12.3622 11,11.9145 11,11.3622 C11,10.8099 11.44772,10.3622 12,10.3622 L12,10.3622 Z M16,10.3622 C16.55228,10.3622 17,10.8099 17,11.3622 C17,11.9145 16.55228,12.3622 16,12.3622 C15.44772,12.3622 15,11.9145 15,11.3622 C15,10.8099 15.44772,10.3622 16,10.3622 L16,10.3622 Z M11.5,14.3622 L14.0625,14.3622 L16.5,14.3622 C16.5,14.3622 15.94445,16.3622 14,16.3622 C12.05556,16.3622 11.5,14.3622 11.5,14.3622 L11.5,14.3622 Z" id="path6342-3-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/theatre-s.svg b/data/styles/clear/style-night/symbols/theatre-s.svg
index 804249f3d9..ef85c1970c 100644
--- a/data/styles/clear/style-night/symbols/theatre-s.svg
+++ b/data/styles/clear/style-night/symbols/theatre-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>theatre-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="theatre-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <g id="g6508-copy" transform="translate(4.000000, 4.000000)" fill="#FFFFFF" opacity="0.41" sketch:type="MSShapeGroup">
+            <g id="g6508-copy" transform="translate(4.000000, 4.000000)" fill="#FFFFFF" opacity="0.400186567" sketch:type="MSShapeGroup">
                 <path d="M0.5,0.3622 C0.25,0.3622 0,0.6122 0,0.8622 L0,3.8622 C0,4.9702 0.5,6.3622 2.5,6.3622 C2.67934,6.3622 2.84309,6.3522 3,6.3312 L3,4.8624 L1,4.8624 C1,4.8624 1.25,3.8624 2.5,3.8624 C2.75,3.8624 2.84826,3.8994 3,3.9564 L3,2.8624 C3,2.4041 3.20224,2.0508 3.45312,1.7999 C3.70401,1.549 4.04166,1.3624 4.5,1.3624 L5,1.3624 L5,0.8626 C5,0.6126 4.7357,0.3628 4.5,0.3626 C4,0.3622 3.5,0.8622 2.5,0.8622 C1.63337,0.8622 1,0.3622 0.5,0.3622 L0.5,0.3622 Z M1.5,2.3622 C1.77614,2.3622 2,2.5861 2,2.8622 C2,3.1383 1.77614,3.3622 1.5,3.3622 C1.22386,3.3622 1,3.1383 1,2.8622 C1,2.5861 1.22386,2.3622 1.5,2.3622 L1.5,2.3622 Z M4.5,2.3622 C4.2643,2.3622 4,2.6122 4,2.8622 L4,5.8622 C4,6.9702 4.5,8.3622 6.5,8.3622 C8.5,8.3622 9,6.9702 9,5.8622 L9,2.8622 C9,2.6122 8.7357,2.3622 8.5,2.3622 C8,2.3622 7.24536,2.8622 6.5,2.8622 C5.75464,2.8622 5,2.3622 4.5,2.3622 L4.5,2.3622 Z M5.5,4.3622 C5.77614,4.3622 6,4.5861 6,4.8622 C6,5.1383 5.77614,5.3622 5.5,5.3622 C5.22386,5.3622 5,5.1383 5,4.8622 C5,4.5861 5.22386,4.3622 5.5,4.3622 L5.5,4.3622 Z M7.5,4.3622 C7.77614,4.3622 8,4.5861 8,4.8622 C8,5.1383 7.77614,5.3622 7.5,5.3622 C7.22386,5.3622 7,5.1383 7,4.8622 C7,4.5861 7.22386,4.3622 7.5,4.3622 L7.5,4.3622 Z M5,6.3622 L8,6.3622 C8,6.3622 7.75,7.3622 6.5,7.3622 C5.25,7.3622 5,6.3622 5,6.3622 L5,6.3622 Z" id="path6370"></path>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/toilets-l copy.svg b/data/styles/clear/style-night/symbols/toilets-l copy.svg
index 2c0c793f36..737dbb5628 100644
--- a/data/styles/clear/style-night/symbols/toilets-l copy.svg	
+++ b/data/styles/clear/style-night/symbols/toilets-l copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>toilets-l copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="toilets-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M9.5,4 C8.11929,4 7,5.11929 7,6.5 C7,7.88071 8.11929,9 9.5,9 C10.88071,9 12,7.88071 12,6.5 C12,5.11929 10.88071,4 9.5,4 L9.5,4 Z M17.5,4 C16.11929,4 15,5.11929 15,6.5 C15,7.88071 16.11929,9 17.5,9 C18.88071,9 20,7.88071 20,6.5 C20,5.11929 18.88071,4 17.5,4 L17.5,4 Z M9,10 C8,10 7,11 7,12 L7,14 L5.5,18.5 C5.5,19 6,19 6.5,19 L8,19 L8,23 L11,23 L11,19 L12.5,19 C13,19 13.5,19 13.5,18.5 L12,14 L12,12 C12,11 11,10 10,10 L9,10 Z M15,10 C14.5,10 14,10.5 14,11 L16,17 L16,19 L16,23 L19,23 L19,19 L19,17 L21,11 C21,10.5 20.5,10 20,10 L15,10 Z" id="path16479-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M9.5,4 C8.11929,4 7,5.11929 7,6.5 C7,7.88071 8.11929,9 9.5,9 C10.88071,9 12,7.88071 12,6.5 C12,5.11929 10.88071,4 9.5,4 L9.5,4 Z M17.5,4 C16.11929,4 15,5.11929 15,6.5 C15,7.88071 16.11929,9 17.5,9 C18.88071,9 20,7.88071 20,6.5 C20,5.11929 18.88071,4 17.5,4 L17.5,4 Z M9,10 C8,10 7,11 7,12 L7,14 L5.5,18.5 C5.5,19 6,19 6.5,19 L8,19 L8,23 L11,23 L11,19 L12.5,19 C13,19 13.5,19 13.5,18.5 L12,14 L12,12 C12,11 11,10 10,10 L9,10 Z M15,10 C14.5,10 14,10.5 14,11 L16,17 L16,19 L16,23 L19,23 L19,19 L19,17 L21,11 C21,10.5 20.5,10 20,10 L15,10 Z" id="path16479-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/toilets-m copy.svg b/data/styles/clear/style-night/symbols/toilets-m copy.svg
index 72b2fa0f48..c3a3dbfe49 100644
--- a/data/styles/clear/style-night/symbols/toilets-m copy.svg	
+++ b/data/styles/clear/style-night/symbols/toilets-m copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>toilets-m copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="toilets-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M8.00001,4 C6.89544,4 6.00001,4.8954 6.00001,6 C6.00001,7.1046 6.89544,8 8.00001,8 C9.10458,8 10.00001,7.1046 10.00001,6 C10.00001,4.8954 9.10458,4 8.00001,4 L8.00001,4 Z M15,4 C13.89543,4 13,4.8954 13,6 C13,7.1046 13.89543,8 15,8 C16.10457,8 17,7.1046 17,6 C17,4.8954 16.10457,4 15,4 L15,4 Z M7.50001,9 L6.00001,10.5 L6.00001,13 L4.50001,15.5 L5.00001,16 L7.00001,16 L7.00001,19 L9.00001,19 L9.00001,16 L11.00001,16 L11.50001,15.5 L10.00001,13 L10.00001,10.5 L8.50001,9 L7.50001,9 Z M13,9 L12.00001,10 L14,14.5 L14,19 L16,19 L16,14.5 L18.00001,10 L17,9 L13,9 Z" id="path7660-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.00001,4 C6.89544,4 6.00001,4.8954 6.00001,6 C6.00001,7.1046 6.89544,8 8.00001,8 C9.10458,8 10.00001,7.1046 10.00001,6 C10.00001,4.8954 9.10458,4 8.00001,4 L8.00001,4 Z M15,4 C13.89543,4 13,4.8954 13,6 C13,7.1046 13.89543,8 15,8 C16.10457,8 17,7.1046 17,6 C17,4.8954 16.10457,4 15,4 L15,4 Z M7.50001,9 L6.00001,10.5 L6.00001,13 L4.50001,15.5 L5.00001,16 L7.00001,16 L7.00001,19 L9.00001,19 L9.00001,16 L11.00001,16 L11.50001,15.5 L10.00001,13 L10.00001,10.5 L8.50001,9 L7.50001,9 Z M13,9 L12.00001,10 L14,14.5 L14,19 L16,19 L16,14.5 L18.00001,10 L17,9 L13,9 Z" id="path7660-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/toilets-s copy.svg b/data/styles/clear/style-night/symbols/toilets-s copy.svg
index df843e9c40..a8457d0f93 100644
--- a/data/styles/clear/style-night/symbols/toilets-s copy.svg	
+++ b/data/styles/clear/style-night/symbols/toilets-s copy.svg	
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>toilets-s copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="toilets-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M6,4 C5.30964,4 4.75,4.55964 4.75,5.25 C4.75,5.94036 5.30964,6.5 6,6.5 C6.69036,6.5 7.25,5.94036 7.25,5.25 C7.25,4.55964 6.69036,4 6,4 L6,4 Z M11,4 C10.30964,4 9.75,4.55964 9.75,5.25 C9.75,5.94036 10.30964,6.5 11,6.5 C11.69036,6.5 12.25,5.94036 12.25,5.25 C12.25,4.55964 11.69036,4 11,4 L11,4 Z M5,7 L5,8.5 L3.5,11 L5,11 L5,13 L7,13 L7,11 L8.5,11 L7,8.5 L7,7 L5,7 L5,7 Z M9,7 L10,10.5 L10,13 L12,13 L12,10.5 L13,7 L9,7 L9,7 Z" id="path7660-7-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6,4 C5.30964,4 4.75,4.55964 4.75,5.25 C4.75,5.94036 5.30964,6.5 6,6.5 C6.69036,6.5 7.25,5.94036 7.25,5.25 C7.25,4.55964 6.69036,4 6,4 L6,4 Z M11,4 C10.30964,4 9.75,4.55964 9.75,5.25 C9.75,5.94036 10.30964,6.5 11,6.5 C11.69036,6.5 12.25,5.94036 12.25,5.25 C12.25,4.55964 11.69036,4 11,4 L11,4 Z M5,7 L5,8.5 L3.5,11 L5,11 L5,13 L7,13 L7,11 L8.5,11 L7,8.5 L7,7 L5,7 L5,7 Z M9,7 L10,10.5 L10,13 L12,13 L12,10.5 L13,7 L9,7 L9,7 Z" id="path7660-7-copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/tourism-l.svg b/data/styles/clear/style-night/symbols/tourism-l.svg
index 94a870fbcf..b9f5b6e2b8 100644
--- a/data/styles/clear/style-night/symbols/tourism-l.svg
+++ b/data/styles/clear/style-night/symbols/tourism-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>tourism-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="tourism-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <polygon id="Star-1" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" points="13.5 17.75 8.50382536 20.3766445 9.45800981 14.8133222 5.41601961 10.8733555 11.0019127 10.0616778 13.5 5 15.9980873 10.0616778 21.5839804 10.8733555 17.5419902 14.8133222 18.4961746 20.3766445 "></polygon>
+            <polygon id="Star-1" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup" points="13.5 17.75 8.50382536 20.3766445 9.45800981 14.8133222 5.41601961 10.8733555 11.0019127 10.0616778 13.5 5 15.9980873 10.0616778 21.5839804 10.8733555 17.5419902 14.8133222 18.4961746 20.3766445 "></polygon>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/tourism-m.svg b/data/styles/clear/style-night/symbols/tourism-m.svg
index 568411876c..f0d97afda9 100644
--- a/data/styles/clear/style-night/symbols/tourism-m.svg
+++ b/data/styles/clear/style-night/symbols/tourism-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>tourism-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="tourism-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <polygon id="Star-1-Copy-2" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" points="11.5 14.75 7.67939586 16.7586105 8.40906632 12.5043052 5.31813264 9.49138954 9.58969793 8.87069477 11.5 5 13.4103021 8.87069477 17.6818674 9.49138954 14.5909337 12.5043052 15.3206041 16.7586105 "></polygon>
+            <polygon id="Star-1-Copy-2" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup" points="11.5 14.75 7.67939586 16.7586105 8.40906632 12.5043052 5.31813264 9.49138954 9.58969793 8.87069477 11.5 5 13.4103021 8.87069477 17.6818674 9.49138954 14.5909337 12.5043052 15.3206041 16.7586105 "></polygon>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/tourism-s.svg b/data/styles/clear/style-night/symbols/tourism-s.svg
index cb64926743..83d4cc734f 100644
--- a/data/styles/clear/style-night/symbols/tourism-s.svg
+++ b/data/styles/clear/style-night/symbols/tourism-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>tourism-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="tourism-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <polygon id="Star-1-Copy-3" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" points="8.5 10.75 5.85496636 12.1405765 6.36012284 9.19528824 4.22024568 7.10942353 7.17748318 6.67971176 8.5 4 9.82251682 6.67971176 12.7797543 7.10942353 10.6398772 9.19528824 11.1450336 12.1405765 "></polygon>
+            <polygon id="Star-1-Copy-3" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup" points="8.5 10.75 5.85496636 12.1405765 6.36012284 9.19528824 4.22024568 7.10942353 7.17748318 6.67971176 8.5 4 9.82251682 6.67971176 12.7797543 7.10942353 10.6398772 9.19528824 11.1450336 12.1405765 "></polygon>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/townhall-l.svg b/data/styles/clear/style-night/symbols/townhall-l.svg
index 6146790b3b..cf0dffd27a 100644
--- a/data/styles/clear/style-night/symbols/townhall-l.svg
+++ b/data/styles/clear/style-night/symbols/townhall-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>townhall-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="bank-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M21.4018182,7.39104762 L14,4 L6.59818182,7.39104762 C6.23090909,7.52404762 6.005,7.86921429 6.00318182,8.23654762 L6,9 L22,9 L22,8.24107143 C21.995,7.86921429 21.7690909,7.52404762 21.4018182,7.39104762 Z M19.5,18 L19,10 L17,10 L16.5,18 L15.5,18 L14.9090909,10 L13.0909091,10 L12.5,18 L11.5,18 L11,10 L9,10 L8.5,18 L7.00244075,18 C6.44880801,18 6,18.4426603 6,18.9989566 L6,21 L22,21 L22,18.9989566 C22,18.4472481 21.5530501,18 20.9975592,18 L19.5,18 Z" id="Imported-Layers" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M21.4018182,7.39104762 L14,4 L6.59818182,7.39104762 C6.23090909,7.52404762 6.005,7.86921429 6.00318182,8.23654762 L6,9 L22,9 L22,8.24107143 C21.995,7.86921429 21.7690909,7.52404762 21.4018182,7.39104762 Z M19.5,18 L19,10 L17,10 L16.5,18 L15.5,18 L14.9090909,10 L13.0909091,10 L12.5,18 L11.5,18 L11,10 L9,10 L8.5,18 L7.00244075,18 C6.44880801,18 6,18.4426603 6,18.9989566 L6,21 L22,21 L22,18.9989566 C22,18.4472481 21.5530501,18 20.9975592,18 L19.5,18 Z" id="Imported-Layers" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/townhall-m.svg b/data/styles/clear/style-night/symbols/townhall-m.svg
index 7907eb16c3..0715960b63 100644
--- a/data/styles/clear/style-night/symbols/townhall-m.svg
+++ b/data/styles/clear/style-night/symbols/townhall-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>townhall-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="bank-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M11.5,4 C11.5,4 4.505,6.86921429 4.50318182,7.23654762 L4.5,8 L18.5,8 L18.5,7.24107143 C18.495,6.86921429 11.5,4 11.5,4 Z M16.0365553,16 L15.0112953,9 L13.9175005,9 L13.4600668,16 L12.5553169,16 L12,9 L11,9 L10.4870887,16 L9.55106163,16 L9.0292325,9 L7.91749907,9 L7.04839683,16 L6.00019572,16 C5.44780288,16 5,16.4438648 5,17 L5,18 L18,18 L18,17 C18,16.4477153 17.5446112,16 16.9952704,16 L16.0365553,16 Z" id="Imported-Layers-Copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.5,4 C11.5,4 4.505,6.86921429 4.50318182,7.23654762 L4.5,8 L18.5,8 L18.5,7.24107143 C18.495,6.86921429 11.5,4 11.5,4 Z M16.0365553,16 L15.0112953,9 L13.9175005,9 L13.4600668,16 L12.5553169,16 L12,9 L11,9 L10.4870887,16 L9.55106163,16 L9.0292325,9 L7.91749907,9 L7.04839683,16 L6.00019572,16 C5.44780288,16 5,16.4438648 5,17 L5,18 L18,18 L18,17 C18,16.4477153 17.5446112,16 16.9952704,16 L16.0365553,16 Z" id="Imported-Layers-Copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/townhall-s.svg b/data/styles/clear/style-night/symbols/townhall-s.svg
index 6b5d3845b4..fdbbfe94aa 100644
--- a/data/styles/clear/style-night/symbols/townhall-s.svg
+++ b/data/styles/clear/style-night/symbols/townhall-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>townhall-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="bank-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M8.5,4 C8.5,4 4.0045,5.86921429 4.00286364,6.23654762 L4,7 L13,7 L13,6.24107143 C12.9955,5.86921429 8.5,4 8.5,4 Z M11.5365553,11.5 L9.9600668,11.5 L9.05531693,11.5 L7.98708868,11.5 L7.05106163,11.5 L5.54839683,11.5 L5.25077269,11.5 C4.83613238,11.5 4.5,11.8328986 4.5,12.25 L4.5,13 L12.5,13 L12.5,12.25 C12.5,11.8357864 12.1738216,11.5 11.7408771,11.5 L11.5365553,11.5 Z M6,7.5 L7,7.5 L7,11 L6,11 L6,7.5 Z M8,7.5 L9,7.5 L9,11 L8,11 L8,7.5 Z M10,7.5 L11,7.5 L11,11 L10,11 L10,7.5 Z" id="Imported-Layers-Copy-2" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.5,4 C8.5,4 4.0045,5.86921429 4.00286364,6.23654762 L4,7 L13,7 L13,6.24107143 C12.9955,5.86921429 8.5,4 8.5,4 Z M11.5365553,11.5 L9.9600668,11.5 L9.05531693,11.5 L7.98708868,11.5 L7.05106163,11.5 L5.54839683,11.5 L5.25077269,11.5 C4.83613238,11.5 4.5,11.8328986 4.5,12.25 L4.5,13 L12.5,13 L12.5,12.25 C12.5,11.8357864 12.1738216,11.5 11.7408771,11.5 L11.5365553,11.5 Z M6,7.5 L7,7.5 L7,11 L6,11 L6,7.5 Z M8,7.5 L9,7.5 L9,11 L8,11 L8,7.5 Z M10,7.5 L11,7.5 L11,11 L10,11 L10,7.5 Z" id="Imported-Layers-Copy-2" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/volcano-l.svg b/data/styles/clear/style-night/symbols/volcano-l.svg
index 497f08430f..080484b03f 100644
--- a/data/styles/clear/style-night/symbols/volcano-l.svg
+++ b/data/styles/clear/style-night/symbols/volcano-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>volcano-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,9 +8,9 @@
         <g id="volcano-l-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
             <ellipse id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="12.5" ry="12.5"></ellipse>
-            <path d="M13.4999998,11.1570941 C12.902949,11.1570941 11.7512537,10.5975741 11.7512537,10.5975741 L7.08552632,17.96875 C7.02524737,18.0748312 7,18.1938375 7,18.3125 C7,18.828125 7.34210526,19.0001375 7.68421053,19 L19.3157895,19 C19.6578947,19.0001375 20,18.828125 20,18.3125 C20,18.1938375 19.9747868,18.0748312 19.9144737,17.96875 L15.3358539,10.5975741 C15.3358539,10.5975741 14.0978158,11.1570941 13.4999998,11.1570941 Z" id="path11349" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <rect id="Rectangle-35" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" x="12.9130435" y="7.04347826" width="2.34782609" height="2.34782609"></rect>
-            <rect id="Rectangle-35-Copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" x="15.2608696" y="4.69565217" width="2.34782609" height="2.34782609"></rect>
+            <path d="M13.4999998,11.1570941 C12.902949,11.1570941 11.7512537,10.5975741 11.7512537,10.5975741 L7.08552632,17.96875 C7.02524737,18.0748312 7,18.1938375 7,18.3125 C7,18.828125 7.34210526,19.0001375 7.68421053,19 L19.3157895,19 C19.6578947,19.0001375 20,18.828125 20,18.3125 C20,18.1938375 19.9747868,18.0748312 19.9144737,17.96875 L15.3358539,10.5975741 C15.3358539,10.5975741 14.0978158,11.1570941 13.4999998,11.1570941 Z" id="path11349" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <rect id="Rectangle-35" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup" x="12.9130435" y="7.04347826" width="2.34782609" height="2.34782609"></rect>
+            <rect id="Rectangle-35-Copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup" x="15.2608696" y="4.69565217" width="2.34782609" height="2.34782609"></rect>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/volcano-m.svg b/data/styles/clear/style-night/symbols/volcano-m.svg
index 7ac5f10274..630dc57016 100644
--- a/data/styles/clear/style-night/symbols/volcano-m.svg
+++ b/data/styles/clear/style-night/symbols/volcano-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>volcano-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,9 +8,9 @@
         <g id="volcano-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
-            <path d="M11.4999999,9.50419125 C10.991401,9.50419125 10.0103272,9.02756313 10.0103272,9.02756313 L6.03581871,15.306713 C5.98446998,15.3970785 5.96296296,15.4984542 5.96296296,15.599537 C5.96296296,16.0387731 6.25438596,16.1853023 6.54580897,16.1851852 L16.454191,16.1851852 C16.745614,16.1853023 17.037037,16.0387731 17.037037,15.599537 C17.037037,15.4984542 17.0155592,15.3970785 16.9641813,15.306713 L13.0638755,9.02756313 C13.0638755,9.02756313 12.0092505,9.50419125 11.4999999,9.50419125 Z" id="path11349" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <rect id="Rectangle-35" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" x="11" y="6" width="2" height="2"></rect>
-            <rect id="Rectangle-35-Copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" x="13" y="4" width="2" height="2"></rect>
+            <path d="M11.4999999,9.50419125 C10.991401,9.50419125 10.0103272,9.02756313 10.0103272,9.02756313 L6.03581871,15.306713 C5.98446998,15.3970785 5.96296296,15.4984542 5.96296296,15.599537 C5.96296296,16.0387731 6.25438596,16.1853023 6.54580897,16.1851852 L16.454191,16.1851852 C16.745614,16.1853023 17.037037,16.0387731 17.037037,15.599537 C17.037037,15.4984542 17.0155592,15.3970785 16.9641813,15.306713 L13.0638755,9.02756313 C13.0638755,9.02756313 12.0092505,9.50419125 11.4999999,9.50419125 Z" id="path11349" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <rect id="Rectangle-35" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup" x="11" y="6" width="2" height="2"></rect>
+            <rect id="Rectangle-35-Copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup" x="13" y="4" width="2" height="2"></rect>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/volcano-s.svg b/data/styles/clear/style-night/symbols/volcano-s.svg
index c8aabd4dc1..e79e70ee38 100644
--- a/data/styles/clear/style-night/symbols/volcano-s.svg
+++ b/data/styles/clear/style-night/symbols/volcano-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>volcano-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,9 +8,9 @@
         <g id="volcano-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.87037037"></circle>
-            <path d="M8.4999999,7.02483701 C8.12407903,7.02483701 7.39893749,6.67254666 7.39893749,6.67254666 L4.46125731,11.3136574 C4.4233039,11.3804493 4.40740741,11.4553792 4.40740741,11.5300926 C4.40740741,11.8547454 4.62280702,11.9630495 4.83820663,11.962963 L12.1617934,11.962963 C12.377193,11.9630495 12.5925926,11.8547454 12.5925926,11.5300926 C12.5925926,11.4553792 12.5767176,11.3804493 12.5387427,11.3136574 L9.655908,6.67254666 C9.655908,6.67254666 8.87640253,7.02483701 8.4999999,7.02483701 Z" id="path11349" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <rect id="Rectangle-35" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" x="8.13043478" y="4.43478261" width="1.47826087" height="1.47826087"></rect>
-            <rect id="Rectangle-35-Copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" x="9.60869565" y="2.95652174" width="1.47826087" height="1.47826087"></rect>
+            <path d="M8.4999999,7.02483701 C8.12407903,7.02483701 7.39893749,6.67254666 7.39893749,6.67254666 L4.46125731,11.3136574 C4.4233039,11.3804493 4.40740741,11.4553792 4.40740741,11.5300926 C4.40740741,11.8547454 4.62280702,11.9630495 4.83820663,11.962963 L12.1617934,11.962963 C12.377193,11.9630495 12.5925926,11.8547454 12.5925926,11.5300926 C12.5925926,11.4553792 12.5767176,11.3804493 12.5387427,11.3136574 L9.655908,6.67254666 C9.655908,6.67254666 8.87640253,7.02483701 8.4999999,7.02483701 Z" id="path11349" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <rect id="Rectangle-35" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup" x="8.13043478" y="4.43478261" width="1.47826087" height="1.47826087"></rect>
+            <rect id="Rectangle-35-Copy" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup" x="9.60869565" y="2.95652174" width="1.47826087" height="1.47826087"></rect>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/waterfall-l.svg b/data/styles/clear/style-night/symbols/waterfall-l.svg
index c27e55da77..d19046e6f6 100644
--- a/data/styles/clear/style-night/symbols/waterfall-l.svg
+++ b/data/styles/clear/style-night/symbols/waterfall-l.svg
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="25px" height="25px" viewBox="0 0 25 25" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+<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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>waterfall-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="waterfall-l-copy" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-38" opacity="0.2" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="12.5"></circle>
-            <path d="M4,16.4166667 L4,17.7708667 C4,17.7708667 5,17.3336667 6,17.3333333 C7,17.333 8,18 9.5,18 C11,18 11.47352,17.3564667 12.5,17.3333333 C13.5,17.3336667 14,18 15.5,18 C17,18 18,17.3333333 19,17.3333333 C19.70165,17.3333333 21,17.7708667 21,17.7708667 L21,16.4166667 C20.3584,16.2521333 19.65657,16 19,16 C17.5,16 16.5,16.667 15.5,16.6666667 C14.5,16.6663333 14,16 12.5,16 C11,16 10.5,16.667 9.5,16.6666667 C8.5,16.667 7.5,16 6,16 C5.30594,16 4.66024,16.2699333 4,16.4166667 Z" id="path4758-copy" fill="#295675" sketch:type="MSShapeGroup"></path>
-            <path d="M6,19 C5.30594,19 4.66024,19.2699333 4,19.4166667 L4,20.7708667 C4,20.7708667 5,20.3336667 6,20.3333333 C7,20.333 8,21 9.5,21 C11,21 11.47352,20.3564667 12.5,20.3333333 C13.5,20.3336667 14,21 15.5,21 C17,21 18,20.3333333 19,20.3333333 C19.70165,20.3333333 21,20.7708667 21,20.7708667 L21,19.4166667 C20.3584,19.2521333 19.65657,19 19,19 C17.5,19 16.5,19.667 15.5,19.6666667 C14.5,19.6663333 14,19 12.5,19 C11,19 10.5,19.667 9.5,19.6666667 C8.5,19.667 7.5,19 6,19 L6,19 Z" id="path4758-copy-6" fill="#295675" sketch:type="MSShapeGroup"></path>
-            <path d="M12.1875,3 L11.17185,3 C11.17185,3 11.49975,3.69515724 11.5,4.39031449 C11.50025,5.08547173 11,5.78062897 11,6.82336484 C11,7.8661007 11.48265,8.19527156 11.5,8.90883657 C11.49975,9.60399381 11,9.95157243 11,10.9943083 C11,12.0370442 11.5,12.7322014 11.5,13.4273586 C11.5,13.9151157 11.17185,14.8176731 11.17185,14.8176731 L12.1875,14.8176731 C12.3109,14.3716602 12.5,13.883778 12.5,13.4273586 C12.5,12.3846228 11.99975,11.6894655 12,10.9943083 C12.00025,10.2991511 12.5,9.95157243 12.5,8.90883657 C12.5,7.8661007 11.99975,7.51852208 12,6.82336484 C11.99975,6.12820759 12.5,5.43305035 12.5,4.39031449 C12.5,3.90783365 12.29755,3.45897062 12.1875,3 Z" id="path4758-copy-2" fill="#295675" sketch:type="MSShapeGroup"></path>
-            <path d="M10.1875,3 L9.17185,3 C9.17185,3 9.49975,3.69515724 9.5,4.39031449 C9.50025,5.08547173 9,5.78062897 9,6.82336484 C9,7.8661007 9.48265,8.19527156 9.5,8.90883657 C9.49975,9.60399381 9,9.95157243 9,10.9943083 C9,12.0370442 9.5,12.7322014 9.5,13.4273586 C9.5,13.9151157 9.17185,14.8176731 9.17185,14.8176731 L10.1875,14.8176731 C10.3109,14.3716602 10.5,13.883778 10.5,13.4273586 C10.5,12.3846228 9.99975,11.6894655 10,10.9943083 C10.00025,10.2991511 10.5,9.95157243 10.5,8.90883657 C10.5,7.8661007 9.99975,7.51852208 10,6.82336484 C9.99975,6.12820759 10.5,5.43305035 10.5,4.39031449 C10.5,3.90783365 10.29755,3.45897062 10.1875,3 Z" id="path4758-copy-5" fill="#295675" sketch:type="MSShapeGroup"></path>
-            <path d="M14.1875,3 L13.17185,3 C13.17185,3 13.49975,3.69515724 13.5,4.39031449 C13.50025,5.08547173 13,5.78062897 13,6.82336484 C13,7.8661007 13.48265,8.19527156 13.5,8.90883657 C13.49975,9.60399381 13,9.95157243 13,10.9943083 C13,12.0370442 13.5,12.7322014 13.5,13.4273586 C13.5,13.9151157 13.17185,14.8176731 13.17185,14.8176731 L14.1875,14.8176731 C14.3109,14.3716602 14.5,13.883778 14.5,13.4273586 C14.5,12.3846228 13.99975,11.6894655 14,10.9943083 C14.00025,10.2991511 14.5,9.95157243 14.5,8.90883657 C14.5,7.8661007 13.99975,7.51852208 14,6.82336484 C13.99975,6.12820759 14.5,5.43305035 14.5,4.39031449 C14.5,3.90783365 14.29755,3.45897062 14.1875,3 Z" id="path4758-copy-3" fill="#295675" sketch:type="MSShapeGroup"></path>
-            <path d="M16.1875,3 L15.17185,3 C15.17185,3 15.49975,3.69515724 15.5,4.39031449 C15.50025,5.08547173 15,5.78062897 15,6.82336484 C15,7.8661007 15.48265,8.19527156 15.5,8.90883657 C15.49975,9.60399381 15,9.95157243 15,10.9943083 C15,12.0370442 15.5,12.7322014 15.5,13.4273586 C15.5,13.9151157 15.17185,14.8176731 15.17185,14.8176731 L16.1875,14.8176731 C16.3109,14.3716602 16.5,13.883778 16.5,13.4273586 C16.5,12.3846228 15.99975,11.6894655 16,10.9943083 C16.00025,10.2991511 16.5,9.95157243 16.5,8.90883657 C16.5,7.8661007 15.99975,7.51852208 16,6.82336484 C15.99975,6.12820759 16.5,5.43305035 16.5,4.39031449 C16.5,3.90783365 16.29755,3.45897062 16.1875,3 Z" id="path4758-copy-4" fill="#295675" sketch:type="MSShapeGroup"></path>
+        <g id="waterfall-l" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#133655" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <path d="M5,17.4166667 L5,18.7708667 C5,18.7708667 6,18.3336667 7,18.3333333 C8,18.333 9,19 10.5,19 C12,19 12.47352,18.3564667 13.5,18.3333333 C14.5,18.3336667 15,19 16.5,19 C18,19 19,18.3333333 20,18.3333333 C20.70165,18.3333333 22,18.7708667 22,18.7708667 L22,17.4166667 C21.3584,17.2521333 20.65657,17 20,17 C18.5,17 17.5,17.667 16.5,17.6666667 C15.5,17.6663333 15,17 13.5,17 C12,17 11.5,17.667 10.5,17.6666667 C9.5,17.667 8.5,17 7,17 C6.30594,17 5.66024,17.2699333 5,17.4166667 Z" id="path4758-copy-12" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M7,20 C6.30594,20 5.66024,20.2699333 5,20.4166667 L5,21.7708667 C5,21.7708667 6,21.3336667 7,21.3333333 C8,21.333 9,22 10.5,22 C12,22 12.47352,21.3564667 13.5,21.3333333 C14.5,21.3336667 15,22 16.5,22 C18,22 19,21.3333333 20,21.3333333 C20.70165,21.3333333 22,21.7708667 22,21.7708667 L22,20.4166667 C21.3584,20.2521333 20.65657,20 20,20 C18.5,20 17.5,20.667 16.5,20.6666667 C15.5,20.6663333 15,20 13.5,20 C12,20 11.5,20.667 10.5,20.6666667 C9.5,20.667 8.5,20 7,20 L7,20 Z" id="path4758-copy-7" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M13.1875,4 L12.17185,4 C12.17185,4 12.49975,4.69515724 12.5,5.39031449 C12.50025,6.08547173 12,6.78062897 12,7.82336484 C12,8.8661007 12.48265,9.19527156 12.5,9.90883657 C12.49975,10.6039938 12,10.9515724 12,11.9943083 C12,13.0370442 12.5,13.7322014 12.5,14.4273586 C12.5,14.9151157 12.17185,15.8176731 12.17185,15.8176731 L13.1875,15.8176731 C13.3109,15.3716602 13.5,14.883778 13.5,14.4273586 C13.5,13.3846228 12.99975,12.6894655 13,11.9943083 C13.00025,11.2991511 13.5,10.9515724 13.5,9.90883657 C13.5,8.8661007 12.99975,8.51852208 13,7.82336484 C12.99975,7.12820759 13.5,6.43305035 13.5,5.39031449 C13.5,4.90783365 13.29755,4.45897062 13.1875,4 Z" id="path4758-copy-8" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.1875,4 L10.17185,4 C10.17185,4 10.49975,4.69515724 10.5,5.39031449 C10.50025,6.08547173 10,6.78062897 10,7.82336484 C10,8.8661007 10.48265,9.19527156 10.5,9.90883657 C10.49975,10.6039938 10,10.9515724 10,11.9943083 C10,13.0370442 10.5,13.7322014 10.5,14.4273586 C10.5,14.9151157 10.17185,15.8176731 10.17185,15.8176731 L11.1875,15.8176731 C11.3109,15.3716602 11.5,14.883778 11.5,14.4273586 C11.5,13.3846228 10.99975,12.6894655 11,11.9943083 C11.00025,11.2991511 11.5,10.9515724 11.5,9.90883657 C11.5,8.8661007 10.99975,8.51852208 11,7.82336484 C10.99975,7.12820759 11.5,6.43305035 11.5,5.39031449 C11.5,4.90783365 11.29755,4.45897062 11.1875,4 Z" id="path4758-copy-9" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M15.1875,4 L14.17185,4 C14.17185,4 14.49975,4.69515724 14.5,5.39031449 C14.50025,6.08547173 14,6.78062897 14,7.82336484 C14,8.8661007 14.48265,9.19527156 14.5,9.90883657 C14.49975,10.6039938 14,10.9515724 14,11.9943083 C14,13.0370442 14.5,13.7322014 14.5,14.4273586 C14.5,14.9151157 14.17185,15.8176731 14.17185,15.8176731 L15.1875,15.8176731 C15.3109,15.3716602 15.5,14.883778 15.5,14.4273586 C15.5,13.3846228 14.99975,12.6894655 15,11.9943083 C15.00025,11.2991511 15.5,10.9515724 15.5,9.90883657 C15.5,8.8661007 14.99975,8.51852208 15,7.82336484 C14.99975,7.12820759 15.5,6.43305035 15.5,5.39031449 C15.5,4.90783365 15.29755,4.45897062 15.1875,4 Z" id="path4758-copy-10" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M17.1875,4 L16.17185,4 C16.17185,4 16.49975,4.69515724 16.5,5.39031449 C16.50025,6.08547173 16,6.78062897 16,7.82336484 C16,8.8661007 16.48265,9.19527156 16.5,9.90883657 C16.49975,10.6039938 16,10.9515724 16,11.9943083 C16,13.0370442 16.5,13.7322014 16.5,14.4273586 C16.5,14.9151157 16.17185,15.8176731 16.17185,15.8176731 L17.1875,15.8176731 C17.3109,15.3716602 17.5,14.883778 17.5,14.4273586 C17.5,13.3846228 16.99975,12.6894655 17,11.9943083 C17.00025,11.2991511 17.5,10.9515724 17.5,9.90883657 C17.5,8.8661007 16.99975,8.51852208 17,7.82336484 C16.99975,7.12820759 17.5,6.43305035 17.5,5.39031449 C17.5,4.90783365 17.29755,4.45897062 17.1875,4 Z" id="path4758-copy-11" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/waterfall-m.svg b/data/styles/clear/style-night/symbols/waterfall-m.svg
index c093a0c6f6..72644223c6 100644
--- a/data/styles/clear/style-night/symbols/waterfall-m.svg
+++ b/data/styles/clear/style-night/symbols/waterfall-m.svg
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="22px" viewBox="0 0 23 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+<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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>waterfall-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="waterfall-m-copy" sketch:type="MSLayerGroup" transform="translate(0.000000, -0.500000)">
-            <circle id="Oval-1-Copy-38" opacity="0.2" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.6481481"></circle>
-            <path d="M5.96296296,14.4814815 C5.37172667,14.4814815 4.82168593,14.7114247 4.25925926,14.8364198 L4.25925926,15.9899975 C4.25925926,15.9899975 5.11111111,15.6175679 5.96296296,15.617284 C6.81481481,15.617 7.66666667,16.1851852 8.94444444,16.1851852 C10.2222222,16.1851852 10.6255911,15.6369901 11.5,15.617284 C12.3518519,15.6175679 12.7777778,16.1851852 14.0555556,16.1851852 C15.3333333,16.1851852 16.1851852,15.617284 17.037037,15.617284 C17.6347389,15.617284 18.7407407,15.9899975 18.7407407,15.9899975 L18.7407407,14.8364198 C18.1941926,14.6962617 17.5963374,14.4814815 17.037037,14.4814815 C15.7592593,14.4814815 14.9074074,15.0496667 14.0555556,15.0493827 C13.2037037,15.0490988 12.7777778,14.4814815 11.5,14.4814815 C10.2222222,14.4814815 9.7962963,15.0496667 8.94444444,15.0493827 C8.09259259,15.0496667 7.24074074,14.4814815 5.96296296,14.4814815 L5.96296296,14.4814815 Z" id="path4758-copy" fill="#295675" sketch:type="MSShapeGroup"></path>
-            <path d="M5.96296296,17.037037 C5.37172667,17.037037 4.82168593,17.2669802 4.25925926,17.3919753 L4.25925926,18.5455531 C4.25925926,18.5455531 5.11111111,18.1731235 5.96296296,18.1728395 C6.81481481,18.1725556 7.66666667,18.7407407 8.94444444,18.7407407 C10.2222222,18.7407407 10.6255911,18.1925457 11.5,18.1728395 C12.3518519,18.1731235 12.7777778,18.7407407 14.0555556,18.7407407 C15.3333333,18.7407407 16.1851852,18.1728395 17.037037,18.1728395 C17.6347389,18.1728395 18.7407407,18.5455531 18.7407407,18.5455531 L18.7407407,17.3919753 C18.1941926,17.2518173 17.5963374,17.037037 17.037037,17.037037 C15.7592593,17.037037 14.9074074,17.6052222 14.0555556,17.6049383 C13.2037037,17.6046543 12.7777778,17.037037 11.5,17.037037 C10.2222222,17.037037 9.7962963,17.6052222 8.94444444,17.6049383 C8.09259259,17.6052222 7.24074074,17.037037 5.96296296,17.037037 L5.96296296,17.037037 Z" id="path4758-copy-6" fill="#295675" sketch:type="MSShapeGroup"></path>
-            <path d="M11.2337963,3.40740741 L10.368613,3.40740741 C10.368613,3.40740741 10.6479352,3.99957839 10.6481481,4.59174938 C10.6483611,5.18392036 10.2222222,5.77609135 10.2222222,6.66434782 C10.2222222,7.5526043 10.6333685,7.83300911 10.6481481,8.44086078 C10.6479352,9.03303176 10.2222222,9.32911726 10.2222222,10.2173737 C10.2222222,11.1056302 10.6481481,11.6978012 10.6481481,12.2899722 C10.6481481,12.705469 10.368613,13.4743142 10.368613,13.4743142 L11.2337963,13.4743142 C11.3389148,13.0943772 11.5,12.6787739 11.5,12.2899722 C11.5,11.4017157 11.0738611,10.8095447 11.0740741,10.2173737 C11.074287,9.62520275 11.5,9.32911726 11.5,8.44086078 C11.5,7.5526043 11.0738611,7.25651881 11.0740741,6.66434782 C11.0738611,6.07217684 11.5,5.48000585 11.5,4.59174938 C11.5,4.18074718 11.3275426,3.79838238 11.2337963,3.40740741 Z" id="path4758-copy-2" fill="#295675" sketch:type="MSShapeGroup"></path>
-            <path d="M9.53009259,3.40740741 L8.66490926,3.40740741 C8.66490926,3.40740741 8.94423148,3.99957839 8.94444444,4.59174938 C8.94465741,5.18392036 8.51851852,5.77609135 8.51851852,6.66434782 C8.51851852,7.5526043 8.92966481,7.83300911 8.94444444,8.44086078 C8.94423148,9.03303176 8.51851852,9.32911726 8.51851852,10.2173737 C8.51851852,11.1056302 8.94444444,11.6978012 8.94444444,12.2899722 C8.94444444,12.705469 8.66490926,13.4743142 8.66490926,13.4743142 L9.53009259,13.4743142 C9.63521111,13.0943772 9.7962963,12.6787739 9.7962963,12.2899722 C9.7962963,11.4017157 9.37015741,10.8095447 9.37037037,10.2173737 C9.37058333,9.62520275 9.7962963,9.32911726 9.7962963,8.44086078 C9.7962963,7.5526043 9.37015741,7.25651881 9.37037037,6.66434782 C9.37015741,6.07217684 9.7962963,5.48000585 9.7962963,4.59174938 C9.7962963,4.18074718 9.62383889,3.79838238 9.53009259,3.40740741 Z" id="path4758-copy-5" fill="#295675" sketch:type="MSShapeGroup"></path>
-            <path d="M12.9375,3.40740741 L12.0723167,3.40740741 C12.0723167,3.40740741 12.3516389,3.99957839 12.3518519,4.59174938 C12.3520648,5.18392036 11.9259259,5.77609135 11.9259259,6.66434782 C11.9259259,7.5526043 12.3370722,7.83300911 12.3518519,8.44086078 C12.3516389,9.03303176 11.9259259,9.32911726 11.9259259,10.2173737 C11.9259259,11.1056302 12.3518519,11.6978012 12.3518519,12.2899722 C12.3518519,12.705469 12.0723167,13.4743142 12.0723167,13.4743142 L12.9375,13.4743142 C13.0426185,13.0943772 13.2037037,12.6787739 13.2037037,12.2899722 C13.2037037,11.4017157 12.7775648,10.8095447 12.7777778,10.2173737 C12.7779907,9.62520275 13.2037037,9.32911726 13.2037037,8.44086078 C13.2037037,7.5526043 12.7775648,7.25651881 12.7777778,6.66434782 C12.7775648,6.07217684 13.2037037,5.48000585 13.2037037,4.59174938 C13.2037037,4.18074718 13.0312463,3.79838238 12.9375,3.40740741 Z" id="path4758-copy-3" fill="#295675" sketch:type="MSShapeGroup"></path>
-            <path d="M14.6412037,3.40740741 L13.7760204,3.40740741 C13.7760204,3.40740741 14.0553426,3.99957839 14.0555556,4.59174938 C14.0557685,5.18392036 13.6296296,5.77609135 13.6296296,6.66434782 C13.6296296,7.5526043 14.0407759,7.83300911 14.0555556,8.44086078 C14.0553426,9.03303176 13.6296296,9.32911726 13.6296296,10.2173737 C13.6296296,11.1056302 14.0555556,11.6978012 14.0555556,12.2899722 C14.0555556,12.705469 13.7760204,13.4743142 13.7760204,13.4743142 L14.6412037,13.4743142 C14.7463222,13.0943772 14.9074074,12.6787739 14.9074074,12.2899722 C14.9074074,11.4017157 14.4812685,10.8095447 14.4814815,10.2173737 C14.4816944,9.62520275 14.9074074,9.32911726 14.9074074,8.44086078 C14.9074074,7.5526043 14.4812685,7.25651881 14.4814815,6.66434782 C14.4812685,6.07217684 14.9074074,5.48000585 14.9074074,4.59174938 C14.9074074,4.18074718 14.73495,3.79838238 14.6412037,3.40740741 Z" id="path4758-copy-4" fill="#295675" sketch:type="MSShapeGroup"></path>
+        <g id="waterfall-m" sketch:type="MSLayerGroup">
+            <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#133655" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <path d="M6.53367864,14 C6.00144614,14 5.50629799,14.2069955 5,14.3195164 L5,15.3579702 C5,15.3579702 5.76683932,15.022708 6.53367864,15.0224524 C7.30051796,15.0221968 8.06735728,15.5336786 9.21761626,15.5336786 C10.3678752,15.5336786 10.730989,15.040192 11.5181342,15.0224524 C12.2849735,15.022708 12.6683932,15.5336786 13.8186522,15.5336786 C14.9689111,15.5336786 15.7357505,15.0224524 16.5025898,15.0224524 C17.0406426,15.0224524 18.0362684,15.3579702 18.0362684,15.3579702 L18.0362684,14.3195164 C17.5442643,14.1933458 17.0060735,14 16.5025898,14 C15.3523308,14 14.5854915,14.5114818 13.8186522,14.5112262 C13.0518129,14.5109706 12.6683932,14 11.5181342,14 C10.3678752,14 9.98445557,14.5114818 9.21761626,14.5112262 C8.45077694,14.5114818 7.68393762,14 6.53367864,14 L6.53367864,14 Z" id="path4758-copy-18" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M5,16.3195164 L5,17.3579702 C5,17.3579702 5.76683932,17.022708 6.53367864,17.0224524 C7.30051796,17.0221968 8.06735728,17.5336786 9.21761626,17.5336786 C10.3678752,17.5336786 10.730989,17.040192 11.5181342,17.0224524 C12.2849735,17.022708 12.6683932,17.5336786 13.8186522,17.5336786 C14.9689111,17.5336786 15.7357505,17.0224524 16.5025898,17.0224524 C17.0406426,17.0224524 18.0362684,17.3579702 18.0362684,17.3579702 L18.0362684,16.3195164 C17.5442643,16.1933458 17.0060735,16 16.5025898,16 C15.3523308,16 14.5854915,16.5114818 13.8186522,16.5112262 C13.0518129,16.5109706 12.6683932,16 11.5181342,16 C10.3678752,16 9.98445557,16.5114818 9.21761626,16.5112262 C8.45077694,16.5114818 7.68393762,16 6.53367864,16 C6.00144615,16 5.50629799,16.2069955 5,16.3195164 Z" id="path4758-copy-13" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10.9106217,4 L10.1317813,4 C10.1317813,4 10.3832279,4.53307391 10.3834197,5.06614781 C10.3836114,5.59922172 10,6.13229563 10,6.93190649 C10,7.73151735 10.370115,7.98393851 10.3834197,8.53112821 C10.3832279,9.06420212 10,9.33073907 10,10.1303499 C10,10.9299608 10.3834197,11.4630347 10.3834197,11.9961086 C10.3834197,12.3701399 10.1317813,13.0622564 10.1317813,13.0622564 L10.9106217,13.0622564 C11.0052497,12.7202362 11.150259,12.3461089 11.150259,11.9961086 C11.150259,11.1964977 10.7666476,10.6634238 10.7668393,10.1303499 C10.767031,9.59727602 11.150259,9.33073907 11.150259,8.53112821 C11.150259,7.73151735 10.7666476,7.4649804 10.7668393,6.93190649 C10.7666476,6.39883258 11.150259,5.86575867 11.150259,5.06614781 C11.150259,4.69616254 10.9950124,4.35195672 10.9106217,4 Z" id="path4758-copy-14" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.91062169,4 L8.13178134,4 C8.13178134,4 8.38322795,4.53307391 8.38341966,5.06614781 C8.38361137,5.59922172 8,6.13229563 8,6.93190649 C8,7.73151735 8.370115,7.98393851 8.38341966,8.53112821 C8.38322795,9.06420212 8,9.33073907 8,10.1303499 C8,10.9299608 8.38341966,11.4630347 8.38341966,11.9961086 C8.38341966,12.3701399 8.13178134,13.0622564 8.13178134,13.0622564 L8.91062169,13.0622564 C9.00524966,12.7202362 9.15025898,12.3461089 9.15025898,11.9961086 C9.15025898,11.1964977 8.76664761,10.6634238 8.76683932,10.1303499 C8.76703103,9.59727602 9.15025898,9.33073907 9.15025898,8.53112821 C9.15025898,7.73151735 8.76664761,7.4649804 8.76683932,6.93190649 C8.76664761,6.39883258 9.15025898,5.86575867 9.15025898,5.06614781 C9.15025898,4.69616254 8.99501236,4.35195672 8.91062169,4 Z" id="path4758-copy-15" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M12.9106217,4 L12.1317813,4 C12.1317813,4 12.3832279,4.53307391 12.3834197,5.06614781 C12.3836114,5.59922172 12,6.13229563 12,6.93190649 C12,7.73151735 12.370115,7.98393851 12.3834197,8.53112821 C12.3832279,9.06420212 12,9.33073907 12,10.1303499 C12,10.9299608 12.3834197,11.4630347 12.3834197,11.9961086 C12.3834197,12.3701399 12.1317813,13.0622564 12.1317813,13.0622564 L12.9106217,13.0622564 C13.0052497,12.7202362 13.150259,12.3461089 13.150259,11.9961086 C13.150259,11.1964977 12.7666476,10.6634238 12.7668393,10.1303499 C12.767031,9.59727602 13.150259,9.33073907 13.150259,8.53112821 C13.150259,7.73151735 12.7666476,7.4649804 12.7668393,6.93190649 C12.7666476,6.39883258 13.150259,5.86575867 13.150259,5.06614781 C13.150259,4.69616254 12.9950124,4.35195672 12.9106217,4 Z" id="path4758-copy-16" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M14.9126485,4 L14.1338081,4 C14.1338081,4 14.3852547,4.53307391 14.3854464,5.06614781 C14.3856382,5.59922172 14.0020268,6.13229563 14.0020268,6.93190649 C14.0020268,7.73151735 14.3721418,7.98393851 14.3854464,8.53112821 C14.3852547,9.06420212 14.0020268,9.33073907 14.0020268,10.1303499 C14.0020268,10.9299608 14.3854464,11.4630347 14.3854464,11.9961086 C14.3854464,12.3701399 14.1338081,13.0622564 14.1338081,13.0622564 L14.9126485,13.0622564 C15.0072765,12.7202362 15.1522858,12.3461089 15.1522858,11.9961086 C15.1522858,11.1964977 14.7686744,10.6634238 14.7688661,10.1303499 C14.7690578,9.59727602 15.1522858,9.33073907 15.1522858,8.53112821 C15.1522858,7.73151735 14.7686744,7.4649804 14.7688661,6.93190649 C14.7686744,6.39883258 15.1522858,5.86575867 15.1522858,5.06614781 C15.1522858,4.69616254 14.9970391,4.35195672 14.9126485,4 Z" id="path4758-copy-17" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/waterfall-s.svg b/data/styles/clear/style-night/symbols/waterfall-s.svg
index a9e77784c4..fc7052fd2f 100644
--- a/data/styles/clear/style-night/symbols/waterfall-s.svg
+++ b/data/styles/clear/style-night/symbols/waterfall-s.svg
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="16px" viewBox="0 0 17 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+<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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>waterfall-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="waterfall-s-copy" sketch:type="MSLayerGroup" transform="translate(0.000000, -0.500000)">
-            <circle id="Oval-1-Copy-38" opacity="0.2" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.87037037"></circle>
-            <path d="M4.40740741,10.7037037 C3.97040667,10.7037037 3.56385481,10.8736617 3.14814815,10.9660494 L3.14814815,11.8186938 C3.14814815,11.8186938 3.77777778,11.5434198 4.40740741,11.5432099 C5.03703704,11.543 5.66666667,11.962963 6.61111111,11.962963 C7.55555556,11.962963 7.85369778,11.5577753 8.5,11.5432099 C9.12962963,11.5434198 9.44444444,11.962963 10.3888889,11.962963 C11.3333333,11.962963 11.962963,11.5432099 12.5925926,11.5432099 C13.0343722,11.5432099 13.8518519,11.8186938 13.8518519,11.8186938 L13.8518519,10.9660494 C13.4478815,10.8624543 13.0059885,10.7037037 12.5925926,10.7037037 C11.6481481,10.7037037 11.0185185,11.1236667 10.3888889,11.1234568 C9.75925926,11.1232469 9.44444444,10.7037037 8.5,10.7037037 C7.55555556,10.7037037 7.24074074,11.1236667 6.61111111,11.1234568 C5.98148148,11.1236667 5.35185185,10.7037037 4.40740741,10.7037037 L4.40740741,10.7037037 Z" id="path4758-copy" fill="#295675" sketch:type="MSShapeGroup"></path>
-            <path d="M4.40740741,12.5925926 C3.97040667,12.5925926 3.56385481,12.7625506 3.14814815,12.8549383 L3.14814815,13.7075827 C3.14814815,13.7075827 3.77777778,13.4323086 4.40740741,13.4320988 C5.03703704,13.4318889 5.66666667,13.8518519 6.61111111,13.8518519 C7.55555556,13.8518519 7.85369778,13.4466642 8.5,13.4320988 C9.12962963,13.4323086 9.44444444,13.8518519 10.3888889,13.8518519 C11.3333333,13.8518519 11.962963,13.4320988 12.5925926,13.4320988 C13.0343722,13.4320988 13.8518519,13.7075827 13.8518519,13.7075827 L13.8518519,12.8549383 C13.4478815,12.7513432 13.0059885,12.5925926 12.5925926,12.5925926 C11.6481481,12.5925926 11.0185185,13.0125556 10.3888889,13.0123457 C9.75925926,13.0121358 9.44444444,12.5925926 8.5,12.5925926 C7.55555556,12.5925926 7.24074074,13.0125556 6.61111111,13.0123457 C5.98148148,13.0125556 5.35185185,12.5925926 4.40740741,12.5925926 L4.40740741,12.5925926 Z" id="path4758-copy-6" fill="#295675" sketch:type="MSShapeGroup"></path>
-            <path d="M8.30324074,2.51851852 L7.66375741,2.51851852 C7.66375741,2.51851852 7.87021296,2.95621012 7.87037037,3.39390171 C7.87052778,3.83159331 7.55555556,4.26928491 7.55555556,4.92582231 C7.55555556,5.5823597 7.8594463,5.78961543 7.87037037,6.2388971 C7.87021296,6.6765887 7.55555556,6.89543449 7.55555556,7.55197189 C7.55555556,8.20850929 7.87037037,8.64620088 7.87037037,9.08389248 C7.87037037,9.39099879 7.66375741,9.95927568 7.66375741,9.95927568 L8.30324074,9.95927568 C8.38093704,9.67845275 8.5,9.37126765 8.5,9.08389248 C8.5,8.42735509 8.18502778,7.98966349 8.18518519,7.55197189 C8.18534259,7.11428029 8.5,6.89543449 8.5,6.2388971 C8.5,5.5823597 8.18502778,5.3635139 8.18518519,4.92582231 C8.18502778,4.48813071 8.5,4.05043911 8.5,3.39390171 C8.5,3.09011748 8.37253148,2.80750002 8.30324074,2.51851852 Z" id="path4758-copy-2" fill="#295675" sketch:type="MSShapeGroup"></path>
-            <path d="M7.04398148,2.51851852 L6.40449815,2.51851852 C6.40449815,2.51851852 6.6109537,2.95621012 6.61111111,3.39390171 C6.61126852,3.83159331 6.2962963,4.26928491 6.2962963,4.92582231 C6.2962963,5.5823597 6.60018704,5.78961543 6.61111111,6.2388971 C6.6109537,6.6765887 6.2962963,6.89543449 6.2962963,7.55197189 C6.2962963,8.20850929 6.61111111,8.64620088 6.61111111,9.08389248 C6.61111111,9.39099879 6.40449815,9.95927568 6.40449815,9.95927568 L7.04398148,9.95927568 C7.12167778,9.67845275 7.24074074,9.37126765 7.24074074,9.08389248 C7.24074074,8.42735509 6.92576852,7.98966349 6.92592593,7.55197189 C6.92608333,7.11428029 7.24074074,6.89543449 7.24074074,6.2388971 C7.24074074,5.5823597 6.92576852,5.3635139 6.92592593,4.92582231 C6.92576852,4.48813071 7.24074074,4.05043911 7.24074074,3.39390171 C7.24074074,3.09011748 7.11327222,2.80750002 7.04398148,2.51851852 Z" id="path4758-copy-5" fill="#295675" sketch:type="MSShapeGroup"></path>
-            <path d="M9.5625,2.51851852 L8.92301667,2.51851852 C8.92301667,2.51851852 9.12947222,2.95621012 9.12962963,3.39390171 C9.12978704,3.83159331 8.81481481,4.26928491 8.81481481,4.92582231 C8.81481481,5.5823597 9.11870556,5.78961543 9.12962963,6.2388971 C9.12947222,6.6765887 8.81481481,6.89543449 8.81481481,7.55197189 C8.81481481,8.20850929 9.12962963,8.64620088 9.12962963,9.08389248 C9.12962963,9.39099879 8.92301667,9.95927568 8.92301667,9.95927568 L9.5625,9.95927568 C9.6401963,9.67845275 9.75925926,9.37126765 9.75925926,9.08389248 C9.75925926,8.42735509 9.44428704,7.98966349 9.44444444,7.55197189 C9.44460185,7.11428029 9.75925926,6.89543449 9.75925926,6.2388971 C9.75925926,5.5823597 9.44428704,5.3635139 9.44444444,4.92582231 C9.44428704,4.48813071 9.75925926,4.05043911 9.75925926,3.39390171 C9.75925926,3.09011748 9.63179074,2.80750002 9.5625,2.51851852 Z" id="path4758-copy-3" fill="#295675" sketch:type="MSShapeGroup"></path>
-            <path d="M10.8217593,2.51851852 L10.1822759,2.51851852 C10.1822759,2.51851852 10.3887315,2.95621012 10.3888889,3.39390171 C10.3890463,3.83159331 10.0740741,4.26928491 10.0740741,4.92582231 C10.0740741,5.5823597 10.3779648,5.78961543 10.3888889,6.2388971 C10.3887315,6.6765887 10.0740741,6.89543449 10.0740741,7.55197189 C10.0740741,8.20850929 10.3888889,8.64620088 10.3888889,9.08389248 C10.3888889,9.39099879 10.1822759,9.95927568 10.1822759,9.95927568 L10.8217593,9.95927568 C10.8994556,9.67845275 11.0185185,9.37126765 11.0185185,9.08389248 C11.0185185,8.42735509 10.7035463,7.98966349 10.7037037,7.55197189 C10.7038611,7.11428029 11.0185185,6.89543449 11.0185185,6.2388971 C11.0185185,5.5823597 10.7035463,5.3635139 10.7037037,4.92582231 C10.7035463,4.48813071 11.0185185,4.05043911 11.0185185,3.39390171 C11.0185185,3.09011748 10.89105,2.80750002 10.8217593,2.51851852 Z" id="path4758-copy-4" fill="#295675" sketch:type="MSShapeGroup"></path>
+        <g id="waterfall-s" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#133655" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <path d="M5.05882353,10 C4.69138,10 4.34953882,10.1368898 4,10.2113019 L4,10.89805 C4,10.89805 4.52941176,10.6763352 5.05882353,10.6761661 C5.58823529,10.6759971 6.11764706,11.0142492 6.91176471,11.0142492 C7.70588235,11.0142492 7.95656941,10.6878976 8.5,10.6761661 C9.02941176,10.6763352 9.29411765,11.0142492 10.0882353,11.0142492 C10.8823529,11.0142492 11.4117647,10.6761661 11.9411765,10.6761661 C12.3126382,10.6761661 13,10.89805 13,10.89805 L13,10.2113019 C12.6603294,10.127863 12.2887724,10 11.9411765,10 C11.1470588,10 10.6176471,10.3382521 10.0882353,10.3380831 C9.55882353,10.337914 9.29411765,10 8.5,10 C7.70588235,10 7.44117647,10.3382521 6.91176471,10.3380831 C6.38235294,10.3382521 5.85294118,10 5.05882353,10 L5.05882353,10 Z" id="path4758-copy-24" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M5.05882353,12 C4.69138,12 4.34953882,12.1368898 4,12.2113019 L4,12.89805 C4,12.89805 4.52941176,12.6763352 5.05882353,12.6761661 C5.58823529,12.6759971 6.11764706,13.0142492 6.91176471,13.0142492 C7.70588235,13.0142492 7.95656941,12.6878976 8.5,12.6761661 C9.02941176,12.6763352 9.29411765,13.0142492 10.0882353,13.0142492 C10.8823529,13.0142492 11.4117647,12.6761661 11.9411765,12.6761661 C12.3126382,12.6761661 13,12.89805 13,12.89805 L13,12.2113019 C12.6603294,12.127863 12.2887724,12 11.9411765,12 C11.1470588,12 10.6176471,12.3382521 10.0882353,12.3380831 C9.55882353,12.337914 9.29411765,12 8.5,12 C7.70588235,12 7.44117647,12.3382521 6.91176471,12.3380831 C6.38235294,12.3382521 5.85294118,12 5.05882353,12 L5.05882353,12 Z" id="path4758-copy-19" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6.92033348,3 L6.13318679,3 C6.13318679,3 6.38731508,3.35253134 6.38750883,3.70506267 C6.38770259,4.05759401 6,4.41012534 6,4.93892234 C6,5.46771935 6.37406228,5.63464998 6.38750883,5.99651635 C6.38731508,6.34904769 6,6.52531335 6,7.05411036 C6,7.58290736 6.38750883,7.93543869 6.38750883,8.28797003 C6.38750883,8.53532364 6.13318679,8.9930327 6.13318679,8.9930327 L6.92033348,8.9930327 C7.01597066,8.7668486 7.1625265,8.51943153 7.1625265,8.28797003 C7.1625265,7.75917303 6.77482391,7.40664169 6.77501767,7.05411036 C6.77521142,6.70157902 7.1625265,6.52531335 7.1625265,5.99651635 C7.1625265,5.46771935 6.77482391,5.29145368 6.77501767,4.93892234 C6.77482391,4.58639101 7.1625265,4.23385967 7.1625265,3.70506267 C7.1625265,3.46038477 7.00562417,3.23275529 6.92033348,3 Z" id="path4758-copy-20" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.92033348,3 L8.13318679,3 C8.13318679,3 8.38731508,3.35253134 8.38750883,3.70506267 C8.38770259,4.05759401 8,4.41012534 8,4.93892234 C8,5.46771935 8.37406228,5.63464998 8.38750883,5.99651635 C8.38731508,6.34904769 8,6.52531335 8,7.05411036 C8,7.58290736 8.38750883,7.93543869 8.38750883,8.28797003 C8.38750883,8.53532364 8.13318679,8.9930327 8.13318679,8.9930327 L8.92033348,8.9930327 C9.01597066,8.7668486 9.1625265,8.51943153 9.1625265,8.28797003 C9.1625265,7.75917303 8.77482391,7.40664169 8.77501767,7.05411036 C8.77521142,6.70157902 9.1625265,6.52531335 9.1625265,5.99651635 C9.1625265,5.46771935 8.77482391,5.29145368 8.77501767,4.93892234 C8.77482391,4.58639101 9.1625265,4.23385967 9.1625265,3.70506267 C9.1625265,3.46038477 9.00562417,3.23275529 8.92033348,3 Z" id="path4758-copy-22" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10.9203335,3 L10.1331868,3 C10.1331868,3 10.3873151,3.35253134 10.3875088,3.70506267 C10.3877026,4.05759401 10,4.41012534 10,4.93892234 C10,5.46771935 10.3740623,5.63464998 10.3875088,5.99651635 C10.3873151,6.34904769 10,6.52531335 10,7.05411036 C10,7.58290736 10.3875088,7.93543869 10.3875088,8.28797003 C10.3875088,8.53532364 10.1331868,8.9930327 10.1331868,8.9930327 L10.9203335,8.9930327 C11.0159707,8.7668486 11.1625265,8.51943153 11.1625265,8.28797003 C11.1625265,7.75917303 10.7748239,7.40664169 10.7750177,7.05411036 C10.7752114,6.70157902 11.1625265,6.52531335 11.1625265,5.99651635 C11.1625265,5.46771935 10.7748239,5.29145368 10.7750177,4.93892234 C10.7748239,4.58639101 11.1625265,4.23385967 11.1625265,3.70506267 C11.1625265,3.46038477 11.0056242,3.23275529 10.9203335,3 Z" id="path4758-copy-23" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/zoo-l.svg b/data/styles/clear/style-night/symbols/zoo-l.svg
index d84c4995c9..cae8d1e1ed 100644
--- a/data/styles/clear/style-night/symbols/zoo-l.svg
+++ b/data/styles/clear/style-night/symbols/zoo-l.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>zoo-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="zoo-l-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M19,4 C17,7 15.215787,9.0052 13,11 C10.883373,12.9055 7,12.2513 7,15 L7,16 C7,17 8,17.9515 8,19 L8,20 C8,21.5 7.5,21.5 7,23 L8,23 L10,20 L10,23 L11,23 L11,21.5 L11,17 L13,17 L13,23 L14,23 L14,20 L14,18.5 L15,20 L16,23 L17,23 L15.46875,16.71875 C16.058246,16.359058 16,15.694118 16,15 L16,12 L20,6.5 L21.4375,6.9453125 C21.737214,7.0381587 22,7 22,6.75 C22,6.25 21.673378,6.1387024 21.5,6 L19,4 Z" id="path10847-43-3-9" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M19,4 C17,7 15.215787,9.0052 13,11 C10.883373,12.9055 7,12.2513 7,15 L7,16 C7,17 8,17.9515 8,19 L8,20 C8,21.5 7.5,21.5 7,23 L8,23 L10,20 L10,23 L11,23 L11,21.5 L11,17 L13,17 L13,23 L14,23 L14,20 L14,18.5 L15,20 L16,23 L17,23 L15.46875,16.71875 C16.058246,16.359058 16,15.694118 16,15 L16,12 L20,6.5 L21.4375,6.9453125 C21.737214,7.0381587 22,7 22,6.75 C22,6.25 21.673378,6.1387024 21.5,6 L19,4 Z" id="path10847-43-3-9" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/zoo-m.svg b/data/styles/clear/style-night/symbols/zoo-m.svg
index 91e3e5a321..e558baa722 100644
--- a/data/styles/clear/style-night/symbols/zoo-m.svg
+++ b/data/styles/clear/style-night/symbols/zoo-m.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>zoo-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="zoo-m-copy" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <path d="M15,6 C13.66667,8 13.47719,9.6701 12,11 C10.58891,12.2703 8,11.8342 8,13.6667 L8,14.3333 C8,15 8.66667,15.6343 8.66667,16.3333 L8.66667,17 C8.66667,18 8.33333,18 8,19 L8.66667,19 L10,17 L10,19 L11,19 L11,15 L12,15 L12,19 L13,19 L13,16 L14,19 L14.66667,19 L13.64583,14.8125 C14.03883,14.5727 14,14.1294 14,13.6667 L14,11.6667 L15.5,8 L17,8.5 C17,8.453 16.99948,8.038 17,8 C17,8 16.75649,7.7565 16.66667,7.6667 L15,6 Z" id="path10847-43-3-9-9" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M15,6 C13.66667,8 13.47719,9.6701 12,11 C10.58891,12.2703 8,11.8342 8,13.6667 L8,14.3333 C8,15 8.66667,15.6343 8.66667,16.3333 L8.66667,17 C8.66667,18 8.33333,18 8,19 L8.66667,19 L10,17 L10,19 L11,19 L11,15 L12,15 L12,19 L13,19 L13,16 L14,19 L14.66667,19 L13.64583,14.8125 C14.03883,14.5727 14,14.1294 14,13.6667 L14,11.6667 L15.5,8 L17,8.5 C17,8.453 16.99948,8.038 17,8 C17,8 16.75649,7.7565 16.66667,7.6667 L15,6 Z" id="path10847-43-3-9-9" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/zoo-s.svg b/data/styles/clear/style-night/symbols/zoo-s.svg
index 9f6d0c3e34..5311646f17 100644
--- a/data/styles/clear/style-night/symbols/zoo-s.svg
+++ b/data/styles/clear/style-night/symbols/zoo-s.svg
@@ -1,6 +1,6 @@
 <?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" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12081) - http://www.bohemiancoding.com/sketch -->
     <title>zoo-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
@@ -8,7 +8,7 @@
         <g id="zoo-s-copy" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#3D3D37" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M10.5,4 C9.5,5.5 9.60789,7.0026 8.5,8 C7.44168,8.9528 5,8.6257 5,10 L5,10.5 C5,11 5.5,11.4758 5.5,12 L5.5,12.5 C5.5,13.25 5.25,13.25 5,14 L5.5,14 L6.5,12.5 L6.5,14 L7,14 L7,11 L8,11 L8,14 L8.5,14 L8.5,11.5 L9.5,11.5 L10,14 L10.5,14 L10,10 L10,8.5 L11,5 L12,5 L12,4 L10.5,4 Z" id="path10518" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10.5,4 C9.5,5.5 9.60789,7.0026 8.5,8 C7.44168,8.9528 5,8.6257 5,10 L5,10.5 C5,11 5.5,11.4758 5.5,12 L5.5,12.5 C5.5,13.25 5.25,13.25 5,14 L5.5,14 L6.5,12.5 L6.5,14 L7,14 L7,11 L8,11 L8,14 L8.5,14 L8.5,11.5 L9.5,11.5 L10,14 L10.5,14 L10,10 L10,8.5 L11,5 L12,5 L12,4 L10.5,4 Z" id="path10518" opacity="0.400186567" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file