diff --git a/data/basic_hdpi.skn b/data/basic_hdpi.skn
index 2a81e13e17..8baf9255a6 100644
--- a/data/basic_hdpi.skn
+++ b/data/basic_hdpi.skn
@@ -208,233 +208,221 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
+
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/data/basic_ldpi.skn b/data/basic_ldpi.skn
index f3acf60a6c..3505cabb0c 100644
--- a/data/basic_ldpi.skn
+++ b/data/basic_ldpi.skn
@@ -208,233 +208,221 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/data/basic_mdpi.skn b/data/basic_mdpi.skn
index e5d0ec3ddc..333d582ef6 100644
--- a/data/basic_mdpi.skn
+++ b/data/basic_mdpi.skn
@@ -208,233 +208,221 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/data/styles/symbols/airport.svg b/data/styles/symbols/airport.svg
index 5d9387e732..d84bb1ff48 100644
--- a/data/styles/symbols/airport.svg
+++ b/data/styles/symbols/airport.svg
@@ -1,90 +1,4 @@
-
-
-
-
+
+
\ No newline at end of file
diff --git a/data/styles/symbols/alpine_hut.svg b/data/styles/symbols/alpine_hut.svg
index dc72309939..eddb4cb2fb 100644
--- a/data/styles/symbols/alpine_hut.svg
+++ b/data/styles/symbols/alpine_hut.svg
@@ -1,60 +1,21 @@
-
diff --git a/data/styles/symbols/archery-borderless.svg b/data/styles/symbols/archery-borderless.svg
index a604ed67f1..24b3031d55 100644
--- a/data/styles/symbols/archery-borderless.svg
+++ b/data/styles/symbols/archery-borderless.svg
@@ -1,93 +1,53 @@
-
diff --git a/data/styles/symbols/atm.svg b/data/styles/symbols/atm.svg
index 2bfe1c66ea..2f3d74b452 100644
--- a/data/styles/symbols/atm.svg
+++ b/data/styles/symbols/atm.svg
@@ -1,105 +1,30 @@
-
diff --git a/data/styles/symbols/bakery.svg b/data/styles/symbols/bakery.svg
index 92eccfe92d..2567a141df 100644
--- a/data/styles/symbols/bakery.svg
+++ b/data/styles/symbols/bakery.svg
@@ -1,72 +1,19 @@
-
diff --git a/data/styles/symbols/bank.svg b/data/styles/symbols/bank.svg
index 1cae24401f..5e25409f87 100644
--- a/data/styles/symbols/bank.svg
+++ b/data/styles/symbols/bank.svg
@@ -1,58 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/data/styles/symbols/bar.svg b/data/styles/symbols/bar.svg
index 37da8ab0c3..f770c2f944 100644
--- a/data/styles/symbols/bar.svg
+++ b/data/styles/symbols/bar.svg
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
+ width="16px"
+ height="16px"
+ id="svg5079"
+ version="1.1"
+ inkscape:version="0.47 r22583"
+ sodipodi:docname="bar.svg">
+ bar icon
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ image/svg+xml
+
+ bar icon
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/data/styles/symbols/baseball-borderless.svg b/data/styles/symbols/baseball-borderless.svg
index b47852d53a..4be6afd408 100644
--- a/data/styles/symbols/baseball-borderless.svg
+++ b/data/styles/symbols/baseball-borderless.svg
@@ -1,58 +1,19 @@
-
diff --git a/data/styles/symbols/bicycle_rental.svg b/data/styles/symbols/bicycle_rental.svg
index 183548d5bb..91db8a3505 100644
--- a/data/styles/symbols/bicycle_rental.svg
+++ b/data/styles/symbols/bicycle_rental.svg
@@ -1,77 +1,55 @@
diff --git a/data/styles/symbols/bird.svg b/data/styles/symbols/bird.svg
index 90eacbd298..f3181c12bc 100644
--- a/data/styles/symbols/bird.svg
+++ b/data/styles/symbols/bird.svg
@@ -1,117 +1,26 @@
-
diff --git a/data/styles/symbols/bowls-borderless.svg b/data/styles/symbols/bowls-borderless.svg
index d95d848371..d4e9cfacfc 100644
--- a/data/styles/symbols/bowls-borderless.svg
+++ b/data/styles/symbols/bowls-borderless.svg
@@ -1,61 +1,22 @@
-
diff --git a/data/styles/symbols/building.svg b/data/styles/symbols/building.svg
index 900852864f..18e95dbf97 100644
--- a/data/styles/symbols/building.svg
+++ b/data/styles/symbols/building.svg
@@ -1,55 +1,14 @@
-
diff --git a/data/styles/symbols/bus.svg b/data/styles/symbols/bus.svg
index a443de46b5..760c077b0d 100644
--- a/data/styles/symbols/bus.svg
+++ b/data/styles/symbols/bus.svg
@@ -1,93 +1,12 @@
-
-
+
+
\ No newline at end of file
diff --git a/data/styles/symbols/bus_sta.svg b/data/styles/symbols/bus_sta.svg
index ebdf3012b9..23ef1b5ce0 100644
--- a/data/styles/symbols/bus_sta.svg
+++ b/data/styles/symbols/bus_sta.svg
@@ -1,84 +1,69 @@
+
diff --git a/data/styles/symbols/cafe.svg b/data/styles/symbols/cafe.svg
index 0d6e9b2942..01d289a873 100644
--- a/data/styles/symbols/cafe.svg
+++ b/data/styles/symbols/cafe.svg
@@ -1,109 +1,40 @@
-
diff --git a/data/styles/symbols/campSite.svg b/data/styles/symbols/campSite.svg
index 829664c71a..5b6d81a819 100644
--- a/data/styles/symbols/campSite.svg
+++ b/data/styles/symbols/campSite.svg
@@ -1,66 +1,4 @@
-
-
+
+
\ No newline at end of file
diff --git a/data/styles/symbols/cannon.svg b/data/styles/symbols/cannon.svg
index 064d2f07d5..ee20d8d455 100644
--- a/data/styles/symbols/cannon.svg
+++ b/data/styles/symbols/cannon.svg
@@ -13,7 +13,7 @@
viewBox="0 0 12 12"
height="37.28"
sodipodi:version="0.32"
- inkscape:version="0.48.2 r9819"
+ inkscape:version="0.47 r22583"
sodipodi:docname="cannon.svg">
@@ -44,7 +44,7 @@
sodipodi:type="inkscape:persp3d" />
+ id="path3" />
diff --git a/data/styles/symbols/church.svg b/data/styles/symbols/church.svg
index eb6a3d63d7..8b60ce1927 100644
--- a/data/styles/symbols/church.svg
+++ b/data/styles/symbols/church.svg
@@ -1,60 +1,6 @@
-
-
+
+
\ No newline at end of file
diff --git a/data/styles/symbols/cinema.svg b/data/styles/symbols/cinema.svg
index d7596251a0..7b3904a742 100644
--- a/data/styles/symbols/cinema.svg
+++ b/data/styles/symbols/cinema.svg
@@ -1,64 +1,20 @@
-
-
-
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/data/styles/symbols/dog_park.svg b/data/styles/symbols/dog_park.svg
index 9af0dec84f..c0e972a9c1 100644
--- a/data/styles/symbols/dog_park.svg
+++ b/data/styles/symbols/dog_park.svg
@@ -1,61 +1,41 @@
-
-
\ No newline at end of file
+ width="16"
+ height="16"
+ viewBox="0 0 18 18"
+ id="symbol-dog-park"
+ style="stroke:#000000">
+
+
+
+
+
+
+
+
diff --git a/data/styles/symbols/drinking_water.svg b/data/styles/symbols/drinking_water.svg
index 5267d56eaf..e57fa1291d 100644
--- a/data/styles/symbols/drinking_water.svg
+++ b/data/styles/symbols/drinking_water.svg
@@ -1,77 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/data/styles/symbols/earthquakeCamp.svg b/data/styles/symbols/earthquakeCamp.svg
index 4c7301c9a9..4e8e07233f 100644
--- a/data/styles/symbols/earthquakeCamp.svg
+++ b/data/styles/symbols/earthquakeCamp.svg
@@ -1,67 +1,4 @@
-
-