diff --git a/data/styles/clear/style-clear/6plus/bookmark-bg-l.png b/data/styles/clear/style-clear/6plus/bookmark-bg-l.png
index ad2295860b..5206b09f72 100644
Binary files a/data/styles/clear/style-clear/6plus/bookmark-bg-l.png and b/data/styles/clear/style-clear/6plus/bookmark-bg-l.png differ
diff --git a/data/styles/clear/style-clear/6plus/bookmark-bg-m.png b/data/styles/clear/style-clear/6plus/bookmark-bg-m.png
index 1e7e365ece..a675a70cdb 100644
Binary files a/data/styles/clear/style-clear/6plus/bookmark-bg-m.png and b/data/styles/clear/style-clear/6plus/bookmark-bg-m.png differ
diff --git a/data/styles/clear/style-clear/6plus/bookmark-bg-s.png b/data/styles/clear/style-clear/6plus/bookmark-bg-s.png
index 6434d2ac7c..dd2c7a5be1 100644
Binary files a/data/styles/clear/style-clear/6plus/bookmark-bg-s.png and b/data/styles/clear/style-clear/6plus/bookmark-bg-s.png differ
diff --git a/data/styles/clear/style-clear/6plus/bookmark-bg-xs.png b/data/styles/clear/style-clear/6plus/bookmark-bg-xs.png
index db792c7a2b..bf2b6279ce 100644
Binary files a/data/styles/clear/style-clear/6plus/bookmark-bg-xs.png and b/data/styles/clear/style-clear/6plus/bookmark-bg-xs.png differ
diff --git a/data/styles/clear/style-clear/6plus/bookmark-default-l.png b/data/styles/clear/style-clear/6plus/bookmark-default-l.png
index a87121ee8c..30ddf6acc4 100644
Binary files a/data/styles/clear/style-clear/6plus/bookmark-default-l.png and b/data/styles/clear/style-clear/6plus/bookmark-default-l.png differ
diff --git a/data/styles/clear/style-clear/6plus/bookmark-default-m.png b/data/styles/clear/style-clear/6plus/bookmark-default-m.png
index a43e15be10..3823f6aac8 100644
Binary files a/data/styles/clear/style-clear/6plus/bookmark-default-m.png and b/data/styles/clear/style-clear/6plus/bookmark-default-m.png differ
diff --git a/data/styles/clear/style-clear/6plus/bookmark-default-s.png b/data/styles/clear/style-clear/6plus/bookmark-default-s.png
index be64038ab6..2ba6874f72 100644
Binary files a/data/styles/clear/style-clear/6plus/bookmark-default-s.png and b/data/styles/clear/style-clear/6plus/bookmark-default-s.png differ
diff --git a/data/styles/clear/style-clear/6plus/bookmark-default-xs.png b/data/styles/clear/style-clear/6plus/bookmark-default-xs.png
index b6ec1a9cc6..10517f0220 100644
Binary files a/data/styles/clear/style-clear/6plus/bookmark-default-xs.png and b/data/styles/clear/style-clear/6plus/bookmark-default-xs.png differ
diff --git a/data/styles/clear/style-clear/6plus/search-booking-inactive.png b/data/styles/clear/style-clear/6plus/search-booking-inactive.png
deleted file mode 100644
index 82d9dc3f90..0000000000
Binary files a/data/styles/clear/style-clear/6plus/search-booking-inactive.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/6plus/search-booking.png b/data/styles/clear/style-clear/6plus/search-booking.png
deleted file mode 100644
index fa67ead78d..0000000000
Binary files a/data/styles/clear/style-clear/6plus/search-booking.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/6plus/search-result.png b/data/styles/clear/style-clear/6plus/search-result.png
index 1d20ee3766..233defbf20 100644
Binary files a/data/styles/clear/style-clear/6plus/search-result.png and b/data/styles/clear/style-clear/6plus/search-result.png differ
diff --git a/data/styles/clear/style-clear/6plus/searchbooking-bg-l.png b/data/styles/clear/style-clear/6plus/searchbooking-bg-l.png
new file mode 100644
index 0000000000..309a9e76c3
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/searchbooking-bg-l.png differ
diff --git a/data/styles/clear/style-clear/6plus/searchbooking-bg-s.png b/data/styles/clear/style-clear/6plus/searchbooking-bg-s.png
new file mode 100644
index 0000000000..022a94328e
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/searchbooking-bg-s.png differ
diff --git a/data/styles/clear/style-clear/6plus/searchbooking-default-l.png b/data/styles/clear/style-clear/6plus/searchbooking-default-l.png
new file mode 100644
index 0000000000..64f7c03f77
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/searchbooking-default-l.png differ
diff --git a/data/styles/clear/style-clear/6plus/searchbooking-default-s.png b/data/styles/clear/style-clear/6plus/searchbooking-default-s.png
new file mode 100644
index 0000000000..0097c88a2e
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/searchbooking-default-s.png differ
diff --git a/data/styles/clear/style-clear/6plus/searchbooking-ext-1.png b/data/styles/clear/style-clear/6plus/searchbooking-ext-1.png
new file mode 100644
index 0000000000..7826ddcc78
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/searchbooking-ext-1.png differ
diff --git a/data/styles/clear/style-clear/6plus/searchbooking-ext-2.png b/data/styles/clear/style-clear/6plus/searchbooking-ext-2.png
new file mode 100644
index 0000000000..fd49f72c3a
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/searchbooking-ext-2.png differ
diff --git a/data/styles/clear/style-clear/6plus/searchbooking-ext-3.png b/data/styles/clear/style-clear/6plus/searchbooking-ext-3.png
new file mode 100644
index 0000000000..4495830544
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/searchbooking-ext-3.png differ
diff --git a/data/styles/clear/style-clear/6plus/searchbooking-inactive.png b/data/styles/clear/style-clear/6plus/searchbooking-inactive.png
new file mode 100644
index 0000000000..adcca4ea0b
Binary files /dev/null and b/data/styles/clear/style-clear/6plus/searchbooking-inactive.png differ
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-bg-l.png b/data/styles/clear/style-clear/hdpi/bookmark-bg-l.png
index 462d1129c7..713964b6b8 100644
Binary files a/data/styles/clear/style-clear/hdpi/bookmark-bg-l.png and b/data/styles/clear/style-clear/hdpi/bookmark-bg-l.png differ
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-bg-m.png b/data/styles/clear/style-clear/hdpi/bookmark-bg-m.png
index 39ab5ff2fa..afa4037663 100644
Binary files a/data/styles/clear/style-clear/hdpi/bookmark-bg-m.png and b/data/styles/clear/style-clear/hdpi/bookmark-bg-m.png differ
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-bg-s.png b/data/styles/clear/style-clear/hdpi/bookmark-bg-s.png
index 57e0bfe682..d61db5bf01 100644
Binary files a/data/styles/clear/style-clear/hdpi/bookmark-bg-s.png and b/data/styles/clear/style-clear/hdpi/bookmark-bg-s.png differ
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-bg-xs.png b/data/styles/clear/style-clear/hdpi/bookmark-bg-xs.png
index 1504916daa..8862784353 100644
Binary files a/data/styles/clear/style-clear/hdpi/bookmark-bg-xs.png and b/data/styles/clear/style-clear/hdpi/bookmark-bg-xs.png differ
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-default-l.png b/data/styles/clear/style-clear/hdpi/bookmark-default-l.png
index ec4c33883e..21901f943d 100644
Binary files a/data/styles/clear/style-clear/hdpi/bookmark-default-l.png and b/data/styles/clear/style-clear/hdpi/bookmark-default-l.png differ
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-default-m.png b/data/styles/clear/style-clear/hdpi/bookmark-default-m.png
index 3fd3f8255b..63860d5b82 100644
Binary files a/data/styles/clear/style-clear/hdpi/bookmark-default-m.png and b/data/styles/clear/style-clear/hdpi/bookmark-default-m.png differ
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-default-s.png b/data/styles/clear/style-clear/hdpi/bookmark-default-s.png
index d77384a936..8375f4b686 100644
Binary files a/data/styles/clear/style-clear/hdpi/bookmark-default-s.png and b/data/styles/clear/style-clear/hdpi/bookmark-default-s.png differ
diff --git a/data/styles/clear/style-clear/hdpi/bookmark-default-xs.png b/data/styles/clear/style-clear/hdpi/bookmark-default-xs.png
index ba56e275ac..f01f573adf 100644
Binary files a/data/styles/clear/style-clear/hdpi/bookmark-default-xs.png and b/data/styles/clear/style-clear/hdpi/bookmark-default-xs.png differ
diff --git a/data/styles/clear/style-clear/hdpi/search-booking-inactive.png b/data/styles/clear/style-clear/hdpi/search-booking-inactive.png
deleted file mode 100644
index a0d3b756e8..0000000000
Binary files a/data/styles/clear/style-clear/hdpi/search-booking-inactive.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/hdpi/search-booking.png b/data/styles/clear/style-clear/hdpi/search-booking.png
deleted file mode 100644
index 19a866d518..0000000000
Binary files a/data/styles/clear/style-clear/hdpi/search-booking.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/hdpi/search-result.png b/data/styles/clear/style-clear/hdpi/search-result.png
index 4681e99ba7..9d09a464a9 100644
Binary files a/data/styles/clear/style-clear/hdpi/search-result.png and b/data/styles/clear/style-clear/hdpi/search-result.png differ
diff --git a/data/styles/clear/style-clear/hdpi/searchbooking-bg-l.png b/data/styles/clear/style-clear/hdpi/searchbooking-bg-l.png
new file mode 100644
index 0000000000..91f4a752a9
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/searchbooking-bg-l.png differ
diff --git a/data/styles/clear/style-clear/hdpi/searchbooking-bg-s.png b/data/styles/clear/style-clear/hdpi/searchbooking-bg-s.png
new file mode 100644
index 0000000000..a7d3b1de0f
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/searchbooking-bg-s.png differ
diff --git a/data/styles/clear/style-clear/hdpi/searchbooking-default-l.png b/data/styles/clear/style-clear/hdpi/searchbooking-default-l.png
new file mode 100644
index 0000000000..70cf0f2903
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/searchbooking-default-l.png differ
diff --git a/data/styles/clear/style-clear/hdpi/searchbooking-default-s.png b/data/styles/clear/style-clear/hdpi/searchbooking-default-s.png
new file mode 100644
index 0000000000..33ef9a33da
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/searchbooking-default-s.png differ
diff --git a/data/styles/clear/style-clear/hdpi/searchbooking-ext-1.png b/data/styles/clear/style-clear/hdpi/searchbooking-ext-1.png
new file mode 100644
index 0000000000..8e17daf440
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/searchbooking-ext-1.png differ
diff --git a/data/styles/clear/style-clear/hdpi/searchbooking-ext-2.png b/data/styles/clear/style-clear/hdpi/searchbooking-ext-2.png
new file mode 100644
index 0000000000..5c9d5efaa7
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/searchbooking-ext-2.png differ
diff --git a/data/styles/clear/style-clear/hdpi/searchbooking-ext-3.png b/data/styles/clear/style-clear/hdpi/searchbooking-ext-3.png
new file mode 100644
index 0000000000..f71a52f17f
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/searchbooking-ext-3.png differ
diff --git a/data/styles/clear/style-clear/hdpi/searchbooking-inactive.png b/data/styles/clear/style-clear/hdpi/searchbooking-inactive.png
new file mode 100644
index 0000000000..fdc731501c
Binary files /dev/null and b/data/styles/clear/style-clear/hdpi/searchbooking-inactive.png differ
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-bg-l.png b/data/styles/clear/style-clear/mdpi/bookmark-bg-l.png
index 2c52e0f4c7..9f18f7d7da 100644
Binary files a/data/styles/clear/style-clear/mdpi/bookmark-bg-l.png and b/data/styles/clear/style-clear/mdpi/bookmark-bg-l.png differ
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-bg-m.png b/data/styles/clear/style-clear/mdpi/bookmark-bg-m.png
index 800202a71e..1805a2c68d 100644
Binary files a/data/styles/clear/style-clear/mdpi/bookmark-bg-m.png and b/data/styles/clear/style-clear/mdpi/bookmark-bg-m.png differ
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-bg-s.png b/data/styles/clear/style-clear/mdpi/bookmark-bg-s.png
index d8ff7d0a67..0d0c4fdac7 100644
Binary files a/data/styles/clear/style-clear/mdpi/bookmark-bg-s.png and b/data/styles/clear/style-clear/mdpi/bookmark-bg-s.png differ
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-bg-xs.png b/data/styles/clear/style-clear/mdpi/bookmark-bg-xs.png
index 47e4babd43..0962bdb912 100644
Binary files a/data/styles/clear/style-clear/mdpi/bookmark-bg-xs.png and b/data/styles/clear/style-clear/mdpi/bookmark-bg-xs.png differ
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-default-l.png b/data/styles/clear/style-clear/mdpi/bookmark-default-l.png
index 0156a8f7cf..6433fb9a25 100644
Binary files a/data/styles/clear/style-clear/mdpi/bookmark-default-l.png and b/data/styles/clear/style-clear/mdpi/bookmark-default-l.png differ
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-default-m.png b/data/styles/clear/style-clear/mdpi/bookmark-default-m.png
index ffdee25cef..38b694987a 100644
Binary files a/data/styles/clear/style-clear/mdpi/bookmark-default-m.png and b/data/styles/clear/style-clear/mdpi/bookmark-default-m.png differ
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-default-s.png b/data/styles/clear/style-clear/mdpi/bookmark-default-s.png
index de87bc95ba..c1dbeb0cca 100644
Binary files a/data/styles/clear/style-clear/mdpi/bookmark-default-s.png and b/data/styles/clear/style-clear/mdpi/bookmark-default-s.png differ
diff --git a/data/styles/clear/style-clear/mdpi/bookmark-default-xs.png b/data/styles/clear/style-clear/mdpi/bookmark-default-xs.png
index 62051e88c0..b62d2cfb58 100644
Binary files a/data/styles/clear/style-clear/mdpi/bookmark-default-xs.png and b/data/styles/clear/style-clear/mdpi/bookmark-default-xs.png differ
diff --git a/data/styles/clear/style-clear/mdpi/search-booking-inactive.png b/data/styles/clear/style-clear/mdpi/search-booking-inactive.png
deleted file mode 100644
index 1cb13ce2b4..0000000000
Binary files a/data/styles/clear/style-clear/mdpi/search-booking-inactive.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/mdpi/search-booking.png b/data/styles/clear/style-clear/mdpi/search-booking.png
deleted file mode 100644
index 5e9cdf86d9..0000000000
Binary files a/data/styles/clear/style-clear/mdpi/search-booking.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/mdpi/search-result.png b/data/styles/clear/style-clear/mdpi/search-result.png
index 64eae9c0e5..df45781319 100644
Binary files a/data/styles/clear/style-clear/mdpi/search-result.png and b/data/styles/clear/style-clear/mdpi/search-result.png differ
diff --git a/data/styles/clear/style-clear/mdpi/searchbooking-bg-l.png b/data/styles/clear/style-clear/mdpi/searchbooking-bg-l.png
new file mode 100644
index 0000000000..19b6231877
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/searchbooking-bg-l.png differ
diff --git a/data/styles/clear/style-clear/mdpi/searchbooking-bg-s.png b/data/styles/clear/style-clear/mdpi/searchbooking-bg-s.png
new file mode 100644
index 0000000000..2c84362d3b
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/searchbooking-bg-s.png differ
diff --git a/data/styles/clear/style-clear/mdpi/searchbooking-default-l.png b/data/styles/clear/style-clear/mdpi/searchbooking-default-l.png
new file mode 100644
index 0000000000..715dd930cc
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/searchbooking-default-l.png differ
diff --git a/data/styles/clear/style-clear/mdpi/searchbooking-default-s.png b/data/styles/clear/style-clear/mdpi/searchbooking-default-s.png
new file mode 100644
index 0000000000..d77ab4ac57
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/searchbooking-default-s.png differ
diff --git a/data/styles/clear/style-clear/mdpi/searchbooking-ext-1.png b/data/styles/clear/style-clear/mdpi/searchbooking-ext-1.png
new file mode 100644
index 0000000000..fd29d83260
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/searchbooking-ext-1.png differ
diff --git a/data/styles/clear/style-clear/mdpi/searchbooking-ext-2.png b/data/styles/clear/style-clear/mdpi/searchbooking-ext-2.png
new file mode 100644
index 0000000000..c04ee81153
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/searchbooking-ext-2.png differ
diff --git a/data/styles/clear/style-clear/mdpi/searchbooking-ext-3.png b/data/styles/clear/style-clear/mdpi/searchbooking-ext-3.png
new file mode 100644
index 0000000000..626bd15427
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/searchbooking-ext-3.png differ
diff --git a/data/styles/clear/style-clear/mdpi/searchbooking-inactive.png b/data/styles/clear/style-clear/mdpi/searchbooking-inactive.png
new file mode 100644
index 0000000000..25b7895604
Binary files /dev/null and b/data/styles/clear/style-clear/mdpi/searchbooking-inactive.png differ
diff --git a/data/styles/clear/style-clear/style.mapcss b/data/styles/clear/style-clear/style.mapcss
index bd711161b7..e443b50148 100755
--- a/data/styles/clear/style-clear/style.mapcss
+++ b/data/styles/clear/style-clear/style.mapcss
@@ -93,7 +93,7 @@ colors
TransitBackground-color: #FFFFFF;
TransitBackground-opacity: 0.4;
BookmarkRed-color: #E51B23;
- BookmarkPink-color: #E91F63;
+ BookmarkPink-color: #FF4182;
BookmarkPurple-color: #9C27B0;
BookmarkDeepPurple-color: #673AB7;
BookmarkBlue-color: #006EC7;
@@ -102,10 +102,17 @@ colors
BookmarkTeal-color: #009588;
BookmarkGreen-color: #388E3C;
BookmarkLime-color: #7EBF39;
- BookmarkYellow-color: #FFC108;
+ BookmarkYellow-color: #FFC800;
BookmarkOrange-color: #FFA000;
BookmarkDeepOrange-color: #607D8B;
BookmarkBrown-color: #795548;
BookmarkGray-color: #757575;
BookmarkBlueGray-color: #607D8B;
+ RatingNone-color: #597380;
+ RatingHorrible-color: #E63C2D;
+ RatingBad-color: #F06432;
+ RatingNormal-color: #FFC800;
+ RatingGood-color: #93BF39;
+ RatingExcellent-color: #3C8C3C;
+ RatingText-color: #FFFFFF;
}
diff --git a/data/styles/clear/style-clear/symbols/alcohol-s.svg b/data/styles/clear/style-clear/symbols/alcohol-s.svg
deleted file mode 100644
index b816731f44..0000000000
--- a/data/styles/clear/style-clear/symbols/alcohol-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/alpine_hut-s.svg b/data/styles/clear/style-clear/symbols/alpine_hut-s.svg
deleted file mode 100644
index 7140433a5c..0000000000
--- a/data/styles/clear/style-clear/symbols/alpine_hut-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/america-football-m.svg b/data/styles/clear/style-clear/symbols/america-football-m.svg
deleted file mode 100644
index 5209510051..0000000000
--- a/data/styles/clear/style-clear/symbols/america-football-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/america-football-s.svg b/data/styles/clear/style-clear/symbols/america-football-s.svg
deleted file mode 100644
index dee65c5719..0000000000
--- a/data/styles/clear/style-clear/symbols/america-football-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/apartment-s.svg b/data/styles/clear/style-clear/symbols/apartment-s.svg
deleted file mode 100644
index c247aa6ac4..0000000000
--- a/data/styles/clear/style-clear/symbols/apartment-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/archery-m.svg b/data/styles/clear/style-clear/symbols/archery-m.svg
deleted file mode 100644
index 99f6b67e5b..0000000000
--- a/data/styles/clear/style-clear/symbols/archery-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/archery-s.svg b/data/styles/clear/style-clear/symbols/archery-s.svg
deleted file mode 100644
index a999ca7d75..0000000000
--- a/data/styles/clear/style-clear/symbols/archery-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/atm-m.svg b/data/styles/clear/style-clear/symbols/atm-m.svg
deleted file mode 100644
index ac669417d7..0000000000
--- a/data/styles/clear/style-clear/symbols/atm-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/atm-s.svg b/data/styles/clear/style-clear/symbols/atm-s.svg
deleted file mode 100644
index d6018ebade..0000000000
--- a/data/styles/clear/style-clear/symbols/atm-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/australian-football-m.svg b/data/styles/clear/style-clear/symbols/australian-football-m.svg
deleted file mode 100644
index f990e1c082..0000000000
--- a/data/styles/clear/style-clear/symbols/australian-football-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/australian-football-s.svg b/data/styles/clear/style-clear/symbols/australian-football-s.svg
deleted file mode 100644
index 779aa97fdf..0000000000
--- a/data/styles/clear/style-clear/symbols/australian-football-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/bakery-s.svg b/data/styles/clear/style-clear/symbols/bakery-s.svg
deleted file mode 100644
index eee09cbffa..0000000000
--- a/data/styles/clear/style-clear/symbols/bakery-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/bank-s.svg b/data/styles/clear/style-clear/symbols/bank-s.svg
deleted file mode 100644
index 6876e6c967..0000000000
--- a/data/styles/clear/style-clear/symbols/bank-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/banknote-m.svg b/data/styles/clear/style-clear/symbols/banknote-m.svg
deleted file mode 100644
index 083ae07ace..0000000000
--- a/data/styles/clear/style-clear/symbols/banknote-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/banknote-s.svg b/data/styles/clear/style-clear/symbols/banknote-s.svg
deleted file mode 100644
index 03b362f436..0000000000
--- a/data/styles/clear/style-clear/symbols/banknote-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/bar-m.svg b/data/styles/clear/style-clear/symbols/bar-m.svg
deleted file mode 100644
index 018788ad4d..0000000000
--- a/data/styles/clear/style-clear/symbols/bar-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/bar-s.svg b/data/styles/clear/style-clear/symbols/bar-s.svg
deleted file mode 100644
index c70b75ba53..0000000000
--- a/data/styles/clear/style-clear/symbols/bar-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/baseball-m.svg b/data/styles/clear/style-clear/symbols/baseball-m.svg
deleted file mode 100644
index 583e2ec972..0000000000
--- a/data/styles/clear/style-clear/symbols/baseball-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/baseball-s.svg b/data/styles/clear/style-clear/symbols/baseball-s.svg
deleted file mode 100644
index 4ae2ee2c76..0000000000
--- a/data/styles/clear/style-clear/symbols/baseball-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/basketball-m.svg b/data/styles/clear/style-clear/symbols/basketball-m.svg
deleted file mode 100644
index f1730e92bc..0000000000
--- a/data/styles/clear/style-clear/symbols/basketball-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/basketball-s.svg b/data/styles/clear/style-clear/symbols/basketball-s.svg
deleted file mode 100644
index d1fd81602b..0000000000
--- a/data/styles/clear/style-clear/symbols/basketball-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/bbq-m.svg b/data/styles/clear/style-clear/symbols/bbq-m.svg
deleted file mode 100644
index d7f62d9825..0000000000
--- a/data/styles/clear/style-clear/symbols/bbq-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/bbq-s.svg b/data/styles/clear/style-clear/symbols/bbq-s.svg
deleted file mode 100644
index f756a4c068..0000000000
--- a/data/styles/clear/style-clear/symbols/bbq-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/bcontrol-s.svg b/data/styles/clear/style-clear/symbols/bcontrol-s.svg
deleted file mode 100644
index b48dd4d2e9..0000000000
--- a/data/styles/clear/style-clear/symbols/bcontrol-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/beach-s.svg b/data/styles/clear/style-clear/symbols/beach-s.svg
deleted file mode 100644
index a2525042a8..0000000000
--- a/data/styles/clear/style-clear/symbols/beach-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/beauty-s.svg b/data/styles/clear/style-clear/symbols/beauty-s.svg
deleted file mode 100644
index 721f3c9992..0000000000
--- a/data/styles/clear/style-clear/symbols/beauty-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/beer-s.svg b/data/styles/clear/style-clear/symbols/beer-s.svg
deleted file mode 100644
index 4e9d734b60..0000000000
--- a/data/styles/clear/style-clear/symbols/beer-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/bicycle-m.svg b/data/styles/clear/style-clear/symbols/bicycle-m.svg
deleted file mode 100644
index 0bb17aca35..0000000000
--- a/data/styles/clear/style-clear/symbols/bicycle-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/bicycle-s.svg b/data/styles/clear/style-clear/symbols/bicycle-s.svg
deleted file mode 100644
index 68ec53e0c2..0000000000
--- a/data/styles/clear/style-clear/symbols/bicycle-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/bike-parking-m.svg b/data/styles/clear/style-clear/symbols/bike-parking-m.svg
deleted file mode 100644
index 796f4587ed..0000000000
--- a/data/styles/clear/style-clear/symbols/bike-parking-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/bike-parking-s.svg b/data/styles/clear/style-clear/symbols/bike-parking-s.svg
deleted file mode 100644
index 79c8bb3a07..0000000000
--- a/data/styles/clear/style-clear/symbols/bike-parking-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/book-shop-s.svg b/data/styles/clear/style-clear/symbols/book-shop-s.svg
deleted file mode 100644
index 397d41d5b7..0000000000
--- a/data/styles/clear/style-clear/symbols/book-shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/bookmaker-s.svg b/data/styles/clear/style-clear/symbols/bookmaker-s.svg
deleted file mode 100644
index 0ffa316d96..0000000000
--- a/data/styles/clear/style-clear/symbols/bookmaker-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/bowls-m.svg b/data/styles/clear/style-clear/symbols/bowls-m.svg
deleted file mode 100644
index 799f019f7a..0000000000
--- a/data/styles/clear/style-clear/symbols/bowls-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/bowls-s.svg b/data/styles/clear/style-clear/symbols/bowls-s.svg
deleted file mode 100644
index a252c9a951..0000000000
--- a/data/styles/clear/style-clear/symbols/bowls-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/buddhist-xl.svg b/data/styles/clear/style-clear/symbols/buddhist-xl.svg
deleted file mode 100644
index 327d312285..0000000000
--- a/data/styles/clear/style-clear/symbols/buddhist-xl.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
diff --git a/data/styles/clear/style-clear/symbols/butcher-s.svg b/data/styles/clear/style-clear/symbols/butcher-s.svg
deleted file mode 100644
index d5286a67ed..0000000000
--- a/data/styles/clear/style-clear/symbols/butcher-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/cafe-s.svg b/data/styles/clear/style-clear/symbols/cafe-s.svg
deleted file mode 100644
index 96ec91e88f..0000000000
--- a/data/styles/clear/style-clear/symbols/cafe-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/campsite-s.svg b/data/styles/clear/style-clear/symbols/campsite-s.svg
deleted file mode 100644
index c1e024d3f8..0000000000
--- a/data/styles/clear/style-clear/symbols/campsite-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/car-part-s.svg b/data/styles/clear/style-clear/symbols/car-part-s.svg
deleted file mode 100644
index cc0aeff130..0000000000
--- a/data/styles/clear/style-clear/symbols/car-part-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/car-wash-m.svg b/data/styles/clear/style-clear/symbols/car-wash-m.svg
deleted file mode 100644
index 31485f1458..0000000000
--- a/data/styles/clear/style-clear/symbols/car-wash-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/car-wash-s.svg b/data/styles/clear/style-clear/symbols/car-wash-s.svg
deleted file mode 100644
index 7fe4c3769a..0000000000
--- a/data/styles/clear/style-clear/symbols/car-wash-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/car_sharing-m.svg b/data/styles/clear/style-clear/symbols/car_sharing-m.svg
deleted file mode 100644
index a4383dd752..0000000000
--- a/data/styles/clear/style-clear/symbols/car_sharing-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/car_sharing-s.svg b/data/styles/clear/style-clear/symbols/car_sharing-s.svg
deleted file mode 100644
index fbb26ebaa9..0000000000
--- a/data/styles/clear/style-clear/symbols/car_sharing-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/car_shop-s.svg b/data/styles/clear/style-clear/symbols/car_shop-s.svg
deleted file mode 100644
index e738f85db1..0000000000
--- a/data/styles/clear/style-clear/symbols/car_shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/caravan_site-s.svg b/data/styles/clear/style-clear/symbols/caravan_site-s.svg
deleted file mode 100644
index afb40d3504..0000000000
--- a/data/styles/clear/style-clear/symbols/caravan_site-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/casino-m.svg b/data/styles/clear/style-clear/symbols/casino-m.svg
deleted file mode 100644
index 03e97e6ac5..0000000000
--- a/data/styles/clear/style-clear/symbols/casino-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/casino-s.svg b/data/styles/clear/style-clear/symbols/casino-s.svg
deleted file mode 100644
index 34f839af2f..0000000000
--- a/data/styles/clear/style-clear/symbols/casino-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/cemetery-s.svg b/data/styles/clear/style-clear/symbols/cemetery-s.svg
deleted file mode 100644
index 2d5f0bb1dd..0000000000
--- a/data/styles/clear/style-clear/symbols/cemetery-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/chemist-s.svg b/data/styles/clear/style-clear/symbols/chemist-s.svg
deleted file mode 100644
index 84bcfa2bad..0000000000
--- a/data/styles/clear/style-clear/symbols/chemist-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/chimney-m.svg b/data/styles/clear/style-clear/symbols/chimney-m.svg
deleted file mode 100644
index 0d48f741ac..0000000000
--- a/data/styles/clear/style-clear/symbols/chimney-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/chimney-s.svg b/data/styles/clear/style-clear/symbols/chimney-s.svg
deleted file mode 100644
index 7c52d6c31e..0000000000
--- a/data/styles/clear/style-clear/symbols/chimney-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/christian-xl.svg b/data/styles/clear/style-clear/symbols/christian-xl.svg
deleted file mode 100644
index 702cccf2eb..0000000000
--- a/data/styles/clear/style-clear/symbols/christian-xl.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
diff --git a/data/styles/clear/style-clear/symbols/cinema-m.svg b/data/styles/clear/style-clear/symbols/cinema-m.svg
deleted file mode 100644
index cd89c2136c..0000000000
--- a/data/styles/clear/style-clear/symbols/cinema-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/cinema-s.svg b/data/styles/clear/style-clear/symbols/cinema-s.svg
deleted file mode 100644
index 02938e1665..0000000000
--- a/data/styles/clear/style-clear/symbols/cinema-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/cities-m.svg b/data/styles/clear/style-clear/symbols/cities-m.svg
deleted file mode 100644
index bc86782c5e..0000000000
--- a/data/styles/clear/style-clear/symbols/cities-m.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/cities-s.svg b/data/styles/clear/style-clear/symbols/cities-s.svg
deleted file mode 100644
index dca72e291f..0000000000
--- a/data/styles/clear/style-clear/symbols/cities-s.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/cities-xs.svg b/data/styles/clear/style-clear/symbols/cities-xs.svg
deleted file mode 100644
index 39b65a8626..0000000000
--- a/data/styles/clear/style-clear/symbols/cities-xs.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/climbing-m.svg b/data/styles/clear/style-clear/symbols/climbing-m.svg
deleted file mode 100644
index 23a28d29e0..0000000000
--- a/data/styles/clear/style-clear/symbols/climbing-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/climbing-s.svg b/data/styles/clear/style-clear/symbols/climbing-s.svg
deleted file mode 100644
index 9a47d979d7..0000000000
--- a/data/styles/clear/style-clear/symbols/climbing-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/clothes-s.svg b/data/styles/clear/style-clear/symbols/clothes-s.svg
deleted file mode 100644
index 5e10d4e15a..0000000000
--- a/data/styles/clear/style-clear/symbols/clothes-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/computer-s.svg b/data/styles/clear/style-clear/symbols/computer-s.svg
deleted file mode 100644
index e5df98413d..0000000000
--- a/data/styles/clear/style-clear/symbols/computer-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/convenience-m.svg b/data/styles/clear/style-clear/symbols/convenience-m.svg
deleted file mode 100644
index 27b0956aad..0000000000
--- a/data/styles/clear/style-clear/symbols/convenience-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/convenience-s.svg b/data/styles/clear/style-clear/symbols/convenience-s.svg
deleted file mode 100644
index d8fb6ae29f..0000000000
--- a/data/styles/clear/style-clear/symbols/convenience-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/copyshop-s.svg b/data/styles/clear/style-clear/symbols/copyshop-s.svg
deleted file mode 100644
index dc2dfa21ec..0000000000
--- a/data/styles/clear/style-clear/symbols/copyshop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/cricket-m.svg b/data/styles/clear/style-clear/symbols/cricket-m.svg
deleted file mode 100644
index aa9d3c1596..0000000000
--- a/data/styles/clear/style-clear/symbols/cricket-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/cricket-s.svg b/data/styles/clear/style-clear/symbols/cricket-s.svg
deleted file mode 100644
index fac41e9ecd..0000000000
--- a/data/styles/clear/style-clear/symbols/cricket-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/crossing-m.svg b/data/styles/clear/style-clear/symbols/crossing-m.svg
deleted file mode 100644
index d717b36e5d..0000000000
--- a/data/styles/clear/style-clear/symbols/crossing-m.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/crossing-s.svg b/data/styles/clear/style-clear/symbols/crossing-s.svg
deleted file mode 100644
index 04075c7b0c..0000000000
--- a/data/styles/clear/style-clear/symbols/crossing-s.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/curling-m.svg b/data/styles/clear/style-clear/symbols/curling-m.svg
deleted file mode 100644
index 5f752a3f07..0000000000
--- a/data/styles/clear/style-clear/symbols/curling-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/curling-s.svg b/data/styles/clear/style-clear/symbols/curling-s.svg
deleted file mode 100644
index 5b9f7fa125..0000000000
--- a/data/styles/clear/style-clear/symbols/curling-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/defibrillator-m.svg b/data/styles/clear/style-clear/symbols/defibrillator-m.svg
deleted file mode 100644
index c21fdc5a3c..0000000000
--- a/data/styles/clear/style-clear/symbols/defibrillator-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/defibrillator-s.svg b/data/styles/clear/style-clear/symbols/defibrillator-s.svg
deleted file mode 100644
index d09ba1990d..0000000000
--- a/data/styles/clear/style-clear/symbols/defibrillator-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/dentist-m.svg b/data/styles/clear/style-clear/symbols/dentist-m.svg
deleted file mode 100644
index 5eb54caac5..0000000000
--- a/data/styles/clear/style-clear/symbols/dentist-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/dentist-s.svg b/data/styles/clear/style-clear/symbols/dentist-s.svg
deleted file mode 100644
index 32fa380011..0000000000
--- a/data/styles/clear/style-clear/symbols/dentist-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/department_store-s.svg b/data/styles/clear/style-clear/symbols/department_store-s.svg
deleted file mode 100644
index 41689fe3b5..0000000000
--- a/data/styles/clear/style-clear/symbols/department_store-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/diving-m.svg b/data/styles/clear/style-clear/symbols/diving-m.svg
deleted file mode 100644
index 1714075871..0000000000
--- a/data/styles/clear/style-clear/symbols/diving-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/diving-s.svg b/data/styles/clear/style-clear/symbols/diving-s.svg
deleted file mode 100644
index daedb30542..0000000000
--- a/data/styles/clear/style-clear/symbols/diving-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/dog_park-s.svg b/data/styles/clear/style-clear/symbols/dog_park-s.svg
deleted file mode 100644
index 94e688b9f1..0000000000
--- a/data/styles/clear/style-clear/symbols/dog_park-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/doityourself-s.svg b/data/styles/clear/style-clear/symbols/doityourself-s.svg
deleted file mode 100644
index 21360c3fe1..0000000000
--- a/data/styles/clear/style-clear/symbols/doityourself-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/dot-s.svg b/data/styles/clear/style-clear/symbols/dot-s.svg
deleted file mode 100644
index 2deb49c42c..0000000000
--- a/data/styles/clear/style-clear/symbols/dot-s.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/electronics-s.svg b/data/styles/clear/style-clear/symbols/electronics-s.svg
deleted file mode 100644
index dfecfa9573..0000000000
--- a/data/styles/clear/style-clear/symbols/electronics-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/embassy-m.svg b/data/styles/clear/style-clear/symbols/embassy-m.svg
deleted file mode 100644
index c53102debb..0000000000
--- a/data/styles/clear/style-clear/symbols/embassy-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/embassy-s.svg b/data/styles/clear/style-clear/symbols/embassy-s.svg
deleted file mode 100644
index c95241d454..0000000000
--- a/data/styles/clear/style-clear/symbols/embassy-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/entrance-xs.svg b/data/styles/clear/style-clear/symbols/entrance-xs.svg
deleted file mode 100644
index f694c94247..0000000000
--- a/data/styles/clear/style-clear/symbols/entrance-xs.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/equestrian-s.svg b/data/styles/clear/style-clear/symbols/equestrian-s.svg
deleted file mode 100644
index bd29ed8053..0000000000
--- a/data/styles/clear/style-clear/symbols/equestrian-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/erotic-s.svg b/data/styles/clear/style-clear/symbols/erotic-s.svg
deleted file mode 100644
index 8466d4ce98..0000000000
--- a/data/styles/clear/style-clear/symbols/erotic-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/fastfood-s.svg b/data/styles/clear/style-clear/symbols/fastfood-s.svg
deleted file mode 100644
index 9364919c41..0000000000
--- a/data/styles/clear/style-clear/symbols/fastfood-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/fire_station-m.svg b/data/styles/clear/style-clear/symbols/fire_station-m.svg
deleted file mode 100644
index 296f3749ca..0000000000
--- a/data/styles/clear/style-clear/symbols/fire_station-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/fire_station-s.svg b/data/styles/clear/style-clear/symbols/fire_station-s.svg
deleted file mode 100644
index 8bffe8f527..0000000000
--- a/data/styles/clear/style-clear/symbols/fire_station-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/firehydrant-m.svg b/data/styles/clear/style-clear/symbols/firehydrant-m.svg
deleted file mode 100644
index 18f4b2a417..0000000000
--- a/data/styles/clear/style-clear/symbols/firehydrant-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/firehydrant-s.svg b/data/styles/clear/style-clear/symbols/firehydrant-s.svg
deleted file mode 100644
index 9532061199..0000000000
--- a/data/styles/clear/style-clear/symbols/firehydrant-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/florist-s.svg b/data/styles/clear/style-clear/symbols/florist-s.svg
deleted file mode 100644
index f7eacfe7b7..0000000000
--- a/data/styles/clear/style-clear/symbols/florist-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/fountain-s.svg b/data/styles/clear/style-clear/symbols/fountain-s.svg
deleted file mode 100644
index 770685dee8..0000000000
--- a/data/styles/clear/style-clear/symbols/fountain-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/funeral_directors-s.svg b/data/styles/clear/style-clear/symbols/funeral_directors-s.svg
deleted file mode 100644
index fa8fe31999..0000000000
--- a/data/styles/clear/style-clear/symbols/funeral_directors-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/funicular-m.svg b/data/styles/clear/style-clear/symbols/funicular-m.svg
deleted file mode 100644
index 4a7ed82fd8..0000000000
--- a/data/styles/clear/style-clear/symbols/funicular-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/funicular-s.svg b/data/styles/clear/style-clear/symbols/funicular-s.svg
deleted file mode 100644
index aba2e527a9..0000000000
--- a/data/styles/clear/style-clear/symbols/funicular-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/furniture-s.svg b/data/styles/clear/style-clear/symbols/furniture-s.svg
deleted file mode 100644
index 708384175a..0000000000
--- a/data/styles/clear/style-clear/symbols/furniture-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/gallery-s.svg b/data/styles/clear/style-clear/symbols/gallery-s.svg
deleted file mode 100644
index bea55b87a0..0000000000
--- a/data/styles/clear/style-clear/symbols/gallery-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/garden-s.svg b/data/styles/clear/style-clear/symbols/garden-s.svg
deleted file mode 100644
index b8c2b96b52..0000000000
--- a/data/styles/clear/style-clear/symbols/garden-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/garden-xl.svg b/data/styles/clear/style-clear/symbols/garden-xl.svg
deleted file mode 100644
index cf0b3e1d0c..0000000000
--- a/data/styles/clear/style-clear/symbols/garden-xl.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
diff --git a/data/styles/clear/style-clear/symbols/garden_center-s.svg b/data/styles/clear/style-clear/symbols/garden_center-s.svg
deleted file mode 100644
index 945840c655..0000000000
--- a/data/styles/clear/style-clear/symbols/garden_center-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/gate-m.svg b/data/styles/clear/style-clear/symbols/gate-m.svg
deleted file mode 100644
index 85dabf0edd..0000000000
--- a/data/styles/clear/style-clear/symbols/gate-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/gate-s.svg b/data/styles/clear/style-clear/symbols/gate-s.svg
deleted file mode 100644
index 27808ffdb5..0000000000
--- a/data/styles/clear/style-clear/symbols/gate-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/gift-s.svg b/data/styles/clear/style-clear/symbols/gift-s.svg
deleted file mode 100644
index 72f5b192c3..0000000000
--- a/data/styles/clear/style-clear/symbols/gift-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/golf-m.svg b/data/styles/clear/style-clear/symbols/golf-m.svg
deleted file mode 100644
index e145ea920d..0000000000
--- a/data/styles/clear/style-clear/symbols/golf-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/golf-s.svg b/data/styles/clear/style-clear/symbols/golf-s.svg
deleted file mode 100644
index 4c3ca21eea..0000000000
--- a/data/styles/clear/style-clear/symbols/golf-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/greengrocer-s.svg b/data/styles/clear/style-clear/symbols/greengrocer-s.svg
deleted file mode 100644
index 9ff8f29fac..0000000000
--- a/data/styles/clear/style-clear/symbols/greengrocer-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/grocery-s.svg b/data/styles/clear/style-clear/symbols/grocery-s.svg
deleted file mode 100644
index 43a52df74f..0000000000
--- a/data/styles/clear/style-clear/symbols/grocery-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/gym-m.svg b/data/styles/clear/style-clear/symbols/gym-m.svg
deleted file mode 100644
index 5f507c91a4..0000000000
--- a/data/styles/clear/style-clear/symbols/gym-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/gym-s.svg b/data/styles/clear/style-clear/symbols/gym-s.svg
deleted file mode 100644
index 879642bd43..0000000000
--- a/data/styles/clear/style-clear/symbols/gym-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/hairdresser-s.svg b/data/styles/clear/style-clear/symbols/hairdresser-s.svg
deleted file mode 100644
index 57190abdd7..0000000000
--- a/data/styles/clear/style-clear/symbols/hairdresser-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/hand-m.svg b/data/styles/clear/style-clear/symbols/hand-m.svg
deleted file mode 100644
index 0e3509a1d4..0000000000
--- a/data/styles/clear/style-clear/symbols/hand-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/hand-s.svg b/data/styles/clear/style-clear/symbols/hand-s.svg
deleted file mode 100644
index fa40b07151..0000000000
--- a/data/styles/clear/style-clear/symbols/hand-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/hardware-m.svg b/data/styles/clear/style-clear/symbols/hardware-m.svg
deleted file mode 100644
index ea7cbebde1..0000000000
--- a/data/styles/clear/style-clear/symbols/hardware-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/hardware-s.svg b/data/styles/clear/style-clear/symbols/hardware-s.svg
deleted file mode 100644
index b3b3a9d6ed..0000000000
--- a/data/styles/clear/style-clear/symbols/hardware-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/helipad-m.svg b/data/styles/clear/style-clear/symbols/helipad-m.svg
deleted file mode 100644
index 544856894d..0000000000
--- a/data/styles/clear/style-clear/symbols/helipad-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/helipad-s.svg b/data/styles/clear/style-clear/symbols/helipad-s.svg
deleted file mode 100644
index d565c697ad..0000000000
--- a/data/styles/clear/style-clear/symbols/helipad-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/heliport-m.svg b/data/styles/clear/style-clear/symbols/heliport-m.svg
deleted file mode 100644
index e26c5a7bcd..0000000000
--- a/data/styles/clear/style-clear/symbols/heliport-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/heliport-s.svg b/data/styles/clear/style-clear/symbols/heliport-s.svg
deleted file mode 100644
index a2c4c213c3..0000000000
--- a/data/styles/clear/style-clear/symbols/heliport-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/hindu-xl.svg b/data/styles/clear/style-clear/symbols/hindu-xl.svg
deleted file mode 100644
index 69830ed448..0000000000
--- a/data/styles/clear/style-clear/symbols/hindu-xl.svg
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
diff --git a/data/styles/clear/style-clear/symbols/historic-ship-s.svg b/data/styles/clear/style-clear/symbols/historic-ship-s.svg
deleted file mode 100644
index 78e0986194..0000000000
--- a/data/styles/clear/style-clear/symbols/historic-ship-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/home-m.svg b/data/styles/clear/style-clear/symbols/home-m.svg
deleted file mode 100644
index f5abc3591c..0000000000
--- a/data/styles/clear/style-clear/symbols/home-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/home-s.svg b/data/styles/clear/style-clear/symbols/home-s.svg
deleted file mode 100644
index 002fde5050..0000000000
--- a/data/styles/clear/style-clear/symbols/home-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/hostel-s.svg b/data/styles/clear/style-clear/symbols/hostel-s.svg
deleted file mode 100644
index 0b1c2118f2..0000000000
--- a/data/styles/clear/style-clear/symbols/hostel-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/hunting-tower-m.svg b/data/styles/clear/style-clear/symbols/hunting-tower-m.svg
deleted file mode 100644
index be74cee49c..0000000000
--- a/data/styles/clear/style-clear/symbols/hunting-tower-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/hunting-tower-s.svg b/data/styles/clear/style-clear/symbols/hunting-tower-s.svg
deleted file mode 100644
index 6853e33ad0..0000000000
--- a/data/styles/clear/style-clear/symbols/hunting-tower-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/ice_cream-s.svg b/data/styles/clear/style-clear/symbols/ice_cream-s.svg
deleted file mode 100644
index 0ab241560f..0000000000
--- a/data/styles/clear/style-clear/symbols/ice_cream-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/information-s.svg b/data/styles/clear/style-clear/symbols/information-s.svg
deleted file mode 100644
index 396d00dcd3..0000000000
--- a/data/styles/clear/style-clear/symbols/information-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/jewelry-s.svg b/data/styles/clear/style-clear/symbols/jewelry-s.svg
deleted file mode 100644
index 1fa12456bc..0000000000
--- a/data/styles/clear/style-clear/symbols/jewelry-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/kindergarten-m.svg b/data/styles/clear/style-clear/symbols/kindergarten-m.svg
deleted file mode 100644
index d7c8a79874..0000000000
--- a/data/styles/clear/style-clear/symbols/kindergarten-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/kindergarten-s.svg b/data/styles/clear/style-clear/symbols/kindergarten-s.svg
deleted file mode 100644
index 7771fa8c1b..0000000000
--- a/data/styles/clear/style-clear/symbols/kindergarten-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/kiosk-s.svg b/data/styles/clear/style-clear/symbols/kiosk-s.svg
deleted file mode 100644
index 7149af5f33..0000000000
--- a/data/styles/clear/style-clear/symbols/kiosk-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/laundry-s.svg b/data/styles/clear/style-clear/symbols/laundry-s.svg
deleted file mode 100644
index c5b675c829..0000000000
--- a/data/styles/clear/style-clear/symbols/laundry-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/lawyer-m.svg b/data/styles/clear/style-clear/symbols/lawyer-m.svg
deleted file mode 100644
index f97befae94..0000000000
--- a/data/styles/clear/style-clear/symbols/lawyer-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/lawyer-s.svg b/data/styles/clear/style-clear/symbols/lawyer-s.svg
deleted file mode 100644
index a87d187ff0..0000000000
--- a/data/styles/clear/style-clear/symbols/lawyer-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/library-m.svg b/data/styles/clear/style-clear/symbols/library-m.svg
deleted file mode 100644
index 0f20202080..0000000000
--- a/data/styles/clear/style-clear/symbols/library-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/library-s.svg b/data/styles/clear/style-clear/symbols/library-s.svg
deleted file mode 100644
index bb1cbee592..0000000000
--- a/data/styles/clear/style-clear/symbols/library-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/lift_gate-s.svg b/data/styles/clear/style-clear/symbols/lift_gate-s.svg
deleted file mode 100644
index b5f5d7fe02..0000000000
--- a/data/styles/clear/style-clear/symbols/lift_gate-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/mail-s.svg b/data/styles/clear/style-clear/symbols/mail-s.svg
deleted file mode 100644
index 01bccf40f1..0000000000
--- a/data/styles/clear/style-clear/symbols/mail-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/marketplace-s.svg b/data/styles/clear/style-clear/symbols/marketplace-s.svg
deleted file mode 100644
index 494b6ed737..0000000000
--- a/data/styles/clear/style-clear/symbols/marketplace-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/media-s.svg b/data/styles/clear/style-clear/symbols/media-s.svg
deleted file mode 100644
index 47fa92db67..0000000000
--- a/data/styles/clear/style-clear/symbols/media-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/military-s.svg b/data/styles/clear/style-clear/symbols/military-s.svg
deleted file mode 100644
index 643d24360e..0000000000
--- a/data/styles/clear/style-clear/symbols/military-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/mobile_phone-s.svg b/data/styles/clear/style-clear/symbols/mobile_phone-s.svg
deleted file mode 100644
index 5cda81ad06..0000000000
--- a/data/styles/clear/style-clear/symbols/mobile_phone-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/motel-m.svg b/data/styles/clear/style-clear/symbols/motel-m.svg
deleted file mode 100644
index c1002a1d86..0000000000
--- a/data/styles/clear/style-clear/symbols/motel-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/motel-s.svg b/data/styles/clear/style-clear/symbols/motel-s.svg
deleted file mode 100644
index 6265c5b3a5..0000000000
--- a/data/styles/clear/style-clear/symbols/motel-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/motorcycle-parking-m.svg b/data/styles/clear/style-clear/symbols/motorcycle-parking-m.svg
deleted file mode 100644
index b6c5d61eea..0000000000
--- a/data/styles/clear/style-clear/symbols/motorcycle-parking-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/motorcycle-parking-s.svg b/data/styles/clear/style-clear/symbols/motorcycle-parking-s.svg
deleted file mode 100644
index 805d667667..0000000000
--- a/data/styles/clear/style-clear/symbols/motorcycle-parking-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/motorcycle_shop-s.svg b/data/styles/clear/style-clear/symbols/motorcycle_shop-s.svg
deleted file mode 100644
index 1964b55199..0000000000
--- a/data/styles/clear/style-clear/symbols/motorcycle_shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/music-s.svg b/data/styles/clear/style-clear/symbols/music-s.svg
deleted file mode 100644
index 0a5de6caf4..0000000000
--- a/data/styles/clear/style-clear/symbols/music-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/muslim-xl.svg b/data/styles/clear/style-clear/symbols/muslim-xl.svg
deleted file mode 100644
index 7b713d5e46..0000000000
--- a/data/styles/clear/style-clear/symbols/muslim-xl.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
diff --git a/data/styles/clear/style-clear/symbols/newsagent-m.svg b/data/styles/clear/style-clear/symbols/newsagent-m.svg
deleted file mode 100644
index 71569313a9..0000000000
--- a/data/styles/clear/style-clear/symbols/newsagent-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/newsagent-s.svg b/data/styles/clear/style-clear/symbols/newsagent-s.svg
deleted file mode 100644
index 527b1ee48b..0000000000
--- a/data/styles/clear/style-clear/symbols/newsagent-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/npark-m.svg b/data/styles/clear/style-clear/symbols/npark-m.svg
deleted file mode 100644
index b8f3f64807..0000000000
--- a/data/styles/clear/style-clear/symbols/npark-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/npark-s.svg b/data/styles/clear/style-clear/symbols/npark-s.svg
deleted file mode 100644
index 49989e6775..0000000000
--- a/data/styles/clear/style-clear/symbols/npark-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/nparkF-xl.svg b/data/styles/clear/style-clear/symbols/nparkF-xl.svg
deleted file mode 100644
index 785b57e5a1..0000000000
--- a/data/styles/clear/style-clear/symbols/nparkF-xl.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
diff --git a/data/styles/clear/style-clear/symbols/office-financial-m.svg b/data/styles/clear/style-clear/symbols/office-financial-m.svg
deleted file mode 100644
index 3d11d10541..0000000000
--- a/data/styles/clear/style-clear/symbols/office-financial-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/office-financial-s.svg b/data/styles/clear/style-clear/symbols/office-financial-s.svg
deleted file mode 100644
index 7bf4e70c03..0000000000
--- a/data/styles/clear/style-clear/symbols/office-financial-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/office-m.svg b/data/styles/clear/style-clear/symbols/office-m.svg
deleted file mode 100644
index 965280b25a..0000000000
--- a/data/styles/clear/style-clear/symbols/office-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/office-s.svg b/data/styles/clear/style-clear/symbols/office-s.svg
deleted file mode 100644
index e99eb9afce..0000000000
--- a/data/styles/clear/style-clear/symbols/office-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/optician-s.svg b/data/styles/clear/style-clear/symbols/optician-s.svg
deleted file mode 100644
index 8c3e174c7f..0000000000
--- a/data/styles/clear/style-clear/symbols/optician-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/outdoor-shop-s.svg b/data/styles/clear/style-clear/symbols/outdoor-shop-s.svg
deleted file mode 100644
index f75d8b05c1..0000000000
--- a/data/styles/clear/style-clear/symbols/outdoor-shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/parking-meter-m.svg b/data/styles/clear/style-clear/symbols/parking-meter-m.svg
deleted file mode 100644
index a922626834..0000000000
--- a/data/styles/clear/style-clear/symbols/parking-meter-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/parking-meter-s.svg b/data/styles/clear/style-clear/symbols/parking-meter-s.svg
deleted file mode 100644
index b7cb0d12c5..0000000000
--- a/data/styles/clear/style-clear/symbols/parking-meter-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/parking_pay-m.svg b/data/styles/clear/style-clear/symbols/parking_pay-m.svg
deleted file mode 100644
index 7ede632253..0000000000
--- a/data/styles/clear/style-clear/symbols/parking_pay-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/parking_pay-s.svg b/data/styles/clear/style-clear/symbols/parking_pay-s.svg
deleted file mode 100644
index 2fbfffc0e9..0000000000
--- a/data/styles/clear/style-clear/symbols/parking_pay-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/petshop-s.svg b/data/styles/clear/style-clear/symbols/petshop-s.svg
deleted file mode 100644
index bdeb6c2a6e..0000000000
--- a/data/styles/clear/style-clear/symbols/petshop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/pharmacy-s.svg b/data/styles/clear/style-clear/symbols/pharmacy-s.svg
deleted file mode 100644
index 0ef39d55d2..0000000000
--- a/data/styles/clear/style-clear/symbols/pharmacy-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/phone-m.svg b/data/styles/clear/style-clear/symbols/phone-m.svg
deleted file mode 100644
index 90b4215ee5..0000000000
--- a/data/styles/clear/style-clear/symbols/phone-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/phone-s.svg b/data/styles/clear/style-clear/symbols/phone-s.svg
deleted file mode 100644
index de43975e22..0000000000
--- a/data/styles/clear/style-clear/symbols/phone-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/photo-shop-s.svg b/data/styles/clear/style-clear/symbols/photo-shop-s.svg
deleted file mode 100644
index c63c5fa69d..0000000000
--- a/data/styles/clear/style-clear/symbols/photo-shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/picnic-s.svg b/data/styles/clear/style-clear/symbols/picnic-s.svg
deleted file mode 100644
index 1a3cf15467..0000000000
--- a/data/styles/clear/style-clear/symbols/picnic-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/picnic_table-s.svg b/data/styles/clear/style-clear/symbols/picnic_table-s.svg
deleted file mode 100644
index 957e1c23c7..0000000000
--- a/data/styles/clear/style-clear/symbols/picnic_table-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/pitch-m.svg b/data/styles/clear/style-clear/symbols/pitch-m.svg
deleted file mode 100644
index b18a65a155..0000000000
--- a/data/styles/clear/style-clear/symbols/pitch-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/pitch-s.svg b/data/styles/clear/style-clear/symbols/pitch-s.svg
deleted file mode 100644
index 458afbfdf1..0000000000
--- a/data/styles/clear/style-clear/symbols/pitch-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/place-of-worship-xl.svg b/data/styles/clear/style-clear/symbols/place-of-worship-xl.svg
deleted file mode 100644
index 72adb5ba10..0000000000
--- a/data/styles/clear/style-clear/symbols/place-of-worship-xl.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
diff --git a/data/styles/clear/style-clear/symbols/police-m.svg b/data/styles/clear/style-clear/symbols/police-m.svg
deleted file mode 100644
index 79b03f213f..0000000000
--- a/data/styles/clear/style-clear/symbols/police-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/police-s.svg b/data/styles/clear/style-clear/symbols/police-s.svg
deleted file mode 100644
index 68564534eb..0000000000
--- a/data/styles/clear/style-clear/symbols/police-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/postbox-m.svg b/data/styles/clear/style-clear/symbols/postbox-m.svg
deleted file mode 100644
index fc87d648ef..0000000000
--- a/data/styles/clear/style-clear/symbols/postbox-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/postbox-s.svg b/data/styles/clear/style-clear/symbols/postbox-s.svg
deleted file mode 100644
index 4c082efa21..0000000000
--- a/data/styles/clear/style-clear/symbols/postbox-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/power-m.svg b/data/styles/clear/style-clear/symbols/power-m.svg
deleted file mode 100644
index 53f7c5cfb4..0000000000
--- a/data/styles/clear/style-clear/symbols/power-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/power-s.svg b/data/styles/clear/style-clear/symbols/power-s.svg
deleted file mode 100644
index 7e9441219e..0000000000
--- a/data/styles/clear/style-clear/symbols/power-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/prison-m.svg b/data/styles/clear/style-clear/symbols/prison-m.svg
deleted file mode 100644
index 5986be835a..0000000000
--- a/data/styles/clear/style-clear/symbols/prison-m.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/prison-s.svg b/data/styles/clear/style-clear/symbols/prison-s.svg
deleted file mode 100644
index 9f5ff6afe4..0000000000
--- a/data/styles/clear/style-clear/symbols/prison-s.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/public-building-m.svg b/data/styles/clear/style-clear/symbols/public-building-m.svg
deleted file mode 100644
index e2ee07b4c4..0000000000
--- a/data/styles/clear/style-clear/symbols/public-building-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/public-building-s.svg b/data/styles/clear/style-clear/symbols/public-building-s.svg
deleted file mode 100644
index 4052d6b554..0000000000
--- a/data/styles/clear/style-clear/symbols/public-building-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/recycling-s.svg b/data/styles/clear/style-clear/symbols/recycling-s.svg
deleted file mode 100644
index 879b972d69..0000000000
--- a/data/styles/clear/style-clear/symbols/recycling-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/restaurant-s.svg b/data/styles/clear/style-clear/symbols/restaurant-s.svg
deleted file mode 100644
index afe8b5dce6..0000000000
--- a/data/styles/clear/style-clear/symbols/restaurant-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/sauna-m.svg b/data/styles/clear/style-clear/symbols/sauna-m.svg
deleted file mode 100644
index 8f5724f726..0000000000
--- a/data/styles/clear/style-clear/symbols/sauna-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/sauna-s.svg b/data/styles/clear/style-clear/symbols/sauna-s.svg
deleted file mode 100644
index 2dfebf9070..0000000000
--- a/data/styles/clear/style-clear/symbols/sauna-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/school-m.svg b/data/styles/clear/style-clear/symbols/school-m.svg
deleted file mode 100644
index 5c92d5c9ea..0000000000
--- a/data/styles/clear/style-clear/symbols/school-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/school-s.svg b/data/styles/clear/style-clear/symbols/school-s.svg
deleted file mode 100644
index 079e93b5d4..0000000000
--- a/data/styles/clear/style-clear/symbols/school-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/seafood-shop-s.svg b/data/styles/clear/style-clear/symbols/seafood-shop-s.svg
deleted file mode 100644
index 0c9908f6e9..0000000000
--- a/data/styles/clear/style-clear/symbols/seafood-shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/shoes-s.svg b/data/styles/clear/style-clear/symbols/shoes-s.svg
deleted file mode 100644
index e3b4d0c217..0000000000
--- a/data/styles/clear/style-clear/symbols/shoes-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/shop-bicycle-s.svg b/data/styles/clear/style-clear/symbols/shop-bicycle-s.svg
deleted file mode 100644
index e4c3b76a05..0000000000
--- a/data/styles/clear/style-clear/symbols/shop-bicycle-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/shower-m.svg b/data/styles/clear/style-clear/symbols/shower-m.svg
deleted file mode 100644
index c37b851047..0000000000
--- a/data/styles/clear/style-clear/symbols/shower-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/shower-s.svg b/data/styles/clear/style-clear/symbols/shower-s.svg
deleted file mode 100644
index ea77b1c368..0000000000
--- a/data/styles/clear/style-clear/symbols/shower-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/skiing-m.svg b/data/styles/clear/style-clear/symbols/skiing-m.svg
deleted file mode 100644
index 57ae6e3ce8..0000000000
--- a/data/styles/clear/style-clear/symbols/skiing-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/skiing-s.svg b/data/styles/clear/style-clear/symbols/skiing-s.svg
deleted file mode 100644
index 92ddef91cf..0000000000
--- a/data/styles/clear/style-clear/symbols/skiing-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/soccer-m.svg b/data/styles/clear/style-clear/symbols/soccer-m.svg
deleted file mode 100644
index 8b01adc050..0000000000
--- a/data/styles/clear/style-clear/symbols/soccer-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/soccer-s.svg b/data/styles/clear/style-clear/symbols/soccer-s.svg
deleted file mode 100644
index d327ed7366..0000000000
--- a/data/styles/clear/style-clear/symbols/soccer-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/sports-s.svg b/data/styles/clear/style-clear/symbols/sports-s.svg
deleted file mode 100644
index 9077d2fb63..0000000000
--- a/data/styles/clear/style-clear/symbols/sports-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/stationery_shop-m.svg b/data/styles/clear/style-clear/symbols/stationery_shop-m.svg
deleted file mode 100644
index 13e3456c14..0000000000
--- a/data/styles/clear/style-clear/symbols/stationery_shop-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/stationery_shop-s.svg b/data/styles/clear/style-clear/symbols/stationery_shop-s.svg
deleted file mode 100644
index e49527f35f..0000000000
--- a/data/styles/clear/style-clear/symbols/stationery_shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/survey_point-m.svg b/data/styles/clear/style-clear/symbols/survey_point-m.svg
deleted file mode 100644
index 3d304f7396..0000000000
--- a/data/styles/clear/style-clear/symbols/survey_point-m.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/survey_point-s.svg b/data/styles/clear/style-clear/symbols/survey_point-s.svg
deleted file mode 100644
index 766dafc16d..0000000000
--- a/data/styles/clear/style-clear/symbols/survey_point-s.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/sweets-s.svg b/data/styles/clear/style-clear/symbols/sweets-s.svg
deleted file mode 100644
index 83579604c4..0000000000
--- a/data/styles/clear/style-clear/symbols/sweets-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/swimming-s.svg b/data/styles/clear/style-clear/symbols/swimming-s.svg
deleted file mode 100644
index 9a109d7280..0000000000
--- a/data/styles/clear/style-clear/symbols/swimming-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/taxi-s.svg b/data/styles/clear/style-clear/symbols/taxi-s.svg
deleted file mode 100644
index e64ccf26ba..0000000000
--- a/data/styles/clear/style-clear/symbols/taxi-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/tennis-m.svg b/data/styles/clear/style-clear/symbols/tennis-m.svg
deleted file mode 100644
index 8dbd4c71a2..0000000000
--- a/data/styles/clear/style-clear/symbols/tennis-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/tennis-s.svg b/data/styles/clear/style-clear/symbols/tennis-s.svg
deleted file mode 100644
index 5f5ba04369..0000000000
--- a/data/styles/clear/style-clear/symbols/tennis-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/ticket-shop-s.svg b/data/styles/clear/style-clear/symbols/ticket-shop-s.svg
deleted file mode 100644
index eb61feed92..0000000000
--- a/data/styles/clear/style-clear/symbols/ticket-shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/tire-repair-m.svg b/data/styles/clear/style-clear/symbols/tire-repair-m.svg
deleted file mode 100644
index 519f142d9a..0000000000
--- a/data/styles/clear/style-clear/symbols/tire-repair-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/tire-repair-s.svg b/data/styles/clear/style-clear/symbols/tire-repair-s.svg
deleted file mode 100644
index 3e4e9f09e0..0000000000
--- a/data/styles/clear/style-clear/symbols/tire-repair-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/toilets-m.svg b/data/styles/clear/style-clear/symbols/toilets-m.svg
deleted file mode 100644
index 6e7e3fb23c..0000000000
--- a/data/styles/clear/style-clear/symbols/toilets-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/toilets-s.svg b/data/styles/clear/style-clear/symbols/toilets-s.svg
deleted file mode 100644
index b78a816224..0000000000
--- a/data/styles/clear/style-clear/symbols/toilets-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/tomb-s.svg b/data/styles/clear/style-clear/symbols/tomb-s.svg
deleted file mode 100644
index ba93e3c55f..0000000000
--- a/data/styles/clear/style-clear/symbols/tomb-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/toys-s.svg b/data/styles/clear/style-clear/symbols/toys-s.svg
deleted file mode 100644
index 55128c4dd6..0000000000
--- a/data/styles/clear/style-clear/symbols/toys-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/train-xs.svg b/data/styles/clear/style-clear/symbols/train-xs.svg
deleted file mode 100644
index b524c17b1e..0000000000
--- a/data/styles/clear/style-clear/symbols/train-xs.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/travel_agency_shop-m.svg b/data/styles/clear/style-clear/symbols/travel_agency_shop-m.svg
deleted file mode 100644
index 92158db8c1..0000000000
--- a/data/styles/clear/style-clear/symbols/travel_agency_shop-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/travel_agency_shop-s.svg b/data/styles/clear/style-clear/symbols/travel_agency_shop-s.svg
deleted file mode 100644
index 9db8ff5117..0000000000
--- a/data/styles/clear/style-clear/symbols/travel_agency_shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/vending-m.svg b/data/styles/clear/style-clear/symbols/vending-m.svg
deleted file mode 100644
index 5163f925e4..0000000000
--- a/data/styles/clear/style-clear/symbols/vending-m.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/vending-s.svg b/data/styles/clear/style-clear/symbols/vending-s.svg
deleted file mode 100644
index ec824818f2..0000000000
--- a/data/styles/clear/style-clear/symbols/vending-s.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/veterinary-s.svg b/data/styles/clear/style-clear/symbols/veterinary-s.svg
deleted file mode 100644
index 7bbd69545b..0000000000
--- a/data/styles/clear/style-clear/symbols/veterinary-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/viator-star-m.svg b/data/styles/clear/style-clear/symbols/viator-star-m.svg
deleted file mode 100644
index d02f6d0c79..0000000000
--- a/data/styles/clear/style-clear/symbols/viator-star-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/viator-star-s.svg b/data/styles/clear/style-clear/symbols/viator-star-s.svg
deleted file mode 100644
index 5081ecdfde..0000000000
--- a/data/styles/clear/style-clear/symbols/viator-star-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/waste-basket-m.svg b/data/styles/clear/style-clear/symbols/waste-basket-m.svg
deleted file mode 100644
index 6724607b78..0000000000
--- a/data/styles/clear/style-clear/symbols/waste-basket-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/wayside_shrine-s.svg b/data/styles/clear/style-clear/symbols/wayside_shrine-s.svg
deleted file mode 100644
index eb9ccb6704..0000000000
--- a/data/styles/clear/style-clear/symbols/wayside_shrine-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/symbols/windmill-s.svg b/data/styles/clear/style-clear/symbols/windmill-s.svg
deleted file mode 100644
index 6a44a1a91f..0000000000
--- a/data/styles/clear/style-clear/symbols/windmill-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-bg-l.png b/data/styles/clear/style-clear/xhdpi/bookmark-bg-l.png
index cce232031c..93e66abdbf 100644
Binary files a/data/styles/clear/style-clear/xhdpi/bookmark-bg-l.png and b/data/styles/clear/style-clear/xhdpi/bookmark-bg-l.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-bg-m.png b/data/styles/clear/style-clear/xhdpi/bookmark-bg-m.png
index 7b053d050a..3c15b98b05 100644
Binary files a/data/styles/clear/style-clear/xhdpi/bookmark-bg-m.png and b/data/styles/clear/style-clear/xhdpi/bookmark-bg-m.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-bg-s.png b/data/styles/clear/style-clear/xhdpi/bookmark-bg-s.png
index 8e401aced0..73059a9baf 100644
Binary files a/data/styles/clear/style-clear/xhdpi/bookmark-bg-s.png and b/data/styles/clear/style-clear/xhdpi/bookmark-bg-s.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-bg-xs.png b/data/styles/clear/style-clear/xhdpi/bookmark-bg-xs.png
index d985cae096..57da5fc1fc 100644
Binary files a/data/styles/clear/style-clear/xhdpi/bookmark-bg-xs.png and b/data/styles/clear/style-clear/xhdpi/bookmark-bg-xs.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-default-l.png b/data/styles/clear/style-clear/xhdpi/bookmark-default-l.png
index 4b7e2c0e28..b366e086d3 100644
Binary files a/data/styles/clear/style-clear/xhdpi/bookmark-default-l.png and b/data/styles/clear/style-clear/xhdpi/bookmark-default-l.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-default-m.png b/data/styles/clear/style-clear/xhdpi/bookmark-default-m.png
index f5ca3d5049..5c8db4d36a 100644
Binary files a/data/styles/clear/style-clear/xhdpi/bookmark-default-m.png and b/data/styles/clear/style-clear/xhdpi/bookmark-default-m.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-default-s.png b/data/styles/clear/style-clear/xhdpi/bookmark-default-s.png
index 91a31272cd..9631a19e57 100644
Binary files a/data/styles/clear/style-clear/xhdpi/bookmark-default-s.png and b/data/styles/clear/style-clear/xhdpi/bookmark-default-s.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/bookmark-default-xs.png b/data/styles/clear/style-clear/xhdpi/bookmark-default-xs.png
index a2a3511471..f6c7cbb441 100644
Binary files a/data/styles/clear/style-clear/xhdpi/bookmark-default-xs.png and b/data/styles/clear/style-clear/xhdpi/bookmark-default-xs.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/search-booking-inactive.png b/data/styles/clear/style-clear/xhdpi/search-booking-inactive.png
deleted file mode 100644
index f1b6201738..0000000000
Binary files a/data/styles/clear/style-clear/xhdpi/search-booking-inactive.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xhdpi/search-booking.png b/data/styles/clear/style-clear/xhdpi/search-booking.png
deleted file mode 100644
index 828c84a3bb..0000000000
Binary files a/data/styles/clear/style-clear/xhdpi/search-booking.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xhdpi/search-result.png b/data/styles/clear/style-clear/xhdpi/search-result.png
index 88ee79bf88..3e2add11cf 100644
Binary files a/data/styles/clear/style-clear/xhdpi/search-result.png and b/data/styles/clear/style-clear/xhdpi/search-result.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/searchbooking-bg-l.png b/data/styles/clear/style-clear/xhdpi/searchbooking-bg-l.png
new file mode 100644
index 0000000000..6d20f85440
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/searchbooking-bg-l.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/searchbooking-bg-s.png b/data/styles/clear/style-clear/xhdpi/searchbooking-bg-s.png
new file mode 100644
index 0000000000..8d5fd36908
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/searchbooking-bg-s.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/searchbooking-default-l.png b/data/styles/clear/style-clear/xhdpi/searchbooking-default-l.png
new file mode 100644
index 0000000000..6efa80b831
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/searchbooking-default-l.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/searchbooking-default-s.png b/data/styles/clear/style-clear/xhdpi/searchbooking-default-s.png
new file mode 100644
index 0000000000..f9fd373cc5
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/searchbooking-default-s.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/searchbooking-ext-1.png b/data/styles/clear/style-clear/xhdpi/searchbooking-ext-1.png
new file mode 100644
index 0000000000..9a298da2e2
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/searchbooking-ext-1.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/searchbooking-ext-2.png b/data/styles/clear/style-clear/xhdpi/searchbooking-ext-2.png
new file mode 100644
index 0000000000..fc3c3e6f74
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/searchbooking-ext-2.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/searchbooking-ext-3.png b/data/styles/clear/style-clear/xhdpi/searchbooking-ext-3.png
new file mode 100644
index 0000000000..38740ca888
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/searchbooking-ext-3.png differ
diff --git a/data/styles/clear/style-clear/xhdpi/searchbooking-inactive.png b/data/styles/clear/style-clear/xhdpi/searchbooking-inactive.png
new file mode 100644
index 0000000000..5c264064ac
Binary files /dev/null and b/data/styles/clear/style-clear/xhdpi/searchbooking-inactive.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-bg-l.png b/data/styles/clear/style-clear/xxhdpi/bookmark-bg-l.png
index 3955f637ce..707a3e47e3 100644
Binary files a/data/styles/clear/style-clear/xxhdpi/bookmark-bg-l.png and b/data/styles/clear/style-clear/xxhdpi/bookmark-bg-l.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-bg-m.png b/data/styles/clear/style-clear/xxhdpi/bookmark-bg-m.png
index 0a55bf8f7c..a782530e1c 100644
Binary files a/data/styles/clear/style-clear/xxhdpi/bookmark-bg-m.png and b/data/styles/clear/style-clear/xxhdpi/bookmark-bg-m.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-bg-s.png b/data/styles/clear/style-clear/xxhdpi/bookmark-bg-s.png
index 4920bcb859..ed0332918d 100644
Binary files a/data/styles/clear/style-clear/xxhdpi/bookmark-bg-s.png and b/data/styles/clear/style-clear/xxhdpi/bookmark-bg-s.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-bg-xs.png b/data/styles/clear/style-clear/xxhdpi/bookmark-bg-xs.png
index ec3baa7871..4b89f14cc9 100644
Binary files a/data/styles/clear/style-clear/xxhdpi/bookmark-bg-xs.png and b/data/styles/clear/style-clear/xxhdpi/bookmark-bg-xs.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-default-l.png b/data/styles/clear/style-clear/xxhdpi/bookmark-default-l.png
index acca4e7908..9406db9d9a 100644
Binary files a/data/styles/clear/style-clear/xxhdpi/bookmark-default-l.png and b/data/styles/clear/style-clear/xxhdpi/bookmark-default-l.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-default-m.png b/data/styles/clear/style-clear/xxhdpi/bookmark-default-m.png
index ac52ca5c71..1f7581a4a3 100644
Binary files a/data/styles/clear/style-clear/xxhdpi/bookmark-default-m.png and b/data/styles/clear/style-clear/xxhdpi/bookmark-default-m.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-default-s.png b/data/styles/clear/style-clear/xxhdpi/bookmark-default-s.png
index 40ade2385c..6999268491 100644
Binary files a/data/styles/clear/style-clear/xxhdpi/bookmark-default-s.png and b/data/styles/clear/style-clear/xxhdpi/bookmark-default-s.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/bookmark-default-xs.png b/data/styles/clear/style-clear/xxhdpi/bookmark-default-xs.png
index 3a14c803df..a1aed9b923 100644
Binary files a/data/styles/clear/style-clear/xxhdpi/bookmark-default-xs.png and b/data/styles/clear/style-clear/xxhdpi/bookmark-default-xs.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/search-booking-inactive.png b/data/styles/clear/style-clear/xxhdpi/search-booking-inactive.png
deleted file mode 100644
index 720975d62c..0000000000
Binary files a/data/styles/clear/style-clear/xxhdpi/search-booking-inactive.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxhdpi/search-booking.png b/data/styles/clear/style-clear/xxhdpi/search-booking.png
deleted file mode 100644
index cac673de72..0000000000
Binary files a/data/styles/clear/style-clear/xxhdpi/search-booking.png and /dev/null differ
diff --git a/data/styles/clear/style-clear/xxhdpi/search-result.png b/data/styles/clear/style-clear/xxhdpi/search-result.png
index e17a6fec47..c2c88568bd 100644
Binary files a/data/styles/clear/style-clear/xxhdpi/search-result.png and b/data/styles/clear/style-clear/xxhdpi/search-result.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/searchbooking-bg-l.png b/data/styles/clear/style-clear/xxhdpi/searchbooking-bg-l.png
new file mode 100644
index 0000000000..677910ea0c
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/searchbooking-bg-l.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/searchbooking-bg-s.png b/data/styles/clear/style-clear/xxhdpi/searchbooking-bg-s.png
new file mode 100644
index 0000000000..e2ad41a63d
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/searchbooking-bg-s.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/searchbooking-default-l.png b/data/styles/clear/style-clear/xxhdpi/searchbooking-default-l.png
new file mode 100644
index 0000000000..010d63b817
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/searchbooking-default-l.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/searchbooking-default-s.png b/data/styles/clear/style-clear/xxhdpi/searchbooking-default-s.png
new file mode 100644
index 0000000000..e615cd7804
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/searchbooking-default-s.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/searchbooking-ext-1.png b/data/styles/clear/style-clear/xxhdpi/searchbooking-ext-1.png
new file mode 100644
index 0000000000..f43dc9a240
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/searchbooking-ext-1.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/searchbooking-ext-2.png b/data/styles/clear/style-clear/xxhdpi/searchbooking-ext-2.png
new file mode 100644
index 0000000000..f8877af3a7
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/searchbooking-ext-2.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/searchbooking-ext-3.png b/data/styles/clear/style-clear/xxhdpi/searchbooking-ext-3.png
new file mode 100644
index 0000000000..bdffb6f939
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/searchbooking-ext-3.png differ
diff --git a/data/styles/clear/style-clear/xxhdpi/searchbooking-inactive.png b/data/styles/clear/style-clear/xxhdpi/searchbooking-inactive.png
new file mode 100644
index 0000000000..dc96f8316e
Binary files /dev/null and b/data/styles/clear/style-clear/xxhdpi/searchbooking-inactive.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/api-result.png b/data/styles/clear/style-clear/xxxhdpi/api-result.png
new file mode 100644
index 0000000000..498e12d0f4
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/api-result.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-bg-l.png b/data/styles/clear/style-clear/xxxhdpi/bookmark-bg-l.png
new file mode 100644
index 0000000000..ae957faa74
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/bookmark-bg-l.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-bg-m.png b/data/styles/clear/style-clear/xxxhdpi/bookmark-bg-m.png
new file mode 100644
index 0000000000..ec59477f59
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/bookmark-bg-m.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-bg-s.png b/data/styles/clear/style-clear/xxxhdpi/bookmark-bg-s.png
new file mode 100644
index 0000000000..774697573b
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/bookmark-bg-s.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-bg-xs.png b/data/styles/clear/style-clear/xxxhdpi/bookmark-bg-xs.png
new file mode 100644
index 0000000000..db51ad538a
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/bookmark-bg-xs.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-default-l.png b/data/styles/clear/style-clear/xxxhdpi/bookmark-default-l.png
new file mode 100644
index 0000000000..e233f81886
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/bookmark-default-l.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-default-m.png b/data/styles/clear/style-clear/xxxhdpi/bookmark-default-m.png
new file mode 100644
index 0000000000..fd36656135
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/bookmark-default-m.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-default-s.png b/data/styles/clear/style-clear/xxxhdpi/bookmark-default-s.png
new file mode 100644
index 0000000000..8fa828430a
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/bookmark-default-s.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/bookmark-default-xs.png b/data/styles/clear/style-clear/xxxhdpi/bookmark-default-xs.png
new file mode 100644
index 0000000000..bb71db6ca6
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/bookmark-default-xs.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/compass-image.png b/data/styles/clear/style-clear/xxxhdpi/compass-image.png
new file mode 100644
index 0000000000..bb6edf44d4
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/compass-image.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/cross_geoposition.png b/data/styles/clear/style-clear/xxxhdpi/cross_geoposition.png
new file mode 100644
index 0000000000..30f57a9c38
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/cross_geoposition.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/current-position.png b/data/styles/clear/style-clear/xxxhdpi/current-position.png
new file mode 100644
index 0000000000..21738b7f9a
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/current-position.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/non-found-search-result.png b/data/styles/clear/style-clear/xxxhdpi/non-found-search-result.png
new file mode 100644
index 0000000000..4a5a8d5d0e
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/non-found-search-result.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-arrow.png b/data/styles/clear/style-clear/xxxhdpi/route-arrow.png
new file mode 100644
index 0000000000..997a21da11
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-arrow.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-a.png b/data/styles/clear/style-clear/xxxhdpi/route-point-a.png
new file mode 100644
index 0000000000..68193c9327
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-a.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-b.png b/data/styles/clear/style-clear/xxxhdpi/route-point-b.png
new file mode 100644
index 0000000000..3c09bdbb7d
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-b.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-c.png b/data/styles/clear/style-clear/xxxhdpi/route-point-c.png
new file mode 100644
index 0000000000..467c9631ec
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-c.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-finish.png b/data/styles/clear/style-clear/xxxhdpi/route-point-finish.png
new file mode 100644
index 0000000000..c30443bff0
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-finish.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/route-point-start.png b/data/styles/clear/style-clear/xxxhdpi/route-point-start.png
new file mode 100644
index 0000000000..385969bf16
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/route-point-start.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-adv.png b/data/styles/clear/style-clear/xxxhdpi/search-adv.png
new file mode 100644
index 0000000000..06884a5ea6
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/search-adv.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/search-result.png b/data/styles/clear/style-clear/xxxhdpi/search-result.png
new file mode 100644
index 0000000000..51bfeaec58
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/search-result.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/searchbooking-bg-l.png b/data/styles/clear/style-clear/xxxhdpi/searchbooking-bg-l.png
new file mode 100644
index 0000000000..989193828e
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/searchbooking-bg-l.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/searchbooking-bg-s.png b/data/styles/clear/style-clear/xxxhdpi/searchbooking-bg-s.png
new file mode 100644
index 0000000000..03b4bd2304
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/searchbooking-bg-s.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/searchbooking-default-l.png b/data/styles/clear/style-clear/xxxhdpi/searchbooking-default-l.png
new file mode 100644
index 0000000000..1e78622ff1
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/searchbooking-default-l.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/searchbooking-default-s.png b/data/styles/clear/style-clear/xxxhdpi/searchbooking-default-s.png
new file mode 100644
index 0000000000..80d0402129
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/searchbooking-default-s.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/searchbooking-ext-1.png b/data/styles/clear/style-clear/xxxhdpi/searchbooking-ext-1.png
new file mode 100644
index 0000000000..7492b8be70
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/searchbooking-ext-1.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/searchbooking-ext-2.png b/data/styles/clear/style-clear/xxxhdpi/searchbooking-ext-2.png
new file mode 100644
index 0000000000..98c4c01096
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/searchbooking-ext-2.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/searchbooking-ext-3.png b/data/styles/clear/style-clear/xxxhdpi/searchbooking-ext-3.png
new file mode 100644
index 0000000000..a833757dd5
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/searchbooking-ext-3.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/searchbooking-inactive.png b/data/styles/clear/style-clear/xxxhdpi/searchbooking-inactive.png
new file mode 100644
index 0000000000..2aa075debf
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/searchbooking-inactive.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-thin-scaled.png b/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-thin-scaled.png
new file mode 100644
index 0000000000..b84c4a4043
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-thin-scaled.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-thin.png b/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-thin.png
new file mode 100644
index 0000000000..606cfeb01f
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-thin.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-wide-scaled.png b/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-wide-scaled.png
new file mode 100644
index 0000000000..40290ef0a5
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-wide-scaled.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-wide.png b/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-wide.png
new file mode 100644
index 0000000000..d00b341fe8
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/shield-us-hw-wide.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-i-thin-scaled.png b/data/styles/clear/style-clear/xxxhdpi/shield-us-i-thin-scaled.png
new file mode 100644
index 0000000000..abf541096c
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/shield-us-i-thin-scaled.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-i-thin.png b/data/styles/clear/style-clear/xxxhdpi/shield-us-i-thin.png
new file mode 100644
index 0000000000..28d0c4c9cd
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/shield-us-i-thin.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-i-wide-scaled.png b/data/styles/clear/style-clear/xxxhdpi/shield-us-i-wide-scaled.png
new file mode 100644
index 0000000000..7c64ec16e1
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/shield-us-i-wide-scaled.png differ
diff --git a/data/styles/clear/style-clear/xxxhdpi/shield-us-i-wide.png b/data/styles/clear/style-clear/xxxhdpi/shield-us-i-wide.png
new file mode 100644
index 0000000000..2c9c65130f
Binary files /dev/null and b/data/styles/clear/style-clear/xxxhdpi/shield-us-i-wide.png differ
diff --git a/data/styles/clear/style-night/6plus/bookmark-bg-l.png b/data/styles/clear/style-night/6plus/bookmark-bg-l.png
index ad2295860b..5206b09f72 100644
Binary files a/data/styles/clear/style-night/6plus/bookmark-bg-l.png and b/data/styles/clear/style-night/6plus/bookmark-bg-l.png differ
diff --git a/data/styles/clear/style-night/6plus/bookmark-bg-s.png b/data/styles/clear/style-night/6plus/bookmark-bg-s.png
index 6434d2ac7c..dd2c7a5be1 100644
Binary files a/data/styles/clear/style-night/6plus/bookmark-bg-s.png and b/data/styles/clear/style-night/6plus/bookmark-bg-s.png differ
diff --git a/data/styles/clear/style-night/6plus/bookmark-bg-xs.png b/data/styles/clear/style-night/6plus/bookmark-bg-xs.png
index db792c7a2b..bf2b6279ce 100644
Binary files a/data/styles/clear/style-night/6plus/bookmark-bg-xs.png and b/data/styles/clear/style-night/6plus/bookmark-bg-xs.png differ
diff --git a/data/styles/clear/style-night/6plus/bookmark-default-l.png b/data/styles/clear/style-night/6plus/bookmark-default-l.png
index a26ff56ca3..30ddf6acc4 100644
Binary files a/data/styles/clear/style-night/6plus/bookmark-default-l.png and b/data/styles/clear/style-night/6plus/bookmark-default-l.png differ
diff --git a/data/styles/clear/style-night/6plus/bookmark-default-m.png b/data/styles/clear/style-night/6plus/bookmark-default-m.png
index 3ce04d803f..3823f6aac8 100644
Binary files a/data/styles/clear/style-night/6plus/bookmark-default-m.png and b/data/styles/clear/style-night/6plus/bookmark-default-m.png differ
diff --git a/data/styles/clear/style-night/6plus/bookmark-default-s.png b/data/styles/clear/style-night/6plus/bookmark-default-s.png
index ec5d83dbb1..2ba6874f72 100644
Binary files a/data/styles/clear/style-night/6plus/bookmark-default-s.png and b/data/styles/clear/style-night/6plus/bookmark-default-s.png differ
diff --git a/data/styles/clear/style-night/6plus/bookmark-default-xs.png b/data/styles/clear/style-night/6plus/bookmark-default-xs.png
index 92c8c5a3f8..10517f0220 100644
Binary files a/data/styles/clear/style-night/6plus/bookmark-default-xs.png and b/data/styles/clear/style-night/6plus/bookmark-default-xs.png differ
diff --git a/data/styles/clear/style-night/6plus/search-booking-inactive.png b/data/styles/clear/style-night/6plus/search-booking-inactive.png
deleted file mode 100644
index 1eef84e348..0000000000
Binary files a/data/styles/clear/style-night/6plus/search-booking-inactive.png and /dev/null differ
diff --git a/data/styles/clear/style-night/6plus/search-booking.png b/data/styles/clear/style-night/6plus/search-booking.png
deleted file mode 100644
index 183f8fb86b..0000000000
Binary files a/data/styles/clear/style-night/6plus/search-booking.png and /dev/null differ
diff --git a/data/styles/clear/style-night/6plus/search-result.png b/data/styles/clear/style-night/6plus/search-result.png
index ff8937fbb6..8fb42e5bff 100644
Binary files a/data/styles/clear/style-night/6plus/search-result.png and b/data/styles/clear/style-night/6plus/search-result.png differ
diff --git a/data/styles/clear/style-night/6plus/searchbooking-bg-l.png b/data/styles/clear/style-night/6plus/searchbooking-bg-l.png
new file mode 100644
index 0000000000..309a9e76c3
Binary files /dev/null and b/data/styles/clear/style-night/6plus/searchbooking-bg-l.png differ
diff --git a/data/styles/clear/style-night/6plus/searchbooking-bg-s.png b/data/styles/clear/style-night/6plus/searchbooking-bg-s.png
new file mode 100644
index 0000000000..022a94328e
Binary files /dev/null and b/data/styles/clear/style-night/6plus/searchbooking-bg-s.png differ
diff --git a/data/styles/clear/style-night/6plus/searchbooking-default-l.png b/data/styles/clear/style-night/6plus/searchbooking-default-l.png
new file mode 100644
index 0000000000..64f7c03f77
Binary files /dev/null and b/data/styles/clear/style-night/6plus/searchbooking-default-l.png differ
diff --git a/data/styles/clear/style-night/6plus/searchbooking-default-s.png b/data/styles/clear/style-night/6plus/searchbooking-default-s.png
new file mode 100644
index 0000000000..0097c88a2e
Binary files /dev/null and b/data/styles/clear/style-night/6plus/searchbooking-default-s.png differ
diff --git a/data/styles/clear/style-night/6plus/searchbooking-ext-1.png b/data/styles/clear/style-night/6plus/searchbooking-ext-1.png
new file mode 100644
index 0000000000..df552c9dc5
Binary files /dev/null and b/data/styles/clear/style-night/6plus/searchbooking-ext-1.png differ
diff --git a/data/styles/clear/style-night/6plus/searchbooking-ext-2.png b/data/styles/clear/style-night/6plus/searchbooking-ext-2.png
new file mode 100644
index 0000000000..f8138ceabe
Binary files /dev/null and b/data/styles/clear/style-night/6plus/searchbooking-ext-2.png differ
diff --git a/data/styles/clear/style-night/6plus/searchbooking-ext-3.png b/data/styles/clear/style-night/6plus/searchbooking-ext-3.png
new file mode 100644
index 0000000000..972cac5be6
Binary files /dev/null and b/data/styles/clear/style-night/6plus/searchbooking-ext-3.png differ
diff --git a/data/styles/clear/style-night/6plus/searchbooking-inactive.png b/data/styles/clear/style-night/6plus/searchbooking-inactive.png
new file mode 100644
index 0000000000..adcca4ea0b
Binary files /dev/null and b/data/styles/clear/style-night/6plus/searchbooking-inactive.png differ
diff --git a/data/styles/clear/style-night/hdpi/bookmark-bg-l.png b/data/styles/clear/style-night/hdpi/bookmark-bg-l.png
index 462d1129c7..713964b6b8 100644
Binary files a/data/styles/clear/style-night/hdpi/bookmark-bg-l.png and b/data/styles/clear/style-night/hdpi/bookmark-bg-l.png differ
diff --git a/data/styles/clear/style-night/hdpi/bookmark-bg-s.png b/data/styles/clear/style-night/hdpi/bookmark-bg-s.png
index 57e0bfe682..d61db5bf01 100644
Binary files a/data/styles/clear/style-night/hdpi/bookmark-bg-s.png and b/data/styles/clear/style-night/hdpi/bookmark-bg-s.png differ
diff --git a/data/styles/clear/style-night/hdpi/bookmark-bg-xs.png b/data/styles/clear/style-night/hdpi/bookmark-bg-xs.png
index 1504916daa..8862784353 100644
Binary files a/data/styles/clear/style-night/hdpi/bookmark-bg-xs.png and b/data/styles/clear/style-night/hdpi/bookmark-bg-xs.png differ
diff --git a/data/styles/clear/style-night/hdpi/bookmark-default-l.png b/data/styles/clear/style-night/hdpi/bookmark-default-l.png
index b79d4d3e6a..21901f943d 100644
Binary files a/data/styles/clear/style-night/hdpi/bookmark-default-l.png and b/data/styles/clear/style-night/hdpi/bookmark-default-l.png differ
diff --git a/data/styles/clear/style-night/hdpi/bookmark-default-m.png b/data/styles/clear/style-night/hdpi/bookmark-default-m.png
index 86e660347f..63860d5b82 100644
Binary files a/data/styles/clear/style-night/hdpi/bookmark-default-m.png and b/data/styles/clear/style-night/hdpi/bookmark-default-m.png differ
diff --git a/data/styles/clear/style-night/hdpi/bookmark-default-s.png b/data/styles/clear/style-night/hdpi/bookmark-default-s.png
index 972b10643b..8375f4b686 100644
Binary files a/data/styles/clear/style-night/hdpi/bookmark-default-s.png and b/data/styles/clear/style-night/hdpi/bookmark-default-s.png differ
diff --git a/data/styles/clear/style-night/hdpi/bookmark-default-xs.png b/data/styles/clear/style-night/hdpi/bookmark-default-xs.png
index ee31fda236..f01f573adf 100644
Binary files a/data/styles/clear/style-night/hdpi/bookmark-default-xs.png and b/data/styles/clear/style-night/hdpi/bookmark-default-xs.png differ
diff --git a/data/styles/clear/style-night/hdpi/search-booking-inactive.png b/data/styles/clear/style-night/hdpi/search-booking-inactive.png
deleted file mode 100644
index 6b5d96c90b..0000000000
Binary files a/data/styles/clear/style-night/hdpi/search-booking-inactive.png and /dev/null differ
diff --git a/data/styles/clear/style-night/hdpi/search-booking.png b/data/styles/clear/style-night/hdpi/search-booking.png
deleted file mode 100644
index bd2bd04a55..0000000000
Binary files a/data/styles/clear/style-night/hdpi/search-booking.png and /dev/null differ
diff --git a/data/styles/clear/style-night/hdpi/search-result.png b/data/styles/clear/style-night/hdpi/search-result.png
index d9071790b4..7f7750356e 100644
Binary files a/data/styles/clear/style-night/hdpi/search-result.png and b/data/styles/clear/style-night/hdpi/search-result.png differ
diff --git a/data/styles/clear/style-night/hdpi/searchbooking-bg-l.png b/data/styles/clear/style-night/hdpi/searchbooking-bg-l.png
new file mode 100644
index 0000000000..91f4a752a9
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/searchbooking-bg-l.png differ
diff --git a/data/styles/clear/style-night/hdpi/searchbooking-bg-s.png b/data/styles/clear/style-night/hdpi/searchbooking-bg-s.png
new file mode 100644
index 0000000000..a7d3b1de0f
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/searchbooking-bg-s.png differ
diff --git a/data/styles/clear/style-night/hdpi/searchbooking-default-l.png b/data/styles/clear/style-night/hdpi/searchbooking-default-l.png
new file mode 100644
index 0000000000..70cf0f2903
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/searchbooking-default-l.png differ
diff --git a/data/styles/clear/style-night/hdpi/searchbooking-default-s.png b/data/styles/clear/style-night/hdpi/searchbooking-default-s.png
new file mode 100644
index 0000000000..33ef9a33da
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/searchbooking-default-s.png differ
diff --git a/data/styles/clear/style-night/hdpi/searchbooking-ext-1.png b/data/styles/clear/style-night/hdpi/searchbooking-ext-1.png
new file mode 100644
index 0000000000..58d9b79b80
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/searchbooking-ext-1.png differ
diff --git a/data/styles/clear/style-night/hdpi/searchbooking-ext-2.png b/data/styles/clear/style-night/hdpi/searchbooking-ext-2.png
new file mode 100644
index 0000000000..946f35dd35
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/searchbooking-ext-2.png differ
diff --git a/data/styles/clear/style-night/hdpi/searchbooking-ext-3.png b/data/styles/clear/style-night/hdpi/searchbooking-ext-3.png
new file mode 100644
index 0000000000..49fa3cd1bf
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/searchbooking-ext-3.png differ
diff --git a/data/styles/clear/style-night/hdpi/searchbooking-inactive.png b/data/styles/clear/style-night/hdpi/searchbooking-inactive.png
new file mode 100644
index 0000000000..fdc731501c
Binary files /dev/null and b/data/styles/clear/style-night/hdpi/searchbooking-inactive.png differ
diff --git a/data/styles/clear/style-night/mdpi/bookmark-bg-l.png b/data/styles/clear/style-night/mdpi/bookmark-bg-l.png
index 2c52e0f4c7..9f18f7d7da 100644
Binary files a/data/styles/clear/style-night/mdpi/bookmark-bg-l.png and b/data/styles/clear/style-night/mdpi/bookmark-bg-l.png differ
diff --git a/data/styles/clear/style-night/mdpi/bookmark-bg-s.png b/data/styles/clear/style-night/mdpi/bookmark-bg-s.png
index d8ff7d0a67..0d0c4fdac7 100644
Binary files a/data/styles/clear/style-night/mdpi/bookmark-bg-s.png and b/data/styles/clear/style-night/mdpi/bookmark-bg-s.png differ
diff --git a/data/styles/clear/style-night/mdpi/bookmark-bg-xs.png b/data/styles/clear/style-night/mdpi/bookmark-bg-xs.png
index 47e4babd43..0962bdb912 100644
Binary files a/data/styles/clear/style-night/mdpi/bookmark-bg-xs.png and b/data/styles/clear/style-night/mdpi/bookmark-bg-xs.png differ
diff --git a/data/styles/clear/style-night/mdpi/bookmark-default-l.png b/data/styles/clear/style-night/mdpi/bookmark-default-l.png
index 72ae568fc1..6433fb9a25 100644
Binary files a/data/styles/clear/style-night/mdpi/bookmark-default-l.png and b/data/styles/clear/style-night/mdpi/bookmark-default-l.png differ
diff --git a/data/styles/clear/style-night/mdpi/bookmark-default-m.png b/data/styles/clear/style-night/mdpi/bookmark-default-m.png
index 2949bf55a2..38b694987a 100644
Binary files a/data/styles/clear/style-night/mdpi/bookmark-default-m.png and b/data/styles/clear/style-night/mdpi/bookmark-default-m.png differ
diff --git a/data/styles/clear/style-night/mdpi/bookmark-default-s.png b/data/styles/clear/style-night/mdpi/bookmark-default-s.png
index 0397856785..c1dbeb0cca 100644
Binary files a/data/styles/clear/style-night/mdpi/bookmark-default-s.png and b/data/styles/clear/style-night/mdpi/bookmark-default-s.png differ
diff --git a/data/styles/clear/style-night/mdpi/bookmark-default-xs.png b/data/styles/clear/style-night/mdpi/bookmark-default-xs.png
index faf5175e4a..b62d2cfb58 100644
Binary files a/data/styles/clear/style-night/mdpi/bookmark-default-xs.png and b/data/styles/clear/style-night/mdpi/bookmark-default-xs.png differ
diff --git a/data/styles/clear/style-night/mdpi/search-booking-inactive.png b/data/styles/clear/style-night/mdpi/search-booking-inactive.png
deleted file mode 100644
index 28e0a06476..0000000000
Binary files a/data/styles/clear/style-night/mdpi/search-booking-inactive.png and /dev/null differ
diff --git a/data/styles/clear/style-night/mdpi/search-booking.png b/data/styles/clear/style-night/mdpi/search-booking.png
deleted file mode 100644
index d8fd990d7e..0000000000
Binary files a/data/styles/clear/style-night/mdpi/search-booking.png and /dev/null differ
diff --git a/data/styles/clear/style-night/mdpi/search-result.png b/data/styles/clear/style-night/mdpi/search-result.png
index e29c0527f1..1610fc169d 100644
Binary files a/data/styles/clear/style-night/mdpi/search-result.png and b/data/styles/clear/style-night/mdpi/search-result.png differ
diff --git a/data/styles/clear/style-night/mdpi/searchbooking-bg-l.png b/data/styles/clear/style-night/mdpi/searchbooking-bg-l.png
new file mode 100644
index 0000000000..19b6231877
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/searchbooking-bg-l.png differ
diff --git a/data/styles/clear/style-night/mdpi/searchbooking-bg-s.png b/data/styles/clear/style-night/mdpi/searchbooking-bg-s.png
new file mode 100644
index 0000000000..2c84362d3b
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/searchbooking-bg-s.png differ
diff --git a/data/styles/clear/style-night/mdpi/searchbooking-default-l.png b/data/styles/clear/style-night/mdpi/searchbooking-default-l.png
new file mode 100644
index 0000000000..715dd930cc
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/searchbooking-default-l.png differ
diff --git a/data/styles/clear/style-night/mdpi/searchbooking-default-s.png b/data/styles/clear/style-night/mdpi/searchbooking-default-s.png
new file mode 100644
index 0000000000..d77ab4ac57
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/searchbooking-default-s.png differ
diff --git a/data/styles/clear/style-night/mdpi/searchbooking-ext-1.png b/data/styles/clear/style-night/mdpi/searchbooking-ext-1.png
new file mode 100644
index 0000000000..9853a97379
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/searchbooking-ext-1.png differ
diff --git a/data/styles/clear/style-night/mdpi/searchbooking-ext-2.png b/data/styles/clear/style-night/mdpi/searchbooking-ext-2.png
new file mode 100644
index 0000000000..0e2a4fd2b0
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/searchbooking-ext-2.png differ
diff --git a/data/styles/clear/style-night/mdpi/searchbooking-ext-3.png b/data/styles/clear/style-night/mdpi/searchbooking-ext-3.png
new file mode 100644
index 0000000000..1228bf9811
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/searchbooking-ext-3.png differ
diff --git a/data/styles/clear/style-night/mdpi/searchbooking-inactive.png b/data/styles/clear/style-night/mdpi/searchbooking-inactive.png
new file mode 100644
index 0000000000..25b7895604
Binary files /dev/null and b/data/styles/clear/style-night/mdpi/searchbooking-inactive.png differ
diff --git a/data/styles/clear/style-night/style.mapcss b/data/styles/clear/style-night/style.mapcss
index e51ce653e7..edf43b2bd8 100644
--- a/data/styles/clear/style-night/style.mapcss
+++ b/data/styles/clear/style-night/style.mapcss
@@ -93,7 +93,7 @@ colors
TransitBackground-color: #000000;
TransitBackground-opacity: 0.4;
BookmarkRed-color: #E51B23;
- BookmarkPink-color: #E91F63;
+ BookmarkPink-color: #FF4182;
BookmarkPurple-color: #9C27B0;
BookmarkDeepPurple-color: #673AB7;
BookmarkBlue-color: #006EC7;
@@ -102,10 +102,17 @@ colors
BookmarkTeal-color: #009588;
BookmarkGreen-color: #388E3C;
BookmarkLime-color: #7EBF39;
- BookmarkYellow-color: #FFC108;
+ BookmarkYellow-color: #FFC800;
BookmarkOrange-color: #FFA000;
BookmarkDeepOrange-color: #607D8B;
BookmarkBrown-color: #795548;
BookmarkGray-color: #757575;
BookmarkBlueGray-color: #607D8B;
+ RatingNone-color: #597380;
+ RatingHorrible-color: #E63C2D;
+ RatingBad-color: #F06432;
+ RatingNormal-color: #FFC800;
+ RatingGood-color: #93BF39;
+ RatingExcellent-color: #3C8C3C;
+ RatingText-color: #FFFFFF;
}
diff --git a/data/styles/clear/style-night/symbols/alcohol-s.svg b/data/styles/clear/style-night/symbols/alcohol-s.svg
deleted file mode 100644
index 5e7b99b6f9..0000000000
--- a/data/styles/clear/style-night/symbols/alcohol-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/alpine_hut-s.svg b/data/styles/clear/style-night/symbols/alpine_hut-s.svg
deleted file mode 100644
index 021a57a51a..0000000000
--- a/data/styles/clear/style-night/symbols/alpine_hut-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/america-football-m.svg b/data/styles/clear/style-night/symbols/america-football-m.svg
deleted file mode 100644
index 6abcbc90b5..0000000000
--- a/data/styles/clear/style-night/symbols/america-football-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/america-football-s.svg b/data/styles/clear/style-night/symbols/america-football-s.svg
deleted file mode 100644
index 4e1a8c7667..0000000000
--- a/data/styles/clear/style-night/symbols/america-football-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/apartment-s.svg b/data/styles/clear/style-night/symbols/apartment-s.svg
deleted file mode 100644
index d1f030fe0d..0000000000
--- a/data/styles/clear/style-night/symbols/apartment-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/archery-m.svg b/data/styles/clear/style-night/symbols/archery-m.svg
deleted file mode 100644
index 95ad6de447..0000000000
--- a/data/styles/clear/style-night/symbols/archery-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/archery-s.svg b/data/styles/clear/style-night/symbols/archery-s.svg
deleted file mode 100644
index f8536bfc09..0000000000
--- a/data/styles/clear/style-night/symbols/archery-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/atm-m.svg b/data/styles/clear/style-night/symbols/atm-m.svg
deleted file mode 100644
index c08f43fbe6..0000000000
--- a/data/styles/clear/style-night/symbols/atm-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/atm-s.svg b/data/styles/clear/style-night/symbols/atm-s.svg
deleted file mode 100644
index ace2428f56..0000000000
--- a/data/styles/clear/style-night/symbols/atm-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/australian-football-m.svg b/data/styles/clear/style-night/symbols/australian-football-m.svg
deleted file mode 100644
index 9abbb7e4cc..0000000000
--- a/data/styles/clear/style-night/symbols/australian-football-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/australian-football-s.svg b/data/styles/clear/style-night/symbols/australian-football-s.svg
deleted file mode 100644
index a45d529830..0000000000
--- a/data/styles/clear/style-night/symbols/australian-football-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/bakery-s.svg b/data/styles/clear/style-night/symbols/bakery-s.svg
deleted file mode 100644
index f7c6cf6644..0000000000
--- a/data/styles/clear/style-night/symbols/bakery-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/bank-s.svg b/data/styles/clear/style-night/symbols/bank-s.svg
deleted file mode 100644
index a454c9fa76..0000000000
--- a/data/styles/clear/style-night/symbols/bank-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/banknote-m.svg b/data/styles/clear/style-night/symbols/banknote-m.svg
deleted file mode 100644
index c310aa1c5e..0000000000
--- a/data/styles/clear/style-night/symbols/banknote-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/banknote-s.svg b/data/styles/clear/style-night/symbols/banknote-s.svg
deleted file mode 100644
index 5220bbcb16..0000000000
--- a/data/styles/clear/style-night/symbols/banknote-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/bar-m.svg b/data/styles/clear/style-night/symbols/bar-m.svg
deleted file mode 100644
index 33f264a409..0000000000
--- a/data/styles/clear/style-night/symbols/bar-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/bar-s.svg b/data/styles/clear/style-night/symbols/bar-s.svg
deleted file mode 100644
index 8943b75e97..0000000000
--- a/data/styles/clear/style-night/symbols/bar-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/baseball-m.svg b/data/styles/clear/style-night/symbols/baseball-m.svg
deleted file mode 100644
index 8cdb9b14a1..0000000000
--- a/data/styles/clear/style-night/symbols/baseball-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/baseball-s.svg b/data/styles/clear/style-night/symbols/baseball-s.svg
deleted file mode 100644
index 50b811b36d..0000000000
--- a/data/styles/clear/style-night/symbols/baseball-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/basketball-m.svg b/data/styles/clear/style-night/symbols/basketball-m.svg
deleted file mode 100644
index 6d82557539..0000000000
--- a/data/styles/clear/style-night/symbols/basketball-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/basketball-s.svg b/data/styles/clear/style-night/symbols/basketball-s.svg
deleted file mode 100644
index 968e8bb64d..0000000000
--- a/data/styles/clear/style-night/symbols/basketball-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/bbq-m.svg b/data/styles/clear/style-night/symbols/bbq-m.svg
deleted file mode 100644
index 915b47405b..0000000000
--- a/data/styles/clear/style-night/symbols/bbq-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/bbq-s.svg b/data/styles/clear/style-night/symbols/bbq-s.svg
deleted file mode 100644
index dca826bada..0000000000
--- a/data/styles/clear/style-night/symbols/bbq-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/bcontrol-s.svg b/data/styles/clear/style-night/symbols/bcontrol-s.svg
deleted file mode 100644
index a30e647ae5..0000000000
--- a/data/styles/clear/style-night/symbols/bcontrol-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/beach-s.svg b/data/styles/clear/style-night/symbols/beach-s.svg
deleted file mode 100644
index cd85b3083b..0000000000
--- a/data/styles/clear/style-night/symbols/beach-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/beauty-s.svg b/data/styles/clear/style-night/symbols/beauty-s.svg
deleted file mode 100644
index 3027a770d7..0000000000
--- a/data/styles/clear/style-night/symbols/beauty-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/beer-s.svg b/data/styles/clear/style-night/symbols/beer-s.svg
deleted file mode 100644
index 1eee31d45c..0000000000
--- a/data/styles/clear/style-night/symbols/beer-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/bicycle-m.svg b/data/styles/clear/style-night/symbols/bicycle-m.svg
deleted file mode 100644
index 427c3ccb5f..0000000000
--- a/data/styles/clear/style-night/symbols/bicycle-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/bicycle-s.svg b/data/styles/clear/style-night/symbols/bicycle-s.svg
deleted file mode 100644
index d1df84fb76..0000000000
--- a/data/styles/clear/style-night/symbols/bicycle-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/bike-parking-m.svg b/data/styles/clear/style-night/symbols/bike-parking-m.svg
deleted file mode 100644
index b1aa996628..0000000000
--- a/data/styles/clear/style-night/symbols/bike-parking-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/bike-parking-s.svg b/data/styles/clear/style-night/symbols/bike-parking-s.svg
deleted file mode 100644
index a772fb5dde..0000000000
--- a/data/styles/clear/style-night/symbols/bike-parking-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/book-shop-s.svg b/data/styles/clear/style-night/symbols/book-shop-s.svg
deleted file mode 100644
index 9dbc84dc99..0000000000
--- a/data/styles/clear/style-night/symbols/book-shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/bookmaker-s.svg b/data/styles/clear/style-night/symbols/bookmaker-s.svg
deleted file mode 100644
index 41735532b9..0000000000
--- a/data/styles/clear/style-night/symbols/bookmaker-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/bowls-m.svg b/data/styles/clear/style-night/symbols/bowls-m.svg
deleted file mode 100644
index bb16da14c4..0000000000
--- a/data/styles/clear/style-night/symbols/bowls-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/bowls-s.svg b/data/styles/clear/style-night/symbols/bowls-s.svg
deleted file mode 100644
index 6afc3959a7..0000000000
--- a/data/styles/clear/style-night/symbols/bowls-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/buddhist-xl.svg b/data/styles/clear/style-night/symbols/buddhist-xl.svg
deleted file mode 100644
index df32be7398..0000000000
--- a/data/styles/clear/style-night/symbols/buddhist-xl.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
diff --git a/data/styles/clear/style-night/symbols/butcher-s.svg b/data/styles/clear/style-night/symbols/butcher-s.svg
deleted file mode 100644
index 06009556f1..0000000000
--- a/data/styles/clear/style-night/symbols/butcher-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/cafe-s.svg b/data/styles/clear/style-night/symbols/cafe-s.svg
deleted file mode 100644
index e23c86a633..0000000000
--- a/data/styles/clear/style-night/symbols/cafe-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/campsite-s.svg b/data/styles/clear/style-night/symbols/campsite-s.svg
deleted file mode 100644
index 79a60d6dc2..0000000000
--- a/data/styles/clear/style-night/symbols/campsite-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/car-part-s.svg b/data/styles/clear/style-night/symbols/car-part-s.svg
deleted file mode 100644
index 9de8c5d683..0000000000
--- a/data/styles/clear/style-night/symbols/car-part-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/car-wash-m.svg b/data/styles/clear/style-night/symbols/car-wash-m.svg
deleted file mode 100644
index b5a3ab9900..0000000000
--- a/data/styles/clear/style-night/symbols/car-wash-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/car-wash-s.svg b/data/styles/clear/style-night/symbols/car-wash-s.svg
deleted file mode 100644
index 3a2ed40842..0000000000
--- a/data/styles/clear/style-night/symbols/car-wash-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/car_sharing-m.svg b/data/styles/clear/style-night/symbols/car_sharing-m.svg
deleted file mode 100644
index 5a355defc4..0000000000
--- a/data/styles/clear/style-night/symbols/car_sharing-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/car_sharing-s.svg b/data/styles/clear/style-night/symbols/car_sharing-s.svg
deleted file mode 100644
index 31ad832b46..0000000000
--- a/data/styles/clear/style-night/symbols/car_sharing-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/car_shop-s.svg b/data/styles/clear/style-night/symbols/car_shop-s.svg
deleted file mode 100644
index 95317fe20f..0000000000
--- a/data/styles/clear/style-night/symbols/car_shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/caravan_site-s.svg b/data/styles/clear/style-night/symbols/caravan_site-s.svg
deleted file mode 100644
index 7c1b981739..0000000000
--- a/data/styles/clear/style-night/symbols/caravan_site-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/casino-m.svg b/data/styles/clear/style-night/symbols/casino-m.svg
deleted file mode 100644
index 5c71a01ba7..0000000000
--- a/data/styles/clear/style-night/symbols/casino-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/casino-s.svg b/data/styles/clear/style-night/symbols/casino-s.svg
deleted file mode 100644
index 4728357268..0000000000
--- a/data/styles/clear/style-night/symbols/casino-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/cemetery-s.svg b/data/styles/clear/style-night/symbols/cemetery-s.svg
deleted file mode 100644
index 01a2144784..0000000000
--- a/data/styles/clear/style-night/symbols/cemetery-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/chemist-s.svg b/data/styles/clear/style-night/symbols/chemist-s.svg
deleted file mode 100644
index 81fa09710a..0000000000
--- a/data/styles/clear/style-night/symbols/chemist-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/chimney-m.svg b/data/styles/clear/style-night/symbols/chimney-m.svg
deleted file mode 100644
index 9d1a16c3f8..0000000000
--- a/data/styles/clear/style-night/symbols/chimney-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/chimney-s.svg b/data/styles/clear/style-night/symbols/chimney-s.svg
deleted file mode 100644
index 062e016f08..0000000000
--- a/data/styles/clear/style-night/symbols/chimney-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/christian-xl.svg b/data/styles/clear/style-night/symbols/christian-xl.svg
deleted file mode 100644
index 712fb42377..0000000000
--- a/data/styles/clear/style-night/symbols/christian-xl.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
diff --git a/data/styles/clear/style-night/symbols/cinema-m.svg b/data/styles/clear/style-night/symbols/cinema-m.svg
deleted file mode 100644
index 5a5306df77..0000000000
--- a/data/styles/clear/style-night/symbols/cinema-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/cinema-s.svg b/data/styles/clear/style-night/symbols/cinema-s.svg
deleted file mode 100644
index 1575415118..0000000000
--- a/data/styles/clear/style-night/symbols/cinema-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/cities-m.svg b/data/styles/clear/style-night/symbols/cities-m.svg
deleted file mode 100644
index 04c1b2c82c..0000000000
--- a/data/styles/clear/style-night/symbols/cities-m.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/cities-s.svg b/data/styles/clear/style-night/symbols/cities-s.svg
deleted file mode 100644
index a749dc530b..0000000000
--- a/data/styles/clear/style-night/symbols/cities-s.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/cities-xs.svg b/data/styles/clear/style-night/symbols/cities-xs.svg
deleted file mode 100644
index 39b65a8626..0000000000
--- a/data/styles/clear/style-night/symbols/cities-xs.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/climbing-m.svg b/data/styles/clear/style-night/symbols/climbing-m.svg
deleted file mode 100644
index 596e129d82..0000000000
--- a/data/styles/clear/style-night/symbols/climbing-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/climbing-s.svg b/data/styles/clear/style-night/symbols/climbing-s.svg
deleted file mode 100644
index e1d1876a49..0000000000
--- a/data/styles/clear/style-night/symbols/climbing-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/clothes-s.svg b/data/styles/clear/style-night/symbols/clothes-s.svg
deleted file mode 100644
index 870278e18e..0000000000
--- a/data/styles/clear/style-night/symbols/clothes-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/college-xl-01.svg b/data/styles/clear/style-night/symbols/college-xl-01.svg
deleted file mode 100644
index 201066422e..0000000000
--- a/data/styles/clear/style-night/symbols/college-xl-01.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
diff --git a/data/styles/clear/style-night/symbols/computer-s.svg b/data/styles/clear/style-night/symbols/computer-s.svg
deleted file mode 100644
index 115d1c9c9d..0000000000
--- a/data/styles/clear/style-night/symbols/computer-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/convenience-m.svg b/data/styles/clear/style-night/symbols/convenience-m.svg
deleted file mode 100644
index 8396986aa4..0000000000
--- a/data/styles/clear/style-night/symbols/convenience-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/convenience-s.svg b/data/styles/clear/style-night/symbols/convenience-s.svg
deleted file mode 100644
index 76828ec718..0000000000
--- a/data/styles/clear/style-night/symbols/convenience-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/copyshop-s.svg b/data/styles/clear/style-night/symbols/copyshop-s.svg
deleted file mode 100644
index a58aae1bc9..0000000000
--- a/data/styles/clear/style-night/symbols/copyshop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/cricket-m.svg b/data/styles/clear/style-night/symbols/cricket-m.svg
deleted file mode 100644
index 01ec60ece8..0000000000
--- a/data/styles/clear/style-night/symbols/cricket-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/cricket-s.svg b/data/styles/clear/style-night/symbols/cricket-s.svg
deleted file mode 100644
index 4a8ff2b243..0000000000
--- a/data/styles/clear/style-night/symbols/cricket-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/crossing-m.svg b/data/styles/clear/style-night/symbols/crossing-m.svg
deleted file mode 100644
index fa38625353..0000000000
--- a/data/styles/clear/style-night/symbols/crossing-m.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/crossing-s.svg b/data/styles/clear/style-night/symbols/crossing-s.svg
deleted file mode 100644
index 10c151f0ff..0000000000
--- a/data/styles/clear/style-night/symbols/crossing-s.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/curling-m.svg b/data/styles/clear/style-night/symbols/curling-m.svg
deleted file mode 100644
index 39e57f782b..0000000000
--- a/data/styles/clear/style-night/symbols/curling-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/curling-s.svg b/data/styles/clear/style-night/symbols/curling-s.svg
deleted file mode 100644
index 93bd442fba..0000000000
--- a/data/styles/clear/style-night/symbols/curling-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/defibrillator-m.svg b/data/styles/clear/style-night/symbols/defibrillator-m.svg
deleted file mode 100644
index 5a4dadba2d..0000000000
--- a/data/styles/clear/style-night/symbols/defibrillator-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/defibrillator-s.svg b/data/styles/clear/style-night/symbols/defibrillator-s.svg
deleted file mode 100644
index f295ad8bd7..0000000000
--- a/data/styles/clear/style-night/symbols/defibrillator-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/dentist-m.svg b/data/styles/clear/style-night/symbols/dentist-m.svg
deleted file mode 100644
index b4acf2d4c8..0000000000
--- a/data/styles/clear/style-night/symbols/dentist-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/dentist-s.svg b/data/styles/clear/style-night/symbols/dentist-s.svg
deleted file mode 100644
index 1064a74072..0000000000
--- a/data/styles/clear/style-night/symbols/dentist-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/department_store-s.svg b/data/styles/clear/style-night/symbols/department_store-s.svg
deleted file mode 100644
index 7dae6e32b4..0000000000
--- a/data/styles/clear/style-night/symbols/department_store-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/diving-m.svg b/data/styles/clear/style-night/symbols/diving-m.svg
deleted file mode 100644
index 108ad3420d..0000000000
--- a/data/styles/clear/style-night/symbols/diving-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/diving-s.svg b/data/styles/clear/style-night/symbols/diving-s.svg
deleted file mode 100644
index 6fc3f55bb4..0000000000
--- a/data/styles/clear/style-night/symbols/diving-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/dog_park-s.svg b/data/styles/clear/style-night/symbols/dog_park-s.svg
deleted file mode 100644
index 97e5eba60d..0000000000
--- a/data/styles/clear/style-night/symbols/dog_park-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/doityourself-s.svg b/data/styles/clear/style-night/symbols/doityourself-s.svg
deleted file mode 100644
index f7cdaee2cd..0000000000
--- a/data/styles/clear/style-night/symbols/doityourself-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/dot-s.svg b/data/styles/clear/style-night/symbols/dot-s.svg
deleted file mode 100644
index a749dc530b..0000000000
--- a/data/styles/clear/style-night/symbols/dot-s.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/electronics-s.svg b/data/styles/clear/style-night/symbols/electronics-s.svg
deleted file mode 100644
index bf7977d059..0000000000
--- a/data/styles/clear/style-night/symbols/electronics-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/embassy-m.svg b/data/styles/clear/style-night/symbols/embassy-m.svg
deleted file mode 100644
index df69ac9081..0000000000
--- a/data/styles/clear/style-night/symbols/embassy-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/embassy-s.svg b/data/styles/clear/style-night/symbols/embassy-s.svg
deleted file mode 100644
index dade9a3d37..0000000000
--- a/data/styles/clear/style-night/symbols/embassy-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/entrance-xs.svg b/data/styles/clear/style-night/symbols/entrance-xs.svg
deleted file mode 100644
index b1a8eab661..0000000000
--- a/data/styles/clear/style-night/symbols/entrance-xs.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/equestrian-s.svg b/data/styles/clear/style-night/symbols/equestrian-s.svg
deleted file mode 100644
index 40bace62f1..0000000000
--- a/data/styles/clear/style-night/symbols/equestrian-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/erotic-s.svg b/data/styles/clear/style-night/symbols/erotic-s.svg
deleted file mode 100644
index 1ed70a2953..0000000000
--- a/data/styles/clear/style-night/symbols/erotic-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/fastfood-s.svg b/data/styles/clear/style-night/symbols/fastfood-s.svg
deleted file mode 100644
index 52de59d4ab..0000000000
--- a/data/styles/clear/style-night/symbols/fastfood-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/fire_station-m.svg b/data/styles/clear/style-night/symbols/fire_station-m.svg
deleted file mode 100644
index 96c5920934..0000000000
--- a/data/styles/clear/style-night/symbols/fire_station-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/fire_station-s.svg b/data/styles/clear/style-night/symbols/fire_station-s.svg
deleted file mode 100644
index 68c26ec3c5..0000000000
--- a/data/styles/clear/style-night/symbols/fire_station-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/firehydrant-m.svg b/data/styles/clear/style-night/symbols/firehydrant-m.svg
deleted file mode 100644
index 47554d071e..0000000000
--- a/data/styles/clear/style-night/symbols/firehydrant-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/firehydrant-s.svg b/data/styles/clear/style-night/symbols/firehydrant-s.svg
deleted file mode 100644
index edf240c0dd..0000000000
--- a/data/styles/clear/style-night/symbols/firehydrant-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/florist-s.svg b/data/styles/clear/style-night/symbols/florist-s.svg
deleted file mode 100644
index 8e9c3c1cb9..0000000000
--- a/data/styles/clear/style-night/symbols/florist-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/fountain-s.svg b/data/styles/clear/style-night/symbols/fountain-s.svg
deleted file mode 100644
index a044f7e90d..0000000000
--- a/data/styles/clear/style-night/symbols/fountain-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/funeral_directors-s.svg b/data/styles/clear/style-night/symbols/funeral_directors-s.svg
deleted file mode 100644
index f31cbef783..0000000000
--- a/data/styles/clear/style-night/symbols/funeral_directors-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/funicular-m.svg b/data/styles/clear/style-night/symbols/funicular-m.svg
deleted file mode 100644
index f7134bba24..0000000000
--- a/data/styles/clear/style-night/symbols/funicular-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/funicular-s.svg b/data/styles/clear/style-night/symbols/funicular-s.svg
deleted file mode 100644
index 5fbe39fa95..0000000000
--- a/data/styles/clear/style-night/symbols/funicular-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/furniture-s.svg b/data/styles/clear/style-night/symbols/furniture-s.svg
deleted file mode 100644
index 8fea2b24f9..0000000000
--- a/data/styles/clear/style-night/symbols/furniture-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/gallery-s.svg b/data/styles/clear/style-night/symbols/gallery-s.svg
deleted file mode 100644
index 9928b79ffc..0000000000
--- a/data/styles/clear/style-night/symbols/gallery-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/garden-s.svg b/data/styles/clear/style-night/symbols/garden-s.svg
deleted file mode 100644
index f95da33040..0000000000
--- a/data/styles/clear/style-night/symbols/garden-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/garden-xl.svg b/data/styles/clear/style-night/symbols/garden-xl.svg
deleted file mode 100644
index 963e0f07b1..0000000000
--- a/data/styles/clear/style-night/symbols/garden-xl.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
diff --git a/data/styles/clear/style-night/symbols/garden_center-s.svg b/data/styles/clear/style-night/symbols/garden_center-s.svg
deleted file mode 100644
index 5bc1ec7b19..0000000000
--- a/data/styles/clear/style-night/symbols/garden_center-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/gate-m.svg b/data/styles/clear/style-night/symbols/gate-m.svg
deleted file mode 100644
index 4dd8f7814e..0000000000
--- a/data/styles/clear/style-night/symbols/gate-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/gate-s.svg b/data/styles/clear/style-night/symbols/gate-s.svg
deleted file mode 100644
index 0272ce0049..0000000000
--- a/data/styles/clear/style-night/symbols/gate-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/gift-s.svg b/data/styles/clear/style-night/symbols/gift-s.svg
deleted file mode 100644
index 700a3b3952..0000000000
--- a/data/styles/clear/style-night/symbols/gift-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/golf-m.svg b/data/styles/clear/style-night/symbols/golf-m.svg
deleted file mode 100644
index b2b22896c5..0000000000
--- a/data/styles/clear/style-night/symbols/golf-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/golf-s.svg b/data/styles/clear/style-night/symbols/golf-s.svg
deleted file mode 100644
index 2f02620c9a..0000000000
--- a/data/styles/clear/style-night/symbols/golf-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/greengrocer-s.svg b/data/styles/clear/style-night/symbols/greengrocer-s.svg
deleted file mode 100644
index 1aab7cef19..0000000000
--- a/data/styles/clear/style-night/symbols/greengrocer-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/grocery-s.svg b/data/styles/clear/style-night/symbols/grocery-s.svg
deleted file mode 100644
index fbb979121f..0000000000
--- a/data/styles/clear/style-night/symbols/grocery-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/gym-m.svg b/data/styles/clear/style-night/symbols/gym-m.svg
deleted file mode 100644
index c5748b474b..0000000000
--- a/data/styles/clear/style-night/symbols/gym-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/gym-s.svg b/data/styles/clear/style-night/symbols/gym-s.svg
deleted file mode 100644
index 3f51042150..0000000000
--- a/data/styles/clear/style-night/symbols/gym-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/hairdresser-s.svg b/data/styles/clear/style-night/symbols/hairdresser-s.svg
deleted file mode 100644
index 36a5d03373..0000000000
--- a/data/styles/clear/style-night/symbols/hairdresser-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/hand-m.svg b/data/styles/clear/style-night/symbols/hand-m.svg
deleted file mode 100644
index 2508cdd3a6..0000000000
--- a/data/styles/clear/style-night/symbols/hand-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/hand-s.svg b/data/styles/clear/style-night/symbols/hand-s.svg
deleted file mode 100644
index 1536528193..0000000000
--- a/data/styles/clear/style-night/symbols/hand-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/hardware-m.svg b/data/styles/clear/style-night/symbols/hardware-m.svg
deleted file mode 100644
index e3bb87bf87..0000000000
--- a/data/styles/clear/style-night/symbols/hardware-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/hardware-s.svg b/data/styles/clear/style-night/symbols/hardware-s.svg
deleted file mode 100644
index 4bc2ce9860..0000000000
--- a/data/styles/clear/style-night/symbols/hardware-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/helipad-m.svg b/data/styles/clear/style-night/symbols/helipad-m.svg
deleted file mode 100644
index abe30f9931..0000000000
--- a/data/styles/clear/style-night/symbols/helipad-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/helipad-s.svg b/data/styles/clear/style-night/symbols/helipad-s.svg
deleted file mode 100644
index 3b7ec88540..0000000000
--- a/data/styles/clear/style-night/symbols/helipad-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/heliport-m.svg b/data/styles/clear/style-night/symbols/heliport-m.svg
deleted file mode 100644
index ab4e497c96..0000000000
--- a/data/styles/clear/style-night/symbols/heliport-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/heliport-s.svg b/data/styles/clear/style-night/symbols/heliport-s.svg
deleted file mode 100644
index 60e9db3316..0000000000
--- a/data/styles/clear/style-night/symbols/heliport-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/hindu-xl.svg b/data/styles/clear/style-night/symbols/hindu-xl.svg
deleted file mode 100644
index 1e90ee7da6..0000000000
--- a/data/styles/clear/style-night/symbols/hindu-xl.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
diff --git a/data/styles/clear/style-night/symbols/historic-ship-s.svg b/data/styles/clear/style-night/symbols/historic-ship-s.svg
deleted file mode 100644
index dfe9fde86f..0000000000
--- a/data/styles/clear/style-night/symbols/historic-ship-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/home-m.svg b/data/styles/clear/style-night/symbols/home-m.svg
deleted file mode 100644
index 9ec0d48809..0000000000
--- a/data/styles/clear/style-night/symbols/home-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/home-s.svg b/data/styles/clear/style-night/symbols/home-s.svg
deleted file mode 100644
index d3a66b6b16..0000000000
--- a/data/styles/clear/style-night/symbols/home-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/hostel-s.svg b/data/styles/clear/style-night/symbols/hostel-s.svg
deleted file mode 100644
index ddbd8d2af5..0000000000
--- a/data/styles/clear/style-night/symbols/hostel-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/hunting-tower-m.svg b/data/styles/clear/style-night/symbols/hunting-tower-m.svg
deleted file mode 100644
index 2bba87dfeb..0000000000
--- a/data/styles/clear/style-night/symbols/hunting-tower-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/hunting-tower-s.svg b/data/styles/clear/style-night/symbols/hunting-tower-s.svg
deleted file mode 100644
index 207abca889..0000000000
--- a/data/styles/clear/style-night/symbols/hunting-tower-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/ice_cream-s.svg b/data/styles/clear/style-night/symbols/ice_cream-s.svg
deleted file mode 100644
index 7be1a89134..0000000000
--- a/data/styles/clear/style-night/symbols/ice_cream-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/information-s.svg b/data/styles/clear/style-night/symbols/information-s.svg
deleted file mode 100644
index 12cddf4e72..0000000000
--- a/data/styles/clear/style-night/symbols/information-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/jewelry-s.svg b/data/styles/clear/style-night/symbols/jewelry-s.svg
deleted file mode 100644
index 28448198a4..0000000000
--- a/data/styles/clear/style-night/symbols/jewelry-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/kindergarten-m.svg b/data/styles/clear/style-night/symbols/kindergarten-m.svg
deleted file mode 100644
index 3089aca6ca..0000000000
--- a/data/styles/clear/style-night/symbols/kindergarten-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/kindergarten-s.svg b/data/styles/clear/style-night/symbols/kindergarten-s.svg
deleted file mode 100644
index 346bc0d517..0000000000
--- a/data/styles/clear/style-night/symbols/kindergarten-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/kiosk-s.svg b/data/styles/clear/style-night/symbols/kiosk-s.svg
deleted file mode 100644
index 3bf3b5f21f..0000000000
--- a/data/styles/clear/style-night/symbols/kiosk-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/laundry-s.svg b/data/styles/clear/style-night/symbols/laundry-s.svg
deleted file mode 100644
index 3ca5821928..0000000000
--- a/data/styles/clear/style-night/symbols/laundry-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/lawyer-m.svg b/data/styles/clear/style-night/symbols/lawyer-m.svg
deleted file mode 100644
index c33dc8ca8d..0000000000
--- a/data/styles/clear/style-night/symbols/lawyer-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/lawyer-s.svg b/data/styles/clear/style-night/symbols/lawyer-s.svg
deleted file mode 100644
index 8aa9513e38..0000000000
--- a/data/styles/clear/style-night/symbols/lawyer-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/library-m.svg b/data/styles/clear/style-night/symbols/library-m.svg
deleted file mode 100644
index 6132cf597f..0000000000
--- a/data/styles/clear/style-night/symbols/library-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/library-s.svg b/data/styles/clear/style-night/symbols/library-s.svg
deleted file mode 100644
index 68139502c9..0000000000
--- a/data/styles/clear/style-night/symbols/library-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/lift_gate-s.svg b/data/styles/clear/style-night/symbols/lift_gate-s.svg
deleted file mode 100644
index 9acaa971ee..0000000000
--- a/data/styles/clear/style-night/symbols/lift_gate-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/mail-s.svg b/data/styles/clear/style-night/symbols/mail-s.svg
deleted file mode 100644
index 89c72e039d..0000000000
--- a/data/styles/clear/style-night/symbols/mail-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/marketplace-s.svg b/data/styles/clear/style-night/symbols/marketplace-s.svg
deleted file mode 100644
index 5baf199a77..0000000000
--- a/data/styles/clear/style-night/symbols/marketplace-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/media-s.svg b/data/styles/clear/style-night/symbols/media-s.svg
deleted file mode 100644
index a015d8bab2..0000000000
--- a/data/styles/clear/style-night/symbols/media-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/military-s.svg b/data/styles/clear/style-night/symbols/military-s.svg
deleted file mode 100644
index 1d7de7d35b..0000000000
--- a/data/styles/clear/style-night/symbols/military-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/mobile_phone-s.svg b/data/styles/clear/style-night/symbols/mobile_phone-s.svg
deleted file mode 100644
index ff2cfdc3f6..0000000000
--- a/data/styles/clear/style-night/symbols/mobile_phone-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/motel-m.svg b/data/styles/clear/style-night/symbols/motel-m.svg
deleted file mode 100644
index d15ddef927..0000000000
--- a/data/styles/clear/style-night/symbols/motel-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/motel-s.svg b/data/styles/clear/style-night/symbols/motel-s.svg
deleted file mode 100644
index b227d3e3e2..0000000000
--- a/data/styles/clear/style-night/symbols/motel-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/motorcycle-parking-m.svg b/data/styles/clear/style-night/symbols/motorcycle-parking-m.svg
deleted file mode 100644
index 5b84b757fb..0000000000
--- a/data/styles/clear/style-night/symbols/motorcycle-parking-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/motorcycle-parking-s.svg b/data/styles/clear/style-night/symbols/motorcycle-parking-s.svg
deleted file mode 100644
index 2f688ee73a..0000000000
--- a/data/styles/clear/style-night/symbols/motorcycle-parking-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/motorcycle_shop-s.svg b/data/styles/clear/style-night/symbols/motorcycle_shop-s.svg
deleted file mode 100644
index c5e3565b63..0000000000
--- a/data/styles/clear/style-night/symbols/motorcycle_shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/music-s.svg b/data/styles/clear/style-night/symbols/music-s.svg
deleted file mode 100644
index d7819a2590..0000000000
--- a/data/styles/clear/style-night/symbols/music-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/muslim-xl.svg b/data/styles/clear/style-night/symbols/muslim-xl.svg
deleted file mode 100644
index fa5422c09b..0000000000
--- a/data/styles/clear/style-night/symbols/muslim-xl.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
diff --git a/data/styles/clear/style-night/symbols/newsagent-m.svg b/data/styles/clear/style-night/symbols/newsagent-m.svg
deleted file mode 100644
index 48dff27f75..0000000000
--- a/data/styles/clear/style-night/symbols/newsagent-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/newsagent-s.svg b/data/styles/clear/style-night/symbols/newsagent-s.svg
deleted file mode 100644
index ca375e2002..0000000000
--- a/data/styles/clear/style-night/symbols/newsagent-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/npark-m.svg b/data/styles/clear/style-night/symbols/npark-m.svg
deleted file mode 100644
index 289f8721fa..0000000000
--- a/data/styles/clear/style-night/symbols/npark-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/npark-s.svg b/data/styles/clear/style-night/symbols/npark-s.svg
deleted file mode 100644
index c63ed38a4f..0000000000
--- a/data/styles/clear/style-night/symbols/npark-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/nparkF-xl.svg b/data/styles/clear/style-night/symbols/nparkF-xl.svg
deleted file mode 100644
index de60692240..0000000000
--- a/data/styles/clear/style-night/symbols/nparkF-xl.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
diff --git a/data/styles/clear/style-night/symbols/office-financial-m.svg b/data/styles/clear/style-night/symbols/office-financial-m.svg
deleted file mode 100644
index 0d72042729..0000000000
--- a/data/styles/clear/style-night/symbols/office-financial-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/office-financial-s.svg b/data/styles/clear/style-night/symbols/office-financial-s.svg
deleted file mode 100644
index 5f195c717e..0000000000
--- a/data/styles/clear/style-night/symbols/office-financial-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/office-m.svg b/data/styles/clear/style-night/symbols/office-m.svg
deleted file mode 100644
index 3d942c2ab8..0000000000
--- a/data/styles/clear/style-night/symbols/office-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/office-s.svg b/data/styles/clear/style-night/symbols/office-s.svg
deleted file mode 100644
index 4e2f5104cb..0000000000
--- a/data/styles/clear/style-night/symbols/office-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/optician-s.svg b/data/styles/clear/style-night/symbols/optician-s.svg
deleted file mode 100644
index 825e1a5c6f..0000000000
--- a/data/styles/clear/style-night/symbols/optician-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/outdoor-shop-s.svg b/data/styles/clear/style-night/symbols/outdoor-shop-s.svg
deleted file mode 100644
index fa9f3137b2..0000000000
--- a/data/styles/clear/style-night/symbols/outdoor-shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/parking-meter-m.svg b/data/styles/clear/style-night/symbols/parking-meter-m.svg
deleted file mode 100644
index 864e8c6e93..0000000000
--- a/data/styles/clear/style-night/symbols/parking-meter-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/parking-meter-s.svg b/data/styles/clear/style-night/symbols/parking-meter-s.svg
deleted file mode 100644
index 8164f8659e..0000000000
--- a/data/styles/clear/style-night/symbols/parking-meter-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/parking_pay-m.svg b/data/styles/clear/style-night/symbols/parking_pay-m.svg
deleted file mode 100644
index 7e0f4ac66e..0000000000
--- a/data/styles/clear/style-night/symbols/parking_pay-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/parking_pay-s.svg b/data/styles/clear/style-night/symbols/parking_pay-s.svg
deleted file mode 100644
index 9fd4f619cc..0000000000
--- a/data/styles/clear/style-night/symbols/parking_pay-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/petshop-s.svg b/data/styles/clear/style-night/symbols/petshop-s.svg
deleted file mode 100644
index 950360a9a3..0000000000
--- a/data/styles/clear/style-night/symbols/petshop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/pharmacy-s.svg b/data/styles/clear/style-night/symbols/pharmacy-s.svg
deleted file mode 100644
index 5349d7c581..0000000000
--- a/data/styles/clear/style-night/symbols/pharmacy-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/phone-m.svg b/data/styles/clear/style-night/symbols/phone-m.svg
deleted file mode 100644
index 38d7c5e8a4..0000000000
--- a/data/styles/clear/style-night/symbols/phone-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/phone-s.svg b/data/styles/clear/style-night/symbols/phone-s.svg
deleted file mode 100644
index c8131a1b80..0000000000
--- a/data/styles/clear/style-night/symbols/phone-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/photo-shop-s.svg b/data/styles/clear/style-night/symbols/photo-shop-s.svg
deleted file mode 100644
index 4ce1f2cf82..0000000000
--- a/data/styles/clear/style-night/symbols/photo-shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/picnic-s.svg b/data/styles/clear/style-night/symbols/picnic-s.svg
deleted file mode 100644
index 484a6130c7..0000000000
--- a/data/styles/clear/style-night/symbols/picnic-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/picnic_table-s.svg b/data/styles/clear/style-night/symbols/picnic_table-s.svg
deleted file mode 100644
index 2ead87ec8b..0000000000
--- a/data/styles/clear/style-night/symbols/picnic_table-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/pitch-m.svg b/data/styles/clear/style-night/symbols/pitch-m.svg
deleted file mode 100644
index b8f058459a..0000000000
--- a/data/styles/clear/style-night/symbols/pitch-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/pitch-s.svg b/data/styles/clear/style-night/symbols/pitch-s.svg
deleted file mode 100644
index 4f33db51f5..0000000000
--- a/data/styles/clear/style-night/symbols/pitch-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/place-of-worship-xl.svg b/data/styles/clear/style-night/symbols/place-of-worship-xl.svg
deleted file mode 100644
index e7ae9dbb6f..0000000000
--- a/data/styles/clear/style-night/symbols/place-of-worship-xl.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
diff --git a/data/styles/clear/style-night/symbols/police-m.svg b/data/styles/clear/style-night/symbols/police-m.svg
deleted file mode 100644
index 9412e49249..0000000000
--- a/data/styles/clear/style-night/symbols/police-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/police-s.svg b/data/styles/clear/style-night/symbols/police-s.svg
deleted file mode 100644
index 6c5384aa3a..0000000000
--- a/data/styles/clear/style-night/symbols/police-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/postbox-m.svg b/data/styles/clear/style-night/symbols/postbox-m.svg
deleted file mode 100644
index 4adca485bf..0000000000
--- a/data/styles/clear/style-night/symbols/postbox-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/postbox-s.svg b/data/styles/clear/style-night/symbols/postbox-s.svg
deleted file mode 100644
index ee3623966a..0000000000
--- a/data/styles/clear/style-night/symbols/postbox-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/power-m.svg b/data/styles/clear/style-night/symbols/power-m.svg
deleted file mode 100644
index 858118e84e..0000000000
--- a/data/styles/clear/style-night/symbols/power-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/power-s.svg b/data/styles/clear/style-night/symbols/power-s.svg
deleted file mode 100644
index f2e9661712..0000000000
--- a/data/styles/clear/style-night/symbols/power-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/prison-m.svg b/data/styles/clear/style-night/symbols/prison-m.svg
deleted file mode 100644
index 7025aaa725..0000000000
--- a/data/styles/clear/style-night/symbols/prison-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/prison-s.svg b/data/styles/clear/style-night/symbols/prison-s.svg
deleted file mode 100644
index 2ccb61ad43..0000000000
--- a/data/styles/clear/style-night/symbols/prison-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/public-building-m.svg b/data/styles/clear/style-night/symbols/public-building-m.svg
deleted file mode 100644
index 56217468b3..0000000000
--- a/data/styles/clear/style-night/symbols/public-building-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/public-building-s.svg b/data/styles/clear/style-night/symbols/public-building-s.svg
deleted file mode 100644
index 6eadae95f5..0000000000
--- a/data/styles/clear/style-night/symbols/public-building-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/recycling-s.svg b/data/styles/clear/style-night/symbols/recycling-s.svg
deleted file mode 100644
index 1782325500..0000000000
--- a/data/styles/clear/style-night/symbols/recycling-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/restaurant-s.svg b/data/styles/clear/style-night/symbols/restaurant-s.svg
deleted file mode 100644
index 10040133b5..0000000000
--- a/data/styles/clear/style-night/symbols/restaurant-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/sauna-m.svg b/data/styles/clear/style-night/symbols/sauna-m.svg
deleted file mode 100644
index 218126ab04..0000000000
--- a/data/styles/clear/style-night/symbols/sauna-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/sauna-s.svg b/data/styles/clear/style-night/symbols/sauna-s.svg
deleted file mode 100644
index 845b918247..0000000000
--- a/data/styles/clear/style-night/symbols/sauna-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/school-m.svg b/data/styles/clear/style-night/symbols/school-m.svg
deleted file mode 100644
index c01fded6ec..0000000000
--- a/data/styles/clear/style-night/symbols/school-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/school-s.svg b/data/styles/clear/style-night/symbols/school-s.svg
deleted file mode 100644
index 0fdc73d38a..0000000000
--- a/data/styles/clear/style-night/symbols/school-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/seafood-shop-s.svg b/data/styles/clear/style-night/symbols/seafood-shop-s.svg
deleted file mode 100644
index 6411b037e2..0000000000
--- a/data/styles/clear/style-night/symbols/seafood-shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/shoes-s.svg b/data/styles/clear/style-night/symbols/shoes-s.svg
deleted file mode 100644
index c8b2acb43a..0000000000
--- a/data/styles/clear/style-night/symbols/shoes-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/shop-bicycle-s.svg b/data/styles/clear/style-night/symbols/shop-bicycle-s.svg
deleted file mode 100644
index cc62f6063c..0000000000
--- a/data/styles/clear/style-night/symbols/shop-bicycle-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/shower-m.svg b/data/styles/clear/style-night/symbols/shower-m.svg
deleted file mode 100644
index 1146e444a1..0000000000
--- a/data/styles/clear/style-night/symbols/shower-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/shower-s.svg b/data/styles/clear/style-night/symbols/shower-s.svg
deleted file mode 100644
index 34df8ce3c6..0000000000
--- a/data/styles/clear/style-night/symbols/shower-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/skiing-m.svg b/data/styles/clear/style-night/symbols/skiing-m.svg
deleted file mode 100644
index 25a461fdf9..0000000000
--- a/data/styles/clear/style-night/symbols/skiing-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/skiing-s.svg b/data/styles/clear/style-night/symbols/skiing-s.svg
deleted file mode 100644
index 1d6b02b144..0000000000
--- a/data/styles/clear/style-night/symbols/skiing-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/soccer-m.svg b/data/styles/clear/style-night/symbols/soccer-m.svg
deleted file mode 100644
index 14ab5a7421..0000000000
--- a/data/styles/clear/style-night/symbols/soccer-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/soccer-s.svg b/data/styles/clear/style-night/symbols/soccer-s.svg
deleted file mode 100644
index f44f41eb9a..0000000000
--- a/data/styles/clear/style-night/symbols/soccer-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/sports-s.svg b/data/styles/clear/style-night/symbols/sports-s.svg
deleted file mode 100644
index 00737820f5..0000000000
--- a/data/styles/clear/style-night/symbols/sports-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/stationery_shop-m.svg b/data/styles/clear/style-night/symbols/stationery_shop-m.svg
deleted file mode 100644
index 3b7123f2e1..0000000000
--- a/data/styles/clear/style-night/symbols/stationery_shop-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/stationery_shop-s.svg b/data/styles/clear/style-night/symbols/stationery_shop-s.svg
deleted file mode 100644
index 4b0958cd48..0000000000
--- a/data/styles/clear/style-night/symbols/stationery_shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/survey_point-m.svg b/data/styles/clear/style-night/symbols/survey_point-m.svg
deleted file mode 100644
index ccf1ab4d1f..0000000000
--- a/data/styles/clear/style-night/symbols/survey_point-m.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/survey_point-s.svg b/data/styles/clear/style-night/symbols/survey_point-s.svg
deleted file mode 100644
index 2f336dbb98..0000000000
--- a/data/styles/clear/style-night/symbols/survey_point-s.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/sweets-s.svg b/data/styles/clear/style-night/symbols/sweets-s.svg
deleted file mode 100644
index 2bbfec602d..0000000000
--- a/data/styles/clear/style-night/symbols/sweets-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/swimming-s.svg b/data/styles/clear/style-night/symbols/swimming-s.svg
deleted file mode 100644
index e1adb2ae3f..0000000000
--- a/data/styles/clear/style-night/symbols/swimming-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/taxi-s.svg b/data/styles/clear/style-night/symbols/taxi-s.svg
deleted file mode 100644
index 5c678d2f69..0000000000
--- a/data/styles/clear/style-night/symbols/taxi-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/tennis-m.svg b/data/styles/clear/style-night/symbols/tennis-m.svg
deleted file mode 100644
index a36f107647..0000000000
--- a/data/styles/clear/style-night/symbols/tennis-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/tennis-s.svg b/data/styles/clear/style-night/symbols/tennis-s.svg
deleted file mode 100644
index b69387a2c0..0000000000
--- a/data/styles/clear/style-night/symbols/tennis-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/ticket-shop-s.svg b/data/styles/clear/style-night/symbols/ticket-shop-s.svg
deleted file mode 100644
index f070c70910..0000000000
--- a/data/styles/clear/style-night/symbols/ticket-shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/tire-repair-m.svg b/data/styles/clear/style-night/symbols/tire-repair-m.svg
deleted file mode 100644
index c964514c35..0000000000
--- a/data/styles/clear/style-night/symbols/tire-repair-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/tire-repair-s.svg b/data/styles/clear/style-night/symbols/tire-repair-s.svg
deleted file mode 100644
index 1e98890556..0000000000
--- a/data/styles/clear/style-night/symbols/tire-repair-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/toilets-m.svg b/data/styles/clear/style-night/symbols/toilets-m.svg
deleted file mode 100644
index 84b1209ea8..0000000000
--- a/data/styles/clear/style-night/symbols/toilets-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/toilets-s.svg b/data/styles/clear/style-night/symbols/toilets-s.svg
deleted file mode 100644
index 527c2e54f0..0000000000
--- a/data/styles/clear/style-night/symbols/toilets-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/tomb-s.svg b/data/styles/clear/style-night/symbols/tomb-s.svg
deleted file mode 100644
index 637040b870..0000000000
--- a/data/styles/clear/style-night/symbols/tomb-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/toys-s.svg b/data/styles/clear/style-night/symbols/toys-s.svg
deleted file mode 100644
index 055b50f3b6..0000000000
--- a/data/styles/clear/style-night/symbols/toys-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/train-xs.svg b/data/styles/clear/style-night/symbols/train-xs.svg
deleted file mode 100644
index 6a90996502..0000000000
--- a/data/styles/clear/style-night/symbols/train-xs.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/travel_agency_shop-m.svg b/data/styles/clear/style-night/symbols/travel_agency_shop-m.svg
deleted file mode 100644
index d4403856ca..0000000000
--- a/data/styles/clear/style-night/symbols/travel_agency_shop-m.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/travel_agency_shop-s.svg b/data/styles/clear/style-night/symbols/travel_agency_shop-s.svg
deleted file mode 100644
index 62ff1faf0b..0000000000
--- a/data/styles/clear/style-night/symbols/travel_agency_shop-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/vending-m.svg b/data/styles/clear/style-night/symbols/vending-m.svg
deleted file mode 100644
index 669c9ce37a..0000000000
--- a/data/styles/clear/style-night/symbols/vending-m.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/vending-s.svg b/data/styles/clear/style-night/symbols/vending-s.svg
deleted file mode 100644
index 209bb96cb4..0000000000
--- a/data/styles/clear/style-night/symbols/vending-s.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/veterinary-s.svg b/data/styles/clear/style-night/symbols/veterinary-s.svg
deleted file mode 100644
index 256c3d44c7..0000000000
--- a/data/styles/clear/style-night/symbols/veterinary-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/viator-star-m.svg b/data/styles/clear/style-night/symbols/viator-star-m.svg
deleted file mode 100644
index 0cb3d5a6cf..0000000000
--- a/data/styles/clear/style-night/symbols/viator-star-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/viator-star-s.svg b/data/styles/clear/style-night/symbols/viator-star-s.svg
deleted file mode 100644
index be28695d0f..0000000000
--- a/data/styles/clear/style-night/symbols/viator-star-s.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/waste-basket-m.svg b/data/styles/clear/style-night/symbols/waste-basket-m.svg
deleted file mode 100644
index 86dcae8d26..0000000000
--- a/data/styles/clear/style-night/symbols/waste-basket-m.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/wayside_shrine-s.svg b/data/styles/clear/style-night/symbols/wayside_shrine-s.svg
deleted file mode 100644
index 166ff6e3f0..0000000000
--- a/data/styles/clear/style-night/symbols/wayside_shrine-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/symbols/windmill-s.svg b/data/styles/clear/style-night/symbols/windmill-s.svg
deleted file mode 100644
index 160ead3273..0000000000
--- a/data/styles/clear/style-night/symbols/windmill-s.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-bg-l.png b/data/styles/clear/style-night/xhdpi/bookmark-bg-l.png
index cce232031c..93e66abdbf 100644
Binary files a/data/styles/clear/style-night/xhdpi/bookmark-bg-l.png and b/data/styles/clear/style-night/xhdpi/bookmark-bg-l.png differ
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-bg-s.png b/data/styles/clear/style-night/xhdpi/bookmark-bg-s.png
index 8e401aced0..73059a9baf 100644
Binary files a/data/styles/clear/style-night/xhdpi/bookmark-bg-s.png and b/data/styles/clear/style-night/xhdpi/bookmark-bg-s.png differ
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-bg-xs.png b/data/styles/clear/style-night/xhdpi/bookmark-bg-xs.png
index d985cae096..57da5fc1fc 100644
Binary files a/data/styles/clear/style-night/xhdpi/bookmark-bg-xs.png and b/data/styles/clear/style-night/xhdpi/bookmark-bg-xs.png differ
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-default-l.png b/data/styles/clear/style-night/xhdpi/bookmark-default-l.png
index 2b15b80dd3..b366e086d3 100644
Binary files a/data/styles/clear/style-night/xhdpi/bookmark-default-l.png and b/data/styles/clear/style-night/xhdpi/bookmark-default-l.png differ
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-default-m.png b/data/styles/clear/style-night/xhdpi/bookmark-default-m.png
index 633d25ff2d..5c8db4d36a 100644
Binary files a/data/styles/clear/style-night/xhdpi/bookmark-default-m.png and b/data/styles/clear/style-night/xhdpi/bookmark-default-m.png differ
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-default-s.png b/data/styles/clear/style-night/xhdpi/bookmark-default-s.png
index 28edd6a7e4..9631a19e57 100644
Binary files a/data/styles/clear/style-night/xhdpi/bookmark-default-s.png and b/data/styles/clear/style-night/xhdpi/bookmark-default-s.png differ
diff --git a/data/styles/clear/style-night/xhdpi/bookmark-default-xs.png b/data/styles/clear/style-night/xhdpi/bookmark-default-xs.png
index 58057cb94f..f6c7cbb441 100644
Binary files a/data/styles/clear/style-night/xhdpi/bookmark-default-xs.png and b/data/styles/clear/style-night/xhdpi/bookmark-default-xs.png differ
diff --git a/data/styles/clear/style-night/xhdpi/search-booking-inactive.png b/data/styles/clear/style-night/xhdpi/search-booking-inactive.png
deleted file mode 100644
index d7ab474ee4..0000000000
Binary files a/data/styles/clear/style-night/xhdpi/search-booking-inactive.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xhdpi/search-booking.png b/data/styles/clear/style-night/xhdpi/search-booking.png
deleted file mode 100644
index a0dca277ed..0000000000
Binary files a/data/styles/clear/style-night/xhdpi/search-booking.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xhdpi/search-result.png b/data/styles/clear/style-night/xhdpi/search-result.png
index dfbe124652..a85cec856d 100644
Binary files a/data/styles/clear/style-night/xhdpi/search-result.png and b/data/styles/clear/style-night/xhdpi/search-result.png differ
diff --git a/data/styles/clear/style-night/xhdpi/searchbooking-bg-l.png b/data/styles/clear/style-night/xhdpi/searchbooking-bg-l.png
new file mode 100644
index 0000000000..6d20f85440
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/searchbooking-bg-l.png differ
diff --git a/data/styles/clear/style-night/xhdpi/searchbooking-bg-s.png b/data/styles/clear/style-night/xhdpi/searchbooking-bg-s.png
new file mode 100644
index 0000000000..8d5fd36908
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/searchbooking-bg-s.png differ
diff --git a/data/styles/clear/style-night/xhdpi/searchbooking-default-l.png b/data/styles/clear/style-night/xhdpi/searchbooking-default-l.png
new file mode 100644
index 0000000000..6efa80b831
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/searchbooking-default-l.png differ
diff --git a/data/styles/clear/style-night/xhdpi/searchbooking-default-s.png b/data/styles/clear/style-night/xhdpi/searchbooking-default-s.png
new file mode 100644
index 0000000000..f9fd373cc5
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/searchbooking-default-s.png differ
diff --git a/data/styles/clear/style-night/xhdpi/searchbooking-ext-1.png b/data/styles/clear/style-night/xhdpi/searchbooking-ext-1.png
new file mode 100644
index 0000000000..2468de7aea
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/searchbooking-ext-1.png differ
diff --git a/data/styles/clear/style-night/xhdpi/searchbooking-ext-2.png b/data/styles/clear/style-night/xhdpi/searchbooking-ext-2.png
new file mode 100644
index 0000000000..a07ec6a71e
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/searchbooking-ext-2.png differ
diff --git a/data/styles/clear/style-night/xhdpi/searchbooking-ext-3.png b/data/styles/clear/style-night/xhdpi/searchbooking-ext-3.png
new file mode 100644
index 0000000000..b16b660437
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/searchbooking-ext-3.png differ
diff --git a/data/styles/clear/style-night/xhdpi/searchbooking-inactive.png b/data/styles/clear/style-night/xhdpi/searchbooking-inactive.png
new file mode 100644
index 0000000000..5c264064ac
Binary files /dev/null and b/data/styles/clear/style-night/xhdpi/searchbooking-inactive.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-bg-l.png b/data/styles/clear/style-night/xxhdpi/bookmark-bg-l.png
index 3955f637ce..707a3e47e3 100644
Binary files a/data/styles/clear/style-night/xxhdpi/bookmark-bg-l.png and b/data/styles/clear/style-night/xxhdpi/bookmark-bg-l.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-bg-s.png b/data/styles/clear/style-night/xxhdpi/bookmark-bg-s.png
index 4920bcb859..ed0332918d 100644
Binary files a/data/styles/clear/style-night/xxhdpi/bookmark-bg-s.png and b/data/styles/clear/style-night/xxhdpi/bookmark-bg-s.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-bg-xs.png b/data/styles/clear/style-night/xxhdpi/bookmark-bg-xs.png
index ec3baa7871..4b89f14cc9 100644
Binary files a/data/styles/clear/style-night/xxhdpi/bookmark-bg-xs.png and b/data/styles/clear/style-night/xxhdpi/bookmark-bg-xs.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-default-l.png b/data/styles/clear/style-night/xxhdpi/bookmark-default-l.png
index ce0a8381c5..9406db9d9a 100644
Binary files a/data/styles/clear/style-night/xxhdpi/bookmark-default-l.png and b/data/styles/clear/style-night/xxhdpi/bookmark-default-l.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-default-m.png b/data/styles/clear/style-night/xxhdpi/bookmark-default-m.png
index a1432a6e4f..1f7581a4a3 100644
Binary files a/data/styles/clear/style-night/xxhdpi/bookmark-default-m.png and b/data/styles/clear/style-night/xxhdpi/bookmark-default-m.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-default-s.png b/data/styles/clear/style-night/xxhdpi/bookmark-default-s.png
index cd0091e629..6999268491 100644
Binary files a/data/styles/clear/style-night/xxhdpi/bookmark-default-s.png and b/data/styles/clear/style-night/xxhdpi/bookmark-default-s.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/bookmark-default-xs.png b/data/styles/clear/style-night/xxhdpi/bookmark-default-xs.png
index cbfef200e5..a1aed9b923 100644
Binary files a/data/styles/clear/style-night/xxhdpi/bookmark-default-xs.png and b/data/styles/clear/style-night/xxhdpi/bookmark-default-xs.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/search-booking-inactive.png b/data/styles/clear/style-night/xxhdpi/search-booking-inactive.png
deleted file mode 100644
index 82d35ce9b4..0000000000
Binary files a/data/styles/clear/style-night/xxhdpi/search-booking-inactive.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxhdpi/search-booking.png b/data/styles/clear/style-night/xxhdpi/search-booking.png
deleted file mode 100644
index 013873a49f..0000000000
Binary files a/data/styles/clear/style-night/xxhdpi/search-booking.png and /dev/null differ
diff --git a/data/styles/clear/style-night/xxhdpi/search-result.png b/data/styles/clear/style-night/xxhdpi/search-result.png
index 5bf972a4cd..45beb049e8 100644
Binary files a/data/styles/clear/style-night/xxhdpi/search-result.png and b/data/styles/clear/style-night/xxhdpi/search-result.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/searchbooking-bg-l.png b/data/styles/clear/style-night/xxhdpi/searchbooking-bg-l.png
new file mode 100644
index 0000000000..677910ea0c
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/searchbooking-bg-l.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/searchbooking-bg-s.png b/data/styles/clear/style-night/xxhdpi/searchbooking-bg-s.png
new file mode 100644
index 0000000000..e2ad41a63d
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/searchbooking-bg-s.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/searchbooking-default-l.png b/data/styles/clear/style-night/xxhdpi/searchbooking-default-l.png
new file mode 100644
index 0000000000..010d63b817
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/searchbooking-default-l.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/searchbooking-default-s.png b/data/styles/clear/style-night/xxhdpi/searchbooking-default-s.png
new file mode 100644
index 0000000000..e615cd7804
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/searchbooking-default-s.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/searchbooking-ext-1.png b/data/styles/clear/style-night/xxhdpi/searchbooking-ext-1.png
new file mode 100644
index 0000000000..bdd9d824ee
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/searchbooking-ext-1.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/searchbooking-ext-2.png b/data/styles/clear/style-night/xxhdpi/searchbooking-ext-2.png
new file mode 100644
index 0000000000..a6b22bc0a6
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/searchbooking-ext-2.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/searchbooking-ext-3.png b/data/styles/clear/style-night/xxhdpi/searchbooking-ext-3.png
new file mode 100644
index 0000000000..e6cd189e9a
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/searchbooking-ext-3.png differ
diff --git a/data/styles/clear/style-night/xxhdpi/searchbooking-inactive.png b/data/styles/clear/style-night/xxhdpi/searchbooking-inactive.png
new file mode 100644
index 0000000000..dc96f8316e
Binary files /dev/null and b/data/styles/clear/style-night/xxhdpi/searchbooking-inactive.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/api-result.png b/data/styles/clear/style-night/xxxhdpi/api-result.png
new file mode 100644
index 0000000000..a00f931ab6
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/api-result.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-bg-l.png b/data/styles/clear/style-night/xxxhdpi/bookmark-bg-l.png
new file mode 100644
index 0000000000..ae957faa74
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/bookmark-bg-l.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-bg-m.png b/data/styles/clear/style-night/xxxhdpi/bookmark-bg-m.png
new file mode 100644
index 0000000000..ec59477f59
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/bookmark-bg-m.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-bg-s.png b/data/styles/clear/style-night/xxxhdpi/bookmark-bg-s.png
new file mode 100644
index 0000000000..774697573b
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/bookmark-bg-s.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-bg-xs.png b/data/styles/clear/style-night/xxxhdpi/bookmark-bg-xs.png
new file mode 100644
index 0000000000..db51ad538a
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/bookmark-bg-xs.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-default-l.png b/data/styles/clear/style-night/xxxhdpi/bookmark-default-l.png
new file mode 100644
index 0000000000..e233f81886
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/bookmark-default-l.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-default-m.png b/data/styles/clear/style-night/xxxhdpi/bookmark-default-m.png
new file mode 100644
index 0000000000..fd36656135
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/bookmark-default-m.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-default-s.png b/data/styles/clear/style-night/xxxhdpi/bookmark-default-s.png
new file mode 100644
index 0000000000..8fa828430a
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/bookmark-default-s.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/bookmark-default-xs.png b/data/styles/clear/style-night/xxxhdpi/bookmark-default-xs.png
new file mode 100644
index 0000000000..bb71db6ca6
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/bookmark-default-xs.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/compass-image.png b/data/styles/clear/style-night/xxxhdpi/compass-image.png
new file mode 100644
index 0000000000..08257e28a4
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/compass-image.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/cross_geoposition.png b/data/styles/clear/style-night/xxxhdpi/cross_geoposition.png
new file mode 100644
index 0000000000..d3bd9db3f5
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/cross_geoposition.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/current-position.png b/data/styles/clear/style-night/xxxhdpi/current-position.png
new file mode 100644
index 0000000000..b6249457a6
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/current-position.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/non-found-search-result.png b/data/styles/clear/style-night/xxxhdpi/non-found-search-result.png
new file mode 100644
index 0000000000..4a5a8d5d0e
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/non-found-search-result.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-arrow.png b/data/styles/clear/style-night/xxxhdpi/route-arrow.png
new file mode 100644
index 0000000000..997a21da11
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-arrow.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-a.png b/data/styles/clear/style-night/xxxhdpi/route-point-a.png
new file mode 100644
index 0000000000..68193c9327
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-a.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-b.png b/data/styles/clear/style-night/xxxhdpi/route-point-b.png
new file mode 100644
index 0000000000..3c09bdbb7d
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-b.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-c.png b/data/styles/clear/style-night/xxxhdpi/route-point-c.png
new file mode 100644
index 0000000000..467c9631ec
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-c.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-finish.png b/data/styles/clear/style-night/xxxhdpi/route-point-finish.png
new file mode 100644
index 0000000000..c30443bff0
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-finish.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/route-point-start.png b/data/styles/clear/style-night/xxxhdpi/route-point-start.png
new file mode 100644
index 0000000000..385969bf16
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/route-point-start.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/search-adv.png b/data/styles/clear/style-night/xxxhdpi/search-adv.png
new file mode 100644
index 0000000000..0207764623
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/search-adv.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/search-result.png b/data/styles/clear/style-night/xxxhdpi/search-result.png
new file mode 100644
index 0000000000..0b2258415a
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/search-result.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/searchbooking-bg-l.png b/data/styles/clear/style-night/xxxhdpi/searchbooking-bg-l.png
new file mode 100644
index 0000000000..989193828e
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/searchbooking-bg-l.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/searchbooking-bg-s.png b/data/styles/clear/style-night/xxxhdpi/searchbooking-bg-s.png
new file mode 100644
index 0000000000..03b4bd2304
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/searchbooking-bg-s.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/searchbooking-default-l.png b/data/styles/clear/style-night/xxxhdpi/searchbooking-default-l.png
new file mode 100644
index 0000000000..1e78622ff1
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/searchbooking-default-l.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/searchbooking-default-s.png b/data/styles/clear/style-night/xxxhdpi/searchbooking-default-s.png
new file mode 100644
index 0000000000..80d0402129
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/searchbooking-default-s.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/searchbooking-ext-1.png b/data/styles/clear/style-night/xxxhdpi/searchbooking-ext-1.png
new file mode 100644
index 0000000000..236d911dbd
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/searchbooking-ext-1.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/searchbooking-ext-2.png b/data/styles/clear/style-night/xxxhdpi/searchbooking-ext-2.png
new file mode 100644
index 0000000000..bd98da009c
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/searchbooking-ext-2.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/searchbooking-ext-3.png b/data/styles/clear/style-night/xxxhdpi/searchbooking-ext-3.png
new file mode 100644
index 0000000000..9f9e23a256
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/searchbooking-ext-3.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/searchbooking-inactive.png b/data/styles/clear/style-night/xxxhdpi/searchbooking-inactive.png
new file mode 100644
index 0000000000..2aa075debf
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/searchbooking-inactive.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-hw-thin-scaled.png b/data/styles/clear/style-night/xxxhdpi/shield-us-hw-thin-scaled.png
new file mode 100644
index 0000000000..b84c4a4043
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/shield-us-hw-thin-scaled.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-hw-thin.png b/data/styles/clear/style-night/xxxhdpi/shield-us-hw-thin.png
new file mode 100644
index 0000000000..606cfeb01f
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/shield-us-hw-thin.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-hw-wide-scaled.png b/data/styles/clear/style-night/xxxhdpi/shield-us-hw-wide-scaled.png
new file mode 100644
index 0000000000..40290ef0a5
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/shield-us-hw-wide-scaled.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-hw-wide.png b/data/styles/clear/style-night/xxxhdpi/shield-us-hw-wide.png
new file mode 100644
index 0000000000..d00b341fe8
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/shield-us-hw-wide.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-i-thin-scaled.png b/data/styles/clear/style-night/xxxhdpi/shield-us-i-thin-scaled.png
new file mode 100644
index 0000000000..abf541096c
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/shield-us-i-thin-scaled.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-i-thin.png b/data/styles/clear/style-night/xxxhdpi/shield-us-i-thin.png
new file mode 100644
index 0000000000..28d0c4c9cd
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/shield-us-i-thin.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-i-wide-scaled.png b/data/styles/clear/style-night/xxxhdpi/shield-us-i-wide-scaled.png
new file mode 100644
index 0000000000..7c64ec16e1
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/shield-us-i-wide-scaled.png differ
diff --git a/data/styles/clear/style-night/xxxhdpi/shield-us-i-wide.png b/data/styles/clear/style-night/xxxhdpi/shield-us-i-wide.png
new file mode 100644
index 0000000000..2c9c65130f
Binary files /dev/null and b/data/styles/clear/style-night/xxxhdpi/shield-us-i-wide.png differ
diff --git a/data/styles/vehicle/style-clear/style.mapcss b/data/styles/vehicle/style-clear/style.mapcss
index 2904267c9e..26dd118f39 100644
--- a/data/styles/vehicle/style-clear/style.mapcss
+++ b/data/styles/vehicle/style-clear/style.mapcss
@@ -93,7 +93,7 @@ colors
TransitBackground-color: #FFFFFF;
TransitBackground-opacity: 0.4;
BookmarkRed-color: #E51B23;
- BookmarkPink-color: #E91F63;
+ BookmarkPink-color: #FF4182;
BookmarkPurple-color: #9C27B0;
BookmarkDeepPurple-color: #673AB7;
BookmarkBlue-color: #006EC7;
@@ -102,10 +102,17 @@ colors
BookmarkTeal-color: #009588;
BookmarkGreen-color: #388E3C;
BookmarkLime-color: #7EBF39;
- BookmarkYellow-color: #FFC108;
+ BookmarkYellow-color: #FFC800;
BookmarkOrange-color: #FFA000;
BookmarkDeepOrange-color: #607D8B;
BookmarkBrown-color: #795548;
BookmarkGray-color: #757575;
- BookmarkBlueGray-color: #607D8B;
+ BookmarkBlueGray-color: #607D8B;
+ RatingNone-color: #597380;
+ RatingHorrible-color: #E63C2D;
+ RatingBad-color: #F06432;
+ RatingNormal-color: #FFC800;
+ RatingGood-color: #93BF39;
+ RatingExcellent-color: #3C8C3C;
+ RatingText-color: #FFFFFF;
}
diff --git a/data/styles/vehicle/style-night/style.mapcss b/data/styles/vehicle/style-night/style.mapcss
index 09185aaa58..4bee567b17 100755
--- a/data/styles/vehicle/style-night/style.mapcss
+++ b/data/styles/vehicle/style-night/style.mapcss
@@ -93,7 +93,7 @@ colors
TransitBackground-color: #000000;
TransitBackground-opacity: 0.4;
BookmarkRed-color: #E51B23;
- BookmarkPink-color: #E91F63;
+ BookmarkPink-color: #FF4182;
BookmarkPurple-color: #9C27B0;
BookmarkDeepPurple-color: #673AB7;
BookmarkBlue-color: #006EC7;
@@ -102,10 +102,17 @@ colors
BookmarkTeal-color: #009588;
BookmarkGreen-color: #388E3C;
BookmarkLime-color: #7EBF39;
- BookmarkYellow-color: #FFC108;
+ BookmarkYellow-color: #FFC800;
BookmarkOrange-color: #FFA000;
BookmarkDeepOrange-color: #607D8B;
BookmarkBrown-color: #795548;
BookmarkGray-color: #757575;
- BookmarkBlueGray-color: #607D8B;
+ BookmarkBlueGray-color: #607D8B;
+ RatingNone-color: #597380;
+ RatingHorrible-color: #E63C2D;
+ RatingBad-color: #F06432;
+ RatingNormal-color: #FFC800;
+ RatingGood-color: #93BF39;
+ RatingExcellent-color: #3C8C3C;
+ RatingText-color: #FFFFFF;
}