diff --git a/data/styles/clear/style-clear/symbols/barrier-entrance-s.svg b/data/styles/clear/style-clear/symbols/barrier-entrance-s.svg
new file mode 100644
index 0000000000..18ed5e1d60
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/barrier-entrance-s.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-clear/symbols/bcontrol-s.svg b/data/styles/clear/style-clear/symbols/bcontrol-s.svg
new file mode 100644
index 0000000000..a4346ba2a4
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/bcontrol-s.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-clear/symbols/campsite-s.svg b/data/styles/clear/style-clear/symbols/campsite-s.svg
new file mode 100644
index 0000000000..986684bc68
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/campsite-s.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-clear/symbols/caravan_site-s.svg b/data/styles/clear/style-clear/symbols/caravan_site-s.svg
new file mode 100644
index 0000000000..36408262a1
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/caravan_site-s.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-clear/symbols/ford-m.svg b/data/styles/clear/style-clear/symbols/ford-m.svg
new file mode 100644
index 0000000000..dc8fea1551
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/ford-m.svg
@@ -0,0 +1,4 @@
+
diff --git a/data/styles/clear/style-clear/symbols/mast-m.svg b/data/styles/clear/style-clear/symbols/mast-m.svg
new file mode 100644
index 0000000000..59947de4f8
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/mast-m.svg
@@ -0,0 +1,4 @@
+
diff --git a/data/styles/clear/style-clear/symbols/mountain-pass-m.svg b/data/styles/clear/style-clear/symbols/mountain-pass-m.svg
new file mode 100644
index 0000000000..4545e07079
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/mountain-pass-m.svg
@@ -0,0 +1,3 @@
+
diff --git a/data/styles/clear/style-clear/symbols/mountain-pass-s.svg b/data/styles/clear/style-clear/symbols/mountain-pass-s.svg
new file mode 100644
index 0000000000..be4300e53d
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/mountain-pass-s.svg
@@ -0,0 +1,3 @@
+
diff --git a/data/styles/clear/style-clear/symbols/mountain-pass.svg b/data/styles/clear/style-clear/symbols/mountain-pass.svg
deleted file mode 100644
index 4fb5c4c98c..0000000000
--- a/data/styles/clear/style-clear/symbols/mountain-pass.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
diff --git a/data/styles/clear/style-clear/symbols/picnic-s.svg b/data/styles/clear/style-clear/symbols/picnic-s.svg
new file mode 100644
index 0000000000..6322a761da
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/picnic-s.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-clear/symbols/power-tower-m.svg b/data/styles/clear/style-clear/symbols/power-tower-m.svg
new file mode 100644
index 0000000000..6f64cfb882
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/power-tower-m.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-clear/symbols/shelter-s.svg b/data/styles/clear/style-clear/symbols/shelter-s.svg
new file mode 100644
index 0000000000..3dee6f4649
--- /dev/null
+++ b/data/styles/clear/style-clear/symbols/shelter-s.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-night/symbols/barrier-entrance-s.svg b/data/styles/clear/style-night/symbols/barrier-entrance-s.svg
new file mode 100644
index 0000000000..c46aa9ce16
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/barrier-entrance-s.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-night/symbols/bcontrol-s.svg b/data/styles/clear/style-night/symbols/bcontrol-s.svg
new file mode 100644
index 0000000000..a60d403eeb
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/bcontrol-s.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-night/symbols/campsite-s.svg b/data/styles/clear/style-night/symbols/campsite-s.svg
new file mode 100644
index 0000000000..dd79b9b0af
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/campsite-s.svg
@@ -0,0 +1,7 @@
+
diff --git a/data/styles/clear/style-night/symbols/caravan_site-s.svg b/data/styles/clear/style-night/symbols/caravan_site-s.svg
new file mode 100644
index 0000000000..8dd718b4b0
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/caravan_site-s.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-night/symbols/ford-m.svg b/data/styles/clear/style-night/symbols/ford-m.svg
new file mode 100644
index 0000000000..23473eb03d
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/ford-m.svg
@@ -0,0 +1,4 @@
+
diff --git a/data/styles/clear/style-night/symbols/mast-m.svg b/data/styles/clear/style-night/symbols/mast-m.svg
new file mode 100644
index 0000000000..88750a521b
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/mast-m.svg
@@ -0,0 +1,4 @@
+
diff --git a/data/styles/clear/style-night/symbols/mountain-pass-m.svg b/data/styles/clear/style-night/symbols/mountain-pass-m.svg
new file mode 100644
index 0000000000..b40fcaa346
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/mountain-pass-m.svg
@@ -0,0 +1,3 @@
+
diff --git a/data/styles/clear/style-night/symbols/mountain-pass-s.svg b/data/styles/clear/style-night/symbols/mountain-pass-s.svg
new file mode 100644
index 0000000000..49abe00b77
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/mountain-pass-s.svg
@@ -0,0 +1,3 @@
+
diff --git a/data/styles/clear/style-night/symbols/mountain-pass.svg b/data/styles/clear/style-night/symbols/mountain-pass.svg
deleted file mode 100644
index 725ad9be2e..0000000000
--- a/data/styles/clear/style-night/symbols/mountain-pass.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
diff --git a/data/styles/clear/style-night/symbols/picnic-s.svg b/data/styles/clear/style-night/symbols/picnic-s.svg
new file mode 100644
index 0000000000..91a586548b
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/picnic-s.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-night/symbols/power-tower-m.svg b/data/styles/clear/style-night/symbols/power-tower-m.svg
new file mode 100644
index 0000000000..6968465aaf
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/power-tower-m.svg
@@ -0,0 +1,5 @@
+
diff --git a/data/styles/clear/style-night/symbols/shelter-s.svg b/data/styles/clear/style-night/symbols/shelter-s.svg
new file mode 100644
index 0000000000..2e06579855
--- /dev/null
+++ b/data/styles/clear/style-night/symbols/shelter-s.svg
@@ -0,0 +1,7 @@
+