Radar reflectors (RADRFL)

RCTLPT areas and TSSLPT/RCTLPT points
Cosmetics
2025-06-30 21:09:15 +02:00 · 2024-12-18 13:58:49 +01:00 · 2024-12-18 12:41:05 +01:00 · 2024-12-17 11:28:23 +01:00 · 2024-12-17 10:55:01 +01:00 · 2024-12-16 15:03:02 +01:00
423 changed files with 14365 additions and 12410 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@ -1,4 +1,4 @@
-version: 13.19.{build}
+version: 13.34.{build}

 configuration:
  - Release
@ -12,8 +12,8 @@ environment:
  - QTDIR: C:\Qt\5.15\msvc2019_64
    OPENSSLDIR: C:\OpenSSL-v111-Win64\bin
    NSISDEF: /DOPENSSL /DANGLE
-  - QTDIR: C:\Qt\6.7\msvc2019_64
-    OPENSSLDIR: C:\OpenSSL-v32-Win64\bin
+  - QTDIR: C:\Qt\6.8\msvc2019_64
+    OPENSSLDIR: C:\OpenSSL-v33-Win64\bin
    NSISDEF: /DQT6 /DOPENSSL

 install:
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@ -26,14 +26,12 @@ jobs:
      - name: Setup NDK path
        run: echo "ANDROID_NDK_ROOT=${ANDROID_HOME}/ndk/23.1.7779620/" >> $GITHUB_ENV
      - name: Install Qt (Desktop)
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
        with:
-          aqtversion: '==3.1.*'
          version: '6.4.0'
      - name: Install Qt (Android)
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
        with:
-          aqtversion: '==3.1.*'
          version: '6.4.0'
          target: 'android'
          arch: 'android_arm64_v8a'
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@ -18,7 +18,7 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4

    - name: Install dependencies
      run: |
@ -26,7 +26,7 @@ jobs:
          sudo apt-get install qtbase5-dev qtbase5-private-dev qtbase5-dev-tools qt5-qmake qttools5-dev-tools libqt5opengl5-dev qtpositioning5-dev libqt5svg5-dev libqt5serialport5-dev

    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
@ -37,9 +37,9 @@ jobs:
        # queries: security-extended,security-and-quality

    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
      with:
        category: "/language:${{matrix.language}}"
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@ -6,40 +6,16 @@ on:
      - master

 jobs:
-  qt5:
-    name: GPXSee Qt5 build
+  build:
+    name: GPXSee
    runs-on: macos-latest
    steps:
      - name: Checkout
        uses: actions/checkout@v4
      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
        with:
-          version: '5.15.2'
-      - name: Create localization
-        run: lrelease gpxsee.pro
-      - name: Configure build
-        run: qmake gpxsee.pro
-      - name: Build project
-        run: make -j3
-      - name: Create DMG
-        run: macdeployqt GPXSee.app -dmg -appstore-compliant
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: GPXSee-qt5.dmg
-          path: GPXSee.dmg
-
-  qt6:
-    name: GPXSee Qt6 build
-    runs-on: macos-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Install Qt
-        uses: jurplel/install-qt-action@v3
-        with:
-          version: '6.7.0'
+          version: '6.8.0'
          modules: qtpositioning qtserialport qtimageformats
      - name: Create localization
        run: lrelease gpxsee.pro
@ -52,5 +28,5 @@ jobs:
      - name: Upload artifacts
        uses: actions/upload-artifact@v4
        with:
-          name: GPXSee-qt6.dmg
          path: GPXSee.dmg
+          name: GPXSee.dmg
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -1,4 +1,4 @@
-Only localization contributions are accepted at the moment, code pull requests will be rejected.
+__Only localization contributions are accepted at the moment, code pull requests will be rejected.__

 The rationale is, that I want leave the possibility to distribute GPXsee builds in the OS X/Windows
 stores under a non-GPL licence open. In the future, code pull requests under a
--- a/README.md
+++ b/README.md
@ -73,5 +73,3 @@ different, GPL compatible, licenses:
  [Transverse Mercator](src/map/proj/transversemercator.cpp) projections - NIMA
  Source Code Disclaimer
 * [Projection parameters CSV files](data/CRS) - BSD/EPSG/Public domain
-* [Mapsforge render theme](data/mapsforge/default.xml) and its
-  [icons](icons/map/mapsforge) - LGPLv3
--- a/data/mapsforge/default.xml
+++ b/data/mapsforge/default.xml
--- a/data/style/style.xml
+++ b/data/style/style.xml
--- a/gpxsee.pro
+++ b/gpxsee.pro
@ -3,7 +3,7 @@ unix:!macx:!android {
 } else {
    TARGET = GPXSee
 }
-VERSION = 13.19
+VERSION = 13.34


 QT += core \
@ -27,7 +27,6 @@ HEADERS += src/common/config.h \
    src/common/garmin.h \
    src/common/coordinates.h \
    src/common/hash.h \
-    src/common/linec.h \
    src/common/range.h \
    src/common/rectc.h \
    src/common/textcodec.h \
@ -39,12 +38,9 @@ HEADERS += src/common/config.h \
    src/common/greatcircle.h \
    src/common/programpaths.h \
    src/common/tifffile.h \
-    src/common/downloader.h \
    src/common/polygon.h \
    src/common/color.h \
    src/common/csv.h \
-    src/common/dem.h \
-    src/common/demloader.h \
    src/GUI/crosshairitem.h \
    src/GUI/motioninfoitem.h \
    src/GUI/pluginparameters.h \
@ -122,12 +118,18 @@ HEADERS += src/common/config.h \
    src/data/gpsdumpparser.h \
    src/data/style.h \
    src/data/twonavparser.h \
+    src/map/downloader.h \
+    src/map/demloader.h \
    src/map/ENC/attributes.h \
    src/map/ENC/mapdata.h \
    src/map/ENC/atlasdata.h \
    src/map/ENC/objects.h \
    src/map/ENC/rastertile.h \
    src/map/ENC/style.h \
+    src/map/IMG/demfile.h \
+    src/map/IMG/demtile.h \
+    src/map/IMG/demtree.h \
+    src/map/IMG/jls.h \
    src/map/IMG/section.h \
    src/map/IMG/zoom.h \
    src/map/conversion.h \
@ -135,8 +137,10 @@ HEADERS += src/common/config.h \
    src/map/encjob.h \
    src/map/encmap.h \
    src/map/ENC/iso8211.h \
+    src/map/filter.h \
    src/map/gemfmap.h \
    src/map/gmifile.h \
+    src/map/metatype.h \
    src/map/oruxmap.h \
    src/map/osmdroidmap.h \
    src/map/proj/polyconic.h \
@ -190,6 +194,7 @@ HEADERS += src/common/config.h \
    src/map/sqlitemap.h \
    src/map/utm.h \
    src/map/map.h \
+    src/map/dem.h \
    src/map/maplist.h \
    src/map/onlinemap.h \
    src/map/tile.h \
@ -275,10 +280,7 @@ SOURCES += src/main.cpp \
    src/common/greatcircle.cpp \
    src/common/programpaths.cpp \
    src/common/tifffile.cpp \
-    src/common/downloader.cpp \
    src/common/csv.cpp \
-    src/common/dem.cpp \
-    src/common/demloader.cpp \
    src/GUI/crosshairitem.cpp \
    src/GUI/motioninfoitem.cpp \
    src/GUI/pluginparameters.cpp \
@ -341,14 +343,20 @@ SOURCES += src/main.cpp \
    src/GUI/pngexportdialog.cpp \
    src/GUI/projectioncombobox.cpp \
    src/GUI/passwordedit.cpp \
+    src/map/downloader.cpp \
+    src/map/demloader.cpp \
    src/map/ENC/atlasdata.cpp \
    src/map/ENC/mapdata.cpp \
    src/map/ENC/rastertile.cpp \
    src/map/ENC/style.cpp \
+    src/map/IMG/demfile.cpp \
+    src/map/IMG/demtree.cpp \
+    src/map/IMG/jls.cpp \
    src/map/conversion.cpp \
    src/map/encatlas.cpp \
    src/map/encmap.cpp \
    src/map/ENC/iso8211.cpp \
+    src/map/filter.cpp \
    src/map/gemfmap.cpp \
    src/map/gmifile.cpp \
    src/map/oruxmap.cpp \
@ -426,6 +434,7 @@ SOURCES += src/main.cpp \
    src/map/geocentric.cpp \
    src/map/jnxmap.cpp \
    src/map/map.cpp \
+    src/map/dem.cpp \
    src/map/geotiffmap.cpp \
    src/map/image.cpp \
    src/map/mbtilesmap.cpp \
@ -465,8 +474,7 @@ SOURCES += src/main.cpp \
    src/data/smlparser.cpp \
    src/data/geojsonparser.cpp

-DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
-    QT_NO_DEPRECATED_WARNINGS
+DEFINES += APP_VERSION=\\\"$$VERSION\\\"

 RESOURCES += gpxsee.qrc
 TRANSLATIONS = lang/gpxsee_en.ts \
@ -486,7 +494,7 @@ TRANSLATIONS = lang/gpxsee_en.ts \
    lang/gpxsee_hu.ts \
    lang/gpxsee_it.ts \
    lang/gpxsee_eo.ts \
-    lang/gpxsee_zh.ts \
+    lang/gpxsee_zh_CN.ts \
    lang/gpxsee_ca.ts \
    lang/gpxsee_ko.ts

--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@ -5,14 +5,17 @@
 	</qresource>

 	<!-- Common map stuff -->
-	<qresource prefix="/map">
-		<file alias="arrow.png">icons/map/arrow.png</file>
-		<file alias="arrow@2x.png">icons/map/arrow@2x.png</file>
-		<file alias="water-arrow.png">icons/map/water-arrow.png</file>
-		<file alias="water-arrow@2x.png">icons/map/water-arrow@2x.png</file>
+	<qresource prefix="/symbols">
+		<file alias="bunker.svg">icons/map/symbols/bunker.svg</file>
+		<file alias="cliff.svg">icons/map/symbols/cliff.svg</file>
+		<file alias="cross.svg">icons/map/symbols/cross.svg</file>
+		<file alias="exit.svg">icons/map/symbols/exit.svg</file>
+		<file alias="flow.svg">icons/map/symbols/flow.svg</file>
+		<file alias="oneway.svg">icons/map/symbols/oneway.svg</file>
+		<file alias="saddle.svg">icons/map/symbols/saddle.svg</file>
 	</qresource>

-	<!-- POIs (IMG & ENC style) -->
+	<!-- POIs (IMG, Mapsforge & ENC style) -->
 	<qresource prefix="/POI">
 		<file alias="airfield-11.svg">icons/map/POI/airfield-11.svg</file>
 		<file alias="airport-11.svg">icons/map/POI/airport-11.svg</file>
@ -22,8 +25,12 @@
 		<file alias="bank-11.svg">icons/map/POI/bank-11.svg</file>
 		<file alias="bar-11.svg">icons/map/POI/bar-11.svg</file>
 		<file alias="barrier-11.svg">icons/map/POI/barrier-11.svg</file>
+		<file alias="baseball-11.svg">icons/map/POI/baseball-11.svg</file>
+		<file alias="basketball-11.svg">icons/map/POI/basketball-11.svg</file>
 		<file alias="bbq-11.svg">icons/map/POI/bbq-11.svg</file>
 		<file alias="beach-11.svg">icons/map/POI/beach-11.svg</file>
+		<file alias="beer-11.svg">icons/map/POI/beer-11.svg</file>
+		<file alias="bicycle-11.svg">icons/map/POI/bicycle-11.svg</file>
 		<file alias="bowling-alley-11.svg">icons/map/POI/bowling-alley-11.svg</file>
 		<file alias="building-alt1-11.svg">icons/map/POI/building-alt1-11.svg</file>
 		<file alias="bridge-11.svg">icons/map/POI/bridge-11.svg</file>
@ -34,16 +41,24 @@
 		<file alias="car-rental-11.svg">icons/map/POI/car-rental-11.svg</file>
 		<file alias="car-repair-11.svg">icons/map/POI/car-repair-11.svg</file>
 		<file alias="casino-11.svg">icons/map/POI/casino-11.svg</file>
+		<file alias="castle-11.svg">icons/map/POI/castle-11.svg</file>
 		<file alias="cemetery-11.svg">icons/map/POI/cemetery-11.svg</file>
 		<file alias="cinema-11.svg">icons/map/POI/cinema-11.svg</file>
 		<file alias="clothing-store-11.svg">icons/map/POI/clothing-store-11.svg</file>
+		<file alias="college-11.svg">icons/map/POI/college-11.svg</file>
 		<file alias="communications-tower-11.svg">icons/map/POI/communications-tower-11.svg</file>
 		<file alias="convenience-11.svg">icons/map/POI/convenience-11.svg</file>
+		<file alias="cricket-11.svg">icons/map/POI/cricket-11.svg</file>
+		<file alias="cross-11.svg">icons/map/POI/cross-11.svg</file>
 		<file alias="dam-11.svg">icons/map/POI/dam-11.svg</file>
 		<file alias="danger-11.svg">icons/map/POI/danger-11.svg</file>
+		<file alias="defibrillator-11.svg">icons/map/POI/defibrillator-11.svg</file>
+		<file alias="doctor-11.svg">icons/map/POI/doctor-11.svg</file>
 		<file alias="drinking-water-11.svg">icons/map/POI/drinking-water-11.svg</file>
 		<file alias="fast-food-11.svg">icons/map/POI/fast-food-11.svg</file>
+		<file alias="embassy-11.svg">icons/map/POI/embassy-11.svg</file>
 		<file alias="entrance-alt1-11.svg">icons/map/POI/entrance-alt1-11.svg</file>
+		<file alias="ferry-11.svg">icons/map/POI/ferry-11.svg</file>
 		<file alias="fire-station-11.svg">icons/map/POI/fire-station-11.svg</file>
 		<file alias="fitness-centre-11.svg">icons/map/POI/fitness-centre-11.svg</file>
 		<file alias="fuel-11.svg">icons/map/POI/fuel-11.svg</file>
@ -56,20 +71,32 @@
 		<file alias="harbor-11.svg">icons/map/POI/harbor-11.svg</file>
 		<file alias="hardware-11.svg">icons/map/POI/hardware-11.svg</file>
 		<file alias="heliport-11.svg">icons/map/POI/heliport-11.svg</file>
+		<file alias="home-11.svg">icons/map/POI/home-11.svg</file>
+		<file alias="horse-riding-11.svg">icons/map/POI/horse-riding-11.svg</file>
 		<file alias="hospital-11.svg">icons/map/POI/hospital-11.svg</file>
+		<file alias="hot-spring.svg">icons/map/POI/hot-spring.svg</file>
+		<file alias="ice-cream-11.svg">icons/map/POI/ice-cream-11.svg</file>
 		<file alias="information-11.svg">icons/map/POI/information-11.svg</file>
 		<file alias="landmark-11.svg">icons/map/POI/landmark-11.svg</file>
+		<file alias="laundry-11.svg">icons/map/POI/laundry-11.svg</file>
 		<file alias="library-11.svg">icons/map/POI/library-11.svg</file>
+		<file alias="lighthouse-11.svg">icons/map/POI/lighthouse-11.svg</file>
 		<file alias="lodging-11.svg">icons/map/POI/lodging-11.svg</file>
+		<file alias="monument-11.svg">icons/map/POI/monument-11.svg</file>
 		<file alias="mountain-11.svg">icons/map/POI/mountain-11.svg</file>
 		<file alias="museum-11.svg">icons/map/POI/museum-11.svg</file>
+		<file alias="observation-tower.svg">icons/map/POI/observation-tower.svg</file>
 		<file alias="park-11.svg">icons/map/POI/park-11.svg</file>
 		<file alias="parking-11.svg">icons/map/POI/parking-11.svg</file>
+		<file alias="parking-garage-11.svg">icons/map/POI/parking-garage-11.svg</file>
 		<file alias="pharmacy-11.svg">icons/map/POI/pharmacy-11.svg</file>
 		<file alias="picnic-site-11.svg">icons/map/POI/picnic-site-11.svg</file>
 		<file alias="place-of-worship-11.svg">icons/map/POI/place-of-worship-11.svg</file>
 		<file alias="police-11.svg">icons/map/POI/police-11.svg</file>
 		<file alias="post-11.svg">icons/map/POI/post-11.svg</file>
+		<file alias="rail-11.svg">icons/map/POI/rail-11.svg</file>
+		<file alias="rail-light-11.svg">icons/map/POI/rail-light-11.svg</file>
+		<file alias="rail-metro-11.svg">icons/map/POI/rail-metro-11.svg</file>
 		<file alias="religious-christian-11.svg">icons/map/POI/religious-christian-11.svg</file>
 		<file alias="religious-jewish-11.svg">icons/map/POI/religious-jewish-11.svg</file>
 		<file alias="religious-muslim-11.svg">icons/map/POI/religious-muslim-11.svg</file>
@ -81,25 +108,35 @@
 		<file alias="school-11.svg">icons/map/POI/school-11.svg</file>
 		<file alias="shelter-11.svg">icons/map/POI/shelter-11.svg</file>
 		<file alias="shop-11.svg">icons/map/POI/shop-11.svg</file>
+		<file alias="skateboard-11.svg">icons/map/POI/skateboard-11.svg</file>
 		<file alias="skiing-11.svg">icons/map/POI/skiing-11.svg</file>
+		<file alias="slaughterhouse-11.svg">icons/map/POI/slaughterhouse-11.svg</file>
+		<file alias="slipway-11.svg">icons/map/POI/slipway-11.svg</file>
 		<file alias="soccer-11.svg">icons/map/POI/soccer-11.svg</file>
+		<file alias="stadium-11.svg">icons/map/POI/stadium-11.svg</file>
 		<file alias="swimming-11.svg">icons/map/POI/swimming-11.svg</file>
-		<file alias="theatre-11.svg">icons/map/POI/theatre-11.svg</file>
 		<file alias="telephone-11.svg">icons/map/POI/telephone-11.svg</file>
+		<file alias="tennis-11.svg">icons/map/POI/tennis-11.svg</file>
+		<file alias="theatre-11.svg">icons/map/POI/theatre-11.svg</file>
 		<file alias="toilet-11.svg">icons/map/POI/toilet-11.svg</file>
 		<file alias="town-hall-11.svg">icons/map/POI/town-hall-11.svg</file>
+		<file alias="triangle-11.svg">icons/map/POI/triangle-11.svg</file>
+		<file alias="triangle-stroked-11.svg">icons/map/POI/triangle-stroked-11.svg</file>
 		<file alias="viewpoint-11.svg">icons/map/POI/viewpoint-11.svg</file>
 		<file alias="village-11.svg">icons/map/POI/village-11.svg</file>
 		<file alias="volcano-11.svg">icons/map/POI/volcano-11.svg</file>
+		<file alias="volleyball-11.svg">icons/map/POI/volleyball-11.svg</file>
+		<file alias="water-11.svg">icons/map/POI/water-11.svg</file>
 		<file alias="waterfall-11.svg">icons/map/POI/waterfall-11.svg</file>
+		<file alias="watermill-11.svg">icons/map/POI/watermill-11.svg</file>
 		<file alias="wetland-11.svg">icons/map/POI/wetland-11.svg</file>
+		<file alias="windmill-11.svg">icons/map/POI/windmill-11.svg</file>
 		<file alias="zoo-11.svg">icons/map/POI/zoo-11.svg</file>
 	</qresource>

-	<!-- marine stuff (IMG & ENC style) -->
+	<!-- Marine stuff (IMG & ENC style) -->
 	<qresource prefix="/marine">
 		<file alias="light-major.png">icons/map/marine/light-major.png</file>
-		<file alias="light-platform.png">icons/map/marine/light-platform.png</file>
 		<file alias="buoy.png">icons/map/marine/buoy.png</file>
 		<file alias="beacon.png">icons/map/marine/beacon.png</file>
 		<file alias="rock-exposed.png">icons/map/marine/rock-exposed.png</file>
@ -165,142 +202,25 @@
 		<file alias="rescue-station.png">icons/map/marine/rescue-station.png</file>
 		<file alias="windmill.png">icons/map/marine/windmill.png</file>
 		<file alias="flagstaff.png">icons/map/marine/flagstaff.png</file>
+		<file alias="deviation-dolphin.png">icons/map/marine/deviation-dolphin.png</file>
+		<file alias="kelp.png">icons/map/marine/kelp.png</file>
+		<file alias="eddies.png">icons/map/marine/eddies.png</file>
+		<file alias="dome.png">icons/map/marine/dome.png</file>
+		<file alias="radar-reflector.png">icons/map/marine/radar-reflector.png</file>
 	</qresource>

-	<!-- Mapsforge rendertheme -->
-	<qresource prefix="/mapsforge">
-		<file alias="default.xml">data/mapsforge/default.xml</file>
+	<!-- Patterns (Mapsforge) -->
+	<qresource prefix="/patterns">
+		<file alias="cemetery.svg">icons/map/patterns/cemetery.svg</file>
+		<file alias="military-area.svg">icons/map/patterns/military-area.svg</file>
+		<file alias="nature-reserve.svg">icons/map/patterns/nature-reserve.svg</file>
+		<file alias="orchard.svg">icons/map/patterns/orchard.svg</file>
+		<file alias="vineyard.svg">icons/map/patterns/vineyard.svg</file>
+		<file alias="wetland.svg">icons/map/patterns/wetland.svg</file>
+	</qresource>

-		<file alias="patterns/hills.svg">icons/map/mapsforge/patterns/hills.svg</file>
-		<file alias="patterns/farmland.svg">icons/map/mapsforge/patterns/farmland.svg</file>
-		<file alias="patterns/coniferous.svg">icons/map/mapsforge/patterns/coniferous.svg</file>
-		<file alias="patterns/marsh.png">icons/map/mapsforge/patterns/marsh.png</file>
-		<file alias="patterns/dot.png">icons/map/mapsforge/patterns/dot.png</file>
-		<file alias="patterns/cemetery.png">icons/map/mapsforge/patterns/cemetery.png</file>
-		<file alias="patterns/rail.png">icons/map/mapsforge/patterns/rail.png</file>
-		<file alias="patterns/access-destination.png">icons/map/mapsforge/patterns/access-destination.png</file>
-		<file alias="patterns/deciduous.svg">icons/map/mapsforge/patterns/deciduous.svg</file>
-		<file alias="patterns/grass.svg">icons/map/mapsforge/patterns/grass.svg</file>
-		<file alias="patterns/wood-mixed.png">icons/map/mapsforge/patterns/wood-mixed.png</file>
-		<file alias="patterns/wood-deciduous.png">icons/map/mapsforge/patterns/wood-deciduous.png</file>
-		<file alias="patterns/pike.png">icons/map/mapsforge/patterns/pike.png</file>
-		<file alias="patterns/wood-coniferous.png">icons/map/mapsforge/patterns/wood-coniferous.png</file>
-		<file alias="patterns/coniferous_and_deciduous.svg">icons/map/mapsforge/patterns/coniferous_and_deciduous.svg</file>
-		<file alias="patterns/arrow.png">icons/map/mapsforge/patterns/arrow.png</file>
-		<file alias="patterns/military.png">icons/map/mapsforge/patterns/military.png</file>
-		<file alias="patterns/scrub.svg">icons/map/mapsforge/patterns/scrub.svg</file>
-		<file alias="patterns/nature-reserve.png">icons/map/mapsforge/patterns/nature-reserve.png</file>
-		<file alias="patterns/swamp.svg">icons/map/mapsforge/patterns/swamp.svg</file>
-		<file alias="patterns/quarry.svg">icons/map/mapsforge/patterns/quarry.svg</file>
-		<file alias="patterns/access-private.png">icons/map/mapsforge/patterns/access-private.png</file>
-		<file alias="symbols/barrier/blocks.svg">icons/map/mapsforge/symbols/barrier/blocks.svg</file>
-		<file alias="symbols/barrier/stile.svg">icons/map/mapsforge/symbols/barrier/stile.svg</file>
-		<file alias="symbols/barrier/cycle_barrier.svg">icons/map/mapsforge/symbols/barrier/cycle_barrier.svg</file>
-		<file alias="symbols/barrier/lift_gate.svg">icons/map/mapsforge/symbols/barrier/lift_gate.svg</file>
-		<file alias="symbols/barrier/bollard.svg">icons/map/mapsforge/symbols/barrier/bollard.svg</file>
-		<file alias="symbols/barrier/gate.svg">icons/map/mapsforge/symbols/barrier/gate.svg</file>
-		<file alias="symbols/dot_blue.svg">icons/map/mapsforge/symbols/dot_blue.svg</file>
-		<file alias="symbols/dot_blue_dark.svg">icons/map/mapsforge/symbols/dot_blue_dark.svg</file>
-		<file alias="symbols/peak.svg">icons/map/mapsforge/symbols/peak.svg</file>
-		<file alias="symbols/traffic_signal.svg">icons/map/mapsforge/symbols/traffic_signal.svg</file>
-		<file alias="symbols/place_of_worship/hindu.svg">icons/map/mapsforge/symbols/place_of_worship/hindu.svg</file>
-		<file alias="symbols/place_of_worship/unknown.svg">icons/map/mapsforge/symbols/place_of_worship/unknown.svg</file>
-		<file alias="symbols/place_of_worship/islamic.svg">icons/map/mapsforge/symbols/place_of_worship/islamic.svg</file>
-		<file alias="symbols/place_of_worship/jewish.svg">icons/map/mapsforge/symbols/place_of_worship/jewish.svg</file>
-		<file alias="symbols/place_of_worship/shinto.svg">icons/map/mapsforge/symbols/place_of_worship/shinto.svg</file>
-		<file alias="symbols/place_of_worship/buddhist.svg">icons/map/mapsforge/symbols/place_of_worship/buddhist.svg</file>
-		<file alias="symbols/place_of_worship/christian.svg">icons/map/mapsforge/symbols/place_of_worship/christian.svg</file>
-		<file alias="symbols/volcano.svg">icons/map/mapsforge/symbols/volcano.svg</file>
-		<file alias="symbols/bench.svg">icons/map/mapsforge/symbols/bench.svg</file>
-		<file alias="symbols/transport/parking_private.svg">icons/map/mapsforge/symbols/transport/parking_private.svg</file>
-		<file alias="symbols/transport/helicopter.svg">icons/map/mapsforge/symbols/transport/helicopter.svg</file>
-		<file alias="symbols/transport/rental_bicycle.svg">icons/map/mapsforge/symbols/transport/rental_bicycle.svg</file>
-		<file alias="symbols/transport/train_station2.svg">icons/map/mapsforge/symbols/transport/train_station2.svg</file>
-		<file alias="symbols/transport/parking.svg">icons/map/mapsforge/symbols/transport/parking.svg</file>
-		<file alias="symbols/transport/slipway.svg">icons/map/mapsforge/symbols/transport/slipway.svg</file>
-		<file alias="symbols/transport/bus_stop.svg">icons/map/mapsforge/symbols/transport/bus_stop.svg</file>
-		<file alias="symbols/transport/bus_station.svg">icons/map/mapsforge/symbols/transport/bus_station.svg</file>
-		<file alias="symbols/transport/airport2.svg">icons/map/mapsforge/symbols/transport/airport2.svg</file>
-		<file alias="symbols/transport/fuel.svg">icons/map/mapsforge/symbols/transport/fuel.svg</file>
-		<file alias="symbols/transport/lighthouse.svg">icons/map/mapsforge/symbols/transport/lighthouse.svg</file>
-		<file alias="symbols/transport/traffic_lights.svg">icons/map/mapsforge/symbols/transport/traffic_lights.svg</file>
-		<file alias="symbols/transport/tram_stop.svg">icons/map/mapsforge/symbols/transport/tram_stop.svg</file>
-		<file alias="symbols/food/bar.svg">icons/map/mapsforge/symbols/food/bar.svg</file>
-		<file alias="symbols/food/cafe.svg">icons/map/mapsforge/symbols/food/cafe.svg</file>
-		<file alias="symbols/food/drinkingtap.svg">icons/map/mapsforge/symbols/food/drinkingtap.svg</file>
-		<file alias="symbols/food/pub.svg">icons/map/mapsforge/symbols/food/pub.svg</file>
-		<file alias="symbols/food/fastfood.svg">icons/map/mapsforge/symbols/food/fastfood.svg</file>
-		<file alias="symbols/food/biergarten.svg">icons/map/mapsforge/symbols/food/biergarten.svg</file>
-		<file alias="symbols/food/restaurant.svg">icons/map/mapsforge/symbols/food/restaurant.svg</file>
-		<file alias="symbols/railway-crossing.svg">icons/map/mapsforge/symbols/railway-crossing.svg</file>
-		<file alias="symbols/accommodation/hotel2.svg">icons/map/mapsforge/symbols/accommodation/hotel2.svg</file>
-		<file alias="symbols/accommodation/camping.svg">icons/map/mapsforge/symbols/accommodation/camping.svg</file>
-		<file alias="symbols/accommodation/chalet.svg">icons/map/mapsforge/symbols/accommodation/chalet.svg</file>
-		<file alias="symbols/accommodation/alpinehut.svg">icons/map/mapsforge/symbols/accommodation/alpinehut.svg</file>
-		<file alias="symbols/accommodation/shelter2.svg">icons/map/mapsforge/symbols/accommodation/shelter2.svg</file>
-		<file alias="symbols/accommodation/caravan_park.svg">icons/map/mapsforge/symbols/accommodation/caravan_park.svg</file>
-		<file alias="symbols/accommodation/hostel.svg">icons/map/mapsforge/symbols/accommodation/hostel.svg</file>
-		<file alias="symbols/health/doctors2.svg">icons/map/mapsforge/symbols/health/doctors2.svg</file>
-		<file alias="symbols/health/hospital.svg">icons/map/mapsforge/symbols/health/hospital.svg</file>
-		<file alias="symbols/health/pharmacy.svg">icons/map/mapsforge/symbols/health/pharmacy.svg</file>
-		<file alias="symbols/chair_lift.svg">icons/map/mapsforge/symbols/chair_lift.svg</file>
-		<file alias="symbols/education/school.svg">icons/map/mapsforge/symbols/education/school.svg</file>
-		<file alias="symbols/education/nursery3.svg">icons/map/mapsforge/symbols/education/nursery3.svg</file>
-		<file alias="symbols/education/university.svg">icons/map/mapsforge/symbols/education/university.svg</file>
-		<file alias="symbols/money/atm2.svg">icons/map/mapsforge/symbols/money/atm2.svg</file>
-		<file alias="symbols/money/bank2.svg">icons/map/mapsforge/symbols/money/bank2.svg</file>
-		<file alias="symbols/shopping/marketplace.svg">icons/map/mapsforge/symbols/shopping/marketplace.svg</file>
-		<file alias="symbols/shopping/bicycle.svg">icons/map/mapsforge/symbols/shopping/bicycle.svg</file>
-		<file alias="symbols/shopping/alcohol.svg">icons/map/mapsforge/symbols/shopping/alcohol.svg</file>
-		<file alias="symbols/shopping/diy.svg">icons/map/mapsforge/symbols/shopping/diy.svg</file>
-		<file alias="symbols/shopping/bakery.svg">icons/map/mapsforge/symbols/shopping/bakery.svg</file>
-		<file alias="symbols/shopping/greengrocer.svg">icons/map/mapsforge/symbols/shopping/greengrocer.svg</file>
-		<file alias="symbols/shopping/laundrette.svg">icons/map/mapsforge/symbols/shopping/laundrette.svg</file>
-		<file alias="symbols/shopping/car_repair.svg">icons/map/mapsforge/symbols/shopping/car_repair.svg</file>
-		<file alias="symbols/shopping/butcher.svg">icons/map/mapsforge/symbols/shopping/butcher.svg</file>
-		<file alias="symbols/shopping/book.svg">icons/map/mapsforge/symbols/shopping/book.svg</file>
-		<file alias="symbols/shopping/convenience.svg">icons/map/mapsforge/symbols/shopping/convenience.svg</file>
-		<file alias="symbols/shopping/supermarket.svg">icons/map/mapsforge/symbols/shopping/supermarket.svg</file>
-		<file alias="symbols/poi/mountain_pass.svg">icons/map/mapsforge/symbols/poi/mountain_pass.svg</file>
-		<file alias="symbols/poi/embassy2.svg">icons/map/mapsforge/symbols/poi/embassy2.svg</file>
-		<file alias="symbols/poi/cave.svg">icons/map/mapsforge/symbols/poi/cave.svg</file>
-		<file alias="symbols/cable_car.svg">icons/map/mapsforge/symbols/cable_car.svg</file>
-		<file alias="symbols/railway-crossing-small.svg">icons/map/mapsforge/symbols/railway-crossing-small.svg</file>
-		<file alias="symbols/dot_magenta.svg">icons/map/mapsforge/symbols/dot_magenta.svg</file>
-		<file alias="symbols/dot_black.svg">icons/map/mapsforge/symbols/dot_black.svg</file>
-		<file alias="symbols/gondola.svg">icons/map/mapsforge/symbols/gondola.svg</file>
-		<file alias="symbols/dot_white.svg">icons/map/mapsforge/symbols/dot_white.svg</file>
-		<file alias="symbols/amenity/recycling.svg">icons/map/mapsforge/symbols/amenity/recycling.svg</file>
-		<file alias="symbols/amenity/firestation3.svg">icons/map/mapsforge/symbols/amenity/firestation3.svg</file>
-		<file alias="symbols/amenity/telephone.svg">icons/map/mapsforge/symbols/amenity/telephone.svg</file>
-		<file alias="symbols/amenity/post_box.svg">icons/map/mapsforge/symbols/amenity/post_box.svg</file>
-		<file alias="symbols/amenity/fountain2.svg">icons/map/mapsforge/symbols/amenity/fountain2.svg</file>
-		<file alias="symbols/amenity/playground.svg">icons/map/mapsforge/symbols/amenity/playground.svg</file>
-		<file alias="symbols/amenity/library.svg">icons/map/mapsforge/symbols/amenity/library.svg</file>
-		<file alias="symbols/amenity/post_office.svg">icons/map/mapsforge/symbols/amenity/post_office.svg</file>
-		<file alias="symbols/amenity/police2.svg">icons/map/mapsforge/symbols/amenity/police2.svg</file>
-		<file alias="symbols/amenity/toilets.svg">icons/map/mapsforge/symbols/amenity/toilets.svg</file>
-		<file alias="symbols/tourist/picnic.svg">icons/map/mapsforge/symbols/tourist/picnic.svg</file>
-		<file alias="symbols/tourist/monument.svg">icons/map/mapsforge/symbols/tourist/monument.svg</file>
-		<file alias="symbols/tourist/archaeological2.svg">icons/map/mapsforge/symbols/tourist/archaeological2.svg</file>
-		<file alias="symbols/tourist/museum.svg">icons/map/mapsforge/symbols/tourist/museum.svg</file>
-		<file alias="symbols/tourist/attraction.svg">icons/map/mapsforge/symbols/tourist/attraction.svg</file>
-		<file alias="symbols/tourist/information.svg">icons/map/mapsforge/symbols/tourist/information.svg</file>
-		<file alias="symbols/tourist/theatre.svg">icons/map/mapsforge/symbols/tourist/theatre.svg</file>
-		<file alias="symbols/tourist/zoo.svg">icons/map/mapsforge/symbols/tourist/zoo.svg</file>
-		<file alias="symbols/tourist/cinema2.svg">icons/map/mapsforge/symbols/tourist/cinema2.svg</file>
-		<file alias="symbols/tourist/castle2.svg">icons/map/mapsforge/symbols/tourist/castle2.svg</file>
-		<file alias="symbols/tourist/ruin.svg">icons/map/mapsforge/symbols/tourist/ruin.svg</file>
-		<file alias="symbols/tourist/memorial.svg">icons/map/mapsforge/symbols/tourist/memorial.svg</file>
-		<file alias="symbols/tourist/view_point.svg">icons/map/mapsforge/symbols/tourist/view_point.svg</file>
-		<file alias="symbols/tourist/windmill.svg">icons/map/mapsforge/symbols/tourist/windmill.svg</file>
-		<file alias="symbols/water/weir.svg">icons/map/mapsforge/symbols/water/weir.svg</file>
-		<file alias="symbols/sport/swimming_outdoor.svg">icons/map/mapsforge/symbols/sport/swimming_outdoor.svg</file>
-		<file alias="symbols/sport/tennis.svg">icons/map/mapsforge/symbols/sport/tennis.svg</file>
-		<file alias="symbols/sport/shooting.svg">icons/map/mapsforge/symbols/sport/shooting.svg</file>
-		<file alias="symbols/sport/stadium.svg">icons/map/mapsforge/symbols/sport/stadium.svg</file>
-		<file alias="symbols/sport/soccer.svg">icons/map/mapsforge/symbols/sport/soccer.svg</file>
-		<file alias="symbols/sport/golf.svg">icons/map/mapsforge/symbols/sport/golf.svg</file>
-		<file alias="symbols/oneway.svg">icons/map/mapsforge/symbols/oneway.svg</file>
+	<!-- Mapsforge style -->
+	<qresource prefix="/style">
+		<file alias="style.xml">data/style/style.xml</file>
 	</qresource>
 </RCC>
--- a/icons/map/POI/baseball-11.svg
+++ b/icons/map/POI/baseball-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="baseball-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M7,3c0,0.5523-0.4477,1-1,1S5,3.5523,5,3s0.4477-1,1-1S7,2.4477,7,3z M9.85,10.24L9.85,10.24l-3-4.85&#xA;&#x9;C6.7391,5.2011,6.5603,5.0616,6.35,5H2.5C2.2239,5,2,5.2239,2,5.5S2.2239,6,2.5,6H5l0.92,1.09l-2.73,3l0,0&#xA;&#x9;C3.0637,10.1876,2.9928,10.3405,3,10.5C3,10.7761,3.2239,11,3.5,11c0.1224-0.0006,0.2401-0.047,0.33-0.13l0,0l3-2.71L9,10.81l0,0&#xA;&#x9;c0.0912,0.1178,0.231,0.1877,0.38,0.19c0.2761,0,0.5-0.2239,0.5-0.5C9.8938,10.4122,9.8834,10.3223,9.85,10.24z M4,0.28&#xA;&#x9;C4,0.1254,3.8746,0,3.72,0C3.6221,0.0262,3.5348,0.0821,3.47,0.16L2,4.59C1.9941,4.6331,1.9941,4.6769,2,4.72&#xA;&#x9;C2,4.8746,2.1254,5,2.28,5c0.1015-0.0243,0.1926-0.0803,0.26-0.16L4,0.41C4.006,0.3669,4.006,0.3231,4,0.28z"/>
+</svg>
--- a/icons/map/POI/basketball-11.svg
+++ b/icons/map/POI/basketball-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="basketball-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <path id="icon_concepts:_sports_leisure" d="M2.63,3.51a5.1555,5.1555,0,0,1,.34,1.48H2.04A3.2586,3.2586,0,0,1,2.63,3.51Zm.55-.63a6.2022,6.2022,0,0,1,.55,2.11H5.12V2.01A3.4256,3.4256,0,0,0,3.18,2.88Zm2.7-.87V4.99H7.27a6.2022,6.2022,0,0,1,.55-2.11A3.4256,3.4256,0,0,0,5.88,2.01Zm2.49,1.5a5.1555,5.1555,0,0,0-.34,1.48h.93A3.2586,3.2586,0,0,0,8.37,3.51ZM9.9,6.5a.4952.4952,0,0,1-.49.5H8.44L7.91,8.05v1.7a.2176.2176,0,0,1-.14.2.236.236,0,0,1-.08.02.1987.1987,0,0,1-.16-.07l-.75-.74-1.16.77a.2107.2107,0,0,1-.24,0L4.22,9.16l-.75.74a.2222.2222,0,0,1-.38-.15V8.05L2.57,7H1.6a.5.5,0,1,1,0-1H9.4a.4951.4951,0,0,1,.5.49ZM3.53,8V9.22l.5-.5c.01,0,.01-.01.02-.01L5.1,7H3.06l.45.9A.3561.3561,0,0,1,3.53,8Zm2.97.82-1-1.63-1,1.63,1,.67ZM7.94,7H5.9L6.95,8.71c.01,0,.01.01.02.01l.5.5V8a.3561.3561,0,0,1,.02-.1Z"/>
+</svg>
--- a/icons/map/POI/beer-11.svg
+++ b/icons/map/POI/beer-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="beer-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M5.5,1c-2.3,0-3,0.66-3,0.66v2c0.0328,0.9197,0.2577,1.8223,0.66,2.65c0.376,0.9646,0.376,2.0354,0,3c0,0,0,0.66,2.32,0.66&#xA;&#x9;S7.8,9.31,7.8,9.31c-0.376-0.9646-0.376-2.0354,0-3c0.4023-0.8277,0.6272-1.7303,0.66-2.65v-2C8.46,1.66,7.8,1,5.5,1z M5.5,9.28&#xA;&#x9;C4.9736,9.3066,4.4465,9.2458,3.94,9.1c0.1326-0.4787,0.1999-0.9732,0.2-1.47h2.72c-0.0144,0.2198-0.0144,0.4402,0,0.66&#xA;&#x9;C6.8939,8.5635,6.9474,8.8342,7.02,9.1C6.5269,9.2448,6.0136,9.309,5.5,9.29V9.28z M7.82,3.28c-1.5116,0.4425-3.1184,0.4425-4.63,0&#xA;&#x9;L3.18,2c1.5151-0.4422,3.1249-0.4422,4.64,0c0,0,0.03,1.33,0,1.33L7.82,3.28z"/>
+</svg>
--- a/icons/map/POI/bicycle-11.svg
+++ b/icons/map/POI/bicycle-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="bicycle-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path id="path4804" d="&#xA;&#x9;M6.5,1.5c-0.6761-0.01-0.6761,1.0096,0,1H7V3.211L4.252,4.7813L3.7383,3.5h0.7148c0.6761,0.01,0.6761-1.0096,0-1H2.4258&#xA;&#x9;c-0.6761-0.01-0.6761,1.0096,0,1h0.2344l0.4316,1.0781C2.9011,4.5311,2.7047,4.5001,2.5,4.5001c-1.3748,0-2.5,1.1252-2.5,2.5&#xA;&#x9;s1.1252,2.5,2.5,2.5S5,8.3748,5,7.0001c0-0.4713-0.1399-0.9078-0.3691-1.2852l2.4707-1.4121L7.5039,4.711&#xA;&#x9;C6.6216,5.0981,6,5.9792,6,7.0001c0,1.3748,1.1252,2.5,2.5,2.5s2.5-1.1252,2.5-2.5c0-1.2959-1.0034-2.3575-2.2695-2.4766L8,3.793V2&#xA;&#x9;c0-0.2761-0.2239-0.5-0.5-0.5H6.5z M2.5,5.5C3.3344,5.5,4,6.1657,4,7S3.3344,8.5,2.5,8.5S1,7.8344,1,7S1.6656,5.5,2.5,5.5z&#xA;&#x9; M8.4551,5.504h0.002c0.0299,0.003,0.06,0.003,0.0898,0C9.3587,5.5289,10,6.1818,10,7.0001c0,0.8344-0.6656,1.5-1.5,1.5&#xA;&#x9;S7,7.8345,7,7.0001C7,6.1811,7.6424,5.5279,8.4551,5.504L8.4551,5.504z"/>
+</svg>
--- a/icons/map/POI/castle-11.svg
+++ b/icons/map/POI/castle-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="castle-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M8.67,0.81v1.48C8.6812,2.6709,8.3815,2.9888,8.0006,3C8.0004,3,8.0002,3,8,3H3.09c-0.381,0.0056-0.6944-0.2988-0.7-0.6799&#xA;&#x9;C2.3899,2.3134,2.3899,2.3067,2.39,2.3V0.81c0-0.1905,0.1545-0.345,0.345-0.345S3.08,0.6195,3.08,0.81V1.5H4V1l0,0&#xA;&#x9;c0-0.2761,0.2239-0.5,0.5-0.5S5,0.7239,5,1l0,0v0.5h1V1l0,0c0-0.2761,0.2239-0.5,0.5-0.5S7,0.7239,7,1l0,0v0.5h1V0.81&#xA;&#x9;C7.9679,0.625,8.0919,0.449,8.2769,0.4169c0.185-0.0321,0.361,0.0919,0.3931,0.2769C8.6767,0.7323,8.6767,0.7716,8.67,0.81z&#xA;&#x9; M10.06,9.63c0,0.1933-0.1567,0.35-0.35,0.35h0H1.35C1.1567,9.9799,1.0001,9.8231,1.0002,9.6298&#xA;&#x9;C1.0004,9.4366,1.1569,9.2801,1.35,9.28H1.7c0.3754,0.0112,0.6888-0.284,0.7-0.6594c0.0004-0.0135,0.0004-0.0271,0-0.0406&#xA;&#x9;c0,0,0.7-3.2,0.7-3.89C3.0944,4.3145,3.3943,4.0056,3.7699,4C3.7766,3.9999,3.7833,3.9999,3.79,4h3.48&#xA;&#x9;c0.3754-0.0112,0.6888,0.284,0.7,0.6594c0.0004,0.0135,0.0004,0.0271,0,0.0406c0,0.7,0.7,3.89,0.7,3.89&#xA;&#x9;c-0.0112,0.3754,0.284,0.6888,0.6594,0.7c0.0135,0.0004,0.0271,0.0004,0.0406,0h0.34c0.1933,0,0.35,0.1567,0.35,0.35v0V9.63z&#xA;&#x9; M6.5,7.5c0-0.5523-0.4477-1-1-1s-1,0.4477-1,1v2h2V7.5z"/>
+</svg>
--- a/icons/map/POI/college-11.svg
+++ b/icons/map/POI/college-11.svg
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="college-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <g>
+    <path d="M2,7.3c0.3-0.2,0.5-0.5,0.5-0.8c0-0.4-0.2-0.7-0.6-0.9V4.4L5.5,6L11,3.5L5.5,1L0,3.5L1.2,4v1.6&#xA;  C0.8,5.8,0.6,6.1,0.6,6.5c0,0.3,0.2,0.6,0.5,0.8L0.6,9c-0.3,1,0.5,1,0.5,1h1c0,0,0.8,0,0.5-1L2,7.3z"/>
+    <path d="M3.5,6.2c0,0.1,0,0.2,0,0.3c0,0.4-0.2,0.8-0.4,1.1C3.3,8,3.5,8.4,3.5,9v0.6C4,9.8,4.7,10,5.5,10&#xA;  C8,10,9,8.5,9,8.5v-3L5.5,7.1L3.5,6.2z"/>
+  </g>
+</svg>
--- a/icons/map/POI/cricket-11.svg
+++ b/icons/map/POI/cricket-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="cricket-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M6,1c0,0.5523-0.4477,1-1,1S4,1.5523,4,1s0.4477-1,1-1S6,0.4477,6,1z M8.88,5.18l-1-2l0,0l0,0&#xA;&#x9;C7.7859,3.0671,7.647,3.0012,7.5,3H2.77C2.3827,2.9815,2.0467,3.2651,2,3.65l0,0l-1,6.71l0,0c-0.0068,0.0464-0.0068,0.0936,0,0.14&#xA;&#x9;C1,10.7761,1.2239,11,1.5,11c0.2307,0.0129,0.4391-0.1371,0.5-0.36l0,0l1.22-3.89l0,0l0.21-0.83l0.4,0.44l0,0L5,7.6v2.9&#xA;&#x9;C5,10.7761,5.2239,11,5.5,11S6,10.7761,6,10.5v-3l0,0l0,0C5.9971,7.3984,5.9621,7.3004,5.9,7.22l0,0L4.45,5.5L5.5,4h1.71l0.92,1.84&#xA;&#x9;l0,0C8.2247,5.9439,8.3594,6.0022,8.5,6C8.7723,6.0001,8.9946,5.7822,9,5.51C8.9826,5.3931,8.9418,5.2808,8.88,5.18z M10.5,8&#xA;&#x9;C10.2239,8,10,8.2239,10,8.5S10.2239,9,10.5,9S11,8.7761,11,8.5S10.7761,8,10.5,8z M8.69,8V7.25C8.69,7.1119,8.5781,7,8.44,7&#xA;&#x9;S8.19,7.1119,8.19,7.25V8C8.0378,8.0855,7.9426,8.2455,7.94,8.42v2.08c0,0.2761,0.2239,0.5,0.5,0.5s0.5-0.2239,0.5-0.5V8.41&#xA;&#x9;C8.9339,8.2391,8.8392,8.0837,8.69,8z"/>
+</svg>
--- a/icons/map/POI/cross-11.svg
+++ b/icons/map/POI/cross-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="cross-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M2.2,1.19l3.3,3.3L8.8,1.2C8.9314,1.0663,9.1127,0.9938,9.3,1C9.6761,1.0243,9.9757,1.3239,10,1.7&#xA;&#x9;c0.0018,0.1806-0.0705,0.3541-0.2,0.48L6.49,5.5L9.8,8.82C9.9295,8.9459,10.0018,9.1194,10,9.3C9.9757,9.6761,9.6761,9.9757,9.3,10&#xA;&#x9;c-0.1873,0.0062-0.3686-0.0663-0.5-0.2L5.5,6.51L2.21,9.8c-0.1314,0.1337-0.3127,0.2062-0.5,0.2C1.3265,9.98,1.02,9.6735,1,9.29&#xA;&#x9;C0.9982,9.1094,1.0705,8.9359,1.2,8.81L4.51,5.5L1.19,2.18C1.0641,2.0524,0.9955,1.8792,1,1.7C1.0243,1.3239,1.3239,1.0243,1.7,1&#xA;&#x9;C1.8858,0.9912,2.0669,1.06,2.2,1.19z"/>
+</svg>
--- a/icons/map/POI/defibrillator-11.svg
+++ b/icons/map/POI/defibrillator-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11" id="defibrillator-11">
+  <path d="M1.42,4.7955C-0.2131,1.5291,3.9327-.6514,5.512,2.6149,7.0914-.6514,11.2371,1.5291,9.6039,4.7955c-0.0225.0377-.0483,0.0732-0.071,0.1108H8.3867L7.5586,3.252a0.65,0.65,0,0,0-1.1172,0L5,6.1338,4.5586,5.252A0.6243,0.6243,0,0,0,4,4.9063H1.4913C1.4685,4.8687,1.4427,4.8332,1.42,4.7955ZM8,6.1563a0.6243,0.6243,0,0,1-.5586-0.3457L7,4.9287,5.5586,7.8105a0.6241,0.6241,0,0,1-1.1172,0L3.6133,6.1563H2.3006a24.2269,24.2269,0,0,0,2.8973,3.449L5.2134,9.6208A0.44,0.44,0,0,0,5.835,9.6053a24.2289,24.2289,0,0,0,2.8905-3.449H8Z"/>
+</svg>
--- a/icons/map/POI/doctor-11.svg
+++ b/icons/map/POI/doctor-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="doctor-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M9.5,5.87c0.0017-0.8174-0.6596-1.4813-1.477-1.483S6.5417,5.0466,6.54,5.864C6.5386,6.54,6.9955,7.131,7.65,7.3v0.42&#xA;&#x9;c0,1.0245-0.8305,1.855-1.855,1.855S3.94,8.7445,3.94,7.72l0,0C3.9776,6.8275,4.3787,5.9893,5.05,5.4H5&#xA;&#x9;c0.718-0.4684,1.1564-1.2628,1.17-2.12V1.79c0-0.613-0.4969-1.11-1.11-1.11c-0.0033,0-0.0067,0-0.01,0H4.5&#xA;&#x9;c-0.2043,0-0.37,0.1657-0.37,0.37S4.2957,1.42,4.5,1.42h0.55c0.2043,0,0.37,0.1657,0.37,0.37v1.49l0,0&#xA;&#x9;c0,1.0178-0.8222,1.8445-1.84,1.85V5.4l0,0V5.13C2.5583,5.1355,1.7255,4.3117,1.72,3.29c0-0.0033,0-0.0067,0-0.01l0,0V1.79&#xA;&#x9;c0-0.2043,0.1657-0.37,0.37-0.37l0,0h0.52c0.2043,0,0.37-0.1657,0.3699-0.3701C2.9799,0.8456,2.8143,0.68,2.61,0.68H2.09&#xA;&#x9;C1.4848,0.6909,0.9999,1.1847,1,1.79v1.49C0.9978,4.1241,1.4086,4.9158,2.1,5.4l0,0c0.6676,0.591,1.065,1.429,1.1,2.32&#xA;&#x9;c0,1.4332,1.1618,2.595,2.595,2.595S8.39,9.1532,8.39,7.72V7.3C9.0424,7.1316,9.4986,6.5438,9.5,5.87z M8,6.61&#xA;&#x9;c-0.4087,0-0.74-0.3313-0.74-0.74S7.5913,5.13,8,5.13s0.74,0.3313,0.74,0.74l0,0C8.74,6.2787,8.4087,6.61,8,6.61z"/>
+</svg>
--- a/icons/map/POI/embassy-11.svg
+++ b/icons/map/POI/embassy-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="embassy-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M5.5,2C4.6014,2.0766,3.7537,2.4494,3.09,3.06C3.0316,3.1262,2.9995,3.2117,3,3.3v3.32&#xA;&#x9;C2.9889,6.8074,3.1318,6.9684,3.3193,6.9796C3.4115,6.985,3.5021,6.9527,3.57,6.89C4.1239,6.4637,4.8011,6.2286,5.5,6.22&#xA;&#x9;C6.61,6.22,6.85,7,8,7c0.6869-0.0671,1.3313-0.3629,1.83-0.84C9.9401,6.0917,10.0051,5.9695,10,5.84V2.37&#xA;&#x9;c0.0309-0.1908-0.0987-0.3705-0.2896-0.4014C9.6387,1.9569,9.5652,1.9679,9.5,2C9.0686,2.3529,8.5507,2.5842,8,2.67&#xA;&#x9;C6.85,2.67,6.65,2,5.5,2z M1.5,1.5c0.5523,0,1,0.4477,1,1s-0.4477,1-1,1s-1-0.4477-1-1S0.9477,1.5,1.5,1.5z M2,4.5v6&#xA;&#x9;C2,10.7761,1.7761,11,1.5,11S1,10.7761,1,10.5v-6C1,4.2239,1.2239,4,1.5,4S2,4.2239,2,4.5z"/>
+</svg>
--- a/icons/map/POI/ferry-11.svg
+++ b/icons/map/POI/ferry-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="ferry-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M11,9.45v0.77c-0.2167,0.0089-0.4213,0.1022-0.57,0.26c-0.2266,0.2196-0.5054,0.3779-0.81,0.46&#xA;&#x9;c-0.5149,0.1365-1.0639,0.0296-1.49-0.29L7.8,10.38c-0.2669-0.2313-0.6631-0.2313-0.93,0c-0.12,0.09-0.23,0.2-0.35,0.28&#xA;&#x9;c-0.6333,0.452-1.4889,0.4316-2.1-0.05l-0.33-0.27c-0.2457-0.185-0.5843-0.185-0.83,0c-0.16,0.11-0.3,0.25-0.46,0.36&#xA;&#x9;c-0.601,0.4185-1.399,0.4185-2,0l-0.26-0.21C0.4009,10.3346,0.2078,10.238,0,10.22V9.45c0.2162-0.0231,0.4345,0.015,0.63,0.11&#xA;&#x9;C0.8642,9.6894,1.0882,9.8365,1.3,10c0.1841,0.1814,0.4478,0.2567,0.7,0.2c0.093-0.0244,0.181-0.0651,0.26-0.12&#xA;&#x9;c0.13-0.09,0.25-0.2,0.38-0.3c0.616-0.4518,1.454-0.4518,2.07,0l0.4,0.31c0.2416,0.1752,0.5684,0.1752,0.81,0l0.4-0.31&#xA;&#x9;c0.6181-0.4567,1.4619-0.4567,2.08,0l0.38,0.3c0.2437,0.18,0.5763,0.18,0.82,0L10,9.77C10.2882,9.5546,10.6403,9.4419,11,9.45z&#xA;&#x9; M2.61,7.61L1,5l1-0.91V1.15C2.0163,0.5061,2.546-0.0057,3.19,0h4.62C8.454-0.0057,8.9837,0.5061,9,1.15v2.94L10,5L8.39,7.62&#xA;&#x9;C7.5729,7.0755,6.4952,7.1324,5.74,7.76L5.5,8l0,0L5.3,7.82C4.5536,7.1506,3.4512,7.0646,2.61,7.61z M2.81,3.61L5.5,2l2.69,1.63&#xA;&#x9;V1.15c0.0114-0.1985-0.1403-0.3686-0.3388-0.38c-0.0137-0.0008-0.0275-0.0008-0.0412,0H3.19&#xA;&#x9;C2.9915,0.7586,2.8214,0.9103,2.81,1.1088c-0.0008,0.0137-0.0008,0.0275,0,0.0412v2.48V3.61z"/>
+</svg>
--- a/icons/map/POI/home-11.svg
+++ b/icons/map/POI/home-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11" id="home-11">
+  <path d="M10.0015,4.7507c0,0.13807-0.11193,0.25-0.25,0.25H1.25c-0.13807,0-0.25-0.11193-0.25-0.25&#xA;&#x9;c-0.00054-0.07163,0.02839-0.14033,0.08-0.19l4.2378-3.4545l0.016-0.016c0.10112-0.09209,0.2577-0.08493,0.35,0.016l2.3174,1.8892&#xA;&#x9;V1.5c0-0.27614,0.22386-0.5,0.5-0.5s0.5,0.22386,0.5,0.5v2.31l0.92,0.75C9.9731,4.60979,10.00215,4.67878,10.0015,4.7507z M2,9.7514&#xA;&#x9;c-0.00111,0.13696,0.10902,0.24889,0.24598,0.25c0.00001,0,0.00001,0,0.00002,0h2.7547v-2h1v2h2.7526&#xA;&#x9;c0.13697,0,0.248-0.11103,0.248-0.248l0,0l0,0V6.0009H2V9.7514z"/>
+</svg>
--- a/icons/map/POI/horse-riding-11.svg
+++ b/icons/map/POI/horse-riding-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="horse-riding-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <path d="M4,1A1,1,0,1,1,5,2,1,1,0,0,1,4,1Zm6.88,3.5L9,3V2.5L7,5H6L7,6V7.014a.5.5,0,1,1-1,0V6.5L4,5H3a1,1,0,0,0-.8.446A1.189,1.189,0,0,0,1.247,5,1.076,1.076,0,0,0,0,5.988C0,7.3.635,7.471.635,7.471a.33.33,0,0,0,.115.023A.253.253,0,0,0,1,7.25V6a.49.49,0,0,1,.48-.5H1.5A.5.5,0,0,1,2,6V8.014l-.3.6a1.609,1.609,0,0,0-.2.6v1.542A.244.244,0,0,0,1.744,11,.255.255,0,0,0,2,10.756V9.514a.367.367,0,0,1,.1-.3l.9-1.2V9l.467,1.816A.256.256,0,0,0,3.709,11a.25.25,0,0,0,.25-.25v-.016l-.242-1.61a.6.6,0,0,1,.025-.236L3.8,8.714,4,8H6V9l.466,1.816A.256.256,0,0,0,6.709,11a.25.25,0,0,0,.25-.25L6.718,9.124a.6.6,0,0,1,.025-.236L7,8a.877.877,0,0,0,.934-.661L8.5,4.5a.6.6,0,0,0,.71.454.562.562,0,0,0,.143-.07l.9.116a.721.721,0,0,0,.392.1A.331.331,0,0,0,11,4.784.406.406,0,0,0,10.88,4.5ZM6,3.5A.51.51,0,0,0,5.5,3h-1a.482.482,0,0,0-.5.5V5H6Z"/>
+</svg>
--- a/icons/map/POI/hot-spring.svg
+++ b/icons/map/POI/hot-spring.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="hot-spring" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M6.682,5.759c-.505-.725-.781-1.121-.63-2.376,.139-1.156,.678-1.616,1.198-2.059,.404-.345,.797-.68,.981-1.324,.301,.722-.036,1.47-.349,2.164-.311,.691-.599,1.329-.211,1.836,.971,1.271,1.963,2.88,.971,4.586-.214,.393-.539,.681-.861,.968-.422,.375-.841,.747-1.004,1.348-.269-.677,.008-1.366,.285-2.052,.306-.759,.61-1.516,.172-2.251-.203-.34-.389-.607-.551-.84Zm3.371-1.174c-.098-.632,.034-1.281,.368-1.809,.367-.45,.701-.642,.991-.81,.345-.199,.627-.362,.83-.877,.289,.684,0,1.188-.304,1.718-.119,.207-.24,.418-.329,.645-.191,.61,.101,.893,.467,1.247,.358,.346,.786,.76,.899,1.617,.083,.635-.036,1.156-.372,1.684-.356,.436-.681,.655-.965,.846-.356,.24-.648,.437-.856,.965-.292-.688,.031-1.259,.353-1.828,.123-.217,.246-.434,.334-.658,.073-.558-.234-.867-.581-1.217-.357-.36-.757-.763-.834-1.523Zm-8.018,0c-.098-.632,.005-1.3,.368-1.809,.376-.528,.729-.717,1.035-.881,.323-.173,.594-.318,.786-.806,.289,.683-.014,1.208-.325,1.749-.122,.212-.246,.427-.336,.655-.152,.385,.131,1.014,.501,1.242,1.002,.801,1.227,2.286,.547,3.353-.366,.448-.704,.648-.999,.823-.353,.209-.645,.382-.849,.898-.278-.656,.008-1.18,.3-1.714,.131-.24,.263-.481,.345-.737,.179-.557-.134-.884-.51-1.277-.349-.365-.752-.785-.863-1.498Zm10.965,4.414c.7,2.616-3.474,3-5.5,3s-6.2-.484-5.5-3c-.633,.316-1,.961-1,1.5,0,1.519,2.91,2.9,6.5,2.9s6.5-1.381,6.5-2.9c0-.539-.367-1.184-1-1.5Z"/>
+</svg>
--- a/icons/map/POI/ice-cream-11.svg
+++ b/icons/map/POI/ice-cream-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="ice-cream-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M4,6c0.541,0.0007,1.0676-0.1748,1.5-0.5C5.9324,5.8252,6.459,6.0007,7,6l-1,4.69c-0.1082,0.2541-0.4019,0.3723-0.656,0.264&#xA;&#x9;c-0.1188-0.0506-0.2134-0.1452-0.264-0.264L4,6z M7,2H6.91c0.2826-0.7787-0.1195-1.6391-0.8982-1.9218S4.3726,0.1978,4.09,0.9765&#xA;&#x9;C3.97,1.3071,3.97,1.6694,4.09,2H4C3.1716,2,2.5,2.6716,2.5,3.5S3.1716,5,4,5s1.5-0.6716,1.5-1.5l0,0l0,0l0,0&#xA;&#x9;C5.5,4.3284,6.1716,5,7,5s1.5-0.6716,1.5-1.5S7.8284,2,7,2z"/>
+</svg>
--- a/icons/map/POI/laundry-11.svg
+++ b/icons/map/POI/laundry-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="laundry-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path id="path3291" d="M5,0L4,2H2c0,0-1,0-1,1v7c0,0,0,1,1,1h7c1,0,1-1,1-1V1c0-1-1-1-1-1H5z M6,1h3v1H6V1z M5.5,4&#xA;&#x9;C6.8807,4,8,5.1193,8,6.5S6.8807,9,5.5,9S3,7.8807,3,6.5S4.1193,4,5.5,4z"/>
+</svg>
--- a/icons/map/POI/lighthouse-11.svg
+++ b/icons/map/POI/lighthouse-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="lighthouse-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M7,6l1,5H3l1-5h1.2V2H4.28C4.1042,1.9823,3.9759,1.8255,3.9936,1.6496C4.0042,1.544,4.0665,1.4504,4.16,1.4L5.38,1&#xA;&#x9;c0.0762-0.0347,0.1638-0.0347,0.24,0l1.22,0.4c0.1555,0.0839,0.2136,0.2781,0.1296,0.4336C6.9192,1.927,6.8257,1.9894,6.72,2H5.81v4&#xA;&#x9;H7z M8,3v0.5L11,3V2.5L8,3z M8,5.5L11,6V5.5L8,5V5.5z M3,3L0,2.5V3l3,0.5V3z M3,5L0,5.5V6l3-0.5V5z"/>
+</svg>
--- a/icons/map/POI/monument-11.svg
+++ b/icons/map/POI/monument-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="monument-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path id="path11719-7" d="M5.5,0L4,2v4.5h3V2L5.5,0z M3,7L2,8&#xA;&#x9;v3h7V8L8,7H3z"/>
+</svg>
--- a/icons/map/POI/observation-tower.svg
+++ b/icons/map/POI/observation-tower.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15" id="observation-tower">
+  <path d="M12 12.5H11.5L10 9V7C10.9951 7 10.9951 6.25 10.9951 6.25L11.5 3C11.5 3 11.5 2.5 11 2.5H10C10 2.5 10 2 9.5 2H8.5V1.5C8.5 1.5 8.5 0.5 7.5 0.5C6.5 0.5 6.5 1.5 6.5 1.5V2H5.5C5 2 5 2.5 5 2.5H4C3.5 2.5 3.5 3 3.5 3L4.0049 6.25C4.0049 6.25 4.0049 7 5 7V9L3.5 12.5H3C3 12.5 2 12.5 2 13.25C2 14 3 14 3 14H12C12 14 13 14 13 13.25C13 12.5 12 12.5 12 12.5ZM10.25 3.5L10 5H5L4.75 3.4971L10.25 3.5ZM8.5 7V8H6.5V7H8.5ZM6.5006 9.4971H8.4994L9.5 12.5H5.5L6.5006 9.4971Z"/>
+</svg>
--- a/icons/map/POI/parking-garage-11.svg
+++ b/icons/map/POI/parking-garage-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="parking-garage-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M7.25,7.44C6.8067,7.7602,6.2657,7.9158,5.72,7.88H4.45V10H3.19V4H5.8c0.5201-0.0279,1.0324,0.1358,1.44,0.46&#xA;&#x9;c0.3847,0.372,0.5828,0.8966,0.54,1.43C7.8557,6.4611,7.6596,7.0348,7.25,7.44z M6.25,5.28c-0.1946-0.1475-0.4365-0.2186-0.68-0.2&#xA;&#x9;H4.45v1.76H5.6c0.246,0.0129,0.4882-0.0654,0.68-0.22c0.1746-0.1813,0.2621-0.4293,0.24-0.68c0.023-0.2449-0.0651-0.4871-0.24-0.66&#xA;&#x9;L6.25,5.28z M10.41,3.28c0.1349-0.2403,0.0499-0.5444-0.19-0.68l-4.5-2.5c-0.1521-0.0855-0.3379-0.0855-0.49,0l-4.5,2.5&#xA;&#x9;C0.4972,2.7485,0.4288,3.0576,0.5773,3.2904C0.7144,3.5054,0.9913,3.5828,1.22,3.47l4.28-2.4l4.26,2.37&#xA;&#x9;c0.2421,0.1328,0.546,0.0442,0.6789-0.1979C10.4392,3.2414,10.4396,3.2407,10.44,3.24L10.41,3.28z"/>
+</svg>
--- a/icons/map/POI/rail-11.svg
+++ b/icons/map/POI/rail-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="rail-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M9,10.5C9,10.7761,8.7761,11,8.5,11c-0.1824-0.0029-0.3481-0.107-0.43-0.27l0,0L7.69,10H3.31l-0.37,0.74l0,0&#xA;&#x9;C2.8537,10.9023,2.6838,11.0027,2.5,11C2.2239,11,2,10.7761,2,10.5c0.0022-0.0847,0.0263-0.1674,0.07-0.24l0,0l1-2l0,0&#xA;&#x9;C3.1546,8.1008,3.3198,8.001,3.5,8c0.2751-0.0235,0.5172,0.1805,0.5407,0.4556C4.0479,8.5392,4.0339,8.6233,4,8.7L3.81,9h3.38L7,8.7&#xA;&#x9;C6.8991,8.443,7.0256,8.1528,7.2826,8.0518C7.514,7.9609,7.7771,8.0539,7.9,8.27l0,0l1,2l0,0C8.9527,10.3367,8.9872,10.416,9,10.5z&#xA;&#x9; M8,0H3C2.4477,0,2,0.4477,2,1v5c0,0.5523,0.4477,1,1,1h5c0.5523,0,1-0.4477,1-1V1C9,0.4477,8.5523,0,8,0z M3.5,6&#xA;&#x9;C3.2239,6,3,5.7761,3,5.5S3.2239,5,3.5,5S4,5.2239,4,5.5S3.7761,6,3.5,6z M3.5,4C3.2239,4,3,3.7761,3,3.5v-2&#xA;&#x9;C3,1.2239,3.2239,1,3.5,1h1.79v3H3.5z M7.5,6C7.2239,6,7,5.7761,7,5.5S7.2239,5,7.5,5S8,5.2239,8,5.5S7.7761,6,7.5,6z M8,3.5&#xA;&#x9;C8,3.7761,7.7761,4,7.5,4H5.69V1H7.5C7.7761,1,8,1.2239,8,1.5V3.5z"/>
+</svg>
--- a/icons/map/POI/rail-light-11.svg
+++ b/icons/map/POI/rail-light-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="rail-light-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path id="path14245" d="M4,0&#xA;&#x9;C3.5,0,3.5,0.5,3.5,0.5S3.5,1,4,1h1v0.9707L4,2c0,0-1,0-1,1v3c0,2,2,2,2,2h1c0,0,2,0,2-2V3c0-1-1-1-1-1H6V1h1c0.5,0,0.5-0.5,0.5-0.5&#xA;&#x9;S7.5,0,7,0H4z M5.5,3L7,3.5V5H5.5H4V3.5L5.5,3z M5.5,6C5.777,6,6,6.223,6,6.5S5.777,7,5.5,7S5,6.777,5,6.5S5.223,6,5.5,6z&#xA;&#x9; M2.834,8.5L2,11h1.5l0.334-1h3.332L7.5,11H9L8.166,8.5H6.668L6.834,9H4.166l0.166-0.5H2.834z"/>
+</svg>
--- a/icons/map/POI/rail-metro-11.svg
+++ b/icons/map/POI/rail-metro-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="rail-metro-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path id="path14200" d="M3.5,0C3,0,3,0.5,3,0.5L2,5v1c0,1.0244,1,1,1,1h5c0,0,1,0,1-1V5L8,0.5C8,0.5,8,0,7.5,0H3.5z M4,1h3l0.5,3h-4&#xA;&#x9;L4,1z M3.5,5C3.7761,5,4,5.2239,4,5.5S3.7761,6,3.5,6S3,5.7761,3,5.5S3.2239,5,3.5,5z M5.25,5h0.5C5.8885,5,6,5.1115,6,5.25&#xA;&#x9;S5.8885,5.5,5.75,5.5h-0.5C5.1115,5.5,5,5.3885,5,5.25S5.1115,5,5.25,5z M7.5,5C7.7761,5,8,5.2239,8,5.5S7.7761,6,7.5,6&#xA;&#x9;S7,5.7761,7,5.5S7.2239,5,7.5,5z M3,8l-1,3h1.5l0.334-1h3.332L7.5,11H9L8,8H6.5l0.334,1H4.166L4.5,8H3z"/>
+</svg>
--- a/icons/map/POI/skateboard-11.svg
+++ b/icons/map/POI/skateboard-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="skateboard-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <path id="icon_concepts:_sports_leisure" d="M8,6H3A2.0024,2.0024,0,0,1,1,4H2A1.001,1.001,0,0,0,3,5H8A1.001,1.001,0,0,0,9,4h1A2.0024,2.0024,0,0,1,8,6ZM8,7A1,1,0,1,0,9,8,1,1,0,0,0,8,7ZM3,7A1,1,0,1,0,4,8,1,1,0,0,0,3,7Z"/>
+</svg>
--- a/icons/map/POI/slaughterhouse-11.svg
+++ b/icons/map/POI/slaughterhouse-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="slaughterhouse-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <path d="M11,5.75v.241C11,7,10,6.5,10,6.5H8A3.081,3.081,0,0,1,7,8a2.848,2.848,0,0,1-.416.9.26.26,0,0,0-.05.242l.458,1.55A.227.227,0,0,1,7,10.75a.25.25,0,0,1-.25.25.259.259,0,0,1-.244-.173L6,9V8.5H2.75l-.21.42a.25.25,0,0,0-.02.168L3,10.75a.25.25,0,0,1-.25.25.26.26,0,0,1-.237-.172L2,9V8.5a4.013,4.013,0,0,1-.843-.139,1.383,1.383,0,0,1-.5,1.045.242.242,0,0,0-.094.282l.414.99a.213.213,0,0,1,.011.072.25.25,0,0,1-.25.25.253.253,0,0,1-.228-.148L0,9.5a6.031,6.031,0,0,0,0-2v-2A1.486,1.486,0,0,1,2,4.1s.768.132,1.1.154A2.457,2.457,0,0,0,4,4.087,1.666,1.666,0,0,1,4.5,4a1.648,1.648,0,0,1,.844.257,3.166,3.166,0,0,0,.9.23L7,4.5s.966-.484,1-.5V3.5l.5.5A1.474,1.474,0,0,1,10,3.5.914.914,0,0,0,9,4l1,1,.68.529a.425.425,0,0,1,.07-.029A.238.238,0,0,1,11,5.75Z"/>
+</svg>
--- a/icons/map/POI/slipway-11.svg
+++ b/icons/map/POI/slipway-11.svg
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="slipway-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <g id="slipway-final">
+    <path d="M1.0417,8l8,1.3794V10h-8Zm8-4-1,1v.625L3.7345,4.01l.0777-.2852.86-.8447H5.5a.35.35,0,0,0,0-.6992H4.529a.3478.3478,0,0,0-.2451.1L3.2546,3.291a.3566.3566,0,0,0-.0928.1582l-.0856.3137L1.0417,3C1.0948,4,1,5.5094,3,5.8844,3.9829,6.0687,8.0948,7,8.0948,7l1.9469-2Z"/>
+  </g>
+</svg>
--- a/icons/map/POI/stadium-11.svg
+++ b/icons/map/POI/stadium-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="stadium-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path id="path4177" d="M5,0v3v0.0117&#xA;&#x9;C2.7922,3.1089,1.0876,3.8182,1,4.6816c0,0,0,2.4594,0,3.6816C0.9995,9.2672,3.0143,10,5.5,10s4.5005-0.7328,4.5-1.6367V4.6816&#xA;&#x9;C9.9122,3.8177,8.2093,3.1082,6,3.0117V2.5723L8.5,1.5L5,0z M1.8184,5.752C2.1366,5.9302,2.5373,6.0838,3,6.2051v2.459&#xA;&#x9;C2.2493,8.4283,1.8213,8.0972,1.8184,7.75V5.752z M9.1816,5.7559V7.75C9.1803,8.0979,8.7521,8.4298,8,8.666V6.2031&#xA;&#x9;C8.4614,6.0836,8.862,5.932,9.1816,5.7559z M4,6.3984C4.4815,6.4652,4.9888,6.4995,5.5,6.5C6.0112,6.4995,6.5185,6.4652,7,6.3984&#xA;&#x9;v2.4922C6.5282,8.9624,6.0171,8.9997,5.5,9C4.9829,8.9997,4.4718,8.9624,4,8.8906V6.3984z"/>
+</svg>
--- a/icons/map/POI/tennis-11.svg
+++ b/icons/map/POI/tennis-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="tennis-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <path d="M9.38,1.63C8.5569.7765,6.6118.8078,5.24,2.24A4.26,4.26,0,0,0,4.05,5a4.1491,4.1491,0,0,1-.5,2.07.62.62,0,0,0-.67.12L1.19,8.88a.61.61,0,0,0,0,.85l.09.09a.5941.5941,0,0,0,.84.01l.01-.01L3.82,8.13a.5994.5994,0,0,0,.12-.67,5.8237,5.8237,0,0,1,2.21-.49A3.9655,3.9655,0,0,0,8.77,5.78C10.09,4.46,10.3421,2.6276,9.38,1.63ZM6.15,6.47a1.6589,1.6589,0,0,1-1.17-.44,1.923,1.923,0,0,1-.31-1.98L6.95,6.33A2.5434,2.5434,0,0,1,6.15,6.47Zm1.06-.23L4.77,3.8a3.72,3.72,0,0,1,.7-1.07L8.28,5.55A3.5558,3.5558,0,0,1,7.21,6.24Zm1.25-.87L5.64,2.54a3.9241,3.9241,0,0,1,1.04-.71h.01l2.5,2.5A3.578,3.578,0,0,1,8.46,5.37Zm.83-1.29L6.94,1.72a2.76,2.76,0,0,1,.92-.17,1.6156,1.6156,0,0,1,1.17.44,1.7156,1.7156,0,0,1,.41,1.52A3,3,0,0,1,9.29,4.08Z"/>
+</svg>
--- a/icons/map/POI/triangle-11.svg
+++ b/icons/map/POI/triangle-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="triangle-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path id="rect3338" d="M5.5174,1.2315&#xA;&#x9;C5.3163,1.2253,5.1276,1.328,5.024,1.5l-4,6.6598C0.8013,8.5293,1.0679,8.9999,1.5,9h8c0.4321-0.0001,0.6987-0.4707,0.476-0.8402&#xA;&#x9;l-4-6.6598C5.8787,1.3386,5.706,1.2375,5.5174,1.2315z"/>
+</svg>
--- a/icons/map/POI/triangle-stroked-11.svg
+++ b/icons/map/POI/triangle-stroked-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="triangle-stroked-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path id="rect3338" d="M5.5174,1.2315&#xA;&#x9;C5.3163,1.2253,5.1276,1.328,5.024,1.5l-4,6.6598C0.8013,8.5293,1.0679,8.9999,1.5,9h8c0.4321-0.0001,0.6987-0.4707,0.476-0.8402&#xA;&#x9;l-4-6.6598C5.8787,1.3386,5.706,1.2375,5.5174,1.2315z M5.5,2.8627l3.0191,5.0286H2.4809L5.5,2.8627z"/>
+</svg>
--- a/icons/map/POI/volleyball-11.svg
+++ b/icons/map/POI/volleyball-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="volleyball-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <path d="M9.99,5.73a3.6572,3.6572,0,0,1-.1.74A6.3224,6.3224,0,0,0,7.44,5.05a5.9537,5.9537,0,0,0-1.32-.27c-.03,0-.07-.01-.11-.01A4.6052,4.6052,0,0,1,5.5,3.64a1.0563,1.0563,0,0,1-.06-.24h.12a4.8784,4.8784,0,0,1,1.01.11,5.0388,5.0388,0,0,1,1.14.36,4.8341,4.8341,0,0,1,.94.53A5.1356,5.1356,0,0,1,9.99,5.73ZM9.33,7.31a5.1964,5.1964,0,0,0-1.36-.97c-.05.1-.11.19-.17.29a5.8645,5.8645,0,0,1-.59.82,7.1807,7.1807,0,0,1-.78.78,6.72,6.72,0,0,1-.93.65,6.3643,6.3643,0,0,1-1.86.72,4.524,4.524,0,0,0,3.72,0,4.1584,4.1584,0,0,0,1.25-.86,3.1983,3.1983,0,0,0,.43-.47,3.7473,3.7473,0,0,0,.48-.76A1.1915,1.1915,0,0,0,9.33,7.31ZM8.68,2.32a4.5077,4.5077,0,0,0-1.24-.88,3.979,3.979,0,0,0-.75-.28,4.3423,4.3423,0,0,0-1.03-.15,1.2787,1.2787,0,0,0-.32,0A5.3628,5.3628,0,0,0,5.25,2c0,.14.01.28.02.41a1.6165,1.6165,0,0,1,.22-.01,1.9237,1.9237,0,0,1,.24.01,6.6508,6.6508,0,0,1,1,.11,5.6947,5.6947,0,0,1,1,.28,6.7814,6.7814,0,0,1,1.02.47,6.6645,6.6645,0,0,1,.98.69A4.5655,4.5655,0,0,0,8.68,2.32ZM3.03,6.34a5.808,5.808,0,0,1-.4-.92,5.7849,5.7849,0,0,1-.28-1.03,6.86,6.86,0,0,1-.1-1.12V3.25a5.656,5.656,0,0,1,.07-.93A4.3939,4.3939,0,0,0,1.27,3.97,4.3206,4.3206,0,0,0,1,5.5a1.7671,1.7671,0,0,0,.01.23,4.4161,4.4161,0,0,0,.09.73,4.0749,4.0749,0,0,0,.31.91,1.0685,1.0685,0,0,0,.27-.07A5.0679,5.0679,0,0,0,3.2,6.63C3.14,6.53,3.08,6.44,3.03,6.34Zm3.88-.4a5.4992,5.4992,0,0,0-1.35-.19c-.02.03-.04.05-.06.08a6.2466,6.2466,0,0,1-.91,1.01,5.8334,5.8334,0,0,1-.8.61,6.5727,6.5727,0,0,1-1.83.82,3.1983,3.1983,0,0,0,.43.47,5.1724,5.1724,0,0,0,2.18-.51,5.4146,5.4146,0,0,0,.93-.55,5.5958,5.5958,0,0,0,.91-.84A4.8049,4.8049,0,0,0,7,6.01a.0517.0517,0,0,0,.02-.04A.2283.2283,0,0,0,6.91,5.94ZM4.88,4.78a5.6391,5.6391,0,0,1-.45-1.27,6.3861,6.3861,0,0,1-.16-.99c-.01-.17-.02-.35-.02-.52a5.83,5.83,0,0,1,.06-.84,3.9815,3.9815,0,0,0-.75.28A5.5806,5.5806,0,0,0,3.27,2.8c-.01.15-.02.3-.02.45a4.2153,4.2153,0,0,0,.04.62,4.7107,4.7107,0,0,0,.27,1.18,5.0984,5.0984,0,0,0,.42.92A.0517.0517,0,0,0,4,6.01a.1778.1778,0,0,0,.08-.07h.01a5.6817,5.6817,0,0,0,.84-1.06A.3131.3131,0,0,1,4.88,4.78Z"/>
+</svg>
--- a/icons/map/POI/water-11.svg
+++ b/icons/map/POI/water-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="water-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M5.5,11C3.59,11,2,9,2,7s2.61-5.81,3.5-7C6.39,1.19,9,5,9,7S7.41,11,5.5,11z"/>
+</svg>
--- a/icons/map/POI/watermill-11.svg
+++ b/icons/map/POI/watermill-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="watermill-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M9.9874,4.375C9.9216,2.5436,8.4563,1.0784,6.625,1.0126V1h-0.25v0.0126C5.274,1.0521,4.3123,1.6034,3.7004,2.4301L2.5059,1&#xA;&#x9;L0,4h1v4l1.8-1l1.8,1l1.1202-0.6218C5.2513,7.2512,4.825,7.021,4.4765,6.7003L6.252,4.9247c0.0385,0.0226,0.0788,0.0383,0.123,0.05&#xA;&#x9;v2.0399L6.4014,7L6.625,7.1243V4.9747c0.0442-0.0117,0.0845-0.0274,0.123-0.05l1.7755,1.7755&#xA;&#x9;C8.1429,7.0505,7.6736,7.3016,7.1526,7.4177l0.5937,0.3301C9.0195,7.2596,9.9359,6.0602,9.9874,4.625H10v-0.25H9.9874z&#xA;&#x9; M4.2997,6.5235C3.8347,6.0182,3.5435,5.3568,3.5126,4.625h2.5126c0.0117,0.0442,0.0274,0.0845,0.05,0.123L4.2997,6.5235z&#xA;&#x9; M6.0253,4.375H3.5126c0.0308-0.7318,0.3221-1.3932,0.7871-1.8985L6.0753,4.252C6.0527,4.2905,6.037,4.3308,6.0253,4.375z&#xA;&#x9; M6.375,4.0253c-0.0442,0.0117-0.0845,0.0274-0.123,0.05L4.4765,2.2997c0.5053-0.465,1.1667-0.7563,1.8985-0.7871V4.0253z&#xA;&#x9; M6.625,4.0253V1.5126c0.7318,0.0308,1.3932,0.3221,1.8985,0.7871L6.748,4.0753C6.7095,4.0527,6.6692,4.037,6.625,4.0253z&#xA;&#x9; M8.7003,6.5235L6.9247,4.748c0.0226-0.0385,0.0383-0.0788,0.05-0.123h2.5126C9.4565,5.3568,9.1653,6.0182,8.7003,6.5235z&#xA;&#x9; M6.9747,4.375c-0.0117-0.0442-0.0274-0.0845-0.05-0.123l1.7755-1.7755c0.465,0.5053,0.7563,1.1667,0.7871,1.8985H6.9747z M6.4014,8&#xA;&#x9;L4.6,9L3.808,8.56l0,0L2.8,8L1.792,8.56l0,0L1,9v1l1.8-1l1.8,1l1.8014-1L8.2,10L10,9V8L8.2,9L6.4014,8z"/>
+</svg>
--- a/icons/map/POI/windmill-11.svg
+++ b/icons/map/POI/windmill-11.svg
@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="windmill-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path d="M6.375,3.9375L5.9375,3.5L6.375,3.0625h0.4375L9,0.875L8.125,0L5.9375,2.1875V2.625L5.5,3.0625L5.0625,2.625V2.1875L2.875,0&#xA;&#x9;L2,0.875l2.1875,2.1875H4.625L5.0625,3.5L4.625,3.9375H4.1875L2,6.125L2.875,7l2.1875-2.1875V4.375L5.5,3.9375L5.9375,4.375v0.4375&#xA;&#x9;L8.125,7L9,6.125L6.8125,3.9375H6.375z M8.5,10H8L7,7.5L5.5,6L4,7.5L3,10H2.5C2.2239,10,2,10.2238,2,10.5&#xA;&#x9;C2,10.7761,2.2239,11,2.5,11h6C8.7761,11,9,10.7761,9,10.5C9,10.2238,8.7761,10,8.5,10z M6,9.9717C6,9.9873,5.9874,10,5.9717,10&#xA;&#x9;H5.0283C5.0126,10,5,9.9873,5,9.9717v-0.972C5,8.7238,5.2238,8.5,5.4998,8.5C5.7761,8.5,6,8.7239,6,9.0002V9.9717z"/>
+</svg>
--- a/icons/map/arrow.png
+++ b/icons/map/arrow.png
--- a/icons/map/arrow@2x.png
+++ b/icons/map/arrow@2x.png
--- a/icons/map/mapsforge/licence.txt
+++ b/icons/map/mapsforge/licence.txt
@ -1,169 +0,0 @@
-Mapsforge render theme icons as provided by the Mapsforge project
-(https://github.com/mapsforge). Licensed under LGPLv3.
-
-----
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
--- a/icons/map/mapsforge/patterns/access-destination.png
+++ b/icons/map/mapsforge/patterns/access-destination.png
--- a/icons/map/mapsforge/patterns/access-private.png
+++ b/icons/map/mapsforge/patterns/access-private.png
--- a/icons/map/mapsforge/patterns/arrow.png
+++ b/icons/map/mapsforge/patterns/arrow.png
--- a/icons/map/mapsforge/patterns/cemetery.png
+++ b/icons/map/mapsforge/patterns/cemetery.png
--- a/icons/map/mapsforge/patterns/coniferous.svg
+++ b/icons/map/mapsforge/patterns/coniferous.svg
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol id="symbol-university" viewBox="244.5 110 489 219.9">
-   <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" id="path4460"/>
-   <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39" id="path4462"/>
-   <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" id="path4464"/>
-   <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" id="path4466"/>
-  </symbol>
-  <symbol viewBox="244.5 110 489 219.9" id="symbol9807">
-   <path id="path9809" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path9811" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path9813" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path9815" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <path inkscape:connector-curvature="0" id="path8893-1-1" d="m 151.49813,293.8417 -44.4375,95.875 -0.34375,0.71875 0.78125,0 8.9375,0 -15.15625,27.53125 -0.40625,0.71875 0.84375,0 10.71875,0 -18.062502,29.875 -0.5625,0.90625 1.0625,-0.15625 45.593752,-6.84375 0,48.53125 0,0.5 0.5,0 10.625,0 0.375,0 0.125,0 0.375,0 10.59375,0 0.5,0 0,-0.5 0,-48.53125 45.6875,6.84375 1.03125,0.15625 -0.53125,-0.90625 -18.0625,-29.875 10.625,0 0.84375,0 -0.40625,-0.71875 -15.15625,-27.53125 9,0 0.78125,0 -0.3125,-0.71875 -44.53125,-95.875 -0.5,0.0937 -0.53125,-0.0937 z m -0.0312,2.4375 0,194.21875 -10,0 0,-48.625 0,-0.5625 -0.5625,0.0937 -45.125002,6.75 17.937502,-29.6875 0.46875,-0.78125 -0.875,0 -10.75,0 15.15625,-27.53125 0.40625,-0.71875 -0.84375,0 -9,0 43.1875,-93.15625 z m 1.125,0.0625 43.25,93.09375 -9.09375,0 -0.84375,0 0.40625,0.71875 15.15625,27.53125 -10.65625,0 -0.875,0 0.4375,0.78125 17.9375,29.6875 -45.15625,-6.75 -0.59375,-0.0937 0,0.5625 0,48.625 -9.96875,0 0,-194.15625 z m -0.63664,-2.30136 -44.44666,95.87969 9.78092,0 -15.56963,28.27819 11.57742,0 -18.497262,30.60698 46.176622,-6.91983 0,49.10424 10.97859,0 0,-196.94927 z m 0.13307,0 0,196.94927 10.97859,0 0,-49.10424 46.24316,6.91983 -18.49726,-30.60698 11.51089,0 -15.56964,-28.27819 9.84746,0 -44.5132,-95.87969 z" fill-opacity=".733" color="#000000" fill="#87b987"/>
- <path inkscape:connector-curvature="0" id="path8893-1-7" d="m 438.03409,87.423634 -44.4375,95.874996 -0.34375,0.71875 0.78125,0 8.9375,0 -15.15625,27.53125 -0.40625,0.71875 0.84375,0 10.71875,0 -18.0625,29.875 -0.5625,0.90625 1.0625,-0.15625 45.59375,-6.84375 0,48.53125 0,0.5 0.5,0 10.625,0 0.375,0 0.125,0 0.375,0 10.59375,0 0.5,0 0,-0.5 0,-48.53125 45.6875,6.84375 1.03125,0.15625 -0.53125,-0.90625 -18.0625,-29.875 10.625,0 0.84375,0 -0.40625,-0.71875 -15.15625,-27.53125 9,0 0.78125,0 -0.3125,-0.71875 -44.53125,-95.874996 -0.5,0.0937 -0.53125,-0.0937 z m -0.0312,2.4375 0,194.218746 -10,0 0,-48.625 0,-0.5625 -0.5625,0.0937 -45.125,6.75 17.9375,-29.6875 0.46875,-0.78125 -0.875,0 -10.75,0 15.15625,-27.53125 0.40625,-0.71875 -0.84375,0 -9,0 43.1875,-93.156246 z m 1.125,0.0625 43.25,93.093746 -9.09375,0 -0.84375,0 0.40625,0.71875 15.15625,27.53125 -10.65625,0 -0.875,0 0.4375,0.78125 17.9375,29.6875 -45.15625,-6.75 -0.59375,-0.0937 0,0.5625 0,48.625 -9.96875,0 0,-194.156246 z m -0.63664,-2.30136 -44.44666,95.879686 9.78092,0 -15.56963,28.27819 11.57742,0 -18.49726,30.60698 46.17662,-6.91983 0,49.10424 10.97859,0 0,-196.949266 z m 0.13307,0 0,196.949266 10.97859,0 0,-49.10424 46.24316,6.91983 -18.49726,-30.60698 11.51089,0 -15.56964,-28.27819 9.84746,0 -44.5132,-95.879686 z" fill-opacity=".733" color="#000000" fill="#87b987"/>
-</svg>
--- a/icons/map/mapsforge/patterns/coniferous_and_deciduous.svg
+++ b/icons/map/mapsforge/patterns/coniferous_and_deciduous.svg
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol id="symbol-university" viewBox="244.5 110 489 219.9">
-   <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" id="path4460"/>
-   <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39" id="path4462"/>
-   <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" id="path4464"/>
-   <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" id="path4466"/>
-  </symbol>
-  <symbol viewBox="244.5 110 489 219.9" id="symbol9807">
-   <path id="path9809" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path9811" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path9813" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path9815" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <path id="path8893-1" d="m 171,276.21875 -44.4375,95.875 -0.34375,0.71875 0.78125,0 8.9375,0 -15.15625,27.53125 -0.40625,0.71875 0.84375,0 10.71875,0 -18.0625,29.875 -0.5625,0.90625 1.0625,-0.15625 45.59375,-6.84375 0,48.53125 0,0.5 0.5,0 10.625,0 0.375,0 0.125,0 0.375,0 10.59375,0 0.5,0 0,-0.5 0,-48.53125 45.6875,6.84375 1.03125,0.15625 -0.53125,-0.90625 -18.0625,-29.875 10.625,0 0.84375,0 -0.40625,-0.71875 -15.15625,-27.53125 9,0 0.78125,0 -0.3125,-0.71875 -44.53125,-95.875 -0.5,0.0937 L 171,276.21875 z m -0.0312,2.4375 0,194.21875 -10,0 0,-48.625 0,-0.5625 -0.5625,0.0937 -45.125,6.75 17.9375,-29.6875 0.46875,-0.78125 -0.875,0 -10.75,0 15.15625,-27.53125 0.40625,-0.71875 -0.84375,0 -9,0 43.1875,-93.15625 z m 1.125,0.0625 43.25,93.09375 -9.09375,0 -0.84375,0 0.40625,0.71875 15.15625,27.53125 -10.65625,0 -0.875,0 0.4375,0.78125 17.9375,29.6875 -45.15625,-6.75 -0.59375,-0.0937 0,0.5625 0,48.625 -9.96875,0 0,-194.15625 z m -0.63664,-2.30136 -44.44666,95.87969 9.78092,0 -15.56963,28.27819 11.57742,0 -18.49726,30.60698 46.17662,-6.91983 0,49.10424 10.97859,0 0,-196.94927 z m 0.13307,0 0,196.94927 10.97859,0 0,-49.10424 46.24316,6.91983 -18.49726,-30.60698 11.51089,0 -15.56964,-28.27819 9.84746,0 -44.5132,-95.87969 z" fill-opacity=".733" color="#000000" fill="#87b987"/>
- <path d="m 401.20072,107.52099 c -12.89249,-0.21792 -26.4631,6.91624 -29.20596,21.537 -1.16133,6.19036 -2.13136,8.18098 -9.45839,8.30804 -22.57124,0.39142 -32.17031,33.57097 -13.10114,49.20917 1.88949,1.54956 0.80099,2.89533 -5.56,7.73287 -32.37287,24.61961 2.48489,73.74553 35.59676,50.16779 4.84775,-3.4519 5.61647,-3.48967 6.71034,-0.63908 2.30895,6.01702 1.28278,34.9088 -1.5977,44.47997 l -2.87586,9.52229 17.31908,0 c 1.71459,0 2.57221,0.006 3.96229,0 1.40745,0.006 2.28396,0 4.0262,0 l 17.31908,0 -2.81195,-9.52229 c -2.88049,-9.57117 -3.97059,-38.46295 -1.66161,-44.47997 1.09387,-2.85059 1.86259,-2.81282 6.71034,0.63908 33.11187,23.57774 67.96963,-25.54818 35.59676,-50.16779 -6.36099,-4.83754 -7.77751,-6.8574 -5.49609,-7.73287 19.06917,-7.31754 8.85147,-45.48948 -13.16505,-49.20917 -7.22574,-1.22077 -8.23315,-2.11768 -9.39448,-8.30804 -2.87273,-15.31291 -17.65149,-22.36306 -31.05929,-21.40919 -0.61108,-0.0438 -1.23787,-0.1174 -1.85333,-0.12781 z" id="path9696" inkscape:connector-curvature="0" fill="#87b987" fill-opacity=".733"/>
-</svg>
--- a/icons/map/mapsforge/patterns/deciduous.svg
+++ b/icons/map/mapsforge/patterns/deciduous.svg
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol id="symbol-university" viewBox="244.5 110 489 219.9">
-   <path d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" id="path4460"/>
-   <path fill="none" stroke="#000000" stroke-width="20" d="M94,176l-21,39" id="path4462"/>
-   <path d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" id="path4464"/>
-   <path ill="none" stroke="#000000" stroke-width="20" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" id="path4466"/>
-  </symbol>
-  <symbol viewBox="244.5 110 489 219.9" id="symbol9807">
-   <path id="path9809" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path9811" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path9813" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path9815" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <path d="m 159.3237,301.42595 c -12.89248,-0.21792 -26.46309,6.91624 -29.20596,21.537 -1.16132,6.19036 -2.13136,8.18098 -9.45839,8.30804 -22.571243,0.39142 -32.170313,33.57097 -13.10114,49.20917 1.88949,1.54956 0.80099,2.89533 -5.55999,7.73287 -32.372883,24.61961 2.48489,73.74553 35.59676,50.16779 4.84774,-3.4519 5.61646,-3.48967 6.71034,-0.63908 2.30895,6.01702 1.28278,34.9088 -1.5977,44.47997 l -2.87586,9.52229 17.31907,0 c 1.71459,0 2.57221,0.006 3.9623,0 1.40744,0.006 2.28396,0 4.0262,0 l 17.31907,0 -2.81195,-9.52229 c -2.88048,-9.57117 -3.97058,-38.46295 -1.66161,-44.47997 1.09388,-2.85059 1.8626,-2.81282 6.71034,0.63908 33.11188,23.57774 67.96964,-25.54818 35.59676,-50.16779 -6.36098,-4.83754 -7.77751,-6.8574 -5.49608,-7.73287 19.06916,-7.31754 8.85147,-45.48948 -13.16505,-49.20917 -7.22574,-1.22077 -8.23316,-2.11768 -9.39448,-8.30804 -2.87273,-15.31291 -17.6515,-22.36306 -31.0593,-21.40919 -0.61108,-0.0438 -1.23787,-0.1174 -1.85333,-0.12781 z" id="path9696" inkscape:connector-curvature="0" fill="#87b987" fill-opacity=".733"/>
- <path d="m 419.39534,72.446632 c -12.89248,-0.21792 -26.46309,6.91624 -29.20596,21.537 -1.16132,6.190358 -2.13136,8.180978 -9.45839,8.308038 -22.57124,0.39142 -32.17031,33.57097 -13.10114,49.20917 1.88949,1.54956 0.80099,2.89533 -5.55999,7.73287 -32.37288,24.6196 2.48489,73.74552 35.59676,50.16778 4.84774,-3.4519 5.61646,-3.48967 6.71034,-0.63908 2.30895,6.01702 1.28278,34.9088 -1.5977,44.47997 l -2.87586,9.52229 17.31907,0 c 1.71459,0 2.57221,0.006 3.9623,0 1.40744,0.006 2.28396,0 4.0262,0 l 17.31907,0 -2.81195,-9.52229 c -2.88048,-9.57117 -3.97058,-38.46295 -1.66161,-44.47997 1.09388,-2.85059 1.8626,-2.81282 6.71034,0.63908 33.11189,23.57774 67.96965,-25.54818 35.59677,-50.16778 -6.36098,-4.83754 -7.77751,-6.8574 -5.49608,-7.73287 19.06916,-7.31754 8.85147,-45.48948 -13.16505,-49.20917 -7.22574,-1.22077 -8.23316,-2.11768 -9.39448,-8.308038 -2.87273,-15.31291 -17.65151,-22.36306 -31.05931,-21.40919 -0.61108,-0.0438 -1.23787,-0.1174 -1.85333,-0.12781 z" id="path9696-1" inkscape:connector-curvature="0" fill="#87b987" fill-opacity=".733"/>
-</svg>
--- a/icons/map/mapsforge/patterns/dot.png
+++ b/icons/map/mapsforge/patterns/dot.png
--- a/icons/map/mapsforge/patterns/farmland.svg
+++ b/icons/map/mapsforge/patterns/farmland.svg
@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="128" width="128" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <metadata>
-  <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/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <g transform="translate(-311,-468.36218)">
-  <rect style="enable-background:new;" transform="scale(-1,-1)" height="64" width="64" y="-596.4" x="-375" fill="#f7f5e5"/>
-  <rect style="enable-background:new;" height="64" width="64" y="468.4" x="375" fill="#f7f5e5"/>
-  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="64" width="64" y="-439" x="532.4" fill="#f7f5e5"/>
-  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="64" width="64" y="311" x="-532.4" fill="#f7f5e5"/>
-  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-594.4" x="-375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-586.4" x="-375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-578.4" x="-375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-570.4" x="-375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-562.4" x="-375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-554.4" x="-375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-546.4" x="-375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="scale(-1,-1)" height="4" width="64" y="-538.4" x="-375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" height="4" width="64" y="470.4" x="375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" height="4" width="64" y="478.4" x="375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" height="4" width="64" y="486.4" x="375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" height="4" width="64" y="494.4" x="375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" height="4" width="64" y="502.4" x="375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" height="4" width="64" y="510.4" x="375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" height="4" width="64" y="518.4" x="375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" height="4" width="64" y="526.4" x="375" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-437" x="532.4" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-429" x="532.4" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-421" x="532.4" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-413" x="532.4" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-405" x="532.4" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-397" x="532.4" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-389" x="532.4" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,1,-1,0,0,0)" height="4" width="64" y="-381" x="532.4" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="313" x="-532.4" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="321" x="-532.4" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="329" x="-532.4" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="337" x="-532.4" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="345" x="-532.4" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="353" x="-532.4" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="361" x="-532.4" fill="#efe9c9"/>
-  <rect style="enable-background:new;" transform="matrix(0,-1,1,0,0,0)" height="4" width="64" y="369" x="-532.4" fill="#efe9c9"/>
- </g>
-</svg>
--- a/icons/map/mapsforge/patterns/grass.svg
+++ b/icons/map/mapsforge/patterns/grass.svg
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <metadata id="metadata10"/>
- <path inkscape:connector-curvature="0" sodipodi:nodetypes="cc" id="path3781" d="m 185.62513,286.07679 0.32964,-83.39783" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
- <path inkscape:connector-curvature="0" sodipodi:nodetypes="cc" id="path3783" d="M 235.01392,232.12965 208.64307,286.1899" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
- <path inkscape:connector-curvature="0" sodipodi:nodetypes="cc" id="path3785" d="m 268.03405,253.11322 -32.3043,32.96357" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
- <path inkscape:connector-curvature="0" sodipodi:nodetypes="cc" d="m 140.65911,229.8222 22.74487,56.3677" id="path3787" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
- <path inkscape:connector-curvature="0" sodipodi:nodetypes="cc" d="m 104.34263,254.10212 31.97466,31.97467" id="path3789" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
- <path inkscape:connector-curvature="0" d="m 385.62513,190.07678 0.32964,-83.39783" id="path3793" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
- <path inkscape:connector-curvature="0" d="M 435.01392,136.12964 408.64307,190.1899" id="path3795" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
- <path inkscape:connector-curvature="0" d="m 468.03405,157.11321 -32.3043,32.96357" id="path3797" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
- <path inkscape:connector-curvature="0" id="path3799" d="m 340.65911,133.8222 22.74487,56.3677" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
- <path inkscape:connector-curvature="0" id="path3801" d="m 304.34263,158.10212 31.97466,31.97466" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
- <path inkscape:connector-curvature="0" d="m 289.62513,436.07679 0.32964,-83.39783" id="path3807" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
- <path inkscape:connector-curvature="0" d="m 339.01392,382.12965 -26.37085,54.06026" id="path3809" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
- <path inkscape:connector-curvature="0" d="m 372.03405,403.11322 -32.3043,32.96357" id="path3811" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
- <path inkscape:connector-curvature="0" id="path3813" d="m 244.65911,379.82221 22.74487,56.3677" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
- <path inkscape:connector-curvature="0" id="path3815" d="m 208.34263,404.10213 31.97466,31.97466" sodipodi:nodetypes="cc" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="11.654" stroke-opacity=".733"/>
-</svg>
--- a/icons/map/mapsforge/patterns/hills.svg
+++ b/icons/map/mapsforge/patterns/hills.svg
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <metadata id="metadata10"/>
- <path d="m 362.98225,178.74951 c -18.3712,0.59518 -37.24028,3.30167 -53.875,11.21875 -11.25487,7.22101 -22.36174,14.50288 -33.40625,22.03125 -1.46855,1.05996 -6.63905,5.09345 -2.09375,3.0625 23.14953,-7.60492 43.81095,-22.25924 68.19266,-26.47693 20.60973,-5.15501 44.5539,-7.48552 63.05734,4.88318 12.34319,7.70967 22.99577,18.05648 36.3125,24.25 14.27752,7.77103 24.71792,24.76074 41.09375,26.75 -16.38702,-23.13213 -44.74653,-33.04697 -64.59013,-52.78497 -14.71539,-13.83429 -35.8556,-12.62913 -54.69112,-12.93378 z" id="path3656" fill="#999999"/>
- <path d="m 196.70535,94.254447 c -39.22077,-0.83704 -81.18443,5.73512 -111.323742,32.742223 -17.84714,15.20614 -33.7635,33.63041 -55.27001,43.75778 -2.650844,3.00967 2.800086,3.75932 4.90625,3 9.019234,-2.2793 15.95483,-9.35158 24.07693,-13.84356 15.98596,-10.61568 29.67645,-23.9299 42.574182,-37.94328 13.17695,-9.53662 29.87141,-12.00889 45.2614,-16.37281 24.51897,-5.32234 49.90938,-8.779243 74.99374,-6.652853 17.9245,4.576333 29.12992,21.095083 44.84375,29.968753 15.17614,9.89258 31.52486,18.7369 45.25,30.25 1.11555,-1.9244 -0.91505,-5.53366 -1.15625,-7.84375 -3.15304,-7.06153 -11.43345,-9.86687 -17.1875,-14.53125 -15.56308,-9.47906 -31.54849,-18.77017 -44.28125,-31.8125 -7.39152,-7.118783 -17.21364,-11.069463 -27.5,-10.468753 -8.38657,-0.4434 -16.79286,-0.33168 -25.1875,-0.25 z" id="path3658" fill="#999999"/>
- <path d="m 230.65504,246.00676 c -31.62382,2.61225 -64.4086,9.42287 -89.71169,29.65518 -17.03503,12.8395 -31.04208,29.79465 -50.069559,39.68857 -1.92089,2.78152 2.84221,7.28577 4.9375,3.78125 24.244999,-13.1651 41.551299,-35.81632 64.843749,-50.21875 22.74862,-11.9244 48.95265,-14.49799 74.09375,-17.625 17.57282,-0.89735 36.19959,4.8049 47.5625,18.71875 15.26441,12.85776 34.81496,19.83178 48.8125,34.1875 6.33889,5.2207 11.49959,13.49618 19.4375,15.4375 -0.53075,-5.86255 -6.28126,-9.81487 -9.53125,-14.34375 -14.02641,-15.2832 -32.85089,-24.47094 -49.75,-35.9375 -9.35849,-7.95098 -17.80511,-19.73683 -31.38058,-19.94438 -9.72254,-1.54075 -19.3656,-3.61775 -29.24442,-3.39937 z" id="path3660" fill="#999999"/>
-</svg>
--- a/icons/map/mapsforge/patterns/marsh.png
+++ b/icons/map/mapsforge/patterns/marsh.png
--- a/icons/map/mapsforge/patterns/military.png
+++ b/icons/map/mapsforge/patterns/military.png
--- a/icons/map/mapsforge/patterns/nature-reserve.png
+++ b/icons/map/mapsforge/patterns/nature-reserve.png
--- a/icons/map/mapsforge/patterns/pike.png
+++ b/icons/map/mapsforge/patterns/pike.png
--- a/icons/map/mapsforge/patterns/quarry.svg
+++ b/icons/map/mapsforge/patterns/quarry.svg
@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <metadata id="metadata10"/>
- <path d="m 162.09375,118.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" id="path2845" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path id="path3720" d="m 213.09375,306.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path d="m 317.8125,219.03125 c -6.94506,1.66919 -15.66332,-1.75576 -21.21875,3.96875 -1.08673,7.66083 7.17525,14.05434 14.375,11.6875 7.55393,0.21939 16.59421,3.12237 23.0625,-1.625 -2.35509,-6.81053 -9.47907,-10.9266 -15.34375,-14.15625 -0.29932,0.01 -0.57875,-0.26991 -0.875,0.125 z" id="path3722" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path d="m 179.90625,216.40625 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.84375 5.20747,2.21591 11.12585,-0.34164 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.4375 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" id="path3724" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path d="m 353.8125,325.90625 c -8.93261,1.51509 -21.54424,-1.63526 -26.8125,7.96875 -3.18584,11.10588 8.85949,22.88956 19.9375,19.84375 9.50902,0.73456 22.46427,3.65875 28.86766,-5.49246 0.73995,-10.83984 -10.56107,-17.02729 -18.49266,-21.91379 -1.13062,-0.328 -2.32223,-0.50738 -3.5,-0.40625 z" id="path3736" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path id="path3742" d="m 278.90625,291.40625 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.84375 5.20747,2.21591 11.12585,-0.34164 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.4375 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path d="m 110.84375,257.34375 c -5.18653,1.2232 -12.129845,-1.78199 -16.25,2.0625 1.142733,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" id="path3744" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path id="path3750" d="m 125.84375,403.34375 c -5.18653,1.2232 -12.12984,-1.78199 -16.25,2.0625 1.14273,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path d="m 81.09375,509.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" id="path3752" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path d="m 184.90625,492.40625 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.84375 5.20747,2.21591 11.12585,-0.34164 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.4375 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" id="path3754" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path id="path3758" d="M 86.8125,336.03125 C 79.86744,337.70044 71.14918,334.27549 65.59375,340 c -1.08673,7.66083 7.17525,14.05434 14.375,11.6875 7.55393,0.21939 16.59421,3.12237 23.0625,-1.625 -2.35509,-6.81053 -9.47907,-10.9266 -15.34375,-14.15625 -0.29932,0.01 -0.57875,-0.26991 -0.875,0.125 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path id="path3760" d="m 467.09375,281.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path id="path3762" d="m 46.812499,151.90625 c -8.93261,1.51509 -21.54424,-1.63526 -26.8125,7.96875 -3.18584,11.10588 8.85949,22.88956 19.9375,19.84375 9.50902,0.73456 22.46427,3.65875 28.86766,-5.49246 0.73995,-10.83984 -10.56107,-17.02729 -18.49266,-21.91379 -1.13062,-0.328 -2.32223,-0.50738 -3.5,-0.40625 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path id="path3764" d="m 520.8125,504.90625 c -8.93261,1.51509 -21.54424,-1.63526 -26.8125,7.96875 -3.18584,11.10588 8.85949,22.88956 19.9375,19.84375 9.50902,0.73456 22.46427,3.65875 28.86766,-5.49246 0.73995,-10.83984 -10.56107,-17.02729 -18.49266,-21.91379 -1.13062,-0.328 -2.32223,-0.50738 -3.5,-0.40625 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path d="m 496.90625,459.40625 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.84375 5.20747,2.21591 11.12585,-0.34164 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.4375 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" id="path3766" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path id="path3768" d="m 397.84375,514.34375 c -5.18653,1.2232 -12.12984,-1.78199 -16.25,2.0625 1.14273,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path id="path3770" d="m 407.8125,418.03125 c -6.94506,1.66919 -15.66332,-1.75576 -21.21875,3.96875 -1.08673,7.66083 7.17525,14.05434 14.375,11.6875 7.55393,0.21939 16.59421,3.12237 23.0625,-1.625 -2.35509,-6.81053 -9.47907,-10.9266 -15.34375,-14.15625 -0.29932,0.01 -0.57875,-0.26991 -0.875,0.125 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path d="m 284.09375,450.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" id="path3772" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path d="m 499.09375,133.90625 c -7.54388,1.86034 -17.86615,-1.8012 -23.34375,5.15625 -1.8527,8.27965 6.87822,17.21084 15.25,14.59375 8.64197,0.26924 18.88574,3.45596 26.28125,-2.5625 -1.07836,-7.98061 -9.49105,-12.22377 -15.3125,-16.625 -0.9167,-0.36606 -1.87567,-0.6779 -2.875,-0.5625 z" id="path3774" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path id="path3776" d="m 456.90625,89.406249 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.843751 5.20747,2.21591 11.12585,-0.341641 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.437501 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path id="path3778" d="m 387.84375,174.34375 c -5.18653,1.2232 -12.12984,-1.78199 -16.25,2.0625 1.14273,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path id="path3780" d="m 241.8125,21.906249 c -8.93261,1.51509 -21.54424,-1.63526 -26.8125,7.96875 -3.18584,11.10588 8.85949,22.88956 19.9375,19.84375 9.50902,0.73456 22.46427,3.65875 28.86766,-5.49246 0.73995,-10.83984 -10.56107,-17.02729 -18.49266,-21.91379 -1.13062,-0.328 -2.32223,-0.50738 -3.5,-0.40625 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path id="path3782" d="m 270.90625,73.40625 c -2.77739,-0.30495 -3.49974,1.7747 -0.96875,2.84375 5.20747,2.21591 11.12585,-0.34164 16.5625,1.40625 4.32588,1.09062 2.00748,-1.10314 -0.25,-2.4375 -4.45512,-3.20523 -10.17563,-0.98733 -15.34375,-1.8125 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path d="m 163.84375,50.34375 c -5.18653,1.2232 -12.12984,-1.78199 -16.25,2.0625 1.14273,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" id="path3784" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
- <path id="path3786" d="m 553.84375,171.34375 c -5.18653,1.2232 -12.12984,-1.78199 -16.25,2.0625 1.14273,5.72491 8.08668,6.54153 12.8125,5.375 4.60242,0.0651 11.34685,2.24094 14.84375,0.15625 -2.85276,-3.35591 -6.96625,-6.98346 -11.40625,-7.59375 z" fill="none" stroke="#999999" stroke-linejoin="round" stroke-linecap="round" stroke-width="8.7"/>
-</svg>
--- a/icons/map/mapsforge/patterns/rail.png
+++ b/icons/map/mapsforge/patterns/rail.png
--- a/icons/map/mapsforge/patterns/scrub.svg
+++ b/icons/map/mapsforge/patterns/scrub.svg
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <metadata id="metadata10"/>
- <path d="m 91.846983,454.74639 376.797227,0" id="path3752" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="12" stroke-opacity=".733"/>
- <g id="g3779" transform="matrix(0.74835908,0,0,0.74835908,47.4084,40.634415)" stroke="#87b987" stroke-opacity=".733">
-  <path d="m 219.43574,376.07932 0.44048,-111.44093" id="path3781" sodipodi:nodetypes="cc" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
-  <path d="m 285.43186,303.99208 -35.23824,72.23839" id="path3783" sodipodi:nodetypes="cc" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
-  <path d="m 329.55523,332.03152 -43.16684,44.0478" id="path3785" sodipodi:nodetypes="cc" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
-  <path id="path3787" d="m 159.34959,300.90874 30.39298,75.32173" sodipodi:nodetypes="cc" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
-  <path id="path3789" d="m 110.82144,333.35295 42.72636,42.72637" sodipodi:nodetypes="cc" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
- </g>
- <g transform="matrix(0.74835908,0,0,0.74835908,247.4084,-55.36559)" id="g3791" stroke="#87b987" stroke-opacity=".733">
-  <path sodipodi:nodetypes="cc" id="path3793" d="m 219.43574,376.07932 0.44048,-111.44093" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
-  <path sodipodi:nodetypes="cc" id="path3795" d="m 285.43186,303.99208 -35.23824,72.23839" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
-  <path sodipodi:nodetypes="cc" id="path3797" d="m 329.55523,332.03152 -43.16684,44.0478" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
-  <path sodipodi:nodetypes="cc" d="m 159.34959,300.90874 30.39298,75.32173" id="path3799" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
-  <path sodipodi:nodetypes="cc" d="m 110.82144,333.35295 42.72636,42.72637" id="path3801" fill="none" stroke-linejoin="round" stroke-linecap="round" stroke-width="15.573" stroke-opacity=".733"/>
- </g>
- <path id="path3803" d="m 346.41953,394.74639 169.65214,0" fill="none" stroke="#87b987" stroke-linejoin="round" stroke-linecap="round" stroke-width="12" stroke-opacity=".733"/>
-</svg>
--- a/icons/map/mapsforge/patterns/swamp.svg
+++ b/icons/map/mapsforge/patterns/swamp.svg
@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <metadata id="metadata10"/>
- <path inkscape:connector-curvature="0" d="m 181.73921,194.70571 c -0.36208,-47.80432 1.03597,-56.4901 0.0356,-77.88187 -0.70547,-15.15612 -3.35673,-41.490921 0.14412,-39.682489 13.97763,7.21985 27.08725,184.465759 5.24773,184.465759 -7.57632,0 -9.08557,-18.58927 -5.43179,-66.9014 l 0.004,0 1e-5,0 z" id="path3683" sodipodi:nodetypes="csssccc" fill="#60b8ff"/>
- <path inkscape:connector-curvature="0" sodipodi:nodetypes="csssscccsssc" id="path3685" d="m 268.61521,245.51493 c 0,-8.85071 1.81377,-23.3155 7.5572,-39.2584 7.32509,-20.33329 22.5433,-25.46652 6.40886,-19.27518 -6.99753,2.68517 -18.97163,16.77542 -24.20646,31.79213 -11.82358,33.917 -9.98259,42.83363 1.34396,42.83363 4.89294,0 8.89626,-7.24146 8.89626,-16.09218 l 1.8e-4,0 z m -35.58505,-10.01745 c 0,-34.3596 8.12745,-55.66267 18.25122,-84.10944 10.42588,-29.29575 34.4997,-50.04067 11.69084,-31.16476 -33.48633,27.71221 -64.71212,141.38383 -38.83832,141.38383 4.89295,0 8.89626,-11.74929 8.89626,-26.10963 z" fill="#60b8ff"/>
- <path inkscape:connector-curvature="0" d="m 278.32812,317.3576 c -11.73052,0.48378 -23.69834,0.39217 -35.19543,2.76424 -2.88537,1.6697 -1.19132,6.25193 2.00331,6.17633 17.49808,4.03041 35.74826,2.75786 53.61207,2.74633 7.66155,-0.34655 15.65922,-0.50312 22.85408,-3.1995 2.85708,-1.90147 0.91299,-6.4662 -2.37491,-6.24875 -13.37358,-2.92705 -27.26954,-2.38486 -40.89912,-2.23865 z" id="path3687" fill="#60b8ff"/>
- <path inkscape:connector-curvature="0" d="m 101.122,245.51493 c 0,-8.85071 -1.813771,-23.3155 -7.557198,-39.2584 -7.32509,-20.33329 -22.543301,-25.46652 -6.408863,-19.27518 6.99753,2.68517 18.971631,16.77542 24.206461,31.79213 11.82357,33.917 9.98258,42.83363 -1.34396,42.83363 -4.89294,0 -8.89626,-7.24146 -8.89626,-16.09218 l -1.8e-4,0 z m 35.58505,-10.01745 c 0,-34.3596 -8.12745,-55.66267 -18.25122,-84.10944 -10.42588,-29.29575 -34.499697,-50.04067 -11.69084,-31.16476 33.48632,27.71221 64.71211,141.38383 38.83832,141.38383 -4.89295,0 -8.89626,-11.74929 -8.89626,-26.10963 z" id="path3689" sodipodi:nodetypes="csssscccsssc" fill="#60b8ff"/>
- <path inkscape:connector-curvature="0" d="m 223.76353,283.99202 c -28.7682,0.42228 -57.64822,0.51219 -86.31446,2.60851 -2.70507,0.43595 -4.05156,4.4494 -1.09012,5.58689 14.32727,3.21782 29.2919,2.53438 43.93539,3.29402 40.22877,0.85238 80.55721,1.25187 120.71225,-1.60044 2.83845,-0.56816 8.41438,-0.63035 7.80607,-4.71089 -1.96973,-3.87654 -7.56813,-2.5836 -11.0959,-3.34824 -24.59864,-1.90498 -49.29685,-1.88353 -73.95323,-1.82985 z" id="path3713" fill="#60b8ff"/>
-</svg>
--- a/icons/map/mapsforge/patterns/wood-coniferous.png
+++ b/icons/map/mapsforge/patterns/wood-coniferous.png
--- a/icons/map/mapsforge/patterns/wood-deciduous.png
+++ b/icons/map/mapsforge/patterns/wood-deciduous.png
--- a/icons/map/mapsforge/patterns/wood-mixed.png
+++ b/icons/map/mapsforge/patterns/wood-mixed.png
--- a/icons/map/mapsforge/symbols/accommodation/alpinehut.svg
+++ b/icons/map/mapsforge/symbols/accommodation/alpinehut.svg
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <path id="path4143" d="m 39.8,167 c -6.9,3.6 -8.1,12.7 -2.7,18 18.4,25.6 22,21.5 47,11.3 l 0,274 c 0,6.3 5.1,11.5 11.5,11.5 l 30.6,0 c 6.3,0 11.5,-5.2 11.5,-11.5 0,-105 -0.2,-177 -0.2,-295 l 8.1,-3.1 144,-17 144,17.2 5.8,2.4 c -0.6,98 -0.3,197 -0.3,296 0,6.4 5,11.5 11.5,11.5 l 30.6,0 c 6.3,0 11.3,-5.1 11.4,-11.5 l 0,-274 c 32,13.6 26.7,13.4 50,-10.6 5.3,-5.4 3.9,-14.4 -2.7,-18 L 295,36.8 c -3.4,-1.7 -7.5,-1.8 -10.75,0.1 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4145" d="m 316.9,254.7 c 17.2,-1.3 29.6,-14 29.8,-29.8 -1.4,-17 -14.3,-29.5 -29.8,-29.7 -17.3,1.3 -29.4,13.9 -29.6,29.7 1.3,17.5 13.7,29.6 29.6,29.8 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4147" d="m 185.5,318.4 c -2.9,5 -1.8,8.8 3.1,11.5 l 14,8.4 c 5,3 8.9,1.9 11.6,-3 l 44,-76 c 3,-5 2,-8.8 -3,-11.6 -6.4,-2.3 -10.2,-6.3 -19.4,-10 -2.6,0 -4.8,1.6 -6.35,4.75 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4149" d="m 223.5,345.2 c -2.5,4.4 -3.8,9.9 -3.5,16.4 l 1.4,89 -30.6,66 c -8.2,26.5 24.3,39 34.5,19.5 l 33.5,-71.8 c 1.2,-2.6 1.8,-5.5 1.8,-8.3 l -0.5,-54 34,46 10,81 c 10.4,23 42,15.6 39,-6.8 l -11.8,-93 c -1.2,-6.9 -5.3,-11 -9.1,-16.4 l -30,-42 29,-51 14.6,18.6 c 1.2,1.8 2.9,3 5.4,3.9 l 29,14.2 0,171 c 1.3,13.6 12.3,13 12.3,0 l 0,-170 c 14.2,-8.1 12.7,-25 -0.3,-29.8 L 357,313 321,269 c -5.1,-6 -12,-9.5 -24.4,-11.4 -16,-0.5 -26,5.3 -33.1,17.3 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 39.8,167 c -6.9,3.6 -8.1,12.7 -2.7,18 18.4,25.6 22,21.5 47,11.3 l 0,274 c 0,6.3 5.1,11.5 11.5,11.5 l 30.6,0 c 6.3,0 11.5,-5.2 11.5,-11.5 0,-105 -0.2,-177 -0.2,-295 l 8.1,-3.1 144,-17 144,17.2 5.8,2.4 c -0.6,98 -0.3,197 -0.3,296 0,6.4 5,11.5 11.5,11.5 l 30.6,0 c 6.3,0 11.3,-5.1 11.4,-11.5 l 0,-274 c 32,13.6 26.7,13.4 50,-10.6 5.3,-5.4 3.9,-14.4 -2.7,-18 L 295,36.8 c -3.4,-1.7 -7.5,-1.8 -10.75,0.1 z" id="path4140" fill="#0092da" fill-rule="evenodd"/>
- <path d="m 316.9,254.7 c 17.2,-1.3 29.6,-14 29.8,-29.8 -1.4,-17 -14.3,-29.5 -29.8,-29.7 -17.3,1.3 -29.4,13.9 -29.6,29.7 1.3,17.5 13.7,29.6 29.6,29.8 z" id="path4138" fill="#0092da" fill-rule="evenodd"/>
- <path d="m 185.5,318.4 c -2.9,5 -1.8,8.8 3.1,11.5 l 14,8.4 c 5,3 8.9,1.9 11.6,-3 l 44,-76 c 3,-5 2,-8.8 -3,-11.6 -6.4,-2.3 -10.2,-6.3 -19.4,-10 -2.6,0 -4.8,1.6 -6.35,4.75 z" id="path4136" fill="#0092da" fill-rule="evenodd"/>
- <path d="m 223.5,345.2 c -2.5,4.4 -3.8,9.9 -3.5,16.4 l 1.4,89 -30.6,66 c -8.2,26.5 24.3,39 34.5,19.5 l 33.5,-71.8 c 1.2,-2.6 1.8,-5.5 1.8,-8.3 l -0.5,-54 34,46 10,81 c 10.4,23 42,15.6 39,-6.8 l -11.8,-93 c -1.2,-6.9 -5.3,-11 -9.1,-16.4 l -30,-42 29,-51 14.6,18.6 c 1.2,1.8 2.9,3 5.4,3.9 l 29,14.2 0,171 c 1.3,13.6 12.3,13 12.3,0 l 0,-170 c 14.2,-8.1 12.7,-25 -0.3,-29.8 L 357,313 321,269 c -5.1,-6 -12,-9.5 -24.4,-11.4 -16,-0.5 -26,5.3 -33.1,17.3 z" id="path4142" fill="#0092da" fill-rule="evenodd"/>
-</svg>
--- a/icons/map/mapsforge/symbols/accommodation/camping.svg
+++ b/icons/map/mapsforge/symbols/accommodation/camping.svg
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <path white-space="normal" isolation="auto" mix-blend-mode="normal" id="path4136" d="m 238,69.9 35.5,69.6 C 201.85647,277.57135 133.9648,402.34008 70.8,520 l 434.2,0 0,0 1,0 C 438.24843,393.7415 371.88254,266.72481 305,140 L 340,72 317,60 290,111 261,58 Z M 378,494 202,494 c 20,-40 66,-134 88,-208 22,73 67,167 88,208 z" solid-color="#000000" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 238,69.9 35.5,69.6 C 201.85647,277.57135 133.9648,402.34008 70.8,520 l 434.2,0 0,0 1,0 C 438.24843,393.7415 371.88254,266.72481 305,140 L 340,72 317,60 290,111 261,58 Z M 378,494 202,494 c 20,-40 66,-134 88,-208 22,73 67,167 88,208 z" id="path2443" mix-blend-mode="normal" isolation="auto" white-space="normal" fill="#0092da" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
-</svg>
--- a/icons/map/mapsforge/symbols/accommodation/caravan_park.svg
+++ b/icons/map/mapsforge/symbols/accommodation/caravan_park.svg
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <path id="path4154" d="m 437.37231,250.39628 c -4.5e-4,11.35401 -5.48014,17.03089 -16.43911,17.0307 l -58.15534,0 c -10.97172,1.9e-4 -16.45739,-5.67669 -16.45704,-17.0307 l 0,-27.60765 c -3.5e-4,-10.9711 5.48532,-16.45678 16.45704,-16.45704 l 58.15534,0 c 10.95897,2.6e-4 16.43866,5.48594 16.43911,16.45704 l 0,27.60765 z m -165.64595,0.59155 c -2.7e-4,10.9596 -5.68314,16.4393 -17.04861,16.43911 l -125.70448,0 c -10.97148,1.9e-4 -16.45714,-5.47951 -16.45702,-16.43911 l 0,-28.19925 c -1.2e-4,-10.9711 5.48554,-16.45677 16.45702,-16.45704 l 125.70448,0 c 11.36547,2.7e-4 17.04834,5.48594 17.04861,16.45704 l 0,28.19925 z m 257.88062,132.17613 -42.30784,0 0,-146.85839 c -4.9e-4,-22.71928 -7.93022,-41.91018 -23.78919,-57.57271 -15.85992,-15.66197 -34.95221,-23.49309 -57.27693,-23.49341 l -274.91131,0 c -22.71965,3.2e-4 -41.910547,7.83144 -57.572716,23.49341 -15.662329,15.66253 -23.49345,34.85343 -23.493391,57.57271 l 0,103.97689 c -5.9e-5,16.44518 5.874027,30.54181 17.622287,42.28991 11.748113,11.74826 25.844727,17.62236 42.28991,17.62229 l 94.58311,0 c 1.17104,-16.83939 7.82793,-31.13322 19.97074,-42.88151 12.14234,-11.74806 26.83056,-17.62215 44.06468,-17.62228 16.83918,1.3e-4 31.42582,5.87422 43.75993,17.62228 12.33347,11.74829 18.89477,25.84492 19.6839,42.28992 l 213.81592,0 c -5.5e-4,-10.95932 -5.48025,-16.43902 -16.4391,-16.43911 l 0,0 z m -260.82065,41.10672 c -5.48595,5e-5 -10.18582,-1.95699 -14.09962,-5.8711 -3.91434,-3.91403 -5.87137,-8.61389 -5.87111,-14.09963 -2.6e-4,-5.86805 1.95677,-10.66353 5.87111,-14.38645 3.9138,-3.72277 8.61367,-5.5842 14.09962,-5.58428 5.47344,8e-5 10.17033,1.86151 14.09067,5.58428 3.91975,3.72292 5.87977,8.5184 5.88006,14.38645 -2.9e-4,5.48574 -1.96031,10.1856 -5.88006,14.09963 -3.92034,3.91411 -8.61723,5.87115 -14.09067,5.8711 l 0,0 z m 0,-66.36594 c -12.93164,1.2e-4 -23.9,4.50279 -32.9051,13.50804 -9.00558,9.00544 -13.50826,19.96782 -13.50802,32.88717 -2.4e-4,12.53704 4.50244,23.30819 13.50802,32.3135 9.0051,9.00539 19.97346,13.50805 32.9051,13.50804 12.52475,1e-5 23.29292,-4.50265 32.30455,-13.50804 9.01101,-9.00531 13.51667,-19.77646 13.51699,-32.3135 -3.2e-4,-12.91935 -4.50598,-23.88173 -13.51699,-32.88717 -9.01163,-9.00525 -19.7798,-13.50792 -32.30455,-13.50804 l 0,0 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 437.37231,250.39628 c -4.5e-4,11.35401 -5.48014,17.03089 -16.43911,17.0307 l -58.15534,0 c -10.97172,1.9e-4 -16.45739,-5.67669 -16.45704,-17.0307 l 0,-27.60765 c -3.5e-4,-10.9711 5.48532,-16.45678 16.45704,-16.45704 l 58.15534,0 c 10.95897,2.6e-4 16.43866,5.48594 16.43911,16.45704 l 0,27.60765 z m -165.64595,0.59155 c -2.7e-4,10.9596 -5.68314,16.4393 -17.04861,16.43911 l -125.70448,0 c -10.97148,1.9e-4 -16.45714,-5.47951 -16.45702,-16.43911 l 0,-28.19925 c -1.2e-4,-10.9711 5.48554,-16.45677 16.45702,-16.45704 l 125.70448,0 c 11.36547,2.7e-4 17.04834,5.48594 17.04861,16.45704 l 0,28.19925 z m 257.88062,132.17613 -42.30784,0 0,-146.85839 c -4.9e-4,-22.71928 -7.93022,-41.91018 -23.78919,-57.57271 -15.85992,-15.66197 -34.95221,-23.49309 -57.27693,-23.49341 l -274.91131,0 c -22.71965,3.2e-4 -41.910547,7.83144 -57.572716,23.49341 -15.662329,15.66253 -23.49345,34.85343 -23.493391,57.57271 l 0,103.97689 c -5.9e-5,16.44518 5.874027,30.54181 17.622287,42.28991 11.748113,11.74826 25.844727,17.62236 42.28991,17.62229 l 94.58311,0 c 1.17104,-16.83939 7.82793,-31.13322 19.97074,-42.88151 12.14234,-11.74806 26.83056,-17.62215 44.06468,-17.62228 16.83918,1.3e-4 31.42582,5.87422 43.75993,17.62228 12.33347,11.74829 18.89477,25.84492 19.6839,42.28992 l 213.81592,0 c -5.5e-4,-10.95932 -5.48025,-16.43902 -16.4391,-16.43911 l 0,0 z m -260.82065,41.10672 c -5.48595,5e-5 -10.18582,-1.95699 -14.09962,-5.8711 -3.91434,-3.91403 -5.87137,-8.61389 -5.87111,-14.09963 -2.6e-4,-5.86805 1.95677,-10.66353 5.87111,-14.38645 3.9138,-3.72277 8.61367,-5.5842 14.09962,-5.58428 5.47344,8e-5 10.17033,1.86151 14.09067,5.58428 3.91975,3.72292 5.87977,8.5184 5.88006,14.38645 -2.9e-4,5.48574 -1.96031,10.1856 -5.88006,14.09963 -3.92034,3.91411 -8.61723,5.87115 -14.09067,5.8711 l 0,0 z m 0,-66.36594 c -12.93164,1.2e-4 -23.9,4.50279 -32.9051,13.50804 -9.00558,9.00544 -13.50826,19.96782 -13.50802,32.88717 -2.4e-4,12.53704 4.50244,23.30819 13.50802,32.3135 9.0051,9.00539 19.97346,13.50805 32.9051,13.50804 12.52475,1e-5 23.29292,-4.50265 32.30455,-13.50804 9.01101,-9.00531 13.51667,-19.77646 13.51699,-32.3135 -3.2e-4,-12.91935 -4.50598,-23.88173 -13.51699,-32.88717 -9.01163,-9.00525 -19.7798,-13.50792 -32.30455,-13.50804 l 0,0 z" id="flowRoot3192" fill="#0092da"/>
-</svg>
--- a/icons/map/mapsforge/symbols/accommodation/chalet.svg
+++ b/icons/map/mapsforge/symbols/accommodation/chalet.svg
@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <defs id="defs4">
-  <symbol viewBox="244.5 110 489 219.9" id="symbol-university">
-   <path id="path4460" d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z"/>
-   <path id="path4462" d="M94,176l-21,39" stroke-width="20" stroke="#000000" fill="none"/>
-   <path id="path4464" d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z"/>
-   <path id="path4466" d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24" stroke-width="20" stroke="#000000" ill="none"/>
-  </symbol>
- </defs>
- <g id="g8101">
-  <path id="path8105" d="M 184.57,66.176 22.128,206.55 l 32.488,0 0,210.57 97.464,0 0,-107.01 67.21,0 0,107.01 95.24,0 0,-210.57 32.48,0 -162.44,-140.374 0,0 0,0 z m 215.05,114.724 -7.38,15.7 -5.95,12.61 C 365.63,253 344.9,296.77 324.13,340.5 c -9.95,-13.67 -19.9,-27.32 -29.95,-40.92 l -7.18,-9.75 -6.36,10.26 C 241.5,362.73 202.75,425.6 163.4,488 l -7.79,12.41 14.67,0.1 c 122.88,1.05 245.76,2.02 368.63,3.08 l 13.13,0.1 -5.64,-11.79 C 500.09,393.37 453.52,295 407.01,196.6 l -7.39,-15.7 z m 0,138.99 c 2.49,0 4.94,1.21 6.46,3.18 7.34,9.24 14.49,16.8 17.34,17.95 1.42,0.57 1.08,0.66 2.56,-0.31 1.49,-0.97 4.49,-4.12 7.8,-10.57 1.39,-2.68 4.36,-4.45 7.38,-4.41 3.03,0 5.97,1.9 7.29,4.62 l 66.87,141.55 c 2.44,5.01 -1.92,11.87 -7.49,11.79 l -302.17,-2.56 c -2.88,-0 -5.69,-1.68 -7.08,-4.21 -1.38,-2.53 -1.3,-5.85 0.21,-8.31 l 59.49,-95.49 c 2.58,-4.16 9.22,-4.97 12.72,-1.54 5.3,5.26 9.89,8.04 15.38,8.41 5.5,0.37 13.19,-1.68 24.52,-10.05 3.47,-2.62 9.04,-1.78 11.59,1.75 l 5.23,7.18 21.54,-45.55 c 1.26,-2.75 4.15,-4.71 7.18,-4.82 3.03,-0.1 6.04,1.65 7.49,4.31 2.13,3.87 4.25,6.03 5.84,6.98 1.6,0.95 2.62,1.12 4.52,0.71 3.78,-0.8 11.09,-5.99 18.67,-17.02 1.47,-2.17 4.04,-3.55 6.66,-3.59 z" opacity="0.8" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-width="40"/>
- </g>
- <path inkscape:connector-curvature="0" id="path5240-1" d="m 393.67597,212.73143 c -22.60621,47.92953 -45.25319,95.83979 -68.00405,143.70085 -12.60271,-17.39413 -25.2881,-34.72804 -38.05354,-52.00309 -39.11955,62.61111 -77.85915,125.45937 -117.23774,187.90861 122.87897,1.04217 245.7585,2.01795 368.6373,3.0771 -46.30032,-98.51045 -92.87536,-196.89159 -139.3929,-295.2996 -1.98304,4.20537 -3.96604,8.41075 -5.94907,12.61613 z" fill="#ffffff"/>
- <path inkscape:connector-curvature="0" id="path5240" d="m 393.67597,212.73143 c -22.60621,47.92953 -45.25319,95.83979 -68.00405,143.70085 -12.60271,-17.39413 -25.2881,-34.72804 -38.05354,-52.00309 -39.11955,62.61111 -77.85915,125.45937 -117.23774,187.90861 122.87897,1.04217 245.7585,2.01795 368.6373,3.0771 -46.30032,-98.51045 -92.87536,-196.89159 -139.3929,-295.2996 -1.98304,4.20537 -3.96604,8.41075 -5.94907,12.61613 z" opacity="0.25" fill="#0092da" stroke="#0092da"/>
- <g id="g8092">
-  <path fill="#0092da" stroke-width="5" color="#000000" opacity="0.5" id="path3744" d="m 399.62231,180.90483 -7.38505,15.69324 -5.94907,12.61614 c -20.6536,43.7896 -41.39031,87.56068 -62.15754,131.28985 -9.94882,-13.67275 -19.90161,-27.32667 -29.9505,-40.92551 l -7.17992,-9.74416 -6.35935,10.25702 c -39.13714,62.63924 -77.88892,125.5066 -117.23774,187.9086 l -7.79533,12.411 14.66754,0.1024 c 122.88192,1.04221 245.7622,2.01799 368.6373,3.07711 l 13.12898,0.1024 -5.64136,-11.79557 C 500.09345,393.37373 453.52353,295.0032 407.00737,196.59807 l -7.38506,-15.69324 z m 0,138.98262 c 2.48519,0.007 4.93962,1.21532 6.46193,3.17968 7.33939,9.24471 14.48281,16.80271 17.33436,17.94978 1.42578,0.57371 1.07763,0.66578 2.56426,-0.30754 1.48662,-0.97348 4.4883,-4.11961 7.79533,-10.56473 1.39433,-2.68386 4.36089,-4.45286 7.38505,-4.41052 3.02414,0.0423 5.96375,1.89386 7.28249,4.61566 l 66.87577,141.54687 c 2.43717,5.01006 -1.91673,11.86877 -7.48763,11.79558 l -302.1718,-2.56442 c -2.8853,-0.0397 -5.68833,-1.67615 -7.07735,-4.20538 -1.38888,-2.52923 -1.30961,-5.85218 0.20514,-8.30819 l 59.49072,-95.49285 c 2.58116,-4.16468 9.21894,-4.96762 12.7187,-1.53856 5.3028,5.25747 9.89394,8.04016 15.38553,8.41076 5.4916,0.3706 13.18531,-1.68658 24.51428,-10.05188 3.47449,-2.61976 9.04052,-1.78239 11.59043,1.74369 l 5.23108,7.17992 21.53975,-45.54117 c 1.25972,-2.75269 4.15453,-4.71511 7.17991,-4.8208 3.02538,-0.10569 6.03871,1.64999 7.48762,4.30795 2.13163,3.86819 4.25504,6.02391 5.84651,6.97477 1.59146,0.95071 2.61975,1.12066 4.51308,0.71799 3.78667,-0.80533 11.08861,-5.99482 18.66778,-17.02665 1.47553,-2.16917 4.04389,-3.55221 6.66706,-3.58996 z" inkscape:connector-curvature="0"/>
-  <path stroke-width="0.852" fill-rule="evenodd" fill="#0092da" sodipodi:nodetypes="ccccccccccccc" id="path645" d="M 184.57113,66.176498 22.127529,206.5523 l 32.488502,0 0,210.56359 97.466389,0 0,-107.00635 67.20514,0 2.2e-4,107.00635 95.23845,0 0,-210.56359 32.4887,0 -162.4438,-140.375802 0,0 0,0 z"/>
- </g>
-</svg>
--- a/icons/map/mapsforge/symbols/accommodation/hostel.svg
+++ b/icons/map/mapsforge/symbols/accommodation/hostel.svg
@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <path id="path4151" d="M 56.699219 35 C 38.699219 35.5 38.8 55 39.5 68 C 38.7 223 37.000781 377 36.800781 531 C 41.000781 555 73.000781 543 70.800781 522 L 71 494 L 506 497 C 507 511 502 531 519 535 C 538 539 542 518 540 504 C 541 385 543 266 543 147 C 539 123 503 134 509 156 L 508 237 L 73 234 C 73 172 74 111 74 49 C 72.8 41 64.899219 34.8 56.699219 35 z M 72 267 L 508 269 L 506 461 L 71 459 L 72 267 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4153" d="m 143,144 c 18,34 73,31 88,-4 7,-38 -8,-66 -48,-67.1 C 149,73 125,114 143,144 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4155" d="m 235,204 c 16,19 42,11 63,13 44,-1 89,1 133,-1 28,-4 34,-62 -3,-66 -55.66676,-0.3014 -111.33294,-3 -167,-3 -28,0 -45,37 -26,57 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4157" d="m 134,178 c -26,-1 -20,41 4,35 l 69,0 c 23,-5 15,-36 6,-36 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4159" d="m 138,368 c 18,34 73,31 88,-4 7,-38 -8,-66 -48,-67 -34,0 -58,41 -40,71 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4161" d="m 256,444 c 44,0 127,0 171,-2 46,-7 37,-68 -6,-69 l -163,0 c -53,8 -37,69 -2,71 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4163" d="m 130,404 c -22,-1 -23,36 5,35 23,0 46,1 69,0 23,-5 16,-36 -7,-35 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="M 56.699219 35 C 38.699219 35.5 38.8 55 39.5 68 C 38.7 223 37.000781 377 36.800781 531 C 41.000781 555 73.000781 543 70.800781 522 L 71 494 L 506 497 C 507 511 502 531 519 535 C 538 539 542 518 540 504 C 541 385 543 266 543 147 C 539 123 503 134 509 156 L 508 237 L 73 234 C 73 172 74 111 74 49 C 72.8 41 64.899219 34.8 56.699219 35 z M 72 267 L 508 269 L 506 461 L 71 459 L 72 267 z " id="path4148" fill="#0092da"/>
- <path d="m 143,144 c 18,34 73,31 88,-4 7,-38 -8,-66 -48,-67.1 C 149,73 125,114 143,144 Z" id="path4146" fill="#0092da"/>
- <path d="m 235,204 c 16,19 42,11 63,13 44,-1 89,1 133,-1 28,-4 34,-62 -3,-66 -55.66676,-0.3014 -111.33294,-3 -167,-3 -28,0 -45,37 -26,57 z" id="path4144" fill="#0092da"/>
- <path d="m 134,178 c -26,-1 -20,41 4,35 l 69,0 c 23,-5 15,-36 6,-36 z" id="path4142" fill="#0092da"/>
- <path d="m 138,368 c 18,34 73,31 88,-4 7,-38 -8,-66 -48,-67 -34,0 -58,41 -40,71 z" id="path4138" fill="#0092da"/>
- <path d="m 256,444 c 44,0 127,0 171,-2 46,-7 37,-68 -6,-69 l -163,0 c -53,8 -37,69 -2,71 z" id="path4136" fill="#0092da"/>
- <path d="m 130,404 c -22,-1 -23,36 5,35 23,0 46,1 69,0 23,-5 16,-36 -7,-35 z" id="path4189" fill="#0092da"/>
-</svg>
--- a/icons/map/mapsforge/symbols/accommodation/hotel2.svg
+++ b/icons/map/mapsforge/symbols/accommodation/hotel2.svg
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <path id="path4142" d="M 167,138.19922 C 136.5,137.69922 109,160.6 109,192 c 0,31.4 28,55 58,55 30.5,0 58,-22.9 58,-54 0,-31.4 -28,-54.00078 -58,-54.80078 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4144" d="m 58.199219,171.59961 c -9.4,0.5 -17,8.10039 -17,16.90039 L 37.900391,426 c -0.3,9.5 7.30039,17.4 16.90039,17.5 9.5,0.1 17.398828,-7.6 17.298828,-17 l 1,-71 434.000001,2.90039 L 506,417.30078 c -0.3,9.5 7.20078,17.39961 16.80078,17.59961 9.5,0.2 17.4,-7.4 17.5,-17 l 3.09961,-155 c 0.3,-9.6 -7.4,-17.59961 -17,-17.59961 -9.5,0 -17.00117,7.6 -17.20117,17 L 508,325.19922 74,322.30078 l 1.699219,-132 c 0.285904,-11.70664 -8.981794,-19.13181 -17.5,-18.70117 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4146" d="m 257,231 c -22.5,0 -41,18.6 -41,41 0,22.4 18.6,41 41,41 l 199,0 c 22.5,0 41,-18.6 41,-41 0,-22.4 -18.6,-41 -41,-41 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4148" d="m 103,266.30078 c -11.3,0 -20.900391,9.49883 -20.900391,20.79883 C 82.099609,298.39961 91.7,308 103,308 l 86,0 c 11.3,0 20.90039,-9.50078 20.90039,-20.80078 0,-11.3 -9.60039,-20.89844 -20.90039,-20.89844 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="M 167,138.19922 C 136.5,137.69922 109,160.6 109,192 c 0,31.4 28,55 58,55 30.5,0 58,-22.9 58,-54 0,-31.4 -28,-54.00078 -58,-54.80078 z" id="path4140" fill="#0092da"/>
- <path d="m 58.199219,171.59961 c -9.4,0.5 -17,8.10039 -17,16.90039 L 37.900391,426 c -0.3,9.5 7.30039,17.4 16.90039,17.5 9.5,0.1 17.398828,-7.6 17.298828,-17 l 1,-71 434.000001,2.90039 L 506,417.30078 c -0.3,9.5 7.20078,17.39961 16.80078,17.59961 9.5,0.2 17.4,-7.4 17.5,-17 l 3.09961,-155 c 0.3,-9.6 -7.4,-17.59961 -17,-17.59961 -9.5,0 -17.00117,7.6 -17.20117,17 L 508,325.19922 74,322.30078 l 1.699219,-132 c 0.285904,-11.70664 -8.981794,-19.13181 -17.5,-18.70117 z" id="path4138" fill="#0092da"/>
- <path d="m 257,231 c -22.5,0 -41,18.6 -41,41 0,22.4 18.6,41 41,41 l 199,0 c 22.5,0 41,-18.6 41,-41 0,-22.4 -18.6,-41 -41,-41 z" id="path4136" fill="#0092da"/>
- <path d="m 103,266.30078 c -11.3,0 -20.900391,9.49883 -20.900391,20.79883 C 82.099609,298.39961 91.7,308 103,308 l 86,0 c 11.3,0 20.90039,-9.50078 20.90039,-20.80078 0,-11.3 -9.60039,-20.89844 -20.90039,-20.89844 z" id="path4151" fill="#0092da"/>
-</svg>
--- a/icons/map/mapsforge/symbols/accommodation/shelter2.svg
+++ b/icons/map/mapsforge/symbols/accommodation/shelter2.svg
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4685" d="m 354,40 c -16,16 -37,36 -50,52 -4,9 10,18 16,9 16,-16 32,-31 46,-48 3,-5 2,-14 -6,-14.1 -1,0 -3,0.1 -6,1.1 z M 228,52 c -28,26 -58,55 -81,80 -6,9 8,19 15,11 26,-26 53,-52 78,-79.2 3,-4.8 -1,-12.8 -7,-12.8 -2,0 -3,0.6 -5,1 z M 123,82 c -26,26 -57,55 -80.2,79 -5.8,9 8,19 14.9,11 C 84,146 111,120 137,93 c 3,-5 -1,-13 -8,-13 -2,0 -4,1 -6,2 z m 404,5 c -21,17 -45,40 -62,58 -6,9 8,19 15,12 19,-19 39,-38 58,-57 3,-5 -1,-14 -7,-14 -1,0 -2,0 -4,1 z m -96,14 c -17,16 -50,49 -74,74 -5,9 8,19 15,11 26,-26 53,-52 79,-79 5,-4 4,-16 -5,-15 -3,0 -9,2 -15,9 z m -169,10 c -25,23 -59,57 -82,80 -5,9 8,19 15,11 26,-26 53,-52 79,-79 3,-5 -2,-13 -8,-13 -1,0 -3,1 -4,1 z m 77,14 c -14,11 -30,27 -44,41 -4,10 10,18 16,10 13,-13 28,-25 40,-39 2,-5 -2,-13 -7,-13 -2,0 -3,0 -5,1 z m 191,36 c -21,19 -47,44 -65,63 -6,8 8,19 15,11 20,-20 41,-40 60,-60 3,-5 1,-15 -6,-15 -1,0 -3,0 -4,1 z m -102,31 -24,25 c -6,10 5,21 14,11 l 24,-27 c 4,-5 1,-14 -5,-14 -3,0 -6,1 -9,5 z m -323,-3 c -21,19 -47,43 -65.2,63 -5.8,9 8,19 14.9,11 C 75,242 97,222 117,201 c 3,-5 -1,-13 -8,-14 -1,0 -3,1 -4,2 z" solid-color="#000000" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4687" d="M 98.9,346.4 139,330 c 0.1,67 -0.3,135 0.2,202 -1.2,16 46,14.4 45,-0.3 0.3,-71 0,-143 0.1,-214 33.5,-3.8 67,-8.2 101,-11.6 l 98,11.6 c 0.1,72 -0.3,143 0.2,215 -0.2,16 45,14.4 45,-0.3 0.3,-68 0,-135 0.1,-203 15.8,5.8 31,13.6 47,18.2 12.7,-3.8 31.5,-23 13,-33.7 -67,-35 -199,-105 -202,-106 -0.9,-0.3 -1.8,0 -2.6,-0.2 -3.1,1.6 -148,76.9 -210,110.15 -9.8,15.55 18.6,31.85 24.9,28.55 z" solid-color="#000000" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 354,40 c -16,16 -37,36 -50,52 -4,9 10,18 16,9 16,-16 32,-31 46,-48 3,-5 2,-14 -6,-14.1 -1,0 -3,0.1 -6,1.1 z M 228,52 c -28,26 -58,55 -81,80 -6,9 8,19 15,11 26,-26 53,-52 78,-79.2 3,-4.8 -1,-12.8 -7,-12.8 -2,0 -3,0.6 -5,1 z M 123,82 c -26,26 -57,55 -80.2,79 -5.8,9 8,19 14.9,11 C 84,146 111,120 137,93 c 3,-5 -1,-13 -8,-13 -2,0 -4,1 -6,2 z m 404,5 c -21,17 -45,40 -62,58 -6,9 8,19 15,12 19,-19 39,-38 58,-57 3,-5 -1,-14 -7,-14 -1,0 -2,0 -4,1 z m -96,14 c -17,16 -50,49 -74,74 -5,9 8,19 15,11 26,-26 53,-52 79,-79 5,-4 4,-16 -5,-15 -3,0 -9,2 -15,9 z m -169,10 c -25,23 -59,57 -82,80 -5,9 8,19 15,11 26,-26 53,-52 79,-79 3,-5 -2,-13 -8,-13 -1,0 -3,1 -4,1 z m 77,14 c -14,11 -30,27 -44,41 -4,10 10,18 16,10 13,-13 28,-25 40,-39 2,-5 -2,-13 -7,-13 -2,0 -3,0 -5,1 z m 191,36 c -21,19 -47,44 -65,63 -6,8 8,19 15,11 20,-20 41,-40 60,-60 3,-5 1,-15 -6,-15 -1,0 -3,0 -4,1 z m -102,31 -24,25 c -6,10 5,21 14,11 l 24,-27 c 4,-5 1,-14 -5,-14 -3,0 -6,1 -9,5 z m -323,-3 c -21,19 -47,43 -65.2,63 -5.8,9 8,19 14.9,11 C 75,242 97,222 117,201 c 3,-5 -1,-13 -8,-14 -1,0 -3,1 -4,2 z" id="path4160" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
- <path d="M 98.9,346.4 139,330 c 0.1,67 -0.3,135 0.2,202 -1.2,16 46,14.4 45,-0.3 0.3,-71 0,-143 0.1,-214 33.5,-3.8 67,-8.2 101,-11.6 l 98,11.6 c 0.1,72 -0.3,143 0.2,215 -0.2,16 45,14.4 45,-0.3 0.3,-68 0,-135 0.1,-203 15.8,5.8 31,13.6 47,18.2 12.7,-3.8 31.5,-23 13,-33.7 -67,-35 -199,-105 -202,-106 -0.9,-0.3 -1.8,0 -2.6,-0.2 -3.1,1.6 -148,76.9 -210,110.15 -9.8,15.55 18.6,31.85 24.9,28.55 z" id="path15803" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
-</svg>
--- a/icons/map/mapsforge/symbols/amenity/firestation3.svg
+++ b/icons/map/mapsforge/symbols/amenity/firestation3.svg
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata1976"/>
- <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4141" d="m 265,52.1 c -25,9.7 -46,29.8 -74,32 -20.4,0 -72.9,0 -47,32.6 12.7,9.8 24,38.5 39.7,39 l -20.8,17.8 c -12,-18.5 -29.7,-43 -53,-47.9 -4.5,-0.6 -9.7,2.1 -11.4,6.4 -4.4,26 -3.3,54 -19.5,77 -17.4,30 -40,64.9 -26.8,101 12.7,37.7 43.6,72 35.8,114 1.2,33 35.5,12.1 49.9,-2.5 9,-6.2 15.8,-14.8 18.4,-21.5 l 17.6,19 c -3,0.5 -6.3,2.3 -9.2,5.7 -10.7,9.5 -19.9,20.5 -30,30.5 -24.6,26 22.3,34 40.7,32.4 41.8,10.3 75,51 121,43.7 43,-5.3 79,-44 124,-37 27,2.8 24.5,-29.6 13.7,-40 -5.5,-7 -19.9,-25.7 -31,-27.9 L 418.7,412 c 5,8.4 19,18.7 24,24.5 10.3,12.2 47,24 43.6,-6.3 0.5,-25.6 9.3,-49.7 23.7,-71 16.6,-26 31.8,-58.8 18.9,-90 -12.5,-36.7 -39.6,-70 -35.6,-111 0.7,-11 -4.7,-26.3 -18.5,-23.7 -13.2,12.4 -43.1463,28.5284 -48.1463,45.5284 l -18.00947,-19.15473 c 4.9,-1 8.72829,-6.96321 13.15577,-11.17367 13.97491,-13.28991 49,-35.5 22.8,-55 C 415,94 385,92 361,74 340,60 315,46.7 290,47 c -8.4,0.1 -16.8,1.7 -25,5.1 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 265,52.1 c -25,9.7 -46,29.8 -74,32 -20.4,0 -72.9,0 -47,32.6 12.7,9.8 24,38.5 39.7,39 l -20.8,17.8 c -12,-18.5 -29.7,-43 -53,-47.9 -4.5,-0.6 -9.7,2.1 -11.4,6.4 -4.4,26 -3.3,54 -19.5,77 -17.4,30 -40,64.9 -26.8,101 12.7,37.7 43.6,72 35.8,114 1.2,33 35.5,12.1 49.9,-2.5 9,-6.2 15.8,-14.8 18.4,-21.5 l 17.6,19 c -3,0.5 -6.3,2.3 -9.2,5.7 -10.7,9.5 -19.9,20.5 -30,30.5 -24.6,26 22.3,34 40.7,32.4 41.8,10.3 75,51 121,43.7 43,-5.3 79,-44 124,-37 27,2.8 24.5,-29.6 13.7,-40 -5.5,-7 -19.9,-25.7 -31,-27.9 L 418.7,412 c 5,8.4 19,18.7 24,24.5 10.3,12.2 47,24 43.6,-6.3 0.5,-25.6 9.3,-49.7 23.7,-71 16.6,-26 31.8,-58.8 18.9,-90 -12.5,-36.7 -39.6,-70 -35.6,-111 0.7,-11 -4.7,-26.3 -18.5,-23.7 -13.2,12.4 -43.1463,28.5284 -48.1463,45.5284 l -18.00947,-19.15473 c 4.9,-1 8.72829,-6.96321 13.15577,-11.17367 13.97491,-13.28991 49,-35.5 22.8,-55 C 415,94 385,92 361,74 340,60 315,46.7 290,47 c -8.4,0.1 -16.8,1.7 -25,5.1 z" id="path3575" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
- <path d="M 295,63.900391 C 273,64.000391 251,74 233,87 c -22,17 -54,13 -76,18 6,19 34,27 33,49 -3,2 -4.49023,1.87305 -6.49023,1.87305 l -20.61915,17.61718 C 137.7476,196.40419 127.964,143.37781 111,149 c 3,36 -20,67 -36,97 -14,22 -15.2,50 -3,74 11,28 35,54 31,86 -1,33 25,-4 36,-11 16,-9 21.16992,-4.08008 17.16992,4.91992 l 17.64063,19.08985 C 183.81055,417.00977 190,429 176,438 c -11,9 -44,38 -10,33 48,2 81,53 131,44 42,-7 77,-44 121,-36 15,-14 -24,-28 -27,-45 2,-6 7.5293,-8.63672 12.5293,-7.63672 l 15.38086,-14.49023 C 415.91016,406.87305 415,402 427,400 c 16,6 33,43 43,25 -3,-37 23,-66 38,-97 17,-29 4,-63 -11,-90 -13,-23 -23,-49 -20,-75 -16,-15 -29,34 -50,27 -1,-4 -1,-7 0,-10 l -18,-19 c -10,2 -16.82475,-5.14106 -7,-16 9.82475,-10.85894 38,-27 26,-36 C 391,113 359,91 328,74 318,67 307,64.000391 295,63.900391 Z M 278.90234,79.193359 C 290.19809,174.26445 347.61717,152.61478 327.84961,250.50977 301.49286,186.5015 252.5456,187.44263 278.90234,79.193359 Z m -25.88672,71.539061 c 11.57815,76.24514 58.36163,80.95137 80.95313,150.60742 9.97791,-32.56891 30.78141,-43.30032 20.61523,-124.25195 102.60306,139.3121 43.95969,189.20105 23.53321,239.08984 l 6.58789,-69.65625 c -32.00463,92.24721 -57.42032,110.13129 -80.95313,130.83985 12.99011,-43.29971 17.88529,-86.59884 -8.2832,-130.83985 -6.40092,71.44452 -24.47379,56.47731 -28.05078,113.89649 -35.76987,-27.20351 -43.29949,-55.53645 -49.88867,-100.71875 -4.89483,5.3654 -13.17926,27.67436 -12.80274,52.71289 l -0.1875,0 c -26.26261,-14.77838 -42.26597,-48.94736 -30.12304,-100.71875 8.28355,-36.3341 32.47549,-80.9516 13.93164,-118.60352 22.49736,15.53142 45.84104,52.43136 69.65625,94.13086 1.60023,-45.08817 -21.64952,-74.36261 -4.98829,-136.48828 z" id="path6053" opacity="0.9" fill="#ffffff" fill-rule="evenodd"/>
-</svg>
--- a/icons/map/mapsforge/symbols/amenity/fountain2.svg
+++ b/icons/map/mapsforge/symbols/amenity/fountain2.svg
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <path id="path4137" d="m 256,65.6 c -2.1,-4.9 -3.4,-10 -8.8,-12.7 -40,-5.9 -48,104 -51,141 10.2,-33.6 39.6,-163 50.7,-111 -5.4,14 -14.8,50 -9.5,101 4.9,-26.4 7.1,-53.8 14.7,-80 10.8,58.9 17,123 20.4,175 -5.4,-22.5 -8.4,-53.7 -22.4,-65 -6.3,-3.8 -18,3.9 -21,8 -8.9,-7.6 -17.2,-13.4 -31.4,-7.2 -7.8,-2.4 -16.2,-4.3 -23.6,-1.9 C 78,206 45,393 34,466 69,369 83,286 141,237 102,308 96,343 77,463 c 37,-96 49,-221 101,-229 -39,62 -51.8,164 -54.6,234 21,-78 30,-171 71.8,-226 7.9,6.1 14.6,13.6 20.5,21.8 -12.3,67 -21,135 -20.8,203 15,-62 18.2,-125 30.7,-187 29.7,67 36,137 47,194 -76,-5.4 -140,43 -209,40.8 0.8,6 -3.9,14 6.5,14 l 439,0 c 10.4,0.1 5.7,-8 6.5,-14 -68,2.3 -133,-46 -209,-40.8 11.3,-57 17.7,-128 47,-194 12.5,62 15.6,126 30.7,187 0.2,-68 -8.5,-136 -20.8,-203 5.9,-8.2 12.6,-15.7 20.5,-21.8 41.5,56 50.6,148 71.8,226 -2.8,-69.9 -15.4,-172 -54.6,-234 51,8.1 64,133 101,230 -19,-120 -25,-155 -64,-227 58,48.8 71.8,132 107,229 -10.9,-73 -43,-259 -140,-252 -7.4,-2.3 -15.8,-0.5 -23.6,1.9 -14.2,-6.2 -22.4,-0.4 -31.4,7.2 -3,-4.2 -14.9,-11.8 -21,-8 -14,11.3 -17,42.6 -22.4,65 3.3,-52 9.6,-116 20.4,-175 7.5,25.8 9.8,53 14.7,80 5.3,-51 -4.1,-87 -9.5,-101 11.2,-52 40.5,78 50.7,111 -2.9,-37.6 -10.8,-147 -51,-141 -5.4,2.7 -6.8,7.8 -8.9,12.7 -2.3,-5.5 -4.6,-13 -12,-13.7 C 302,54 295,69 290,92 285,69 278,54 268,51.9 c -7.5,0.7 -9.8,8.2 -12,13.7 z M 279,188 C 281,175 257,81 262.9,81.85 271,80.9 279,170 279,188 Z m 22,0 c 0,-18 8,-107.1 16,-106 4,-1 -12,75 -16,106 z m -57,44 c 16.9,22 22.7,74 25.7,101 -9.9,-34 -15.9,-66.8 -29.9,-97 1.16391,-1.46884 3.28268,-3.46903 4.2,-4 z m 97.2,3.4 c -14,30.6 -20,63 -29.9,97 3,-26 8.8,-79 25.7,-100.7 1.5,0.3 2.9,1.6 4.2,3.7 z m -89.3,63.9 c -6.4,-17.4 -11.2,-33.6 -18.8,-48 0.2,-1.1 0.6,-1.6 0.95,-1.65 C 238,249.1 250,291.6 251.9,299.3 Z m 97.2,-48 c -7.6,14.5 -12.4,30.7 -18.8,48 1.9,-7.4 13.9,-50 17.85,-49.7 0.35,0.2 0.65,0.7 0.95,1.7 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 256,65.6 c -2.1,-4.9 -3.4,-10 -8.8,-12.7 -40,-5.9 -48,104 -51,141 10.2,-33.6 39.6,-163 50.7,-111 -5.4,14 -14.8,50 -9.5,101 4.9,-26.4 7.1,-53.8 14.7,-80 10.8,58.9 17,123 20.4,175 -5.4,-22.5 -8.4,-53.7 -22.4,-65 -6.3,-3.8 -18,3.9 -21,8 -8.9,-7.6 -17.2,-13.4 -31.4,-7.2 -7.8,-2.4 -16.2,-4.3 -23.6,-1.9 C 78,206 45,393 34,466 69,369 83,286 141,237 102,308 96,343 77,463 c 37,-96 49,-221 101,-229 -39,62 -51.8,164 -54.6,234 21,-78 30,-171 71.8,-226 7.9,6.1 14.6,13.6 20.5,21.8 -12.3,67 -21,135 -20.8,203 15,-62 18.2,-125 30.7,-187 29.7,67 36,137 47,194 -76,-5.4 -140,43 -209,40.8 0.8,6 -3.9,14 6.5,14 l 439,0 c 10.4,0.1 5.7,-8 6.5,-14 -68,2.3 -133,-46 -209,-40.8 11.3,-57 17.7,-128 47,-194 12.5,62 15.6,126 30.7,187 0.2,-68 -8.5,-136 -20.8,-203 5.9,-8.2 12.6,-15.7 20.5,-21.8 41.5,56 50.6,148 71.8,226 -2.8,-69.9 -15.4,-172 -54.6,-234 51,8.1 64,133 101,230 -19,-120 -25,-155 -64,-227 58,48.8 71.8,132 107,229 -10.9,-73 -43,-259 -140,-252 -7.4,-2.3 -15.8,-0.5 -23.6,1.9 -14.2,-6.2 -22.4,-0.4 -31.4,7.2 -3,-4.2 -14.9,-11.8 -21,-8 -14,11.3 -17,42.6 -22.4,65 3.3,-52 9.6,-116 20.4,-175 7.5,25.8 9.8,53 14.7,80 5.3,-51 -4.1,-87 -9.5,-101 11.2,-52 40.5,78 50.7,111 -2.9,-37.6 -10.8,-147 -51,-141 -5.4,2.7 -6.8,7.8 -8.9,12.7 -2.3,-5.5 -4.6,-13 -12,-13.7 C 302,54 295,69 290,92 285,69 278,54 268,51.9 c -7.5,0.7 -9.8,8.2 -12,13.7 z M 279,188 C 281,175 257,81 262.9,81.85 271,80.9 279,170 279,188 Z m 22,0 c 0,-18 8,-107.1 16,-106 4,-1 -12,75 -16,106 z m -57,44 c 16.9,22 22.7,74 25.7,101 -9.9,-34 -15.9,-66.8 -29.9,-97 1.16391,-1.46884 3.28268,-3.46903 4.2,-4 z m 97.2,3.4 c -14,30.6 -20,63 -29.9,97 3,-26 8.8,-79 25.7,-100.7 1.5,0.3 2.9,1.6 4.2,3.7 z m -89.3,63.9 c -6.4,-17.4 -11.2,-33.6 -18.8,-48 0.2,-1.1 0.6,-1.6 0.95,-1.65 C 238,249.1 250,291.6 251.9,299.3 Z m 97.2,-48 c -7.6,14.5 -12.4,30.7 -18.8,48 1.9,-7.4 13.9,-50 17.85,-49.7 0.35,0.2 0.65,0.7 0.95,1.7 z" id="path4151" fill="#734a08"/>
-</svg>
--- a/icons/map/mapsforge/symbols/amenity/library.svg
+++ b/icons/map/mapsforge/symbols/amenity/library.svg
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4139" d="m 56,287 c 75,86 152,171 228,257 13.7,4.7 7.2,-16 8.5,-24.3 L 292,444 c -9,-14.6 -22.7,-26.4 -33.5,-39.9 0,0 -190,-218 -193,-219 -11.3,-4.9 -8.9,20.3 -9.25,24.85 C 55.9,235 55,261 56,287 Z M 70,157 c -4.9,5 9,15.9 15,23 l 214,243 c 9.5,3.4 18,-7.5 26.9,-10.8 L 524,298 c 6.6,-8.9 -6.2,-16.7 -12.4,-23.4 L 302,32.7 C 300.8,31.5 300,30.6 298,31 219,75.8 143,114 70,157 Z" solid-color="#000000" color-interpolation-filters="linearRGB" opacity="0.8" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4141" d="m 309,522 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -4.6,-18.4 C 448.78613,440.70065 370.7288,485.36996 309,522 Z m 0.4,-40.3 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -5.05,-17.85 -72.01734,39.87078 -148.55451,85.78517 -210.75,121.85 z m 0,-40 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -4.8,-18 -6.4,2 -149,86 -211,122 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 56,287 c 75,86 152,171 228,257 13.7,4.7 7.2,-16 8.5,-24.3 L 292,444 c -9,-14.6 -22.7,-26.4 -33.5,-39.9 0,0 -190,-218 -193,-219 -11.3,-4.9 -8.9,20.3 -9.25,24.85 C 55.9,235 55,261 56,287 Z M 70,157 c -4.9,5 9,15.9 15,23 l 214,243 c 9.5,3.4 18,-7.5 26.9,-10.8 L 524,298 c 6.6,-8.9 -6.2,-16.7 -12.4,-23.4 L 302,32.7 C 300.8,31.5 300,30.6 298,31 219,75.8 143,114 70,157 Z" id="path3474" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
- <path d="m 309,522 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -4.6,-18.4 C 448.78613,440.70065 370.7288,485.36996 309,522 Z m 0.4,-40.3 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -5.05,-17.85 -72.01734,39.87078 -148.55451,85.78517 -210.75,121.85 z m 0,-40 c -5.8,4.6 -4.7,17 3.8,18 6.5,-0.1 11.3,-5.4 17,-8 64.8,-38 130,-75.9 195,-114 6.1,-4.8 4.8,-18.7 -4.8,-18 -6.4,2 -149,86 -211,122 z" id="path3507" isolation="auto" white-space="normal" mix-blend-mode="normal" opacity="0.8" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" fill-rule="evenodd" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
-</svg>
--- a/icons/map/mapsforge/symbols/amenity/playground.svg
+++ b/icons/map/mapsforge/symbols/amenity/playground.svg
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata10"/>
- <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4137" d="m 129,148 c -11,18 -4,43 16,53 19,11 44,5 56,-13 10,-32 -6,-59 -36,-59 -18,-1 -30,9 -36,19 z m 311,84 0,0 c 2,22 21,39 43,39 22,0 41,-18 39,-40 -1,-22 -20,-39 -42,-39 -22,0 -41,18 -40,40 z M 57,273 c -25,-2 -25.3,28 -7,32 l 63,12 c -7,11 -49,55 -24,60 13,4 48,-39 59,-53 l 134,27 c -15,31 -30,62 -45,94 l 106,0 c -14,-30 -29,-61 -43,-91 l 121,24 c 4,15 13,87 36,72 13,1 -1,-51 -2,-66 l 69,14 c 27,3 32,-27 1,-33 -7,-21 -9,-89 -31,-93 -22,-5 -52,53 -66,74 L 157,292 C 148,265 152,200 132,197.5 112,195 76,245 57,273 Z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 129,148 c -11,18 -4,43 16,53 19,11 44,5 56,-13 10,-32 -6,-59 -36,-59 -18,-1 -30,9 -36,19 z m 311,84 0,0 c 2,22 21,39 43,39 22,0 41,-18 39,-40 -1,-22 -20,-39 -42,-39 -22,0 -41,18 -40,40 z M 57,273 c -25,-2 -25.3,28 -7,32 l 63,12 c -7,11 -49,55 -24,60 13,4 48,-39 59,-53 l 134,27 c -15,31 -30,62 -45,94 l 106,0 c -14,-30 -29,-61 -43,-91 l 121,24 c 4,15 13,87 36,72 13,1 -1,-51 -2,-66 l 69,14 c 27,3 32,-27 1,-33 -7,-21 -9,-89 -31,-93 -22,-5 -52,53 -66,74 L 157,292 C 148,265 152,200 132,197.5 112,195 76,245 57,273 Z" id="path4165" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
-</svg>
--- a/icons/map/mapsforge/symbols/amenity/police2.svg
+++ b/icons/map/mapsforge/symbols/amenity/police2.svg
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata1976"/>
- <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4140" d="m 145,51.4 c -18.8,4.5 -31,23 -46.6,34 -12.9,8.3 -23.3,22.7 -11.8,37 15,32.7 27.4,70 14.5,106 -14,43.6 -39.6,86 -31.5,134 4.9,45.9 32.7,88 73,110 45,28.7 107,51 151,72.9 24.9,-11.4 33.39752,-20.51553 62,-34 50.9,-24 110,-47.7 137,-100 23,-44 22.6,-99 -0.4,-143 -14.9,-33 -34.2205,-81.20497 -22.7205,-119.20497 C 481.40745,121.55155 502.54348,105.53602 484.2,89.3 467,74 450,57 429,45 412,48.7 398,62 380,63 340,72 308,46.7 286,35 271,38.9 261,54.8 246,59 213.5,73.7 175,68 145,51.4 Z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" fill-rule="evenodd" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 145,51.4 c -18.8,4.5 -31,23 -46.6,34 -12.9,8.3 -23.3,22.7 -11.8,37 15,32.7 27.4,70 14.5,106 -14,43.6 -39.6,86 -31.5,134 4.9,45.9 32.7,88 73,110 45,28.7 107,51 151,72.9 24.9,-11.4 33.39752,-20.51553 62,-34 50.9,-24 110,-47.7 137,-100 23,-44 22.6,-99 -0.4,-143 -14.9,-33 -34.2205,-81.20497 -22.7205,-119.20497 C 481.40745,121.55155 502.54348,105.53602 484.2,89.3 467,74 450,57 429,45 412,48.7 398,62 380,63 340,72 308,46.7 286,35 271,38.9 261,54.8 246,59 213.5,73.7 175,68 145,51.4 Z" id="path4158" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#734a08" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
- <path d="m 444.8,74.9 c 24.78695,22.245963 43.44099,26.48199 24.24099,48.16149 C 452.0795,153.9795 449.1,193.9 462.6,228.9 c 11.7,35.8 35,69 34.5,108 1.6,43.9 -19.5,88 -56,112 -45,33 -82.9441,37.53354 -151,80 C 234,493 169,482 120,436 81,397 72,334 95,285 c 36,-71 35,-101 0,-177 16,-15 32,-28.1 48,-42 43,25 102,20.6 139,-13 40.9,20 77,33.7 119,19.7 16.3,-7.6 23.49503,-20.022981 43.8,2.2 z" id="path4150" isolation="auto" white-space="normal" mix-blend-mode="normal" opacity="0.9" fill="#ffffff" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
- <path d="m 209.3,113.2 c -7.3,-5.6 -16.5,-1.6 -20.3,3.5 l -16.6,23.8 c -5.8,12.4 -3,20 7.3,25.9 l 8,24 c -5.3,7.4 -1,24.6 0.5,37 -14.8,5 -35.6,14.8 -38,30 -0.8,6.6 -2.2,14.2 0.5,19.7 18,20.2 47.9,25 74,23.7 24.7,28.5 12.4,76 -11.7,90 -8.4,4.3 -16.4,0.7 -24,2.5 -29.7,5.4 -29.5,42.6 -0.2,48 68,1.1 103,-87 80,-140 -6.3,-14 -15,-25.6 -25.4,-34.5 -2.5,-12 -14.2,-24 -24,-32.5 3.6,-16.3 -3,-44 -12.9,-50 l -8,-24.5 c 4.9,-9.4 13,-18.4 18.5,-27 l 17.9,-1.7 c 9.6,8 18.7,16 28,21.8 -1.8,13.2 -2.4,30 3.4,40.7 -4.9,91 70,122 120,107 13.9,-4.7 23.4,-8.7 31.5,-19.4 17.7,-24.8 -12.4,-50.6 -31,-35 -6.9,4.4 -10.4,12.9 -19.2,15.8 -43.8,7.7 -66,-21.5 -65.9,-56.6 23,-15.9 44,-52 38,-72 -15.9,-23.7 -32.6,-22.5 -59.7,-7.2 -7.7,-5.9 -15.6,-11.7 -23.4,-17.5 -7.3,-5.7 -15.7,-4.6 -21.8,2.7 -9,0.3 -17.2,1.2 -25.5,1.8 z m 55.9,27.8 c -5,-2 -13,-8.1 -17,-12.7 2.5,-2.5 4.8,-4.9 3.8,-8 6.7,4.9 12.5,7.9 18.25,12.05 1.95,0.65 -4.65,6.95 -5.05,8.65 z m -60.7,-8.9 c -1.5,5 -7.7,14.2 -12.2,18.6 -3.1,-2 -5.7,-3.2 -8.3,-0.7 4.1,-8.5 9,-18.6 15.35,-23.4 1.05,2.2 2.85,4.2 5.15,5.5 z m -4.1,92.8 c -2.1,-6.2 -3.2,-17.7 -1.9,-22.4 2.7,1.2 4.6,-0.2 6.2,-2.3 3.5,7.3 5.8,17.5 3.75,25.35 -2.75,-2.15 -5.25,-1.35 -8.05,-0.65 z" id="rect3389" fill="#734a08"/>
- <path d="m 189.9,396.5 c -69,-6.3 -69.9,-102 -3.1,-111 l -6,-33.5 C 63,269 86,434 187,438 Z" id="path3325" opacity="0.8" fill="#734a08"/>
- <path id="path3556" d="M 387,250 C 439,193 359.2,135 318,167 L 301,138 C 402,79 492,209 416,278.5 Z" opacity="0.8" fill="#734a08"/>
-</svg>
--- a/icons/map/mapsforge/symbols/amenity/post_box.svg
+++ b/icons/map/mapsforge/symbols/amenity/post_box.svg
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <path id="path4141" d="m 484,435 0,-292 -385,0 0,292 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 484,435 0,-292 -385,0 0,292 z" id="flowRoot3192" fill="#734a08"/>
- <path d="M 226,289 126,389 126,189 Z" id="path4156" opacity="0.9" fill="#ffffff"/>
- <path d="m 314,292 c -6.1,6.1 -13.8,9.2 -23,9.2 -9.6,0 -17.7,-3.2 -24,-9.6 l -122,-122 292,0.2 z" id="path4154" opacity="0.9" fill="#ffffff"/>
- <path d="m 356,289 100,-100 0,200 z" id="path4152" opacity="0.9" fill="#ffffff"/>
- <path d="m 244,308 4.3,4.3 c 11.6,11.3 25.6,16.9 42,16.9 16.4,0 30,-5.6 41.5,-16.9 l 4.3,-4.3 100,100 -292.55,0 z" id="path4150" opacity="0.9" fill="#ffffff"/>
-</svg>
--- a/icons/map/mapsforge/symbols/amenity/post_office.svg
+++ b/icons/map/mapsforge/symbols/amenity/post_office.svg
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <path white-space="normal" isolation="auto" mix-blend-mode="normal" id="path4144" d="M 32,290 C 32,432 148,548 290,548 432,548 548,432 548,290 548,148 432,32 290,32 148,32 32,148 32,290 Z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="M 32,290 C 32,432 148,548 290,548 432,548 548,432 548,290 548,148 432,32 290,32 148,32 32,148 32,290 Z" id="path4183" mix-blend-mode="normal" isolation="auto" white-space="normal" fill="#ac39ac" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
- <path d="M 525,290 C 525,420 420,525 290,525 160,525 55,420 55,290 55,160 160,55 290,55 420,55 525,160 525,290 Z" id="circle4177" mix-blend-mode="normal" isolation="auto" white-space="normal" opacity="0.8" fill="#ffffff" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
- <path d="M 122 163 L 122 417 L 457 417 L 457 163 L 122 163 z M 163 187 L 417 187.19922 L 310 293 C 304.7 298.3 298 301 290 301 C 281.6 301 274.59961 298.19961 269.09961 292.59961 L 163 187 z M 146 203 L 233 290 L 146 377 L 146 203 z M 434 203 L 434 377 L 347 290 L 434 203 z M 249 307 C 260.29741 318.49378 276.25955 325.22887 289.30078 325.40039 C 307.93883 323.32024 317.64861 318.35139 329 307 L 416 394 L 161 394 L 249 307 z " id="path4145" fill="#ac39ac"/>
-</svg>
--- a/icons/map/mapsforge/symbols/amenity/recycling.svg
+++ b/icons/map/mapsforge/symbols/amenity/recycling.svg
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <path id="path4146" d="m 184.2,239 -100,0 40.7,23.6 -25,43 c -4.23491,8.05447 -3.850557,17.30188 0,24.6 l 39.6,69 c 1.8,-5 3.6,-9.3 5.4,-12.9 l 49,-85 40.05,24.15 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4148" d="m 164.4,430.8 c 5.9,5.7 12.9,8.6 21,8.6 l 99,0 0,-80 -104,0 c -6.78203,11.95881 -12.71982,22.08356 -20.4,35.4 -7.18414,12.33935 -4.47208,27.18332 4.4,36 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4150" d="m 293.1,196.7 100,0 50,-87 -40.7,23.6 -25,-43 C 372,83 365,79 356,79 l -79,0 c 3.2,3.6 5.9,7.1 8,10.7 l 48.7,85 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4152" d="m 218.3,98 -49.8,86 c 18.9,11 41.9,24.3 69,39.6 16,-27.5 33.4,-57 51.9,-90 L 270,98 C 264.3,88 255.7,83 244.15,83 232.6,83 224,88 218.3,98 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4154" d="m 372.3,312.5 -49.8,87 49.8,86 0,-46.6 49.8,0 c 9.6,0 16.9,-4.1 21.9,-12.3 l 39.6,-69 c -5.4,1.4 -9.8,2.1 -13.4,2.1 l -97.95,-0.6 c 0.0935,-15.53311 0.05,-31.06668 0.05,-46.6 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4156" d="m 377.1,251.8 c 22,38 39.6,68 53,91 l 40,0 c 11.8,0 20.5,-5 26,-15 5.4,-9.6 5.2,-19.4 -0.5,-29.4 l -49.25,-86.1 c -2.05,1 -25.05,14.2 -69.25,39.5 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 184.2,239 -100,0 40.7,23.6 -25,43 c -4.23491,8.05447 -3.850557,17.30188 0,24.6 l 39.6,69 c 1.8,-5 3.6,-9.3 5.4,-12.9 l 49,-85 40.05,24.15 z" id="path4144" fill="#734a08"/>
- <path d="m 164.4,430.8 c 5.9,5.7 12.9,8.6 21,8.6 l 99,0 0,-80 -104,0 c -6.78203,11.95881 -12.71982,22.08356 -20.4,35.4 -7.18414,12.33935 -4.47208,27.18332 4.4,36 z" id="path4142" fill="#734a08"/>
- <path d="m 293.1,196.7 100,0 50,-87 -40.7,23.6 -25,-43 C 372,83 365,79 356,79 l -79,0 c 3.2,3.6 5.9,7.1 8,10.7 l 48.7,85 z" id="path4140" fill="#734a08"/>
- <path d="m 218.3,98 -49.8,86 c 18.9,11 41.9,24.3 69,39.6 16,-27.5 33.4,-57 51.9,-90 L 270,98 C 264.3,88 255.7,83 244.15,83 232.6,83 224,88 218.3,98 Z" id="path4138" fill="#734a08"/>
- <path d="m 372.3,312.5 -49.8,87 49.8,86 0,-46.6 49.8,0 c 9.6,0 16.9,-4.1 21.9,-12.3 l 39.6,-69 c -5.4,1.4 -9.8,2.1 -13.4,2.1 l -97.95,-0.6 c 0.0935,-15.53311 0.05,-31.06668 0.05,-46.6 z" id="path4136" fill="#734a08"/>
- <path d="m 377.1,251.8 c 22,38 39.6,68 53,91 l 40,0 c 11.8,0 20.5,-5 26,-15 5.4,-9.6 5.2,-19.4 -0.5,-29.4 l -49.25,-86.1 c -2.05,1 -25.05,14.2 -69.25,39.5 z" id="flowRoot3192" fill="#734a08"/>
-</svg>
--- a/icons/map/mapsforge/symbols/amenity/telephone.svg
+++ b/icons/map/mapsforge/symbols/amenity/telephone.svg
@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <path id="path4146" d="M 188,205 C 51,396 105,494 127,509 l 89,-128 c -18,-12 -8,-34 16,-77 16,-28 38,-61 64,-91 18,-21 38,-41 56,-28 L 443,54.9 C 437,51 424,47 406,48 360,47.7 281,75 188,205 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4148" d="m 362,192 40,28 c 4,3 15,1 17.5,-3 L 493,111 c 6,-8 4,-19 -4,-24 L 453,61.8 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4150" d="m 137,516 40,28 c 4,3 15,0 17.5,-4 L 266,437 c 6,-8 3,-18 -4,-24 l -36,-25 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="M 188,205 C 51,396 105,494 127,509 l 89,-128 c -18,-12 -8,-34 16,-77 16,-28 38,-61 64,-91 18,-21 38,-41 56,-28 L 443,54.9 C 437,51 424,47 406,48 360,47.7 281,75 188,205 Z" id="path4152" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 362,192 40,28 c 4,3 15,1 17.5,-3 L 493,111 c 6,-8 4,-19 -4,-24 L 453,61.8 Z" id="path4154" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 137,516 40,28 c 4,3 15,0 17.5,-4 L 266,437 c 6,-8 3,-18 -4,-24 l -36,-25 z" id="path4156" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="M 188,205 C 51,396 105,494 127,509 l 89,-128 c -18,-12 -8,-34 16,-77 16,-28 38,-61 64,-91 18,-21 38,-41 56,-28 L 443,54.9 C 437,51 424,47 406,48 360,47.7 281,75 188,205 Z" id="path4138" fill="#734a08"/>
- <path d="m 362,192 40,28 c 4,3 15,1 17.5,-3 L 493,111 c 6,-8 4,-19 -4,-24 L 453,61.8 Z" id="path4136" fill="#734a08"/>
- <path d="m 137,516 40,28 c 4,3 15,0 17.5,-4 L 266,437 c 6,-8 3,-18 -4,-24 l -36,-25 z" id="path1333" fill="#734a08"/>
- <path id="path4140" d="M 188,205 C 51,396 105,494 127,509 l 89,-128 c -18,-12 -8,-34 16,-77 16,-28 38,-61 64,-91 18,-21 38,-41 56,-28 L 443,54.9 C 437,51 424,47 406,48 360,47.7 281,75 188,205 Z" fill="#734a08"/>
- <path id="path4142" d="m 362,192 40,28 c 4,3 15,1 17.5,-3 L 493,111 c 6,-8 4,-19 -4,-24 L 453,61.8 Z" fill="#734a08"/>
- <path id="path4144" d="m 137,516 40,28 c 4,3 15,0 17.5,-4 L 266,437 c 6,-8 3,-18 -4,-24 l -36,-25 z" fill="#734a08"/>
-</svg>
--- a/icons/map/mapsforge/symbols/amenity/toilets.svg
+++ b/icons/map/mapsforge/symbols/amenity/toilets.svg
@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <path id="path4145" d="M 543,290 A 253,253 0 0 1 290,543 253,253 0 0 1 37,290 253,253 0 0 1 290,37 253,253 0 0 1 543,290 Z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="M 543,290 A 253,253 0 0 1 290,543 253,253 0 0 1 37,290 253,253 0 0 1 290,37 253,253 0 0 1 543,290 Z" id="path3267" fill="#734a08"/>
- <path d="m 305.6,471 0,-361 -28.6,0 0,361 z" id="path4143" fill="#ffffff"/>
- <path d="m 133.2,176 c -9,0 -17,3.2 -24.3,9.7 -5.4,5 -9,10.6 -10.8,16.8 l -24.9,83 c -3.3816,9.92675 3.72505,17.15425 11.3,17.3 5.8,0 9.6,-3.2 11.4,-9.7 l 22.7,-76 12.4,0 -37,135 36,0 0,105 c 0,9.4 4.5,14 13.5,14 9,0 13.5,-4.7 13.5,-14 l 0,-105 13.5,0 0,106 c 0,9 4.5,13.5 13.5,13.5 9,0 13.5,-4.5 13.5,-13.5 l 0,-105 36,0 -37.8,-135 13,0 22.7,76 c 1.8,6.5 5.6,9.7 11.3,9.7 10.17001,-1.81294 15.15147,-8.88598 11.3,-17.3 l -24.9,-83 c -1.8,-5.8 -5.9,-11.4 -12.4,-16.8 -7.9,-6.5 -16.6,-9.7 -25.8,-10.2 z" id="path4141" fill="#ffffff"/>
- <path d="m 192.9,142 c -1.30386,-17.62038 -13.69624,-29.38975 -29.7,-29.6 -17.28496,1.33431 -28.98803,13.98417 -29.2,29.6 1.32728,16.94133 13.77172,28.88968 29.2,29.1 17.16182,-1.21895 29.4786,-13.38168 29.7,-29.1 z" id="path4139" fill="#ffffff"/>
- <path d="m 445.3,141.4 c -1.23748,-17.25187 -13.38979,-28.98634 -29.1,-29.2 -17.3663,1.32487 -28.89595,13.49205 -29.1,29.2 1.28754,16.8883 13.71941,28.98335 29.1,29.2 16.94133,-1.32728 28.88968,-13.77172 29.1,-29.2 z" id="path4137" fill="#ffffff"/>
- <path d="m 377.2,176.5 c -10.4,0 -19.4,3.7 -26.8,11 -7.4,7.4 -11,16.5 -11,27.3 l 0,90 c 0,8.6 4,13 11.9,13 7.6,0 11.4,-4.3 11.4,-13 l 0,-87 14,0 0,238 c 0,10.8 5.4,16.2 16.2,16.2 10.8,0 16.2,-5.4 16.2,-16.2 l 0,-138 14,0 0,138 c 0,10.8 5.4,16.2 16.2,16.2 11.2,0 16.8,-5.4 16.8,-16.2 l 0,-238 13.5,0 0,88 c 0,9 3.8,13.5 11.4,13.5 7.6,0 11.4,-4.5 11.4,-13.5 l 0,-89 c 0,-10.4 -3.5,-19.5 -10.5,-27.3 -7,-7.8 -16,-11.6 -27.5,-12.3 z" id="flowRoot3192" fill="#ffffff"/>
-</svg>
--- a/icons/map/mapsforge/symbols/barrier/blocks.svg
+++ b/icons/map/mapsforge/symbols/barrier/blocks.svg
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <path id="path4142" d="m 333.4082,239.80078 c -4.05705,52.83752 -7.97544,107.27619 -10.74218,151.79892 1.33172,12.36242 11.81493,23 25.33398,23 32.33334,-0.3331 64.66669,-0.66662 97.00003,-1 13.44016,0 24.05695,-9.94808 25.34375,-23 0.22336,-47.57134 -0.40528,-96.53651 -0.74417,-144.5997 0,-14.39987 -12.04379,-25.49157 -25.41406,-25.59375 l -84.09375,-6.00586 c -14.75458,1.04928 -25.63304,15.2893 -26.6836,25.40039 z" shape-rendering="auto" mix-blend-mode="normal" filter-blend-mode="normal" color-interpolation-filters="linearRGB" isolation="auto" white-space="normal" opacity="0.8" fill="none" solid-opacity="1" image-rendering="auto" solid-color="#000000" stroke="#ffffff" color="#000000" stroke-linejoin="round" stroke-width="64" color-rendering="auto" filter-gaussianBlur-deviation="0" color-interpolation="sRGB"/>
- <path id="path4144" d="m 102,163 c -4,4 -6,11 -6,17 l 0,208 c 0,13 10,23 23,23 l 97,0 c 13,0 23,-10 23,-23 l 0,0 0,0 -6,-176 c -0.45443,-5.5379 -2.1836,-11.15846 -5,-15 -4,-4 -9,-7 -16,-10 l -92,-30 c -6.96524,-1.59555 -14.15061,1.02707 -18,6 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 333.4082,239.80078 c -4.05705,52.83752 -7.97544,107.27619 -10.74218,151.79892 1.33172,12.36242 11.81493,23 25.33398,23 32.33334,-0.3331 64.66669,-0.66662 97.00003,-1 13.44016,0 24.05695,-9.94808 25.34375,-23 0.22336,-47.57134 -0.40528,-96.53651 -0.74417,-144.5997 0,-14.39987 -12.04379,-25.49157 -25.41406,-25.59375 l -84.09375,-6.00586 c -14.75458,1.04928 -25.63304,15.2893 -26.6836,25.40039 z" id="path4137" shape-rendering="auto" mix-blend-mode="normal" color-interpolation-filters="linearRGB" isolation="auto" white-space="normal" fill="#666666" solid-opacity="1" image-rendering="auto" solid-color="#000000" color="#000000" color-rendering="auto" color-interpolation="sRGB"/>
- <path d="m 102,163 c -4,4 -6,11 -6,17 l 0,208 c 0,13 10,23 23,23 l 97,0 c 13,0 23,-10 23,-23 l 0,0 0,0 -6,-176 c -0.45443,-5.5379 -2.1836,-11.15846 -5,-15 -4,-4 -9,-7 -16,-10 l -92,-30 c -6.96524,-1.59555 -14.15061,1.02707 -18,6 z" id="path6056" fill="#666666"/>
-</svg>
--- a/icons/map/mapsforge/symbols/barrier/bollard.svg
+++ b/icons/map/mapsforge/symbols/barrier/bollard.svg
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata10"/>
- <path id="path4136" d="m 239,159 c -13,13 -20,31 -20,50 l 0,171 c -2,1 -5,1 -7,2 -8,2 -11,6 -11,10 l 0,25 c -1,5 4,10 14,12 19,6 42,5 64,6 29,0 59,0 86,-5 8,-3 14,-7 14,-11 l 0,0 0,-27 c 0,-2 -1,-5 -4,-7 -4,-2 -9,-4 -15,-5 l 0,-171 c 0,-19 -7,-38 -21,-51 -13,-13 -32,-21 -50,-21 -19,1 -37,8 -50,22 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 239,159 c -13,13 -20,31 -20,50 l 0,171 c -2,1 -5,1 -7,2 -8,2 -11,6 -11,10 l 0,25 c -1,5 4,10 14,12 19,6 42,5 64,6 29,0 59,0 86,-5 8,-3 14,-7 14,-11 l 0,0 0,-27 c 0,-2 -1,-5 -4,-7 -4,-2 -9,-4 -15,-5 l 0,-171 c 0,-19 -7,-38 -21,-51 -13,-13 -32,-21 -50,-21 -19,1 -37,8 -50,22 z" id="path4689" fill="#666666" color="#000000"/>
-</svg>
--- a/icons/map/mapsforge/symbols/barrier/cycle_barrier.svg
+++ b/icons/map/mapsforge/symbols/barrier/cycle_barrier.svg
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata2975"/>
- <path id="path4138" d="m 380,421 c 10.8,34.4 53.8,16 49,-10 l -31,-161 49,0 0,172 c 0.7,28 36.7,19.7 34.8,-0.4 L 482,199 c -2,-25.7 -34.9,-19.4 -35,-0.4 l 0,16.4 -56,0 -13,-71 c -14,-35 -55.9,-17.8 -49,9 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4140" d="m 189,215 -56,0 0,-16 c -3,-26 -34,-20 -35,0 l 0,223 c 4.3,25.9 34.9,18.6 35,-0.4 l 0,-171.6 49,0 -31,161 c -7.1,39.5 45.7,38 48.7,9.5 L 252,153 c 2,-35.8 -43.9,-37 -49.3,-9.5 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 380,421 c 10.8,34.4 53.8,16 49,-10 l -31,-161 49,0 0,172 c 0.7,28 36.7,19.7 34.8,-0.4 L 482,199 c -2,-25.7 -34.9,-19.4 -35,-0.4 l 0,16.4 -56,0 -13,-71 c -14,-35 -55.9,-17.8 -49,9 z" id="path4136" fill="#666666"/>
- <path d="m 189,215 -56,0 0,-16 c -3,-26 -34,-20 -35,0 l 0,223 c 4.3,25.9 34.9,18.6 35,-0.4 l 0,-171.6 49,0 -31,161 c -7.1,39.5 45.7,38 48.7,9.5 L 252,153 c 2,-35.8 -43.9,-37 -49.3,-9.5 z" id="line6215" fill="#666666"/>
-</svg>
--- a/icons/map/mapsforge/symbols/barrier/gate.svg
+++ b/icons/map/mapsforge/symbols/barrier/gate.svg
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata10"/>
- <path id="path4137" d="m415 154c-15.3.1-23.8 14.5-34.7 23L333 220c-73 0-147 0-220 0-20 .2-30 27.8-15.3 41 11 10.6 27.3 5.8 41 6.9 48 0 95 0 142 0l-52 47.9c-39.5.3-79-.5-118 .4-19.8 2.6-26.7 31-10.3 42.6 11.8 8.3 26.9 3.9 40 5 12 0 24 0 36 0-10.3 10-22 18.8-31 30-10.9 16.7 6.3 40.6 25.6 35.6 13-3.8 21-16 31.5-24.3C217 392 232 378 247 364c74-.1 147 .1 220-.1 19.9-.8 29.5-28.6 14.2-41-11.3-10-27-5.3-41-6.5-47 0-94 0-141 0l52-47.9c38.7-.1 77 .2 116-.1 19.9-1 29-28.9 13.8-41.6-11.6-10-27.6-5.1-41.5-6.3-12 0-24 0-36 0 10.3-10 22-18.9 31-30 9.8-15.3-2.2-36.7-20.3-36.4z" fill="none" stroke="#ffffff" stroke-linejoin="round" stroke-width="64" opacity="0.8"/>
- <path d="m415 154c-15.3.1-23.8 14.5-34.7 23L333 220c-73 0-147 0-220 0-20 .2-30 27.8-15.3 41 11 10.6 27.3 5.8 41 6.9 48 0 95 0 142 0l-52 47.9c-39.5.3-79-.5-118 .4-19.8 2.6-26.7 31-10.3 42.6 11.8 8.3 26.9 3.9 40 5 12 0 24 0 36 0-10.3 10-22 18.8-31 30-10.9 16.7 6.3 40.6 25.6 35.6 13-3.8 21-16 31.5-24.3C217 392 232 378 247 364c74-.1 147 .1 220-.1 19.9-.8 29.5-28.6 14.2-41-11.3-10-27-5.3-41-6.5-47 0-94 0-141 0l52-47.9c38.7-.1 77 .2 116-.1 19.9-1 29-28.9 13.8-41.6-11.6-10-27.6-5.1-41.5-6.3-12 0-24 0-36 0 10.3-10 22-18.9 31-30 9.8-15.3-2.2-36.7-20.3-36.4" id="path2900" fill="#666666"/>
-</svg>
--- a/icons/map/mapsforge/symbols/barrier/lift_gate.svg
+++ b/icons/map/mapsforge/symbols/barrier/lift_gate.svg
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata10"/>
- <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4149" d="m 376,171.8 c -75,16.7 -151,32.9 -226,50 -19,6.5 -23.5,35.9 -6.6,47 14.5,10.9 32.7,1.6 48,-0.8 90,-19.7 180,-38.9 269,-59 20,-6.7 23.6,-38 4.6,-48.7 -4,-2.6 -8.8,-4 -13.3,-4.25 C 426.5,159.6 402,166.8 376,171.8 Z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4151" d="m 398,413 c 0.3,13.9 13.7,25.4 27.4,24 13.8,-0.1 27.5,0.2 41,-0.1 13.5,-1 24,-14.2 22.9,-27.6 l 0,-132 C 489,264 475,253 462,254 l -39,0 c -14.4,-0.4 -26.8,13 -25.2,27.2 z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path mix-blend-mode="normal" white-space="normal" isolation="auto" id="path4153" d="m 95.4,175.5 c 0.1,79 -0.2,158 0.1,237 1.3,17.8 19.7,31 37,28 14.2,-0.9 29,2.4 42.8,-2.8 13.4,-6.1 20,-21.6 18.3,-35.8 l 0,-137 c -15.3,4 -32.7,13.7 -47.9,4 -16.9,-9.3 -12.9,-37.7 4.3,-44 14,-3.8 31.8,-5.3 43,-11.4 -0.4,-16.9 1,-34 -0.9,-50.8 -3.8,-16 -21,-26 -37,-23.8 C 146,139 136,139 127,139 108.2,138.2 92.6,157.2 95.4,175.5 Z" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 376,171.8 c -75,16.7 -151,32.9 -226,50 -19,6.5 -23.5,35.9 -6.6,47 14.5,10.9 32.7,1.6 48,-0.8 90,-19.7 180,-38.9 269,-59 20,-6.7 23.6,-38 4.6,-48.7 -4,-2.6 -8.8,-4 -13.3,-4.25 C 426.5,159.6 402,166.8 376,171.8 Z" id="path3732" isolation="auto" white-space="normal" mix-blend-mode="normal" fill="#666666" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
- <path d="m 398,413 c 0.3,13.9 13.7,25.4 27.4,24 13.8,-0.1 27.5,0.2 41,-0.1 13.5,-1 24,-14.2 22.9,-27.6 l 0,-132 C 489,264 475,253 462,254 l -39,0 c -14.4,-0.4 -26.8,13 -25.2,27.2 z" id="rect3827" isolation="auto" white-space="normal" mix-blend-mode="normal" opacity="0.8" fill="#666666" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
- <path d="m 95.4,175.5 c 0.1,79 -0.2,158 0.1,237 1.3,17.8 19.7,31 37,28 14.2,-0.9 29,2.4 42.8,-2.8 13.4,-6.1 20,-21.6 18.3,-35.8 l 0,-137 c -15.3,4 -32.7,13.7 -47.9,4 -16.9,-9.3 -12.9,-37.7 4.3,-44 14,-3.8 31.8,-5.3 43,-11.4 -0.4,-16.9 1,-34 -0.9,-50.8 -3.8,-16 -21,-26 -37,-23.8 C 146,139 136,139 127,139 108.2,138.2 92.6,157.2 95.4,175.5 Z" id="rect3925" isolation="auto" white-space="normal" mix-blend-mode="normal" opacity="0.8" fill="#666666" color-rendering="auto" solid-opacity="1" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
-</svg>
--- a/icons/map/mapsforge/symbols/barrier/stile.svg
+++ b/icons/map/mapsforge/symbols/barrier/stile.svg
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" width="580" height="580">
- <metadata id="metadata10"/>
- <path id="path4140" d="m 121.8,138.8 c -2.9,2.9 -4.6,7.1 -4.5,11.2 l 0,22.6 c -7.79341,-0.39187 -16.66305,0.75984 -21.8,5.6 -3.8,3.6 -6,8.8 -6,14 0,5.2 2.2,10.3 6,14 7.08798,5.84684 13.34906,5.6 21.8,5.6 l 0,59 c -7.79341,-0.39187 -16.66305,0.75984 -21.8,5.6 -3.8,3.6 -6,8.8 -6,14 0,5.2 2.2,10.3 6,14 7.08798,5.84684 13.34906,5.6 21.8,5.6 l 0,67.4 32,0 0,-67.4 75,0 c 0,-7.86667 0,-15.73333 0,-23.6 l 140,0 0,23.6 69,0 0,67.4 32,0 0,-67.4 c 7.04399,0.33687 14.89745,-1.35759 19.4,-5.6 3.8,-3.6 5.9,-8.8 5.9,-14 0,-5.2 -2.2,-10.3 -5.9,-14 -6.43243,-5.21599 -11.9333,-5.6 -19.4,-5.6 l 0,-59 c 7.04399,0.33687 14.89745,-1.35759 19.4,-5.6 3.8,-3.6 5.9,-8.8 5.9,-14 0,-5.2 -2.2,-10.3 -5.9,-14 -6.43243,-5.21599 -11.9333,-5.6 -19.4,-5.6 l 0,-22.6 c 0.1,-4.2 -1.7,-8.4 -4.7,-11.3 -3,-3 -7.3,-4.7 -11.6,-4.6 -4.2,0.1 -8.3,1.8 -11.2,4.8 -2.9,2.9 -4.6,7.1 -4.5,11.2 l 0,22.6 -285,0 0,-22.6 c 0.1,-4.2 -1.7,-8.4 -4.7,-11.3 -3,-3 -7.3,-4.7 -11.1,-4.7 -3.7,0 -7.8,1.7 -10.7,4.7 z m 311.5,73.4 0,59 -285,0 0,-59 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4142" d="m 247,354 95,0 0,-50 -95,0 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" white-space="normal" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path id="path4144" d="m 215,418 c 54,0 108,0 162,0 l 0,-50 c -54,0 -108,0 -162,0 z" mix-blend-mode="normal" solid-color="#000000" opacity="0.8" white-space="normal" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="m 121.8,138.8 c -2.9,2.9 -4.6,7.1 -4.5,11.2 l 0,22.6 c -7.79341,-0.39187 -16.66305,0.75984 -21.8,5.6 -3.8,3.6 -6,8.8 -6,14 0,5.2 2.2,10.3 6,14 7.08798,5.84684 13.34906,5.6 21.8,5.6 l 0,59 c -7.79341,-0.39187 -16.66305,0.75984 -21.8,5.6 -3.8,3.6 -6,8.8 -6,14 0,5.2 2.2,10.3 6,14 7.08798,5.84684 13.34906,5.6 21.8,5.6 l 0,67.4 32,0 0,-67.4 75,0 c 0,-7.86667 0,-15.73333 0,-23.6 l 140,0 0,23.6 69,0 0,67.4 32,0 0,-67.4 c 7.04399,0.33687 14.89745,-1.35759 19.4,-5.6 3.8,-3.6 5.9,-8.8 5.9,-14 0,-5.2 -2.2,-10.3 -5.9,-14 -6.43243,-5.21599 -11.9333,-5.6 -19.4,-5.6 l 0,-59 c 7.04399,0.33687 14.89745,-1.35759 19.4,-5.6 3.8,-3.6 5.9,-8.8 5.9,-14 0,-5.2 -2.2,-10.3 -5.9,-14 -6.43243,-5.21599 -11.9333,-5.6 -19.4,-5.6 l 0,-22.6 c 0.1,-4.2 -1.7,-8.4 -4.7,-11.3 -3,-3 -7.3,-4.7 -11.6,-4.6 -4.2,0.1 -8.3,1.8 -11.2,4.8 -2.9,2.9 -4.6,7.1 -4.5,11.2 l 0,22.6 -285,0 0,-22.6 c 0.1,-4.2 -1.7,-8.4 -4.7,-11.3 -3,-3 -7.3,-4.7 -11.1,-4.7 -3.7,0 -7.8,1.7 -10.7,4.7 z m 311.5,73.4 0,59 -285,0 0,-59 z" id="path2900" opacity="0.8" fill="#666666" color="#000000"/>
- <path d="m 247,354 95,0 0,-50 -95,0 z" id="path4138" fill="#666666" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
- <path d="m 215,418 c 54,0 108,0 162,0 l 0,-50 c -54,0 -108,0 -162,0 z" id="path4403" fill="#666666" isolation="auto" color-rendering="auto" white-space="normal" solid-opacity="1" mix-blend-mode="normal" color-interpolation-filters="linearRGB" shape-rendering="auto" image-rendering="auto" color-interpolation="sRGB" color="#000000" solid-color="#000000"/>
-</svg>
--- a/icons/map/mapsforge/symbols/bench.svg
+++ b/icons/map/mapsforge/symbols/bench.svg
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="580" height="580" version="1.0">
- <metadata id="metadata7"/>
- <path id="path4141" d="M 72.400391 148.19922 L 72 244 L 144 244 L 144 292 L 48 292 L 48 349 L 77.699219 363.30078 L 102.59961 363.30078 C 97.999609 371.00078 96 380 96 388 C 96 414.5 117.5 436 144 436 C 170.5 436 192 414.5 192 388 C 192 379.5 189.70039 371.1 185.40039 364 C 255.40039 364.1 324.40039 364.1 394.40039 364 C 390.10039 371.3 387.80078 379.7 387.80078 388 C 387.80078 414.5 409.30078 436 435.80078 436 C 462.30078 436 483.80078 414.5 483.80078 388 C 483.80078 379.5 481.49922 371.09922 477.19922 363.69922 L 502.09961 363.69922 L 531.80078 349.40039 L 531.80078 292.40039 L 435.80078 292.40039 L 435.80078 244.40039 L 507.80078 244.40039 L 507.80078 148.40039 L 72.400391 148.19922 z M 168.80078 244.40039 L 411.80078 244.40039 L 411.80078 292.40039 C 330.00078 292.00039 249 292 168 292 L 168.80078 244.40039 z " mix-blend-mode="normal" solid-color="#000000" opacity="0.8" color-interpolation-filters="linearRGB" filter-gaussianBlur-deviation="0" color="#000000" image-rendering="auto" color-rendering="auto" stroke-width="64" isolation="auto" color-interpolation="sRGB" solid-opacity="1" fill="none" stroke-linejoin="round" filter-blend-mode="normal" stroke="#ffffff" shape-rendering="auto"/>
- <path d="M 72.400391 148.19922 L 72 244 L 144 244 L 144 292 L 48 292 L 48 349 L 77.699219 363.30078 L 102.59961 363.30078 C 97.999609 371.00078 96 380 96 388 C 96 414.5 117.5 436 144 436 C 170.5 436 192 414.5 192 388 C 192 379.5 189.70039 371.1 185.40039 364 C 255.40039 364.1 324.40039 364.1 394.40039 364 C 390.10039 371.3 387.80078 379.7 387.80078 388 C 387.80078 414.5 409.30078 436 435.80078 436 C 462.30078 436 483.80078 414.5 483.80078 388 C 483.80078 379.5 481.49922 371.09922 477.19922 363.69922 L 502.09961 363.69922 L 531.80078 349.40039 L 531.80078 292.40039 L 435.80078 292.40039 L 435.80078 244.40039 L 507.80078 244.40039 L 507.80078 148.40039 L 72.400391 148.19922 z M 168.80078 244.40039 L 411.80078 244.40039 L 411.80078 292.40039 C 330.00078 292.00039 249 292 168 292 L 168.80078 244.40039 z " id="path4138" fill="#734a08"/>
-</svg>
--- a/icons/map/mapsforge/symbols/cable_car.svg
+++ b/icons/map/mapsforge/symbols/cable_car.svg
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="580" height="580" version="1.0">
- <metadata id="metadata3003"/>
- <path id="path3760" d="m489 124l-402 0c-14.8 0-26.9 11.8-26.9 26.4l0 283c0 14.5 12 26.5 26.9 26.5l402 0c15 .1 27-10.9 27-25.9l0-283c0-14.5-12-26.4-26.9-26.4"/>
- <path d="m 84,176 0,89 c 0,8 7,15 16,15 l 89,0 c 8,0 15,-7 15,-15 l 0,-89 c 0,-9 -7,-16 -15,-16 l -89,0 c -9,0 -16,7 -16,16 z m 144,0 0,89 c 0,9 7,16 16,15 l 89,0 c 8,0 15,-7 15,-15 l 0,-89 c 0,-9 -7,-16 -16,-16 l -89,0 c -8,0 -15,7 -15,16 z m 144,0 0,89 c 0,8 7,15 16,15 l 89,0 c 8,0 15,-7 15,-15 l 0,-89 c 0,-9 -7,-16 -15,-16 l -89,0 c -9,0 -16,7 -16,16 z" id="path3758-6" opacity="0.7" fill="#ffffff"/>
- <path id="rect3015" d="m276 3.6l24 0 0 132-24 0z"/>
-</svg>
--- a/icons/map/mapsforge/symbols/chair_lift.svg
+++ b/icons/map/mapsforge/symbols/chair_lift.svg
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" height="580" width="580">
- <metadata id="metadata3003"/>
- <path id="path15" d="m 156.2,183.43782 30,170 c 5.7,30.7 27.3,56.9 58,66 8.1,2.5 16.3,3.8 24.4,3.8 l 59,0.2 c 26.7,0 26.8,-36 0.2,-35.8 l -56,-0.2 c -5.4,-0.4 -11.2,-0.6 -16.6,-2.3 -18,-5.7 -30.7,-20.8 -34,-38 l -30.2,-169.5 c -2.1,-11.9 -9.9,-17.3 -17.8,-17.7 -10.1,-0.4 -19.8,8.3 -17,23.5 z m 113.40613,-23.43784 c -23.41349,0 -42.39388,-18.98035 -42.39388,-42.39385 0,-23.413508 18.98039,-42.393859 42.39388,-42.393859 23.41349,0 42.39387,18.980351 42.39387,42.393859 0,23.4135 -18.98038,42.39385 -42.39387,42.39385 z M 420,4.6386719 317.51758,235.22656 310.5,194.1875 c -1.5,-8.35 -16.2,-21.14961 -34.25,-21.84961 -20.25,-0.7 -36.25,15.30078 -36.25,35.30078 5.38217,38.23946 12.86696,78.74425 17.18359,103.67188 C 261.50022,336.23818 276.2,349.03711 294,349.03711 l 90,0 0.19922,111.10156 c 0.2,5.1 8.10078,12.59961 17.80078,12.59961 9.7,0 17.60078,-7.49961 17.80078,-12.59961 L 420,323.03711 c 0,-14.6 -12,-26.5 -27,-26.5 l -65,0 -3.81445,-22.31445 L 444,4.6386719 Z"/>
-</svg>
--- a/icons/map/mapsforge/symbols/dot_black.svg
+++ b/icons/map/mapsforge/symbols/dot_black.svg
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.0" width="580" height="580">
- <metadata id="metadata1976"/>
- <defs id="defs4">
-  <marker viewBox="0 0 10 10" refY="5" refX="10" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowStart">
-   <path id="path2111" d="M 10 0 L 0 5 L 10 10 z"/>
-  </marker>
-  <marker viewBox="0 0 10 10" refY="5" orient="auto" markerWidth="4" markerUnits="strokeWidth" markerHeight="3" id="ArrowEnd">
-   <path id="path2108" d="M 0 0 L 10 5 L 0 10 z"/>
-  </marker>
- </defs>
- <circle id="path4175" cx="290" cy="290" r="91.4" fill="#111" stroke="#fff" stroke-linejoin="bevel" stroke-linecap="square" stroke-width="16"/>
-</svg>
--- a/icons/map/mapsforge/symbols/dot_blue.svg
+++ b/icons/map/mapsforge/symbols/dot_blue.svg
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="580" width="580" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <title>other</title>
- <metadata>
-  <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>other</dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <circle opacity=".8" cx="290" cy="290" r="145" fill="#fff"/>
- <circle cy="290" cx="290" r="116" fill="#0092DA"/>
-</svg>
--- a/icons/map/mapsforge/symbols/dot_blue_dark.svg
+++ b/icons/map/mapsforge/symbols/dot_blue_dark.svg
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="580" width="580" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <title>other</title>
- <metadata>
-  <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>other</dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <circle opacity=".8" cx="290" cy="290" r="145" fill="#fff"/>
- <circle cy="290" cx="290" r="116" fill="#2d51bc"/>
-</svg>
--- a/icons/map/mapsforge/symbols/dot_magenta.svg
+++ b/icons/map/mapsforge/symbols/dot_magenta.svg
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="580" width="580" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <title>other</title>
- <metadata>
-  <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>other</dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <circle opacity=".8" cx="290" cy="290" r="145" fill="#fff"/>
- <circle cy="290" cx="290" r="116" fill="#AC39AC"/>
-</svg>
--- a/Show More
+++ b/Show More