diff --git a/amenity-points.mss b/amenity-points.mss
index 9b61cf7a58..7c394ade94 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -30,28 +30,28 @@
   }
 
   [feature = 'amenity_atm'][zoom >= 17] {
-    marker-file: url('symbols/atm.16.svg');
+    marker-file: url('symbols/atm.18.svg');
     marker-fill: @money-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_bank'][zoom >= 17] {
-    marker-file: url('symbols/bank.16.svg');
+    marker-file: url('symbols/bank.18.svg');
     marker-fill: @money-icon;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_bar'][zoom >= 17] {
-    marker-file: url('symbols/bar.16.svg');
+    marker-file: url('symbols/bar.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_bicycle_rental'][zoom >= 17] {
-    marker-file: url('symbols/rental_bicycle.16.svg');
+    marker-file: url('symbols/rental_bicycle.18.svg');
     marker-fill: #0092da;
     marker-placement: interior;
   }
@@ -81,14 +81,14 @@
   }
 
   [feature = 'amenity_cafe'][zoom >= 17] {
-    marker-file: url('symbols/cafe.16.svg');
+    marker-file: url('symbols/cafe.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'tourism_camp_site'][zoom >= 16] {
-    marker-file: url('symbols/camping.16.svg');
+    marker-file: url('symbols/camping.18.svg');
     marker-fill: #0092da;
     marker-placement: interior;
     marker-clip: false;
@@ -115,21 +115,21 @@
   }
 
   [feature = 'amenity_cinema'][zoom >= 16] {
-    marker-file: url('symbols/cinema.16.svg');
+    marker-file: url('symbols/cinema.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_fire_station'][zoom >= 16] {
-    marker-file: url('symbols/firestation.16.svg');
+    marker-file: url('symbols/firestation.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_fuel'][zoom >= 17] {
-    marker-file: url('symbols/fuel.16.svg');
+    marker-file: url('symbols/fuel.18.svg');
     marker-fill: #0092da;
     marker-placement: interior;
     marker-clip: false;
@@ -141,7 +141,7 @@
   }
 
   [feature = 'amenity_hospital'][zoom >= 15] {
-    marker-file: url('symbols/hospital.16.svg');
+    marker-file: url('symbols/hospital.18.svg');
     marker-fill: @health-color;
     marker-placement: interior;
     marker-clip: false;
@@ -168,7 +168,7 @@
   }
 
   [feature = 'amenity_embassy'][zoom >= 17] {
-    marker-file: url('symbols/embassy.16.svg');
+    marker-file: url('symbols/embassy.18.svg');
     marker-fill: #0092da;
     marker-placement: interior;
     marker-clip: false;
@@ -185,7 +185,7 @@
   }
 
   [feature = 'amenity_townhall'][zoom > 16] {
-    marker-file: url('symbols/town_hall.16.svg');
+    marker-file: url('symbols/town_hall.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
@@ -202,13 +202,13 @@
   }
 
   [feature = 'man_made_mast'][zoom >= 17] {
-    marker-file: url('symbols/communications.16.svg');
+    marker-file: url('symbols/communications.18.svg');
     marker-fill: #555;
     marker-placement: interior;
   }
 
   [feature = 'tourism_museum'][zoom >= 16] {
-    marker-file: url('symbols/museum.16.svg');
+    marker-file: url('symbols/museum.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
@@ -225,62 +225,62 @@
   }
 
   [feature = 'amenity_pharmacy'][zoom >= 17] {
-    marker-file: url('symbols/pharmacy.16.svg');
+    marker-file: url('symbols/pharmacy.18.svg');
     marker-fill: @health-color;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_doctors'][zoom >= 17] {
-    marker-file: url('symbols/doctors.16.svg');
+    marker-file: url('symbols/doctors.18.svg');
     marker-fill: @health-color;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_dentist'][zoom >= 17] {
-    marker-file: url('symbols/dentist.16.svg');
+    marker-file: url('symbols/dentist.18.svg');
     marker-fill: @health-color;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_place_of_worship'][zoom >= 16] {
-    marker-file: url('symbols/place_of_worship.16.svg');
+    marker-file: url('symbols/place_of_worship.18.svg');
     marker-fill: #000000;
     marker-placement: interior;
     marker-clip: false;
     [religion = 'christian'] {
-      marker-file: url('symbols/christian.16.svg');
+      marker-file: url('symbols/christian.18.svg');
       [denomination = 'jehovahs_witness']{
-        marker-file: url('symbols/place_of_worship.16.svg');
+        marker-file: url('symbols/place_of_worship.18.svg');
       }
     }
     [religion = 'muslim'] {
-      marker-file: url('symbols/muslim.16.svg');
+      marker-file: url('symbols/muslim.18.svg');
     }
     [religion = 'sikh'] {
-      marker-file: url('symbols/sikhist.16.svg');
+      marker-file: url('symbols/sikhist.18.svg');
     }
     [religion = 'jewish'] {
-      marker-file: url('symbols/jewish.16.svg');
+      marker-file: url('symbols/jewish.18.svg');
     }
     [religion = 'hindu'] {
-      marker-file: url('symbols/hinduist.16.svg');
+      marker-file: url('symbols/hinduist.18.svg');
     }
     [religion = 'buddhist'] {
-      marker-file: url('symbols/buddhist.16.svg');
+      marker-file: url('symbols/buddhist.18.svg');
     }
     [religion = 'shinto'] {
-      marker-file: url('symbols/shintoist.16.svg');
+      marker-file: url('symbols/shintoist.18.svg');
     }
     [religion = 'taoist'] {
-      marker-file: url('symbols/taoist.16.svg');
+      marker-file: url('symbols/taoist.18.svg');
     }
   }
 
   [feature = 'amenity_police'][zoom >= 16] {
-    marker-file: url('symbols/police.16.svg');
+    marker-file: url('symbols/police.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
@@ -297,21 +297,21 @@
   }
 
   [feature = 'amenity_pub'][zoom >= 17] {
-    marker-file: url('symbols/pub.16.svg');
+    marker-file: url('symbols/pub.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_biergarten'][zoom >= 17] {
-    marker-file: url('symbols/biergarten.16.svg');
+    marker-file: url('symbols/biergarten.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_recycling'][zoom >= 16] {
-    marker-file: url('symbols/recycling.16.svg');
+    marker-file: url('symbols/recycling.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
@@ -322,14 +322,14 @@
 
   [feature = 'amenity_restaurant'][zoom >= 17],
   [feature = 'amenity_food_court'][zoom >= 17] {
-    marker-file: url('symbols/restaurant.16.svg');
+    marker-file: url('symbols/restaurant.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_fast_food'][zoom >= 17] {
-    marker-file: url('symbols/fast_food.16.svg');
+    marker-file: url('symbols/fast_food.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
@@ -346,27 +346,27 @@
   }
 
   [feature = 'amenity_theatre'][zoom >= 16] {
-    marker-file: url('symbols/theatre.16.svg');
+    marker-file: url('symbols/theatre.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_toilets'][zoom >= 17] {
-    marker-file: url('symbols/toilets.16.svg');
+    marker-file: url('symbols/toilets.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'amenity_drinking_water'][zoom >= 17] {
-    marker-file: url('symbols/drinking_water.16.svg');
+    marker-file: url('symbols/drinking_water.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
   }
 
   [feature = 'amenity_prison'][zoom >= 17] {
-    marker-file: url('symbols/prison.16.svg');
+    marker-file: url('symbols/prison.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
@@ -383,7 +383,7 @@
   }
 
   [feature = 'historic_memorial'][zoom >= 17] {
-    marker-file: url('symbols/tourist_memorial.16.svg');
+    marker-file: url('symbols/tourist_memorial.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
@@ -410,7 +410,7 @@
   }
 
   [feature = 'shop_bakery'][zoom >= 17] {
-    marker-file: url('symbols/shop_bakery.16.svg');
+    marker-file: url('symbols/shop_bakery.18.svg');
     marker-fill: @shop-icon;
     marker-placement: interior;
     marker-clip: false;
@@ -487,7 +487,7 @@
   }
 
   [feature = 'leisure_playground'][zoom >= 17] {
-    marker-file: url('symbols/playground.16.svg');
+    marker-file: url('symbols/playground.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
@@ -507,14 +507,14 @@
   }
 
   [feature = 'tourism_picnic_site'][zoom >= 16] {
-    marker-file: url('symbols/picnic.16.svg');
+    marker-file: url('symbols/picnic.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
     marker-clip: false;
   }
 
   [feature = 'leisure_picnic_table'][zoom >= 17] {
-    marker-file: url('symbols/picnic.16.svg');
+    marker-file: url('symbols/picnic.18.svg');
     marker-fill: #734a08;
     marker-placement: interior;
   }
diff --git a/symbols/atm.16.svg b/symbols/atm.16.svg
deleted file mode 100644
index 36a74f801e..0000000000
--- a/symbols/atm.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 2,1 C 1.4576271,1 1,1.4576271 1,2 l 0,2 c 0,0.559322 0.4886174,1 1,1 l 0,-2 12,0 0,2 c 0.511382,0 1,-0.4857094 1,-1 L 15,2 C 15,1.4576271 14.508475,1 14,1 z m 1,3 0,8 c 0,0.599243 0.400757,1 1,1 l 8,0 c 0.527334,0 1,-0.448696 1,-1 l 0,-8 -1,0 0,6 c -1,0 -2,1 -2,2 L 6,12 C 6,11 5,10 4,10 L 4,4 z M 8,5 C 6.4292037,5 5,5.9528024 5,7 5,8.0471976 6.4292037,9 8,9 9.5707963,9 11,8.0471976 11,7 11,5.9528024 9.5707963,5 8,5 z M 3,13.5 C 3,14.554668 3.4247267,15 4,15 l 8,0 c 0.527334,0 1,-0.445332 1,-1.5 -0.305085,0.271186 -0.496636,0.49272 -1,0.46875 l -8,0.0625 C 3.5206056,14.00728 3.3050847,13.805085 3,13.5 z" />
-</svg>
diff --git a/symbols/atm.18.svg b/symbols/atm.18.svg
new file mode 100644
index 0000000000..0e6d785ef2
--- /dev/null
+++ b/symbols/atm.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="atm">
+    <path
+       d="M 3,2 C 2.4576271,2 2,2.4576271 2,3 l 0,2 c 0,0.559322 0.4886174,1 1,1 l 0,-2 12,0 0,2 c 0.511382,0 1,-0.4857094 1,-1 L 16,3 C 16,2.4576271 15.508475,2 15,2 z m 1,3 0,8 c 0,0.599243 0.400757,1 1,1 l 8,0 c 0.527334,0 1,-0.448696 1,-1 l 0,-8 -1,0 0,6 c -1,0 -2,1 -2,2 L 7,13 C 7,12 6,11 5,11 L 5,5 z M 9,6 C 7.4292037,6 6,6.9528024 6,8 6,9.047198 7.4292037,10 9,10 10.570796,10 12,9.047198 12,8 12,6.9528024 10.570796,6 9,6 z M 4,14.5 C 4,15.554668 4.4247267,16 5,16 l 8,0 c 0.527334,0 1,-0.445332 1,-1.5 -0.305085,0.271186 -0.496636,0.49272 -1,0.46875 l -8,0.0625 C 4.5206056,15.00728 4.3050847,14.805085 4,14.5 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 3,2 C 2.457627,2 2,2.4576271 2,3 l 0,2 c 0,0.559322 0.488617,1 1,1 l 0,-2 12,0 0,2 c 0.511382,0 1,-0.4857094 1,-1 L 16,3 C 16,2.4576271 15.508475,2 15,2 z m 1,3 0,8 c 0,0.599243 0.400757,1 1,1 l 8,0 c 0.527334,0 1,-0.448696 1,-1 l 0,-8 -1,0 0,6 c -1,0 -2,1 -2,2 L 7,13 C 7,12 6,11 5,11 L 5,5 z M 9,6 C 7.429204,6 6,6.9528024 6,8 6,9.047198 7.429204,10 9,10 10.570796,10 12,9.047198 12,8 12,6.9528024 10.570796,6 9,6 z M 4,14.5 C 4,15.554668 4.424727,16 5,16 l 8,0 c 0.527334,0 1,-0.445332 1,-1.5 -0.305085,0.271186 -0.496636,0.49272 -1,0.46875 l -8,0.0625 C 4.520606,15.00728 4.305085,14.805085 4,14.5 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/bank.16.svg b/symbols/bank.16.svg
deleted file mode 100644
index ea8c60afd5..0000000000
--- a/symbols/bank.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 1,3 0,7 c 0,0.627119 0.4237288,1 1,1 l 12,0 c 0.576271,0 1,-0.423729 1,-1 L 15,3 1,3 z m 3,1 8,0 c 0,1 1,2 2,2 l 0,2 c -1,0 -2,1 -2,2 L 4,10 C 4,9 3,8 2,8 L 2,6 C 3,6 4,5 4,4 z M 8,5 C 6.3431459,5 5,5.8954305 5,7 5,8.1045695 6.3431459,9 8,9 9.6568547,9 11,8.1045695 11,7 11,5.8954305 9.6568547,5 8,5 z M 1,11.5 C 1,12.626577 1.4486964,13 2,13 l 12,0 c 0.551304,0 1,-0.445333 1,-1.5 -0.288136,0.271186 -0.559322,0.5 -1,0.5 L 2,12 C 1.559322,12 1.2711864,11.754237 1,11.5 z" />
-</svg>
diff --git a/symbols/bank.18.svg b/symbols/bank.18.svg
new file mode 100644
index 0000000000..3d1981bac0
--- /dev/null
+++ b/symbols/bank.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="bank">
+    <path
+       d="m 2,4 0,7 c 0,0.627119 0.4237288,1 1,1 l 12,0 c 0.576271,0 1,-0.423729 1,-1 L 16,4 2,4 z m 3,1 8,0 c 0,1 1,2 2,2 l 0,2 c -1,0 -2,1 -2,2 L 5,11 C 5,10 4,9 3,9 L 3,7 C 4,7 5,6 5,5 z M 9,6 C 7.3431459,6 6,6.8954305 6,8 6,9.10457 7.3431459,10 9,10 10.656855,10 12,9.10457 12,8 12,6.8954305 10.656855,6 9,6 z M 2,12.5 C 2,13.626577 2.4486964,14 3,14 l 12,0 c 0.551304,0 1,-0.445333 1,-1.5 -0.288136,0.271186 -0.559322,0.5 -1,0.5 L 3,13 C 2.559322,13 2.2711864,12.754237 2,12.5 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 2,4 0,7 c 0,0.627119 0.423729,1 1,1 l 12,0 c 0.576271,0 1,-0.423729 1,-1 L 16,4 2,4 z m 3,1 8,0 c 0,1 1,2 2,2 l 0,2 c -1,0 -2,1 -2,2 L 5,11 C 5,10 4,9 3,9 L 3,7 C 4,7 5,6 5,5 z M 9,6 C 7.343146,6 6,6.8954305 6,8 6,9.10457 7.343146,10 9,10 10.656855,10 12,9.10457 12,8 12,6.8954305 10.656855,6 9,6 z M 2,12.5 C 2,13.626577 2.448696,14 3,14 l 12,0 c 0.551304,0 1,-0.445333 1,-1.5 -0.288136,0.271186 -0.559322,0.5 -1,0.5 L 3,13 C 2.559322,13 2.271186,12.754237 2,12.5 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/bar.16.svg b/symbols/bar.16.svg
deleted file mode 100644
index 0b361ab557..0000000000
--- a/symbols/bar.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 2,2 5.5,6 0,4 C 7.5,12 3,13 3,14 l 10,0 C 13,13 8.5,12 8.5,12 L 8.5,8 14,2 z" />
-</svg>
diff --git a/symbols/bar.18.svg b/symbols/bar.18.svg
new file mode 100644
index 0000000000..716fc50cfa
--- /dev/null
+++ b/symbols/bar.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="bar">
+    <path
+       d="m 3,3 5.5,6 0,4 C 8.5,13 4,14 4,15 l 10,0 C 14,14 9.5,13 9.5,13 L 9.5,9 15,3 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 3,3 5.5,6 0,4 C 8.5,13 4,14 4,15 l 10,0 C 14,14 9.5,13 9.5,13 L 9.5,9 15,3 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/biergarten.16.svg b/symbols/biergarten.16.svg
deleted file mode 100644
index 0fd4973b83..0000000000
--- a/symbols/biergarten.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 4,1 C 3,1 2,2 2,3 l 0,10 c 0,1 -1,2 -1,2 l 11,0 c 0,0 -1,-1 -1,-2 l 3,0 c 1,0 1,-1 1,-1 L 15,6 C 15,5 14,4 13,4 L 11,4 11,3 C 11,1.7603028 10.263667,1 9,1 z M 5,2 8,2 C 9.3809813,2 10,2.3528175 10,3 7,3 4.85459,3.19773 5,6 5,8 3,8 3,6 L 3,4 C 3,2.4966359 3.4966359,2 5,2 z m 6,3.5 1,0 c 0.690253,0 1.5,0.027334 1.5,1.5 l 0,4.5 -2.5,0 z m -8,7.5 7,0 0,1 -7,0 z" />
-</svg>
diff --git a/symbols/biergarten.18.svg b/symbols/biergarten.18.svg
new file mode 100644
index 0000000000..6b2d036c71
--- /dev/null
+++ b/symbols/biergarten.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="biergarten">
+    <path
+       d="M 5,2 C 4,2 3,3 3,4 l 0,10 c 0,1 -1,2 -1,2 l 11,0 c 0,0 -1,-1 -1,-2 l 3,0 c 1,0 1,-1 1,-1 L 16,7 C 16,6 15,5 14,5 L 12,5 12,4 C 12,2.7603028 11.263667,2 10,2 z m 1,1 3,0 c 1.380981,0 2,0.3528175 2,1 C 8,4 5.85459,4.19773 6,7 6,9 4,9 4,7 L 4,5 C 4,3.4966359 4.4966359,3 6,3 z m 6,3.5 1,0 c 0.690253,0 1.5,0.027334 1.5,1.5 l 0,4.5 -2.5,0 z m -8,7.5 7,0 0,1 -7,0 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 5,2 C 4,2 3,3 3,4 l 0,10 c 0,1 -1,2 -1,2 l 11,0 c 0,0 -1,-1 -1,-2 l 3,0 c 1,0 1,-1 1,-1 L 16,7 C 16,6 15,5 14,5 L 12,5 12,4 C 12,2.7603028 11.263667,2 10,2 z m 1,1 3,0 c 1.380981,0 2,0.3528175 2,1 C 8,4 5.85459,4.19773 6,7 6,9 4,9 4,7 L 4,5 C 4,3.4966359 4.496636,3 6,3 z m 6,3.5 1,0 c 0.690253,0 1.5,0.027334 1.5,1.5 l 0,4.5 -2.5,0 z m -8,7.5 7,0 0,1 -7,0 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/buddhist.16.svg b/symbols/buddhist.16.svg
deleted file mode 100644
index e82c2aad0a..0000000000
--- a/symbols/buddhist.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 8,1.03125 C 7.7538575,1.0291155 7.51543,1.3562643 7.5,2 4.6029845,2.2545513 2.2563153,4.6023818 2,7.5 c -1.2703952,0 -1.28747145,0.96914 0,1 0.2283193,2.916563 2.584827,5.219256 5.5,5.46875 0,1.404649 1,1.356045 1,0 2.935396,-0.222296 5.24644,-2.531918 5.46875,-5.46875 1.394629,0 1.355936,-1 0,-1 C 13.719146,4.5822447 11.417031,2.2268292 8.5,2 8.5,1.3648024 8.2461425,1.0333845 8,1.03125 z m -0.5,2.28125 0,3.5 L 5.03125,4.34375 C 5.7197423,3.7836121 6.5677817,3.4152092 7.5,3.3125 z m 1,0 c 0.9313705,0.098765 1.774011,0.4754302 2.46875,1.03125 L 8.5,6.8125 l 0,-3.5 z m 3.1875,1.71875 C 12.246246,5.7188969 12.615706,6.567911 12.71875,7.5 l -3.5,0 2.46875,-2.46875 z M 4.34375,5.0625 6.78125,7.5 3.3125,7.5 C 3.4201833,6.5853201 3.7953862,5.7436898 4.34375,5.0625 z M 8,7.25 C 8.4142135,7.25 8.75,7.5857863 8.75,8 8.75,8.4142135 8.4142135,8.75 8,8.75 7.5857865,8.75 7.25,8.4142135 7.25,8 7.25,7.5857863 7.5857865,7.25 8,7.25 z m -4.6875,1.25 3.53125,0 -2.5,2.5 C 3.7799209,10.302758 3.4094553,9.4411262 3.3125,8.5 z m 5.84375,0 3.5625,0 c -0.100162,0.9519801 -0.493668,1.801539 -1.0625,2.5 l -2.5,-2.5 z M 7.5,9.21875 l 0,3.5 C 6.567911,12.615706 5.7188969,12.246246 5.03125,11.6875 L 7.5,9.21875 z m 1,0 2.46875,2.5 c -0.687689,0.544344 -1.5388332,0.905241 -2.46875,1 l 0,-3.5 z" />
-</svg>
diff --git a/symbols/buddhist.18.svg b/symbols/buddhist.18.svg
new file mode 100644
index 0000000000..6a14d96324
--- /dev/null
+++ b/symbols/buddhist.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="buddhist">
+    <path
+       d="m 9.0002107,2.0311595 c -0.2461425,-0.00213 -0.48457,0.3250143 -0.5,0.96875 -2.8970155,0.2545513 -5.2436847,2.6023818 -5.5,5.5 -1.2703952,0 -1.2874715,0.96914 0,1 0.2283193,2.9165635 2.584827,5.2192565 5.5,5.4687505 0,1.404649 1,1.356045 1,0 2.9353963,-0.222296 5.2464403,-2.531918 5.4687503,-5.4687505 1.394629,0 1.355936,-1 0,-1 -0.249604,-2.9177553 -2.551719,-5.2731708 -5.4687503,-5.5 0,-0.6351976 -0.2538575,-0.9666155 -0.5,-0.96875 z m -0.5,2.28125 0,3.5 -2.46875,-2.46875 c 0.6884923,-0.5601379 1.5365317,-0.9285408 2.46875,-1.03125 z m 1,0 c 0.9313703,0.098765 1.7740113,0.4754302 2.4687503,1.03125 l -2.4687503,2.46875 0,-3.5 z m 3.1875003,1.71875 c 0.558746,0.6876469 0.928206,1.536661 1.03125,2.46875 l -3.5,0 2.46875,-2.46875 z m -7.3437503,0.03125 2.4375,2.4375 -3.46875,0 c 0.1076833,-0.9146799 0.4828862,-1.7563102 1.03125,-2.4375 z m 3.65625,2.1875 c 0.4142135,0 0.75,0.3357863 0.75,0.75 0,0.414214 -0.3357865,0.75 -0.75,0.75 -0.4142135,0 -0.75,-0.335786 -0.75,-0.75 0,-0.4142137 0.3357865,-0.75 0.75,-0.75 z m -4.6875,1.25 3.53125,0 -2.5,2.5000005 C 4.7801316,11.302668 4.409666,10.441036 4.3127107,9.4999095 z m 5.8437503,0 3.5625,0 c -0.100162,0.9519805 -0.493668,1.8015395 -1.0625,2.5000005 l -2.5,-2.5000005 z m -1.6562503,0.7187505 0,3.5 c -0.932089,-0.103044 -1.7811031,-0.472504 -2.46875,-1.03125 l 2.46875,-2.46875 z m 1,0 2.4687503,2.5 c -0.687689,0.544344 -1.538834,0.905241 -2.4687503,1 l 0,-3.5 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 9.000211,2.0311595 c -0.246143,-0.00213 -0.48457,0.3250143 -0.5,0.96875 -2.897016,0.2545513 -5.243685,2.6023818 -5.5,5.5 -1.270395,0 -1.287472,0.96914 0,1 0.228319,2.9165635 2.584827,5.2192565 5.5,5.4687505 0,1.404649 1,1.356045 1,0 2.935396,-0.222296 5.24644,-2.531918 5.46875,-5.4687505 1.394629,0 1.355936,-1 0,-1 -0.249604,-2.9177553 -2.551719,-5.2731708 -5.46875,-5.5 0,-0.6351976 -0.253858,-0.9666155 -0.5,-0.96875 z m -0.5,2.28125 0,3.5 -2.46875,-2.46875 c 0.688492,-0.5601379 1.536531,-0.9285408 2.46875,-1.03125 z m 1,0 c 0.93137,0.098765 1.774011,0.4754302 2.46875,1.03125 l -2.46875,2.46875 0,-3.5 z m 3.1875,1.71875 c 0.558746,0.6876469 0.928206,1.536661 1.03125,2.46875 l -3.5,0 2.46875,-2.46875 z m -7.34375,0.03125 2.4375,2.4375 -3.46875,0 c 0.107683,-0.9146799 0.482886,-1.7563102 1.03125,-2.4375 z m 3.65625,2.1875 c 0.414213,0 0.75,0.3357863 0.75,0.75 0,0.414214 -0.335787,0.75 -0.75,0.75 -0.414214,0 -0.75,-0.335786 -0.75,-0.75 0,-0.4142137 0.335786,-0.75 0.75,-0.75 z m -4.6875,1.25 3.53125,0 -2.5,2.5000005 C 4.780132,11.302668 4.409666,10.441036 4.312711,9.4999095 z m 5.84375,0 3.5625,0 c -0.100162,0.9519805 -0.493668,1.8015395 -1.0625,2.5000005 l -2.5,-2.5000005 z m -1.65625,0.7187505 0,3.5 C 7.568122,13.615616 6.719108,13.246156 6.031461,12.68741 l 2.46875,-2.46875 z m 1,0 2.46875,2.5 c -0.687689,0.544344 -1.538834,0.905241 -2.46875,1 l 0,-3.5 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/cafe.16.svg b/symbols/cafe.16.svg
deleted file mode 100644
index d6060f46d1..0000000000
--- a/symbols/cafe.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 2,2 0,6 c 0,2 2,3 4.5,3 C 9,11 11,10 11,8 l 2,0 c 1,0 2,-1 2,-2 L 15,5 C 15,4 14,3 13,3 l -2,0 0,-1 z m 9,2.25 1.75,0 c 0.667788,0 1,0.5628359 1,1.25 0,0.6871641 -0.388201,1.25 -1,1.25 L 11,6.75 z M 1,12 c 0,1 1,2 2,2 l 7,0 c 1,0 2,-1 2,-2 z" />
-</svg>
diff --git a/symbols/cafe.18.svg b/symbols/cafe.18.svg
new file mode 100644
index 0000000000..c7ec78543c
--- /dev/null
+++ b/symbols/cafe.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="cafe">
+    <path
+       d="m 3,3 0,6 c 0,2 2,3 4.5,3 C 10,12 12,11 12,9 l 2,0 c 1,0 2,-1 2,-2 L 16,6 C 16,5 15,4 14,4 l -2,0 0,-1 z m 9,2.25 1.75,0 c 0.667788,0 1,0.5628359 1,1.25 0,0.6871641 -0.388201,1.25 -1,1.25 L 12,7.75 z M 2,13 c 0,1 1,2 2,2 l 7,0 c 1,0 2,-1 2,-2 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 3,3 0,6 c 0,2 2,3 4.5,3 C 10,12 12,11 12,9 l 2,0 c 1,0 2,-1 2,-2 L 16,6 C 16,5 15,4 14,4 l -2,0 0,-1 z m 9,2.25 1.75,0 c 0.667788,0 1,0.5628359 1,1.25 0,0.6871641 -0.388201,1.25 -1,1.25 L 12,7.75 z M 2,13 c 0,1 1,2 2,2 l 7,0 c 1,0 2,-1 2,-2 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/camping.16.svg b/symbols/camping.16.svg
deleted file mode 100644
index 12e40a440d..0000000000
--- a/symbols/camping.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 15,15 9.0000011,3.9999992 10.000001,1 9.0000011,1 8.0000012,2.9999995 7.0000003,1 6.0000005,1 7.0000003,3.9999992 1,15 z m -6.9999988,-7.0000008 2.9999998,6.0000018 -6.0000005,0 z" />
-</svg>
diff --git a/symbols/camping.18.svg b/symbols/camping.18.svg
new file mode 100644
index 0000000000..a1042cdbe1
--- /dev/null
+++ b/symbols/camping.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="camping">
+    <path
+       d="M 16,16 10.000001,4.9999992 11.000001,2 l -1,0 L 9.0000012,3.9999995 8.0000003,2 7.0000005,2 8.0000003,4.9999992 2,16 z m -6.9999988,-7.0000008 2.9999998,6.0000018 -6.0000005,0 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 16,16 10.000001,4.9999992 11.000001,2 l -1,0 -1,1.9999995 L 8,2 7,2 8,4.9999992 2,16 z m -6.999999,-7.0000008 3,6.0000018 -6.000001,0 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/christian.16.svg b/symbols/christian.16.svg
deleted file mode 100644
index da6b146ceb..0000000000
--- a/symbols/christian.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 7.999999,1 C 6.999998,1 7,2 7,2 l -1e-6,3 -4,0 0,2 4,0 L 7,15 9.000001,15 9,7 13,7 13,5 9,5 9,2 C 9,2 9,1 7.999999,1 z" />
-</svg>
diff --git a/symbols/christian.18.svg b/symbols/christian.18.svg
new file mode 100644
index 0000000000..0c61f6233b
--- /dev/null
+++ b/symbols/christian.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="christian">
+    <path
+       d="M 9,2 C 7.999999,2 8.000001,3 8.000001,3 L 8,6 4,6 l 0,2 4,0 10e-7,8 2.000001,0 -1e-6,-8 4,0 0,-2 -4,0 0,-3 c 0,0 0,-1 -1.000001,-1 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 9,2 C 7.999999,2 8.000001,3 8.000001,3 L 8,6 4,6 l 0,2 4,0 10e-7,8 2.000001,0 -1e-6,-8 4,0 0,-2 -4,0 0,-3 c 0,0 0,-1 -1.000001,-1 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/cinema.16.svg b/symbols/cinema.16.svg
deleted file mode 100644
index c383d87acc..0000000000
--- a/symbols/cinema.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 2,2 C 1.446,2 1,2.446 1,3 l 0,11 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 L 15,3 C 15,2.446 14.554,2 14,2 L 2,2 z m 0.25,1 0.5,0 C 2.8885,3 3,3.1115 3,3.25 l 0,0.5 C 3,3.8885 2.8885,4 2.75,4 L 2.25,4 C 2.1115,4 2,3.8885 2,3.75 L 2,3.25 C 2,3.1115 2.1115,3 2.25,3 z M 5,3 11,3 11,8 5,8 5,3 z m 8.25,0 0.5,0 C 13.8885,3 14,3.1115 14,3.25 l 0,0.5 C 14,3.8885 13.8885,4 13.75,4 l -0.5,0 C 13.1115,4 13,3.8885 13,3.75 l 0,-0.5 C 13,3.1115 13.1115,3 13.25,3 z m -11,2 0.5,0 C 2.8885,5 3,5.1115 3,5.25 l 0,0.5 C 3,5.8885 2.8885,6 2.75,6 L 2.25,6 C 2.1115,6 2,5.8885 2,5.75 L 2,5.25 C 2,5.1115 2.1115,5 2.25,5 z m 11,0 0.5,0 C 13.8885,5 14,5.1115 14,5.25 l 0,0.5 C 14,5.8885 13.8885,6 13.75,6 l -0.5,0 C 13.1115,6 13,5.8885 13,5.75 l 0,-0.5 C 13,5.1115 13.1115,5 13.25,5 z m -11,2 0.5,0 C 2.8885,7 3,7.1115 3,7.25 l 0,0.5 C 3,7.8885 2.8885,8 2.75,8 L 2.25,8 C 2.1115,8 2,7.8885 2,7.75 L 2,7.25 C 2,7.1115 2.1115,7 2.25,7 z m 11,0 0.5,0 C 13.8885,7 14,7.1115 14,7.25 l 0,0.5 C 14,7.8885 13.8885,8 13.75,8 l -0.5,0 C 13.1115,8 13,7.8885 13,7.75 l 0,-0.5 C 13,7.1115 13.1115,7 13.25,7 z m -11,2 0.5,0 C 2.8885,9 3,9.1115 3,9.25 l 0,0.5 C 3,9.8885 2.8885,10 2.75,10 l -0.5,0 C 2.1115,10 2,9.8885 2,9.75 L 2,9.25 C 2,9.1115 2.1115,9 2.25,9 z M 5,9 l 6,0 0,5 -6,0 0,-5 z m 8.25,0 0.5,0 C 13.8885,9 14,9.1115 14,9.25 l 0,0.5 C 14,9.8885 13.8885,10 13.75,10 l -0.5,0 C 13.1115,10 13,9.8885 13,9.75 l 0,-0.5 C 13,9.1115 13.1115,9 13.25,9 z m -11,2 0.5,0 C 2.8885,11 3,11.1115 3,11.25 l 0,0.5 C 3,11.8885 2.8885,12 2.75,12 l -0.5,0 C 2.1115,12 2,11.8885 2,11.75 l 0,-0.5 C 2,11.1115 2.1115,11 2.25,11 z m 11,0 0.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.5 C 14,11.8885 13.8885,12 13.75,12 l -0.5,0 C 13.1115,12 13,11.8885 13,11.75 l 0,-0.5 C 13,11.1115 13.1115,11 13.25,11 z m -11,2 0.5,0 C 2.8885,13 3,13.1115 3,13.25 l 0,0.5 C 3,13.8885 2.8885,14 2.75,14 l -0.5,0 C 2.1115,14 2,13.8885 2,13.75 l 0,-0.5 C 2,13.1115 2.1115,13 2.25,13 z m 11,0 0.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.5 C 14,13.8885 13.8885,14 13.75,14 l -0.5,0 C 13.1115,14 13,13.8885 13,13.75 l 0,-0.5 C 13,13.1115 13.1115,13 13.25,13 z" />
-</svg>
diff --git a/symbols/cinema.18.svg b/symbols/cinema.18.svg
new file mode 100644
index 0000000000..4a77e066c9
--- /dev/null
+++ b/symbols/cinema.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="cinema">
+    <path
+       d="M 3,3 C 2.446,3 2,3.446 2,4 l 0,11 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 L 16,4 C 16,3.446 15.554,3 15,3 L 3,3 z m 0.25,1 0.5,0 C 3.8885,4 4,4.1115 4,4.25 l 0,0.5 C 4,4.8885 3.8885,5 3.75,5 L 3.25,5 C 3.1115,5 3,4.8885 3,4.75 L 3,4.25 C 3,4.1115 3.1115,4 3.25,4 z M 6,4 12,4 12,9 6,9 6,4 z m 8.25,0 0.5,0 C 14.8885,4 15,4.1115 15,4.25 l 0,0.5 C 15,4.8885 14.8885,5 14.75,5 l -0.5,0 C 14.1115,5 14,4.8885 14,4.75 l 0,-0.5 C 14,4.1115 14.1115,4 14.25,4 z m -11,2 0.5,0 C 3.8885,6 4,6.1115 4,6.25 l 0,0.5 C 4,6.8885 3.8885,7 3.75,7 L 3.25,7 C 3.1115,7 3,6.8885 3,6.75 L 3,6.25 C 3,6.1115 3.1115,6 3.25,6 z m 11,0 0.5,0 C 14.8885,6 15,6.1115 15,6.25 l 0,0.5 C 15,6.8885 14.8885,7 14.75,7 l -0.5,0 C 14.1115,7 14,6.8885 14,6.75 l 0,-0.5 C 14,6.1115 14.1115,6 14.25,6 z m -11,2 0.5,0 C 3.8885,8 4,8.1115 4,8.25 l 0,0.5 C 4,8.8885 3.8885,9 3.75,9 L 3.25,9 C 3.1115,9 3,8.8885 3,8.75 L 3,8.25 C 3,8.1115 3.1115,8 3.25,8 z m 11,0 0.5,0 C 14.8885,8 15,8.1115 15,8.25 l 0,0.5 C 15,8.8885 14.8885,9 14.75,9 l -0.5,0 C 14.1115,9 14,8.8885 14,8.75 l 0,-0.5 C 14,8.1115 14.1115,8 14.25,8 z m -11,2 0.5,0 C 3.8885,10 4,10.1115 4,10.25 l 0,0.5 C 4,10.8885 3.8885,11 3.75,11 l -0.5,0 C 3.1115,11 3,10.8885 3,10.75 l 0,-0.5 C 3,10.1115 3.1115,10 3.25,10 z m 2.75,0 6,0 0,5 -6,0 0,-5 z m 8.25,0 0.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.5 C 15,10.8885 14.8885,11 14.75,11 l -0.5,0 C 14.1115,11 14,10.8885 14,10.75 l 0,-0.5 C 14,10.1115 14.1115,10 14.25,10 z m -11,2 0.5,0 C 3.8885,12 4,12.1115 4,12.25 l 0,0.5 C 4,12.8885 3.8885,13 3.75,13 l -0.5,0 C 3.1115,13 3,12.8885 3,12.75 l 0,-0.5 C 3,12.1115 3.1115,12 3.25,12 z m 11,0 0.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.5 C 15,12.8885 14.8885,13 14.75,13 l -0.5,0 C 14.1115,13 14,12.8885 14,12.75 l 0,-0.5 C 14,12.1115 14.1115,12 14.25,12 z m -11,2 0.5,0 C 3.8885,14 4,14.1115 4,14.25 l 0,0.5 C 4,14.8885 3.8885,15 3.75,15 l -0.5,0 C 3.1115,15 3,14.8885 3,14.75 l 0,-0.5 C 3,14.1115 3.1115,14 3.25,14 z m 11,0 0.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.5 C 15,14.8885 14.8885,15 14.75,15 l -0.5,0 C 14.1115,15 14,14.8885 14,14.75 l 0,-0.5 C 14,14.1115 14.1115,14 14.25,14 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 3,3 C 2.446,3 2,3.446 2,4 l 0,11 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 L 16,4 C 16,3.446 15.554,3 15,3 L 3,3 z m 0.25,1 0.5,0 C 3.8885,4 4,4.1115 4,4.25 l 0,0.5 C 4,4.8885 3.8885,5 3.75,5 L 3.25,5 C 3.1115,5 3,4.8885 3,4.75 L 3,4.25 C 3,4.1115 3.1115,4 3.25,4 z M 6,4 12,4 12,9 6,9 6,4 z m 8.25,0 0.5,0 C 14.8885,4 15,4.1115 15,4.25 l 0,0.5 C 15,4.8885 14.8885,5 14.75,5 l -0.5,0 C 14.1115,5 14,4.8885 14,4.75 l 0,-0.5 C 14,4.1115 14.1115,4 14.25,4 z m -11,2 0.5,0 C 3.8885,6 4,6.1115 4,6.25 l 0,0.5 C 4,6.8885 3.8885,7 3.75,7 L 3.25,7 C 3.1115,7 3,6.8885 3,6.75 L 3,6.25 C 3,6.1115 3.1115,6 3.25,6 z m 11,0 0.5,0 C 14.8885,6 15,6.1115 15,6.25 l 0,0.5 C 15,6.8885 14.8885,7 14.75,7 l -0.5,0 C 14.1115,7 14,6.8885 14,6.75 l 0,-0.5 C 14,6.1115 14.1115,6 14.25,6 z m -11,2 0.5,0 C 3.8885,8 4,8.1115 4,8.25 l 0,0.5 C 4,8.8885 3.8885,9 3.75,9 L 3.25,9 C 3.1115,9 3,8.8885 3,8.75 L 3,8.25 C 3,8.1115 3.1115,8 3.25,8 z m 11,0 0.5,0 C 14.8885,8 15,8.1115 15,8.25 l 0,0.5 C 15,8.8885 14.8885,9 14.75,9 l -0.5,0 C 14.1115,9 14,8.8885 14,8.75 l 0,-0.5 C 14,8.1115 14.1115,8 14.25,8 z m -11,2 0.5,0 C 3.8885,10 4,10.1115 4,10.25 l 0,0.5 C 4,10.8885 3.8885,11 3.75,11 l -0.5,0 C 3.1115,11 3,10.8885 3,10.75 l 0,-0.5 C 3,10.1115 3.1115,10 3.25,10 z m 2.75,0 6,0 0,5 -6,0 0,-5 z m 8.25,0 0.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.5 C 15,10.8885 14.8885,11 14.75,11 l -0.5,0 C 14.1115,11 14,10.8885 14,10.75 l 0,-0.5 C 14,10.1115 14.1115,10 14.25,10 z m -11,2 0.5,0 C 3.8885,12 4,12.1115 4,12.25 l 0,0.5 C 4,12.8885 3.8885,13 3.75,13 l -0.5,0 C 3.1115,13 3,12.8885 3,12.75 l 0,-0.5 C 3,12.1115 3.1115,12 3.25,12 z m 11,0 0.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.5 C 15,12.8885 14.8885,13 14.75,13 l -0.5,0 C 14.1115,13 14,12.8885 14,12.75 l 0,-0.5 C 14,12.1115 14.1115,12 14.25,12 z m -11,2 0.5,0 C 3.8885,14 4,14.1115 4,14.25 l 0,0.5 C 4,14.8885 3.8885,15 3.75,15 l -0.5,0 C 3.1115,15 3,14.8885 3,14.75 l 0,-0.5 C 3,14.1115 3.1115,14 3.25,14 z m 11,0 0.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,0.5 C 15,14.8885 14.8885,15 14.75,15 l -0.5,0 C 14.1115,15 14,14.8885 14,14.75 l 0,-0.5 C 14,14.1115 14.1115,14 14.25,14 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/communications.16.svg b/symbols/communications.16.svg
deleted file mode 100644
index 58f31ebbac..0000000000
--- a/symbols/communications.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 5,1.40625 C 3.2327602,2.1855669 1.96875,3.9521023 1.96875,6 1.96875,8.0478977 3.2327602,9.8144331 5,10.59375 L 5,9.4375 C 3.8044698,8.7467087 3,7.4881502 3,6 3,4.5118498 3.8044698,3.2532914 5,2.5625 L 5,1.40625 z m 6,0 0,1.15625 C 12.19553,3.2532914 13,4.5118498 13,6 13,7.4881502 12.19553,8.7467087 11,9.4375 l 0,1.15625 C 12.76724,9.8144331 14.03125,8.0478977 14.03125,6 14.03125,3.9521023 12.76724,2.1855669 11,1.40625 z M 6,3.1875 C 4.8429537,3.6043642 4,4.7033306 4,6 4,7.2966694 4.8429537,8.3956358 6,8.8125 L 6,7.71875 C 5.4030811,7.3740292 5,6.7435697 5,6 5,5.2564303 5.4030811,4.6259708 6,4.28125 L 6,3.1875 z m 4,0 0,1.09375 C 10.596919,4.6259708 11,5.2564303 11,6 11,6.7435697 10.596919,7.3740292 10,7.71875 L 10,8.8125 C 11.157046,8.3956358 12,7.2966694 12,6 12,4.7033306 11.157046,3.6043642 10,3.1875 z M 7.84375,5 C 7.5625,5.046875 7,5.25 7,6 l 0,8 -3,0 0,1 8,0 0,-1 -3,0 0,-8 C 9,5 8,5 8,5 8,5 7.9375,4.984375 7.84375,5 z" />
-</svg>
diff --git a/symbols/communications.18.svg b/symbols/communications.18.svg
new file mode 100644
index 0000000000..ee3ad36288
--- /dev/null
+++ b/symbols/communications.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="mast-communications">
+    <path
+       d="M 6.00025,2.40625 C 4.2330102,3.1855669 2.969,4.9521023 2.969,7 c 0,2.047898 1.2640102,3.814433 3.03125,4.59375 l 0,-1.15625 c -1.1955302,-0.690791 -2,-1.9493498 -2,-3.4375 0,-1.4881502 0.8044698,-2.7467086 2,-3.4375 l 0,-1.15625 z m 6,0 0,1.15625 c 1.19553,0.6907914 2,1.9493498 2,3.4375 0,1.4881502 -0.80447,2.746709 -2,3.4375 l 0,1.15625 C 13.76749,10.814433 15.0315,9.047898 15.0315,7 c 0,-2.0478977 -1.26401,-3.8144331 -3.03125,-4.59375 z m -5,1.78125 c -1.1570463,0.4168642 -2,1.5158306 -2,2.8125 0,1.2966694 0.8429537,2.395636 2,2.8125 l 0,-1.09375 c -0.5969189,-0.3447208 -1,-0.9751803 -1,-1.71875 0,-0.7435697 0.4030811,-1.3740292 1,-1.71875 l 0,-1.09375 z m 4,0 0,1.09375 c 0.596919,0.3447208 1,0.9751803 1,1.71875 0,0.7435697 -0.403081,1.3740292 -1,1.71875 l 0,1.09375 c 1.157046,-0.416864 2,-1.5158306 2,-2.8125 0,-1.2966694 -0.842954,-2.3956358 -2,-2.8125 z M 8.844,6 C 8.56275,6.046875 8.00025,6.25 8.00025,7 l 0,8 -3,0 0,1 8,0 0,-1 -3,0 0,-8 c 0,-1 -1,-1 -1,-1 0,0 -0.0625,-0.015625 -0.15625,0 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 6.00025,2.40625 C 4.23301,3.1855669 2.969,4.9521023 2.969,7 c 0,2.047898 1.26401,3.814433 3.03125,4.59375 l 0,-1.15625 c -1.19553,-0.690791 -2,-1.9493498 -2,-3.4375 0,-1.4881502 0.80447,-2.7467086 2,-3.4375 l 0,-1.15625 z m 6,0 0,1.15625 c 1.19553,0.6907914 2,1.9493498 2,3.4375 0,1.4881502 -0.80447,2.746709 -2,3.4375 l 0,1.15625 C 13.76749,10.814433 15.0315,9.047898 15.0315,7 c 0,-2.0478977 -1.26401,-3.8144331 -3.03125,-4.59375 z m -5,1.78125 c -1.157046,0.4168642 -2,1.5158306 -2,2.8125 0,1.2966694 0.842954,2.395636 2,2.8125 l 0,-1.09375 c -0.596919,-0.3447208 -1,-0.9751803 -1,-1.71875 0,-0.7435697 0.403081,-1.3740292 1,-1.71875 l 0,-1.09375 z m 4,0 0,1.09375 c 0.596919,0.3447208 1,0.9751803 1,1.71875 0,0.7435697 -0.403081,1.3740292 -1,1.71875 l 0,1.09375 c 1.157046,-0.416864 2,-1.5158306 2,-2.8125 0,-1.2966694 -0.842954,-2.3956358 -2,-2.8125 z M 8.844,6 C 8.56275,6.046875 8.00025,6.25 8.00025,7 l 0,8 -3,0 0,1 8,0 0,-1 -3,0 0,-8 c 0,-1 -1,-1 -1,-1 0,0 -0.0625,-0.015625 -0.15625,0 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/dentist.16.svg b/symbols/dentist.16.svg
deleted file mode 100644
index 8cae7f50d6..0000000000
--- a/symbols/dentist.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 8,9 c 2,0 2,1 2,3 0,1 -1.0091211,3 0,3 1,0 1.751359,-1.142963 2,-3 0.248641,-1.857037 0,-3 0,-4 C 12,6 13,4 13,3 13,2 12.599761,1.21742 12,1 10,1 10,2 8,2 6,2 6,1 4,1 3.400799,1.21742 3,2 3,3 c 0,1 1,3 1,5 0,1 -0.1223902,2.57334 0,4 0.1223902,1.42666 1,3 2,3 1.008702,0 0,-2 0,-3 0,-2 0,-3 2,-3 z" />
-</svg>
diff --git a/symbols/dentist.18.svg b/symbols/dentist.18.svg
new file mode 100644
index 0000000000..1072068f55
--- /dev/null
+++ b/symbols/dentist.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="dentist">
+    <path
+       d="m 9,10 c 2,0 2,1 2,3 0,1 -1.0091211,3 0,3 1,0 1.751359,-1.142963 2,-3 0.248641,-1.857037 0,-3 0,-4 C 13,7 14,5 14,4 14,3 13.599761,2.21742 13,2 11,2 11,3 9,3 7,3 7,2 5,2 4.400799,2.21742 4,3 4,4 c 0,1 1,3 1,5 0,1 -0.1223902,2.57334 0,4 0.1223902,1.42666 1,3 2,3 1.008702,0 0,-2 0,-3 0,-2 0,-3 2,-3 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 9,10 c 2,0 2,1 2,3 0,1 -1.009121,3 0,3 1,0 1.751359,-1.142963 2,-3 0.248641,-1.857037 0,-3 0,-4 C 13,7 14,5 14,4 14,3 13.599761,2.21742 13,2 11,2 11,3 9,3 7,3 7,2 5,2 4.400799,2.21742 4,3 4,4 c 0,1 1,3 1,5 0,1 -0.12239,2.57334 0,4 0.12239,1.42666 1,3 2,3 1.008702,0 0,-2 0,-3 0,-2 0,-3 2,-3 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/doctors.16.svg b/symbols/doctors.16.svg
deleted file mode 100644
index 484b3992f8..0000000000
--- a/symbols/doctors.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 8,2 C 6.83929,2 5.6678336,2.5047052 4.875,3.5 4.1875142,4.3630449 4,5 3.90625,6.0000004 1.01009,6.0238004 1,7.0817104 1,14 l 14,0 C 15,7.0817104 14.9899,6.0237504 12.09375,6.0000004 12,5 11.795537,4.3460958 11.125,3.5 10.334655,2.5027279 9.16071,2 8,2 z m 0,2 c 1.281412,-0.00489 2,1 2.0625,2.0000004 l -4.125,0 C 6,5 6.718588,4.0048937 8,4 z m -1,3.0000004 2,0 L 9,9 l 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z" />
-</svg>
diff --git a/symbols/doctors.18.svg b/symbols/doctors.18.svg
new file mode 100644
index 0000000000..ddeade7757
--- /dev/null
+++ b/symbols/doctors.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="doctor">
+    <path
+       d="M 9,3 C 7.83929,3 6.6678336,3.5047052 5.875,4.5 5.1875142,5.3630449 5,6 4.90625,7.0000004 2.01009,7.0238004 2,8.0817104 2,15 l 14,0 C 16,8.0817104 15.9899,7.0237504 13.09375,7.0000004 13,6 12.795537,5.3460958 12.125,4.5 11.334655,3.5027279 10.16071,3 9,3 z m 0,2 c 1.281412,-0.00489 2,1 2.0625,2.0000004 l -4.125,0 C 7,6 7.718588,5.0048937 9,5 z m -1,3.0000004 2,0 L 10,10 l 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 9,3 C 7.83929,3 6.667834,3.5047052 5.875,4.5 5.187514,5.3630449 5,6 4.90625,7.0000004 2.01009,7.0238004 2,8.0817104 2,15 l 14,0 C 16,8.0817104 15.9899,7.0237504 13.09375,7.0000004 13,6 12.795537,5.3460958 12.125,4.5 11.334655,3.5027279 10.16071,3 9,3 z m 0,2 c 1.281412,-0.00489 2,1 2.0625,2.0000004 l -4.125,0 C 7,6 7.718588,5.0048937 9,5 z m -1,3.0000004 2,0 L 10,10 l 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/drinking_water.16.svg b/symbols/drinking_water.16.svg
deleted file mode 100644
index 7e7b0af052..0000000000
--- a/symbols/drinking_water.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 2,7 1.5,8 5,0 L 10,7 z M 3.18,8 8.81,8 8.44,10 3.55,10 M 5,6 C 5,4 6,3 8,3 L 9,3 9,2 8,2 C 7,2 7,1 8,1 l 3,0 c 1,0 1,1 0,1 l -1,0 0,1 4,0 0,1.5 -6,0 C 6.9152599,4.4911116 6.5,4.9824765 6.5,6 z" />
-</svg>
diff --git a/symbols/drinking_water.18.svg b/symbols/drinking_water.18.svg
new file mode 100644
index 0000000000..3bfc6eb134
--- /dev/null
+++ b/symbols/drinking_water.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="drinking-water">
+    <path
+       d="m 3,8 1.5,8 5,0 L 11,8 z M 4.18,9 9.81,9 9.44,11 4.55,11 M 6,7 C 6,5 7,4 9,4 L 10,4 10,3 9,3 C 8,3 8,2 9,2 l 3,0 c 1,0 1,1 0,1 l -1,0 0,1 4,0 0,1.5 -6,0 C 7.9152599,5.4911116 7.5,5.9824765 7.5,7 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 3,8 1.5,8 5,0 L 11,8 z M 4.18,9 9.81,9 9.44,11 4.55,11 M 6,7 C 6,5 7,4 9,4 L 10,4 10,3 9,3 C 8,3 8,2 9,2 l 3,0 c 1,0 1,1 0,1 l -1,0 0,1 4,0 0,1.5 -6,0 C 7.91526,5.49111 7.5,5.9824765 7.5,7 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1" />
+  </g>
+</svg>
diff --git a/symbols/embassy.16.svg b/symbols/embassy.16.svg
deleted file mode 100644
index 0d2350009c..0000000000
--- a/symbols/embassy.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 9,2 C 6,4 4,2 4,2 l 0,7 c 0,0 2,2 5,0 3,-2 5,0 5,0 L 14,2 C 14,2 12,0 9,2 z M 2.5,1.25 C 2.25,1.25 2,1.5 2,2 l 0,12 c 0,1 1,1 1,0 L 3,2 C 3,1.5 2.75,1.25 2.5,1.25 z" />
-</svg>
diff --git a/symbols/embassy.18.svg b/symbols/embassy.18.svg
new file mode 100644
index 0000000000..d7ab03d2fd
--- /dev/null
+++ b/symbols/embassy.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="embassy">
+    <path
+       d="M 10,3 C 7,5 5,3 5,3 l 0,7 c 0,0 2,2 5,0 3,-2 5,0 5,0 L 15,3 C 15,3 13,1 10,3 z M 3.5,2.25 C 3.25,2.25 3,2.5 3,3 l 0,12 c 0,1 1,1 1,0 L 4,3 C 4,2.5 3.75,2.25 3.5,2.25 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 10,3 C 7,5 5,3 5,3 l 0,7 c 0,0 2,2 5,0 3,-2 5,0 5,0 L 15,3 C 15,3 13,1 10,3 z M 3.5,2.25 C 3.25,2.25 3,2.5 3,3 l 0,12 c 0,1 1,1 1,0 L 4,3 C 4,2.5 3.75,2.25 3.5,2.25 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/fast_food.16.svg b/symbols/fast_food.16.svg
deleted file mode 100644
index f5377083ab..0000000000
--- a/symbols/fast_food.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 6,4 C 3,4 1.960032,6.000799 2,7 L 2,8 14,8 14,7 C 14,6 13,4 10,4 z M 2,9 c -1,0 -1,1 0,1 l 12,0 c 1,0 1,-1 0,-1 z m 0,2.03125 0,0.625 C 2,12.34045 2.81579,13 3.5,13 l 9,0 c 0.68421,0 1.5,-0.65955 1.5,-1.34375 l 0,-0.625 z" />
-</svg>
diff --git a/symbols/fast_food.18.svg b/symbols/fast_food.18.svg
new file mode 100644
index 0000000000..b3729893b2
--- /dev/null
+++ b/symbols/fast_food.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="fast-food">
+    <path
+       d="M 7,5 C 4,5 2.960032,7.000799 3,8 L 3,9 15,9 15,8 C 15,7 14,5 11,5 z m -4,5 c -1,0 -1,1 0,1 l 12,0 c 1,0 1,-1 0,-1 z m 0,2.03125 0,0.625 C 3,13.34045 3.81579,14 4.5,14 l 9,0 c 0.68421,0 1.5,-0.65955 1.5,-1.34375 l 0,-0.625 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 7,5 C 4,5 2.960032,7.000799 3,8 L 3,9 15,9 15,8 C 15,7 14,5 11,5 z m -4,5 c -1,0 -1,1 0,1 l 12,0 c 1,0 1,-1 0,-1 z m 0,2.03125 0,0.625 C 3,13.34045 3.81579,14 4.5,14 l 9,0 c 0.68421,0 1.5,-0.65955 1.5,-1.34375 l 0,-0.625 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/firestation.16.svg b/symbols/firestation.16.svg
deleted file mode 100644
index 2b9a6260a3..0000000000
--- a/symbols/firestation.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 8,1 C 4.4241613,2.2414283 3,6 3,9 3,12 4.7449329,14.259763 7,15 5,11.741416 5,9 8,7 c -0.5049218,1.3528175 0,4 1,5 0.431455,-0.400757 1,-1.424727 1,-2 2,2 0.562898,3.633261 0,5 1.08818,-0.559102 3,-2 3,-5 C 13,7 11,6 11,3 9.6164844,3.5992431 9,5 9,6 8.0479394,5.4434404 7,3.2464256 8,1 z" />
-</svg>
diff --git a/symbols/firestation.18.svg b/symbols/firestation.18.svg
new file mode 100644
index 0000000000..88a5afb6dd
--- /dev/null
+++ b/symbols/firestation.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="fire-station">
+    <path
+       d="m 9,2 c -3.5758387,1.2414283 -5,5 -5,8 0,3 1.7449329,5.259763 4,6 -2,-3.258584 -2,-6 1,-8 -0.5049218,1.352818 0,4 1,5 0.431455,-0.400757 1,-1.424727 1,-2 2,2 0.562898,3.633261 0,5 1.08818,-0.559102 3,-2 3,-5 C 14,8 12,7 12,4 10.616484,4.5992431 10,6 10,7 9.0479394,6.4434404 8,4.2464256 9,2 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 9,2 c -3.575839,1.2414283 -5,5 -5,8 0,3 1.744933,5.259763 4,6 -2,-3.258584 -2,-6 1,-8 -0.504922,1.352818 0,4 1,5 0.431455,-0.400757 1,-1.424727 1,-2 2,2 0.562898,3.633261 0,5 1.08818,-0.559102 3,-2 3,-5 C 14,8 12,7 12,4 10.616484,4.5992431 10,6 10,7 9.047939,6.4434404 8,4.2464256 9,2 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/fuel.16.svg b/symbols/fuel.16.svg
deleted file mode 100644
index fcacd89d87..0000000000
--- a/symbols/fuel.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 11.78125,1 -0.625,0.71875 1.1875,1.09375 c 0.03621,0.036212 0.0856,0.084693 0.125,0.125 l -0.25,0.28125 C 11.818532,3.6189681 12.105689,4.1369332 12.25,4.28125 L 13,5.03125 13,11 c 0,1 -0.392136,1 -0.5,1 C 12.392136,12 12,12 12,11 L 12,7 C 12,5.7190916 11,5 10,5 L 10,3 C 10,2.4486964 9.5752733,2 9,2 L 3,2 C 2.400757,2 2,2.4247267 2,3 l 0,12 8,0 0,-9 c 0,0 1,0 1,1 l 0,4 c 0,2 1.239698,2 1.5,2 0.275652,0 1.5,0 1.5,-2 L 14,4 C 14,3 13.713983,2.7907839 13.375,2.46875 L 11.78125,1 z M 3,4 9,4 9,7 3,7 3,4 z" />
-</svg>
diff --git a/symbols/fuel.18.svg b/symbols/fuel.18.svg
new file mode 100644
index 0000000000..e5206f8354
--- /dev/null
+++ b/symbols/fuel.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="fuel">
+    <path
+       d="m 12.78125,2 -0.625,0.71875 1.1875,1.09375 c 0.03621,0.036212 0.0856,0.084693 0.125,0.125 l -0.25,0.28125 C 12.818532,4.6189681 13.105689,5.1369332 13.25,5.28125 L 14,6.03125 14,12 c 0,1 -0.392136,1 -0.5,1 C 13.392136,13 13,13 13,12 L 13,8 C 13,6.7190916 12,6 11,6 L 11,4 C 11,3.4486964 10.575273,3 10,3 L 4,3 C 3.400757,3 3,3.4247267 3,4 l 0,12 8,0 0,-9 c 0,0 1,0 1,1 l 0,4 c 0,2 1.239698,2 1.5,2 0.275652,0 1.5,0 1.5,-2 L 15,5 C 15,4 14.713983,3.7907839 14.375,3.46875 L 12.78125,2 z M 4,5 10,5 10,8 4,8 4,5 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 12.78125,2 -0.625,0.71875 1.1875,1.09375 c 0.03621,0.036212 0.0856,0.084693 0.125,0.125 l -0.25,0.28125 C 12.818532,4.6189681 13.105689,5.1369332 13.25,5.28125 L 14,6.03125 14,12 c 0,1 -0.392136,1 -0.5,1 C 13.392136,13 13,13 13,12 L 13,8 C 13,6.7190916 12,6 11,6 L 11,4 C 11,3.4486964 10.575273,3 10,3 L 4,3 C 3.400757,3 3,3.4247267 3,4 l 0,12 8,0 0,-9 c 0,0 1,0 1,1 l 0,4 c 0,2 1.239698,2 1.5,2 0.275652,0 1.5,0 1.5,-2 L 15,5 C 15,4 14.713983,3.7907839 14.375,3.46875 L 12.78125,2 z M 4,5 10,5 10,8 4,8 4,5 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/hinduist.16.svg b/symbols/hinduist.16.svg
deleted file mode 100644
index 113725bb4f..0000000000
--- a/symbols/hinduist.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 7,3 C 7,3 8.598346,5.8202261 11,3.5 11.330985,4 12,5 12,5 12,5 8.5566276,7.3559064 7,3 z M 2,5 C 2.2886214,5.6087858 2.6605301,6.357316 3,7 3.5044529,6 5,6 5,6 6,6 6.7338601,6.3918109 6.7338601,7.0271271 6.7338601,7.6624433 6,8 5,8 5,8 5,9 5,9.5 6.3108541,9.251282 7.0026347,10.289559 6.6821476,11.006988 6.074951,12.36634 2.5039264,12.526644 1,10 c 0,3.987823 3.4414924,4 4,4 2,0 3,-2 3,-4 0.5208035,0.543036 1.354855,0.545623 2,0 0.904803,-0.7652747 1.258697,-2.0101204 2.5,-2 1.513712,0.012341 1.5,3 0.5,4 -1,1 -3.3940417,0.644701 -4,-1 0,1 0,3.001353 3,3 3,-0.0014 3.608129,-3.383953 2.5,-6 C 13.815126,6.3831655 12.532891,5.9499041 11.150024,6.3783041 10.081908,6.7092042 10.130789,7.1826541 9.5,8 9.1705614,8.3957084 9,9 8,9 7.6528812,9 7.2283233,8.7255178 7,8.5 8.2381398,7.6151627 8.0558004,5.9129516 7,5 5.6121477,3.7999227 3.1598684,4.0452627 2,5 z M 8,3 9,2 10,3 9,4 z" />
-</svg>
diff --git a/symbols/hinduist.18.svg b/symbols/hinduist.18.svg
new file mode 100644
index 0000000000..1e42e70bcf
--- /dev/null
+++ b/symbols/hinduist.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="hinduist">
+    <path
+       d="m 8,3.9999993 c 0,0 1.598346,2.8202261 4,0.5 0.330985,0.5 1,1.5 1,1.5 0,0 -3.4433724,2.3559064 -5,-2 z m -5,2 c 0.2886214,0.6087858 0.6605301,1.357316 1,2 0.5044529,-1 2,-1 2,-1 1,0 1.7338601,0.3918109 1.7338601,1.0271271 C 7.7338601,8.6624426 7,8.9999993 6,8.9999993 c 0,0 0,1 0,1.4999997 1.3108541,-0.248718 2.0026347,0.789559 1.6821476,1.506988 C 7.074951,13.366339 3.5039264,13.526643 2,10.999999 c 0,3.987823 3.4414924,4 4,4 2,0 3,-2 3,-4 0.5208035,0.543036 1.354855,0.545623 2,0 0.904803,-0.765275 1.258697,-2.0101201 2.5,-1.9999997 1.513712,0.01234 1.5,2.9999997 0.5,3.9999997 -1,1 -3.394042,0.644701 -4,-1 0,1 0,3.001353 3,3 3,-0.0014 3.608129,-3.383953 2.5,-5.9999997 C 14.815126,7.3831648 13.532891,6.9499034 12.150024,7.3783034 11.081908,7.7092035 11.130789,8.1826534 10.5,8.9999993 c -0.329439,0.395708 -0.5,1 -1.5,1 -0.3471188,0 -0.7716767,-0.274482 -1,-0.5 1.2381398,-0.8848373 1.0558004,-2.5870484 0,-3.5 -1.3878523,-1.2000773 -3.8401316,-0.9547373 -5,0 z m 6,-2 1,-1 1,1 -1,1 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 8,3.9999993 c 0,0 1.598346,2.8202261 4,0.5 0.330985,0.5 1,1.5 1,1.5 0,0 -3.443372,2.3559064 -5,-2 z m -5,2 c 0.288621,0.6087858 0.66053,1.357316 1,2 0.504453,-1 2,-1 2,-1 1,0 1.73386,0.3918109 1.73386,1.0271271 C 7.73386,8.6624426 7,8.9999993 6,8.9999993 c 0,0 0,1 0,1.4999997 1.310854,-0.248718 2.002635,0.789559 1.682148,1.506988 C 7.074951,13.366339 3.503926,13.526643 2,10.999999 c 0,3.987823 3.441492,4 4,4 2,0 3,-2 3,-4 0.520803,0.543036 1.354855,0.545623 2,0 0.904803,-0.765275 1.258697,-2.0101201 2.5,-1.9999997 1.513712,0.01234 1.5,2.9999997 0.5,3.9999997 -1,1 -3.394042,0.644701 -4,-1 0,1 0,3.001353 3,3 3,-0.0014 3.608129,-3.383953 2.5,-5.9999997 C 14.815126,7.3831648 13.532891,6.9499034 12.150024,7.3783034 11.081908,7.7092035 11.130789,8.1826534 10.5,8.9999993 c -0.329439,0.395708 -0.5,1 -1.5,1 -0.347119,0 -0.771677,-0.274482 -1,-0.5 1.23814,-0.8848373 1.0558,-2.5870484 0,-3.5 -1.387852,-1.2000773 -3.840132,-0.9547373 -5,0 z m 6,-2 1,-1 1,1 -1,1 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/hospital.16.svg b/symbols/hospital.16.svg
deleted file mode 100644
index 21b5e9cbb6..0000000000
--- a/symbols/hospital.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 8,0.96875 C 4.1945765,0.96875 1.03125,4.0714285 1.03125,8 c 0,3.928572 3.1633265,7.03125 6.96875,7.03125 3.805424,0 6.96875,-3.102679 6.96875,-7.03125 C 14.96875,4.0714285 11.805424,0.96875 8,0.96875 z m 0,1.0625 c 3.374278,0 6.03125,2.7176196 6.03125,5.96875 0,3.251131 -2.656972,5.96875 -6.03125,5.96875 C 4.6257218,13.96875 1.96875,11.251131 1.96875,8 1.96875,4.7488696 4.6257218,2.03125 8,2.03125 z M 6,3 6,6 3,6 l 0,4 3,0 0,3 4,0 0,-3 3,0 0,-4 -3,0 0,-3 -4,0 z" />
-</svg>
diff --git a/symbols/hospital.18.svg b/symbols/hospital.18.svg
new file mode 100644
index 0000000000..9b915551d3
--- /dev/null
+++ b/symbols/hospital.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="hospital">
+    <path
+       d="M 9,2 C 5.1775118,2 2,5.0888888 2,9 c 0,3.911112 3.1775118,7 7,7 3.822489,0 7,-3.088889 7,-7 C 16,5.0888888 12.822489,2 9,2 z m 0,1.0577778 c 3.389409,0 6.058296,2.7055413 6.058296,5.9422222 0,3.236682 -2.668887,5.942222 -6.058296,5.942222 C 5.6105905,14.942222 2.941704,12.236682 2.941704,9 2.941704,5.7633191 5.6105905,3.0577778 9,3.0577778 z m -2.0089686,0.9644444 0,2.9866667 -3.0134529,0 0,3.9822221 3.0134529,0 0,2.986667 4.0179376,0 0,-2.986667 3.013453,0 0,-3.9822221 -3.013453,0 0,-2.9866667 -4.0179376,0 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 9,2 C 5.177512,2 2,5.0888888 2,9 c 0,3.911112 3.177512,7 7,7 3.822489,0 7,-3.088889 7,-7 C 16,5.0888888 12.822489,2 9,2 z m 0,1.0577778 c 3.389409,0 6.058296,2.7055413 6.058296,5.9422222 0,3.236682 -2.668887,5.942222 -6.058296,5.942222 C 5.610591,14.942222 2.941704,12.236682 2.941704,9 2.941704,5.7633191 5.610591,3.0577778 9,3.0577778 z m -2.008969,0.9644444 0,2.9866667 -3.013452,0 0,3.9822221 3.013452,0 0,2.986667 4.017938,0 0,-2.986667 3.013453,0 0,-3.9822221 -3.013453,0 0,-2.9866667 -4.017938,0 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/jewish.16.svg b/symbols/jewish.16.svg
deleted file mode 100644
index ab0db96be7..0000000000
--- a/symbols/jewish.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 8.03125,1.34375 6,4.875 l -4,0 2,3.5 -2,3.5 4,0 2.03125,3.53125 2,-3.53125 3.96875,0 -1.96875,-3.5 1.96875,-3.5 -3.96875,0 -2,-3.53125 z m 0,2.5 0.59375,1.03125 -1.1875,0 0.59375,-1.03125 z m -3.90625,2.1875 1.21875,0 -0.625,1.0625 L 4.125,6.03125 z m 2.65625,0 2.5,0 1.3125,2.34375 -1.3125,2.34375 -2.5,0 L 5.46875,8.375 6.78125,6.03125 z m 3.90625,0 1.25,0 -0.625,1.09375 -0.625,-1.09375 z m 0.625,3.59375 0.625,1.09375 -1.25,0 0.625,-1.09375 z m -6.59375,0.03125 0.625,1.0625 -1.21875,0 0.59375,-1.0625 z M 7.4375,11.875 8.625,11.875 8.03125,12.90625 7.4375,11.875 z" />
-</svg>
diff --git a/symbols/jewish.18.svg b/symbols/jewish.18.svg
new file mode 100644
index 0000000000..3f3ab4f827
--- /dev/null
+++ b/symbols/jewish.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="jewish">
+    <path
+       d="M 9.03125,2.3435 7,5.87475 l -4,0 2,3.5 -2,3.5 4,0 2.03125,3.53125 2,-3.53125 3.96875,0 -1.96875,-3.5 1.96875,-3.5 -3.96875,0 -2,-3.53125 z m 0,2.5 0.59375,1.03125 -1.1875,0 L 9.03125,4.8435 z M 5.125,7.031 l 1.21875,0 -0.625,1.0625 L 5.125,7.031 z m 2.65625,0 2.5,0 1.3125,2.34375 -1.3125,2.34375 -2.5,0 L 6.46875,9.37475 7.78125,7.031 z m 3.90625,0 1.25,0 -0.625,1.09375 -0.625,-1.09375 z m 0.625,3.59375 0.625,1.09375 -1.25,0 0.625,-1.09375 z m -6.59375,0.03125 0.625,1.0625 -1.21875,0 0.59375,-1.0625 z m 2.71875,2.21875 1.1875,0 L 9.03125,13.906 8.4375,12.87475 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 9.03125,2.3435 7,5.87475 l -4,0 2,3.5 -2,3.5 4,0 2.03125,3.53125 2,-3.53125 3.96875,0 -1.96875,-3.5 1.96875,-3.5 -3.96875,0 -2,-3.53125 z m 0,2.5 0.59375,1.03125 -1.1875,0 L 9.03125,4.8435 z M 5.125,7.031 l 1.21875,0 -0.625,1.0625 L 5.125,7.031 z m 2.65625,0 2.5,0 1.3125,2.34375 -1.3125,2.34375 -2.5,0 L 6.46875,9.37475 7.78125,7.031 z m 3.90625,0 1.25,0 -0.625,1.09375 -0.625,-1.09375 z m 0.625,3.59375 0.625,1.09375 -1.25,0 0.625,-1.09375 z m -6.59375,0.03125 0.625,1.0625 -1.21875,0 0.59375,-1.0625 z m 2.71875,2.21875 1.1875,0 L 9.03125,13.906 8.4375,12.87475 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/museum.16.svg b/symbols/museum.16.svg
deleted file mode 100644
index e34ba58a5e..0000000000
--- a/symbols/museum.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 8,2 2,4 2,5 14,5 14,4 z m -6,4 0,1 1,0 0,5 -1,0 -1,2 14,0 -1,-2 -1,0 0,-5 1,0 0,-1 z M 6,7 C 6.4973717,7 7,7.5325904 7,8 L 7,12 5,12 5,8 C 5,7.4726661 5.5026283,7 6,7 z m 4,0 c 0.503364,0 1,0.4726661 1,1 l 0,4 -2,0 0,-4 C 9,7.4726661 9.4966359,7 10,7 z" />
-</svg>
diff --git a/symbols/museum.18.svg b/symbols/museum.18.svg
new file mode 100644
index 0000000000..2a5c2c0a7f
--- /dev/null
+++ b/symbols/museum.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="museum">
+    <path
+       d="M 9,3 3,5 3,6 15,6 15,5 z m -6,4 0,1 1,0 0,5 -1,0 -1,2 14,0 -1,-2 -1,0 0,-5 1,0 0,-1 z M 7,8 C 7.4973717,8 8,8.5325904 8,9 L 8,13 6,13 6,9 C 6,8.4726661 6.5026283,8 7,8 z m 4,0 c 0.503364,0 1,0.4726661 1,1 l 0,4 -2,0 0,-4 c 0,-0.5273339 0.496636,-1 1,-1 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 9,3 3,5 3,6 15,6 15,5 z m -6,4 0,1 1,0 0,5 -1,0 -1,2 14,0 -1,-2 -1,0 0,-5 1,0 0,-1 z M 7,8 C 7.497372,8 8,8.5325904 8,9 L 8,13 6,13 6,9 C 6,8.4726661 6.502628,8 7,8 z m 4,0 c 0.503364,0 1,0.4726661 1,1 l 0,4 -2,0 0,-4 c 0,-0.5273339 0.496636,-1 1,-1 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/muslim.16.svg b/symbols/muslim.16.svg
deleted file mode 100644
index 5588fe196f..0000000000
--- a/symbols/muslim.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 7,2 C 3.609585,2 1,4.6096 1,8 c 0,3.3904 2.609585,6 6,6 1.89566,0 3.873911,-0.6497 5,-2 -0.7358,0.479 -2.0565974,1 -3,1 C 6.40733,13 4,10.5927 4,8 4,5.4073 6.40733,3 9,3 9.9434026,3 11.2642,3.5211 12,4 10.873911,2.6498 8.89566,2 7,2 z m 4.5,3 -1,2 L 8,7 10,8.5 9,11 11.5,9.5 14,11 13,8.5 15,7 12.5,7 11.5,5 z" />
-</svg>
diff --git a/symbols/muslim.18.svg b/symbols/muslim.18.svg
new file mode 100644
index 0000000000..d0a7c0b861
--- /dev/null
+++ b/symbols/muslim.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="muslim">
+    <path
+       d="M 8,3 C 4.609585,3 2,5.6096 2,9 c 0,3.3904 2.609585,6 6,6 1.89566,0 3.873911,-0.6497 5,-2 -0.7358,0.479 -2.056597,1 -3,1 C 7.40733,14 5,11.5927 5,9 5,6.4073 7.40733,4 10,4 10.943403,4 12.2642,4.5211 13,5 11.873911,3.6498 9.89566,3 8,3 z m 4.5,3 -1,2 L 9,8 11,9.5 10,12 12.5,10.5 15,12 14,9.5 16,8 13.5,8 12.5,6 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 8,3 C 4.609585,3 2,5.6096 2,9 c 0,3.3904 2.609585,6 6,6 1.89566,0 3.873911,-0.6497 5,-2 -0.7358,0.479 -2.056597,1 -3,1 C 7.40733,14 5,11.5927 5,9 5,6.4073 7.40733,4 10,4 10.943403,4 12.2642,4.5211 13,5 11.873911,3.6498 9.89566,3 8,3 z m 4.5,3 -1,2 L 9,8 11,9.5 10,12 12.5,10.5 15,12 14,9.5 16,8 13.5,8 12.5,6 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/pharmacy.16.svg b/symbols/pharmacy.16.svg
deleted file mode 100644
index 0f8ffcbe2d..0000000000
--- a/symbols/pharmacy.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 5,5 -2,2 0,8 10,0 0,-8 -2,-2.0000003 z m 2,2 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z M 5,1 5,4 11,4 11,1 z" />
-</svg>
diff --git a/symbols/pharmacy.18.svg b/symbols/pharmacy.18.svg
new file mode 100644
index 0000000000..270f3b3511
--- /dev/null
+++ b/symbols/pharmacy.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="pharmacy">
+    <path
+       d="m 6,6 -2,2 0,8 10,0 0,-8 -2,-2.0000003 z m 2,2 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z M 6,2 6,5 12,5 12,2 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 6,6 -2,2 0,8 10,0 0,-8 -2,-2.0000003 z m 2,2 2,0 0,2 2,0 0,2 -2,0 0,2 -2,0 0,-2 -2,0 0,-2 2,0 z M 6,2 6,5 12,5 12,2 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/picnic.16.svg b/symbols/picnic.16.svg
deleted file mode 100644
index c2b71293d0..0000000000
--- a/symbols/picnic.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 4,3 C 2.6779661,3 2.6779661,4.5 4,4.5 l 8,0 C 13.33909,4.5 13.338983,3 12,3 L 4,3 z M 5,5 4.25,8 2,8 C 0.6779661,8 0.6779661,9.5 2,9.5 L 3.875,9.5 3,13 4.5,13 5.375,9.5 10.625,9.5 11.5,13 13,13 12.125,9.5 14,9.5 C 15.33909,9.5 15.338983,8 14,8 L 11.75,8 11,5 9.5,5 10.25,8 5.75,8 6.5,5 5,5 z" />
-</svg>
diff --git a/symbols/picnic.18.svg b/symbols/picnic.18.svg
new file mode 100644
index 0000000000..9843817a1d
--- /dev/null
+++ b/symbols/picnic.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="table">
+    <path
+       d="m 4.9995254,4 c -1.3220339,0 -1.3220339,1.5 0,1.5 l 7.9999996,0 c 1.33909,0 1.338983,-1.5 0,-1.5 L 4.9995254,4 z m 1,2 -0.75,3 -2.25,0 c -1.3220339,0 -1.3220339,1.5 0,1.5 l 1.875,0 -0.875,3.5 1.5,0 0.875,-3.5 5.2499996,0 0.875,3.5 1.5,0 -0.875,-3.5 1.875,0 c 1.33909,0 1.338983,-1.5 0,-1.5 l -2.25,0 -0.75,-3 -1.5,0 0.75,3 -4.4999996,0 0.75,-3 -1.5,0 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 4.999525,4 c -1.322034,0 -1.322034,1.5 0,1.5 l 8,0 c 1.33909,0 1.338983,-1.5 0,-1.5 l -8,0 z m 1,2 -0.75,3 -2.25,0 c -1.322034,0 -1.322034,1.5 0,1.5 l 1.875,0 -0.875,3.5 1.5,0 0.875,-3.5 5.25,0 0.875,3.5 1.5,0 -0.875,-3.5 1.875,0 c 1.33909,0 1.338983,-1.5 0,-1.5 l -2.25,0 -0.75,-3 -1.5,0 0.75,3 -4.5,0 0.75,-3 -1.5,0 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/place_of_worship.16.svg b/symbols/place_of_worship.16.svg
deleted file mode 100644
index cffa0a0cb5..0000000000
--- a/symbols/place_of_worship.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 7.5,1 C 6.6715729,1 6,1.6715729 6,2.5 6,3.3284271 6.671573,4 7.5,4 8.3284271,4 9,3.3284271 9,2.5 9,1.6715729 8.328427,1 7.5,1 z M 2.167788,5.573171 3.5,8 l 3,-1 1,4 -2,2 c -0.2711864,0.305085 -0.4661017,0.45872 -0.5,1 0,1 1,1 1,1 l 6,0 c 0,0 1,0 1,-1 0,-1 -1,-1 -1,-1 l -3,0 1,-1 c 1,-1 0.928985,-1.472666 0.8125,-2 L 10,6 C 9.7606097,5.1065832 9.1377884,4.6703491 8,4.85 L 7,5 4,6.5 3,5 C 2.5588374,4.412383 1.8167825,4.9182326 2.167788,5.573171 z" />
-</svg>
diff --git a/symbols/place_of_worship.18.svg b/symbols/place_of_worship.18.svg
new file mode 100644
index 0000000000..7e2dc02ba2
--- /dev/null
+++ b/symbols/place_of_worship.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="place-of-worship">
+    <path
+       d="m 8.4996454,2 c -0.8284271,0 -1.5,0.6715729 -1.5,1.5 0,0.8284271 0.671573,1.5 1.5,1.5 0.8284271,0 1.5,-0.6715729 1.5,-1.5 0,-0.8284271 -0.671573,-1.5 -1.5,-1.5 z M 3.1674334,6.573171 4.4996454,9 l 3,-1 1,4 -2,2 c -0.2711864,0.305085 -0.4661017,0.45872 -0.5,1 0,1 1,1 1,1 l 5.9999996,0 c 0,0 1,0 1,-1 0,-1 -1,-1 -1,-1 l -2.9999996,0 0.9999996,-1 c 1,-1 0.928985,-1.472666 0.8125,-2 l -0.8125,-4 C 10.760255,6.1065832 10.137434,5.6703491 8.9996454,5.85 l -1,0.15 -3,1.5 -1,-1.5 C 3.5584828,5.412383 2.8164279,5.9182326 3.1674334,6.573171 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 8.499645,2 c -0.828427,0 -1.5,0.6715729 -1.5,1.5 0,0.8284271 0.671573,1.5 1.5,1.5 0.828428,0 1.5,-0.6715729 1.5,-1.5 0,-0.8284271 -0.671573,-1.5 -1.5,-1.5 z M 3.167433,6.573171 4.499645,9 l 3,-1 1,4 -2,2 c -0.271186,0.305085 -0.466101,0.45872 -0.5,1 0,1 1,1 1,1 l 6,0 c 0,0 1,0 1,-1 0,-1 -1,-1 -1,-1 l -3,0 1,-1 c 1,-1 0.928985,-1.472666 0.8125,-2 l -0.8125,-4 c -0.23939,-0.8934168 -0.862211,-1.3296509 -2,-1.15 l -1,0.15 -3,1.5 -1,-1.5 C 3.558483,5.412383 2.816428,5.918233 3.167433,6.573171 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/playground.16.svg b/symbols/playground.16.svg
deleted file mode 100644
index e75a973428..0000000000
--- a/symbols/playground.16.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <path
-     d="M 4.40625,2 C 3.65262,2.0471927 2.9985239,2.7448953 3,3.5 3.0002867,4.2852156 3.7147844,4.9994517 4.5,4.9994517 5.2852156,4.9994517 5.9997133,4.2852156 6,3.5 6.0015986,2.6823545 5.2222984,1.9488955 4.40625,2 z m 8,3 C 11.65262,5.0471927 10.998524,5.7448953 11,6.5 c 2.87e-4,0.7852156 0.714784,1.4994517 1.5,1.4994517 0.785216,0 1.499713,-0.7142361 1.5,-1.4994517 C 14.001599,5.6823545 13.222298,4.9488956 12.40625,5 z M 4,5.5 C 2.5290102,5.5 2.1341648,7.3734067 2.03125,8.375 L 1,8 1,9 6.96875,11.125 6,15 10,15 9.0625,11.875 15,14 15,13 14.0625,12.65625 C 14.226562,11.794922 14.75,8.5 13,8.5 c -1.638462,0 -1.915209,2.244501 -1.96875,3.09375 l -5.9375,-2.125 C 5.2850122,8.3375305 5.614,5.5 4,5.5 z"
-     id="path4885"
-     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
-</svg>
diff --git a/symbols/playground.18.svg b/symbols/playground.18.svg
new file mode 100644
index 0000000000..009286a968
--- /dev/null
+++ b/symbols/playground.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="playground">
+    <path
+       d="M 5.40625,3 C 4.65262,3.0471927 3.9985239,3.7448953 4,4.5 4.0002867,5.2852156 4.7147844,5.9994517 5.5,5.9994517 6.2852156,5.9994517 6.9997133,5.2852156 7,4.5 7.0015986,3.6823545 6.2222984,2.9488955 5.40625,3 z m 8,3 C 12.65262,6.0471927 11.998524,6.7448953 12,7.5 c 2.87e-4,0.7852156 0.714784,1.4994517 1.5,1.4994517 0.785216,0 1.499713,-0.7142361 1.5,-1.4994517 C 15.001599,6.6823545 14.222298,5.9488956 13.40625,6 z M 5,6.5 C 3.5290102,6.5 3.1341648,8.3734067 3.03125,9.375 L 2,9 2,10 7.96875,12.125 7,16 11,16 10.0625,12.875 16,15 16,14 15.0625,13.65625 C 15.226562,12.794922 15.75,9.5 14,9.5 c -1.638462,0 -1.915209,2.244501 -1.96875,3.09375 l -5.9375,-2.125 C 6.2850122,9.337531 6.614,6.5 5,6.5 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 5.40625,3 C 4.65262,3.047193 3.998524,3.7448953 4,4.5 4.000287,5.2852156 4.714784,5.9994517 5.5,5.9994517 6.285216,5.9994517 6.999713,5.2852156 7,4.5 7.0016,3.6823545 6.222298,2.9488955 5.40625,3 z m 8,3 C 12.65262,6.0471927 11.998524,6.7448953 12,7.5 c 2.87e-4,0.7852156 0.714784,1.4994517 1.5,1.4994517 0.785216,0 1.499713,-0.7142361 1.5,-1.4994517 C 15.001599,6.6823545 14.222298,5.9488956 13.40625,6 z M 5,6.5 C 3.52901,6.5 3.134165,8.3734067 3.03125,9.375 L 2,9 2,10 7.96875,12.125 7,16 11,16 10.0625,12.875 16,15 16,14 15.0625,13.65625 C 15.226562,12.794922 15.75,9.5 14,9.5 c -1.638462,0 -1.915209,2.244501 -1.96875,3.09375 l -5.9375,-2.125 C 6.285012,9.337531 6.614,6.5 5,6.5 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/police.16.svg b/symbols/police.16.svg
deleted file mode 100644
index f899d8b7f6..0000000000
--- a/symbols/police.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 6,1 5,2 5,3 11,3 11,2 10,1 z M 5,4 C 4.9667,4.168726 5,4.3395259 5,4.5185186 5,5.9503556 6.61931,7 8,7 9.38069,7 11,5.9503556 11,4.5185186 11,4.3395259 11,4 11,4 z M 5,8 C 3.5810939,8 3.01415,9.876578 3,11 L 3,15 4.53125,15 10,8 z M 11.5,8 6.03125,15 13,15 13,11 C 13,9.8764743 12.727158,8 11.5,8 z" />
-</svg>
diff --git a/symbols/police.18.svg b/symbols/police.18.svg
new file mode 100644
index 0000000000..b44db5329c
--- /dev/null
+++ b/symbols/police.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="police">
+    <path
+       d="M 7,2 6,3 6,4 12,4 12,3 11,2 z M 6,5 C 5.9667,5.168726 6,5.3395259 6,5.5185186 6,6.9503556 7.61931,8 9,8 10.38069,8 12,6.9503556 12,5.5185186 12,5.3395259 12,5 12,5 z M 6,9 C 4.5810939,9 4.01415,10.876578 4,12 L 4,16 5.53125,16 11,9 z M 12.5,9 7.03125,16 14,16 14,12 C 14,10.876474 13.727158,9 12.5,9 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 7,2 6,3 6,4 12,4 12,3 11,2 z M 6,5 C 5.9667,5.168726 6,5.3395259 6,5.5185186 6,6.9503556 7.61931,8 9,8 10.38069,8 12,6.9503556 12,5.5185186 12,5.3395259 12,5 12,5 z M 6,9 C 4.581094,9 4.01415,10.876578 4,12 L 4,16 5.53125,16 11,9 z M 12.5,9 7.03125,16 14,16 14,12 C 14,10.876474 13.727158,9 12.5,9 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/prison.16.svg b/symbols/prison.16.svg
deleted file mode 100644
index ec7e760b7f..0000000000
--- a/symbols/prison.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 1,1 1,15 15,15 15,1 1,1 z m 1,1 3,0 0,12 -0.5,0 0,-4.21875 C 4.2009277,10.13501 4,10.5625 4,11 L 4,14 2,14 2,2 z m 4,0 4,0 0,12 -0.5,0 0,-5 -3,0 0,5 L 6,14 6,2 z m 5,0 3,0 0,12 -2,0 0,-3 C 12,10.5625 11.799072,10.13501 11.5,9.78125 L 11.5,14 11,14 11,2 z M 8,4 C 7.3991523,4 6.8666154,4.2680514 6.5,4.6875 l 0,2.625 C 6.8666154,7.7319486 7.3991523,8 8,8 8.6008474,8 9.1333845,7.7319486 9.5,7.3125 l 0,-2.625 C 9.1333845,4.2680514 8.6008474,4 8,4 z" />
-</svg>
diff --git a/symbols/prison.18.svg b/symbols/prison.18.svg
new file mode 100644
index 0000000000..9c0db89057
--- /dev/null
+++ b/symbols/prison.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="prison">
+    <path
+       d="M 2,2 2,16 16,16 16,2 2,2 z m 1,1 3,0 0,12 -0.5,0 0,-4.21875 C 5.2009277,11.13501 5,11.5625 5,12 L 5,15 3,15 3,3 z m 4,0 4,0 0,12 -0.5,0 0,-5 -3,0 0,5 L 7,15 7,3 z m 5,0 3,0 0,12 -2,0 0,-3 c 0,-0.4375 -0.200928,-0.86499 -0.5,-1.21875 L 12.5,15 12,15 12,3 z M 9,5 C 8.3991523,5 7.8666154,5.2680514 7.5,5.6875 l 0,2.625 C 7.8666154,8.7319486 8.3991523,9 9,9 9.6008474,9 10.133385,8.7319486 10.5,8.3125 l 0,-2.625 C 10.133385,5.2680514 9.6008474,5 9,5 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 2,2 2,16 16,16 16,2 2,2 z m 1,1 3,0 0,12 -0.5,0 0,-4.21875 C 5.200928,11.13501 5,11.5625 5,12 L 5,15 3,15 3,3 z m 4,0 4,0 0,12 -0.5,0 0,-5 -3,0 0,5 L 7,15 7,3 z m 5,0 3,0 0,12 -2,0 0,-3 c 0,-0.4375 -0.200928,-0.86499 -0.5,-1.21875 L 12.5,15 12,15 12,3 z M 9,5 C 8.399152,5 7.866615,5.2680514 7.5,5.6875 l 0,2.625 C 7.866615,8.7319486 8.399152,9 9,9 9.600847,9 10.133385,8.7319486 10.5,8.3125 l 0,-2.625 C 10.133385,5.2680514 9.600847,5 9,5 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/pub.16.svg b/symbols/pub.16.svg
deleted file mode 100644
index f71a431be1..0000000000
--- a/symbols/pub.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 3,2 2,12 6,0 2,-12 z m 1.25,1 7.5,0 -0.33,2 -6.86,0 z" />
-</svg>
diff --git a/symbols/pub.18.svg b/symbols/pub.18.svg
new file mode 100644
index 0000000000..d1a067a428
--- /dev/null
+++ b/symbols/pub.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="pub">
+    <path
+       d="m 4,3 2,12 6,0 2,-12 z m 1.25,1 7.5,0 -0.33,2 -6.86,0 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 4,3 2,12 6,0 2,-12 z m 1.25,1 7.5,0 -0.33,2 -6.86,0 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/recycling.16.svg b/symbols/recycling.16.svg
deleted file mode 100644
index de9cec47e4..0000000000
--- a/symbols/recycling.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 6.1111131,9.690628 4.5133516,6.804047 1.3,6.804047 2.6062101,7.5880837 1.7986781,9.0311016 C 1.7298071,9.1619607 1.6953738,9.2986132 1.6953767,9.4410632 1.6953738,9.583519 1.7298067,9.720173 1.7986781,9.851023 l 1.2710773,2.298282 c 0.057331,-0.166376 0.1146592,-0.309011 0.171995,-0.427902 L 4.8227305,8.9065915 6.1111131,9.690628 z m -2.3879902,2.316224 c -0.091944,0.154416 -0.1379139,0.320611 -0.1379099,0.498585 -4e-6,0.273307 0.094563,0.504931 0.2836852,0.694868 0.189119,0.189939 0.4152978,0.284906 0.6785371,0.284906 l 3.1619632,0 0,-2.654413 -3.333432,0 c -0.023082,0.04749 -0.109074,0.201902 -0.2579918,0.463243 l -0.3948518,0.712811 z m 4.2783511,-6.5745954 3.196047,0 L 12.812587,2.54622 11.506901,3.3302555 10.698844,1.8866933 C 10.549912,1.6137609 10.320934,1.4772893 10.011916,1.4772767 l -2.5432048,0 C 7.5718315,1.5958193 7.6578273,1.7145295 7.7267029,1.8334098 L 9.2898557,4.6482199 9.032389,4.8086154 8.001474,5.4322566 z M 6.4377974,1.6197306 C 6.0710797,1.6197421 5.7961336,1.7859374 5.6129601,2.1183163 L 4.0151984,4.9690109 C 4.6220663,5.3372941 5.3609057,5.7767964 6.2317187,6.2875185 6.746994,5.372999 7.3024778,4.3752843 7.8981728,3.2943703 L 7.2626345,2.1183163 C 7.0794458,1.7859374 6.8045007,1.6197421 6.4377974,1.6197306 l 0,0 z m 4.1068816,9.1751824 0,-0.320793 0,-1.228795 L 8.9463931,12.131363 10.544679,15 l 0,-1.55013 1.597761,0 c 0.309366,0 0.54411,-0.136653 0.704231,-0.409962 l 1.271602,-2.298279 c -0.171656,0.04749 -0.314811,0.07123 -0.42946,0.07123 l -3.144134,-0.01795 z m 2.37121,-4.88147 c -0.05735,0.035533 -0.79636,0.4750321 -2.217045,1.3185066 0.710337,1.2708481 1.271764,2.2745434 1.684282,3.0110934 l 1.288383,0 c 0.378233,2e-6 0.658946,-0.166373 0.842142,-0.499132 0.171629,-0.3207878 0.165862,-0.6473788 -0.01731,-0.9797736 L 12.915891,5.913443 z" />
-</svg>
diff --git a/symbols/recycling.18.svg b/symbols/recycling.18.svg
new file mode 100644
index 0000000000..f81a95804e
--- /dev/null
+++ b/symbols/recycling.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="recycling">
+    <path
+       d="M 7.1111131,10.690628 5.5133516,7.804047 2.3,7.804047 3.6062101,8.5880837 2.7986781,10.031102 c -0.068871,0.130859 -0.1033043,0.267511 -0.1033014,0.409961 -2.9e-6,0.142456 0.03443,0.27911 0.1033014,0.40996 l 1.2710773,2.298282 c 0.057331,-0.166376 0.1146592,-0.309011 0.171995,-0.427902 l 1.5809801,-2.814812 1.2883826,0.784037 z m -2.3879902,2.316224 c -0.091944,0.154416 -0.1379139,0.320611 -0.1379099,0.498585 -4e-6,0.273307 0.094563,0.504931 0.2836852,0.694868 0.189119,0.189939 0.4152978,0.284906 0.6785371,0.284906 l 3.1619632,0 0,-2.654413 -3.333432,0 c -0.023082,0.04749 -0.109074,0.201902 -0.2579918,0.463243 l -0.3948518,0.712811 z m 4.2783511,-6.5745954 3.196047,0 L 13.812587,3.54622 12.506901,4.3302555 11.698844,2.8866933 C 11.549912,2.6137609 11.320934,2.4772893 11.011916,2.4772767 l -2.5432048,0 C 8.5718315,2.5958193 8.6578273,2.7145295 8.7267029,2.8334098 L 10.289856,5.6482199 10.032389,5.8086154 9.001474,6.4322566 z M 7.4377974,2.6197306 C 7.0710797,2.6197421 6.7961336,2.7859374 6.6129601,3.1183163 L 5.0151984,5.9690109 C 5.6220663,6.3372941 6.3609057,6.7767964 7.2317187,7.2875185 7.746994,6.372999 8.3024778,5.3752843 8.8981728,4.2943703 L 8.2626345,3.1183163 C 8.0794458,2.7859374 7.8045007,2.6197421 7.4377974,2.6197306 l 0,0 z m 4.1068816,9.1751824 0,-0.320793 0,-1.228795 L 9.9463931,13.131363 11.544679,16 l 0,-1.55013 1.597761,0 c 0.309366,0 0.54411,-0.136653 0.704231,-0.409962 l 1.271602,-2.298279 c -0.171656,0.04749 -0.314811,0.07123 -0.42946,0.07123 l -3.144134,-0.01795 z m 2.37121,-4.88147 c -0.05735,0.035533 -0.79636,0.4750321 -2.217045,1.3185066 0.710337,1.2708484 1.271764,2.2745434 1.684282,3.0110934 l 1.288383,0 c 0.378233,2e-6 0.658946,-0.166373 0.842142,-0.499132 0.171629,-0.320788 0.165862,-0.647379 -0.01731,-0.979774 l -1.58045,-2.850694 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 7.111113,10.690628 5.513352,7.804047 2.3,7.804047 3.60621,8.5880837 2.798678,10.031102 c -0.06887,0.130859 -0.103304,0.267511 -0.103301,0.409961 -3e-6,0.142456 0.03443,0.27911 0.103301,0.40996 l 1.271077,2.298282 c 0.05733,-0.166376 0.11466,-0.309011 0.171995,-0.427902 l 1.58098,-2.814812 1.288383,0.784037 z m -2.38799,2.316224 c -0.09194,0.154416 -0.137914,0.320611 -0.13791,0.498585 -4e-6,0.273307 0.09456,0.504931 0.283685,0.694868 0.189119,0.189939 0.415298,0.284906 0.678537,0.284906 l 3.161963,0 0,-2.654413 -3.333432,0 c -0.02308,0.04749 -0.109074,0.201902 -0.257991,0.463243 l -0.394852,0.712811 z m 4.278351,-6.5745954 3.196047,0 L 13.812587,3.54622 12.506901,4.3302555 11.698844,2.8866933 C 11.549912,2.6137609 11.320934,2.4772893 11.011916,2.4772767 l -2.543205,0 c 0.10312,0.1185426 0.189116,0.2372528 0.257992,0.3561331 L 10.289856,5.6482199 10.032389,5.8086154 9.001474,6.4322566 z M 7.437797,2.6197306 C 7.07108,2.6197421 6.796134,2.7859374 6.61296,3.1183163 L 5.015198,5.9690109 C 5.622066,6.3372941 6.360906,6.7767964 7.231719,7.2875185 7.746994,6.372999 8.302478,5.3752843 8.898173,4.2943703 L 8.262635,3.1183163 C 8.079446,2.7859374 7.804501,2.6197421 7.437797,2.6197306 l 0,0 z m 4.106882,9.1751824 0,-0.320793 0,-1.228795 L 9.946393,13.131363 11.544679,16 l 0,-1.55013 1.597761,0 c 0.309366,0 0.54411,-0.136653 0.704231,-0.409962 l 1.271602,-2.298279 c -0.171656,0.04749 -0.314811,0.07123 -0.42946,0.07123 l -3.144134,-0.01795 z m 2.37121,-4.88147 c -0.05735,0.035533 -0.79636,0.4750321 -2.217045,1.3185066 0.710337,1.2708484 1.271764,2.2745434 1.684282,3.0110934 l 1.288383,0 c 0.378233,2e-6 0.658946,-0.166373 0.842142,-0.499132 0.171629,-0.320788 0.165862,-0.647379 -0.01731,-0.979774 l -1.58045,-2.850694 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/rental_bicycle.16.svg b/symbols/rental_bicycle.16.svg
deleted file mode 100644
index 72497aaabf..0000000000
--- a/symbols/rental_bicycle.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 4.5,1 C 3.1192881,1 2,2.1192881 2,3.5 2,4.8807119 3.1192881,6 4.5,6 5.4253425,6 6.2239846,5.4972377 6.65625,4.75 L 8,4.75 l 1,-1 1,1 1,-1 1,1 0.5,0 L 14,3.5 12.5,2.25 6.65625,2.25 C 6.2239846,1.5027623 5.4253425,1 4.5,1 z m -1,2 C 3.7761424,3 4,3.2238576 4,3.5 4,3.7761424 3.7761424,4 3.5,4 3.2238576,4 3,3.7761424 3,3.5 3,3.2238576 3.2238576,3 3.5,3 z m 5.5,3.4375 0.03125,1 L 10,8 10,9 6.25,9 6,9 6,8 6.5,8 c 1,0 1,-1 0,-1 l -2,0 c -1,0 -1,1 0,1 L 5,8 5,9 4.4375,10.375 c -0.041654,-0.0023 -0.082838,0 -0.125,0 C 3.0420041,10.375 2,11.417004 2,12.6875 2,13.957996 3.0420041,15 4.3125,15 5.5829959,15 6.625,13.957996 6.625,12.6875 6.625,12.447485 6.5695688,12.218899 6.5,12 l 0.5,0 1,0 2.156,-2 2.5e-4,0 0.28125,0.71875 C 9.7978612,11.135655 9.375,11.877559 9.375,12.6875 9.375,13.957996 10.417004,15 11.6875,15 c 1.270496,0 2.34375,-1.042004 2.34375,-2.3125 0,-1.270496 -1.073254,-2.3125 -2.34375,-2.3125 -0.04216,0 -0.08335,-0.0023 -0.125,0 L 11,9 11,7.625 z M 5.84375,10 8.956,10 7.65,11.25 l -1.55625,0 C 5.9398886,11.062277 5.7662923,10.851578 5.5625,10.71875 z M 4.3125,11.5 C 4.9750008,11.5 5.5,12.024999 5.5,12.6875 5.5,13.350001 4.9750008,13.875 4.3125,13.875 3.6499993,13.875 3.125,13.350001 3.125,12.6875 3.125,12.024999 3.6499993,11.5 4.3125,11.5 z m 7.375,0 c 0.662501,0 1.1875,0.524999 1.1875,1.1875 0,0.662501 -0.524999,1.1875 -1.1875,1.1875 -0.662501,0 -1.15625,-0.524999 -1.15625,-1.1875 0,-0.662501 0.493749,-1.1875 1.15625,-1.1875 z" />
-</svg>
diff --git a/symbols/rental_bicycle.18.svg b/symbols/rental_bicycle.18.svg
new file mode 100644
index 0000000000..5ba47cc885
--- /dev/null
+++ b/symbols/rental_bicycle.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="rental-bicycle">
+    <path
+       d="M 5.5,2 C 4.1192881,2 3,3.1192881 3,4.5 3,5.8807119 4.1192881,7 5.5,7 6.4253425,7 7.2239846,6.4972377 7.65625,5.75 L 9,5.75 l 1,-1 1,1 1,-1 1,1 0.5,0 L 15,4.5 13.5,3.25 7.65625,3.25 C 7.2239846,2.5027623 6.4253425,2 5.5,2 z m -1,2 C 4.7761424,4 5,4.2238576 5,4.5 5,4.7761424 4.7761424,5 4.5,5 4.2238576,5 4,4.7761424 4,4.5 4,4.2238576 4.2238576,4 4.5,4 z m 5.5,3.4375 0.03125,1 L 11,9 11,10 7.25,10 7,10 7,9 7.5,9 c 1,0 1,-1 0,-1 l -2,0 c -1,0 -1,1 0,1 L 6,9 6,10 5.4375,11.375 c -0.041654,-0.0023 -0.082838,0 -0.125,0 C 4.0420041,11.375 3,12.417004 3,13.6875 3,14.957996 4.0420041,16 5.3125,16 6.5829959,16 7.625,14.957996 7.625,13.6875 7.625,13.447485 7.5695688,13.218899 7.5,13 l 0.5,0 1,0 2.156,-2 2.5e-4,0 0.28125,0.71875 c -0.639639,0.416905 -1.0625,1.158809 -1.0625,1.96875 0,1.270496 1.042004,2.3125 2.3125,2.3125 1.270496,0 2.34375,-1.042004 2.34375,-2.3125 0,-1.270496 -1.073254,-2.3125 -2.34375,-2.3125 -0.04216,0 -0.08335,-0.0023 -0.125,0 L 12,10 12,8.625 z M 6.84375,11 9.956,11 8.65,12.25 l -1.55625,0 C 6.9398886,12.062277 6.7662923,11.851578 6.5625,11.71875 z M 5.3125,12.5 C 5.9750008,12.5 6.5,13.024999 6.5,13.6875 6.5,14.350001 5.9750008,14.875 5.3125,14.875 4.6499993,14.875 4.125,14.350001 4.125,13.6875 4.125,13.024999 4.6499993,12.5 5.3125,12.5 z m 7.375,0 c 0.662501,0 1.1875,0.524999 1.1875,1.1875 0,0.662501 -0.524999,1.1875 -1.1875,1.1875 -0.662501,0 -1.15625,-0.524999 -1.15625,-1.1875 0,-0.662501 0.493749,-1.1875 1.15625,-1.1875 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 5.5,2 C 4.119288,2 3,3.1192881 3,4.5 3,5.8807119 4.119288,7 5.5,7 6.425342,7 7.223985,6.4972377 7.65625,5.75 L 9,5.75 l 1,-1 1,1 1,-1 1,1 0.5,0 L 15,4.5 13.5,3.25 7.65625,3.25 C 7.223985,2.5027623 6.425342,2 5.5,2 z m -1,2 C 4.776142,4 5,4.2238576 5,4.5 5,4.7761424 4.776142,5 4.5,5 4.223858,5 4,4.7761424 4,4.5 4,4.2238576 4.223858,4 4.5,4 z m 5.5,3.4375 0.03125,1 L 11,9 11,10 7.25,10 7,10 7,9 7.5,9 c 1,0 1,-1 0,-1 l -2,0 c -1,0 -1,1 0,1 L 6,9 6,10 5.4375,11.375 c -0.04165,-0.0023 -0.08284,0 -0.125,0 C 4.042004,11.375 3,12.417004 3,13.6875 3,14.957996 4.042004,16 5.3125,16 6.582996,16 7.625,14.957996 7.625,13.6875 7.625,13.447485 7.56957,13.218899 7.5,13 l 0.5,0 1,0 2.156,-2 2.5e-4,0 0.28125,0.71875 c -0.639639,0.416905 -1.0625,1.158809 -1.0625,1.96875 0,1.270496 1.042004,2.3125 2.3125,2.3125 1.270496,0 2.34375,-1.042004 2.34375,-2.3125 0,-1.270496 -1.073254,-2.3125 -2.34375,-2.3125 -0.04216,0 -0.08335,-0.0023 -0.125,0 L 12,10 12,8.625 z M 6.84375,11 9.956,11 8.65,12.25 l -1.55625,0 C 6.939889,12.062277 6.766292,11.851578 6.5625,11.71875 z M 5.3125,12.5 C 5.975001,12.5 6.5,13.024999 6.5,13.6875 6.5,14.350001 5.975001,14.875 5.3125,14.875 4.649999,14.875 4.125,14.350001 4.125,13.6875 4.125,13.024999 4.649999,12.5 5.3125,12.5 z m 7.375,0 c 0.662501,0 1.1875,0.524999 1.1875,1.1875 0,0.662501 -0.524999,1.1875 -1.1875,1.1875 -0.662501,0 -1.15625,-0.524999 -1.15625,-1.1875 0,-0.662501 0.493749,-1.1875 1.15625,-1.1875 z"
+       id="icon"
+       style="fill:#1a1a1a;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/restaurant.16.svg b/symbols/restaurant.16.svg
deleted file mode 100644
index 816134d63d..0000000000
--- a/symbols/restaurant.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 5,1 C 4,1 2,3 2,6 c 0,3 2.25,4 2.25,4 l -0.5,5 2.5,0 -0.5,-5 C 5.75,10 8,9 8,6 8,3 6,1 5,1 z M 9,1.75 9,8 c 0,1 1.75,1 1.75,2 l -0.5,5 2.5,0 -0.5,-5 C 12.25,9 14,9 14,8 l 0,-6.25 c 0,-1 -1,-1 -1,0 L 13,7 c 0,0.5632885 -1,0.5632884 -1,0 l 0,-5.25 c 0,-1 -1,-1 -1,0 L 11,7 c 0,0.5273339 -1,0.5273339 -1,0 l 0,-5.25 c 0,-1 -1,-1 -1,0 z" />
-</svg>
diff --git a/symbols/restaurant.18.svg b/symbols/restaurant.18.svg
new file mode 100644
index 0000000000..c864d9aaab
--- /dev/null
+++ b/symbols/restaurant.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="restaurant">
+    <path
+       d="M 6,2 C 5,2 3,4 3,7 c 0,3 2.25,4 2.25,4 l -0.5,5 2.5,0 -0.5,-5 C 6.75,11 9,10 9,7 9,4 7,2 6,2 z M 10,2.75 10,9 c 0,1 1.75,1 1.75,2 l -0.5,5 2.5,0 -0.5,-5 C 13.25,10 15,10 15,9 l 0,-6.25 c 0,-1 -1,-1 -1,0 L 14,8 c 0,0.5632885 -1,0.5632884 -1,0 l 0,-5.25 c 0,-1 -1,-1 -1,0 L 12,8 c 0,0.5273339 -1,0.5273339 -1,0 l 0,-5.25 c 0,-1 -1,-1 -1,0 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 6,2 C 5,2 3,4 3,7 c 0,3 2.25,4 2.25,4 l -0.5,5 2.5,0 -0.5,-5 C 6.75,11 9,10 9,7 9,4 7,2 6,2 z M 10,2.75 10,9 c 0,1 1.75,1 1.75,2 l -0.5,5 2.5,0 -0.5,-5 C 13.25,10 15,10 15,9 l 0,-6.25 c 0,-1 -1,-1 -1,0 L 14,8 c 0,0.5632885 -1,0.5632884 -1,0 l 0,-5.25 c 0,-1 -1,-1 -1,0 L 12,8 c 0,0.5273339 -1,0.5273339 -1,0 l 0,-5.25 c 0,-1 -1,-1 -1,0 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/shintoist.16.svg b/symbols/shintoist.16.svg
deleted file mode 100644
index c2ac884511..0000000000
--- a/symbols/shintoist.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 1,1 c 0,1 0.6545446,1.654855 1,2 0.3454553,0.345145 0.8426782,0.2121799 0.8426782,0.4724826 0,0 0.1573217,0.5275173 0.6573217,0.5275173 l 1.2500001,0 c 0,0.2876366 0.2500001,0.5 0.2500001,0.5 0,0 -0.2500001,0.1404543 -0.2500001,0.5000002 l -1.2500001,0 c -0.5,0 -0.5,0.2499999 -0.5,0.5 0,0.5273339 0,0.9999999 0,0.9999999 0,0.2396973 0.2311002,0.5 0.5,0.5 0.2689,0 1.2500003,0 1.2500001,0 l 0,1 -0.7499999,0 c 0,0.4060258 0.2706055,0.7315864 0.7499999,0.9999999 0,0.3163531 0,5.5000001 0,5.5000001 0,0.658649 1.4999999,0.715727 1.4999999,0 l 0,-7.5 L 9.75,7 l 0,7.5 c 0,0.691758 1.5,0.643818 1.5,0 0,0 -10e-7,-5.183647 0,-5.5000001 C 11.729394,8.6883936 12,8.4074852 12,8 l -0.75,0 0,-1 c 0,0 0.981099,0 1.25,0 0.220961,0 0.5,-0.2603027 0.5,-0.5 0,0 0,-0.4999999 0,-0.9999999 0,-0.5 -0.274339,-0.5 -0.5,-0.5 l -1.25,0 c 0.02397,-0.2636668 -0.25,-0.5 -0.25,-0.5 0,0 0.25,-0.2123634 0.25,-0.5000002 l 1.25,0 c 0.5,0 0.5,-0.5 0.5,-0.5 C 13,3.2636669 13.582844,3.3613872 14,3 14.417156,2.6386128 15,2 15,1 8.9999999,2 6,2 1,1 z m 5.2499999,2.9999999 c -1.463e-4,0 1.0000002,0 1.0000002,0 l 0,1.0000002 -1.0000002,0 C 6.2499999,4.7123635 6,4.4999999 6,4.4999999 c 0,0 0.2499999,-0.1883936 0.2499999,-0.5 z m 2.5000001,0 1,0 c 0,0.2647543 0.2499999,0.5 0.2499999,0.5 0,0 -0.2499999,0.2363334 -0.2499999,0.5000002 l -1,0 z" />
-</svg>
diff --git a/symbols/shintoist.18.svg b/symbols/shintoist.18.svg
new file mode 100644
index 0000000000..8a3d9e13e2
--- /dev/null
+++ b/symbols/shintoist.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="shintoist">
+    <path
+       d="m 2,2.000387 c 0,1 0.6545446,1.654855 1,2 0.3454553,0.345145 0.8426782,0.2121799 0.8426782,0.4724826 0,0 0.1573217,0.5275173 0.6573217,0.5275173 l 1.2500001,0 c 0,0.2876366 0.2500001,0.5 0.2500001,0.5 0,0 -0.2500001,0.1404543 -0.2500001,0.5000002 l -1.2500001,0 c -0.5,0 -0.5,0.2499999 -0.5,0.5 0,0.5273339 0,0.9999999 0,0.9999999 0,0.2396973 0.2311002,0.5 0.5,0.5 0.2689,0 1.2500003,0 1.2500001,0 l 0,1 -0.7499999,0 c 0,0.406026 0.2706055,0.731586 0.7499999,1 0,0.316353 0,5.5 0,5.5 0,0.658649 1.4999999,0.715727 1.4999999,0 l 0,-7.5 3.5000001,0 0,7.5 c 0,0.691758 1.5,0.643818 1.5,0 0,0 -10e-7,-5.183647 0,-5.5 0.479394,-0.311606 0.75,-0.592515 0.75,-1 l -0.75,0 0,-1 c 0,0 0.981099,0 1.25,0 0.220961,0 0.5,-0.2603027 0.5,-0.5 0,0 0,-0.4999999 0,-0.9999999 0,-0.5 -0.274339,-0.5 -0.5,-0.5 l -1.25,0 c 0.02397,-0.2636668 -0.25,-0.5 -0.25,-0.5 0,0 0.25,-0.2123634 0.25,-0.5000002 l 1.25,0 c 0.5,0 0.5,-0.5 0.5,-0.5 0,-0.236333 0.582844,-0.1386127 1,-0.4999999 0.417156,-0.3613872 1,-1 1,-2 -6.0000001,1 -9,1 -14,0 z m 5.2499999,2.9999999 c -1.463e-4,0 1.0000002,0 1.0000002,0 l 0,1.0000002 -1.0000002,0 C 7.2499999,5.7127505 7,5.5003869 7,5.5003869 c 0,0 0.2499999,-0.1883936 0.2499999,-0.5 z m 2.5000001,0 1,0 c 0,0.2647543 0.25,0.5 0.25,0.5 0,0 -0.25,0.2363334 -0.25,0.5000002 l -1,0 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 2,2.000387 c 0,1 0.654545,1.654855 1,2 0.345455,0.345145 0.842678,0.2121799 0.842678,0.4724826 0,0 0.157322,0.5275173 0.657322,0.5275173 l 1.25,0 c 0,0.2876366 0.25,0.5 0.25,0.5 0,0 -0.25,0.1404543 -0.25,0.5000002 l -1.25,0 c -0.5,0 -0.5,0.2499999 -0.5,0.5 0,0.5273339 0,0.9999999 0,0.9999999 0,0.2396973 0.2311,0.5 0.5,0.5 0.2689,0 1.25,0 1.25,0 l 0,1 -0.75,0 c 0,0.406026 0.270606,0.731586 0.75,1 0,0.316353 0,5.5 0,5.5 0,0.658649 1.5,0.715727 1.5,0 l 0,-7.5 3.5,0 0,7.5 c 0,0.691758 1.5,0.643818 1.5,0 0,0 -10e-7,-5.183647 0,-5.5 0.479394,-0.311606 0.75,-0.592515 0.75,-1 l -0.75,0 0,-1 c 0,0 0.981099,0 1.25,0 0.220961,0 0.5,-0.2603027 0.5,-0.5 0,0 0,-0.4999999 0,-0.9999999 0,-0.5 -0.274339,-0.5 -0.5,-0.5 l -1.25,0 c 0.02397,-0.2636668 -0.25,-0.5 -0.25,-0.5 0,0 0.25,-0.2123634 0.25,-0.5000002 l 1.25,0 c 0.5,0 0.5,-0.5 0.5,-0.5 0,-0.236333 0.582844,-0.1386127 1,-0.4999999 0.417156,-0.3613872 1,-1 1,-2 -6,1 -9,1 -14,0 z m 5.25,2.9999999 c -1.46e-4,0 1,0 1,0 l 0,1.0000002 -1,0 C 7.25,5.7127505 7,5.5003869 7,5.5003869 c 0,0 0.25,-0.1883936 0.25,-0.5 z m 2.5,0 1,0 c 0,0.2647543 0.25,0.5 0.25,0.5 0,0 -0.25,0.2363334 -0.25,0.5000002 l -1,0 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/shop_bakery.16.svg b/symbols/shop_bakery.16.svg
deleted file mode 100644
index 852e0eceba..0000000000
--- a/symbols/shop_bakery.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 7.75,4 9.25,8 7.75,8 6.25,4 C 6.25,4 4.4948328,4 4.5,4 L 6,8 4.5,8 3.1769068,4.5762712 C 2.2910439,5.2640693 1,7.1983848 1,9 l 0,2 c 0,0.59322 0.4237288,1 1,1 l 12,0 c 0.576271,0 1,-0.423729 1,-1 L 15,9 C 15,6.5355945 13.272623,4.5853602 11,4 L 12.5,8 11,8 9.5,4 c 0,0 -1.743955,0 -1.75,0 z" />
-</svg>
diff --git a/symbols/shop_bakery.18.svg b/symbols/shop_bakery.18.svg
new file mode 100644
index 0000000000..23981c791a
--- /dev/null
+++ b/symbols/shop_bakery.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="bakery">
+    <path
+       d="m 8.75,5 1.5,4 -1.5,0 -1.5,-4 C 7.25,5 5.4948328,5 5.5,5 L 7,9 5.5,9 4.1769068,5.5762712 C 3.2910439,6.2640693 2,8.1983848 2,10 l 0,2 c 0,0.59322 0.4237288,1 1,1 l 12,0 c 0.576271,0 1,-0.423729 1,-1 l 0,-2 C 16,7.5355945 14.272623,5.5853602 12,5 L 13.5,9 12,9 10.5,5 c 0,0 -1.743955,0 -1.75,0 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 8.75,5 1.5,4 -1.5,0 -1.5,-4 C 7.25,5 5.494833,5 5.5,5 L 7,9 5.5,9 4.176907,5.5762712 C 3.291044,6.2640693 2,8.1983848 2,10 l 0,2 c 0,0.59322 0.423729,1 1,1 l 12,0 c 0.576271,0 1,-0.423729 1,-1 l 0,-2 C 16,7.5355945 14.272623,5.5853602 12,5 L 13.5,9 12,9 10.5,5 c 0,0 -1.743955,0 -1.75,0 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/sikhist.16.svg b/symbols/sikhist.16.svg
deleted file mode 100644
index 6818072db1..0000000000
--- a/symbols/sikhist.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 7.9843342,1 6.9817232,2 C 7.044285,2.4367914 7.0601031,2.7749535 7.1070496,3.15625 5.8826554,3.5360844 4.9765013,4.653806 4.9765013,6 c 0,1.3565494 0.9229007,2.4727975 2.1618799,2.84375 C 7.0873598,9.2198537 7.0530306,9.5732699 6.9817232,10 l 0.5013055,0.5 0,0.40625 C 6.5614039,10.285538 5.5815135,9.5952456 4.9765013,9 2.9436865,7 3.4803233,3.5 5.9791123,2 3.9800811,2.5 2,4.3084098 2,7 c 0,2.9999999 2.9765013,4 2.9765013,5 l 1.002611,-1 1.2845953,0.71875 C 6.6495383,12.098319 5.9791123,12.5 5.9791123,12.5 l 0.5013055,0.5 1.0652741,-0.59375 0,0.71875 C 7.220259,13.290251 6.9817232,13.610806 6.9817232,14 c 0,0.552285 0.4488843,1 1.002611,1 0.5537267,0 1.002611,-0.447715 1.002611,-1 0,-0.389194 -0.2072042,-0.709749 -0.5326371,-0.875 l 0,-0.71875 L 9.4882507,13 9.9895561,12.5 c 0,0 -0.7067165,-0.44273 -1.2532637,-0.78125 L 9.9895561,11 10.992167,12 C 10.992167,11 14,9.9999999 14,7 14,4.3084098 11.994778,2.5 9.9895561,2 12.496084,3.5 13.031277,7 10.992167,9 10.377366,9.6030089 9.4209487,10.310953 8.4856397,10.9375 l 0,-0.4375 L 8.9869452,10 C 8.9177277,9.5857768 8.8803904,9.2251088 8.8302872,8.84375 10.069267,8.4727975 10.992167,7.3565494 10.992167,6 c 0,-1.3565494 -0.9229,-2.4727975 -2.1618798,-2.84375 C 8.8803904,2.7748912 8.9177277,2.4142232 8.9869452,2 L 7.9843342,1 z M 8.7049608,4.125 C 9.4582923,4.4127741 9.9895561,5.1474103 9.9895561,6 c 0,0.8525897 -0.5312638,1.5872258 -1.2845953,1.875 -0.1212607,-1.2890411 -0.1212607,-2.4609588 0,-3.75 z M 7.2010444,4.15625 c 0.009,-0.0038 0.022269,0.00367 0.031332,0 C 7.3673018,5.5461524 7.3833891,6.638887 7.2637076,7.875 6.510376,7.5872258 5.9791123,6.8525897 5.9791123,6 c 0,-0.8284273 0.5022278,-1.5401335 1.2219321,-1.84375 z M 5.4778068,13 c -0.2768634,0 -0.5013055,0.223858 -0.5013055,0.5 0,0.276142 0.2244421,0.5 0.5013055,0.5 0.2768634,0 0.5013055,-0.223858 0.5013055,-0.5 0,-0.276142 -0.2244421,-0.5 -0.5013055,-0.5 z m 5.0130552,0 c -0.276863,0 -0.5013059,0.223858 -0.5013059,0.5 0,0.276142 0.2244429,0.5 0.5013059,0.5 0.276863,0 0.501305,-0.223858 0.501305,-0.5 0,-0.276142 -0.224442,-0.5 -0.501305,-0.5 z" />
-</svg>
diff --git a/symbols/sikhist.18.svg b/symbols/sikhist.18.svg
new file mode 100644
index 0000000000..db606b6236
--- /dev/null
+++ b/symbols/sikhist.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="sikhist">
+    <path
+       d="M 8.9843342,2 7.9817232,3 C 8.044285,3.4367914 8.0601031,3.7749535 8.1070496,4.15625 6.8826554,4.5360844 5.9765013,5.653806 5.9765013,7 c 0,1.3565494 0.9229007,2.472798 2.1618799,2.84375 C 8.0873598,10.219854 8.0530306,10.57327 7.9817232,11 l 0.5013055,0.5 0,0.40625 C 7.5614039,11.285538 6.5815135,10.595246 5.9765013,10 3.9436865,8 4.4803233,4.5 6.9791123,3 4.9800811,3.5 3,5.3084098 3,8 c 0,3 2.9765013,4 2.9765013,5 l 1.002611,-1 1.2845953,0.71875 C 7.6495383,13.098319 6.9791123,13.5 6.9791123,13.5 l 0.5013055,0.5 1.0652741,-0.59375 0,0.71875 C 8.220259,14.290251 7.9817232,14.610806 7.9817232,15 c 0,0.552285 0.4488843,1 1.002611,1 0.5537267,0 1.002611,-0.447715 1.002611,-1 0,-0.389194 -0.2072042,-0.709749 -0.5326371,-0.875 l 0,-0.71875 L 10.488251,14 10.989556,13.5 c 0,0 -0.706716,-0.44273 -1.2532636,-0.78125 L 10.989556,12 11.992167,13 C 11.992167,12 15,11 15,8 15,5.3084098 12.994778,3.5 10.989556,3 c 2.506528,1.5 3.041721,5 1.002611,7 -0.614801,0.603009 -1.571218,1.310953 -2.5065273,1.9375 l 0,-0.4375 L 9.9869452,11 C 9.9177277,10.585777 9.8803904,10.225109 9.8302872,9.84375 11.069267,9.472798 11.992167,8.3565494 11.992167,7 c 0,-1.3565494 -0.9229,-2.4727975 -2.1618798,-2.84375 C 9.8803904,3.7748912 9.9177277,3.4142232 9.9869452,3 L 8.9843342,2 z M 9.7049608,5.125 C 10.458292,5.4127741 10.989556,6.1474103 10.989556,7 c 0,0.8525897 -0.531264,1.5872258 -1.2845952,1.875 -0.1212607,-1.2890411 -0.1212607,-2.4609588 0,-3.75 z M 8.2010444,5.15625 c 0.009,-0.0038 0.022269,0.00367 0.031332,0 C 8.3673018,6.5461524 8.3833891,7.638887 8.2637076,8.875 7.510376,8.5872258 6.9791123,7.8525897 6.9791123,7 c 0,-0.8284273 0.5022278,-1.5401335 1.2219321,-1.84375 z M 6.4778068,14 c -0.2768634,0 -0.5013055,0.223858 -0.5013055,0.5 0,0.276142 0.2244421,0.5 0.5013055,0.5 0.2768634,0 0.5013055,-0.223858 0.5013055,-0.5 0,-0.276142 -0.2244421,-0.5 -0.5013055,-0.5 z m 5.0130552,0 c -0.276863,0 -0.501306,0.223858 -0.501306,0.5 0,0.276142 0.224443,0.5 0.501306,0.5 0.276863,0 0.501305,-0.223858 0.501305,-0.5 0,-0.276142 -0.224442,-0.5 -0.501305,-0.5 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 8.984334,2 7.981723,3 C 8.044283,3.4367914 8.060103,3.7749535 8.10705,4.15625 6.882655,4.5360844 5.976501,5.653806 5.976501,7 c 0,1.3565494 0.922901,2.472798 2.16188,2.84375 C 8.087361,10.219854 8.053031,10.57327 7.981723,11 l 0.501306,0.5 0,0.40625 C 7.561404,11.285538 6.581513,10.595246 5.976501,10 3.943686,8 4.480323,4.5 6.979112,3 4.980081,3.5 3,5.3084098 3,8 c 0,3 2.976501,4 2.976501,5 l 1.002611,-1 1.284596,0.71875 C 7.649538,13.098319 6.979112,13.5 6.979112,13.5 l 0.501306,0.5 1.065274,-0.59375 0,0.71875 C 8.220259,14.290251 7.981723,14.610806 7.981723,15 c 0,0.552285 0.448885,1 1.002611,1 0.553727,0 1.002611,-0.447715 1.002611,-1 0,-0.389194 -0.207204,-0.709749 -0.532637,-0.875 l 0,-0.71875 L 10.488251,14 10.989556,13.5 c 0,0 -0.706716,-0.44273 -1.253264,-0.78125 L 10.989556,12 11.992167,13 C 11.992167,12 15,11 15,8 15,5.3084098 12.994778,3.5 10.989556,3 c 2.506528,1.5 3.041721,5 1.002611,7 -0.614801,0.603009 -1.571218,1.310953 -2.506527,1.9375 l 0,-0.4375 L 9.986945,11 C 9.917725,10.585777 9.88039,10.225109 9.830287,9.84375 11.069267,9.472798 11.992167,8.3565494 11.992167,7 c 0,-1.3565494 -0.9229,-2.4727975 -2.16188,-2.84375 C 9.880387,3.7748912 9.917727,3.4142232 9.986945,3 L 8.984334,2 z m 0.720627,3.125 c 0.753331,0.2877741 1.284595,1.0224103 1.284595,1.875 0,0.8525897 -0.531264,1.5872258 -1.284595,1.875 -0.121261,-1.2890411 -0.121261,-2.4609588 0,-3.75 z M 8.201044,5.15625 c 0.009,-0.0038 0.02227,0.00367 0.03133,0 C 8.3673,6.5461524 8.383387,7.638887 8.263704,8.875 7.510372,8.5872258 6.979108,7.8525897 6.979108,7 c 0,-0.8284273 0.502228,-1.5401335 1.221932,-1.84375 z M 6.477807,14 c -0.276864,0 -0.501306,0.223858 -0.501306,0.5 0,0.276142 0.224442,0.5 0.501306,0.5 0.276863,0 0.501305,-0.223858 0.501305,-0.5 0,-0.276142 -0.224442,-0.5 -0.501305,-0.5 z m 5.013055,0 c -0.276863,0 -0.501306,0.223858 -0.501306,0.5 0,0.276142 0.224443,0.5 0.501306,0.5 0.276863,0 0.501305,-0.223858 0.501305,-0.5 0,-0.276142 -0.224442,-0.5 -0.501305,-0.5 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/taoist.16.svg b/symbols/taoist.16.svg
deleted file mode 100644
index 50ad202738..0000000000
--- a/symbols/taoist.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 8,15 c 3.858078,0 7,-3.169117 7,-7 C 15,4.169117 11.877274,1 8,1 4.122726,1 1,4.13993 1,8 c 0,3.860071 3.141922,7 7,7 z M 8,14 C 4.680369,14 2,11.319631 2,8 2,4.680369 4.680369,2 8,2 c 3,0 4,5.4793944 0,6 -4,0.5206056 -2.915254,6 0,6 z m 0,-2 c -0.5522848,0 -1,-0.447716 -1,-1 0,-0.552284 0.4477152,-1 1,-1 0.5522848,0 1,0.447716 1,1 0,0.552284 -0.4477152,1 -1,1 z M 8,6 C 8.5522847,6 9,5.552285 9,5 9,4.447715 8.5522847,4 8,4 7.4477153,4 7,4.447715 7,5 7,5.552285 7.4477153,6 8,6 z" />
-</svg>
diff --git a/symbols/taoist.18.svg b/symbols/taoist.18.svg
new file mode 100644
index 0000000000..bafc9827c9
--- /dev/null
+++ b/symbols/taoist.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="taoist">
+    <path
+       d="m 9,16 c 3.858078,0 7,-3.169117 7,-7 C 16,5.169117 12.877274,2 9,2 5.122726,2 2,5.13993 2,9 c 0,3.860071 3.141922,7 7,7 z M 9,15 C 5.680369,15 3,12.319631 3,9 3,5.680369 5.680369,3 9,3 c 3,0 4,5.4793944 0,6 -4,0.520606 -2.915254,6 0,6 z m 0,-2 c -0.5522848,0 -1,-0.447716 -1,-1 0,-0.552284 0.4477152,-1 1,-1 0.5522848,0 1,0.447716 1,1 0,0.552284 -0.4477152,1 -1,1 z M 9,7 C 9.5522847,7 10,6.552285 10,6 10,5.447715 9.5522847,5 9,5 8.4477153,5 8,5.447715 8,6 8,6.552285 8.4477153,7 9,7 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 9,16 c 3.858078,0 7,-3.169117 7,-7 C 16,5.169117 12.877274,2 9,2 5.122726,2 2,5.13993 2,9 c 0,3.860071 3.141922,7 7,7 z M 9,15 C 5.680369,15 3,12.319631 3,9 3,5.680369 5.680369,3 9,3 c 3,0 4,5.4793944 0,6 -4,0.520606 -2.915254,6 0,6 z m 0,-2 c -0.552285,0 -1,-0.447716 -1,-1 0,-0.552284 0.447715,-1 1,-1 0.552285,0 1,0.447716 1,1 0,0.552284 -0.447715,1 -1,1 z M 9,7 C 9.552285,7 10,6.552285 10,6 10,5.447715 9.552285,5 9,5 8.447715,5 8,5.447715 8,6 8,6.552285 8.447715,7 9,7 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/theatre.16.svg b/symbols/theatre.16.svg
deleted file mode 100644
index 9cf15fd439..0000000000
--- a/symbols/theatre.16.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6" />
-  <rect
-     width="16"
-     height="16"
-     x="0"
-     y="0"
-     id="canvas"
-     style="fill:none;stroke:none;visibility:hidden" />
-  <path
-     d="m 1,1 0,7 c 0,0 0,4 4,4 0.4876943,0 0.9052288,-0.08308 1.28125,-0.1875 C 6.222862,11.329209 6.25,11 6.25,11 l 0,-0.21875 C 5.9069891,10.915179 5.4900129,11 5,11 2,11 2,8 2,8 L 2,2.5 c 2,0.9520605 4,0.9520605 6,0 L 8,3.65625 C 8.3344864,3.7893793 8.6766322,3.9137483 9,4 L 9,1 C 6,2.3728814 4,2.3050847 1,1 z m 2.5,3 c -0.5522847,0 -1,0.4477153 -1,1 0,0.5522847 0.4477153,1 1,1 0.5522847,0 1,-0.4477153 1,-1 0,-0.5522847 -0.4477153,-1 -1,-1 z M 7,4 7,11 c 0,0 0,4 4,4 4,0 4,-4 4,-4 L 15,4 C 12,5.3728814 10,5.3050847 7,4 z m 2.5,3 c 0.552285,0 1,0.4477153 1,1 0,0.5522847 -0.447715,1 -1,1 -0.5522847,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.4477153,-1 1,-1 z m 3,0 c 0.552285,0 1,0.4477153 1,1 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 z M 5,7.5 c -1.4622401,0 -2,1.016949 -2,2 l 3.25,0 0,-1.65625 C 5.9457008,7.6221969 5.5458781,7.5 5,7.5 z m 4,3.5 4,0 c 0,1 -1,2 -2,2 -1,0 -2,-1 -2,-2 z"
-     id="theatre"
-     style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
-</svg>
diff --git a/symbols/theatre.18.svg b/symbols/theatre.18.svg
new file mode 100644
index 0000000000..96e258c66f
--- /dev/null
+++ b/symbols/theatre.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="theatre">
+    <path
+       d="m 2,2 0,7 c 0,0 0,4 4,4 0.4876943,0 0.9052288,-0.08308 1.28125,-0.1875 C 7.222862,12.329209 7.25,12 7.25,12 l 0,-0.21875 C 6.9069891,11.915179 6.4900129,12 6,12 3,12 3,9 3,9 L 3,3.5 c 2,0.9520605 4,0.9520605 6,0 L 9,4.65625 C 9.3344864,4.7893793 9.6766322,4.9137483 10,5 L 10,2 C 7,3.3728814 5,3.3050847 2,2 z m 2.5,3 c -0.5522847,0 -1,0.4477153 -1,1 0,0.5522847 0.4477153,1 1,1 0.5522847,0 1,-0.4477153 1,-1 0,-0.5522847 -0.4477153,-1 -1,-1 z M 8,5 8,12 c 0,0 0,4 4,4 4,0 4,-4 4,-4 L 16,5 C 13,6.3728814 11,6.3050847 8,5 z m 2.5,3 c 0.552285,0 1,0.4477153 1,1 0,0.552285 -0.447715,1 -1,1 -0.5522847,0 -1,-0.447715 -1,-1 0,-0.5522847 0.4477153,-1 1,-1 z m 3,0 c 0.552285,0 1,0.4477153 1,1 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.5522847 0.447715,-1 1,-1 z M 6,8.5 c -1.4622401,0 -2,1.016949 -2,2 l 3.25,0 0,-1.65625 C 6.9457008,8.6221969 6.5458781,8.5 6,8.5 z m 4,3.5 4,0 c 0,1 -1,2 -2,2 -1,0 -2,-1 -2,-2 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 2,2 0,7 c 0,0 0,4 4,4 0.487694,0 0.905229,-0.08308 1.28125,-0.1875 C 7.222862,12.329209 7.25,12 7.25,12 l 0,-0.21875 C 6.906989,11.915179 6.490013,12 6,12 3,12 3,9 3,9 L 3,3.5 c 2,0.9520605 4,0.9520605 6,0 L 9,4.65625 C 9.334486,4.7893793 9.676632,4.9137483 10,5 L 10,2 C 7,3.3728814 5,3.3050847 2,2 z m 2.5,3 c -0.552285,0 -1,0.4477153 -1,1 0,0.5522847 0.447715,1 1,1 0.552285,0 1,-0.4477153 1,-1 0,-0.5522847 -0.447715,-1 -1,-1 z M 8,5 8,12 c 0,0 0,4 4,4 4,0 4,-4 4,-4 L 16,5 C 13,6.3728814 11,6.3050847 8,5 z m 2.5,3 c 0.552285,0 1,0.4477153 1,1 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.5522847 0.447715,-1 1,-1 z m 3,0 c 0.552285,0 1,0.4477153 1,1 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.5522847 0.447715,-1 1,-1 z M 6,8.5 c -1.46224,0 -2,1.016949 -2,2 l 3.25,0 0,-1.65625 C 6.945701,8.6221969 6.545878,8.5 6,8.5 z m 4,3.5 4,0 c 0,1 -1,2 -2,2 -1,0 -2,-1 -2,-2 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/toilets.16.svg b/symbols/toilets.16.svg
deleted file mode 100644
index ac0b5ae05b..0000000000
--- a/symbols/toilets.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="m 7.25,1 0,14 1.5,0 0,-14 -1.5,0 z M 3.5,2 C 2.6715729,2 2,2.6715729 2,3.5 2,4.3284271 2.6715729,5 3.5,5 4.3284271,5 5,4.3284271 5,3.5 5,2.6715729 4.3284271,2 3.5,2 z m 9,0 C 11.671573,2 11,2.6715729 11,3.5 11,4.3284271 11.671573,5 12.5,5 13.328427,5 14,4.3284271 14,3.5 14,2.6715729 13.328427,2 12.5,2 z m -10,4 c -0.5997222,0 -1,0.568545 -1,1 0,0.5273339 1.25,1.4966359 1.25,2 C 2.75,9.5559735 1,10 1,12 l 1.75,0 0,3 1.5,0 0,-3 L 6,12 C 6,10 4.25,9.5295085 4.25,9 4.25,8.4704915 5.5,7.5513036 5.5,7 5.5,6.5925147 5.0752733,6 4.5,6 l -2,0 z M 11,6 c -0.527334,0 -1,0.4804699 -1,1 0,1 1.75,4.016073 1.75,5 l 0,3 1.5,0 0,-3 C 13.25,11.035543 15,8 15,7 15,6.446616 14.551304,6 14,6 l -3,0 z" />
-</svg>
diff --git a/symbols/toilets.18.svg b/symbols/toilets.18.svg
new file mode 100644
index 0000000000..c754aa5731
--- /dev/null
+++ b/symbols/toilets.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="toilets">
+    <path
+       d="m 8.25,2 0,14 1.5,0 0,-14 -1.5,0 z M 4.5,3 C 3.6715729,3 3,3.6715729 3,4.5 3,5.3284271 3.6715729,6 4.5,6 5.3284271,6 6,5.3284271 6,4.5 6,3.6715729 5.3284271,3 4.5,3 z m 9,0 C 12.671573,3 12,3.6715729 12,4.5 12,5.3284271 12.671573,6 13.5,6 14.328427,6 15,5.3284271 15,4.5 15,3.6715729 14.328427,3 13.5,3 z m -10,4 c -0.5997222,0 -1,0.568545 -1,1 0,0.5273339 1.25,1.496636 1.25,2 0,0.555974 -1.75,1 -1.75,3 l 1.75,0 0,3 1.5,0 0,-3 L 7,13 C 7,11 5.25,10.529509 5.25,10 5.25,9.470492 6.5,8.5513036 6.5,8 6.5,7.5925147 6.0752733,7 5.5,7 l -2,0 z M 12,7 c -0.527334,0 -1,0.4804699 -1,1 0,1 1.75,4.016073 1.75,5 l 0,3 1.5,0 0,-3 C 14.25,12.035543 16,9 16,8 16,7.446616 15.551304,7 15,7 l -3,0 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="m 8.25,2 0,14 1.5,0 0,-14 -1.5,0 z M 4.5,3 C 3.671573,3 3,3.6715729 3,4.5 3,5.3284271 3.671573,6 4.5,6 5.328427,6 6,5.3284271 6,4.5 6,3.6715729 5.328427,3 4.5,3 z m 9,0 C 12.671573,3 12,3.6715729 12,4.5 12,5.3284271 12.671573,6 13.5,6 14.328427,6 15,5.3284271 15,4.5 15,3.6715729 14.328427,3 13.5,3 z m -10,4 c -0.599722,0 -1,0.568545 -1,1 0,0.5273339 1.25,1.496636 1.25,2 0,0.555974 -1.75,1 -1.75,3 l 1.75,0 0,3 1.5,0 0,-3 L 7,13 C 7,11 5.25,10.529509 5.25,10 5.25,9.470492 6.5,8.5513036 6.5,8 6.5,7.5925147 6.075273,7 5.5,7 l -2,0 z M 12,7 c -0.527334,0 -1,0.4804699 -1,1 0,1 1.75,4.016073 1.75,5 l 0,3 1.5,0 0,-3 C 14.25,12.035543 16,9 16,8 16,7.446616 15.551304,7 15,7 l -3,0 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/tourist_memorial.16.svg b/symbols/tourist_memorial.16.svg
deleted file mode 100644
index 8cb8b49df2..0000000000
--- a/symbols/tourist_memorial.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 6,2 C 5,2 4,3 4,4 l 0,8 8,0 0,-8 C 12,3 11,2 10,2 z M 7,4 9,4 9,5 7,5 z m -2,2 6,0 0,1 -6,0 z m 1,2 4,0 0,1 -4,0 z m -3,5 -1,1 0,1 12,0 0,-1 -1,-1 z" />
-</svg>
diff --git a/symbols/tourist_memorial.18.svg b/symbols/tourist_memorial.18.svg
new file mode 100644
index 0000000000..2e6449ec2e
--- /dev/null
+++ b/symbols/tourist_memorial.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="memorial">
+    <path
+       d="M 7,3 C 6,3 5,4 5,5 l 0,8 8,0 0,-8 C 13,4 12,3 11,3 z m 1,2 2,0 0,1 -2,0 z m -2,2 6,0 0,1 -6,0 z m 1,2 4,0 0,1 -4,0 z m -3,5 -1,1 0,1 12,0 0,-1 -1,-1 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 7,3 C 6,3 5,4 5,5 l 0,8 8,0 0,-8 C 13,4 12,3 11,3 z m 1,2 2,0 0,1 -2,0 z m -2,2 6,0 0,1 -6,0 z m 1,2 4,0 0,1 -4,0 z m -3,5 -1,1 0,1 12,0 0,-1 -1,-1 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>
diff --git a/symbols/town_hall.16.svg b/symbols/town_hall.16.svg
deleted file mode 100644
index 358fba9cc6..0000000000
--- a/symbols/town_hall.16.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns="http://www.w3.org/2000/svg"
-   version="1.1"
-   width="100%"
-   height="100%"
-   viewBox="0 0 16 16">
-  <path
-     d="M 8,1 C 7.75,1.0032 7.5,1.1644239 7.5,1.5 L 7.5,5.375 2,8 14,8 8.5,5.375 8.5,1.5 C 8.5,1.1516409 8.25,0.99680426 8,1 z M 9,1 9,4 13,4 11,2.5 13,1 z m -7,8 0,1 1,0 0,4 -1,0 0,1 12,0 0,-1 -1,0 0,-4 1,0 0,-1 z m 6,1.5 c 1,0 2,0.5 2,1.5 l 0,2 -4,0 0,-2 c 0,-1 1,-1.5 2,-1.5 z" />
-</svg>
diff --git a/symbols/town_hall.18.svg b/symbols/town_hall.18.svg
new file mode 100644
index 0000000000..71b2551b23
--- /dev/null
+++ b/symbols/town_hall.18.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="100%"
+   height="100%"
+   viewBox="0 0 18 18"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <rect
+     width="18"
+     height="18"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <g
+     id="town-hall">
+    <path
+       d="M 9,2 C 8.75,2.0032 8.5,2.1644239 8.5,2.5 L 8.5,6.375 3,9 15,9 9.5,6.375 9.5,2.5 C 9.5,2.1516409 9.25,1.9968043 9,2 z m 1,0 0,3 4,0 L 12,3.5 14,2 z m -7,8 0,1 1,0 0,4 -1,0 0,1 12,0 0,-1 -1,0 0,-4 1,0 0,-1 z m 6,1.5 c 1,0 2,0.5 2,1.5 l 0,2 -4,0 0,-2 c 0,-1 1,-1.5 2,-1.5 z"
+       id="halo"
+       style="opacity:0.3;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+       d="M 9,2 C 8.75,2.0032 8.5,2.1644239 8.5,2.5 L 8.5,6.375 3,9 15,9 9.5,6.375 9.5,2.5 C 9.5,2.1516409 9.25,1.9968043 9,2 z m 1,0 0,3 4,0 L 12,3.5 14,2 z m -7,8 0,1 1,0 0,4 -1,0 0,1 12,0 0,-1 -1,0 0,-4 1,0 0,-1 z m 6,1.5 c 1,0 2,0.5 2,1.5 l 0,2 -4,0 0,-2 c 0,-1 1,-1.5 2,-1.5 z"
+       id="icon"
+       style="fill:#1a1a1a;fill-opacity:1;stroke:none" />
+  </g>
+</svg>