Merge branch 'trunk' into qt5_qml_gui

668 files changed, 20014 insertions, 22203 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 000000000..4f8a82d39
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,112 @@
+version: 2
+defaults: &defaults
+  docker:
+    - image: ubuntu:14.04
+
+jobs:
+  build_linux:
+    <<: *defaults
+    steps:
+      - checkout
+      - run:
+          name: Build for Linux
+          command: |
+            bash ci/setup_common_requirements.sh
+            bash ci/build_linux.sh
+  build_android_arm:
+    <<: *defaults
+    steps:
+      - checkout
+      - run:
+          name: Setup common requirements
+          command: |
+            bash ci/setup_common_requirements.sh
+      - run:
+          name: Prepare the Android build environment
+          command: |
+            bash ci/setup_android.sh
+      - run:
+          name: Build for Android ARM
+          command: |
+            bash ci/build_android.sh
+      - store_artifacts:
+          path: android-arm/navit
+  build_android_x86:
+    <<: *defaults
+    steps:
+      - checkout
+      - run:
+          name: Setup common requirements
+          command: |
+            bash ci/setup_common_requirements.sh
+      - run:
+          name: Prepare the Android build environment
+          command: |
+            bash ci/setup_android.sh
+      - run:
+          name: Build for Android X86
+          command: |
+            bash ci/build_android_x86.sh
+      - store_artifacts:
+          path: android-x86/navit
+  build_win32:
+    <<: *defaults
+    steps:
+      - checkout
+      - run:
+          name: Build for Windows
+          command: |
+            bash ci/setup_common_requirements.sh
+            bash ci/build_win32.sh
+  build_wince:
+    <<: *defaults
+    steps:
+      - checkout
+      - run:
+          name: Build for Windows CE
+          command: |
+            bash ci/setup_common_requirements.sh
+            bash ci/build_wince.sh
+  build_tomtom_minimal:
+    <<: *defaults
+    docker:
+      - image: navit/tomtom-build-image
+    steps:
+      - checkout
+      - run:
+          name: Setup common requirements
+          command: |
+            bash ci/setup_common_requirements.sh
+      - run:
+          name: Build for Tomtom (minimal)
+          command: |
+            bash ci/build_tomtom_minimal.sh
+      - store_artifacts:
+          path: /output
+  build_tomtom_plugin:
+    <<: *defaults
+    docker:
+      - image: navit/tomtom-build-image
+    steps:
+      - checkout
+      - run:
+          name: Setup common requirements
+          command: |
+            bash ci/setup_common_requirements.sh
+      - run:
+          name: Build for Tomtom (plugin)
+          command: |
+            bash ci/build_tomtom_plugin.sh
+      - store_artifacts:
+          path: /output
+
+workflows:
+  version: 2
+  build_all:
+    jobs:
+      - build_linux
+      - build_android_arm
+      - build_android_x86
+      - build_win32
+      - build_tomtom_minimal
+      - build_tomtom_plugin
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6354e1ee..3d5924582 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,7 @@ set(SHARE_DIR share/navit CACHE PATH "Navit share path")
 add_definitions ("-DSHARE_DIR=\"${SHARE_DIR}\"")
 set(LOCALE_DIR share/locale CACHE PATH "Navit locale path")
 add_definitions ("-DLOCALE_DIR=\"${LOCALE_DIR}\"")
-set(IMAGE_DIR share/navit/xpm CACHE PATH "Navit image path")
+set(IMAGE_DIR share/navit/icons CACHE PATH "Navit image path")
 add_definitions ("-DIMAGE_DIR=\"${IMAGE_DIR}\"")
 set(MAN_DIR share/man/man1 CACHE PATH "Navit man path")
 add_definitions ("-DMAN_DIR=\"${MAN_DIR}\"")
@@ -120,7 +120,7 @@ set(CPACK_PACKAGE_VENDOR "Navit team")
 set(CPACK_PACKAGE_VERSION_MAJOR ${NAVIT_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${NAVIT_VERSION_MINOR})
 set(CPACK_PACKAGE_VERSION_PATCH "${NAVIT_VERSION_PATCH}")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/GPL-2")
 set(CPACK_NSIS_PACKAGE_NAME "Navit ${PACKAGE_VERSION}")
 set(CPACK_PACKAGE_FILE_NAME ${PACKAGE})
@@ -424,7 +424,7 @@ endif(SDL_FOUND AND SDLIMAGE_FOUND AND FREETYPE_FOUND)
 if(SDL2MAIN AND SDL2IMAGE AND GLES2)
     set_with_reason(graphics/egl "SDL2/SDL2_image libs found" TRUE ${SDL2MAIN} ${SDL2IMAGE} ${GLES2})
     message(STATUS "EGL libs found : ${SDL2MAIN} ${SDL2IMAGE} ${GLES2}")
-endif(SDL2_FOUND AND SDL2IMAGE_FOUND AND GLES2)
+endif(SDL2MAIN AND SDL2IMAGE AND GLES2)
 
 if (LIBGPS_FOUND)
    if (LIBGPS_NEW_FOUND)
@@ -609,7 +609,7 @@ if(WIN32 OR WINCE)
    set(BIN_DIR bin)
    set(SHARE_DIR ./)
    set(LOCALE_DIR locale)
-   set(IMAGE_DIR xpm)
+   set(IMAGE_DIR icons)
 
 
    if(HAVE_GTK2 AND NOT MSVC)
@@ -704,9 +704,9 @@ if(ANDROID)
    set(XSLTS "android;${XSLTS}" CACHE STRING "define a semicolon seperated list of XSLTs to process")
    list(APPEND NAVIT_LIBS log)
    set(HAVE_API_ANDROID 1)
-   set_with_reason(graphics/android "Android detected" TRUE)
-   set_with_reason(speech/android "Android detected" TRUE)
-   set_with_reason(vehicle/android "Android detected" TRUE)
+   set_with_reason(graphics/android "Android detected, NDK:${ANDROID_NDK_API_VERSION}, API:${ANDROID_API_VERSION}" TRUE)
+   set_with_reason(speech/android "Android detected, NDK:${ANDROID_NDK_API_VERSION}, API:${ANDROID_API_VERSION}" TRUE)
+   set_with_reason(vehicle/android "Android detected, NDK:${ANDROID_NDK_API_VERSION}, API:${ANDROID_API_VERSION}" TRUE)
    set(SHARED_LIBNAVIT TRUE)
 
    add_feature(XPM2PNG "Android detected" TRUE)
diff --git a/NEWS b/NEWS
deleted file mode 100644
index e69de29bb..000000000
--- a/NEWS
+++ /dev/null
diff --git a/README b/README
deleted file mode 100644
index 9fa5f80de..000000000
--- a/README
+++ /dev/null
@@ -1,74 +0,0 @@
-NavIT
-=====
-
-Navit is a open source (GPL) car navigation system with routing engine.
-
-It's modular design is capable of using vector maps of various formats
-for routing and rendering of the displayed map. It's even possible to
-use multiple maps at a time.
-
-The GTK+ or SDL user interfaces are designed to work well with touch
-screen displays. Points of Interest of various formats are displayed
-on the map.
-
-The current vehicle position is either read from gpsd or directly from
-NMEA GPS sensors.
-
-The routing engine not only calculates an optimal route to your
-destination, but also generates directions and even speaks to you.
-
-Navit currently speaks over 70 languages!
-
-You can help translating via our web based translation page :
- http://translations.launchpad.net/navit/trunk/+pots/navit
-
-
-For help or more information, please refer to the wiki :
- http://wiki.navit-project.org
-
-If you don't know where to start, we recommend you to read the 
-Interactive Help : http://wiki.navit-project.org/index.php/Interactive_help
-
-
-Maps:
-=====
-
-The best navigation system is useless without maps. Those three maps
-are known to work:
-
-- OpenStreetMaps : display, routing, but street name search isn't complete
- (see http://wiki.navit-project.org/index.php/OpenStreetMaps )
-
-- Grosser Reiseplaner and compliant maps : full support
- (see http://wiki.navit-project.org/index.php/European_maps )
-
-- Garmin maps : display, routing, search is being worked on
- (see http://wiki.navit-project.org/index.php/Garmin_maps )
-
-
-GPS Support:
-============
-
-Navit read the current vehicle position :
-- directly from a file
-- from gpsd (local or remote)
-- from udp server (friends tracking) (experimental)
-
-
-Routing algorithm
-=================
-
-NavIt uses a Dijkstra algorithm for routing. The routing starts at the
-destination by assigning a value to each point directly connected to
-destination point. The value represents the estimated time needed to
-pass this distance.
-
-Now the point with the lowest value is choosen using the Fibonacci
-heap and a value is assigned to connected points whos are
-unevaluated or whos current value ist greater than the new one.
-
-The search is repeated until the origin is found.
-
-Once the origin is reached, all that needs to be done is to follow the
-points with the lowest values to the destination.
-
diff --git a/README.md b/README.md
index 399b96802..152419378 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Navit on Android tablet:
 
-![navit on android](http://wiki.openstreetmap.org/w/images/2/25/Navit_android.png)
+![navit on android](https://raw.githubusercontent.com/navit-gps/navit/trunk/contrib/images/androidtablet.png)
 
 Navit on Linux based Carputer:
 
diff --git a/Toolchain/arm-eabi.cmake b/Toolchain/arm-eabi.cmake
index 7c8190667..5aec27692 100755
--- a/Toolchain/arm-eabi.cmake
+++ b/Toolchain/arm-eabi.cmake
@@ -1,8 +1,8 @@
 set(CMAKE_SYSTEM_NAME GNU)
 
 set(ANDROID TRUE)
-set(ANDROID_API_VERSION 9 CACHE STRING "Andriod API Version")
-set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Andriod NDK API Version")
+set(ANDROID_API_VERSION 9 CACHE STRING "Android API Version")
+set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Android NDK API Version")
 set(ANDROID_ARCH "armeabi" CACHE STRING "Android architecture")
 
 find_program(CMAKE_C_COMPILER NAMES arm-eabi-gcc arm-eabi-gcc.exe arm-linux-androideabi-gcc arm-linux-androideabi-gcc.exe)
@@ -11,7 +11,7 @@ set(PKG_CONFIG_EXECUTABLE "arm-eabi-pkg-config")
 
 get_filename_component(COMPILER_PATH ${CMAKE_C_COMPILER} PATH)
 
-set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Andriod NDK")
+set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Android NDK")
 
 set(NDK_ARCH_DIR "${ANDROID_NDK}/platforms/android-${ANDROID_NDK_API_VERSION}/arch-arm")
 set(CMAKE_FIND_ROOT_PATH ${NDK_ARCH_DIR})
diff --git a/Toolchain/i686-android.cmake b/Toolchain/i686-android.cmake
index 2b6e8a177..4f5630644 100755
--- a/Toolchain/i686-android.cmake
+++ b/Toolchain/i686-android.cmake
@@ -1,8 +1,8 @@
 set(CMAKE_SYSTEM_NAME GNU)
 
 set(ANDROID TRUE)
-set(ANDROID_API_VERSION 9 CACHE STRING "Andriod API Version")
-set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Andriod NDK API Version")
+set(ANDROID_API_VERSION 9 CACHE STRING "Android API Version")
+set(ANDROID_NDK_API_VERSION ${ANDROID_API_VERSION} CACHE STRING "Android NDK API Version")
 set(ANDROID_ARCH "x86" CACHE STRING "Android architecture")
 
 find_program(CMAKE_C_COMPILER NAMES i686-linux-android-gcc i686-linux-android-gcc.exe)
@@ -11,7 +11,7 @@ set(PKG_CONFIG_EXECUTABLE "i686-android-pkg-config")
 
 get_filename_component(COMPILER_PATH ${CMAKE_C_COMPILER} PATH)
 
-set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Andriod NDK")
+set(ANDROID_NDK "${COMPILER_PATH}/../../../../.." CACHE STRING "PATH to Android NDK")
 
 set(NDK_ARCH_DIR "${ANDROID_NDK}/platforms/android-${ANDROID_NDK_API_VERSION}/arch-x86")
 set(CMAKE_FIND_ROOT_PATH ${NDK_ARCH_DIR})
diff --git a/ci/build.sh b/ci/build.sh
index b5d81e9dc..536ab7781 100644
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -5,5 +5,10 @@ echo "$# build script (s) to run"
 for i in $(seq 1 $#); do
 	eval s=\$$i
 	echo "Starting build script #$i : $s"
-	bash -e $s
+	if [ ! -z $CIRCLE_ARTIFACTS ]; then
+		set -o pipefail
+		bash -e $s 2>&1 | tee $CIRCLE_ARTIFACTS/${i}.log
+	else
+		bash -e $s
+	fi
 done
diff --git a/ci/build_android.sh b/ci/build_android.sh
index 93e250f95..ad42c78c2 100644
--- a/ci/build_android.sh
+++ b/ci/build_android.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+apt-get update && apt-get install -y wget
+
 export ARCH="arm"
 export START_PATH=~/
 export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/"
@@ -10,28 +12,30 @@ export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/arm-linux-androideabi-4.9/prebui
 export ANDROID_SDK="/usr/local/android-sdk-linux/"
 export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools"
 export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
-export BUILD_PATH=$START_PATH"/android-${ARCH}"
+export BUILD_PATH=android-${ARCH}
+
+export ANDROID_SDK_HOME=/opt/android-sdk-linux
+export ANDROID_HOME=/opt/android-sdk-linux
+export PATH=${PATH}:${ANDROID_SDK_HOME}/tools:${ANDROID_SDK_HOME}/platform-tools:/opt/tools
 
 wget -nv -c http://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip
 [ -d ~/android-ndk-r11c ] || unzip -q -d ~ android-ndk-r11c-linux-x86_64.zip
 
 [ -d $BUILD_PATH ] || mkdir -p $BUILD_PATH
-cd $BUILD_PATH
+pushd $BUILD_PATH
 
 android list targets
 
-cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 $SOURCE_PATH
-make
+cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/arm-eabi.cmake -DCACHE_SIZE='(20*1024*1024)' -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 ../
+
+make -j $(nproc --all)
 
 if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
-  make apkg-release && mv $BUILD_PATH/navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1
+  make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1
 else
-  make apkg && mv $BUILD_PATH/navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1
+  make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1
 fi
 
-[ -d $CIRCLE_ARTIFACTS/android-${ARCH}/ ] || mkdir $CIRCLE_ARTIFACTS/android-${ARCH}/
-cp $BUILD_PATH/navit/*.xml $CIRCLE_ARTIFACTS/android-${ARCH}/
-
 echo
 echo "Build leftovers :"
-ls $BUILD_PATH
+find .
diff --git a/ci/build_android_x86.sh b/ci/build_android_x86.sh
index 30ced4296..6e84bc4e1 100644
--- a/ci/build_android_x86.sh
+++ b/ci/build_android_x86.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+apt-get update && apt-get install -y wget
+
 export ARCH="x86"
 export START_PATH=~/
 export SOURCE_PATH=$START_PATH"/"${CIRCLE_PROJECT_REPONAME}"/"
@@ -10,28 +12,30 @@ export ANDROID_NDK_BIN=$ANDROID_NDK"/toolchains/x86-4.9/prebuilt/linux-x86_64/bi
 export ANDROID_SDK="/usr/local/android-sdk-linux/"
 export ANDROID_SDK_PLATFORM_TOOLS=$ANDROID_SDK"/platform-tools"
 export PATH=$ANDROID_NDK_BIN:$ANDROID_SDK_PLATFORM_TOOLS:$PATH
-export BUILD_PATH=$START_PATH"/android-${ARCH}"
+export BUILD_PATH=android-${ARCH}
+
+export ANDROID_SDK_HOME=/opt/android-sdk-linux
+export ANDROID_HOME=/opt/android-sdk-linux
+export PATH=${PATH}:${ANDROID_SDK_HOME}/tools:${ANDROID_SDK_HOME}/platform-tools:/opt/tools
+
 
 wget -nv -c http://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip
 [ -d ~/android-ndk-r11c ] || unzip -q -d ~ android-ndk-r11c-linux-x86_64.zip
 
 [ -d $BUILD_PATH ] || mkdir -p $BUILD_PATH
-cd $BUILD_PATH
+pushd $BUILD_PATH
 
 android list targets
 
-cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_FILE -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 $SOURCE_PATH
-make
+cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain/i686-android.cmake -DAVOID_FLOAT=1 -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n -DANDROID_API_VERSION=25 -DANDROID_NDK_API_VERSION=19 -DDISABLE_CXX=1 -DDISABLE_QT=1 ..
+make -j $(nproc --all)
 
 if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
-  make apkg-release && mv $BUILD_PATH/navit/android/bin/Navit-release-unsigned.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1
+  make -j $(nproc --all) apkg-release && mv navit/android/bin/Navit-release-unsigned.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-release-unsigned.apk || exit 1
 else
-  make apkg && mv $BUILD_PATH/navit/android/bin/Navit-debug.apk $CIRCLE_ARTIFACTS/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1
+  make -j $(nproc --all) apkg && mv navit/android/bin/Navit-debug.apk navit/android/bin/navit-$CIRCLE_SHA1-${ARCH}-debug.apk || exit 1
 fi
 
-[ -d $CIRCLE_ARTIFACTS/android-${ARCH}/ ] || mkdir $CIRCLE_ARTIFACTS/android-${ARCH}/
-cp $BUILD_PATH/navit/*.xml $CIRCLE_ARTIFACTS/android-${ARCH}/
-
 echo
 echo "Build leftovers :"
-ls $BUILD_PATH
+find .
diff --git a/ci/build_linux.sh b/ci/build_linux.sh
index afaac34e2..14abb7597 100644
--- a/ci/build_linux.sh
+++ b/ci/build_linux.sh
@@ -1,16 +1,21 @@
-sudo apt-get install cmake libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev g++ libgtk2.0-dev libqt5svg5-dev qtdeclarative5-qtquick2-plugin qtdeclarative5-window-plugin qtmultimedia5-dev
+set -e
+
+COVERITY_VERSION="2017.07"
+
+apt-get install -y libpng12-dev librsvg2-bin libfreetype6-dev libdbus-glib-1-dev libgtk2.0-dev curl
 
 cmake_opts="-Dgraphics/qt_qpainter:BOOL=FALSE -Dgui/qml:BOOL=FALSE -DSVG2PNG:BOOL=FALSE -DSAMPLE_MAP=n -Dgraphics/gtk_drawing_area:BOOL=TRUE"
 
+mkdir ${CIRCLE_WORKING_DIRECTORY}/linux-bin && cd ${CIRCLE_WORKING_DIRECTORY}/linux-bin
+
 if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trunk" ]]; then
 	# If we are building the official trunk code, push an update to coverity
-	wget -nv -c -O ~/assets/cov-analysis-linux64-7.6.0.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-7.6.0.tar.gz
-	tar xfz ~/assets/cov-analysis-linux64-7.6.0.tar.gz
-	export PATH=~/navit/cov-analysis-linux64-7.6.0/bin:$PATH
+	wget -nv -c -O /tmp/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz http://sd-55475.dedibox.fr/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz
+	tar xfz /tmp/cov-analysis-linux64-${COVERITY_VERSION}.tar.gz --no-same-owner -C /usr/local/share/
+	export PATH=/usr/local/share/cov-analysis-linux64-${COVERITY_VERSION}/bin:$PATH
 	
-	mkdir ~/linux-bin && cd ~/linux-bin
-	cov-build --dir cov-int cmake ~/${CIRCLE_PROJECT_REPONAME}/ ${cmake_opts}
-	cov-build --dir cov-int make || exit -1
+	cov-build --dir cov-int cmake ${CIRCLE_WORKING_DIRECTORY}/ ${cmake_opts}
+	cov-build --dir cov-int make -j $(nproc --all) || exit -1
 	tar czvf navit.tgz cov-int
 	
 	curl --form token=$COVERITY_TOKEN \
@@ -26,15 +31,10 @@ if [[ "${CIRCLE_PROJECT_USERNAME}" == "navit-gps" && "${CIRCLE_BRANCH}" == "trun
 	curl "https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload" -H "$lp_cookie" -H "Referer: https://translations.launchpad.net/navit/${CIRCLE_BRANCH}/+translations-upload" -F file=@po/navit.pot | grep title
 
 else
-	mkdir ~/linux-bin && cd ~/linux-bin
-	cmake ~/${CIRCLE_PROJECT_REPONAME}/ ${cmake_opts} || exit -1
-	make  || exit -1
+	cmake ${CIRCLE_WORKING_DIRECTORY}/ ${cmake_opts} || exit -1
+	make -j $(nproc --all) || exit -1
 fi
 
 if [[ "$CIRCLE_ARTIFACTS" != "" ]]; then
-	cp -r navit/xpm $CIRCLE_ARTIFACTS
+	cp -r navit/icons $CIRCLE_ARTIFACTS
 fi
-
-
-# Done with the builds tests. Running some app tests 
-bash ~/navit/ci/run_linux_tests.sh
diff --git a/ci/build_tomtom_minimal.sh b/ci/build_tomtom_minimal.sh
index 585f79316..a178b9733 100644
--- a/ci/build_tomtom_minimal.sh
+++ b/ci/build_tomtom_minimal.sh
@@ -8,11 +8,8 @@
 set -e
 
 export ARCH=arm-linux
-cp Toolchain/$ARCH.cmake /tmp
-
-# toolchain
 export TOMTOM_SDK_DIR=/opt/tomtom-sdk
-mkdir -p $TOMTOM_SDK_DIR >/dev/null 2>&1 || export TOMTOM_SDK_DIR=$HOME/tomtom-sdk 
+mkdir -p $TOMTOM_SDK_DIR >/dev/null 2>&1 || export TOMTOM_SDK_DIR=$HOME/tomtom-sdk
 export PREFIX=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/$ARCH/sys-root
 export PATH=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/bin:$PREFIX/bin/:$PATH
 export CFLAGS="-O2 -I$PREFIX/include -I$PREFIX/usr/include"
@@ -28,184 +25,45 @@ export STRIP=$ARCH-strip
 export OBJCOPY=$ARCH-objcopy
 export LN_S="ln -s"
 export PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig
-JOBS=`getconf _NPROCESSORS_ONLN`
-
-echo "Jobs"
-echo $JOBS
-
-mkdir -p ~/tomtom_assets
-
-if ! [ -e "~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz" ]
- then 
-  wget -nv -c https://github.com/navit-gps/dependencies/raw/master/tomtom/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -P ~/tomtom_assets
-fi
-
-if ! test -f "~/tomtom_assets/libpng-1.6.29.tar.gz"
-then 
-  wget -nv -c ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.29.tar.gz -P ~/tomtom_assets
-fi
-
-# toolchain
-cd /tmp
-mkdir -p $TOMTOM_SDK_DIR
-tar xzf ~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -C $TOMTOM_SDK_DIR
-
-
-# zlib
-cd /tmp
-wget -nv -c http://zlib.net/zlib-1.2.11.tar.gz
-tar xzf zlib-1.2.11.tar.gz
-cd zlib-1.2.11
-./configure --prefix=$PREFIX
-make -j$JOBS
-make install
-
-# libxml
-cd /tmp/
-wget -nv -c http://xmlsoft.org/sources/libxml2-2.7.8.tar.gz
-tar xzf libxml2-2.7.8.tar.gz
-cd libxml2-2.7.8/
-./configure --prefix=$PREFIX --host=$ARCH --without-python
-make -j$JOBS
-make install
-
-# libpng
-cd /tmp/
-tar xzf ~/tomtom_assets/libpng-1.6.29.tar.gz
-cd libpng-1.6.29/ 
-./configure --prefix=$PREFIX --host=$ARCH
-make -j$JOBS
-make install
-
-
-cd /tmp
-wget -nv -c http://download.savannah.gnu.org/releases/freetype/freetype-2.5.0.tar.gz
-tar xzf freetype-2.5.0.tar.gz
-cd freetype-2.5.0
-./configure --prefix=$PREFIX --host=$ARCH
-make -j$JOBS
-make install
-
-freetype-config --cflags
-
-# glib
-cd /tmp
-wget -nv -c http://ftp.gnome.org/pub/gnome/sources/glib/2.25/glib-2.25.17.tar.gz
-tar xzf glib-2.25.17.tar.gz
-cd glib-2.25.17
-cat > tomtom.cache << EOF
-glib_cv_long_long_format=ll
-glib_cv_stack_grows=no
-glib_cv_uscore=no
-ac_cv_func_posix_getgrgid_r=yes
-ac_cv_func_posix_getpwuid_r=yes
-EOF
-chmod a-w tomtom.cache
-./configure --prefix=$PREFIX --host=$ARCH --cache-file=tomtom.cache
-sed -i "s|cp xgen-gmc gmarshal.c |cp xgen-gmc gmarshal.c \&\& sed -i \"s\|g_value_get_schar\|g_value_get_char\|g\" gmarshal.c |g" gobject/Makefile
-make -j$JOBS
-make install
-
-
-# tslib
-cd /tmp
-rm -rf tslib-svn
-git clone https://github.com/playya/tslib-svn.git
-cd tslib-svn
-sed -i "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g" configure.ac
-sed -i "119i\#ifdef EVIOCGRAB" plugins/input-raw.c
-sed -i "124i\#endif" plugins/input-raw.c
-sed -i "290i\#ifdef EVIOCGRAB" plugins/input-raw.c
-sed -i "294i\#endif" plugins/input-raw.c
-sed -i "s|# module_raw h3600|module_raw h3600|g" etc/ts.conf # tomtom go 710
-./autogen.sh
-./configure --prefix=$PREFIX --host=$ARCH
-make -j$JOBS
-make install
-
+JOBS=$(nproc --all)
 
-cd /tmp
-wget -nv -c http://www.libsdl.org/release/SDL-1.2.15.tar.gz
-tar xzf SDL-1.2.15.tar.gz
-cd SDL-1.2.15
-wget -nv -c http://tracks.yaina.de/source/sdl-fbcon-notty.patch
-patch -p0 -i sdl-fbcon-notty.patch
-./configure --prefix=$PREFIX --host=$ARCH \
-  --disable-esd --disable-cdrom --disable-joystick --disable-video-x11 \
-  --disable-x11-vm --disable-dga --disable-video-x11-dgamouse \
-  --disable-video-x11-xv --disable-video-x11-xinerama --disable-video-directfb \
-  --enable-video-fbcon --disable-audio CFLAGS="$CFLAGS -DFBCON_NOTTY"
-make -j$JOBS
-make install
-
-# to find sdl-config
-export PATH=$PREFIX/bin:$PATH
-
-# sdl image
-cd /tmp
-wget -nv -c http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz
-tar xzf SDL_image-1.2.12.tar.gz
-cd SDL_image-1.2.12
-./configure --prefix=$PREFIX --host=$ARCH
-make -j$JOBS
-make install
-
-
-# in the end we only want Navit locale
-rm -r $PREFIX/share/locale
-
-
-# navit
-cd ~/navit
-sed -i "s|set ( TOMTOM_SDK_DIR /opt/tomtom-sdk )|set ( TOMTOM_SDK_DIR $TOMTOM_SDK_DIR )|g" /tmp/$ARCH.cmake
 mkdir -p build
-cd build
+pushd build
 cmake ../ -DCMAKE_INSTALL_PREFIX=$PREFIX -DFREETYPE_INCLUDE_DIRS=$PREFIX/include/freetype2/ -Dsupport/gettext_intl=TRUE \
--DHAVE_API_TOMTOM=TRUE -DXSLTS=tomtom -DAVOID_FLOAT=TRUE -Dmap/mg=FALSE -DUSE_PLUGINS=0 -DCMAKE_TOOLCHAIN_FILE=/tmp/$ARCH.cmake \
+-DHAVE_API_TOMTOM=TRUE -DXSLTS=tomtom -DAVOID_FLOAT=TRUE -Dmap/mg=FALSE -DUSE_PLUGINS=0 -DCMAKE_TOOLCHAIN_FILE=../Toolchain/$ARCH.cmake \
 -DDISABLE_QT=ON -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n
 make -j$JOBS
 make install
-cd ..
-
 
 # creating directories
 OUT_PATH="/tmp/tomtom/sdcard"
-rm -rf $OUT_PATH
-mkdir -p $OUT_PATH
-cd $OUT_PATH
-mkdir -p navit
-cd navit
-mkdir -p bin share
-cd share 
-mkdir -p fonts
-cd ..
-
+[ -d $OUT_PATH ] && rm -rf $OUT_PATH
+mkdir -p $OUT_PATH/navit/bin
+mkdir -p $OUT_PATH/navit/share/fonts
+mkdir -p $OUT_PATH/navit/share/icons
+mkdir -p $OUT_PATH/navit/share/maps
+mkdir -p $OUT_PATH/navit/share/locale
 
 # navit executable
-cp $PREFIX/bin/navit bin/
-
+cp navit/navit $OUT_PATH/navit/bin
 
 # fonts
-cp -r ~/navit/navit/fonts/*.ttf $OUT_PATH/navit/share/fonts
+cp -r ../navit/fonts/*.ttf $OUT_PATH/navit/share/fonts
 
 # images and xml
-cd share
-mkdir xpm
-cd xpm
-cp $PREFIX/share/navit/xpm/*16.png ./
-cp $PREFIX/share/navit/xpm/*32.png ./
-cp $PREFIX/share/navit/xpm/*48.png ./
-cp $PREFIX/share/navit/xpm/*64.png ./
-cp $PREFIX/share/navit/xpm/nav*.* ./
-cp $PREFIX/share/navit/xpm/country*.png ./
+cp $PREFIX/share/navit/icons/*16.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/*32.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/*48.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/*64.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/nav*.* $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/country*.png $OUT_PATH/navit/share/icons
 cd ..
 cp $PREFIX/share/navit/navit.xml ./tomtom480.xml
-mkdir -p maps
-
 
 # locale
-cp -r $PREFIX/share/locale ./
+cp -r $PREFIX/share/locale $OUT_PATH/navit/share/locale
 
 
 cd $OUT_PATH
-zip -r $CIRCLE_ARTIFACTS/navitom_minimal.zip navit
+mkdir /output
+zip -r /output/navitom_minimal.zip navit
diff --git a/ci/build_tomtom_plugin.sh b/ci/build_tomtom_plugin.sh
index 6acf3b376..51a15f815 100644
--- a/ci/build_tomtom_plugin.sh
+++ b/ci/build_tomtom_plugin.sh
@@ -27,472 +27,114 @@ export STRIP=$ARCH-strip
 export OBJCOPY=$ARCH-objcopy
 export LN_S="ln -s"
 export PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig
-JOBS=`getconf _NPROCESSORS_ONLN`
+JOBS=$(nproc --all) 
 
 echo "Jobs"
 echo $JOBS
 
-mkdir -p ~/tomtom_assets
-
-if ! [ -e "~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz" ]
- then 
-  wget -nv -c https://github.com/navit-gps/dependencies/raw/master/tomtom/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -P ~/tomtom_assets
-fi
-
-if ! test -f "~/tomtom_assets/libpng-1.6.29.tar.gz"
-then 
-  wget -nv -c ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.29.tar.gz -P ~/tomtom_assets
-fi
-
-# toolchain
-cd /tmp
-mkdir -p $TOMTOM_SDK_DIR
-tar xzf ~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -C $TOMTOM_SDK_DIR
-
 # espeak
-cd /tmp
+pushd /tmp
 # this one includes the precompiled voices
 wget -nv -c http://freefr.dl.sourceforge.net/project/espeak/espeak/espeak-1.48/espeak-1.48.04-source.zip
 unzip espeak-1.48.04-source.zip
-cd espeak-1.48.04-source
+pushd espeak-1.48.04-source
 sed -i "s/PREFIX=\/usr//g" src/Makefile
 sed -i "s/DATADIR=\/usr\/share\/espeak-data/DATADIR=~\/share\/espeak-data/g" src/Makefile
 sed -i "s/AUDIO = portaudio/#AUDIO = portaudio/g" src/Makefile
 sed -i "s/-fvisibility=hidden//g" src/Makefile
 cat src/Makefile
 make -C src
-cd src
-make install
-
-# http://forum.navit-project.org/viewtopic.php?f=17&t=568
-cd /tmp
-cat > /tmp/espeakdsp.c << EOF
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/soundcard.h>
-#include <sys/wait.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
-#define IBUFFERLEN 1024
-#define MAXARGC 30
-
-
-int  main(int argc, char *argv[],char *envp[])
-{
-	int pipefd[2];
-	pid_t cpid;
-	char buf;
-	int co,wp,l,fh;
-	short bufi[IBUFFERLEN],bufo[IBUFFERLEN*2];	 
-	int rate=22050;
-
-	char *newargv[MAXARGC+2];
-
-	for(co=0;co<argc;co++)
-	{
-		if(co>=MAXARGC)break;
-		newargv[co]=argv[co];
-	}
-	newargv[co++]="--stdout";
-	newargv[co++]=NULL;
-
-	if (pipe(pipefd) == -1)
-	{
-		perror("pipe");
-		exit(EXIT_FAILURE);
-	}
-
-	if(setpriority(PRIO_PROCESS,0,-10))
-	perror ("setpriority");
-
-	cpid = fork();
-	if (cpid == -1)
-	{
-		perror("fork");
-		exit(EXIT_FAILURE);
-	}
-
-	if (cpid == 0)
-	{    /* Child writes to pipe */
-
-		close(pipefd[0]);          /* Close unused read end */
-		dup2(pipefd[1],1);	
-		execve("/mnt/sdcard/navit/bin/espeak",newargv,envp);	      
-		perror("exec /mnt/sdcard/navit/bin/espeak");	
-		close(pipefd[1]);          /* Reader will see EOF */
-		wait(NULL);                /* Wait for child */
-		exit(EXIT_SUCCESS);
-
-	} else { /* Parent read from  pipe */
-
-		close(pipefd[1]);          /* Close unused write end */
-
-		l=read(pipefd[0],bufi,64);
-		if(memcmp(bufi,"RIFF",4))
-		{
-			while(l>0)
-			{
-				write(1,bufi,l);
-				l=read(pipefd[0],bufi,IBUFFERLEN);
-			}
-			exit(EXIT_SUCCESS);
-		}
-		l=read(pipefd[0],bufi,IBUFFERLEN);
-		if(l<500)
-		{
-			printf("espeakdsp: avoid noise speaking a empty string\n");
-			exit(EXIT_SUCCESS); 	
-		} 			
-		usleep (50000);
-
-		fh=open("/dev/dsp",O_WRONLY);
-		if(fh<0)
-		{
-			perror("open /dev/dsp");	
-			exit(EXIT_FAILURE);
-		}
-		ioctl(fh, SNDCTL_DSP_SPEED , &rate);
-		ioctl(fh, SNDCTL_DSP_SYNC, 0);
-		while(l)
-		{
-			for(co=0,wp=0;co<IBUFFERLEN;co++)
-			{
-				bufo[wp++]=bufi[co]; /* mono->stereo */
-				bufo[wp++]=bufi[co];
-			}
-			write (fh,bufo,wp);
-			l=read(pipefd[0],bufi,IBUFFERLEN);
-		}
-		ioctl(fh, SNDCTL_DSP_SYNC, 0);
-		close(pipefd[0]);
-		exit(EXIT_SUCCESS);
-	}
-}
-EOF
-arm-linux-gcc -O2 -I$PREFIX/include -I$PREFIX/usr/include espeakdsp.c -o espeakdsp
-
-# zlib
-cd /tmp
-wget -nv -c http://zlib.net/zlib-1.2.11.tar.gz
-tar xzf zlib-1.2.11.tar.gz
-cd zlib-1.2.11
-./configure --prefix=$PREFIX
-make -j$JOBS
-make install
-
-# libxml
-cd /tmp/
-wget -nv -c http://xmlsoft.org/sources/libxml2-2.7.8.tar.gz
-tar xzf libxml2-2.7.8.tar.gz
-cd libxml2-2.7.8/
-./configure --prefix=$PREFIX --host=$ARCH --without-python
-make -j$JOBS
-make install
-
-# libpng
-cd /tmp/
-tar xzf ~/tomtom_assets/libpng-1.6.29.tar.gz
-cd libpng-1.6.29/ 
-./configure --prefix=$PREFIX --host=$ARCH
-make -j$JOBS
-make install
-
-
-cd /tmp
-wget -nv -c http://download.savannah.gnu.org/releases/freetype/freetype-2.5.0.tar.gz
-tar xzf freetype-2.5.0.tar.gz
-cd freetype-2.5.0
-./configure --prefix=$PREFIX --host=$ARCH
-make -j$JOBS
-make install
-
-freetype-config --cflags
-
-# glib
-cd /tmp
-wget -nv -c http://ftp.gnome.org/pub/gnome/sources/glib/2.25/glib-2.25.17.tar.gz
-tar xzf glib-2.25.17.tar.gz
-cd glib-2.25.17
-cat > tomtom.cache << EOF
-glib_cv_long_long_format=ll
-glib_cv_stack_grows=no
-glib_cv_uscore=no
-ac_cv_func_posix_getgrgid_r=yes
-ac_cv_func_posix_getpwuid_r=yes
-EOF
-chmod a-w tomtom.cache
-./configure --prefix=$PREFIX --host=$ARCH --cache-file=tomtom.cache
-sed -i "s|cp xgen-gmc gmarshal.c |cp xgen-gmc gmarshal.c \&\& sed -i \"s\|g_value_get_schar\|g_value_get_char\|g\" gmarshal.c |g" gobject/Makefile
-make -j$JOBS
-make install
-
-
-# tslib
-cd /tmp
-rm -rf tslib-svn
-git clone https://github.com/playya/tslib-svn.git
-cd tslib-svn
-sed -i "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g" configure.ac
-sed -i "119i\#ifdef EVIOCGRAB" plugins/input-raw.c
-sed -i "124i\#endif" plugins/input-raw.c
-sed -i "290i\#ifdef EVIOCGRAB" plugins/input-raw.c
-sed -i "294i\#endif" plugins/input-raw.c
-sed -i "s|# module_raw h3600|module_raw h3600|g" etc/ts.conf # tomtom go 710
-./autogen.sh
-./configure --prefix=$PREFIX --host=$ARCH
-make -j$JOBS
+pushd src
 make install
-
-
-cd /tmp
-wget -nv -c http://www.libsdl.org/release/SDL-1.2.15.tar.gz
-tar xzf SDL-1.2.15.tar.gz
-cd SDL-1.2.15
-wget -nv -c http://tracks.yaina.de/source/sdl-fbcon-notty.patch
-patch -p0 -i sdl-fbcon-notty.patch
-./configure --prefix=$PREFIX --host=$ARCH \
-  --disable-esd --disable-cdrom --disable-joystick --disable-video-x11 \
-  --disable-x11-vm --disable-dga --disable-video-x11-dgamouse \
-  --disable-video-x11-xv --disable-video-x11-xinerama --disable-video-directfb \
-  --enable-video-fbcon --disable-audio CFLAGS="$CFLAGS -DFBCON_NOTTY"
-make -j$JOBS
-make install
-
-# sdl test utilities
-cd test
-./configure --prefix=$PREFIX --host=$ARCH
-make testvidinfo
-cp testvidinfo $PREFIX/usr/bin/
-
-# to find sdl-config
-export PATH=$PREFIX/bin:$PATH
-
-# sdl image
-cd /tmp
-wget -nv -c http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz
-tar xzf SDL_image-1.2.12.tar.gz
-cd SDL_image-1.2.12
-./configure --prefix=$PREFIX --host=$ARCH
-make -j$JOBS
-make install
-
-
-# in the end we only want Navit locale
-rm -r $PREFIX/share/locale
-
-cat > ~/navit/navit/xpm/tomtom_minus.svg << EOF
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="64px" height="64px" viewBox="-100 -100 200 200" xmlns="http://www.w3.org/2000/svg" version="1.1">
-<rect x="-110" y="-110" width="220" height="220" fill="#000080" stroke="none" opacity="0.5"/>
-<path fill="none" stroke="#ffffff" stroke-width="20" stroke-linecap="round" d="M 60 0 L -60 0"/>
-</svg>
-EOF
-
-cat > ~/navit/navit/xpm/tomtom_plus.svg << EOF
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="64px" height="64px" viewBox="-100 -100 200 200" xmlns="http://www.w3.org/2000/svg" version="1.1">
-<rect x="-110" y="-110" width="220" height="220" fill="#000080" stroke="none" opacity="0.5"/>
-<path fill="none" stroke="#ffffff" stroke-width="20" stroke-linecap="round" d="M 0 60 L 0 -60 M 60 0 L -60 0"/>
-</svg>
-EOF
+popd # src
+popd # espeak-*
+popd # /tmp
 
 
 # navit
-cd ~/navit
-sed -i "s|set ( TOMTOM_SDK_DIR /opt/tomtom-sdk )|set ( TOMTOM_SDK_DIR $TOMTOM_SDK_DIR )|g" /tmp/$ARCH.cmake
 mkdir -p build
-cd build
+pushd build
 cmake ../ -DCMAKE_INSTALL_PREFIX=$PREFIX -DFREETYPE_INCLUDE_DIRS=$PREFIX/include/freetype2/ -Dsupport/gettext_intl=TRUE \
 -DHAVE_API_TOMTOM=TRUE -DXSLTS=tomtom -DAVOID_FLOAT=TRUE -Dmap/mg=FALSE -DUSE_PLUGINS=0 -DCMAKE_TOOLCHAIN_FILE=/tmp/$ARCH.cmake \
 -DDISABLE_QT=ON -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n
 make -j$JOBS
 make install
-cd ..
-
 
 # creating directories
 OUT_PATH="/tmp/tomtom/sdcard"
-rm -rf $OUT_PATH
-mkdir -p $OUT_PATH
-cd $OUT_PATH
-mkdir -p navit SDKRegistry
-cd navit
-mkdir -p bin lib share sdl ts
-cd share 
-mkdir -p fonts
-cd ..
-
-
-cp $PREFIX/lib/libfreetype.so.6 lib
-cp $PREFIX/lib/libSDL-1.2.so.0 lib
-cp $PREFIX/lib/libSDL_image-1.2.so.0 lib
-cp $PREFIX/lib/libfreetype.so.6 lib
-cp $PREFIX/lib/libgio-2.0.so lib
-cp $PREFIX/lib/libglib-2.0.so lib/libglib-2.0.so.0
-cp $PREFIX/lib/libgmodule-2.0.so lib/libgmodule-2.0.so.0
-cp $PREFIX/lib/libgobject-2.0.so lib/libgobject-2.0.so.0
-cp $PREFIX/lib/libgthread-2.0.so lib/libgthread-2.0.so.0
-cp $PREFIX/lib/libpng16.so.16 lib
-cp $PREFIX/lib/libts-1.0.so.0 lib
-cp $PREFIX/lib/libxml2.so.2 lib
-cp $PREFIX/lib/libz.so.1 lib
-cp $PREFIX/etc/ts.conf ts
-cp $TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/$ARCH/lib/libstdc++.so.5 lib
+[ -d $OUT_PATH ] && rm -rf $OUT_PATH
+mkdir -p $OUT_PATH/navit/bin
+mkdir -p $OUT_PATH/navit/lib
+mkdir -p $OUT_PATH/navit/sdl
+mkdir -p $OUT_PATH/navit/ts
+mkdir -p $OUT_PATH/navit/share/fonts
+mkdir -p $OUT_PATH/navit/share/icons
+mkdir -p $OUT_PATH/navit/share/maps
+mkdir -p $OUT_PATH/navit/share/locale
+
+cp $PREFIX/lib/libfreetype.so.6 $OUT_PATH/navit/lib
+cp $PREFIX/lib/libSDL-1.2.so.0 $OUT_PATH/navit/lib
+cp $PREFIX/lib/libSDL_image-1.2.so.0 $OUT_PATH/navit/lib
+cp $PREFIX/lib/libfreetype.so.6 $OUT_PATH/navit/lib
+cp $PREFIX/lib/libgio-2.0.so $OUT_PATH/navit/lib
+cp $PREFIX/lib/libglib-2.0.so $OUT_PATH/navit/lib/libglib-2.0.so.0
+cp $PREFIX/lib/libgmodule-2.0.so $OUT_PATH/navit/lib/libgmodule-2.0.so.0
+cp $PREFIX/lib/libgobject-2.0.so $OUT_PATH/navit/lib/libgobject-2.0.so.0
+cp $PREFIX/lib/libgthread-2.0.so $OUT_PATH/navit/lib/libgthread-2.0.so.0
+cp $PREFIX/lib/libpng16.so.16 $OUT_PATH/navit/lib
+cp $PREFIX/lib/libts-1.0.so.0 $OUT_PATH/navit/lib
+cp $PREFIX/lib/libxml2.so.2 $OUT_PATH/navit/lib
+cp $PREFIX/lib/libz.so.1 $OUT_PATH/navit/lib
+cp $TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/$ARCH/lib/libstdc++.so.5 $OUT_PATH/navit/lib
+cp $PREFIX/etc/ts.conf $OUT_PATH/navit/ts
 
 # flite
 # cp $PREFIX/bin/flite* bin/
 
+# http://forum.navit-project.org/viewtopic.php?f=17&t=568
+arm-linux-gcc -O2 -I$PREFIX/include -I$PREFIX/usr/include ../contrib/tomtom/espeakdsp.c -o $OUT_PATH/navit/bin/espeakdsp
+
 # SDL testvidinfo
-cp $PREFIX/usr/bin/testvidinfo sdl/
+cp $PREFIX/usr/bin/testvidinfo $OUT_PATH/navit/sdl
 
 # navit executable and wrapper
-cp $PREFIX/bin/navit bin/
-cat > bin/navit-wrapper << 'EOF'
-#!/bin/sh
-
-cd /mnt/sdcard/navit/bin
-
-# Set some paths.
-export PATH=$PATH:/mnt/sdcard/navit/bin
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/mnt/sdcard/navit/lib:/mnt/sdcard/LoquendoTTS/lib
-export HOME=/mnt/sdcard/navit
-export NAVIT_LIBDIR=/mnt/sdcard/navit/lib/navit
-export NAVIT_SHAREDIR=/mnt/sdcard/navit/share
-export NAVIT_LOCALEDIR=/mnt/sdcard/navit/share/locale
-
-# tslib requirements.
-export TSLIB_CONSOLEDEVICE=none
-export TSLIB_FBDEVICE=/dev/fb
-export TSLIB_TSDEVICE=/dev/ts
-export TSLIB_CALIBFILE=/mnt/sdcard/navit/ts/pointercal
-export TSLIB_CONFFILE=/mnt/sdcard/navit/ts/ts.conf
-export TSLIB_PLUGINDIR=/mnt/sdcard/navit/lib/ts
-
-# SDL requirements.
-export SDL_MOUSEDRV=TSLIB
-export SDL_MOUSEDEV=$TSLIB_TSDEVICE
-export SDL_NOMOUSE=1
-export SDL_FBDEV=/dev/fb
-export SDL_VIDEODRIVER=fbcon
-export SDL_AUDIODRIVER=dsp
-
-# Set time zone.
-export TZ="CEDT-01:00:00CEST-02:00:00,M3.4.0,M10.4.0"
-
-# Set language.
-export LANG=en_US
-
-export ESPEAK_DATA_PATH=/mnt/sdcard/navit/share
-
-# Run Navit.
-if /mnt/sdcard/navit/sdl/testvidinfo | grep 480x272
-then
-	/mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/tomtom480.xml 2>/mnt/sdcard/navit/navit.log&
-# tomtom320xml is not provided yet
-# elif  /mnt/sdcard/navit/sdl/testvidinfo | grep 320x240
-# then
-# 	/mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/config/tomtom320.xml 2>/mnt/sdcard/navit/navit.log&
-else
-	exit 1
-fi
-
-# Kill TTN while Navit is running.
-killall ttn
-
-while [ $? -eq 0 ]
-do
-echo "\0" > /dev/watchdog
-sleep 10
-ps | grep -v grep | grep -v wrapper | grep navit
-done
-
-/sbin/reboot
-
-EOF
-chmod a+rx bin/navit-wrapper
+cp $PREFIX/bin/navit $OUT_PATH/navit/bin
+cp ../contrib/tomtom/navit-wrapper $OUT_PATH/navit/bin/navit-wrapper 
 
 # fonts
-cp -r ~/navit/navit/fonts/*.ttf $OUT_PATH/navit/share/fonts
+cp -r ../navit/fonts/*.ttf $OUT_PATH/navit/share/fonts
 
 # ts
 cp -r $PREFIX/lib/ts $OUT_PATH/navit/lib/
 cp $PREFIX/bin/ts_* $OUT_PATH/navit/ts/
 
 # images and xml
-cd share
-mkdir xpm
-cd xpm
-cp $PREFIX/share/navit/xpm/*16.png ./
-cp $PREFIX/share/navit/xpm/*32.png ./
-cp $PREFIX/share/navit/xpm/*48.png ./
-cp $PREFIX/share/navit/xpm/*64.png ./
-cp $PREFIX/share/navit/xpm/nav*.* ./
-cp $PREFIX/share/navit/xpm/country*.png ./
-cd ..
+cp $PREFIX/share/navit/icons/*16.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/*32.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/*48.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/*64.png $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/nav*.* $OUT_PATH/navit/share/icons
+cp $PREFIX/share/navit/icons/country*.png $OUT_PATH/navit/share/icons
 cp $PREFIX/share/navit/navit.xml ./tomtom480.xml
-mkdir -p maps
 
 
 # locale
-cp -r $PREFIX/share/locale ./
+cp -r $PREFIX/share/locale $OUT_PATH/navit/share/locale
 
 # espeak
-cp -r ~/share/espeak-data ./
+cp -r ~/share/espeak-data $OUT_PATH/navit/share/
 cp $PREFIX/bin/espeak $OUT_PATH/navit/bin/
 cp $PREFIX/lib/libespeak.so.1 $OUT_PATH/navit/lib
 
-mv /tmp/espeakdsp $OUT_PATH/navit/bin/
-
 # add a menu button
-cat > $OUT_PATH/SDKRegistry/navit.cap << EOF
-Version|100|
-AppName|navit-wrapper|
-AppPath|/mnt/sdcard/navit/bin/|
-AppIconFile|navit.bmp|
-AppMainTitle|Navit|
-AppPort|2001|
-COMMAND|CMD|hallo|navit.bmp|Navit|
-EOF
-
+cp -r ../contrib/tomtom/SDKRegistry/ $OUT_PATH/
+cp -r ../contrib/tomtom/ts $OUT_PATH/
 
 convert $PREFIX/share/icons/hicolor/128x128/apps/navit.png  -type truecolor -crop 100x100+12+28 -resize 48x48 $OUT_PATH/SDKRegistry/navit.bmp
-convert -background none ~/navit/navit/xpm/tomtom_plus.svg -resize 80x80 $OUT_PATH/navit/share/xpm/tomtom_plus_80_80.png
-convert -background none ~/navit/navit/xpm/tomtom_minus.svg -resize 80x80 $OUT_PATH/navit/share/xpm/tomtom_minus_80_80.png
-
-cat > $OUT_PATH/SDKRegistry/ts.cap << EOF
-Version|100|
-AppName|ts-wrapper|
-AppPath|/mnt/sdcard/navit/ts/|
-AppIconFile||
-AppMainTitle|Touchscreen|
-AppPort||
-COMMAND|CMD|hallo||Touchscreen|
-EOF
-
-
-cat > $OUT_PATH/navit/ts/ts-wrapper << EOF
-#!/bin/sh
-
-cd /mnt/sdcard
-
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/mnt/sdcard/navit/lib
-
-export TSLIB_CONSOLEDEVICE=none
-export TSLIB_FBDEVICE=/dev/fb
-export TSLIB_TSDEVICE=/dev/ts
-export TSLIB_CALIBFILE=/mnt/sdcard/navit/ts/pointercal
-export TSLIB_CONFFILE=/mnt/sdcard/navit/ts/ts.conf
-export TSLIB_PLUGINDIR=/mnt/sdcard/navit/lib/ts
+convert -background none ../navit/icons/tomtom_plus.svg -resize 80x80 $OUT_PATH/navit/share/icons/tomtom_plus_80_80.png
+convert -background none ../navit/icons/tomtom_minus.svg -resize 80x80 $OUT_PATH/navit/share/icons/tomtom_minus_80_80.png
 
-/mnt/sdcard/navit/ts/ts_calibrate
-/mnt/sdcard/navit/ts/ts_test
-EOF
 
 cd $OUT_PATH
-zip -r $CIRCLE_ARTIFACTS/navitom.zip navit SDKRegistry
+mkdir /output
+zip -r /output/navitom_plugin.zip navit SDKRegistry ts
diff --git a/ci/build_win32.sh b/ci/build_win32.sh
index de5156843..47b05b9d2 100644
--- a/ci/build_win32.sh
+++ b/ci/build_win32.sh
@@ -1,8 +1,8 @@
-sudo apt-get install mingw32 mingw32-binutils mingw32-runtime default-jdk nsis
+apt-get update && apt-get install -y mingw32 mingw32-binutils mingw32-runtime default-jdk nsis
 
 mkdir win32
 pushd win32
-cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make && make package
+cmake -Dbinding/python:BOOL=FALSE -DSAMPLE_MAP=n -DCMAKE_TOOLCHAIN_FILE=../Toolchain/mingw32.cmake ../ && make -j $(nproc --all)  && make -j $(nproc --all) package
 popd
 
 cp win32/*.exe $CIRCLE_ARTIFACTS/
diff --git a/ci/build_wince.sh b/ci/build_wince.sh
new file mode 100644
index 000000000..7d0b3b471
--- /dev/null
+++ b/ci/build_wince.sh
@@ -0,0 +1,3 @@
+mkdir wince && cd wince
+cmake ../ -DCMAKE_TOOLCHAIN_FILE=Toolchain/arm-mingw32ce.cmake -DXSLTS=windows -DCACHE_SIZE=10485760 -Dsvg2png_scaling:STRING=16,32 -Dsvg2png_scaling_nav:STRING=32 -Dsvg2png_scaling_flag=16 -DSAMPLE_MAP=n 
+make
diff --git a/ci/docker/tomtom/Dockerfile b/ci/docker/tomtom/Dockerfile
new file mode 100644
index 000000000..adddbdbf8
--- /dev/null
+++ b/ci/docker/tomtom/Dockerfile
@@ -0,0 +1,106 @@
+FROM ubuntu:14.04
+
+RUN apt-get update  && apt-get install -y libglib2.0-dev git autogen autoconf libtool imagemagick zip \
+	wget build-essential gettext cmake \
+	&& apt-get clean && apt-get autoremove && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN dpkg --add-architecture i386 && apt-get update \
+	&& apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386 \
+	&& apt-get clean && apt-get autoremove && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+ENV ARCH=arm-linux
+ENV TOMTOM_SDK_DIR=/opt/tomtom-sdk
+ENV PREFIX=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/$ARCH/sys-root
+ENV PATH=$TOMTOM_SDK_DIR/gcc-3.3.4_glibc-2.3.2/bin:$PREFIX/bin/:$PATH
+ENV CFLAGS="-O2 -I$PREFIX/include -I$PREFIX/usr/include"
+ENV CPPFLAGS="-I$PREFIX/include -I$PREFIX/usr/include"
+ENV LDFLAGS="-L$PREFIX/lib -L$PREFIX/usr/lib"
+ENV CC=$ARCH-gcc
+ENV CXX=$ARCH-g++
+ENV LD=$ARCH-ld
+ENV NM="$ARCH-nm -B"
+ENV AR=$ARCH-ar
+ENV RANLIB=$ARCH-ranlib
+ENV STRIP=$ARCH-strip
+ENV OBJCOPY=$ARCH-objcopy
+ENV LN_S="ln -s"
+ENV PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig
+RUN mkdir -p $TOMTOM_SDK_DIR
+
+RUN wget -nv -c https://github.com/navit-gps/dependencies/raw/master/tomtom/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -P /tmp \
+	&& tar xzf /tmp/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -C $TOMTOM_SDK_DIR \
+	&& rm /tmp/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz
+
+# zlib
+RUN wget -nv -c http://zlib.net/zlib-1.2.11.tar.gz -P /tmp && cd /tmp/ \
+	&& tar xzf zlib-1.2.11.tar.gz && cd zlib-1.2.11 \
+	&& ./configure --prefix=$PREFIX && make && make install \
+	&& rm -rf /tmp/zlib-1.2.11 /tmp/zlib-1.2.11.tar.gz
+
+# libxml
+RUN  wget -nv -c http://xmlsoft.org/sources/libxml2-2.7.8.tar.gz -P /tmp && cd /tmp/ \
+	&& tar xzf libxml2-2.7.8.tar.gz && cd libxml2-2.7.8/ \
+	&& ./configure --prefix=$PREFIX --host=$ARCH --without-python && make && make install \
+	&& rm -rf /tmp/libxml2-2.7.8/ /tmp/libxml2-2.7.8.tar.gz
+
+# libpng
+RUN wget -nv -c https://github.com/navit-gps/dependencies/raw/master/tomtom/libpng-1.6.29.tar.gz -P /tmp && cd /tmp/ \
+	&& tar xzf libpng-1.6.29.tar.gz && cd libpng-1.6.29/ \
+	&& ./configure --prefix=$PREFIX --host=$ARCH  && make && make install \
+	&& rm -rf /tmp/libpng-1.6.29/ /tmp/libpng-1.6.29.tar.gz
+
+# Freetype
+RUN wget -nv -c http://download.savannah.gnu.org/releases/freetype/freetype-2.5.0.tar.gz -P /tmp && cd /tmp/ \
+	&& tar xzf freetype-2.5.0.tar.gz && cd freetype-2.5.0 \
+	&& ./configure --prefix=$PREFIX --host=$ARCH &&  make && make install \
+	&& rm -rf /tmp/freetype-2.5.0 /tmp/freetype-2.5.0.tar.gz
+ 
+# freetype-config --cflags
+
+# glib
+
+# chmod a-w tomtom.cache
+COPY tomtom.cache /tmp/
+
+RUN wget -nv -c http://ftp.gnome.org/pub/gnome/sources/glib/2.25/glib-2.25.17.tar.gz -P /tmp && cd /tmp / \
+	&& tar xzf glib-2.25.17.tar.gz && cd glib-2.25.17 \
+	&& mv /tmp/tomtom.cache . \
+	&& ./configure --prefix=$PREFIX --host=$ARCH --cache-file=tomtom.cache \
+	&& sed -i "s|cp xgen-gmc gmarshal.c |cp xgen-gmc gmarshal.c \&\& sed -i \"s\|g_value_get_schar\|g_value_get_char\|g\" gmarshal.c |g" gobject/Makefile \
+	&& make && make install \
+	&& rm -rf /tmp/glib-2.25.17 /tmp/glib-2.25.17.tar.gz
+
+# tslib
+RUN git clone https://github.com/playya/tslib-svn.git /tmp/tslib-svn  && cd /tmp/tslib-svn/ \
+	&& sed -i "s|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g" configure.ac \
+	&& sed -i "119i\#ifdef EVIOCGRAB" plugins/input-raw.c \
+	&& sed -i "124i\#endif" plugins/input-raw.c \
+	&& sed -i "290i\#ifdef EVIOCGRAB" plugins/input-raw.c \
+	&& sed -i "294i\#endif" plugins/input-raw.c \
+	&& sed -i "s|# module_raw h3600|module_raw h3600|g" etc/ts.conf \
+	&& ./autogen.sh && ./configure --prefix=$PREFIX --host=$ARCH \
+	&& make && make install \
+	&& rm -rf /tmp/tslib-svn/
+
+# SDL
+RUN wget -nv -c http://www.libsdl.org/release/SDL-1.2.15.tar.gz -P /tmp && cd /tmp/ \
+	&& tar xzf SDL-1.2.15.tar.gz && cd SDL-1.2.15 \
+	&& wget -nv -c http://tracks.yaina.de/source/sdl-fbcon-notty.patch \
+	&& patch -p0 -i sdl-fbcon-notty.patch \
+	&& ./configure --prefix=$PREFIX --host=$ARCH \
+	   --disable-esd --disable-cdrom --disable-joystick --disable-video-x11 \
+	   --disable-x11-vm --disable-dga --disable-video-x11-dgamouse \
+	   --disable-video-x11-xv --disable-video-x11-xinerama --disable-video-directfb \
+	   --enable-video-fbcon --disable-audio CFLAGS="$CFLAGS -DFBCON_NOTTY" \
+	&& make && make install \
+	&& cd test && ./configure --prefix=$PREFIX --host=$ARCH \
+	&& make testvidinfo && cp testvidinfo $PREFIX/usr/bin/ \
+	&& rm -rf /tmp/SDL-1.2.15 /tmp/SDL-1.2.15.tar.gz
+
+# sdl image
+RUN wget -nv -c http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz -P /tmp/ && cd /tmp/ \
+	&& tar xzf SDL_image-1.2.12.tar.gz && cd SDL_image-1.2.12 \
+	&& ./configure --prefix=$PREFIX --host=$ARCH && make && make install \
+	&& rm -rf /tmp/SDL_image-1.2.12 /tmp/SDL_image-1.2.12.tar.gz
+
+COPY entrypoint.sh /
+CMD bash /entrypoint.sh
diff --git a/ci/docker/tomtom/README.md b/ci/docker/tomtom/README.md
new file mode 100644
index 000000000..badaf2707
--- /dev/null
+++ b/ci/docker/tomtom/README.md
@@ -0,0 +1,7 @@
+This is the code used to build the image available at https://hub.docker.com/r/navit/tomtom-build-image/
+
+If you want to build and use that image locally, you can do the following:
+docker build . -t navit/tomtom-build-image
+docker run -ti -v /tmp:/output navit/tomtom-build-image /bin/bash /entrypoint.sh
+
+The resulting build will be in your /tmp/ folder.
diff --git a/ci/docker/tomtom/entrypoint.sh b/ci/docker/tomtom/entrypoint.sh
new file mode 100644
index 000000000..e70e1cb5e
--- /dev/null
+++ b/ci/docker/tomtom/entrypoint.sh
@@ -0,0 +1,3 @@
+git clone https://github.com/navit-gps/navit.git
+cd navit
+bash ci/build_tomtom_minimal.sh
diff --git a/ci/docker/tomtom/tomtom.cache b/ci/docker/tomtom/tomtom.cache
new file mode 100644
index 000000000..ea2cb3faf
--- /dev/null
+++ b/ci/docker/tomtom/tomtom.cache
@@ -0,0 +1,5 @@
+glib_cv_long_long_format=ll
+glib_cv_stack_grows=no
+glib_cv_uscore=no
+ac_cv_func_posix_getgrgid_r=yes
+ac_cv_func_posix_getpwuid_r=yes
diff --git a/ci/setup_android.sh b/ci/setup_android.sh
new file mode 100644
index 000000000..64e250635
--- /dev/null
+++ b/ci/setup_android.sh
@@ -0,0 +1,34 @@
+apt-get update && apt-get install -y software-properties-common
+add-apt-repository -y ppa:openjdk-r/ppa
+apt-get update && apt-get install -y openjdk-8-jdk wget expect git curl libsaxonb-java ant
+apt-get remove -y openjdk-7-jre-headless
+
+export ANDROID_SDK_HOME=/opt/android-sdk-linux
+export ANDROID_HOME=/opt/android-sdk-linux
+
+cd /opt && wget -q https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz -O android-sdk.tgz
+cd /opt && tar -xvzf android-sdk.tgz
+cd /opt && rm -f android-sdk.tgz
+
+export PATH=${PATH}:${ANDROID_SDK_HOME}/tools:${ANDROID_SDK_HOME}/platform-tools:/opt/tools
+
+echo y | android update sdk --no-ui --all --filter platform-tools | grep 'package installed'
+#RUN echo y | android update sdk --no-ui --all --filter extra-android-support | grep 'package installed'
+
+echo y | android update sdk --no-ui --all --filter android-25 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter android-24 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter android-23 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter android-18 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter android-16 | grep 'package installed'
+
+echo y | android update sdk --no-ui --all --filter build-tools-25.0.3 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-25.0.2 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-25.0.1 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-25.0.0 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-24.0.3 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-24.0.2 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-24.0.1 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-23.0.3 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-23.0.2 | grep 'package installed'
+echo y | android update sdk --no-ui --all --filter build-tools-23.0.1 | grep 'package installed'
+
diff --git a/ci/setup_common_requirements.sh b/ci/setup_common_requirements.sh
new file mode 100644
index 000000000..f5fa73cef
--- /dev/null
+++ b/ci/setup_common_requirements.sh
@@ -0,0 +1 @@
+apt-get update && apt-get install -y wget unzip cmake build-essential gettext
diff --git a/ci/setup_tomtom_requirements.sh b/ci/setup_tomtom_requirements.sh
index 8ed1c158f..00bd33c44 100644
--- a/ci/setup_tomtom_requirements.sh
+++ b/ci/setup_tomtom_requirements.sh
@@ -1,12 +1,17 @@
 #!/bin/sh
 # this builds navit for tomtom
-# in case you want to build a plugin for tomtom use build_tomtom_plugin.sh instead
-# in case you want to build a standalone system
-# https://github.com/george-hopkins/opentom
-# https://github.com/gefin/opentom
 
 set -e
 
+# install additional packages to build TT evitonment and navit
+apt-get install -y libglib2.0-dev git autogen autoconf libtool imagemagick zip
+dpkg --add-architecture i386
+apt-get update
+apt-get install -y libc6:i386 libncurses5:i386 libstdc++6:i386
+
+#remove disturbing build artefact for second run
+rm -f /opt/tomtom-sdk/gcc-3.3.4_glibc-2.3.2/arm-linux/sys-root/bin//glib-genmarshal
+
 export ARCH=arm-linux
 cp Toolchain/$ARCH.cmake /tmp
 
@@ -28,33 +33,34 @@ export STRIP=$ARCH-strip
 export OBJCOPY=$ARCH-objcopy
 export LN_S="ln -s"
 export PKG_CONFIG_LIBDIR=$PREFIX/lib/pkgconfig
-JOBS=`getconf _NPROCESSORS_ONLN`
+JOBS=$(nproc --all) 
 
 echo "Jobs"
 echo $JOBS
 
-mkdir -p ~/assets/tomtom/
+mkdir -p ~/tomtom_assets
 
-if ! [ -e "~/assets/tomtom/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz" ]
+if ! [ -e "~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz" ]
  then 
-  wget -nv -c http://www.tomtom.com/gpl/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -P ~/assets/tomtom
+  wget -nv -c https://github.com/navit-gps/dependencies/raw/master/tomtom/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -P ~/tomtom_assets
 fi
 
-if ! test -f "~/assets/tomtom/libpng-1.6.29.tar.gz"
+if ! test -f "~/tomtom_assets/libpng-1.6.29.tar.gz"
 then 
-  wget -nv -c ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng16/libpng-1.6.29.tar.gz -P ~/assets/tomtom
+  wget -nv -c https://github.com/navit-gps/dependencies/raw/master/tomtom/libpng-1.6.29.tar.gz -P ~/tomtom_assets
 fi
 
 # toolchain
 cd /tmp
 mkdir -p $TOMTOM_SDK_DIR
-tar xzf ~/assets/tomtom/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -C $TOMTOM_SDK_DIR
+tar xzf ~/tomtom_assets/toolchain_redhat_gcc-3.3.4_glibc-2.3.2-20060131a.tar.gz -C $TOMTOM_SDK_DIR
+
 
 # zlib
 cd /tmp
-wget -nv -c http://zlib.net/zlib-1.2.9.tar.gz
-tar xzf zlib-1.2.9.tar.gz
-cd zlib-1.2.9
+wget -nv -c http://zlib.net/zlib-1.2.11.tar.gz
+tar xzf zlib-1.2.11.tar.gz
+cd zlib-1.2.11
 ./configure --prefix=$PREFIX
 make -j$JOBS
 make install
@@ -70,7 +76,7 @@ make install
 
 # libpng
 cd /tmp/
-tar xzf ~/assets/tomtom/libpng-1.6.29.tar.gz
+tar xzf ~/tomtom_assets/libpng-1.6.29.tar.gz
 cd libpng-1.6.29/ 
 ./configure --prefix=$PREFIX --host=$ARCH
 make -j$JOBS
@@ -156,53 +162,6 @@ make -j$JOBS
 make install
 
 
-
-# espeak
-cd /tmp
-# this one includes the precompiled voices
-wget -nv -c http://freefr.dl.sourceforge.net/project/espeak/espeak/espeak-1.48/espeak-1.48.04-source.zip
-unzip espeak-1.48.04-source.zip
-cd espeak-1.48.04-source
-sed -i "s/PREFIX=\/usr//g" src/Makefile
-sed -i "s/DATADIR=\/usr\/share\/espeak-data/DATADIR=~\/share\/espeak-data/g" src/Makefile
-sed -i "s/AUDIO = portaudio/#AUDIO = portaudio/g" src/Makefile
-sed -i "s/-fvisibility=hidden//g" src/Makefile
-cat src/Makefile
-make -C src
-cd src
-sudo make install
-
-# http://forum.navit-project.org/viewtopic.php?f=17&t=568
-cd /tmp
-arm-linux-gcc -O2 -I$PREFIX/include -I$PREFIX/usr/include ~/navit/contrib/tomtom/espeakdsp.c -o espeakdsp
-
-
-
 # in the end we only want Navit locale
 rm -r $PREFIX/share/locale
 
-# navit
-cd ~/navit
-sed -i "s|set ( TOMTOM_SDK_DIR /opt/tomtom-sdk )|set ( TOMTOM_SDK_DIR $TOMTOM_SDK_DIR )|g" /tmp/$ARCH.cmake
-mkdir -p build
-cd build
-cmake ../ -DCMAKE_INSTALL_PREFIX=$PREFIX -DFREETYPE_INCLUDE_DIRS=$PREFIX/include/freetype2/ -Dsupport/gettext_intl=TRUE \
--DHAVE_API_TOMTOM=TRUE -DXSLTS=tomtom -DAVOID_FLOAT=TRUE -Dmap/mg=FALSE -DUSE_PLUGINS=0 -DCMAKE_TOOLCHAIN_FILE=/tmp/$ARCH.cmake \
--DDISABLE_QT=ON -DSAMPLE_MAP=n -DBUILD_MAPTOOL=n
-make -j$JOBS
-make install
-cd ..
-
-
-# creating directories
-OUT_PATH="/tmp/tomtom/sdcard"
-rm -rf $OUT_PATH
-mkdir -p $OUT_PATH
-cd $OUT_PATH
-mkdir -p navit SDKRegistry
-cd navit
-mkdir -p bin lib share sdl ts
-cd share
-mkdir -p fonts
-cd ..
-
diff --git a/ci/update_version.sh b/ci/update_version.sh
deleted file mode 100644
index b34b0da73..000000000
--- a/ci/update_version.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-if [ -z "$CIRCLE_BUILD_NUM" -o "$CIRCLE_PROJECT_USERNAME" != "navit-gps" ] ; then
-  exit
-fi
-
-if ! git --no-pager log -n 1 ; then
-  echo "This script should be run from the versioned directory"
-  exit 1
-fi
-
-if [ "$CIRCLE_BRANCH" != "trunk" ] ; then
-  exit
-fi
-
-TAG=R$(( 5658 + $CIRCLE_BUILD_NUM ))
-
-if [ "$1" == "prepare" ] ; then
-  git log -1 --format="%H %d" | grep 'tag: R' 
-  if [ $? -eq 0 ] ; then
-    echo "This commit is already tagged."
-    exit
-  fi
-  git tag $TAG
-  exit
-fi
-
-if [ "$1" == "push" ] ; then
-  git log -1 --format="%H %d" | grep "tag: $TAG"
-  if [ $? -eq 0 ] ; then
-    echo Pushing tag $TAG to origin...
-    git push origin $TAG
-  fi
-fi
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 9321c75b1..000000000
--- a/circle.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-machine:
-  environment:
-    CMAKE_FILE: ../Toolchain/arm-eabi.cmake
-dependencies:
-  cache_directories:
-    - ~/.android
-    - ~/android
-    - "~/assets/"
-  pre:
-    - "[ -d ~/assets ] || mkdir ~/assets"
-    - "[ -d ~/android ] || mkdir ~/android"
-    - sudo apt-get update
-    - bash ci/update_version.sh prepare
-# Android build    
-    - sudo apt-get install gettext
-    - sudo apt-get install libsaxonb-java
-# for aapt
-    - sudo apt-get install lib32stdc++6
-    - sudo apt-get install lib32z1
-# For python testing with junit reporting
-    - sudo apt-get install python-gobject libdbus-glib-1-dev python-dev
-    - pip install junit-xml dbus-python
-    - ln -s /usr/lib/python2.7/dist-packages/gobject /opt/circleci/python/2.7.11/lib/python2.7/site-packages/
-    - ln -s /usr/lib/python2.7/dist-packages/glib /opt/circleci/python/2.7.11/lib/python2.7/site-packages/
-test:
-
-  override:
-    - bash ci/build.sh:
-        parallel: true
-        files:
-          - ci/build_*.sh
-deployment:
-  publish_to_playstore:
-    branch: master
-    owner: navit-gps
-    commands:
-      - bash ci/publish.sh
-  merge_into_master:
-    branch: trunk
-    owner: navit-gps
-    commands:
-      - bash ci/update_version.sh push
-      - git push origin $CIRCLE_SHA1:refs/heads/master
-  merge_translations:
-    branch: /i18n.*/
-    owner: navit-gps
-    commands:
-      - bash ci/merge_i18n_update.sh
diff --git a/cmake/navit_macros.cmake b/cmake/navit_macros.cmake
index 6591d7463..734a5381f 100644
--- a/cmake/navit_macros.cmake
+++ b/cmake/navit_macros.cmake
@@ -80,6 +80,9 @@ macro(supportlib_add_library LIB_NAME )
    TARGET_LINK_LIBRARIES(${LIB_NAME} ${${LIB_NAME}_LIBS})
    SET_TARGET_PROPERTIES( ${LIB_NAME} PROPERTIES COMPILE_FLAGS "${NAVIT_COMPILE_FLAGS}")
    SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES COMPILE_DEFINITIONS "MODULE=${LIB_NAME}")
+   install(TARGETS ${LIB_NAME}
+	   DESTINATION ${LIB_DIR}/${${LIB_NAME}_TYPE}
+           PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 endmacro(supportlib_add_library)
 
 macro(message_error)
diff --git a/cmake/version.cmake b/cmake/version.cmake
index eddf0b479..8f82d9f61 100755
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -2,34 +2,18 @@ FIND_PROGRAM(GIT_EXECUTABLE NAMES git git.exe DOC "git command line client")
 
 get_filename_component(SOURCE_DIR ${SRC} PATH)
 
-if (GIT_EXECUTABLE)
-   EXECUTE_PROCESS(
-      COMMAND ${GIT_EXECUTABLE} log "--format=%h %d"
-      WORKING_DIRECTORY "${SOURCE_DIR}"
-      OUTPUT_VARIABLE VERSION
-      ERROR_VARIABLE GIT_ERROR
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-      ERROR_STRIP_TRAILING_WHITESPACE
-   )
-   if(NOT VERSION)
-      message(STATUS "Cannot determine current git commit - git error: '${GIT_ERROR}'")
-      set(VERSION "0000")
-   endif()
-else()
-   message(STATUS "git not found, cannot record git commit")
-   set(VERSION "0000")
-endif(GIT_EXECUTABLE)
-
-string(REGEX MATCH "R[0-9]+" VERSION_NUM ${VERSION} )
-if(NOT VERSION_NUM)
-   message(STATUS "I can't find a release tag. This is probably not Navit's official tree")
-   message(STATUS "It's OK, I will default to 0000")
-   set(VERSION_NUM "0000")
-endif()
-string(REPLACE "R" "" VERSION_NUM ${VERSION_NUM} )
-if(NOT VERSION_NUM)
-   set(VERSION_NUM "0000")
-endif()
+string(TIMESTAMP VERSION "%y%m%d%H%M")
+
+string(REGEX MATCH "[0-9]+" VERSION_NUM ${VERSION} ) 
+if(NOT VERSION_NUM) 
+   message(STATUS "I can't find a release tag. This is probably not Navit's official tree") 
+   message(STATUS "It's OK, I will default to 0000") 
+   set(VERSION_NUM "0000") 
+endif() 
+string(REPLACE "R" "" VERSION_NUM ${VERSION_NUM} ) 
+if(NOT VERSION_NUM) 
+   set(VERSION_NUM "0000") 
+endif() 
 
 string(REGEX MATCH "^[a-z0-9]+" VERSION ${VERSION} )
 
diff --git a/contrib/android_build.sh b/contrib/android_build.sh
deleted file mode 100644
index 68b8110fb..000000000
--- a/contrib/android_build.sh
+++ /dev/null
@@ -1,115 +0,0 @@
-#!/bin/sh
-
-# (C)opyright 2011 Lutz Möhrmann
-# License: GPL v2
-
-show_api_lvl () {
-	case $1 in
-		 1) ver='Android 1.0' ;;
-		 2) ver='Android 1.1' ;;
-		 3) ver='Android 1.5 "Cupcake"' ;;
-		 4) ver='Android 1.6 "Donut"' ;;
-		 5) ver='Android 2.0 "Eclair"' ;;
-		 6) ver='Android 2.0.1 "Eclair"' ;;
-		 7) ver='Android 2.1 "Eclair"' ;;
-		 8) ver='Android 2.2 "Froyo"' ;;
-		 9) ver='Android 2.3 "Gingerbread"' ;;
-		10) ver='Android 2.3.3+ "Gingerbread"' ;;
-		11) ver='Android 3.0 "Honeycomb"' ;;
-		12) ver='Android 3.1 "Ice Cream Sandwich"' ;;
-	esac
-	echo "$1	$ver"
-}
-
-if [ -z $ANDROID_NDK ]; then
-	echo "The environment variable ANDROID_NDK must be set!"
-	exit
-fi
-
-platforms=$ANDROID_NDK/platforms
-if [ ! -d $platforms ]; then
-	platforms=$ANDROID_NDK/build/platforms
-fi
-
-if [ ! -d $platforms ]; then
-	echo "The environment variable ANDROID_NDK must be pointing to the android NDK!"
-	exit
-fi
-
-if [ ! -d navit -o ! -f autogen.sh ]; then
-	echo "This script must be called from the navit main directory (where autogen.sh is in)"
-	exit
-fi
-
-api_lvl=${1-$ANDROID_API_LVL}
-
-while [ -z $api_lvl ]; do
-	echo "The environment variable ANDROID_API_LVL is not set and the API level was also not given on the commandline."
-	echo "Possible API levels for your NDK are:"
-	cd $platforms
-	for p in android-*; do
-		[ -d $p/arch-arm ] || continue
-		show_api_lvl ${p#android-}
-	done
-	cd - > /dev/null
-	echo "Enter the desired API level (4 is recommended)"
-	read api_lvl
-	if [ ! -d $platforms/android-$api_lvl/arch-arm ]; then
-		echo "Bad choice, retrying..."; echo ""
-		unset api_lvl
-	fi
-done
-
-ANDROID_API_LVL=$api_lvl
-export ANDROID_API_LVL
-ANDROID_PLATFORM=$platforms/android-$ANDROID_API_LVL/arch-arm
-export ANDROID_PLATFORM
-PATH=`echo $ANDROID_NDK/toolchains/arm-eabi-*/prebuilt/linux-x86/bin`:$PATH
-export PATH
-
-if [ ! -f Makefile.in ]; then
-	echo ""; echo "*** Running autogen.sh ***"; echo ""
-	./autogen.sh
-fi
-
-if [ ! -f Makefile ]; then
-	echo ""; echo "*** Running configure ***"; echo ""
-	./configure \
-		PKG_CONFIG=arm-eabi-pkgconfig \
-		RANLIB=arm-eabi-ranlib \
-		AR=arm-eabi-ar \
-		CC="arm-eabi-gcc -L$ANDROID_PLATFORM/usr/lib -L. -I$ANDROID_PLATFORM/usr/include" \
-		CXX=arm-eabi-g++ \
-		--host=arm-eabi-linux_android \
-		--enable-avoid-float \
-		--enable-avoid-unaligned \
-		--enable-cache-size=20971520 \
-		--enable-svg2png-scaling=8,16,32,48,64,96 \
-		--enable-svg2png-scaling-nav=59 \
-		--enable-svg2png-scaling-flag=32 \
-		--with-xslts=android,plugin_menu,pedestrian_button,pedestrian \
-		--with-saxon=saxonb-xslt \
-		--enable-transformation-roll \
-		--enable-plugin-pedestrian \
-		--with-android-permissions=CAMERA \
-		--with-android-project=android-$ANDROID_API_LVL
-fi
-
-set -e
-
-echo ""; echo "*** Running make ***"; echo ""
-make
-
-echo ""; echo "*** Running make apkg ***"; echo ""
-cd navit
-make apkg
-cd - > /dev/null
-
-apk=`pwd`/navit/android/bin/Navit-debug.apk
-if [ -f $apk ]; then
-	echo "Great - looks like it worked! The result is"; echo ""
-	ls -l $apk
-	echo ""
-else
-	echo "This shouldn't happen! Something went terribly wrong..."
-fi
diff --git a/contrib/cursor/navitcursor.svg b/contrib/cursor/navitcursor.svg
new file mode 100644
index 000000000..a87091638
--- /dev/null
+++ b/contrib/cursor/navitcursor.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="42"
+   height="42"
+   viewBox="0 0 42.000002 42.000001"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="navitcursor.svg">
+  <title
+     id="title3336">Navit cursor</title>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="24.988831"
+     inkscape:cy="19.67354"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <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>Navit cursor</dc:title>
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>jfitie@gmail.com</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source>Navit</dc:source>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1010.3623)">
+    <path
+       style="fill:#008500;fill-rule:evenodd;stroke:#008500;stroke-width:0.25000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 0,1049.3623 21.000002,-39 0,24 z"
+       id="path3365"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#00bc00;fill-rule:evenodd;stroke:#008500;stroke-width:0.25000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 42.000004,1049.3623 -21.000002,-39 0,24 z"
+       id="path4167"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#009c00;fill-opacity:1;fill-rule:evenodd;stroke:#008500;stroke-width:0.25000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0,1049.3623 21.000002,-15 0,6 z"
+       id="path4169"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#006500;fill-opacity:1;fill-rule:evenodd;stroke:#008500;stroke-width:0.25000003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 21.000002,1034.3623 0,6 21.000002,9 z"
+       id="path4171"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/contrib/geojson-to-bbox.py b/contrib/geojson-to-bbox.py
new file mode 100755
index 000000000..6f6d79466
--- /dev/null
+++ b/contrib/geojson-to-bbox.py
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+import json
+import argparse
+parser = argparse.ArgumentParser()
+
+parser.add_argument("-csv" , help="Output all files opmitted as a csv file, saperated by comma or if set by opmitted seperator", action="store_true")
+parser.add_argument("-csv-seperator", help="Set the seperator used by csv output", default=",")
+parser.add_argument("files", type=argparse.FileType('r'), nargs='+')
+
+args=parser.parse_args()
+
+for f in args.files:
+	content=f.read()
+	json_obj = json.loads(content)
+	minx=999999
+	maxx=-999999
+	miny=999999
+	maxy=-999999
+	if json_obj['geometry']['type'] == "Polygon":
+		for region in json_obj['geometry']['coordinates'][0]:
+			minx=min(minx,region[0])
+			maxx=max(maxx,region[0])
+			miny=min(miny,region[1])
+			maxy=max(maxy,region[1])
+	elif json_obj['geometry']['type'] == "MultiPolygon":
+		for sub in json_obj['geometry']['coordinates']:
+			for region in sub[0]:
+				minx=min(minx,region[0])
+				maxx=max(maxx,region[0])
+				miny=min(miny,region[1])
+				maxy=max(maxy,region[1])
+	if args.csv:
+		print(f.name+args.csv_seperator+str(minx)+args.csv_seperator+str(miny)+args.csv_seperator+str(maxx)+args.csv_seperator+str(maxy))
+	else:
+		print(f.name+": "+str(minx)+" "+str(miny)+" x "+str(maxx)+" "+str(maxy))
diff --git a/contrib/images/androidtablet.png b/contrib/images/androidtablet.png
new file mode 100644
index 000000000..ec6885325
--- /dev/null
+++ b/contrib/images/androidtablet.png
diff --git a/contrib/sailfish/navit-sailfish.spec b/contrib/sailfish/navit-sailfish.spec
index 4ed226967..d11a3fc70 100755
--- a/contrib/sailfish/navit-sailfish.spec
+++ b/contrib/sailfish/navit-sailfish.spec
@@ -27,6 +27,17 @@ BuildRequires: qt5-qtdbus-devel
 BuildRequires: qt5-qtpositioning-devel
 BuildRequires: qt5-qtxml-devel
 BuildRequires: qt5-qtsvg-devel
+BuildRequires: qt5-qtmultimedia
+BuildRequires: qt5-qtmultimedia-devel
+BuildRequires: qt5-qtmultimedia-gsttools
+BuildRequires: qt5-qtmultimedia-plugin-mediaservice-gstaudiodecoder
+BuildRequires: qt5-qtmultimedia-plugin-mediaservice-gstcamerabin
+BuildRequires: qt5-qtmultimedia-plugin-mediaservice-gstmediacapture
+BuildRequires: qt5-qtmultimedia-plugin-mediaservice-gstmediaplayer
+BuildRequires: qt5-qtmultimedia-plugin-resourcepolicy-resourceqt
+BuildRequires: qt5-qtmultimedia-plugin-audio-alsa
+BuildRequires: qt5-qtmultimedia-plugin-playlistformats-m3u
+BuildRequires: qt5-qtmultimedia-plugin-audio-pulseaudio
 
 #Requires: glib2
 #Requires: gettext-libs
@@ -68,7 +79,7 @@ cmake  -DCMAKE_INSTALL_PREFIX:PATH=/usr \
        -DNAVIT_BINARY:STRING=harbour-navit \
        -DSHARE_DIR:PATH=share/harbour-navit \
        -DLOCALE_DIR:PATH=share/harbour-navit/locale \
-       -DIMAGE_DIR:PATH=share/harbour-navit/xpm \
+       -DIMAGE_DIR:PATH=share/harbour-navit/icons \
        -DLIB_DIR:PATH=share/harbour-navit/lib \
        -DBUILD_MAPTOOL:BOOL=FALSE \
        -Dfont/freetype:BOOL=FALSE \
@@ -82,6 +93,7 @@ cmake  -DCMAKE_INSTALL_PREFIX:PATH=/usr \
        -Dvehicle/gpsd_dbus:BOOL=FALSE \
        -DUSE_PLUGINS=n \
        -DUSE_QWIDGET:BOOL=FALSE \
+       -DXSLTS:STRING="sailfish_disable;sailfish_qt5;sailfish_osd;sailfish_cursor;sailfish_mapset;sailfish_svg;sailfish_gui" \
          %{navit_real_source}
 %{__make}
 
@@ -90,12 +102,12 @@ cmake  -DCMAKE_INSTALL_PREFIX:PATH=/usr \
 %install
 %make_install
 #copy in sailfish config
-cp %{navit_real_source}/contrib/sailfish/navit.xml %{buildroot}/usr/share/harbour-navit/navit.xml
+#cp %{navit_real_source}/contrib/sailfish/navit.xml %{buildroot}/usr/share/harbour-navit/navit.xml
 
 %files
 %defattr(644, root, root, 755)
 %{_datadir}/harbour-navit/navit.xml
-%{_datadir}/harbour-navit/xpm/
+%{_datadir}/harbour-navit/icons/
 %{_datadir}/harbour-navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin
 %{_datadir}/harbour-navit/espeak-data/
 %{_datadir}/applications/harbour-navit.desktop
@@ -111,8 +123,11 @@ cp %{navit_real_source}/contrib/sailfish/navit.xml %{buildroot}/usr/share/harbou
 
 
 %changelog
-*Wed May 11 2017 metalstrolch 0.5.1-3
-- Switch to QT font rendering. Remove freetype dep.
+*Wed Jun 05 2017 metalstrolch 0.5.1-3
+- Enable rotating.
+- Create default config from xlst
+- Switch to QT font rendering.
+- Remove freetype dep.
 
 *Wed May 03 2017 metalstrolch 0.5.1-2
 - Use qt5_espeak
diff --git a/contrib/sailfish/navit.xml b/contrib/sailfish/navit.xml
deleted file mode 100755
index 4f2c96941..000000000
--- a/contrib/sailfish/navit.xml
+++ /dev/null
@@ -1,6943 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-	For configuration options used in this file, please read
-	http://wiki.navit-project.org/index.php/Configuration
-	Do not edit /usr/share/navit/navit.xml or /etc/navit/navit.xml :
-	changes would be lost on upgrade. Rather copy it to ~/.navit/.
--->
-<!DOCTYPE config
-  SYSTEM "navit.dtd">
-<config xmlns:xi="http://www.w3.org/2001/XInclude">
-	<plugins>
-		<plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}lib*.so" ondemand="yes"/>
-		<plugin path="$NAVIT_LIBDIR/autoload/${NAVIT_LIBPREFIX}lib*.so"/>
-		<plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libbinding_dbus.so" active="no"/>
-		<plugin path="$NAVIT_LIBDIR/*/${NAVIT_LIBPREFIX}libgraphics_null.so" active="no"/>
-	</plugins>
-
-	<!-- The global debug level (like using command line option "-d"). Ignored if option -d is used. -->
-	<!-- Possible debug levels: error, warning, info, debug. -->
-	<debug name="global" dbg_level="error"/>
-	<!-- Example of setting the debug level for a single function.  -->
-	<debug name="navit:do_draw" dbg_level="error"/>
-	<!-- This is here so one can copy&paste the contents of popup menus --> 
-	<debug name="navit:popup_printf_cb" dbg_level="debug"/>
-	<!-- Example for logging timing/profiling information. Note the prefix "profile:".
-	<debug name="profile:navit:do_draw" dbg_level="debug"/>
-	-->
-	<!-- segv: 1 - show backtrace with gdb and exit, 2 - stay in gdb -->
-	<debug name="segv" level="1"/>
-	<!-- timestamps 0/1 - prefix log messages with a timestamp -->
-	<debug name="timestamps" level="0"/>
-	<debug name="graphics_qt5" dbg_level="error"/>
-	<debug name="vehicle_qt5" dbg_level="error"/>
-
-	<!-- center= defines which map location Navit will show after first start.
-		It will only be used for the first start; subsequent starts will remember the
-		last position (in center.txt).
-		Center coordinates format: "Long Lat" in decimal degrees (WGS 84).
-		For other formats see http://wiki.navit-project.org/index.php/Coordinate_format.
-		-->
-	<navit center="11.5666 48.1333" zoom="256" tracking="1" orientation="-1" recent_dest="250" drag_bitmap="0">
-		<!-- Use one of gtk_drawing_area, qt_qpainter or sdl. 
-		     On windows systems, use win32 -->
-		<graphics type="qt5" qt5_platform="wayland"/>
-		<!-- The following line let you select which graphical user interface you'd like to use.
-		Options include internal (optimized for touch screen devices), gtk (useful for desktop computers).
-		If you don't like the internal gui, set enabled=yes for the following tag and enabled=no for the gui internal tag -->
-		<gui type="gtk" enabled="no" menubar="1" toolbar="1" statusbar="1"/>
-	<!--
-			In case of the internal GUI, you can even influence the size of the text and of the icons in the toolbar and the viewport.
-			Here's an example for a freerunner: -->
-		<!-- <gui type="internal" font_size="350" icon_xs="32" icon_s="96" icon_l="96"/> -->
-		<!-- The action that appears on map click is configurable with the attribute "on_map_click".
-		     To get the prvious behaviour of showing the map point menu use on_map_click='menu("#Map Point")'
-	        -->
-		<gui type="internal" font_size="350" icon_xs="32" icon_s="96" icon_l="96" enabled="yes"><![CDATA[
-			<html>
-				<a name='Main Menu'><text>Main menu</text>
-					<a href='#Actions'><img src='gui_actions'>Actions</img></a>
-					<img cond='flags&amp;2' src='gui_map' onclick='back_to_map()'><text>Show
-Map</text></img>
-					<a href='#Settings'><img src='gui_settings'><text>Settings</text></img></a>
-				<a href='#Tools'><img src='gui_tools'><text>Tools</text></img></a>
-				<a href='#Route'><img src='gui_settings'><text>Route</text></img></a>
-				<img src='gui_about' onclick='about()'><text>About</text></img>
-				<img src='gui_quit' onclick='quit()'><text>Quit</text></img>
-				</a>
-			<a name='Actions'><text>Actions</text>
-				<img src='gui_bookmark' onclick='bookmarks()'><text>Bookmarks</text></img>
-				<img src='gui_formerdests' onclick='formerdests()'><text>Former
-Destinations</text></img>
-				<img cond='click_coord_geo' src='gui_map' onclick='position(click_coord_geo,_("Map Point"),8|16|32|64|256)'><script>write(click_coord_geo)</script></img>
-				<img cond='position_coord_geo' src='gui_vehicle' onclick='position(position_coord_geo,_("Vehicle Position"),8|32|64|128|256)'><script>write(position_coord_geo)</script></img>
-				<img src='gui_town' onclick='town()'><text>Town</text></img>
-				<img src='gui_map' onclick='enter_coord()'><text>Coordinates</text></img>
-				<img cond='navit.route.route_status&amp;1' src='gui_stop' onclick='abort_navigation();refresh()'><text>Stop
-Navigation</text></img>
-			</a>
-			<a name='Settings'><text>Settings</text>
-				<a href='#Settings Display'><img src='gui_display'><text>Display</text></img></a>
-				<img src='gui_maps' onclick='setting_maps()'><text>Maps</text></img>
-				<!-- <a href='#Settings Maps'><img src='gui_maps'><text>Maps</text></img></a> -->
-				<img src='gui_vehicle' onclick='setting_vehicle()'><text>Vehicle</text></img>
-				<!-- <a href='#Settings Vehicles'><img src='gui_vehicle'><text>Vehicle</text></img></a> -->
-				<img src='gui_rules' onclick='setting_rules()'><text>Rules</text></img>
-			</a>
-			<a name='Settings Display'><text>Display</text>
-				<!-- <img src='gui_display' onclick='setting_layout()'><text>Layout</text></img> -->
-				<a href='#Settings Layouts'><img src='gui_display'><text>Layout</text></img></a>
-				<img cond='fullscreen==0' src='gui_fullscreen' onclick='fullscreen=1'><text>Fullscreen</text></img>
-				<img cond='fullscreen==1' src='gui_leave_fullscreen' onclick='fullscreen=0'><text>Window Mode</text></img>
-				<img cond='navit.pitch==0' src='gui_map' onclick='navit.pitch=pitch;redraw_map();back_to_map()'><text>3D</text></img>
-				<img cond='navit.pitch!=0' src='gui_map' onclick='navit.pitch=0;redraw_map();back_to_map()'><text>2D</text></img>
-				<img cond='navit.autozoom_active==0' src='gui_zoom_auto' onclick='navit.autozoom_active=1;redraw_map();back_to_map()'><text>Auto zoom</text></img>
-				<img cond='navit.autozoom_active==1' src='gui_zoom_manual' onclick='navit.autozoom_active=0;redraw_map();back_to_map()'><text>Manual zoom</text></img>
-  				<a href='#Settings Layers'><img src='gui_layers'><text>Layers</text></img></a>
-			</a>
-			<a name='Tools'><text>Tools</text>
-				<img src='gui_actions' onclick='locale()'><text>Show Locale</text></img>
-            <img src='gui_tools' onclick='network_info()'><text>Network info</text></img>
-			</a>
-			<a name='Route'><text>Route</text>
-				<img src='gui_actions' onclick='route_description()'><text>Description</text></img>
-				<img src='gui_actions' onclick='route_height_profile()'><text>Height Profile</text></img>
-				<img cond='navit.waypoints_flag &amp;&amp; (navit.route.route_status&amp;1)' src='cursor_still' onclick='waypoints()'><text>Waypoints</text></img>
-				<img cond='navit.waypoints_flag &amp;&amp; (navit.route.route_status&amp;1)' src='gui_stop' onclick='navit.route_remove_last_waypoint()'><text>Drop last 
-Waypoint</text></img>
-				<img cond='navit.waypoints_flag &amp;&amp; (navit.route.route_status&amp;1)' src='gui_stop' onclick='navit.route_remove_next_waypoint()'><text>Drop next 
-Waypoint</text></img>
-			</a>
-			<a name='Map Point'><text>Map Point</text>
-				<script>position(click_coord_geo,_("Map Point"),8|16|32|64|256)</script>
-			</a>
-			<a name='Settings Layouts' class='clist' refresh_cond='navit.layout'><text>Layout</text>
-				<script>
-					foreach(layout;navit.layout)
-						img("centry", navit.layout==layout?"gui_active":"gui_inactive", layout.name,
-							"", "navit.layout=navit.layout[@name==%{se}*]", layout.name);
-				</script>
-			</a>
-			<a name='Settings Maps' class='clist'><text>Maps</text>
-				<script>
-					foreach(map;navit.mapset.map)
-						if (map.description)
-							img("centry",map.active?"gui_active":"gui_inactive", map.description,
-							"","navit.mapset.map[@description==%{se}].active=%{d}*",map.description,!map.active,"redraw_map();refresh();");
-						else
-							img("centry",map.active?"gui_active":"gui_inactive", map.type+":"+map.data,
-								"","navit.mapset.map[@data==%{se}].active=%{d}*",map.data,!map.active,"redraw_map();refresh();");
-				</script>
-			</a>
-			<a name='Settings Layers' class='clist'><text>Layers</text>
-				<script>
-					foreach(layer;navit.layout.layer)
-						if (layer.name)
-							img("centry",layer.active?"gui_active":"gui_inactive",layer.name,
-							"","navit.layout.layer[@name==%{se}].active=%{d}*",layer.name,!layer.active,"redraw_map();refresh();");
-						else
-							img("centry",layer.active?"gui_active":"gui_inactive",
-								"","navit.layout.layer[@name==%{se}].active=%{d}*",layer.name,!layer.active,"redraw_map();refresh();");
-				</script>
-			</a>
-			<a name='Settings Vehicles' class='clist'><text>Vehicle</text>
-				<script>
-					foreach(vehicle;navit.vehicle)
-						img("centry",navit.vehicle==vehicle?"gui_active":"gui_inactive",vehicle.name,
-							"name=%{se};menu(\"#Settings Vehicle\")",vehicle.name);
-				</script>
-			</a>
-			<a name='Settings Vehicle' class='clist'><script>write(name)</script>
-				<script>
-					foreach(vehicle;navit.vehicle)
-						if (vehicle.name == name) {
-							if (vehicle!=navit.vehicle)
-								img("centry","gui_active","Set as active",
-									"","navit.vehicle=navit.vehicle[@name==%{se}*]",name);
-							foreach(vehicleprofile;navit.vehicleprofile)
-				0		img("centry",vehicle.profilename==vehicleprofile.name?"gui_active":"gui_inactive",vehicleprofile.name,
-									"","navit.vehicle[@name=%{se}].profilename=%{se}*",name,vehicleprofile.name,"refresh()");
-						}
-				</script>
-			</a>
-			<a name='Satellite Status' class='clist'><text>Satellite Status</text>
-				<script>satellite_status_page()</script>
-			</a>
-			<a name='NMEA Data' class='clist'><text>NMEA Data</text>
-				<script>nmea_data_page()</script>
-			</a>
-			</html>
-		]]></gui>
-		<!-- for a debug log -->
-		<log enabled="no" type="textfile_debug" data="debug_%Y%m%d-%i.txt" flush_size="1000" flush_time="30"/>
-		<!-- osd items allow to position display and control items directly on top of the map: -->
-		<osd enabled="no" type="compass"/>
-		<osd enabled="no" type="navigation_next_turn"/> 
-
-		<!-- Commands include gui_internal_menu, gui_internal_fullscreen, zoom_in and zoom_out.
-			Usage of negative values change the button origins. x="0" y="0" specifies the top left, x="-0" y="-0" the bottom right corner.
-			It's always the top left corner of the icon, so you need to consider the icon's size when you enter the values. -->
-                <osd enabled="yes" type="gps_status" x="0" y="0" w="50" h="50"/>
-                <osd enabled="no" type="text" label="${vehicle.position_sats_used}/${vehicle.position_qual}" x="0" y="0" w="50" h="50" background_color="#00000058" font_size="400"/>
-                <osd enabled="yes" type="text" label="${vehicle.position_speed}" x="50" y="0" w="150" h="50" background_color="#00000058" font_size="400"/>
-                <osd enabled="yes" type="text" label="${navigation.item.destination_length[named]}" x="200" y="0" w="240" h="50" background_color="#00000058" font_size="400"/>
-                <osd enabled="yes" type="navigation_next_turn" x="-100" y="0" w="100" h="100" icon_w="90" icon_h="80" background_color="#00000058"/>
-                <osd enabled="yes" type="text" label="${navigation.item[1].length[named]}" x="-100" y="100" w="100" h="50" background_color="#00000058" font_size="400"/>
-		<osd enabled="yes" type="button" x="-96" y="-96" w="96" h="96" command="zoom_in()" src="zoom_in"/>
-		<osd enabled="yes" type="button" x="0" y="-96" w="96" h="96" command="zoom_out()" src="zoom_out"/> 
-
-		<!-- Vehicle with GPS enabled for gpsd on unix -->
-		<vehicle name="Local GPS" profilename="car" enabled="no" active="1" source="gpsd://localhost" gpsd_query="w+xj">
-		<!-- Vehicle with GPS enabled for direct communication on windows. Remove the line above if you use this. -->
-		<!-- <vehicle name="Local GPS" profilename="car" follow="1" enabled="yes" active="1" 
-				source="serial:COM4 baud=4800 parity=N data=8 stop=1" > -->
-
-			<!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): -->
-			<log enabled="no" type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius" data="track_%Y%m%d-%%i.gpx" flush_size="1000" flush_time="30"/>
-		</vehicle>
-
-		<!-- For SDL, you should add follow="1" to have the view centered on your position -->
-		<!-- <vehicle name="Meins" enabled="yes" source="gpsd://localhost" color="#0000ff" follow="1"/> -->
-
-		<vehicle name="Demo" profilename="car" enabled="no" source="demo://"/>
-		<vehicle name="Qt5" profilename="car" enabled="yes" active="1" source="qt5://"/>
-
-		<!-- For the cumulative displacement filter to be enabled, set cdf_histsize="x" here, with x being an integer somewhere around 4 -->
-		<tracking cdf_histsize="0"/>
-
-		<vehicleprofile name="car" route_depth="4:25%,8:40000,18:10000" flags="0x4000000" flags_forward_mask="0x4000002" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0" static_speed="5" static_distance="25">
-			<roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="10" />
-			<roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="30" />
-			<roadprofile item_types="street_3_city" speed="40" route_weight="40" />
-			<roadprofile item_types="street_4_city" speed="50" route_weight="50" />
-			<roadprofile item_types="highway_city" speed="80" route_weight="80" />
-			<roadprofile item_types="street_1_land" speed="60" route_weight="60" />
-			<roadprofile item_types="street_2_land" speed="65" route_weight="65" />
-			<roadprofile item_types="street_3_land" speed="70" route_weight="70" />
-			<roadprofile item_types="street_4_land" speed="80" route_weight="80" />
-			<roadprofile item_types="street_n_lanes" speed="120" route_weight="120" />
-			<roadprofile item_types="highway_land" speed="120" route_weight="120" />
-			<roadprofile item_types="ramp" speed="40" route_weight="40" />
-			<!--roundabout does not apply to OSMaps -->
-			<roadprofile item_types="roundabout" speed="10" route_weight="10"/>
-			<roadprofile item_types="ferry" speed="40" route_weight="40"/>
-		</vehicleprofile>
-
-		<vehicleprofile name="car_shortest" flags="0x4000000" flags_forward_mask="0x4000002" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0" static_speed="5" static_distance="25">
-			<roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="60" />
-			<roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="60" />
-			<roadprofile item_types="street_3_city" speed="40" route_weight="60" />
-			<roadprofile item_types="street_4_city" speed="50" route_weight="60" />
-			<roadprofile item_types="highway_city" speed="80" route_weight="60" />
-			<roadprofile item_types="street_1_land" speed="60" route_weight="60" />
-			<roadprofile item_types="street_2_land" speed="65" route_weight="60" />
-			<roadprofile item_types="street_3_land" speed="70" route_weight="60" />
-			<roadprofile item_types="street_4_land" speed="80" route_weight="60" />
-			<roadprofile item_types="street_n_lanes" speed="120" route_weight="60" />
-			<roadprofile item_types="highway_land" speed="120" route_weight="60" />
-			<roadprofile item_types="ramp" speed="40" route_weight="60" />
-			<!--roundabout does not apply to OSMaps -->
-			<roadprofile item_types="roundabout" speed="10" route_weight="60"/>
-			<roadprofile item_types="ferry" speed="40" route_weight="60"/>
-		</vehicleprofile>
-
-		<vehicleprofile name="car_avoid_tolls" flags="0x4000000" flags_forward_mask="0x4000402" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0" static_speed="5" static_distance="25">
-			<roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="10"/>
-			<roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="30"/>
-			<roadprofile item_types="street_3_city" speed="40" route_weight="40"/>
-			<roadprofile item_types="street_4_city" speed="50" route_weight="50"/>
-			<roadprofile item_types="highway_city" speed="80" route_weight="80"/>
-			<roadprofile item_types="street_1_land" speed="60" route_weight="60"/>
-			<roadprofile item_types="street_2_land" speed="65" route_weight="65"/>
-			<roadprofile item_types="street_3_land" speed="70" route_weight="70"/>
-			<roadprofile item_types="street_4_land" speed="80" route_weight="80"/>
-			<roadprofile item_types="street_n_lanes" speed="120" route_weight="120"/>
-			<roadprofile item_types="highway_land" speed="120" route_weight="120"/>
-			<roadprofile item_types="ramp" speed="40" route_weight="40"/>
-			<!--roundabout does not apply to OSMaps -->
-			<roadprofile item_types="roundabout" speed="10" route_weight="10"/>
-			<roadprofile item_types="ferry" speed="40" route_weight="40"/>
-		</vehicleprofile>
-		<vehicleprofile name="car_pedantic" route_depth="18:25%,18:40000" flags="0x4000000" flags_forward_mask="0x4000002" flags_reverse_mask="0x4000001" maxspeed_handling="0" route_mode="0" static_speed="5" static_distance="25">
-			<roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="10"/>
-			<roadprofile item_types="street_2_city,track_paved" speed="30" route_weight="30"/>
-			<roadprofile item_types="street_3_city" speed="40" route_weight="40"/>
-			<roadprofile item_types="street_4_city" speed="50" route_weight="50"/>
-			<roadprofile item_types="highway_city" speed="80" route_weight="80"/>
-			<roadprofile item_types="street_1_land" speed="60" route_weight="60"/>
-			<roadprofile item_types="street_2_land" speed="65" route_weight="65"/>
-			<roadprofile item_types="street_3_land" speed="70" route_weight="70"/>
-			<roadprofile item_types="street_4_land" speed="80" route_weight="80"/>
-			<roadprofile item_types="street_n_lanes" speed="120" route_weight="120"/>
-			<roadprofile item_types="highway_land" speed="120" route_weight="120"/>
-			<roadprofile item_types="ramp" speed="40" route_weight="40"/>
-			<!--roundabout does not apply to OSMaps -->
-			<roadprofile item_types="roundabout" speed="10" route_weight="10"/>
-			<roadprofile item_types="ferry" speed="40" route_weight="40"/>
-		</vehicleprofile>
-		<vehicleprofile name="bike" route_depth="18:25%,18:40000" flags="0x40000000" flags_forward_mask="0x40000000" flags_reverse_mask="0x40000000" maxspeed_handling="1" route_mode="0" static_speed="5" static_distance="25">
-			<roadprofile item_types="steps" speed="2" route_weight="5" />
-			<roadprofile item_types="street_pedestrian,footway" speed="5" route_weight="10" />
-			<roadprofile item_types="path,track_ground" speed="12" route_weight="12" />
-			<roadprofile item_types="track_gravelled" speed="17" route_weight="15" />
-			<!-- cycleways, paved tracks, serviceways etc. are the favourite ways -->
-			<roadprofile item_types="track_paved,cycleway,street_service,street_parking_lane" speed="22" route_weight="20" />
-			<!-- residential, unclassified, living street etc. -->
-			<roadprofile item_types="street_0,street_1_city,living_street" speed="20" route_weight="15" />
-			<!-- tertiary and minor roads are acceptable, but should be avoided in favour of tracks and cycleways -->
-			<roadprofile item_types="street_2_city,street_1_land,street_2_land" speed="22" route_weight="12" />
-			<!-- secondary etc. are acceptable when necessary -->
-			<roadprofile item_types="street_3_city" speed="22" route_weight="10" />
-			<!-- primary, trunk etc. should be avoided -->
-			<roadprofile item_types="street_4_city,ramp" speed="22" route_weight="7" />
-			<!-- Those types do not appear in maptool.c and therefore are not used ATM -->
-			<roadprofile item_types="street_3_land,street_4_land" speed="20" route_weight="7" />
-			<!--roundabout does not apply to OSMaps -->	
-			<roadprofile item_types="roundabout" speed="20" route_weight="10"/>
-			<roadprofile item_types="ferry" speed="40" route_weight="40"/>
-		</vehicleprofile>
-
-		<vehicleprofile name="pedestrian" route_depth="18:25%,18:10000" flags="0x80000000" flags_forward_mask="0x80000000" flags_reverse_mask="0x80000000" maxspeed_handling="1" route_mode="0" static_speed="3" static_distance="10">
-			<roadprofile item_types="footway,bridleway,path,steps" speed="5" route_weight="5"/>
-			<roadprofile item_types="hiking_mountain" speed="4" route_weight="4"/>
-			<roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="5"/>
-			<roadprofile item_types="track_gravelled,track_unpaved,track_grass,track_ground,hiking" speed="5" route_weight="5"/>
-			<roadprofile item_types="track_paved" speed="5" route_weight="5"/>
-			<roadprofile item_types="cycleway" speed="5" route_weight="5"/>
-			<roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="5"/>
-			<roadprofile item_types="street_3_city,street_4_city,street_service,street_parking_lane" speed="5" route_weight="5"/>
-			<roadprofile item_types="street_1_land,street_2_land" speed="5" route_weight="5"/>
-			<roadprofile item_types="street_3_land,street_4_land" speed="5" route_weight="5"/>
-			<!--roundabout does not apply to OSMaps -->
-			<roadprofile item_types="roundabout" speed="5" route_weight="5"/>
-			<roadprofile item_types="ferry" speed="40" route_weight="40"/>
-		</vehicleprofile>
-		<vehicleprofile name="horse" route_depth="18:25%,18:40000" flags="0x20000000" flags_forward_mask="0x20000000" flags_reverse_mask="0x20000000" maxspeed_handling="1" route_mode="0" static_speed="3" static_distance="10">
-			<roadprofile item_types="bridleway" speed="10" route_weight="10"/>
-			<roadprofile item_types="footway,path,steps" speed="5" route_weight="5"/>
-			<roadprofile item_types="living_street,street_pedestrian" speed="5" route_weight="4"/>
-			<roadprofile item_types="track_gravelled" speed="5" route_weight="5"/>
-			<roadprofile item_types="track_paved" speed="5" route_weight="5"/>
-			<roadprofile item_types="cycleway" speed="5" route_weight="5"/>
-			<roadprofile item_types="street_0,street_1_city,street_2_city" speed="5" route_weight="2"/>
-			<roadprofile item_types="street_3_city,street_4_city,street_service,street_parking_lane" speed="5" route_weight="4"/>
-			<roadprofile item_types="street_1_land,street_2_land" speed="5" route_weight="2"/>
-			<roadprofile item_types="street_3_land,street_4_land" speed="5" route_weight="4"/>
-			<!--roundabout does not apply to OSMaps -->
-			<roadprofile item_types="roundabout" speed="5" route_weight="2"/>
-			<roadprofile item_types="ferry" speed="40" route_weight="40"/>
-		</vehicleprofile>
-                <!-- chr:
-                     flags used for a truck: (first flag number is 0)
-                                 8: SIZE_OR_WEIGHT_LIMIT
-                                21: TRANSPORT_TRUCK
-                  speed setup:
-                     'speed' data of the vehicleprofile for a car is
-                        reduced about 10 km/h. When the speed was at
-                        10 km/h, I reduced it to 5 km/h.
-                     'route_weight' data has been treated in the same way.
-                        If you want to discourage the use of small roads,
-                        just reduce this value.
-                  size and weight setup:
-                     This is an example, you have to use the data of your truck.
-                     bobshaffer's standard truck:
-                       (1 lb = 453.59237 g, 1 foot = .3048 m)
-                       (data has to be in [cm] and [kg] according to 'vehicleprofile.h')
-                                vehicle_width=  9    feet,   274 cm
-                               vehicle_height= 13.5  feet,   411 cm
-                               vehicle_length= 70    feet,  2134 cm
-                               vehicle_weight= 80000 lbs,  36287 kg
-                          vehicle_axle_weight= 34000 lbs,  15422 kg
-                -->
-
-                <vehicleprofile name="Truck" flags="0x200000" flags_forward_mask="0x200002" flags_reverse_mask="0x200001" maxspeed_handling="1" route_mode="0" static_speed="5"
- static_distance="25"
-                                vehicle_width="274" vehicle_height="411" vehicle_length="2134"
-                                vehicle_weight="36287" vehicle_axle_weight="15422">
-                        <roadprofile item_types="street_0,street_1_city,living_street,street_service,track_gravelled,track_unpaved,street_parking_lane" speed="10" route_weight="5" />
-                        <roadprofile item_types="street_2_city,track_paved" speed="20" route_weight="20"/>
-                        <roadprofile item_types="street_3_city" speed="30" route_weight="30"/>
-                       	<roadprofile item_types="street_4_city" speed="40" route_weight="40"/>
-                        <roadprofile item_types="highway_city" speed="70" route_weight="70"/>
-                        <roadprofile item_types="street_1_land" speed="50" route_weight="50"/>
-                        <roadprofile item_types="street_2_land" speed="55" route_weight="55"/>
-                        <roadprofile item_types="street_3_land" speed="60" route_weight="60"/>
-                        <roadprofile item_types="street_4_land" speed="70" route_weight="70"/>
-                        <roadprofile item_types="street_n_lanes" speed="80" route_weight="80"/>
-                        <roadprofile item_types="highway_land" speed="80" route_weight="80"/>
-                        <roadprofile item_types="ramp" speed="30" route_weight="30"/>
-			<!--roundabout does not apply to OSMaps -->
-                        <roadprofile item_types="roundabout" speed="5" route_weight="5"/>
-                        <roadprofile item_types="ferry" speed="40" route_weight="40"/>
-                </vehicleprofile>
-
-
-		<route destination_distance="50"/>
-
-		<navigation>
-			<announce type="street_0,street_1_city,street_parking_lane,living_street,street_service" level0="25" level1="100" level2="200" unit="m"/>
-			<announce type="street_2_city,street_3_city,street_4_city,ramp" level0="50" level1="200" level2="500" unit="m"/>
-			<announce type="highway_city,street_1_land,street_2_land,street_3_land,street_4_land" level0="100" level1="400" level2="1000" unit="m"/>
-			<announce type="street_n_lanes,highway_land" level0="300" level1="1000" level2="2000" unit="m"/>
-		</navigation>
-
-		<!-- Navit provides speech output in text format.
-			If you have a speech synthesizer like festival lite installed, you can get turn by turn directions out of navit. Please set the "cps"-value to how many characters your tts engine approximately speaks per second.
-			The default is text output to the shell -->
-		<!-- speech type="cmdline" data="echo 'Fix the speech tag in navit.xml to let navit say:' '%s'" cps="15"/ -->
-		<speech type="qt5_espeak" cps="15"/>
-		<!--
-		Instead of using a speech synthesizer, navit can also play pre-recorded samples for each word.
-		See http://wiki.navit-project.org/index.php/Configuration for details.
-
-		<speech type="cmdline" data="aplay -q %s"
-		sample_dir="/path/to/sampledir" sample_suffix=".wav" flags="1"
-		vocabulary_name="0" vocabulary_name_systematic="0" vocabulary_distances="0"/>
-                -->
-
-		<!-- You can only have enabled only one mapset at time, but with as much maps enabled as you want -->
-
-		<!-- If you have the reiseplaner maps installed, set enabled="yes" in the next line and set the path correctly -->
-		<mapset enabled="no">
-			<map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map"/>
-			<map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp1.smp"/>
-			<map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp2.smp"/>
-			<map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp3.smp"/>
-			<map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp4.smp"/>
-			<map type="mg" enabled="yes" data="/opt/reiseplaner/travel/DE.map/smp5.smp"/>
-		</mapset>
-
-		<!-- If you dont want to use the sample map, either set enabled="no" in the next line or remove the xml file from the maps directory -->
-		<mapset enabled="no">
-			<xi:include href="$NAVIT_SHAREDIR/maps/*.xml"/>
-		</mapset>
-
-		<!-- Mapset template for openstreetmaps -->
-		<mapset enabled="no">
-			<map type="binfile" enabled="yes" data="/media/mmc2/MapsNavit/osm_europe.bin"/>
-		</mapset>
-		<!-- Mapset template for openstreetmaps -->
-		<mapset enabled="yes">
-			<map type="binfile" enabled="no" data="/usr/share/navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin"/>
-			<map type="binfile" enabled="yes" data="~/Maps/map.navit.bin"/>
-		</mapset>
-
-		<!-- Mapset template for garmin maps -->
-		<mapset enabled="no">
-			<map type="garmin" enabled="yes" data="/path/to/img" debug="4"/>
-		</mapset>
-
-		<layer name="Found items" order="0-">
-			<itemgra item_types="found_item">
-				<circle color="#008080" radius="24" width="2" text_size="12"/>
-			</itemgra>
-		</layer>
-
-		<layout name="Car" nightlayout="Car-dark" color="#ffefb7" font="Arial">
-
-			<cursor w="26" h="26">
-				<itemgra>
-					<circle color="#0000ff" radius="24" width="2">
-						<coord x="0" y="0"/>
-					</circle>
-				</itemgra>
-				<itemgra speed_range="-2">
-					<polyline color="#0000ff" width="2">
-						<coord x="0" y="0"/>
-						<coord x="0" y="0"/>
-					</polyline>
-				</itemgra>
-				<itemgra speed_range="3-">
-					<polyline color="#0000ff" width="2">
-						<coord x="-7" y="-10"/>
-						<coord x="0" y="12"/>
-						<coord x="7" y="-10"/>
-					</polyline>
-				</itemgra>
-			</cursor>
-
-			<layer name="polygons">
-				<itemgra item_types="image" order="0-">
-					<image/>
-				</itemgra>
-				<itemgra item_types="poly_wood" order="8-">
-					<polygon color="#8ec78d"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_farm" order="8-">
-					<polygon color="#c7f1a3"/>
-					<polyline color="#79c691"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_meadow" order="8-">
-					<polygon color="#c7f1a3"/>
-					<polyline color="#79c691"/>
-				</itemgra>
-				<itemgra item_types="poly_town" order="0-">
-					<polygon color="#ffc895"/>
-					<polyline color="#ebb481"/>
-				</itemgra>
-				<itemgra item_types="poly_university" order="8-">
-					<polygon color="#d68fb8"/>
-					<polyline color="#881155"/>
-				</itemgra>
-				<itemgra item_types="poly_water_tiled" order="0-">
-					<polygon color="#82c8ea"/>
-				</itemgra>
-				<itemgra item_types="poly_water" order="0-">
-					<polygon color="#82c8ea"/>
-					<polyline color="#5096b8"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_land" order="0-">
-					<polygon color="#ffefb7"/>
-					<polyline color="#ffefb7"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="9-">
-					<polygon color="#a0a0a0"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_park" order="0-">
-					<polygon color="#7cc334"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="10">
-					<polyline color="#d2d2d2" width="3"/>
-					<polyline color="#dddddd" width="1"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="11">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#dddddd" width="3"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="12">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#dddddd" width="6"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="13">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#dddddd" width="7"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="14">
-					<polyline color="#d2d2d2" width="13"/>
-					<polyline color="#dddddd" width="9"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="15">
-					<polyline color="#d2d2d2" width="18"/>
-					<polyline color="#dddddd" width="14"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="16">
-					<polyline color="#d2d2d2" width="21"/>
-					<polyline color="#dddddd" width="17"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="17">
-					<polyline color="#d2d2d2" width="25"/>
-					<polyline color="#dddddd" width="21"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="18">
-					<polyline color="#d2d2d2" width="40"/>
-					<polyline color="#dddddd" width="34"/>
-					<polygon color="#dddddd"/>
-				</itemgra>
-				<itemgra item_types="poly_airport" order="0-">
-					<polygon color="#a0a0a0"/>
-				</itemgra>
-				<itemgra item_types="poly_sport,poly_sports_pitch" order="11-">
-					<polygon color="#4af04f"/>
-				</itemgra>
-				<itemgra item_types="poly_industry,poly_place" order="11-">
-					<polygon color="#e6e6e6"/>
-				</itemgra>
-				<itemgra item_types="poly_service" order="8-18">
-					<polygon color="#fefefe"/>
-					<polyline color="#d2d2d2" width="1"/>
-				</itemgra>
-				<itemgra item_types="poly_street_1" order="8-13">
-					<polygon color="#ffffff"/>
-					<polyline color="#d2d2d2" width="1"/>
-				</itemgra>
-				<itemgra item_types="poly_street_1" order="14-16">
-					<polygon color="#ffffff"/>
-					<polyline color="#d2d2d2" width="2"/>
-				</itemgra>
-				<itemgra item_types="poly_street_1" order="17-18">
-					<polygon color="#ffffff"/>
-					<polyline color="#d2d2d2" width="3"/>
-				</itemgra>
-				<itemgra item_types="poly_street_2" order="7-12">
-					<polygon color="#ffff00"/>
-					<polyline color="#c0c0c0" width="1"/>
-				</itemgra>
-				<itemgra item_types="poly_street_2" order="13-16">
-					<polygon color="#ffff00"/>
-					<polyline color="#c0c0c0" width="2"/>
-				</itemgra>
-				<itemgra item_types="poly_street_2" order="17-18">
-					<polygon color="#ffff00"/>
-					<polyline color="#c0c0c0" width="3"/>
-				</itemgra>
-				<itemgra item_types="poly_street_3" order="7-11">
-					<polygon color="#ffff00"/>
-					<polyline color="#a0a0a0" width="1"/>
-				</itemgra>
-				<itemgra item_types="poly_street_3" order="12-15">
-					<polygon color="#ffff00"/>
-					<polyline color="#a0a0a0" width="2"/>
-				</itemgra>
-				<itemgra item_types="poly_street_3" order="16-18">
-					<polygon color="#ffff00"/>
-					<polyline color="#a0a0a0" width="3"/>
-				</itemgra>
-				<itemgra item_types="water_line" order="0-">
-					<polyline color="#5096b8" width="1"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="4-5">
-					<polyline color="#82c8ea" width="1"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="6">
-					<polyline color="#82c8ea" width="2"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="7">
-					<polyline color="#82c8ea" width="3"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="8-9">
-					<polyline color="#82c8ea" width="4"/>
-					<text text_size="7"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="10-">
-					<polyline color="#82c8ea" width="4"/>
-					<text text_size="10"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="6">
-					<polyline color="#82c8ea" width="1"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="7">
-					<polyline color="#82c8ea" width="2"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="8-9">
-					<polyline color="#82c8ea" width="3"/>
-					<text text_size="7"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="10-">
-					<polyline color="#82c8ea" width="3"/>
-					<text text_size="10"/>
-				</itemgra>
-				<itemgra item_types="water_stream" order="8-9">
-					<polyline color="#82c8ea" width="1"/>
-				</itemgra>
-				<itemgra item_types="water_stream" order="10-">
-					<polyline color="#82c8ea" width="2"/>
-					<text text_size="7"/>
-				</itemgra>
-				<itemgra item_types="water_drain" order="10-">
-					<polyline color="#82c8ea" width="1"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_apron" order="0-">
-					<polygon color="#d0d0d0"/>
-				</itemgra>
-				<itemgra item_types="poly_terminal" order="7-">
-					<polygon color="#e3c6a6"/>
-				</itemgra>
-				<itemgra item_types="poly_cemetery" order="11-">
-					<polygon color="#bde3cb"/>
-				</itemgra>
-				<itemgra item_types="poly_car_parking" order="11-">
-					<polygon color="#e7cf87"/>
-				</itemgra>
-				<itemgra item_types="poly_building" order="11-">
-					<polygon color="#b6a6a6"/>
-				</itemgra>
-				<itemgra item_types="rail" order="6-">
-					<polyline color="#696969" width="3"/>
-					<polyline color="#ffffff" width="1" dash="5,5"/>
-				</itemgra>
-				<itemgra item_types="ferry" order="5-">
-					<polyline color="#000000" width="1" dash="10"/>
-				</itemgra>
-				<itemgra item_types="border_country" order="0-">
-					<polyline color="#b8434e" width="1" dash="10,5,2,5"/>
-				</itemgra>
-				<itemgra item_types="border_state" order="0-">
-					<polyline color="#808080" width="1"/>
-				</itemgra>
-				<itemgra item_types="height_line_1" order="0-">
-					<polyline color="#000000" width="4"/>
-				</itemgra>
-				<itemgra item_types="height_line_2" order="0-">
-					<polyline color="#000000" width="2"/>
-				</itemgra>
-				<itemgra item_types="height_line_3" order="0-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-			</layer>
-			<layer name="streets">
-				<itemgra item_types="street_route" order="2">
-					<polyline color="#0000a0" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="3-5">
-					<polyline color="#0000a0" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="6">
-					<polyline color="#0000a0" width="10"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="7-8">
-					<polyline color="#0000a0" width="16"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="9-10">
-					<polyline color="#0000a0" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="11">
-					<polyline color="#0000a0" width="28"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="12">
-					<polyline color="#0000a0" width="32"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="13">
-					<polyline color="#0000a0" width="52"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="14">
-					<polyline color="#0000a0" width="64"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="15">
-					<polyline color="#0000a0" width="68"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="16">
-					<polyline color="#0000a0" width="132"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="17">
-					<polyline color="#0000a0" width="268"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="18">
-					<polyline color="#0000a0" width="530"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="2">
-					<polyline color="#ba00b8" width="4"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="3-5">
-					<polyline color="#ba00b8" width="8"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="6">
-					<polyline color="#ba00b8" width="10"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="7-8">
-					<polyline color="#ba00b8" width="16"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="9-10">
-					<polyline color="#ba00b8" width="20"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="11">
-					<polyline color="#ba00b8" width="28"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="12">
-					<polyline color="#ba00b8" width="32"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="13">
-					<polyline color="#ba00b8" width="52"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="14">
-					<polyline color="#ba00b8" width="64"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="15">
-					<polyline color="#ba00b8" width="68"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="16">
-					<polyline color="#ba00b8" width="132"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="17">
-					<polyline color="#ba00b8" width="268"/>
-				</itemgra>
-				<itemgra item_types="selected_line" order="18">
-					<polyline color="#ba00b8" width="530"/>
-				</itemgra>
-				<itemgra item_types="forest_way_1" order="10-">
-					<polyline color="#0070c0" width="6"/>
-				</itemgra>
-				<itemgra item_types="forest_way_2" order="10-">
-					<polyline color="#ff0000" width="3"/>
-				</itemgra>
-				<itemgra item_types="forest_way_3" order="10-">
-					<polyline color="#ff0000" width="1" dash="2,4"/>
-				</itemgra>
-				<itemgra item_types="forest_way_4" order="10-">
-					<polyline color="#119a2e" width="1" dash="4,10"/>
-				</itemgra>
-				<itemgra item_types="street_nopass" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_paved" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled,track_grass" order="10-12">
-					<polyline color="#800000" width="1" dash="3,6"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled,track_grass" order="13-14">
-					<polyline color="#ffffff" width="4"/>
-					<polyline color="#800000" width="1" dash="4,8"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled,track_grass" order="15-16">
-					<polyline color="#ffffff" width="5"/>
-					<polyline color="#800000" width="1" dash="5,10"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled,track_grass" order="17-">
-					<polyline color="#ffffff" width="7"/>
-					<polyline color="#800000" width="1" dash="7,15"/>
-				</itemgra>
-				<itemgra item_types="track_unpaved,track_ground,path,hiking,hiking_mountain,hiking_mountain_demanding,hiking_alpine,hiking_alpine_demanding,hiking_alpine_difficult" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="bridleway" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="cycleway" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="10-12">
-					<polyline color="#00A000" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="13-14">
-					<polyline color="#00A000" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="15-16">
-					<polyline color="#00A000" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="17-">
-					<polyline color="#00A000" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="10-12">
-					<polyline color="#0000ff" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="13-14">
-					<polyline color="#0000ff" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="15-16">
-					<polyline color="#0000ff" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="17-">
-					<polyline color="#0000ff" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="10-12">
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="13-14">
-					<polyline color="#ff0000" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="15-16">
-					<polyline color="#ff0000" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="17-">
-					<polyline color="#ff0000" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="10-12">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="13-14">
-					<polyline color="#000000" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="15-16">
-					<polyline color="#000000" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="17-">
-					<polyline color="#000000" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="10-12">
-					<polyline color="#ffaa00" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="13-14">
-					<polyline color="#ffaa00" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="15-16">
-					<polyline color="#ffaa00" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="17-">
-					<polyline color="#ffaa00" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="10-12">
-					<polyline color="#ffff00" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="13-14">
-					<polyline color="#ffff00" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="15-16">
-					<polyline color="#ffff00" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="17-">
-					<polyline color="#ffff00" width="5"/>
-				</itemgra>
-				<itemgra item_types="lift_cable_car" order="6-">
-					<polyline color="#696969" width="1" dash="5"/>
-				</itemgra>
-				<itemgra item_types="lift_chair" order="6-">
-					<polyline color="#696969" width="1" dash="5"/>
-				</itemgra>
-				<itemgra item_types="lift_drag" order="6-">
-					<polyline color="#696969" width="1" dash="5"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="10-12">
-					<polyline color="#0000ff" width="1" dash="3,6" offset="4"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="13-14">
-					<polyline color="#ffffff" width="4" offset="6"/>
-					<polyline color="#0000ff" width="1" dash="4,8" offset="6"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="15-16">
-					<polyline color="#ffffff" width="5" offset="7"/>
-					<polyline color="#0000ff" width="1" dash="5,10" offset="7"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="17-">
-					<polyline color="#ffffff" width="7" offset="10"/>
-					<polyline color="#0000ff" width="1" dash="7,15" offset="10"/>
-				</itemgra>
-				<itemgra item_types="footway_and_piste_nordic" order="10-12">
-					<polyline color="#ff0000" width="1" dash="3,15"/>
-					<polyline color="#0000ff" width="1" dash="3,15" offset="9"/>
-				</itemgra>
-				<itemgra item_types="footway_and_piste_nordic" order="13-14">
-					<polyline color="#ffffff" width="4"/>
-					<polyline color="#ff0000" width="2"/>
-					<polyline color="#0000ff" width="1" dash="4,20" offset="12"/>
-				</itemgra>
-				<itemgra item_types="footway_and_piste_nordic" order="15-16">
-					<polyline color="#ffffff" width="5"/>
-					<polyline color="#ff0000" width="3"/>
-					<polyline color="#0000ff" width="1" dash="5,25" offset="15"/>
-				</itemgra>
-				<itemgra item_types="footway_and_piste_nordic" order="17-">
-					<polyline color="#ffffff" width="7"/>
-					<polyline color="#ff0000" width="5"/>
-					<polyline color="#0000ff" width="1" dash="7,37" offset="22"/>
-				</itemgra>
-				<itemgra item_types="footway" order="10-12">
-					<polyline color="#ff0000" width="1" dash="3,6"/>
-				</itemgra>
-				<itemgra item_types="footway" order="13-14">
-					<polyline color="#ffffff" width="4"/>
-					<polyline color="#ff0000" width="1" dash="4,8"/>
-				</itemgra>
-				<itemgra item_types="footway" order="15-16">
-					<polyline color="#ffffff" width="5"/>
-					<polyline color="#ff0000" width="1" dash="5,10"/>
-				</itemgra>
-				<itemgra item_types="footway" order="17-">
-					<polyline color="#ffffff" width="7"/>
-					<polyline color="#ff0000" width="1" dash="7,15"/>
-				</itemgra>
-				<itemgra item_types="steps" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="10">
-					<polyline color="#d2d2d2" width="3"/>
-					<polyline color="#dddddd" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="11">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#dddddd" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="12">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#dddddd" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="13">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#dddddd" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="14">
-					<polyline color="#d2d2d2" width="13"/>
-					<polyline color="#dddddd" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="15">
-					<polyline color="#d2d2d2" width="18"/>
-					<polyline color="#dddddd" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="16">
-					<polyline color="#d2d2d2" width="21"/>
-					<polyline color="#dddddd" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="17">
-					<polyline color="#d2d2d2" width="25"/>
-					<polyline color="#dddddd" width="21"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="18">
-					<polyline color="#d2d2d2" width="40"/>
-					<polyline color="#dddddd" width="34"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="10">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="11">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="12">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#fefefe" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="13">
-					<polyline color="#d2d2d2" width="6"/>
-					<polyline color="#fefefe" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="14">
-					<polyline color="#d2d2d2" width="7"/>
-					<polyline color="#fefefe" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="15">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#fefefe" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="16">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#fefefe" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="17">
-					<polyline color="#d2d2d2" width="10"/>
-					<polyline color="#fefefe" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="18">
-					<polyline color="#d2d2d2" width="11"/>
-					<polyline color="#fefefe" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="12">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="13">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="14">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#fefefe" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="15">
-					<polyline color="#d2d2d2" width="6"/>
-					<polyline color="#fefefe" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="16">
-					<polyline color="#d2d2d2" width="7"/>
-					<polyline color="#fefefe" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="17">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#fefefe" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="18">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#fefefe" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="10">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#ffffff" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="11">
-					<polyline color="#d2d2d2" width="6"/>
-					<polyline color="#ffffff" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="12">
-					<polyline color="#d2d2d2" width="10"/>
-					<polyline color="#ffffff" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="13">
-					<polyline color="#d2d2d2" width="11"/>
-					<polyline color="#ffffff" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="14">
-					<polyline color="#d2d2d2" width="17"/>
-					<polyline color="#ffffff" width="13"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="15">
-					<polyline color="#d2d2d2" width="18"/>
-					<polyline color="#ffffff" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="16">
-					<polyline color="#d2d2d2" width="30"/>
-					<polyline color="#ffffff" width="26"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="17">
-					<polyline color="#d2d2d2" width="67"/>
-					<polyline color="#ffffff" width="61"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="18">
-					<polyline color="#d2d2d2" width="132"/>
-					<polyline color="#ffffff" width="126"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="7-8">
-					<polyline color="#c0c0c0" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="9">
-					<polyline color="#c0c0c0" width="3"/>
-					<polyline color="#ffff00" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="10">
-					<polyline color="#c0c0c0" width="4"/>
-					<polyline color="#ffff00" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="11">
-					<polyline color="#c0c0c0" width="5"/>
-					<polyline color="#ffff00" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="12">
-					<polyline color="#c0c0c0" width="7"/>
-					<polyline color="#ffff00" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="13">
-					<polyline color="#c0c0c0" width="11"/>
-					<polyline color="#ffff00" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="14">
-					<polyline color="#c0c0c0" width="14"/>
-					<polyline color="#ffff00" width="11"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="15">
-					<polyline color="#c0c0c0" width="19"/>
-					<polyline color="#ffff00" width="15"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="16">
-					<polyline color="#c0c0c0" width="30"/>
-					<polyline color="#ffff00" width="26"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="17">
-					<polyline color="#c0c0c0" width="63"/>
-					<polyline color="#ffff00" width="57"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="18">
-					<polyline color="#c0c0c0" width="100"/>
-					<polyline color="#ffff00" width="90"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="7-8">
-					<polyline color="#a0a0a0" width="3"/>
-					<polyline color="#ffff00" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="9">
-					<polyline color="#a0a0a0" width="5"/>
-					<polyline color="#ffff00" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="10">
-					<polyline color="#a0a0a0" width="8"/>
-					<polyline color="#ffff00" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="11">
-					<polyline color="#a0a0a0" width="9"/>
-					<polyline color="#ffff00" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="12">
-					<polyline color="#a0a0a0" width="13"/>
-					<polyline color="#ffff00" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="13">
-					<polyline color="#a0a0a0" width="18"/>
-					<polyline color="#ffff00" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="14">
-					<polyline color="#a0a0a0" width="21"/>
-					<polyline color="#ffff00" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="15">
-					<polyline color="#a0a0a0" width="25"/>
-					<polyline color="#ffff00" width="21"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="16">
-					<polyline color="#a0a0a0" width="40"/>
-					<polyline color="#ffff00" width="34"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="17">
-					<polyline color="#a0a0a0" width="79"/>
-					<polyline color="#ffff00" width="73"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="18">
-					<polyline color="#a0a0a0" width="156"/>
-					<polyline color="#ffff00" width="150"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="2-6">
-					<polyline color="#404040" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="7-8">
-					<polyline color="#404040" width="3"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="9">
-					<polyline color="#000000" width="5"/>
-					<polyline color="#ff0000" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="10">
-					<polyline color="#000000" width="6"/>
-					<polyline color="#ff0000" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11">
-					<polyline color="#000000" width="9"/>
-					<polyline color="#ff0000" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="12">
-					<polyline color="#000000" width="13"/>
-					<polyline color="#ff0000" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="13">
-					<polyline color="#000000" width="18"/>
-					<polyline color="#ff0000" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="14">
-					<polyline color="#000000" width="21"/>
-					<polyline color="#ff0000" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="15">
-					<polyline color="#000000" width="24"/>
-					<polyline color="#ff0000" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="16">
-					<polyline color="#000000" width="39"/>
-					<polyline color="#ff0000" width="33"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="17">
-					<polyline color="#000000" width="78"/>
-					<polyline color="#ff0000" width="72"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="18">
-					<polyline color="#000000" width="156"/>
-					<polyline color="#ff0000" width="150"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="2">
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="3-5">
-					<polyline color="#ff0000" width="3"/>
-					<polyline color="#ffff00" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="6">
-					<polyline color="#ff0000" width="4"/>
-					<polyline color="#ffff00" width="2"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="7-8">
-					<polyline color="#ff0000" width="7"/>
-					<polyline color="#ffff00" width="5"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="9-10">
-					<polyline color="#ff0000" width="9"/>
-					<polyline color="#ffff00" width="5"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="11">
-					<polyline color="#ff0000" width="13"/>
-					<polyline color="#ffff00" width="9"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="12">
-					<polyline color="#ff0000" width="15"/>
-					<polyline color="#ffff00" width="10"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="13">
-					<polyline color="#ff0000" width="25"/>
-					<polyline color="#ffff00" width="17"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="14">
-					<polyline color="#ff0000" width="31"/>
-					<polyline color="#ffff00" width="24"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="15">
-					<polyline color="#ff0000" width="33"/>
-					<polyline color="#ffff00" width="27"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="16">
-					<polyline color="#ff0000" width="65"/>
-					<polyline color="#ffff00" width="59"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="17">
-					<polyline color="#ff0000" width="133"/>
-					<polyline color="#ffff00" width="127"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="18">
-					<polyline color="#ff0000" width="264"/>
-					<polyline color="#ffff00" width="258"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="tracking_0" order="0-">
-					<polyline color="#000000" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_10" order="0-">
-					<polyline color="#191919" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_20" order="0-">
-					<polyline color="#333333" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_30" order="0-">
-					<polyline color="#4c4c4c" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_40" order="0-">
-					<polyline color="#666666" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_50" order="0-">
-					<polyline color="#7f7f7f" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_60" order="0-">
-					<polyline color="#999999" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_70" order="0-">
-					<polyline color="#b2b2b2" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_80" order="0-">
-					<polyline color="#cccccc" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_90" order="0-">
-					<polyline color="#e5e5e5" width="3"/>
-				</itemgra>
-				<itemgra item_types="tracking_100" order="0-">
-					<polyline color="#ffffff" width="3"/>
-				</itemgra>
-				<itemgra item_types="highway_exit_label" order="10-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street" order="10-18">
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="street_nopass,street_0,street_1_city,street_1_land,footway" order="12-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="2">
-					<polyline color="#ff9000" width="2"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="3-5">
-					<polyline color="#ff9000" width="4"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="6">
-					<polyline color="#ff9000" width="5"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="7-8">
-					<polyline color="#ff9000" width="8"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="9-10">
-					<polyline color="#ff9000" width="10"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="11">
-					<polyline color="#ff9000" width="14"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="12">
-					<polyline color="#ff9000" width="16"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="13">
-					<polyline color="#ff9000" width="26"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="14">
-					<polyline color="#ff9000" width="32"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="15">
-					<polyline color="#ff9000" width="34"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="16">
-					<polyline color="#ff9000" width="66"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="17">
-					<polyline color="#ff9000" width="134"/>
-				</itemgra>
-				<itemgra item_types="traffic_distortion" order="18">
-					<polyline color="#ff9000" width="265"/>
-				</itemgra>
-			</layer>
-			<layer name="polylines">
-				<itemgra item_types="aeroway_taxiway" order="10">
-					<polyline color="#989994" width="4"/>
-					<polyline color="#d3dbbc" width="2"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="11">
-					<polyline color="#989994" width="6"/>
-					<polyline color="#d3dbbc" width="4"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="12">
-					<polyline color="#989994" width="10"/>
-					<polyline color="#d3dbbc" width="8"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="13">
-					<polyline color="#989994" width="12"/>
-					<polyline color="#d3dbbc" width="9"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="14">
-					<polyline color="#989994" width="15"/>
-					<polyline color="#d3dbbc" width="13"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="15">
-					<polyline color="#989994" width="17"/>
-					<polyline color="#d3dbbc" width="14"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="16">
-					<polyline color="#989994" width="33"/>
-					<polyline color="#d3dbbc" width="26"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="17">
-					<polyline color="#989994" width="69"/>
-					<polyline color="#d3dbbc" width="61"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="18">
-					<polyline color="#989994" width="132"/>
-					<polyline color="#d3dbbc" width="126"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="2-6">
-					<polyline color="#404040" width="1"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="7-8">
-					<polyline color="#404040" width="3"/>
-					<polyline color="#d3dbbc" width="1"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="9">
-					<polyline color="#6b6f5f" width="5"/>
-					<polyline color="#d3dbbc" width="3"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="10">
-					<polyline color="#6b6f5f" width="6"/>
-					<polyline color="#d3dbbc" width="4"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="11">
-					<polyline color="#6b6f5f" width="9"/>
-					<polyline color="#d3dbbc" width="7"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="12">
-					<polyline color="#6b6f5f" width="13"/>
-					<polyline color="#d3dbbc" width="9"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="13">
-					<polyline color="#6b6f5f" width="18"/>
-					<polyline color="#d3dbbc" width="14"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="14">
-					<polyline color="#6b6f5f" width="21"/>
-					<polyline color="#d3dbbc" width="17"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="15">
-					<polyline color="#6b6f5f" width="24"/>
-					<polyline color="#d3dbbc" width="20"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="16">
-					<polyline color="#6b6f5f" width="39"/>
-					<polyline color="#d3dbbc" width="33"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="17">
-					<polyline color="#6b6f5f" width="78"/>
-					<polyline color="#d3dbbc" width="72"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="18">
-					<polyline color="#6b6f5f" width="156"/>
-					<polyline color="#d3dbbc" width="150"/>
-				</itemgra>
-				<itemgra item_types="rail_tram" order="10-">
-					<polyline color="#606060" width="2"/>
-				</itemgra>
-			</layer>
-			<layer name="labels">
-						<itemgra item_types="house_number" order="15-">
-						<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="11-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="10-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e3,place_label" order="10-">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4" order="9-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_2e3" order="9-">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="town_label_5e3,town_label_1e4,town_label_2e4,town_label_5e4" order="9-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="8-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_2e3" order="8">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7" order="7-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_5e3" order="7-8">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e4" order="6-8">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="town_label_2e4,town_label_5e4" order="5-8">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="5-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="5-">
-					<circle color="#000000" radius="3" text_size="20"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="3-4">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="3-4">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="0-2">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="Internal">
-				<itemgra item_types="track" order="7-">
-					<polyline color="#3f3f3f" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_tracked" order="7-">
-					<polyline color="#3f3fff" width="3"/>
-				</itemgra>
-				<itemgra item_types="rg_segment" order="12-">
-					<polyline color="#FF089C" width="1"/>
-					<arrows color="#FF089C" width="1"/>
-					<text text_size="15"/>
-				</itemgra>
-				<itemgra item_types="rg_point" order="12-">
-					<circle color="#FF089C" radius="10" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="nav_left_1" order="0-">
-					<icon src="nav_left_1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_left_2" order="0-">
-					<icon src="nav_left_2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_left_3" order="0-">
-					<icon src="nav_left_3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_1" order="0-">
-					<icon src="nav_right_1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_2" order="0-">
-					<icon src="nav_right_2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_3" order="0-">
-					<icon src="nav_right_3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_straight" order="0-">
-					<icon src="nav_straight_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_turnaround_left" order="0-">
-					<icon src="nav_turnaround_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_turnaround_right" order="0-">
-					<icon src="nav_turnaround_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l1" order="0-">
-					<icon src="nav_roundabout_l1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r1" order="0-">
-					<icon src="nav_roundabout_r1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l2" order="0-">
-					<icon src="nav_roundabout_l2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r2" order="0-">
-					<icon src="nav_roundabout_r2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l3" order="0-">
-					<icon src="nav_roundabout_l3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r3" order="0-">
-					<icon src="nav_roundabout_r3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l4" order="0-">
-					<icon src="nav_roundabout_l4_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r4" order="0-">
-					<icon src="nav_roundabout_r4_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l5" order="0-">
-					<icon src="nav_roundabout_l5_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r5" order="0-">
-					<icon src="nav_roundabout_r5_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l6" order="0-">
-					<icon src="nav_roundabout_l6_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r6" order="0-">
-					<icon src="nav_roundabout_r6_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l7" order="0-">
-					<icon src="nav_roundabout_l7_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r7" order="0-">
-					<icon src="nav_roundabout_r7_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l8" order="0-">
-					<icon src="nav_roundabout_l8_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r8" order="0-">
-					<icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_keep_left" order="0-">
-					<icon src="nav_keep_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_merge_left" order="0-">
-					<icon src="nav_merge_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_keep_right" order="0-">
-					<icon src="nav_keep_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_merge_right" order="0-">
-					<icon src="nav_merge_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_exit_left" order="0-">
-					<icon src="nav_exit_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_exit_right" order="0-">
-					<icon src="nav_exit_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="route_end" order="0-">
-					<icon src="nav_destination_bk.svg" w="32" h="32" x="4" y="30"/>
-				</itemgra>
-				<itemgra item_types="nav_none" order="0-">
-					<icon src="unknown.svg"/>
-				</itemgra>
-				<itemgra item_types="announcement" order="7-">
-					<icon src="gui_sound_32_32.svg"/>
-					<circle color="#FF089C" radius="10" text_size="7"/>
-				</itemgra>
-
-				<itemgra item_types="waypoint,route_end" order="2">
-					<circle color="#008080" radius="4" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="3-5">
-					<circle color="#008080" radius="8" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="6">
-					<circle color="#008080" radius="10" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="7-8">
-					<circle color="#008080" radius="16" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="9-10">
-					<circle color="#008080" radius="20" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="11">
-					<circle color="#008080" radius="28" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="12">
-					<circle color="#008080" radius="32" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="13">
-					<circle color="#008080" radius="52" width="4" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="14">
-					<circle color="#008080" radius="64" width="4" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="15">
-					<circle color="#008080" radius="68" width="6" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="16">
-					<circle color="#008080" radius="132" width="8" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="17">
-					<circle color="#008080" radius="268" width="8" text_size="48"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="18">
-					<circle color="#008080" radius="530" width="8" text_size="48"/>
-				</itemgra>
-			</layer>
-			<layer name="Unknown" enabled="no">
-				<!-- This entry shows all unknow point elements as blue circles -->
-				<itemgra item_types="point_unkn" order="9-">
-					<circle color="#8080ff" radius="3"/>
-				</itemgra>
-				<!-- This entry shows all unknown linear elements as blue lines -->
-				<itemgra item_types="street_unkn" order="0-">
-					<polyline color="#8080ff" width="3"/>
-				</itemgra>
-			</layer>
-			<layer name="POI Road items">
-				<itemgra item_types="mini_roundabout" order="12-">
-					<icon src="mini_roundabout.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="turning_circle" order="12-">
-					<icon src="mini_roundabout.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_bridge" order="12-">
-					<icon src="bridge.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="highway_exit" order="11-">
-					<icon src="exit.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_border_station" order="12-">
-					<icon src="border_station.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_crossing" order="12-">
-					<icon src="crossing.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_height" order="12-">
-					<icon src="height.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_level_crossing" order="11-">
-					<icon src="level_crossing.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_tunnel" order="12-">
-					<icon src="tunnel.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="traffic_signals" order="13-">
-					<icon src="traffic_signals.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="barrier_bollard" order="12-">
-					<icon src="barrier_bollard.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="barrier_lift_gate" order="12-">
-					<icon src="barrier_lift_gate.svg" h="15" w="15"/>
-				</itemgra>
-			</layer>
-			<layer name="POI public transport">
-				<itemgra item_types="poi_airport" order="5-">
-					<icon src="airport.svg" h="20" w="20"/>
-				</itemgra>
-				<itemgra item_types="poi_car_sharing" order="11-">
-					<icon src="car_sharing.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_halt" order="11-">
-					<circle color="#ff0000" radius="3" width="3"/>
-					<circle color="#000000" radius="5" width="2" text_size="8"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_station" order="9-">
-					<circle color="#ff0000" radius="3" width="3"/>
-					<circle color="#000000" radius="6" width="2" text_size="8"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_tram_stop" order="10-11">
-					<circle color="#ff0000" radius="2" width="2"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_tram_stop" order="12-">
-					<circle color="#ff0000" radius="3" width="3"/>
-					<circle color="#606060" radius="5" width="2" text_size="8"/>
-				</itemgra>
-				<itemgra item_types="poi_taxi" order="13-">
-					<icon src="taxi.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_bus_station" order="11-">
-					<icon src="bus.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_bus_stop" order="12-">
-					<icon src="bus_stop.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_heliport" order="12-">
-					<icon src="heliport.svg" h="15" w="15"/>
-				</itemgra>
-			</layer>
-			<layer name="POI public transport Labels">
-				<itemgra item_types="poi_airport,poi_car_sharing,poi_taxi,poi_bus_station,poi_bus_stop,poi_heliport" order="14-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="POI Car">
-				<itemgra item_types="poi_car_parking" order="11-">
-					<icon src="parking.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_fuel" order="12-">
-					<icon src="fuel.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_repair_service" order="12-">
-					<icon src="repair_service.svg" h="15" w="15"/>
-				</itemgra>
-			</layer>
-			<layer name="POI Car Labels">
-				<itemgra item_types="poi_car_parking,poi_fuel,poi_repair_service" order="16-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="POI accomodation">
-				<itemgra item_types="poi_resort" order="12-">
-					<icon src="resort.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_hotel" order="12-">
-					<icon src="hotel.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_guesthouse" order="12-">
-					<icon src="guesthouse.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_motel" order="12-">
-					<icon src="motel.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_hostel" order="12-">
-					<icon src="hostel.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_cafe" order="12-">
-					<icon src="cafe.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_bar" order="12-">
-					<icon src="bar.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_pub" order="12-">
-					<icon src="beer.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_dining" order="12-">
-					<icon src="restaurant.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_fastfood" order="12-">
-					<icon src="fastfood.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_camp_rv" order="12-">
-					<icon src="camping.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_restaurant" order="12-">
-					<icon src="restaurant.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_picnic" order="12-">
-					<icon src="picnic.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_biergarten" order="12-">
-					<icon src="beer.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_wine" order="12-">
-					<icon src="wine.svg" h="15" w="15"/>
-				</itemgra>
-			</layer>
-			<layer name="POI accomodation Labels">
-				<itemgra item_types="poi_resort,poi_hotel,poi_guesthouse,poi_motel,poi_hostel,poi_dining,poi_restaurant" order="14-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="poi_cafe,poi_bar,poi_pub,poi_fastfood,poi_camp_rv,poi_picnic,poi_biergarten,poi_wine" order="15-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="POI religion">
-				<itemgra item_types="poi_worship" order="11-">
-					<icon src="worship.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_church" order="11-">
-					<icon src="church.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_bahai" order="11-">
-					<icon src="bahai.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_buddhist" order="11-">
-					<icon src="buddhist.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_hindu" order="11-">
-					<icon src="hindu.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_islamic" order="11-">
-					<icon src="islamic.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_jain" order="11-">
-					<icon src="jain.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_jewish" order="11-">
-					<icon src="jewish.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_pagan" order="11-">
-					<icon src="pagan.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_pastafarian" order="11-">
-					<icon src="pastafarian.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shinto" order="11-">
-					<icon src="shinto.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_sikh" order="11-">
-					<icon src="sikh.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_taoist" order="11-">
-					<icon src="taoist.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_cemetery" order="12-">
-					<icon src="cemetery.svg" h="15" w="15"/>
-				</itemgra>
-			</layer>
-			<layer name="POI religion Labels">
-				<itemgra item_types="poi_worship,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cemetery" order="15-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="POI government">
-				<itemgra item_types="poi_townhall" order="13-">
-					<icon src="townhall.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_government_building" order="13-">
-					<icon src="goverment_building.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_justice" order="13-">
-					<icon src="justice.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_post_office,poi_post_box" order="13-">
-					<icon src="post.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_public_office" order="13-">
-					<icon src="public_office.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_military" order="13-">
-					<icon src="military.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_school" order="13-">
-					<icon src="school.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_atm" order="12-">
-					<icon src="atm.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_bank" order="13-">
-					<icon src="bank.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_forbidden_area" order="13-">
-					<icon src="forbiden_area.svg" h="15" w="15"/>
-				</itemgra>
-			</layer>
-			<layer name="POI government Labels">
-				<itemgra item_types="poi_townhall,poi_government_building,poi_justice,poi_public_office,poi_military,poi_school,poi_forbidden_area" order="14-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="poi_post_office,poi_post_box,poi_atm,poi_bank" order="16-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="POI cultural">
-				<itemgra item_types="poi_cinema" order="12-">
-					<icon src="cinema.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_casino" order="12-">
-					<icon src="casino.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_library" order="12-">
-					<icon src="library.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_theater" order="12-">
-					<icon src="theater.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_concert" order="12-">
-					<icon src="concert.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_attraction" order="11-">
-					<icon src="attraction.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_museum_history" order="12-">
-					<icon src="museum.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_zoo" order="9-">
-					<icon src="zoo.svg" h="15" w="15"/>
-				</itemgra>
-			</layer>
-			<layer name="POI cultural Labels">
-				<itemgra item_types="poi_attraction,poi_museum_history" order="14-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="poi_cinema,poi_casino,poi_library,poi_theater,poi_concert,poi_zoo" order="16-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="POI commercial">
-				<itemgra item_types="poi_mall" order="14-">
-					<icon src="mall.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_car_dealer_parts" order="14-">
-					<icon src="car_dealer.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shopping" order="14-">
-					<icon src="shopping.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_car_rent" order="14-">
-					<icon src="car_rent.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_car_wash" order="14-">
-					<icon src="car_wash.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_fair" order="14-">
-					<icon src="fair.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_kiosk" order="14-">
-					<icon src="shop_kiosk.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_apparel" order="14-">
-					<icon src="shop_apparel.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_computer" order="14-">
-					<icon src="shop_computer.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_department" order="14-">
-					<icon src="shop_department.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_furniture" order="14-">
-					<icon src="shop_furnish.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_grocery" order="14-">
-					<icon src="shop_grocery.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_baker" order="14-">
-					<icon src="shop_butcher.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_butcher" order="14-">
-					<icon src="shop_baker.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_shoes" order="14-">
-					<icon src="shop_shoes.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_optician" order="14-">
-					<icon src="shop_optician.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_handg" order="14-">
-					<icon src="shop_handg.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_merchandise" order="14-">
-					<icon src="shop_merchandise.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_retail" order="14-">
-					<icon src="shop_retail.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_beverages" order="14-">
-					<icon src="shop_beverages.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_bicycle" order="14-">
-					<icon src="bicycle_shop.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_florist" order="14-">
-					<icon src="shop_florist.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_gps" order="14-">
-					<icon src="garmin.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_vending_machine" order="14-">
-					<icon src="vending_machine.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_hairdresser" order="14-">
-					<icon src="shop_baker.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_autoservice" order="14-">
-					<icon src="car_dealer.svg" h="15" w="15"/>
-				</itemgra>
-			</layer>
-			<layer name="POI commercial Labels">
-				<itemgra item_types="poi_mall,poi_car_dealer_parts,poi_shopping,poi_car_rent,poi_car_wash,poi_fair,poi_shop_kiosk,poi_shop_apparel,poi_shop_computer,poi_shop_department,poi_shop_furniture,poi_shop_grocery,poi_shop_baker,poi_shop_butcher,poi_shop_shoes,poi_shop_optician,poi_shop_handg,poi_shop_merchandise,poi_shop_retail,poi_shop_beverages,poi_shop_bicycle,poi_shop_florist,poi_shop_gps,poi_vending_machine,poi_hairdresser,poi_autoservice" order="16-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="POI geocache">
-				<itemgra item_types="poi_gc_multi" order="12-">
-					<icon src="gc_multi.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_tradi" order="12-">
-					<icon src="gc_tradi.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_event" order="12-">
-					<icon src="gc_event.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_mystery" order="12-">
-					<icon src="gc_mystery.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_question" order="12-">
-					<icon src="gc_question.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_stages" order="12-">
-					<icon src="gc_stages.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_reference" order="12-">
-					<icon src="gc_reference.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_webcam" order="12-">
-					<icon src="gc_webcam.svg"/>
-				</itemgra>
-			</layer>
-			<layer name="POI health">
-				<itemgra item_types="poi_hospital" order="12-">
-					<icon src="hospital.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_police" order="12-">
-					<icon src="police.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_emergency" order="12-">
-					<icon src="emergency.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_firebrigade" order="13-">
-					<icon src="firebrigade.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_pharmacy" order="13-">
-					<icon src="pharmacy.svg" h="15" w="15"/>
-				</itemgra>
-			</layer>
-			<layer name="POI health Labels">
-				<itemgra item_types="poi_hospital,poi_police,poi_emergency,poi_firebrigade,poi_pharmacy" order="14-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="POI pedestrian">
-				<itemgra item_types="poi_communication" order="13-">
-					<icon src="communication.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_bench" order="15-">
-					<icon src="bench.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_hunting_stand" order="14-">
-					<icon src="hunting_stand.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_memorial" order="12-">
-					<icon src="memorial.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_monument" order="12-">
-					<icon src="memorial.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shelter" order="13-">
-					<icon src="shelter.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_fountain" order="13-">
-					<icon src="fountain.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_potable_water" order="14-">
-					<icon src="drinking_water.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_toilets" order="13-">
-					<icon src="toilets.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_restroom" order="13-">
-					<icon src="toilets.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_shower" order="14-">
-					<icon src="shower.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_viewpoint" order="10-">
-					<icon src="viewpoint.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_telephone" order="14-">
-					<icon src="telephone.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_wifi" order="14-">
-					<icon src="wifi.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_drinking_water" order="13-">
-					<icon src="drinking_water.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_boundary_stone" order="14-">
-					<icon src="boundary_stone.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_information" order="13-">
-					<icon src="information.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_bicycle_parking" order="15-">
-					<icon src="bicycle_parking.svg" h="15" w="15"/>
-				</itemgra>
-			</layer>
-			<layer name="POI pedestrian Labels">
-				<itemgra item_types="poi_communication,poi_bench,poi_hunting_stand,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_potable_water,poi_toilets,poi_restroom,poi_shower,poi_viewpoint,poi_telephone,poi_wifi,poi_drinking_water,poi_boundary_stone,poi_information,poi_bicycle_parking" order="16-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="POI landscape">
-				<itemgra item_types="town_ghost" order="10-">
-					<icon src="ghost_town.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_bay" order="12-">
-					<icon src="bay.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_cove" order="12-">
-					<icon src="cove.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_dam" order="12-">
-					<icon src="dam.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_hotspring" order="12-">
-					<icon src="hotspring.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_landmark" order="11-">
-					<icon src="landmark.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_castle" order="11-">
-					<icon src="castle.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_ruins" order="11-">
-					<icon src="ruins.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_mark" order="12-">
-					<icon src="mark.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_mine" order="12-">
-					<icon src="mine.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_tower" order="13-">
-					<icon src="tower.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_scenic_area" order="12-">
-					<icon src="scenic_area.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_peak" order="7-">
-					<icon src="peak.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_oil_field" order="12-">
-					<icon src="oil_field.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_tree" order="14-">
-					<icon src="tree.svg" h="15" w="15"/>
-				</itemgra>
-			</layer>
-			<layer name="POI landscape Labels">
-				<itemgra item_types="town_ghost,poi_bay,poi_cove,poi_dam,poi_hotspring,poi_landmark,poi_castle,poi_ruins,poi_scenic_area,poi_peak,poi_oil_field" order="14-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="poi_mark,poi_mine,poi_tree" order="16-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="POI sport">
-				<itemgra item_types="poi_diving" order="13-">
-					<icon src="diving.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_fish" order="13-">
-					<icon src="fish.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_golf" order="13-">
-					<icon src="golf.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_icesport" order="13-">
-					<icon src="icesport.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_soccer" order="13-">
-					<icon src="soccer.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_sailing" order="13-">
-					<icon src="sailing.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_skiing" order="13-">
-					<icon src="skiing.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_sport" order="13-">
-					<icon src="sport.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_stadium" order="13-">
-					<icon src="stadium.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_swimming" order="13-">
-					<icon src="swimming.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_trail" order="13-">
-					<icon src="trail.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_tide" order="13-">
-					<icon src="tide.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_bowling" order="13-">
-					<icon src="bowling.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_climbing" order="13-">
-					<icon src="climbing.svg" h="15" w="15"/>
-				</itemgra>
-			</layer>
-			<layer name="POI sport Labels">
-				<itemgra item_types="poi_icesport,poi_soccer,poi_stadium,poi_swimming" order="14-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="poi_diving,poi_fish,poi_golf,poi_sailing,poi_skiing,poi_sport,poi_trail,poi_tide,poi_bowling,poi_climbing" order="16-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="POI Symbols">
-				<itemgra item_types="poi_auto_club" order="12-">
-					<icon src="auto_club.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_bend" order="12-">
-					<icon src="bend.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_boat_ramp" order="12-">
-					<icon src="boat_ramp.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_business_service" order="12-">
-					<icon src="bussines_service.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_danger_area" order="12-">
-					<icon src="danger_16_16.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_danger_sea_wreck" order="12-">
-					<icon src="dangerous.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_daymark" order="12-">
-					<icon src="daymark.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_levee" order="12-">
-					<icon src="levee.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_locale" order="12-">
-					<icon src="locale.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_loudspeaker" order="12-">
-					<icon src="loudspeaker.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_manmade_feature" order="12-">
-					<icon src="manmade_feature.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_marine" order="12-">
-					<icon src="marine.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_marine_type" order="12-">
-					<icon src="marine_type.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_nondangerous" order="12-">
-					<icon src="nondangerous.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_personal_service" order="12-">
-					<icon src="personal_service.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_restricted_area" order="12-">
-					<icon src="restricted_area.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_service" order="12-">
-					<icon src="service.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_social_service" order="12-">
-					<icon src="social_service.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_sounding" order="12-">
-					<icon src="sounding.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_wrecker" order="12-">
-					<icon src="wrecker.svg" h="15" w="15"/>
-				</itemgra>
-				<itemgra item_types="poi_image" order="12-">
-					<image/>
-				</itemgra>
-				<itemgra item_types="tec_common" order="11-">
-					<icon src="tec_common.svg"/>
-				</itemgra>
-				<itemgra item_types="vehicle" order="0-">
-					<icon src="gui_vehicle_16_16.svg" />
-				</itemgra>
-				<itemgra item_types="vehicle_pedestrian" order="0-">
-					<icon src="gui_vehicle_pedestrian_16_16.svg" />
-				</itemgra>
-				<itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf" order="10-">
-					<icon src="%s" />
-				</itemgra>
-			</layer>
-			<layer name="POI symbols Labels">
-				<itemgra item_types="poi_auto_club,poi_bend,poi_boat_ramp,poi_business_service,poi_danger_area,poi_danger_sea_wreck,poi_daymark,poi_levee,poi_locale,poi_loudspeaker,poi_manmade_feature,poi_marine,poi_marine_type,poi_nondangerous,poi_personal_service,poi_restricted_area,poi_service,poi_social_service,poi_sounding,poi_wrecker,poi_image,vehicle,vehicle_pedestrian" order="16-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf" order="10-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="Found items" ref="Found items"/>
-		</layout>
-
-		<layout name="Car-dark" daylayout="Car" color="#011001">
-
-			<cursor w="26" h="26">
-				<itemgra>
-					<circle color="#00ff00" radius="24" width="2">
-						<coord x="0" y="0"/>
-					</circle>
-				</itemgra>
-				<itemgra speed_range="-2">
-					<polyline color="#00ff00" width="2">
-						<coord x="0" y="0"/>
-						<coord x="0" y="0"/>
-					</polyline>
-				</itemgra>
-				<itemgra speed_range="3-">
-					<polyline color="#00ff00" width="2">
-						<coord x="-7" y="-10"/>
-						<coord x="0" y="12"/>
-						<coord x="7" y="-10"/>
-					</polyline>
-				</itemgra>
-			</cursor>
-
-			<layer name="polygons">
-				<itemgra item_types="image" order="0-">
-					<image/>
-				</itemgra>
-				<itemgra item_types="poly_wood" order="0-">
-					<polygon color="#041a06"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-">
-					<polygon color="#041a06"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_farm" order="0-">
-					<polygon color="#041a06"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_meadow" order="0-">
-					<polygon color="#041a06"/>
-				</itemgra>
-				<itemgra item_types="poly_town" order="0-">
-					<polygon color="#191711"/>
-				</itemgra>
-				<itemgra item_types="poly_university" order="8-">
-					<polygon color="#140f14"/>
-				</itemgra>
-				<itemgra item_types="poly_water" order="0-">
-					<polygon color="#010321"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_land" order="0-">
-					<polygon color="#011001"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_park" order="0-">
-					<polygon color="#041a06"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="10">
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="11">
-					<polyline color="#1e0728" width="3"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="12">
-					<polyline color="#1e0728" width="5"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="13">
-					<polyline color="#1e0728" width="6"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="14">
-					<polyline color="#1e0728" width="7"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="15">
-					<polyline color="#1e0728" width="9"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="16">
-					<polyline color="#1e0728" width="10"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="17">
-					<polyline color="#1e0728" width="12"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_pedestrian" order="18">
-					<polyline color="#1e0728" width="20"/>
-					<polygon color="#202020"/>
-				</itemgra>
-				<itemgra item_types="poly_airport" order="0-">
-					<polygon color="#002e00"/>
-				</itemgra>
-				<itemgra item_types="poly_sport,poly_sports_pitch" order="0-">
-					<polygon color="#0c220c"/>
-				</itemgra>
-				<itemgra item_types="poly_industry,poly_place" order="0-">
-					<polygon color="#111111"/>
-				</itemgra>
-				<itemgra item_types="poly_service" order="8-18">
-					<polygon color="#1a1a1a"/>
-					<polyline color="#282828" width="1"/>
-				</itemgra>
-				<itemgra item_types="poly_street_1" order="8-13">
-					<polygon color="#24092f"/>
-				</itemgra>
-				<itemgra item_types="poly_street_1" order="14-16">
-					<polygon color="#24092f"/>
-				</itemgra>
-				<itemgra item_types="poly_street_1" order="17-18">
-					<polygon color="#24092f"/>
-				</itemgra>
-				<itemgra item_types="poly_street_2" order="7-12">
-					<polygon color="#c5c300"/>
-					<polyline color="#c0c0c0" width="1"/>
-				</itemgra>
-				<itemgra item_types="poly_street_2" order="13-16">
-					<polygon color="#c5c300"/>
-					<polyline color="#c0c0c0" width="2"/>
-				</itemgra>
-				<itemgra item_types="poly_street_2" order="17-18">
-					<polygon color="#c5c300"/>
-					<polyline color="#c0c0c0" width="3"/>
-				</itemgra>
-				<itemgra item_types="poly_street_3" order="7-11">
-					<polygon color="#c5c300"/>
-					<polyline color="#a0a0a0" width="1"/>
-				</itemgra>
-				<itemgra item_types="poly_street_3" order="12-15">
-					<polygon color="#c5c300"/>
-					<polyline color="#a0a0a0" width="2"/>
-				</itemgra>
-				<itemgra item_types="poly_street_3" order="16-18">
-					<polygon color="#c5c300"/>
-					<polyline color="#a0a0a0" width="3"/>
-				</itemgra>
-				<itemgra item_types="water_line" order="0-">
-					<polyline color="#010321" width="1"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="4-5">
-					<polyline color="#010321" width="1"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="6">
-					<polyline color="#010321" width="2"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="7">
-					<polyline color="#010321" width="3"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="8-9">
-					<polyline color="#010321" width="4"/>
-					<text color="#55c4bd" background_color="#000000" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="10-">
-					<polyline color="#010321" width="4"/>
-					<text color="#55c4bd" background_color="#000000" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="6">
-					<polyline color="#010321" width="1"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="7">
-					<polyline color="#010321" width="2"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="8-9">
-					<polyline color="#010321" width="3"/>
-					<text color="#55c4bd" background_color="#000000" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="10-">
-					<polyline color="#010321" width="3"/>
-					<text color="#55c4bd" background_color="#000000" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="water_stream" order="8-9">
-					<polyline color="#010321" width="1"/>
-				</itemgra>
-				<itemgra item_types="water_stream" order="10-">
-					<polyline color="#010321" width="2"/>
-					<text color="#55c4bd" background_color="#000000" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="water_drain" order="10-">
-					<polyline color="#010321" width="1"/>
-					<text color="#55c4bd" background_color="#000000" text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_apron" order="0-">
-					<polygon color="#041a06"/>
-				</itemgra>
-				<itemgra item_types="poly_terminal" order="7-">
-					<polygon color="#282424"/>
-				</itemgra>
-				<itemgra item_types="poly_cemetery" order="8-">
-					<polygon color="#041a06"/>
-				</itemgra>
-				<itemgra item_types="poly_car_parking" order="8-">
-					<polygon color="#1a170f"/>
-				</itemgra>
-				<itemgra item_types="poly_building" order="8-">
-					<polygon color="#282424"/>
-				</itemgra>
-				<itemgra item_types="rail" order="6-8">
-					<polyline color="#282828" width="2"/>
-					<polyline color="#3d3d3d" dash="1,5" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail" order="9-">
-					<polyline color="#282828" width="3"/>
-					<polyline color="#3d3d3d" dash="1,5" width="1"/>
-				</itemgra>
-				<itemgra item_types="ferry" order="5-">
-					<polyline color="#113111" width="1" dash="10"/>
-				</itemgra>
-				<itemgra item_types="border_country" order="0-">
-					<polyline color="#0d0b41" width="1" dash="10,5,2,5"/>
-				</itemgra>
-				<itemgra item_types="border_state" order="0-">
-					<polyline color="#808080" width="1"/>
-				</itemgra>
-				<itemgra item_types="height_line_1" order="0-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="height_line_2" order="0-">
-					<polyline color="#000000" width="2"/>
-				</itemgra>
-			</layer>
-			<layer name="streets">
-				<itemgra item_types="street_route" order="2">
-					<polyline color="#0000a0" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="3-5">
-					<polyline color="#0000a0" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="6">
-					<polyline color="#0000a0" width="10"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="7-8">
-					<polyline color="#0000a0" width="16"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="9-10">
-					<polyline color="#0000a0" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="11">
-					<polyline color="#0000a0" width="28"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="12">
-					<polyline color="#0000a0" width="32"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="13">
-					<polyline color="#0000a0" width="52"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="14">
-					<polyline color="#0000a0" width="64"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="15">
-					<polyline color="#0000a0" width="68"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="16">
-					<polyline color="#0000a0" width="132"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="17">
-					<polyline color="#0000a0" width="268"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="18">
-					<polyline color="#0000a0" width="530"/>
-				</itemgra>
-				<itemgra item_types="street_nopass" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_paved" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled" order="10-12">
-					<polyline color="#800000" width="1" dash="3,6"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled" order="13-14">
-					<polyline color="#3d3d3d" width="4"/>
-					<polyline color="#800000" width="1" dash="4,8"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled" order="15-16">
-					<polyline color="#3d3d3d" width="5"/>
-					<polyline color="#800000" width="1" dash="5,10"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled" order="17-">
-					<polyline color="#3d3d3d" width="7"/>
-					<polyline color="#800000" width="1" dash="7,15"/>
-				</itemgra>
-				<itemgra item_types="track_unpaved" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="bridleway" order="10-">
-					<polyline color="#1e0728" width="1"/>
-				</itemgra>
-				<itemgra item_types="cycleway" order="10-">
-					<polyline color="#1e0728" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="10-12">
-					<polyline color="#00A000" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="13-14">
-					<polyline color="#00A000" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="15-16">
-					<polyline color="#00A000" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_novice" order="17-">
-					<polyline color="#00A000" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="10-12">
-					<polyline color="#0000ff" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="13-14">
-					<polyline color="#0000ff" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="15-16">
-					<polyline color="#0000ff" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_easy" order="17-">
-					<polyline color="#0000ff" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="10-12">
-					<polyline color="#900000" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="13-14">
-					<polyline color="#900000" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="15-16">
-					<polyline color="#900000" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_intermediate" order="17-">
-					<polyline color="#900000" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="10-12">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="13-14">
-					<polyline color="#000000" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="15-16">
-					<polyline color="#000000" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_advanced" order="17-">
-					<polyline color="#000000" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="10-12">
-					<polyline color="#ffaa00" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="13-14">
-					<polyline color="#ffaa00" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="15-16">
-					<polyline color="#ffaa00" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_expert" order="17-">
-					<polyline color="#ffaa00" width="5"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="10-12">
-					<polyline color="#c5c300" width="1"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="13-14">
-					<polyline color="#c5c300" width="2"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="15-16">
-					<polyline color="#c5c300" width="3"/>
-				</itemgra>
-				<itemgra item_types="piste_downhill_freeride" order="17-">
-					<polyline color="#c5c300" width="5"/>
-				</itemgra>
-				<itemgra item_types="lift_cable_car" order="6-">
-					<polyline color="#3d3d3d" width="1" dash="5"/>
-				</itemgra>
-				<itemgra item_types="lift_chair" order="6-">
-					<polyline color="#3d3d3d" width="1" dash="5"/>
-				</itemgra>
-				<itemgra item_types="lift_drag" order="6-">
-					<polyline color="#3d3d3d" width="1" dash="5"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="10-12">
-					<polyline color="#0000ff" width="1" dash="3,6"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="13-14">
-					<polyline color="#0000ff" width="2"/>
-					<polyline color="#000000" width="1" dash="4,8"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="15-16">
-					<polyline color="#0000ff" width="3"/>
-					<polyline color="#000000" width="1" dash="5,10"/>
-				</itemgra>
-				<itemgra item_types="piste_nordic" order="17-">
-					<polyline color="#0000ff" width="5"/>
-					<polyline color="#000000" width="1" dash="7,15"/>
-				</itemgra>
-				<itemgra item_types="footway" order="11-12">
-					<polyline color="#4e0000" width="1" dash="3,6"/>
-				</itemgra>
-				<itemgra item_types="footway" order="13-14">
-					<polyline color="#4e0000" width="2"/>
-					<polyline color="#000000" width="1" dash="4,8"/>
-				</itemgra>
-				<itemgra item_types="footway" order="15-16">
-					<polyline color="#4e0000" width="3"/>
-					<polyline color="#000000" width="1" dash="5,10"/>
-				</itemgra>
-				<itemgra item_types="footway" order="17-">
-					<polyline color="#4e0000" width="5"/>
-					<polyline color="#000000" width="1" dash="7,15"/>
-				</itemgra>
-				<itemgra item_types="steps" order="14-15">
-					<polyline color="#4d4e11" width="1"/>
-				</itemgra>
-				<itemgra item_types="steps" order="16">
-					<polyline color="#4d4e11" width="2"/>
-				</itemgra>
-				<itemgra item_types="steps" order="17-18">
-					<polyline color="#4d4e11" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="10">
-					<polyline color="#1e0728" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="11">
-					<polyline color="#1e0728" width="5"/>
-					<polyline color="#202020" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="12">
-					<polyline color="#1e0728" width="8"/>
-					<polyline color="#202020" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="13">
-					<polyline color="#1e0728" width="9"/>
-					<polyline color="#202020" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="14">
-					<polyline color="#1e0728" width="13"/>
-					<polyline color="#202020" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="15">
-					<polyline color="#1e0728" width="18"/>
-					<polyline color="#202020" width="10"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="16">
-					<polyline color="#1e0728" width="21"/>
-					<polyline color="#202020" width="13"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="17">
-					<polyline color="#1e0728" width="25"/>
-					<polyline color="#202020" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="18">
-					<polyline color="#1e0728" width="40"/>
-					<polyline color="#202020" width="30"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="10">
-					<polyline color="#2c2c2c" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="11">
-					<polyline color="#2c2c2c" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="12">
-					<polyline color="#2c2c2c" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="13">
-					<polyline color="#2c2c2c" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="14">
-					<polyline color="#2c2c2c" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="15">
-					<polyline color="#2c2c2c" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="16">
-					<polyline color="#2c2c2c" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="17">
-					<polyline color="#2c2c2c" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="18">
-					<polyline color="#2c2c2c" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="12">
-					<polyline color="#2c2c2c" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="13">
-					<polyline color="#2c2c2c" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="14">
-					<polyline color="#2c2c2c" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="15">
-					<polyline color="#2c2c2c" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="16">
-					<polyline color="#2c2c2c" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="17">
-					<polyline color="#2c2c2c" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="18">
-					<polyline color="#2c2c2c" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="10">
-					<polyline color="#24092f" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="11">
-					<polyline color="#24092f" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="12">
-					<polyline color="#24092f" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="13">
-					<polyline color="#24092f" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="14">
-					<polyline color="#24092f" width="13"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="15">
-					<polyline color="#24092f" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="16">
-					<polyline color="#24092f" width="26"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="17">
-					<polyline color="#24092f" width="61"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="18">
-					<polyline color="#24092f" width="126"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="8">
-					<polyline color="#1d4c19" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="9">
-					<polyline color="#1d4c19" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="10">
-					<polyline color="#1d4c19" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="11">
-					<polyline color="#1d4c19" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="12">
-					<polyline color="#1d4c19" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="13">
-					<polyline color="#1d4c19" width="11"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="14">
-					<polyline color="#1d4c19" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="15">
-					<polyline color="#1d4c19" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="16">
-					<polyline color="#1d4c19" width="30"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="17">
-					<polyline color="#1d4c19" width="67"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="18">
-					<polyline color="#1d4c19" width="138"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="7-8">
-					<polyline color="#4d4e11" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="9">
-					<polyline color="#4d4e11" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="10">
-					<polyline color="#4d4e11" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="11">
-					<polyline color="#4d4e11" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="12">
-					<polyline color="#4d4e11" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="13">
-					<polyline color="#4d4e11" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="14">
-					<polyline color="#4d4e11" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="15">
-					<polyline color="#4d4e11" width="21"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="16">
-					<polyline color="#4d4e11" width="34"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="17">
-					<polyline color="#4d4e11" width="73"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp,roundabout" order="18">
-					<polyline color="#4d4e11" width="150"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="2-5">
-					<polyline color="#430000" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="6-8">
-					<polyline color="#430000" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="9">
-					<polyline color="#430000" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="10">
-					<polyline color="#430000" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11">
-					<polyline color="#430000" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="12">
-					<polyline color="#430000" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="13">
-					<polyline color="#430000" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="14">
-					<polyline color="#430000" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="15">
-					<polyline color="#430000" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="16">
-					<polyline color="#430000" width="33"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="17">
-					<polyline color="#430000" width="72"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="18">
-					<polyline color="#430000" width="150"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="2">
-					<polyline color="#760000" width="1"/>
-				</itemgra>
-				<!--1d4c19/0d740d-->
-				<itemgra item_types="highway_city,highway_land" order="3-5">
-					<polyline color="#640000" width="3"/>
-					<polyline color="#0a5c0a" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="6">
-					<polyline color="#640000" width="4"/>
-					<polyline color="#0a5c0a" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="7-8">
-					<polyline color="#640000" width="6"/>
-					<polyline color="#005b00" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="9-10">
-					<polyline color="#640000" width="8"/>
-					<polyline color="#0a5c0a" width="2"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="11">
-					<polyline color="#640000" width="12"/>
-					<polyline color="#0a5c0a" width="3"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="12">
-					<polyline color="#640000" width="13"/>
-					<polyline color="#0a5c0a" width="3"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="13">
-					<polyline color="#640000" width="17"/>
-					<polyline color="#0a5c0a" width="4"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="14">
-					<polyline color="#640000" width="24"/>
-					<polyline color="#0a5c0a" width="4"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="15">
-					<polyline color="#640000" width="27"/>
-					<polyline color="#0a5c0a" width="5"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="16">
-					<polyline color="#640000" width="59"/>
-					<polyline color="#0a5c0a" width="6"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="17">
-					<polyline color="#640000" width="127"/>
-					<polyline color="#0a5c0a" width="7"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="18">
-					<polyline color="#640000" width="258"/>
-					<polyline color="#0a5c0a" width="8"/>
-				</itemgra>
-				<!-- This entry shows all unknown linear elements as blue lines -->
-				<!--
-				<itemgra item_types="street_unkn" order="0-">
-					<polyline color="#8080ff" width="3"/>
-				</itemgra>
-				-->
-				<itemgra item_types="highway_exit_label" order="10-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street" order="10-18">
-					<text text_size="8" color="#55c4bd" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18">
-					<text text_size="9" color="#55c4bd" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="street_nopass,street_0,street_1_city,street_1_land,footway" order="12-18">
-					<text text_size="9" color="#55c4bd" background_color="#000000"/>
-				</itemgra>
-			</layer>
-			<layer name="polylines">
-				<itemgra item_types="aeroway_taxiway" order="10">
-					<polyline color="#404040" width="4"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="11">
-					<polyline color="#404040" width="6"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="12">
-					<polyline color="#404040" width="10"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="13">
-					<polyline color="#404040" width="12"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="14">
-					<polyline color="#404040" width="15"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="15">
-					<polyline color="#404040" width="17"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="16">
-					<polyline color="#404040" width="33"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="17">
-					<polyline color="#404040" width="69"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="18">
-					<polyline color="#404040" width="132"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="2-6">
-					<polyline color="#404040" width="1"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="7-8">
-					<polyline color="#404040" width="3"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="9">
-					<polyline color="#404040" width="5"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="10">
-					<polyline color="#404040" width="6"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="11">
-					<polyline color="#404040" width="9"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="12">
-					<polyline color="#404040" width="13"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="13">
-					<polyline color="#404040" width="18"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="14">
-					<polyline color="#404040" width="21"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="15">
-					<polyline color="#404040" width="24"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="16">
-					<polyline color="#404040" width="39"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="17">
-					<polyline color="#404040" width="78"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="18">
-					<polyline color="#404040" width="156"/>
-				</itemgra>
-				<itemgra item_types="rail_tram,bus_guideway" order="10-">
-					<polyline color="#3d3d3d" width="2"/>
-				</itemgra>
-			</layer>
-			<layer name="labels">
-				<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="12-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="11-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e3,town_label_2e3,town_label_5e3,place_label" order="10-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4" order="9-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e4,town_label_2e4,town_label_5e4" order="8-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="6-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="4-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6" order="3-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6" order="2-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e7,district_label_1e7" order="1-">
-					<circle color="#55c4bd" background_color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-			</layer>
-			<layer name="Internal">
-				<itemgra item_types="track" order="3-">
-					<polyline color="#3f3f3f" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_tracked" order="7-">
-					<polyline color="#3f3fff" width="3"/>
-				</itemgra>
-				<itemgra item_types="rg_segment" order="0-">
-					<polyline color="#FF089C" width="1"/>
-					<arrows color="#FF089C" width="1"/>
-				</itemgra>
-				<itemgra item_types="rg_point" order="0-">
-					<circle color="#FF089C" radius="10" background_color="#000000" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="nav_left_1" order="0-">
-					<icon src="nav_left_1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_left_2" order="0-">
-					<icon src="nav_left_2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_left_3" order="0-">
-					<icon src="nav_left_3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_1" order="0-">
-					<icon src="nav_right_1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_2" order="0-">
-					<icon src="nav_right_2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_3" order="0-">
-					<icon src="nav_right_3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_straight" order="0-">
-					<icon src="nav_straight_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_turnaround_left" order="0-">
-					<icon src="nav_turnaround_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_turnaround_right" order="0-">
-					<icon src="nav_turnaround_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l1" order="0-">
-					<icon src="nav_roundabout_l1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r1" order="0-">
-					<icon src="nav_roundabout_r1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l2" order="0-">
-					<icon src="nav_roundabout_l2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r2" order="0-">
-					<icon src="nav_roundabout_r2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l3" order="0-">
-					<icon src="nav_roundabout_l3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r3" order="0-">
-					<icon src="nav_roundabout_r3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l4" order="0-">
-					<icon src="nav_roundabout_l4_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r4" order="0-">
-					<icon src="nav_roundabout_r4_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l5" order="0-">
-					<icon src="nav_roundabout_l5_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r5" order="0-">
-					<icon src="nav_roundabout_r5_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l6" order="0-">
-					<icon src="nav_roundabout_l6_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r6" order="0-">
-					<icon src="nav_roundabout_r6_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l7" order="0-">
-					<icon src="nav_roundabout_l7_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r7" order="0-">
-					<icon src="nav_roundabout_r7_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l8" order="0-">
-					<icon src="nav_roundabout_l8_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r8" order="0-">
-					<icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_keep_left" order="0-">
-					<icon src="nav_keep_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_merge_left" order="0-">
-					<icon src="nav_merge_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_keep_right" order="0-">
-					<icon src="nav_keep_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_merge_right" order="0-">
-					<icon src="nav_merge_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_exit_left" order="0-">
-					<icon src="nav_exit_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_exit_right" order="0-">
-					<icon src="nav_exit_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="route_end" order="0-">
-					<icon src="nav_destination_wh.svg" w="32" h="32" x="4" y="30"/>
-				</itemgra>
-				<itemgra item_types="nav_none" order="0-">
-					<icon src="unknown.svg"/>
-				</itemgra>
-				<itemgra item_types="announcement" order="7-">
-					<icon src="gui_sound_32_32.svg"/>
-					<circle color="#FF089C" radius="10" background_color="#000000" text_size="7"/>
-				</itemgra>
-				
-				<itemgra item_types="waypoint,route_end" order="2">
-					<circle color="#00a0a0" radius="4" width="2" background_color="#000000" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="3-5">
-					<circle color="#00a0a0" radius="8" width="2" background_color="#000000" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="6">
-					<circle color="#00a0a0" radius="10" width="2" background_color="#000000" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="7-8">
-					<circle color="#00a0a0" radius="16" width="2" background_color="#000000" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="9-10">
-					<circle color="#00a0a0" radius="20" width="4" background_color="#000000" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="11">
-					<circle color="#00a0a0" radius="28" width="4" background_color="#000000" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="12">
-					<circle color="#00a0a0" radius="32" width="4" background_color="#000000" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="13">
-					<circle color="#00a0a0" radius="52" width="4" background_color="#000000" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="14">
-					<circle color="#00a0a0" radius="64" width="4" background_color="#000000" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="15">
-					<circle color="#00a0a0" radius="68" width="6" background_color="#000000" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="16">
-					<circle color="#00a0a0" radius="132" width="8" background_color="#000000" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="17">
-					<circle color="#00a0a0" radius="268" width="8" background_color="#000000" text_size="48"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="18">
-					<circle color="#00a0a0" radius="530" width="8" background_color="#000000" text_size="48"/>
-				</itemgra>
-			</layer>
-			<layer name="points">
-				<itemgra item_types="mini_roundabout" order="12-">
-					<icon src="mini_roundabout.svg"/>
-				</itemgra>
-				<itemgra item_types="turning_circle" order="12-">
-					<icon src="mini_roundabout.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_airport" order="5-">
-					<icon src="airport.svg"/>
-				</itemgra>
-				<itemgra item_types="town_ghost" order="0-">
-					<icon src="ghost_town.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_hotel" order="12-">
-					<icon src="hotel.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_car_parking" order="11-">
-					<icon src="parking.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_car_sharing" order="11-">
-					<icon src="car_sharing.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_car_dealer_parts" order="0-">
-					<icon src="car_dealer.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_fuel" order="10-">
-					<icon src="fuel.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_shopping" order="14-">
-					<icon src="shopping.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_attraction" order="8-">
-					<icon src="attraction.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_cafe" order="12-">
-					<icon src="cafe.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_bar" order="12-">
-					<icon src="bar.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_pub" order="12-">
-					<icon src="beer.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_bridge" order="0-">
-					<icon src="bridge.svg"/>
-				</itemgra>
-				<itemgra item_types="highway_exit" order="11-">
-					<icon src="exit.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_camp_rv" order="9-">
-					<icon src="camping.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_museum_history" order="12-">
-					<icon src="museum.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_hospital" order="12-">
-					<icon src="hospital.svg"/>
-				</itemgra>
-				<!-- not really usefull -->
-				<!--
-				<itemgra item_types="point_unkn" order="0-">
-						<circle color="#8080ff" radius="3"/>
-				</itemgra>
-				-->
-				<itemgra item_types="poi_dining" order="12-">
-					<icon src="restaurant.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_fastfood" order="12-">
-					<icon src="fastfood.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_police" order="12-">
-					<icon src="police.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_auto_club" order="0-">
-					<icon src="auto_club.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_autoservice" order="0-">
-					<icon src="car_dealer.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_bank" order="12-">
-					<icon src="bank.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_atm" order="12-">
-					<icon src="atm.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_bay" order="0-">
-					<icon src="bay.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_bend" order="0-">
-					<icon src="bend.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_boat_ramp" order="12-">
-					<icon src="boat_ramp.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_border_station" order="0-">
-					<icon src="border_station.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_bowling" order="0-">
-					<icon src="bowling.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_bus_station" order="12-">
-					<icon src="bus.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_bus_stop" order="12-">
-					<icon src="bus_stop.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_business_service" order="0-">
-					<icon src="bussines_service.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_car_rent" order="11-">
-					<icon src="car_rent.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_car_wash" order="12-">
-					<icon src="car_wash.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_casino" order="11-">
-					<icon src="casino.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_cemetery" order="11-">
-					<icon src="cemetery.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_church" order="11-">
-					<icon src="church.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_bahai" order="11-">
-					<icon src="bahai.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_buddhist" order="11-">
-					<icon src="buddhist.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_hindu" order="11-">
-					<icon src="hindu.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_islamic" order="11-">
-					<icon src="islamic.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_jain" order="11-">
-					<icon src="jain.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_jewish" order="11-">
-					<icon src="jewish.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_pagan" order="11-">
-					<icon src="pagan.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_pastafarian" order="11-">
-					<icon src="pastafarian.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_shinto" order="11-">
-					<icon src="shinto.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_sikh" order="11-">
-					<icon src="sikh.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_taoist" order="11-">
-					<icon src="taoist.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_cinema" order="12-">
-					<icon src="cinema.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_communication" order="0-">
-					<icon src="communication.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_concert" order="0-">
-					<icon src="concert.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_cove" order="0-">
-					<icon src="cove.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_crossing" order="0-">
-					<icon src="crossing.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_dam" order="0-">
-					<icon src="dam.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_danger_area" order="12-">
-					<icon src="danger_16_16.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_danger_sea_wreck" order="0-">
-					<icon src="dangerous.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_daymark" order="0-">
-					<icon src="daymark.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_diving" order="0-">
-					<icon src="diving.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_drinking_water" order="0-">
-					<icon src="drinking_water.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_emergency" order="0-">
-					<icon src="emergency.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_fair" order="0-">
-					<icon src="fair.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_firebrigade" order="12-">
-					<icon src="firebrigade.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_fish" order="0-">
-					<icon src="fish.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_forbidden_area" order="0-">
-					<icon src="forbiden_area.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_gps" order="14-">
-					<icon src="garmin.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_golf" order="12-">
-					<icon src="golf.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_government_building" order="0-">
-					<icon src="goverment_building.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_height" order="0-">
-					<icon src="height.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_heliport" order="7-">
-					<icon src="heliport.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_hotspring" order="0-">
-					<icon src="hotspring.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_icesport" order="0-">
-					<icon src="icesport.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_information" order="12-">
-					<icon src="information.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_justice" order="10-">
-					<icon src="justice.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_landmark" order="0-">
-					<icon src="landmark.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_levee" order="0-">
-					<icon src="levee.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_level_crossing" order="11-">
-					<icon src="level_crossing.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_library" order="12-">
-					<icon src="library.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_locale" order="0-">
-					<icon src="locale.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_loudspeaker" order="0-">
-					<icon src="loudspeaker.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_mall" order="0-">
-					<icon src="mall.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_manmade_feature" order="0-">
-					<icon src="manmade_feature.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_marine" order="0-">
-					<icon src="marine.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_marine_type" order="0-">
-					<icon src="marine_type.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_mark" order="0-">
-					<icon src="mark.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_military" order="0-">
-					<icon src="military.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_mine" order="0-">
-					<icon src="mine.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_nondangerous" order="0-">
-					<icon src="nondangerous.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_oil_field" order="0-">
-					<icon src="oil_field.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_peak" order="6-">
-					<icon src="peak.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_personal_service" order="0-">
-					<icon src="personal_service.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_pharmacy" order="12-">
-					<icon src="pharmacy.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_post_office,poi_post_box" order="13-">
-					<icon src="post.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_public_office" order="0-">
-					<icon src="public_office.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_halt" order="10-">
-					<circle color="#000000" radius="3" width="3"/>
-					<circle color="#3d3d3d" background_color="#000000" radius="6" width="2" text_size="8"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_station" order="11-">
-					<circle color="#000000" radius="3" width="3"/>
-					<circle color="#3d3d3d" background_color="#000000" radius="6" width="2" text_size="8"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_tram_stop" order="10-11">
-					<circle color="#3d3d3d" background_color="#000000" radius="2" width="2"/>
-				</itemgra>
-				<itemgra item_types="poi_rail_tram_stop" order="12-">
-					<circle color="#000000" radius="3" width="3"/>
-					<circle color="#3d3d3d" background_color="#000000" radius="6" width="2" text_size="8"/>
-				</itemgra>
-				<itemgra item_types="poi_repair_service" order="0-">
-					<icon src="repair_service.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_resort" order="0-">
-					<icon src="resort.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_restaurant" order="12-">
-					<icon src="restaurant.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_restricted_area" order="0-">
-					<icon src="restricted_area.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_restroom" order="13-">
-					<icon src="toilets.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_sailing" order="0-">
-					<icon src="sailing.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_scenic_area" order="0-">
-					<icon src="scenic_area.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_school" order="12-">
-					<icon src="school.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_service" order="0-">
-					<icon src="service.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_apparel" order="14-">
-					<icon src="shop_apparel.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_computer" order="14-">
-					<icon src="shop_computer.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_department" order="14-">
-					<icon src="shop_department.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_furniture" order="14-">
-					<icon src="shop_furnish.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_grocery" order="14-">
-					<icon src="shop_grocery.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_handg" order="14-">
-					<icon src="shop_handg.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_merchandise" order="14-">
-					<icon src="shop_merchandise.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_shop_retail" order="14-">
-					<icon src="shop_retail.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_shower" order="0-">
-					<icon src="shower.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_skiing" order="12-">
-					<icon src="skiing.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_social_service" order="0-">
-					<icon src="social_service.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_sounding" order="0-">
-					<icon src="sounding.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_sport" order="12-">
-					<icon src="sport.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_stadium" order="0-">
-					<icon src="stadium.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_swimming" order="12-">
-					<icon src="swimming.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_taxi" order="13-">
-					<icon src="taxi.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_telephone" order="13-">
-					<icon src="telephone.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_theater" order="12-">
-					<icon src="theater.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_tide" order="0-">
-					<icon src="tide.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_tower" order="13-">
-					<icon src="tower.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_townhall" order="12-">
-					<icon src="townhall.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_trail" order="0-">
-					<icon src="trail.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_truck_stop" order="0-">
-					<icon src="truck_stop.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_tunnel" order="0-">
-					<icon src="tunnel.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_wifi" order="11-">
-					<icon src="wifi.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_wine" order="0-">
-					<icon src="wine.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_worship" order="0-">
-					<icon src="worship.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_wrecker" order="0-">
-					<icon src="wrecker.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_zoo" order="10-">
-					<icon src="zoo.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_picnic" order="11-">
-					<icon src="picnic.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_multi" order="0-">
-					<icon src="gc_multi.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_tradi" order="0-">
-					<icon src="gc_tradi.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_event" order="0-">
-					<icon src="gc_event.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_mystery" order="0-">
-					<icon src="gc_mystery.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_question" order="0-">
-					<icon src="gc_question.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_stages" order="0-">
-					<icon src="gc_stages.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_reference" order="0-">
-					<icon src="gc_reference.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_gc_webcam" order="0-">
-					<icon src="gc_webcam.svg"/>
-				</itemgra>
-				<itemgra item_types="traffic_signals" order="13-">
-					<icon src="traffic_signals.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_image" order="0-">
-					<image/>
-				</itemgra>
-				<!-- I'm not sure if the following stuff should appear in any layout. Maybe portions should only apply to the bike layout? -->
-				<itemgra item_types="poi_bench" order="15-">
-					<icon src="bench.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_biergarten" order="12-">
-					<icon src="beer.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_boundary_stone" order="13-">
-					<icon src="boundary_stone.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_castle" order="12-">
-					<icon src="castle.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_hunting_stand" order="13-">
-					<icon src="hunting_stand.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_memorial" order="12-">
-					<icon src="memorial.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_monument" order="12-">
-					<icon src="memorial.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_shelter" order="10-">
-					<icon src="shelter.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_fountain" order="12-">
-					<icon src="fountain.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_potable_water" order="12-">
-					<icon src="drinking_water.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_toilets" order="12-">
-					<icon src="toilets.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_viewpoint" order="12-">
-					<icon src="viewpoint.svg"/>
-				</itemgra>
-				<itemgra item_types="tec_common" order="11-">
-					<icon src="tec_common.svg"/>
-				</itemgra>
-				<itemgra item_types="vehicle" order="0-">
-					<icon src="gui_vehicle_16_16.svg" />
-				</itemgra>
-				<itemgra item_types="vehicle_pedestrian" order="0-">
-					<icon src="gui_vehicle_pedestrian_16_16.svg" />
-				</itemgra>
-			</layer>
-			<layer name="POI Labels">
-				<itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_car_sharing,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
-					<circle color="#606060" background_color="#000000" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>
-			<layer name="Found items" ref="Found items"/>
-		</layout>
-
-    <layout name="Car-Android" color="#fef9ee" font="Liberation Sans">
-      <cursor w="49" h="49">
-        <itemgra speed_range="-2">
-          <polyline color="#00BC00" radius="0" width="4">
-            <coord x="0" y="0" />
-          </polyline>
-          <circle color="#008500" radius="9" width="3">
-            <coord x="0" y="0" />
-          </circle>
-          <circle color="#00BC00" radius="13" width="3">
-            <coord x="0" y="0" />
-          </circle>
-          <circle color="#008500" radius="18" width="3">
-            <coord x="0" y="0" />
-          </circle>
-        </itemgra>
-        <itemgra speed_range="3-">
-          <polygon color="#00000066">
-            <coord x="-21" y="-27" />
-            <coord x="0" y="12" />
-            <coord x="21" y="-27" />
-            <coord x="0" y="-12" />
-            <coord x="-21" y="-27" />
-          </polygon>
-          <polygon color="#008500">
-            <coord x="-21" y="-18" />
-            <coord x="0" y="21" />
-            <coord x="0" y="-3" />
-            <coord x="-21" y="-18" />
-          </polygon>
-          <polygon color="#00BC00">
-            <coord x="21" y="-18" />
-            <coord x="0" y="21" />
-            <coord x="0" y="-3" />
-            <coord x="21" y="-18" />
-          </polygon>
-          <polyline color="#008500" width="1">
-            <coord x="-21" y="-18" />
-            <coord x="0" y="21" />
-            <coord x="0" y="-3" />
-            <coord x="-21" y="-18" />
-          </polyline>
-          <polyline color="#008500" width="1">
-            <coord x="21" y="-18" />
-            <coord x="0" y="21" />
-            <coord x="0" y="-3" />
-            <coord x="21" y="-18" />
-          </polyline>
-        </itemgra>
-      </cursor>
-      <layer name="polygons">
-        <itemgra item_types="poly_wood" order="8-">
-          <polygon color="#8ec78d" />
-          <text text_size="5" />
-        </itemgra>
-        <itemgra item_types="poly_water_tiled">
-          <polygon color="#82c8ea" />
-        </itemgra>
-        <itemgra item_types="poly_water" order="10-">
-          <polygon color="#82c8ea" />
-          <polyline color="#5096b8" />
-          <text text_size="5" />
-        </itemgra>
-        <itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra"
-        order="14-">
-          <polygon color="#a0a0a0" />
-          <text text_size="5" />
-        </itemgra>
-        <itemgra item_types="poly_park" order="14-">
-          <polygon color="#7cc334" />
-          <text text_size="5" />
-        </itemgra>
-        <itemgra item_types="poly_pedestrian" order="14">
-          <polyline color="#d2d2d2" width="13" />
-          <polyline color="#dddddd" width="9" />
-          <polygon color="#dddddd" />
-        </itemgra>
-        <itemgra item_types="poly_pedestrian" order="15">
-          <polyline color="#d2d2d2" width="18" />
-          <polyline color="#dddddd" width="14" />
-          <polygon color="#dddddd" />
-        </itemgra>
-        <itemgra item_types="poly_pedestrian" order="16">
-          <polyline color="#d2d2d2" width="21" />
-          <polyline color="#dddddd" width="17" />
-          <polygon color="#dddddd" />
-        </itemgra>
-        <itemgra item_types="poly_pedestrian" order="17">
-          <polyline color="#d2d2d2" width="25" />
-          <polyline color="#dddddd" width="21" />
-          <polygon color="#dddddd" />
-        </itemgra>
-        <itemgra item_types="poly_pedestrian" order="18">
-          <polyline color="#d2d2d2" width="40" />
-          <polyline color="#dddddd" width="34" />
-          <polygon color="#dddddd" />
-        </itemgra>
-        <itemgra item_types="poly_airport" order="5-">
-          <polygon color="#a0a0a0" />
-        </itemgra>
-        <itemgra item_types="water_river" order="6-7">
-          <polyline color="#82c8ea" width="3" />
-        </itemgra>
-        <itemgra item_types="water_river" order="8-9">
-          <polyline color="#82c8ea" width="4" />
-        </itemgra>
-        <itemgra item_types="water_river" order="10-">
-          <polyline color="#82c8ea" width="4" />
-          <text text_size="10" />
-        </itemgra>
-        <itemgra item_types="water_canal" order="13-">
-          <polyline color="#82c8ea" width="3" />
-          <text text_size="10" />
-        </itemgra>
-        <itemgra item_types="water_stream" order="13-">
-          <polyline color="#82c8ea" width="2" />
-          <text text_size="7" />
-        </itemgra>
-        <itemgra item_types="water_drain" order="14-">
-          <polyline color="#82c8ea" width="1" />
-          <text text_size="5" />
-        </itemgra>
-        <itemgra item_types="poly_apron" order="13-">
-          <polygon color="#d0d0d0" />
-        </itemgra>
-        <itemgra item_types="poly_terminal" order="14-">
-          <polygon color="#e3c6a6" />
-        </itemgra>
-        <itemgra item_types="poly_car_parking" order="15-">
-          <polygon color="#e7cf87" />
-        </itemgra>
-        <itemgra item_types="poly_building" order="14-">
-          <polygon color="#b6a6a6" />
-        </itemgra>
-        <itemgra item_types="rail" order="13-">
-          <polyline color="#696969" width="3" />
-          <polyline color="#ffffff" width="1" dash="5,5" />
-        </itemgra>
-        <itemgra item_types="ferry" order="14-">
-          <polyline color="#000000" width="1" dash="10" />
-        </itemgra>
-        <itemgra item_types="border_country" order="0-">
-          <polyline color="#808080" width="1" dash="10,5,2,5"/>
-        </itemgra>
-        <itemgra item_types="border_state" order="0-">
-            <polyline color="#808080" width="4"/>
-        </itemgra>
-      </layer>
-      <layer name="streets">
-        <itemgra item_types="street_route" order="2">
-          <polyline color="#69e068" width="8" />
-        </itemgra>
-        <itemgra item_types="street_route" order="3-5">
-          <polyline color="#69e068" width="10" />
-        </itemgra>
-        <itemgra item_types="street_route" order="6">
-          <polyline color="#69e068" width="12" />
-        </itemgra>
-        <itemgra item_types="street_route" order="7-8">
-          <polyline color="#69e068" width="16" />
-        </itemgra>
-        <itemgra item_types="street_route" order="9-10">
-          <polyline color="#69e068" width="20" />
-        </itemgra>
-        <itemgra item_types="street_route" order="11">
-          <polyline color="#69e068" width="28" />
-        </itemgra>
-        <itemgra item_types="street_route" order="12">
-          <polyline color="#69e068" width="32" />
-        </itemgra>
-        <itemgra item_types="street_route" order="13">
-          <polyline color="#69e068" width="52" />
-        </itemgra>
-        <itemgra item_types="street_route" order="14">
-          <polyline color="#69e068" width="64" />
-        </itemgra>
-        <itemgra item_types="street_route" order="15">
-          <polyline color="#69e068" width="68" />
-        </itemgra>
-        <itemgra item_types="street_route" order="16">
-          <polyline color="#69e068" width="132" />
-        </itemgra>
-        <itemgra item_types="street_route" order="17">
-          <polyline color="#69e068" width="268" />
-        </itemgra>
-        <itemgra item_types="street_route" order="18">
-          <polyline color="#69e068" width="530" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="2">
-          <polyline color="#ba00b8" width="4" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="3-5">
-          <polyline color="#ba00b8" width="8" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="6">
-          <polyline color="#ba00b8" width="10" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="7-8">
-          <polyline color="#ba00b8" width="16" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="9-10">
-          <polyline color="#ba00b8" width="20" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="11">
-          <polyline color="#ba00b8" width="28" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="12">
-          <polyline color="#ba00b8" width="32" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="13">
-          <polyline color="#ba00b8" width="52" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="14">
-          <polyline color="#ba00b8" width="64" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="15">
-          <polyline color="#ba00b8" width="68" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="16">
-          <polyline color="#ba00b8" width="132" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="17">
-          <polyline color="#ba00b8" width="268" />
-        </itemgra>
-        <itemgra item_types="selected_line" order="18">
-          <polyline color="#ba00b8" width="530" />
-        </itemgra>
-        <itemgra item_types="forest_way_1" order="14-">
-          <polyline color="#0070c0" width="6" />
-        </itemgra>
-        <itemgra item_types="forest_way_2" order="14-">
-          <polyline color="#ff0000" width="3" />
-        </itemgra>
-        <itemgra item_types="forest_way_3" order="14-">
-          <polyline color="#ff0000" width="1" dash="2,4" />
-        </itemgra>
-        <itemgra item_types="forest_way_4" order="14-">
-          <polyline color="#119a2e" width="1" dash="4,10" />
-        </itemgra>
-        <itemgra item_types="street_nopass" order="14-">
-          <polyline color="#000000" width="1" />
-        </itemgra>
-        <itemgra item_types="track_paved" order="14-">
-          <polyline color="#000000" width="1" />
-        </itemgra>
-        <itemgra item_types="track_gravelled" order="14">
-          <polyline color="#ffffff" width="4"/>
-          <polyline color="#800000" width="1" dash="4,8" />
-        </itemgra>
-        <itemgra item_types="track_gravelled" order="15-16">
-          <polyline color="#ffffff" width="5"/>
-          <polyline color="#800000" width="1" dash="5,10" />
-        </itemgra>
-        <itemgra item_types="track_gravelled" order="17-">
-          <polyline color="#ffffff" width="7"/>
-          <polyline color="#800000" width="1" dash="7,15" />
-        </itemgra>
-        <itemgra item_types="track_unpaved" order="14-">
-          <polyline color="#000000" width="1" />
-        </itemgra>
-        <itemgra item_types="bridleway" order="14-">
-          <polyline color="#000000" width="1" />
-        </itemgra>
-        <itemgra item_types="cycleway" order="14-">
-          <polyline color="#000000" width="1" />
-        </itemgra>
-        <itemgra item_types="lift_cable_car" order="15-">
-          <polyline color="#696969" width="1" dash="5" />
-        </itemgra>
-        <itemgra item_types="lift_chair" order="15-">
-          <polyline color="#696969" width="1" dash="5" />
-        </itemgra>
-        <itemgra item_types="lift_drag" order="15-">
-          <polyline color="#696969" width="1" dash="5" />
-        </itemgra>
-        <itemgra item_types="footway" order="15-16">
-          <polyline color="#ffffff" width="5"/>
-          <polyline color="#ff0000" width="1" dash="5,10" />
-        </itemgra>
-        <itemgra item_types="footway" order="17-">
-          <polyline color="#ffffff" width="7"/>
-          <polyline color="#ff0000" width="1" dash="7,15" />
-        </itemgra>
-        <itemgra item_types="steps" order="15-">
-          <polyline color="#000000" width="1" />
-        </itemgra>
-        <itemgra item_types="street_pedestrian,living_street"
-        order="14">
-          <polyline color="#d2d2d2" width="13" />
-          <polyline color="#dddddd" width="9" />
-        </itemgra>
-        <itemgra item_types="street_pedestrian,living_street"
-        order="15">
-          <polyline color="#d2d2d2" width="18" />
-          <polyline color="#dddddd" width="14" />
-        </itemgra>
-        <itemgra item_types="street_pedestrian,living_street"
-        order="16">
-          <polyline color="#d2d2d2" width="21" />
-          <polyline color="#dddddd" width="17" />
-        </itemgra>
-        <itemgra item_types="street_pedestrian,living_street"
-        order="17">
-          <polyline color="#d2d2d2" width="25" />
-          <polyline color="#dddddd" width="21" />
-        </itemgra>
-        <itemgra item_types="street_pedestrian,living_street"
-        order="18">
-          <polyline color="#d2d2d2" width="40" />
-          <polyline color="#dddddd" width="34" />
-        </itemgra>
-        <itemgra item_types="street_service" order="14">
-          <polyline color="#d2d2d2" width="7" />
-          <polyline color="#fefefe" width="5" />
-        </itemgra>
-        <itemgra item_types="street_service" order="15">
-          <polyline color="#d2d2d2" width="8" />
-          <polyline color="#fefefe" width="6" />
-        </itemgra>
-        <itemgra item_types="street_service" order="16">
-          <polyline color="#d2d2d2" width="9" />
-          <polyline color="#fefefe" width="7" />
-        </itemgra>
-        <itemgra item_types="street_service" order="17">
-          <polyline color="#d2d2d2" width="10" />
-          <polyline color="#fefefe" width="8" />
-        </itemgra>
-        <itemgra item_types="street_service" order="18">
-          <polyline color="#d2d2d2" width="11" />
-          <polyline color="#fefefe" width="9" />
-        </itemgra>
-        <itemgra item_types="street_parking_lane" order="15">
-          <polyline color="#d2d2d2" width="6" />
-          <polyline color="#fefefe" width="4" />
-        </itemgra>
-        <itemgra item_types="street_parking_lane" order="16">
-          <polyline color="#d2d2d2" width="7" />
-          <polyline color="#fefefe" width="5" />
-        </itemgra>
-        <itemgra item_types="street_parking_lane" order="17">
-          <polyline color="#d2d2d2" width="8" />
-          <polyline color="#fefefe" width="6" />
-        </itemgra>
-        <itemgra item_types="street_parking_lane" order="18">
-          <polyline color="#d2d2d2" width="9" />
-          <polyline color="#fefefe" width="7" />
-        </itemgra>
-        <itemgra item_types="street_0,street_1_city,street_1_land"
-        order="12">
-          <polyline color="#d2d2d2" width="1" />
-        </itemgra>
-        <itemgra item_types="street_0,street_1_city,street_1_land"
-        order="13-14">
-          <polyline color="#d2d2d2" width="17" />
-          <polyline color="#ffffff" width="13" />
-        </itemgra>
-        <itemgra item_types="street_0,street_1_city,street_1_land"
-        order="15">
-          <polyline color="#d2d2d2" width="18" />
-          <polyline color="#ffffff" width="14" />
-        </itemgra>
-        <itemgra item_types="street_0,street_1_city,street_1_land"
-        order="16">
-          <polyline color="#d2d2d2" width="30" />
-          <polyline color="#ffffff" width="26" />
-        </itemgra>
-        <itemgra item_types="street_0,street_1_city,street_1_land"
-        order="17">
-          <polyline color="#d2d2d2" width="67" />
-          <polyline color="#ffffff" width="61" />
-        </itemgra>
-        <itemgra item_types="street_0,street_1_city,street_1_land"
-        order="18">
-          <polyline color="#d2d2d2" width="132" />
-          <polyline color="#ffffff" width="126" />
-        </itemgra>
-        <itemgra item_types="street_2_city,street_2_land,ramp"
-        order="11-12">
-          <polyline color="#c0c0c0" width="9" />
-          <polyline color="#fefc8c" width="7" />
-        </itemgra>
-        <itemgra item_types="street_2_city,street_2_land,ramp"
-        order="13-14">
-          <polyline color="#c0c0c0" width="13" />
-          <polyline color="#fefc8c" width="11" />
-        </itemgra>
-        <itemgra item_types="street_2_city,street_2_land,ramp"
-        order="15">
-          <polyline color="#c0c0c0" width="19" />
-          <polyline color="#fefc8c" width="15" />
-        </itemgra>
-        <itemgra item_types="street_2_city,street_2_land,ramp"
-        order="16">
-          <polyline color="#c0c0c0" width="30" />
-          <polyline color="#fefc8c" width="26" />
-        </itemgra>
-        <itemgra item_types="street_2_city,street_2_land,ramp"
-        order="17">
-          <polyline color="#c0c0c0" width="63" />
-          <polyline color="#fefc8c" width="57" />
-        </itemgra>
-        <itemgra item_types="street_2_city,street_2_land,ramp"
-        order="18">
-          <polyline color="#c0c0c0" width="100" />
-          <polyline color="#fefc8c" width="90" />
-        </itemgra>
-        <itemgra item_types="street_3_city,street_3_land,roundabout"
-        order="11-12">
-          <polyline color="#a0a0a0" width="9" />
-          <polyline color="#fefc8c" width="7" />
-        </itemgra>
-        <itemgra item_types="street_3_city,street_3_land,roundabout"
-        order="13-14">
-          <polyline color="#a0a0a0" width="21" />
-          <polyline color="#fefc8c" width="17" />
-        </itemgra>
-        <itemgra item_types="street_3_city,street_3_land,roundabout"
-        order="15">
-          <polyline color="#a0a0a0" width="25" />
-          <polyline color="#fefc8c" width="21" />
-        </itemgra>
-        <itemgra item_types="street_3_city,street_3_land,roundabout"
-        order="16">
-          <polyline color="#a0a0a0" width="40" />
-          <polyline color="#fefc8c" width="34" />
-        </itemgra>
-        <itemgra item_types="street_3_city,street_3_land,roundabout"
-        order="17">
-          <polyline color="#a0a0a0" width="79" />
-          <polyline color="#fefc8c" width="73" />
-        </itemgra>
-        <itemgra item_types="street_3_city,street_3_land,roundabout"
-        order="18">
-          <polyline color="#a0a0a0" width="156" />
-          <polyline color="#fefc8c" width="150" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="2-6">
-          <polyline color="#f8dc79" width="4" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="7-8">
-          <polyline color="#f8dc79" width="4" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="9">
-          <polyline color="#f8dc79" width="5" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="10">
-          <polyline color="#f8dc79" width="6" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="11">
-          <polyline color="#000000" width="9" />
-          <polyline color="#f8dc79" width="7" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="12">
-          <polyline color="#000000" width="13" />
-          <polyline color="#f8dc79" width="9" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="13">
-          <polyline color="#000000" width="18" />
-          <polyline color="#f8dc79" width="14" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="14">
-          <polyline color="#000000" width="21" />
-          <polyline color="#f8dc79" width="17" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="15">
-          <polyline color="#000000" width="24" />
-          <polyline color="#f8dc79" width="20" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="16">
-          <polyline color="#000000" width="39" />
-          <polyline color="#f8dc79" width="33" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="17">
-          <polyline color="#000000" width="78" />
-          <polyline color="#f8dc79" width="72" />
-        </itemgra>
-        <itemgra item_types="street_4_city,street_4_land,street_n_lanes"
-        order="18">
-          <polyline color="#000000" width="156" />
-          <polyline color="#f8dc79" width="150" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land"
-        order="0-1">
-          <polyline color="#fc843b" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="2">
-          <polyline color="#fc843b" width="3" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land"
-        order="3-5">
-          <polyline color="#fc843b" width="6" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="6">
-          <polyline color="#fc843b" width="6" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land"
-        order="7-8">
-          <polyline color="#fc843b" width="6" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="9">
-          <polyline color="#fc843b" width="7" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="10">
-          <polyline color="#fc843b" width="9" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="11">
-          <polyline color="#a8aab3" width="13" />
-          <polyline color="#fc843b" width="9" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="12">
-          <polyline color="#a8aab3" width="15" />
-          <polyline color="#fc843b" width="10" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="13">
-          <polyline color="#a8aab3" width="25" />
-          <polyline color="#fc843b" width="17" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="14">
-          <polyline color="#a8aab3" width="31" />
-          <polyline color="#fc843b" width="24" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="15">
-          <polyline color="#a8aab3" width="33" />
-          <polyline color="#fc843b" width="27" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="16">
-          <polyline color="#a8aab3" width="65" />
-          <polyline color="#fc843b" width="59" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="17">
-          <polyline color="#a8aab3" width="133" />
-          <polyline color="#fc843b" width="127" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land" order="18">
-          <polyline color="#a8aab3" width="264" />
-          <polyline color="#fc843b" width="258" />
-          <polyline color="#a8aab3" width="1" />
-        </itemgra>
-        <itemgra item_types="highway_exit_label" order="13-">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street"
-        order="13-18">
-          <text text_size="8" />
-        </itemgra>
-        <itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp"
-        order="13-18">
-          <text text_size="9" />
-        </itemgra>
-        <itemgra item_types="street_nopass,street_0,street_1_city,street_1_land,footway"
-        order="13-18">
-          <text text_size="9" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="7-8">
-          <polyline color="#ff9000" width="8" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="9-10">
-          <polyline color="#ff9000" width="10" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="11">
-          <polyline color="#ff9000" width="14" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="12">
-          <polyline color="#ff9000" width="16" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="13">
-          <polyline color="#ff9000" width="26" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="14">
-          <polyline color="#ff9000" width="32" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="15">
-          <polyline color="#ff9000" width="34" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="16">
-          <polyline color="#ff9000" width="66" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="17">
-          <polyline color="#ff9000" width="134" />
-        </itemgra>
-        <itemgra item_types="traffic_distortion" order="18">
-          <polyline color="#ff9000" width="265" />
-        </itemgra>
-      </layer>
-      <layer name="polylines">
-        <itemgra item_types="rail_tram" order="13-">
-          <polyline color="#606060" width="2" />
-        </itemgra>
-      </layer>
-      <layer name="labels">
-        <itemgra item_types="house_number" order="15-">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2"
-        order="13-">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3"
-        order="12-">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="town_label_1e3,place_label"
-        order="10-">
-          <circle color="#000000" radius="3" text_size="10" />
-        </itemgra>
-        <itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4"
-        order="11-">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="town_label_2e3" order="11-">
-          <circle color="#000000" radius="3" text_size="10" />
-        </itemgra>
-        <itemgra item_types="town_label_5e3,town_label_1e4,town_label_2e4,town_label_5e4"
-        order="11-">
-          <circle color="#000000" radius="3" text_size="15" />
-        </itemgra>
-        <itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5"
-        order="10-">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="town_label_2e3" order="10">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7"
-        order="9-">
-          <circle color="#000000" radius="3" text_size="7" />
-        </itemgra>
-        <itemgra item_types="town_label_5e3" order="9-10">
-          <circle color="#000000" radius="3" text_size="10" />
-        </itemgra>
-        <itemgra item_types="town_label_1e4" order="8-9">
-          <circle color="#000000" radius="3" text_size="10" />
-        </itemgra>
-        <itemgra item_types="town_label_2e4,town_label_5e4"
-        order="7-8">
-          <circle color="#000000" radius="3" text_size="10" />
-        </itemgra>
-        <itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5"
-        order="5-">
-          <circle color="#000000" radius="3" text_size="15" />
-        </itemgra>
-        <itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7"
-        order="5-">
-          <circle color="#000000" radius="3" text_size="20" />
-        </itemgra>
-        <itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5"
-        order="4">
-          <circle color="#000000" radius="3" text_size="10" />
-        </itemgra>
-        <itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7"
-        order="4">
-          <circle color="#000000" radius="3" text_size="15" />
-        </itemgra>
-        <itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7"
-        order="0-3">
-          <circle color="#000000" radius="3" text_size="10" />
-        </itemgra>
-      </layer>
-      <layer name="Internal">
-        <itemgra item_types="track" order="7-">
-          <polyline color="#3f3f3f" width="1" />
-        </itemgra>
-        <itemgra item_types="track_tracked" order="7-">
-          <polyline color="#3f3fff" width="3" />
-        </itemgra>
-        <itemgra item_types="rg_segment" order="12-">
-          <polyline color="#FF089C" width="1" />
-          <arrows color="#FF089C" width="1" />
-        </itemgra>
-        <itemgra item_types="rg_point" order="12-">
-          <circle color="#FF089C" radius="10" text_size="7" />
-        </itemgra>
-        <itemgra item_types="nav_left_1" order="0-">
-          <icon src="nav_left_1_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_left_2" order="0-">
-          <icon src="nav_left_2_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_left_3" order="0-">
-          <icon src="nav_left_3_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_right_1" order="0-">
-          <icon src="nav_right_1_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_right_2" order="0-">
-          <icon src="nav_right_2_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_right_3" order="0-">
-          <icon src="nav_right_3_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_straight" order="0-">
-          <icon src="nav_straight_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_turnaround_left" order="0-">
-          <icon src="nav_turnaround_left_bk.svg" w="32" h="32" />
-        </itemgra>
-	 <itemgra item_types="nav_turnaround_right" order="0-">
-          <icon src="nav_turnaround_right_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l1" order="0-">
-          <icon src="nav_roundabout_l1_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r1" order="0-">
-          <icon src="nav_roundabout_r1_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l2" order="0-">
-          <icon src="nav_roundabout_l2_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r2" order="0-">
-          <icon src="nav_roundabout_r2_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l3" order="0-">
-          <icon src="nav_roundabout_l3_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r3" order="0-">
-          <icon src="nav_roundabout_r3_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l4" order="0-">
-          <icon src="nav_roundabout_l4_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r4" order="0-">
-          <icon src="nav_roundabout_r4_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l5" order="0-">
-          <icon src="nav_roundabout_l5_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r5" order="0-">
-          <icon src="nav_roundabout_r5_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l6" order="0-">
-          <icon src="nav_roundabout_l6_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r6" order="0-">
-          <icon src="nav_roundabout_r6_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l7" order="0-">
-          <icon src="nav_roundabout_l7_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r7" order="0-">
-          <icon src="nav_roundabout_r7_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_l8" order="0-">
-          <icon src="nav_roundabout_l8_bk.svg" w="32" h="32" />
-        </itemgra>
-        <itemgra item_types="nav_roundabout_r8" order="0-">
-          <icon src="nav_roundabout_r8_bk.svg" w="32" h="32" />
-        </itemgra>
-	<itemgra item_types="nav_keep_left" order="0-">
-	  <icon src="nav_keep_left_bk.svg" w="32" h="32"/>
-	</itemgra>
-	<itemgra item_types="nav_merge_left" order="0-">
-	  <icon src="nav_merge_left_bk.svg" w="32" h="32"/>
-	</itemgra>
-	<itemgra item_types="nav_keep_right" order="0-">
-	  <icon src="nav_keep_right_bk.svg" w="32" h="32"/>
-	</itemgra>
-	<itemgra item_types="nav_merge_right" order="0-">
-	  <icon src="nav_merge_right_bk.svg" w="32" h="32"/>
-	</itemgra>
-	<itemgra item_types="nav_exit_left" order="0-">
-	  <icon src="nav_exit_left_bk.svg" w="32" h="32"/>
-	</itemgra>
-	<itemgra item_types="nav_exit_right" order="0-">
-	  <icon src="nav_exit_right_bk.svg" w="32" h="32"/>
-	</itemgra>
-        <itemgra item_types="route_end" order="0-">
-          <icon src="nav_destination_bk.svg" w="32" h="32" x="4" y="30"/>
-        </itemgra>
-        
-        <itemgra item_types="waypoint,route_end" order="2">
-			<circle color="#000000" radius="4" width="2" text_size="24"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="3-5">
-			<circle color="#000000" radius="8" width="2" text_size="24"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="6">
-			<circle color="#000000" radius="10" width="2" text_size="24"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="7-8">
-			<circle color="#000000" radius="16" width="2" text_size="24"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="9-10">
-			<circle color="#000000" radius="20" width="4" text_size="32"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="11">
-			<circle color="#000000" radius="28" width="4" text_size="32"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="12">
-			<circle color="#000000" radius="32" width="4" text_size="32"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="13">
-			<circle color="#000000" radius="52" width="4" text_size="24"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="14">
-			<circle color="#000000" radius="64" width="4" text_size="24"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="15">
-			<circle color="#000000" radius="68" width="6" text_size="24"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="16">
-			<circle color="#000000" radius="132" width="8" text_size="32"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="17">
-			<circle color="#000000" radius="268" width="8" text_size="48"/>
-		</itemgra>
-		<itemgra item_types="waypoint,route_end" order="18">
-			<circle color="#000000" radius="530" width="8" text_size="48"/>
-		</itemgra>
-        
-        <itemgra item_types="nav_none" order="0-">
-          <icon src="unknown.svg" />
-        </itemgra>
-        <itemgra item_types="announcement" order="7-">
-          <icon src="gui_sound_32_32.svg" />
-          <circle color="#FF089C" radius="10" text_size="7" />
-        </itemgra>
-      </layer>
-      <layer name="POI Symbols" active="1">
-        <itemgra item_types="mini_roundabout" order="12-">
-          <icon src="mini_roundabout.svg" />
-        </itemgra>
-        <itemgra item_types="turning_circle" order="12-">
-          <icon src="mini_roundabout.svg" />
-        </itemgra>
-        <itemgra item_types="poi_airport" order="6-">
-          <icon src="airport.svg" />
-        </itemgra>
-        <itemgra item_types="poi_fuel" order="12-">
-          <icon src="fuel.svg" />
-        </itemgra>
-        <itemgra item_types="poi_bridge" order="12-">
-          <icon src="bridge.svg" />
-        </itemgra>
-        <itemgra item_types="highway_exit" order="12-">
-          <icon src="exit.svg" />
-        </itemgra>
-        <itemgra item_types="poi_auto_club" order="13-">
-          <icon src="auto_club.svg" />
-        </itemgra>
-        <itemgra item_types="poi_bank" order="13-">
-          <icon src="bank.svg" />
-        </itemgra>
-	<itemgra item_types="poi_atm" order="13-">
-		<icon src="atm.svg"/>
-	</itemgra>
-        <itemgra item_types="poi_danger_area" order="13-">
-          <icon src="danger_16_16.svg" />
-        </itemgra>
-        <itemgra item_types="poi_forbidden_area" order="13-">
-          <icon src="forbiden_area.svg" />
-        </itemgra>
-        <itemgra item_types="poi_tunnel" order="12-">
-          <icon src="tunnel.svg" />
-        </itemgra>
-        <itemgra item_types="traffic_signals" order="14-">
-          <icon src="traffic_signals.svg" />
-        </itemgra>
-      </layer>
-      <layer name="POI Labels" active="1">
-        <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle"
-        order="15-">
-          <circle color="#606060" radius="0" width="0"
-          text_size="10" />
-        </itemgra>
-      </layer>
-      <layer name="Android-POI-Icons-full" active="0">
-        <itemgra item_types="mini_roundabout" order="12-">
-          <icon src="mini_roundabout.svg" />
-        </itemgra>
-        <itemgra item_types="turning_circle" order="12-">
-          <icon src="mini_roundabout.svg" />
-        </itemgra>
-        <itemgra item_types="poi_airport" order="5-">
-          <icon src="airport.svg" />
-        </itemgra>
-        <itemgra item_types="town_ghost" order="10-">
-          <icon src="ghost_town.svg" />
-        </itemgra>
-        <itemgra item_types="poi_hotel" order="12-">
-          <icon src="hotel.svg" />
-        </itemgra>
-        <itemgra item_types="poi_car_parking" order="11-">
-          <icon src="parking.svg" />
-        </itemgra>
-        <itemgra item_types="poi_car_dealer_parts" order="12-">
-          <icon src="car_dealer.svg" />
-        </itemgra>
-        <itemgra item_types="poi_fuel" order="12-">
-          <icon src="fuel.svg" />
-        </itemgra>
-        <itemgra item_types="poi_shopping" order="14-">
-          <icon src="shopping.svg" />
-        </itemgra>
-        <itemgra item_types="poi_attraction" order="11-">
-          <icon src="attraction.svg" />
-        </itemgra>
-        <itemgra item_types="poi_cafe" order="12-">
-          <icon src="cafe.svg" />
-        </itemgra>
-        <itemgra item_types="poi_bar" order="12-">
-          <icon src="bar.svg" />
-        </itemgra>
-        <itemgra item_types="poi_pub" order="12-">
-          <icon src="beer.svg" />
-        </itemgra>
-        <itemgra item_types="poi_bridge" order="12-">
-          <icon src="bridge.svg" />
-        </itemgra>
-        <itemgra item_types="highway_exit" order="11-">
-          <icon src="exit.svg" />
-        </itemgra>
-        <itemgra item_types="poi_camp_rv" order="12-">
-          <icon src="camping.svg" />
-        </itemgra>
-        <itemgra item_types="poi_museum_history" order="12-">
-          <icon src="museum.svg" />
-        </itemgra>
-        <itemgra item_types="poi_hospital" order="12-">
-          <icon src="hospital.svg" />
-        </itemgra>
-        <itemgra item_types="poi_dining" order="12-">
-          <icon src="restaurant.svg"/>
-        </itemgra>
-        <itemgra item_types="poi_fastfood" order="12-">
-          <icon src="fastfood.svg" />
-        </itemgra>
-        <itemgra item_types="poi_police" order="12-">
-          <icon src="police.svg" />
-        </itemgra>
-        <itemgra item_types="poi_auto_club" order="12-">
-          <icon src="auto_club.svg" />
-        </itemgra>
-        <itemgra item_types="poi_autoservice" order="12-">
-          <icon src="car_dealer.svg" />
-        </itemgra>
-        <itemgra item_types="poi_bank" order="12-">
-          <icon src="bank.svg" />
-        </itemgra>
-	<itemgra item_types="poi_atm" order="12-">
-	  <icon src="atm.svg"/>
-	</itemgra>
-        <itemgra item_types="poi_bay" order="12-">
-          <icon src="bay.svg" />
-        </itemgra>
-        <itemgra item_types="poi_bend" order="12-">
-          <icon src="bend.svg" />
-        </itemgra>
-        <itemgra item_types="poi_boat_ramp" order="12-">
-          <icon src="boat_ramp.svg" />
-        </itemgra>
-        <itemgra item_types="poi_border_station" order="12-">
-          <icon src="border_station.svg" />
-        </itemgra>
-        <itemgra item_types="poi_bowling" order="12-">
-          <icon src="bowling.svg" />
-        </itemgra>
-        <itemgra item_types="poi_bus_station" order="11-">
-          <icon src="bus.svg" />
-        </itemgra>
-        <itemgra item_types="poi_bus_stop" order="12-">
-          <icon src="bus_stop.svg" />
-        </itemgra>
-        <itemgra item_types="poi_business_service" order="12-">
-          <icon src="bussines_service.svg" />
-        </itemgra>
-        <itemgra item_types="poi_car_rent" order="12-">
-          <icon src="car_rent.svg" />
-        </itemgra>
-	<itemgra item_types="poi_car_sharing" order="11-">
-	  <icon src="car_sharing.svg"/>
-	</itemgra>
-        <itemgra item_types="poi_car_wash" order="12-">
-          <icon src="car_wash.svg" />
-        </itemgra>
-        <itemgra item_types="poi_casino" order="12-">
-          <icon src="casino.svg" />
-        </itemgra>
-        <itemgra item_types="poi_cemetery" order="12-">
-          <icon src="cemetery.svg" />
-        </itemgra>
-        <itemgra item_types="poi_church" order="11-">
-          <icon src="church.svg" />
-        </itemgra>
-				<itemgra item_types="poi_bahai" order="11-">
-					<icon src="bahai.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_buddhist" order="11-">
-					<icon src="buddhist.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_hindu" order="11-">
-					<icon src="hindu.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_islamic" order="11-">
-					<icon src="islamic.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_jain" order="11-">
-					<icon src="jain.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_jewish" order="11-">
-					<icon src="jewish.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_pagan" order="11-">
-					<icon src="pagan.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_pastafarian" order="11-">
-					<icon src="pastafarian.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_shinto" order="11-">
-					<icon src="shinto.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_sikh" order="11-">
-					<icon src="sikh.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_taoist" order="11-">
-					<icon src="taoist.svg"/>
-				</itemgra>
-        <itemgra item_types="poi_cinema" order="12-">
-          <icon src="cinema.svg" />
-        </itemgra>
-        <itemgra item_types="poi_communication" order="12-">
-          <icon src="communication.svg" />
-        </itemgra>
-        <itemgra item_types="poi_concert" order="12-">
-          <icon src="concert.svg" />
-        </itemgra>
-        <itemgra item_types="poi_cove" order="12-">
-          <icon src="cove.svg" />
-        </itemgra>
-        <itemgra item_types="poi_crossing" order="12-">
-          <icon src="crossing.svg" />
-        </itemgra>
-        <itemgra item_types="poi_dam" order="12-">
-          <icon src="dam.svg" />
-        </itemgra>
-        <itemgra item_types="poi_danger_area" order="12-">
-          <icon src="danger_16_16.svg" />
-        </itemgra>
-        <itemgra item_types="poi_danger_sea_wreck" order="12-">
-          <icon src="dangerous.svg" />
-        </itemgra>
-        <itemgra item_types="poi_daymark" order="12-">
-          <icon src="daymark.svg" />
-        </itemgra>
-        <itemgra item_types="poi_diving" order="12-">
-          <icon src="diving.svg" />
-        </itemgra>
-        <itemgra item_types="poi_drinking_water" order="13-">
-          <icon src="drinking_water.svg" />
-        </itemgra>
-        <itemgra item_types="poi_emergency" order="12-">
-          <icon src="emergency.svg" />
-        </itemgra>
-        <itemgra item_types="poi_fair" order="12-">
-          <icon src="fair.svg" />
-        </itemgra>
-        <itemgra item_types="poi_firebrigade" order="12-">
-          <icon src="firebrigade.svg" />
-        </itemgra>
-        <itemgra item_types="poi_fish" order="9-">
-          <icon src="fish.svg" />
-        </itemgra>
-        <itemgra item_types="poi_forbidden_area" order="12-">
-          <icon src="forbiden_area.svg" />
-        </itemgra>
-        <itemgra item_types="poi_shop_gps" order="15-">
-          <icon src="garmin.svg" />
-        </itemgra>
-        <itemgra item_types="poi_golf" order="12-">
-          <icon src="golf.svg" />
-        </itemgra>
-        <itemgra item_types="poi_government_building" order="12-">
-          <icon src="goverment_building.svg" />
-        </itemgra>
-        <itemgra item_types="poi_height" order="12-">
-          <icon src="height.svg" />
-        </itemgra>
-        <itemgra item_types="poi_heliport" order="8-">
-          <icon src="heliport.svg" />
-        </itemgra>
-        <itemgra item_types="poi_hotspring" order="12-">
-          <icon src="hotspring.svg" />
-        </itemgra>
-        <itemgra item_types="poi_icesport" order="12-">
-          <icon src="icesport.svg" />
-        </itemgra>
-        <itemgra item_types="poi_information" order="12-">
-          <icon src="information.svg" />
-        </itemgra>
-        <itemgra item_types="poi_justice" order="12-">
-          <icon src="justice.svg" />
-        </itemgra>
-        <itemgra item_types="poi_landmark" order="11-">
-          <icon src="landmark.svg" />
-        </itemgra>
-        <itemgra item_types="poi_levee" order="12-">
-          <icon src="levee.svg" />
-        </itemgra>
-        <itemgra item_types="poi_level_crossing" order="11-">
-          <icon src="level_crossing.svg" />
-        </itemgra>
-        <itemgra item_types="poi_library" order="12-">
-          <icon src="library.svg" />
-        </itemgra>
-        <itemgra item_types="poi_locale" order="12-">
-          <icon src="locale.svg" />
-        </itemgra>
-        <itemgra item_types="poi_loudspeaker" order="12-">
-          <icon src="loudspeaker.svg" />
-        </itemgra>
-        <itemgra item_types="poi_mall" order="12-">
-          <icon src="mall.svg" />
-        </itemgra>
-        <itemgra item_types="poi_manmade_feature" order="12-">
-          <icon src="manmade_feature.svg" />
-        </itemgra>
-        <itemgra item_types="poi_marine" order="12-">
-          <icon src="marine.svg" />
-        </itemgra>
-        <itemgra item_types="poi_marine_type" order="12-">
-          <icon src="marine_type.svg" />
-        </itemgra>
-        <itemgra item_types="poi_mark" order="12-">
-          <icon src="mark.svg" />
-        </itemgra>
-        <itemgra item_types="poi_military" order="11-">
-          <icon src="military.svg" />
-        </itemgra>
-        <itemgra item_types="poi_mine" order="12-">
-          <icon src="mine.svg" />
-        </itemgra>
-        <itemgra item_types="poi_nondangerous" order="12-">
-          <icon src="nondangerous.svg" />
-        </itemgra>
-        <itemgra item_types="poi_oil_field" order="12-">
-          <icon src="oil_field.svg" />
-        </itemgra>
-        <itemgra item_types="poi_peak" order="7-">
-          <icon src="peak.svg" />
-        </itemgra>
-        <itemgra item_types="poi_personal_service" order="12-">
-          <icon src="personal_service.svg" />
-        </itemgra>
-        <itemgra item_types="poi_pharmacy" order="12-">
-          <icon src="pharmacy.svg" />
-        </itemgra>
-        <itemgra item_types="poi_post_office,poi_post_box"
-        order="13-">
-          <icon src="post.svg" />
-        </itemgra>
-        <itemgra item_types="poi_public_office" order="12-">
-          <icon src="public_office.svg" />
-        </itemgra>
-        <itemgra item_types="poi_rail_halt" order="11-">
-          <circle color="#ff0000" radius="3" width="3" />
-          <circle color="#000000" radius="5" width="2"
-          text_size="8" />
-        </itemgra>
-        <itemgra item_types="poi_rail_station" order="9-">
-          <circle color="#ff0000" radius="3" width="3" />
-          <circle color="#000000" radius="6" width="2"
-          text_size="8" />
-        </itemgra>
-        <itemgra item_types="poi_rail_tram_stop" order="10-11">
-          <circle color="#ff0000" radius="2" width="2" />
-        </itemgra>
-        <itemgra item_types="poi_rail_tram_stop" order="12-">
-          <circle color="#ff0000" radius="3" width="3" />
-          <circle color="#606060" radius="5" width="2"
-          text_size="8" />
-        </itemgra>
-        <itemgra item_types="poi_repair_service" order="12-">
-          <icon src="repair_service.svg" />
-        </itemgra>
-        <itemgra item_types="poi_resort" order="12-">
-          <icon src="resort.svg" />
-        </itemgra>
-        <itemgra item_types="poi_restaurant" order="12-">
-          <icon src="restaurant.svg" />
-        </itemgra>
-        <itemgra item_types="poi_restricted_area" order="12-">
-          <icon src="restricted_area.svg" />
-        </itemgra>
-        <itemgra item_types="poi_restroom" order="13-">
-          <icon src="toilets.svg"/>
-        </itemgra>
-        <itemgra item_types="poi_sailing" order="12-">
-          <icon src="sailing.svg" />
-        </itemgra>
-        <itemgra item_types="poi_scenic_area" order="12-">
-          <icon src="scenic_area.svg" />
-        </itemgra>
-        <itemgra item_types="poi_school" order="12-">
-          <icon src="school.svg" />
-        </itemgra>
-        <itemgra item_types="poi_service" order="12-">
-          <icon src="service.svg" />
-        </itemgra>
-        <itemgra item_types="poi_shop_apparel" order="14-">
-          <icon src="shop_apparel.svg" />
-        </itemgra>
-	<itemgra item_types="poi_shop_bicycle" order="14-">
-	  <icon src="bicycle_shop.svg" />
-	</itemgra>
-        <itemgra item_types="poi_shop_computer" order="14-">
-          <icon src="shop_computer.svg" />
-        </itemgra>
-        <itemgra item_types="poi_shop_department" order="14-">
-          <icon src="shop_department.svg" />
-        </itemgra>
-        <itemgra item_types="poi_shop_furniture" order="14-">
-          <icon src="shop_furnish.svg" />
-        </itemgra>
-        <itemgra item_types="poi_shop_grocery" order="14-">
-          <icon src="shop_grocery.svg" />
-        </itemgra>
-        <itemgra item_types="poi_shop_handg" order="14-">
-          <icon src="shop_handg.svg" />
-        </itemgra>
-        <itemgra item_types="poi_shop_merchandise" order="14-">
-          <icon src="shop_merchandise.svg" />
-        </itemgra>
-        <itemgra item_types="poi_shop_retail" order="14-">
-          <icon src="shop_retail.svg" />
-        </itemgra>
-        <itemgra item_types="poi_shower" order="13-">
-          <icon src="shower.svg" />
-        </itemgra>
-        <itemgra item_types="poi_skiing" order="11-">
-          <icon src="skiing.svg" />
-        </itemgra>
-        <itemgra item_types="poi_social_service" order="12-">
-          <icon src="social_service.svg" />
-        </itemgra>
-        <itemgra item_types="poi_sounding" order="12-">
-          <icon src="sounding.svg" />
-        </itemgra>
-        <itemgra item_types="poi_sport" order="12-">
-          <icon src="sport.svg" />
-        </itemgra>
-        <itemgra item_types="poi_stadium" order="11-">
-          <icon src="stadium.svg" />
-        </itemgra>
-        <itemgra item_types="poi_swimming" order="12-">
-          <icon src="swimming.svg" />
-        </itemgra>
-        <itemgra item_types="poi_telephone" order="13-">
-          <icon src="telephone.svg" />
-        </itemgra>
-        <itemgra item_types="poi_theater" order="12-">
-          <icon src="theater.svg" />
-        </itemgra>
-        <itemgra item_types="poi_tide" order="12-">
-          <icon src="tide.svg" />
-        </itemgra>
-        <itemgra item_types="poi_tower" order="13-">
-          <icon src="tower.svg" />
-        </itemgra>
-        <itemgra item_types="poi_townhall" order="12-">
-          <icon src="townhall.svg" />
-        </itemgra>
-        <itemgra item_types="poi_trail" order="12-">
-          <icon src="trail.svg" />
-        </itemgra>
-        <itemgra item_types="poi_truck_stop" order="12-">
-          <icon src="truck_stop.svg" />
-        </itemgra>
-        <itemgra item_types="poi_tunnel" order="12-">
-          <icon src="tunnel.svg" />
-        </itemgra>
-        <itemgra item_types="poi_wine" order="12-">
-          <icon src="wine.svg" />
-        </itemgra>
-        <itemgra item_types="poi_worship" order="8-">
-          <icon src="worship.svg" />
-        </itemgra>
-        <itemgra item_types="poi_wrecker" order="12-">
-          <icon src="wrecker.svg" />
-        </itemgra>
-        <itemgra item_types="poi_zoo" order="9-">
-          <icon src="zoo.svg" />
-        </itemgra>
-        <itemgra item_types="poi_picnic" order="12-">
-          <icon src="picnic.svg" />
-        </itemgra>
-        <itemgra item_types="poi_gc_multi" order="12-">
-          <icon src="gc_multi.svg" />
-        </itemgra>
-        <itemgra item_types="poi_gc_tradi" order="12-">
-          <icon src="gc_tradi.svg" />
-        </itemgra>
-        <itemgra item_types="poi_gc_event" order="12-">
-          <icon src="gc_event.svg" />
-        </itemgra>
-        <itemgra item_types="poi_gc_mystery" order="12-">
-          <icon src="gc_mystery.svg" />
-        </itemgra>
-        <itemgra item_types="poi_gc_question" order="12-">
-          <icon src="gc_question.svg" />
-        </itemgra>
-        <itemgra item_types="poi_gc_stages" order="12-">
-          <icon src="gc_stages.svg" />
-        </itemgra>
-        <itemgra item_types="poi_gc_reference" order="12-">
-          <icon src="gc_reference.svg" />
-        </itemgra>
-        <itemgra item_types="poi_gc_webcam" order="12-">
-          <icon src="gc_webcam.svg" />
-        </itemgra>
-        <itemgra item_types="traffic_signals" order="13-">
-          <icon src="traffic_signals.svg" />
-        </itemgra>
-        <itemgra item_types="poi_wifi" order="13-">
-          <icon src="wifi.svg" />
-        </itemgra>
-        <itemgra item_types="poi_image" order="12-">
-          <image />
-        </itemgra>
-        <itemgra item_types="poi_bench" order="15-">
-          <icon src="bench.svg" />
-        </itemgra>
-        <itemgra item_types="poi_biergarten" order="12-">
-          <icon src="biergarten.svg" />
-        </itemgra>
-        <itemgra item_types="poi_boundary_stone" order="13-">
-          <icon src="boundary_stone.svg" />
-        </itemgra>
-        <itemgra item_types="poi_castle" order="11-">
-          <icon src="castle.svg" />
-        </itemgra>
-        <itemgra item_types="poi_ruins" order="11-">
-          <icon src="ruins.svg" />
-        </itemgra>
-        <itemgra item_types="poi_hunting_stand" order="12-">
-          <icon src="hunting_stand.svg" />
-        </itemgra>
-        <itemgra item_types="poi_memorial" order="12-">
-          <icon src="memorial.svg" />
-        </itemgra>
-        <itemgra item_types="poi_monument" order="12-">
-          <icon src="memorial.svg" />
-        </itemgra>
-        <itemgra item_types="poi_shelter" order="11-">
-          <icon src="shelter.svg" />
-        </itemgra>
-        <itemgra item_types="poi_fountain" order="13-">
-          <icon src="fountain.svg" />
-        </itemgra>
-        <itemgra item_types="poi_potable_water" order="13-">
-          <icon src="drinking_water.svg"/>
-        </itemgra>
-        <itemgra item_types="poi_toilets" order="12-">
-          <icon src="toilets.svg" />
-        </itemgra>
-        <itemgra item_types="poi_viewpoint" order="10-">
-          <icon src="viewpoint.svg" />
-        </itemgra>
-        <itemgra item_types="tec_common" order="11-">
-          <icon src="tec_common.svg"/>
-        </itemgra>
-        <itemgra item_types="vehicle" order="0-">
-          <icon src="gui_vehicle_16_16.svg" />
-        </itemgra>
-        <itemgra item_types="vehicle_pedestrian" order="0-">
-          <icon src="gui_vehicle_pedestrian_16_16.svg" />
-        </itemgra>
-        <itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf"
-        order="10-">
-          <icon src="%s" />
-        </itemgra>
-      </layer>
-      <layer name="Android-POI-Labels-full" active="0">
-        <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_car_sharing,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_shop_bicycle,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle"
-         order="14-">
-          <circle color="#606060" radius="0" width="0"
-          text_size="10" />
-        </itemgra>
-        <itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf"
-        order="14-">
-          <circle color="#606060" radius="0" width="0"
-          text_size="10" />
-        </itemgra>
-      </layer>
-      <layer name="Found items" ref="Found items"/>
-    </layout>
-
-		<layout name="Car-simple" color="#839ea9">
-			<layer name="polygon">
-				  <itemgra item_types="poly_town" order="8-">
-				    <polygon color="#6b8091"/>
-				  </itemgra>
-			</layer>
-			<layer name="streets">
-				<itemgra item_types="water_line" order="11-">
-					<polyline width="3" color="#5e71a7" />
-				</itemgra>
-				<itemgra item_types="rail" order="9-">
-					<polyline width="4" color="#a4bac8" />
-					<polyline width="1" color="#e0e0e0" dash="4,6"/>
-				</itemgra>
-				<itemgra item_types="street_1_city,street_1_land" order="12-">
-					<polyline width="5" color="#516170"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="12-">
-					<polyline width="7" color="#516170"/>
-				</itemgra>
-				<itemgra item_types="street_1_city,street_1_land" order="11">
-					<polyline width="3" color="#516170"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="9-11">
-					<polyline width="5" color="#516170"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="11-">
-					<polyline width="9" color="#516170" />
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="8-10">
-					<polyline width="7" color="#516170" />
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11-">
-					<polyline width="9" color="#516170" />
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="8-10">
-					<polyline width="7" color="#516170" />
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="6-7">
-					<polyline width="3" color="#516170" />
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="4-">
-					<polyline width="9" color="#516170" />
-				</itemgra>
-
-				<itemgra item_types="street_route" >
-					<polyline width="11" color="#516170" />
-				</itemgra>
-				
-				<itemgra item_types="street_1_city,street_1_land" order="12-">
-					<polyline width="3" color="#a4bac8" />
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="12-">
-					<polyline width="5" color="#90a3af" />
-				</itemgra>
-				<itemgra item_types="street_1_city,street_1_land" order="11">
-					<polyline width="1" color="#a4bac8" />
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="9-11">
-					<polyline width="3" color="#90a3af" />
-				</itemgra>
-
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="11-">
-					<polyline width="6" color="#a4bac8" />
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="8-10">
-					<polyline width="4" color="#a4bac8" />
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11-">
-					<polyline width="6" color="#c7e1f2" />
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="8-10">
-					<polyline width="4" color="#c7e1f2" />
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="6-7">
-					<polyline width="1" color="#c7e1f2" />
-				</itemgra>
-
-				<itemgra item_types="highway_city,highway_land" order="4-">
-					<polyline width="3" color="#c0e1ff" />
-				</itemgra>
-
-				<itemgra item_types="street_route" >
-					<polyline width="9" color="#ffffff" />
-				</itemgra>
-				
-				<itemgra item_types="waypoint,route_end" >
-					<circle color="#000000" radius="8" width="2" text_size="24"/>
-				</itemgra>
-			</layer>
-			<layer name="labels">
-				<itemgra item_types="water_line" order="11-">
-					<text text_size="16" color="#0000ff" />
-				</itemgra>
-				<itemgra item_types="street_1_city,street_2_city,street_3_city,street_4_city,highway_city,street_1_land,street_2_land,street_3_land,street_4_land,street_n_lanes,highway_land,living_street,footway">
-					<text text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="10-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e3,town_label_2e3,district_label_1e3,district_label_2e3" order="9-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label_5e3,district_label_5e3" order="8-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e4,district_label_1e4" order="7-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label_2e4,district_label_2e4" order="6-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label_5e4,town_label_1e5,district_label_5e4,district_label_1e5" order="5-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label_2e5,district_label_2e5" order="4-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-				<itemgra item_types="town_label_5e5,district_label_5e5" order="2-">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-
-				<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7,district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7">
-					<circle radius="3" text_size="16" color="#ffffff" background_color="#000000"/>
-				</itemgra>
-			</layer>
-			<layer name="Found items" ref="Found items"/>
-		</layout>
-
-		<layout name="Bike" color="#ffefb7" font="Liberation Sans">
-
-			<cursor w="26" h="26">
-				<itemgra>
-					<circle color="#0000ff" radius="24" width="2">
-						<coord x="0" y="0"/>
-					</circle>
-				</itemgra>
-				<itemgra speed_range="-2">
-					<polyline color="#0000ff" width="2">
-						<coord x="0" y="0"/>
-						<coord x="0" y="0"/>
-					</polyline>
-				</itemgra>
-				<itemgra speed_range="3-">
-					<polyline color="#0000ff" width="2">
-						<coord x="-7" y="-10"/>
-						<coord x="0" y="12"/>
-						<coord x="7" y="-10"/>
-					</polyline>
-				</itemgra>
-			</cursor>
-
-			<layer name="Landuse">
-				<itemgra item_types="image" order="0-">
-					<image/>
-				</itemgra>
-				<itemgra item_types="poly_wood" order="0-">
-					<polygon color="#8ec78d"/>
-				</itemgra>
-				<itemgra item_types="poly_town" order="0-">
-					<polygon color="#ffc895"/>
-					<polyline color="#ebb481"/>
-				</itemgra>
-				<itemgra item_types="poly_park" order="0-">
-					<polygon color="#7cc334"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_water" order="0-">
-					<polygon color="#82c8ea"/>
-					<polyline color="#5096b8"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_land" order="0-">
-					<polygon color="#ffefb7"/>
-					<polyline color="#ffefb7"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_airport" order="0-">
-					<polygon color="#a0a0a0"/>
-				</itemgra>
-				<itemgra item_types="poly_sport" order="0-">
-					<polygon color="#ff8c00"/>
-				</itemgra>
-				<itemgra item_types="poly_industry,poly_place,poly_railway" order="0-">
-					<polygon color="#e6e6e6"/>
-				</itemgra>
-				<itemgra item_types="poly_commercial" order="0-">
-					<polygon color="#fff8dc"/>
-				</itemgra>
-				<itemgra item_types="poly_industry,poly_building,poly_place,poly_brownfield,poly_greenfield,poly_construction,poly_railway" order="0-">
-					<polygon color="#ecd8ff"/>
-				</itemgra>
-				<itemgra item_types="poly_farm" order="0-">
-					<polygon color="#c7f1a3"/>
-					<polyline color="#79c691"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_meadow" order="0-">
-					<polygon color="#c7f1a3"/>
-					<polyline color="#79c691"/>
-				</itemgra>
-				<itemgra item_types="poly_scree,poly_scrub,poly_fell,poly_heath" order="0-">
-					<polygon color="#c7f1a3"/>
-					<polyline color="#79c691"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_marsh,poly_mud,poly_quarry" order="0-">
-					<polygon color="#DEB887"/>
-					<polyline color="#DEB887"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_allotments,poly_playground,poly_village_green,poly_recreation_ground,poly_common,poly_garden" order="0-">
-					<polygon color="#c7f1a3"/>
-					<polyline color="#79c691"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_ruins" order="0-">
-					<polygon color="#b6a6a6"/>
-				</itemgra>
-				<itemgra item_types="poly_apron" order="0-">
-					<polygon color="#d0d0d0"/>
-				</itemgra>
-				<itemgra item_types="poly_terminal" order="7-">
-					<polygon color="#e3c6a6"/>
-				</itemgra>
-				<itemgra item_types="poly_cemetery" order="1-">
-					<polygon color="#bde3cb"/>
-				</itemgra>
-				<itemgra item_types="poly_car_parking" order="1-">
-					<polygon color="#d2d2d2"/>
-				</itemgra>
-				<itemgra item_types="poly_building" order="0-">
-					<polygon color="#ff6347"/>
-				</itemgra>
-			</layer>
-			<layer name="Contour Lines">
-				<itemgra item_types="height_line_1" order="8">
-					<polyline color="#A9A9A9" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="height_line_1" order="9">
-					<polyline color="#A9A9A9" width="2"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="height_line_2" order="9">
-					<polyline color="#A9A9A9" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="height_line_1" order="10-">
-					<polyline color="#A9A9A9" width="3"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="height_line_2" order="10-">
-					<polyline color="#A9A9A9" width="2"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="height_line_3" order="10-">
-					<polyline color="#A9A9A9" width="1"/>
-				</itemgra>
-			</layer>
-			<!-- "Contour Lines" -->
-
-			<layer name="Barriers">
-				<itemgra item_types="ditch" order="8-">
-					<polyline color="#B8860B" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="hedge" order="8-">
-					<polyline color="#90EE90" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="fence" order="8-">
-					<polyline color="#808080" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="wall" order="8-">
-					<polyline color="#808080" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="retaining_wall" order="8-">
-					<polyline color="#808080" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="city_wall" order="8-">
-					<polyline color="#CD5C5C" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-			</layer>
-			<!-- "Barriers" -->
-
-			<layer name="Waterways">
-				<itemgra item_types="water_line" order="0-">
-					<polyline color="#82c8ea" width="2"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_river" order="0-">
-					<polyline color="#82c8ea" width="4"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_canal" order="0-">
-					<polyline color="#82c8ea" width="3"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_stream" order="0-">
-					<polyline color="#82c8ea" width="2"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="water_drain" order="0-">
-					<polyline color="#82c8ea" width="1"/>
-					<text text_size="5"/>
-				</itemgra>
-			</layer>
-			<layer name="Borders">
-				<itemgra item_types="border_state" order="0-5">
-					<polyline color="#778899" width="3"/>
-					<polyline color="#ffefb7" dash="3,2,1,3" width="1"/>
-				</itemgra>
-				<itemgra item_types="border_country" order="0-5">
-					<polyline color="#778899" width="2"/>
-					<polyline color="#ffefb7" dash="3,2,1,3" width="1"/>
-				</itemgra>
-				<itemgra item_types="border_state" order="6-11">
-					<polyline color="#778899" width="3"/>
-					<polyline color="#ffefb7" dash="6,6,1,6" width="1"/>
-				</itemgra>
-				<itemgra item_types="border_country" order="6-11">
-					<polyline color="#778899" width="2"/>
-					<polyline color="#ffefb7" dash="6,6,1,6" width="1"/>
-				</itemgra>
-				<itemgra item_types="border_state" order="12-20">
-					<polyline color="#778899" width="3"/>
-					<polyline color="#ffefb7" dash="10,10,2,10" width="1"/>
-				</itemgra>
-				<itemgra item_types="border_country" order="12-20">
-					<polyline color="#778899" width="2"/>
-					<polyline color="#ffefb7" dash="10,10,2,10" width="1"/>
-				</itemgra>
-			</layer>
-			<layer name="Current Route">
-				<itemgra item_types="street_route" order="2">
-					<polyline color="#FF00FF" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="3-5">
-					<polyline color="#FF00FF" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="6">
-					<polyline color="#FF00FF" width="10"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="7-8">
-					<polyline color="#FF00FF" width="16"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="9-10">
-					<polyline color="#FF00FF" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="11">
-					<polyline color="#FF00FF" width="28"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="12">
-					<polyline color="#FF00FF" width="32"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="13">
-					<polyline color="#FF00FF" width="52"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="14">
-					<polyline color="#FF00FF" width="64"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="15">
-					<polyline color="#FF00FF" width="68"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="16">
-					<polyline color="#FF00FF" width="132"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="17">
-					<polyline color="#FF00FF" width="268"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="18">
-					<polyline color="#FF00FF" width="530"/>
-				</itemgra>
-			</layer>
-			<layer name="Ways and Paths">
-				<itemgra item_types="powerline" order="12-">
-					<polyline color="#778899" width="1"/>
-					<polyline color="#778899" dash="1,80" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_nopass" order="10-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_paved" order="8-">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#fefefe" width="3"/>
-				</itemgra>
-				<itemgra item_types="track_gravelled" order="9-">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="track_unpaved" order="10-">
-					<polyline color="#d2d2d2" width="3"/>
-					<polyline color="#fefefe" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_ground" order="11-">
-					<polyline color="#d2d2d2" width="3"/>
-					<polyline color="#fefefe" width="1" dash="6,6"/>
-				</itemgra>
-				<itemgra item_types="track_grass" order="12-">
-					<polyline color="#fefefe" width="2"/>
-					<polyline color="#ffefb7" width="1" dash="6,6"/>
-				</itemgra>
-				<itemgra item_types="bridleway" order="10-">
-					<polyline color="#8b4513" width="3"/>
-					<polyline color="#f4a460" width="1"/>
-				</itemgra>
-				<itemgra item_types="cycleway" order="10-">
-					<polyline color="#006400" width="4"/>
-					<polyline color="#3cb371" width="2"/>
-				</itemgra>
-				<itemgra item_types="footway" order="12-">
-					<polyline color="#8b4513" width="3"/>
-					<polyline color="#CD853F" width="1"/>
-				</itemgra>
-				<itemgra item_types="steps" order="12-">
-					<polyline color="#8b4513" width="3"/>
-					<polyline color="#F4A460" width="1" dash="6,4"/>
-				</itemgra>
-				<itemgra item_types="path" order="11-">
-					<polyline color="#8b4513" width="3"/>
-					<polyline color="#ffefb7" width="1" dash="2,4"/>
-				</itemgra>
-				<itemgra item_types="hiking" order="11-">
-					<polyline color="#8b4513" width="2"/>
-					<polyline color="#ffefb7" width="1" dash="4,4"/>
-				</itemgra>
-				<itemgra item_types="hiking_mountain" order="11-">
-					<polyline color="#8b4513" width="2"/>
-					<polyline color="#ffefb7" width="1" dash="6,4"/>
-				</itemgra>
-				<itemgra item_types="hiking_mountain_demanding" order="13-">
-					<polyline color="#8b4513" width="2"/>
-					<polyline color="#ffefb7" width="1" dash="8,4"/>
-				</itemgra>
-				<itemgra item_types="hiking_alpine" order="13-">
-					<polyline color="#8b4513" width="1" dash="10,4"/>
-				</itemgra>
-				<itemgra item_types="hiking_alpine_demanding" order="14-">
-					<polyline color="#8b4513" width="1" dash="12,4"/>
-				</itemgra>
-				<itemgra item_types="hiking_alpine_difficult" order="14-">
-					<polyline color="#8b4513" width="1" dash="14,4"/>
-				</itemgra>
-			</layer>
-			<layer name="Streets">
-				<itemgra item_types="poly_pedestrian,poly_plaza" order="0-">
-					<polygon color="#d2d2d2"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="10">
-					<polyline color="#d2d2d2" width="3"/>
-					<polyline color="#dddddd" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="11">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#dddddd" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="12">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#dddddd" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="13">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#dddddd" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="14">
-					<polyline color="#d2d2d2" width="13"/>
-					<polyline color="#dddddd" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="15">
-					<polyline color="#d2d2d2" width="18"/>
-					<polyline color="#dddddd" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="16">
-					<polyline color="#d2d2d2" width="21"/>
-					<polyline color="#dddddd" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="17">
-					<polyline color="#d2d2d2" width="25"/>
-					<polyline color="#dddddd" width="21"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="18">
-					<polyline color="#d2d2d2" width="40"/>
-					<polyline color="#dddddd" width="34"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="9">
-					<polyline color="#d2d2d2" width="2"/>
-					<polyline color="#fefefe" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="10">
-					<polyline color="#d2d2d2" width="3"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="11">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="12">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#fefefe" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="13">
-					<polyline color="#d2d2d2" width="6"/>
-					<polyline color="#fefefe" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="14">
-					<polyline color="#d2d2d2" width="7"/>
-					<polyline color="#fefefe" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="15">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#fefefe" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="16">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#fefefe" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="17">
-					<polyline color="#d2d2d2" width="10"/>
-					<polyline color="#fefefe" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_service" order="18">
-					<polyline color="#d2d2d2" width="11"/>
-					<polyline color="#fefefe" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="12">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="13">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#fefefe" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="14">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#fefefe" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="15">
-					<polyline color="#d2d2d2" width="6"/>
-					<polyline color="#fefefe" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="16">
-					<polyline color="#d2d2d2" width="7"/>
-					<polyline color="#fefefe" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="17">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#fefefe" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_parking_lane" order="18">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#fefefe" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="8-10">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#ffffff" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="11">
-					<polyline color="#d2d2d2" width="6"/>
-					<polyline color="#ffffff" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="12">
-					<polyline color="#d2d2d2" width="10"/>
-					<polyline color="#ffffff" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="13">
-					<polyline color="#d2d2d2" width="12"/>
-					<polyline color="#ffffff" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="14">
-					<polyline color="#d2d2d2" width="15"/>
-					<polyline color="#ffffff" width="13"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="15">
-					<polyline color="#d2d2d2" width="17"/>
-					<polyline color="#ffffff" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="16">
-					<polyline color="#d2d2d2" width="33"/>
-					<polyline color="#ffffff" width="26"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="17">
-					<polyline color="#d2d2d2" width="69"/>
-					<polyline color="#ffffff" width="61"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="18">
-					<polyline color="#d2d2d2" width="132"/>
-					<polyline color="#ffffff" width="126"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="7-8">
-					<polyline color="#c0c0c0" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="9">
-					<polyline color="#c0c0c0" width="3"/>
-					<polyline color="#ffff00" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="10">
-					<polyline color="#c0c0c0" width="4"/>
-					<polyline color="#ffff00" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="11">
-					<polyline color="#c0c0c0" width="5"/>
-					<polyline color="#ffff00" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="12">
-					<polyline color="#c0c0c0" width="7"/>
-					<polyline color="#ffff00" width="5"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="13">
-					<polyline color="#c0c0c0" width="11"/>
-					<polyline color="#ffff00" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="14">
-					<polyline color="#c0c0c0" width="14"/>
-					<polyline color="#ffff00" width="11"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="15">
-					<polyline color="#c0c0c0" width="19"/>
-					<polyline color="#ffff00" width="15"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="16">
-					<polyline color="#c0c0c0" width="30"/>
-					<polyline color="#ffff00" width="26"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="17">
-					<polyline color="#c0c0c0" width="63"/>
-					<polyline color="#ffff00" width="57"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,ramp" order="18">
-					<polyline color="#c0c0c0" width="100"/>
-					<polyline color="#ffff00" width="90"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="7-8">
-					<polyline color="#a0a0a0" width="3"/>
-					<polyline color="#ffff00" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="9">
-					<polyline color="#a0a0a0" width="5"/>
-					<polyline color="#ffff00" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="10">
-					<polyline color="#a0a0a0" width="8"/>
-					<polyline color="#ffff00" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="11">
-					<polyline color="#a0a0a0" width="9"/>
-					<polyline color="#ffff00" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="12">
-					<polyline color="#a0a0a0" width="13"/>
-					<polyline color="#ffff00" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="13">
-					<polyline color="#a0a0a0" width="18"/>
-					<polyline color="#ffff00" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="14">
-					<polyline color="#a0a0a0" width="21"/>
-					<polyline color="#ffff00" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="15">
-					<polyline color="#a0a0a0" width="25"/>
-					<polyline color="#ffff00" width="21"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="16">
-					<polyline color="#a0a0a0" width="40"/>
-					<polyline color="#ffff00" width="34"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="17">
-					<polyline color="#a0a0a0" width="79"/>
-					<polyline color="#ffff00" width="73"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,roundabout" order="18">
-					<polyline color="#a0a0a0" width="156"/>
-					<polyline color="#ffff00" width="150"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="2-6">
-					<polyline color="#404040" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="7-8">
-					<polyline color="#404040" width="3"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="9">
-					<polyline color="#000000" width="5"/>
-					<polyline color="#ff0000" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="10">
-					<polyline color="#000000" width="6"/>
-					<polyline color="#ff0000" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11">
-					<polyline color="#000000" width="9"/>
-					<polyline color="#ff0000" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="12">
-					<polyline color="#000000" width="13"/>
-					<polyline color="#ff0000" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="13">
-					<polyline color="#000000" width="18"/>
-					<polyline color="#ff0000" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="14">
-					<polyline color="#000000" width="21"/>
-					<polyline color="#ff0000" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="15">
-					<polyline color="#000000" width="24"/>
-					<polyline color="#ff0000" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="16">
-					<polyline color="#000000" width="39"/>
-					<polyline color="#ff0000" width="33"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="17">
-					<polyline color="#000000" width="78"/>
-					<polyline color="#ff0000" width="72"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="18">
-					<polyline color="#000000" width="156"/>
-					<polyline color="#ff0000" width="150"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="2">
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="3-5">
-					<polyline color="#ff0000" width="3"/>
-					<polyline color="#ffff00" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="6">
-					<polyline color="#ff0000" width="4"/>
-					<polyline color="#ffff00" width="2"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="7-8">
-					<polyline color="#ff0000" width="7"/>
-					<polyline color="#ffff00" width="5"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="9-10">
-					<polyline color="#ff0000" width="9"/>
-					<polyline color="#ffff00" width="5"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="11">
-					<polyline color="#ff0000" width="13"/>
-					<polyline color="#ffff00" width="9"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="12">
-					<polyline color="#ff0000" width="15"/>
-					<polyline color="#ffff00" width="10"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="13">
-					<polyline color="#ff0000" width="25"/>
-					<polyline color="#ffff00" width="17"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="14">
-					<polyline color="#ff0000" width="31"/>
-					<polyline color="#ffff00" width="24"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="15">
-					<polyline color="#ff0000" width="33"/>
-					<polyline color="#ffff00" width="27"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="16">
-					<polyline color="#ff0000" width="65"/>
-					<polyline color="#ffff00" width="59"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="17">
-					<polyline color="#ff0000" width="133"/>
-					<polyline color="#ffff00" width="127"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="18">
-					<polyline color="#ff0000" width="264"/>
-					<polyline color="#ffff00" width="258"/>
-					<polyline color="#ff0000" width="1"/>
-				</itemgra>
-			</layer>
-			<layer name="Aerialways">
-				<itemgra item_types="aeroway_taxiway" order="10">
-					<polyline color="#989994" width="4"/>
-					<polyline color="#d3dbbc" width="2"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="11">
-					<polyline color="#989994" width="6"/>
-					<polyline color="#d3dbbc" width="4"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="12">
-					<polyline color="#989994" width="10"/>
-					<polyline color="#d3dbbc" width="8"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="13">
-					<polyline color="#989994" width="12"/>
-					<polyline color="#d3dbbc" width="9"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="14">
-					<polyline color="#989994" width="15"/>
-					<polyline color="#d3dbbc" width="13"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="15">
-					<polyline color="#989994" width="17"/>
-					<polyline color="#d3dbbc" width="14"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="16">
-					<polyline color="#989994" width="33"/>
-					<polyline color="#d3dbbc" width="26"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="17">
-					<polyline color="#989994" width="69"/>
-					<polyline color="#d3dbbc" width="61"/>
-				</itemgra>
-				<itemgra item_types="aeroway_taxiway" order="18">
-					<polyline color="#989994" width="132"/>
-					<polyline color="#d3dbbc" width="126"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="2-6">
-					<polyline color="#404040" width="1"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="7-8">
-					<polyline color="#404040" width="3"/>
-					<polyline color="#d3dbbc" width="1"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="9">
-					<polyline color="#6b6f5f" width="5"/>
-					<polyline color="#d3dbbc" width="3"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="10">
-					<polyline color="#6b6f5f" width="6"/>
-					<polyline color="#d3dbbc" width="4"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="11">
-					<polyline color="#6b6f5f" width="9"/>
-					<polyline color="#d3dbbc" width="7"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="12">
-					<polyline color="#6b6f5f" width="13"/>
-					<polyline color="#d3dbbc" width="9"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="13">
-					<polyline color="#6b6f5f" width="18"/>
-					<polyline color="#d3dbbc" width="14"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="14">
-					<polyline color="#6b6f5f" width="21"/>
-					<polyline color="#d3dbbc" width="17"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="15">
-					<polyline color="#6b6f5f" width="24"/>
-					<polyline color="#d3dbbc" width="20"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="16">
-					<polyline color="#6b6f5f" width="39"/>
-					<polyline color="#d3dbbc" width="33"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="17">
-					<polyline color="#6b6f5f" width="78"/>
-					<polyline color="#d3dbbc" width="72"/>
-				</itemgra>
-				<itemgra item_types="aeroway_runway" order="18">
-					<polyline color="#6b6f5f" width="156"/>
-					<polyline color="#d3dbbc" width="150"/>
-				</itemgra>
-			</layer>
-			<layer name="Railways">
-				<itemgra item_types="rail" order="6-9">
-					<polyline color="#696969" width="4"/>
-					<polyline color="#FFFFFF" dash="2,5" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail_narrow_gauge" order="6-9">
-					<polyline color="#696969" width="4"/>
-					<polyline color="#FFFFFF" dash="2,5" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail" order="10-13">
-					<polyline color="#696969" width="6"/>
-					<polyline color="#FFFFFF" dash="3,8" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail_narrow_gauge" order="10-13">
-					<polyline color="#696969" width="6"/>
-					<polyline color="#FFFFFF" dash="3,8" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail" order="14-18">
-					<polyline color="#696969" width="8"/>
-					<polyline color="#FFFFFF" dash="4,12" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail_narrow_gauge" order="14-18">
-					<polyline color="#696969" width="8"/>
-					<polyline color="#FFFFFF" dash="4,12" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail_light" order="10-13">
-					<polyline color="#696969" width="4"/>
-					<polyline color="#FFFFFF" dash="2,5" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail_light" order="14-18">
-					<polyline color="#696969" width="6"/>
-					<polyline color="#FFFFFF" dash="4,8" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail_subway" order="8-">
-					<polyline color="#696969" width="2"/>
-					<polyline color="#FFFFFF" dash="5,5" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail_mono" order="10-">
-					<polyline color="#696969" width="2"/>
-				</itemgra>
-				<itemgra item_types="rail_tram,bus_guideway" order="10-">
-					<polyline color="#696969" width="2"/>
-				</itemgra>
-				<itemgra item_types="rail_preserved" order="10-">
-					<polyline color="#696969" width="1" dash="7"/>
-				</itemgra>
-				<itemgra item_types="rail_disused" order="12-">
-					<polyline color="#d3d3d3" width="1" dash="10"/>
-				</itemgra>
-				<itemgra item_types="rail_abandoned" order="12-">
-					<polyline color="#f5f5f5" width="1" dash="10"/>
-				</itemgra>
-				<itemgra item_types="lift_cable_car" order="10-">
-					<polyline color="#778899" width="5"/>
-					<polyline color="#ffefb7" dash="1,40" width="1"/>
-				</itemgra>
-				<itemgra item_types="lift_chair" order="10-">
-					<polyline color="#778899" width="5"/>
-					<polyline color="#ffefb7" dash="1,40" width="1"/>
-				</itemgra>
-				<itemgra item_types="lift_drag" order="10-">
-					<polyline color="#778899" width="5"/>
-					<polyline color="#ffefb7" dash="1,40" width="1"/>
-				</itemgra>
-				<itemgra item_types="ferry" order="5-">
-					<polyline color="#000000" width="3"/>
-					<polyline color="#ffefb7"  width="1" dash="5"/>
-				</itemgra>
-				<itemgra item_types="track" order="3-">
-					<polyline color="#3f3f3f" width="1"/>
-				</itemgra>
-			</layer>
-			<layer name="Internal">
-				<itemgra item_types="track" order="7-">
-					<polyline color="#3f3f3f" width="1"/>
-				</itemgra>
-				<itemgra item_types="track_tracked" order="7-">
-					<polyline color="#3f3fff" width="3"/>
-				</itemgra>
-				<itemgra item_types="rg_segment" order="12-">
-					<polyline color="#FF089C" width="1"/>
-					<arrows color="#FF089C" width="1"/>
-				</itemgra>
-				<itemgra item_types="rg_point" order="12-">
-					<circle color="#FF089C" radius="10" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="nav_left_1" order="0-">
-					<icon src="nav_left_1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_left_2" order="0-">
-					<icon src="nav_left_2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_left_3" order="0-">
-					<icon src="nav_left_3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_1" order="0-">
-					<icon src="nav_right_1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_2" order="0-">
-					<icon src="nav_right_2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_right_3" order="0-">
-					<icon src="nav_right_3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_straight" order="0-">
-					<icon src="nav_straight_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_turnaround_left" order="0-">
-					<icon src="nav_turnaround_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_turnaround_right" order="0-">
-					<icon src="nav_turnaround_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l1" order="0-">
-					<icon src="nav_roundabout_l1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r1" order="0-">
-					<icon src="nav_roundabout_r1_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l2" order="0-">
-					<icon src="nav_roundabout_l2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r2" order="0-">
-					<icon src="nav_roundabout_r2_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l3" order="0-">
-					<icon src="nav_roundabout_l3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r3" order="0-">
-					<icon src="nav_roundabout_r3_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l4" order="0-">
-					<icon src="nav_roundabout_l4_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r4" order="0-">
-					<icon src="nav_roundabout_r4_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l5" order="0-">
-					<icon src="nav_roundabout_l5_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r5" order="0-">
-					<icon src="nav_roundabout_r5_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l6" order="0-">
-					<icon src="nav_roundabout_l6_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r6" order="0-">
-					<icon src="nav_roundabout_r6_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l7" order="0-">
-					<icon src="nav_roundabout_l7_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r7" order="0-">
-					<icon src="nav_roundabout_r7_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_l8" order="0-">
-					<icon src="nav_roundabout_l8_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_roundabout_r8" order="0-">
-					<icon src="nav_roundabout_r8_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_keep_left" order="0-">
-					<icon src="nav_keep_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_merge_left" order="0-">
-					<icon src="nav_merge_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_keep_right" order="0-">
-					<icon src="nav_keep_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_merge_right" order="0-">
-					<icon src="nav_merge_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_exit_left" order="0-">
-					<icon src="nav_exit_left_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="nav_exit_right" order="0-">
-					<icon src="nav_exit_right_bk.svg" w="32" h="32"/>
-				</itemgra>
-				<itemgra item_types="route_end" order="0-">
-					<icon src="nav_destination_bk.svg" w="32" h="32" x="4" y="30"/>
-				</itemgra>
-				
-				<itemgra item_types="waypoint,route_end" order="2">
-					<circle color="#000000" radius="4" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="3-5">
-					<circle color="#000000" radius="8" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="6">
-					<circle color="#000000" radius="10" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="7-8">
-					<circle color="#000000" radius="16" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="9-10">
-					<circle color="#000000" radius="20" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="11">
-					<circle color="#000000" radius="28" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="12">
-					<circle color="#000000" radius="32" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="13">
-					<circle color="#000000" radius="52" width="4" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="14">
-					<circle color="#000000" radius="64" width="4" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="15">
-					<circle color="#000000" radius="68" width="6" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="16">
-					<circle color="#000000" radius="132" width="8" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="17">
-					<circle color="#000000" radius="268" width="8" text_size="48"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="18">
-					<circle color="#000000" radius="530" width="8" text_size="48"/>
-				</itemgra>
-				
-				<itemgra item_types="nav_none" order="0-">
-					<icon src="unknown.svg"/>
-				</itemgra>
-				<itemgra item_types="announcement" order="7-">
-					<icon src="gui_sound_32_32.svg"/>
-					<circle color="#FF089C" radius="10" text_size="7"/>
-				</itemgra>
-			</layer>			
-			<layer name="Street Labels">
-				<itemgra item_types="highway_exit_label" order="10-">
-					<circle color="#000000" radius="3" text_size="12"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street" order="10-18">
-					<text text_size="8"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="street_nopass,street_0,street_1_city,street_1_land" order="12-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="track,track_paved,track_gravelled,track_unpaved,track_ground,track_grass" order="12-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="bridleway,cycleway,footway,steps,path" order="12-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="hiking,hiking_mountain,hiking_mountain_demanding,hiking_alpine,hiking_alpine_demanding,hiking_alpine_difficult" order="12-18">
-					<text text_size="9"/>
-				</itemgra>
-			</layer>
-			<layer name="Unknown Elements">
-				<!-- This entry shows all unknown linear elements as blue lines -->
-				<!--
-				<itemgra item_types="street_unkn" order="0-">
-					<polyline color="#8080ff" width="3"/> 
-				</itemgra>
-				-->
-			</layer>
-			<layer name="Place Labels">
-				<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="12-">
-					<circle color="#000000" radius="3" text_size="12"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="9-">
-					<circle color="#000000" radius="3" text_size="12"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e3,town_label_2e3,town_label_5e3,place_label" order="9-">
-					<circle color="#000000" radius="3" text_size="12"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4" order="7-">
-					<circle color="#000000" radius="3" text_size="12"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e4,town_label_2e4,town_label_5e4" order="7-">
-					<circle color="#000000" radius="3" text_size="12"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="5-">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="5-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6" order="3-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6" order="3-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e7,district_label_1e7" order="1-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-			</layer>
-
-			<xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Symbols'])"/>
-			<!--<xi:include xpointer="xpointer(/config/navit/layout[@name='Car']/layer[@name='POI Labels'])"/> -->
-
-			<!-- "Bicycle POIs" -->
-			<layer name="Bicycle POI Symbols">
-				<itemgra item_types="poi_bicycle_parking" order="12-">
-					<icon src="bicycle_parking.svg"/>
-				</itemgra>
-				<itemgra item_types="poi_bicycle_rental" order="11-">
-					<icon src="bicycle_rental.svg"/>
-				</itemgra>
-			</layer>
-			<layer name="Bicycle POI Labels">
-				<itemgra item_types="poi_bicycle_parking,poi_bicycle_rental" order="14-">
-					<circle color="#606060" radius="0" width="0" text_size="10"/>
-				</itemgra>
-			</layer>					
-			<layer name="Found items" ref="Found items"/>
-		</layout>
-
-		<layout name="T@H" font="Liberation Sans">
-
-			<cursor w="26" h="26">
-				<itemgra>
-					<circle color="#0000ff" radius="24" width="2">
-						<coord x="0" y="0"/>
-					</circle>
-				</itemgra>
-				<itemgra speed_range="-2">
-					<polyline color="#0000ff" width="2">
-						<coord x="0" y="0"/>
-						<coord x="0" y="0"/>
-					</polyline>
-				</itemgra>
-				<itemgra speed_range="3-">
-					<polyline color="#0000ff" width="2">
-						<coord x="-7" y="-10"/>
-						<coord x="0" y="12"/>
-						<coord x="7" y="-10"/>
-					</polyline>
-				</itemgra>
-			</cursor>
-
-			<layer name="sea" details="0">
-				<!-- landuse=forest -->
-				<itemgra item_types="poly_wood" order="0-">
-					<polygon color="#72bf81"/>
-				</itemgra>
-				<itemgra item_types="poly_flats,poly_scrub,poly_military_zone,poly_marine,plantation,tundra" order="0-"> 
-					<polygon color="#a0a0a0"/> 
-					<text text_size="5"/> 
-				</itemgra> 
-				<!-- landuse=residential -->
-				<itemgra item_types="poly_town" order="0-">
-					<polygon color="#f2f2f2"/>
-				</itemgra>
-				<!-- natural=water -->
-				<itemgra item_types="poly_water" order="0-">
-					<polygon color="#b5d6f1"/>
-					<polyline color="#b5d6f1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<!-- leisure=park -->
-				<itemgra item_types="poly_park" order="0-">
-					<polygon color="#c7f1a3"/>
-					<polyline color="#79c691"/>
-					<text text_size="5"/>
-				</itemgra>
-				<itemgra item_types="poly_airport" order="0-">
-					<polygon color="#a0a0a0"/>
-				</itemgra>
-				<itemgra item_types="poly_sport" order="0-">
-					<polygon color="#4af04f"/>
-				</itemgra>
-				<!-- landuse=industrial -->
-				<itemgra item_types="poly_industry,poly_building,poly_place" order="0-">
-					<polygon color="#ecd8ff"/>
-				</itemgra>
-				<!-- waterway=stream -->
-				<itemgra item_types="water_line" order="0-4">
-					<polyline color="#b5d6f1" width="1"/>
-					<text text_size="8"/>
-				</itemgra>
-				<!-- railway=subway -->
-				<itemgra item_types="rail" order="6">
-					<polyline color="#aaaaaa" width="1"/>
-				</itemgra>
-				<itemgra item_types="rail" order="7-8">
-					<polyline color="#aaaaaa" width="2"/>
-				</itemgra>
-				<itemgra item_types="rail" order="9-">
-					<polyline color="#aaaaaa" width="6"/>
-				</itemgra>
-				<itemgra item_types="ferry" order="5-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="border_country" order="0-">
-					<polyline color="#b8434e" width="1"/>
-				</itemgra>
-				<itemgra item_types="border_state" order="0-">
-					<polyline color="#808080" width="1"/>
-				</itemgra>
-				<itemgra item_types="height_line_1" order="0-">
-					<polyline color="#000000" width="1"/>
-				</itemgra>
-				<itemgra item_types="height_line_2" order="0-">
-					<polyline color="#000000" width="2"/>
-				</itemgra>
-				<!-- routing -->
-				<itemgra item_types="street_route" order="2">
-					<polyline color="#0000a0" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="3-5">
-					<polyline color="#0000a0" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="6">
-					<polyline color="#0000a0" width="10"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="7-8">
-					<polyline color="#0000a0" width="16"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="9-10">
-					<polyline color="#0000a0" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="11">
-					<polyline color="#0000a0" width="28"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="12">
-					<polyline color="#0000a0" width="32"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="13">
-					<polyline color="#0000a0" width="52"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="14">
-					<polyline color="#0000a0" width="64"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="15">
-					<polyline color="#0000a0" width="68"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="16">
-					<polyline color="#0000a0" width="132"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="17">
-					<polyline color="#0000a0" width="268"/>
-				</itemgra>
-				<itemgra item_types="street_route" order="18">
-					<polyline color="#0000a0" width="530"/>
-				</itemgra>
-				<!-- highway=service,footway, ,... -->
-				<itemgra item_types="street_pedestrian,living_street" order="10">
-					<polyline color="#d2d2d2" width="3"/>
-					<polyline color="#dddddd" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="11">
-					<polyline color="#d2d2d2" width="5"/>
-					<polyline color="#dddddd" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="12">
-					<polyline color="#d2d2d2" width="8"/>
-					<polyline color="#dddddd" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="13">
-					<polyline color="#d2d2d2" width="9"/>
-					<polyline color="#dddddd" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="14">
-					<polyline color="#d2d2d2" width="13"/>
-					<polyline color="#dddddd" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="15">
-					<polyline color="#d2d2d2" width="18"/>
-					<polyline color="#dddddd" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="16">
-					<polyline color="#d2d2d2" width="21"/>
-					<polyline color="#dddddd" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="17">
-					<polyline color="#d2d2d2" width="25"/>
-					<polyline color="#dddddd" width="21"/>
-				</itemgra>
-				<itemgra item_types="street_pedestrian,living_street" order="18">
-					<polyline color="#d2d2d2" width="40"/>
-					<polyline color="#dddddd" width="34"/>
-				</itemgra>
-				<itemgra item_types="street_nopass" order="10">
-					<polyline color="#efeaa0" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_nopass" order="11-12">
-					<polyline color="#efeaa0" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_nopass" order="13-">
-					<polyline color="#efeaa0" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="10">
-					<polyline color="#d2d2d2" width="4"/>
-					<polyline color="#ffffff" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="11">
-					<polyline color="#d2d2d2" width="6"/>
-					<polyline color="#ffffff" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="12">
-					<polyline color="#d2d2d2" width="10"/>
-					<polyline color="#ffffff" width="8"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="13">
-					<polyline color="#d2d2d2" width="12"/>
-					<polyline color="#ffffff" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="14">
-					<polyline color="#d2d2d2" width="15"/>
-					<polyline color="#ffffff" width="13"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="15">
-					<polyline color="#d2d2d2" width="17"/>
-					<polyline color="#ffffff" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="16">
-					<polyline color="#d2d2d2" width="33"/>
-					<polyline color="#ffffff" width="26"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="17">
-					<polyline color="#d2d2d2" width="69"/>
-					<polyline color="#ffffff" width="61"/>
-				</itemgra>
-				<itemgra item_types="street_0,street_1_city,street_1_land" order="18">
-					<polyline color="#d2d2d2" width="132"/>
-					<polyline color="#ffffff" width="126"/>
-				</itemgra>
-				<!-- highway=tertiary -->
-				<itemgra item_types="street_2_city,street_2_land" order="7-8">
-					<polyline color="#c4c4c4" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="9">
-					<polyline color="#c4c4c4" width="4"/>
-					<polyline color="#f7f496" width="2"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="10">
-					<polyline color="#c4c4c4" width="6"/>
-					<polyline color="#f7f496" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="11">
-					<polyline color="#c4c4c4" width="8"/>
-					<polyline color="#f7f496" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="12">
-					<polyline color="#c4c4c4" width="12"/>
-					<polyline color="#f7f496" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="13">
-					<polyline color="#c4c4c4" width="15"/>
-					<polyline color="#f7f496" width="11"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="14">
-					<polyline color="#c4c4c4" width="18"/>
-					<polyline color="#f7f496" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="15">
-					<polyline color="#c4c4c4" width="21"/>
-					<polyline color="#f7f496" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="16">
-					<polyline color="#c4c4c4" width="35"/>
-					<polyline color="#f7f496" width="30"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="17">
-					<polyline color="#c4c4c4" width="73"/>
-					<polyline color="#f7f496" width="67"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land" order="18">
-					<polyline color="#c4c4c4" width="144"/>
-					<polyline color="#f7f496" width="138"/>
-				</itemgra>
-				<!-- highway=secondary -->
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="7">
-					<polyline color="#fdbf6f" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="8">
-					<polyline color="#000000" width="2"/>
-					<polyline color="#fdbf6f" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="9">
-					<polyline color="#000000" width="5"/>
-					<polyline color="#fdbf6f" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="10">
-					<polyline color="#000000" width="8"/>
-					<polyline color="#fdbf6f" width="6"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="11">
-					<polyline color="#000000" width="9"/>
-					<polyline color="#fdbf6f" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="12">
-					<polyline color="#000000" width="11"/>
-					<polyline color="#fdbf6f" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="13">
-					<polyline color="#000000" width="16"/>
-					<polyline color="#fdbf6f" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="14">
-					<polyline color="#000000" width="19"/>
-					<polyline color="#fdbf6f" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="15">
-					<polyline color="#000000" width="23"/>
-					<polyline color="#fdbf6f" width="21"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="16">
-					<polyline color="#000000" width="36"/>
-					<polyline color="#fdbf6f" width="34"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="17">
-					<polyline color="#000000" width="75"/>
-					<polyline color="#fdbf6f" width="73"/>
-				</itemgra>
-				<itemgra item_types="street_3_city,street_3_land,ramp" order="18">
-					<polyline color="#000000" width="152"/>
-					<polyline color="#fdbf6f" width="150"/>
-				</itemgra>
-				<!-- highway=primary -->
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="2-6">
-					<polyline color="#e46d71" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="7-8">
-					<polyline color="#e46d71" width="3"/>
-					<polyline color="#e46d71" width="1"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="9">
-					<polyline color="#e46d71" width="5"/>
-					<polyline color="#e46d71" width="3"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="10">
-					<polyline color="#e46d71" width="6"/>
-					<polyline color="#e46d71" width="4"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="11">
-					<polyline color="#e46d71" width="9"/>
-					<polyline color="#e46d71" width="7"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="12">
-					<polyline color="#e46d71" width="13"/>
-					<polyline color="#e46d71" width="9"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="13">
-					<polyline color="#e46d71" width="18"/>
-					<polyline color="#e46d71" width="14"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="14">
-					<polyline color="#e46d71" width="21"/>
-					<polyline color="#e46d71" width="17"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="15">
-					<polyline color="#e46d71" width="24"/>
-					<polyline color="#e46d71" width="20"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="16">
-					<polyline color="#e46d71" width="39"/>
-					<polyline color="#e46d71" width="33"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="17">
-					<polyline color="#e46d71" width="78"/>
-					<polyline color="#e46d71" width="72"/>
-				</itemgra>
-				<itemgra item_types="street_4_city,street_4_land,street_n_lanes" order="18">
-					<polyline color="#e46d71" width="156"/>
-					<polyline color="#e46d71" width="150"/>
-				</itemgra>
-				<!-- highway=motorway -->
-				<itemgra item_types="highway_city,highway_land" order="2">
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="3-5">
-					<polyline color="#87908a" width="3"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="6">
-					<polyline color="#87908a" width="4"/>
-					<polyline color="#809bc0" width="2"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="7-8">
-					<polyline color="#87908a" width="7"/>
-					<polyline color="#809bc0" width="5"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="9-10">
-					<polyline color="#87908a" width="9"/>
-					<polyline color="#809bc0" width="5"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="11">
-					<polyline color="#87908a" width="13"/>
-					<polyline color="#809bc0" width="9"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="12">
-					<polyline color="#87908a" width="15"/>
-					<polyline color="#809bc0" width="10"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="13">
-					<polyline color="#87908a" width="25"/>
-					<polyline color="#809bc0" width="17"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="14">
-					<polyline color="#87908a" width="31"/>
-					<polyline color="#809bc0" width="24"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="15">
-					<polyline color="#87908a" width="33"/>
-					<polyline color="#809bc0" width="27"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="16">
-					<polyline color="#87908a" width="65"/>
-					<polyline color="#809bc0" width="59"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="17">
-					<polyline color="#87908a" width="133"/>
-					<polyline color="#809bc0" width="127"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_city,highway_land" order="18">
-					<polyline color="#87908a" width="264"/>
-					<polyline color="#809bc0" width="258"/>
-					<polyline color="#809bc0" width="1"/>
-				</itemgra>
-				<itemgra item_types="highway_exit_label" order="10-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<!-- highway=primary (font)-->
-				<itemgra item_types="highway_city,highway_land,street_4_city,street_4_land,street_n_lanes,living_street" order="10-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="street_2_city,street_2_land,street_3_city,street_3_land,ramp" order="11-18">
-					<text text_size="9"/>
-				</itemgra>
-				<itemgra item_types="street_nopass,street_0,street_1_city,street_1_land,footway" order="12-18">
-					<text text_size="9"/>
-				</itemgra>
-				<!-- place=suburb -->
-				<itemgra item_types="town_label,district_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2" order="9-">
-					<circle color="#000000" radius="3" text_size="9"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e3,district_label_2e3,district_label_5e3" order="11-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e3,town_label_2e3,town_label_5e3,place_label" order="10-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e4,district_label_2e4,district_label_5e4" order="9-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e4,town_label_2e4,town_label_5e4" order="8-">
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e5,district_label_2e5,district_label_5e5" order="6-">
-					<circle color="#000000" radius="3" text_size="10"/>
-				</itemgra>
-				<!-- place=city -->
-				<itemgra item_types="town_label_1e5,town_label_2e5,town_label_5e5" order="4-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="district_label_1e6,district_label_2e6,district_label_5e6" order="3-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e6,town_label_2e6,town_label_5e6" order="2-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="town_label_1e7,district_label_1e7" order="1-">
-					<circle color="#000000" radius="3" text_size="15"/>
-				</itemgra>
-				<itemgra item_types="rg_point" order="0-">
-					<circle color="#FF089C" radius="10"/>
-				</itemgra>
-				
-				<itemgra item_types="waypoint,route_end" order="2">
-					<circle color="#008080" radius="4" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="3-5">
-					<circle color="#008080" radius="8" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="6">
-					<circle color="#008080" radius="10" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="7-8">
-					<circle color="#008080" radius="16" width="2" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="9-10">
-					<circle color="#008080" radius="20" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="11">
-					<circle color="#008080" radius="28" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="12">
-					<circle color="#008080" radius="32" width="4" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="13">
-					<circle color="#008080" radius="52" width="4" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="14">
-					<circle color="#008080" radius="64" width="4" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="15">
-					<circle color="#008080" radius="68" width="6" text_size="24"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="16">
-					<circle color="#008080" radius="132" width="8" text_size="32"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="17">
-					<circle color="#008080" radius="268" width="8" text_size="48"/>
-				</itemgra>
-				<itemgra item_types="waypoint,route_end" order="18">
-					<circle color="#008080" radius="530" width="8" text_size="48"/>
-				</itemgra>
-				
-				<!-- !!!!...POIs...!!!! -->
-				<!-- amenity=bank -->
-				<itemgra item_types="poi_bank" order="14-">
-					<icon src="bank.svg"/>
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<itemgra item_types="poi_atm" order="12-">
-					<icon src="atm.svg"/>
-				</itemgra>
-				<!-- amenity=fuel -->
-				<itemgra item_types="poi_fuel" order="14-">
-					<icon src="fuel.svg"/>
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<!-- amenity=hospitalg -->
-				<itemgra item_types="poi_hospital" order="14-">
-					<icon src="hospital.svg"/>
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<!-- amenity=parking -->
-				<itemgra item_types="poi_car_parking" order="14-">
-					<icon src="parking.svg"/>
-				</itemgra>
-				<!-- amenity=police -->
-				<itemgra item_types="poi_police" order="14-">
-					<icon src="police.svg"/>
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<!-- amenity=restaurant -->
-				<itemgra item_types="poi_restaurant" order="14-">
-					<icon src="restaurant.svg"/>
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<!-- leisure=golf_curse -->
-				<itemgra item_types="poi_golf" order="14-">
-					<icon src="golf.svg"/>
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-				<!-- tourism=hotel -->
-				<itemgra item_types="poi_hotel" order="14-">
-					<icon src="hotel.svg"/>
-					<circle color="#000000" radius="3" text_size="7"/>
-				</itemgra>
-			</layer>
-			<layer name="Found items" ref="Found items"/>
-		</layout>
-		<layout name="Route">
-			<layer name="streets">
-				<itemgra item_types="street_route_occluded" order="0-">
-					<polyline color="#0000a0" width="20"/>
-				</itemgra>
-			</layer>
-		</layout>
-	</navit>
-</config>
diff --git a/contrib/sjjb_import.pl b/contrib/sjjb_import.pl
index 538c205c4..9c5b61e1a 100644
--- a/contrib/sjjb_import.pl
+++ b/contrib/sjjb_import.pl
@@ -201,7 +201,7 @@ sub get_arg {
 }
 
 $sjjb_dir= get_arg(0, "Directory holding the extracted svg's from http://www.sjjb.co.uk/mapicons/downloads");
-$dest_dir= $ARGV[1] ? $ARGV[1] : dirname(__FILE__)."/../navit/xpm/";
+$dest_dir= $ARGV[1] ? $ARGV[1] : dirname(__FILE__)."/../navit/icons/";
 
 foreach $i (@icons) {
 	my ($path, $icon)= split('/', $i->[0]);
diff --git a/contrib/tomtom/SDKRegistry/navit.cap b/contrib/tomtom/SDKRegistry/navit.cap
new file mode 100644
index 000000000..d9bae49b7
--- /dev/null
+++ b/contrib/tomtom/SDKRegistry/navit.cap
@@ -0,0 +1,7 @@
+Version|100|
+AppName|navit-wrapper|
+AppPath|/mnt/sdcard/navit/bin/|
+AppIconFile|navit.bmp|
+AppMainTitle|Navit|
+AppPort|2001|
+COMMAND|CMD|hallo|navit.bmp|Navit|
diff --git a/contrib/tomtom/SDKRegistry/ts.cap b/contrib/tomtom/SDKRegistry/ts.cap
new file mode 100644
index 000000000..c10c831a4
--- /dev/null
+++ b/contrib/tomtom/SDKRegistry/ts.cap
@@ -0,0 +1,8 @@
+Version|100|
+AppName|ts-wrapper|
+AppPath|/mnt/sdcard/navit/ts/|
+AppIconFile||
+AppMainTitle|Touchscreen|
+AppPort||
+COMMAND|CMD|hallo||Touchscreen|
+
diff --git a/contrib/tomtom/navit-wrapper b/contrib/tomtom/navit-wrapper
new file mode 100755
index 000000000..f4eadb9e0
--- /dev/null
+++ b/contrib/tomtom/navit-wrapper
@@ -0,0 +1,59 @@
+#!/bin/sh
+
+cd /mnt/sdcard/navit/bin
+
+# Set some paths.
+export PATH=$PATH:/mnt/sdcard/navit/bin
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/mnt/sdcard/navit/lib:/mnt/sdcard/LoquendoTTS/lib
+export HOME=/mnt/sdcard/navit
+export NAVIT_LIBDIR=/mnt/sdcard/navit/lib/navit
+export NAVIT_SHAREDIR=/mnt/sdcard/navit/share
+export NAVIT_LOCALEDIR=/mnt/sdcard/navit/share/locale
+
+# tslib requirements.
+export TSLIB_CONSOLEDEVICE=none
+export TSLIB_FBDEVICE=/dev/fb
+export TSLIB_TSDEVICE=/dev/ts
+export TSLIB_CALIBFILE=/mnt/sdcard/navit/ts/pointercal
+export TSLIB_CONFFILE=/mnt/sdcard/navit/ts/ts.conf
+export TSLIB_PLUGINDIR=/mnt/sdcard/navit/lib/ts
+
+# SDL requirements.
+export SDL_MOUSEDRV=TSLIB
+export SDL_MOUSEDEV=$TSLIB_TSDEVICE
+export SDL_NOMOUSE=1
+export SDL_FBDEV=/dev/fb
+export SDL_VIDEODRIVER=fbcon
+export SDL_AUDIODRIVER=dsp
+
+# Set time zone.
+export TZ="CEDT-01:00:00CEST-02:00:00,M3.4.0,M10.4.0"
+
+# Set language.
+export LANG=en_US
+
+export ESPEAK_DATA_PATH=/mnt/sdcard/navit/share
+
+# Run Navit.
+if /mnt/sdcard/navit/sdl/testvidinfo | grep 480x272
+then
+        /mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/tomtom480.xml 2>/mnt/sdcard/navit/navit.log&
+# tomtom320xml is not provided yet
+# elif  /mnt/sdcard/navit/sdl/testvidinfo | grep 320x240
+# then
+#       /mnt/sdcard/navit/bin/navit /mnt/sdcard/navit/share/config/tomtom320.xml 2>/mnt/sdcard/navit/navit.log&
+else
+        exit 1
+fi
+
+# Kill TTN while Navit is running.
+killall ttn
+
+while [ $? -eq 0 ]
+do
+echo "\0" > /dev/watchdog
+sleep 10
+ps | grep -v grep | grep -v wrapper | grep navit
+done
+
+/sbin/reboot
diff --git a/contrib/tomtom/ts/ts-wrapper b/contrib/tomtom/ts/ts-wrapper
new file mode 100644
index 000000000..6f8f8e2d5
--- /dev/null
+++ b/contrib/tomtom/ts/ts-wrapper
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+cd /mnt/sdcard
+
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/mnt/sdcard/navit/lib
+
+export TSLIB_CONSOLEDEVICE=none
+export TSLIB_FBDEVICE=/dev/fb
+export TSLIB_TSDEVICE=/dev/ts
+export TSLIB_CALIBFILE=/mnt/sdcard/navit/ts/pointercal
+export TSLIB_CONFFILE=/mnt/sdcard/navit/ts/ts.conf
+export TSLIB_PLUGINDIR=/mnt/sdcard/navit/lib/ts
+
+/mnt/sdcard/navit/ts/ts_calibrate
+/mnt/sdcard/navit/ts/ts_test
diff --git a/intl/VERSION b/intl/VERSION
deleted file mode 100644
index b4b846ca7..000000000
--- a/intl/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-GNU gettext library from gettext-0.14.1
diff --git a/navit/CMakeLists.txt b/navit/CMakeLists.txt
index c9d56cd34..cac127531 100644
--- a/navit/CMakeLists.txt
+++ b/navit/CMakeLists.txt
@@ -76,8 +76,8 @@ if(NOT ANDROID)
    endif()
    if (BUILD_BUNDLE)
       list(APPEND NAVIT_START_SRC resources/share resources/Icon.png resources/Default.png)
-      add_custom_command(OUTPUT resources/Icon.png COMMAND convert -scale 79x79 -crop 60x60+8+19 ${CMAKE_CURRENT_SOURCE_DIR}/xpm/desktop_icons/128x128/navit.png resources/Icon.png)
-      add_custom_command(OUTPUT resources/Default.png COMMAND convert -scale 79x79 -crop 60x60+8+19 ${CMAKE_CURRENT_SOURCE_DIR}/xpm/desktop_icons/128x128/navit.png resources/Default.png)
+      add_custom_command(OUTPUT resources/Icon.png COMMAND convert -scale 79x79 -crop 60x60+8+19 ${CMAKE_CURRENT_SOURCE_DIR}/icons/desktop_icons/128x128/navit.png resources/Icon.png)
+      add_custom_command(OUTPUT resources/Default.png COMMAND convert -scale 79x79 -crop 60x60+8+19 ${CMAKE_CURRENT_SOURCE_DIR}/icons/desktop_icons/128x128/navit.png resources/Default.png)
    endif()
    add_executable(navit ${NAVIT_START_SRC})
    target_link_libraries (navit ${NAVIT_LIBNAME})
@@ -132,9 +132,14 @@ macro(process_xslt SRC_XML DEST_XML)
           list(APPEND XSLT_COMMANDS COMMAND ${CMAKE_COMMAND} -E rename ${DEST_XML}.tmp ${DEST_XML})
        endforeach()
    endif()
+   # Depend on all XSLT files, because the main XSLT file may pull in other files.
+   # Ideally we'd parse the main XSLT file for includes, but that is tricky to do reliably.
+   # Note that this list of files is only updated when (re)running CMake, so if files are
+   # added/deleted, CMake must be re-run manually.
+   file(GLOB ALL_XSLT_FILES "${PROJECT_SOURCE_DIR}/navit/xslt/*.xslt")
    ADD_CUSTOM_COMMAND(
       OUTPUT ${DEST_XML}
-      DEPENDS ${SRC_XML} ${XSLT_FILES}
+      DEPENDS ${SRC_XML} ${ALL_XSLT_FILES}
       ${XSLT_COMMANDS}
    )
 endmacro()
@@ -161,7 +166,7 @@ endif()
 
 
 add_subdirectory (maptool)
-add_subdirectory (xpm)
+add_subdirectory (icons)
 add_subdirectory (maps)
 if(ANDROID)
    add_subdirectory (android)
diff --git a/navit/android/Android_Market_Version_int.txt b/navit/android/Android_Market_Version_int.txt
deleted file mode 100644
index 7c9f73e61..000000000
--- a/navit/android/Android_Market_Version_int.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# DO NOT edit this file!!!
-#
-# Android Market: Int Version Number of Navit Release for the Android Market
-#
-# only "cp15" or "zoff" should edit this file!
-#
-#
-v_int:2
diff --git a/navit/android/CMakeLists.txt b/navit/android/CMakeLists.txt
index ca3bdbfa4..6a9b9c92f 100644
--- a/navit/android/CMakeLists.txt
+++ b/navit/android/CMakeLists.txt
@@ -55,7 +55,7 @@ if (ANDROID)
                      -D DST=${CMAKE_CURRENT_BINARY_DIR}/res/raw
                      -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
       COMMAND ${CMAKE_COMMAND}
-                     -D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/xpm/*.png"
+                     -D GLOB_EXP="${PROJECT_BINARY_DIR}/navit/icons/*.png"
                      -D DST=${CMAKE_CURRENT_BINARY_DIR}/res/drawable-nodpi
                      -D LOWER=1
                      -P ${PROJECT_SOURCE_DIR}/cmake/copy_files.cmake
diff --git a/navit/android/dummy.txt b/navit/android/dummy.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/navit/android/dummy.txt
+++ /dev/null
diff --git a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
index 0d3ba1c61..eb9cd6a4e 100644
--- a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
+++ b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
@@ -92,210 +92,211 @@ public class NavitMapDownloader extends Thread
 	

 	//

 	// define the maps here

+	// size estimations updated 2017-06-22

 	//

 	public static final osm_map_values[] osm_maps = {

-		new osm_map_values(Navit._("Whole Planet"), "-180", "-90", "180", "90", 17142215673L, 0),

-		new osm_map_values(Navit._("Africa"), "-30.89", "-36.17", "61.68", "38.40", 978759015L, 0),

-		new osm_map_values(Navit._("Angola"), "11.4", "-18.1", "24.2", "-5.3", 91248521L, 1),

-		new osm_map_values(Navit._("Burundi"), "28.9", "-4.5", "30.9", "-2.2", 90190335L, 1),

-		new osm_map_values(Navit._("Canary Islands"), "-18.69", "26.52", "-12.79", "29.99", 98499593L, 1),

-		new osm_map_values(Navit._("Congo, Democratic Republic of the"), "11.7", "-13.6", "31.5", "5.7", 142546118L, 1),

-		new osm_map_values(Navit._("Ethiopia"), "32.89", "3.33", "48.07", "14.97", 104750098L, 1),

-		new osm_map_values(Navit._("Guinea"), "-15.47", "7.12", "-7.58", "12.74", 142811547L, 1),

-		new osm_map_values(Navit._("Cote d'Ivoire"), "-8.72", "4.09", "-2.43", "10.80", 96781332L, 1),

-		new osm_map_values(Navit._("Kenya"), "33.8", "-5.2", "42.4", "4.9", 99336192L, 1),

-		new osm_map_values(Navit._("Lesotho"), "26.9", "-30.7", "29.6", "-28.4", 100726025L, 1),

-		new osm_map_values(Navit._("Liberia"), "-15.00", "-0.73", "-7.20", "8.65", 124911153L, 1),

-		new osm_map_values(Navit._("Libya"), "9.32", "19.40", "25.54", "33.63", 92073435L, 1),

-		new osm_map_values(Navit._("Madagascar"), "42.25", "-26.63", "51.20", "-11.31", 106061047L, 1),

-		new osm_map_values(Navit._("Namibia")+"+"+Navit._("Botswana"), "11.4", "-29.1", "29.5", "-16.9", 114970822L, 1),

-		new osm_map_values(Navit._("Reunion"), "55.2", "-21.4", "55.9", "-20.9", 98431755L, 1),

-		new osm_map_values(Navit._("Rwanda"), "28.8", "-2.9", "30.9", "-1.0", 94150938L, 1),

-		new osm_map_values(Navit._("South Africa")+"+"+Navit._("Lesotho"), "15.93", "-36.36", "33.65", "-22.08", 156152979L, 1),

-		new osm_map_values(Navit._("Tanzania, United Republic of"), "29.19", "-11.87", "40.74", "-0.88", 106768648L, 1),

-		new osm_map_values(Navit._("Uganda"), "29.3", "-1.6", "35.1", "4.3", 100022833L, 1),

-		new osm_map_values(Navit._("Asia"), "23.8", "0.1", "195.0", "82.4", 3253177355L, 0),

-		new osm_map_values(Navit._("Azerbaijan"), "44.74", "38.34", "51.69", "42.37", 102293296L, 1),

-		new osm_map_values(Navit._("China"), "67.3", "5.3", "135.0", "54.5", 903999878L, 1),

-		new osm_map_values(Navit._("Cyprus"), "32.0", "34.5", "34.9", "35.8", 90703681L, 1),

-		new osm_map_values(Navit._("India")+"+"+Navit._("Nepal"), "67.9", "5.5", "89.6", "36.0", 256058660L, 1),

-		new osm_map_values(Navit._("Indonesia"), "93.7", "-17.3", "155.5", "7.6", 228766382L, 1),

-		new osm_map_values(Navit._("Iran, Islamic Republic of"), "43.5", "24.4", "63.6", "40.4", 154094880L, 1),

-		new osm_map_values(Navit._("Iraq"), "38.7", "28.5", "49.2", "37.4", 107058534L, 1),

-		new osm_map_values(Navit._("Israel"), "33.99", "29.8", "35.95", "33.4", 119569846L, 1),

-		new osm_map_values(Navit._("Japan")+"+"+Navit._("Korea")+"+"+Navit._("Taiwan"), "117.6", "20.5", "151.3", "47.1", 766362093L, 1),

-		new osm_map_values(Navit._("Kazakhstan"), "46.44", "40.89", "87.36", "55.45", 280438037L, 1),

-		new osm_map_values(Navit._("Kyrgyzstan"), "69.23", "39.13", "80.33", "43.29", 110465464L, 1),

-		new osm_map_values(Navit._("Malaysia")+"+"+Navit._("Singapore"), "94.3", "-5.9", "108.6", "6.8", 119187612L, 1),

-		new osm_map_values(Navit._("Mongolia"), "87.5", "41.4", "120.3", "52.7", 107398401L, 1),

-		new osm_map_values(Navit._("Pakistan"), "60.83", "23.28", "77.89", "37.15", 136107911L, 1),

-		new osm_map_values(Navit._("Philippines"), "115.58", "4.47", "127.85", "21.60", 166151582L, 1),

-		new osm_map_values(Navit._("Saudi Arabia"), "33.2", "16.1", "55.9", "33.5", 170037602L, 1),

-		new osm_map_values(Navit._("Thailand"), "97.5", "5.7", "105.2", "19.7", 134166813L, 1),

-		new osm_map_values(Navit._("Turkey"), "25.1", "35.8", "46.4", "42.8", 232347346L, 1),

-		new osm_map_values(Navit._("Turkmenistan"), "51.78", "35.07", "66.76", "42.91", 95588384L, 1),

-		new osm_map_values(Navit._("UAE+Other"), "51.5", "22.6", "56.7", "26.5", 95709627L, 1),

-		new osm_map_values(Navit._("Australia")+"+"+Navit._("Oceania"), "89.84", "-57.39", "179.79", "7.26", 482408675L, 0),

-		new osm_map_values(Navit._("Australia"), "110.5", "-44.2", "154.9", "-9.2", 244410808L, 0),

-		new osm_map_values(Navit._("Tasmania"), "144.0", "-45.1", "155.3", "-24.8", 176390644L, 1),

-		new osm_map_values(Navit._("Victoria")+"+"+Navit._("New South Wales"), "140.7", "-39.4", "153.7", "-26.9", 166905296L, 1),

-		new osm_map_values(Navit._("New Caledonia"), "157.85", "-25.05", "174.15", "-16.85", 88175405L, 1),

-		new osm_map_values(Navit._("New Zealand"), "165.2", "-47.6", "179.1", "-33.7", 180469055L, 1),

-		new osm_map_values(Navit._("Europe"), "-12.97", "33.59", "34.15", "72.10", 9046728786L, 0),

-		new osm_map_values(Navit._("Western Europe"), "-17.6", "34.5", "42.9", "70.9", 9512395121L, 1),

-		new osm_map_values(Navit._("Austria"), "9.4", "46.32", "17.21", "49.1", 662454467L, 1),

-		new osm_map_values(Navit._("Azores"), "-31.62", "36.63", "-24.67", "40.13", 84310373L, 1),

-		new osm_map_values(Navit._("BeNeLux"), "2.08", "48.87", "7.78", "54.52", 1520394547L, 1),

-		new osm_map_values(Navit._("Netherlands"), "3.07", "50.75", "7.23", "53.73", 1055308779L, 1),

-		new osm_map_values(Navit._("Denmark"), "7.65", "54.32", "15.58", "58.07", 290170098L, 1),

-		new osm_map_values(Navit._("Faroe Islands"), "-7.8", "61.3", "-6.1", "62.5", 83188591L, 1),

-		new osm_map_values(Navit._("France"), "-5.45", "42.00", "8.44", "51.68", 3249655126L, 1),

-		new osm_map_values(Navit._("Alsace"), "6.79", "47.27", "8.48", "49.17", 288424319L, 2),

-		new osm_map_values(Navit._("Aquitaine"), "-2.27", "42.44", "1.50", "45.76", 372741849L, 2),

-		new osm_map_values(Navit._("Auvergne"), "2.01", "44.57", "4.54", "46.85", 248344580L, 2),

-		new osm_map_values(Navit._("Basse-Normandie"), "-2.09", "48.13", "1.03", "49.98", 212920166L, 2),

-		new osm_map_values(Navit._("Bourgogne"), "2.80", "46.11", "5.58", "48.45", 254169749L, 2),

-		new osm_map_values(Navit._("Bretagne"), "-5.58", "46.95", "-0.96", "48.99", 344216282L, 2),

-		new osm_map_values(Navit._("Centre"), "0.01", "46.29", "3.18", "48.99", 406182417L, 2),

-		new osm_map_values(Navit._("Champagne-Ardenne"), "3.34", "47.53", "5.94", "50.28", 229584275L, 2),

-		new osm_map_values(Navit._("Corse"), "8.12", "41.32", "9.95", "43.28", 100145697L, 2),

-		new osm_map_values(Navit._("Franche-Comte"), "5.20", "46.21", "7.83", "48.07", 262855868L, 2),

-		new osm_map_values(Navit._("Haute-Normandie"), "-0.15", "48.62", "1.85", "50.18", 161154198L, 2),

-		new osm_map_values(Navit._("Ile-de-France"), "1.40", "48.07", "3.61", "49.29", 161154198L, 2),

-		new osm_map_values(Navit._("Languedoc-Roussillon"), "1.53", "42.25", "4.89", "45.02", 327632080L, 2),

-		new osm_map_values(Navit._("Limousin"), "0.58", "44.87", "2.66", "46.50", 183489689L, 2),

-		new osm_map_values(Navit._("Lorraine"), "4.84", "47.77", "7.72", "49.73", 269812559L, 2),

-		new osm_map_values(Navit._("Midi-Pyrenees"), "-0.37", "42.18", "3.50", "45.10", 383558262L, 2),

-		new osm_map_values(Navit._("Nord-pas-de-Calais"), "1.42", "49.92", "4.49", "51.31", 302919146L, 2),

-		new osm_map_values(Navit._("Pays-de-la-Loire"), "-2.88", "46.20", "0.97", "48.62", 450193605L, 2),

-		new osm_map_values(Navit._("Picardie"), "1.25", "48.79", "4.31", "50.43", 307070563L, 2),

-		new osm_map_values(Navit._("Poitou-Charentes"), "-1.69", "45.04", "1.26", "47.23", 313113043L, 2),

-		new osm_map_values(Navit._("Provence-Alpes-Cote-d-Azur"), "4.21", "42.91", "7.99", "45.18", 317595783L, 2),

-		new osm_map_values(Navit._("Rhone-Alpes"), "3.65", "44.07", "7.88", "46.64", 407877163L, 2),

-		new osm_map_values(Navit._("Germany"), "5.18", "46.84", "15.47", "55.64", 2837673591L, 1),

-		new osm_map_values(Navit._("Baden-Wuerttemberg"), "7.32", "47.14", "10.57", "49.85", 527492836L, 2),

-		new osm_map_values(Navit._("Bayern"), "8.92", "47.22", "13.90", "50.62", 662940459L, 2),

-		new osm_map_values(Navit._("Mittelfranken"), "9.86", "48.78", "11.65", "49.84", 160155291L, 2),

-		new osm_map_values(Navit._("Niederbayern"), "11.55", "47.75", "14.12", "49.42", 239575482L, 2),

-		new osm_map_values(Navit._("Oberbayern"), "10.67", "47.05", "13.57", "49.14", 301207029L, 2),

-		new osm_map_values(Navit._("Oberfranken"), "10.31", "49.54", "12.49", "50.95", 183767024L, 2),

-		new osm_map_values(Navit._("Oberpfalz"), "11.14", "48.71", "13.47", "50.43", 199582448L, 2),

-		new osm_map_values(Navit._("Schwaben"), "9.27", "47.10", "11.36", "49.09", 248955385L, 2),

-		new osm_map_values(Navit._("Unterfranken"), "8.59", "49.16", "10.93", "50.67", 236009244L, 2),

-		new osm_map_values(Navit._("Berlin"), "13.03", "52.28", "13.81", "52.73", 236009244L, 2),

-		new osm_map_values(Navit._("Brandenburg"), "11.17", "51.30", "14.83", "53.63", 248263976L, 2),

-		new osm_map_values(Navit._("Bremen"), "8.43", "52.96", "9.04", "53.66", 116469818L, 2),

-		new osm_map_values(Navit._("Hamburg"), "9.56", "53.34", "10.39", "53.80", 122614777L, 2),

-		new osm_map_values(Navit._("Hessen"), "7.72", "49.34", "10.29", "51.71", 334364378L, 2),

-		new osm_map_values(Navit._("Mecklenburg-Vorpommern"), "10.54", "53.05", "14.48", "55.05", 164819613L, 2),

-		new osm_map_values(Navit._("Niedersachsen"), "6.40", "51.24", "11.69", "54.22", 662782848L, 2),

-		new osm_map_values(Navit._("Nordrhein-westfalen"), "5.46", "50.26", "9.52", "52.59", 796972268L, 2),

-		new osm_map_values(Navit._("Rheinland-Pfalz"), "6.06", "48.91", "8.56", "51.00", 334191707L, 2),

-		new osm_map_values(Navit._("Saarland"), "6.30", "49.06", "7.46", "49.69", 120534914L, 2),

-		new osm_map_values(Navit._("Sachsen-Anhalt"), "10.50", "50.88", "13.26", "53.11", 221889143L, 2),

-		new osm_map_values(Navit._("Sachsen"), "11.82", "50.11", "15.10", "51.73", 267277236L, 2),

-		new osm_map_values(Navit._("Schleswig-Holstein"), "7.41", "53.30", "11.98", "55.20", 219653495L, 2),

-		new osm_map_values(Navit._("Thueringen"), "9.81", "50.15", "12.72", "51.70", 208223042L, 2),

-		new osm_map_values(Navit._("Germany")+"+"+Navit._("Austria")+"+"+Navit._("Switzerland"), "3.4", "44.5", "18.6", "55.1", 4492224830L, 1),

-		new osm_map_values(Navit._("Iceland"), "-25.3", "62.8", "-11.4", "67.5", 94548231L, 1),

-		new osm_map_values(Navit._("Ireland"), "-11.17", "51.25", "-5.23", "55.9", 165550114L, 1),

-		new osm_map_values(Navit._("Italy"), "6.52", "36.38", "18.96", "47.19", 1062662974L, 1),

-		new osm_map_values(Navit._("Spain")+"+"+Navit._("Portugal"), "-11.04", "34.87", "4.62", "44.41", 812986937L, 1),

-		new osm_map_values(Navit._("Mallorca"), "2.2", "38.8", "4.7", "40.2", 134412997L, 2),

-		new osm_map_values(Navit._("Galicia"), "-10.0", "41.7", "-6.3", "44.1", 151155417L, 2),

-		new osm_map_values(Navit._("Scandinavia"), "4.0", "54.4", "32.1", "71.5", 957345953L, 1),

-		new osm_map_values(Navit._("Finland"), "18.6", "59.2", "32.3", "70.3", 326001389L, 1),

-		new osm_map_values(Navit._("Denmark"), "7.49", "54.33", "13.05", "57.88", 255631813L, 1),

-		new osm_map_values(Navit._("Switzerland"), "5.79", "45.74", "10.59", "47.84", 439384941L, 1),

-		new osm_map_values(Navit._("United Kingdom"), "-9.7", "49.6", "2.2", "61.2", 679063758L, 1),

-		new osm_map_values(Navit._("England"), "-7.80", "48.93", "2.41", "56.14", 724085648L, 1),

-		new osm_map_values(Navit._("Buckinghamshire"), "-1.19", "51.44", "-0.43", "52.25", 109563143L, 2),

-		new osm_map_values(Navit._("Cambridgeshire"), "-0.55", "51.96", "0.56", "52.79", 108935775L, 2),

-		new osm_map_values(Navit._("Cumbria"), "-3.96", "53.85", "-2.11", "55.24", 108479102L, 2),

-		new osm_map_values(Navit._("East yorkshire with hull"), "-1.16", "53.50", "0.54", "54.26", 109066505L, 2),

-		new osm_map_values(Navit._("Essex"), "-0.07", "51.40", "1.36", "52.14", 126883293L, 2),

-		new osm_map_values(Navit._("Herefordshire"), "-3.19", "51.78", "-2.29", "52.45", 97777992L, 2),

-		new osm_map_values(Navit._("Kent"), "-0.02", "50.81", "1.65", "51.53", 112579242L, 2),

-		new osm_map_values(Navit._("Lancashire"), "-3.20", "53.43", "-2.00", "54.29", 112845974L, 2),

-		new osm_map_values(Navit._("Leicestershire"), "-1.65", "52.34", "-0.61", "53.03", 117179765L, 2),

-		new osm_map_values(Navit._("Norfolk"),  "0.10", "52.30", "2.04", "53.41", 108306587L, 2),

-		new osm_map_values(Navit._("Nottinghamshire"), "-1.39", "52.73", "-0.62", "53.55", 112023678L, 2),

-		new osm_map_values(Navit._("Oxfordshire"), "-1.77", "51.41", "-0.82", "52.22", 109834780L, 2),

-		new osm_map_values(Navit._("Shropshire"), "-3.29", "52.26", "-2.18", "53.05", 103532414L, 2),

-		new osm_map_values(Navit._("Somerset"), "-3.89", "50.77", "-2.20", "51.40", 109975069L, 2),

-		new osm_map_values(Navit._("South yorkshire"), "-1.88", "53.25", "-0.80", "53.71", 110488840L, 2),

-		new osm_map_values(Navit._("Suffolk"), "0.29", "51.88", "1.81", "52.60", 109788040L, 2),

-		new osm_map_values(Navit._("Surrey"), "-0.90", "51.02", "0.10", "51.52", 121727148L, 2),

-		new osm_map_values(Navit._("Wiltshire"),  "-2.41", "50.90", "-1.44", "51.76", 106375888L, 2),

-		new osm_map_values(Navit._("Scotland"), "-8.13", "54.49", "-0.15", "61.40", 189176250L, 2),

-		new osm_map_values(Navit._("Wales"), "-5.56", "51.28", "-2.60", "53.60", 144572638L, 2),

-		new osm_map_values(Navit._("Albania"), "19.09", "39.55", "21.12", "42.72", 106939331L, 1),

-		new osm_map_values(Navit._("Belarus"), "23.12", "51.21", "32.87", "56.23", 229648760L, 1),

-		new osm_map_values(Navit._("Russian Federation"), "27.9", "41.5", "190.4", "77.6", 1479983473L, 1),

-		new osm_map_values(Navit._("Bulgaria"), "24.7", "42.1", "24.8", "42.1", 83696190L, 1),

-		new osm_map_values(Navit._("Bosnia and Herzegovina"), "15.69", "42.52", "19.67", "45.32", 144196241L, 1),

-		new osm_map_values(Navit._("Czech Republic"), "11.91", "48.48", "19.02", "51.17", 711304334L, 1),

-		new osm_map_values(Navit._("Croatia"), "13.4", "42.1", "19.4", "46.9", 251673871L, 1),

-		new osm_map_values(Navit._("Estonia"), "21.5", "57.5", "28.2", "59.6", 142340828L, 1),

-		new osm_map_values(Navit._("Greece"), "28.9", "37.8", "29.0", "37.8", 83257661L, 1),

-		new osm_map_values(Navit._("Crete"), "23.3", "34.5", "26.8", "36.0", 87834598L, 1),

-		new osm_map_values(Navit._("Hungary"), "16.08", "45.57", "23.03", "48.39", 256779608L, 1),

-		new osm_map_values(Navit._("Latvia"), "20.7", "55.6", "28.3", "58.1", 144857068L, 1),

-		new osm_map_values(Navit._("Lithuania"), "20.9", "53.8", "26.9", "56.5", 156811735L, 1),

-		new osm_map_values(Navit._("Poland"), "13.6", "48.8", "24.5", "55.0", 1018629889L, 1),

-		new osm_map_values(Navit._("Romania"), "20.3", "43.5", "29.9", "48.4", 265402066L, 1),

-		new osm_map_values(Navit._("Ukraine"),  "22.0", "44.3", "40.4", "52.4", 524768547L, 1),

-		new osm_map_values(Navit._("North America"), "-178.1", "6.5", "-10.4", "84.0", 4526641449L, 0),

-		new osm_map_values(Navit._("Alaska"), "-179.5", "49.5", "-129", "71.6", 174207438L, 1),

-		new osm_map_values(Navit._("Canada"), "-141.3", "41.5", "-52.2", "70.2", 2273900574L, 1),

-		new osm_map_values(Navit._("Hawaii"), "-161.07", "18.49", "-154.45", "22.85", 87476921L, 1),

-		new osm_map_values(Navit._("USA")+Navit._(" (except Alaska and Hawaii)"), "-125.4", "24.3", "-66.5", "49.3", 3389691841L, 1),

-		new osm_map_values(Navit._("Midwest"), "-104.11", "35.92", "-80.46", "49.46", 1030850300L, 2),

-		new osm_map_values(Navit._("Michigan"), "-90.47", "41.64", "-79.00", "49.37", 495136827L, 2),

-		new osm_map_values(Navit._("Ohio"), "-84.87", "38.05", "-79.85", "43.53", 226499873L, 2),

-		new osm_map_values(Navit._("Northeast"), "-80.58", "38.72", "-66.83", "47.53", 848767227L, 2),

-		new osm_map_values(Navit._("Massachusetts"), "-73.56", "40.78", "-68.67", "42.94", 284272912L, 2),

-		new osm_map_values(Navit._("Vermont"), "-73.49", "42.68", "-71.41", "45.07", 110911886L, 2),

-		new osm_map_values(Navit._("Pacific"), "-180.05", "15.87", "-129.75", "73.04", 172206612L, 2),

-		new osm_map_values(Navit._("South"),  "-106.70", "23.98", "-71.46", "40.70", 1481026457L, 2),

-		new osm_map_values(Navit._("Arkansas"), "-94.67", "32.95", "-89.59", "36.60", 125115656L, 2),

-		new osm_map_values(Navit._("District of Columbia"), "-77.17", "38.74", "-76.86", "39.05", 101152353L, 2),

-		new osm_map_values(Navit._("Florida"), "-88.75", "23.63", "-77.67", "31.05", 174378547L, 2),

-		new osm_map_values(Navit._("Louisiana"), "-94.09", "28.09", "-88.62", "33.07", 177996551L, 2),

-		new osm_map_values(Navit._("Maryland"), "-79.54", "37.83", "-74.99", "40.22", 213559925L, 2),

-		new osm_map_values(Navit._("Mississippi"), "-91.71", "29.99", "-88.04", "35.05", 146620850L, 2),

-		new osm_map_values(Navit._("Oklahoma"), "-103.41", "33.56", "-94.38", "37.38", 167396836L, 2),

-		new osm_map_values(Navit._("Texas"), "-106.96", "25.62", "-92.97", "36.58", 320259945L, 2),

-		new osm_map_values(Navit._("Virginia"), "-83.73", "36.49", "-74.25", "39.52", 306054196L, 2),

-		new osm_map_values(Navit._("West Virginia"), "-82.70", "37.15", "-77.66", "40.97", 181531617L, 2),

-		new osm_map_values(Navit._("West"), "-133.11", "31.28", "-101.99", "49.51", 837597071L, 2),

-		new osm_map_values(Navit._("Arizona"), "-114.88", "30.01", "-108.99", "37.06", 140190223L, 2),

-		new osm_map_values(Navit._("California"), "-125.94", "32.43", "-114.08", "42.07", 384857326L, 2),

-		new osm_map_values(Navit._("Colorado"), "-109.11", "36.52", "-100.41", "41.05", 185388342L, 2),

-		new osm_map_values(Navit._("Idaho"), "-117.30", "41.93", "-110.99", "49.18", 137642365L, 2),

-		new osm_map_values(Navit._("Montana"), "-116.10", "44.31", "-102.64", "49.74", 140601787L, 2),

-		new osm_map_values(Navit._("New Mexico"), "-109.10", "26.98", "-96.07", "37.05", 263105357L, 2),

-		new osm_map_values(Navit._("Nevada"), "-120.2", "35.0", "-113.8", "42.1", 164712473L, 2),

-		new osm_map_values(Navit._("Oregon"),  "-124.8", "41.8", "-116.3", "46.3", 153169398L, 2),

-		new osm_map_values(Navit._("Utah"), "-114.11", "36.95", "-108.99", "42.05", 115653638L, 2),

-		new osm_map_values(Navit._("Washington State"), "-125.0", "45.5", "-116.9", "49.0", 167427046L, 2),

-		new osm_map_values(Navit._("South+Middle America"), "-83.5", "-56.3", "-30.8", "13.7", 562230441L, 0),

-		new osm_map_values(Navit._("Argentina"), "-73.9", "-57.3", "-51.6", "-21.0", 244901827L, 1),

-		new osm_map_values(Navit._("Argentina")+"+"+Navit._("Chile"), "-77.2", "-56.3", "-52.7", "-16.1", 269594088L, 1),

-		new osm_map_values(Navit._("Bolivia"), "-70.5", "-23.1", "-57.3", "-9.3", 121759213L, 1),

-		new osm_map_values(Navit._("Brazil"), "-71.4", "-34.7", "-32.8", "5.4", 388405363L, 1),

-		new osm_map_values(Navit._("Chile"), "-81.77", "-58.50", "-65.46", "-17.41", 160742590L, 1),

-		new osm_map_values(Navit._("Cuba"), "-85.3", "19.6", "-74.0", "23.6", 95014897L, 1),

-		new osm_map_values(Navit._("Colombia"), "-79.1", "-4.0", "-66.7", "12.6", 151545547L, 1),

-		new osm_map_values(Navit._("Ecuador"), "-82.6", "-5.4", "-74.4", "2.3", 105488624L, 1),

-		new osm_map_values(Navit._("Guyana")+"+"+Navit._("Suriname")+"+"+Navit._("Guyane Francaise"), "-62.0", "1.0", "-51.2", "8.9", 92083881L, 1),

-		new osm_map_values(Navit._("Haiti")+"+"+Navit._("Dominican Republic"), "-74.8", "17.3", "-68.2", "20.1", 103797756L, 1),

-		new osm_map_values(Navit._("Jamaica"), "-78.6", "17.4", "-75.9", "18.9", 85053924L, 1),

-		new osm_map_values(Navit._("Mexico"), "-117.6", "14.1", "-86.4", "32.8", 384891270L, 1),

-		new osm_map_values(Navit._("Paraguay"), "-63.8", "-28.1", "-53.6", "-18.8", 116798539L, 1),

-		new osm_map_values(Navit._("Peru"), "-82.4", "-18.1", "-67.5", "0.4", 137292365L, 1),

-		new osm_map_values(Navit._("Uruguay"), "-59.2", "-36.5", "-51.7", "-29.7", 113817110L, 1),

-		new osm_map_values(Navit._("Venezuela"), "-73.6", "0.4", "-59.7", "12.8", 124001905L, 1)

+		new osm_map_values(Navit._("Whole Planet"), "-180", "-90", "180", "90", 23992258630L, 0),

+		new osm_map_values(Navit._("Africa"), "-30.89", "-36.17", "61.68", "38.40", 2070076339L, 0),

+		new osm_map_values(Navit._("Angola"), "11.4", "-18.1", "24.2", "-5.3", 127557789L, 1),

+		new osm_map_values(Navit._("Burundi"), "28.9", "-4.5", "30.9", "-2.2", 124049667L, 1),

+		new osm_map_values(Navit._("Canary Islands"), "-18.69", "26.52", "-12.79", "29.99", 133565815L, 1),

+		new osm_map_values(Navit._("Congo, Democratic Republic of the"), "11.7", "-13.6", "31.5", "5.7", 244228485L, 1),

+		new osm_map_values(Navit._("Ethiopia"), "32.89", "3.33", "48.07", "14.97", 153067406L, 1),

+		new osm_map_values(Navit._("Guinea"), "-15.47", "7.12", "-7.58", "12.74", 188047126L, 1),

+		new osm_map_values(Navit._("Cote d'Ivoire"), "-8.72", "4.09", "-2.43", "10.80", 132187496L, 1),

+		new osm_map_values(Navit._("Kenya"), "33.8", "-5.2", "42.4", "4.9", 190073089L, 1),

+		new osm_map_values(Navit._("Lesotho"), "26.9", "-30.7", "29.6", "-28.4", 196189429L, 1),

+		new osm_map_values(Navit._("Liberia"), "-15.00", "-0.73", "-7.20", "8.65", 156257253L, 1),

+		new osm_map_values(Navit._("Libya"), "9.32", "19.40", "25.54", "33.63", 126046917L, 1),

+		new osm_map_values(Navit._("Madagascar"), "42.25", "-26.63", "51.20", "-11.31", 145210721L, 1),

+		new osm_map_values(Navit._("Namibia")+"+"+Navit._("Botswana"), "11.4", "-29.1", "29.5", "-16.9", 248970987L, 1),

+		new osm_map_values(Navit._("Reunion"), "55.2", "-21.4", "55.9", "-20.9", 126008774L, 1),

+		new osm_map_values(Navit._("Rwanda"), "28.8", "-2.9", "30.9", "-1.0", 128267595L, 1),

+		new osm_map_values(Navit._("South Africa")+"+"+Navit._("Lesotho"), "15.93", "-36.36", "33.65", "-22.08", 307280006L, 1),

+		new osm_map_values(Navit._("Tanzania, United Republic of"), "29.19", "-11.87", "40.74", "-0.88", 253621029L, 1),

+		new osm_map_values(Navit._("Uganda"), "29.3", "-1.6", "35.1", "4.3", 179134521L, 1),

+		new osm_map_values(Navit._("Asia"), "23.8", "0.1", "195.0", "82.4", 5113673780L, 0),

+		new osm_map_values(Navit._("Azerbaijan"), "44.74", "38.34", "51.69", "42.37", 138346406L, 1),

+		new osm_map_values(Navit._("China"), "67.3", "5.3", "135.0", "54.5", 1718108758L, 1),

+		new osm_map_values(Navit._("Cyprus"), "32.0", "34.5", "34.9", "35.8", 118472448L, 1),

+		new osm_map_values(Navit._("India")+"+"+Navit._("Nepal"), "67.9", "5.5", "89.6", "36.0", 601877877L, 1),

+		new osm_map_values(Navit._("Indonesia"), "93.7", "-17.3", "155.5", "7.6", 420741405L, 1),

+		new osm_map_values(Navit._("Iran, Islamic Republic of"), "43.5", "24.4", "63.6", "40.4", 242016066L, 1),

+		new osm_map_values(Navit._("Iraq"), "38.7", "28.5", "49.2", "37.4", 160751805L, 1),

+		new osm_map_values(Navit._("Israel"), "33.99", "29.8", "35.95", "33.4", 155685778L, 1),

+		new osm_map_values(Navit._("Japan")+"+"+Navit._("Korea")+"+"+Navit._("Taiwan"), "117.6", "20.5", "151.3", "47.1", 1029080156L, 1),

+		new osm_map_values(Navit._("Kazakhstan"), "46.44", "40.89", "87.36", "55.45", 407633007L, 1),

+		new osm_map_values(Navit._("Kyrgyzstan"), "69.23", "39.13", "80.33", "43.29", 147997835L, 1),

+		new osm_map_values(Navit._("Malaysia")+"+"+Navit._("Singapore"), "94.3", "-5.9", "108.6", "6.8", 168816435L, 1),

+		new osm_map_values(Navit._("Mongolia"), "87.5", "41.4", "120.3", "52.7", 153534851L, 1),

+		new osm_map_values(Navit._("Pakistan"), "60.83", "23.28", "77.89", "37.15", 217644321L, 1),

+		new osm_map_values(Navit._("Philippines"), "115.58", "4.47", "127.85", "21.60", 281428307L, 1),

+		new osm_map_values(Navit._("Saudi Arabia"), "33.2", "16.1", "55.9", "33.5", 242648303L, 1),

+		new osm_map_values(Navit._("Thailand"), "97.5", "5.7", "105.2", "19.7", 185135492L, 1),

+		new osm_map_values(Navit._("Turkey"), "25.1", "35.8", "46.4", "42.8", 331087441L, 1),

+		new osm_map_values(Navit._("Turkmenistan"), "51.78", "35.07", "66.76", "42.91", 131045087L, 1),

+		new osm_map_values(Navit._("UAE+Other"), "51.5", "22.6", "56.7", "26.5", 128934674L, 1),

+		new osm_map_values(Navit._("Australia")+"+"+Navit._("Oceania"), "89.84", "-57.39", "179.79", "7.26", 782722650L, 0),

+		new osm_map_values(Navit._("Australia"), "110.5", "-44.2", "154.9", "-9.2", 348652900L, 0),

+		new osm_map_values(Navit._("Tasmania"), "144.0", "-45.1", "155.3", "-24.8", 253231890L, 1),

+		new osm_map_values(Navit._("Victoria")+"+"+Navit._("New South Wales"), "140.7", "-39.4", "153.7", "-26.9", 241500829L, 1),

+		new osm_map_values(Navit._("New Caledonia"), "157.85", "-25.05", "174.15", "-16.85", 115512336L, 1),

+		new osm_map_values(Navit._("New Zealand"), "165.2", "-47.6", "179.1", "-33.7", 239264192L, 1),

+		new osm_map_values(Navit._("Europe"), "-12.97", "33.59", "34.15", "72.10", 11984126789L, 0),

+		new osm_map_values(Navit._("Western Europe"), "-17.6", "34.5", "42.9", "70.9", 12648810717L, 1),

+		new osm_map_values(Navit._("Austria"), "9.4", "46.32", "17.21", "49.1", 898273634L, 1),

+		new osm_map_values(Navit._("Azores"), "-31.62", "36.63", "-24.67", "40.13", 112687225L, 1),

+		new osm_map_values(Navit._("BeNeLux"), "2.08", "48.87", "7.78", "54.52", 1771971595L, 1),

+		new osm_map_values(Navit._("Netherlands"), "3.07", "50.75", "7.23", "53.73", 1191828033L, 1),

+		new osm_map_values(Navit._("Denmark"), "7.65", "54.32", "15.58", "58.07", 365606979L, 1),

+		new osm_map_values(Navit._("Faroe Islands"), "-7.8", "61.3", "-6.1", "62.5", 109377568L, 1),

+		new osm_map_values(Navit._("France"), "-5.45", "42.00", "8.44", "51.68", 3907969744L, 1),

+		new osm_map_values(Navit._("Alsace"), "6.79", "47.27", "8.48", "49.17", 354249349L, 2),

+		new osm_map_values(Navit._("Aquitaine"), "-2.27", "42.44", "1.50", "45.76", 443715019L, 2),

+		new osm_map_values(Navit._("Auvergne"), "2.01", "44.57", "4.54", "46.85", 287663213L, 2),

+		new osm_map_values(Navit._("Basse-Normandie"), "-2.09", "48.13", "1.03", "49.98", 262352354L, 2),

+		new osm_map_values(Navit._("Bourgogne"), "2.80", "46.11", "5.58", "48.45", 298868796L, 2),

+		new osm_map_values(Navit._("Bretagne"), "-5.58", "46.95", "-0.96", "48.99", 382770794L, 2),

+		new osm_map_values(Navit._("Centre"), "0.01", "46.29", "3.18", "48.99", 474224721L, 2),

+		new osm_map_values(Navit._("Champagne-Ardenne"), "3.34", "47.53", "5.94", "50.28", 269947824L, 2),

+		new osm_map_values(Navit._("Corse"), "8.12", "41.32", "9.95", "43.28", 129902146L, 2),

+		new osm_map_values(Navit._("Franche-Comte"), "5.20", "46.21", "7.83", "48.07", 324476070L, 2),

+		new osm_map_values(Navit._("Haute-Normandie"), "-0.15", "48.62", "1.85", "50.18", 202782876L, 2),

+		new osm_map_values(Navit._("Ile-de-France"), "1.40", "48.07", "3.61", "49.29", 311052699L, 2),

+		new osm_map_values(Navit._("Languedoc-Roussillon"), "1.53", "42.25", "4.89", "45.02", 380145667L, 2),

+		new osm_map_values(Navit._("Limousin"), "0.58", "44.87", "2.66", "46.50", 206696539L, 2),

+		new osm_map_values(Navit._("Lorraine"), "4.84", "47.77", "7.72", "49.73", 330777318L, 2),

+		new osm_map_values(Navit._("Midi-Pyrenees"), "-0.37", "42.18", "3.50", "45.10", 462618363L, 2),

+		new osm_map_values(Navit._("Nord-pas-de-Calais"), "1.42", "49.92", "4.49", "51.31", 368467511L, 2),

+		new osm_map_values(Navit._("Pays-de-la-Loire"), "-2.88", "46.20", "0.97", "48.62", 499471143L, 2),

+		new osm_map_values(Navit._("Picardie"), "1.25", "48.79", "4.31", "50.43", 374308041L, 2),

+		new osm_map_values(Navit._("Poitou-Charentes"), "-1.69", "45.04", "1.26", "47.23", 342125526L, 2),

+		new osm_map_values(Navit._("Provence-Alpes-Cote-d-Azur"), "4.21", "42.91", "7.99", "45.18", 390306134L, 2),

+		new osm_map_values(Navit._("Rhone-Alpes"), "3.65", "44.07", "7.88", "46.64", 510797942L, 2),

+		new osm_map_values(Navit._("Germany"), "5.18", "46.84", "15.47", "55.64", 3521359466L, 1),

+		new osm_map_values(Navit._("Baden-Wuerttemberg"), "7.32", "47.14", "10.57", "49.85", 674361124L, 2),

+		new osm_map_values(Navit._("Bayern"), "8.92", "47.22", "13.90", "50.62", 860161150L, 2),

+		new osm_map_values(Navit._("Mittelfranken"), "9.86", "48.78", "11.65", "49.84", 203055195L, 2),

+		new osm_map_values(Navit._("Niederbayern"), "11.55", "47.75", "14.12", "49.42", 312924770L, 2),

+		new osm_map_values(Navit._("Oberbayern"), "10.67", "47.05", "13.57", "49.14", 382734883L, 2),

+		new osm_map_values(Navit._("Oberfranken"), "10.31", "49.54", "12.49", "50.95", 235258691L, 2),

+		new osm_map_values(Navit._("Oberpfalz"), "11.14", "48.71", "13.47", "50.43", 264536012L, 2),

+		new osm_map_values(Navit._("Schwaben"), "9.27", "47.10", "11.36", "49.09", 321141607L, 2),

+		new osm_map_values(Navit._("Unterfranken"), "8.59", "49.16", "10.93", "50.67", 303720890L, 2),

+		new osm_map_values(Navit._("Berlin"), "13.03", "52.28", "13.81", "52.73", 169019946L, 2),

+		new osm_map_values(Navit._("Brandenburg"), "11.17", "51.30", "14.83", "53.63", 323497599L, 2),

+		new osm_map_values(Navit._("Bremen"), "8.43", "52.96", "9.04", "53.66", 150963608L, 2),

+		new osm_map_values(Navit._("Hamburg"), "9.56", "53.34", "10.39", "53.80", 156284421L, 2),

+		new osm_map_values(Navit._("Hessen"), "7.72", "49.34", "10.29", "51.71", 432279328L, 2),

+		new osm_map_values(Navit._("Mecklenburg-Vorpommern"), "10.54", "53.05", "14.48", "55.05", 213183908L, 2),

+		new osm_map_values(Navit._("Niedersachsen"), "6.40", "51.24", "11.69", "54.22", 819766939L, 2),

+		new osm_map_values(Navit._("Nordrhein-westfalen"), "5.46", "50.26", "9.52", "52.59", 967053517L, 2),

+		new osm_map_values(Navit._("Rheinland-Pfalz"), "6.06", "48.91", "8.56", "51.00", 442868899L, 2),

+		new osm_map_values(Navit._("Saarland"), "6.30", "49.06", "7.46", "49.69", 157721162L, 2),

+		new osm_map_values(Navit._("Sachsen-Anhalt"), "10.50", "50.88", "13.26", "53.11", 287785088L, 2),

+		new osm_map_values(Navit._("Sachsen"), "11.82", "50.11", "15.10", "51.73", 342620834L, 2),

+		new osm_map_values(Navit._("Schleswig-Holstein"), "7.41", "53.30", "11.98", "55.20", 280293910L, 2),

+		new osm_map_values(Navit._("Thueringen"), "9.81", "50.15", "12.72", "51.70", 269428239L, 2),

+		new osm_map_values(Navit._("Germany")+"+"+Navit._("Austria")+"+"+Navit._("Switzerland"), "3.4", "44.5", "18.6", "55.1", 5746126429L, 1),

+		new osm_map_values(Navit._("Iceland"), "-25.3", "62.8", "-11.4", "67.5", 124837162L, 1),

+		new osm_map_values(Navit._("Ireland"), "-11.17", "51.25", "-5.23", "55.9", 234750271L, 1),

+		new osm_map_values(Navit._("Italy"), "6.52", "36.38", "18.96", "47.19", 1610171395L, 1),

+		new osm_map_values(Navit._("Spain")+"+"+Navit._("Portugal"), "-11.04", "34.87", "4.62", "44.41", 1039624918L, 1),

+		new osm_map_values(Navit._("Mallorca"), "2.2", "38.8", "4.7", "40.2", 137200636L, 2),

+		new osm_map_values(Navit._("Galicia"), "-10.0", "41.7", "-6.3", "44.1", 174549553L, 2),

+		new osm_map_values(Navit._("Scandinavia"), "4.0", "54.4", "32.1", "71.5", 1398661090L, 1),

+		new osm_map_values(Navit._("Finland"), "18.6", "59.2", "32.3", "70.3", 460997178L, 1),

+		new osm_map_values(Navit._("Denmark"), "7.49", "54.33", "13.05", "57.88", 321870414L, 1),

+		new osm_map_values(Navit._("Switzerland"), "5.79", "45.74", "10.59", "47.84", 552565332L, 1),

+		new osm_map_values(Navit._("United Kingdom"), "-9.7", "49.6", "2.2", "61.2", 901724648L, 1),

+		new osm_map_values(Navit._("England"), "-7.80", "48.93", "2.41", "56.14", 937728414L, 1),

+		new osm_map_values(Navit._("Buckinghamshire"), "-1.19", "51.44", "-0.43", "52.25", 142256978L, 2),

+		new osm_map_values(Navit._("Cambridgeshire"), "-0.55", "51.96", "0.56", "52.79", 142334001L, 2),

+		new osm_map_values(Navit._("Cumbria"), "-3.96", "53.85", "-2.11", "55.24", 144422460L, 2),

+		new osm_map_values(Navit._("East yorkshire with hull"), "-1.16", "53.50", "0.54", "54.26", 141518744L, 2),

+		new osm_map_values(Navit._("Essex"), "-0.07", "51.40", "1.36", "52.14", 162542730L, 2),

+		new osm_map_values(Navit._("Herefordshire"), "-3.19", "51.78", "-2.29", "52.45", 129368660L, 2),

+		new osm_map_values(Navit._("Kent"), "-0.02", "50.81", "1.65", "51.53", 145482562L, 2),

+		new osm_map_values(Navit._("Lancashire"), "-3.20", "53.43", "-2.00", "54.29", 148964975L, 2),

+		new osm_map_values(Navit._("Leicestershire"), "-1.65", "52.34", "-0.61", "53.03", 154199956L, 2),

+		new osm_map_values(Navit._("Norfolk"),  "0.10", "52.30", "2.04", "53.41", 146017009L, 2),

+		new osm_map_values(Navit._("Nottinghamshire"), "-1.39", "52.73", "-0.62", "53.55", 147986548L, 2),

+		new osm_map_values(Navit._("Oxfordshire"), "-1.77", "51.41", "-0.82", "52.22", 142240992L, 2),

+		new osm_map_values(Navit._("Shropshire"), "-3.29", "52.26", "-2.18", "53.05", 136909363L, 2),

+		new osm_map_values(Navit._("Somerset"), "-3.89", "50.77", "-2.20", "51.40", 145186096L, 2),

+		new osm_map_values(Navit._("South yorkshire"), "-1.88", "53.25", "-0.80", "53.71", 145902650L, 2),

+		new osm_map_values(Navit._("Suffolk"), "0.29", "51.88", "1.81", "52.60", 143799697L, 2),

+		new osm_map_values(Navit._("Surrey"), "-0.90", "51.02", "0.10", "51.52", 157987139L, 2),

+		new osm_map_values(Navit._("Wiltshire"),  "-2.41", "50.90", "-1.44", "51.76", 138652346L, 2),

+		new osm_map_values(Navit._("Scotland"), "-8.13", "54.49", "-0.15", "61.40", 258853845L, 2),

+		new osm_map_values(Navit._("Wales"), "-5.56", "51.28", "-2.60", "53.60", 193593409L, 2),

+		new osm_map_values(Navit._("Albania"), "19.09", "39.55", "21.12", "42.72", 146199817L, 1),

+		new osm_map_values(Navit._("Belarus"), "23.12", "51.21", "32.87", "56.23", 324470696L, 1),

+		new osm_map_values(Navit._("Russian Federation"), "27.9", "41.5", "190.4", "77.6", 2148314279L, 1),

+		new osm_map_values(Navit._("Bulgaria"), "24.7", "42.1", "24.8", "42.1", 109869373L, 1),

+		new osm_map_values(Navit._("Bosnia and Herzegovina"), "15.69", "42.52", "19.67", "45.32", 187122485L, 1),

+		new osm_map_values(Navit._("Czech Republic"), "11.91", "48.48", "19.02", "51.17", 904838442L, 1),

+		new osm_map_values(Navit._("Croatia"), "13.4", "42.1", "19.4", "46.9", 460854751L, 1),

+		new osm_map_values(Navit._("Estonia"), "21.5", "57.5", "28.2", "59.6", 173378927L, 1),

+		new osm_map_values(Navit._("Greece"), "28.9", "37.8", "29.0", "37.8", 109435051L, 1),

+		new osm_map_values(Navit._("Crete"), "23.3", "34.5", "26.8", "36.0", 115985063L, 1),

+		new osm_map_values(Navit._("Hungary"), "16.08", "45.57", "23.03", "48.39", 350318541L, 1),

+		new osm_map_values(Navit._("Latvia"), "20.7", "55.6", "28.3", "58.1", 188188140L, 1),

+		new osm_map_values(Navit._("Lithuania"), "20.9", "53.8", "26.9", "56.5", 217852597L, 1),

+		new osm_map_values(Navit._("Poland"), "13.6", "48.8", "24.5", "55.0", 1464968657L, 1),

+		new osm_map_values(Navit._("Romania"), "20.3", "43.5", "29.9", "48.4", 347931565L, 1),

+		new osm_map_values(Navit._("Ukraine"),  "22.0", "44.3", "40.4", "52.4", 793611912L, 1),

+		new osm_map_values(Navit._("North America"), "-178.1", "6.5", "-10.4", "84.0", 5601866516L, 0),

+		new osm_map_values(Navit._("Alaska"), "-179.5", "49.5", "-129", "71.6", 207746039L, 1),

+		new osm_map_values(Navit._("Canada"), "-141.3", "41.5", "-52.2", "70.2", 2635719651L, 1),

+		new osm_map_values(Navit._("Hawaii"), "-161.07", "18.49", "-154.45", "22.85", 115016656L, 1),

+		new osm_map_values(Navit._("USA")+Navit._(" (except Alaska and Hawaii)"), "-125.4", "24.3", "-66.5", "49.3", 4060487198L, 1),

+		new osm_map_values(Navit._("Midwest"), "-104.11", "35.92", "-80.46", "49.46", 1145596450L, 2),

+		new osm_map_values(Navit._("Michigan"), "-90.47", "41.64", "-79.00", "49.37", 538247019L, 2),

+		new osm_map_values(Navit._("Ohio"), "-84.87", "38.05", "-79.85", "43.53", 277022336L, 2),

+		new osm_map_values(Navit._("Northeast"), "-80.58", "38.72", "-66.83", "47.53", 1017160709L, 2),

+		new osm_map_values(Navit._("Massachusetts"), "-73.56", "40.78", "-68.67", "42.94", 340055487L, 2),

+		new osm_map_values(Navit._("Vermont"), "-73.49", "42.68", "-71.41", "45.07", 139626067L, 2),

+		new osm_map_values(Navit._("Pacific"), "-180.05", "15.87", "-129.75", "73.04", 207090640L, 2),

+		new osm_map_values(Navit._("South"),  "-106.70", "23.98", "-71.46", "40.70", 1747935356L, 2),

+		new osm_map_values(Navit._("Arkansas"), "-94.67", "32.95", "-89.59", "36.60", 155658661L, 2),

+		new osm_map_values(Navit._("District of Columbia"), "-77.17", "38.74", "-76.86", "39.05", 129235755L, 2),

+		new osm_map_values(Navit._("Florida"), "-88.75", "23.63", "-77.67", "31.05", 224022108L, 2),

+		new osm_map_values(Navit._("Louisiana"), "-94.09", "28.09", "-88.62", "33.07", 210120605L, 2),

+		new osm_map_values(Navit._("Maryland"), "-79.54", "37.83", "-74.99", "40.22", 276462622L, 2),

+		new osm_map_values(Navit._("Mississippi"), "-91.71", "29.99", "-88.04", "35.05", 177858031L, 2),

+		new osm_map_values(Navit._("Oklahoma"), "-103.41", "33.56", "-94.38", "37.38", 200061473L, 2),

+		new osm_map_values(Navit._("Texas"), "-106.96", "25.62", "-92.97", "36.58", 430089141L, 2),

+		new osm_map_values(Navit._("Virginia"), "-83.73", "36.49", "-74.25", "39.52", 384187569L, 2),

+		new osm_map_values(Navit._("West Virginia"), "-82.70", "37.15", "-77.66", "40.97", 220552071L, 2),

+		new osm_map_values(Navit._("West"), "-133.11", "31.28", "-101.99", "49.51", 1152909162L, 2),

+		new osm_map_values(Navit._("Arizona"), "-114.88", "30.01", "-108.99", "37.06", 182826833L, 2),

+		new osm_map_values(Navit._("California"), "-125.94", "32.43", "-114.08", "42.07", 586923326L, 2),

+		new osm_map_values(Navit._("Colorado"), "-109.11", "36.52", "-100.41", "41.05", 228623724L, 2),

+		new osm_map_values(Navit._("Idaho"), "-117.30", "41.93", "-110.99", "49.18", 170684507L, 2),

+		new osm_map_values(Navit._("Montana"), "-116.10", "44.31", "-102.64", "49.74", 176229800L, 2),

+		new osm_map_values(Navit._("New Mexico"), "-109.10", "26.98", "-96.07", "37.05", 361793070L, 2),

+		new osm_map_values(Navit._("Nevada"), "-120.2", "35.0", "-113.8", "42.1", 200614482L, 2),

+		new osm_map_values(Navit._("Oregon"),  "-124.8", "41.8", "-116.3", "46.3", 211462685L, 2),

+		new osm_map_values(Navit._("Utah"), "-114.11", "36.95", "-108.99", "42.05", 151590197L, 2),

+		new osm_map_values(Navit._("Washington State"), "-125.0", "45.5", "-116.9", "49.0", 222553768L, 2),

+		new osm_map_values(Navit._("South+Middle America"), "-83.5", "-56.3", "-30.8", "13.7", 958895383L, 0),

+		new osm_map_values(Navit._("Argentina"), "-73.9", "-57.3", "-51.6", "-21.0", 376857648L, 1),

+		new osm_map_values(Navit._("Argentina")+"+"+Navit._("Chile"), "-77.2", "-56.3", "-52.7", "-16.1", 420275812L, 1),

+		new osm_map_values(Navit._("Bolivia"), "-70.5", "-23.1", "-57.3", "-9.3", 175937824L, 1),

+		new osm_map_values(Navit._("Brazil"), "-71.4", "-34.7", "-32.8", "5.4", 664872975L, 1),

+		new osm_map_values(Navit._("Chile"), "-81.77", "-58.50", "-65.46", "-17.41", 241657330L, 1),

+		new osm_map_values(Navit._("Cuba"), "-85.3", "19.6", "-74.0", "23.6", 129043575L, 1),

+		new osm_map_values(Navit._("Colombia"), "-79.1", "-4.0", "-66.7", "12.6", 212016580L, 1),

+		new osm_map_values(Navit._("Ecuador"), "-82.6", "-5.4", "-74.4", "2.3", 158857591L, 1),

+		new osm_map_values(Navit._("Guyana")+"+"+Navit._("Suriname")+"+"+Navit._("Guyane Francaise"), "-62.0", "1.0", "-51.2", "8.9", 123000072L, 1),

+		new osm_map_values(Navit._("Haiti")+"+"+Navit._("Dominican Republic"), "-74.8", "17.3", "-68.2", "20.1", 149925689L, 1),

+		new osm_map_values(Navit._("Jamaica"), "-78.6", "17.4", "-75.9", "18.9", 113961998L, 1),

+		new osm_map_values(Navit._("Mexico"), "-117.6", "14.1", "-86.4", "32.8", 551307973L, 1),

+		new osm_map_values(Navit._("Paraguay"), "-63.8", "-28.1", "-53.6", "-18.8", 159498397L, 1),

+		new osm_map_values(Navit._("Peru"), "-82.4", "-18.1", "-67.5", "0.4", 212490557L, 1),

+		new osm_map_values(Navit._("Uruguay"), "-59.2", "-36.5", "-51.7", "-29.7", 157482719L, 1),

+		new osm_map_values(Navit._("Venezuela"), "-73.6", "0.4", "-59.7", "12.8", 167295729L, 1)

 	};

 

 	private String map_filename_path;

@@ -364,6 +365,7 @@ public class NavitMapDownloader extends Thread
 

 		if (success) {

 			toast(map_values.map_name + " " + Navit._("ready"));

+			getMapInfoFile().delete();

 			Log.d(TAG, "success");

 		}

 

diff --git a/navit/graphics.c b/navit/graphics.c
index 7680d96ce..f89a4f89d 100644
--- a/navit/graphics.c
+++ b/navit/graphics.c
@@ -2070,7 +2070,7 @@ graphics_icon_path(const char *icon)
 #else
 		if (! navit_sharedir)
 			navit_sharedir = getenv("NAVIT_SHAREDIR");
-		ret=g_strdup_printf("%s/xpm/%s", navit_sharedir, icon);
+		ret=g_strdup_printf("%s/icons/%s", navit_sharedir, icon);
 #endif
 	}
 	if (wordexp)
diff --git a/navit/graphics/qt5/QNavitQuick.cpp b/navit/graphics/qt5/QNavitQuick.cpp
index b87aabc57..7df3e0073 100644
--- a/navit/graphics/qt5/QNavitQuick.cpp
+++ b/navit/graphics/qt5/QNavitQuick.cpp
@@ -68,7 +68,7 @@ static void paintOverlays(QPainter* painter, struct graphics_priv* gp, QPaintEve
         if (!value->disable) {
             QRect rr(value->x, value->y, value->pixmap->width(), value->pixmap->height());
             if (event->rect().intersects(rr)) {
-                dbg(lvl_debug, "draw overlay (%d, %d, %d, %d)\n", value->x, value->y, value->pixmap->width(), value->pixmap->height());
+                dbg(lvl_debug, "draw overlay (%d, %d, %d, %d)\n", value->x + value->scroll_x, value->y + value->scroll_y, value->pixmap->width(), value->pixmap->height());
                 painter->drawPixmap(value->x, value->y, *value->pixmap);
                 /* draw overlays of overlay if any by recursive calling */
                 paintOverlays(painter, value, event);
@@ -89,7 +89,7 @@ void QNavitQuick::paint(QPainter* painter)
         painter->fillRect(boundingRect(), *graphics_priv->background_graphics_gc_priv->brush);
     }
     /* draw base */
-    painter->drawPixmap(0, 0, *graphics_priv->pixmap,
+    painter->drawPixmap(graphics_priv->scroll_x, graphics_priv->scroll_y, *graphics_priv->pixmap,
         boundingRect().x(), boundingRect().y(),
         boundingRect().width(), boundingRect().height());
     paintOverlays(painter, graphics_priv, &event);
diff --git a/navit/graphics/qt5/QNavitWidget.cpp b/navit/graphics/qt5/QNavitWidget.cpp
index 09034ce22..5a5bd303b 100644
--- a/navit/graphics/qt5/QNavitWidget.cpp
+++ b/navit/graphics/qt5/QNavitWidget.cpp
@@ -70,8 +70,8 @@ static void paintOverlays(QPainter* painter, struct graphics_priv* gp, QPaintEve
         if (!value->disable) {
             QRect rr(value->x, value->y, value->pixmap->width(), value->pixmap->height());
             if (event->rect().intersects(rr)) {
-                dbg(lvl_debug, "draw overlay (%d, %d, %d, %d)\n", value->x, value->y, value->pixmap->width(), value->pixmap->height());
-                painter->drawPixmap(value->x, value->y, *value->pixmap);
+                dbg(lvl_debug, "draw overlay (%d, %d, %d, %d)\n", value->x + value->scroll_x, value->y + value->scroll_y, value->pixmap->width(), value->pixmap->height());
+                painter->drawPixmap(value->x + value->scroll_x, value->y + value->scroll_y, *value->pixmap);
                 /* draw overlays of overlay if any by recursive calling */
                 paintOverlays(painter, value, event);
             }
@@ -88,8 +88,8 @@ void QNavitWidget::paintEvent(QPaintEvent* event)
         painter.setPen(*graphics_priv->background_graphics_gc_priv->pen);
         painter.fillRect(event->rect(), *graphics_priv->background_graphics_gc_priv->brush);
     }
-    painter.drawPixmap(0, 0, *graphics_priv->pixmap,
-        event->rect().x(), event->rect().y(),
+    painter.drawPixmap(event->rect().x(), event->rect().y(), *graphics_priv->pixmap,
+        event->rect().x() - graphics_priv->scroll_x, event->rect().y() - graphics_priv->scroll_y,
         event->rect().width(), event->rect().height());
     paintOverlays(&painter, graphics_priv, event);
 }
diff --git a/navit/graphics/qt5/graphics_qt5.cpp b/navit/graphics/qt5/graphics_qt5.cpp
index c25944ee5..f7ac15f43 100644
--- a/navit/graphics/qt5/graphics_qt5.cpp
+++ b/navit/graphics/qt5/graphics_qt5.cpp
@@ -575,14 +575,49 @@ draw_image(struct graphics_priv* gr, struct graphics_gc_priv* fg, struct point*
         dbg(lvl_debug, "Try to draw image, but no painter\n");
 }
 
+/**
+ * @brief	Drag layer.
+ * @param   gr private handle
+ * @param	p	vector the bitmap is moved from base, or NULL to indicate 0:0 vector
+ *
+ * Move layer to new position. If drag_bitmap is enabled this may also be
+ * called for root layer. There the content of the root layer is to be moved
+ * by given vector. On root layer, NULL indicates the end of a drag.
+ */
 static void draw_drag(struct graphics_priv* gr, struct point* p)
 {
+    struct point vector;
+
     if (p != NULL) {
-        //            dbg(lvl_debug,"enter %p (%d,%d)\n", gr, p->x, p->y);
-        gr->x = p->x;
-        gr->y = p->y;
+        dbg(lvl_debug, "enter %p (%d,%d)\n", gr, p->x, p->y);
+        vector = *p;
     } else {
-        //            dbg(lvl_debug,"enter %p (NULL)\n", gr);
+        dbg(lvl_debug, "enter %p (NULL)\n", gr);
+        vector.x = 0;
+        vector.y = 0;
+    }
+    if (gr->root) {
+        gr->scroll_x = vector.x;
+        gr->scroll_y = vector.y;
+    } else {
+#if USE_QWIDGET
+        int damage_x = gr->x;
+        int damage_y = gr->y;
+        int damage_w = gr->pixmap->width();
+        int damage_h = gr->pixmap->height();
+#endif
+        gr->x = vector.x;
+        gr->y = vector.y;
+#if USE_QWIDGET
+        /* call repaint on widget for stale area. */
+        if (gr->widget != NULL)
+            gr->widget->repaint(damage_x, damage_y, damage_w, damage_h);
+#endif
+#if USE_QML
+// No need to emit update, as QNavitQuic always repaints everything.
+//    if (gr->GPriv != NULL)
+//        gr->GPriv->emit_update();
+#endif
     }
 }
 
@@ -608,26 +643,29 @@ draw_mode(struct graphics_priv* gr, enum draw_mode_num mode)
     case draw_mode_end:
         dbg(lvl_debug, "End drawing on context %p (use == %d)\n", gr, gr->use_count);
         gr->use_count--;
+        if (gr->use_count < 0)
+            gr->use_count = 0;
         if (gr->use_count > 0) {
             dbg(lvl_debug, "drawing on %p still in use\n", gr);
         } else if (gr->painter != NULL) {
             gr->painter->end();
             delete (gr->painter);
             gr->painter = NULL;
+        } else {
+            dbg(lvl_debug, "Context %p not active!\n", gr)
+        }
 #if USE_QWIDGET
-            /* call repaint on widget */
-            if (gr->widget != NULL)
-                gr->widget->repaint(gr->x, gr->y, gr->pixmap->width(), gr->pixmap->height());
+        /* call repaint on widget */
+        if (gr->widget != NULL)
+            gr->widget->repaint(gr->x, gr->y, gr->pixmap->width(), gr->pixmap->height());
 #endif
 #if USE_QML
-            if (gr->GPriv != NULL)
-                gr->GPriv->emit_update();
+        if (gr->GPriv != NULL)
+            gr->GPriv->emit_update();
 
 #endif
-        } else
-            dbg(lvl_debug, "Context %p not active!\n", gr)
 
-                break;
+        break;
     default:
         dbg(lvl_debug, "Unknown drawing %d on context %p\n", mode, gr);
         break;
@@ -739,7 +777,6 @@ static void get_text_bbox(struct graphics_priv* gr, struct graphics_font_priv* f
 {
     int i;
     struct point pt;
-    QPainter* painter = gr->painter;
     QString tmp = QString::fromUtf8(text);
     QRect r;
     //        dbg(lvl_debug,"enter %s %d %d\n", text, dx, dy);
@@ -853,6 +890,8 @@ overlay_new(struct graphics_priv* gr, struct graphics_methods* meth, struct poin
     graphics_priv->use_count = 0;
     graphics_priv->parent = gr;
     graphics_priv->overlays = g_hash_table_new(NULL, NULL);
+    graphics_priv->scroll_x = 0;
+    graphics_priv->scroll_y = 0;
     graphics_priv->root = false;
     graphics_priv->argc = 0;
     graphics_priv->argv[0] = NULL;
@@ -955,6 +994,8 @@ graphics_qt5_new(struct navit* nav, struct graphics_methods* meth, struct attr**
     graphics_priv->x = 0;
     graphics_priv->y = 0;
     graphics_priv->disable = 0;
+    graphics_priv->scroll_x = 0;
+    graphics_priv->scroll_y = 0;
 #if USE_QML
     graphics_priv->engine = NULL;
     graphics_priv->window = NULL;
diff --git a/navit/graphics/qt5/graphics_qt5.h b/navit/graphics/qt5/graphics_qt5.h
index bf54ef45c..f9d19616b 100644
--- a/navit/graphics/qt5/graphics_qt5.h
+++ b/navit/graphics/qt5/graphics_qt5.h
@@ -89,6 +89,8 @@ struct graphics_priv {
     int disable;
     int x;
     int y;
+    int scroll_x;
+    int scroll_y;
     struct graphics_gc_priv* background_graphics_gc_priv;
 #if HAVE_FREETYPE
     struct font_priv* (*font_freetype_new)(void* meth);
diff --git a/navit/graphics/qt5/loader.qml b/navit/graphics/qt5/loader.qml
index ed9425bf7..9882cb23a 100644
--- a/navit/graphics/qt5/loader.qml
+++ b/navit/graphics/qt5/loader.qml
@@ -5,8 +5,6 @@ import QtQuick.Window 2.0
 Window {
    width: 200; height: 200
     
-   Screen.orientationUpdateMask: Qt.PortraitOrientation + Qt.LandscapeOrientation + Qt.InvertedPortraitOrientation + Qt.InvertedLandscapeOrientation
-
    Item {
        id: root
        anchors.fill: parent
@@ -35,5 +33,12 @@ Window {
            source: "graphics_qt5.qml"
            objectName: "navit_loader"
        }
+       Component.onCompleted: {
+           // orientation update mask is defined since QML 5.4 So make this compatible to 5.2
+	   // by just calling this if available
+           if(Screen.hasOwnProperty('orientationUpdateMask')) {
+               Screen.orientationUpdateMask = Qt.PortraitOrientation + Qt.LandscapeOrientation + Qt.InvertedPortraitOrientation + Qt.InvertedLandscapeOrientation;
+	   }
+       }
    }
 }
diff --git a/navit/gui/internal/gui_internal_command.c b/navit/gui/internal/gui_internal_command.c
index 43e788c10..a91f69f5f 100644
--- a/navit/gui/internal/gui_internal_command.c
+++ b/navit/gui/internal/gui_internal_command.c
@@ -510,16 +510,16 @@ gui_internal_cmd2_route_height_profile(struct gui_priv *this, char *function, st
 			int heightmap_installed = FALSE;
 			msh=mapset_open(ms);
 			while ((map=mapset_next(msh, 1))) {
-				struct attr name_attr;
-				if (map_get_attr(map, attr_name, &name_attr, NULL)){
-					dbg(lvl_debug,"map name = %s\n",name_attr.u.str);
-					if (strstr(name_attr.u.str,".heightlines.bin")){
-						dbg(lvl_info,"reading heightlines from map %s\n",name_attr.u.str);
+				struct attr data_attr;
+				if (map_get_attr(map, attr_data, &data_attr, NULL)){
+					dbg(lvl_debug,"map name = %s\n",data_attr.u.str);
+					if (strstr(data_attr.u.str,".heightlines.bin")){
+						dbg(lvl_info,"reading heightlines from map %s\n",data_attr.u.str);
 						mr=map_rect_new(map, &sel);
 						heightmap_installed = TRUE;
 					}
 					else {
-						dbg(lvl_debug,"ignoring map %s\n",name_attr.u.str);
+						dbg(lvl_debug,"ignoring map %s\n",data_attr.u.str);
 					}
 				}
 				if (mr) {
diff --git a/navit/gui/internal/gui_internal_poi.c b/navit/gui/internal/gui_internal_poi.c
index 689315f6e..cb31ecc95 100644
--- a/navit/gui/internal/gui_internal_poi.c
+++ b/navit/gui/internal/gui_internal_poi.c
@@ -42,7 +42,7 @@ struct selector {
 static enum item_type selectors_BankTypes[]={type_poi_bank,type_poi_bank, type_poi_atm,type_poi_atm, type_none};
 static enum item_type selectors_FuelTypes[]={type_poi_fuel,type_poi_fuel,type_none};
 static enum item_type selectors_BusTrainTypes[]={type_poi_rail_station,type_poi_rail_station,
-    type_poi_bus_station,type_poi_bus_station, type_poi_bus_stop,type_poi_bus_stop, type_none};
+    type_poi_rail_halt,type_poi_rail_tram_stop,type_poi_bus_station,type_poi_bus_stop,type_none};
 static enum item_type selectors_HotelTypes[]={type_poi_hotel,type_poi_camp_rv,type_poi_camping,type_poi_camping,
     type_poi_resort,type_poi_resort,type_poi_motel,type_poi_hostel,type_none};
 static enum item_type selectors_RestaurantTypes[]={type_poi_bar,type_poi_picnic,type_poi_burgerking,type_poi_fastfood,
diff --git a/navit/gui/qml/gui_qml.cpp b/navit/gui/qml/gui_qml.cpp
index 7a1016473..3efc719dd 100644
--- a/navit/gui/qml/gui_qml.cpp
+++ b/navit/gui/qml/gui_qml.cpp
@@ -460,7 +460,7 @@ static struct gui_priv * gui_qml_new(struct navit *nav, struct gui_methods *meth
 		this_->skin=g_strdup("navit");
 	}
 	if ( this_->icon_src==NULL ) {
-		this_->icon_src=g_strjoin(NULL,getenv("NAVIT_SHAREDIR"),"/xpm/",NULL);
+		this_->icon_src=g_strjoin(NULL,getenv("NAVIT_SHAREDIR"),"/icons/",NULL);
 	}
 
 	if ((attr=attr_search(attrs, NULL, attr_callback_list))) {
diff --git a/navit/xpm/CMakeLists.txt b/navit/icons/CMakeLists.txt
index 6d40f2a92..6d40f2a92 100644
--- a/navit/xpm/CMakeLists.txt
+++ b/navit/icons/CMakeLists.txt
diff --git a/navit/xpm/airport.svg b/navit/icons/airport.svg
index c21edce78..c21edce78 100644
--- a/navit/xpm/airport.svg
+++ b/navit/icons/airport.svg
diff --git a/navit/icons/atm.svg b/navit/icons/atm.svg
new file mode 100644
index 000000000..965aeb72a
--- /dev/null
+++ b/navit/icons/atm.svg
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="atm.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/projets/navit/icons/png/bank.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3173">
+      <stop
+         style="stop-color:#33b400;stop-opacity:1;"
+         offset="0"
+         id="stop3175" />
+      <stop
+         style="stop-color:#93cb00;stop-opacity:1;"
+         offset="1"
+         id="stop3177" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2390"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3173"
+       id="linearGradient3179"
+       x1="1.0178572"
+       y1="6.2410717"
+       x2="8.7142859"
+       y2="6.2410717"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3173"
+       id="linearGradient3182"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="1.0178572"
+       y1="6.2410717"
+       x2="8.7142859"
+       y2="6.2410717"
+       gradientTransform="matrix(4.9163101,0,0,4.923007,-0.9404501,-77.772264)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#22a638"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="26.166924"
+     inkscape:cy="-1.0638383"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1432"
+     inkscape:window-height="871"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:description>edited by jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3706"
+       transform="matrix(0.23156491,0,0,0.23156879,-1.3196731,16.811686)">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect3171-3"
+         d="m 93.115454,-68.506529 c -6.41813,4.083022 -12.883096,8.999986 -20.642582,10.628906 -14.394864,4.310286 -29.499685,-1.66533 -43.945312,2.636719 -7.749823,2.120316 -16.947506,6.103907 -19.980525,13.962922 -0.718593,11.850608 -0.716693,23.986857 0.06646,35.7070003 3.041161,5.14324299 8.388048,0.160839 11.230469,-2.375 3.69021,-2.015642 8.758555,-5.8092673 12.332031,-5.3105473 1.116874,2.368895 1.315032,3.3709883 -1.839844,3.019532 -7.503661,0.2477903 -17.253367,6.6571163 -14.267578,15.1132811 5.414768,10.6794269 20.884613,11.2351629 30.291016,5.9550779 2.245514,-2.5802681 4.517464,2.361533 7.376955,2.06836 6.644303,2.545535 13.797187,-1.008637 20.185547,2.089843 9.209478,2.466214 23.172003,-0.916742 24.464843,-11.8769528 -0.0316,-5.0224589 -5.08259,-8.0588329 -8.56836,-10.2656249 2.96603,-4.4153123 0.88832,-10.5798253 -3.17578,-13.5410163 5.17133,-3.23017 12.83119,-7.059092 11.04883,-14.43164 -0.37435,-10.60121 1.43374,-21.716769 -1.13683,-32.015601 -0.71307,-0.907799 -2.23846,-1.357718 -3.43934,-1.365259 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.63547659;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc"
+         id="rect3171"
+         d="m 11.789282,-40.234335 c 11.265416,-13.337664 26.152404,-12.169306 40.822934,-11.867963 13.097456,1.663744 26.558815,-0.680943 40.822933,-11.867964 l 0,33.845673 c -12.629658,10.321566 -25.864913,16.701363 -40.822933,11.867965 -13.607645,-2.2322 -27.215289,0.07541 -40.822934,11.867966 l 0,-33.845677 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3182);fill-opacity:1;fill-rule:evenodd;stroke:#0d4300;stroke-width:4.63547659;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="8.2149277"
+         rx="14.485865"
+         cy="-11.732427"
+         cx="72.478546"
+         id="path3186"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:4.63547707;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="8.2149277"
+         rx="14.485865"
+         cy="2.3395565"
+         cx="33.490875"
+         id="path2395"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:4.63547707;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="8.2149277"
+         rx="14.485865"
+         cy="3.9950845"
+         cx="79.431755"
+         id="path3184"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:4.63547707;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="8.2149277"
+         rx="14.485865"
+         cy="2.3395565"
+         cx="61.303734"
+         id="path3169"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:4.63547707;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="8.2149277"
+         rx="14.485865"
+         cy="-2.9179978"
+         cx="52.03278"
+         id="path3167"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:4.63547707;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <text
+         id="text2394"
+         y="-24.30253"
+         x="41.702309"
+         style="font-style:normal;font-weight:normal;font-size:33.71606064px;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="-24.30253"
+           x="41.702309"
+           id="tspan2396"
+           sodipodi:role="line">$</tspan></text>
+      <ellipse
+         ry="8.2149277"
+         rx="14.485865"
+         cy="-13.698995"
+         cx="50.377254"
+         id="path3188"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:4.63547707;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/attraction.svg b/navit/icons/attraction.svg
new file mode 100644
index 000000000..aa76cf906
--- /dev/null
+++ b/navit/icons/attraction.svg
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="attraction.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/projets/navit/icons/png/attraction.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3151">
+      <stop
+         style="stop-color:#6cff81;stop-opacity:1;"
+         offset="0"
+         id="stop3153" />
+      <stop
+         style="stop-color:#109026;stop-opacity:1;"
+         offset="1"
+         id="stop3155" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3151"
+       id="linearGradient3157"
+       x1="5.8379931"
+       y1="5.0950255"
+       x2="11.171147"
+       y2="8.0432262"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f4ca00"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="23.691613"
+     inkscape:cy="7.1163305"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1136"
+     inkscape:window-height="751"
+     inkscape:window-x="138"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3366"
+       transform="matrix(0.2184765,0,0,0.2184765,-0.17834745,16.924444)">
+      <path
+         transform="matrix(6.9468004,0,0,7.3031548,-7.1464034,-81.930952)"
+         d="M 12.410715,13.767857 8.3912092,11.652205 4.3696665,13.763982 5.1396758,9.2874321 1.8885314,6.1152927 6.383929,5.4642852 l 2.012225,-4.072267 2.008299,4.0742047 4.494768,0.65534 -3.2542,3.1690046 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.5712783"
+         sodipodi:arg1="0.94295973"
+         sodipodi:r2="3.4200625"
+         sodipodi:r1="6.8401251"
+         sodipodi:cy="8.2321424"
+         sodipodi:cx="8.3928576"
+         sodipodi:sides="5"
+         id="path2383-7"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.69094229;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+         sodipodi:type="star" />
+      <path
+         transform="matrix(5.6541004,0,0,5.9441423,3.5277342,-70.899029)"
+         d="M 12.410715,13.767857 8.3912092,11.652205 4.3696665,13.763982 5.1396758,9.2874321 1.8885314,6.1152927 6.383929,5.4642852 l 2.012225,-4.072267 2.008299,4.0742047 4.494768,0.65534 -3.2542,3.1690046 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.5712783"
+         sodipodi:arg1="0.94295973"
+         sodipodi:r2="3.4200625"
+         sodipodi:r1="6.8401251"
+         sodipodi:cy="8.2321424"
+         sodipodi:cx="8.3928576"
+         sodipodi:sides="5"
+         id="path2383"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3157);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.69094229;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+         sodipodi:type="star" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/xpm/bahai.svg b/navit/icons/bahai.svg
index 57abf2d5c..57abf2d5c 100644
--- a/navit/xpm/bahai.svg
+++ b/navit/icons/bahai.svg
diff --git a/navit/icons/bank.svg b/navit/icons/bank.svg
new file mode 100644
index 000000000..965aeb72a
--- /dev/null
+++ b/navit/icons/bank.svg
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="atm.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/projets/navit/icons/png/bank.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3173">
+      <stop
+         style="stop-color:#33b400;stop-opacity:1;"
+         offset="0"
+         id="stop3175" />
+      <stop
+         style="stop-color:#93cb00;stop-opacity:1;"
+         offset="1"
+         id="stop3177" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2390"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3173"
+       id="linearGradient3179"
+       x1="1.0178572"
+       y1="6.2410717"
+       x2="8.7142859"
+       y2="6.2410717"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3173"
+       id="linearGradient3182"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       x1="1.0178572"
+       y1="6.2410717"
+       x2="8.7142859"
+       y2="6.2410717"
+       gradientTransform="matrix(4.9163101,0,0,4.923007,-0.9404501,-77.772264)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#22a638"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="8"
+     inkscape:cx="26.166924"
+     inkscape:cy="-1.0638383"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1432"
+     inkscape:window-height="871"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:description>edited by jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3706"
+       transform="matrix(0.23156491,0,0,0.23156879,-1.3196731,16.811686)">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect3171-3"
+         d="m 93.115454,-68.506529 c -6.41813,4.083022 -12.883096,8.999986 -20.642582,10.628906 -14.394864,4.310286 -29.499685,-1.66533 -43.945312,2.636719 -7.749823,2.120316 -16.947506,6.103907 -19.980525,13.962922 -0.718593,11.850608 -0.716693,23.986857 0.06646,35.7070003 3.041161,5.14324299 8.388048,0.160839 11.230469,-2.375 3.69021,-2.015642 8.758555,-5.8092673 12.332031,-5.3105473 1.116874,2.368895 1.315032,3.3709883 -1.839844,3.019532 -7.503661,0.2477903 -17.253367,6.6571163 -14.267578,15.1132811 5.414768,10.6794269 20.884613,11.2351629 30.291016,5.9550779 2.245514,-2.5802681 4.517464,2.361533 7.376955,2.06836 6.644303,2.545535 13.797187,-1.008637 20.185547,2.089843 9.209478,2.466214 23.172003,-0.916742 24.464843,-11.8769528 -0.0316,-5.0224589 -5.08259,-8.0588329 -8.56836,-10.2656249 2.96603,-4.4153123 0.88832,-10.5798253 -3.17578,-13.5410163 5.17133,-3.23017 12.83119,-7.059092 11.04883,-14.43164 -0.37435,-10.60121 1.43374,-21.716769 -1.13683,-32.015601 -0.71307,-0.907799 -2.23846,-1.357718 -3.43934,-1.365259 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.63547659;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc"
+         id="rect3171"
+         d="m 11.789282,-40.234335 c 11.265416,-13.337664 26.152404,-12.169306 40.822934,-11.867963 13.097456,1.663744 26.558815,-0.680943 40.822933,-11.867964 l 0,33.845673 c -12.629658,10.321566 -25.864913,16.701363 -40.822933,11.867965 -13.607645,-2.2322 -27.215289,0.07541 -40.822934,11.867966 l 0,-33.845677 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3182);fill-opacity:1;fill-rule:evenodd;stroke:#0d4300;stroke-width:4.63547659;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="8.2149277"
+         rx="14.485865"
+         cy="-11.732427"
+         cx="72.478546"
+         id="path3186"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:4.63547707;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="8.2149277"
+         rx="14.485865"
+         cy="2.3395565"
+         cx="33.490875"
+         id="path2395"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:4.63547707;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="8.2149277"
+         rx="14.485865"
+         cy="3.9950845"
+         cx="79.431755"
+         id="path3184"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:4.63547707;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="8.2149277"
+         rx="14.485865"
+         cy="2.3395565"
+         cx="61.303734"
+         id="path3169"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:4.63547707;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="8.2149277"
+         rx="14.485865"
+         cy="-2.9179978"
+         cx="52.03278"
+         id="path3167"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:4.63547707;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <text
+         id="text2394"
+         y="-24.30253"
+         x="41.702309"
+         style="font-style:normal;font-weight:normal;font-size:33.71606064px;font-family:'Bitstream Vera Sans';fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="-24.30253"
+           x="41.702309"
+           id="tspan2396"
+           sodipodi:role="line">$</tspan></text>
+      <ellipse
+         ry="8.2149277"
+         rx="14.485865"
+         cy="-13.698995"
+         cx="50.377254"
+         id="path3188"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:4.63547707;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/bar.svg b/navit/icons/bar.svg
new file mode 100644
index 000000000..e81ba6ca1
--- /dev/null
+++ b/navit/icons/bar.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="bar.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/navit/icons/png/bar.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f4ca00"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="16.673422"
+     inkscape:cy="15.75252"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="892"
+     inkscape:window-height="653"
+     inkscape:window-x="540"
+     inkscape:window-y="218"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3410"
+       transform="matrix(0.21732933,0,0,0.21732688,2.4063677,16.673011)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3157-3"
+         d="m 38.646473,-74.476271 c -6.541856,-0.0089 -11.084439,6.296264 -17.660156,5.511719 -7.076765,0.91672 -13.038266,6.182308 -16.326176,11.996094 -5.49374001,0.469881 -4.40281001,7.553537 -3.78320001,11.328125 -0.38583,22.57608 -0.0377,45.29565185 -0.12109,67.927734 C 23.641272,22.191631 46.526673,22.090108 69.412098,21.994432 69.367108,14.168104 69.064322,6.1423728 69.177723,-1.5583022 81.943167,-4.9179532 85.560414,-21.616351 80.57616,-32.505568 c -1.378405,-3.631454 -4.279697,-6.702001 -7.054687,-9.03125 2.87129,-11.567792 -6.019201,-23.753224 -17.359375,-25.814453 -4.338541,-4.962636 -10.991271,-7.444471 -17.515625,-7.125 z"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.42937899;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="17.288969"
+         rx="17.333633"
+         cy="-52.591404"
+         cx="39.913322"
+         id="path3157"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#e5ff39;fill-opacity:1;fill-rule:evenodd;stroke:#aaaf00;stroke-width:4.42937899;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="17.288969"
+         rx="17.333633"
+         cy="-47.352322"
+         cx="23.892843"
+         id="path3155"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#e5ff39;fill-opacity:1;fill-rule:evenodd;stroke:#aaaf00;stroke-width:4.42937899;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="17.288969"
+         rx="17.333633"
+         cy="-45.518642"
+         cx="52.256969"
+         id="path3159"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#e5ff39;fill-opacity:1;fill-rule:evenodd;stroke:#aaaf00;stroke-width:4.42937899;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="rect2381"
+         d="M 4.2965851,-52.283183 63.98446,-51.759275 64.968052,18.57793 4.3635121,18.839883 4.2965851,-52.283183 Z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#b9d500;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.42937899;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3158"
+         d="m 63.999909,-39.488949 c 18.362354,0.200048 19.413503,34.7110821 0.787894,34.9993372"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8.85875797;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3161"
+         d="m 17.610842,-40.946368 0,47.6756423"
+         style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.42937899px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3163"
+         d="m 26.727794,-40.946368 0,47.6756423"
+         style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.42937899px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3165"
+         d="m 35.014235,-40.946368 0,47.6756423"
+         style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.42937899px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3160"
+         d="m 43.872993,-40.946368 0,47.6756423"
+         style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.42937899px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3162"
+         d="m 52.731751,-40.946368 0,47.6756423"
+         style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.42937899px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/beer.svg b/navit/icons/beer.svg
new file mode 100644
index 000000000..e81ba6ca1
--- /dev/null
+++ b/navit/icons/beer.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="bar.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/navit/icons/png/bar.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f4ca00"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.313708"
+     inkscape:cx="16.673422"
+     inkscape:cy="15.75252"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="892"
+     inkscape:window-height="653"
+     inkscape:window-x="540"
+     inkscape:window-y="218"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3410"
+       transform="matrix(0.21732933,0,0,0.21732688,2.4063677,16.673011)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3157-3"
+         d="m 38.646473,-74.476271 c -6.541856,-0.0089 -11.084439,6.296264 -17.660156,5.511719 -7.076765,0.91672 -13.038266,6.182308 -16.326176,11.996094 -5.49374001,0.469881 -4.40281001,7.553537 -3.78320001,11.328125 -0.38583,22.57608 -0.0377,45.29565185 -0.12109,67.927734 C 23.641272,22.191631 46.526673,22.090108 69.412098,21.994432 69.367108,14.168104 69.064322,6.1423728 69.177723,-1.5583022 81.943167,-4.9179532 85.560414,-21.616351 80.57616,-32.505568 c -1.378405,-3.631454 -4.279697,-6.702001 -7.054687,-9.03125 2.87129,-11.567792 -6.019201,-23.753224 -17.359375,-25.814453 -4.338541,-4.962636 -10.991271,-7.444471 -17.515625,-7.125 z"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.42937899;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="17.288969"
+         rx="17.333633"
+         cy="-52.591404"
+         cx="39.913322"
+         id="path3157"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#e5ff39;fill-opacity:1;fill-rule:evenodd;stroke:#aaaf00;stroke-width:4.42937899;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="17.288969"
+         rx="17.333633"
+         cy="-47.352322"
+         cx="23.892843"
+         id="path3155"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#e5ff39;fill-opacity:1;fill-rule:evenodd;stroke:#aaaf00;stroke-width:4.42937899;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <ellipse
+         ry="17.288969"
+         rx="17.333633"
+         cy="-45.518642"
+         cx="52.256969"
+         id="path3159"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#e5ff39;fill-opacity:1;fill-rule:evenodd;stroke:#aaaf00;stroke-width:4.42937899;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="rect2381"
+         d="M 4.2965851,-52.283183 63.98446,-51.759275 64.968052,18.57793 4.3635121,18.839883 4.2965851,-52.283183 Z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#b9d500;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.42937899;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3158"
+         d="m 63.999909,-39.488949 c 18.362354,0.200048 19.413503,34.7110821 0.787894,34.9993372"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8.85875797;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3161"
+         d="m 17.610842,-40.946368 0,47.6756423"
+         style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.42937899px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3163"
+         d="m 26.727794,-40.946368 0,47.6756423"
+         style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.42937899px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3165"
+         d="m 35.014235,-40.946368 0,47.6756423"
+         style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.42937899px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3160"
+         d="m 43.872993,-40.946368 0,47.6756423"
+         style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.42937899px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3162"
+         d="m 52.731751,-40.946368 0,47.6756423"
+         style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.42937899px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/bench.svg b/navit/icons/bench.svg
new file mode 100644
index 000000000..6f2b40ff3
--- /dev/null
+++ b/navit/icons/bench.svg
@@ -0,0 +1,410 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   sodipodi:docname="bench.svg"
+   inkscape:version="0.91 r13725"
+   xml:space="preserve"
+   id="Layer_1"
+   viewBox="12.5 44.907 57.374999 31.795826"
+   width="22"
+   height="22"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   version="1.0"><sodipodi:namedview
+     pagecolor="#ff00ff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="938"
+     inkscape:window-height="689"
+     id="namedview77"
+     showgrid="false"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="95.371787"
+     inkscape:cy="16.007613"
+     inkscape:window-x="248"
+     inkscape:window-y="170"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><metadata
+     id="metadata79"><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>bench g.aoi</dc:title><dc:description>jfitie@gmail.com</dc:description><cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /></cc:Work><cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"><cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF></metadata><defs
+     id="defs150"><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 103.9075 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="374.99999 : 103.9075 : 1"
+       inkscape:persp3d-origin="187.5 : 69.271667 : 1"
+       id="perspective81" /></defs><title
+     id="title3">bench g.aoi</title><g
+     id="g3659"
+     transform="matrix(0.21216376,0,0,0.21216184,-26.456315,34.735924)"><path
+       inkscape:connector-curvature="0"
+       id="path3654"
+       d="m 240.24267,39.985999 c -11.05725,0.762915 -11.30458,14.201647 -13.83947,22.310233 -1.36739,6.333271 -0.78909,13.750431 -3.45351,19.544377 -11.0028,-0.204534 -22.45764,2.742097 -30.71986,10.105823 -11.33227,4.172969 -11.24288,23.854488 2.48061,24.347698 8.00464,2.68885 17.46386,2.39977 24.59729,6.95285 -0.99336,12.03044 -9.56182,32.72196 6.86116,37.68799 8.60725,4.86759 17.2427,0.17654 19.687,-9.05143 0.88605,-7.61094 1.08052,-16.19851 3.13769,-22.86544 12.37247,0.14477 16.32769,15.65607 29.05426,16.24877 6.79609,3.40105 12.4831,-3.18229 16.58494,-5.52153 14.85027,4.14914 30.70549,5.51915 44.44729,11.6543 -0.35189,12.75302 -9.36036,28.86531 -0.29543,40.06164 8.60617,6.43644 26.1297,8.02853 27.44974,-6.41292 2.76787,-8.53552 0.39226,-21.48664 5.26176,-27.42936 6.51631,2.36221 8.038,12.29836 15.89222,14.02285 9.47188,5.98764 27.4832,2.4933 24.84178,-11.54733 0.25649,-4.74938 -6.98243,-8.36937 0.21902,-10.99721 6.78107,-10.47754 23.5365,1.34397 27.67386,-12.36741 4.79126,-15.67838 5.65473,-32.48111 10.7731,-47.860038 0.2852,-6.277729 7.49596,-15.630516 -2.84226,-19.070666 -17.97749,-2.979525 -35.42123,-6.387396 -53.25933,-9.45893 -32.90657,-1.404879 -65.70582,-9.188785 -98.48063,-12.970561 -14.54316,-5.197085 -30.09567,-2.743057 -44.9212,-6.482128 -3.68929,-0.55218 -7.41424,-0.968954 -11.15003,-0.901578 z"
+       style="fill:#ffffff;stroke:#ffffff;stroke-width:0.87021828" /><g
+       transform="matrix(0.87812658,0,0,0.87813208,142.568,-13.01737)"
+       id="g2884"><g
+         id="g5"
+         transform="matrix(0.765,0,0,0.765,47,34.971508)"><line
+           x1="138.5"
+           y1="174.907"
+           x2="138.5"
+           y2="174.907"
+           id="line7"
+           style="fill:#a05a2c" /><line
+           x1="95.5"
+           y1="130.907"
+           x2="95.5"
+           y2="130.907"
+           id="line9"
+           style="fill:#a05a2c" /><line
+           x1="95.5"
+           y1="130.907"
+           x2="95.5"
+           y2="130.907"
+           id="line11"
+           style="fill:#a05a2c" /><line
+           x1="95.5"
+           y1="130.907"
+           x2="95.5"
+           y2="130.907"
+           id="line13"
+           style="fill:#a05a2c" /><line
+           x1="95.5"
+           y1="130.907"
+           x2="95.5"
+           y2="130.907"
+           id="line15"
+           style="fill:#a05a2c" /><path
+           inkscape:connector-curvature="0"
+           d="m 127.5,168.907 c -6.442,-6.442 -11.455,-13.773 -16.889,-21.019 -1.376,-1.834 -2.935,-3.627 -3.963,-5.686 -0.853,-1.705 -2.595,-3.791 -3.898,-5.546 -1.303,-1.755 -1.645,-2.785 -2.75,-3.75 -0.795,-0.694 -1.57,-1.023 -3,-1.5 3.313,0.663 6.627,1.325 9.94,1.987 1.968,0.395 4.569,1.885 5.477,3.013 3.679,4.567 6.857,9.262 9.917,14.361 1.54,2.567 3.916,4.638 5.583,7.139 1.613,2.419 3.571,5.571 5.607,7.607 3.75,3.75 6.258,9.552 11.476,11.393 -6.521,-1.715 -12.845,-2.764 -17.5,-7.999"
+           id="path17"
+           style="fill:#a05a2c" /><line
+           x1="106"
+           y1="133.407"
+           x2="106"
+           y2="133.407"
+           id="line19"
+           style="fill:#a05a2c" /><line
+           x1="106"
+           y1="133.407"
+           x2="106"
+           y2="133.407"
+           id="line21"
+           style="fill:#a05a2c" /><line
+           x1="106"
+           y1="133.407"
+           x2="106"
+           y2="133.407"
+           id="line23"
+           style="fill:#a05a2c" /><path
+           inkscape:connector-curvature="0"
+           d="m 60.5,193.907 c 1.128,-10.202 2.024,-21.12 4.068,-31.34 0.529,-2.646 0.792,-5.319 1.235,-7.979 0.456,-2.734 1.474,-5.291 2.145,-7.973 0.28,-1.121 0.323,-2.295 0.604,-3.416 0.396,-1.585 0.089,-1.877 1.625,-1.512 3.108,0.74 6.215,1.48 9.323,2.22 -1.24,4.961 -1.211,9.771 -2.055,14.834 -0.842,5.056 -2.685,10.246 -3.797,15.25 -1.163,5.233 0.336,10.517 -0.534,15.735 -0.511,3.066 1.09,7.727 0.386,12.181 -4.45,-1.271 -13.527,-1.663 -13,-8"
+           id="path25"
+           style="fill:#a05a2c" /><line
+           x1="79"
+           y1="144.407"
+           x2="79"
+           y2="144.407"
+           id="line27"
+           style="fill:#a05a2c" /><line
+           x1="79"
+           y1="144.407"
+           x2="79"
+           y2="144.407"
+           id="line29"
+           style="fill:#a05a2c" /><line
+           x1="77"
+           y1="146.907"
+           x2="77"
+           y2="146.907"
+           id="line31"
+           style="fill:#a05a2c" /><path
+           inkscape:connector-curvature="0"
+           d="m 60.5,146.407 c -2.115,-1.918 -1.717,-6.561 0.156,-8.656 1.979,-2.214 4.022,-4.269 6.344,-6.344 2.43,-2.173 5.67,-3.585 8.5,-5 3.396,-1.698 6.771,-3.091 10.405,-4.302 3.328,-1.109 7.438,-1.054 10.927,-1.49 3.847,-0.48 7.011,0.412 10.775,0.95 1.152,0.165 3.285,1.136 4.393,0.842 1.054,-0.279 1.609,-1.609 2.25,-2.25 1.617,-1.617 2.58,-6.981 3.25,-9.25 1.719,-5.817 1.784,-11.923 2.963,-17.815 1.206,-6.028 1.823,-12.187 2.695,-18.292 0.91,-6.373 3.054,-12.529 5.092,-18.643 0.461,-1.384 1.436,-2.778 2.25,-4 0.243,-0.365 2.609,-1.787 3.058,-1.744 3.481,0.331 6.981,0.907 10.462,1.239 -2.425,1.788 -4.787,4.559 -5.77,7.505 -0.623,1.867 -1.381,3.035 -1.723,5.084 -0.315,1.891 0.324,3.624 0.048,5.559 -1.014,7.096 -3.658,14.288 -3.658,21.513 0,1.635 -1.967,3.342 -2.287,4.946 -0.315,1.575 -0.306,3.353 -0.682,4.856 -0.429,1.713 -0.317,3.398 -0.87,5.058 -0.521,1.565 -0.884,3.265 -1.208,4.883 -0.791,3.956 -2.032,15.089 -8.036,13.296 -10.734,-3.205 -23.224,-1.46 -32.912,4.354 -5.507,3.304 -24.716,14.34 -14.422,21.202 -3.91,-0.931 -8.787,-1.359 -12,-3.501"
+           id="path33"
+           style="fill:#a05a2c" /><line
+           x1="310"
+           y1="216.907"
+           x2="310"
+           y2="216.907"
+           id="line35"
+           style="fill:#a05a2c" /><line
+           x1="310"
+           y1="216.907"
+           x2="310"
+           y2="216.907"
+           id="line37"
+           style="fill:#a05a2c" /><line
+           x1="309.5"
+           y1="216.907"
+           x2="309.5"
+           y2="216.907"
+           id="line39"
+           style="fill:#a05a2c" /><line
+           x1="309.5"
+           y1="216.907"
+           x2="309.5"
+           y2="216.907"
+           id="line41"
+           style="fill:#a05a2c" /><line
+           x1="247"
+           y1="183.407"
+           x2="247"
+           y2="183.407"
+           id="line43"
+           style="fill:#a05a2c" /><line
+           x1="247"
+           y1="183.407"
+           x2="247"
+           y2="183.407"
+           id="line45"
+           style="fill:#a05a2c" /><path
+           inkscape:connector-curvature="0"
+           d="m 322.5,220.407 c -4.032,-1.046 -8.064,-2.091 -12.096,-3.136 -2.597,-0.674 -5.271,-1.232 -7.248,-3.208 -4.501,-4.501 -8.535,-10.195 -11.725,-15.776 -3.527,-6.173 -7.109,-12.235 -10.283,-18.584 -0.71,-1.419 -1.463,-2.967 -2.148,-4.296 -0.502,-0.975 -2,-2.241 -2,-3.25 0,-0.515 -1.5,-0.985 -1.5,-1.5 0,-0.837 -2.469,-0.575 -3,-1.25 3.895,0.835 7.789,1.669 11.684,2.504 2.046,0.438 4.99,1.077 6.316,2.496 0.068,0.073 1.418,0.642 1.418,0.75 0,0.649 0.322,-0.072 0.5,0.25 0.288,0.525 0.375,1.375 0.75,1.75 1.033,1.034 1.711,2.635 2.172,4.016 1.001,3.005 2.934,6.708 4.828,9.234 1.004,1.339 1.538,2.841 2.198,4.38 0.608,1.422 1.794,2.67 2.569,4.027 1.783,3.119 2.299,6.15 4.147,9.231 3.121,5.202 7.264,10.824 13.418,12.362"
+           id="path47"
+           style="fill:#a05a2c" /><line
+           x1="278"
+           y1="174.907"
+           x2="278"
+           y2="174.907"
+           id="line49"
+           style="fill:#a05a2c" /><path
+           inkscape:connector-curvature="0"
+           d="m 253.418,240.407 c 1.932,-11.594 1.344,-23.31 3.65,-34.84 1.113,-5.569 3.353,-11.171 5.15,-16.565 0.154,-0.462 -0.605,-3.066 -0.762,-3.105 -1.331,-0.333 -2.662,-0.666 -3.994,-0.998 -3.321,-0.83 -6.643,-1.661 -9.963,-2.491 -0.004,3.052 -1.598,6.083 -2.1,9.095 -0.6,3.604 -1.62,7.005 -2.332,10.565 -1.48,7.399 -1.824,14.991 -3.465,22.372 -1.324,5.961 -2.104,13.127 -2.104,19.202 0,1.795 0.064,2.894 0.87,4.507 0.438,0.877 2.484,1.146 3.317,1.384 3.938,1.125 8.021,2.015 11.959,3.14 -3.9,-2.234 -0.683,-9.53 -0.226,-12.266 z"
+           id="path51"
+           style="fill:#a05a2c" /><path
+           inkscape:connector-curvature="0"
+           d="m 254.418,183.907 c 0.866,-2.599 1.995,-5.913 3.926,-7.844 2.174,-2.173 4.536,-4.19 7.008,-6.045 6.09,-4.567 12.298,-5.95 19.602,-8.038 1.459,-0.416 3.049,-1.448 4.552,-1.637 2.612,-0.326 3.927,-0.312 6.448,0.407 1.586,0.453 8.465,2.329 8.465,-0.594 0,-0.835 -0.276,-2.33 0.082,-3.25 0.701,-1.8 1.49,-3.454 1.87,-5.353 0.696,-3.48 2.634,-6.993 3.495,-10.439 1.31,-5.237 1.963,-10.676 2.855,-16.027 0.945,-5.674 0.549,-11.336 1.262,-17.043 0.695,-5.562 3.052,-11.488 4.828,-16.818 1.562,-4.686 1.664,-11.073 6.362,-13.422 -4.21,-0.601 -8.593,-1.601 -12.803,-2.202 -3.57,-0.51 -4.546,3.007 -5.87,5.554 -1.477,2.843 -2.3,6.8 -3.156,9.797 -1.038,3.634 -1.561,7.322 -2.47,10.958 -1.819,7.278 -2.611,14.918 -3.847,22.329 -0.285,1.712 -0.685,4.593 -0.771,5.642 -0.087,1.05 -0.396,2.186 -0.756,4.209 -0.359,2.024 -1.215,7.101 -1.803,10.635 -0.292,1.749 -0.656,3.395 -1.148,5.166 -0.491,1.771 -0.909,3.235 -1.679,4.773 -1.062,2.126 -1.603,4.241 -4.13,4.241 -1.643,0 -3.137,-0.925 -4.777,-1.13 -2.146,-0.268 -4.147,-0.37 -6.312,-0.37 -3.608,0 -7.438,0.909 -10.709,2.311 -6.271,2.688 -12.705,5.452 -17.598,10.346 -4.357,4.357 -9.344,8.944 -9.344,15.578 0,2.972 2.251,4.212 4.816,4.762 3.895,0.835 7.789,1.669 11.684,2.504 -3.857,-1.343 -1.021,-6.184 -0.082,-9 z"
+           id="path53"
+           style="fill:#a05a2c" /></g><g
+         id="g55"
+         transform="matrix(0.765,0,0,0.765,47,34.971508)"><line
+           x1="110.5"
+           y1="122.407"
+           x2="110.5"
+           y2="122.407"
+           id="line57"
+           style="fill:#784421" /><path
+           inkscape:connector-curvature="0"
+           d="m 147,166.407 c -1.478,-0.961 -4.314,-3.204 -6.75,-6 -2.436,-2.796 -4.633,-5.96 -6.75,-8.5 -2.438,-2.927 -4.527,-6.038 -6.74,-9.136 -0.943,-1.32 -1.702,-2.777 -2.604,-4.13 -0.734,-1.101 -1.688,-2.87 -2.656,-3.734 0.451,0.056 2.644,-0.61 3.12,-0.878 0.802,-0.45 3.097,-2.64 3.576,-3.107 0.802,-0.781 1.531,-1.698 1.882,-2.749 0.568,-1.704 1.278,-3.335 1.844,-5.031 1.122,-3.366 2.52,-6.384 3.105,-9.9 0.616,-3.695 1.161,-7.43 1.973,-11.084 1.634,-7.352 1.596,-15.134 3.417,-22.418 0.862,-3.449 1.09,-6.924 2.083,-10.332 0.275,-0.944 0.932,-3.501 1.25,-4.25 0.466,-1.097 0.211,-2.127 1,-3.5 1.392,-2.422 2.89,-5.737 1.25,-8.25 -2.705,-4.145 -4.736,0.104 -6.5,2.75 -2.008,3.012 -2.484,6.701 -3.606,10.069 -1.151,3.455 -1.799,7.518 -2.315,11.134 -0.493,3.451 -1.145,6.879 -1.828,10.297 -0.699,3.493 -0.691,7.015 -1.574,10.546 -0.815,3.262 -0.794,6.678 -1.624,9.996 -0.823,3.295 -1.227,6.733 -2.302,9.958 -0.766,2.297 -1.917,5.884 -4.25,6.25 -1.557,0.245 -2.959,-0.319 -4.405,-0.802 -1.647,-0.549 -3.513,-0.5 -5.232,-0.715 -6.816,-0.853 -15.613,0.392 -21.812,3.491 -5.975,2.987 -11.813,5.788 -16.551,10.525 -1.896,1.896 -4.5,4.833 -4.5,7.734 0,2.376 1.517,5.921 4.5,5.266 1.082,-0.237 2.354,-1.708 2.87,-2.741 0.638,-1.273 1.536,-2.164 2.63,-3.259 -0.857,3.431 -1.699,6.796 -2.552,10.208 -0.898,3.592 -1.001,7.278 -1.8,10.876 -1.625,7.313 -3.26,17.835 -3.776,25.28 -0.217,3.127 -0.439,3.74 -0.372,6.87 0.076,3.509 2.599,6.667 5.656,3.609 1.021,-1.021 2.344,-1.983 2.344,-3.578 0,-1.938 0.152,-3.681 0.473,-5.6 0.571,-3.431 0.654,-6.927 1.226,-10.355 1.254,-7.524 2.018,-15.108 3.274,-22.645 0.53,-3.181 1.657,-6.624 2.527,-9.666 0.437,-1.524 0.656,-2.812 1.37,-4.241 0.292,-0.584 0.35,-1.173 0.63,-1.759 0.308,-0.644 0.795,-1.091 1.13,-1.759 2.521,-5.045 8.594,-7.741 14.12,-7.741 2.669,0 4.874,0.101 6.75,2 0.463,0.47 1.256,1.597 2,2.5 0.83,1.007 2.031,2.562 2.604,3.708 1.281,2.562 3.193,4.787 4.693,7.287 1.645,2.742 3.81,4.949 5.703,7.505 3.522,4.759 6.815,9.815 11,14 2.482,2.482 8.861,8.763 12.5,6.5 2.066,-1.285 2.5,-4.063 2.5,-6.25 0,-1.063 -0.625,-2.573 -1.5,-3.25 -0.766,-0.592 -1.523,-0.038 -3.001,-0.999 z"
+           id="path59"
+           style="fill:#784421" /><path
+           inkscape:connector-curvature="0"
+           d="m 290.5,174.407 c 0.248,0.413 2.725,5.181 3.5,7 1.437,3.372 4.75,9.184 5.438,10.354 0.688,1.17 1.039,2.361 1.875,3.615 1.223,1.835 2.341,3.675 3.436,5.589 1.793,3.139 3.805,6.197 5.669,9.304 1.982,3.305 9.233,12.048 13.083,9.639 2.642,-1.653 3.19,-5.136 3,-8 -0.229,-3.439 -3.128,-2.628 -5.156,-4.656 -9.326,-9.327 -15.088,-22.332 -20.844,-33.844 1.017,0.228 2.337,-0.919 3.24,-1.37 1.279,-0.64 1.998,-1.536 3.008,-2.546 0.326,-0.326 1.179,-2.198 1.404,-2.661 0.396,-0.811 0.969,-1.721 1.258,-2.588 0.59,-1.771 0.725,-2.865 1.434,-4.601 0.636,-1.556 0.815,-3.225 1.156,-4.734 0.451,-2.001 1.062,-3.874 1.4,-5.905 0.589,-3.529 1.498,-7.04 2.1,-10.595 2.479,-14.647 4.342,-29.37 7.948,-43.792 0.714,-2.859 2.065,-5.248 2.974,-7.974 0.82,-2.46 2.439,-7.054 -0.662,-8.604 -1.565,-0.783 -2.223,0.016 -3.26,1.37 -1.131,1.476 -1.994,2.983 -2.578,4.734 -1.182,3.546 -2.588,6.931 -3.505,10.598 -3.503,14.012 -4.342,28.793 -7.167,42.918 -0.709,3.544 -1.627,7.012 -2.223,10.584 -0.586,3.521 -1.768,6.382 -3.027,9.666 -0.4,1.044 -0.767,2.094 -1.5,3 -1.047,1.294 -1.451,0.849 -3,0.5 -1.824,-0.41 -3.588,-0.668 -5.393,-1.184 -1.803,-0.515 -3.415,0.184 -5.258,0.184 -7.541,0 -14.375,3.615 -20.711,7.417 -2.703,1.621 -5.238,4.117 -7.639,6.083 -2.402,1.968 -4.49,4.481 -5.871,7.241 -0.906,1.812 -2.629,3.707 -2.629,5.993 0,2.057 0.061,5.039 2,5.766 1.888,0.707 3.586,-0.673 4.371,-2.241 0.859,-1.719 2.049,-3.138 3.129,-4.759 -0.727,3.632 -1.632,7.396 -2.802,10.905 -1.171,3.513 -1.384,7.525 -2.111,11.159 -1.45,7.253 -2.3,14.642 -3.216,21.973 -0.462,3.688 -0.859,7.392 -1.471,11.058 -0.491,2.951 -1.674,6.859 -0.271,9.664 2.033,4.065 4.919,1.365 6.371,-1.759 0.688,-1.481 0.553,-3.211 0.948,-4.792 0.437,-1.746 0.589,-3.582 0.768,-5.368 1.478,-14.769 3.511,-29.743 7.108,-44.136 1.492,-5.967 2.527,-11.512 6.676,-16.204 1.311,-1.483 2.652,-3.128 5.26,-4 2.606,-0.872 3.732,-1.257 4.506,-1.422 0.774,-0.165 1.291,-0.204 1.994,-0.208 0.702,-0.003 1.109,0.035 1.99,0.13 0.881,0.095 3.002,1.086 3.25,1.499 z"
+           id="path61"
+           style="fill:#784421" /></g><g
+         id="g63"
+         transform="matrix(0.765,0,0,0.765,47,34.971508)"><line
+           x1="86"
+           y1="45.907001"
+           x2="86"
+           y2="45.907001"
+           id="line65"
+           style="fill:#a05a2c" /><line
+           x1="86"
+           y1="45.907001"
+           x2="86"
+           y2="45.907001"
+           id="line67"
+           style="fill:#a05a2c" /><line
+           x1="86"
+           y1="45.907001"
+           x2="86"
+           y2="45.907001"
+           id="line69"
+           style="fill:#a05a2c" /><line
+           x1="86"
+           y1="45.907001"
+           x2="86"
+           y2="45.907001"
+           id="line71"
+           style="fill:#a05a2c" /><line
+           x1="86"
+           y1="45.907001"
+           x2="86"
+           y2="45.907001"
+           id="line73"
+           style="fill:#a05a2c" /><polygon
+           points="383.815,99.188 383.5,99.907 383.295,100.559 383.267,100.97 383.13,101.463 382.938,102.012 382.5,102.407 81,55.407 80.392,54.979 80,54.407 79.834,53.694 79.742,53.131 79.75,52.288 79.868,51.595 80.307,50.451 80.5,49.907 81,48.907 81.294,48.326 81.794,47.326 82.132,46.634 82.621,45.803 83.263,45.248 84,44.907 84.5,44.907 84.5,44.907 387,88.407 387.5,88.907 387.5,89.407 387,90.407 386,92.407 385.5,93.907 384.803,95.65 384.303,97.65 "
+           id="polygon75"
+           style="fill:#a05a2c" /><polygon
+           points="70.5,99.907 70.5,100.407 70.5,101.407 70.5,102.407 70.667,103.105 71,103.907 71.5,104.407 371,163.907 371.53,163.795 371.753,162.947 372,161.407 372.342,159.94 372.729,158.457 373,156.791 373.257,155.389 373.5,154.407 373.684,153.397 373.866,152.382 374,151.407 374.09,150.086 374,149.407 74.5,92.907 74,92.907 73.33,93.159 72.498,93.741 72,94.407 71.707,95.219 71.5,95.907 71.354,96.363 71.249,96.779 71.249,96.779 71.083,97.175 70.937,97.674 70.792,98.236 70.688,98.694 70.625,99.214 "
+           id="polygon77"
+           style="fill:#a05a2c" /><line
+           x1="75.5"
+           y1="87.406998"
+           x2="75.5"
+           y2="87.406998"
+           id="line79"
+           style="fill:#a05a2c" /><line
+           x1="75.5"
+           y1="87.906998"
+           x2="75.5"
+           y2="87.906998"
+           id="line81"
+           style="fill:#a05a2c" /><line
+           x1="75.5"
+           y1="87.906998"
+           x2="75.5"
+           y2="87.906998"
+           id="line83"
+           style="fill:#a05a2c" /><polygon
+           points="73.5,82.907 73.5,83.907 73.5,84.407 73.5,85.407 73.5,86.407 73.697,86.963 74,87.407 74.827,88.094 75.5,88.407 375,143.407 375.5,143.407 375.672,142.819 375.727,142.113 375.821,141.025 376,139.907 376.412,137.445 376.741,135.389 377,133.407 377.5,130.907 377.619,129.302 377.5,128.407 77,76.407 77,76.407 76.443,76.557 75.797,76.896 75,77.407 74.555,77.853 74.278,78.593 73.987,79.579 73.809,80.37 73.68,81.243 73.5,81.907 "
+           id="polygon85"
+           style="fill:#a05a2c" /><polygon
+           points="76,66.907 76,66.407 76.188,65.268 76.347,64.391 76.5,63.907 76.746,62.876 77,61.907 77.444,61.242 77.882,60.764 78.5,60.407 79.277,60.325 80,60.407 80,60.407 381.5,107.907 381,109.907 380.5,112.907 380,115.407 379.5,117.907 379,120.407 378.5,122.907 78,71.907 77.264,71.684 76.487,71.066 76.125,70.532 76,69.907 76,68.907 76,67.907 "
+           id="polygon87"
+           style="fill:#a05a2c" /><line
+           x1="366.5"
+           y1="170.407"
+           x2="366.5"
+           y2="170.407"
+           id="line89"
+           style="fill:#a05a2c" /><polygon
+           points="66.869,109.841 66.5,109.741 66.226,109.588 65.349,109.643 64.777,109.797 64.377,110.006 63.73,110.523 63.014,111.24 62.855,112.093 63.19,112.496 63.682,112.67 64.107,112.758 64.446,112.903 64.967,113.002 65.394,113.102 65.724,113.223 66.5,113.407 366,175.407 366.23,175.334 366.746,175.099 367,174.907 367.311,174.629 367.5,174.407 367.817,174.135 368,173.907 368.251,173.441 368.5,172.907 368.768,172.443 369,171.907 369.367,171.15 369.5,170.407 369.438,169.939 368.994,169.297 368.5,168.907 69.5,108.407 69,108.407 68.291,108.684 67.784,109.125 67.5,109.407 67.123,109.709 67.123,109.709 "
+           id="polygon91"
+           style="fill:#a05a2c" /><line
+           x1="352"
+           y1="173.907"
+           x2="352"
+           y2="173.907"
+           id="line93"
+           style="fill:#a05a2c" /><line
+           x1="352"
+           y1="173.907"
+           x2="352"
+           y2="173.907"
+           id="line95"
+           style="fill:#a05a2c" /><polygon
+           points="56.928,107.764 55.893,107.68 55.379,107.651 54.893,107.68 53.928,107.764 53.472,107.833 53,107.907 52,108.407 51.5,108.907 51,109.407 50.5,110.407 50.5,111.407 50.5,111.407 352,174.407 353.151,174.441 354.807,174.394 356.276,174.3 357.688,174.14 358.803,174.041 359.895,173.83 360,172.907 360,171.407 359.725,170.414 359.5,169.907 359,169.407 58,107.907 57.472,107.833 "
+           id="polygon97"
+           style="fill:#a05a2c" /><line
+           x1="343.40799"
+           y1="172.715"
+           x2="343.40799"
+           y2="172.715"
+           id="line99"
+           style="fill:#a05a2c" /><line
+           x1="344"
+           y1="172.407"
+           x2="344"
+           y2="172.407"
+           id="line101"
+           style="fill:#a05a2c" /><line
+           x1="345"
+           y1="171.907"
+           x2="345"
+           y2="171.907"
+           id="line103"
+           style="fill:#a05a2c" /><line
+           x1="345.26001"
+           y1="171.69901"
+           x2="345.26001"
+           y2="171.69901"
+           id="line105"
+           style="fill:#a05a2c" /><polygon
+           points="344.699,176.686 345.5,176.407 346.11,176.133 346.651,175.957 347.59,175.639 348.484,175.193 348.86,174.828 348.723,173.832 348.5,172.907 348,171.907 347.5,171.407 45.5,108.907 44.494,108.826 43.931,108.77 43.431,108.77 42.931,108.77 42.431,108.77 41.846,108.797 41.273,108.983 40.658,109.152 40.17,109.276 39.761,109.43 39,109.907 38.5,110.407 37.884,111.258 37.5,111.907 37.276,113.049 37.5,113.907 37.5,113.907 340.5,178.407 341,178.407 342.059,178.013 342.691,177.625 343.332,177.355 344.053,176.99 "
+           id="polygon107"
+           style="fill:#a05a2c" /><polygon
+           points="336.5,178.907 336,177.907 32.5,113.407 31.626,112.97 31,112.907 30.046,113.194 29.5,113.407 28.824,113.729 28.038,114.079 27.5,114.407 26.845,114.823 26,115.407 25.5,115.907 25,116.407 24.289,117.238 24,117.907 24,118.907 24.5,119.907 24.5,119.907 328.5,187.407 329.281,187.105 329.781,186.605 330.281,186.105 331.281,185.105 332.701,183.96 333.5,183.407 334.629,182.479 336,181.407 337,180.407 337,179.907 "
+           id="polygon109"
+           style="fill:#a05a2c" /><line
+           x1="14"
+           y1="132.407"
+           x2="14"
+           y2="132.407"
+           id="line111"
+           style="fill:#a05a2c" /><line
+           x1="13.5"
+           y1="131.907"
+           x2="13.5"
+           y2="131.907"
+           id="line113"
+           style="fill:#a05a2c" /><line
+           x1="13.5"
+           y1="131.907"
+           x2="13.5"
+           y2="131.907"
+           id="line115"
+           style="fill:#a05a2c" /><line
+           x1="20.5"
+           y1="122.407"
+           x2="20.5"
+           y2="122.407"
+           id="line117"
+           style="fill:#a05a2c" /><line
+           x1="20.5"
+           y1="122.407"
+           x2="20.5"
+           y2="122.407"
+           id="line119"
+           style="fill:#a05a2c" /><line
+           x1="20.5"
+           y1="122.407"
+           x2="20.5"
+           y2="122.407"
+           id="line121"
+           style="fill:#a05a2c" /><line
+           x1="20.5"
+           y1="122.407"
+           x2="20.5"
+           y2="122.407"
+           id="line123"
+           style="fill:#a05a2c" /><polygon
+           points="319.727,199.978 320,199.407 320.5,197.907 321.5,196.407 322,195.407 322.747,194.243 323.57,192.998 324.57,191.998 325,191.407 325.085,190.895 325,190.407 324,189.407 19.5,121.407 19,121.407 18,121.407 17.5,121.907 16.5,122.407 16,122.907 15.5,123.407 14.5,124.407 14,124.907 13.5,125.907 13,126.907 12.5,127.907 12.5,128.407 12.5,129.407 12.5,130.407 13,131.407 13.5,131.907 14,132.407 14,132.407 319,203.907 319.257,203.586 319.316,202.588 319.316,201.588 319.557,200.56 "
+           id="polygon125"
+           style="fill:#a05a2c" /></g><g
+         id="g127"
+         transform="matrix(0.765,0,0,0.765,47,34.971508)"><polygon
+           points="384.803,95.65 385.5,93.907 386,92.407 387,90.407 387.5,89.407 387.5,88.907 387,88.407 386.5,88.407 386,88.407 385,88.907 384.5,89.407 384,90.407 383.612,91.568 383.27,92.356 383,93.407 382.5,94.407 382.207,95.44 382,96.407 381.693,97.737 381.5,98.907 381.5,99.907 381.624,100.753 381.761,101.404 382.172,101.987 382.172,101.987 382.5,102.407 382.938,102.012 383.13,101.463 383.267,100.97 383.295,100.559 383.5,99.907 383.815,99.188 384.303,97.65 "
+           id="polygon129"
+           style="fill:#784421" /><polygon
+           points="370,158.907 370,160.407 370,161.407 370,162.407 370.27,163.473 371,163.907 371.53,163.795 371.753,162.947 372,161.407 372.342,159.94 372.729,158.457 373,156.791 373.257,155.389 373.5,154.407 373.684,153.397 373.866,152.382 374,151.407 374.09,150.086 374,149.407 373.452,149.455 373,149.907 372.5,150.407 372,151.407 371.5,152.407 371.225,153.018 371.071,153.479 370.855,153.957 370.67,154.496 370.67,154.496 370.547,155.05 370.393,155.589 370.254,156.112 370.177,156.574 370.039,157.684 370.039,158.184 "
+           id="polygon131"
+           style="fill:#784421" /><polygon
+           points="376.346,129.238 376,129.907 375.5,130.907 375,131.907 374.5,132.907 374.221,133.928 374.016,134.961 373.844,135.887 373.639,136.841 373.467,137.807 373.467,138.801 373.5,139.907 373.5,140.907 373.844,142.021 374.344,143.021 375,143.407 375,143.407 375.5,143.407 375.672,142.819 375.727,142.113 375.821,141.025 376,139.907 376.412,137.445 376.741,135.389 377,133.407 377.5,130.907 377.619,129.302 377.5,128.407 376.895,128.689 "
+           id="polygon133"
+           style="fill:#784421" /><polygon
+           points="377.305,114.979 377.076,115.975 377.066,116.897 377,117.907 377,118.907 377,120.407 377.168,121.25 377.5,121.907 378,122.407 378.5,122.907 378.5,122.907 379,120.407 379.5,117.907 380,115.407 380.5,112.907 381,109.907 381.5,107.907 381,107.907 380.5,107.907 380,108.407 379.5,108.907 379,109.907 378.5,110.907 378.197,111.825 377.785,112.956 377.536,113.964 "
+           id="polygon135"
+           style="fill:#784421" /><line
+           x1="366.5"
+           y1="170.407"
+           x2="366.5"
+           y2="170.407"
+           id="line137"
+           style="fill:#784421" /><polygon
+           points="367,170.407 366.733,171.09 366.004,171.175 365.471,171.074 364.5,170.907 364,171.407 363.5,172.407 363,173.407 363.076,174.256 363.33,174.594 363.686,174.729 364,174.907 364.428,175.082 364.85,175.169 365.37,175.277 366,175.407 366.23,175.334 366.746,175.099 367,174.907 367.311,174.629 367.5,174.407 367.817,174.135 368,173.907 368.251,173.441 368.5,172.907 368.768,172.443 369,171.907 369.367,171.15 369.5,170.407 369.438,169.939 369.438,169.939 368.994,169.297 368.5,168.907 367.883,169.025 367.5,169.407 367,169.907 "
+           id="polygon139"
+           style="fill:#784421" /><polygon
+           points="352.5,171.907 352.16,172.885 352,173.907 352,174.407 353.151,174.441 354.807,174.394 356.276,174.3 357.688,174.14 358.803,174.041 359.895,173.83 359.895,173.83 360,172.907 360,171.407 359.725,170.414 359.5,169.907 359,169.407 358.5,169.407 357.5,169.407 357,169.407 356.5,169.407 356,169.407 355.5,169.407 355,169.407 354.141,169.703 353.411,170.041 352.871,170.854 "
+           id="polygon141"
+           style="fill:#784421" /><polygon
+           points="346.651,175.957 347.59,175.639 348.484,175.193 348.86,174.828 348.723,173.832 348.5,172.907 348,171.907 347.5,171.407 347,171.365 346.5,171.351 346,171.407 345.676,171.547 345.26,171.699 345,171.907 344.44,172.174 344,172.407 343.408,172.715 343,172.907 342.393,173.273 341.5,173.907 341,174.907 340.683,175.932 340.5,177.407 340.5,178.407 340.5,178.407 341,178.407 342.059,178.013 342.691,177.625 343.332,177.355 344.053,176.99 344.699,176.686 345.5,176.407 346.11,176.133 "
+           id="polygon143"
+           style="fill:#784421" /><polygon
+           points="328.817,183.903 328.174,185.748 328.174,186.51 328.5,187.407 329.281,187.105 330.281,186.105 331.281,185.105 332.701,183.96 333.5,183.407 334.629,182.479 336,181.407 337,180.407 337,180.407 337,179.907 336.5,178.907 336,177.907 335.465,177.864 335,177.907 334,178.407 333.59,178.59 333,178.907 332.253,179.385 331.5,179.907 331,180.407 330.5,180.907 329.909,181.77 329.409,182.77 "
+           id="polygon145"
+           style="fill:#784421" /><polygon
+           points="321,191.907 320.243,192.84 319.743,193.84 319,194.907 318.5,195.907 318,196.907 317.576,198.021 317.5,199.407 317.5,200.407 317.5,201.407 317.561,202.387 318,203.407 318.389,203.674 319,203.907 319.257,203.586 319.316,202.588 319.316,201.588 319.557,200.56 319.727,199.978 320,199.407 320.5,197.907 321.5,196.407 322,195.407 322.747,194.243 323.57,192.998 324.57,191.998 325,191.407 325.085,190.895 325.085,190.895 325,190.407 324,189.407 323.5,189.407 323.01,189.559 322.5,189.907 321.606,190.963 "
+           id="polygon147"
+           style="fill:#784421" /></g></g></g></svg>
\ No newline at end of file
diff --git a/navit/xpm/bicycle_parking.svg b/navit/icons/bicycle_parking.svg
index da4246e2e..da4246e2e 100644
--- a/navit/xpm/bicycle_parking.svg
+++ b/navit/icons/bicycle_parking.svg
diff --git a/navit/xpm/bicycle_rental.svg b/navit/icons/bicycle_rental.svg
index 9392ad4a8..9392ad4a8 100644
--- a/navit/xpm/bicycle_rental.svg
+++ b/navit/icons/bicycle_rental.svg
diff --git a/navit/icons/bicycle_shop.svg b/navit/icons/bicycle_shop.svg
new file mode 100644
index 000000000..7d97366e4
--- /dev/null
+++ b/navit/icons/bicycle_shop.svg
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="bicycle_shop.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title></dc:title>
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="23.451328"
+     inkscape:cy="49.511077"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="874"
+     inkscape:window-width="1440"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:zoom="2.8284271"
+     objecttolerance="10.0"
+     pagecolor="#ff00ff"
+     showgrid="false"
+     inkscape:window-maximized="1" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       id="perspective12"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <style
+       id="style6"
+       type="text/css">
+    .fil0 {fill:#EF7900}
+  </style>
+    <inkscape:perspective
+       id="perspective6807"
+       inkscape:persp3d-origin="29.116032 : 19.410688 : 1"
+       inkscape:vp_x="0 : 29.116032 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="58.232063 : 29.116032 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6954"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       id="ArrowStart"
+       markerHeight="3"
+       markerUnits="strokeWidth"
+       markerWidth="4"
+       orient="auto"
+       refX="10"
+       refY="5"
+       viewBox="0 0 10 10">
+      <path
+         d="M 10,0 0,5 10,10 Z"
+         id="path2295"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="ArrowEnd"
+       markerHeight="3"
+       markerUnits="strokeWidth"
+       markerWidth="4"
+       orient="auto"
+       refX="0"
+       refY="5"
+       viewBox="0 0 10 10">
+      <path
+         d="M 0,0 10,5 0,10 Z"
+         id="path2292"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <inkscape:perspective
+       id="perspective7597"
+       inkscape:persp3d-origin="178.5405 : 158.483 : 1"
+       inkscape:vp_x="0 : 237.7245 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="357.08099 : 237.7245 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <ellipse
+     id="FrontWheel-1"
+     style="fill:none;stroke:#ffffff;stroke-width:2.24440885;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     cx="-17.331921"
+     cy="13.770599"
+     rx="3.5458753"
+     ry="4.1071954"
+     transform="scale(-1,1)" />
+  <ellipse
+     id="RearWheel-8"
+     style="fill:none;stroke:#ffffff;stroke-width:2.24440885;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     cx="-4.6680803"
+     cy="13.694069"
+     rx="3.5458753"
+     ry="4.1071954"
+     transform="scale(-1,1)" />
+  <path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.02370328;stroke-opacity:1"
+     d="m 13.072607,3.271816 c -0.652861,-0.09 -1.234442,-0.0093 -1.005618,0.837694 -0.07488,0.913962 0.870876,1.183873 1.50229,1.54695 C 12.28851,6.009809 10.769782,6.28904 9.5104239,5.68232 10.443169,5.014051 9.5623239,3.917071 8.6604279,4.13274 7.646764,4.363589 6.4666557,3.959426 5.5523953,4.34841 4.9295532,5.076721 5.4837843,6.490658 6.5571358,6.187742 6.163037,8.022295 5.1897706,9.658856 4.6546167,11.44711 c -0.3695135,1.01996 -1.4763532,2.483412 -0.5593584,3.46431 1.4205186,0.531248 2.994827,-0.13263 4.478811,0.174464 1.3974103,0.218366 2.8823307,-0.208709 3.5547297,-1.543004 1.069524,-1.360403 2.020921,-2.810541 3.133897,-4.137621 0.766248,1.67573 0.489177,3.864291 1.852984,5.212463 1.176439,0.176677 1.340299,-1.401218 0.805282,-2.141795 C 17.014507,9.593585 16.734744,6.410493 15.241655,3.769345 14.645097,3.262795 13.810672,3.269182 13.072607,3.271814 Z m -2.860355,4.581673 c 1.337462,0.0029 2.674926,0.0055 4.012387,0.0088 -1.32826,1.676523 -2.656478,3.353081 -3.985208,5.029233 C 10.611938,11.263134 9.0788661,9.991377 9.2899245,8.426889 9.4135347,8.035328 9.8230064,7.840916 10.212252,7.853522 Z m -2.3847243,2.380699 c -0.00533,0.91971 1.7116012,3.060017 0.266528,2.959326 -0.7817065,0.0894 -1.6323426,0.175278 -2.4289997,-0.07189 0.9768681,-1.207357 1.1989847,-2.770182 1.7368159,-4.180579 0.1418852,0.431048 0.2837705,0.862095 0.4256558,1.293144 z"
+     id="Frame-7"
+     inkscape:connector-curvature="0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#ad30c0;stroke:none"
+     id="path2323"
+     d="" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#ad30c0;stroke:none"
+     id="path2329"
+     d="" />
+  <g
+     id="g4349"
+     transform="matrix(0.22407301,0,0,0.22406536,-0.20000752,-0.177659)">
+    <ellipse
+       ry="18.330345"
+       rx="15.824643"
+       transform="scale(-1,1)"
+       cy="62.095139"
+       cx="-78.181404"
+       style="fill:none;stroke:#ad30c0;stroke-width:4.2314229px;stroke-opacity:1"
+       id="FrontWheel" />
+    <ellipse
+       ry="18.330345"
+       rx="15.824643"
+       transform="scale(-1,1)"
+       cy="61.753578"
+       cx="-21.664818"
+       style="fill:none;stroke:#ad30c0;stroke-width:4.2314229px;stroke-opacity:1"
+       id="RearWheel" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.10578556;stroke-opacity:1"
+       id="Frame"
+       d="m 57.099795,17.290206 c 13.029919,0.147107 10.820167,-1.559325 17.830416,24.537324 5.710879,20.851203 5.088826,18.577303 5.118694,20.039902 0.02093,1.136279 -0.770919,2.037186 -1.765965,2.114301 C 76.213587,63.739366 77.084004,64.240974 69.909585,38.43428 43.694525,70.467485 53.52976,65.272999 39.421774,65.923535 20.880171,65.717587 19.373136,67.041543 19.153008,63.893469 c 0.0254,-1.068974 0.45719,-1.706434 13.182316,-34.511127 l -1.219172,-3.883606 -4.190911,-0.08826 0.152397,-4.060132 15.620664,0 c 1.380038,2.18698 -0.558788,2.177172 -7.543638,3.97187 l 1.219174,3.971867 31.165132,0.08827 C 65.439282,20.889407 66.624589,21.418988 57.175992,21.438603 l -0.0762,-4.148397 z M 68.4395,33.735488 37.943802,33.672855 46.757274,61.105666 68.4395,33.735488 Z m -34.172483,1.628431 8.651261,26.305436 -18.924635,0.06263 10.273374,-26.368067 z" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#ad30c0;stroke:none"
+     id="path2323-6"
+     d="" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#ad30c0;stroke:none"
+     id="path2329-5"
+     d="" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#ad30c0;stroke:none"
+     id="path2323-9"
+     d="" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#ad30c0;stroke:none"
+     id="path2329-2"
+     d="" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#ad30c0;stroke:none"
+     id="path2323-6-6"
+     d="" />
+  <path
+     inkscape:connector-curvature="0"
+     style="fill:#ad30c0;stroke:none"
+     id="path2329-5-6"
+     d="" />
+</svg>
diff --git a/navit/xpm/biergarten.svg b/navit/icons/biergarten.svg
index 1bfabe4ba..1bfabe4ba 100644
--- a/navit/xpm/biergarten.svg
+++ b/navit/icons/biergarten.svg
diff --git a/navit/icons/boat_ramp.svg b/navit/icons/boat_ramp.svg
new file mode 100644
index 000000000..2915d58bd
--- /dev/null
+++ b/navit/icons/boat_ramp.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="boat_ramp.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/navit/icons/png/boat_ramp.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f4ca00"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="28.065039"
+     inkscape:cy="46.174477"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g3391"
+       transform="matrix(0.21999998,0,0,0.21999998,26.056881,25.365974)" />
+    <g
+       id="g3408"
+       transform="matrix(0.20644918,0,0,0.20644876,0.93453755,16.796369)">
+      <g
+         id="g3397"
+         transform="translate(118.44039,37.29988)">
+        <path
+           inkscape:connector-curvature="0"
+           id="rect2381-3"
+           d="m -24.189453,-49.107422 c -32.111976,0.07378 -63.074914,1.026643 -95.186887,1.10068 5.3956,11.45783 9.64265,22.031544 15.03454,33.491117 25.68685,0.07091 51.373697,0.14209 77.06055,0.210937 1.813652,-11.602582 3.623461,-23.205766 5.435547,-34.808593 -0.78125,0.002 -1.5625,0.0039 -2.34375,0.0059 z"
+           style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.41036224;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           sodipodi:nodetypes="ccccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3154-6"
+           d="m -92,-114.0957 c -9.65306,21.370408 -17.89279,40.79588 -27.54477,62.166781 18.15494,-0.07914 34.895674,1.783866 53.050629,1.706263 0.06733,-21.682946 0.137852,-43.365882 0.205079,-65.048824 l -25.179688,0 -0.411749,0.91129 z"
+           style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.41036224;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           sodipodi:nodetypes="ccccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3156-7"
+           d="m -66.152344,-100.51562 c 0.03693,16.71875 0.08011,33.437491 0.117188,50.156245 15.351562,0 30.703125,0 46.054687,0 -8.699351,-17.300719 -17.401625,-34.599967 -26.101562,-51.900395 -6.691403,-0.0966 -13.382814,-0.19259 -20.074219,-0.28906 0.0013,0.67774 0.0026,1.35547 0.0039,2.03321 z"
+           style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.41036224;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3158-5"
+           d="m -65.517578,-115.5918 c -5.745429,0.11003 -5.452576,7.40481 -4.640625,11.42188 -0.01453,19.51398 -0.107833,39.175322 -0.05859,58.749998 3.976838,1.680534 8.943175,-1.045553 8.318359,-5.695312 -1.044411,-18.603485 0.09213,-37.34228 -0.318359,-56.025386 -0.646687,-3.48319 2.084709,-9.24994 -3.300781,-8.45118 z"
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.41036224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="rect2381"
+         d="M 3.7107426,-6.7124887 91.418937,-6.9074002 87.236577,19.880514 16.140737,19.685602 3.7107426,-6.7124887 Z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#3d6b98;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.41036224;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path3154"
+         d="m 29.053699,-73.076985 18.585768,0 -0.181336,57.0637 -44.2710634,0.194911 25.8666314,-57.258611 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#9fbcd9;fill-opacity:1;fill-rule:evenodd;stroke:#4d618c;stroke-width:4.41036224;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path3156"
+         d="m 69.373459,-60.101441 -13.582196,-0.194911 0.106113,44.13064 35.572778,0 -22.096673,-43.935728 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#9fbcd9;fill-opacity:1;fill-rule:evenodd;stroke:#4d618c;stroke-width:4.41036224;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3158"
+         d="m 51.724001,-75.297778 0,66.3505985"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4.41036224px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/xpm/boundary_stone.svg b/navit/icons/boundary_stone.svg
index 15a3def54..15a3def54 100644
--- a/navit/xpm/boundary_stone.svg
+++ b/navit/icons/boundary_stone.svg
diff --git a/navit/xpm/buddhist.svg b/navit/icons/buddhist.svg
index eaae0d3c4..eaae0d3c4 100644
--- a/navit/xpm/buddhist.svg
+++ b/navit/icons/buddhist.svg
diff --git a/navit/icons/bus.svg b/navit/icons/bus.svg
new file mode 100644
index 000000000..0730db313
--- /dev/null
+++ b/navit/icons/bus.svg
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="bus.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/navit/icons/png/bus.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3181">
+      <stop
+         id="stop3183"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         id="stop3185"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3169">
+      <stop
+         style="stop-color:#d2d2d2;stop-opacity:1;"
+         offset="0"
+         id="stop3171" />
+      <stop
+         style="stop-color:#656565;stop-opacity:1;"
+         offset="1"
+         id="stop3173" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3169"
+       id="linearGradient3175"
+       x1="13.119969"
+       y1="12.919525"
+       x2="13.280306"
+       y2="4.8899608"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.7280586,0,0,4.7280586,-4.1607651,-78.721961)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3181"
+       id="linearGradient3179"
+       gradientUnits="userSpaceOnUse"
+       x1="13.069741"
+       y1="8.9047422"
+       x2="13.129622"
+       y2="-6.9136248"
+       gradientTransform="matrix(4.2023165,0,0,4.2023165,1.675985,-74.040363)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#0083f4"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="22.306858"
+     inkscape:cy="76.440013"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g4235"
+       transform="matrix(0.20443644,0,0,0.20443644,0.69711429,16.566472)">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect3159-6"
+         d="m 44.909514,-80.500443 c -15.86237,0.23187 -31.71187,1.520829 -47.3867205,3.974609 -0.28658,30.788752 -0.51179,61.578861 -0.40625,92.369141 2.90480003,1.051928 7.0449,-0.951187 9.36719,0.59375 -0.85233,7.790006 9.0546105,10.764473 15.1816405,8.585938 4.24426,-0.698021 7.05574,-4.816893 6.95313,-8.982422 13.01726,0.04326 26.19722,-0.08633 39.11328,0.06445 -0.18119,6.160195 5.91821,10.86098 11.806639,9.830078 5.419494,0.773496 11.06969,-3.735344 10.984375,-9.320312 4.828147,0.192527 11.098512,-2.915111 9.484372,-8.6816415 -1.238765,-18.5942465 -0.194585,-37.4784905 -0.622325,-56.1854705 -0.0292,-9.3171 -0.0692,-18.634162 -0.10228,-27.951248 -17.893022,-3.484834 -36.171391,-4.544919 -54.373051,-4.296875 z"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         ry="4.7280588"
+         rx="4.7280588"
+         y="-4.634974"
+         x="10.192269"
+         height="25.328899"
+         width="14.353036"
+         id="rect3159"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         ry="4.7280588"
+         rx="4.7280588"
+         y="-4.2128253"
+         x="71.994743"
+         height="25.328899"
+         width="14.353036"
+         id="rect3163"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc"
+         id="rect2386"
+         d="m 1.4960195,-73.698399 c 27.7581905,-4.180266 64.9219065,-5.139026 93.8013145,0.211074 l 0.168838,47.175047 0,37.718928 -94.3501045,0 0,-37.718928 0.379952,-47.386121 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#516280;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         ry="4.516984"
+         rx="4.7280588"
+         y="-69.265846"
+         x="6.7306547"
+         height="15.366194"
+         width="83.796448"
+         id="rect3165"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#babd00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path3167"
+         d="m 6.0309104,-64.537786 84.3694966,0.211074 -0.820503,46.689022 -84.0550481,0 0.5060545,-46.900096 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3175);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         y="-7.6322241"
+         x="5.5486412"
+         height="8.8651075"
+         width="13.719812"
+         id="rect3187"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         y="-7.8010826"
+         x="67.35112"
+         height="8.8651075"
+         width="13.719812"
+         id="rect3415"
+         style="display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         y="-7.8010826"
+         x="76.807243"
+         height="8.8651075"
+         width="13.719812"
+         id="rect3413"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         y="-7.8010826"
+         x="14.582609"
+         height="8.8651075"
+         width="13.719812"
+         id="rect3417"
+         style="display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc"
+         id="rect3419"
+         d="m 63.797887,-38.40498 6.158688,0 c 3.29428,0 5.946357,2.533678 5.946357,5.680891 l 0,10.193752 0.0929,5.282697 -18.03813,0.06638 -0.106189,-5.349061 0,-10.193751 c 0,-3.147214 2.652078,-5.680891 5.946357,-5.680891 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <circle
+         r="6.5834627"
+         cy="-45.625553"
+         cx="66.930336"
+         id="path3421"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path3177"
+         d="m 15.189926,-61.769965 66.330066,-0.375269 c 3.183643,11.53701 3.771375,31.35721 3.473053,42.396801 l -73.39522,0 c 0.01334,-10.246596 0.118187,-29.303083 3.592101,-42.021532 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3179);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/xpm/bus_halt.xpm b/navit/icons/bus_halt.xpm
index ed7c75e50..ed7c75e50 100644
--- a/navit/xpm/bus_halt.xpm
+++ b/navit/icons/bus_halt.xpm
diff --git a/navit/icons/bus_stop.svg b/navit/icons/bus_stop.svg
new file mode 100644
index 000000000..1782c143f
--- /dev/null
+++ b/navit/icons/bus_stop.svg
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="bus_stop.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <metadata
+     id="metadata1976">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="-5.8182546"
+     inkscape:cy="48.694774"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="725"
+     inkscape:window-width="1024"
+     inkscape:window-x="123"
+     inkscape:window-y="146"
+     inkscape:zoom="1.8433542"
+     objecttolerance="10.0"
+     pagecolor="#ff00ff"
+     showgrid="false"
+     inkscape:window-maximized="0" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       id="perspective3653"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       id="ArrowStart"
+       markerHeight="3"
+       markerUnits="strokeWidth"
+       markerWidth="4"
+       orient="auto"
+       refX="10"
+       refY="5"
+       viewBox="0 0 10 10">
+      <path
+         d="M 10,0 0,5 10,10 Z"
+         id="path2111"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="ArrowEnd"
+       markerHeight="3"
+       markerUnits="strokeWidth"
+       markerWidth="4"
+       orient="auto"
+       refX="0"
+       refY="5"
+       viewBox="0 0 10 10">
+      <path
+         d="M 0,0 10,5 0,10 Z"
+         id="path2108"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <inkscape:perspective
+       id="perspective2512"
+       inkscape:persp3d-origin="177.51199 : 145.02 : 1"
+       inkscape:vp_x="0 : 217.53 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="355.02399 : 217.53 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <rect
+     style="fill:#ffffff;stroke:#ffffff;stroke-width:0.20552891"
+     id="rect3473"
+     width="10.815232"
+     height="11.762958"
+     x="4.6271358"
+     y="1.4031579"
+     ry="0.68246084" />
+  <path
+     style="fill:#ffffff;stroke:#ffffff;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none"
+     d="M 9.9565355,2.253461 C 9.2085894,2.2726065 8.3955453,2.4780109 7.8819782,2.6143418 6.3266335,2.8673699 5.9797745,4.6663299 6.0023091,5.9721148 5.7744537,7.790684 5.9707631,9.6258328 5.8877064,11.451282 c 0.8945741,-0.693653 0.7500388,1.065524 1.7401701,0.893167 0.6616797,0.103019 1.3268331,-0.390668 1.4688103,-1.035271 0.6715306,0.121301 1.7383612,-0.36263 2.1845462,0.153344 0.382352,1.244789 2.329111,1.061193 2.632939,-0.118821 1.042,-0.9399 0.318551,-2.5625402 0.518757,-3.7680469 -0.102023,-1.4798739 0.07528,-3.2564776 -0.943865,-4.443878 -0.82501,-0.6170834 -1.737803,-0.6964806 -2.654613,-0.8441933 -0.291373,-0.0308 -0.584957,-0.048018 -0.8779155,-0.034118 z m 0.7101185,3.1266895 c 0.653808,-0.088645 1.592217,-0.086045 1.264083,0.8249251 C 11.105341,6.7360817 10.00443,6.1549574 9.0685868,6.3889283 8.5765015,6.4980173 7.9560464,6.2355183 8.3982089,5.654724 8.6805642,5.0310252 9.7900655,5.587215 10.371607,5.3810951 c 0.09835,4.082e-4 0.196697,-9.091e-4 0.295047,-9.091e-4 z m 1.912784,3.1913177 c 0.885536,0.4797996 -0.806171,0.7701076 -0.165387,0.048573 0.04701,-0.034446 0.106661,-0.055864 0.165387,-0.048573 z m -4.7363979,0.002 C 8.7038551,9.1036038 6.9908868,9.3051028 7.682872,8.6103952 7.730154,8.5811132 7.7873628,8.5644222 7.8430401,8.5734682 Z"
+     id="path2115-9"
+     inkscape:connector-curvature="0" />
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 13.394779,1.0116534 C 10.692246,1.2164052 7.9418246,0.83444351 5.2567733,1.1594643 3.6079522,1.9634894 4.2196973,4.1112557 4.1177747,5.5199405 c 0.061015,2.3895789 -0.1545098,4.8755605 0.303583,7.2163245 0.9803862,1.495403 2.9598944,0.654623 4.4131892,0.853459 2.0750541,-0.130409 4.2806911,0.362941 6.2709901,-0.280647 1.216832,-1.108895 0.584978,-3.045999 0.737051,-4.5978371 C 15.743536,6.4431446 16.032351,4.1200447 15.611931,1.8712567 15.154361,1.1115961 14.209956,0.95095621 13.394779,1.0116534 Z m 0.383156,2.09545 c 0.03612,2.8115623 0.03615,5.6235992 0,8.4351616 -2.505587,-0.01187 -5.0114472,0.0305 -7.5168215,-0.01727 0.012664,-2.8059412 -0.030327,-5.6121335 0.018045,-8.4178859 z"
+     id="rect3653-1"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccccccccccc" />
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 10.594523,11.97877 c -0.50506,-0.02336 -1.6011898,-0.32961 -1.5148517,0.792441 0,2.636269 0,5.272538 0,7.908805 0.7098997,0.401155 1.8468527,0.226589 1.9295487,-1.009772 -0.01685,-2.602526 -0.05516,-5.22545 -0.03366,-7.838011 -0.127012,0.04885 -0.254023,0.09769 -0.381035,0.146537 z"
+     id="path4184-2"
+     inkscape:connector-curvature="0" />
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="m 12.724035,18.930485 c -2.026284,0.113843 -4.1091844,-0.128853 -6.1118107,0.104761 -1.200424,0.443592 -0.6069279,2.19187 0.7401805,1.929014 2.0512182,-0.112794 4.2115012,0.262502 6.1904012,-0.209887 0.915015,-0.557944 0.29982,-1.883042 -0.818771,-1.823888 z"
+     id="path4186-7"
+     inkscape:connector-curvature="0" />
+  <g
+     id="g1327"
+     transform="matrix(0.03397385,0,0,0.03397385,0,1.2562488)">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.896,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.314 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
+       id="path1329"
+       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     id="g2117"
+     style="fill:#000000"
+     transform="matrix(0.04068381,0,0,0.04068381,2.7222638,2.4309237)">
+    <g
+       id="g2119"
+       style="fill:#000000">
+      <g
+         id="g2121"
+         style="fill:#000000">
+        <path
+           d=""
+           id="path2125"
+           style="fill:#000000;stroke:none"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         id="g2127"
+         style="fill:#000000">
+        <path
+           d=""
+           id="path2131"
+           style="fill:#000000;stroke:none"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+  <path
+     d="m 10.043805,3.0568725 c 0.01098,0 0.02238,4.082e-4 0.03348,5.155e-4 0.01118,-9.19e-5 0.02243,-5.155e-4 0.03348,-5.155e-4 l -0.06697,0 z m 0.03348,5.155e-4 C 9.2975394,3.0635698 8.2410908,3.2831197 7.800141,3.4668478 7.3528766,3.6532104 7.0546086,3.8396621 6.9614359,4.3055565 l -0.3353816,2.5830997 0,3.5588018 0.5779124,0 0,0.558124 c 0,0.680509 0.9954905,0.680509 0.9954905,0 l 0,-0.558124 1.8387658,0 0.0055,0 1.911321,0 0,0.558124 c 0,0.680509 0.995997,0.680509 0.995997,0 l 0,-0.558124 0.577912,0 0,-3.5588018 L 13.19366,4.3055565 C 13.100469,3.8396558 12.802201,3.653204 12.354933,3.4668423 11.913939,3.283096 10.857048,3.0635189 10.077278,3.0573816 Z m -1.4196646,0.6519906 1.3861776,0 1.453659,0 c 0.279553,0 0.279553,0.4191007 0,0.4191007 l -1.456704,0 -1.3831326,0 c -0.2795517,0 -0.2795517,-0.4191007 0,-0.4191007 z m -0.6180788,0.8427678 2.0012114,0 2.006329,0 c 0.2953,0 0.372592,0.1498944 0.408445,0.3774943 l 0.261302,1.8732674 c 0.02435,0.1795572 -0.02795,0.3577071 -0.276017,0.3577071 l -2.397014,0 -2.397988,0 c -0.2480736,0 -0.2998526,-0.1781499 -0.2755099,-0.3577071 L 7.6316092,4.9296389 C 7.6674638,4.702039 7.7442456,4.5521445 8.0395472,4.5521445 Z m -0.337326,3.7562164 c 0.2638035,-9e-7 0.5453979,0.2821017 0.5453979,0.5459052 0,0.2638038 -0.2815944,0.5453968 -0.5453979,0.5453968 -0.2638035,0 -0.5459052,-0.281593 -0.5459052,-0.5453968 0,-0.2638035 0.2821017,-0.5459052 0.5459052,-0.5459052 z m 4.7506514,0 c 0.263802,0 0.545397,0.2821017 0.545397,0.5459052 0,0.2638038 -0.281595,0.5453968 -0.545397,0.5453968 -0.263804,0 -0.545906,-0.281593 -0.545906,-0.5453968 0,-0.2638035 0.282102,-0.5459061 0.545906,-0.5459052 z"
+     id="path2115"
+     sodipodi:nodetypes="cscccsccccccccccccccccsccccccccccccccccccccsssccsssc"
+     style="fill:#0089cd;stroke:none"
+     inkscape:connector-curvature="0" />
+  <rect
+     height="10.974864"
+     id="rect3653"
+     ry="0.68246007"
+     style="fill:none;stroke:#0089cd;stroke-width:0.50960779;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     width="10.035949"
+     x="4.9805841"
+     y="1.7845235" />
+  <path
+     d="m 10.008805,12.780169 0,7.635762"
+     id="path4184"
+     style="fill:none;stroke:#0089cd;stroke-width:0.97842932;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 13.03185,19.985729 -6.1503495,0"
+     id="path4186"
+     style="fill:none;stroke:#0089cd;stroke-width:1.01921558;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" />
+  <g
+     id="g2117-7"
+     style="fill:#000000"
+     transform="matrix(0.04068381,0,0,0.04068381,22.831718,4.3387728)">
+    <g
+       id="g2119-5"
+       style="fill:#000000">
+      <g
+         id="g2121-3"
+         style="fill:#000000">
+        <path
+           d=""
+           id="path2125-5"
+           style="fill:#000000;stroke:none"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         id="g2127-6"
+         style="fill:#000000">
+        <path
+           d=""
+           id="path2131-2"
+           style="fill:#000000;stroke:none"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/navit/xpm/cafe.svg b/navit/icons/cafe.svg
index bd8c0c797..bd8c0c797 100644
--- a/navit/xpm/cafe.svg
+++ b/navit/icons/cafe.svg
diff --git a/navit/xpm/camping.svg b/navit/icons/camping.svg
index 4058fb77d..4058fb77d 100644
--- a/navit/xpm/camping.svg
+++ b/navit/icons/camping.svg
diff --git a/navit/icons/car_dealer.svg b/navit/icons/car_dealer.svg
new file mode 100644
index 000000000..599f1ee7c
--- /dev/null
+++ b/navit/icons/car_dealer.svg
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="car_dealer.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="144.13586"
+     inkscape:cy="59.366766"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="874"
+     inkscape:window-width="1440"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:zoom="2.8284271"
+     objecttolerance="10.0"
+     pagecolor="#ff00ff"
+     showgrid="false"
+     inkscape:window-maximized="1" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       id="perspective12"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <style
+       id="style6"
+       type="text/css">
+    .fil0 {fill:#EF7900}
+  </style>
+    <inkscape:perspective
+       id="perspective6807"
+       inkscape:persp3d-origin="29.116032 : 19.410688 : 1"
+       inkscape:vp_x="0 : 29.116032 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="58.232063 : 29.116032 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6954"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       id="ArrowStart"
+       markerHeight="3"
+       markerUnits="strokeWidth"
+       markerWidth="4"
+       orient="auto"
+       refX="10"
+       refY="5"
+       viewBox="0 0 10 10">
+      <path
+         d="M 10,0 0,5 10,10 Z"
+         id="path2295"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="ArrowEnd"
+       markerHeight="3"
+       markerUnits="strokeWidth"
+       markerWidth="4"
+       orient="auto"
+       refX="0"
+       refY="5"
+       viewBox="0 0 10 10">
+      <path
+         d="M 0,0 10,5 0,10 Z"
+         id="path2292"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <inkscape:perspective
+       id="perspective7597"
+       inkscape:persp3d-origin="178.5405 : 158.483 : 1"
+       inkscape:vp_x="0 : 237.7245 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="357.08099 : 237.7245 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="g4447"
+     transform="matrix(0.20586556,0,0,0.20586832,0.78123304,-1.0035774)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path4440"
+       d="M 66.756048,12.064733 C 52.565924,13.1721 38.230672,11.294742 24.088079,12.738561 14.655005,15.245513 12.332176,25.739312 9.5192579,33.700687 c -1.0359747,3.782761 -2.5023651,7.688615 -6.4604753,9.073031 -8.2886595,6.256446 -6.0859259,17.719537 -6.0898438,26.61914 0.7219292,4.940718 -1.4087758,13.256741 0.9860122,16.218093 2.64431784,-0.848869 8.5986502,-1.451804 7.049144,3.211597 -2.4840628,9.90964 12.047745,16.981402 18.777344,9.58203 3.644069,-3.22295 3.753281,-8.5071 3.535156,-12.994142 14.655244,0.121195 29.827212,-0.241456 44.16211,0.179688 -0.977264,7.180494 3.09417,16.111796 11.359374,15.925786 7.925473,0.31954 13.613455,-8.604262 10.910157,-15.701177 3.666787,-0.01936 9.921254,-1.090158 8.660154,-6.234375 C 100.07766,68.495745 105.59407,55.461761 98.617376,45.449499 96.101437,41.675054 90.406885,41.472555 90.258315,36.064842 87.06607,27.32724 84.805853,14.695111 73.892767,12.646764 71.555265,12.120898 69.144339,12.01565 66.756048,12.064733 Z"
+       style="fill:#ffffff;stroke:#ffffff" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ad30c0;stroke:none"
+       id="path2301"
+       d="m 27.916882,16.760143 c -6.128552,0 -9.379612,3.34581 -10.880499,7.262158 L 9.0692437,44.594174 c -3.1583189,0.404837 -8.75705874,4.112277 -8.75705874,11.1353 l 0,26.160763 7.75479644,0 0,8.366384 c 0,10.293039 14.5667836,10.171819 14.5667856,0 l 0,-8.366384 26.203235,0 0.0086,0 26.203216,0 0,8.366384 c 0,10.171819 14.566716,10.293039 14.566798,0 l 0,-8.366384 7.754785,0 0,-26.160763 c 0,-7.023023 -5.598703,-10.730327 -8.757076,-11.1353 L 80.637609,24.022301 c -1.50088,-3.916348 -4.751911,-7.262158 -10.880507,-7.262158 l -11.262692,0 -19.178927,0 -11.398601,0 z m -0.09343,7.491491 20.996563,0 0.01725,0 0.0086,0 21.005039,0 c 2.626397,0.02269 3.751251,1.666959 4.501684,3.941084 l 6.00507,16.189097 -31.511793,0 -0.0086,0 -0.01725,0 -31.503334,0 6.00508,-16.189097 c 0.750444,-2.274125 1.875011,-3.916622 4.501689,-3.941084 z M 15.583954,52.255542 c 3.716324,0 6.727051,3.100683 6.727051,6.93089 -1e-6,3.83048 -3.010727,6.939423 -6.727051,6.939423 -3.716051,0 -6.7270534,-3.108943 -6.7270534,-6.939423 0,-3.830207 3.0110024,-6.93089 6.7270534,-6.93089 z m 66.514583,0 c 3.716322,0 6.727074,3.100683 6.727052,6.93089 0,3.83048 -3.01073,6.939423 -6.727052,6.939423 -3.71605,0 -6.735565,-3.108943 -6.735565,-6.939423 0,-3.830207 3.019515,-6.93089 6.735565,-6.93089 z" />
+    <g
+       transform="matrix(0.04255774,0,0,0.04255774,36.006437,77.799)"
+       id="g2319">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;stroke:none"
+         id="path2323"
+         d="" />
+    </g>
+    <g
+       transform="matrix(0.04255774,0,0,0.04255774,36.006437,77.799)"
+       id="g2325">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;stroke:none"
+         id="path2329"
+         d="" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/xpm/car_rent.svg b/navit/icons/car_rent.svg
index eeb05a95b..eeb05a95b 100644
--- a/navit/xpm/car_rent.svg
+++ b/navit/icons/car_rent.svg
diff --git a/navit/xpm/car_sharing.svg b/navit/icons/car_sharing.svg
index d8f8d1e75..d8f8d1e75 100644
--- a/navit/xpm/car_sharing.svg
+++ b/navit/icons/car_sharing.svg
diff --git a/navit/xpm/casino.svg b/navit/icons/casino.svg
index df5dcf89f..df5dcf89f 100644
--- a/navit/xpm/casino.svg
+++ b/navit/icons/casino.svg
diff --git a/navit/icons/castle.svg b/navit/icons/castle.svg
new file mode 100644
index 000000000..843c1aa1d
--- /dev/null
+++ b/navit/icons/castle.svg
@@ -0,0 +1,453 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="castle.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="55.005049"
+     inkscape:cy="43.549644"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="874"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1440"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:zoom="5.2137932"
+     objecttolerance="10.0"
+     pagecolor="#ffff00"
+     showgrid="false" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       id="perspective2441"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_x="0 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="60 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       id="symbol-university"
+       viewBox="244.5 110 489 219.9">
+      <path
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
+         id="path4460"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 94,176 73,215"
+         id="path4462"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
+      <path
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
+         id="path4464"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
+         id="path4466"
+         ill="none"
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_x="0 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="12 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4904"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       id="Arrow2Lend"
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         id="path4137"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Arrow1Mend"
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4125"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="TriangleOutL"
+       inkscape:stockid="TriangleOutL"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         id="path4214"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.8,0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Arrow1Lend"
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4119"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Tail"
+       inkscape:stockid="Tail"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <g
+         id="g4152"
+         transform="scale(-1.2,-1.2)">
+        <path
+           d="M -3.8048674,-3.9585227 0.54352094,0"
+           id="path4154"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M -1.2866832,-3.9585227 3.0617053,0"
+           id="path4156"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M 1.3053582,-3.9585227 5.6537466,0"
+           id="path4158"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M -3.8048674,4.1775838 0.54352094,0.21974226"
+           id="path4160"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M -1.2866832,4.1775838 3.0617053,0.21974226"
+           id="path4162"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M 1.3053582,4.1775838 5.6537466,0.21974226"
+           id="path4164"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+      </g>
+    </marker>
+    <marker
+       id="Arrow1Sstart"
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4128"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(0.2,0,0,0.2,1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Arrow1Send"
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4131"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="SemiCircleOut"
+       inkscape:stockid="SemiCircleOut"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="m -2.5,-0.80913858 c 0,2.75999998 -2.24,4.99999998 -5,4.99999998 l 0,-10 c 2.76,0 5,2.24 5,5.00000002 z"
+         id="path4235"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         transform="matrix(0.6,0,0,0.6,4.2752958,0.4580676)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Arrow2Send"
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         id="path4149"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         transform="matrix(-0.3,0,0,-0.3,0.69,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="TriangleOutS"
+       inkscape:stockid="TriangleOutS"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         id="path4220"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.2,0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="CurveIn"
+       inkscape:stockid="CurveIn"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="m 4.625493,-5.0456926 c -2.76,0 -5.00000002,2.24 -5.00000002,5.00000002 0,2.75999998 2.24000002,4.99999998 5.00000002,4.99999998"
+         id="path4238"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         transform="scale(0.6,0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="InfiniteLineStart"
+       inkscape:stockid="InfiniteLineStart"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <g
+         id="g4298"
+         transform="translate(-13,0)">
+        <circle
+           cx="3"
+           cy="0"
+           id="circle4300"
+           r="0.80000001" />
+        <circle
+           cx="6.5"
+           cy="0"
+           id="circle4302"
+           r="0.80000001" />
+        <circle
+           cx="10"
+           cy="0"
+           id="circle4304"
+           r="0.80000001" />
+      </g>
+    </marker>
+    <marker
+       id="StopS"
+       inkscape:stockid="StopS"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,5.65 0,-5.65"
+         id="path4229"
+         style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(0.2,0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Arrow2Sstart"
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         id="path4146"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         transform="matrix(0.3,0,0,0.3,-0.69,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="DiamondS"
+       inkscape:stockid="DiamondS"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 Z"
+         id="path4202"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.2,0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="RazorWire"
+       inkscape:stockid="RazorWire"
+       orient="auto"
+       refX="0"
+       refY="0">
+       style=&quot;overflow:visible&quot;&gt;
+      <path
+   d="m 0.02272727,-0.74009011 0,1.4375 -7.78124997,2.31250001 18.4374997,0 -7.1874997,-2.31250001 0,-1.4375 7.2499997,-2.15624999 -18.4687497,0 7.74999997,2.15624999 z"
+   id="path4286"
+   style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1pt"
+   transform="scale(0.8,0.8)"
+   inkscape:connector-curvature="0" />
+</marker>
+    <inkscape:perspective
+       id="perspective5233"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5412"
+       inkscape:persp3d-origin="250 : 166.66667 : 1"
+       inkscape:vp_x="0 : 250 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="500 : 250 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective8631"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-536.27327,44.693248)">
+    <rect
+       height="10"
+       id="rect4134"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="10"
+       x="1"
+       y="1" />
+    <rect
+       height="8"
+       id="rect4136"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="8"
+       x="2"
+       y="2" />
+  </g>
+  <g
+     id="g4738"
+     transform="matrix(0.20554798,0,0,0.20554796,0.7776223,-1.6818662)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path2958-8"
+       d="m 69.910849,26.034711 c -4.360829,0.455733 -9.176699,3.214028 -8.296875,8.392578 0.852858,4.688734 0.271393,9.216875 -0.476562,13.785157 -0.515409,2.119883 4.29039,4.651269 0.412109,3.751953 -2.382569,-0.265039 -4.169265,2.740933 -5.09375,3.509766 -3.000396,-3.967297 -10.650513,-3.905745 -13.498047,-0.13086 -0.269809,0.213306 -3.434006,-4.245145 -6.322266,-3.238281 -1.297527,0.05335 2.114169,-4.236895 0.757813,-6.416016 -0.560731,-5.916042 2.193136,-13.921397 -2.492187,-18.367187 -3.9181,-2.103176 -9.069191,0.0092 -11.429688,2.517578 C 20.667389,24.987155 11.60383,25.42548 10.641318,30.472211 9.4298696,25.456347 2.5414206,26.545004 -1.2805574,27.835493 c -3.009286,7.214436 -1.594921,15.919406 -1.285156,23.728515 1.284726,2.770134 7.102947,1.040261 6.335937,5.675781 0.146028,13.378048 -1.141075,26.943402 0.498047,40.316409 3.754315,3.601022 10.4841274,1.66197 15.5605454,2.30088 7.223651,-0.57573 15.007992,0.809252 21.867189,-0.94151 4.402108,-4.170421 1.578013,-11.074916 2.257813,-15.837888 3.631314,0.541563 8.290994,-1.922716 11.4375,0.148438 0.191749,5.757113 -2.334197,18.074902 7.230469,16.54297 10.694188,-0.8954 22.181652,1.927212 32.371089,-1.60547 1.75282,-14.332727 0.39606,-28.972713 0.78321,-43.375 6.801584,0.663059 7.399524,-7.571944 6.576174,-12.410157 -0.34459,-5.148353 2.07004,-14.697268 -5.326174,-15.730468 -3.10176,-0.380886 -7.05163,0.579013 -8.527346,2.632812 -3.246303,-4.497769 -10.854024,-2.653339 -13.451172,0.002 -0.952947,-1.929959 -2.905594,-3.43413 -5.136719,-3.248047 z m -2.078125,28.669922 c 0.951997,1.02756 0.192289,0.197326 0,0 z"
+       style="font-style:normal;font-weight:normal;font-size:20.57779694px;font-family:'Bitstream Vera Sans';fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.20922267;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-style:normal;font-weight:normal;font-size:20.57779694px;font-family:'Bitstream Vera Sans';fill:#b26609;fill-opacity:1;stroke:#b26609;stroke-width:1.20922267;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc"
+       id="path2958"
+       d="m 0.70479201,50.591063 0.0712967,-19.488227 6.48157579,0 0,6.481643 6.4815745,0 0,-6.481643 6.481576,0 0,6.481643 6.481577,0 0,-6.481643 6.481577,0 0,19.444992 -6.481577,0 0,12.962694 6.481577,0 0,-6.481055 6.481579,0 0,6.481055 6.48157,0 0,-6.481055 6.48158,0 0,6.481055 0,6.481639 0,6.481643 0.773759,0 0,2.4509 -13.736909,0 0,16.994024 -32.4078835,0 0,-45.3709 -6.55319738,0.05834 3.2252e-4,-0.0149 1.58e-6,-4e-6 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-style:normal;font-weight:normal;font-size:20.57779694px;font-family:'Bitstream Vera Sans';fill:#b26609;fill-opacity:1;stroke:#b26609;stroke-width:1.20922267;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc"
+       id="path2958-0"
+       d="m 98.035182,50.591063 -0.07063,-19.488227 -6.472693,0 0,6.481643 -6.472634,0 0,-6.481643 -6.472629,0 0,6.481643 -6.472634,0 0,-6.481643 -6.472634,0 0,19.444992 6.472634,0 0,12.963277 -6.472634,0 0,-6.481638 -6.472629,0 0,6.481638 -6.472629,0 0,-6.481638 -6.472634,0 0,6.481638 0,6.481056 0,6.481643 3.248038,0 0,2.4509 9.697225,0 0,16.994024 32.36316,0 0,-45.3709 6.544187,0.05834 -8.03e-4,-0.0149 -4.1e-5,-4e-6 z" />
+  </g>
+</svg>
diff --git a/navit/icons/cemetery.svg b/navit/icons/cemetery.svg
new file mode 100644
index 000000000..7070fcb04
--- /dev/null
+++ b/navit/icons/cemetery.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="cemetery.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/navit/icons/png/bus.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3181">
+      <stop
+         id="stop3183"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+      <stop
+         id="stop3185"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3169">
+      <stop
+         style="stop-color:#d2d2d2;stop-opacity:1;"
+         offset="0"
+         id="stop3171" />
+      <stop
+         style="stop-color:#656565;stop-opacity:1;"
+         offset="1"
+         id="stop3173" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#0083f4"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="8.8591678"
+     inkscape:cy="38.829475"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <path
+       style="fill:#ffffff;stroke:#ffffff;stroke-width:0.18828967"
+       d="m 10.311729,-76.902465 c -3.3755856,-0.118158 -6.0886976,2.883529 -6.6515556,6.041081 -0.586939,2.483642 -0.991995,5.311074 0.22764,7.668021 1.604822,2.569803 4.677305,3.582054 7.2359156,4.903253 1.918497,0.874329 4.351189,1.828128 6.337493,0.639155 2.017944,-1.493992 2.000665,-4.319483 2.109801,-6.579472 0.02608,-2.915029 0.293553,-6.07503 -1.078621,-8.754364 -1.519474,-2.335238 -4.395469,-3.305838 -6.992152,-3.840174 -0.393416,-0.05477 -0.79125,-0.08187 -1.188521,-0.0775 z"
+       id="path3372-3"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3372"
+       d="m 8.0536284,-60.482272 c -3.949167,-2.140927 -4.748474,-3.614563 -4.314447,-7.954309 0.694667,-6.945855 4.836642,-9.608447 10.7533706,-6.912608 3.826014,1.743249 4.44847,3.118699 4.44847,9.829858 0,8.762472 -2.166533,9.76482 -10.8873936,5.037059 z"
+       style="fill:#8c8c8c" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3370"
+       d="m 8.5863474,-64.619442 c -2.301038,-1.487045 -2.301038,-1.678798 0,-1.725778 2.3010386,-0.04698 2.3010386,-0.238734 0,-1.725779 -1.423768,-0.920109 -1.812068,-1.672924 -0.86289,-1.672924 0.949179,0 2.8906806,0.752815 4.3144486,1.672924 2.301038,1.487045 2.301038,1.678798 0,1.725779 -2.3010386,0.04698 -2.3010386,0.238733 0,1.725778 1.423767,0.920109 1.812067,1.672924 0.862889,1.672924 -0.949178,0 -2.89068,-0.752815 -4.3144476,-1.672924 z"
+       style="fill:#3f3f3f" />
+  </g>
+</svg>
diff --git a/navit/xpm/church.svg b/navit/icons/church.svg
index 12441b19a..12441b19a 100644
--- a/navit/xpm/church.svg
+++ b/navit/icons/church.svg
diff --git a/navit/icons/cinema.svg b/navit/icons/cinema.svg
new file mode 100644
index 000000000..fc1611908
--- /dev/null
+++ b/navit/icons/cinema.svg
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="cinema.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/projets/navit/icons/png/cinema.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3156">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3158" />
+      <stop
+         id="stop3166"
+         offset="0.41698599"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3164"
+         offset="0.41698599"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         style="stop-color:#3d3d3d;stop-opacity:1;"
+         offset="1"
+         id="stop3160" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3156"
+       id="linearGradient3162"
+       x1="0.875"
+       y1="3.59375"
+       x2="2.0625"
+       y2="4.65625"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="reflect"
+       gradientTransform="matrix(4.9592696,0,0,4.9592696,-3.33272,-83.487192)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#22a638"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="82.273623"
+     inkscape:cy="48.388215"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="943"
+     inkscape:window-height="682"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g3407"
+       transform="matrix(0.20329529,0,0,0.20329529,0.66974093,-60.935637)">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect2381-5"
+         d="m 95.99219,-80.94922 c -32.05588,3.52573 -64.11198,7.04949 -96.16796964,10.57422 1.49032004,6.3509 -1.99300996,12.90195 0.008,18.96484 C 3.0962104,-27.04692 6.3576804,-2.6833402 9.6232404,21.679688 39.07975,20.102686 68.53598,18.520546 97.99238,16.941406 c 0,-22.3554662 0,-44.710936 0,-67.066406 -22.32107,-1.37852 -44.64191,-2.76069 -66.96289,-4.14062 22.68555,-1.38331 45.37103,-2.76785 68.05664,-4.1504 -0.3233,-7.58914 -0.64629,-15.17831 -0.9668,-22.76757 -0.70898,0.0781 -1.41797,0.15625 -2.12695,0.23437 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.95926952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="rect2381"
+         d="m 3.79623,-50.941986 90.196716,5.579178 0,59.511236 -80.898086,4.33936 -9.29863,-69.429774 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#5a5a5a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.95926952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path3154"
+         d="M 4.1061843,-65.819795 94.3029,-75.738334 94.922809,-61.170479 3.4862756,-55.591301 4.1061843,-65.819795 Z"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3162);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.95926952;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3168"
+         d="m 18.14602,-37.504459 62.828843,3.068392"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.95926952px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3170"
+         d="m 22.091096,-16.352355 58.664597,0.21915"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.95926952px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3172"
+         d="M 24.940316,5.8956029 81.112374,3.7038934"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.95926952px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3174"
+         d="m 58.765617,-14.891156 5e-6,17.8988225"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.95926952px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.45597486" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/xpm/country_.svgz b/navit/icons/country_.svgz
index b58b69495..b58b69495 100644
--- a/navit/xpm/country_.svgz
+++ b/navit/icons/country_.svgz
diff --git a/navit/xpm/country_AD.svgz b/navit/icons/country_AD.svgz
index 38eaf0b96..38eaf0b96 100644
--- a/navit/xpm/country_AD.svgz
+++ b/navit/icons/country_AD.svgz
diff --git a/navit/xpm/country_AE.svgz b/navit/icons/country_AE.svgz
index 67dcd1e9d..67dcd1e9d 100644
--- a/navit/xpm/country_AE.svgz
+++ b/navit/icons/country_AE.svgz
diff --git a/navit/xpm/country_AF.svgz b/navit/icons/country_AF.svgz
index 7dab2fc22..7dab2fc22 100644
--- a/navit/xpm/country_AF.svgz
+++ b/navit/icons/country_AF.svgz
diff --git a/navit/xpm/country_AG.svgz b/navit/icons/country_AG.svgz
index f0d9e58e2..f0d9e58e2 100644
--- a/navit/xpm/country_AG.svgz
+++ b/navit/icons/country_AG.svgz
diff --git a/navit/xpm/country_AI.svgz b/navit/icons/country_AI.svgz
index 595d72df7..595d72df7 100644
--- a/navit/xpm/country_AI.svgz
+++ b/navit/icons/country_AI.svgz
diff --git a/navit/xpm/country_AL.svgz b/navit/icons/country_AL.svgz
index 5d2ab91ec..5d2ab91ec 100644
--- a/navit/xpm/country_AL.svgz
+++ b/navit/icons/country_AL.svgz
diff --git a/navit/xpm/country_AM.svgz b/navit/icons/country_AM.svgz
index 72d031eaa..72d031eaa 100644
--- a/navit/xpm/country_AM.svgz
+++ b/navit/icons/country_AM.svgz
diff --git a/navit/xpm/country_AN.svgz b/navit/icons/country_AN.svgz
index e40e324ef..e40e324ef 100644
--- a/navit/xpm/country_AN.svgz
+++ b/navit/icons/country_AN.svgz
diff --git a/navit/xpm/country_AO.svgz b/navit/icons/country_AO.svgz
index 5e8d94ed5..5e8d94ed5 100644
--- a/navit/xpm/country_AO.svgz
+++ b/navit/icons/country_AO.svgz
diff --git a/navit/xpm/country_AQ.svgz b/navit/icons/country_AQ.svgz
index cf1308c54..cf1308c54 100644
--- a/navit/xpm/country_AQ.svgz
+++ b/navit/icons/country_AQ.svgz
diff --git a/navit/xpm/country_AR.svgz b/navit/icons/country_AR.svgz
index 59f4b1077..59f4b1077 100644
--- a/navit/xpm/country_AR.svgz
+++ b/navit/icons/country_AR.svgz
diff --git a/navit/xpm/country_AS.svgz b/navit/icons/country_AS.svgz
index 3c4d0eff2..3c4d0eff2 100644
--- a/navit/xpm/country_AS.svgz
+++ b/navit/icons/country_AS.svgz
diff --git a/navit/xpm/country_AT.svgz b/navit/icons/country_AT.svgz
index 76d3c70b4..76d3c70b4 100644
--- a/navit/xpm/country_AT.svgz
+++ b/navit/icons/country_AT.svgz
diff --git a/navit/xpm/country_AU.svgz b/navit/icons/country_AU.svgz
index 84a3882d9..84a3882d9 100644
--- a/navit/xpm/country_AU.svgz
+++ b/navit/icons/country_AU.svgz
diff --git a/navit/xpm/country_AW.svgz b/navit/icons/country_AW.svgz
index 3a095057c..3a095057c 100644
--- a/navit/xpm/country_AW.svgz
+++ b/navit/icons/country_AW.svgz
diff --git a/navit/xpm/country_AX.svgz b/navit/icons/country_AX.svgz
index c56d47c9a..c56d47c9a 100644
--- a/navit/xpm/country_AX.svgz
+++ b/navit/icons/country_AX.svgz
diff --git a/navit/xpm/country_AZ.svgz b/navit/icons/country_AZ.svgz
index a1a6bb26e..a1a6bb26e 100644
--- a/navit/xpm/country_AZ.svgz
+++ b/navit/icons/country_AZ.svgz
diff --git a/navit/xpm/country_BA.svgz b/navit/icons/country_BA.svgz
index dd5c66b3b..dd5c66b3b 100644
--- a/navit/xpm/country_BA.svgz
+++ b/navit/icons/country_BA.svgz
diff --git a/navit/xpm/country_BB.svgz b/navit/icons/country_BB.svgz
index 82cf29ca9..82cf29ca9 100644
--- a/navit/xpm/country_BB.svgz
+++ b/navit/icons/country_BB.svgz
diff --git a/navit/xpm/country_BD.svgz b/navit/icons/country_BD.svgz
index 9bf453dc2..9bf453dc2 100644
--- a/navit/xpm/country_BD.svgz
+++ b/navit/icons/country_BD.svgz
diff --git a/navit/xpm/country_BE.svgz b/navit/icons/country_BE.svgz
index be47fcbc2..be47fcbc2 100644
--- a/navit/xpm/country_BE.svgz
+++ b/navit/icons/country_BE.svgz
diff --git a/navit/xpm/country_BF.svgz b/navit/icons/country_BF.svgz
index 35a225633..35a225633 100644
--- a/navit/xpm/country_BF.svgz
+++ b/navit/icons/country_BF.svgz
diff --git a/navit/xpm/country_BG.svgz b/navit/icons/country_BG.svgz
index 3d4d0f838..3d4d0f838 100644
--- a/navit/xpm/country_BG.svgz
+++ b/navit/icons/country_BG.svgz
diff --git a/navit/xpm/country_BH.svgz b/navit/icons/country_BH.svgz
index 5b0cce662..5b0cce662 100644
--- a/navit/xpm/country_BH.svgz
+++ b/navit/icons/country_BH.svgz
diff --git a/navit/xpm/country_BI.svgz b/navit/icons/country_BI.svgz
index 7750db3cc..7750db3cc 100644
--- a/navit/xpm/country_BI.svgz
+++ b/navit/icons/country_BI.svgz
diff --git a/navit/xpm/country_BJ.svgz b/navit/icons/country_BJ.svgz
index 86bcd5d3a..86bcd5d3a 100644
--- a/navit/xpm/country_BJ.svgz
+++ b/navit/icons/country_BJ.svgz
diff --git a/navit/xpm/country_BL.svgz b/navit/icons/country_BL.svgz
index 46b7fff94..46b7fff94 100644
--- a/navit/xpm/country_BL.svgz
+++ b/navit/icons/country_BL.svgz
diff --git a/navit/xpm/country_BM.svgz b/navit/icons/country_BM.svgz
index 13451a770..13451a770 100644
--- a/navit/xpm/country_BM.svgz
+++ b/navit/icons/country_BM.svgz
diff --git a/navit/xpm/country_BN.svgz b/navit/icons/country_BN.svgz
index f5de30fc5..f5de30fc5 100644
--- a/navit/xpm/country_BN.svgz
+++ b/navit/icons/country_BN.svgz
diff --git a/navit/xpm/country_BO.svgz b/navit/icons/country_BO.svgz
index 2a814f56e..2a814f56e 100644
--- a/navit/xpm/country_BO.svgz
+++ b/navit/icons/country_BO.svgz
diff --git a/navit/xpm/country_BR.svgz b/navit/icons/country_BR.svgz
index 5bc65e3bf..5bc65e3bf 100644
--- a/navit/xpm/country_BR.svgz
+++ b/navit/icons/country_BR.svgz
diff --git a/navit/xpm/country_BS.svgz b/navit/icons/country_BS.svgz
index dbb64ce7a..dbb64ce7a 100644
--- a/navit/xpm/country_BS.svgz
+++ b/navit/icons/country_BS.svgz
diff --git a/navit/xpm/country_BT.svgz b/navit/icons/country_BT.svgz
index 9e6ad96ec..9e6ad96ec 100644
--- a/navit/xpm/country_BT.svgz
+++ b/navit/icons/country_BT.svgz
diff --git a/navit/xpm/country_BV.svgz b/navit/icons/country_BV.svgz
index f990449ff..f990449ff 100644
--- a/navit/xpm/country_BV.svgz
+++ b/navit/icons/country_BV.svgz
diff --git a/navit/xpm/country_BW.svgz b/navit/icons/country_BW.svgz
index 5c6865055..5c6865055 100644
--- a/navit/xpm/country_BW.svgz
+++ b/navit/icons/country_BW.svgz
diff --git a/navit/xpm/country_BY.svgz b/navit/icons/country_BY.svgz
index bf279e708..bf279e708 100644
--- a/navit/xpm/country_BY.svgz
+++ b/navit/icons/country_BY.svgz
diff --git a/navit/xpm/country_BZ.svgz b/navit/icons/country_BZ.svgz
index 34fe28f1a..34fe28f1a 100644
--- a/navit/xpm/country_BZ.svgz
+++ b/navit/icons/country_BZ.svgz
diff --git a/navit/xpm/country_CA.svgz b/navit/icons/country_CA.svgz
index 92587f9fa..92587f9fa 100644
--- a/navit/xpm/country_CA.svgz
+++ b/navit/icons/country_CA.svgz
diff --git a/navit/xpm/country_CC.svgz b/navit/icons/country_CC.svgz
index ec8e914a0..ec8e914a0 100644
--- a/navit/xpm/country_CC.svgz
+++ b/navit/icons/country_CC.svgz
diff --git a/navit/xpm/country_CD.svgz b/navit/icons/country_CD.svgz
index 70ffe5e5d..70ffe5e5d 100644
--- a/navit/xpm/country_CD.svgz
+++ b/navit/icons/country_CD.svgz
diff --git a/navit/xpm/country_CF.svgz b/navit/icons/country_CF.svgz
index eb794a0a4..eb794a0a4 100644
--- a/navit/xpm/country_CF.svgz
+++ b/navit/icons/country_CF.svgz
diff --git a/navit/xpm/country_CG.svgz b/navit/icons/country_CG.svgz
index da2ba7737..da2ba7737 100644
--- a/navit/xpm/country_CG.svgz
+++ b/navit/icons/country_CG.svgz
diff --git a/navit/xpm/country_CH.svgz b/navit/icons/country_CH.svgz
index c27e64412..c27e64412 100644
--- a/navit/xpm/country_CH.svgz
+++ b/navit/icons/country_CH.svgz
diff --git a/navit/xpm/country_CI.svgz b/navit/icons/country_CI.svgz
index d58271fdf..d58271fdf 100644
--- a/navit/xpm/country_CI.svgz
+++ b/navit/icons/country_CI.svgz
diff --git a/navit/xpm/country_CK.svgz b/navit/icons/country_CK.svgz
index 254e25a16..254e25a16 100644
--- a/navit/xpm/country_CK.svgz
+++ b/navit/icons/country_CK.svgz
diff --git a/navit/xpm/country_CL.svgz b/navit/icons/country_CL.svgz
index e0436f103..e0436f103 100644
--- a/navit/xpm/country_CL.svgz
+++ b/navit/icons/country_CL.svgz
diff --git a/navit/xpm/country_CM.svgz b/navit/icons/country_CM.svgz
index 76a7798cf..76a7798cf 100644
--- a/navit/xpm/country_CM.svgz
+++ b/navit/icons/country_CM.svgz
diff --git a/navit/xpm/country_CN.svgz b/navit/icons/country_CN.svgz
index 10319b605..10319b605 100644
--- a/navit/xpm/country_CN.svgz
+++ b/navit/icons/country_CN.svgz
diff --git a/navit/xpm/country_CO.svgz b/navit/icons/country_CO.svgz
index 4294d1df7..4294d1df7 100644
--- a/navit/xpm/country_CO.svgz
+++ b/navit/icons/country_CO.svgz
diff --git a/navit/xpm/country_CR.svgz b/navit/icons/country_CR.svgz
index 877f779c1..877f779c1 100644
--- a/navit/xpm/country_CR.svgz
+++ b/navit/icons/country_CR.svgz
diff --git a/navit/xpm/country_CU.svgz b/navit/icons/country_CU.svgz
index fde7996ae..fde7996ae 100644
--- a/navit/xpm/country_CU.svgz
+++ b/navit/icons/country_CU.svgz
diff --git a/navit/xpm/country_CV.svgz b/navit/icons/country_CV.svgz
index 2080d1f68..2080d1f68 100644
--- a/navit/xpm/country_CV.svgz
+++ b/navit/icons/country_CV.svgz
diff --git a/navit/xpm/country_CX.svgz b/navit/icons/country_CX.svgz
index 1ad1ea803..1ad1ea803 100644
--- a/navit/xpm/country_CX.svgz
+++ b/navit/icons/country_CX.svgz
diff --git a/navit/xpm/country_CY.svgz b/navit/icons/country_CY.svgz
index 59073bbed..59073bbed 100644
--- a/navit/xpm/country_CY.svgz
+++ b/navit/icons/country_CY.svgz
diff --git a/navit/xpm/country_CZ.svgz b/navit/icons/country_CZ.svgz
index 893984037..893984037 100644
--- a/navit/xpm/country_CZ.svgz
+++ b/navit/icons/country_CZ.svgz
diff --git a/navit/xpm/country_DE.svgz b/navit/icons/country_DE.svgz
index 107982c31..107982c31 100644
--- a/navit/xpm/country_DE.svgz
+++ b/navit/icons/country_DE.svgz
diff --git a/navit/xpm/country_DJ.svgz b/navit/icons/country_DJ.svgz
index 6d2e49071..6d2e49071 100644
--- a/navit/xpm/country_DJ.svgz
+++ b/navit/icons/country_DJ.svgz
diff --git a/navit/xpm/country_DK.svgz b/navit/icons/country_DK.svgz
index f9d51c74f..f9d51c74f 100644
--- a/navit/xpm/country_DK.svgz
+++ b/navit/icons/country_DK.svgz
diff --git a/navit/xpm/country_DM.svgz b/navit/icons/country_DM.svgz
index ff8215f42..ff8215f42 100644
--- a/navit/xpm/country_DM.svgz
+++ b/navit/icons/country_DM.svgz
diff --git a/navit/xpm/country_DO.svgz b/navit/icons/country_DO.svgz
index a16fba7df..a16fba7df 100644
--- a/navit/xpm/country_DO.svgz
+++ b/navit/icons/country_DO.svgz
diff --git a/navit/xpm/country_DZ.svgz b/navit/icons/country_DZ.svgz
index e17f46fd3..e17f46fd3 100644
--- a/navit/xpm/country_DZ.svgz
+++ b/navit/icons/country_DZ.svgz
diff --git a/navit/xpm/country_EC.svgz b/navit/icons/country_EC.svgz
index fb2f4f0e9..fb2f4f0e9 100644
--- a/navit/xpm/country_EC.svgz
+++ b/navit/icons/country_EC.svgz
diff --git a/navit/xpm/country_EE.svgz b/navit/icons/country_EE.svgz
index dcf6b912f..dcf6b912f 100644
--- a/navit/xpm/country_EE.svgz
+++ b/navit/icons/country_EE.svgz
diff --git a/navit/xpm/country_EG.svgz b/navit/icons/country_EG.svgz
index 317ce47b8..317ce47b8 100644
--- a/navit/xpm/country_EG.svgz
+++ b/navit/icons/country_EG.svgz
diff --git a/navit/xpm/country_EH.svgz b/navit/icons/country_EH.svgz
index b08f92298..b08f92298 100644
--- a/navit/xpm/country_EH.svgz
+++ b/navit/icons/country_EH.svgz
diff --git a/navit/xpm/country_ER.svgz b/navit/icons/country_ER.svgz
index d00a4c6a8..d00a4c6a8 100644
--- a/navit/xpm/country_ER.svgz
+++ b/navit/icons/country_ER.svgz
diff --git a/navit/xpm/country_ES.svgz b/navit/icons/country_ES.svgz
index f0abc567d..f0abc567d 100644
--- a/navit/xpm/country_ES.svgz
+++ b/navit/icons/country_ES.svgz
diff --git a/navit/xpm/country_ET.svgz b/navit/icons/country_ET.svgz
index 2e6604508..2e6604508 100644
--- a/navit/xpm/country_ET.svgz
+++ b/navit/icons/country_ET.svgz
diff --git a/navit/xpm/country_FI.svgz b/navit/icons/country_FI.svgz
index 85927b63b..85927b63b 100644
--- a/navit/xpm/country_FI.svgz
+++ b/navit/icons/country_FI.svgz
diff --git a/navit/xpm/country_FJ.svgz b/navit/icons/country_FJ.svgz
index 4085c59db..4085c59db 100644
--- a/navit/xpm/country_FJ.svgz
+++ b/navit/icons/country_FJ.svgz
diff --git a/navit/xpm/country_FK.svgz b/navit/icons/country_FK.svgz
index b2ff812e8..b2ff812e8 100644
--- a/navit/xpm/country_FK.svgz
+++ b/navit/icons/country_FK.svgz
diff --git a/navit/xpm/country_FM.svgz b/navit/icons/country_FM.svgz
index 32361a5b4..32361a5b4 100644
--- a/navit/xpm/country_FM.svgz
+++ b/navit/icons/country_FM.svgz
diff --git a/navit/xpm/country_FO.svgz b/navit/icons/country_FO.svgz
index 92bed0f6a..92bed0f6a 100644
--- a/navit/xpm/country_FO.svgz
+++ b/navit/icons/country_FO.svgz
diff --git a/navit/xpm/country_FR.svgz b/navit/icons/country_FR.svgz
index 58c9e0fc3..58c9e0fc3 100644
--- a/navit/xpm/country_FR.svgz
+++ b/navit/icons/country_FR.svgz
diff --git a/navit/xpm/country_GA.svgz b/navit/icons/country_GA.svgz
index 0bf22f648..0bf22f648 100644
--- a/navit/xpm/country_GA.svgz
+++ b/navit/icons/country_GA.svgz
diff --git a/navit/xpm/country_GB.svgz b/navit/icons/country_GB.svgz
index 07500c719..07500c719 100644
--- a/navit/xpm/country_GB.svgz
+++ b/navit/icons/country_GB.svgz
diff --git a/navit/xpm/country_GD.svgz b/navit/icons/country_GD.svgz
index 5ee64135a..5ee64135a 100644
--- a/navit/xpm/country_GD.svgz
+++ b/navit/icons/country_GD.svgz
diff --git a/navit/xpm/country_GE.svgz b/navit/icons/country_GE.svgz
index 54a8e8bf1..54a8e8bf1 100644
--- a/navit/xpm/country_GE.svgz
+++ b/navit/icons/country_GE.svgz
diff --git a/navit/xpm/country_GF.svgz b/navit/icons/country_GF.svgz
index 4ac873b47..4ac873b47 100644
--- a/navit/xpm/country_GF.svgz
+++ b/navit/icons/country_GF.svgz
diff --git a/navit/xpm/country_GG.svgz b/navit/icons/country_GG.svgz
index e565c1682..e565c1682 100644
--- a/navit/xpm/country_GG.svgz
+++ b/navit/icons/country_GG.svgz
diff --git a/navit/xpm/country_GH.svgz b/navit/icons/country_GH.svgz
index ae8a23741..ae8a23741 100644
--- a/navit/xpm/country_GH.svgz
+++ b/navit/icons/country_GH.svgz
diff --git a/navit/xpm/country_GI.svgz b/navit/icons/country_GI.svgz
index 0446a7e14..0446a7e14 100644
--- a/navit/xpm/country_GI.svgz
+++ b/navit/icons/country_GI.svgz
diff --git a/navit/xpm/country_GL.svgz b/navit/icons/country_GL.svgz
index efc40350b..efc40350b 100644
--- a/navit/xpm/country_GL.svgz
+++ b/navit/icons/country_GL.svgz
diff --git a/navit/xpm/country_GM.svgz b/navit/icons/country_GM.svgz
index a9334e79c..a9334e79c 100644
--- a/navit/xpm/country_GM.svgz
+++ b/navit/icons/country_GM.svgz
diff --git a/navit/xpm/country_GN.svgz b/navit/icons/country_GN.svgz
index 1b63e41ca..1b63e41ca 100644
--- a/navit/xpm/country_GN.svgz
+++ b/navit/icons/country_GN.svgz
diff --git a/navit/xpm/country_GP.svgz b/navit/icons/country_GP.svgz
index 904de5ae6..904de5ae6 100644
--- a/navit/xpm/country_GP.svgz
+++ b/navit/icons/country_GP.svgz
diff --git a/navit/xpm/country_GQ.svgz b/navit/icons/country_GQ.svgz
index afc2be67c..afc2be67c 100644
--- a/navit/xpm/country_GQ.svgz
+++ b/navit/icons/country_GQ.svgz
diff --git a/navit/xpm/country_GR.svgz b/navit/icons/country_GR.svgz
index 40cde738c..40cde738c 100644
--- a/navit/xpm/country_GR.svgz
+++ b/navit/icons/country_GR.svgz
diff --git a/navit/xpm/country_GS.svgz b/navit/icons/country_GS.svgz
index 2f824fde3..2f824fde3 100644
--- a/navit/xpm/country_GS.svgz
+++ b/navit/icons/country_GS.svgz
diff --git a/navit/xpm/country_GT.svgz b/navit/icons/country_GT.svgz
index 2a060b6b2..2a060b6b2 100644
--- a/navit/xpm/country_GT.svgz
+++ b/navit/icons/country_GT.svgz
diff --git a/navit/xpm/country_GU.svgz b/navit/icons/country_GU.svgz
index 510129294..510129294 100644
--- a/navit/xpm/country_GU.svgz
+++ b/navit/icons/country_GU.svgz
diff --git a/navit/xpm/country_GW.svgz b/navit/icons/country_GW.svgz
index dc6aea01c..dc6aea01c 100644
--- a/navit/xpm/country_GW.svgz
+++ b/navit/icons/country_GW.svgz
diff --git a/navit/xpm/country_GY.svgz b/navit/icons/country_GY.svgz
index 5925c884e..5925c884e 100644
--- a/navit/xpm/country_GY.svgz
+++ b/navit/icons/country_GY.svgz
diff --git a/navit/xpm/country_HK.svgz b/navit/icons/country_HK.svgz
index 4e73944b1..4e73944b1 100644
--- a/navit/xpm/country_HK.svgz
+++ b/navit/icons/country_HK.svgz
diff --git a/navit/xpm/country_HM.svgz b/navit/icons/country_HM.svgz
index 36a363f8c..36a363f8c 100644
--- a/navit/xpm/country_HM.svgz
+++ b/navit/icons/country_HM.svgz
diff --git a/navit/xpm/country_HN.svgz b/navit/icons/country_HN.svgz
index 19baf8a2f..19baf8a2f 100644
--- a/navit/xpm/country_HN.svgz
+++ b/navit/icons/country_HN.svgz
diff --git a/navit/xpm/country_HR.svgz b/navit/icons/country_HR.svgz
index b16673a1a..b16673a1a 100644
--- a/navit/xpm/country_HR.svgz
+++ b/navit/icons/country_HR.svgz
diff --git a/navit/xpm/country_HT.svgz b/navit/icons/country_HT.svgz
index 78569d866..78569d866 100644
--- a/navit/xpm/country_HT.svgz
+++ b/navit/icons/country_HT.svgz
diff --git a/navit/xpm/country_HU.svgz b/navit/icons/country_HU.svgz
index 138e5e6ee..138e5e6ee 100644
--- a/navit/xpm/country_HU.svgz
+++ b/navit/icons/country_HU.svgz
diff --git a/navit/xpm/country_ID.svgz b/navit/icons/country_ID.svgz
index bebdbe9cb..bebdbe9cb 100644
--- a/navit/xpm/country_ID.svgz
+++ b/navit/icons/country_ID.svgz
diff --git a/navit/xpm/country_IE.svgz b/navit/icons/country_IE.svgz
index 5a0782e62..5a0782e62 100644
--- a/navit/xpm/country_IE.svgz
+++ b/navit/icons/country_IE.svgz
diff --git a/navit/xpm/country_IL.svgz b/navit/icons/country_IL.svgz
index 0de8f5412..0de8f5412 100644
--- a/navit/xpm/country_IL.svgz
+++ b/navit/icons/country_IL.svgz
diff --git a/navit/xpm/country_IM.svgz b/navit/icons/country_IM.svgz
index 63cfd31a2..63cfd31a2 100644
--- a/navit/xpm/country_IM.svgz
+++ b/navit/icons/country_IM.svgz
diff --git a/navit/xpm/country_IN.svgz b/navit/icons/country_IN.svgz
index d207dcdee..d207dcdee 100644
--- a/navit/xpm/country_IN.svgz
+++ b/navit/icons/country_IN.svgz
diff --git a/navit/xpm/country_IO.svgz b/navit/icons/country_IO.svgz
index c2e20767f..c2e20767f 100644
--- a/navit/xpm/country_IO.svgz
+++ b/navit/icons/country_IO.svgz
diff --git a/navit/xpm/country_IQ.svgz b/navit/icons/country_IQ.svgz
index 2045a8775..2045a8775 100644
--- a/navit/xpm/country_IQ.svgz
+++ b/navit/icons/country_IQ.svgz
diff --git a/navit/xpm/country_IR.svgz b/navit/icons/country_IR.svgz
index fbf6ef0af..fbf6ef0af 100644
--- a/navit/xpm/country_IR.svgz
+++ b/navit/icons/country_IR.svgz
diff --git a/navit/xpm/country_IS.svgz b/navit/icons/country_IS.svgz
index 649434345..649434345 100644
--- a/navit/xpm/country_IS.svgz
+++ b/navit/icons/country_IS.svgz
diff --git a/navit/xpm/country_IT.svgz b/navit/icons/country_IT.svgz
index 7b2490ea1..7b2490ea1 100644
--- a/navit/xpm/country_IT.svgz
+++ b/navit/icons/country_IT.svgz
diff --git a/navit/xpm/country_JE.svgz b/navit/icons/country_JE.svgz
index a61eb2e4e..a61eb2e4e 100644
--- a/navit/xpm/country_JE.svgz
+++ b/navit/icons/country_JE.svgz
diff --git a/navit/xpm/country_JM.svgz b/navit/icons/country_JM.svgz
index 97d89506e..97d89506e 100644
--- a/navit/xpm/country_JM.svgz
+++ b/navit/icons/country_JM.svgz
diff --git a/navit/xpm/country_JO.svgz b/navit/icons/country_JO.svgz
index 515bf8a74..515bf8a74 100644
--- a/navit/xpm/country_JO.svgz
+++ b/navit/icons/country_JO.svgz
diff --git a/navit/xpm/country_JP.svgz b/navit/icons/country_JP.svgz
index 896888544..896888544 100644
--- a/navit/xpm/country_JP.svgz
+++ b/navit/icons/country_JP.svgz
diff --git a/navit/xpm/country_KE.svgz b/navit/icons/country_KE.svgz
index 94894b8a1..94894b8a1 100644
--- a/navit/xpm/country_KE.svgz
+++ b/navit/icons/country_KE.svgz
diff --git a/navit/xpm/country_KG.svgz b/navit/icons/country_KG.svgz
index adb3a3708..adb3a3708 100644
--- a/navit/xpm/country_KG.svgz
+++ b/navit/icons/country_KG.svgz
diff --git a/navit/xpm/country_KH.svgz b/navit/icons/country_KH.svgz
index 1da2ccb0b..1da2ccb0b 100644
--- a/navit/xpm/country_KH.svgz
+++ b/navit/icons/country_KH.svgz
diff --git a/navit/xpm/country_KI.svgz b/navit/icons/country_KI.svgz
index 2c6775e53..2c6775e53 100644
--- a/navit/xpm/country_KI.svgz
+++ b/navit/icons/country_KI.svgz
diff --git a/navit/xpm/country_KM.svgz b/navit/icons/country_KM.svgz
index 5cb2b84a4..5cb2b84a4 100644
--- a/navit/xpm/country_KM.svgz
+++ b/navit/icons/country_KM.svgz
diff --git a/navit/xpm/country_KN.svgz b/navit/icons/country_KN.svgz
index 9c5150bfc..9c5150bfc 100644
--- a/navit/xpm/country_KN.svgz
+++ b/navit/icons/country_KN.svgz
diff --git a/navit/xpm/country_KP.svgz b/navit/icons/country_KP.svgz
index f45c8e803..f45c8e803 100644
--- a/navit/xpm/country_KP.svgz
+++ b/navit/icons/country_KP.svgz
diff --git a/navit/xpm/country_KR.svgz b/navit/icons/country_KR.svgz
index 61b6112c6..61b6112c6 100644
--- a/navit/xpm/country_KR.svgz
+++ b/navit/icons/country_KR.svgz
diff --git a/navit/xpm/country_KW.svgz b/navit/icons/country_KW.svgz
index 439d148ac..439d148ac 100644
--- a/navit/xpm/country_KW.svgz
+++ b/navit/icons/country_KW.svgz
diff --git a/navit/xpm/country_KY.svgz b/navit/icons/country_KY.svgz
index f209210bc..f209210bc 100644
--- a/navit/xpm/country_KY.svgz
+++ b/navit/icons/country_KY.svgz
diff --git a/navit/xpm/country_KZ.svgz b/navit/icons/country_KZ.svgz
index 78a1f4420..78a1f4420 100644
--- a/navit/xpm/country_KZ.svgz
+++ b/navit/icons/country_KZ.svgz
diff --git a/navit/xpm/country_LA.svgz b/navit/icons/country_LA.svgz
index 9ce9d6c15..9ce9d6c15 100644
--- a/navit/xpm/country_LA.svgz
+++ b/navit/icons/country_LA.svgz
diff --git a/navit/xpm/country_LB.svgz b/navit/icons/country_LB.svgz
index 387f5e686..387f5e686 100644
--- a/navit/xpm/country_LB.svgz
+++ b/navit/icons/country_LB.svgz
diff --git a/navit/xpm/country_LC.svgz b/navit/icons/country_LC.svgz
index 7bcacff51..7bcacff51 100644
--- a/navit/xpm/country_LC.svgz
+++ b/navit/icons/country_LC.svgz
diff --git a/navit/xpm/country_LI.svgz b/navit/icons/country_LI.svgz
index 6019f9a0d..6019f9a0d 100644
--- a/navit/xpm/country_LI.svgz
+++ b/navit/icons/country_LI.svgz
diff --git a/navit/xpm/country_LK.svgz b/navit/icons/country_LK.svgz
index 02a31a6ac..02a31a6ac 100644
--- a/navit/xpm/country_LK.svgz
+++ b/navit/icons/country_LK.svgz
diff --git a/navit/xpm/country_LR.svgz b/navit/icons/country_LR.svgz
index 57a3391aa..57a3391aa 100644
--- a/navit/xpm/country_LR.svgz
+++ b/navit/icons/country_LR.svgz
diff --git a/navit/xpm/country_LS.svgz b/navit/icons/country_LS.svgz
index d6e19de42..d6e19de42 100644
--- a/navit/xpm/country_LS.svgz
+++ b/navit/icons/country_LS.svgz
diff --git a/navit/xpm/country_LT.svgz b/navit/icons/country_LT.svgz
index 07b5472bf..07b5472bf 100644
--- a/navit/xpm/country_LT.svgz
+++ b/navit/icons/country_LT.svgz
diff --git a/navit/xpm/country_LU.svgz b/navit/icons/country_LU.svgz
index c60b13487..c60b13487 100644
--- a/navit/xpm/country_LU.svgz
+++ b/navit/icons/country_LU.svgz
diff --git a/navit/xpm/country_LV.svgz b/navit/icons/country_LV.svgz
index aa4fdc39a..aa4fdc39a 100644
--- a/navit/xpm/country_LV.svgz
+++ b/navit/icons/country_LV.svgz
diff --git a/navit/xpm/country_LY.svgz b/navit/icons/country_LY.svgz
index d453d8bdf..d453d8bdf 100644
--- a/navit/xpm/country_LY.svgz
+++ b/navit/icons/country_LY.svgz
diff --git a/navit/xpm/country_MA.svgz b/navit/icons/country_MA.svgz
index 794f083bd..794f083bd 100644
--- a/navit/xpm/country_MA.svgz
+++ b/navit/icons/country_MA.svgz
diff --git a/navit/xpm/country_MC.svgz b/navit/icons/country_MC.svgz
index 1ed62dd56..1ed62dd56 100644
--- a/navit/xpm/country_MC.svgz
+++ b/navit/icons/country_MC.svgz
diff --git a/navit/xpm/country_MD.svgz b/navit/icons/country_MD.svgz
index 17675e93e..17675e93e 100644
--- a/navit/xpm/country_MD.svgz
+++ b/navit/icons/country_MD.svgz
diff --git a/navit/xpm/country_ME.svgz b/navit/icons/country_ME.svgz
index ddb9acb43..ddb9acb43 100644
--- a/navit/xpm/country_ME.svgz
+++ b/navit/icons/country_ME.svgz
diff --git a/navit/xpm/country_MF.svgz b/navit/icons/country_MF.svgz
index 657a49fe7..657a49fe7 100644
--- a/navit/xpm/country_MF.svgz
+++ b/navit/icons/country_MF.svgz
diff --git a/navit/xpm/country_MG.svgz b/navit/icons/country_MG.svgz
index 5d4dbcb46..5d4dbcb46 100644
--- a/navit/xpm/country_MG.svgz
+++ b/navit/icons/country_MG.svgz
diff --git a/navit/xpm/country_MH.svgz b/navit/icons/country_MH.svgz
index b9bc96f7a..b9bc96f7a 100644
--- a/navit/xpm/country_MH.svgz
+++ b/navit/icons/country_MH.svgz
diff --git a/navit/xpm/country_MK.svgz b/navit/icons/country_MK.svgz
index 3e77a4f8c..3e77a4f8c 100644
--- a/navit/xpm/country_MK.svgz
+++ b/navit/icons/country_MK.svgz
diff --git a/navit/xpm/country_ML.svgz b/navit/icons/country_ML.svgz
index 86f210717..86f210717 100644
--- a/navit/xpm/country_ML.svgz
+++ b/navit/icons/country_ML.svgz
diff --git a/navit/xpm/country_MM.svgz b/navit/icons/country_MM.svgz
index 71fc23901..71fc23901 100644
--- a/navit/xpm/country_MM.svgz
+++ b/navit/icons/country_MM.svgz
diff --git a/navit/xpm/country_MN.svgz b/navit/icons/country_MN.svgz
index b292c536a..b292c536a 100644
--- a/navit/xpm/country_MN.svgz
+++ b/navit/icons/country_MN.svgz
diff --git a/navit/xpm/country_MO.svgz b/navit/icons/country_MO.svgz
index ffa696461..ffa696461 100644
--- a/navit/xpm/country_MO.svgz
+++ b/navit/icons/country_MO.svgz
diff --git a/navit/xpm/country_MP.svgz b/navit/icons/country_MP.svgz
index 67574ca9b..67574ca9b 100644
--- a/navit/xpm/country_MP.svgz
+++ b/navit/icons/country_MP.svgz
diff --git a/navit/xpm/country_MQ.svgz b/navit/icons/country_MQ.svgz
index d4f6fd925..d4f6fd925 100644
--- a/navit/xpm/country_MQ.svgz
+++ b/navit/icons/country_MQ.svgz
diff --git a/navit/xpm/country_MR.svgz b/navit/icons/country_MR.svgz
index d88359139..d88359139 100644
--- a/navit/xpm/country_MR.svgz
+++ b/navit/icons/country_MR.svgz
diff --git a/navit/xpm/country_MS.svgz b/navit/icons/country_MS.svgz
index 840355651..840355651 100644
--- a/navit/xpm/country_MS.svgz
+++ b/navit/icons/country_MS.svgz
diff --git a/navit/xpm/country_MT.svgz b/navit/icons/country_MT.svgz
index 7737ee80d..7737ee80d 100644
--- a/navit/xpm/country_MT.svgz
+++ b/navit/icons/country_MT.svgz
diff --git a/navit/xpm/country_MU.svgz b/navit/icons/country_MU.svgz
index 346c67ce2..346c67ce2 100644
--- a/navit/xpm/country_MU.svgz
+++ b/navit/icons/country_MU.svgz
diff --git a/navit/xpm/country_MV.svgz b/navit/icons/country_MV.svgz
index 3f1cb872a..3f1cb872a 100644
--- a/navit/xpm/country_MV.svgz
+++ b/navit/icons/country_MV.svgz
diff --git a/navit/xpm/country_MW.svgz b/navit/icons/country_MW.svgz
index 7f63bff7c..7f63bff7c 100644
--- a/navit/xpm/country_MW.svgz
+++ b/navit/icons/country_MW.svgz
diff --git a/navit/xpm/country_MX.svgz b/navit/icons/country_MX.svgz
index 63dff365c..63dff365c 100644
--- a/navit/xpm/country_MX.svgz
+++ b/navit/icons/country_MX.svgz
diff --git a/navit/xpm/country_MY.svgz b/navit/icons/country_MY.svgz
index 188aa84fd..188aa84fd 100644
--- a/navit/xpm/country_MY.svgz
+++ b/navit/icons/country_MY.svgz
diff --git a/navit/xpm/country_MZ.svgz b/navit/icons/country_MZ.svgz
index 1cc6a5dc0..1cc6a5dc0 100644
--- a/navit/xpm/country_MZ.svgz
+++ b/navit/icons/country_MZ.svgz
diff --git a/navit/xpm/country_NA.svgz b/navit/icons/country_NA.svgz
index 45a2ce378..45a2ce378 100644
--- a/navit/xpm/country_NA.svgz
+++ b/navit/icons/country_NA.svgz
diff --git a/navit/xpm/country_NC.svgz b/navit/icons/country_NC.svgz
index 5de7938e0..5de7938e0 100644
--- a/navit/xpm/country_NC.svgz
+++ b/navit/icons/country_NC.svgz
diff --git a/navit/xpm/country_NE.svgz b/navit/icons/country_NE.svgz
index e4aa72cfc..e4aa72cfc 100644
--- a/navit/xpm/country_NE.svgz
+++ b/navit/icons/country_NE.svgz
diff --git a/navit/xpm/country_NF.svgz b/navit/icons/country_NF.svgz
index bffd6b7fc..bffd6b7fc 100644
--- a/navit/xpm/country_NF.svgz
+++ b/navit/icons/country_NF.svgz
diff --git a/navit/xpm/country_NG.svgz b/navit/icons/country_NG.svgz
index b476d20ce..b476d20ce 100644
--- a/navit/xpm/country_NG.svgz
+++ b/navit/icons/country_NG.svgz
diff --git a/navit/xpm/country_NI.svgz b/navit/icons/country_NI.svgz
index 9b7758eaa..9b7758eaa 100644
--- a/navit/xpm/country_NI.svgz
+++ b/navit/icons/country_NI.svgz
diff --git a/navit/xpm/country_NL.svgz b/navit/icons/country_NL.svgz
index cefb48d9e..cefb48d9e 100644
--- a/navit/xpm/country_NL.svgz
+++ b/navit/icons/country_NL.svgz
diff --git a/navit/xpm/country_NO.svgz b/navit/icons/country_NO.svgz
index 878b214cc..878b214cc 100644
--- a/navit/xpm/country_NO.svgz
+++ b/navit/icons/country_NO.svgz
diff --git a/navit/xpm/country_NP.svgz b/navit/icons/country_NP.svgz
index a511b5bf5..a511b5bf5 100644
--- a/navit/xpm/country_NP.svgz
+++ b/navit/icons/country_NP.svgz
diff --git a/navit/xpm/country_NR.svgz b/navit/icons/country_NR.svgz
index 2d5fe618a..2d5fe618a 100644
--- a/navit/xpm/country_NR.svgz
+++ b/navit/icons/country_NR.svgz
diff --git a/navit/xpm/country_NU.svgz b/navit/icons/country_NU.svgz
index 92aad1652..92aad1652 100644
--- a/navit/xpm/country_NU.svgz
+++ b/navit/icons/country_NU.svgz
diff --git a/navit/xpm/country_NZ.svgz b/navit/icons/country_NZ.svgz
index e00fdc9b2..e00fdc9b2 100644
--- a/navit/xpm/country_NZ.svgz
+++ b/navit/icons/country_NZ.svgz
diff --git a/navit/xpm/country_OM.svgz b/navit/icons/country_OM.svgz
index e58349783..e58349783 100644
--- a/navit/xpm/country_OM.svgz
+++ b/navit/icons/country_OM.svgz
diff --git a/navit/xpm/country_PA.svgz b/navit/icons/country_PA.svgz
index 7e5434540..7e5434540 100644
--- a/navit/xpm/country_PA.svgz
+++ b/navit/icons/country_PA.svgz
diff --git a/navit/xpm/country_PE.svgz b/navit/icons/country_PE.svgz
index 0420e0873..0420e0873 100644
--- a/navit/xpm/country_PE.svgz
+++ b/navit/icons/country_PE.svgz
diff --git a/navit/xpm/country_PF.svgz b/navit/icons/country_PF.svgz
index 1172c8e31..1172c8e31 100644
--- a/navit/xpm/country_PF.svgz
+++ b/navit/icons/country_PF.svgz
diff --git a/navit/xpm/country_PG.svgz b/navit/icons/country_PG.svgz
index fc65f1d10..fc65f1d10 100644
--- a/navit/xpm/country_PG.svgz
+++ b/navit/icons/country_PG.svgz
diff --git a/navit/xpm/country_PH.svgz b/navit/icons/country_PH.svgz
index e84a2479a..e84a2479a 100644
--- a/navit/xpm/country_PH.svgz
+++ b/navit/icons/country_PH.svgz
diff --git a/navit/xpm/country_PK.svgz b/navit/icons/country_PK.svgz
index 824b5624d..824b5624d 100644
--- a/navit/xpm/country_PK.svgz
+++ b/navit/icons/country_PK.svgz
diff --git a/navit/xpm/country_PL.svgz b/navit/icons/country_PL.svgz
index 73310535a..73310535a 100644
--- a/navit/xpm/country_PL.svgz
+++ b/navit/icons/country_PL.svgz
diff --git a/navit/xpm/country_PM.svgz b/navit/icons/country_PM.svgz
index 56acb3dd7..56acb3dd7 100644
--- a/navit/xpm/country_PM.svgz
+++ b/navit/icons/country_PM.svgz
diff --git a/navit/xpm/country_PN.svgz b/navit/icons/country_PN.svgz
index 9a0404c74..9a0404c74 100644
--- a/navit/xpm/country_PN.svgz
+++ b/navit/icons/country_PN.svgz
diff --git a/navit/xpm/country_PR.svgz b/navit/icons/country_PR.svgz
index 75217bbea..75217bbea 100644
--- a/navit/xpm/country_PR.svgz
+++ b/navit/icons/country_PR.svgz
diff --git a/navit/xpm/country_PS.svgz b/navit/icons/country_PS.svgz
index 2c5c54c81..2c5c54c81 100644
--- a/navit/xpm/country_PS.svgz
+++ b/navit/icons/country_PS.svgz
diff --git a/navit/xpm/country_PT.svgz b/navit/icons/country_PT.svgz
index f0de8001e..f0de8001e 100644
--- a/navit/xpm/country_PT.svgz
+++ b/navit/icons/country_PT.svgz
diff --git a/navit/xpm/country_PW.svgz b/navit/icons/country_PW.svgz
index 54d644d45..54d644d45 100644
--- a/navit/xpm/country_PW.svgz
+++ b/navit/icons/country_PW.svgz
diff --git a/navit/xpm/country_PY.svgz b/navit/icons/country_PY.svgz
index 67ff330d0..67ff330d0 100644
--- a/navit/xpm/country_PY.svgz
+++ b/navit/icons/country_PY.svgz
diff --git a/navit/xpm/country_QA.svgz b/navit/icons/country_QA.svgz
index 1f221bf1c..1f221bf1c 100644
--- a/navit/xpm/country_QA.svgz
+++ b/navit/icons/country_QA.svgz
diff --git a/navit/xpm/country_RE.svgz b/navit/icons/country_RE.svgz
index 81d06626f..81d06626f 100644
--- a/navit/xpm/country_RE.svgz
+++ b/navit/icons/country_RE.svgz
diff --git a/navit/xpm/country_RO.svgz b/navit/icons/country_RO.svgz
index cc69d366d..cc69d366d 100644
--- a/navit/xpm/country_RO.svgz
+++ b/navit/icons/country_RO.svgz
diff --git a/navit/xpm/country_RS.svgz b/navit/icons/country_RS.svgz
index 447cb2c68..447cb2c68 100644
--- a/navit/xpm/country_RS.svgz
+++ b/navit/icons/country_RS.svgz
diff --git a/navit/xpm/country_RU.svgz b/navit/icons/country_RU.svgz
index 56dce1764..56dce1764 100644
--- a/navit/xpm/country_RU.svgz
+++ b/navit/icons/country_RU.svgz
diff --git a/navit/xpm/country_RW.svgz b/navit/icons/country_RW.svgz
index f92e743e8..f92e743e8 100644
--- a/navit/xpm/country_RW.svgz
+++ b/navit/icons/country_RW.svgz
diff --git a/navit/xpm/country_SA.svgz b/navit/icons/country_SA.svgz
index 48f288422..48f288422 100644
--- a/navit/xpm/country_SA.svgz
+++ b/navit/icons/country_SA.svgz
diff --git a/navit/xpm/country_SB.svgz b/navit/icons/country_SB.svgz
index 6343e43ca..6343e43ca 100644
--- a/navit/xpm/country_SB.svgz
+++ b/navit/icons/country_SB.svgz
diff --git a/navit/xpm/country_SC.svgz b/navit/icons/country_SC.svgz
index db51e3811..db51e3811 100644
--- a/navit/xpm/country_SC.svgz
+++ b/navit/icons/country_SC.svgz
diff --git a/navit/xpm/country_SD.svgz b/navit/icons/country_SD.svgz
index e1f091253..e1f091253 100644
--- a/navit/xpm/country_SD.svgz
+++ b/navit/icons/country_SD.svgz
diff --git a/navit/xpm/country_SE.svgz b/navit/icons/country_SE.svgz
index 17db1c0b9..17db1c0b9 100644
--- a/navit/xpm/country_SE.svgz
+++ b/navit/icons/country_SE.svgz
diff --git a/navit/xpm/country_SG.svgz b/navit/icons/country_SG.svgz
index 75fd3840a..75fd3840a 100644
--- a/navit/xpm/country_SG.svgz
+++ b/navit/icons/country_SG.svgz
diff --git a/navit/xpm/country_SH.svgz b/navit/icons/country_SH.svgz
index b3a7f5b83..b3a7f5b83 100644
--- a/navit/xpm/country_SH.svgz
+++ b/navit/icons/country_SH.svgz
diff --git a/navit/xpm/country_SI.svgz b/navit/icons/country_SI.svgz
index 21837fd5a..21837fd5a 100644
--- a/navit/xpm/country_SI.svgz
+++ b/navit/icons/country_SI.svgz
diff --git a/navit/xpm/country_SJ.svgz b/navit/icons/country_SJ.svgz
index 8971ba307..8971ba307 100644
--- a/navit/xpm/country_SJ.svgz
+++ b/navit/icons/country_SJ.svgz
diff --git a/navit/xpm/country_SK.svgz b/navit/icons/country_SK.svgz
index e3d5fc0e6..e3d5fc0e6 100644
--- a/navit/xpm/country_SK.svgz
+++ b/navit/icons/country_SK.svgz
diff --git a/navit/xpm/country_SL.svgz b/navit/icons/country_SL.svgz
index 2c53b5e2e..2c53b5e2e 100644
--- a/navit/xpm/country_SL.svgz
+++ b/navit/icons/country_SL.svgz
diff --git a/navit/xpm/country_SM.svgz b/navit/icons/country_SM.svgz
index b1f0ec028..b1f0ec028 100644
--- a/navit/xpm/country_SM.svgz
+++ b/navit/icons/country_SM.svgz
diff --git a/navit/xpm/country_SN.svgz b/navit/icons/country_SN.svgz
index dfcbd74bb..dfcbd74bb 100644
--- a/navit/xpm/country_SN.svgz
+++ b/navit/icons/country_SN.svgz
diff --git a/navit/xpm/country_SO.svgz b/navit/icons/country_SO.svgz
index 006f0cfa9..006f0cfa9 100644
--- a/navit/xpm/country_SO.svgz
+++ b/navit/icons/country_SO.svgz
diff --git a/navit/xpm/country_SR.svgz b/navit/icons/country_SR.svgz
index 87bf42090..87bf42090 100644
--- a/navit/xpm/country_SR.svgz
+++ b/navit/icons/country_SR.svgz
diff --git a/navit/xpm/country_ST.svgz b/navit/icons/country_ST.svgz
index ba51d11d8..ba51d11d8 100644
--- a/navit/xpm/country_ST.svgz
+++ b/navit/icons/country_ST.svgz
diff --git a/navit/xpm/country_SV.svgz b/navit/icons/country_SV.svgz
index bc69d5a73..bc69d5a73 100644
--- a/navit/xpm/country_SV.svgz
+++ b/navit/icons/country_SV.svgz
diff --git a/navit/xpm/country_SY.svgz b/navit/icons/country_SY.svgz
index 27d46fab8..27d46fab8 100644
--- a/navit/xpm/country_SY.svgz
+++ b/navit/icons/country_SY.svgz
diff --git a/navit/xpm/country_SZ.svgz b/navit/icons/country_SZ.svgz
index 13c333538..13c333538 100644
--- a/navit/xpm/country_SZ.svgz
+++ b/navit/icons/country_SZ.svgz
diff --git a/navit/xpm/country_TC.svgz b/navit/icons/country_TC.svgz
index 3f5daad2a..3f5daad2a 100644
--- a/navit/xpm/country_TC.svgz
+++ b/navit/icons/country_TC.svgz
diff --git a/navit/xpm/country_TD.svgz b/navit/icons/country_TD.svgz
index 823cc66e7..823cc66e7 100644
--- a/navit/xpm/country_TD.svgz
+++ b/navit/icons/country_TD.svgz
diff --git a/navit/xpm/country_TF.svgz b/navit/icons/country_TF.svgz
index 8da92cfb9..8da92cfb9 100644
--- a/navit/xpm/country_TF.svgz
+++ b/navit/icons/country_TF.svgz
diff --git a/navit/xpm/country_TG.svgz b/navit/icons/country_TG.svgz
index 5a5c0166f..5a5c0166f 100644
--- a/navit/xpm/country_TG.svgz
+++ b/navit/icons/country_TG.svgz
diff --git a/navit/xpm/country_TH.svgz b/navit/icons/country_TH.svgz
index a180af881..a180af881 100644
--- a/navit/xpm/country_TH.svgz
+++ b/navit/icons/country_TH.svgz
diff --git a/navit/xpm/country_TJ.svgz b/navit/icons/country_TJ.svgz
index 17a5a8f17..17a5a8f17 100644
--- a/navit/xpm/country_TJ.svgz
+++ b/navit/icons/country_TJ.svgz
diff --git a/navit/xpm/country_TK.svgz b/navit/icons/country_TK.svgz
index 8db772e7a..8db772e7a 100644
--- a/navit/xpm/country_TK.svgz
+++ b/navit/icons/country_TK.svgz
diff --git a/navit/xpm/country_TL.svgz b/navit/icons/country_TL.svgz
index 69d367768..69d367768 100644
--- a/navit/xpm/country_TL.svgz
+++ b/navit/icons/country_TL.svgz
diff --git a/navit/xpm/country_TM.svgz b/navit/icons/country_TM.svgz
index 29dfc16c7..29dfc16c7 100644
--- a/navit/xpm/country_TM.svgz
+++ b/navit/icons/country_TM.svgz
diff --git a/navit/xpm/country_TN.svgz b/navit/icons/country_TN.svgz
index d5c9bf69b..d5c9bf69b 100644
--- a/navit/xpm/country_TN.svgz
+++ b/navit/icons/country_TN.svgz
diff --git a/navit/xpm/country_TO.svgz b/navit/icons/country_TO.svgz
index 283affa50..283affa50 100644
--- a/navit/xpm/country_TO.svgz
+++ b/navit/icons/country_TO.svgz
diff --git a/navit/xpm/country_TR.svgz b/navit/icons/country_TR.svgz
index d1ec1cbca..d1ec1cbca 100644
--- a/navit/xpm/country_TR.svgz
+++ b/navit/icons/country_TR.svgz
diff --git a/navit/xpm/country_TT.svgz b/navit/icons/country_TT.svgz
index 960a8ebb1..960a8ebb1 100644
--- a/navit/xpm/country_TT.svgz
+++ b/navit/icons/country_TT.svgz
diff --git a/navit/xpm/country_TV.svgz b/navit/icons/country_TV.svgz
index 6b8ed6ab0..6b8ed6ab0 100644
--- a/navit/xpm/country_TV.svgz
+++ b/navit/icons/country_TV.svgz
diff --git a/navit/xpm/country_TW.svgz b/navit/icons/country_TW.svgz
index e1fce9428..e1fce9428 100644
--- a/navit/xpm/country_TW.svgz
+++ b/navit/icons/country_TW.svgz
diff --git a/navit/xpm/country_TZ.svgz b/navit/icons/country_TZ.svgz
index 9615d4f09..9615d4f09 100644
--- a/navit/xpm/country_TZ.svgz
+++ b/navit/icons/country_TZ.svgz
diff --git a/navit/xpm/country_UA.svgz b/navit/icons/country_UA.svgz
index 8f527bb30..8f527bb30 100644
--- a/navit/xpm/country_UA.svgz
+++ b/navit/icons/country_UA.svgz
diff --git a/navit/xpm/country_UG.svgz b/navit/icons/country_UG.svgz
index 0f376c952..0f376c952 100644
--- a/navit/xpm/country_UG.svgz
+++ b/navit/icons/country_UG.svgz
diff --git a/navit/xpm/country_UM.svgz b/navit/icons/country_UM.svgz
index 28ec4a716..28ec4a716 100644
--- a/navit/xpm/country_UM.svgz
+++ b/navit/icons/country_UM.svgz
diff --git a/navit/xpm/country_US.svgz b/navit/icons/country_US.svgz
index 11f823275..11f823275 100644
--- a/navit/xpm/country_US.svgz
+++ b/navit/icons/country_US.svgz
diff --git a/navit/xpm/country_UY.svgz b/navit/icons/country_UY.svgz
index ee677f676..ee677f676 100644
--- a/navit/xpm/country_UY.svgz
+++ b/navit/icons/country_UY.svgz
diff --git a/navit/xpm/country_UZ.svgz b/navit/icons/country_UZ.svgz
index 69e781b43..69e781b43 100644
--- a/navit/xpm/country_UZ.svgz
+++ b/navit/icons/country_UZ.svgz
diff --git a/navit/xpm/country_VA.svgz b/navit/icons/country_VA.svgz
index dc9ba9269..dc9ba9269 100644
--- a/navit/xpm/country_VA.svgz
+++ b/navit/icons/country_VA.svgz
diff --git a/navit/xpm/country_VC.svgz b/navit/icons/country_VC.svgz
index b5c94b0d6..b5c94b0d6 100644
--- a/navit/xpm/country_VC.svgz
+++ b/navit/icons/country_VC.svgz
diff --git a/navit/xpm/country_VE.svgz b/navit/icons/country_VE.svgz
index 19b772013..19b772013 100644
--- a/navit/xpm/country_VE.svgz
+++ b/navit/icons/country_VE.svgz
diff --git a/navit/xpm/country_VG.svgz b/navit/icons/country_VG.svgz
index cb9b78cff..cb9b78cff 100644
--- a/navit/xpm/country_VG.svgz
+++ b/navit/icons/country_VG.svgz
diff --git a/navit/xpm/country_VI.svgz b/navit/icons/country_VI.svgz
index 0ae17cf3c..0ae17cf3c 100644
--- a/navit/xpm/country_VI.svgz
+++ b/navit/icons/country_VI.svgz
diff --git a/navit/xpm/country_VN.svgz b/navit/icons/country_VN.svgz
index 9b6490d5f..9b6490d5f 100644
--- a/navit/xpm/country_VN.svgz
+++ b/navit/icons/country_VN.svgz
diff --git a/navit/xpm/country_VU.svgz b/navit/icons/country_VU.svgz
index a5c02df50..a5c02df50 100644
--- a/navit/xpm/country_VU.svgz
+++ b/navit/icons/country_VU.svgz
diff --git a/navit/xpm/country_WF.svgz b/navit/icons/country_WF.svgz
index 5a0558f3f..5a0558f3f 100644
--- a/navit/xpm/country_WF.svgz
+++ b/navit/icons/country_WF.svgz
diff --git a/navit/xpm/country_WS.svgz b/navit/icons/country_WS.svgz
index 6f8c24f70..6f8c24f70 100644
--- a/navit/xpm/country_WS.svgz
+++ b/navit/icons/country_WS.svgz
diff --git a/navit/xpm/country_YE.svgz b/navit/icons/country_YE.svgz
index 97be6f64a..97be6f64a 100644
--- a/navit/xpm/country_YE.svgz
+++ b/navit/icons/country_YE.svgz
diff --git a/navit/xpm/country_YT.svgz b/navit/icons/country_YT.svgz
index dcfe4c3f8..dcfe4c3f8 100644
--- a/navit/xpm/country_YT.svgz
+++ b/navit/icons/country_YT.svgz
diff --git a/navit/xpm/country_ZA.svgz b/navit/icons/country_ZA.svgz
index dd0ddbde0..dd0ddbde0 100644
--- a/navit/xpm/country_ZA.svgz
+++ b/navit/icons/country_ZA.svgz
diff --git a/navit/xpm/country_ZM.svgz b/navit/icons/country_ZM.svgz
index cdebdcdf3..cdebdcdf3 100644
--- a/navit/xpm/country_ZM.svgz
+++ b/navit/icons/country_ZM.svgz
diff --git a/navit/xpm/country_ZW.svgz b/navit/icons/country_ZW.svgz
index 9ff43bb18..9ff43bb18 100644
--- a/navit/xpm/country_ZW.svgz
+++ b/navit/icons/country_ZW.svgz
diff --git a/navit/xpm/cursor.svg b/navit/icons/cursor.svg
index 3f905c1b0..3f905c1b0 100644
--- a/navit/xpm/cursor.svg
+++ b/navit/icons/cursor.svg
diff --git a/navit/xpm/cursor.xml b/navit/icons/cursor.xml
index 3afede129..3afede129 100644
--- a/navit/xpm/cursor.xml
+++ b/navit/icons/cursor.xml
diff --git a/navit/xpm/cursor2.png b/navit/icons/cursor2.png
index c68890366..c68890366 100644
--- a/navit/xpm/cursor2.png
+++ b/navit/icons/cursor2.png
diff --git a/navit/xpm/cursor225.png b/navit/icons/cursor225.png
index 6e49c46de..6e49c46de 100644
--- a/navit/xpm/cursor225.png
+++ b/navit/icons/cursor225.png
diff --git a/navit/xpm/cursor225.svg b/navit/icons/cursor225.svg
index 5033ff2c8..5033ff2c8 100644
--- a/navit/xpm/cursor225.svg
+++ b/navit/icons/cursor225.svg
diff --git a/navit/xpm/cursor450.png b/navit/icons/cursor450.png
index 353c4ddfe..353c4ddfe 100644
--- a/navit/xpm/cursor450.png
+++ b/navit/icons/cursor450.png
diff --git a/navit/xpm/cursor450.svg b/navit/icons/cursor450.svg
index d3a7a469d..d3a7a469d 100644
--- a/navit/xpm/cursor450.svg
+++ b/navit/icons/cursor450.svg
diff --git a/navit/xpm/cursor675.png b/navit/icons/cursor675.png
index 53a33582b..53a33582b 100644
--- a/navit/xpm/cursor675.png
+++ b/navit/icons/cursor675.png
diff --git a/navit/xpm/cursor675.svg b/navit/icons/cursor675.svg
index 36957816a..36957816a 100644
--- a/navit/xpm/cursor675.svg
+++ b/navit/icons/cursor675.svg
diff --git a/navit/xpm/cursor_still.png b/navit/icons/cursor_still.png
index f9ea8dff7..f9ea8dff7 100644
--- a/navit/xpm/cursor_still.png
+++ b/navit/icons/cursor_still.png
diff --git a/navit/xpm/cursor_still.svg b/navit/icons/cursor_still.svg
index 80ec5d22f..80ec5d22f 100644
--- a/navit/xpm/cursor_still.svg
+++ b/navit/icons/cursor_still.svg
diff --git a/navit/xpm/dam.svg b/navit/icons/dam.svg
index 55b0d859d..55b0d859d 100644
--- a/navit/xpm/dam.svg
+++ b/navit/icons/dam.svg
diff --git a/navit/xpm/danger.svg b/navit/icons/danger.svg
index 215c0f427..215c0f427 100644
--- a/navit/xpm/danger.svg
+++ b/navit/icons/danger.svg
diff --git a/navit/xpm/daymark.svg b/navit/icons/daymark.svg
index 38ec717d5..38ec717d5 100644
--- a/navit/xpm/daymark.svg
+++ b/navit/icons/daymark.svg
diff --git a/navit/xpm/desktop_icons/108x108/navit.png b/navit/icons/desktop_icons/108x108/navit.png
index ccc080c19..ccc080c19 100644
--- a/navit/xpm/desktop_icons/108x108/navit.png
+++ b/navit/icons/desktop_icons/108x108/navit.png
diff --git a/navit/xpm/desktop_icons/128x128/navit.png b/navit/icons/desktop_icons/128x128/navit.png
index abdec4b8d..abdec4b8d 100644
--- a/navit/xpm/desktop_icons/128x128/navit.png
+++ b/navit/icons/desktop_icons/128x128/navit.png
diff --git a/navit/xpm/desktop_icons/22x22/navit.png b/navit/icons/desktop_icons/22x22/navit.png
index 3ae880a40..3ae880a40 100644
--- a/navit/xpm/desktop_icons/22x22/navit.png
+++ b/navit/icons/desktop_icons/22x22/navit.png
diff --git a/navit/xpm/desktop_icons/256x256/navit.png b/navit/icons/desktop_icons/256x256/navit.png
index ef84304d3..ef84304d3 100644
--- a/navit/xpm/desktop_icons/256x256/navit.png
+++ b/navit/icons/desktop_icons/256x256/navit.png
diff --git a/navit/xpm/desktop_icons/86x86/navit.png b/navit/icons/desktop_icons/86x86/navit.png
index 103855850..103855850 100644
--- a/navit/xpm/desktop_icons/86x86/navit.png
+++ b/navit/icons/desktop_icons/86x86/navit.png
diff --git a/navit/xpm/desktop_icons/navit.desktop.in b/navit/icons/desktop_icons/navit.desktop.in
index 81486b7c6..81486b7c6 100644
--- a/navit/xpm/desktop_icons/navit.desktop.in
+++ b/navit/icons/desktop_icons/navit.desktop.in
diff --git a/navit/icons/drinking_water.svg b/navit/icons/drinking_water.svg
new file mode 100644
index 000000000..d81e92082
--- /dev/null
+++ b/navit/icons/drinking_water.svg
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="drinking_water.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="50.806915"
+     inkscape:cy="45.424044"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="820"
+     inkscape:window-width="1238"
+     inkscape:window-x="194"
+     inkscape:window-y="51"
+     inkscape:zoom="3.6867084"
+     objecttolerance="10.0"
+     pagecolor="#ff00ff"
+     showgrid="false"
+     inkscape:window-maximized="0" />
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4196">
+      <stop
+         style="stop-color:#000080;stop-opacity:1;"
+         offset="0"
+         id="stop4198" />
+      <stop
+         style="stop-color:#000080;stop-opacity:0;"
+         offset="1"
+         id="stop4200" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective2441"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_x="0 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="60 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       id="symbol-university"
+       viewBox="244.5 110 489 219.9">
+      <path
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
+         id="path4460"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 94,176 73,215"
+         id="path4462"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
+      <path
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
+         id="path4464"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
+         id="path4466"
+         ill="none"
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_x="0 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="12 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2562"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective12"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4196"
+       id="linearGradient4206"
+       x1="29.023178"
+       y1="70.434334"
+       x2="44.755371"
+       y2="101.62747"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.21881295,0,0,0.21881295,0.47435352,6.2430753e-6)" />
+  </defs>
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-536.27327,44.693248)">
+    <rect
+       height="10"
+       id="rect4134"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="10"
+       x="1"
+       y="1" />
+    <rect
+       height="8"
+       id="rect4136"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="8"
+       x="2"
+       y="2" />
+  </g>
+  <path
+     style="opacity:0.98512196;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.58007604;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+     d="m 12.436868,0.57706224 c -1.756054,-0.0072 -1.452409,2.99148696 0.252488,2.67358796 1.004234,0.02611 2.749381,-1.106231 1.602985,-2.101222 -0.57279,-0.27373596 -1.209385,-0.56173696 -1.855473,-0.57236596 z"
+     id="path3340-5"
+     inkscape:connector-curvature="0" />
+  <path
+     style="opacity:0.98512196;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.58007604;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+     d="m 14.679609,0.57526524 c -0.967634,0.02427 -2.791986,0.83385096 -1.815038,2.00822396 0.936966,1.010616 3.464595,0.889184 3.186202,-0.922345 -0.111341,-0.633164 -0.72702,-1.12771896 -1.371164,-1.08587896 z"
+     id="path3345-3"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#ffffff;stroke:#ffffff;stroke-width:1.16015208;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 13.593731,0.58335224 C 12.387334,1.1419522 12.828196,2.8169302 12.690704,3.9034352 c -0.09796,1.220051 0.240233,2.45467 1.030619,3.404995 1.232351,-1.82182 0.995002,-4.215759 0.538222,-6.19674 C 14.150204,0.83878924 13.923686,0.54027724 13.593731,0.58335224 Z"
+     id="path3347-5"
+     inkscape:connector-curvature="0" />
+  <path
+     style="opacity:0.98512196;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.16015208;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+     d="m 13.531732,2.5506922 c -2.289178,0.593914 -2.305734,4.533935 -0.181504,5.311685 1.894657,0.169104 2.446142,-2.359225 1.920168,-3.786423 -0.201715,-0.799139 -0.840261,-1.581215 -1.738664,-1.525262 z"
+     id="path3349-6"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#ffffff;stroke:#ffffff;stroke-width:1.93358684;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 15.122587,4.4650192 c -1.850678,0.206295 -3.768037,-0.221731 -5.5825924,0.192287 -1.630915,0.596785 -2.336053,2.429814 -1.874245,4.060378 2.6853604,-2.060836 9.0608744,-1.566868 9.5112554,-2.023261 1.426801,0.354491 1.511935,0.03612 1.618189,-1.214391 -0.09716,-1.36257 -1.743679,-1.069923 -3.672607,-1.015013 z"
+     id="path3351-2"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccccc" />
+  <path
+     style="fill:#ffffff;stroke:#ffffff;stroke-width:0.23002474"
+     d="m 7.6774306,9.0732492 c -1.522412,-0.0067 -3.044753,0.105091 -4.548829,0.341892 0.533135,4.0678518 1.067027,8.1356058 1.600289,12.2034418 2.451669,0.29844 4.95269,0.41349 7.3967324,-0.0153 0.936237,-1.818906 0.557294,-3.973665 1.055444,-5.913623 0.275065,-2.090408 0.54868,-4.181007 0.823839,-6.2714018 -2.089757,-0.359069 -4.2138774,-0.361168 -6.3274754,-0.345038 z"
+     id="path3582"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 4.6291306,10.672236 7.5366344,0.06102 -1.220507,9.650504 -5.1566454,0.06102 -1.159482,-9.772555 z"
+     id="path2381"
+     sodipodi:nodetypes="ccccc"
+     style="opacity:0.1;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     inkscape:connector-curvature="0" />
+  <g
+     id="g3353"
+     transform="matrix(0.03867173,0,0,0.03867173,-1.8751227,0.43801824)">
+    <path
+       d="m 391.67731,24.490931 c -11.66352,4.361614 -27.64526,10.849786 -33.63434,10.849786 -5.98908,0 -10.84979,-4.860704 -10.84979,-10.849786 0,-5.989083 4.86071,-10.849787 10.84979,-10.849787 5.70837,0.219191 22.30594,6.964662 33.63434,10.849787 z"
+       id="path3340"
+       sodipodi:nodetypes="csscc"
+       style="opacity:0.98512196;fill:#c02727;fill-opacity:1;stroke:#c02727;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+       transform="translate(15.189701,15.189701)"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 396.38288,39.680632 c 11.66352,4.361614 27.64526,10.849786 33.63434,10.849786 5.98908,0 10.84979,-4.860704 10.84979,-10.849786 0,-5.989083 -4.86071,-10.849787 -10.84979,-10.849787 -5.70837,0.219191 -22.30594,6.964662 -33.63434,10.849787 z"
+       id="path3345"
+       sodipodi:nodetypes="csscc"
+       style="opacity:0.98512196;fill:#c02727;fill-opacity:1;stroke:#c02727;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <path
+       d="m 401.4421,39.138141 0,66.183699 0.81374,25.76824"
+       id="path3347"
+       style="fill:none;stroke:#c02727;stroke-width:30;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+    <ellipse
+       id="path3349"
+       style="opacity:0.98512196;fill:#c02727;fill-opacity:1;stroke:#c02727;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       cx="401.44211"
+       cy="125.39394"
+       rx="22.784552"
+       ry="45.569103" />
+    <path
+       d="m 522.95971,130.81884 -177.93695,-1.00529 -14.10427,-0.0797 c -69.43863,-1.08498 -65.09872,64.01374 -65.09872,64.01374"
+       id="path3351"
+       sodipodi:nodetypes="cccc"
+       style="fill:none;stroke:#c02727;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:connector-curvature="0" />
+  </g>
+  <rect
+     style="opacity:0.44029852;fill:url(#linearGradient4206);fill-opacity:1;stroke:none;stroke-width:12;stroke-miterlimit:4;stroke-dasharray:none"
+     id="rect4179"
+     width="5.9945359"
+     height="6.0538883"
+     x="5.459908"
+     y="14.40297" />
+  <path
+     d="m 12.866673,10.209018 -0.0061,0 c 0.007,-0.006 0.01081,-0.01211 0.01081,-0.01823 0,-0.144298 -1.970328,-0.2612768 -4.4008944,-0.2612768 -2.430542,0 -4.400895,0.1169788 -4.400895,0.2612768 0,0.0061 0.0038,0.01221 0.01084,0.01823 l -0.01084,0 1.37352,10.473678 0.0062,0 c -0.01215,0.0065 -0.01859,0.01323 -0.01859,0.01995 0,0.0997 1.360979,0.180464 3.039818,0.180464 1.6788634,0 3.0398184,-0.08076 3.0398184,-0.180464 0,-0.0067 -0.0064,-0.01341 -0.01859,-0.01995 l 1.374931,-10.473678 z m -2.256784,9.707939 c -0.07036,0.06511 -4.2436584,0.0346 -4.3140214,-0.03052 l -1.304742,-9.043255 c 2.226935,0.0074 3.830658,0.11811 6.8578754,-0.06102 l -1.239112,9.134795 z"
+     id="path2209"
+     sodipodi:nodetypes="ccsssccccsssccccccc"
+     style="fill:#c02727"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/navit/xpm/dumping_station.xpm b/navit/icons/dumping_station.xpm
index c58d14247..c58d14247 100644
--- a/navit/xpm/dumping_station.xpm
+++ b/navit/icons/dumping_station.xpm
diff --git a/navit/icons/emergency.svg b/navit/icons/emergency.svg
new file mode 100644
index 000000000..c88c6aaa0
--- /dev/null
+++ b/navit/icons/emergency.svg
@@ -0,0 +1,504 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="emergency.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="78.817949"
+     inkscape:cy="44.555593"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="874"
+     inkscape:window-width="1440"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:zoom="3.6867085"
+     objecttolerance="10.0"
+     pagecolor="#ff1dff"
+     showgrid="false"
+     inkscape:snap-global="true"
+     inkscape:snap-nodes="false"
+     inkscape:snap-grids="false"
+     inkscape:snap-to-guides="false"
+     inkscape:window-maximized="1" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       id="perspective2441"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_x="0 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="60 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       id="symbol-university"
+       viewBox="244.5 110 489 219.9">
+      <path
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
+         id="path4460"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 94,176 73,215"
+         id="path4462"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
+      <path
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
+         id="path4464"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
+         id="path4466"
+         ill="none"
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_x="0 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="12 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4904"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       id="Arrow2Lend"
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         id="path4137"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Arrow1Mend"
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4125"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="TriangleOutL"
+       inkscape:stockid="TriangleOutL"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         id="path4214"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.8,0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Arrow1Lend"
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4119"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Tail"
+       inkscape:stockid="Tail"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <g
+         id="g4152"
+         transform="scale(-1.2,-1.2)">
+        <path
+           d="M -3.8048674,-3.9585227 0.54352094,0"
+           id="path4154"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M -1.2866832,-3.9585227 3.0617053,0"
+           id="path4156"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M 1.3053582,-3.9585227 5.6537466,0"
+           id="path4158"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M -3.8048674,4.1775838 0.54352094,0.21974226"
+           id="path4160"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M -1.2866832,4.1775838 3.0617053,0.21974226"
+           id="path4162"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M 1.3053582,4.1775838 5.6537466,0.21974226"
+           id="path4164"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+      </g>
+    </marker>
+    <marker
+       id="Arrow1Sstart"
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4128"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(0.2,0,0,0.2,1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Arrow1Send"
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4131"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="SemiCircleOut"
+       inkscape:stockid="SemiCircleOut"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="m -2.5,-0.80913858 c 0,2.75999998 -2.24,4.99999998 -5,4.99999998 l 0,-10 c 2.76,0 5,2.24 5,5.00000002 z"
+         id="path4235"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         transform="matrix(0.6,0,0,0.6,4.2752958,0.4580676)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Arrow2Send"
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         id="path4149"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         transform="matrix(-0.3,0,0,-0.3,0.69,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="TriangleOutS"
+       inkscape:stockid="TriangleOutS"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         id="path4220"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.2,0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="CurveIn"
+       inkscape:stockid="CurveIn"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="m 4.625493,-5.0456926 c -2.76,0 -5.00000002,2.24 -5.00000002,5.00000002 0,2.75999998 2.24000002,4.99999998 5.00000002,4.99999998"
+         id="path4238"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         transform="scale(0.6,0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="InfiniteLineStart"
+       inkscape:stockid="InfiniteLineStart"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <g
+         id="g4298"
+         transform="translate(-13,0)">
+        <circle
+           cx="3"
+           cy="0"
+           id="circle4300"
+           r="0.80000001" />
+        <circle
+           cx="6.5"
+           cy="0"
+           id="circle4302"
+           r="0.80000001" />
+        <circle
+           cx="10"
+           cy="0"
+           id="circle4304"
+           r="0.80000001" />
+      </g>
+    </marker>
+    <marker
+       id="StopS"
+       inkscape:stockid="StopS"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,5.65 0,-5.65"
+         id="path4229"
+         style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(0.2,0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Arrow2Sstart"
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         id="path4146"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         transform="matrix(0.3,0,0,0.3,-0.69,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="DiamondS"
+       inkscape:stockid="DiamondS"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 Z"
+         id="path4202"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.2,0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="RazorWire"
+       inkscape:stockid="RazorWire"
+       orient="auto"
+       refX="0"
+       refY="0">
+       style=&quot;overflow:visible&quot;&gt;
+      <path
+   d="m 0.02272727,-0.74009011 0,1.4375 -7.78124997,2.31250001 18.4374997,0 -7.1874997,-2.31250001 0,-1.4375 7.2499997,-2.15624999 -18.4687497,0 7.74999997,2.15624999 z"
+   id="path4286"
+   style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1pt"
+   transform="scale(0.8,0.8)"
+   inkscape:connector-curvature="0" />
+</marker>
+    <inkscape:perspective
+       id="perspective5233"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5412"
+       inkscape:persp3d-origin="250 : 166.66667 : 1"
+       inkscape:vp_x="0 : 250 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="500 : 250 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-536.27327,44.693248)">
+    <rect
+       height="10"
+       id="rect4134"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="10"
+       x="1"
+       y="1" />
+    <rect
+       height="8"
+       id="rect4136"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="8"
+       x="2"
+       y="2" />
+  </g>
+  <g
+     id="g3448"
+     transform="matrix(0.21007753,0,0,0.21007654,0.15074743,0.8225434)">
+    <g
+       transform="translate(-119.6189,31.193137)"
+       id="g3440">
+      <g
+         id="g1327-3"
+         transform="matrix(0.18023212,0,0,0.18023212,118.90132,-35.074477)"
+         style="fill:#ffffff;stroke:#ffffff">
+        <path
+           d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
+           id="path1329-6"
+           style="fill:#ffffff;fill-opacity:0;stroke:#ffffff;stroke-width:3.40799999;stroke-opacity:0"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:3.47710228;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 168.77539,-26.714844 c -24.90882,0.65124 -45.67473,25.94229543 -41.17383,50.535156 3.15319,24.278992 29.43702,42.421637 53.26172,36.228516 C 205.34548,55.121653 221.58756,26.483972 212.6543,3.0039062 206.68201,-15.179354 187.88727,-27.91809 168.77539,-26.714844 Z"
+         id="path2207-7"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.74868536;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 135.40625,8.0332031 c 0,6.7701819 0,13.5403649 0,20.3105469 23.78385,0 47.56771,0 71.35156,0 -1.21558,-6.573853 1.68803,-13.539405 -0.66992,-19.890625 -3.17978,-5.0668552 -10.53922,-1.2344481 -15.33008,-2.4199219 -18.45052,0 -36.90104,0 -55.35156,0 l 0,1 0,1 z"
+         id="rect3180-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.74868536;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 159.92773,-16.488281 c 0,23.1171873 0,46.234375 0,69.351562 6.6053,-1.239496 13.63591,1.748711 19.99805,-0.724609 5.07576,-3.54689 1.01531,-11.203263 2.31055,-16.275391 0,-18.117187 0,-36.23437475 0,-54.351562 -7.4362,0 -14.8724,0 -22.3086,0 l 0,1 0,1 z"
+         id="rect3182-3"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:3.47710252;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 168.58789,-33.037109 c -26.875,0.732101 -50.02432,26.3501216 -47.70508,53.222656 1.03022,26.672013 26.49775,49.507971 53.19727,47.201172 27.06213,-1.027335 50.08523,-27.229656 47.11701,-54.273425 -1.67559,-26.180886 -26.35425,-48.021089 -52.6092,-46.150403 z"
+         id="path2438-5"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="matrix(0.18023212,0,0,0.18023212,-0.6781117,-3.9155248)"
+       id="g1327">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+         id="path1329"
+         d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z" />
+    </g>
+    <circle
+       r="39.915974"
+       cy="48.346523"
+       cx="51.502563"
+       style="fill:none;stroke:#da0092;stroke-width:3.47710228;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2207" />
+    <rect
+       y="-55.501747"
+       x="-83.177666"
+       width="63.350189"
+       transform="scale(-1,-1)"
+       style="fill:#da0092;fill-opacity:1;stroke:#da0092;stroke-width:1.74868536;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3180"
+       height="14.310408" />
+    <rect
+       y="44.34737"
+       x="-80.021637"
+       width="63.350189"
+       transform="matrix(0,-1,1,0,0,0)"
+       style="fill:#da0092;fill-opacity:1;stroke:#da0092;stroke-width:1.74868536;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect3182"
+       height="14.310408" />
+    <circle
+       r="46.242443"
+       cy="48.346523"
+       cx="51.502567"
+       style="fill:none;stroke:#da0092;stroke-width:3.47710252;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path2438" />
+  </g>
+</svg>
diff --git a/navit/icons/exit.svg b/navit/icons/exit.svg
new file mode 100644
index 000000000..30c7e1356
--- /dev/null
+++ b/navit/icons/exit.svg
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="exit.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/projets/navit/icons/png/exit.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="TriangleOutS"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleOutS"
+       style="overflow:visible">
+      <path
+         id="path3310"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.2,0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Tail"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Tail"
+       style="overflow:visible">
+      <g
+         id="g3197"
+         transform="scale(-1.2,-1.2)">
+        <path
+           id="path3199"
+           d="M -3.8048674,-3.9585227 0.54352094,0"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path3201"
+           d="M -1.2866832,-3.9585227 3.0617053,0"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path3203"
+           d="M 1.3053582,-3.9585227 5.6537466,0"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path3205"
+           d="M -3.8048674,4.1775838 0.54352094,0.21974226"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path3207"
+           d="M -1.2866832,4.1775838 3.0617053,0.21974226"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path3209"
+           d="M 1.3053582,4.1775838 5.6537466,0.21974226"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+      </g>
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Send"
+       style="overflow:visible">
+      <path
+         id="path3176"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible">
+      <path
+         id="path3164"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <marker
+       inkscape:stockid="TriangleOutS"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="TriangleOutS-3"
+       style="overflow:visible">
+      <path
+         id="path3310-6"
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.2,0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#0083f4"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="12.825295"
+     inkscape:cy="36.321475"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g4262"
+       transform="matrix(0.20795333,0,0,0.20795333,2.1530059,-61.356423)">
+      <path
+         sodipodi:nodetypes="ccccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3156-7"
+         d="m -0.73577033,-78.009766 0,103.263672 C 12.33259,25.421855 25.400947,25.590032 38.469308,25.757812 38.801632,9.8012481 36.32019,-7.3551637 46.068917,-21.240234 48.929147,-25.469328 53.375,-29.267857 56.71317,-32.148438 59.375,-29.267857 61,-22 65.434153,-31.855469 71.154162,-41.366718 77.411712,-50.56707 83.453684,-59.890625 69.865665,-60.653961 56.099291,-61.599726 42.51144,-62.366071 43.090489,-58.914689 45,-58 46.88337,-52.082031 c -3.19386,1.565136 -5.737053,4.210982 -8.371094,6.574219 l 0,-34.025391 c -13.08268,-0.167361 -26.16535,-0.335677 -39.24804633,-0.501953 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:13.55577374;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3156"
+         d="m 27.888067,19.085089 c 0,0 -9.355739,-46.088677 34.291408,-68.138317"
+         style="opacity:0.8;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:13.55577374;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#TriangleOutS)" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="rect2383"
+         d="m 3.0843991,-75.807192 31.2487739,0.400903 0,97.290379 -31.2487739,-0.400889 0,-97.290379 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#3f3f3f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path5565"
+         d="m 18.331247,-68.08042 0,86.99585"
+         style="fill:none;fill-rule:evenodd;stroke:#fdff03;stroke-width:4.5185914;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:9.03718265, 9.03718265;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/fastfood.svg b/navit/icons/fastfood.svg
new file mode 100644
index 000000000..d0792d476
--- /dev/null
+++ b/navit/icons/fastfood.svg
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="fastfood.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/projets/navit/icons/png/fastfood.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3179">
+      <stop
+         style="stop-color:#b45d00;stop-opacity:1;"
+         offset="0"
+         id="stop3181" />
+      <stop
+         style="stop-color:#502900;stop-opacity:1;"
+         offset="1"
+         id="stop3183" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3163">
+      <stop
+         style="stop-color:#ffe639;stop-opacity:1;"
+         offset="0"
+         id="stop3165" />
+      <stop
+         style="stop-color:#cd7f00;stop-opacity:1;"
+         offset="1"
+         id="stop3167" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3163"
+       id="linearGradient3169"
+       x1="1.2863814"
+       y1="7.4118395"
+       x2="20.524136"
+       y2="7.4118395"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.9860563,0,0,4.9860563,-5.1427003,-79.771449)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3163"
+       id="linearGradient3177"
+       x1="1.8652222"
+       y1="17.49683"
+       x2="19.974939"
+       y2="17.49683"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.9860563,0,0,4.9860563,-5.1427003,-79.771449)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3179"
+       id="linearGradient3185"
+       x1="2.9744897"
+       y1="13.444727"
+       x2="19.051228"
+       y2="13.444727"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.9860563,0,0,4.9860563,-5.1427003,-79.771449)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f4ca00"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="15.788735"
+     inkscape:cy="55.111737"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="943"
+     inkscape:window-height="682"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g8334"
+       transform="matrix(0.21183869,0,0,0.21183752,0.53532012,-62.052696)">
+      <g
+         transform="translate(108.18734,25.455844)"
+         id="g7700">
+        <path
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.98605633;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m -20.46875,-32.408203 c -27.480255,0.784951 -55.080615,-0.774801 -82.53906,0.736328 -3.77951,4.537054 -1.87122,11.816311 -2.29688,17.580078 0.0145,4.063098 -0.16833,9.8778217 5.27149,9.7910158 19.092926,0.2954012 38.286392,-0.055767 57.425764,0.2036486 9.655941,-0.4065305 19.752323,0.739525 29.113295,-1.2231799 3.400077,-7.0924445 0.633645,-15.2541995 1.582032,-22.7519535 -0.705314,-3.937458 -5.237889,-4.618667 -8.556641,-4.335937 z"
+           id="rect2388-6"
+           inkscape:connector-curvature="0" />
+        <path
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m -102.23242,-48.275391 c 0.98756,7.159132 -2.08599,15.12397 1.80859,21.712891 28.783856,0 57.56771,0 86.351564,0 0,-7.904297 0,-15.808594 0,-23.712891 -29.386718,0 -58.773437,0 -88.160154,0 l 0,1 0,1 z"
+           id="rect3160-2"
+           inkscape:connector-curvature="0" />
+        <path
+           style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.98605633;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m -60.158203,-92.587891 c -15.612648,0.570476 -31.977983,4.066243 -44.763677,13.316407 -4.72542,10.713621 -4.51374,24.330899 1.8163,34.208227 18.738553,1.390231 38.161582,0.369807 57.158291,0.65769 10.45892,-0.322799 21.128473,0.570634 31.449242,-0.473339 6.1820025,-6.107071 5.1000765,-16.022303 4.9179557,-23.978017 -0.5073517,-6.111472 -2.4736867,-13.360125 -9.4071147,-14.736611 -12.91082,-5.754696 -26.984232,-9.214169 -41.170997,-8.994357 z"
+           id="rect3162-6"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.98605633px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m -24.419922,-42.621094 c -9.968746,0.113656 -19.937525,0.224418 -29.90625,0.339844 -1.788781,3.796163 0.570631,8.966986 5.25,8.285156 7.531582,-1.101822 14.884041,-0.460498 22.441406,-0.36914 4.547854,0.117921 6.213232,-7.713236 2.214844,-8.25586 z"
+           id="path3167-1"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.98605633px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m -45.939453,-40.078125 c -5.482721,1.045126 -3.311548,8.255713 -3.265625,12.119141 -0.952799,2.908218 0.382393,4.633351 3.410156,4.529296 6.115122,-1.108562 5.64165,-9.741871 3.697266,-14.167968 -0.678942,-1.500547 -2.128262,-2.661599 -3.841797,-2.480469 z"
+           id="path3169-8"
+           inkscape:connector-curvature="0" />
+        <g
+           id="g2388-7"
+           transform="matrix(4.9860563,0,0,4.9860563,-117.26999,-109.19464)"
+           style="fill:#ffffff;stroke:#ffffff">
+          <path
+             sodipodi:nodetypes="cc"
+             id="path3165-9"
+             d="m 5.2691033,13.237358 5.6706947,-0.06449"
+             style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="cc"
+             id="path3171-2"
+             d="m 8.4382877,13.240339 -0.03125,2.503069"
+             style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             inkscape:connector-curvature="0" />
+        </g>
+        <path
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m -88.583984,-69.720703 c -8.861833,0.120323 -10.744513,14.545001 -2.160157,16.859375 8.060144,3.631262 15.837692,-8.718025 9.003907,-14.367188 -1.776469,-1.79604 -4.343356,-2.648723 -6.84375,-2.492187 z"
+           id="path2420-0"
+           inkscape:connector-curvature="0" />
+        <path
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m -68.328125,-79.537109 c -8.861383,0.1205 -10.74455,14.545251 -2.160156,16.859375 8.047639,3.625603 15.82701,-8.687201 9.023437,-14.34961 -1.781429,-1.806664 -4.351093,-2.667147 -6.863281,-2.509765 z"
+           id="path3192-2"
+           inkscape:connector-curvature="0" />
+        <path
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m -48.541016,-69.720703 c -8.859703,0.123461 -10.743655,14.547414 -2.158203,16.859375 8.059933,3.630218 15.836794,-8.71783 9.003907,-14.367188 -1.776078,-1.798314 -4.344747,-2.648052 -6.845704,-2.492187 z"
+           id="path3194-3"
+           inkscape:connector-curvature="0" />
+        <path
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m -33.582031,-73.771484 c -8.862355,0.119738 -10.743446,14.54868 -2.158203,16.859375 8.059834,3.628745 15.834322,-8.716999 9.003906,-14.367188 -1.778404,-1.794514 -4.344334,-2.649227 -6.845703,-2.492187 z"
+           id="path3196-7"
+           inkscape:connector-curvature="0" />
+        <path
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m -48.228516,-84.054688 c -8.862119,0.118681 -10.744273,14.546998 -2.158203,16.857422 8.060441,3.631691 15.833367,-8.71663 9.003907,-14.367187 -1.780603,-1.791604 -4.343551,-2.64982 -6.845704,-2.490235 z"
+           id="path3198-5"
+           inkscape:connector-curvature="0" />
+      </g>
+      <rect
+         y="-2.5821357"
+         x="6.6504307"
+         height="20.101732"
+         width="85.310013"
+         id="rect2388"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3177);fill-opacity:1;fill-rule:evenodd;stroke:#947c38;stroke-width:4.98605633;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         y="-20.591503"
+         x="9.6882725"
+         height="15.712438"
+         width="80.159523"
+         id="rect3160"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3185);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="rect3162"
+         d="m 6.6601027,-51.978763 c 26.4573093,-13.822951 54.7268393,-15.313797 85.4658213,0 3.995811,11.25278 2.814624,20.562756 0,29.25975 l -85.4658213,0 c -2.913434,-9.429296 -4.7060279,-18.983225 0,-29.25975 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3169);fill-opacity:1;fill-rule:evenodd;stroke:#947c38;stroke-width:4.98605633;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3167"
+         d="m 55.272466,-12.616396 28.2744,-0.32155"
+         style="fill:none;fill-rule:evenodd;stroke:#4bb216;stroke-width:4.98605633px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3169"
+         d="m 62.513272,-12.383592 0,12.32463401"
+         style="fill:none;fill-rule:evenodd;stroke:#4bb216;stroke-width:4.98605633px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <g
+         transform="matrix(4.9860563,0,0,4.9860563,-9.3496853,-83.510991)"
+         id="g2388">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;fill-rule:evenodd;stroke:#4bb216;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 5.2691033,13.237358 5.6706947,-0.06449"
+           id="path3165"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;fill-rule:evenodd;stroke:#4bb216;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 8.4382877,13.240339 -0.03125,2.503069"
+           id="path3171"
+           sodipodi:nodetypes="cc" />
+      </g>
+      <circle
+         r="4.674428"
+         cy="-35.364384"
+         cx="20.099209"
+         id="path2420"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#68480a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <circle
+         r="4.674428"
+         cy="-45.180683"
+         cx="40.355064"
+         id="path3192"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#68480a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <circle
+         r="4.674428"
+         cy="-35.364384"
+         cx="60.143475"
+         id="path3194"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#68480a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <circle
+         r="4.674428"
+         cy="-39.415554"
+         cx="75.101646"
+         id="path3196"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#68480a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <circle
+         r="4.674428"
+         cy="-49.699295"
+         cx="60.455101"
+         id="path3198"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#68480a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/firebrigade.svg b/navit/icons/firebrigade.svg
new file mode 100644
index 000000000..aed6368bc
--- /dev/null
+++ b/navit/icons/firebrigade.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="firebrigade.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/projets/navit/icons/png/firebrigade.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3153">
+      <stop
+         style="stop-color:#e20000;stop-opacity:1;"
+         offset="0"
+         id="stop3155" />
+      <stop
+         style="stop-color:#e20000;stop-opacity:0;"
+         offset="1"
+         id="stop3157" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3153"
+       id="linearGradient3159"
+       x1="11.552056"
+       y1="20.566092"
+       x2="11.552056"
+       y2="-2.348809"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.9548169,0,0,4.9548169,-8.3577179,-83.350264)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f4ca00"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="13.816972"
+     inkscape:cy="56.484364"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1116"
+     inkscape:window-height="771"
+     inkscape:window-x="81"
+     inkscape:window-y="76"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>edited by jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g3701"
+       transform="matrix(0.22000009,0,0,0.21794472,0.31573591,-60.942756)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3157-1"
+         d="m 49.931056,-78.252538 c -5.535916,1.309034 -4.620842,9.018999 -7.333985,12.962891 -1.25668,1.824662 -3.350591,10.820356 -4.52539,6.02539 -1.250324,-5.176571 -8.831539,-3.418724 -8.544957,1.74408 C 24.340453,-40.60583 10.077113,-27.353133 7.6771494,-9.5279287 7.0460854,5.2783522 20.464366,18.67347 35.136134,18.481837 53.148584,29.283905 79.270437,18.126709 84.048243,-2.32871 88.333889,-18.003302 77.643255,-32.079156 69.639813,-44.424084 62.7512,-54.503864 56.914551,-65.222805 53.294337,-76.7916 52.491967,-77.78 51.20426,-78.354024 49.931056,-78.252538 Z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:24.80315018;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 80.954199,-11.117452 c 0,16.3733905 -13.288546,29.661932 -29.661937,29.661932 -16.373386,0 -29.661932,-13.2885415 -29.661932,-29.661932 0,-16.373396 19.178322,-33.84173 28.475462,-63.357896 5.734576,23.813665 30.848407,46.9845 30.848407,63.357896 z m -22.703882,1.990553 c 0,12.8740759 -10.448525,23.322596 -23.322598,23.322596 -12.874075,0 -23.322599,-10.4485201 -23.322599,-23.322596 0,-12.874081 15.079539,-26.609094 22.389698,-49.817079 4.508987,18.72422 24.255499,36.942998 24.255499,49.817079 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3159);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:24.80315018;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+         id="path3157" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="csscc"
+         id="path2385"
+         d="m 68.416258,-7.4855317 c 0,10.6870049 -8.673506,19.3605107 -19.360511,19.3605107 -10.687004,0 -19.360515,-8.6735058 -19.360515,-19.3605107 0,-10.6870093 12.517804,-22.0886973 18.586097,-41.3540653 3.742993,15.543319 20.134929,30.667056 20.134929,41.3540653 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#e1e23e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24.80315018;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/xpm/flag_bk_tr.xpm b/navit/icons/flag_bk_tr.xpm
index a115ecd3e..a115ecd3e 100644
--- a/navit/xpm/flag_bk_tr.xpm
+++ b/navit/icons/flag_bk_tr.xpm
diff --git a/navit/xpm/flag_bk_wh.xpm b/navit/icons/flag_bk_wh.xpm
index 6b87fa8d0..6b87fa8d0 100644
--- a/navit/xpm/flag_bk_wh.xpm
+++ b/navit/icons/flag_bk_wh.xpm
diff --git a/navit/xpm/flag_bl_wh.xpm b/navit/icons/flag_bl_wh.xpm
index 7fa9856f7..7fa9856f7 100644
--- a/navit/xpm/flag_bl_wh.xpm
+++ b/navit/icons/flag_bl_wh.xpm
diff --git a/navit/xpm/flag_wh_bk.xpm b/navit/icons/flag_wh_bk.xpm
index 4564f8ffb..4564f8ffb 100644
--- a/navit/xpm/flag_wh_bk.xpm
+++ b/navit/icons/flag_wh_bk.xpm
diff --git a/navit/icons/fountain.svg b/navit/icons/fountain.svg
new file mode 100644
index 000000000..a23776812
--- /dev/null
+++ b/navit/icons/fountain.svg
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="fountain.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   style="display:inline">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 64 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="128 : 64 : 1"
+       inkscape:persp3d-origin="64 : 42.666667 : 1"
+       id="perspective79" />
+    <linearGradient
+       id="linearGradient2338">
+      <stop
+         style="stop-color:#b1b1b1;stop-opacity:1;"
+         offset="0"
+         id="stop2340" />
+      <stop
+         style="stop-color:#e4e4e4;stop-opacity:1;"
+         offset="1"
+         id="stop2342" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2888">
+      <stop
+         id="stop2890"
+         offset="0"
+         style="stop-color:#007dff;stop-opacity:1;" />
+      <stop
+         id="stop2892"
+         offset="1"
+         style="stop-color:#58abff;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2338"
+       id="linearGradient3115"
+       gradientUnits="userSpaceOnUse"
+       x1="95.135132"
+       y1="57.574238"
+       x2="101.53513"
+       y2="69.595856"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2338"
+       id="linearGradient3118"
+       gradientUnits="userSpaceOnUse"
+       x1="40.302704"
+       y1="59.286484"
+       x2="44.194595"
+       y2="65.599998"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2338"
+       id="linearGradient3127"
+       gradientUnits="userSpaceOnUse"
+       x1="63.74054"
+       y1="90.37838"
+       x2="96.086487"
+       y2="113.03784"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2338"
+       id="linearGradient3134"
+       gradientUnits="userSpaceOnUse"
+       x1="56.653049"
+       y1="98.429657"
+       x2="58.692608"
+       y2="123.99252"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2338"
+       id="linearGradient4444"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
+       x1="67.286484"
+       y1="70.443245"
+       x2="94.875679"
+       y2="75.027023" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2338"
+       id="linearGradient4446"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
+       x1="62.616215"
+       y1="73.081078"
+       x2="66.162163"
+       y2="37.535133" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2338"
+       id="linearGradient4448"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
+       x1="53.571938"
+       y1="51.219669"
+       x2="55.039661"
+       y2="53.665878" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2338"
+       id="linearGradient4450"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
+       x1="81.886787"
+       y1="50.118877"
+       x2="85.066856"
+       y2="54.399742" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2338"
+       id="linearGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
+       x1="65.741821"
+       y1="58.435982"
+       x2="74.181236"
+       y2="62.105293" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2338"
+       id="linearGradient4456"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
+       x1="65.619507"
+       y1="54.522049"
+       x2="77.605927"
+       y2="56.417858" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2338"
+       id="linearGradient4458"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
+       x1="67.087234"
+       y1="55.317066"
+       x2="65.252579"
+       y2="39.294411" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2888"
+       id="linearGradient4460"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
+       x1="61.460957"
+       y1="46.602451"
+       x2="71.612717"
+       y2="52.595661" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2338"
+       id="linearGradient4462"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
+       x1="68.126869"
+       y1="43.911625"
+       x2="70.94001"
+       y2="48.131332" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2338"
+       id="linearGradient4464"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
+       x1="67.087227"
+       y1="45.440506"
+       x2="71.184631"
+       y2="49.109818" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2338"
+       id="linearGradient4466"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
+       x1="68.310341"
+       y1="45.318195"
+       x2="66.90377"
+       y2="41.893505" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2888"
+       id="linearGradient4468"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
+       x1="67.087234"
+       y1="42.74968"
+       x2="68.738426"
+       y2="44.462025" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2888"
+       id="linearGradient4470"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
+       x1="62.439438"
+       y1="36.573006"
+       x2="67.759941"
+       y2="41.343109" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2888"
+       id="linearGradient4472"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
+       x1="69.013618"
+       y1="37.03167"
+       x2="74.0895"
+       y2="49.170971" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ff00ff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.9416149"
+     inkscape:cx="-71.081713"
+     inkscape:cy="23.69938"
+     inkscape:document-units="px"
+     inkscape:current-layer="g3176"
+     showgrid="false"
+     width="744.09px"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="color"
+     inkscape:groupmode="layer"
+     id="layer1"
+     style="display:inline"
+     transform="translate(0,78)" />
+  <g
+     id="g3176"
+     inkscape:groupmode="layer"
+     inkscape:label="outline"
+     style="display:inline"
+     transform="translate(0,78)">
+    <path
+       style="fill:#000000;stroke:#ffffff;stroke-width:0.54675251;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.4720653,-57.593227 -0.58957452,-1.31985 -0.30455628,-0.02601 -0.30455825,-0.026 0,-0.874108 0,-0.874107 4.46244335,-0.02169 4.4624434,-0.02169 0.024957,-0.52401 0.024957,-0.524012 0.4778544,0.06311 c 0.26282,0.03471 0.8361076,0.06311 1.2739706,0.06311 0.437865,0 1.011153,-0.0284 1.273972,-0.06311 l 0.477855,-0.06311 0.02495,0.524012 0.02496,0.52401 4.462443,0.02169 4.462444,0.02169 0,0.874107 0,0.874108 -0.304558,0.026 -0.304558,0.02601 -0.589573,1.31985 -0.589574,1.319851 -8.938363,0 -8.938361,0 -0.5895742,-1.319851 z M 9.435769,-62.677038 C 8.1802779,-62.91618 6.8373214,-63.481301 5.8554144,-64.183665 5.2840205,-64.592388 4.495214,-65.390189 4.2517362,-65.805629 4.0965337,-66.07045 4.0764013,-66.077979 3.5235761,-66.077979 l -0.5685438,0 0,-0.921802 0,-0.921798 8.0449677,0 8.044969,0 0,0.921798 0,0.921802 -0.565662,1.67e-4 -0.565661,1.68e-4 -0.236462,0.374281 c -0.130054,0.205856 -0.511219,0.630026 -0.847034,0.9426 -0.973648,0.90627 -2.227398,1.56821 -3.719455,1.963756 -0.837121,0.221922 -2.80286,0.286113 -3.674926,0.120004 z m 0.701028,-6.135662 c -0.03224,-0.03224 -0.05861,-0.524915 -0.05861,-1.094838 0,-0.746332 -0.03636,-1.123389 -0.1299502,-1.347785 -0.4929455,-1.18184 -1.9638487,-1.430669 -2.9464614,-0.498444 l -0.2690472,0.25525 -0.6318213,-0.565465 C 5.7534052,-72.374988 5.469085,-72.64644 5.469085,-72.667208 c 0,-0.128404 0.4215924,-0.565412 0.7907316,-0.819641 0.8686245,-0.598232 2.1267803,-0.809137 3.0927312,-0.518434 0.2147347,0.06462 0.390286,0.09291 0.3901133,0.06285 -7.437e-4,-0.133039 -0.3413446,-0.592568 -0.7193015,-0.970516 -1.3325633,-1.332537 -3.5454353,-1.356483 -4.9234126,-0.05327 -0.6552517,0.619694 -1.1407328,1.627958 -1.1439198,2.375723 l -9.842e-4,0.233381 -0.8589678,-0.02388 -0.8589692,-0.02388 -0.027039,-0.282795 c -0.01488,-0.155537 0.033105,-0.553122 0.1066145,-0.883526 0.3984161,-1.790769 1.7477743,-3.278389 3.4985306,-3.85701 2.1002544,-0.694126 4.5139287,-0.0218 5.8083516,1.617919 0.184001,0.233084 0.353401,0.423788 0.376447,0.423788 0.02305,0 0.192446,-0.190704 0.376447,-0.423788 0.983566,-1.245935 2.776984,-2.008027 4.44796,-1.890107 2.368131,0.167118 4.352637,1.853586 4.858923,4.129198 0.07351,0.330404 0.121485,0.727989 0.106614,0.883526 l -0.02704,0.282795 -0.858967,0.02388 -0.85897,0.02388 -9.83e-4,-0.233381 c -0.0032,-0.747764 -0.488672,-1.756027 -1.143923,-2.375722 -1.377977,-1.303209 -3.590849,-1.279263 -4.923413,0.05327 -0.377957,0.377949 -0.718539,0.837478 -0.719301,0.970517 -1.67e-4,0.03006 0.175379,0.0017 0.390113,-0.06285 0.965951,-0.290704 2.224107,-0.0798 3.092732,0.518433 0.369138,0.25423 0.790732,0.691237 0.790732,0.819642 0,0.02076 -0.284321,0.29222 -0.631823,0.603225 l -0.631818,0.565466 -0.269047,-0.25525 c -0.946299,-0.897777 -2.312096,-0.712353 -2.919694,0.396386 -0.07466,0.136238 -0.12946,0.619763 -0.156708,1.382699 l -0.0419,1.173201 -0.842254,0.0237 c -0.463241,0.01303 -0.868631,-0.0027 -0.900869,-0.03492 z"
+       id="path4216"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/navit/icons/fuel.svg b/navit/icons/fuel.svg
new file mode 100644
index 000000000..d1b86d21e
--- /dev/null
+++ b/navit/icons/fuel.svg
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="fuel.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/projets/navit/icons/png/fuel.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3172">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3174" />
+      <stop
+         id="stop3184"
+         offset="0.98979592"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3176" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3179">
+      <stop
+         style="stop-color:#e5a80d;stop-opacity:1;"
+         offset="0"
+         id="stop3181" />
+      <stop
+         style="stop-color:#a11708;stop-opacity:1;"
+         offset="1"
+         id="stop3183" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3171">
+      <stop
+         style="stop-color:#7f7f7f;stop-opacity:1;"
+         offset="0"
+         id="stop3173" />
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="1"
+         id="stop3175" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2394"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3171"
+       id="linearGradient3177"
+       x1="8.4442434"
+       y1="3.2490435"
+       x2="9.3754778"
+       y2="7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1035822,0,0,1.1035873,-1.476588,-79.129247)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3179"
+       id="linearGradient3185"
+       x1="6.9290147"
+       y1="9.9886541"
+       x2="9.8439093"
+       y2="17.43853"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1035822,0,0,1.1035873,-1.5114248,-78.982551)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3172"
+       id="radialGradient3180"
+       cx="11.616755"
+       cy="10.509515"
+       fx="11.616755"
+       fy="10.509515"
+       r="10.038391"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#4eadff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="69.173607"
+     inkscape:cy="49.363892"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.80707788px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 14.99519,-77.554749 c -0.529626,0.77429 -1.118486,1.991006 -0.163661,2.715896 2.4199,1.660421 3.753448,4.909978 2.940525,7.784044 -0.253184,1.646554 0.504129,3.188575 1.019634,4.673117 0.134654,0.95387 -0.551151,2.762228 -1.73795,2.244639 -1.88392,-1.971745 -0.79107,-4.925747 -1.355476,-7.341484 -0.169725,-1.763177 -1.476733,-3.879991 -3.492491,-3.533758 -0.664165,0.04556 -0.776659,0.838814 -0.814721,1.243384 -0.905044,0.650552 0.403234,1.33902 0.964929,1.573848 1.237868,2.91267 -0.105895,6.415112 1.72764,9.166429 1.211666,2.260876 4.697088,2.658925 6.2846,0.590081 1.740886,-1.911405 1.669754,-4.917015 0.405789,-7.049582 -0.158668,-2.013327 0.457721,-4.181513 -0.10537,-6.103928 1.100575,-0.407287 0.825889,-1.835939 0.03004,-2.411888 -1.457621,-1.778554 -3.479192,-2.969477 -5.503956,-3.996049 -0.06651,0.148417 -0.133022,0.296834 -0.199532,0.445251 z"
+       id="path3174-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.10358727;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+       d="m 2.5517936,-76.636959 c 0,6.695055 0,13.39011 0,20.085165 3.5733497,0 7.1467001,0 10.7200504,0 0,-6.848105 0,-13.696211 0,-20.544316 -3.5733503,0 -7.1467007,0 -10.7200504,0 l 0,0.229575 0,0.229576 z"
+       id="rect2400-3"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3185);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.10358727;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+       id="rect2400"
+       width="8.8834524"
+       height="18.707596"
+       x="3.4702764"
+       y="-76.198204" />
+    <rect
+       style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3177);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+       id="rect3172"
+       width="5.5739312"
+       height="5.5391197"
+       x="5.0727816"
+       y="-74.568199" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4.80707788px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 15.551702,-76.815931 -0.450629,1.005738 c 0,0 0.326615,0.203887 0.401755,0.243924 0.130479,0.08909 0.264501,0.178004 0.471255,0.363644 0.540546,0.485343 1.281972,1.334003 2.019986,2.774635 0.733569,1.431954 0.869271,2.349302 0.84521,3.223922 -0.02406,0.87462 -0.243922,1.747495 -0.243922,2.934261 0,1.201011 0.329944,1.8521 0.585594,2.319969 0.255651,0.467868 0.440709,0.752855 0.424623,1.782348 -0.03126,2.000461 -1.226009,3.037203 -2.361657,3.010488 -0.520436,-0.01224 -1.087158,-0.325022 -1.563079,-1.13308 -0.475921,-0.808058 -0.820822,-2.104143 -0.789611,-3.914442 0.05328,-3.072616 -0.386599,-4.542152 -1.002146,-5.325075 -0.307773,-0.391461 -0.678157,-0.589186 -0.979278,-0.652407 -0.301121,-0.06322 -0.57842,0.01211 -0.57842,0.01211 l 0.323736,1.055061 c 0,0 -0.0336,1.12e-4 0.0278,0.013 0.0614,0.01289 0.172099,0.04243 0.338981,0.254685 0.333763,0.424519 0.817075,1.669119 0.765845,4.623345 -0.03375,1.957365 0.326617,3.448044 0.942511,4.493761 0.615895,1.045718 1.527441,1.653495 2.487654,1.676081 1.82647,0.04296 3.452729,-1.637335 3.491146,-4.09604 0.01877,-1.200905 -0.301388,-1.856402 -0.559588,-2.328935 -0.2582,-0.472534 -0.450629,-0.762296 -0.450629,-1.790869 0,-1.043088 0.215279,-1.878866 0.243474,-2.90377 0.0276,-1.003205 -0.167107,-2.153045 -0.924575,-3.664241 0.173574,0.211606 0.329903,0.42517 0.449284,0.637611 l 0.96224,-0.540759 c -0.671671,-1.195236 -1.875699,-2.172141 -2.910035,-2.889423 -0.765815,-0.53107 -1.319705,-0.839 -1.623612,-1.002151 -0.03851,-0.0232 -0.03217,-0.01741 -0.06502,-0.03587 -0.06671,-0.0353 -0.232265,-0.126894 -0.232265,-0.126894 l -0.0014,0.0031 c -0.0045,-0.002 -0.04529,-0.02376 -0.04529,-0.02376 z"
+       id="path3174"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/navit/xpm/gc_event.xpm b/navit/icons/gc_event.xpm
index ab6b96edf..ab6b96edf 100644
--- a/navit/xpm/gc_event.xpm
+++ b/navit/icons/gc_event.xpm
diff --git a/navit/xpm/gc_multi.xpm b/navit/icons/gc_multi.xpm
index 99f5ada8c..99f5ada8c 100644
--- a/navit/xpm/gc_multi.xpm
+++ b/navit/icons/gc_multi.xpm
diff --git a/navit/xpm/gc_mystery.xpm b/navit/icons/gc_mystery.xpm
index 7857292ae..7857292ae 100644
--- a/navit/xpm/gc_mystery.xpm
+++ b/navit/icons/gc_mystery.xpm
diff --git a/navit/xpm/gc_question.xpm b/navit/icons/gc_question.xpm
index 9de025068..9de025068 100644
--- a/navit/xpm/gc_question.xpm
+++ b/navit/icons/gc_question.xpm
diff --git a/navit/xpm/gc_reference.xpm b/navit/icons/gc_reference.xpm
index bd19a525b..bd19a525b 100644
--- a/navit/xpm/gc_reference.xpm
+++ b/navit/icons/gc_reference.xpm
diff --git a/navit/xpm/gc_stages.xpm b/navit/icons/gc_stages.xpm
index ede38d156..ede38d156 100644
--- a/navit/xpm/gc_stages.xpm
+++ b/navit/icons/gc_stages.xpm
diff --git a/navit/xpm/gc_tradi.xpm b/navit/icons/gc_tradi.xpm
index c183b690c..c183b690c 100644
--- a/navit/xpm/gc_tradi.xpm
+++ b/navit/icons/gc_tradi.xpm
diff --git a/navit/xpm/gc_webcam.xpm b/navit/icons/gc_webcam.xpm
index 602d694c0..602d694c0 100644
--- a/navit/xpm/gc_webcam.xpm
+++ b/navit/icons/gc_webcam.xpm
diff --git a/navit/icons/golf.svg b/navit/icons/golf.svg
new file mode 100644
index 000000000..c52eebeb2
--- /dev/null
+++ b/navit/icons/golf.svg
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="22"
+   height="22"
+   viewBox="0 0 100 100"
+   enable-background="new 0 0 500 500"
+   xml:space="preserve"
+   id="svg3541"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="golf.svg"><metadata
+     id="metadata3581"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title><dc:description>jfitie@gmail.com</dc:description><cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /></cc:Work><cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"><cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF></metadata><defs
+     id="defs3579"><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 250 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="500 : 250 : 1"
+       inkscape:persp3d-origin="250 : 166.66667 : 1"
+       id="perspective3583" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#SVGID_1_"
+       id="linearGradient3616"
+       gradientUnits="userSpaceOnUse"
+       x1="272.74319"
+       y1="121.6006"
+       x2="316.9014"
+       y2="121.6006" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#SVGID_2_"
+       id="linearGradient3618"
+       gradientUnits="userSpaceOnUse"
+       x1="181.84621"
+       y1="343.44531"
+       x2="311.8457"
+       y2="343.44531" /><linearGradient
+       y2="121.6006"
+       x2="316.9014"
+       y1="121.6006"
+       x1="272.74319"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3470"><stop
+         id="stop3551-6"
+         style="stop-color:#2B2B2B"
+         offset="0.2184" /><stop
+         id="stop3553-7"
+         style="stop-color:#222222"
+         offset="0.5415" /><stop
+         id="stop3555-5"
+         style="stop-color:#0D0D0D"
+         offset="1" /></linearGradient><linearGradient
+       y2="343.44531"
+       x2="311.8457"
+       y1="343.44531"
+       x1="181.84621"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3476"><stop
+         id="stop3560-5"
+         style="stop-color:#7D7D7D"
+         offset="0" /><stop
+         id="stop3562-6"
+         style="stop-color:#A6A6A6"
+         offset="0.977" /></linearGradient></defs><sodipodi:namedview
+     pagecolor="#ff37ff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1148"
+     inkscape:window-height="830"
+     id="namedview3577"
+     showgrid="false"
+     inkscape:zoom="5.0558131"
+     inkscape:cx="57.104884"
+     inkscape:cy="55.046611"
+     inkscape:window-x="97"
+     inkscape:window-y="41"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3541" /><g
+     id="g3503"
+     transform="matrix(0.94577661,0,0,0.94577518,28.132858,2.4686065)"><path
+       inkscape:connector-curvature="0"
+       id="path3547-9"
+       d="m 32.680842,-2.4772927 c -6.310243,-0.6299494 -13.82898,5.6859412 -9.939453,12.1953125 3.23894,6.6447622 1.857374,14.3744192 2.548828,21.4570312 0.56232,5.059742 -3.853892,10.302011 0.162109,14.710938 3.532988,4.572236 0.625166,10.752651 1.682936,16.0796 -0.656347,3.689224 1.562932,11.249733 -0.838865,12.659296 C 18.855076,71.897094 8.0965745,72.237741 4.7492015,80.803957 1.2081295,88.293071 2.9081885,100.0164 12.04217,102.36451 22.593707,105.31281 34.259141,99.297496 40.346857,90.735598 42.803429,85.178875 39.443,79.036834 40.252357,73.234973 39.991657,64.351896 38.966871,55.144057 39.575373,46.505129 44.682048,41.778232 38.76315,35.092724 40.282404,29.487551 39.723456,21.533678 39.642856,13.401586 42.678889,5.9348166 43.373247,0.29052505 37.884714,-3.3661264 32.680842,-2.4772927 Z"
+       style="fill:#ffffff" /><g
+       transform="matrix(0.20727942,0,0,0.20727942,-28.695502,-1.8812881)"
+       id="Outlines"><path
+         inkscape:connector-curvature="0"
+         style="fill:#050606"
+         d="m 268,24.461 c 0,0 27.691,-18.461 56.923,-4.615 5.385,14.615 -1.066,29.23 -5.148,36.154 -4.082,13.846 -4.852,14.615 -4.852,32.308 0,17.693 -0.297,98.462 4.852,106.923 5.149,8.461 3.312,20.769 0,22.308 -3.312,1.539 -8.697,3.846 -8.697,3.846 0,0 -1.836,37.692 8.697,215.384 -17.159,18.462 -70.236,66.154 -123.313,43.077 -23.846,-10.77 -20.452,-33.847 -20.452,-55.385 0,-21.538 18.145,-37.693 23.529,-40.77 5.384,-3.077 32.861,-6.153 48.354,-1.538 15.493,4.615 43.954,13.077 43.954,13.077 0,0 -0.769,-139.231 -3.076,-165.385 -6.924,-6.923 -16.154,-20 -15.385,-27.692 4.615,-13.846 6.922,-11.539 8.461,-31.539 1.539,-20 -3.847,-97.692 -6.155,-110.769 C 271.077,53.691 260.308,42.923 268,24.461 Z"
+         id="path3547" /></g><g
+       transform="matrix(0.20727942,0,0,0.20727942,-28.695502,-1.8812881)"
+       id="Color"><linearGradient
+         id="SVGID_1_"
+         gradientUnits="userSpaceOnUse"
+         x1="272.74319"
+         y1="121.6006"
+         x2="316.9014"
+         y2="121.6006"><stop
+           offset="0.2184"
+           style="stop-color:#2B2B2B"
+           id="stop3551" /><stop
+           offset="0.5415"
+           style="stop-color:#222222"
+           id="stop3553" /><stop
+           offset="1"
+           style="stop-color:#0D0D0D"
+           id="stop3555" /></linearGradient><path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3616)"
+         d="m 314.154,25.999 c 0,0 -24.616,-6.154 -39.231,3.846 -3.846,7.692 -3.076,19.23 6.154,25.384 0.769,10.77 14.615,123.077 -0.77,149.231 1.538,6.154 2.308,11.538 7.692,14.615 0,-7.692 0,-7.692 0,-7.692 l 21.538,-7.692 0,10.769 c 0,0 12.309,4.616 4.616,-18.461 -2.309,-12.308 -6.924,-115.384 -4.616,-138.461 3.077,-6.923 7.146,-11.539 7.146,-11.539 0,0 1.318,-14.615 -2.529,-20 z"
+         id="path3557" /><linearGradient
+         id="SVGID_2_"
+         gradientUnits="userSpaceOnUse"
+         x1="181.84621"
+         y1="343.44531"
+         x2="311.8457"
+         y2="343.44531"><stop
+           offset="0"
+           style="stop-color:#7D7D7D"
+           id="stop3560" /><stop
+           offset="0.977"
+           style="stop-color:#A6A6A6"
+           id="stop3562" /></linearGradient><path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3618)"
+         d="m 311.846,431.383 c 0,0 -33.076,47.693 -87.692,45.385 -27.692,1.538 -42.308,-20 -42.308,-36.154 0,-16.154 7.693,-48.461 29.231,-52.308 21.538,-3.847 66.688,6.923 87.692,19.23 0,-22.308 -7.103,-194.87 -7.103,-194.87 0,0 8.129,-3.667 13,-2.333 0.668,8.334 7.18,221.05 7.18,221.05 z"
+         id="path3564" /></g><g
+       transform="matrix(0.20727942,0,0,0.20727942,-28.695502,-1.8812881)"
+       id="Iron_x5F_Lines"><line
+         style="fill:#726658;stroke:#414042;stroke-width:8;stroke-miterlimit:10"
+         stroke-miterlimit="10"
+         x1="212.312"
+         y1="396.87399"
+         x2="217.688"
+         y2="466.62601"
+         id="line3567" /><line
+         style="fill:none;stroke:#414042;stroke-width:4;stroke-miterlimit:10"
+         stroke-miterlimit="10"
+         x1="215.15601"
+         y1="407.29901"
+         x2="286"
+         y2="412.228"
+         id="line3569" /><line
+         style="fill:none;stroke:#414042;stroke-width:4;stroke-miterlimit:10"
+         stroke-miterlimit="10"
+         x1="215.57201"
+         y1="425.80301"
+         x2="286.21301"
+         y2="421.13699"
+         id="line3571" /><line
+         style="fill:none;stroke:#414042;stroke-width:4;stroke-miterlimit:10"
+         stroke-miterlimit="10"
+         x1="217.688"
+         y1="443"
+         x2="286.21301"
+         y2="428.5"
+         id="line3573" /><line
+         style="fill:none;stroke:#414042;stroke-width:4;stroke-miterlimit:10"
+         stroke-miterlimit="10"
+         x1="217.688"
+         y1="458"
+         x2="289.5"
+         y2="435.75"
+         id="line3575" /></g></g></svg>
\ No newline at end of file
diff --git a/navit/xpm/gui_about.svg b/navit/icons/gui_about.svg
index 2cd20dcd9..2cd20dcd9 100644
--- a/navit/xpm/gui_about.svg
+++ b/navit/icons/gui_about.svg
diff --git a/navit/xpm/gui_actions.svg b/navit/icons/gui_actions.svg
index 9fc4b4d18..9fc4b4d18 100644
--- a/navit/xpm/gui_actions.svg
+++ b/navit/icons/gui_actions.svg
diff --git a/navit/xpm/gui_active.svg b/navit/icons/gui_active.svg
index 390c2e11c..390c2e11c 100644
--- a/navit/xpm/gui_active.svg
+++ b/navit/icons/gui_active.svg
diff --git a/navit/xpm/gui_android_menu.svg b/navit/icons/gui_android_menu.svg
index b47eae076..b47eae076 100644
--- a/navit/xpm/gui_android_menu.svg
+++ b/navit/icons/gui_android_menu.svg
diff --git a/navit/xpm/gui_arrow_down.svg b/navit/icons/gui_arrow_down.svg
index cd44ad4fd..cd44ad4fd 100644
--- a/navit/xpm/gui_arrow_down.svg
+++ b/navit/icons/gui_arrow_down.svg
diff --git a/navit/xpm/gui_arrow_left.svg b/navit/icons/gui_arrow_left.svg
index 783758a48..783758a48 100644
--- a/navit/xpm/gui_arrow_left.svg
+++ b/navit/icons/gui_arrow_left.svg
diff --git a/navit/xpm/gui_arrow_right.svg b/navit/icons/gui_arrow_right.svg
index 94f11d9a4..94f11d9a4 100644
--- a/navit/xpm/gui_arrow_right.svg
+++ b/navit/icons/gui_arrow_right.svg
diff --git a/navit/xpm/gui_arrow_up.svg b/navit/icons/gui_arrow_up.svg
index f64166e75..f64166e75 100644
--- a/navit/xpm/gui_arrow_up.svg
+++ b/navit/icons/gui_arrow_up.svg
diff --git a/navit/xpm/gui_bookmark.svg b/navit/icons/gui_bookmark.svg
index 4d32f31f3..4d32f31f3 100644
--- a/navit/xpm/gui_bookmark.svg
+++ b/navit/icons/gui_bookmark.svg
diff --git a/navit/xpm/gui_display.svg b/navit/icons/gui_display.svg
index 0e89c8680..0e89c8680 100644
--- a/navit/xpm/gui_display.svg
+++ b/navit/icons/gui_display.svg
diff --git a/navit/xpm/gui_formerdests.svg b/navit/icons/gui_formerdests.svg
index 8f453761b..8f453761b 100644
--- a/navit/xpm/gui_formerdests.svg
+++ b/navit/icons/gui_formerdests.svg
diff --git a/navit/xpm/gui_fullscreen.svg b/navit/icons/gui_fullscreen.svg
index 1c025cc5a..1c025cc5a 100644
--- a/navit/xpm/gui_fullscreen.svg
+++ b/navit/icons/gui_fullscreen.svg
diff --git a/navit/xpm/gui_heightprofile.svg b/navit/icons/gui_heightprofile.svg
index 0d80b5c12..0d80b5c12 100644
--- a/navit/xpm/gui_heightprofile.svg
+++ b/navit/icons/gui_heightprofile.svg
diff --git a/navit/xpm/gui_help.svg b/navit/icons/gui_help.svg
index 06dfed2e5..06dfed2e5 100644
--- a/navit/xpm/gui_help.svg
+++ b/navit/icons/gui_help.svg
diff --git a/navit/xpm/gui_home.svg b/navit/icons/gui_home.svg
index 79db440d3..79db440d3 100644
--- a/navit/xpm/gui_home.svg
+++ b/navit/icons/gui_home.svg
diff --git a/navit/xpm/gui_inactive.svg b/navit/icons/gui_inactive.svg
index 61e2dcb8d..61e2dcb8d 100644
--- a/navit/xpm/gui_inactive.svg
+++ b/navit/icons/gui_inactive.svg
diff --git a/navit/xpm/gui_layers.svg b/navit/icons/gui_layers.svg
index 810b5a1d6..810b5a1d6 100644
--- a/navit/xpm/gui_layers.svg
+++ b/navit/icons/gui_layers.svg
diff --git a/navit/xpm/gui_leave_fullscreen.svg b/navit/icons/gui_leave_fullscreen.svg
index d1d351b9b..d1d351b9b 100644
--- a/navit/xpm/gui_leave_fullscreen.svg
+++ b/navit/icons/gui_leave_fullscreen.svg
diff --git a/navit/xpm/gui_log.svg b/navit/icons/gui_log.svg
index 33a1ac9ed..33a1ac9ed 100644
--- a/navit/xpm/gui_log.svg
+++ b/navit/icons/gui_log.svg
diff --git a/navit/xpm/gui_map.svg b/navit/icons/gui_map.svg
index efdc2662b..efdc2662b 100644
--- a/navit/xpm/gui_map.svg
+++ b/navit/icons/gui_map.svg
diff --git a/navit/xpm/gui_maps.svg b/navit/icons/gui_maps.svg
index 3a9ff3e7b..3a9ff3e7b 100644
--- a/navit/xpm/gui_maps.svg
+++ b/navit/icons/gui_maps.svg
diff --git a/navit/xpm/gui_menu.svg b/navit/icons/gui_menu.svg
index e81d59f1e..e81d59f1e 100644
--- a/navit/xpm/gui_menu.svg
+++ b/navit/icons/gui_menu.svg
diff --git a/navit/xpm/gui_minus.svg b/navit/icons/gui_minus.svg
index 3dd1c9680..3dd1c9680 100644
--- a/navit/xpm/gui_minus.svg
+++ b/navit/icons/gui_minus.svg
diff --git a/navit/xpm/gui_plus.svg b/navit/icons/gui_plus.svg
index 59747fa69..59747fa69 100644
--- a/navit/xpm/gui_plus.svg
+++ b/navit/icons/gui_plus.svg
diff --git a/navit/xpm/gui_quit.svg b/navit/icons/gui_quit.svg
index c15b62b40..c15b62b40 100644
--- a/navit/xpm/gui_quit.svg
+++ b/navit/icons/gui_quit.svg
diff --git a/navit/xpm/gui_rules.svg b/navit/icons/gui_rules.svg
index 133dc77f2..133dc77f2 100644
--- a/navit/xpm/gui_rules.svg
+++ b/navit/icons/gui_rules.svg
diff --git a/navit/xpm/gui_search.svg b/navit/icons/gui_search.svg
index e363e15c0..e363e15c0 100644
--- a/navit/xpm/gui_search.svg
+++ b/navit/icons/gui_search.svg
diff --git a/navit/xpm/gui_select_country.svg b/navit/icons/gui_select_country.svg
index 61e2dcb8d..61e2dcb8d 100644
--- a/navit/xpm/gui_select_country.svg
+++ b/navit/icons/gui_select_country.svg
diff --git a/navit/xpm/gui_select_house_number.svg b/navit/icons/gui_select_house_number.svg
index 61e2dcb8d..61e2dcb8d 100644
--- a/navit/xpm/gui_select_house_number.svg
+++ b/navit/icons/gui_select_house_number.svg
diff --git a/navit/xpm/gui_select_street.svg b/navit/icons/gui_select_street.svg
index 390c2e11c..390c2e11c 100644
--- a/navit/xpm/gui_select_street.svg
+++ b/navit/icons/gui_select_street.svg
diff --git a/navit/xpm/gui_select_town.svg b/navit/icons/gui_select_town.svg
index 61e2dcb8d..61e2dcb8d 100644
--- a/navit/xpm/gui_select_town.svg
+++ b/navit/icons/gui_select_town.svg
diff --git a/navit/xpm/gui_settings.svg b/navit/icons/gui_settings.svg
index 86bec7718..86bec7718 100644
--- a/navit/xpm/gui_settings.svg
+++ b/navit/icons/gui_settings.svg
diff --git a/navit/xpm/gui_sound.svg b/navit/icons/gui_sound.svg
index 16fb4a871..16fb4a871 100644
--- a/navit/xpm/gui_sound.svg
+++ b/navit/icons/gui_sound.svg
diff --git a/navit/xpm/gui_sound_32.xpm b/navit/icons/gui_sound_32.xpm
index 2f8de7248..2f8de7248 100644
--- a/navit/xpm/gui_sound_32.xpm
+++ b/navit/icons/gui_sound_32.xpm
diff --git a/navit/xpm/gui_sound_off.svg b/navit/icons/gui_sound_off.svg
index d85e1f8b9..d85e1f8b9 100644
--- a/navit/xpm/gui_sound_off.svg
+++ b/navit/icons/gui_sound_off.svg
diff --git a/navit/xpm/gui_sound_off_32.xpm b/navit/icons/gui_sound_off_32.xpm
index e352bac59..e352bac59 100644
--- a/navit/xpm/gui_sound_off_32.xpm
+++ b/navit/icons/gui_sound_off_32.xpm
diff --git a/navit/xpm/gui_stop.svg b/navit/icons/gui_stop.svg
index 51aa9c6a1..51aa9c6a1 100644
--- a/navit/xpm/gui_stop.svg
+++ b/navit/icons/gui_stop.svg
diff --git a/navit/xpm/gui_strength_0.svg b/navit/icons/gui_strength_0.svg
index 09e8fee08..09e8fee08 100644
--- a/navit/xpm/gui_strength_0.svg
+++ b/navit/icons/gui_strength_0.svg
diff --git a/navit/xpm/gui_strength_1.svg b/navit/icons/gui_strength_1.svg
index 3646ebe96..3646ebe96 100644
--- a/navit/xpm/gui_strength_1.svg
+++ b/navit/icons/gui_strength_1.svg
diff --git a/navit/xpm/gui_strength_2.svg b/navit/icons/gui_strength_2.svg
index 196f046aa..196f046aa 100644
--- a/navit/xpm/gui_strength_2.svg
+++ b/navit/icons/gui_strength_2.svg
diff --git a/navit/xpm/gui_strength_3.svg b/navit/icons/gui_strength_3.svg
index 7a6b45222..7a6b45222 100644
--- a/navit/xpm/gui_strength_3.svg
+++ b/navit/icons/gui_strength_3.svg
diff --git a/navit/xpm/gui_strength_4.svg b/navit/icons/gui_strength_4.svg
index 482d4f234..482d4f234 100644
--- a/navit/xpm/gui_strength_4.svg
+++ b/navit/icons/gui_strength_4.svg
diff --git a/navit/xpm/gui_strength_5.svg b/navit/icons/gui_strength_5.svg
index 0e779b27a..0e779b27a 100644
--- a/navit/xpm/gui_strength_5.svg
+++ b/navit/icons/gui_strength_5.svg
diff --git a/navit/xpm/gui_tools.svg b/navit/icons/gui_tools.svg
index 067fbc1f9..067fbc1f9 100644
--- a/navit/xpm/gui_tools.svg
+++ b/navit/icons/gui_tools.svg
diff --git a/navit/xpm/gui_town.svg b/navit/icons/gui_town.svg
index 2d1f3835c..2d1f3835c 100644
--- a/navit/xpm/gui_town.svg
+++ b/navit/icons/gui_town.svg
diff --git a/navit/xpm/gui_vehicle.svg b/navit/icons/gui_vehicle.svg
index 5fb4b1af1..5fb4b1af1 100644
--- a/navit/xpm/gui_vehicle.svg
+++ b/navit/icons/gui_vehicle.svg
diff --git a/navit/xpm/gui_vehicle_pedestrian.svg b/navit/icons/gui_vehicle_pedestrian.svg
index f5521cd62..f5521cd62 100644
--- a/navit/xpm/gui_vehicle_pedestrian.svg
+++ b/navit/icons/gui_vehicle_pedestrian.svg
diff --git a/navit/xpm/gui_zoom_auto.svg b/navit/icons/gui_zoom_auto.svg
index bc84ca214..bc84ca214 100644
--- a/navit/xpm/gui_zoom_auto.svg
+++ b/navit/icons/gui_zoom_auto.svg
diff --git a/navit/xpm/gui_zoom_in.svg b/navit/icons/gui_zoom_in.svg
index bb7f76ad0..bb7f76ad0 100644
--- a/navit/xpm/gui_zoom_in.svg
+++ b/navit/icons/gui_zoom_in.svg
diff --git a/navit/xpm/gui_zoom_manual.svg b/navit/icons/gui_zoom_manual.svg
index 4f72c9afe..4f72c9afe 100644
--- a/navit/xpm/gui_zoom_manual.svg
+++ b/navit/icons/gui_zoom_manual.svg
diff --git a/navit/xpm/gui_zoom_out.svg b/navit/icons/gui_zoom_out.svg
index ff8c9f986..ff8c9f986 100644
--- a/navit/xpm/gui_zoom_out.svg
+++ b/navit/icons/gui_zoom_out.svg
diff --git a/navit/icons/gui_zoom_route.svg b/navit/icons/gui_zoom_route.svg
new file mode 100644
index 000000000..c7958a2f5
--- /dev/null
+++ b/navit/icons/gui_zoom_route.svg
@@ -0,0 +1,614 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   inkscape:export-ydpi="240.00000"
+   inkscape:export-xdpi="240.00000"
+   inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
+   sodipodi:docname="gui_zoom_route.svg"
+   inkscape:version="0.91 r13725"
+   sodipodi:version="0.32"
+   id="svg249"
+   height="48px"
+   width="48px"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
+  <title
+     id="title3502">gui_zoom_route</title>
+  <defs
+     id="defs3">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient23434">
+      <stop
+         style="stop-color:#2e3436"
+         offset="0"
+         id="stop23436" />
+      <stop
+         style="stop-color:#555753"
+         offset="1"
+         id="stop23438" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient19914">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop19916" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop19918" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient19900">
+      <stop
+         style="stop-color:#888a85"
+         offset="0"
+         id="stop19902" />
+      <stop
+         style="stop-color:#d3d7cf"
+         offset="1"
+         id="stop19904" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15493">
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1;"
+         offset="0"
+         id="stop15495" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop15497" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient11102">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop11104" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop11106" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4952">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4954" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop4956" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4931">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop4933" />
+      <stop
+         style="stop-color:#888a85"
+         offset="1"
+         id="stop4935" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4919">
+      <stop
+         style="stop-color:#429eff;stop-opacity:1;"
+         offset="0"
+         id="stop4921" />
+      <stop
+         style="stop-color:#0044a7;stop-opacity:1;"
+         offset="1"
+         id="stop4923" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2980">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2982" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop2984" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2609"
+       inkscape:collect="always">
+      <stop
+         id="stop2611"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop2613"
+         offset="1"
+         style="stop-color:#eeeeec" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2617">
+      <stop
+         id="stop2619"
+         offset="0"
+         style="stop-color:#fbfbfa;stop-opacity:1;" />
+      <stop
+         id="stop2621"
+         offset="1"
+         style="stop-color:#d3d7cf" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2690"
+       inkscape:collect="always">
+      <stop
+         id="stop2692"
+         offset="0"
+         style="stop-color:#2e3436" />
+      <stop
+         id="stop2694"
+         offset="1"
+         style="stop-color:#555753" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2698">
+      <stop
+         id="stop2700"
+         offset="0"
+         style="stop-color:#555753" />
+      <stop
+         style="stop-color:#a3a5a2;stop-opacity:1;"
+         offset="0.70238096"
+         id="stop2706" />
+      <stop
+         id="stop2702"
+         offset="1"
+         style="stop-color:#888a85" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2609"
+       id="radialGradient1409"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.294293e-16,1.143443,-1.247217,-1.248581e-6,41.735,-54.25682)"
+       cx="45.094624"
+       cy="-2.6936908"
+       fx="45.094624"
+       fy="-2.6936908"
+       r="10.498367" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2617"
+       id="radialGradient1411"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.928248e-11,-1.686609,1.66336,-1.770202e-15,41.65431,111.7396)"
+       cx="59.787472"
+       cy="10.901535"
+       fx="59.787472"
+       fy="10.901535"
+       r="10.55559" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2698"
+       id="linearGradient1421"
+       gradientUnits="userSpaceOnUse"
+       x1="81.332451"
+       y1="55.106758"
+       x2="82.919647"
+       y2="53.511261" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2690"
+       id="linearGradient1423"
+       gradientUnits="userSpaceOnUse"
+       x1="81.096306"
+       y1="57.148193"
+       x2="83.629295"
+       y2="54.615208" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4919"
+       id="radialGradient4925"
+       cx="17.062258"
+       cy="28.851427"
+       fx="17.062258"
+       fy="28.851427"
+       r="13.5"
+       gradientTransform="matrix(1.459545,-9.027299e-15,-5.118666e-17,1.345339,-7.403138,-10.82184)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4931"
+       id="linearGradient4937"
+       x1="54.1129"
+       y1="12.846775"
+       x2="50.079948"
+       y2="-3.8813655"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4952"
+       id="radialGradient4960"
+       cx="16.829521"
+       cy="24.743624"
+       fx="16.829521"
+       fy="24.743624"
+       r="16.924615"
+       gradientTransform="matrix(2.231289,-0.597872,0.530253,1.979013,-30.74857,-16.49764)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11102"
+       id="radialGradient11108"
+       cx="8.0402098"
+       cy="9.5280285"
+       fx="8.0402098"
+       fy="9.5280285"
+       r="9.8125"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.946826,-1.897043e-16,1.897043e-16,0.946826,0.469351,0.499261)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient19900"
+       id="linearGradient19906"
+       x1="40.25"
+       y1="41"
+       x2="43.0625"
+       y2="38.434578"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient19914"
+       id="linearGradient19920"
+       x1="33.985317"
+       y1="32.045906"
+       x2="37.211494"
+       y2="35.272079"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1,0)" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2980"
+       id="radialGradient23426"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.34,1.362626e-15,19.89607)"
+       cx="28.284271"
+       cy="30.145554"
+       fx="28.284271"
+       fy="30.145554"
+       r="13.258252" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2980"
+       id="radialGradient23432"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,-4.196543e-16,-3.619011e-17,0.34,1.860387e-15,19.89607)"
+       cx="28.284271"
+       cy="30.145554"
+       fx="28.284271"
+       fy="30.145554"
+       r="13.258252" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient23434"
+       id="linearGradient23440"
+       x1="55.878288"
+       y1="12.472493"
+       x2="52.5"
+       y2="-4.6213989"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7336"
+       id="linearGradient2256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.00335137,-1.2954112,1.6105612,-0.00269557,16.181036,101.65038)"
+       x1="11.002116"
+       y1="29.756582"
+       x2="46.998974"
+       y2="29.756582" />
+    <linearGradient
+       id="linearGradient7336">
+      <stop
+         id="stop7338"
+         offset="0"
+         style="stop-color: rgb(236, 192, 92); stop-opacity: 1;" />
+      <stop
+         style="stop-color: rgb(215, 183, 86); stop-opacity: 1;"
+         offset="0.19283746"
+         id="stop7340" />
+      <stop
+         id="stop4206"
+         offset="0.63636363"
+         style="stop-color: rgb(226, 203, 144); stop-opacity: 1;" />
+      <stop
+         id="stop7342"
+         offset="1"
+         style="stop-color: rgb(242, 235, 160); stop-opacity: 1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3289"
+       id="linearGradient2258"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.00753116,-1.2954,1.61055,-0.00605749,16.302686,101.75013)"
+       x1="36.880539"
+       y1="20.811714"
+       x2="23.073864"
+       y2="43.531128" />
+    <linearGradient
+       id="linearGradient3289">
+      <stop
+         style="stop-color: rgb(255, 255, 142); stop-opacity: 1;"
+         offset="0"
+         id="stop3291" />
+      <stop
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0.533898;"
+         offset="1"
+         id="stop3293" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     inkscape:window-y="0"
+     inkscape:window-x="0"
+     inkscape:window-height="874"
+     inkscape:window-width="1440"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="false"
+     showgrid="false"
+     inkscape:current-layer="layer5"
+     inkscape:cy="25.827191"
+     inkscape:cx="19.323682"
+     inkscape:zoom="11.313709"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     borderopacity="1"
+     bordercolor="#666666"
+     pagecolor="#b6b6b6"
+     id="base"
+     inkscape:showpageshadow="false"
+     showborder="false"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:grid-points="true"
+     fill="#729fcf"
+     stroke="#2e3436"
+     inkscape:window-maximized="1">
+    <sodipodi:guide
+       orientation="horizontal"
+       position="28"
+       id="guide1415" />
+    <sodipodi:guide
+       orientation="vertical"
+       position="19"
+       id="guide1417" />
+    <inkscape:grid
+       id="GridFromPre046Settings"
+       type="xygrid"
+       originx="0px"
+       originy="0px"
+       spacingx="0.5px"
+       spacingy="0.5px"
+       color="#3f3fff"
+       empcolor="#3f3fff"
+       opacity="0.15"
+       empopacity="0.38"
+       empspacing="2" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4">
+    <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>gui_zoom_route</dc:title>
+        <dc:subject>
+          <rdf:Bag />
+        </dc:subject>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>jfitie@gmail.com</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:source />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:contributor>
+        <dc:date>2017</dc:date>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/SourceCode" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer6"
+     inkscape:label="Shadow"
+     style="display:inline" />
+  <g
+     style="display:inline"
+     inkscape:groupmode="layer"
+     inkscape:label="Base"
+     id="layer1" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer5"
+     inkscape:label="Text"
+     style="display:inline">
+    <g
+       transform="translate(-12.26513,47.49999)"
+       style="display:inline"
+       inkscape:label="base"
+       id="g2637" />
+    <ellipse
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:url(#radialGradient4925);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       id="path1425"
+       cx="17.5"
+       cy="18.25"
+       rx="13.5"
+       ry="13.75"
+       transform="matrix(1.185185,0,0,1.163637,0.259261,-1.236368)" />
+    <circle
+       id="path2607"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient1411);stroke-width:1.87499988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       cx="52.5"
+       cy="4.5"
+       r="10"
+       transform="matrix(1.6,0,0,1.6,-63,12.8)" />
+    <ellipse
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.04705882;fill:url(#radialGradient23432);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       id="path23418"
+       transform="matrix(0.98756,0.175983,-0.12162,0.682489,11.58742,17.92885)"
+       cx="28.284271"
+       cy="30.145554"
+       rx="13.258252"
+       ry="4.5078058" />
+    <g
+       transform="matrix(1.544052,0,0,1.536016,-85.57756,-44.44515)"
+       id="g2708">
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1421);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1423);stroke-width:0.67653471;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="m 76.796351,49.768459 0.647647,3.255175 5.181173,5.213494 c 0.192503,0.193704 0.97147,0.320302 1.942939,-0.65625 0.97147,-0.976552 0.895574,-1.70388 0.647647,-1.953105 l -5.181173,-5.208279 -3.238233,-0.651035 z"
+         id="path2682"
+         sodipodi:nodetypes="cczzzcc"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.19215686;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+         d="m 79.567301,51.320041 c -0.003,0.0112 0.294101,0.324318 -0.245291,0.864982 -0.539399,0.540663 -1.007144,0.373988 -0.993486,0.360259 l -0.269149,-1.521577 1.507926,0.296336 z"
+         id="path2687"
+         sodipodi:nodetypes="csccc"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       sodipodi:nodetypes="cczzzcc"
+       id="path17267"
+       d="m 34.284644,33.278595 0.622566,3.201219 7.499596,7.548776 c 0.368834,0.371253 0.933849,0.217906 1.867696,-0.715942 0.93385,-0.933848 1.174626,-1.401295 0.710955,-1.867698 l -7.499595,-7.54379 -3.201218,-0.622565 z"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient19906);stroke-width:0.99999934;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.15294118;fill:url(#linearGradient19920);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.67653471;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       d="m 32.831928,31.491641 c -0.259828,0.08751 -0.407346,0.360045 -0.337762,0.624007 L 33.50745,37.1077 c 0.02528,0.09166 0.07535,0.174677 0.144755,0.240002 l 7.961518,8.016084 c 0.356814,0.357162 0.895458,0.461555 1.544052,0.336003 0.648595,-0.125552 1.41239,-0.536828 2.219575,-1.344014 0.800523,-0.800521 1.213108,-1.516721 1.351046,-2.160022 0.137938,-0.643302 0.01402,-1.23224 -0.337762,-1.584017 l -8.009769,-7.968083 c -0.07874,-0.07728 -0.180114,-0.127706 -0.28951,-0.144001 l -4.969918,-1.008011 c -0.09457,-0.02714 -0.194934,-0.02714 -0.289509,0 z"
+       id="path19908"
+       sodipodi:nodetypes="cccccsssccccc"
+       inkscape:connector-curvature="0" />
+    <circle
+       id="path2605"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient1409);stroke-width:0.60606074;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       cx="52.5"
+       cy="4.5"
+       r="10"
+       transform="matrix(1.65,0,0,1.65,-65.625,12.575)" />
+    <circle
+       id="path2599"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient23440);stroke-width:0.57142824;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       cx="52.5"
+       cy="4.5"
+       r="10"
+       transform="matrix(1.75,0,0,1.75,-70.875,12.125)" />
+    <ellipse
+       id="path4927"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4937);stroke-width:0.68814939;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       cx="52.5"
+       cy="4.5"
+       transform="matrix(1.453172,0,0,1.453175,-55.29154,13.46071)"
+       r="10" />
+    <circle
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.16078431;fill:url(#radialGradient11108);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       id="path11092"
+       cx="12.375"
+       cy="12.9375"
+       r="9.8125"
+       transform="matrix(1.324842,0,0,1.324842,4.605084,2.859861)" />
+    <ellipse
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.072;fill:url(#radialGradient23426);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       id="path2970"
+       cx="28.284271"
+       cy="30.145554"
+       rx="13.258252"
+       ry="4.5078058"
+       transform="matrix(1.585832,0,0,1.204644,-19.35411,4.31756)" />
+    <g
+       id="g2247"
+       transform="matrix(0.4192022,0,0,0.4192022,-6.197357,-7.3085586)">
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path6459"
+         d="M 45.389306,86.701477 C 34.824265,74.824205 48.435181,53.480282 45.272019,41.36619 l 40.428815,-0.06767 c 4.87026,11.662373 -10.167111,31.886517 0.117285,45.335287 l -40.428813,0.06766 z"
+         style="display:block;overflow:visible;visibility:visible;fill:url(#linearGradient2256);fill-opacity:1;fill-rule:evenodd;stroke:#c58839;stroke-width:2.59699869;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="path16506"
+         d="M 46.174303,85.812209 C 36.888621,75.513321 49.122807,54.275725 46.726999,42.364253 l 37.99609,-0.136813 c 3.896667,8.939411 -9.233341,29.918513 -0.840131,43.361978 l -37.708655,0.222791 z"
+         style="display:block;overflow:visible;visibility:visible;opacity:0.62921298;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2258);stroke-width:1.1234138;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cszz"
+         id="path3216"
+         d="m 49.79095,82.968742 c 2.355601,-8.555149 2.486847,-10.339514 6.375488,-14.651707 3.451705,-3.827665 14.432477,-4.3559 17.81581,-8.373742 3.383334,-4.017843 3.63953,-7.663543 4.290586,-15.38951"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0070c6;stroke-width:3.53917122;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <g
+         transform="matrix(0.5944238,-0.1564125,0.1444815,0.6435113,43.323809,43.074772)"
+         id="g3551">
+        <path
+           inkscape:connector-curvature="0"
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#cc0000;stroke-width:2.58923006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           id="path2565"
+           d="m 11.318692,9.2240568 c 5.323305,5.4689902 11.450555,9.8995942 17.891972,13.7070482 l -1.769096,1.228738 C 21.101863,20.04489 15.052508,15.498993 9.1840818,10.652117 L 11.318692,9.2240568 Z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#cc0000;stroke-width:2.58923006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+           id="path2575"
+           d="M 26.73892,8.9210568 C 21.867631,15.95255 15.247359,21.081199 7.9065151,25.28163 L 10.087564,23.520856 C 8.7241111,24.379297 25.574485,11.804168 23.852075,10.207903 L 26.73892,8.9210568 Z" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path2473"
+         d="m 74.627177,81.489386 -6.429011,-3.403962 -3.26204,-4.487647 -4.169829,-4.700611 -1.97294,-5.310836 -0.520132,-5.77966 0,0"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 9;stroke-dashoffset:0;stroke-opacity:1" />
+    </g>
+    <path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:url(#radialGradient4960);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
+       d="M 20.430801,3.5 C 11.914639,3.824042 5.1019281,10.849356 5.1019281,19.444373 c 0,2.416918 1.4031166,4.72179 2.4913082,6.711877 -0.472071,-5.428185 1.8666174,-6.613181 3.4195547,-6.131073 4.711505,1.462684 12.887343,2.792205 21.287131,-1.59347 2.944666,-1.537461 4.661863,2.229468 4.544204,-1.156238 C 35.904686,9.4808807 29.114153,3.5000001 21.046301,3.5 c -0.20628,0 -0.411112,-0.00778 -0.6155,0 z"
+       id="path4939"
+       sodipodi:nodetypes="cscsscsc"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/navit/icons/heliport.svg b/navit/icons/heliport.svg
new file mode 100644
index 000000000..b80e2692f
--- /dev/null
+++ b/navit/icons/heliport.svg
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="22"
+   height="22"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="heliport.svg">
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffff8a"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1291"
+     inkscape:window-height="871"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="5.2149125"
+     inkscape:cx="65.025422"
+     inkscape:cy="43.302771"
+     inkscape:window-x="141"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs6" />
+  <g
+     id="g3517"
+     transform="matrix(0.20416148,0,0,0.20416238,0.7253889,1.4235293)">
+    <g
+       transform="translate(115.82169,-51.391083)"
+       id="g3502">
+      <path
+         d="m -104.58203,72.339844 c -12.26981,0.204726 -19.17915,17.435869 -10.19531,25.960937 7.87762,9.458789 25.762517,3.919209 26.585934,-8.49414 1.479958,-9.369267 -6.93606,-18.324647 -16.390624,-17.466797 z"
+         id="circle3336-6"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;stroke:#ffffff" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff"
+         d="m -104.06641,76.660156 c -10.04753,0.117184 -13.87032,15.745452 -4.87109,20.369141 8.14724,5.915033 20.509528,-4.536148 15.9375,-13.541016 -1.708904,-4.382542 -6.406237,-7.187374 -11.06641,-6.828125 z"
+         id="circle3338-7"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -104.02148,80.158203 c -8.13471,0.02954 -9.54123,13.52155 -1.49024,15.095703 7.920684,3.050845 13.830836,-9.89553 6.312501,-13.865234 -1.416461,-0.937974 -3.137221,-1.320513 -4.822261,-1.230469 z"
+         id="circle3340-5"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;stroke:#ffffff" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:0.20561387"
+         d="m -36.146484,80.085938 c -15.18587,1.163541 -30.598889,-0.556602 -45.794922,0.591796 -5.554134,2.227064 -3.480238,9.487647 -0.554688,13.0625 4.460769,8.073136 5.915501,18.481506 12.808594,24.863286 6.951217,3.31061 14.79146,0.0206 22.103436,1.14754 11.087124,-0.36385 22.572212,1.1515 33.418048,-0.78231 5.671764,-4.26007 -0.06204,-11.02798 -1.794922,-15.63867 -4.444886,-7.027209 -4.884592,-17.259907 -12.208984,-22.091799 -2.504656,-1.078915 -5.283331,-1.265962 -7.976562,-1.152343 z"
+         id="path3342-3"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:0.20561387"
+         d="m -36.185547,84.699219 c -9.692025,1.091642 -19.701293,-1.002276 -29.259765,0.757812 -4.700298,2.736109 -1.395217,8.597689 0.599609,11.935547 1.351757,5.071922 6.405423,8.755702 11.650391,7.146482 9.711046,-0.48709 19.978838,1.37835 29.339843,-0.97461 4.622942,-4.211212 -1.020041,-9.416596 -2.472656,-13.509762 -1.14077,-4.372707 -5.830927,-5.777287 -9.857422,-5.355469 z"
+         id="path3344-5"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -68.099609,67.603516 c -9.798221,0.803351 -19.943673,-0.929454 -29.613282,0.652343 -6.150159,2.658763 -3.450489,13.538013 3.505134,12.13573 10.02674,-0.764705 20.71005,1.817263 30.350335,-1.264636 4.847928,-3.453472 1.621929,-11.948246 -4.242187,-11.523437 z"
+         id="path3346-6"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;stroke:#ffffff" />
+      <path
+         d="m -20.0625,67.703125 c -9.807281,0.809179 -19.964809,-0.931482 -29.642578,0.65625 -6.127329,2.659116 -3.470551,13.487431 3.470303,12.143595 9.997788,-0.675519 20.563348,1.591918 30.223056,-1.149454 5.019582,-3.36761 1.92097,-12.041213 -4.050781,-11.650391 z"
+         id="path3348-2"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;stroke:#ffffff" />
+      <path
+         d="m -71.392578,71.052734 c -0.929526,3.718373 0.908228,8.454183 5.414062,8.144532 4.730009,0.01087 9.480562,-1.252385 14.015625,0.474609 4.862602,1.14452 11.421345,-5.545086 6.671875,-9.476563 -6.300142,-2.920039 -13.869305,-0.199133 -20.568359,-1.142578 -1.851958,0.645413 -6.759309,-1.627682 -5.533203,2 z"
+         id="rect3350-9"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;stroke:#ffffff" />
+      <path
+         d="m -54.246094,70.371094 c -3.191536,-0.309008 -10.162755,-1.373939 -9.363281,4.007812 0.06811,9.911518 0.01008,19.836983 0.0293,29.753904 4.553033,2.33355 11.786436,1.01982 12.015625,-5.062498 0.192677,-9.798116 -0.344459,-19.643168 -0.109375,-29.466796 -0.857422,0.255859 -1.714844,0.511718 -2.572266,0.767578 z"
+         id="rect3352-1"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;stroke:#ffffff" />
+      <path
+         d="m -45.896484,83.277344 c -3.896546,-0.397378 -7.115721,3.249552 -5.460938,7.015625 0.05752,4.708855 -2.989848,13.415231 3.5625,15.230471 3.911193,1.55682 8.693817,-1.09075 8.101563,-5.669924 -0.343603,-4.304045 -0.6346,-8.357677 0.203125,-12.552735 -0.429083,-2.966176 -3.775921,-4.133289 -6.40625,-4.023437 z"
+         id="rect3354-2"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;stroke:#ffffff" />
+      <path
+         d="m -34.300781,82.746094 c -4.676,-0.01654 -6.511432,4.859779 -5.517578,8.828125 0.236759,4.708835 -2.13808,12.507851 3.214843,14.845701 4.646576,2.00115 9.238046,-2.22766 8.53711,-6.984373 -1.185198,-4.736808 2.018908,-9.944615 -0.921875,-14.208985 -1.238046,-1.62054 -3.280498,-2.553483 -5.3125,-2.480468 z"
+         id="rect3356-7"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;stroke:#ffffff" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:0.20561387"
+         d="m -102.10547,80.228516 c -7.2033,0.586202 -9.04622,12.909643 -2.53125,15.564453 9.539611,4.511931 19.888308,7.089741 29.406251,11.763671 5.091679,1.45424 10.748325,6.08389 15.919922,3.66211 5.607501,-4.4815 3.052277,-12.741308 5.839844,-18.65625 1.680666,-4.445361 1.269823,-11.879406 -4.898438,-12.125 -14.579131,0.134463 -29.158509,-0.08746 -43.736329,-0.208984 z"
+         id="path3358-0"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -23.318359,119.93555 c -16.675873,1.0093 -33.567057,-0.37599 -50.242188,0.59961 -7.872507,1.88124 -7.518196,15.59888 0.946351,15.96044 17.04978,1.0318 34.162794,0.0318 51.217712,0.44971 7.194474,0.35891 11.7036092,-9.48357 6.039062,-14.25586 -2.12887,-1.95334 -5.097084,-2.88727 -7.960937,-2.7539 z"
+         id="path3360-9"
+         inkscape:connector-curvature="0"
+         style="fill:#ffffff;stroke:#ffffff" />
+    </g>
+    <g
+       transform="matrix(0.20561387,0,0,0.20561387,0.23544471,19.985833)"
+       id="g3368">
+      <circle
+         cx="55.5"
+         cy="78"
+         r="55.5"
+         id="circle3336" />
+      <circle
+         style="fill:#ffffff"
+         cx="57"
+         cy="77.5"
+         r="34"
+         id="circle3338" />
+      <circle
+         cx="56"
+         cy="78.5"
+         r="18"
+         id="circle3340" />
+      <path
+         style="stroke:#ffffff"
+         inkscape:connector-curvature="0"
+         d="m 423.916,73.5 c -2.97,-6.627 -10.783,-12 -17.452,-12 l -236.476,0 c -6.668,0 -9.667,5.373 -6.698,12 l 57.795,129 c 2.969,6.627 10.782,12 17.452,12 l 236.475,0 c 6.668,0 9.668,-5.373 6.699,-12 l -57.795,-129 z"
+         id="path3342" />
+      <path
+         style="fill:#ffffff;stroke:#000000"
+         inkscape:connector-curvature="0"
+         d="m 408.512,87.97 c -1.215,-2.468 -5.534,-4.47 -9.645,-4.47 l -145.781,0 c -4.11,0 -6.459,2.002 -5.244,4.47 l 23.647,48.06 c 1.215,2.468 5.533,4.47 9.645,4.47 l 145.78,0 c 4.111,0 6.458,-2.002 5.245,-4.47 L 408.512,87.97 Z"
+         id="path3344" />
+      <path
+         inkscape:connector-curvature="0"
+         d="M 240.5,11.5 C 240.5,17.851 235.351,23 229,23 L 97,23 C 90.649,23 85.5,17.851 85.5,11.5 l 0,0 C 85.5,5.149 90.649,0 97,0 l 132,0 c 6.351,0 11.5,5.149 11.5,11.5 l 0,0 z"
+         id="path3346" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 319,12 c 0,6.351 5.148,11.5 11.5,11.5 l 132,0 c 6.352,0 11.5,-5.149 11.5,-11.5 l 0,0 C 474,5.649 468.852,0.5 462.5,0.5 l -132,0 C 324.148,0.5 319,5.649 319,12 l 0,0 z"
+         id="path3348" />
+      <rect
+         x="231"
+         y="6.5"
+         width="95"
+         height="9"
+         id="rect3350" />
+      <rect
+         x="269"
+         y="12.5"
+         width="19"
+         height="128"
+         id="rect3352" />
+      <rect
+         x="327"
+         y="77.5"
+         width="18"
+         height="68"
+         id="rect3354" />
+      <rect
+         x="384"
+         y="75.5"
+         width="18"
+         height="73"
+         id="rect3356" />
+      <path
+         style="stroke:#000000"
+         inkscape:connector-curvature="0"
+         d="m 265.596,166.786 c -1.57,8.089 -7.385,12.763 -12.986,10.446 -64.097,-26.422 -128.608,-51.793 -193.289,-76.75 -5.631,-2.169 -9.813,-5.898 -9.34,-8.332 2.11,-10.872 3.167,-16.307 5.277,-27.179 0.473,-2.434 5.745,-4.326 11.778,-4.231 69.32,1.053 138.638,1.655 207.965,1.129 6.063,-0.053 9.707,6.453 8.136,14.547 -5.848,30.124 -11.695,60.247 -17.541,90.37 z"
+         id="path3358" />
+      <path
+         inkscape:connector-curvature="0"
+         d="m 477,276.5 c 0,11.598 -9.402,21 -21,21 l -243,0 c -11.598,0 -21,-9.402 -21,-21 l 0,0 c 0,-11.598 9.402,-21 21,-21 l 243,0 c 11.598,0 21,9.402 21,21 l 0,0 z"
+         id="path3360" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/xpm/highway_exit.xpm b/navit/icons/highway_exit.xpm
index 7d433052f..7d433052f 100644
--- a/navit/xpm/highway_exit.xpm
+++ b/navit/icons/highway_exit.xpm
diff --git a/navit/xpm/hindu.svg b/navit/icons/hindu.svg
index b35787c36..b35787c36 100644
--- a/navit/xpm/hindu.svg
+++ b/navit/icons/hindu.svg
diff --git a/navit/icons/hospital.svg b/navit/icons/hospital.svg
new file mode 100644
index 000000000..a9addccee
--- /dev/null
+++ b/navit/icons/hospital.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="hospital.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/navit/icons/png/hospital.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f4ca00"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="65.278252"
+     inkscape:cy="46.424636"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g4581"
+       transform="matrix(0.20657328,0,0,0.20657328,0.81448847,-61.417818)">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect2382-6"
+         d="m -1.7496288,-76.07941 c 0,33.371098 0,66.7421909 0,100.113285 34.0377648,0 68.0755248,0 102.1132888,0 0,-34.03776 0,-68.075521 0,-102.113285 -34.037764,0 -68.075524,0 -102.1132888,0 l 0,1 0,1 z"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.3864522;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         y="-74.235344"
+         x="2.1932259"
+         height="94.113548"
+         width="94.113548"
+         id="rect2382"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:4.3864522;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <g
+         transform="matrix(4.462783,0,0,4.462783,-2.5930544,-76.408646)"
+         id="g2457">
+        <rect
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           id="rect3195"
+           width="3.9196427"
+           height="16.0625"
+           x="9.6569328"
+           y="3" />
+        <rect
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           id="rect2455"
+           width="3.9196427"
+           height="16.0625"
+           x="9.0714283"
+           y="-19.648005"
+           transform="matrix(0,1,-1,0,0,0)" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/hotel.svg b/navit/icons/hotel.svg
new file mode 100644
index 000000000..50f213a3b
--- /dev/null
+++ b/navit/icons/hotel.svg
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="hotel.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/projets/navit/icons/png/shopping.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3160">
+      <stop
+         style="stop-color:#208420;stop-opacity:1;"
+         offset="0"
+         id="stop3162" />
+      <stop
+         style="stop-color:#15d715;stop-opacity:1;"
+         offset="1"
+         id="stop3164" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2390"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2421"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <pattern
+       patternUnits="userSpaceOnUse"
+       width="93.610447"
+       height="68.066813"
+       patternTransform="translate(22.133615,-61.586979)"
+       id="pattern3532">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 22.384416,27.235557 2.776195,0 0,6.983784 -2.776195,0 z m -6.631484,-12.098892 0.531181,0 0,23.853249 -0.531181,0 z m 0.951638,22.590661 59.337406,0 0,0.310945 -59.337406,0 z m -7.7812825,11.453406 76.1021475,0 0,0.245319 -76.1021475,0 z m 78.0608875,-21.859388 0.80136,0 0,34.462077 -0.80136,0 z M 5.8249125,5.8249125 l 0.516157,0 0,56.4169875 -0.516157,0 z"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:11.6498251;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect3209-6" />
+    </pattern>
+    <pattern
+       patternUnits="userSpaceOnUse"
+       width="93.610447"
+       height="68.066813"
+       patternTransform="translate(22.133615,-61.586979)"
+       id="pattern3532-6">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 22.384416,27.235557 2.776195,0 0,6.983784 -2.776195,0 z m -6.631484,-12.098892 0.531181,0 0,23.853249 -0.531181,0 z m 0.951638,22.590661 59.337406,0 0,0.310945 -59.337406,0 z m -7.7812825,11.453406 76.1021475,0 0,0.245319 -76.1021475,0 z m 78.0608875,-21.859388 0.80136,0 0,34.462077 -0.80136,0 z M 5.8249125,5.8249125 l 0.516157,0 0,56.4169875 -0.516157,0 z"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:11.6498251;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect3209-6-0" />
+    </pattern>
+    <pattern
+       patternUnits="userSpaceOnUse"
+       width="93.610447"
+       height="68.066813"
+       patternTransform="translate(22.133615,-61.586979)"
+       id="pattern3532-6-8">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 22.384416,27.235557 2.776195,0 0,6.983784 -2.776195,0 z m -6.631484,-12.098892 0.531181,0 0,23.853249 -0.531181,0 z m 0.951638,22.590661 59.337406,0 0,0.310945 -59.337406,0 z m -7.7812825,11.453406 76.1021475,0 0,0.245319 -76.1021475,0 z m 78.0608875,-21.859388 0.80136,0 0,34.462077 -0.80136,0 z M 5.8249125,5.8249125 l 0.516157,0 0,56.4169875 -0.516157,0 z"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:11.6498251;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect3209-6-0-7" />
+    </pattern>
+    <pattern
+       patternUnits="userSpaceOnUse"
+       width="93.610447"
+       height="68.066813"
+       patternTransform="translate(22.133615,-61.586979)"
+       id="pattern3532-3">
+      <path
+         inkscape:connector-curvature="0"
+         d="m 22.384416,27.235557 2.776195,0 0,6.983784 -2.776195,0 z m -6.631484,-12.098892 0.531181,0 0,23.853249 -0.531181,0 z m 0.951638,22.590661 59.337406,0 0,0.310945 -59.337406,0 z m -7.7812825,11.453406 76.1021475,0 0,0.245319 -76.1021475,0 z m 78.0608875,-21.859388 0.80136,0 0,34.462077 -0.80136,0 z M 5.8249125,5.8249125 l 0.516157,0 0,56.4169875 -0.516157,0 z"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:11.6498251;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="rect3209-6-7" />
+    </pattern>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#22a638"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6"
+     inkscape:cx="68.181417"
+     inkscape:cy="42.960012"
+     inkscape:document-units="px"
+     inkscape:current-layer="g3421"
+     showgrid="true"
+     inkscape:window-width="1432"
+     inkscape:window-height="855"
+     inkscape:window-x="0"
+     inkscape:window-y="16"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by/3.0/" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Source	http://picol.org/</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>Description	
+English: PICOL SVG icon.
+Date	21 March 2015
+Source	http://picol.org/
+Author	Picol.org</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g3421"
+       transform="matrix(0.9283947,0,0,0.92839336,4.2315074,0.70276789)">
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:0.21999738"
+         inkscape:connector-curvature="0"
+         id="path3379-7"
+         d="m -3.8731017,-78.190535 c 0.9638788,0.01046 2.88526699,-0.44745 2.8145568,1.123976 0.055207,0.432021 -0.3363603,1.341035 0.38843641,0.761818 1.73969189,-0.695479 3.92110869,-0.262137 5.17945369,1.151105 3.3407333,-1.914833 7.5759008,-1.87109 11.0739068,-0.405615 0.236833,-1.498437 2.147905,-1.046624 3.195139,-1.066209 0.497508,0.89845 0.07364,2.706475 0.214434,3.957077 l 0,7.055731 c -1.109298,-0.0068 -3.408405,0.583345 -3.248045,-1.045731 -0.228066,-0.719396 0.313576,-1.925368 -0.54567,-2.069859 -5.4477078,0.103087 -10.9186263,0.0053 -16.3569123,0.04984 -0.019052,0.959315 0.59708882,2.730349 -0.7416421,3.089809 -0.8720053,0.101717 -2.1733822,0.346621 -2.448358,-0.81209 -0.2487408,-2.351514 0.061565,-4.753989 -0.05801,-7.12276 l -0.031737,-4.625347 z"
+         sodipodi:nodetypes="cccccccccccccccc" />
+      <g
+         transform="matrix(-0.77280617,0,0,0.77278772,19.619075,-85.139467)"
+         id="bed">
+        <path
+           id="path3379"
+           d="m 28,10 0,5 c 0,-1.657 -1.791,-3 -4,-3 -2.209,0 -4,1.343 -4,3 0,-1.657 -4.687,-3 -8,-3 -3.313,0 -8,1.343 -8,3 l 0,-3 -2,0 0,12 2,0 0,-4 24,0 0,4 2,0 0,-14 -2,0 z"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/navit/xpm/hunting_stand.svg b/navit/icons/hunting_stand.svg
index 4bce19957..6a4edcd49 100644
--- a/navit/xpm/hunting_stand.svg
+++ b/navit/icons/hunting_stand.svg
@@ -10,12 +10,12 @@
    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"
-   width="23.466667"
-   height="23.466667"
-   viewBox="0 0 22.000001 22"
+   width="22"
+   height="22"
+   viewBox="0 0 20.625 20.625"
    id="svg3372"
    version="1.1"
-   inkscape:version="0.92.1 r15371"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="hunting_stand.svg">
   <defs
      id="defs3374">
@@ -40,7 +40,7 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="16"
-     inkscape:cx="11.015116"
+     inkscape:cx="11.140116"
      inkscape:cy="9.353515"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -50,10 +50,10 @@
      inkscape:snap-grids="false"
      inkscape:snap-nodes="true"
      inkscape:snap-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="722"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:snap-global="true"
      inkscape:pagecheckerboard="true" />
@@ -84,37 +84,37 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(0,-1030.3622)">
+     transform="translate(0,-1031.7372)">
     <g
        id="g5722-9"
-       transform="matrix(0.43077265,0,0,0.36005853,-1.440906,674.24596)"
+       transform="matrix(0.41368072,0,0,0.34577538,-0.92701582,689.57202)"
        style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:7.08278704;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
       <path
          transform="translate(0,988.36219)"
          id="path3384-5"
-         d="m 26.634766,5.75 v 49.330078 h 2.77539 V 37.037109 h 16.654297 v 17.660157 h 1.982422 V 11.1875 Z m 3.111328,9.730469 h 15.583984 v 6.835937 H 29.746094 Z"
+         d="m 26.634766,5.75 0,49.330078 2.77539,0 0,-18.042969 16.654297,0 0,17.660157 1.982422,0 0,-43.509766 z m 3.111328,9.730469 15.583984,0 0,6.835937 -15.583984,0 z"
          style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:7.08278704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:connector-curvature="0" />
       <path
          inkscape:connector-curvature="0"
          id="path5650-2"
          d="m 25.865234,1016.2812 -0.878906,1.4024 -14.720703,23.4805 -0.8789062,1.4043 2.8046872,1.7578 0.878906,-1.4024 14.720704,-23.4804 0.878906,-1.4024 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:7.08278704;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:7.08278704;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     </g>
     <g
        id="g5722"
-       transform="matrix(0.43077265,0,0,0.36005853,-1.3492228,674.46007)">
+       transform="matrix(0.41368072,0,0,0.34577538,-0.83897034,689.77764)">
       <path
          transform="translate(0,988.36219)"
          id="path3384"
-         d="m 26.634766,5.75 v 49.330078 h 2.77539 V 37.037109 h 16.654297 v 17.660157 h 1.982422 V 11.1875 Z m 3.111328,9.730469 h 15.583984 v 6.835937 H 29.746094 Z"
+         d="m 26.634766,5.75 0,49.330078 2.77539,0 0,-18.042969 16.654297,0 0,17.660157 1.982422,0 0,-43.509766 z m 3.111328,9.730469 15.583984,0 0,6.835937 -15.583984,0 z"
          style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:connector-curvature="0" />
       <path
          inkscape:connector-curvature="0"
          id="path5650"
          d="m 25.865234,1016.2812 -0.878906,1.4024 -14.720703,23.4805 -0.8789062,1.4043 2.8046872,1.7578 0.878906,-1.4024 14.720704,-23.4804 0.878906,-1.4024 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     </g>
   </g>
 </svg>
diff --git a/navit/xpm/ic_notify.svg b/navit/icons/ic_notify.svg
index 8bf846dae..8bf846dae 100644
--- a/navit/xpm/ic_notify.svg
+++ b/navit/icons/ic_notify.svg
diff --git a/navit/xpm/information.svg b/navit/icons/information.svg
index 972ca05b5..ffc57b159 100644
--- a/navit/xpm/information.svg
+++ b/navit/icons/information.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -12,7 +13,7 @@
    height="22"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
    sodipodi:docname="information.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -61,9 +62,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="14.808798"
-     inkscape:cy="10.788558"
+     inkscape:zoom="2.8"
+     inkscape:cx="-14.650811"
+     inkscape:cy="32.01958"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -72,7 +73,8 @@
      inkscape:window-x="167"
      inkscape:window-y="48"
      showguides="true"
-     inkscape:guide-bbox="true">
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
        id="grid2380"
@@ -87,34 +89,54 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
      inkscape:label="Calque 1"
      inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:2.63918191000000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path2387"
-       sodipodi:cx="11.116072"
-       sodipodi:cy="11.303572"
-       sodipodi:rx="7.9910712"
-       sodipodi:ry="7.6964288"
-       d="M 19.107143,11.303572 A 7.9910712,7.6964288 0 1 1 3.1250005,11.303572 A 7.9910712,7.6964288 0 1 1 19.107143,11.303572 z"
-       transform="matrix(1.1043065,0,0,1.1123039,-1.1733035,-1.5730069)" />
-    <text
-       xml:space="preserve"
-       style="font-size:16.40899658px;font-style:normal;font-weight:normal;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="7.1104369"
-       y="18.413086"
-       id="text2412"
-       transform="scale(1.1164505,0.8956958)"><tspan
-         sodipodi:role="line"
-         id="tspan2414"
-         x="7.1104369"
-         y="18.413086"
-         style="font-size:17.9007225px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ff0000;font-family:Bitstream Charter;-inkscape-font-specification:Bitstream Charter Bold">i</tspan></text>
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g8363"
+       transform="matrix(0.20008227,0,0,0.20008288,1.0464242,-61.464653)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path2387-9"
+         d="M 49.483815,-73.147601 C 22.558885,-73.967925 -2.2368547,-47.507854 2.2533453,-20.426898 5.3817053,6.5575876 35.208045,25.979316 61.243585,18.842633 85.729193,13.38345 103.54469,-14.057191 95.972097,-38.53432 90.610192,-58.806186 70.292577,-73.472042 49.483815,-73.147601 Z"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:13.86307716;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <ellipse
+         ry="40.573875"
+         rx="41.824272"
+         cy="-26.501913"
+         cx="49.55127"
+         id="path2387"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:13.86307716;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <text
+         transform="scale(1.1164505,0.89569579)"
+         id="text2412"
+         y="-0.52475673"
+         x="30.952036"
+         style="font-style:normal;font-weight:normal;font-size:77.7706604px;font-family:'Bitstream Vera Sans';fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:84.84072113px;font-family:'Bitstream Charter';-inkscape-font-specification:'Bitstream Charter Bold';fill:#ff0000"
+           y="-0.52475673"
+           x="30.952036"
+           id="tspan2414"
+           sodipodi:role="line">i</tspan></text>
+    </g>
   </g>
 </svg>
diff --git a/navit/xpm/islamic.svg b/navit/icons/islamic.svg
index 7780aac51..7780aac51 100644
--- a/navit/xpm/islamic.svg
+++ b/navit/icons/islamic.svg
diff --git a/navit/xpm/jain.svg b/navit/icons/jain.svg
index 7da1f7aae..7da1f7aae 100644
--- a/navit/xpm/jain.svg
+++ b/navit/icons/jain.svg
diff --git a/navit/xpm/jewish.svg b/navit/icons/jewish.svg
index 795cb68c1..795cb68c1 100644
--- a/navit/xpm/jewish.svg
+++ b/navit/icons/jewish.svg
diff --git a/navit/xpm/justice.svg b/navit/icons/justice.svg
index 50a5a89a4..72fe1b24b 100644
--- a/navit/xpm/justice.svg
+++ b/navit/icons/justice.svg
@@ -9,51 +9,51 @@
    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"
-   width="23.466667"
-   height="23.466667"
+   width="22"
+   height="22"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.1 r15371"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="justice.svg"
-   viewBox="0 0 22 22">
+   viewBox="0 0 20.625 20.625">
   <defs
      id="defs4">
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18108 : 1"
-       inkscape:vp_y="0 : 999.99998 : 0"
-       inkscape:vp_z="744.09446 : 526.18108 : 1"
-       inkscape:persp3d-origin="372.04723 : 350.78738 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
        id="perspective10" />
     <inkscape:perspective
        id="perspective2824"
-       inkscape:persp3d-origin="0.49999999 : 0.33333332 : 1"
-       inkscape:vp_z="0.99999998 : 0.49999999 : 1"
-       inkscape:vp_y="0 : 999.99998 : 0"
-       inkscape:vp_x="0 : 0.49999999 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
     <inkscape:perspective
        id="perspective3622"
-       inkscape:persp3d-origin="0.49999999 : 0.33333332 : 1"
-       inkscape:vp_z="0.99999998 : 0.49999999 : 1"
-       inkscape:vp_y="0 : 999.99998 : 0"
-       inkscape:vp_x="0 : 0.49999999 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
     <inkscape:perspective
        id="perspective3648"
-       inkscape:persp3d-origin="0.49999999 : 0.33333332 : 1"
-       inkscape:vp_z="0.99999998 : 0.49999999 : 1"
-       inkscape:vp_y="0 : 999.99998 : 0"
-       inkscape:vp_x="0 : 0.49999999 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
     <inkscape:perspective
        id="perspective3697"
-       inkscape:persp3d-origin="0.49999999 : 0.33333332 : 1"
-       inkscape:vp_z="0.99999998 : 0.49999999 : 1"
-       inkscape:vp_y="0 : 999.99998 : 0"
-       inkscape:vp_x="0 : 0.49999999 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
   </defs>
   <sodipodi:namedview
@@ -72,7 +72,7 @@
      inkscape:window-width="1338"
      inkscape:window-height="732"
      inkscape:window-x="24"
-     inkscape:window-y="-4"
+     inkscape:window-y="0"
      inkscape:window-maximized="0"
      inkscape:pagecheckerboard="true" />
   <metadata
@@ -91,11 +91,11 @@
      inkscape:label="Camada 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-190.23529,-232.04075)">
+     transform="translate(-190.23529,-233.41575)">
     <g
        id="g174-1"
        style="fill:#fbfbfb;fill-opacity:1;stroke:#ffffff;stroke-width:1.93781245;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.96760242,0,0,0.98526989,6.1532127,3.4129996)">
+       transform="matrix(0.85822343,0,0,0.87387944,27.567778,31.851521)">
       <g
          transform="matrix(0.05907173,0,0,0.05907173,180.01429,219.79643)"
          id="g3744-0"
@@ -108,7 +108,7 @@
            sodipodi:nodetypes="ccssc" />
         <g
            id="g3636-2"
-           transform="translate(-1.229)"
+           transform="translate(-1.229,0)"
            style="fill:#fbfbfb;fill-opacity:1;stroke:#ffffff;stroke-width:32.80439758;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
           <path
              inkscape:connector-curvature="0"
@@ -129,7 +129,7 @@
            sodipodi:nodetypes="ccssc" />
         <g
            id="g3636-4-7"
-           transform="translate(213.48528)"
+           transform="translate(213.48528,0)"
            style="fill:#fbfbfb;fill-opacity:1;stroke:#ffffff;stroke-width:32.80439758;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
           <path
              inkscape:connector-curvature="0"
@@ -145,78 +145,78 @@
         <path
            inkscape:connector-curvature="0"
            style="fill:#fbfbfb;fill-opacity:1;stroke:#ffffff;stroke-width:32.80439758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 271.12815,548.79075 h 176.78572 c 0,0 -60.52732,-10.81192 -77.5,-33.21428 -5.51081,-7.27376 0.7383,-18.09941 0.42857,-27.14286 l -6.5,-189.78571 h -8.92856 l -6.5,189.78571 c -0.30969,9.04235 5.64503,19.89653 0.0714,27.14286 -17.2022,22.36486 -77.85714,33.21428 -77.85714,33.21428 h 2e-5 z"
+           d="m 271.12815,548.79075 176.78572,0 c 0,0 -60.52732,-10.81192 -77.5,-33.21428 -5.51081,-7.27376 0.7383,-18.09941 0.42857,-27.14286 l -6.5,-189.78571 -8.92856,0 -6.5,189.78571 c -0.30969,9.04235 5.64503,19.89653 0.0714,27.14286 -17.2022,22.36486 -77.85714,33.21428 -77.85714,33.21428 l 2e-5,0 z"
            id="path3683-3"
            sodipodi:nodetypes="ccssccsscc" />
         <path
            inkscape:connector-curvature="0"
            id="path3687-4-7"
            style="fill:#fbfbfb;fill-opacity:1;stroke:#ffffff;stroke-width:32.80439758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 480,300.57647 H 239.042 l -1.42857,-13.92857 c -0.0836,-0.81459 0.11215,-1.88272 0.80357,-2.32143 0.70767,-0.44902 1.66315,0.31365 2.5,0.26785 29.97319,-1.00057 57.9679,-20.9112 88.30357,-15.80357 7.23496,1.21815 13.47071,3.86491 18.75,8.92857 0.65231,0.6571 1.96429,1.96429 1.96429,1.96429 2.73979,2.73979 3.81189,-1.11614 5,-4.64286 2.32362,-7.64974 4.08614,-42.5 4.58614,-42.5 0.5,0 2.26252,34.85026 4.58614,42.5 1.18811,3.52672 2.26021,7.38265 5,4.64286 0,0 1.31198,-1.30719 1.96429,-1.96429 4.9372,-5.5055 11.66787,-7.99802 18.75,-8.92857 29.93468,-3.93323 58.80806,11.72052 88.30357,15.80357 0.83685,0.0458 1.79233,-0.71687 2.5,-0.26785 0.69142,0.43871 0.88717,1.50684 0.80357,2.32143 z"
+           d="m 480,300.57647 -240.958,0 -1.42857,-13.92857 c -0.0836,-0.81459 0.11215,-1.88272 0.80357,-2.32143 0.70767,-0.44902 1.66315,0.31365 2.5,0.26785 29.97319,-1.00057 57.9679,-20.9112 88.30357,-15.80357 7.23496,1.21815 13.47071,3.86491 18.75,8.92857 0.65231,0.6571 1.96429,1.96429 1.96429,1.96429 2.73979,2.73979 3.81189,-1.11614 5,-4.64286 2.32362,-7.64974 4.08614,-42.5 4.58614,-42.5 0.5,0 2.26252,34.85026 4.58614,42.5 1.18811,3.52672 2.26021,7.38265 5,4.64286 0,0 1.31198,-1.30719 1.96429,-1.96429 4.9372,-5.5055 11.66787,-7.99802 18.75,-8.92857 29.93468,-3.93323 58.80806,11.72052 88.30357,15.80357 0.83685,0.0458 1.79233,-0.71687 2.5,-0.26785 0.69142,0.43871 0.88717,1.50684 0.80357,2.32143 z"
            sodipodi:nodetypes="cccscsccczcccscscc" />
       </g>
     </g>
     <g
        id="g174"
-       transform="matrix(0.96760242,0,0,0.98526989,6.1532127,3.4129996)"
-       style="stroke-width:0.76813079;stroke-miterlimit:4;stroke-dasharray:none">
+       transform="matrix(0.85822343,0,0,0.87387944,27.567778,31.851521)"
+       style="stroke-width:0.76813078;stroke-miterlimit:4;stroke-dasharray:none">
       <g
          transform="matrix(0.05907173,0,0,0.05907173,180.01429,219.79643)"
          id="g3744"
-         style="stroke-width:13.00335699;stroke-miterlimit:4;stroke-dasharray:none">
+         style="stroke-width:13.00335693;stroke-miterlimit:4;stroke-dasharray:none">
         <path
            inkscape:connector-curvature="0"
-           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335699;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335693;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 190.73529,444.1479 c 40.95238,0 81.90476,0 122.85714,0 -11.07798,11.0074 -22.99269,22.21828 -38.40401,26.79113 -18.96039,5.62593 -40.14795,4.71786 -57.74013,-4.73259 -10.22602,-5.49338 -20.47812,-12.01113 -26.713,-22.05854 z"
            id="path2830"
            sodipodi:nodetypes="ccssc" />
         <g
            id="g3636"
-           transform="translate(-1.229)"
-           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:13.00335699;stroke-miterlimit:4;stroke-dasharray:none">
+           transform="translate(-1.229,0)"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335693;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
           <path
              inkscape:connector-curvature="0"
              id="path3612"
              d="m 199.28571,445.21932 57.14286,-155"
-             style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335699;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+             style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335693;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
              inkscape:connector-curvature="0"
              id="path3612-1"
              d="m 307.50001,446.46933 -57.14286,-155"
-             style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335699;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+             style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335693;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         </g>
         <path
            inkscape:connector-curvature="0"
-           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335699;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335693;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            d="m 405.44957,444.1479 c 40.95238,0 81.90476,0 122.85714,0 -11.07798,11.0074 -22.99269,22.21828 -38.40401,26.79113 -18.96039,5.62593 -40.14795,4.71786 -57.74013,-4.73259 -10.22602,-5.49338 -20.47812,-12.01113 -26.713,-22.05854 z"
            id="path2830-7"
            sodipodi:nodetypes="ccssc" />
         <g
            id="g3636-4"
-           transform="translate(213.48528)"
-           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:13.00335699;stroke-miterlimit:4;stroke-dasharray:none">
+           transform="translate(213.48528,0)"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335693;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
           <path
              inkscape:connector-curvature="0"
              id="path3612-0"
              d="m 199.28571,445.21932 57.14286,-155"
-             style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335699;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+             style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335693;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
              inkscape:connector-curvature="0"
              id="path3612-1-9"
              d="m 307.50001,446.46933 -57.14286,-155"
-             style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335699;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+             style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335693;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         </g>
         <path
            inkscape:connector-curvature="0"
-           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335699;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 271.12815,548.79075 h 176.78572 c 0,0 -60.52732,-10.81192 -77.5,-33.21428 -5.51081,-7.27376 0.7383,-18.09941 0.42857,-27.14286 l -6.5,-189.78571 h -8.92856 l -6.5,189.78571 c -0.30969,9.04235 5.64503,19.89653 0.0714,27.14286 -17.2022,22.36486 -77.85714,33.21428 -77.85714,33.21428 h 2e-5 z"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335693;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 271.12815,548.79075 176.78572,0 c 0,0 -60.52732,-10.81192 -77.5,-33.21428 -5.51081,-7.27376 0.7383,-18.09941 0.42857,-27.14286 l -6.5,-189.78571 -8.92856,0 -6.5,189.78571 c -0.30969,9.04235 5.64503,19.89653 0.0714,27.14286 -17.2022,22.36486 -77.85714,33.21428 -77.85714,33.21428 l 2e-5,0 z"
            id="path3683"
            sodipodi:nodetypes="ccssccsscc" />
         <path
            inkscape:connector-curvature="0"
            id="path3687-4"
-           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335699;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-           d="M 480,300.57647 H 239.042 l -1.42857,-13.92857 c -0.0836,-0.81459 0.11215,-1.88272 0.80357,-2.32143 0.70767,-0.44902 1.66315,0.31365 2.5,0.26785 29.97319,-1.00057 57.9679,-20.9112 88.30357,-15.80357 7.23496,1.21815 13.47071,3.86491 18.75,8.92857 0.65231,0.6571 1.96429,1.96429 1.96429,1.96429 2.73979,2.73979 3.81189,-1.11614 5,-4.64286 2.32362,-7.64974 4.08614,-42.5 4.58614,-42.5 0.5,0 2.26252,34.85026 4.58614,42.5 1.18811,3.52672 2.26021,7.38265 5,4.64286 0,0 1.31198,-1.30719 1.96429,-1.96429 4.9372,-5.5055 11.66787,-7.99802 18.75,-8.92857 29.93468,-3.93323 58.80806,11.72052 88.30357,15.80357 0.83685,0.0458 1.79233,-0.71687 2.5,-0.26785 0.69142,0.43871 0.88717,1.50684 0.80357,2.32143 z"
+           style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:13.00335693;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 480,300.57647 -240.958,0 -1.42857,-13.92857 c -0.0836,-0.81459 0.11215,-1.88272 0.80357,-2.32143 0.70767,-0.44902 1.66315,0.31365 2.5,0.26785 29.97319,-1.00057 57.9679,-20.9112 88.30357,-15.80357 7.23496,1.21815 13.47071,3.86491 18.75,8.92857 0.65231,0.6571 1.96429,1.96429 1.96429,1.96429 2.73979,2.73979 3.81189,-1.11614 5,-4.64286 2.32362,-7.64974 4.08614,-42.5 4.58614,-42.5 0.5,0 2.26252,34.85026 4.58614,42.5 1.18811,3.52672 2.26021,7.38265 5,4.64286 0,0 1.31198,-1.30719 1.96429,-1.96429 4.9372,-5.5055 11.66787,-7.99802 18.75,-8.92857 29.93468,-3.93323 58.80806,11.72052 88.30357,15.80357 0.83685,0.0458 1.79233,-0.71687 2.5,-0.26785 0.69142,0.43871 0.88717,1.50684 0.80357,2.32143 z"
            sodipodi:nodetypes="cccscsccczcccscscc" />
       </g>
     </g>
diff --git a/navit/icons/level_crossing.svg b/navit/icons/level_crossing.svg
new file mode 100644
index 000000000..dbb3e4f27
--- /dev/null
+++ b/navit/icons/level_crossing.svg
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="level_crossing.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <metadata
+     id="metadata1976">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="-25.634689"
+     inkscape:cy="42.095768"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="733"
+     inkscape:window-width="1432"
+     inkscape:window-x="0"
+     inkscape:window-y="138"
+     inkscape:zoom="3.6867084"
+     objecttolerance="10.0"
+     pagecolor="#ff00ff"
+     showgrid="false"
+     inkscape:window-maximized="0" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       id="perspective3653"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       id="ArrowStart"
+       markerHeight="3"
+       markerUnits="strokeWidth"
+       markerWidth="4"
+       orient="auto"
+       refX="10"
+       refY="5"
+       viewBox="0 0 10 10">
+      <path
+         d="M 10,0 0,5 10,10 Z"
+         id="path2111"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="ArrowEnd"
+       markerHeight="3"
+       markerUnits="strokeWidth"
+       markerWidth="4"
+       orient="auto"
+       refX="0"
+       refY="5"
+       viewBox="0 0 10 10">
+      <path
+         d="M 0,0 10,5 0,10 Z"
+         id="path2108"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <inkscape:perspective
+       id="perspective2512"
+       inkscape:persp3d-origin="177.51199 : 145.02 : 1"
+       inkscape:vp_x="0 : 217.53 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="355.02399 : 217.53 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="g6874"
+     transform="matrix(0,0.20481407,-0.20481468,0,21.367342,36.269364)">
+    <g
+       transform="translate(-60.48756,20.88584)"
+       id="g4249">
+      <path
+         style="opacity:1;fill:#ffffff;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m -83.453125,-22.974609 c -5.376817,0.429956 -9.660664,4.547442 -13.361328,8.044921 -3.564947,5.0825059 0.136635,10.961467 3.381057,15.01946358 16.665322,26.91325142 32.457445,54.48025942 49.759568,80.92780242 6.279312,4.465923 12.311608,-2.702738 16.945312,-6.144531 5.028057,-6.148294 -1.463295,-12.928432 -4.628906,-18.078125 -15.908918,-26.030099 -31.395554,-52.4339243 -47.816406,-78.105469 -1.146167,-1.077688 -2.708013,-1.675408 -4.279297,-1.664062 z"
+         id="rect4196-6"
+         inkscape:connector-curvature="0" />
+      <path
+         style="opacity:1;fill:#ffffff;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m -39.880859,-22.970703 c -7.060932,0.77532 -8.150575,9.91459 -12.194295,14.3861732 -15.11969,24.8264198 -30.268154,49.7730288 -45.370158,74.5200768 -2.665608,5.068696 1.107342,10.059 5.464843,12.496094 3.576379,3.841758 11.342953,6.431301 14.136284,0.319983 17.901549,-28.237129 34.81794,-57.202406 52.420357,-85.5504521 1.909666,-4.7750959 -1.047968,-9.7745749 -5.326172,-11.9453129 -2.598674,-2.1041 -5.634935,-4.26473 -9.130859,-4.226562 z"
+         id="rect4196-3-7"
+         inkscape:connector-curvature="0" />
+    </g>
+    <rect
+       transform="matrix(0.8572455,-0.51490791,0.53158291,0.84700626,0,0)"
+       y="-72.229652"
+       x="-137.01799"
+       height="25.279322"
+       width="14.010298"
+       id="rect6839"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(-0.8572455,-0.51490791,-0.53158291,0.84700626,0,0)"
+       y="53.786011"
+       x="70.273521"
+       height="25.279322"
+       width="14.010298"
+       id="rect6839-6"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(-0.8572455,0.51490791,-0.53158291,-0.84700626,0,0)"
+       y="-33.168327"
+       x="124.19476"
+       height="25.279322"
+       width="14.010298"
+       id="rect6839-6-9"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" />
+    <rect
+       transform="matrix(0.8572455,0.51490791,0.53158291,-0.84700626,0,0)"
+       y="-159.18408"
+       x="-83.096924"
+       height="25.279322"
+       width="14.010298"
+       id="rect6839-2"
+       style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="rect4196"
+       d="m -144.61261,1.9724874 c -0.64453,0.00231 -1.30203,0.204994 -1.88867,0.6230469 l -7.125,5.078125 c -1.56437,1.1148079 -2.02017,3.3336667 -1.02148,4.9746087 l 23.16015,38.052735 -23.16015,38.054687 c -0.99869,1.640942 -0.54289,3.857849 1.02148,4.972657 l 7.125,5.078124 c 1.56438,1.114804 3.62826,0.691724 4.62696,-0.949218 l 19.54296,-32.111328 19.54297,32.111328 c 0.99869,1.640942 3.062578,2.064022 4.626956,0.949218 l 7.125,-5.078124 c 1.564378,-1.114808 2.020176,-3.331715 1.021485,-4.972657 L -113.17511,50.701003 -90.014949,12.648268 c 0.998691,-1.640942 0.542893,-3.8598008 -1.021485,-4.9746087 l -7.125,-5.078125 C -99.725812,1.4807264 -101.7897,1.9038109 -102.78839,3.5447531 L -122.33136,35.656081 -141.87432,3.5447531 c -0.62419,-1.0255889 -1.66407,-1.5761204 -2.73829,-1.5722657 z"
+       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none" />
+  </g>
+</svg>
diff --git a/navit/icons/library.svg b/navit/icons/library.svg
new file mode 100644
index 000000000..b3eabb3d3
--- /dev/null
+++ b/navit/icons/library.svg
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="library.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="-0.18196318"
+     inkscape:cy="52.134449"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="725"
+     inkscape:window-width="1024"
+     inkscape:window-x="241"
+     inkscape:window-y="146"
+     inkscape:zoom="3.6867085"
+     objecttolerance="10.0"
+     pagecolor="#ff00ff"
+     showgrid="false"
+     fit-margin-top="1"
+     units="cm"
+     fit-margin-left="1"
+     fit-margin-right="1"
+     fit-margin-bottom="1"
+     inkscape:window-maximized="0" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       id="perspective2441"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2466"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3333"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3401"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3464"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="g3426"
+     transform="matrix(0.22109862,0,0,0.22109862,0.32984503,-0.39371079)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path3470-1"
+       d="M 48.317007,3.8909439 C 35.009448,11.670562 20.47631,17.945425 8.1012018,27.005544 c -0.313453,1.941972 0.01053,3.498768 -1.745198,4.136804 -2.001536,6.637013 -1.809974,14.654813 -0.41096,21.572413 13.6633812,14.82479 26.0847112,31.205862 40.7823652,44.879851 2.734144,0.784245 3.737744,-2.958498 6.486083,-1.670465 8.512264,-3.257939 15.609769,-9.577354 23.949047,-13.376506 4.902434,-3.350092 12.043198,-5.625712 14.435718,-11.246541 0.04356,-2.731297 -3.741051,-3.57982 -0.260089,-5.588799 1.957113,-2.576537 -3.568957,-4.678406 -0.486005,-5.97956 2.661639,-2.626109 -2.420404,-5.161967 0.754324,-7.064834 C 90.161799,45.994288 83.470262,40.941722 79.216051,35.567519 69.613061,25.375089 61.567851,13.515556 51.07482,4.0686779 50.155568,4.0115179 49.229988,3.2588139 48.317007,3.8909439 Z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.71303189;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <g
+       transform="matrix(0.17130321,0,0,0.17130321,-1.4918457,1.7806282)"
+       id="g1327">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+         id="path1329"
+         d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#734a08;fill-opacity:1;fill-rule:evenodd;stroke:#734a08;stroke-width:1.71303189;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3470"
+       d="M 11.172832,29.170012 50.315875,73.620575 87.800311,52.058731 49.652449,7.939891 11.172832,29.170012 Z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#734a08;fill-opacity:1;fill-rule:evenodd;stroke:#734a08;stroke-width:1.71303189;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3474"
+       d="M 9.0695788,34.088521 47.549164,77.87565 47.715069,94.461677 8.9037308,50.591624 9.0695943,34.088521 Z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.75;fill:#734a08;fill-opacity:1;fill-rule:evenodd;stroke:#734a08;stroke-width:2.82262015;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ccccc"
+       id="path3476"
+       d="m 87.501761,57.820256 -35.331184,20.702519 -0.0245,0.545655 35.301532,-20.687696 0.05435,-0.560478 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.75;fill:#734a08;fill-opacity:1;fill-rule:evenodd;stroke:#734a08;stroke-width:2.82262015;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ccccc"
+       id="path3505"
+       d="m 87.501761,64.672381 -35.331184,20.702518 -0.0245,0.545659 35.301532,-20.6877 0.05435,-0.560477 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.75;fill:#734a08;fill-opacity:1;fill-rule:evenodd;stroke:#734a08;stroke-width:2.82262015;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ccccc"
+       id="path3507"
+       d="m 87.501761,71.524509 -35.331184,20.702519 -0.0245,0.545655 35.301532,-20.687696 0.05435,-0.560478 z" />
+  </g>
+</svg>
diff --git a/navit/xpm/mark.svg b/navit/icons/mark.svg
index 175cb2179..175cb2179 100644
--- a/navit/xpm/mark.svg
+++ b/navit/icons/mark.svg
diff --git a/navit/icons/memorial.svg b/navit/icons/memorial.svg
new file mode 100644
index 000000000..2a1ab9f91
--- /dev/null
+++ b/navit/icons/memorial.svg
@@ -0,0 +1,451 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="memorial.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="52.0852"
+     inkscape:cy="72.678004"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="725"
+     inkscape:window-maximized="0"
+     inkscape:window-width="1024"
+     inkscape:window-x="119"
+     inkscape:window-y="146"
+     inkscape:zoom="3.6867085"
+     objecttolerance="10.0"
+     pagecolor="#ff00ff"
+     showgrid="false" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       id="perspective2441"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_x="0 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="60 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       id="symbol-university"
+       viewBox="244.5 110 489 219.9">
+      <path
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
+         id="path4460"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 94,176 73,215"
+         id="path4462"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
+      <path
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
+         id="path4464"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
+         id="path4466"
+         ill="none"
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_x="0 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="12 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4904"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <marker
+       id="Arrow2Lend"
+       inkscape:stockid="Arrow2Lend"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         id="path4137"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         transform="matrix(-1.1,0,0,-1.1,-1.1,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Arrow1Mend"
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4125"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.4,0,0,-0.4,-4,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="TriangleOutL"
+       inkscape:stockid="TriangleOutL"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         id="path4214"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.8,0.8)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Arrow1Lend"
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4119"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Tail"
+       inkscape:stockid="Tail"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <g
+         id="g4152"
+         transform="scale(-1.2,-1.2)">
+        <path
+           d="M -3.8048674,-3.9585227 0.54352094,0"
+           id="path4154"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M -1.2866832,-3.9585227 3.0617053,0"
+           id="path4156"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M 1.3053582,-3.9585227 5.6537466,0"
+           id="path4158"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M -3.8048674,4.1775838 0.54352094,0.21974226"
+           id="path4160"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M -1.2866832,4.1775838 3.0617053,0.21974226"
+           id="path4162"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M 1.3053582,4.1775838 5.6537466,0.21974226"
+           id="path4164"
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none"
+           inkscape:connector-curvature="0" />
+      </g>
+    </marker>
+    <marker
+       id="Arrow1Sstart"
+       inkscape:stockid="Arrow1Sstart"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4128"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(0.2,0,0,0.2,1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Arrow1Send"
+       inkscape:stockid="Arrow1Send"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         id="path4131"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(-0.2,0,0,-0.2,-1.2,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="SemiCircleOut"
+       inkscape:stockid="SemiCircleOut"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="m -2.5,-0.80913858 c 0,2.75999998 -2.24,4.99999998 -5,4.99999998 l 0,-10 c 2.76,0 5,2.24 5,5.00000002 z"
+         id="path4235"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         transform="matrix(0.6,0,0,0.6,4.2752958,0.4580676)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Arrow2Send"
+       inkscape:stockid="Arrow2Send"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         id="path4149"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         transform="matrix(-0.3,0,0,-0.3,0.69,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="TriangleOutS"
+       inkscape:stockid="TriangleOutS"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         id="path4220"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.2,0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="CurveIn"
+       inkscape:stockid="CurveIn"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="m 4.625493,-5.0456926 c -2.76,0 -5.00000002,2.24 -5.00000002,5.00000002 0,2.75999998 2.24000002,4.99999998 5.00000002,4.99999998"
+         id="path4238"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none;marker-end:none"
+         transform="scale(0.6,0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="InfiniteLineStart"
+       inkscape:stockid="InfiniteLineStart"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <g
+         id="g4298"
+         transform="translate(-13,0)">
+        <circle
+           cx="3"
+           cy="0"
+           id="circle4300"
+           r="0.80000001" />
+        <circle
+           cx="6.5"
+           cy="0"
+           id="circle4302"
+           r="0.80000001" />
+        <circle
+           cx="10"
+           cy="0"
+           id="circle4304"
+           r="0.80000001" />
+      </g>
+    </marker>
+    <marker
+       id="StopS"
+       inkscape:stockid="StopS"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,5.65 0,-5.65"
+         id="path4229"
+         style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1pt"
+         transform="scale(0.2,0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="Arrow2Sstart"
+       inkscape:stockid="Arrow2Sstart"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         id="path4146"
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         transform="matrix(0.3,0,0,0.3,-0.69,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="DiamondS"
+       inkscape:stockid="DiamondS"
+       orient="auto"
+       refX="0"
+       refY="0"
+       style="overflow:visible">
+      <path
+         d="M 0,-7.0710768 -7.0710894,0 0,7.0710589 7.0710462,0 0,-7.0710768 Z"
+         id="path4202"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(0.2,0.2)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       id="RazorWire"
+       inkscape:stockid="RazorWire"
+       orient="auto"
+       refX="0"
+       refY="0">
+       style=&quot;overflow:visible&quot;&gt;
+      <path
+   d="m 0.02272727,-0.74009011 0,1.4375 -7.78124997,2.31250001 18.4374997,0 -7.1874997,-2.31250001 0,-1.4375 7.2499997,-2.15624999 -18.4687497,0 7.74999997,2.15624999 z"
+   id="path4286"
+   style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1pt"
+   transform="scale(0.8,0.8)"
+   inkscape:connector-curvature="0" />
+</marker>
+    <inkscape:perspective
+       id="perspective5233"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5412"
+       inkscape:persp3d-origin="250 : 166.66667 : 1"
+       inkscape:vp_x="0 : 250 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="500 : 250 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective5571"
+       inkscape:persp3d-origin="202.85715 : 136.19048 : 1"
+       inkscape:vp_x="0 : 204.28572 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="405.71429 : 204.28572 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6552"
+       inkscape:persp3d-origin="64 : 42.666667 : 1"
+       inkscape:vp_x="0 : 64 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="128 : 64 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="g4445"
+     style="stroke:none"
+     transform="matrix(0.22,0,0,0.22,0.58000002,-1.0305571e-7)">
+    <g
+       id="g4442"
+       style="stroke:none">
+      <path
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:25;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:accumulate"
+         d="M 68.956109,0.02849391 C 53.245645,1.207999 37.211889,-1.2571768 21.675974,1.1770927 13.091179,5.4156279 15.269088,16.442169 15.378102,24.162597 c -0.250529,16.952922 0.370917,34.350049 -0.284336,51.031438 -4.905411,5.619262 -4.751633,14.237066 -2.906304,20.984165 3.946361,6.55084 11.984632,2.523485 18.516812,3.283368 l 56.014517,0 C 88.871357,96.003023 88.923864,92.035 88.831953,88.300199 88.893949,80.664267 88.622519,79.53015 86.135059,78.07262 80.901849,71.043543 84.612399,64.166304 83.106484,56.023813 82.693034,39.38013 84.568244,22.406674 81.903955,5.9667882 79.554761,1.2564334 73.821241,-0.23187199 68.956109,0.02849391 Z"
+         id="path3585"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccc" />
+    </g>
+  </g>
+  <path
+     d="m 6.2531038,0.8643129 c -0.601011,0 -1.111362,0.511576 -1.111362,1.112587 l 0,14.5861621 c 0.0023,0.05665 12.8471352,0.03081 12.8449942,0 l 0,-14.5861621 c 0,-0.601011 -0.511578,-1.112587 -1.112588,-1.112587 l -10.6210442,0 z m 2.190866,1.04397 c 0.04507,1e-6 0.08383,0.0167 0.115179,0.05024 0.03135,0.03354 0.04656,0.07826 0.04656,0.134784 0,0.05653 -0.01521,0.100701 -0.04656,0.13356 -0.03135,0.03286 -0.07011,0.05024 -0.115179,0.05024 -0.0451,2e-6 -0.08263,-0.01738 -0.113955,-0.05024 -0.03132,-0.03286 -0.04779,-0.07702 -0.04779,-0.13356 0,-0.05653 0.01646,-0.101241 0.04779,-0.134784 0.03133,-0.03354 0.06885,-0.05024 0.113955,-0.05024 z m 2.5682632,0.0025 c 0.04507,10e-7 0.08261,0.0167 0.113955,0.05024 0.03135,0.03354 0.04779,0.07825 0.04779,0.134784 0,0.05653 -0.01644,0.101927 -0.04779,0.134785 -0.03135,0.03286 -0.06888,0.04902 -0.113955,0.04902 -0.0451,2e-6 -0.08385,-0.01615 -0.115179,-0.04902 -0.02185,-0.02292 -0.03505,-0.05256 -0.04166,-0.087 -0.0031,0.01155 -0.0069,0.02314 -0.01226,0.03676 -0.0132,0.03352 -0.03058,0.06742 -0.05146,0.102927 -0.01758,-0.01184 -0.03989,-0.02428 -0.06739,-0.03676 -0.0275,-0.01248 -0.05768,-0.01838 -0.09068,-0.01838 -0.02859,1e-6 -0.05251,0.0093 -0.07229,0.02696 -0.01979,0.01774 -0.03063,0.04517 -0.03063,0.08332 l 0,0.04779 0.245062,0 0,0.294076 -0.245062,0 0,0.657994 -0.32716,0 0,-0.942268 c 0,-0.01709 -5.51e-4,-0.04084 0,-0.07107 5.51e-4,-0.03023 0.0027,-0.05511 0.0049,-0.07352 0.0143,-0.10648 0.05171,-0.186722 0.112729,-0.242612 0.06103,-0.05589 0.145997,-0.08455 0.254866,-0.08455 0.02201,10e-7 0.0451,0.0016 0.06985,0.0049 0.02473,0.0032 0.04921,0.0081 0.07229,0.0147 0.0396,0.01184 0.07311,0.03024 0.101701,0.05391 0.01655,0.0137 0.02734,0.03096 0.03431,0.05146 0.0065,-0.03525 0.02071,-0.06448 0.04289,-0.08822 0.03133,-0.03354 0.07007,-0.05024 0.115179,-0.05024 z m -0.158066,0.13846 c -0.0027,0.01456 -0.0036,0.03004 -0.0036,0.04656 0,0.0171 0.0021,0.03286 0.0049,0.04779 0.0046,-0.01686 0.0074,-0.03242 0.0074,-0.04411 0,-0.01882 -0.0035,-0.03532 -0.0086,-0.05024 z M 9.1338228,1.9193289 c 0.02202,10e-7 0.04633,0.0016 0.07107,0.0049 0.02473,0.0033 0.04798,0.0081 0.07107,0.0147 0.0396,0.01184 0.07433,0.02902 0.102927,0.05269 0.02859,0.02367 0.04288,0.05823 0.04288,0.102926 -10e-7,0.0197 -0.0064,0.04613 -0.01961,0.07965 -0.0132,0.03352 -0.03059,0.06864 -0.05146,0.104153 -0.01758,-0.01184 -0.03989,-0.02428 -0.06739,-0.03676 -0.0275,-0.01248 -0.05769,-0.01837 -0.09067,-0.01838 -0.02859,1e-6 -0.05374,0.008 -0.07352,0.02573 -0.01979,0.01774 -0.0294,0.04639 -0.0294,0.08455 l 0,0.04656 0.243837,0 0,0.294076 -0.243837,0 0,0.65922 -0.328386,0 0,-0.943493 c 0,-0.01709 6.89e-4,-0.03962 0.0012,-0.06985 5.51e-4,-0.03023 0.0014,-0.05511 0.0036,-0.07352 0.0143,-0.10648 0.0517,-0.187947 0.11273,-0.243838 0.06103,-0.05589 0.145996,-0.08331 0.254865,-0.08332 z m 0.417833,0.01348 c 0.02641,1e-6 0.05246,0.0027 0.0772,0.0086 0.02473,0.0059 0.04625,0.01674 0.06494,0.03185 0.01869,0.01513 0.03379,0.03553 0.04533,0.06249 0.01155,0.02697 0.01715,0.06211 0.01715,0.104152 l 0,1.182429 c -0.04508,0.01709 -0.08488,0.02574 -0.120081,0.02574 -0.05057,0 -0.08959,-0.0076 -0.11763,-0.02206 -0.02804,-0.01446 -0.04875,-0.03269 -0.06249,-0.05637 -0.01374,-0.02367 -0.02176,-0.0512 -0.02451,-0.08209 -0.0027,-0.03089 -0.0049,-0.06384 -0.0049,-0.09803 l 0,-1.14322 c 0.01319,-0.0013 0.02737,-0.0035 0.04166,-0.0061 0.01208,-0.0027 0.02558,-0.0048 0.04043,-0.0061 0.01485,-0.0013 0.02859,-0.0012 0.04288,-0.0012 z m -2.151656,0.02574 c 0.02641,10e-7 0.05124,0.0027 0.07597,0.0086 0.02474,0.0059 0.04625,0.01674 0.06494,0.03185 0.01869,0.01513 0.03502,0.03553 0.04656,0.0625 0.01155,0.02696 0.01716,0.0621 0.01716,0.104152 l 0,0.634713 c 0.0055,-0.02889 0.01363,-0.0575 0.02574,-0.08577 0.0121,-0.02826 0.02787,-0.05568 0.04656,-0.08332 l 0.08945,-0.136009 c 0.02088,-0.03154 0.04331,-0.05909 0.06862,-0.08209 0.0253,-0.02301 0.06019,-0.03431 0.104153,-0.03431 0.0253,0 0.05055,0.0037 0.07474,0.01226 0.02419,0.0085 0.04503,0.01767 0.06372,0.02818 0.02087,0.01184 0.04012,0.02595 0.05882,0.04044 l -0.225459,0.378598 0.267119,0.486451 c -0.07259,0.03546 -0.139253,0.05392 -0.199726,0.05392 -0.05168,0 -0.09161,-0.01196 -0.121307,-0.03431 -0.0297,-0.02235 -0.05644,-0.05031 -0.07842,-0.08577 l -0.105384,-0.176452 c -0.01869,-0.03021 -0.0331,-0.05825 -0.04411,-0.08455 -0.01101,-0.0263 -0.019,-0.05536 -0.02451,-0.08822 l 0,0.44724 -0.330835,0 0,-1.384607 c 0.01319,-0.0013 0.02737,-0.0035 0.04166,-0.0061 0.01208,-0.0027 0.02558,-0.0035 0.04043,-0.0049 0.01485,-0.0013 0.02982,-0.0025 0.04411,-0.0025 z m -0.491352,0.01715 c 0.02641,10e-7 0.05124,0.0039 0.07597,0.0098 0.02474,0.0059 0.04748,0.01551 0.06617,0.03063 0.01869,0.01513 0.03379,0.03676 0.04534,0.06372 0.01154,0.02696 0.01716,0.06088 0.01716,0.102926 l 0,1.183655 c -0.04507,0.01709 -0.0861,0.02573 -0.121307,0.02573 -0.05057,0 -0.08959,-0.0075 -0.11763,-0.02206 -0.02804,-0.01446 -0.04875,-0.03269 -0.06249,-0.05637 -0.01374,-0.02367 -0.02176,-0.0512 -0.02451,-0.08209 -0.0028,-0.03089 -0.0037,-0.06384 -0.0037,-0.09802 l 0,-1.14322 c 0.01319,-0.0013 0.02614,-0.0035 0.04044,-0.0061 0.01208,-0.0027 0.02558,-0.0048 0.04044,-0.0061 0.01485,-0.0013 0.02981,-0.0025 0.04411,-0.0025 z m 6.3655192,0.0025 c 0.02202,10e-7 0.04511,0.0016 0.06985,0.0049 0.02473,0.0033 0.04921,0.0081 0.07229,0.0147 0.0396,0.01184 0.07311,0.03024 0.101702,0.05391 0.02145,0.01775 0.03507,0.04026 0.04044,0.06985 l 0,-0.111504 c 0.01319,-0.0013 0.02737,-0.0035 0.04166,-0.0061 0.01208,-0.0027 0.02558,-0.0048 0.04044,-0.0061 0.01485,-0.0013 0.02982,-0.0025 0.04411,-0.0025 0.02641,2e-6 0.05123,0.0027 0.07597,0.0086 0.02473,0.0059 0.04625,0.01673 0.06494,0.03185 0.01869,0.01513 0.03379,0.03676 0.04533,0.06372 0.01155,0.02696 0.01715,0.06088 0.01715,0.102927 l 0,1.183655 c -0.04508,0.01709 -0.08488,0.02573 -0.120082,0.02573 -0.05057,0 -0.08959,-0.0075 -0.117631,-0.02206 -0.02803,-0.01446 -0.04875,-0.03392 -0.06249,-0.05759 -0.01375,-0.02367 -0.02175,-0.04998 -0.02451,-0.08087 -0.0028,-0.03089 -0.0049,-0.06384 -0.0049,-0.09802 l 0,-0.977802 c -0.0029,0.01628 -0.0083,0.03507 -0.01715,0.05759 -0.0132,0.03352 -0.03058,0.06864 -0.05146,0.104151 -0.01758,-0.01184 -0.03989,-0.02428 -0.06739,-0.03676 -0.0275,-0.01248 -0.05768,-0.01838 -0.09068,-0.01838 -0.02859,1e-6 -0.05251,0.0093 -0.07229,0.02696 -0.01979,0.01774 -0.02941,0.04517 -0.02941,0.08333 l 0,0.04779 0.243838,0 0,0.292851 -0.243838,0 0,0.65922 -0.328386,0 0,-0.942268 c 0,-0.01709 -5.51e-4,-0.04084 0,-0.07107 5.51e-4,-0.03023 0.0027,-0.0551 0.0049,-0.07352 0.0143,-0.106481 0.0517,-0.187948 0.112729,-0.243838 0.06103,-0.05589 0.145997,-0.08331 0.254866,-0.08332 z m 0.284274,0.197276 c 0.0014,-0.0079 0.0025,-0.01559 0.0025,-0.02206 0,-0.01118 -6.66e-4,-0.02201 -0.0025,-0.03185 l 0,0.05391 z m 1.819595,-0.196051 c 0.02201,2e-6 0.0451,0.0016 0.06985,0.0049 0.02473,0.0033 0.04921,0.0081 0.07229,0.0147 0.03961,0.01183 0.07311,0.03024 0.101701,0.05391 0.02859,0.02367 0.04288,0.05823 0.04288,0.102926 -10e-7,0.0197 -0.0064,0.04613 -0.0196,0.07965 -0.0132,0.03352 -0.03059,0.06742 -0.05146,0.102927 -0.01758,-0.01184 -0.03989,-0.02305 -0.06739,-0.03554 -0.0275,-0.01248 -0.05768,-0.0196 -0.09067,-0.0196 -0.02859,0 -0.05251,0.0093 -0.07229,0.02696 -0.01979,0.01774 -0.02941,0.04517 -0.02941,0.08332 l 0,0.04779 0.243837,0 0,0.294076 -0.243837,0 0,0.657994 -0.328385,0 0,-0.942267 c 0,-0.01709 -5.51e-4,-0.04084 0,-0.07107 5.51e-4,-0.03023 0.0027,-0.05388 0.0049,-0.07229 0.0143,-0.106481 0.0517,-0.187948 0.112728,-0.243838 0.06103,-0.05589 0.145997,-0.08455 0.254866,-0.08455 z m -2.791271,0.0025 c 0.02638,2e-6 0.05244,0.0027 0.0772,0.0086 0.02475,0.0059 0.04625,0.01673 0.06494,0.03185 0.01869,0.01513 0.03379,0.03553 0.04533,0.0625 0.01155,0.02696 0.01715,0.0621 0.01715,0.104153 l 0,1.191006 -0.247514,0 c -0.01652,0 -0.03093,-0.0055 -0.04411,-0.0147 -0.01319,-0.0093 -0.01961,-0.02861 -0.01961,-0.05881 -0.01541,0.02363 -0.03998,0.04587 -0.07352,0.06494 -0.03354,0.01908 -0.07563,0.02818 -0.126207,0.02818 -0.03738,0 -0.07399,-0.0075 -0.110279,-0.02206 -0.03629,-0.01446 -0.06889,-0.03982 -0.09802,-0.07596 -0.02912,-0.03615 -0.05291,-0.08582 -0.07107,-0.148264 -0.01815,-0.06245 -0.02696,-0.140574 -0.02696,-0.23526 0,-0.09465 0.0074,-0.174423 0.02451,-0.240162 0.01705,-0.06574 0.04003,-0.119773 0.06862,-0.160517 0.02859,-0.04074 0.06187,-0.06981 0.09925,-0.08822 0.03738,-0.01841 0.07692,-0.02818 0.11763,-0.02818 0.02637,10e-7 0.05017,0.0045 0.07107,0.01103 0.02089,0.0066 0.03784,0.01351 0.05268,0.02206 0.01485,0.0085 0.02742,0.01718 0.03676,0.02574 0.0094,0.0085 0.01509,0.01445 0.01839,0.01838 l 0,-0.482774 c 0.01323,-0.0013 0.0274,-0.0035 0.04166,-0.0061 0.01211,-0.0027 0.02491,-0.0048 0.0392,-0.0061 0.0143,-0.0013 0.02859,-0.0012 0.04288,-0.0012 z m 1.557378,0.01348 c 0.02641,2e-6 0.05246,0.0027 0.0772,0.0086 0.02473,0.0059 0.04625,0.01673 0.06494,0.03185 0.01869,0.01513 0.03379,0.03676 0.04533,0.06372 0.01154,0.02697 0.01715,0.06088 0.01715,0.102926 l 0,0.634714 c 0.0055,-0.02889 0.01486,-0.0575 0.02696,-0.08577 0.0121,-0.02826 0.02787,-0.05568 0.04656,-0.08332 l 0.08822,-0.13601 c 0.02088,-0.03153 0.04454,-0.05909 0.06985,-0.08209 0.0253,-0.023 0.06019,-0.03431 0.104153,-0.03431 0.02531,0 0.04932,0.005 0.07352,0.01348 0.02419,0.0085 0.04625,0.01767 0.06494,0.02818 0.02088,0.01184 0.04012,0.02472 0.05881,0.03921 l -0.225458,0.378623 0.267118,0.487676 c -0.07259,0.03547 -0.139252,0.05269 -0.199726,0.05269 -0.05168,0 -0.09283,-0.01074 -0.122532,-0.03308 -0.0297,-0.02235 -0.05521,-0.05153 -0.0772,-0.087 l -0.105377,-0.175289 c -0.01869,-0.03021 -0.0331,-0.05947 -0.04411,-0.08577 -0.01101,-0.0263 -0.02023,-0.05536 -0.02574,-0.08822 l 0,0.44724 -0.32961,0 0,-1.383382 c 0.01319,-0.0013 0.02737,-0.0035 0.04166,-0.0061 0.01208,-0.0027 0.02558,-0.0048 0.04043,-0.0061 0.01485,-0.0013 0.02859,-0.0025 0.04288,-0.0025 z m 2.109994,0 c 0.02637,2e-6 0.05244,0.0027 0.0772,0.0086 0.02475,0.0059 0.04625,0.01673 0.06494,0.03185 0.01869,0.01513 0.03379,0.03676 0.04533,0.06372 0.01154,0.02697 0.01715,0.06088 0.01715,0.102926 l 0,1.191008 -0.247514,0 c -0.01652,0 -0.03093,-0.0043 -0.04411,-0.01348 -0.01319,-0.0092 -0.01961,-0.0286 -0.01961,-0.05881 -0.01541,0.02363 -0.03998,0.04464 -0.07352,0.06372 -0.03354,0.01907 -0.07563,0.02818 -0.126208,0.02818 -0.03738,0 -0.07398,-0.0064 -0.110278,-0.02083 -0.03629,-0.01446 -0.06889,-0.03983 -0.09803,-0.07596 -0.02913,-0.03615 -0.05291,-0.08582 -0.07107,-0.148264 -0.01816,-0.06245 -0.02696,-0.140575 -0.02696,-0.235261 0,-0.09465 0.0074,-0.175648 0.02451,-0.241387 0.01705,-0.06574 0.04003,-0.118547 0.06862,-0.159291 0.02859,-0.04074 0.06187,-0.06981 0.09925,-0.08822 0.03738,-0.01841 0.07692,-0.02818 0.11763,-0.02818 0.02637,0 0.05017,0.0032 0.07107,0.0098 0.02088,0.0066 0.03784,0.01474 0.05269,0.02328 0.01485,0.0085 0.02741,0.01718 0.03676,0.02573 0.0094,0.0085 0.01509,0.01445 0.01838,0.01838 l 0,-0.482775 c 0.01322,-0.0013 0.0274,-0.0035 0.04166,-0.0061 0.01211,-0.0027 0.02491,-0.0048 0.0392,-0.0061 0.01429,-0.0013 0.02859,-0.0025 0.04288,-0.0025 z m -4.658653,0.384747 c 0.09018,1e-6 0.1694,0.01615 0.236486,0.04901 0.02967,0.01448 0.05427,0.03231 0.07352,0.05269 0.01925,0.02038 0.02818,0.04469 0.02819,0.07229 0,0.02363 -0.0057,0.05167 -0.01838,0.08455 -0.01263,0.03288 -0.0291,0.0641 -0.04779,0.09435 -0.03303,-0.03025 -0.06665,-0.05446 -0.102926,-0.07352 -0.03627,-0.01905 -0.07412,-0.02818 -0.111503,-0.02818 -0.04728,2e-6 -0.07107,0.01615 -0.07107,0.04901 0,0.02102 0.0094,0.03662 0.02696,0.04779 0.01758,0.01118 0.03978,0.0203 0.06617,0.02818 0.02639,0.0079 0.05498,0.01709 0.08577,0.02696 0.03078,0.0099 0.05937,0.02439 0.08577,0.04411 0.02639,0.01972 0.04856,0.04669 0.06617,0.08087 0.0176,0.03418 0.02574,0.07958 0.02574,0.134786 -1e-6,0.105197 -0.03099,0.188741 -0.09313,0.251189 -0.06213,0.06245 -0.152027,0.09435 -0.270795,0.09435 -0.0682,0 -0.121352,-0.0072 -0.159291,-0.01961 -0.03795,-0.0125 -0.06869,-0.02483 -0.09068,-0.03798 -0.02859,-0.01709 -0.04782,-0.03599 -0.05881,-0.05637 -0.01099,-0.02038 -0.01593,-0.04137 -0.01593,-0.06372 0,-0.03418 0.0058,-0.06761 0.01961,-0.100476 0.01374,-0.03286 0.0302,-0.06526 0.04778,-0.0968 0.01319,0.01444 0.02829,0.02794 0.04533,0.04044 0.01705,0.01249 0.03534,0.0238 0.05514,0.03431 0.0198,0.01051 0.04037,0.01859 0.06127,0.0245 0.02088,0.0059 0.04023,0.0086 0.06004,0.0086 0.02859,10e-7 0.04917,-0.0048 0.06126,-0.01593 0.0121,-0.01118 0.01838,-0.02579 0.01838,-0.04289 0,-0.01974 -0.0088,-0.03595 -0.02696,-0.04779 -0.01816,-0.01184 -0.041,-0.02144 -0.06739,-0.03063 -0.02639,-0.0092 -0.05512,-0.02002 -0.087,-0.03185 -0.03188,-0.01184 -0.06061,-0.02863 -0.087,-0.04901 -0.02639,-0.02038 -0.04926,-0.04735 -0.06739,-0.08087 -0.01814,-0.03352 -0.02696,-0.07719 -0.02696,-0.131108 0,-0.05256 0.0095,-0.0978 0.02819,-0.137235 0.01869,-0.03944 0.04341,-0.07239 0.07474,-0.09803 0.03133,-0.02564 0.06714,-0.04509 0.107828,-0.05759 0.04069,-0.01249 0.08355,-0.01838 0.128658,-0.01838 z m -3.1809212,0.0012 c 0.02641,10e-7 0.05246,0.0027 0.07719,0.0086 0.02474,0.0059 0.04625,0.01675 0.06494,0.03185 0.01869,0.01511 0.03379,0.03553 0.04534,0.0625 0.01154,0.02696 0.01716,0.06211 0.01716,0.104152 l 0,0.69843 c 0,0.02892 -0.0014,0.06387 -0.0036,0.106603 -0.0022,0.04273 -0.007,0.081 -0.01471,0.115179 -0.01212,0.0526 -0.03108,0.09685 -0.05636,0.132334 -0.02529,0.03549 -0.0532,0.06407 -0.08455,0.08577 -0.03134,0.02171 -0.06246,0.03737 -0.09435,0.04656 -0.03188,0.0092 -0.06023,0.01348 -0.08332,0.01348 -0.04728,-1e-6 -0.08093,-0.01018 -0.102926,-0.03185 -0.022,-0.02169 -0.03765,-0.05348 -0.04534,-0.09557 -0.0033,-0.01709 -0.0057,-0.03486 -0.0074,-0.05392 -0.0017,-0.01905 -0.0039,-0.04556 -0.0061,-0.07842 0.03521,-0.0039 0.06377,-0.01144 0.08577,-0.02328 0.022,-0.01184 0.03937,-0.02692 0.05146,-0.04533 0.0121,-0.01841 0.02011,-0.04063 0.02451,-0.06494 0.0044,-0.02431 0.0074,-0.05072 0.0074,-0.07965 l 0,-0.918988 c 0.01319,-0.0013 0.02614,-0.0035 0.04043,-0.0061 0.01208,-0.0027 0.02558,-0.0048 0.04043,-0.0061 0.01485,-0.0013 0.02982,-0.0012 0.04411,-0.0012 z m 2.5682632,0.0025 c 0.02641,10e-7 0.05123,0.0027 0.07597,0.0086 0.02473,0.0059 0.04625,0.01675 0.06494,0.03186 0.01869,0.0151 0.03379,0.03676 0.04533,0.06372 0.01155,0.02696 0.01838,0.06088 0.01838,0.102926 l 0,0.69843 c -10e-7,0.02892 -0.0014,0.0651 -0.0036,0.107828 -0.0022,0.04273 -0.007,0.081 -0.01471,0.11518 -0.01211,0.0526 -0.03108,0.09685 -0.05637,0.132334 -0.02529,0.03549 -0.05321,0.06407 -0.08455,0.08577 -0.03135,0.02171 -0.0637,0.03615 -0.09558,0.04533 -0.03188,0.0092 -0.05901,0.0147 -0.08209,0.0147 -0.04728,0 -0.08215,-0.0114 -0.104152,-0.03308 -0.02199,-0.02169 -0.03643,-0.05349 -0.04411,-0.09558 -0.0033,-0.01709 -0.0057,-0.03486 -0.0074,-0.05391 -0.0016,-0.01905 -0.0039,-0.04556 -0.0061,-0.07842 0.0352,-0.0039 0.06377,-0.01145 0.08577,-0.02328 0.02199,-0.01184 0.03937,-0.02692 0.05146,-0.04533 0.0121,-0.01841 0.02011,-0.0394 0.02451,-0.06372 0.0044,-0.02431 0.0061,-0.05195 0.0061,-0.08087 l 0,-0.918988 c 0.01319,-0.0013 0.02737,-0.0023 0.04166,-0.0049 0.01208,-0.0027 0.02558,-0.0048 0.04044,-0.0061 0.01485,-0.0013 0.02982,-0.0025 0.04411,-0.0025 z m 1.425043,0.307555 c -0.03738,1e-6 -0.06346,0.01938 -0.0772,0.05881 -0.01375,0.03944 -0.02084,0.09338 -0.02084,0.161742 0,0.03154 0.0016,0.06126 0.0049,0.08822 0.0033,0.02697 0.0089,0.05069 0.01715,0.07107 0.0082,0.02038 0.01989,0.03595 0.03308,0.04779 0.01319,0.01184 0.02921,0.01838 0.04901,0.01838 0.01319,0 0.02416,-0.0017 0.03185,-0.0036 0.0077,-0.002 0.01261,-0.0035 0.01593,-0.0049 l 0,-0.42396 c -0.0066,-0.0053 -0.01527,-0.0091 -0.02573,-0.01103 -0.01046,-0.002 -0.0194,-0.0025 -0.02819,-0.0025 z m 3.653894,0.0147 c -0.03013,0.0043 -0.05169,0.0243 -0.06372,0.05881 -0.01375,0.03944 -0.02083,0.09338 -0.02083,0.161742 0,0.03154 0.0016,0.06003 0.0049,0.087 0.0033,0.02696 0.0089,0.05069 0.01715,0.07107 0.0082,0.02038 0.01989,0.03718 0.03309,0.04901 0.01319,0.01184 0.02921,0.01715 0.04901,0.01715 0.01319,0 0.02416,-4.6e-4 0.03185,-0.0025 0.0077,-0.002 0.01261,-0.0035 0.01593,-0.0049 l 0,-0.423959 c -0.0066,-0.0053 -0.01527,-0.0091 -0.02574,-0.01103 -0.01046,-0.002 -0.01939,-0.0025 -0.02818,-0.0025 -0.0047,0 -0.0092,-6.2e-4 -0.01348,0 z m -6.8924052,1.192237 c 0.02641,2e-6 0.05124,0.0039 0.07597,0.0098 0.02474,0.0059 0.04748,0.01551 0.06617,0.03063 0.01869,0.01513 0.03379,0.03676 0.04534,0.06372 0.01154,0.02696 0.01716,0.06088 0.01716,0.102927 l 0,1.183655 c -0.04507,0.01709 -0.0861,0.02573 -0.121307,0.02573 -0.05057,0 -0.08959,-0.0076 -0.11763,-0.02206 -0.02804,-0.01446 -0.04875,-0.03269 -0.06249,-0.05637 -0.01374,-0.02367 -0.02176,-0.0512 -0.02451,-0.08209 -0.0027,-0.03089 -0.0049,-0.06384 -0.0049,-0.09803 l 0,-1.14322 c 0.01319,-0.0013 0.02737,-0.0035 0.04166,-0.0061 0.01208,-0.0027 0.02558,-0.0048 0.04043,-0.0061 0.01485,-0.0013 0.02982,-0.0025 0.04411,-0.0025 z m 0.460718,0 c 0.02641,2e-6 0.05246,0.0039 0.0772,0.0098 0.02473,0.0059 0.04625,0.01551 0.06494,0.03063 0.01869,0.01513 0.03379,0.03676 0.04533,0.06372 0.01155,0.02696 0.01715,0.06088 0.01715,0.102927 l 0,0.634714 c 0.0055,-0.02889 0.01485,-0.05628 0.02696,-0.08455 0.01209,-0.02826 0.02786,-0.0569 0.04656,-0.08455 l 0.08822,-0.136011 c 0.02088,-0.03153 0.04454,-0.05909 0.06985,-0.08209 0.02531,-0.023 0.06019,-0.03431 0.104152,-0.03431 0.02531,1e-6 0.04932,0.005 0.07352,0.01348 0.02419,0.0085 0.04625,0.01767 0.06494,0.02818 0.02088,0.01184 0.04012,0.02472 0.05882,0.03921 l -0.225458,0.378623 0.267119,0.487675 c -0.07259,0.03547 -0.139252,0.05269 -0.199727,0.05269 -0.05168,0 -0.09283,-0.01074 -0.122531,-0.03309 -0.0297,-0.02235 -0.05521,-0.05153 -0.0772,-0.087 L 9.9045458,5.0231569 c -0.01869,-0.03021 -0.0331,-0.05947 -0.04411,-0.08577 -0.01101,-0.0263 -0.02023,-0.05536 -0.02574,-0.08822 l 0,0.447242 -0.329609,0 0,-1.383383 c 0.01319,-0.0013 0.02737,-0.0035 0.04166,-0.0061 0.01208,-0.0027 0.02558,-0.0048 0.04043,-0.0061 0.01485,-0.0013 0.02859,-0.0025 0.04288,-0.0025 z m -0.938592,0.0098 c 0.02638,2e-6 0.05121,0.0027 0.07597,0.0086 0.02475,0.0059 0.04625,0.01674 0.06494,0.03186 0.01869,0.01513 0.03379,0.03676 0.04534,0.06372 0.01154,0.02696 0.01838,0.06088 0.01838,0.102927 l 0,1.191007 -0.247513,0 c -0.01651,0 -0.03215,-0.0043 -0.04534,-0.01348 -0.01319,-0.0092 -0.01961,-0.0286 -0.01961,-0.05881 -0.01541,0.02363 -0.03998,0.04464 -0.07352,0.06372 -0.03354,0.01907 -0.07563,0.02818 -0.126207,0.02818 -0.03738,0 -0.07398,-0.0064 -0.110279,-0.02083 -0.03629,-0.01447 -0.06889,-0.03982 -0.09802,-0.07597 -0.02913,-0.03615 -0.05292,-0.08582 -0.07107,-0.148263 -0.01815,-0.06245 -0.02696,-0.140575 -0.02696,-0.235261 0,-0.09465 0.0087,-0.175648 0.02574,-0.241387 0.01704,-0.06574 0.04003,-0.118548 0.06862,-0.159291 0.02859,-0.04074 0.06064,-0.06981 0.09803,-0.08822 0.03738,-0.01841 0.07692,-0.02818 0.11763,-0.02818 0.02637,1e-6 0.05017,0.0032 0.07107,0.0098 0.02089,0.0066 0.03906,0.01474 0.05391,0.02328 0.01485,0.0085 0.02619,0.01596 0.03553,0.0245 0.0093,0.0085 0.01631,0.01567 0.01961,0.01961 l 0,-0.484 c 0.01322,-0.0013 0.02617,-0.0023 0.04043,-0.0049 0.01212,-0.0027 0.02614,-0.0048 0.04043,-0.0061 0.0143,-0.0013 0.02859,-0.0025 0.04289,-0.0025 z m -0.90551,0.0012 c 0.02202,2e-6 0.04511,0.0016 0.06984,0.0049 0.02474,0.0033 0.0492,0.0081 0.07229,0.0147 0.0396,0.01184 0.07311,0.03024 0.101702,0.05391 0.02859,0.02367 0.04288,0.05701 0.04288,0.101702 0,0.0197 -0.0064,0.04613 -0.01961,0.07965 -0.0132,0.03352 -0.03059,0.06864 -0.05146,0.104152 -0.01758,-0.01184 -0.03989,-0.02428 -0.06739,-0.03676 -0.0275,-0.01248 -0.05769,-0.01837 -0.09067,-0.01838 -0.02859,1e-6 -0.05251,0.0093 -0.07229,0.02696 -0.01979,0.01774 -0.0294,0.04517 -0.0294,0.08333 l 0,0.04779 0.243838,0 0,0.29285 -0.243838,0 0,0.65922 -0.328385,0 0,-0.942267 c 0,-0.01709 6.89e-4,-0.04084 0.0012,-0.07107 5.51e-4,-0.03023 0.0014,-0.0551 0.0036,-0.07352 0.0143,-0.106479 0.0517,-0.187947 0.112729,-0.243838 0.06103,-0.05589 0.145998,-0.08331 0.254866,-0.08332 z m 7.9069682,0.0245 c 0.04508,10e-7 0.08383,0.0167 0.11518,0.05024 0.03135,0.03354 0.04656,0.07948 0.04656,0.13601 0,0.05653 -0.01522,0.100701 -0.04656,0.13356 -0.03135,0.03286 -0.07011,0.04902 -0.11518,0.04901 -0.0451,1e-6 -0.08263,-0.01615 -0.113955,-0.04901 -0.03133,-0.03286 -0.04656,-0.07702 -0.04656,-0.13356 0,-0.05653 0.01523,-0.102467 0.04656,-0.13601 0.03133,-0.03354 0.06885,-0.05024 0.113955,-0.05024 z m -4.273904,0.0012 c 0.02641,2e-6 0.05246,0.0027 0.0772,0.0086 0.02473,0.0059 0.04625,0.01673 0.06494,0.03185 0.01869,0.01513 0.03379,0.03553 0.04533,0.0625 0.01155,0.02696 0.01715,0.06211 0.01715,0.104153 l 0,0.634713 c 0.0055,-0.02889 0.01363,-0.0575 0.02574,-0.08577 0.01209,-0.02827 0.02786,-0.05568 0.04656,-0.08333 l 0.08944,-0.136014 c 0.02088,-0.03153 0.04331,-0.05909 0.06861,-0.08209 0.02531,-0.02301 0.06019,-0.03431 0.104152,-0.03431 0.02531,10e-7 0.05054,0.0037 0.07474,0.01226 0.02419,0.0085 0.04503,0.0189 0.06372,0.02941 0.02088,0.01184 0.04135,0.02472 0.06004,0.03921 l -0.226684,0.378623 0.267119,0.486451 c -0.07259,0.03546 -0.138026,0.05391 -0.198501,0.05391 -0.05168,0 -0.09283,-0.01196 -0.122531,-0.03431 -0.0297,-0.02235 -0.05521,-0.05031 -0.0772,-0.08577 l -0.106596,-0.176615 c -0.01869,-0.03021 -0.0331,-0.05825 -0.04411,-0.08455 -0.01101,-0.0263 -0.01901,-0.05537 -0.02451,-0.08822 l 0,0.447241 -0.329612,0 0,-1.384608 c 0.01319,-0.0013 0.02615,-0.0035 0.04044,-0.0061 0.01208,-0.0027 0.02558,-0.0035 0.04044,-0.0049 0.01485,-0.0013 0.02982,-0.0025 0.04411,-0.0025 z m 1.19836,0.0049 c 0.02201,10e-7 0.0451,0.0016 0.06985,0.0049 0.02473,0.0033 0.04921,0.0081 0.07229,0.0147 0.0396,0.01184 0.07311,0.02902 0.101701,0.05269 0.02859,0.02367 0.04289,0.05823 0.04289,0.102927 -10e-7,0.0197 -0.0064,0.04612 -0.01961,0.07965 -0.0132,0.03352 -0.02936,0.06864 -0.05024,0.104152 -0.01758,-0.01183 -0.04111,-0.02428 -0.06862,-0.03676 -0.0275,-0.01248 -0.05768,-0.01838 -0.09067,-0.01838 -0.02859,10e-7 -0.05251,0.008 -0.07229,0.02574 -0.01979,0.01774 -0.02941,0.04639 -0.02941,0.08455 l 0,0.04656 0.243836,0 0,0.294077 -0.243836,0 0,0.659219 -0.328386,0 0,-0.943493 c 0,-0.01709 6.89e-4,-0.04084 0.0012,-0.07107 5.51e-4,-0.03023 0.0014,-0.05388 0.0036,-0.07229 0.0143,-0.10648 0.0517,-0.187948 0.112728,-0.243838 0.06103,-0.05589 0.145998,-0.08332 0.254866,-0.08332 z m 1.599037,0.02818 c 0.02639,2e-6 0.05244,0.0027 0.0772,0.0086 0.02475,0.0059 0.04625,0.01673 0.06494,0.03185 0.01869,0.01513 0.03379,0.03553 0.04533,0.0625 0.01155,0.02696 0.01715,0.0621 0.01715,0.104152 l 0,1.191007 -0.247514,0 c -0.01651,0 -0.03093,-0.0055 -0.04411,-0.0147 -0.01319,-0.0093 -0.01961,-0.02861 -0.01961,-0.05881 -0.01541,0.02363 -0.03997,0.04464 -0.07352,0.06372 -0.03354,0.01908 -0.07563,0.02941 -0.126208,0.02941 -0.03738,0 -0.07398,-0.0075 -0.110278,-0.02206 -0.03629,-0.01446 -0.0689,-0.03982 -0.09803,-0.07596 -0.02913,-0.03615 -0.05291,-0.08582 -0.07107,-0.148264 -0.01816,-0.06245 -0.02696,-0.140574 -0.02696,-0.23526 0,-0.09465 0.0074,-0.174422 0.02451,-0.240162 0.01705,-0.06574 0.04002,-0.119773 0.06862,-0.160517 0.02859,-0.04074 0.06187,-0.06981 0.09925,-0.08822 0.03738,-0.01841 0.07692,-0.02818 0.11763,-0.02818 0.02637,1e-6 0.05017,0.0045 0.07107,0.01103 0.02089,0.0066 0.03784,0.01351 0.05269,0.02205 0.01485,0.0086 0.02742,0.01719 0.03676,0.02573 0.0094,0.0085 0.01509,0.01445 0.01838,0.01838 l 0,-0.482774 c 0.01322,-0.0013 0.0274,-0.0035 0.04166,-0.0061 0.01211,-0.0027 0.02492,-0.0048 0.0392,-0.0061 0.0143,-0.0013 0.02859,-0.0012 0.04288,-0.0012 z m 0.461946,0 c 0.02641,2e-6 0.05123,0.0027 0.07596,0.0086 0.02473,0.0059 0.04625,0.01673 0.06494,0.03185 0.01869,0.01513 0.03379,0.03553 0.04533,0.0625 0.01155,0.02696 0.01839,0.0621 0.01839,0.104152 l 0,0.634713 c 0.0055,-0.02889 0.01363,-0.0575 0.02574,-0.08577 0.01209,-0.02826 0.02787,-0.0569 0.04656,-0.08455 l 0.08944,-0.136005 c 0.02088,-0.03153 0.04331,-0.05786 0.06861,-0.08087 0.02531,-0.02301 0.06019,-0.03553 0.104152,-0.03553 0.0253,0 0.04932,0.005 0.07352,0.01348 0.02419,0.0085 0.04625,0.01767 0.06494,0.02818 0.02088,0.01184 0.04012,0.02472 0.05882,0.03921 l -0.225458,0.378622 0.267119,0.487676 c -0.0726,0.03546 -0.139252,0.05269 -0.199726,0.05269 -0.05168,0 -0.09161,-0.01074 -0.121307,-0.03309 -0.0297,-0.02235 -0.05644,-0.05153 -0.07842,-0.087 l -0.105377,-0.175225 c -0.01869,-0.03021 -0.03311,-0.05825 -0.04411,-0.08455 -0.01101,-0.0263 -0.01901,-0.05659 -0.02451,-0.08944 l 0,0.448466 -0.330835,0 0,-1.384608 c 0.01319,-0.0013 0.02737,-0.0035 0.04166,-0.0061 0.01208,-0.0027 0.02558,-0.0048 0.04043,-0.0061 0.01485,-0.0013 0.02982,-0.0012 0.04411,-0.0012 z m -3.841368,0.36639 c 0.128668,1e-6 0.220153,0.03019 0.275696,0.09068 0.05554,0.06048 0.08333,0.156473 0.08333,0.287949 l 0,0.384749 c 0,0.03286 0.003,0.06903 0.0074,0.107828 0.0044,0.03879 0.01069,0.07278 0.01838,0.101702 -0.0154,0.0053 -0.02957,0.009 -0.04166,0.01226 -0.01208,0.0033 -0.02397,0.0066 -0.03553,0.0086 -0.01156,0.002 -0.02412,0.0031 -0.03676,0.0036 -0.01263,6.66e-4 -0.02626,0.0012 -0.04166,0.0012 -0.08907,0 -0.141318,-0.03017 -0.155615,-0.09068 -0.01869,0.02235 -0.0458,0.04285 -0.08209,0.06126 -0.03629,0.01841 -0.08226,0.02696 -0.137236,0.02696 -0.0341,0 -0.06668,-0.0054 -0.09802,-0.01593 -0.03135,-0.01051 -0.05913,-0.02722 -0.08333,-0.05024 -0.0242,-0.023 -0.04329,-0.0532 -0.05759,-0.09068 -0.0143,-0.03748 -0.02083,-0.08331 -0.02083,-0.137236 0,-0.07623 0.0167,-0.137215 0.05024,-0.182571 0.03354,-0.04535 0.07346,-0.07926 0.121306,-0.102927 0.04784,-0.02367 0.09836,-0.03878 0.149489,-0.04533 0.05113,-0.0066 0.0948,-0.0098 0.131109,-0.0098 l 0,-0.02818 c -10e-7,-0.01841 -0.0031,-0.03293 -0.0086,-0.04411 -0.0055,-0.01118 -0.0127,-0.01982 -0.02206,-0.02574 -0.0094,-0.0059 -0.02044,-0.0091 -0.03308,-0.01103 -0.01266,-0.002 -0.02615,-0.0036 -0.04043,-0.0036 -0.03846,2e-6 -0.07655,0.0059 -0.113954,0.01839 -0.0374,0.01248 -0.0788,0.03249 -0.124982,0.05881 -0.0209,-0.03025 -0.03735,-0.06052 -0.04779,-0.08944 -0.01043,-0.02892 -0.01593,-0.0505 -0.01593,-0.06494 0,-0.01974 0.0062,-0.03863 0.01715,-0.05637 0.01099,-0.01773 0.0333,-0.03539 0.06739,-0.05514 0.0297,-0.01841 0.0695,-0.0336 0.120082,-0.04411 0.05057,-0.01051 0.102824,-0.01593 0.155615,-0.01593 z m 2.356284,0.05147 c 0.09018,1e-6 0.168173,0.01615 0.235261,0.04901 0.02967,0.01448 0.05427,0.0323 0.07352,0.05269 0.01924,0.02038 0.0294,0.04347 0.0294,0.07107 0,0.02363 -0.007,0.05167 -0.01961,0.08455 -0.01263,0.03288 -0.02787,0.06532 -0.04656,0.09557 -0.03303,-0.03025 -0.06788,-0.05569 -0.104153,-0.07474 -0.03627,-0.01905 -0.07289,-0.02818 -0.110279,-0.02818 -0.04728,10e-7 -0.07107,0.01615 -0.07107,0.04902 0,0.02102 0.0081,0.03784 0.02574,0.04901 0.01758,0.01118 0.03978,0.02029 0.06617,0.02818 0.02639,0.0079 0.05498,0.01709 0.08577,0.02696 0.03078,0.0099 0.05938,0.02439 0.08577,0.04411 0.02639,0.01972 0.04856,0.04669 0.06617,0.08087 0.0176,0.03418 0.02696,0.07835 0.02696,0.13356 0,0.105198 -0.03099,0.189967 -0.09312,0.252414 -0.06213,0.06245 -0.153253,0.09313 -0.272021,0.09313 -0.06819,0 -0.121352,-0.0059 -0.159291,-0.01838 -0.03795,-0.0125 -0.06747,-0.02605 -0.08944,-0.03921 -0.02859,-0.01709 -0.04905,-0.03599 -0.06004,-0.05637 -0.01099,-0.02038 -0.01593,-0.04137 -0.01593,-0.06372 0,-0.03418 0.0071,-0.06761 0.02084,-0.100475 0.01374,-0.03286 0.02898,-0.06526 0.04656,-0.0968 0.01319,0.01444 0.02829,0.02794 0.04533,0.04044 0.01705,0.01249 0.03534,0.0238 0.05514,0.03431 0.0198,0.01051 0.04037,0.01859 0.06126,0.0245 0.02088,0.0059 0.04147,0.0098 0.06126,0.0098 0.02859,1e-6 0.04917,-0.006 0.06126,-0.01715 0.0121,-0.01118 0.01838,-0.02579 0.01838,-0.04289 0,-0.01974 -0.01002,-0.03473 -0.02819,-0.04656 -0.01815,-0.01184 -0.03978,-0.02267 -0.06617,-0.03185 -0.02639,-0.0092 -0.05635,-0.02002 -0.08822,-0.03185 -0.03188,-0.01184 -0.06061,-0.02741 -0.087,-0.04779 -0.02639,-0.02038 -0.04803,-0.04735 -0.06617,-0.08087 -0.01814,-0.03352 -0.02819,-0.07719 -0.02819,-0.131109 -10e-7,-0.05256 0.0095,-0.09902 0.02819,-0.138461 0.01869,-0.03943 0.04341,-0.07116 0.07474,-0.0968 0.03133,-0.02564 0.06837,-0.04509 0.109053,-0.05759 0.04068,-0.0125 0.08355,-0.01838 0.128658,-0.01838 z m 2.470238,0.02206 c 0.02641,1e-6 0.05246,0.0027 0.0772,0.0086 0.02473,0.0059 0.04625,0.01675 0.06494,0.03185 0.01869,0.01511 0.03379,0.03553 0.04533,0.06249 0.01154,0.02696 0.01715,0.06211 0.01715,0.104153 l 0,0.697204 c 0,0.02892 -0.0014,0.0651 -0.0036,0.107828 -0.0022,0.04273 -0.007,0.081 -0.01471,0.11518 -0.01211,0.0526 -0.02985,0.09685 -0.05514,0.132333 -0.02529,0.03549 -0.05443,0.06407 -0.08577,0.08577 -0.03135,0.02171 -0.06247,0.03737 -0.09435,0.04656 -0.03188,0.0092 -0.05901,0.01348 -0.08209,0.01348 -0.04728,0 -0.08215,-0.0114 -0.104151,-0.03309 -0.02199,-0.02169 -0.03765,-0.05348 -0.04533,-0.09557 -0.0033,-0.01709 -0.0057,-0.03486 -0.0074,-0.05391 -0.0016,-0.01905 -0.0027,-0.04434 -0.0049,-0.0772 0.0352,-0.0039 0.06377,-0.01267 0.08577,-0.0245 0.02199,-0.01184 0.03815,-0.02692 0.05024,-0.04533 0.01209,-0.01841 0.02134,-0.03941 0.02573,-0.06372 0.0044,-0.02431 0.0061,-0.05072 0.0061,-0.07965 l 0,-0.918987 c 0.01319,-0.0013 0.02737,-0.0035 0.04166,-0.0061 0.01208,-0.0027 0.02558,-0.0049 0.04043,-0.0061 0.01485,-0.0013 0.02859,-0.0012 0.04289,-0.0012 z m -7.1656512,0.21075 c -0.03013,0.0043 -0.05169,0.0243 -0.06372,0.05881 -0.01374,0.03944 -0.01961,0.09338 -0.01961,0.161742 -1e-6,0.03154 0.0016,0.06003 0.0049,0.087 0.0033,0.02696 0.0089,0.05069 0.01716,0.07107 0.0083,0.02038 0.01867,0.03718 0.03186,0.04901 0.01319,0.01184 0.02921,0.01715 0.04901,0.01715 0.01319,0 0.02416,-4.59e-4 0.03186,-0.0025 0.0077,-0.002 0.01261,-0.0035 0.01593,-0.0049 l 0,-0.42396 c -0.0066,-0.0053 -0.01405,-0.0091 -0.02451,-0.01103 -0.01045,-0.002 -0.02061,-0.0025 -0.0294,-0.0025 -0.0047,0 -0.0092,-6.2e-4 -0.01348,0 z m 5.5396562,0.05881 c -0.03738,1e-6 -0.06346,0.01938 -0.0772,0.05881 -0.01375,0.03944 -0.02083,0.09338 -0.02083,0.161742 -1e-6,0.03154 0.0016,0.06126 0.0049,0.08822 0.0033,0.02696 0.0089,0.05069 0.01715,0.07107 0.0082,0.02038 0.0199,0.03595 0.03308,0.04779 0.01319,0.01184 0.02921,0.01838 0.04901,0.01838 0.01319,0 0.02416,-0.0017 0.03185,-0.0036 0.0077,-0.002 0.0126,-0.0035 0.01593,-0.0049 l 0,-0.423959 c -0.0066,-0.0053 -0.01527,-0.0091 -0.02574,-0.01103 -0.01046,-0.002 -0.01939,-0.0025 -0.02818,-0.0025 z m -3.149064,0.193599 c -0.02088,0.0027 -0.04133,0.007 -0.06004,0.01226 -0.01871,0.0053 -0.03527,0.01221 -0.04901,0.02206 -0.01375,0.0099 -0.02363,0.02343 -0.03185,0.03921 -0.0082,0.01579 -0.01348,0.03631 -0.01348,0.06127 0,0.03025 0.0071,0.05342 0.02083,0.06985 0.01375,0.01643 0.03339,0.0245 0.05759,0.0245 0.0198,0 0.0373,-0.0054 0.05269,-0.01593 0.01539,-0.01051 0.02328,-0.02673 0.02328,-0.04779 l 0,-0.165418 z m 2.233753,3.006927 c 0.04507,1e-6 0.08383,0.0167 0.115179,0.05024 0.03135,0.03354 0.04656,0.07826 0.04656,0.134785 0,0.05653 -0.01521,0.101926 -0.04656,0.134784 -0.03135,0.03286 -0.07011,0.04901 -0.115179,0.04901 -0.0451,10e-7 -0.08263,-0.01615 -0.113955,-0.04901 -0.03133,-0.03286 -0.04779,-0.07825 -0.04779,-0.134784 0,-0.05653 0.01647,-0.101243 0.04779,-0.134785 0.03133,-0.03354 0.06885,-0.05024 0.113955,-0.05024 z m -3.4970542,0.01838 c 0.02202,0 0.04634,0.0016 0.07107,0.0049 0.02473,0.0033 0.04798,0.0081 0.07107,0.01471 0.0396,0.01184 0.07433,0.02902 0.102928,0.05268 0.02859,0.02367 0.04288,0.05823 0.04288,0.102926 -10e-7,0.01969 -0.0076,0.04613 -0.02083,0.07965 -0.0132,0.03352 -0.02936,0.06742 -0.05024,0.102926 -0.01758,-0.01184 -0.03989,-0.02305 -0.06739,-0.03553 -0.0275,-0.01248 -0.05891,-0.0196 -0.0919,-0.01961 -0.02859,2e-6 -0.05251,0.0093 -0.07229,0.02696 -0.01979,0.01774 -0.02941,0.04639 -0.02941,0.08455 l 0,0.04656 0.243838,0 0,0.294076 -0.243838,0 0,0.659221 -0.328385,0 0,-0.943494 c 0,-0.01709 6.89e-4,-0.04084 0.0012,-0.07107 5.51e-4,-0.03023 0.0014,-0.05388 0.0036,-0.07229 0.01429,-0.106481 0.0517,-0.187949 0.112729,-0.243839 0.06103,-0.05589 0.145997,-0.08332 0.254865,-0.08332 z m 4.1758792,0 c 0.02201,0 0.0451,0.0016 0.06985,0.0049 0.02473,0.0033 0.04921,0.0081 0.07229,0.01471 0.03959,0.01184 0.07311,0.02902 0.101701,0.05268 0.02859,0.02367 0.04289,0.05823 0.04289,0.102926 -2e-6,0.01969 -0.0064,0.04613 -0.01961,0.07965 -0.0132,0.03352 -0.03059,0.06742 -0.05146,0.102926 -0.01758,-0.01184 -0.03989,-0.02305 -0.06739,-0.03553 -0.0275,-0.01248 -0.05769,-0.0196 -0.09068,-0.01961 -0.02859,2e-6 -0.05251,0.0093 -0.07229,0.02696 -0.01979,0.01774 -0.02941,0.04639 -0.0294,0.08455 l 0,0.04656 0.243838,0 0,0.294076 -0.243838,0 0,0.659221 -0.328385,0 0,-0.943494 c 0,-0.01709 -5.51e-4,-0.04084 0,-0.07107 5.51e-4,-0.03023 0.0027,-0.05388 0.0049,-0.07229 0.0143,-0.106481 0.0517,-0.187949 0.112729,-0.243839 0.06103,-0.05589 0.145997,-0.08332 0.254865,-0.08332 z m -3.017955,0.0147 c 0.02641,2e-6 0.05123,0.0038 0.07597,0.0098 0.02473,0.0059 0.04748,0.01551 0.06617,0.03063 0.01869,0.01512 0.03379,0.03676 0.04533,0.06372 0.01155,0.02696 0.01715,0.06088 0.01715,0.102926 l 0,1.183655 c -0.04508,0.0171 -0.0861,0.02573 -0.121308,0.02573 -0.05057,0 -0.08959,-0.0076 -0.11763,-0.02206 -0.02804,-0.01446 -0.04875,-0.0327 -0.0625,-0.05637 -0.01374,-0.02367 -0.02175,-0.0512 -0.0245,-0.08209 -0.0028,-0.03089 -0.0036,-0.06384 -0.0036,-0.09803 l 0,-1.14322 c 0.01319,-0.0013 0.02614,-0.0035 0.04044,-0.0061 0.01208,-0.0026 0.02558,-0.0049 0.04043,-0.0061 0.01485,-0.0013 0.02982,-0.0025 0.04411,-0.0025 z m 0.460719,0 c 0.02641,2e-6 0.05123,0.0038 0.07597,0.0098 0.02473,0.0059 0.04748,0.01551 0.06617,0.03063 0.01869,0.01512 0.03379,0.03676 0.04533,0.06372 0.01155,0.02696 0.01715,0.06088 0.01715,0.102926 l 0,0.63594 c 0.0055,-0.02889 0.01363,-0.0575 0.02574,-0.08577 0.0121,-0.02827 0.02786,-0.0569 0.04656,-0.08455 l 0.08944,-0.136011 c 0.02088,-0.03153 0.04331,-0.05909 0.06861,-0.08209 0.0253,-0.02301 0.06019,-0.03431 0.104152,-0.03431 0.02531,10e-7 0.05055,0.005 0.07474,0.01348 0.02419,0.0086 0.04503,0.01767 0.06372,0.02818 0.02088,0.01184 0.04135,0.02473 0.06004,0.0392 l -0.226684,0.378622 0.267119,0.487676 c -0.07259,0.03547 -0.139253,0.05268 -0.199727,0.05268 -0.05168,0 -0.09161,-0.01073 -0.121306,-0.03308 -0.0297,-0.02235 -0.05644,-0.05153 -0.07842,-0.087 l -0.105368,-0.175214 c -0.01869,-0.03021 -0.0331,-0.05825 -0.04411,-0.08455 -0.01101,-0.0263 -0.01901,-0.05659 -0.02451,-0.08944 l 0,0.448467 -0.330835,0 0,-1.384608 c 0.01319,-0.0013 0.02737,-0.0035 0.04166,-0.0061 0.01208,-0.0026 0.02558,-0.0048 0.04044,-0.0061 0.01485,-0.0013 0.02982,-0.0025 0.04411,-0.0025 z m -1.02559,0.420283 c 0.09018,1e-6 0.169399,0.01615 0.236487,0.04901 0.02967,0.01448 0.05427,0.03231 0.07352,0.05268 0.01925,0.02039 0.02819,0.04469 0.02819,0.07229 0,0.02363 -0.0057,0.05167 -0.01839,0.08455 -0.01263,0.03289 -0.0291,0.0641 -0.04779,0.09435 -0.03303,-0.03025 -0.06788,-0.05446 -0.104151,-0.07352 -0.03627,-0.01905 -0.07289,-0.02818 -0.110279,-0.02818 -0.04728,1e-6 -0.07107,0.01615 -0.07107,0.04901 -1e-6,0.02103 0.0094,0.03662 0.02696,0.04779 0.01758,0.01118 0.03978,0.02153 0.06617,0.0294 0.02639,0.0079 0.05498,0.01586 0.08577,0.02573 0.03078,0.0099 0.05938,0.02562 0.08577,0.04533 0.02639,0.01972 0.04856,0.04669 0.06617,0.08087 0.0176,0.03418 0.02573,0.07835 0.02573,0.133559 0,0.105198 -0.03099,0.188742 -0.09312,0.25119 -0.06213,0.06245 -0.152027,0.09435 -0.270795,0.09435 -0.06819,0 -0.121352,-0.0071 -0.159292,-0.01961 -0.03794,-0.0125 -0.06869,-0.02483 -0.09067,-0.03798 -0.02859,-0.0171 -0.04782,-0.03599 -0.05881,-0.05637 -0.01099,-0.02038 -0.01715,-0.04137 -0.01715,-0.06372 0,-0.03418 0.0071,-0.06761 0.02083,-0.100476 0.01375,-0.03286 0.0302,-0.06526 0.04779,-0.0968 0.01319,0.01444 0.02829,0.02794 0.04533,0.04044 0.01705,0.0125 0.03534,0.0238 0.05514,0.03431 0.0198,0.01051 0.04038,0.01858 0.06126,0.02451 0.02089,0.0059 0.04024,0.0086 0.06004,0.0086 0.02859,0 0.04917,-0.0048 0.06127,-0.01593 0.01209,-0.01118 0.01838,-0.02579 0.01838,-0.04289 0,-0.01974 -0.0088,-0.03595 -0.02696,-0.04779 -0.01816,-0.01184 -0.041,-0.02145 -0.06739,-0.03063 -0.02639,-0.0092 -0.05512,-0.02002 -0.087,-0.03185 -0.03188,-0.01184 -0.06061,-0.02741 -0.087,-0.04779 -0.02639,-0.02038 -0.04926,-0.04735 -0.06739,-0.08087 -0.01814,-0.03352 -0.02696,-0.07719 -0.02696,-0.131109 0,-0.05256 0.0095,-0.09902 0.02818,-0.13846 0.01869,-0.03943 0.04341,-0.07239 0.07474,-0.09803 0.03133,-0.02564 0.06713,-0.04387 0.107829,-0.05637 0.04068,-0.0125 0.08355,-0.01961 0.128657,-0.01961 z m 2.258259,0 c 0.128667,1e-6 0.221379,0.03019 0.27692,0.09068 0.05554,0.06048 0.08333,0.156473 0.08333,0.287949 l 0,0.38475 c 0,0.03286 0.0017,0.06903 0.0061,0.107827 0.0044,0.03879 0.01069,0.07278 0.01838,0.101702 -0.01541,0.0053 -0.02957,0.009 -0.04166,0.01226 -0.01208,0.0033 -0.02397,0.0066 -0.03553,0.0086 -0.01156,0.002 -0.0229,0.0031 -0.03553,0.0036 -0.01263,6.66e-4 -0.02748,0.0012 -0.04289,0.0012 -0.08907,0 -0.140095,-0.03016 -0.154391,-0.09068 -0.01869,0.02235 -0.0458,0.04163 -0.08209,0.06004 -0.03629,0.01841 -0.08226,0.02818 -0.137235,0.02818 -0.0341,0 -0.06668,-0.0054 -0.09803,-0.01593 -0.03135,-0.01051 -0.05913,-0.02723 -0.08332,-0.05024 -0.0242,-0.023 -0.0433,-0.0532 -0.05759,-0.09068 -0.0143,-0.03748 -0.02206,-0.08331 -0.02206,-0.137236 0,-0.07623 0.0167,-0.137214 0.05024,-0.182571 0.03354,-0.04535 0.07469,-0.07926 0.122531,-0.102927 0.04784,-0.02367 0.09714,-0.03878 0.148263,-0.04533 0.05113,-0.0066 0.0948,-0.0098 0.13111,-0.0098 l 0,-0.02819 c 0,-0.01841 -0.0031,-0.03293 -0.0086,-0.04411 -0.0055,-0.01117 -0.0127,-0.01982 -0.02206,-0.02573 -0.0094,-0.0059 -0.02044,-0.01029 -0.03309,-0.01226 -0.01266,-0.002 -0.02614,-0.0025 -0.04044,-0.0025 -0.03846,10e-7 -0.07656,0.0059 -0.113955,0.01838 -0.0374,0.01249 -0.0788,0.03249 -0.124983,0.05881 -0.02091,-0.03025 -0.03612,-0.06052 -0.04656,-0.08944 -0.01043,-0.02892 -0.01593,-0.0505 -0.01593,-0.06494 0,-0.01974 0.005,-0.03863 0.01593,-0.05637 0.01099,-0.01774 0.03329,-0.0354 0.06739,-0.05514 0.0297,-0.01841 0.07073,-0.0336 0.121306,-0.04411 0.05057,-0.01051 0.1016,-0.01593 0.15439,-0.01593 z m 0.616334,0.01961 c 0.02641,2e-6 0.05246,0.0039 0.0772,0.0098 0.02473,0.0059 0.04625,0.01553 0.06494,0.03063 0.01869,0.0151 0.03379,0.03676 0.04533,0.06372 0.01155,0.02696 0.01715,0.06088 0.01715,0.102927 l 0,0.698431 c 0,0.02893 -0.0014,0.0651 -0.0036,0.107827 -0.0022,0.04273 -0.0071,0.081 -0.0147,0.11518 -0.01211,0.0526 -0.03108,0.09685 -0.05637,0.132334 -0.02529,0.03548 -0.05321,0.06407 -0.08455,0.08577 -0.03135,0.02171 -0.06247,0.03738 -0.09435,0.04656 -0.03188,0.0092 -0.06023,0.01348 -0.08332,0.01348 -0.04728,0 -0.08093,-0.0114 -0.102927,-0.03308 -0.02199,-0.02169 -0.03765,-0.05348 -0.04533,-0.09557 -0.0033,-0.0171 -0.0057,-0.03486 -0.0074,-0.05392 -0.0016,-0.01905 -0.0039,-0.04556 -0.0061,-0.07842 0.0352,-0.0039 0.06377,-0.01145 0.08577,-0.02328 0.02199,-0.01184 0.03937,-0.02692 0.05146,-0.04533 0.0121,-0.01841 0.02011,-0.0394 0.02451,-0.06372 0.0044,-0.02431 0.0074,-0.05072 0.0074,-0.07965 l 0,-0.918986 c 0.01319,-0.0013 0.02615,-0.0035 0.04044,-0.0061 0.01208,-0.0026 0.02558,-0.0049 0.04044,-0.0061 0.01485,-0.0013 0.02982,-0.0025 0.04411,-0.0025 z m -0.564871,0.517084 c -0.02088,0.0026 -0.0401,0.007 -0.05881,0.01226 -0.01871,0.0053 -0.03527,0.01221 -0.04901,0.02206 -0.01375,0.0099 -0.02485,0.02343 -0.03309,0.0392 -0.0082,0.01579 -0.01226,0.03508 -0.01226,0.06004 0,0.03025 0.0071,0.05464 0.02083,0.07107 0.01375,0.01643 0.03217,0.02451 0.05637,0.02451 0.0198,0 0.0373,-0.0054 0.05268,-0.01593 0.01539,-0.01051 0.02328,-0.02673 0.02328,-0.04778 l 0,-0.165418 z m -2.6013472,0.98148 c 0.04508,2e-6 0.08383,0.01792 0.1151802,0.05146 0.03135,0.03354 0.04656,0.07826 0.04656,0.1347851 0,0.05653 -0.01522,0.100701 -0.04656,0.133559 -0.03135,0.03286 -0.07011,0.04901 -0.1151802,0.04901 -0.0451,1e-6 -0.08385,-0.01615 -0.115181,-0.04901 -0.03133,-0.03286 -0.04656,-0.07703 -0.04656,-0.133559 0,-0.05653 0.01523,-0.1012421 0.04656,-0.1347851 0.03133,-0.03354 0.07008,-0.05146 0.115181,-0.05146 z m 3.6024302,0 c 0.04507,2e-6 0.08261,0.01792 0.113955,0.05146 0.03135,0.03354 0.04656,0.07826 0.04656,0.1347851 0,0.05653 -0.01521,0.100701 -0.04656,0.133559 -0.03135,0.03286 -0.06888,0.04901 -0.113955,0.04901 -0.0451,1e-6 -0.08385,-0.01615 -0.11518,-0.04901 -0.02515,-0.02639 -0.03916,-0.06006 -0.04411,-0.101701 -0.0031,0.01582 -0.0087,0.03364 -0.01715,0.05514 -0.0132,0.03352 -0.02936,0.06864 -0.05024,0.104152 -0.01758,-0.01184 -0.04111,-0.02428 -0.06862,-0.03676 -0.0275,-0.01248 -0.05768,-0.01838 -0.09067,-0.01838 -0.02859,2e-6 -0.05251,0.0093 -0.07229,0.02696 -0.01979,0.01773 -0.02941,0.04517 -0.02941,0.08332 l 0,0.04779 0.243838,0 0,0.292851 -0.243838,0 0,0.65922 -0.328385,0 0,-0.942267 c 0,-0.01709 6.89e-4,-0.04084 0.0012,-0.07107 5.51e-4,-0.03023 0.0014,-0.05511 0.0036,-0.07352 0.0143,-0.106479 0.0517,-0.187946 0.112729,-0.2438361 0.06103,-0.05589 0.145997,-0.08331 0.254866,-0.08333 0.02202,2e-6 0.0451,0.0016 0.06985,0.0049 0.02473,0.0033 0.04921,0.0081 0.07229,0.0147 0.0396,0.01184 0.07311,0.03024 0.101701,0.05391 0.02076,0.01718 0.03352,0.03913 0.0392,0.06739 0.0043,-0.04392 0.01923,-0.07987 0.04533,-0.1078271 0.03133,-0.03354 0.07008,-0.05146 0.11518,-0.05146 z m -0.160516,0.1592921 c -8.96e-4,0.0088 -0.0012,0.01755 -0.0012,0.02696 0,0.01115 0.0012,0.02163 0.0025,0.03185 0.0017,-0.0089 0.0025,-0.01745 0.0025,-0.0245 -1e-6,-0.01225 -0.0015,-0.02365 -0.0036,-0.03431 z m 1.583109,-0.1409121 c 0.02202,10e-7 0.0451,0.0016 0.06985,0.0049 0.02473,0.0033 0.04798,0.0081 0.07107,0.01471 0.0396,0.01184 0.07433,0.03024 0.102927,0.05391 0.02859,0.02367 0.04288,0.05701 0.04288,0.1017021 -10e-7,0.01969 -0.0064,0.04612 -0.01961,0.07965 -0.0132,0.03353 -0.03058,0.06864 -0.05146,0.104151 -0.01758,-0.01184 -0.03989,-0.02428 -0.06739,-0.03676 -0.0275,-0.01248 -0.05768,-0.01839 -0.09068,-0.01839 -0.02859,2e-6 -0.05251,0.0093 -0.07229,0.02696 -0.01979,0.01774 -0.03063,0.04517 -0.03063,0.08333 l 0,0.04779 0.245064,0 0,0.29285 -0.245064,0 0,0.659221 -0.328386,0 0,-0.942268 c 0,-0.01709 6.89e-4,-0.04084 0.0012,-0.07107 5.51e-4,-0.03023 0.0014,-0.05511 0.0036,-0.07352 0.0143,-0.106477 0.05293,-0.187946 0.113954,-0.2438351 0.06103,-0.05589 0.145997,-0.08332 0.254866,-0.08332 z m -6.2601422,0.01593 c 0.02638,2e-6 0.05245,0.0027 0.07719,0.0086 0.02475,0.0059 0.04625,0.01673 0.06494,0.03185 0.01869,0.01513 0.03379,0.03553 0.04534,0.06249 0.01154,0.02696 0.01716,0.06211 0.01716,0.1041531 l 0,1.191007 -0.247514,0 c -0.01651,0 -0.03093,-0.0043 -0.04411,-0.01348 -0.01319,-0.0092 -0.01961,-0.02983 -0.01961,-0.06004 -0.01541,0.02363 -0.03998,0.04587 -0.07352,0.06494 -0.03354,0.01908 -0.07563,0.02818 -0.126208,0.02818 -0.03738,0 -0.07521,-0.0076 -0.111504,-0.02206 -0.0363,-0.01446 -0.0689,-0.03982 -0.09802,-0.07596 -0.02913,-0.03615 -0.05291,-0.0846 -0.07107,-0.147039 -0.01816,-0.06245 -0.02696,-0.1418 -0.02696,-0.236486 0,-0.09465 0.0087,-0.174423 0.02574,-0.240162 0.01704,-0.06574 0.04003,-0.118548 0.06862,-0.159291 0.02859,-0.04074 0.06187,-0.07103 0.09925,-0.08944 0.03738,-0.01841 0.0757,-0.02696 0.116405,-0.02696 0.02638,10e-7 0.05018,0.0032 0.07107,0.0098 0.02089,0.0066 0.03906,0.01351 0.05391,0.02206 0.01485,0.0086 0.02741,0.01718 0.03676,0.02574 0.0093,0.0086 0.01509,0.01445 0.01838,0.01838 l 0,-0.4827751 c 0.01322,-0.0013 0.02739,-0.0035 0.04166,-0.0061 0.01212,-0.0026 0.02492,-0.0048 0.03921,-0.0061 0.01429,-0.0013 0.02859,-0.0012 0.04289,-0.0012 z m 0.64084,0.4202841 c 0.09018,1e-6 0.169399,0.01616 0.236486,0.04901 0.02967,0.01449 0.05428,0.03231 0.07352,0.05268 0.01925,0.02039 0.02818,0.04347 0.02818,0.07107 0,0.02363 -0.0057,0.05167 -0.01838,0.08455 -0.01263,0.03289 -0.02909,0.06532 -0.04779,0.09557 -0.03303,-0.03025 -0.06788,-0.05568 -0.104152,-0.07474 -0.03628,-0.01905 -0.07289,-0.02818 -0.110279,-0.02818 -0.04728,10e-7 -0.07107,0.01615 -0.07107,0.04901 -10e-7,0.02103 0.0094,0.03784 0.02695,0.04901 0.01758,0.01118 0.03977,0.02029 0.06617,0.02818 0.0264,0.0079 0.05498,0.01709 0.08577,0.02696 0.03079,0.0099 0.05938,0.02439 0.08577,0.04411 0.02639,0.01972 0.04857,0.04669 0.06617,0.08087 0.0176,0.03418 0.02573,0.07835 0.02573,0.133559 0,0.105198 -0.03099,0.189967 -0.09313,0.252415 -0.06213,0.06245 -0.152027,0.09313 -0.270795,0.09313 -0.06819,0 -0.121351,-0.0058 -0.159291,-0.01838 -0.03794,-0.0125 -0.0687,-0.02605 -0.09067,-0.0392 -0.02859,-0.01709 -0.04783,-0.03476 -0.05881,-0.05514 -0.01099,-0.02039 -0.01716,-0.04259 -0.01716,-0.06494 0,-0.03418 0.0071,-0.06761 0.02083,-0.100477 0.01374,-0.03286 0.0302,-0.06526 0.04779,-0.0968 0.01319,0.01444 0.02829,0.02794 0.04534,0.04044 0.01705,0.0125 0.03534,0.0238 0.05514,0.03431 0.0198,0.01051 0.04038,0.01982 0.06127,0.02574 0.02089,0.0059 0.04024,0.0086 0.06004,0.0086 0.02859,0 0.04917,-0.006 0.06127,-0.01715 0.0121,-0.01117 0.01838,-0.02457 0.01838,-0.04166 0,-0.01974 -0.0088,-0.03595 -0.02696,-0.04779 -0.01816,-0.01184 -0.041,-0.02267 -0.06739,-0.03185 -0.0264,-0.0092 -0.05512,-0.02002 -0.087,-0.03186 -0.03188,-0.01184 -0.0606,-0.02741 -0.087,-0.04779 -0.0264,-0.02038 -0.04925,-0.04735 -0.06739,-0.08087 -0.01814,-0.03352 -0.02696,-0.07719 -0.02696,-0.131108 0,-0.05256 0.0095,-0.09902 0.02819,-0.138462 0.01869,-0.03943 0.04341,-0.07116 0.07474,-0.0968 0.03133,-0.02564 0.06714,-0.04509 0.107829,-0.05759 0.04069,-0.0125 0.08355,-0.01838 0.128658,-0.01838 z m 1.2804562,0 c 0.06709,1e-6 0.124258,0.01187 0.171543,0.03553 0.04728,0.02367 0.08604,0.05492 0.115181,0.09435 0.02915,0.03944 0.05053,0.08588 0.06372,0.138462 0.01319,0.05258 0.01961,0.107563 0.01961,0.165417 l 0,0.02574 c -1e-6,0.01118 -6.66e-4,0.02369 -0.0012,0.03553 -5.51e-4,0.01184 -6.89e-4,0.02258 -0.0012,0.03309 -5.51e-4,0.01051 -0.0013,0.01802 -0.0025,0.02328 l -0.441114,0 c 0.0055,0.04994 0.02128,0.09258 0.04656,0.127432 0.02529,0.03484 0.06645,0.05269 0.122531,0.05269 0.044,0 0.08059,-0.0088 0.110278,-0.02451 0.02969,-0.01577 0.05975,-0.03617 0.08944,-0.0625 0.01429,0.02632 0.02859,0.05649 0.04289,0.09067 0.01429,0.03418 0.02083,0.0644 0.02083,0.09068 -10e-7,0.02235 -0.0048,0.044 -0.0147,0.06372 -0.0099,0.01972 -0.02743,0.03794 -0.05269,0.05637 -0.0242,0.01709 -0.05678,0.03227 -0.09802,0.04411 -0.04125,0.01184 -0.0928,0.01715 -0.15439,0.01715 -0.04508,0 -0.09289,-0.0065 -0.144586,-0.01961 -0.0517,-0.01315 -0.100608,-0.03908 -0.144588,-0.0772 -0.04398,-0.03812 -0.07991,-0.09149 -0.109053,-0.160516 -0.02915,-0.06903 -0.04411,-0.159058 -0.04411,-0.270795 0,-0.08285 0.01189,-0.155192 0.03553,-0.215656 0.02364,-0.06046 0.05518,-0.110049 0.09312,-0.149488 0.03794,-0.03943 0.08094,-0.06859 0.129885,-0.087 0.04895,-0.01841 0.09757,-0.02696 0.147038,-0.02696 z m 0.871199,0 c 0.07588,1e-6 0.139586,0.01291 0.192375,0.0392 0.05279,0.0263 0.09567,0.0619 0.128659,0.106602 0.03299,0.04469 0.05745,0.09702 0.07229,0.156841 0.01485,0.05982 0.02206,0.122882 0.02206,0.189924 -10e-7,0.06704 -0.0079,0.132378 -0.02328,0.194825 -0.01541,0.06245 -0.04,0.11687 -0.07352,0.164192 -0.03352,0.04733 -0.07654,0.08444 -0.129884,0.112729 -0.05334,0.02828 -0.119064,0.04289 -0.19605,0.04289 -0.07588,0 -0.139602,-0.01404 -0.192375,-0.04166 -0.05277,-0.02763 -0.09634,-0.06484 -0.129883,-0.111504 -0.03354,-0.04667 -0.05811,-0.100597 -0.07352,-0.161741 -0.01541,-0.06114 -0.02328,-0.125234 -0.02328,-0.1936 0,-0.06837 0.0094,-0.133701 0.02696,-0.194825 0.0176,-0.06112 0.0439,-0.113371 0.07964,-0.158067 0.03574,-0.04469 0.08078,-0.0803 0.13356,-0.106602 0.05277,-0.0263 0.114764,-0.0392 0.186247,-0.0392 z m 1.018239,0 c 0.01651,1e-6 0.03308,9.64e-4 0.04901,0.0049 0.01594,0.0039 0.0297,0.01105 0.04288,0.01961 0.01319,0.0086 0.02483,0.01985 0.03309,0.03431 0.0082,0.01446 0.01226,0.03166 0.01226,0.05268 0,0.02103 -0.003,0.04487 -0.0074,0.06985 -0.0044,0.02498 -0.01,0.04968 -0.01715,0.07596 -0.0072,0.0263 -0.01447,0.05223 -0.02328,0.0772 -0.0088,0.02498 -0.01816,0.04765 -0.02696,0.06739 -0.02309,-0.02235 -0.04472,-0.03906 -0.06617,-0.05024 -0.02145,-0.01118 -0.0458,-0.01715 -0.07107,-0.01715 -0.02859,1e-6 -0.04953,0.0087 -0.06494,0.02574 -0.01541,0.0171 -0.02328,0.03979 -0.02328,0.06739 l 0,0.550167 -0.33206,0 0,-0.942268 c 0.0099,-0.0026 0.02113,-0.006 0.03431,-0.0086 0.01208,-0.0026 0.02626,-0.0048 0.04166,-0.0061 0.0154,-0.0013 0.03289,-0.0012 0.05269,-0.0012 0.09897,10e-7 0.160826,0.03231 0.185023,0.09802 0.0054,-0.01184 0.01417,-0.02419 0.02573,-0.03798 0.01156,-0.0138 0.02505,-0.02738 0.04044,-0.0392 0.01539,-0.01184 0.03289,-0.02153 0.05269,-0.02941 0.0198,-0.0079 0.04051,-0.01103 0.0625,-0.01103 z m 1.637023,0 c 0.09018,1e-6 0.169399,0.01616 0.236487,0.04901 0.02967,0.01449 0.05305,0.03231 0.07229,0.05268 0.01925,0.02039 0.0294,0.04347 0.0294,0.07107 -10e-7,0.02363 -0.0057,0.05167 -0.01838,0.08455 -0.01263,0.03289 -0.02909,0.06532 -0.04779,0.09557 -0.03303,-0.03025 -0.06788,-0.05568 -0.104151,-0.07474 -0.03628,-0.01905 -0.07289,-0.02818 -0.110279,-0.02818 -0.04728,10e-7 -0.07107,0.01615 -0.07107,0.04901 0,0.02103 0.0094,0.03784 0.02696,0.04901 0.01758,0.01118 0.03978,0.02029 0.06617,0.02818 0.02639,0.0079 0.05498,0.01709 0.08577,0.02696 0.03078,0.0099 0.05938,0.02439 0.08577,0.04411 0.02639,0.01972 0.04856,0.04669 0.06617,0.08087 0.0176,0.03418 0.02572,0.07835 0.02572,0.133559 -10e-7,0.105198 -0.03098,0.189967 -0.09313,0.252415 -0.06213,0.06245 -0.152027,0.09313 -0.270794,0.09313 -0.06819,0 -0.121352,-0.0058 -0.159291,-0.01838 -0.03795,-0.0125 -0.06869,-0.02605 -0.09068,-0.0392 -0.02859,-0.01709 -0.04782,-0.03476 -0.05881,-0.05514 -0.01099,-0.02039 -0.01715,-0.04259 -0.01715,-0.06494 0,-0.03418 0.0071,-0.06761 0.02083,-0.100477 0.01375,-0.03286 0.0302,-0.06526 0.04779,-0.0968 0.01319,0.01444 0.02829,0.02794 0.04533,0.04044 0.01705,0.0125 0.03534,0.0238 0.05514,0.03431 0.0198,0.01051 0.03915,0.01982 0.06004,0.02574 0.02089,0.0059 0.04147,0.0086 0.06126,0.0086 0.02859,0 0.04916,-0.006 0.06127,-0.01715 0.01209,-0.01117 0.01838,-0.02457 0.01838,-0.04166 -10e-7,-0.01974 -0.0088,-0.03595 -0.02696,-0.04779 -0.01816,-0.01184 -0.041,-0.02267 -0.06739,-0.03185 -0.02639,-0.0092 -0.05512,-0.02002 -0.087,-0.03186 -0.03188,-0.01184 -0.06183,-0.02741 -0.08822,-0.04779 -0.02639,-0.02038 -0.04802,-0.04735 -0.06617,-0.08087 -0.01814,-0.03352 -0.02696,-0.07719 -0.02696,-0.131108 0,-0.05256 0.0095,-0.09902 0.02819,-0.138462 0.01869,-0.03943 0.04341,-0.07116 0.07474,-0.0968 0.03133,-0.02564 0.06713,-0.04509 0.107828,-0.05759 0.04068,-0.0125 0.08355,-0.01838 0.128659,-0.01838 z m -4.2420472,0.01961 c 0.02641,1e-6 0.05123,0.0027 0.07597,0.0086 0.02473,0.0059 0.04748,0.01675 0.06617,0.03185 0.01869,0.0151 0.03379,0.03553 0.04533,0.0625 0.01155,0.02696 0.01715,0.0621 0.01715,0.104151 l 0,0.697206 c 0,0.02893 -0.0014,0.0651 -0.0036,0.107828 -0.0022,0.04273 -0.007,0.081 -0.01471,0.115179 -0.01211,0.0526 -0.03108,0.09685 -0.05637,0.132334 -0.02529,0.03549 -0.05321,0.06407 -0.08455,0.08577 -0.03135,0.02171 -0.06369,0.03737 -0.09558,0.04656 -0.03188,0.0092 -0.05901,0.01348 -0.08209,0.01348 -0.04728,-1e-6 -0.08215,-0.01018 -0.104151,-0.03186 -0.02199,-0.02169 -0.03643,-0.05348 -0.04411,-0.09557 -0.0033,-0.0171 -0.0057,-0.03608 -0.0074,-0.05514 -0.0016,-0.01905 -0.0039,-0.04434 -0.0061,-0.0772 0.0352,-0.0039 0.06377,-0.01144 0.08577,-0.02328 0.022,-0.01184 0.03937,-0.02814 0.05146,-0.04656 0.0121,-0.01841 0.02011,-0.03941 0.0245,-0.06372 0.0044,-0.02431 0.0061,-0.05072 0.0061,-0.07965 l 0,-0.918987 c 0.01319,-0.0013 0.02737,-0.0035 0.04166,-0.0061 0.01208,-0.0026 0.02558,-0.0048 0.04044,-0.0061 0.01485,-0.0013 0.02982,-0.0012 0.04411,-0.0012 z m 3.6012062,0 c 0.02641,1e-6 0.05246,0.0027 0.0772,0.0086 0.02473,0.0059 0.04625,0.01675 0.06494,0.03185 0.01869,0.0151 0.03379,0.03553 0.04533,0.0625 0.01155,0.02696 0.01715,0.0621 0.01715,0.104151 l 0,0.697206 c 0,0.02893 -2.28e-4,0.0651 -0.0025,0.107828 -0.0022,0.04273 -0.0082,0.081 -0.01593,0.115179 -0.01211,0.0526 -0.02985,0.09685 -0.05514,0.132334 -0.02529,0.03549 -0.05443,0.06407 -0.08577,0.08577 -0.03135,0.02171 -0.06247,0.03737 -0.09435,0.04656 -0.03188,0.0092 -0.05901,0.01348 -0.08209,0.01348 -0.04728,-1e-6 -0.08215,-0.01018 -0.104153,-0.03186 -0.02199,-0.02169 -0.03765,-0.05348 -0.04533,-0.09557 -0.0033,-0.0171 -0.0057,-0.03608 -0.0074,-0.05514 -0.0016,-0.01905 -0.0027,-0.04434 -0.0049,-0.0772 0.0352,-0.0039 0.06378,-0.01144 0.08577,-0.02328 0.02199,-0.01184 0.03815,-0.02814 0.05024,-0.04656 0.0121,-0.01841 0.02134,-0.03941 0.02574,-0.06372 0.0044,-0.02431 0.0061,-0.05072 0.0061,-0.07965 l 0,-0.918987 c 0.01319,-0.0013 0.02737,-0.0035 0.04166,-0.0061 0.01208,-0.0026 0.02558,-0.0048 0.04044,-0.0061 0.01485,-0.0013 0.02859,-0.0012 0.04289,-0.0012 z m -2.88807,0.226584 c -0.05172,10e-7 -0.07842,0.04749 -0.07842,0.142136 l 0.159291,0 c -10e-7,-0.05388 -0.007,-0.09112 -0.01961,-0.111503 -0.01263,-0.02038 -0.03268,-0.03063 -0.06126,-0.03063 z m -2.0989682,0.04288 c -0.03738,2e-6 -0.06223,0.02061 -0.07597,0.06004 -0.01374,0.03944 -0.02083,0.09216 -0.02083,0.160518 l 0,0.0012 c -10e-7,0.03154 0.0016,0.06003 0.0049,0.087 0.0033,0.02696 0.0089,0.05069 0.01716,0.07107 0.0083,0.02038 0.01867,0.03718 0.03186,0.04901 0.01319,0.01184 0.03044,0.01715 0.05024,0.01715 0.01319,0 0.02293,-4.82e-4 0.03064,-0.0025 0.0077,-0.002 0.01383,-0.0036 0.01716,-0.0049 l 0,-0.425185 c -0.0066,-0.0053 -0.01528,-0.0078 -0.02574,-0.0098 -0.01046,-0.002 -0.02061,-0.0036 -0.0294,-0.0036 z m 2.9689422,0.0025 c -0.01869,0 -0.03447,0.0053 -0.04656,0.01715 -0.01209,0.01184 -0.02171,0.02806 -0.02941,0.04779 -0.0077,0.01972 -0.01317,0.04241 -0.01593,0.06739 -0.0028,0.02498 -0.0036,0.04969 -0.0036,0.07597 0,0.02893 8.96e-4,0.05703 0.0036,0.08333 0.0028,0.0263 0.0082,0.04946 0.01593,0.06985 0.0077,0.02039 0.01787,0.0372 0.02941,0.04901 0.01154,0.01182 0.02664,0.01715 0.04533,0.01715 0.01869,10e-7 0.03324,-0.0059 0.04533,-0.01838 0.0121,-0.01248 0.02159,-0.02864 0.02819,-0.04901 0.0066,-0.02038 0.01195,-0.04477 0.01471,-0.07107 0.0028,-0.0263 0.0036,-0.05317 0.0036,-0.08209 -1e-6,-0.05781 -0.0064,-0.106937 -0.01961,-0.147039 -0.01319,-0.0401 -0.03697,-0.06004 -0.07107,-0.06004 z m -2.7410332,1.226541 c 0.04507,1e-6 0.08384,0.0167 0.11518,0.05024 0.03134,0.03354 0.04656,0.07825 0.04656,0.134784 0,0.05653 -0.01522,0.101927 -0.04656,0.134785 -0.03135,0.03286 -0.07011,0.04901 -0.11518,0.04901 -0.04511,1e-6 -0.08263,-0.01615 -0.113954,-0.04901 -0.03133,-0.03286 -0.04779,-0.07826 -0.04779,-0.134785 0,-0.05653 0.01646,-0.101243 0.04779,-0.134784 0.03133,-0.03354 0.06885,-0.05024 0.113954,-0.05024 z m -1.428719,0.01715 c 0.02202,10e-7 0.04511,0.0016 0.06984,0.0049 0.02474,0.0033 0.0492,0.0081 0.07229,0.0147 0.0396,0.01183 0.07311,0.03024 0.101701,0.05391 0.02859,0.02367 0.04288,0.05823 0.04288,0.102927 0,0.01969 -0.0064,0.04612 -0.01961,0.07965 -0.0132,0.03353 -0.02936,0.06742 -0.05024,0.102927 -0.01758,-0.01184 -0.04112,-0.02305 -0.06862,-0.03553 -0.0275,-0.01248 -0.05769,-0.01961 -0.09067,-0.01961 -0.02859,10e-7 -0.05251,0.0093 -0.07229,0.02696 -0.01979,0.01774 -0.02941,0.04517 -0.02941,0.08333 l 0,0.04779 0.243838,0 0,0.294075 -0.243838,0 0,0.657994 -0.328385,0 0,-0.942268 c 0,-0.01709 6.89e-4,-0.04084 0.0012,-0.07107 5.51e-4,-0.03023 0.0014,-0.05388 0.0036,-0.07229 0.0143,-0.106481 0.0517,-0.187949 0.112729,-0.243838 0.06103,-0.05589 0.145998,-0.08455 0.254866,-0.08455 z m 3.4921522,0 c 0.02201,10e-7 0.04634,0.0016 0.07107,0.0049 0.02473,0.0033 0.04798,0.0081 0.07107,0.0147 0.0396,0.01183 0.07433,0.03024 0.102926,0.05391 0.02859,0.02367 0.04288,0.05823 0.04288,0.102927 -10e-7,0.01969 -0.0076,0.04612 -0.02083,0.07965 -0.0132,0.03353 -0.02936,0.06742 -0.05024,0.102927 -0.01758,-0.01184 -0.03989,-0.02305 -0.06739,-0.03553 -0.0275,-0.01248 -0.05892,-0.01961 -0.0919,-0.01961 -0.02859,10e-7 -0.05251,0.0093 -0.07229,0.02696 -0.01979,0.01774 -0.02941,0.04517 -0.02941,0.08333 l 0,0.04779 0.243838,0 0,0.294075 -0.243838,0 0,0.657994 -0.328385,0 0,-0.942268 c 0,-0.01709 6.88e-4,-0.04084 0.0012,-0.07107 5.51e-4,-0.03023 0.0014,-0.05388 0.0036,-0.07229 0.0143,-0.106481 0.0517,-0.187949 0.112729,-0.243838 0.06103,-0.05589 0.145997,-0.08455 0.254865,-0.08455 z m -3.0792212,0.01593 c 0.02641,2e-6 0.05246,0.0027 0.0772,0.0086 0.02474,0.0059 0.04625,0.01673 0.06494,0.03186 0.01869,0.01512 0.03379,0.03676 0.04534,0.06372 0.01154,0.02696 0.01716,0.06088 0.01716,0.102927 l 0,0.634714 c 0.0055,-0.02889 0.01486,-0.0575 0.02696,-0.08577 0.01209,-0.02827 0.02664,-0.05568 0.04533,-0.08333 l 0.08945,-0.136008 c 0.02088,-0.03153 0.04454,-0.05909 0.06984,-0.08209 0.0253,-0.023 0.05896,-0.03431 0.102927,-0.03431 0.0253,1e-6 0.05055,0.005 0.07474,0.01348 0.02419,0.0086 0.04625,0.01767 0.06494,0.02819 0.02088,0.01184 0.04012,0.02473 0.05881,0.0392 l -0.225458,0.378624 0.267119,0.487676 c -0.07259,0.03547 -0.139252,0.05269 -0.199726,0.05269 -0.05168,0 -0.09283,-0.01074 -0.122532,-0.03309 -0.0297,-0.02235 -0.05522,-0.05153 -0.07719,-0.087 l -0.105373,-0.175221 c -0.01869,-0.03021 -0.03433,-0.05947 -0.04533,-0.08577 -0.01101,-0.0263 -0.019,-0.05536 -0.02451,-0.08822 l 0,0.44724 -0.329611,0 0,-1.383381 c 0.01319,-0.0013 0.02737,-0.0035 0.04166,-0.0061 0.01208,-0.0026 0.02558,-0.0048 0.04043,-0.0061 0.01485,-0.0013 0.02859,-0.0025 0.04288,-0.0025 z m 1.447099,0 c 0.02641,2e-6 0.05124,0.0027 0.07597,0.0086 0.02474,0.0059 0.04748,0.01673 0.06617,0.03186 0.01869,0.01512 0.03379,0.03676 0.04534,0.06372 0.01154,0.02696 0.01716,0.06088 0.01716,0.102927 l 0,1.183655 c -0.04507,0.0171 -0.0861,0.02573 -0.121306,0.02573 -0.05057,0 -0.08959,-0.0076 -0.117631,-0.02206 -0.02804,-0.01446 -0.04875,-0.03392 -0.06249,-0.05759 -0.01374,-0.02367 -0.02176,-0.04997 -0.0245,-0.08087 -0.0027,-0.03089 -0.0036,-0.06384 -0.0036,-0.09802 l 0,-1.14322 c 0.01319,-0.0013 0.02614,-0.0035 0.04043,-0.0061 0.01208,-0.0026 0.02558,-0.0048 0.04043,-0.0061 0.01485,-0.0013 0.02982,-0.0025 0.04411,-0.0025 z m 0.9238892,0 c 0.02638,2e-6 0.05245,0.0027 0.0772,0.0086 0.02475,0.0059 0.04625,0.01673 0.06494,0.03186 0.01869,0.01512 0.03379,0.03676 0.04533,0.06372 0.01155,0.02696 0.01715,0.06088 0.01715,0.102927 l 0,1.191006 -0.247514,0 c -0.01651,0 -0.03093,-0.0043 -0.04411,-0.01348 -0.01319,-0.0092 -0.01961,-0.02861 -0.01961,-0.05882 -0.01541,0.02363 -0.03998,0.04465 -0.07352,0.06372 -0.03354,0.01908 -0.07563,0.02819 -0.126208,0.02819 -0.03738,0 -0.07398,-0.0063 -0.110278,-0.02083 -0.03629,-0.01446 -0.07012,-0.03983 -0.09925,-0.07597 -0.02912,-0.03615 -0.05169,-0.08582 -0.06984,-0.148263 -0.01816,-0.06245 -0.02818,-0.140576 -0.02818,-0.23526 0,-0.09465 0.0087,-0.175649 0.02573,-0.241388 0.01704,-0.06573 0.04003,-0.118548 0.06862,-0.159291 0.02859,-0.04074 0.06187,-0.06981 0.09925,-0.08822 0.03738,-0.01841 0.0757,-0.02818 0.116406,-0.02819 0.02637,0 0.05017,0.0032 0.07107,0.0098 0.02089,0.0066 0.03906,0.01473 0.05391,0.02328 0.01485,0.0086 0.02741,0.01718 0.03676,0.02573 0.0094,0.0086 0.01509,0.01445 0.01838,0.01839 l 0,-0.482775 c 0.01322,-0.0013 0.0274,-0.0035 0.04166,-0.0061 0.01211,-0.0026 0.02491,-0.0048 0.0392,-0.0061 0.0143,-0.0013 0.02859,-0.0025 0.04288,-0.0025 z m 4.294734,0.07474 c 0.07695,2e-6 0.142288,0.0151 0.197277,0.04533 0.05498,0.03023 0.0996,0.07507 0.134784,0.133559 0.03519,0.0585 0.06124,0.129715 0.0772,0.213206 0.01596,0.0835 0.0245,0.177793 0.02451,0.284272 -1e-6,0.216935 -0.03567,0.384142 -0.106601,0.501155 -0.07093,0.117013 -0.182604,0.17522 -0.333286,0.17522 -0.151759,0 -0.262493,-0.05601 -0.334513,-0.169093 -0.07202,-0.113081 -0.109053,-0.282483 -0.109053,-0.507282 0,-0.103871 0.0094,-0.197125 0.02696,-0.280596 0.01758,-0.08347 0.04458,-0.154708 0.08087,-0.213205 0.03629,-0.0585 0.08306,-0.103229 0.139686,-0.134785 0.05663,-0.03155 0.124083,-0.04779 0.202177,-0.04779 z m 0.956973,0 c 0.07148,2e-6 0.135489,0.01406 0.189925,0.04166 0.05444,0.02761 0.09973,0.06758 0.136009,0.118856 0.03627,0.05128 0.06272,0.113853 0.08087,0.187473 0.01816,0.07363 0.02818,0.155477 0.02819,0.247514 -2e-6,0.135409 -0.01656,0.252021 -0.04901,0.34799 -0.03246,0.09597 -0.0752,0.173573 -0.127434,0.234035 -0.05223,0.06046 -0.111692,0.105275 -0.17767,0.133559 -0.06598,0.02828 -0.131416,0.04166 -0.198502,0.04166 -0.03846,0 -0.06948,-0.0032 -0.09313,-0.0098 -0.02364,-0.0066 -0.04329,-0.01625 -0.05759,-0.02941 -0.0143,-0.01315 -0.02446,-0.02873 -0.02941,-0.04779 -0.005,-0.01905 -0.0074,-0.04234 -0.0074,-0.06861 0,-0.01974 0.0022,-0.04291 0.0049,-0.06985 0.0028,-0.02694 0.0052,-0.05011 0.0074,-0.06985 0.02198,0.0053 0.03962,0.0085 0.05391,0.0098 0.0143,0.0013 0.03155,0.0025 0.05024,0.0025 0.0253,0 0.05013,-0.0038 0.07597,-0.0098 0.02584,-0.0059 0.05043,-0.01495 0.07352,-0.0294 0.02309,-0.01446 0.04514,-0.0345 0.06494,-0.05881 0.0198,-0.02431 0.03582,-0.05507 0.04901,-0.0919 -0.0242,0.01841 -0.052,0.03199 -0.08332,0.0392 -0.03133,0.0073 -0.05924,0.0098 -0.08455,0.0098 -0.05279,0 -0.09888,-0.01188 -0.138461,-0.03553 -0.03959,-0.02365 -0.07285,-0.05432 -0.09925,-0.09313 -0.02639,-0.03879 -0.04684,-0.08353 -0.06004,-0.134786 -0.0132,-0.05126 -0.01961,-0.105269 -0.01961,-0.160516 0,-0.08545 0.01095,-0.158691 0.03185,-0.221782 0.02091,-0.06309 0.04961,-0.115978 0.087,-0.158066 0.03738,-0.04209 0.08162,-0.07399 0.131108,-0.09435 0.04949,-0.02036 0.102224,-0.03063 0.160518,-0.03063 z m -0.960649,0.302653 c -0.0198,10e-7 -0.03706,0.0058 -0.05024,0.01838 -0.01319,0.0125 -0.0236,0.03292 -0.03186,0.0625 -0.0082,0.02957 -0.01387,0.06842 -0.01715,0.116405 -0.0033,0.04799 -0.0049,0.106756 -0.0049,0.176446 0,0.138057 0.0079,0.235756 0.02328,0.291625 0.01539,0.05587 0.04237,0.08333 0.08087,0.08333 0.01869,0 0.03391,-0.0058 0.04656,-0.01839 0.01266,-0.0125 0.02362,-0.03414 0.03185,-0.06372 0.0082,-0.02957 0.01452,-0.06841 0.01838,-0.116404 0.0038,-0.04799 0.0049,-0.106756 0.0049,-0.176446 0,-0.06969 -0.0011,-0.12846 -0.0049,-0.176446 -0.0038,-0.04799 -0.01014,-0.08684 -0.01838,-0.116405 -0.0082,-0.02957 -0.01921,-0.04999 -0.03185,-0.0625 -0.01266,-0.01249 -0.02787,-0.01838 -0.04656,-0.01838 z m 0.9631,0.0012 c -0.02198,1e-6 -0.04029,0.01624 -0.05514,0.04779 -0.01485,0.03156 -0.02206,0.07903 -0.02206,0.142138 0,0.06439 0.0081,0.111322 0.02574,0.140911 0.0176,0.02959 0.04286,0.04411 0.07474,0.04411 0.02531,0 0.04759,-0.0032 0.06739,-0.0098 0.0022,-0.01969 0.0038,-0.03965 0.0049,-0.06004 0.0011,-0.02038 0.0012,-0.04137 0.0012,-0.06372 -10e-7,-0.03158 -8.95e-4,-0.06175 -0.0036,-0.09067 -0.0028,-0.02893 -0.0082,-0.05485 -0.01593,-0.0772 -0.0077,-0.02235 -0.01731,-0.04077 -0.0294,-0.05391 -0.0121,-0.01313 -0.02799,-0.01961 -0.04779,-0.01961 z m -3.624487,0.04166 c 0.09018,2e-6 0.1694,0.01615 0.236486,0.04901 0.02967,0.01448 0.05427,0.03231 0.07352,0.05269 0.01925,0.02038 0.02818,0.04468 0.02819,0.07229 -2e-6,0.02363 -0.0057,0.05167 -0.01838,0.08455 -0.01263,0.03288 -0.02786,0.0641 -0.04656,0.09435 -0.03303,-0.03025 -0.06788,-0.05446 -0.104151,-0.07352 -0.03628,-0.01905 -0.07289,-0.0294 -0.110278,-0.0294 -0.04728,1e-6 -0.07107,0.01737 -0.07107,0.05024 0,0.02103 0.0081,0.03661 0.02574,0.04779 0.01758,0.01117 0.03978,0.02029 0.06617,0.02819 0.02639,0.0079 0.05498,0.01709 0.08577,0.02696 0.03079,0.0099 0.05937,0.02439 0.08577,0.04411 0.02639,0.01972 0.04857,0.04669 0.06617,0.08087 0.0176,0.03418 0.02574,0.07958 0.02574,0.134785 0,0.105197 -0.03099,0.188742 -0.09313,0.25119 -0.06213,0.06245 -0.152028,0.09312 -0.270795,0.09312 -0.06819,0 -0.121351,-0.0058 -0.159291,-0.01838 -0.03794,-0.0125 -0.06747,-0.02483 -0.08944,-0.03798 -0.02859,-0.01709 -0.04906,-0.03599 -0.06004,-0.05637 -0.01099,-0.02038 -0.01593,-0.04137 -0.01593,-0.06372 0,-0.03418 0.0071,-0.06761 0.02083,-0.100475 0.01375,-0.03287 0.02898,-0.06526 0.04656,-0.0968 0.01319,0.01444 0.02829,0.02794 0.04533,0.04044 0.01705,0.01249 0.03534,0.0238 0.05514,0.03431 0.0198,0.01051 0.04038,0.01859 0.06126,0.02451 0.02089,0.0059 0.04147,0.0086 0.06126,0.0086 0.02859,0 0.04795,-0.0048 0.06004,-0.01593 0.0121,-0.01117 0.01839,-0.02579 0.01839,-0.04288 -1e-6,-0.01974 -0.0088,-0.03595 -0.02696,-0.04779 -0.01816,-0.01184 -0.041,-0.02145 -0.06739,-0.03063 -0.02639,-0.0092 -0.05512,-0.02002 -0.087,-0.03185 -0.03188,-0.01184 -0.06061,-0.02864 -0.087,-0.04901 -0.02639,-0.02038 -0.04926,-0.04735 -0.06739,-0.08087 -0.01814,-0.03352 -0.02696,-0.07719 -0.02696,-0.131109 0,-0.05256 0.0095,-0.0978 0.02818,-0.137235 0.01869,-0.03943 0.04341,-0.07238 0.07474,-0.09803 0.03133,-0.02564 0.06714,-0.04509 0.107829,-0.05759 0.04069,-0.0125 0.08355,-0.01839 0.128658,-0.01839 z m 0.812385,0 c 0.128668,2e-6 0.220155,0.03019 0.275696,0.09068 0.05554,0.06048 0.08332,0.156473 0.08333,0.287949 l 0,0.384749 c -10e-7,0.03286 0.003,0.06903 0.0074,0.107828 0.0044,0.03879 0.01069,0.07278 0.01838,0.101701 -0.01541,0.0053 -0.02958,0.009 -0.04166,0.01226 -0.01208,0.0033 -0.02397,0.0053 -0.03553,0.0074 -0.01156,0.002 -0.02412,0.0043 -0.03676,0.0049 -0.01263,6.66e-4 -0.02626,0 -0.04166,0 -0.08907,0 -0.140094,-0.03016 -0.15439,-0.09068 -0.01869,0.02235 -0.04703,0.04285 -0.08332,0.06127 -0.03629,0.01841 -0.08227,0.02819 -0.137235,0.02819 -0.0341,0 -0.06669,-0.0054 -0.09803,-0.01593 -0.03135,-0.01051 -0.05913,-0.02723 -0.08332,-0.05024 -0.0242,-0.023 -0.04329,-0.05321 -0.05759,-0.09067 -0.0143,-0.03748 -0.02083,-0.08331 -0.02083,-0.137235 -10e-7,-0.07623 0.0167,-0.137215 0.05024,-0.182571 0.03354,-0.04536 0.07346,-0.07926 0.121307,-0.102927 0.04784,-0.02367 0.09836,-0.03878 0.149489,-0.04533 0.05113,-0.0066 0.0948,-0.0098 0.131109,-0.0098 l 0,-0.02819 c -10e-7,-0.01841 -0.0031,-0.03293 -0.0086,-0.04411 -0.0055,-0.01118 -0.0127,-0.01982 -0.02206,-0.02573 -0.0094,-0.0059 -0.02044,-0.01028 -0.03309,-0.01226 -0.01266,-0.002 -0.02615,-0.0025 -0.04043,-0.0025 -0.03846,2e-6 -0.07656,0.0059 -0.113956,0.01839 -0.0374,0.01249 -0.0788,0.03249 -0.124982,0.05881 -0.0209,-0.03025 -0.03735,-0.06052 -0.04779,-0.08944 -0.01043,-0.02893 -0.01593,-0.0505 -0.01593,-0.06494 0,-0.01974 0.0062,-0.03863 0.01715,-0.05637 0.011,-0.01774 0.0333,-0.03663 0.06739,-0.05637 0.0297,-0.01841 0.0695,-0.03237 0.12008,-0.04288 0.05057,-0.01051 0.102825,-0.01593 0.155616,-0.01593 z m 1.017013,0 c 0.0341,2e-6 0.06842,0.0081 0.104151,0.02328 0.03573,0.01513 0.06888,0.03982 0.09802,0.07596 0.02914,0.03615 0.05293,0.08469 0.07107,0.145813 0.01814,0.06112 0.02696,0.137195 0.02696,0.227908 -10e-7,0.106522 -0.0095,0.193872 -0.02819,0.262218 -0.01869,0.06835 -0.04395,0.122866 -0.07474,0.162967 -0.03079,0.0401 -0.06499,0.0682 -0.102927,0.08333 -0.03794,0.01513 -0.07546,0.02206 -0.113954,0.02206 -0.02967,0 -0.05576,-0.0038 -0.0772,-0.01103 -0.02145,-0.0073 -0.03906,-0.01586 -0.05391,-0.02573 -0.01485,-0.0099 -0.0273,-0.0184 -0.03553,-0.02696 -0.0082,-0.0086 -0.01237,-0.01445 -0.01348,-0.01838 l 0,0.48645 -0.32716,0 0,-1.372355 c 0.0099,-0.0026 0.02235,-0.0048 0.03553,-0.0073 0.01208,-0.0026 0.02503,-0.0048 0.04044,-0.0061 0.01541,-0.0013 0.03289,-0.0025 0.05268,-0.0025 0.100075,2e-6 0.161933,0.03124 0.185023,0.09435 0.01869,-0.03025 0.04487,-0.05663 0.07842,-0.07965 0.03354,-0.02301 0.0787,-0.03431 0.134785,-0.03431 z m -4.8436772,0.01961 c 0.02641,2e-6 0.05124,0.0027 0.07597,0.0086 0.02474,0.0059 0.04748,0.01675 0.06617,0.03185 0.01869,0.0151 0.03379,0.03676 0.04534,0.06372 0.01154,0.02696 0.01716,0.06088 0.01716,0.102927 l 0,0.69843 c 0,0.02893 -0.0014,0.0651 -0.0036,0.107828 -0.0022,0.04273 -0.007,0.081 -0.01471,0.115179 -0.01212,0.0526 -0.03108,0.09685 -0.05636,0.132335 -0.02529,0.03548 -0.0532,0.06407 -0.08455,0.08577 -0.03134,0.02171 -0.06369,0.03615 -0.09557,0.04533 -0.03188,0.0092 -0.05901,0.0147 -0.0821,0.0147 -0.04728,0 -0.08215,-0.0114 -0.104152,-0.03308 -0.022,-0.02169 -0.03643,-0.05349 -0.04411,-0.09557 -0.0033,-0.01709 -0.0057,-0.03486 -0.0074,-0.05391 -0.0017,-0.01905 -0.0039,-0.04556 -0.0061,-0.07842 0.0352,-0.0039 0.06377,-0.01145 0.08577,-0.02328 0.022,-0.01184 0.03937,-0.02692 0.05146,-0.04533 0.0121,-0.01841 0.02011,-0.0394 0.02451,-0.06372 0.0044,-0.02431 0.0073,-0.05195 0.0073,-0.08087 l 0,-0.918987 c 0.01319,-0.0013 0.02614,-0.0023 0.04043,-0.0049 0.01208,-0.0026 0.02558,-0.0048 0.04043,-0.0061 0.01485,-0.0013 0.02982,-0.0025 0.04411,-0.0025 z m 4.6954142,0.262218 c -0.01322,10e-7 -0.02417,0.0017 -0.03186,0.0036 -0.0076,0.002 -0.0126,0.0036 -0.01593,0.0049 l 0,0.398228 c 0.0066,0.0053 0.01405,0.0091 0.02451,0.01103 0.01045,0.002 0.02061,0.0025 0.02941,0.0025 0.03738,0 0.06345,-0.02101 0.0772,-0.06372 0.01374,-0.04271 0.01961,-0.09828 0.01961,-0.166642 0,-0.05918 -0.0073,-0.106164 -0.02206,-0.139687 -0.01485,-0.03352 -0.04131,-0.05024 -0.08087,-0.05024 z m -3.5044052,0.0086 c -0.03013,0.0043 -0.05047,0.02431 -0.0625,0.05881 -0.01375,0.03944 -0.02083,0.09338 -0.02083,0.161742 0,0.03154 0.0016,0.06126 0.0049,0.08822 0.0033,0.02696 0.0089,0.04946 0.01715,0.06985 0.0082,0.02038 0.01867,0.03718 0.03186,0.04901 0.01319,0.01184 0.03044,0.01715 0.05024,0.01715 0.01319,0 0.02293,-4.59e-4 0.03063,-0.0025 0.0077,-0.002 0.01383,-0.0036 0.01715,-0.0049 l 0,-0.42396 c -0.0066,-0.0053 -0.01527,-0.0091 -0.02574,-0.01103 -0.01045,-0.002 -0.02061,-0.0025 -0.0294,-0.0025 -0.0047,0 -0.0092,-6.2e-4 -0.01348,0 z m 2.6871182,0.24629 c -0.02088,0.0026 -0.04133,0.007 -0.06004,0.01226 -0.01871,0.0053 -0.03527,0.01221 -0.04901,0.02206 -0.01374,0.0099 -0.02362,0.02219 -0.03185,0.03798 -0.0082,0.01579 -0.01348,0.03631 -0.01348,0.06126 0,0.03025 0.0071,0.05341 0.02083,0.06985 0.01375,0.01643 0.03339,0.02574 0.05759,0.02574 0.0198,0 0.0373,-0.0054 0.05269,-0.01593 0.01539,-0.01051 0.02328,-0.02673 0.02328,-0.04779 l 0,-0.165418 z m 3.50073,0.104151 c 0.04617,0 0.08358,0.01671 0.112729,0.05024 0.02914,0.03353 0.04411,0.07723 0.04411,0.131109 -1e-6,0.05392 -0.01418,0.09871 -0.04166,0.133559 -0.02748,0.03484 -0.06568,0.05146 -0.11518,0.05146 -0.0484,0 -0.08714,-0.01662 -0.11518,-0.05146 -0.02804,-0.03484 -0.04166,-0.07964 -0.04166,-0.133559 0,-0.05389 0.01564,-0.09759 0.04533,-0.131109 0.0297,-0.03352 0.06643,-0.05024 0.111503,-0.05024 z m -5.594795,0.877327 c 0.04507,1e-6 0.08261,0.0167 0.113954,0.05024 0.03135,0.03354 0.04779,0.07948 0.04779,0.13601 0,0.05653 -0.01644,0.100701 -0.04779,0.133559 -0.03135,0.03286 -0.06888,0.04901 -0.113954,0.04901 -0.0451,1e-6 -0.08385,-0.01615 -0.115181,-0.04901 -0.03132,-0.03286 -0.04656,-0.07703 -0.04656,-0.133559 0,-0.05653 0.01523,-0.102467 0.04656,-0.13601 0.03133,-0.03354 0.07007,-0.05024 0.115181,-0.05024 z m -1.2939352,0.01839 c 0.02202,1e-6 0.04633,0.0016 0.07107,0.0049 0.02474,0.0033 0.04798,0.0081 0.07107,0.01471 0.0396,0.01184 0.07433,0.02902 0.102927,0.05268 0.02859,0.02367 0.04288,0.05823 0.04288,0.102926 0,0.0197 -0.0076,0.04612 -0.02083,0.07965 -0.0132,0.03352 -0.02936,0.06864 -0.05024,0.104152 -0.01758,-0.01184 -0.04112,-0.02429 -0.06862,-0.03676 -0.0275,-0.01248 -0.05769,-0.01838 -0.09067,-0.01838 -0.02859,10e-7 -0.05251,0.008 -0.07229,0.02573 -0.01978,0.01773 -0.02941,0.04639 -0.02941,0.08455 l 0,0.04656 0.243838,0 0,0.294076 -0.243838,0 0,0.65922 -0.328385,0 0,-0.943494 c 0,-0.01709 6.89e-4,-0.03961 0.0012,-0.06985 5.51e-4,-0.03023 0.0014,-0.05511 0.0036,-0.07352 0.0143,-0.10648 0.0517,-0.187949 0.112729,-0.243839 0.06103,-0.05589 0.145997,-0.08332 0.254866,-0.08332 z m 1.9715342,0 c 0.02202,1e-6 0.04633,0.0016 0.07107,0.0049 0.02473,0.0033 0.04798,0.0081 0.07107,0.01471 0.0396,0.01184 0.07433,0.02902 0.102927,0.05268 0.02859,0.02367 0.04288,0.05823 0.04288,0.102926 0,0.0197 -0.0064,0.04612 -0.01961,0.07965 -0.0132,0.03352 -0.03058,0.06864 -0.05146,0.104152 -0.01758,-0.01184 -0.03989,-0.02429 -0.06739,-0.03676 -0.0275,-0.01248 -0.05768,-0.01838 -0.09068,-0.01838 -0.02859,10e-7 -0.05373,0.008 -0.07352,0.02573 -0.01979,0.01773 -0.02941,0.04639 -0.02941,0.08455 l 0,0.04656 0.243838,0 0,0.294076 -0.243838,0 0,0.65922 -0.328384,0 0,-0.943494 c 0,-0.01709 6.89e-4,-0.03961 0.0012,-0.06985 5.51e-4,-0.03023 0.0014,-0.05511 0.0036,-0.07352 0.0143,-0.10648 0.0517,-0.187949 0.112731,-0.243839 0.06103,-0.05589 0.145996,-0.08332 0.254865,-0.08332 z m 2.021773,0.01593 c 0.02641,2e-6 0.05123,0.0027 0.07597,0.0086 0.02473,0.0059 0.04625,0.01673 0.06494,0.03185 0.01869,0.01513 0.03379,0.03553 0.04533,0.06249 0.01155,0.02696 0.01715,0.06211 0.01715,0.104153 l 0,0.634713 c 0.0055,-0.02889 0.01485,-0.0575 0.02696,-0.08577 0.0121,-0.02827 0.02786,-0.0569 0.04656,-0.08455 l 0.08822,-0.13601 c 0.02088,-0.03153 0.04454,-0.05786 0.06985,-0.08087 0.02531,-0.023 0.06019,-0.03553 0.104152,-0.03553 0.02531,0 0.04932,0.005 0.07352,0.01348 0.02419,0.0086 0.04625,0.01767 0.06494,0.02819 0.02087,0.01184 0.04012,0.02473 0.05881,0.0392 l -0.225459,0.378622 0.267119,0.487676 c -0.07259,0.03547 -0.139252,0.05269 -0.199726,0.05269 -0.05168,0 -0.09283,-0.01073 -0.122532,-0.03308 -0.0297,-0.02235 -0.05521,-0.05153 -0.0772,-0.087 l -0.105376,-0.17522 c -0.01869,-0.03021 -0.0331,-0.05825 -0.04411,-0.08455 -0.01101,-0.0263 -0.02023,-0.0566 -0.02574,-0.08944 l 0,0.448467 -0.32961,0 0,-1.384607 c 0.01319,-0.0013 0.02737,-0.0035 0.04166,-0.0061 0.01208,-0.0026 0.02558,-0.0048 0.04043,-0.0061 0.01485,-0.0013 0.02982,-0.0012 0.04411,-0.0012 z m 0.985154,0 c 0.02641,2e-6 0.05246,0.0027 0.0772,0.0086 0.02473,0.0059 0.04625,0.01673 0.06494,0.03185 0.01869,0.01513 0.03379,0.03553 0.04533,0.06249 0.01155,0.02696 0.01715,0.06211 0.01715,0.104153 l 0,1.182429 c -0.04508,0.0171 -0.08488,0.02574 -0.120082,0.02574 -0.05057,0 -0.08959,-0.0063 -0.11763,-0.02083 -0.02804,-0.01446 -0.04997,-0.03393 -0.06372,-0.05759 -0.01375,-0.02367 -0.02175,-0.0512 -0.02451,-0.08209 -0.0028,-0.03089 -0.0036,-0.06384 -0.0036,-0.09803 l 0,-1.143221 c 0.01319,-0.0013 0.02614,-0.0035 0.04044,-0.0061 0.01208,-0.0026 0.02558,-0.0048 0.04044,-0.0061 0.01485,-0.0013 0.02982,-0.0012 0.04411,-0.0012 z m -4.3094382,0.419058 c 0.06709,10e-7 0.124258,0.01187 0.1715442,0.03553 0.04728,0.02366 0.08604,0.05614 0.11518,0.09557 0.02915,0.03944 0.0493,0.08466 0.0625,0.137236 0.01319,0.05258 0.02083,0.108789 0.02083,0.166643 -1e-6,0.0066 -1e-6,0.01456 0,0.02574 -1e-6,0.01117 -6.66e-4,0.02247 -0.0012,0.03431 -5.74e-4,0.01184 -6.89e-4,0.0238 -0.0012,0.03431 -5.51e-4,0.01051 -0.0013,0.01802 -0.0025,0.02328 l -0.4411142,0 c 0.0055,0.04994 0.02128,0.09258 0.04657,0.127434 0.02529,0.03484 0.06523,0.05268 0.121305,0.05268 0.044,0 0.08182,-0.0088 0.1115042,-0.02451 0.02969,-0.01577 0.05852,-0.03617 0.08822,-0.06249 0.0143,0.02632 0.02859,0.05649 0.04289,0.09067 0.01429,0.03418 0.02205,0.0644 0.02206,0.09068 -2e-6,0.02235 -0.0048,0.04277 -0.01471,0.0625 -0.0099,0.01972 -0.02742,0.03918 -0.05268,0.05759 -0.0242,0.01709 -0.05678,0.03105 -0.09802,0.04289 -0.04125,0.01184 -0.0928,0.01838 -0.1543902,0.01838 -0.04508,0 -0.09411,-0.0065 -0.145813,-0.01961 -0.0517,-0.01316 -0.09938,-0.03908 -0.143363,-0.0772 -0.04398,-0.03812 -0.07991,-0.09149 -0.109053,-0.160516 -0.02915,-0.06902 -0.04411,-0.159057 -0.04411,-0.270795 0,-0.08285 0.01189,-0.155193 0.03553,-0.215656 0.02364,-0.06046 0.05396,-0.110049 0.0919,-0.149488 0.03794,-0.03943 0.08216,-0.06859 0.131109,-0.087 0.04894,-0.01841 0.09757,-0.02818 0.147037,-0.02818 z m 1.9629572,0 c 0.128668,10e-7 0.22138,0.03141 0.276921,0.0919 0.05554,0.06048 0.08333,0.155247 0.08333,0.286724 l 0,0.384748 c 0,0.03286 0.0017,0.06903 0.0061,0.107828 0.0044,0.03879 0.01069,0.07278 0.01838,0.101702 -0.01541,0.0053 -0.02958,0.009 -0.04166,0.01226 -0.01208,0.0033 -0.02275,0.0066 -0.03431,0.0086 -0.01156,0.002 -0.02412,0.0031 -0.03676,0.0036 -0.01263,6.66e-4 -0.02626,0.0012 -0.04166,0.0012 -0.08907,0 -0.141318,-0.03016 -0.155615,-0.09067 -0.01869,0.02235 -0.0458,0.04285 -0.08209,0.06126 -0.03629,0.01841 -0.08226,0.02696 -0.137236,0.02696 -0.0341,0 -0.06669,-0.0054 -0.09802,-0.01593 -0.03135,-0.01051 -0.05913,-0.02723 -0.08332,-0.05024 -0.0242,-0.023 -0.04329,-0.0532 -0.05759,-0.09068 -0.0143,-0.03748 -0.02206,-0.08331 -0.02206,-0.137234 0,-0.07623 0.0167,-0.13599 0.05024,-0.181347 0.03354,-0.04535 0.0747,-0.08048 0.122532,-0.104153 0.04784,-0.02367 0.09713,-0.03877 0.148263,-0.04533 0.05113,-0.0066 0.0948,-0.0098 0.131109,-0.0098 l 0,-0.02819 c 0,-0.01841 -0.0031,-0.03293 -0.0086,-0.04411 -0.0055,-0.01118 -0.0127,-0.01982 -0.02206,-0.02572 -0.0094,-0.0059 -0.02044,-0.0091 -0.03308,-0.01103 -0.01265,-0.002 -0.02615,-0.0036 -0.04044,-0.0036 -0.03846,1e-6 -0.07655,0.0072 -0.113954,0.01961 -0.0374,0.01249 -0.07881,0.03127 -0.124982,0.05759 -0.02091,-0.03025 -0.03612,-0.0593 -0.04656,-0.08822 -0.01043,-0.02893 -0.01593,-0.05173 -0.01593,-0.06617 0,-0.01974 0.005,-0.0374 0.01593,-0.05514 0.011,-0.01773 0.03452,-0.03663 0.06861,-0.05637 0.0297,-0.01841 0.0695,-0.0336 0.120081,-0.04411 0.05057,-0.01051 0.101599,-0.01592 0.15439,-0.01593 z m 0.796455,0 c 0.09018,10e-7 0.168174,0.01737 0.235261,0.05024 0.02967,0.01449 0.05427,0.03108 0.07352,0.05146 0.01924,0.02038 0.0294,0.04468 0.02941,0.07229 0,0.02363 -0.007,0.05167 -0.01961,0.08455 -0.01263,0.03289 -0.02786,0.06532 -0.04656,0.09558 -0.03303,-0.03025 -0.06787,-0.05568 -0.10415,-0.07474 -0.03628,-0.01905 -0.07289,-0.02818 -0.11028,-0.02818 -0.04728,1e-6 -0.07107,0.01615 -0.07107,0.04901 0,0.02103 0.0094,0.03784 0.02696,0.04901 0.01758,0.01118 0.03978,0.02029 0.06617,0.02819 0.02639,0.0079 0.05498,0.01709 0.08577,0.02696 0.03078,0.0099 0.05938,0.02439 0.08577,0.04411 0.02639,0.01972 0.04734,0.04669 0.06494,0.08087 0.0176,0.03418 0.02696,0.07835 0.02696,0.133559 0,0.105199 -0.03098,0.188743 -0.09313,0.25119 -0.06213,0.06245 -0.153252,0.09435 -0.27202,0.09435 -0.06819,0 -0.121352,-0.0058 -0.159291,-0.01838 -0.03794,-0.0125 -0.06747,-0.02605 -0.08944,-0.0392 -0.02859,-0.0171 -0.04782,-0.03599 -0.05881,-0.05637 -0.01099,-0.02038 -0.01715,-0.04137 -0.01715,-0.06372 0,-0.03418 0.0071,-0.06761 0.02083,-0.100477 0.01375,-0.03286 0.02898,-0.06526 0.04656,-0.0968 0.01319,0.01444 0.02828,0.02794 0.04533,0.04044 0.01705,0.01249 0.03656,0.0238 0.05637,0.03431 0.0198,0.01051 0.03916,0.01858 0.06004,0.02451 0.02088,0.0059 0.04147,0.0098 0.06126,0.0098 0.02859,0 0.04917,-0.006 0.06126,-0.01715 0.0121,-0.01118 0.01838,-0.02579 0.01838,-0.04289 -10e-7,-0.01974 -0.0088,-0.03473 -0.02696,-0.04656 -0.01815,-0.01184 -0.041,-0.02267 -0.06739,-0.03186 -0.02639,-0.0092 -0.05512,-0.02002 -0.087,-0.03185 -0.03188,-0.01184 -0.06183,-0.02741 -0.08822,-0.04779 -0.02639,-0.02038 -0.04802,-0.04735 -0.06617,-0.08087 -0.01814,-0.03353 -0.02696,-0.07719 -0.02696,-0.131109 0,-0.05256 0.0083,-0.09902 0.02696,-0.13846 0.01869,-0.03943 0.04464,-0.07239 0.07597,-0.09803 0.03133,-0.02564 0.06714,-0.04387 0.107829,-0.05637 0.04068,-0.0125 0.08355,-0.01961 0.128658,-0.01961 z m -2.163909,0.02083 c 0.02641,2e-6 0.05123,0.0027 0.07597,0.0086 0.02473,0.0059 0.04625,0.01675 0.06494,0.03185 0.01869,0.0151 0.03379,0.03553 0.04533,0.06249 0.01154,0.02696 0.01715,0.06211 0.01715,0.104152 l 0,0.697205 c -1e-6,0.02893 -2.27e-4,0.0651 -0.0025,0.107828 -0.0022,0.04273 -0.007,0.081 -0.01471,0.115179 -0.01211,0.0526 -0.03108,0.09685 -0.05637,0.132335 -0.02529,0.03548 -0.05321,0.06407 -0.08455,0.08577 -0.03135,0.02171 -0.06369,0.03738 -0.09557,0.04656 -0.03188,0.0092 -0.05901,0.01348 -0.08209,0.01348 -0.04728,-10e-7 -0.08215,-0.01017 -0.104151,-0.03185 -0.02199,-0.02169 -0.03643,-0.05472 -0.04411,-0.0968 -0.0033,-0.0171 -0.0057,-0.03486 -0.0074,-0.05391 -0.0016,-0.01905 -0.0039,-0.04434 -0.0061,-0.0772 0.03521,-0.0039 0.06377,-0.01268 0.08577,-0.02451 0.02199,-0.01184 0.03937,-0.02692 0.05146,-0.04533 0.0121,-0.01841 0.02011,-0.03941 0.0245,-0.06372 0.0044,-0.02431 0.0061,-0.05072 0.0061,-0.07965 l 0,-0.918986 c 0.01319,-0.0013 0.02737,-0.0035 0.04166,-0.0061 0.01208,-0.0026 0.02558,-0.0048 0.04044,-0.0061 0.01485,-0.0013 0.02982,-0.0012 0.04411,-0.0012 z m -0.5991792,0.226675 c -0.05172,2e-6 -0.0772,0.04749 -0.0772,0.142138 l 0.158066,0 c -10e-7,-0.05389 -0.0057,-0.09112 -0.01838,-0.111505 -0.01263,-0.02038 -0.0339,-0.03063 -0.0625,-0.03063 z m 2.0180962,0.289175 c -0.02088,0.0026 -0.0401,0.007 -0.05881,0.01226 -0.01871,0.0053 -0.03527,0.01221 -0.04901,0.02206 -0.01375,0.0099 -0.02485,0.02343 -0.03309,0.0392 -0.0082,0.01579 -0.01226,0.03631 -0.01226,0.06127 -1e-6,0.03025 0.0071,0.05341 0.02083,0.06985 0.01375,0.01643 0.03217,0.0245 0.05637,0.0245 0.0198,0 0.0373,-0.0054 0.05269,-0.01593 0.01539,-0.01051 0.02328,-0.02673 0.02328,-0.04779 l 0,-0.165418 z"
+     id="rect3812"
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.75;fill:#b26609;fill-opacity:1;stroke:none;stroke-width:35;marker:none;enable-background:accumulate"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 5.0936108,17.253631 12.8311602,0 0.715901,0.991248 -14.2543372,0 0.707276,-0.991248 z"
+     id="path4453"
+     sodipodi:nodetypes="ccccc"
+     style="opacity:0.75;fill:#b26609;fill-opacity:1;stroke:#b26609;stroke-width:0.50756156;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 4.2208678,20.920967 14.5766442,0 10e-7,-1.707149 -14.5680182,0 -0.0086,1.707149 z"
+     id="path4457"
+     sodipodi:nodetypes="ccccc"
+     style="opacity:0.75;fill:#b26609;fill-opacity:1;stroke:#b26609;stroke-width:0.50756156;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/navit/xpm/menu.svg b/navit/icons/menu.svg
index ae79e781a..ae79e781a 100644
--- a/navit/xpm/menu.svg
+++ b/navit/icons/menu.svg
diff --git a/navit/xpm/military.svg b/navit/icons/military.svg
index 2c2e5b954..bce2b7b95 100644
--- a/navit/xpm/military.svg
+++ b/navit/icons/military.svg
@@ -9,15 +9,15 @@
    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"
-   width="23.466667"
-   height="23.466667"
+   width="22"
+   height="22"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.1 r15371"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="military.svg"
-   viewBox="0 0 22 22">
+   viewBox="0 0 20.625 20.625">
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -26,32 +26,32 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="16.931818"
-     inkscape:cx="15.470312"
+     inkscape:cx="15.706554"
      inkscape:cy="10.339309"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1366"
-     inkscape:window-height="722"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:pagecheckerboard="true" />
   <defs
      id="defs4">
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18108 : 1"
-       inkscape:vp_y="0 : 999.99998 : 0"
-       inkscape:vp_z="744.09446 : 526.18108 : 1"
-       inkscape:persp3d-origin="372.04723 : 350.78738 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
        id="perspective10" />
     <inkscape:perspective
        id="perspective2824"
-       inkscape:persp3d-origin="0.49999999 : 0.33333332 : 1"
-       inkscape:vp_z="0.99999998 : 0.49999999 : 1"
-       inkscape:vp_y="0 : 999.99998 : 0"
-       inkscape:vp_x="0 : 0.49999999 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
   </defs>
   <metadata
@@ -70,11 +70,11 @@
      inkscape:label="Capa 1"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-104.18734,-215.98288)">
+     transform="translate(-104.18734,-217.35788)">
     <g
        style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:44.70473862;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="g2847-1"
-       transform="matrix(0.06116663,0,0,0.06116663,80.400549,206.75954)">
+       transform="matrix(0.05774239,0,0,0.05774389,81.668765,209.12131)">
       <g
          style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:76.43066406;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          transform="matrix(0.58490579,0,0,0.58490579,-81.984403,63.627373)"
@@ -86,15 +86,15 @@
         <g
            style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:76.43066406;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            id="g3731-9"
-           transform="rotate(-45,303.60099,350.37994)" />
+           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-158.83336,317.30223)" />
         <g
            style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:76.43066406;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           transform="rotate(-90,305.73144,436.37995)"
+           transform="matrix(0,-1,1,0,-130.64851,742.11139)"
            id="g3737-6" />
         <g
            style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:76.43066406;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            id="g3743-9"
-           transform="rotate(-135,306.6139,472.0023)" />
+           transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,189.66664,1022.5671)" />
       </g>
       <g
          style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:99.01612854;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -106,19 +106,19 @@
            transform="translate(121.62237,-3.0129153)" />
         <g
            style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:99.01612854;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           transform="rotate(-45,303.60099,350.37994)"
+           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-158.83336,317.30223)"
            id="g4297-3" />
         <g
            style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:99.01612854;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            id="g4303-4"
-           transform="rotate(-90,305.73144,436.37995)" />
+           transform="matrix(0,-1,1,0,-130.64851,742.11139)" />
         <g
            style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:99.01612854;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           transform="rotate(-135,306.6139,472.0023)"
+           transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,189.66664,1022.5671)"
            id="g4309-5">
           <path
-             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-             d="m 67.636516,475.49769 c -4.263,-0.14424 -8.45541,-0.0554 -12.53125,0.25586 -32.60676,2.49023 -61.2085795,15.2664 -84.53907,34.46094 l -1.74218,1.43359 -1.60547,1.5879 c -86.623666,85.61974 -172.220266,171.92435 -258.058606,257.64061 -49.33781,43.9796 -91.78438,115.86673 -69.24218,194.51563 5.88029,25.51024 19.71576,46.80858 39.38086,61.84958 l 38.31445,18.0294 c 23.68323,4.9863 51.4268,1.3002 73.5918,-13.3243 l 13.35546,-2.418 c 13.86274,-2.5097 31.53064,-3.1569 51.19727,-5.3183 -21.15909,19.977 -42.31747,39.9546 -63.47656,59.9316 -8.31168,1.2148 -16.13161,3.6123 -22.65235,6.961 -16.07067,8.253 -26.4711,19.8341 -34.09961,32.0508 -7.6285,12.2167 -12.72082,25.4061 -14.07421,41.2519 -1.35339,15.8458 1.66432,37.3111 18.09375,54.5508 l 0.31054,0.3262 0.31836,0.3222 c 6.91251,6.9935 16.50817,22.2579 39.36524,36.5723 11.42853,7.1572 28.73208,13.7571 47.68164,12.1328 16.4035,-1.4061 31.06453,-8.6547 43.03515,-17.8379 14.03853,-8.7567 23.68229,-22.4957 28.08203,-32.5625 4.523042,-10.3489 5.852612,-17.4531 6.919932,-22.2441 l 0.0156,-0.01 6.91797,-7.3242 c 48.478854,-51.332 96.9567145,-102.6642 145.435554,-153.9962 50.398434,1.2352 102.838894,-15.5318 140.244134,-56.69135 51.29157,-47.4547 74.24879,-125.5989 39.58398,-193.88868 l 0.0977,0.19336 c -3.33329,-6.63827 -9.32873,-22.1619 -16.99414,-38.23633 -1.32466,-2.77781 -2.61131,-5.80453 -3.91406,-8.79296 l 1.32031,-1.27735 1.83789,-17.97656 c 2.02315,-19.79986 0.97791,-41.16356 -4.26953,-63.70508 -3.78553,-16.26153 -8.43551,-35.70854 -23.99414,-51.77733 0.8844,-9.1687 0.49634,-18.15048 -1.46875,-26.35156 -4.72042,-19.70016 -14.03017,-35.48326 -25.58789,-48.51368 v -0.0156 l -0.0273,-0.0117 c -5.00675,-5.641 -10.442,-10.73799 -16.11726,-15.41974 -21.70228,-24.39796 -52.734944,-35.42857 -80.705064,-36.375 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+             d="m 67.636516,475.49769 c -4.263,-0.14424 -8.45541,-0.0554 -12.53125,0.25586 -32.60676,2.49023 -61.2085795,15.2664 -84.53907,34.46094 l -1.74218,1.43359 -1.60547,1.5879 c -86.623666,85.61974 -172.220266,171.92435 -258.058606,257.64061 -49.33781,43.9796 -91.78438,115.86673 -69.24218,194.51563 5.88029,25.51024 19.71576,46.80858 39.38086,61.84958 l 38.31445,18.0294 c 23.68323,4.9863 51.4268,1.3002 73.5918,-13.3243 l 13.35546,-2.418 c 13.86274,-2.5097 31.53064,-3.1569 51.19727,-5.3183 -21.15909,19.977 -42.31747,39.9546 -63.47656,59.9316 -8.31168,1.2148 -16.13161,3.6123 -22.65235,6.961 -16.07067,8.253 -26.4711,19.8341 -34.09961,32.0508 -7.6285,12.2167 -12.72082,25.4061 -14.07421,41.2519 -1.35339,15.8458 1.66432,37.3111 18.09375,54.5508 l 0.31054,0.3262 0.31836,0.3222 c 6.91251,6.9935 16.50817,22.2579 39.36524,36.5723 11.42853,7.1572 28.73208,13.7571 47.68164,12.1328 16.4035,-1.4061 31.06453,-8.6547 43.03515,-17.8379 14.03853,-8.7567 23.68229,-22.4957 28.08203,-32.5625 4.523042,-10.3489 5.852612,-17.4531 6.919932,-22.2441 l 0.0156,-0.01 6.91797,-7.3242 c 48.478854,-51.332 96.9567145,-102.6642 145.435554,-153.9962 50.398434,1.2352 102.838894,-15.5318 140.244134,-56.69135 51.29157,-47.4547 74.24879,-125.5989 39.58398,-193.88868 l 0.0977,0.19336 c -3.33329,-6.63827 -9.32873,-22.1619 -16.99414,-38.23633 -1.32466,-2.77781 -2.61131,-5.80453 -3.91406,-8.79296 l 1.32031,-1.27735 1.83789,-17.97656 c 2.02315,-19.79986 0.97791,-41.16356 -4.26953,-63.70508 -3.78553,-16.26153 -8.43551,-35.70854 -23.99414,-51.77733 0.8844,-9.1687 0.49634,-18.15048 -1.46875,-26.35156 -4.72042,-19.70016 -14.03017,-35.48326 -25.58789,-48.51368 l 0,-0.0156 -0.0273,-0.0117 c -5.00675,-5.641 -10.442,-10.73799 -16.11726,-15.41974 -21.70228,-24.39796 -52.734944,-35.42857 -80.705064,-36.375 z"
              id="rect4313-1"
              inkscape:connector-curvature="0"
              sodipodi:nodetypes="sscccccccccccssscccsscscccccccccccscsccccs" />
@@ -127,20 +127,20 @@
     </g>
     <g
        id="g4732"
-       transform="matrix(0.96464904,0,0,0.96464904,3.9525559,7.7687785)">
+       transform="matrix(0.91064582,0,0,0.91066967,9.5005028,21.265575)">
       <g
          transform="matrix(0.06340817,0,0,0.06340817,98.757867,207.60389)"
          id="g2847">
         <path
            inkscape:connector-curvature="0"
            style="fill:#000000;fill-opacity:1;stroke:none"
-           d="m 218.71062,215.98288 c -10.86291,0 -13.25923,0.2994 -19.26724,2.42651 -9.37456,3.31904 -18.02598,7.1226 -24.15647,14.1607 -12.18657,13.99078 -21.29537,51.42758 -21.29537,51.42758 l 9.45254,0.32595 c 5.19644,0.17257 34.3183,0.39716 64.71907,0.50703 l 55.26654,0.2173 -0.57946,-8.83685 c -0.29241,-4.45147 -0.90216,-8.48097 -1.88327,-12.34986 l 110.85898,3.1856 8.08919,7.7655 19.689,-6.96728 v -29.11815 l -18.49282,-7.5839 -10.45497,8.41139 -119.28678,3.40985 c -7.66985,-10.98332 -19.29435,-19.56372 -33.39171,-24.55486 -6.00799,-2.12711 -8.40435,-2.42651 -19.26723,-2.42651 z"
+           d="m 218.71062,215.98288 c -10.86291,0 -13.25923,0.2994 -19.26724,2.42651 -9.37456,3.31904 -18.02598,7.1226 -24.15647,14.1607 -12.18657,13.99078 -21.29537,51.42758 -21.29537,51.42758 l 9.45254,0.32595 c 5.19644,0.17257 34.3183,0.39716 64.71907,0.50703 l 55.26654,0.2173 -0.57946,-8.83685 c -0.29241,-4.45147 -0.90216,-8.48097 -1.88327,-12.34986 l 110.85898,3.1856 8.08919,7.7655 19.689,-6.96728 0,-29.11815 -18.49282,-7.5839 -10.45497,8.41139 -119.28678,3.40985 c -7.66985,-10.98332 -19.29435,-19.56372 -33.39171,-24.55486 -6.00799,-2.12711 -8.40435,-2.42651 -19.26723,-2.42651 z"
            id="path3686"
            sodipodi:nodetypes="csacccccccccccccsc" />
         <path
            inkscape:connector-curvature="0"
            style="fill:#000000;fill-opacity:1;stroke:none"
-           d="m 142.70685,286.96743 c -6.4047,5.33714 -10.79456,7.68399 -22.16456,34.04361 h 227.44029 c -16.60433,-10.84152 -21.47892,-21.269 -49.97892,-32.269 l -64.75529,-0.6519 c -35.60517,-0.36038 -70.51337,-0.78168 -77.61219,-0.90541 z"
+           d="m 142.70685,286.96743 c -6.4047,5.33714 -10.79456,7.68399 -22.16456,34.04361 l 227.44029,0 c -16.60433,-10.84152 -21.47892,-21.269 -49.97892,-32.269 l -64.75529,-0.6519 c -35.60517,-0.36038 -70.51337,-0.78168 -77.61219,-0.90541 z"
            id="path2827"
            sodipodi:nodetypes="ccccccc" />
         <circle
@@ -153,7 +153,7 @@
         <path
            inkscape:connector-curvature="0"
            style="fill:none;stroke:#000000;stroke-width:8;stroke-miterlimit:4;stroke-opacity:1"
-           d="m 131.17872,327.57773 h 217.3833 c 0,0 26.2498,-0.35818 28.18377,11.33452 7.89518,47.73383 -52.18377,54.42641 -52.18377,54.42641 h -177.3833 c -16.06123,0 -38.99138,-12.93015 -38.99138,-28.99138 v -13.77817 c 0,-16.06123 6.93015,-22.99138 22.99138,-22.99138 z"
+           d="m 131.17872,327.57773 217.3833,0 c 0,0 26.2498,-0.35818 28.18377,11.33452 7.89518,47.73383 -52.18377,54.42641 -52.18377,54.42641 l -177.3833,0 c -16.06123,0 -38.99138,-12.93015 -38.99138,-28.99138 l 0,-13.77817 c 0,-16.06123 6.93015,-22.99138 22.99138,-22.99138 z"
            id="rect3619"
            sodipodi:nodetypes="ccsccccc" />
         <g
@@ -187,7 +187,7 @@
                ry="6.0104074" />
           </g>
           <g
-             transform="rotate(-45,303.60099,350.37994)"
+             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-158.83336,317.30223)"
              id="g3731">
             <rect
                style="fill:#000000;fill-opacity:1;stroke:none"
@@ -208,7 +208,7 @@
           </g>
           <g
              id="g3737"
-             transform="rotate(-90,305.73144,436.37995)">
+             transform="matrix(0,-1,1,0,-130.64851,742.11139)">
             <rect
                ry="6.0104074"
                y="461.22092"
@@ -227,7 +227,7 @@
                ry="6.0104074" />
           </g>
           <g
-             transform="rotate(-135,306.6139,472.0023)"
+             transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,189.66664,1022.5671)"
              id="g3743">
             <rect
                style="fill:#000000;fill-opacity:1;stroke:none"
@@ -293,7 +293,7 @@
           </g>
           <g
              id="g4297"
-             transform="rotate(-45,303.60099,350.37994)">
+             transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-158.83336,317.30223)">
             <rect
                ry="6.0104074"
                y="461.22092"
@@ -312,7 +312,7 @@
                ry="6.0104074" />
           </g>
           <g
-             transform="rotate(-90,305.73144,436.37995)"
+             transform="matrix(0,-1,1,0,-130.64851,742.11139)"
              id="g4303">
             <rect
                style="fill:#000000;fill-opacity:1;stroke:none"
@@ -333,7 +333,7 @@
           </g>
           <g
              id="g4309"
-             transform="rotate(-135,306.6139,472.0023)">
+             transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,189.66664,1022.5671)">
             <rect
                ry="6.0104074"
                y="461.22092"
diff --git a/navit/xpm/mini_roundabout.svg b/navit/icons/mini_roundabout.svg
index 31611fd9d..31611fd9d 100644
--- a/navit/xpm/mini_roundabout.svg
+++ b/navit/icons/mini_roundabout.svg
diff --git a/navit/xpm/museum.svg b/navit/icons/museum.svg
index bb3d57bc2..eab1adf4c 100644
--- a/navit/xpm/museum.svg
+++ b/navit/icons/museum.svg
@@ -9,18 +9,18 @@
    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"
-   width="23.466667"
-   height="23.466667"
+   width="22"
+   height="22"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.92.1 r15371"
+   inkscape:version="0.91 r13725"
    version="1.0"
    sodipodi:docname="museum.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    inkscape:export-filename="/home/jeff/projets/navit/icons/png/shopping.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
-   viewBox="0 0 22 22">
+   viewBox="0 0 93.749998 93.749998">
   <defs
      id="defs4">
     <linearGradient
@@ -65,25 +65,25 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#ff16ff"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="14.82405"
-     inkscape:cy="12.477793"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="29.162857"
+     inkscape:cy="26.66537"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="722"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
+     inkscape:window-width="1239"
+     inkscape:window-height="661"
+     inkscape:window-x="50"
+     inkscape:window-y="50"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:pagecheckerboard="true"
-     inkscape:window-maximized="1"
+     inkscape:window-maximized="0"
      inkscape:snap-to-guides="false"
      inkscape:snap-grids="false"
      inkscape:snap-global="false">
@@ -106,83 +106,74 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
      inkscape:label="Calque 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(0,71.749998)">
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:11.87630177;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 18.219554,-29.884101 0.171533,0 0,19.254052 -0.171533,0 z"
+       id="rect2425-6"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:11.87630177;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 37.92744,-29.571275 0.171534,0 0,19.254052 -0.171534,0 z"
+       id="rect2427-7"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:11.87630177;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 77.343202,-29.884101 0.171534,0 0,19.254052 -0.171534,0 z"
+       id="rect2429-5"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:11.87630177;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 13.178091,-2.5590449 69.766818,0 0,0.7781325 -69.766818,0 z"
+       id="rect2431-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:11.87630177;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 5.9381747,4.7235961 81.8736503,0 0,0.6848459 -81.8736503,0 z"
+       id="rect2433-5"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:11.87630177;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 12.968911,-38.880377 70.033392,0 0,0.823501 -70.033392,0 z"
+       id="rect2435-6"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:11.87630177;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 26.813123,-46.779427 40.208871,0 0,1.239346 -40.208871,0 z"
+       id="rect2437-2"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:11.87630177;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 40.084159,-54.838788 15.991545,0 0,2.159063 -15.991545,0 z"
+       id="rect2439-9"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:11.87630177;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 58.260972,-29.884101 0.171534,0 0,19.254052 -0.171534,0 z"
+       id="rect3213-1"
+       inkscape:connector-curvature="0" />
     <g
-       transform="translate(0.04185268,0.07425681)"
-       id="g5700-8"
-       style="fill:#fcfcfc;fill-opacity:1;stroke:#ffffff;stroke-width:4.25196841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-      <rect
-         y="9.4651861"
-         x="3.8719943"
-         height="4.7677689"
-         width="0.042476557"
-         id="rect2425-8"
-         style="opacity:1;fill:#fcfcfc;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4.25196841;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         style="opacity:1;fill:#fcfcfc;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4.25196841;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2427-6"
-         width="0.042476557"
-         height="4.7677689"
-         x="8.7522154"
-         y="9.5426493" />
-      <rect
-         y="9.4651861"
-         x="18.512657"
-         height="4.7677689"
-         width="0.042476557"
-         id="rect2429-6"
-         style="opacity:1;fill:#fcfcfc;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4.25196841;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="16.231531"
-         x="2.6235893"
-         height="0.19268438"
-         width="17.276209"
-         id="rect2431-8"
-         style="opacity:1;fill:#fcfcfc;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4.25196841;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         style="opacity:1;fill:#fcfcfc;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4.25196841;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2433-0"
-         width="20.274197"
-         height="0.16958442"
-         x="0.83078289"
-         y="18.034889" />
-      <rect
-         style="opacity:1;fill:#fcfcfc;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4.25196841;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2435-5"
-         width="17.342218"
-         height="0.20391898"
-         x="2.5717878"
-         y="7.2374897" />
-      <rect
-         y="5.2814941"
-         x="6"
-         height="0.30689234"
-         width="9.9568377"
-         id="rect2437-3"
-         style="opacity:1;fill:#fcfcfc;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4.25196841;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         style="opacity:1;fill:#fcfcfc;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4.25196841;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect2439-3"
-         width="3.9599519"
-         height="0.53463638"
-         x="9.2862797"
-         y="3.2858021" />
-      <rect
-         style="opacity:1;fill:#fcfcfc;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:4.25196841;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect3213-3"
-         width="0.042476557"
-         height="4.7677689"
-         x="13.787365"
-         y="9.4651861" />
-    </g>
-    <g
-       id="g5700">
+       id="g5700"
+       transform="matrix(4.0383178,0,0,4.0383775,2.638691,-67.956295)">
       <rect
          y="9.4651861"
          x="3.8719943"
diff --git a/navit/xpm/nav_destination_bk.svg b/navit/icons/nav_destination_bk.svg
index 76e029f21..76e029f21 100644
--- a/navit/xpm/nav_destination_bk.svg
+++ b/navit/icons/nav_destination_bk.svg
diff --git a/navit/xpm/nav_destination_wh.svg b/navit/icons/nav_destination_wh.svg
index ca2e2d66c..ca2e2d66c 100644
--- a/navit/xpm/nav_destination_wh.svg
+++ b/navit/icons/nav_destination_wh.svg
diff --git a/navit/xpm/nav_exit_left_bk.svg b/navit/icons/nav_exit_left_bk.svg
index 057e5011d..057e5011d 100644
--- a/navit/xpm/nav_exit_left_bk.svg
+++ b/navit/icons/nav_exit_left_bk.svg
diff --git a/navit/xpm/nav_exit_left_wh.svg b/navit/icons/nav_exit_left_wh.svg
index 8ba55649e..8ba55649e 100644
--- a/navit/xpm/nav_exit_left_wh.svg
+++ b/navit/icons/nav_exit_left_wh.svg
diff --git a/navit/xpm/nav_exit_right_bk.svg b/navit/icons/nav_exit_right_bk.svg
index e5c768501..e5c768501 100644
--- a/navit/xpm/nav_exit_right_bk.svg
+++ b/navit/icons/nav_exit_right_bk.svg
diff --git a/navit/xpm/nav_exit_right_wh.svg b/navit/icons/nav_exit_right_wh.svg
index 8bf09c0d3..8bf09c0d3 100644
--- a/navit/xpm/nav_exit_right_wh.svg
+++ b/navit/icons/nav_exit_right_wh.svg
diff --git a/navit/xpm/nav_keep_left_bk.svg b/navit/icons/nav_keep_left_bk.svg
index ed9d0d125..ed9d0d125 100644
--- a/navit/xpm/nav_keep_left_bk.svg
+++ b/navit/icons/nav_keep_left_bk.svg
diff --git a/navit/xpm/nav_keep_left_wh.svg b/navit/icons/nav_keep_left_wh.svg
index f9a8efdad..f9a8efdad 100644
--- a/navit/xpm/nav_keep_left_wh.svg
+++ b/navit/icons/nav_keep_left_wh.svg
diff --git a/navit/xpm/nav_keep_right_bk.svg b/navit/icons/nav_keep_right_bk.svg
index ee0d422a6..ee0d422a6 100644
--- a/navit/xpm/nav_keep_right_bk.svg
+++ b/navit/icons/nav_keep_right_bk.svg
diff --git a/navit/xpm/nav_keep_right_wh.svg b/navit/icons/nav_keep_right_wh.svg
index bad0e4343..bad0e4343 100644
--- a/navit/xpm/nav_keep_right_wh.svg
+++ b/navit/icons/nav_keep_right_wh.svg
diff --git a/navit/xpm/nav_left_1.xpm b/navit/icons/nav_left_1.xpm
index 18b9a7716..18b9a7716 100644
--- a/navit/xpm/nav_left_1.xpm
+++ b/navit/icons/nav_left_1.xpm
diff --git a/navit/xpm/nav_left_1_32.xpm b/navit/icons/nav_left_1_32.xpm
index 2c23d7e8c..2c23d7e8c 100644
--- a/navit/xpm/nav_left_1_32.xpm
+++ b/navit/icons/nav_left_1_32.xpm
diff --git a/navit/xpm/nav_left_1_bk.svg b/navit/icons/nav_left_1_bk.svg
index dd4461aa8..dd4461aa8 100644
--- a/navit/xpm/nav_left_1_bk.svg
+++ b/navit/icons/nav_left_1_bk.svg
diff --git a/navit/xpm/nav_left_1_wh.svg b/navit/icons/nav_left_1_wh.svg
index 7604bbd09..7604bbd09 100644
--- a/navit/xpm/nav_left_1_wh.svg
+++ b/navit/icons/nav_left_1_wh.svg
diff --git a/navit/xpm/nav_left_2.xpm b/navit/icons/nav_left_2.xpm
index b5012f47c..b5012f47c 100644
--- a/navit/xpm/nav_left_2.xpm
+++ b/navit/icons/nav_left_2.xpm
diff --git a/navit/xpm/nav_left_2_32.xpm b/navit/icons/nav_left_2_32.xpm
index 3de381a19..3de381a19 100644
--- a/navit/xpm/nav_left_2_32.xpm
+++ b/navit/icons/nav_left_2_32.xpm
diff --git a/navit/xpm/nav_left_2_bk.svg b/navit/icons/nav_left_2_bk.svg
index 4203de1c5..4203de1c5 100644
--- a/navit/xpm/nav_left_2_bk.svg
+++ b/navit/icons/nav_left_2_bk.svg
diff --git a/navit/xpm/nav_left_2_wh.svg b/navit/icons/nav_left_2_wh.svg
index 82fe99317..82fe99317 100644
--- a/navit/xpm/nav_left_2_wh.svg
+++ b/navit/icons/nav_left_2_wh.svg
diff --git a/navit/xpm/nav_left_3_bk.svg b/navit/icons/nav_left_3_bk.svg
index 4aa70dd95..4aa70dd95 100644
--- a/navit/xpm/nav_left_3_bk.svg
+++ b/navit/icons/nav_left_3_bk.svg
diff --git a/navit/xpm/nav_left_3_wh.svg b/navit/icons/nav_left_3_wh.svg
index 529682731..529682731 100644
--- a/navit/xpm/nav_left_3_wh.svg
+++ b/navit/icons/nav_left_3_wh.svg
diff --git a/navit/xpm/nav_merge_left_bk.svg b/navit/icons/nav_merge_left_bk.svg
index 340726cc0..340726cc0 100644
--- a/navit/xpm/nav_merge_left_bk.svg
+++ b/navit/icons/nav_merge_left_bk.svg
diff --git a/navit/xpm/nav_merge_left_wh.svg b/navit/icons/nav_merge_left_wh.svg
index 9ed953cad..9ed953cad 100644
--- a/navit/xpm/nav_merge_left_wh.svg
+++ b/navit/icons/nav_merge_left_wh.svg
diff --git a/navit/xpm/nav_merge_right_bk.svg b/navit/icons/nav_merge_right_bk.svg
index 50da749bd..50da749bd 100644
--- a/navit/xpm/nav_merge_right_bk.svg
+++ b/navit/icons/nav_merge_right_bk.svg
diff --git a/navit/xpm/nav_merge_right_wh.svg b/navit/icons/nav_merge_right_wh.svg
index c7cb52872..c7cb52872 100644
--- a/navit/xpm/nav_merge_right_wh.svg
+++ b/navit/icons/nav_merge_right_wh.svg
diff --git a/navit/xpm/nav_right_1.xpm b/navit/icons/nav_right_1.xpm
index bcf16278a..bcf16278a 100644
--- a/navit/xpm/nav_right_1.xpm
+++ b/navit/icons/nav_right_1.xpm
diff --git a/navit/xpm/nav_right_1_32.xpm b/navit/icons/nav_right_1_32.xpm
index 2277040e5..2277040e5 100644
--- a/navit/xpm/nav_right_1_32.xpm
+++ b/navit/icons/nav_right_1_32.xpm
diff --git a/navit/xpm/nav_right_1_bk.svg b/navit/icons/nav_right_1_bk.svg
index aa069a6d5..aa069a6d5 100644
--- a/navit/xpm/nav_right_1_bk.svg
+++ b/navit/icons/nav_right_1_bk.svg
diff --git a/navit/xpm/nav_right_1_wh.svg b/navit/icons/nav_right_1_wh.svg
index 8edb0e212..8edb0e212 100644
--- a/navit/xpm/nav_right_1_wh.svg
+++ b/navit/icons/nav_right_1_wh.svg
diff --git a/navit/xpm/nav_right_2.xpm b/navit/icons/nav_right_2.xpm
index 5d3088a79..5d3088a79 100644
--- a/navit/xpm/nav_right_2.xpm
+++ b/navit/icons/nav_right_2.xpm
diff --git a/navit/xpm/nav_right_2_32.xpm b/navit/icons/nav_right_2_32.xpm
index 42db0e3da..42db0e3da 100644
--- a/navit/xpm/nav_right_2_32.xpm
+++ b/navit/icons/nav_right_2_32.xpm
diff --git a/navit/xpm/nav_right_2_bk.svg b/navit/icons/nav_right_2_bk.svg
index 25edacf31..25edacf31 100644
--- a/navit/xpm/nav_right_2_bk.svg
+++ b/navit/icons/nav_right_2_bk.svg
diff --git a/navit/xpm/nav_right_2_wh.svg b/navit/icons/nav_right_2_wh.svg
index 7cf15a1a4..7cf15a1a4 100644
--- a/navit/xpm/nav_right_2_wh.svg
+++ b/navit/icons/nav_right_2_wh.svg
diff --git a/navit/xpm/nav_right_3_bk.svg b/navit/icons/nav_right_3_bk.svg
index 4c742387f..4c742387f 100644
--- a/navit/xpm/nav_right_3_bk.svg
+++ b/navit/icons/nav_right_3_bk.svg
diff --git a/navit/xpm/nav_right_3_wh.svg b/navit/icons/nav_right_3_wh.svg
index 8c3f08bfe..8c3f08bfe 100644
--- a/navit/xpm/nav_right_3_wh.svg
+++ b/navit/icons/nav_right_3_wh.svg
diff --git a/navit/xpm/nav_roundabout_l1_bk.svg b/navit/icons/nav_roundabout_l1_bk.svg
index ff52db494..ff52db494 100644
--- a/navit/xpm/nav_roundabout_l1_bk.svg
+++ b/navit/icons/nav_roundabout_l1_bk.svg
diff --git a/navit/xpm/nav_roundabout_l1_wh.svg b/navit/icons/nav_roundabout_l1_wh.svg
index f2a3b5800..f2a3b5800 100644
--- a/navit/xpm/nav_roundabout_l1_wh.svg
+++ b/navit/icons/nav_roundabout_l1_wh.svg
diff --git a/navit/xpm/nav_roundabout_l2_bk.svg b/navit/icons/nav_roundabout_l2_bk.svg
index a1c94a003..a1c94a003 100644
--- a/navit/xpm/nav_roundabout_l2_bk.svg
+++ b/navit/icons/nav_roundabout_l2_bk.svg
diff --git a/navit/xpm/nav_roundabout_l2_wh.svg b/navit/icons/nav_roundabout_l2_wh.svg
index d0c30de54..d0c30de54 100644
--- a/navit/xpm/nav_roundabout_l2_wh.svg
+++ b/navit/icons/nav_roundabout_l2_wh.svg
diff --git a/navit/xpm/nav_roundabout_l3_bk.svg b/navit/icons/nav_roundabout_l3_bk.svg
index 3c609b2e8..3c609b2e8 100644
--- a/navit/xpm/nav_roundabout_l3_bk.svg
+++ b/navit/icons/nav_roundabout_l3_bk.svg
diff --git a/navit/xpm/nav_roundabout_l3_wh.svg b/navit/icons/nav_roundabout_l3_wh.svg
index a13af057c..a13af057c 100644
--- a/navit/xpm/nav_roundabout_l3_wh.svg
+++ b/navit/icons/nav_roundabout_l3_wh.svg
diff --git a/navit/xpm/nav_roundabout_l4_bk.svg b/navit/icons/nav_roundabout_l4_bk.svg
index 0dd38594e..0dd38594e 100644
--- a/navit/xpm/nav_roundabout_l4_bk.svg
+++ b/navit/icons/nav_roundabout_l4_bk.svg
diff --git a/navit/xpm/nav_roundabout_l4_wh.svg b/navit/icons/nav_roundabout_l4_wh.svg
index 0faf9bc0a..0faf9bc0a 100644
--- a/navit/xpm/nav_roundabout_l4_wh.svg
+++ b/navit/icons/nav_roundabout_l4_wh.svg
diff --git a/navit/xpm/nav_roundabout_l5_bk.svg b/navit/icons/nav_roundabout_l5_bk.svg
index f7122efca..f7122efca 100644
--- a/navit/xpm/nav_roundabout_l5_bk.svg
+++ b/navit/icons/nav_roundabout_l5_bk.svg
diff --git a/navit/xpm/nav_roundabout_l5_wh.svg b/navit/icons/nav_roundabout_l5_wh.svg
index 5bbbb38e7..5bbbb38e7 100644
--- a/navit/xpm/nav_roundabout_l5_wh.svg
+++ b/navit/icons/nav_roundabout_l5_wh.svg
diff --git a/navit/xpm/nav_roundabout_l6_bk.svg b/navit/icons/nav_roundabout_l6_bk.svg
index fbf660b33..fbf660b33 100644
--- a/navit/xpm/nav_roundabout_l6_bk.svg
+++ b/navit/icons/nav_roundabout_l6_bk.svg
diff --git a/navit/xpm/nav_roundabout_l6_wh.svg b/navit/icons/nav_roundabout_l6_wh.svg
index 91098222e..91098222e 100644
--- a/navit/xpm/nav_roundabout_l6_wh.svg
+++ b/navit/icons/nav_roundabout_l6_wh.svg
diff --git a/navit/xpm/nav_roundabout_l7_bk.svg b/navit/icons/nav_roundabout_l7_bk.svg
index fc122cf9b..fc122cf9b 100644
--- a/navit/xpm/nav_roundabout_l7_bk.svg
+++ b/navit/icons/nav_roundabout_l7_bk.svg
diff --git a/navit/xpm/nav_roundabout_l7_wh.svg b/navit/icons/nav_roundabout_l7_wh.svg
index 3adc2d7c8..3adc2d7c8 100644
--- a/navit/xpm/nav_roundabout_l7_wh.svg
+++ b/navit/icons/nav_roundabout_l7_wh.svg
diff --git a/navit/xpm/nav_roundabout_l8_bk.svg b/navit/icons/nav_roundabout_l8_bk.svg
index de184a8cb..de184a8cb 100644
--- a/navit/xpm/nav_roundabout_l8_bk.svg
+++ b/navit/icons/nav_roundabout_l8_bk.svg
diff --git a/navit/xpm/nav_roundabout_l8_wh.svg b/navit/icons/nav_roundabout_l8_wh.svg
index cc16f9c15..cc16f9c15 100644
--- a/navit/xpm/nav_roundabout_l8_wh.svg
+++ b/navit/icons/nav_roundabout_l8_wh.svg
diff --git a/navit/xpm/nav_roundabout_r1_bk.svg b/navit/icons/nav_roundabout_r1_bk.svg
index 7d89c9ecb..7d89c9ecb 100644
--- a/navit/xpm/nav_roundabout_r1_bk.svg
+++ b/navit/icons/nav_roundabout_r1_bk.svg
diff --git a/navit/xpm/nav_roundabout_r1_wh.svg b/navit/icons/nav_roundabout_r1_wh.svg
index c9fe0b17b..c9fe0b17b 100644
--- a/navit/xpm/nav_roundabout_r1_wh.svg
+++ b/navit/icons/nav_roundabout_r1_wh.svg
diff --git a/navit/xpm/nav_roundabout_r2_bk.svg b/navit/icons/nav_roundabout_r2_bk.svg
index a2285491d..a2285491d 100644
--- a/navit/xpm/nav_roundabout_r2_bk.svg
+++ b/navit/icons/nav_roundabout_r2_bk.svg
diff --git a/navit/xpm/nav_roundabout_r2_wh.svg b/navit/icons/nav_roundabout_r2_wh.svg
index 94cb7cc8b..94cb7cc8b 100644
--- a/navit/xpm/nav_roundabout_r2_wh.svg
+++ b/navit/icons/nav_roundabout_r2_wh.svg
diff --git a/navit/xpm/nav_roundabout_r3_bk.svg b/navit/icons/nav_roundabout_r3_bk.svg
index bbb2966c7..bbb2966c7 100644
--- a/navit/xpm/nav_roundabout_r3_bk.svg
+++ b/navit/icons/nav_roundabout_r3_bk.svg
diff --git a/navit/xpm/nav_roundabout_r3_wh.svg b/navit/icons/nav_roundabout_r3_wh.svg
index 80f959268..80f959268 100644
--- a/navit/xpm/nav_roundabout_r3_wh.svg
+++ b/navit/icons/nav_roundabout_r3_wh.svg
diff --git a/navit/xpm/nav_roundabout_r4_bk.svg b/navit/icons/nav_roundabout_r4_bk.svg
index 07e082595..07e082595 100644
--- a/navit/xpm/nav_roundabout_r4_bk.svg
+++ b/navit/icons/nav_roundabout_r4_bk.svg
diff --git a/navit/xpm/nav_roundabout_r4_wh.svg b/navit/icons/nav_roundabout_r4_wh.svg
index f2443388a..f2443388a 100644
--- a/navit/xpm/nav_roundabout_r4_wh.svg
+++ b/navit/icons/nav_roundabout_r4_wh.svg
diff --git a/navit/xpm/nav_roundabout_r5_bk.svg b/navit/icons/nav_roundabout_r5_bk.svg
index 8afd28712..8afd28712 100644
--- a/navit/xpm/nav_roundabout_r5_bk.svg
+++ b/navit/icons/nav_roundabout_r5_bk.svg
diff --git a/navit/xpm/nav_roundabout_r5_wh.svg b/navit/icons/nav_roundabout_r5_wh.svg
index 98e8d3756..98e8d3756 100644
--- a/navit/xpm/nav_roundabout_r5_wh.svg
+++ b/navit/icons/nav_roundabout_r5_wh.svg
diff --git a/navit/xpm/nav_roundabout_r6_bk.svg b/navit/icons/nav_roundabout_r6_bk.svg
index 1b3d20504..1b3d20504 100644
--- a/navit/xpm/nav_roundabout_r6_bk.svg
+++ b/navit/icons/nav_roundabout_r6_bk.svg
diff --git a/navit/xpm/nav_roundabout_r6_wh.svg b/navit/icons/nav_roundabout_r6_wh.svg
index c2a516e74..c2a516e74 100644
--- a/navit/xpm/nav_roundabout_r6_wh.svg
+++ b/navit/icons/nav_roundabout_r6_wh.svg
diff --git a/navit/xpm/nav_roundabout_r7_bk.svg b/navit/icons/nav_roundabout_r7_bk.svg
index a7d42a642..a7d42a642 100644
--- a/navit/xpm/nav_roundabout_r7_bk.svg
+++ b/navit/icons/nav_roundabout_r7_bk.svg
diff --git a/navit/xpm/nav_roundabout_r7_wh.svg b/navit/icons/nav_roundabout_r7_wh.svg
index b27ab38e8..b27ab38e8 100644
--- a/navit/xpm/nav_roundabout_r7_wh.svg
+++ b/navit/icons/nav_roundabout_r7_wh.svg
diff --git a/navit/xpm/nav_roundabout_r8_bk.svg b/navit/icons/nav_roundabout_r8_bk.svg
index 743cb2f0d..743cb2f0d 100644
--- a/navit/xpm/nav_roundabout_r8_bk.svg
+++ b/navit/icons/nav_roundabout_r8_bk.svg
diff --git a/navit/xpm/nav_roundabout_r8_wh.svg b/navit/icons/nav_roundabout_r8_wh.svg
index d50e0c58c..d50e0c58c 100644
--- a/navit/xpm/nav_roundabout_r8_wh.svg
+++ b/navit/icons/nav_roundabout_r8_wh.svg
diff --git a/navit/xpm/nav_straight.xpm b/navit/icons/nav_straight.xpm
index dbbfc0c2a..dbbfc0c2a 100644
--- a/navit/xpm/nav_straight.xpm
+++ b/navit/icons/nav_straight.xpm
diff --git a/navit/xpm/nav_straight_32.xpm b/navit/icons/nav_straight_32.xpm
index db07b5719..db07b5719 100644
--- a/navit/xpm/nav_straight_32.xpm
+++ b/navit/icons/nav_straight_32.xpm
diff --git a/navit/xpm/nav_straight_bk.svg b/navit/icons/nav_straight_bk.svg
index 92fa2eaea..92fa2eaea 100644
--- a/navit/xpm/nav_straight_bk.svg
+++ b/navit/icons/nav_straight_bk.svg
diff --git a/navit/xpm/nav_straight_wh.svg b/navit/icons/nav_straight_wh.svg
index 76ce34c29..76ce34c29 100644
--- a/navit/xpm/nav_straight_wh.svg
+++ b/navit/icons/nav_straight_wh.svg
diff --git a/navit/xpm/nav_svg.html b/navit/icons/nav_svg.html
index 3bb5ca51e..3bb5ca51e 100644
--- a/navit/xpm/nav_svg.html
+++ b/navit/icons/nav_svg.html
diff --git a/navit/xpm/nav_turnaround_left_bk.svg b/navit/icons/nav_turnaround_left_bk.svg
index dcaef8e2b..dcaef8e2b 100644
--- a/navit/xpm/nav_turnaround_left_bk.svg
+++ b/navit/icons/nav_turnaround_left_bk.svg
diff --git a/navit/xpm/nav_turnaround_left_wh.svg b/navit/icons/nav_turnaround_left_wh.svg
index d7761f1cf..d7761f1cf 100644
--- a/navit/xpm/nav_turnaround_left_wh.svg
+++ b/navit/icons/nav_turnaround_left_wh.svg
diff --git a/navit/xpm/nav_turnaround_right_bk.svg b/navit/icons/nav_turnaround_right_bk.svg
index 0b6759fe9..0b6759fe9 100644
--- a/navit/xpm/nav_turnaround_right_bk.svg
+++ b/navit/icons/nav_turnaround_right_bk.svg
diff --git a/navit/xpm/nav_turnaround_right_wh.svg b/navit/icons/nav_turnaround_right_wh.svg
index 991009b80..991009b80 100644
--- a/navit/xpm/nav_turnaround_right_wh.svg
+++ b/navit/icons/nav_turnaround_right_wh.svg
diff --git a/navit/xpm/navit.svg b/navit/icons/navit.svg
index 591d9ee57..591d9ee57 100644
--- a/navit/xpm/navit.svg
+++ b/navit/icons/navit.svg
diff --git a/navit/xpm/navit_svg2png b/navit/icons/navit_svg2png
index 675207561..675207561 100755
--- a/navit/xpm/navit_svg2png
+++ b/navit/icons/navit_svg2png
diff --git a/navit/xpm/osd_minus.png b/navit/icons/osd_minus.png
index 4cde8ede4..4cde8ede4 100644
--- a/navit/xpm/osd_minus.png
+++ b/navit/icons/osd_minus.png
diff --git a/navit/xpm/osd_plus.png b/navit/icons/osd_plus.png
index de138e8cc..de138e8cc 100644
--- a/navit/xpm/osd_plus.png
+++ b/navit/icons/osd_plus.png
diff --git a/navit/xpm/pagan.svg b/navit/icons/pagan.svg
index 1c6ee58fc..1c6ee58fc 100644
--- a/navit/xpm/pagan.svg
+++ b/navit/icons/pagan.svg
diff --git a/navit/xpm/parking.svg b/navit/icons/parking.svg
index 3def7c6d2..7a7b60e40 100644
--- a/navit/xpm/parking.svg
+++ b/navit/icons/parking.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -12,7 +13,7 @@
    height="22"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
    sodipodi:docname="parking.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -36,16 +37,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="3.4504037"
-     inkscape:cy="13.224308"
+     inkscape:zoom="5.6"
+     inkscape:cx="24.474716"
+     inkscape:cy="24.902671"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
      inkscape:window-x="0"
-     inkscape:window-y="5">
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
     <inkscape:grid
        type="xygrid"
        id="grid2380"
@@ -60,31 +62,39 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
      inkscape:label="Calque 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(0,78)">
     <rect
-       style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:#ffffff;stroke-width:1.68599999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#0000ff;fill-opacity:1;stroke:#ffffff;stroke-width:0.84443629;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect2402"
-       width="20.263691"
-       height="20.315996"
-       x="0.84497529"
-       y="0.94812441"
-       ry="0" />
-    <text
-       xml:space="preserve"
-       style="font-size:22px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="4.3562827"
-       y="17.580584"
-       id="text3174"><tspan
-         sodipodi:role="line"
-         id="tspan3176"
-         x="4.3562827"
-         y="17.580584"
-         style="font-size:18px;font-weight:bold;fill:#ffffff;-inkscape-font-specification:Bitstream Vera Sans Bold">P</tspan></text>
+       width="17.111395"
+       height="17.155563"
+       x="2.4222181"
+       y="-75.577782"
+       ry="1.8277817" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3343"
+       style="font-style:normal;font-weight:bold;font-size:67.55490112px;font-family:'Bitstream Vera Sans';-inkscape-font-specification:'Bitstream Vera Sans Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 6.7825928,-72.613482 4.7425322,0 q 2.115214,0 3.243328,0.942569 1.135536,0.935147 1.135536,2.671849 0,1.744124 -1.135536,2.686693 -1.128114,0.935147 -3.243328,0.935147 l -1.8851382,0 0,3.844494 -2.857394,0 0,-11.080752 z m 2.857394,2.070683 0,3.094892 1.5808442,0 q 0.831242,0 1.283972,-0.400777 0.45273,-0.4082 0.45273,-1.15038 0,-0.74218 -0.45273,-1.142958 -0.45273,-0.400777 -1.283972,-0.400777 l -1.5808442,0 z" />
   </g>
 </svg>
diff --git a/navit/xpm/pastafarian.svg b/navit/icons/pastafarian.svg
index eff678c09..eff678c09 100644
--- a/navit/xpm/pastafarian.svg
+++ b/navit/icons/pastafarian.svg
diff --git a/navit/icons/peak.svg b/navit/icons/peak.svg
new file mode 100644
index 000000000..72855f9db
--- /dev/null
+++ b/navit/icons/peak.svg
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="peak.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/projets/navit/icons/png/peak.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3156">
+      <stop
+         style="stop-color:#22a638;stop-opacity:1;"
+         offset="0"
+         id="stop3159" />
+      <stop
+         style="stop-color:#11571d;stop-opacity:1;"
+         offset="1"
+         id="stop3161" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3154">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3156" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3158" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3154"
+       id="linearGradient3160"
+       x1="12"
+       y1="7.5346489"
+       x2="12.048141"
+       y2="16.097149"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.493119,0,0,4.493119,-3.6288038,-75.719256)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3156"
+       id="linearGradient3163"
+       x1="6.6808548"
+       y1="7.8981066"
+       x2="12.644531"
+       y2="8.9276867"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.342249,0,0,6.6675913,-7.4405484,-76.273232)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f4ca00"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="41.847465"
+     inkscape:cy="47.300055"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g4548"
+       transform="matrix(0.21332896,0,0,0.21332896,1.6963542,-61.367873)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path2383-6"
+         d="M 41.02148,-71.43164 C 31.65247,-56.289288 18.18501,-43.153283 13.90319,-25.352645 9.1685401,-11.642644 4.4337901,2.06732 -0.30077993,15.777344 29.77333,21.785437 62.58138,28.305986 91.88672,15.595703 96.56443,9.365259 89.94237,2.205907 89.66474,-4.390721 84.79995,-22.823637 79.93498,-41.256506 75.07031,-59.689453 c -4.90237,4.48239 -9.80468,8.964847 -14.70703,13.447265 -5.87654,-9.221199 -11.75091,-18.443787 -17.6289,-27.664062 -0.57097,0.82487 -1.14193,1.64974 -1.7129,2.47461 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.49311876;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc"
+         id="path2383"
+         d="m 3.9854083,12.971997 17.2680737,-50.00341 20.34417,-29.398771 16.949432,26.603492 13.342658,-12.198837 16.99093,64.3759 C 60.737627,23.994199 32.87256,18.442649 3.9854083,12.97199 Z"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3163);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.49311876;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccsssc"
+         id="path3152"
+         d="m 21.851634,-31.482451 1.946737,-5.151125 17.504015,-25.606323 17.239118,25.620081 12.123801,-11.045988 8.492915,33.721742 c -4.912241,2.032759 -8.566212,-11.84924 -13.284085,-12.813868 -4.717879,-0.964627 -8.814736,5.652546 -13.489467,3.19082 -4.674735,-2.461721 -13.578,9.867352 -18.360815,7.408821 -4.782816,-2.458536 -7.130098,-14.369102 -12.172219,-15.32416 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3160);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/pharmacy.svg b/navit/icons/pharmacy.svg
new file mode 100644
index 000000000..14d4e5854
--- /dev/null
+++ b/navit/icons/pharmacy.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="pharmacy.svg">
+  <metadata
+     id="metadata9">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="871"
+     inkscape:window-width="1432"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ff23ff"
+     id="base"
+     inkscape:zoom="2.8157956"
+     inkscape:cx="132.57816"
+     inkscape:cy="68.514694"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2"
+     showgrid="false"
+     inkscape:window-maximized="0" />
+  <defs
+     id="defs4" />
+  <g
+     id="g3387"
+     transform="matrix(0.20583838,0,0,0.20583838,6.0902428,0.30331343)">
+    <g
+       transform="translate(-53.981191,44.747566)"
+       id="g3383">
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.25483263px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 77.880859,-46.085938 c -7.229936,0.02323 -11.786691,8.234864 -9.246926,14.657051 0.363352,13.633556 -0.42643,27.390256 1.947139,40.8728573 0.905212,15.7932507 0.01974,31.9620127 1.737287,47.6556387 2.72289,6.199203 12.977707,3.338138 12.556641,-3.318359 0.835719,-9.358556 -0.857381,-18.758694 0.398579,-28.120113 0.941812,-18.7192776 -0.701899,-37.553976 0.748407,-56.206421 0.966672,-5.129576 2.369303,-13.779325 -4.51808,-15.230107 -1.18235,-0.303958 -2.40882,-0.33823 -3.623047,-0.310547 z"
+         id="path1360-7"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.25483263px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 94.34375,-35.625 c -14.228332,2.50379 -31.746926,0.790326 -42.138672,12.917969 -7.670289,8.243981 -1.423616,23.10015844 9.689453,23.9550779 8.498945,1.9763923 17.502731,-3.26177 25.595703,-0.1796875 0.425361,4.3707297 -5.365654,1.9759588 -7.912109,2.4707031 -10.756855,0.038835 -23.893583,6.2118103 -24.847656,18.1699215 -0.0054,9.8036 11.248816,14.912765 19.824219,13.044922 3.39961,-0.334762 7.793431,-2.163732 10.623046,-0.607422 -4.399906,3.800118 -11.465797,2.674861 -15.427734,7.451172 -4.218645,2.600826 -9.951707,7.40369 -6.919922,12.951172 5.57538,4.350422 10.85041,-1.932554 15.738281,-3.984375 C 87.894618,48.65452 99.561353,42.40397 98.851562,31.419922 96.727382,21.96283 85.132403,20.408866 77.041016,21.503906 c -2.375177,0.04894 -6.029006,1.101381 -7.642578,-0.857422 7.697112,-5.335869 18.388067,-0.459741 26.162109,-6.148437 8.422993,-4.27757 9.907233,-17.6955189 1.457031,-22.7929689 -8.947102,-6.9603501 -20.960901,-4.5753941 -31.173828,-3.2968751 -4.331071,-2.496265 2.737418,-5.3726 4.861328,-5.900391 6.295653,-1.395177 13.050406,-0.968154 19.335938,-0.710937 5.41156,2.871427 11.663634,0.332596 15.771484,-3.486328 3.57272,-3.525259 0.61219,-8.67653 -3.19336,-10.556641 -2.35754,-1.832856 -5.184196,-3.544027 -8.27539,-3.378906 z"
+         id="path1364-5"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="matrix(0.12741631,0,0,0.12741631,-0.62387565,2.0848855)"
+       id="layer1">
+      <g
+         id="g4895"
+         transform="matrix(2,0,0,2,-483.316,-485.5179)">
+        <path
+           inkscape:connector-curvature="0"
+           id="path1360"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 331.42857,623.07647 c 5.84728,12.68982 12.96741,10.10541 20.71429,0 0,0 1.60714,-19.82143 1.42857,-33.57143 -0.17857,-13.75 -2.32143,-1.25 -2.14286,-21.42857 0.17857,-20.17857 2.85714,-59.28572 2.85714,-59.28572 l 0,-66.42857 c 0,0 0.89286,-35.71428 0.71429,-65.71428 -0.17857,-30 -1.78571,-32.67857 -1.42857,-54.28572 0.35714,-21.60714 1.25,-14.46429 2.85714,-32.14286 C 358.03571,272.54075 360,251.6479 360,251.6479 c -3.62641,-11.91857 -38.2823,-11.4817 -42.14286,11.42857 0,0 2.14286,13.57143 2.85715,43.57143 0.71429,30 -1.78571,41.25 0,76.42857 1.78571,35.17857 5.17857,31.42857 7.14285,64.28571 1.96429,32.85714 0.71429,67.14286 0.71429,67.14286 l 2.85714,66.42857 0,42.14286 z" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path1364"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 379.28571,288.79075 c -24.64286,1.96429 -60.71428,7.14286 -60.71428,7.14286 -116.47508,21.61333 -87.82638,123.939 2.14286,100.71429 l 35,-2.14286 c 47.75794,-11.63754 55.83811,52.44721 0,44.28571 L 325,440.93361 c -84.08686,20.79606 -75.33628,99.20758 2.14286,88.57143 l 27.14285,-4.28572 c 59.56652,-1.30424 26.5713,40.447 -2.14285,43.57143 0,0 -8.21428,-0.53571 -21.42857,7.14286 -13.21429,7.67857 -31.42858,23.57143 -31.42858,23.57143 -13.72384,18.19281 -2.40579,14.91799 10,10.71429 0,0 9.64286,-8.92858 20.71429,-14.28572 11.07143,-5.35714 23.57143,-7.14286 23.57143,-7.14286 67.64618,-23.43602 75.57082,-78.75298 2.14286,-80.71428 l -29.28572,1.42857 c -22.81243,8.45052 -69.46577,-27.10559 0,-45 l 30.71429,-0.71429 C 443.82508,460.82712 445.62298,377.62637 355,373.07647 l -36.42857,2.85714 c -40.4999,18.54392 -83.06085,-31.86959 0.71428,-54.28571 0,0 20.89286,0.35714 37.14286,0 16.25,-0.35715 13.21428,-2.50001 27.85714,-1.42858 14.64286,1.07143 20.69724,10.89905 30.71429,5.71429 23.62552,-12.2284 43.00437,-12.96553 2.14286,-37.85714 -10.90464,-6.64278 -13.21429,-1.25001 -37.85715,0.71428 z" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/picnic.svg b/navit/icons/picnic.svg
new file mode 100644
index 000000000..b9af047f3
--- /dev/null
+++ b/navit/icons/picnic.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="picnic.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="27.84447"
+     inkscape:cy="54.066506"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="874"
+     inkscape:window-width="1440"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:zoom="5.2137932"
+     objecttolerance="10.0"
+     pagecolor="#ff00ff"
+     showgrid="false"
+     inkscape:window-maximized="1" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       id="perspective2441"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_x="0 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="60 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       id="symbol-university"
+       viewBox="244.5 110 489 219.9">
+      <path
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
+         id="path4460"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 94,176 73,215"
+         id="path4462"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
+      <path
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
+         id="path4464"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
+         id="path4466"
+         ill="none"
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_x="0 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="12 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-536.27327,44.693248)">
+    <rect
+       height="10"
+       id="rect4134"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="10"
+       x="1"
+       y="1" />
+    <rect
+       height="8"
+       id="rect4136"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="8"
+       x="2"
+       y="2" />
+  </g>
+  <g
+     id="g3366"
+     transform="matrix(0.20536404,0,0,0.20535957,1.0039722,-1.9465945)">
+    <path
+       inkscape:connector-curvature="0"
+       id="flowRoot3192-3"
+       d="m 75.629978,23.490569 c -20.741,0.912667 -41.584931,0.113552 -62.365238,0.382813 0.392658,5.454312 -2.628917,14.670294 4.496094,17.064453 3.082761,1.134707 6.792794,-1.40298 9.371093,-0.541016 -1.770374,4.663194 -3.426705,9.427895 -5.359375,13.984376 -3.59674,3.924483 -9.365775,1.213934 -13.9628903,1.787109 -4.098936,-0.831093 -11.660783,-1.195222 -11.648438,4.734375 -1.661327,5.141116 0.41725,12.806681 6.976563,12.416016 3.553198,0.281696 7.9757773,-2.294732 11.0019533,-0.07031 -3.742035,9.121989 -7.8060183,18.388744 -11.3535163,27.708985 6.503679,-3.349395 15.5550043,2.9631 20.6621103,-3.515626 3.535525,-8.125745 6.687942,-16.439584 10.082031,-24.634765 10.15625,0 20.312503,0 30.468753,0 3.74529,9.244854 7.49176,18.489229 11.23633,27.734371 5.36648,-2.390354 12.86841,2.70433 17.16406,-2.242184 1.38247,-5.476343 -3.97201,-10.437228 -4.93633,-15.669726 -3.40853,-6.473778 -5.72847,-12.214063 4.02031,-9.822461 3.72357,-0.878389 12.047612,2.604554 9.908202,-3.681641 0.21152,-4.479386 1.7461,-12.837381 -4.716792,-13.5 -6.60206,0.737222 -13.30589,0.383662 -19.97656,0.455078 -1.88421,-5.1396 -4.91038,-11.075563 -6.11915,-15.74414 4.43546,0.319995 12.97615,2.506541 13.87891,-4.029297 0.52274,-4.296391 1.38148,-10.50877 -3.95117,-12.212891 -1.55443,-0.566711 -3.23705,-0.670774 -4.87695,-0.603516 z m -25.66016,17.113282 c 0.68167,4.653881 8.14896,13.872697 4.29687,15.476562 -3.81653,-1.471089 -16.75095,3.19176 -13.879162,-2.778803 3.058252,-4.1991 2.459917,-14.818456 9.582292,-12.697759 z"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#b26609;fill-opacity:1;stroke:none"
+       id="flowRoot3192"
+       d="m 33.443282,59.937898 9.554748,-23.476467 9.792363,0 9.554747,23.476467 -28.901858,0 z m 31.144749,-23.476467 15.923384,0 0,-8.730319 -63.113925,0 0,8.730319 15.808181,0 -9.554751,23.476467 -23.3576593,0 0,8.726718 19.8187303,0 -10.969603,27.371809 10.735593,0 11.088408,-27.371809 35.860918,0 11.088412,27.371809 10.854393,0 -11.088403,-27.371809 19.937535,0 0,-8.726718 -23.476462,0 -9.554751,-23.476467 z" />
+  </g>
+</svg>
diff --git a/navit/xpm/playground.svg b/navit/icons/playground.svg
index faed4b508..4373af6d8 100644
--- a/navit/xpm/playground.svg
+++ b/navit/icons/playground.svg
@@ -10,12 +10,12 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
-   width="20"
-   height="20"
-   viewBox="0 0 20 20"
+   width="22"
+   height="22"
+   viewBox="0 0 22 22"
    id="svg2"
    sodipodi:docname="playground.svg"
-   inkscape:version="0.92.1 r15371">
+   inkscape:version="0.91 r13725">
   <metadata
      id="metadata4511">
     <rdf:RDF>
@@ -51,32 +51,32 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="722"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
      id="namedview4507"
      showgrid="false"
      inkscape:pagecheckerboard="true"
      inkscape:zoom="19.428571"
-     inkscape:cx="16.172715"
+     inkscape:cx="16.275656"
      inkscape:cy="9.3437438"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg2" />
   <path
      inkscape:connector-curvature="0"
-     d="m 5.8283959,2.1548914 c -0.8700477,0.054484 -1.6251861,0.8599631 -1.623482,1.7317147 3.313e-4,0.9065127 0.8252009,1.7310809 1.7317143,1.7310809 0.9065129,0 1.7313827,-0.8245682 1.7317139,-1.7310809 C 7.6701887,2.9426529 6.7705038,2.0958925 5.8283959,2.1548914 Z m 9.2358081,3.4634284 c -0.870049,0.05448 -1.625186,0.8599641 -1.623481,1.7317149 3.31e-4,0.9065123 0.825202,1.7310801 1.731714,1.7310801 0.906512,0 1.731383,-0.8245678 1.731714,-1.7310801 0.0018,-0.9439535 -0.897838,-1.7907138 -1.839947,-1.7317149 z M 5.35939,6.1955584 c -1.6982227,0 -2.1540619,2.1628028 -2.2728746,3.3191179 L 1.8959617,9.0817476 v 1.1544774 l 6.8907793,2.45326 -1.1183989,4.473596 h 4.6179039 l -1.08232,-3.607737 6.8547,2.453262 v -1.154478 l -1.082319,-0.396851 c 0.189403,-0.994382 0.7937,-4.7982905 -1.226631,-4.7982905 -1.891568,0 -2.211065,2.5912215 -2.272876,3.5716595 L 6.6220983,10.777386 C 6.8429055,9.471419 7.2227145,6.1955584 5.35939,6.1955584 Z"
+     d="M 6.0243165,1.6925617 C 4.980887,1.757904 4.0752658,2.7239092 4.0773095,3.7693945 c 3.973e-4,1.087174 0.9896456,2.0760726 2.0768076,2.0760726 1.0871613,0 2.0764098,-0.9888986 2.076807,-2.0760726 C 8.2331387,2.6373183 7.1541661,1.6218048 6.0243165,1.6925617 Z M 17.100622,5.846226 c -1.043432,0.065338 -1.949051,1.0313486 -1.947006,2.076833 3.97e-4,1.0871735 0.989646,2.0760719 2.076807,2.0760719 1.08716,0 2.07641,-0.9888984 2.076807,-2.0760719 0.0022,-1.1320766 -1.076758,-2.1475899 -2.206608,-2.076833 z M 5.4618477,6.538504 c -2.0366417,0 -2.5833198,2.5938334 -2.7258093,3.980593 l -1.4278053,-0.5192069 0,1.3845559 8.2639629,2.942177 -1.3412719,5.365151 5.5381519,0 -1.298003,-4.326733 8.220694,2.94218 0,-1.384558 -1.298002,-0.47594 c 0.227147,-1.192556 0.951867,-5.754555 -1.471072,-5.754555 -2.268516,0 -2.651682,3.107633 -2.725811,4.283465 L 6.9761866,12.033456 C 7.2409959,10.46722 7.6964926,6.538504 5.4618477,6.538504 Z"
      id="playground-1"
-     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.18168736;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:2.61645246;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   <rect
-     width="16.162666"
-     height="16.162666"
-     x="1.8959616"
-     y="1.0004153"
+     width="19.383537"
+     height="19.383768"
+     x="1.3082331"
+     y="0.308007"
      id="canvas"
      style="visibility:hidden;fill:none;stroke:none;stroke-width:1.15447605" />
   <path
-     d="m 5.8283959,2.1548914 c -0.8700477,0.054484 -1.6251861,0.8599631 -1.623482,1.7317147 3.313e-4,0.9065127 0.8252009,1.7310809 1.7317143,1.7310809 0.9065129,0 1.7313827,-0.8245682 1.7317139,-1.7310809 C 7.6701887,2.9426529 6.7705038,2.0958925 5.8283959,2.1548914 Z m 9.2358081,3.4634284 c -0.870049,0.05448 -1.625186,0.8599641 -1.623481,1.7317149 3.31e-4,0.9065123 0.825202,1.7310801 1.731714,1.7310801 0.906512,0 1.731383,-0.8245678 1.731714,-1.7310801 0.0018,-0.9439535 -0.897838,-1.7907138 -1.839947,-1.7317149 z M 5.35939,6.1955584 c -1.6982227,0 -2.1540619,2.1628028 -2.2728746,3.3191179 L 1.8959617,9.0817476 v 1.1544774 l 6.8907793,2.45326 -1.1183989,4.473596 h 4.6179039 l -1.08232,-3.607737 6.8547,2.453262 v -1.154478 l -1.082319,-0.396851 c 0.189403,-0.994382 0.7937,-4.7982905 -1.226631,-4.7982905 -1.891568,0 -2.211065,2.5912215 -2.272876,3.5716595 L 6.6220983,10.777386 C 6.8429055,9.471419 7.2227145,6.1955584 5.35939,6.1955584 Z"
+     d="M 6.0243165,1.6925617 C 4.980887,1.757904 4.0752658,2.7239092 4.0773095,3.7693945 c 3.973e-4,1.087174 0.9896456,2.0760726 2.0768076,2.0760726 1.0871613,0 2.0764098,-0.9888986 2.076807,-2.0760726 C 8.2331387,2.6373183 7.1541661,1.6218048 6.0243165,1.6925617 Z M 17.100622,5.846226 c -1.043432,0.065338 -1.949051,1.0313486 -1.947006,2.076833 3.97e-4,1.0871735 0.989646,2.0760719 2.076807,2.0760719 1.08716,0 2.07641,-0.9888984 2.076807,-2.0760719 0.0022,-1.1320766 -1.076758,-2.1475899 -2.206608,-2.076833 z M 5.4618477,6.538504 c -2.0366417,0 -2.5833198,2.5938334 -2.7258093,3.980593 l -1.4278053,-0.5192069 0,1.3845559 8.2639629,2.942177 -1.3412719,5.365151 5.5381519,0 -1.298003,-4.326733 8.220694,2.94218 0,-1.384558 -1.298002,-0.47594 c 0.227147,-1.192556 0.951867,-5.754555 -1.471072,-5.754555 -2.268516,0 -2.651682,3.107633 -2.725811,4.283465 L 6.9761866,12.033456 C 7.2409959,10.46722 7.6964926,6.538504 5.4618477,6.538504 Z"
      id="playground"
      inkscape:connector-curvature="0"
      style="stroke-width:1.15447605" />
diff --git a/navit/icons/police.svg b/navit/icons/police.svg
new file mode 100644
index 000000000..c73412391
--- /dev/null
+++ b/navit/icons/police.svg
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="police.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/projets/navit/icons/png/police.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f4ca00"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="108.43166"
+     inkscape:cy="14.769275"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="918"
+     inkscape:window-height="483"
+     inkscape:window-x="200"
+     inkscape:window-y="221"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g3361"
+       transform="matrix(0.21216975,0,0,0.2121694,1.4016894,-62.319121)">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect2383-3"
+         d="m 74.144589,-67.020119 c -3.380662,5.577799 -9.122992,14.445774 -16.957032,11.230468 -5.14318,-2.561363 -8.50676,-7.42216 -12.12695,-11.685546 -3.3388,6.166479 -10.012362,15.350854 -17.974611,10.597656 -4.909176,-2.726934 -8.356217,-7.296319 -11.888672,-11.523438 -6.8747432,4.035329 -13.7480862,8.073045 -20.6210942,12.111328 11.745254,4.120397 12.776901,17.769153 12.179688,28.308594 -0.244761,16.910473 7.0703452,34.3318344 21.6388142,43.633094 5.311373,3.457785 11.117131,7.716969 17.107275,8.90011 17.5686,-6.57098 33.655692,-21.3799835 35.618962,-40.875154 2.00158,-11.440876 -1.54086,-24.753814 6.63495,-34.368987 2.51547,-2.229444 5.58671,-3.691051 8.38281,-5.519532 -6.9815,-4.138921 -13.96484,-8.27474 -20.94726,-12.412109 l -0.54667,0.837347 -0.50021,0.766169 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc"
+         id="rect2383"
+         d="m 1.9642857,-56.521127 12.0650713,-7.085828 c 13.116408,16.199912 22.908177,14.330738 31.130843,2.447057 12.870788,15.636394 22.46549,10.960863 31.024434,-2.447044 L 88.143301,-56.5211 C 64.352249,-42.181339 97.534834,-2.67566 44.521811,20.125006 -9.2649229,-4.968524 23.014674,-41.348284 1.9642857,-56.521127 Z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         d="M 62.657142,2.8813915 44.120106,-7.134913 25.359985,2.4570567 29.157797,-18.267921 14.238095,-33.145775 l 20.884214,-2.792436 9.539238,-18.786989 9.109342,18.999157 20.815275,3.266856 -15.254331,14.534561 z"
+         inkscape:randomized="0"
+         inkscape:rounded="0"
+         inkscape:flatsided="false"
+         sodipodi:arg2="1.582173"
+         sodipodi:arg1="0.95385444"
+         sodipodi:r2="15.864456"
+         sodipodi:r1="31.72891"
+         sodipodi:cy="-22.998343"
+         sodipodi:cx="44.300587"
+         sodipodi:sides="5"
+         id="path3162"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f4f400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.1999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0.40000001;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+         sodipodi:type="star" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/post.svg b/navit/icons/post.svg
new file mode 100644
index 000000000..7cb29ea06
--- /dev/null
+++ b/navit/icons/post.svg
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="post.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/navit/icons/png/post.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f4ca00"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4"
+     inkscape:cx="62.020326"
+     inkscape:cy="46.268947"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="943"
+     inkscape:window-height="682"
+     inkscape:window-x="114"
+     inkscape:window-y="134"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g3364"
+       transform="matrix(0.2125571,0,0,0.21256165,0.58470202,-63.610093)">
+      <path
+         inkscape:connector-curvature="0"
+         id="rect2381-3"
+         d="m -0.36328105,-49.07422 c 0,22.79167 0,45.583335 0,68.375001 32.90885105,0 65.81771105,0 98.72656105,0 0,-23.458333 0,-46.916671 0,-70.375001 -32.90885,0 -65.81771,0 -98.72656105,0 l 0,1 0,1 z"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.7750001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <rect
+         y="-46.823437"
+         x="3.3875"
+         height="62.373436"
+         width="90.724998"
+         id="rect2381"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#d8d8d8;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.7750001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccc"
+         id="path3158"
+         d="M 8.1625,10.775 49.048438,-21.754688 89.039063,10.775"
+         style="fill:none;fill-rule:evenodd;stroke:#787878;stroke-width:4.7750001px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc"
+         id="rect3153"
+         d="m 3.3875,-46.823438 90.725,0 L 48.75,-7.4296875 3.3875,-46.823438 Z"
+         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:4.7750001;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/public_office.svg b/navit/icons/public_office.svg
new file mode 100644
index 000000000..cc58bdb0f
--- /dev/null
+++ b/navit/icons/public_office.svg
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="public_office.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/navit/icons/png/post.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f4ca00"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="39.367456"
+     inkscape:cy="32.327118"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="943"
+     inkscape:window-height="682"
+     inkscape:window-x="114"
+     inkscape:window-y="134"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#ffffff;stroke:#ffffff;stroke-width:0.21014558"
+       d="M 7.34798,0.10997493 C 5.897925,0.25780607 6.111269,2.0399561 6.145798,3.0659688 6.105259,3.4532062 6.443387,4.3820832 5.701702,4.0945326 4.39782,4.3091313 4.398726,5.9220174 4.309077,6.8305294 2.79033,7.3821048 2.448873,9.1906832 2.66364,10.608624 2.64235,14.37069 2.66074,18.132829 2.65454,21.894929 l 17.442083,0 0,-12.3690385 c 0.0034,-0.28596 -0.656571,-1.3859661 -1.754633,-1.698811 -0.221945,-0.021225 -1.981955,-0.3471553 -2.671558,0.5073024 -0.381692,0.3615956 -0.283692,1.1038632 -0.969048,0.88573 -1.299236,0.112119 -1.289504,1.7280501 -1.029798,2.6354401 -0.462762,0.259609 -1.729742,0.339101 -1.476355,-0.517975 0.123476,-1.5257265 0.226716,-3.8543796 -1.5843,-4.4216761 C 10.098121,6.4593872 10.774641,5.529537 10.287956,4.9654873 9.984372,4.3720048 9.292135,4.0566099 8.684777,3.9956172 8.619981,2.8128233 9.195513,1.0373558 7.972251,0.21669115 7.777578,0.13081103 7.560036,0.0903517 7.347972,0.10997493 Z M 7.036866,6.4566173 C 7.290892,6.680227 8.351606,6.3802543 7.643907,6.7915369 7.436315,6.7994169 6.511557,6.6969339 7.036866,6.4566173 Z M 5.23339,11.447163 c 0.497986,0.0896 -0.136096,0.643037 -0.02504,0.225743 0.156746,0.343113 -0.0677,-0.388397 0.02504,-0.225743 z m 4.42455,0.4285 c -0.589332,-0.223793 0.302635,-0.769318 0,0 z M 7.446074,11.47138 c 0.482833,0.199609 -0.167963,0.509856 -0.215891,0.163765 0.07819,-0.03853 0.152521,-0.143557 0.215891,-0.163765 z M 5.23339,14.073983 c 0.540682,0.161747 -0.284823,0.719747 -0.03612,0.08086 l 0,-0.123955 z M 9.663276,14.50864 C 9.376309,14.322892 9.381885,14.239145 9.66244,14.046483 c 2.1e-4,0.154052 6.38e-4,0.308105 8.36e-4,0.462157 z M 7.446074,14.0982 c 0.482805,0.199536 -0.167995,0.509893 -0.215891,0.163765 0.07819,-0.03853 0.152521,-0.143557 0.215891,-0.163765 z m 2.222125,3.043417 C 9.37599,16.949968 9.382765,16.865586 9.667363,16.667146 c 2.11e-4,0.158158 6.38e-4,0.316313 8.36e-4,0.474471 z M 5.23339,16.700803 c 0.560442,0.195502 -0.362547,0.752037 -0.0238,-0.02832 z m 2.212684,0.02422 c 0.482805,0.199535 -0.167995,0.509893 -0.215891,0.163764 0.07819,-0.03853 0.152521,-0.143556 0.215891,-0.163764 z m 2.226642,2.62682 c -0.145306,0.06956 0.07209,-0.171101 0,0 z M 5.23339,19.327623 c 0.05495,0.104692 -0.112558,-0.09669 0,0 z m 2.211864,0.02299 c -0.03746,0.02593 -0.0115,-0.02985 0,0 z"
+       id="path3347-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+    <path
+       style="fill:#000000"
+       d="m 3.499966,15.145553 c 0,-6.5627895 -0.01072,-6.2578451 0.234825,-6.6769237 C 3.992415,8.0289417 4.519279,7.6749883 5.006575,7.6142325 L 5.24434,7.5845885 5.26487,6.5549612 5.2854,5.5253345 5.397603,5.364801 C 5.459313,5.276508 5.577933,5.1580933 5.661195,5.1016577 5.802301,5.0060157 5.852522,4.9981449 6.400655,4.9857586 l 0.588071,-0.01329 0,-1.7631847 c 0,-1.8922177 0.007,-1.961823 0.210018,-2.1040587 0.122577,-0.085857 0.360357,-0.085857 0.482935,0 0.20307,0.1422357 0.210018,0.211841 0.210018,2.1040587 l 0,1.7631847 0.588071,0.01329 c 0.548135,0.012386 0.598354,0.020258 0.73946,0.1158991 0.08326,0.056436 0.201879,0.1748502 0.263592,0.2631433 l 0.112205,0.1605335 0.02053,1.0296267 0.02053,1.0296273 0.237763,0.029644 c 0.684648,0.085362 1.303063,0.6560446 1.46308,1.3501533 0.02465,0.1069199 0.04193,0.9350322 0.04253,2.0378532 l 0.0011,1.857744 1.528891,-0.01076 1.528893,-0.01076 0.01084,-1.303148 0.01084,-1.303149 0.861349,0 0.861349,0 0,-0.6567047 0,-0.656705 1.312367,0 1.312368,0 0.01131,0.6464437 0.01131,0.646443 0.215481,0.0124 0.215481,0.0124 0,5.456716 0,5.456713 -7.880459,0 -7.88046,0 0,-6.00433 z m 7.008988,-0.453078 -0.01097,-5.5954852 -0.123765,-0.2001741 c -0.0901,-0.1457277 -0.183478,-0.2313683 -0.3433,-0.3148592 l -0.219535,-0.1146868 -2.371182,0 -2.371181,0 -0.219533,0.1146868 C 4.689664,8.6654495 4.59629,8.751088 4.506188,8.8968177 L 4.38242,9.0969939 4.37158,14.692477 l -0.01084,5.595481 3.079595,0 3.079593,0 -0.01097,-5.595483 z M 5.896147,18.896171 C 5.740076,18.801001 5.675303,18.629195 5.675303,18.3104 c 0,-0.497072 0.159187,-0.649261 0.679117,-0.649261 0.528518,0 0.634293,0.113941 0.634293,0.683263 0,0.344504 -0.0026,0.353648 -0.139552,0.490597 -0.136454,0.136454 -0.14715,0.139545 -0.482267,0.139396 -0.264407,-1.24e-4 -0.371972,-0.01799 -0.470747,-0.07822 z m 2.193613,0.0081 c -0.157147,-0.09749 -0.198079,-0.218673 -0.198079,-0.586432 0,-0.540465 0.112274,-0.656705 0.634293,-0.656705 0.52222,0 0.679117,0.151719 0.679117,0.656705 0,0.311843 -0.08034,0.509336 -0.240993,0.592413 -0.173803,0.08988 -0.725912,0.0861 -0.874338,-0.006 z M 5.896147,16.269346 c -0.156071,-0.09517 -0.220844,-0.266975 -0.220844,-0.58577 0,-0.497072 0.159187,-0.649262 0.679117,-0.649262 0.528518,0 0.634293,0.113941 0.634293,0.683263 0,0.344505 -0.0026,0.353648 -0.139552,0.490598 -0.136454,0.136454 -0.14715,0.139545 -0.482267,0.139396 -0.264407,-1.24e-4 -0.371972,-0.01799 -0.470747,-0.07822 z m 2.193613,0.0081 c -0.157147,-0.09749 -0.198079,-0.218673 -0.198079,-0.586432 0,-0.540465 0.112274,-0.656705 0.634293,-0.656705 0.52222,0 0.679117,0.151718 0.679117,0.656705 0,0.311843 -0.08034,0.509336 -0.240993,0.592413 -0.173803,0.08988 -0.725912,0.0861 -0.874338,-0.006 z M 5.896147,13.642521 c -0.156071,-0.09517 -0.220844,-0.266975 -0.220844,-0.58577 0,-0.497073 0.159187,-0.649262 0.679117,-0.649262 0.528518,0 0.634293,0.113941 0.634293,0.683263 0,0.344504 -0.0026,0.353648 -0.139552,0.490597 -0.136454,0.136454 -0.14715,0.139546 -0.482267,0.139396 -0.264407,-1.24e-4 -0.371972,-0.01799 -0.470747,-0.07822 z m 2.193613,0.0081 c -0.157147,-0.09749 -0.198079,-0.218673 -0.198079,-0.586432 0,-0.540465 0.112274,-0.656705 0.634293,-0.656705 0.52222,0 0.679117,0.151719 0.679117,0.656705 0,0.311843 -0.08034,0.509336 -0.240993,0.592413 -0.173803,0.08988 -0.725912,0.0861 -0.874338,-0.006 z M 5.896147,11.01573 C 5.740076,10.92056 5.675303,10.748755 5.675303,10.42996 c 0,-0.4970723 0.159187,-0.6492619 0.679117,-0.6492619 0.528518,0 0.634293,0.1139411 0.634293,0.6832629 0,0.344505 -0.0026,0.353648 -0.139552,0.490598 -0.136454,0.136454 -0.14715,0.139545 -0.482267,0.139396 -0.264407,-1.24e-4 -0.371972,-0.01799 -0.470747,-0.07822 z m 2.193613,0.0081 C 7.932613,10.92634 7.891681,10.805157 7.891681,10.437398 c 0,-0.5404649 0.112274,-0.6567047 0.634293,-0.6567047 0.52222,0 0.679117,0.1517188 0.679117,0.6567047 0,0.311844 -0.08034,0.509336 -0.240993,0.592413 -0.173803,0.08988 -0.725912,0.0861 -0.874338,-0.006 z m 6.36897,5.980618 0,-3.283525 -1.539152,0 -1.539153,0 0,3.283525 0,3.283524 1.539153,0 1.539152,0 0,-3.283524 z m -1.995534,1.891737 c -0.156071,-0.09517 -0.220844,-0.266975 -0.220844,-0.58577 0,-0.497073 0.159188,-0.649262 0.679117,-0.649262 0.528518,0 0.634293,0.113941 0.634293,0.683263 0,0.344504 -0.0026,0.353648 -0.139551,0.490598 -0.136454,0.136453 -0.147151,0.139545 -0.482268,0.139395 -0.264407,-1.24e-4 -0.371972,-0.01799 -0.470747,-0.07822 z m 0,-2.62682 c -0.156071,-0.09517 -0.220844,-0.266975 -0.220844,-0.58577 0,-0.497072 0.159188,-0.649262 0.679117,-0.649262 0.528518,0 0.634293,0.113941 0.634293,0.683263 0,0.344505 -0.0026,0.353648 -0.139551,0.490598 -0.136454,0.136454 -0.147151,0.139545 -0.482268,0.139396 -0.264407,-1.24e-4 -0.371972,-0.01799 -0.470747,-0.07822 z m 5.935764,-0.578327 0,-4.596934 -1.539153,0 -1.539152,0 0,4.596934 0,4.596935 1.539152,0 1.539153,0 0,-4.596935 z m -1.995534,3.205147 c -0.156071,-0.09517 -0.220844,-0.266975 -0.220844,-0.58577 0,-0.497073 0.159187,-0.649262 0.679117,-0.649262 0.528518,0 0.634293,0.113941 0.634293,0.683263 0,0.344504 -0.0026,0.353648 -0.139552,0.490598 -0.136454,0.136453 -0.14715,0.139545 -0.482267,0.139395 -0.264407,-1.24e-4 -0.371973,-0.01799 -0.470747,-0.07822 z m 0,-2.62682 c -0.156071,-0.09517 -0.220844,-0.266975 -0.220844,-0.58577 0,-0.497072 0.159187,-0.649262 0.679117,-0.649262 0.528518,0 0.634293,0.113941 0.634293,0.683263 0,0.344505 -0.0026,0.353648 -0.139552,0.490598 -0.136454,0.136454 -0.14715,0.139545 -0.482267,0.139396 -0.264407,-1.24e-4 -0.371973,-0.01799 -0.470747,-0.07822 z m 0,-2.62682 c -0.156071,-0.09517 -0.220844,-0.266975 -0.220844,-0.58577 0,-0.497072 0.159187,-0.649262 0.679117,-0.649262 0.528518,0 0.634293,0.113941 0.634293,0.683264 0,0.344504 -0.0026,0.353647 -0.139552,0.490597 -0.136454,0.136454 -0.14715,0.139545 -0.482267,0.139396 -0.264407,-1.24e-4 -0.371973,-0.01799 -0.470747,-0.07822 z m -7.64982,-6.7801086 0,-0.7428972 -0.13955,-0.1395499 -0.139549,-0.1395499 -1.034311,0 -1.03431,0 -0.139549,0.1395499 -0.139551,0.1395499 0,0.7428972 0,0.7428975 1.31341,0 1.31341,0 0,-0.7428975 z"
+       id="path3347"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/navit/xpm/rail_station.svg b/navit/icons/rail_station.svg
index 1c19c28d4..1c19c28d4 100644
--- a/navit/xpm/rail_station.svg
+++ b/navit/icons/rail_station.svg
diff --git a/navit/xpm/repair_service.svg b/navit/icons/repair_service.svg
index 106bef807..1bf094979 100644
--- a/navit/xpm/repair_service.svg
+++ b/navit/icons/repair_service.svg
@@ -10,15 +10,15 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="23.466667"
-   height="23.466667"
+   width="22"
+   height="22"
    id="svg1875"
    sodipodi:version="0.32"
-   inkscape:version="0.92.1 r15371"
+   inkscape:version="0.91 r13725"
    version="1.0"
    sodipodi:docname="repair_service.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewBox="0 0 22 22">
+   viewBox="0 0 20.625 20.625">
   <defs
      id="defs1877">
     <linearGradient
@@ -34,10 +34,10 @@
     </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 73.285253 : 1"
-       inkscape:vp_y="0 : 999.99998 : 0"
-       inkscape:vp_z="146.84755 : 73.285253 : 1"
-       inkscape:persp3d-origin="73.42378 : 48.856836 : 1"
+       inkscape:vp_x="0 : 73.285255 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="146.84755 : 73.285255 : 1"
+       inkscape:persp3d-origin="73.423782 : 48.856837 : 1"
        id="perspective12" />
     <linearGradient
        inkscape:collect="always"
@@ -81,21 +81,21 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#ffffff"
+     pagecolor="#ff00ff"
      bordercolor="#666666"
      borderopacity="1.0"
-     inkscape:pageopacity="0.0"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="3.8810917"
-     inkscape:cy="11.042885"
+     inkscape:zoom="16"
+     inkscape:cx="25.94305"
+     inkscape:cy="11.179566"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="g3363"
      showgrid="true"
      inkscape:window-width="1223"
      inkscape:window-height="717"
-     inkscape:window-x="54"
-     inkscape:window-y="1"
+     inkscape:window-x="42"
+     inkscape:window-y="76"
      inkscape:window-maximized="0" />
   <metadata
      id="metadata1880">
@@ -117,24 +117,19 @@
             <rdf:li>Map; Symbol; Wikivoyage; Shop</rdf:li>
           </rdf:Bag>
         </dc:subject>
-        <dc:description>Symbol for Wikivoyage maps:Shop</dc:description>
+        <dc:description>Symbol for Wikivoyage maps:Shop
+jfitie@gmail.com</dc:description>
         <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.5/" />
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
       <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.5/">
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
         <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
       </cc:License>
     </rdf:RDF>
   </metadata>
@@ -142,17 +137,27 @@
      inkscape:label="Hintergrund"
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(836.281,-94.5055)">
-    <path
-       style="fill:#b4b4b4;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.47779047;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m -820.35994,103.33028 c 0,0 2.19332,1.1443 4.20382,-1.07943 1.49562,-1.65423 0.0875,-4.731855 0.0875,-4.731855 0,0 -2.63348,4.310445 -4.29138,2.884945 -1.6348,-1.534342 0.36357,-3.152949 1.95241,-4.819464 0,0 -0.97035,-0.236675 -1.73454,-0.221149 -0.76419,0.01553 -1.74461,0.227318 -2.60449,1.024959 -2.06276,1.913474 -0.54466,4.585084 -0.54466,4.585084 l -6.72413,7.06578 c 0,0 -1.97892,-1.17362 -4.16875,0.87374 -1.82283,1.70422 -0.52982,4.34741 -0.52982,4.34741 0,0 2.77644,-3.95321 4.57974,-2.29482 1.57124,1.59939 -0.93164,3.24453 -2.47476,4.54656 0,0 2.91495,1.08245 4.69798,-0.44178 2.13868,-1.82823 0.72787,-4.55537 0.72787,-4.55537 l 6.82315,-7.18461 z"
-       sodipodi:nodetypes="csccccsccscccscc"
-       id="path16"
-       inkscape:connector-curvature="0" />
+     transform="translate(836.281,-95.880502)">
+    <g
+       id="g3363"
+       transform="matrix(0.98318957,0,0,0.98318957,-8.9103368,-1.3208333)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path16-3"
+         d="m -826.84699,99.087201 c -2.71434,0.01564 -4.86215,3.110579 -3.72195,5.624609 0.23125,0.63187 -0.11751,0.37765 -0.97969,1.27188 -1.47733,1.51572 -2.85044,3.1842 -4.44382,4.55726 -2.88004,-0.8269 -6.10731,2.19677 -5.12274,5.13262 0.18796,0.82529 0.59536,1.57606 0.94488,2.33965 1.09471,-1.16029 1.91926,-3.25579 3.74988,-3.18356 0.71589,0.86098 -0.7342,1.66051 -1.23878,2.18024 -0.69164,0.56324 -1.38665,1.1223 -2.06036,1.70715 2.22307,1.14893 5.60357,1.51363 7.22434,-0.79149 0.7982,-1.11684 0.85897,-2.62048 0.41637,-3.88781 1.88159,-1.88094 3.67679,-4.07083 5.61129,-5.76254 2.7535,0.73841 5.76327,-2.07989 4.91304,-4.89113 -0.18496,-1.14368 -0.69215,-2.19845 -1.16101,-3.24629 -1.07855,1.30242 -1.71873,3.39421 -3.52344,3.7864 -0.79874,-0.92109 0.64149,-1.85634 1.16459,-2.50624 0.38719,-0.56099 1.72489,-1.424538 1.4994,-1.822386 -1.07657,-0.238094 -2.15765,-0.554799 -3.272,-0.508363 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.43858317;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cccccccccccccccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path16"
+         sodipodi:nodetypes="csccccsccscccscc"
+         d="m -826.69254,107.27284 c 0,0 2.01333,1.0504 3.85885,-0.99085 1.37289,-1.51849 0.0803,-4.34356 0.0803,-4.34356 0,0 -2.41738,3.95673 -3.93923,2.6482 -1.50065,-1.40843 0.33374,-2.89421 1.7922,-4.42398 0,0 -0.89073,-0.21725 -1.59221,-0.202998 -0.70148,0.01426 -1.60144,0.208668 -2.39076,0.940848 -1.89349,1.75646 -0.49997,4.20884 -0.49997,4.20884 l -6.17235,6.48596 c 0,0 -1.81653,-1.07731 -3.82666,0.80204 -1.67325,1.56438 -0.48635,3.99067 -0.48635,3.99067 0,0 2.54861,-3.62882 4.20393,-2.10651 1.44231,1.46814 -0.85519,2.97828 -2.27168,4.17347 0,0 2.67575,0.99362 4.31246,-0.40553 1.96319,-1.67821 0.66815,-4.18156 0.66815,-4.18156 l 6.26324,-6.59504 z"
+         style="fill:#b4b4b4;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.43858317;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"
      id="layer2"
      inkscape:label="Symbol"
-     transform="translate(0,-124)" />
+     transform="translate(0,-125.375)" />
 </svg>
diff --git a/navit/xpm/resort.svg b/navit/icons/resort.svg
index cf34919f7..cf34919f7 100644
--- a/navit/xpm/resort.svg
+++ b/navit/icons/resort.svg
diff --git a/navit/icons/restaurant.svg b/navit/icons/restaurant.svg
new file mode 100644
index 000000000..d347eac46
--- /dev/null
+++ b/navit/icons/restaurant.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="restaurant.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/projets/navit/icons/png/police.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2411"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2424"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f4ca00"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="2.4242305"
+     inkscape:cy="25.514558"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1278"
+     inkscape:window-height="682"
+     inkscape:window-x="154"
+     inkscape:window-y="162"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>edited by jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g3694"
+       transform="matrix(0.20319096,0,0,0.20319627,0.87153405,-60.71706)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path2430-9"
+         d="m 11.299665,-79.016462 c -7.5844542,1.143669 -7.0573421,10.505274 -7.1406248,16.248047 -0.4917389,7.544178 5.2169892,13.141766 10.4705248,17.599612 6.205138,6.414712 12.410275,12.829425 18.615412,19.244138 C 21.681151,-15.683862 8.5828309,-6.7404178 -1.9581474,4.5675224 -6.6394353,13.18729 2.9514791,24.779611 12.233259,20.922991 20.765751,17.765319 24.717852,8.5950701 31.717215,3.3264089 c 5.013461,-4.8275317 10.026849,-10.6685182 15.0512,-14.8897459 2.515458,2.948171 6.995015,2.2229375 9.872474,3.4316925 9.493685,9.76751 18.516547,20.3504745 28.299401,29.6171355 7.883972,2.537593 18.22396,-2.903844 17.29883,-12.0371093 -0.8895,-9.43208414 -10.952816,-13.5109448 -16.212893,-20.3085937 -6.733106,-6.714099 -14.545165,-13.2218 -20.511718,-20.193359 4.54255,-0.583519 9.856143,1.641769 13.71289,-2.064453 8.880247,-6.102084 15.71149,-14.752427 23.011721,-22.46875 2.30237,-4.39472 -1.8979,-9.538321 -6.097658,-9.830078 0.208743,-3.819798 -3.952164,-5.945573 -6.814453,-6.365235 -0.901686,-5.592654 -8.806029,-7.380983 -12.101563,-2.716796 -7.959214,7.092846 -18.905162,12.75255 -22.703125,23.30664 -1.147264,2.987002 1.652146,7.659879 -1.396484,9.228516 C 40.412936,-54.276165 27.8239,-67.103004 14.254743,-78.518415 c -0.932678,-0.359139 -1.954984,-0.597121 -2.955078,-0.498047 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.19859481;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccsccsccsc"
+         id="path2430"
+         d="M 13.552478,-74.322278 70.23211,-20.418789 97.299521,5.7232427 c 0,0 2.540188,5.2500023 -0.46266,9.2538123 -3.470184,4.626913 -9.716509,2.776143 -9.716509,2.776143 l -27.76145,-29.149519 c 0,0 -1.242133,-1.605384 -2.776144,-1.388075 -3.693456,0.523192 -5.552287,-0.462658 -5.552287,-0.462658 L 9.8509518,-55.814643 c 0,0 -1.6828097,-2.195604 -1.5037457,-9.138145 0.111762,-4.333068 0.301098,-12.031372 5.2052719,-9.36949 z"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.19859481;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccscc"
+         id="path2432"
+         d="M 39.000475,-25.277046 2.4478972,5.2605484 c 0,0 -3.4701813,5.4616246 0.6940378,10.0885306 4.1642171,4.626913 10.410545,1.016051 10.410545,1.016051 0,0 32.274386,-32.761041 33.313742,-33.776432"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.19859481;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="csscsccccsccccscssc"
+         id="path2434"
+         d="m 53.69091,-36.645502 c 0,0 6.246325,-4.825725 5.320943,-7.601871 -0.925381,-2.776145 -1.080426,-5.111273 0.694023,-8.791125 2.069098,-4.290875 21.630802,-19.433017 21.630802,-19.433017 0,0 2.03197,-1.219713 3.354513,0 1.515264,1.397454 0.347011,3.817201 0.347011,3.817201 l -18.276288,16.541805 c 0,0 1.16516,0.901009 2.660469,2.544192 4.01256,-4.119638 18.623306,-17.003889 18.623306,-17.003889 0,0 2.375326,-1.564802 3.593376,-0.115675 0.727149,0.865135 0.717329,2.313454 -0.04983,3.296672 -3.848384,3.497549 -18.581373,17.640089 -18.580867,17.640089 0,0 1.021474,1.030147 2.891819,2.776145 3.895888,-3.878318 18.970318,-17.582252 18.970318,-17.582252 0,0 1.884456,-1.061749 3.238836,0.231343 1.542694,1.472882 0.40212,3.375759 0.25613,3.762321 -4.888523,4.897798 -18.075218,19.183377 -21.886951,20.875973 -3.971849,1.763691 -5.668571,0.814858 -10.410544,0.462657 -2.630494,-0.195381 -6.014981,4.39557 -6.014981,4.39557"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.19859481;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="csccccccc"
+         id="path3208"
+         d="m 56.663322,-13.901436 c 0,0 3.984762,-1.578218 6.628426,-3.74121 2.5448,-2.082113 4.626906,-4.808246 4.626906,-4.808246 l 29.612217,28.6368216 0.92538,4.6269064 -2.31345,5.320951 -4.395565,1.850762 -5.320951,-0.231351 -29.762963,-31.654634 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/xpm/restroom.xpm b/navit/icons/restroom.xpm
index 597c0d615..597c0d615 100644
--- a/navit/xpm/restroom.xpm
+++ b/navit/icons/restroom.xpm
diff --git a/navit/xpm/ruins.svg b/navit/icons/ruins.svg
index 4a158d290..4a158d290 100644
--- a/navit/xpm/ruins.svg
+++ b/navit/icons/ruins.svg
diff --git a/navit/icons/school.svg b/navit/icons/school.svg
new file mode 100644
index 000000000..3c99eb64f
--- /dev/null
+++ b/navit/icons/school.svg
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="school.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/projets/navit/icons/png/police.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3155">
+      <stop
+         id="stop3163"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         style="stop-color:#0000ff;stop-opacity:0.74901962;"
+         offset="1"
+         id="stop3171" />
+      <stop
+         style="stop-color:#0000ff;stop-opacity:0.49803922;"
+         offset="1"
+         id="stop3165" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective3181"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3155"
+       id="linearGradient3173"
+       x1="1.6414979"
+       y1="10.983024"
+       x2="19.824244"
+       y2="10.983024"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91137644,0,0,0.91138156,0.68665551,-78.37958)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f4ca00"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="31.918419"
+     inkscape:cy="53.448586"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1130"
+     inkscape:window-height="766"
+     inkscape:window-x="284"
+     inkscape:window-y="45"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <path
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.18553674px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 10.858358,-75.480718 c -3.3606194,1.447724 -6.7482731,2.837903 -10.20237828,4.048189 -0.96144525,1.184222 -0.96144525,1.184222 2.08415808,2.627733 0.4843866,0.255395 1.3838932,0.37048 1.592277,0.724005 -0.5537056,1.27361 -0.7243248,2.672779 -0.7751304,4.049276 2.5209069,2.290072 6.0803651,3.362016 9.4343936,2.706376 0.447428,-0.02346 0.923778,-0.102236 1.339553,-0.191031 -0.284709,0.741346 -0.446896,1.521442 -0.634594,2.290928 0.971202,0.04041 1.93492,0.578231 2.883196,0.499226 0.52157,0.954674 2.166046,0.82441 2.292429,-0.353482 0.402802,-1.265009 -0.01517,-2.599617 -0.582435,-3.717185 -0.184428,-0.611635 -0.06418,-1.18444 0.477755,-1.524143 0.824541,-1.320356 -0.204826,-2.779217 -0.328885,-4.142814 -0.217544,-0.568577 -0.646312,-1.235203 0.09786,-1.631566 1.093753,-1.182429 2.205599,-2.347935 3.275399,-3.552479 -3.656575,-0.415067 -7.250614,-1.733976 -10.953603,-1.833033 z"
+       id="path3197-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccc" />
+    <path
+       style="fill:url(#linearGradient3173);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.1826781,-70.75775 9.2638309,-3.452379 7.307496,1.380951 -2.416653,3.107142 0.978169,1.898808 0.575394,2.761904 -3.740057,2.416665 -5.5237753,0.115079 -3.9126742,-2.071427 0.3452358,-2.186508 1.208326,-2.359125 -4.0852922,-1.61111 z"
+       id="path3197"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3187"
+       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.18660998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:none"
+       d="m 6.301679,-69.021992 c 0,0 -0.5870606,0.366914 -1.3208862,2.49502 -0.4094794,1.187497 0,2.128107 0,2.128107 0,0 2.2737833,1.939495 5.0633962,1.98134 5.797223,0.08806 7.558405,-2.641787 7.558405,-2.641787 0,0 0.230448,-0.781932 -0.293531,-2.71517 -0.539632,-1.990993 -0.880591,-1.907958 -0.880591,-1.907958 m -14.3095993,-0.865919 11.2275323,3.948004 5.870605,-6.310935 -7.837258,-1.541043 -9.2608793,3.903974 z m 12.6951833,2.773877 c 0,0 1.347676,0.880979 1.907947,2.935319 0.660443,2.421638 0.05189,3.053085 0.05189,3.053085 0,0 1.174121,0.821891 1.027356,1.775869 m -1.320886,0.205472 c 0,0 0.880591,-1.027361 0.29353,-2.274872 0,0 -0.733825,0.660447 -1.100739,2.0694"
+       sodipodi:nodetypes="cscscscccccccsccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/navit/xpm/shelter.svg b/navit/icons/shelter.svg
index b0cbc7e31..b0cbc7e31 100644
--- a/navit/xpm/shelter.svg
+++ b/navit/icons/shelter.svg
diff --git a/navit/xpm/shinto.svg b/navit/icons/shinto.svg
index 2b1dc3b95..2b1dc3b95 100644
--- a/navit/xpm/shinto.svg
+++ b/navit/icons/shinto.svg
diff --git a/navit/xpm/shop_apparel.svg b/navit/icons/shop_apparel.svg
index 2bcb9e449..6ca708280 100644
--- a/navit/xpm/shop_apparel.svg
+++ b/navit/icons/shop_apparel.svg
@@ -12,7 +12,7 @@
    height="22"
    id="svg2"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="shop_apparel.svg"
    sodipodi:version="0.32"
    version="1.0"
@@ -25,7 +25,20 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <sodipodi:namedview
@@ -35,17 +48,17 @@
      guidetolerance="10.0"
      id="base"
      inkscape:current-layer="svg2"
-     inkscape:cx="32.552186"
-     inkscape:cy="9.5178891"
-     inkscape:pageopacity="0.0"
+     inkscape:cx="31.159939"
+     inkscape:cy="41.128102"
+     inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-height="725"
      inkscape:window-width="1024"
      inkscape:window-x="0"
      inkscape:window-y="20"
-     inkscape:zoom="7.2407731"
+     inkscape:zoom="2.5599999"
      objecttolerance="10.0"
-     pagecolor="#ffffff"
+     pagecolor="#ff00ff"
      showgrid="false"
      inkscape:window-maximized="0" />
   <defs
@@ -138,23 +151,24 @@
        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" />
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
+         id="path4460"
+         inkscape:connector-curvature="0" />
       <path
-         d="M94,176l-21,39"
-         fill="none"
+         d="M 94,176 73,215"
          id="path4462"
-         stroke="#000000"
-         stroke-width="20" />
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
       <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" />
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
+         id="path4464"
+         inkscape:connector-curvature="0" />
       <path
-         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
          id="path4466"
          ill="none"
-         stroke="#000000"
-         stroke-width="20" />
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
     </symbol>
     <inkscape:perspective
        id="perspective3452"
@@ -195,23 +209,24 @@
        id="symbol9807"
        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="path9809" />
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
+         id="path9809"
+         inkscape:connector-curvature="0" />
       <path
-         d="M94,176l-21,39"
-         fill="none"
+         d="M 94,176 73,215"
          id="path9811"
-         stroke="#000000"
-         stroke-width="20" />
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
       <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="path9813" />
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
+         id="path9813"
+         inkscape:connector-curvature="0" />
       <path
-         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
          id="path9815"
          ill="none"
-         stroke="#000000"
-         stroke-width="20" />
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
     </symbol>
     <inkscape:perspective
        id="perspective9805"
@@ -329,30 +344,21 @@
        sodipodi:type="inkscape:persp3d" />
   </defs>
   <g
-     id="g1327"
-     transform="matrix(0.04514455,0,0,0.04514455,-2.3478156,-1.6568572)">
-    <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-       id="path1329"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
      id="layer3"
      inkscape:label="Layout"
-     style="stroke:#757575;stroke-opacity:1;display:none"
-     transform="matrix(48.14969,0,0,48.14969,-1210.2219,-51.870914)">
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-1210.2219,26.129086)">
     <rect
        height="10"
        id="rect4134"
-       style="fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        width="10"
        x="1"
        y="1" />
     <rect
        height="8"
        id="rect4136"
-       style="fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        width="8"
        x="2"
        y="2" />
@@ -360,80 +366,98 @@
   <g
      id="g9828"
      inkscape:label="Layout"
-     style="stroke:#757575;stroke-opacity:1;display:none"
-     transform="matrix(48.14969,0,0,48.14969,-1870.5198,102.97115)">
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-1870.5198,180.97115)">
     <rect
        height="10"
        id="rect9830"
-       style="fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        width="10"
        x="1"
        y="1" />
     <rect
        height="8"
        id="rect9832"
-       style="fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        width="8"
        x="2"
        y="2" />
   </g>
   <g
-     id="g3219"
-     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
-     transform="matrix(0.13028858,0,0,0.13028858,-8.0822756,-68.244127)">
-    <path
-       d="m 67.613793,570.41735 c 24.468075,-13.10042 45.356037,-11.77452 66.041377,-23.06206 11.09637,2.43104 19.357,1.4592 26.99311,-0.26207 23.42862,10.78637 44.02825,12.51579 66.04138,23.5862 -1.82964,11.55946 -5.85886,21.54778 -12.57932,29.6138 -8.15361,-4.36994 -15.86829,-6.10632 -23.32413,-6.28966 l -0.52414,78.62069 c -32.1215,5.98273 -59.34716,3.39775 -85.95862,-0.26207 l -0.26207,-78.09655 c -9.370679,-0.2722 -16.500436,3.19047 -23.848277,6.28966 -7.067215,-9.63539 -10.36885,-19.80873 -12.57931,-30.13794 z"
-       id="path2427"
-       sodipodi:nodetypes="ccccccccccc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 71.282759,569.10701 c 2.214678,10.74851 6.083496,20.78686 13.627586,29.35172"
-       id="path3199"
-       sodipodi:nodetypes="cc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 105.35172,668.16908 c 28.12874,4.60443 56.25747,5.59295 84.38621,-0.26207"
-       id="path3203"
-       sodipodi:nodetypes="cc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 133.3931,547.61736 c -0.22816,2.3247 1.69237,12.73282 13.88965,13.36551 11.93593,0.61914 14.27527,-11.53603 13.88966,-13.10345"
-       id="path3205"
-       sodipodi:nodetypes="czc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 128.21194,550.41871 c -0.22816,2.3247 4.57424,15.11165 18.34482,15.46206 14.03248,0.35707 19.77872,-14.68086 19.39311,-16.24828"
-       id="path3207"
-       sodipodi:nodetypes="czc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 134.52279,552.33459 c 8.53814,2.23324 16.08174,1.75419 25.31809,-0.20185"
-       id="path3209"
-       sodipodi:nodetypes="cc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 104.16182,558.28077 c 2.57594,9.88539 6.83803,21.48891 -0.26207,35.37931"
-       id="path3213"
-       sodipodi:nodetypes="cc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 190.37521,558.48262 c -2.57594,9.88539 -6.83803,21.48891 0.26207,35.37931"
-       id="path3215"
-       sodipodi:nodetypes="cc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+     id="g3490"
+     transform="matrix(0.25128277,0,0,0.25128277,0.58996561,-3.7730198)">
     <path
-       d="m 223.28276,568.84494 c -2.21468,10.74851 -6.0835,20.78686 -13.62759,29.35172"
-       id="path3217"
-       sodipodi:nodetypes="cc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       id="path2427-5"
+       d="m 47.031249,27.015621 c -5.760828,1.41384 -12.303397,-1.22066 -17.532807,2.56581 -8.862283,2.82108 -18.454926,4.23279 -26.4554744,9.37169 1.229579,7.25541 3.815943,14.44684 8.6660154,20.09375 2.660512,-1.04823 5.040657,-2.29086 7.734375,-3.11328 0.03712,10.972 0.07416,21.94401 0.111328,32.916013 14.967938,2.3713 30.451456,3.34292 45.345704,-0.0527 0.505137,-10.725383 -0.647709,-23.274753 0.796875,-32.818363 3.080274,1.58354 7.904584,3.60661 9.775394,-0.7793 3.43791,-4.76159 5.04999,-10.57167 5.72266,-16.33984 -10.73547,-5.50151 -22.898507,-8.4099 -34.16407,-11.84375 z"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.8700012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <g
+       transform="matrix(0.15072623,0,0,0.15072623,-2.3478156,15.014968)"
+       id="g1327">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
+         id="path1329"
+         d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z" />
+    </g>
+    <g
+       transform="matrix(0.4350006,0,0,0.4350006,-21.493727,-207.30308)"
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+       id="g3219">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="ccccccccccc"
+         id="path2427"
+         d="m 67.613793,570.41735 c 24.468075,-13.10042 45.356037,-11.77452 66.041377,-23.06206 11.09637,2.43104 19.357,1.4592 26.99311,-0.26207 23.42862,10.78637 44.02825,12.51579 66.04138,23.5862 -1.82964,11.55946 -5.85886,21.54778 -12.57932,29.6138 -8.15361,-4.36994 -15.86829,-6.10632 -23.32413,-6.28966 l -0.52414,78.62069 c -32.1215,5.98273 -59.34716,3.39775 -85.95862,-0.26207 l -0.26207,-78.09655 c -9.370679,-0.2722 -16.500436,3.19047 -23.848277,6.28966 -7.067215,-9.63539 -10.36885,-19.80873 -12.57931,-30.13794 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path3199"
+         d="m 71.282759,569.10701 c 2.214678,10.74851 6.083496,20.78686 13.627586,29.35172" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path3203"
+         d="m 105.35172,668.16908 c 28.12874,4.60443 56.25747,5.59295 84.38621,-0.26207" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="czc"
+         id="path3205"
+         d="m 133.3931,547.61736 c -0.22816,2.3247 1.69237,12.73282 13.88965,13.36551 11.93593,0.61914 14.27527,-11.53603 13.88966,-13.10345" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="czc"
+         id="path3207"
+         d="m 128.21194,550.41871 c -0.22816,2.3247 4.57424,15.11165 18.34482,15.46206 14.03248,0.35707 19.77872,-14.68086 19.39311,-16.24828" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path3209"
+         d="m 134.52279,552.33459 c 8.53814,2.23324 16.08174,1.75419 25.31809,-0.20185" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path3213"
+         d="m 104.16182,558.28077 c 2.57594,9.88539 6.83803,21.48891 -0.26207,35.37931" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path3215"
+         d="m 190.37521,558.48262 c -2.57594,9.88539 -6.83803,21.48891 0.26207,35.37931" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path3217"
+         d="m 223.28276,568.84494 c -2.21468,10.74851 -6.0835,20.78686 -13.62759,29.35172" />
+    </g>
   </g>
 </svg>
diff --git a/navit/icons/shop_computer.svg b/navit/icons/shop_computer.svg
new file mode 100644
index 000000000..6fd453bcb
--- /dev/null
+++ b/navit/icons/shop_computer.svg
@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="shop_computer.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="69.670434"
+     inkscape:cy="31.54282"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="874"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1440"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:zoom="3.6867085"
+     objecttolerance="10.0"
+     pagecolor="#ff27ff"
+     showgrid="false" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       id="perspective2441"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_x="0 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="60 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       id="symbol-university"
+       viewBox="244.5 110 489 219.9">
+      <path
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
+         id="path4460"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 94,176 73,215"
+         id="path4462"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
+      <path
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
+         id="path4464"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
+         id="path4466"
+         ill="none"
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_x="0 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="12 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4725"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6330"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6376"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6376-2"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6407"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-536.27327,44.693248)">
+    <rect
+       height="10"
+       id="rect4134"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="10"
+       x="1"
+       y="1" />
+    <rect
+       height="8"
+       id="rect4136"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="8"
+       x="2"
+       y="2" />
+  </g>
+  <g
+     id="g3442"
+     transform="matrix(0.19955892,0,0,0.19955923,0.66647975,0.51724451)">
+    <path
+       inkscape:connector-curvature="0"
+       id="rect4428-6"
+       d="m 81.661695,7.469878 c -19.57948,0.846044 -39.40475,-0.131605 -59.08398,0.234242 -5.31242,-1.404655 -10.9701,2.230538 -10.9043,7.877086 0.70691,16.299242 -0.8337,32.837103 0.81836,49.033203 2.75714,2.394813 -2.43825,3.540199 -2.8339897,6.34375 -2.37407,6.741996 -6.50407,12.488517 -9.43358996,18.933594 -2.14541004,6.465709 5.48608996,10.145197 10.91210966,9.386719 18.97039,-1.0358 38.04256,0.0935 57.0664,-0.23871 10.57581,-0.40966 21.47823,0.74098 31.859385,-0.98199 5.14869,-2.56375 4.2375,-9.758468 0.55664,-13.187504 -3.557765,-6.182426 -5.160045,-13.736499 -10.593755,-18.691406 4.11895,-5.861012 0.57998,-13.401333 1.69985,-19.947181 -0.52852,-11.643709 1.52305,-23.841236 -1.09047,-35.148522 -1.92263,-2.977354 -5.65056,-3.806277 -8.97266,-3.613281 z"
+       style="fill:#ffffff;stroke:#ffffff;stroke-width:6.50163364;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <g
+       transform="matrix(6.2999783,0,0,6.2999783,1.1681316,17.51386)"
+       id="g3626">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#ad30c0;stroke-width:1.03200889;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="ccssccssc"
+         id="rect4428"
+         d="m 2.4483515,8.2362225 11.1032965,0 c 0.30455,0 0.412539,0.2781433 0.549729,0.550351 l 1.4905,2.9574075 c 0.13719,0.272208 -0.245178,0.550352 -0.549728,0.550352 l -14.08429756,0 c -0.30454944,0 -0.68691783,-0.278144 -0.54972816,-0.550352 L 1.8986234,8.7865735 C 2.0358129,8.5143659 2.1438021,8.2362225 2.4483515,8.2362225 Z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#ad30c0;stroke-width:0.25799972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path4432"
+         d="m 1.4764801,9.2012489 13.0299889,0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#ad30c0;stroke-width:0.25799972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path4434"
+         d="m 1.0932552,9.8745606 13.7430548,0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#ad30c0;stroke-width:0.25799972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path4436"
+         d="m 0.79760876,10.637491 14.41115024,0" />
+    </g>
+    <rect
+       y="11.680762"
+       x="15.575519"
+       width="71.984909"
+       style="fill:none;stroke:#ad30c0;stroke-width:6.50163364;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       ry="3.2218187"
+       rx="3.2218187"
+       id="rect4426"
+       height="53.09943" />
+    <g
+       transform="matrix(7.1081714,0,0,7.1081714,-7.5276538,13.68804)"
+       id="g3658">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;fill-opacity:1;stroke:none"
+         sodipodi:nodetypes="ccccc"
+         id="path3619"
+         d="m 6.445849,0.54307086 0,4.60246824 1.679497,-1.453411 2.034775,-0.7105565 -3.714272,-2.43850074 z" />
+      <rect
+         y="4.6760492"
+         x="-9.5682249"
+         width="3.1568718"
+         transform="matrix(-0.5,-0.8660254,0.8660254,-0.5,0,0)"
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         ry="0"
+         rx="0"
+         id="rect3649"
+         height="1.1156085" />
+    </g>
+    <rect
+       y="11.680762"
+       x="15.575519"
+       width="71.984909"
+       style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.50163364;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       ry="3.2218187"
+       rx="3.2218187"
+       id="rect4426-3"
+       height="53.09943" />
+    <g
+       transform="matrix(6.2999783,0,0,6.2999783,1.1681316,17.51386)"
+       style="opacity:0.1;fill:#ffffff;fill-opacity:1"
+       id="g3626-4">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;fill-opacity:1;stroke:#ad30c0;stroke-width:1.03200889;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="ccssccssc"
+         id="rect4428-2"
+         d="m 2.4483515,8.2362225 11.1032965,0 c 0.30455,0 0.412539,0.2781433 0.549729,0.550351 l 1.4905,2.9574075 c 0.13719,0.272208 -0.245178,0.550352 -0.549728,0.550352 l -14.08429756,0 c -0.30454944,0 -0.68691783,-0.278144 -0.54972816,-0.550352 L 1.8986234,8.7865735 C 2.0358129,8.5143659 2.1438021,8.2362225 2.4483515,8.2362225 Z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;fill-opacity:1;stroke:#ad30c0;stroke-width:0.25799972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path4432-0"
+         d="m 1.4764801,9.2012489 13.0299889,0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;fill-opacity:1;stroke:#ad30c0;stroke-width:0.25799972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path4434-5"
+         d="m 1.0932552,9.8745606 13.7430548,0" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ad30c0;fill-opacity:1;stroke:#ad30c0;stroke-width:0.25799972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         id="path4436-9"
+         d="m 0.79760876,10.637491 14.41115024,0" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/shop_department.svg b/navit/icons/shop_department.svg
new file mode 100644
index 000000000..f34b015c5
--- /dev/null
+++ b/navit/icons/shop_department.svg
@@ -0,0 +1,508 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="shop_department.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="61.070604"
+     inkscape:cy="74.904247"
+     inkscape:guide-bbox="true"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="725"
+     inkscape:window-maximized="0"
+     inkscape:window-width="1024"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:zoom="3.6867084"
+     objecttolerance="10.0"
+     pagecolor="#ffff33"
+     showgrid="false"
+     showguides="true" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       id="perspective2441"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="6.1230318e-14 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_x="0 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="60 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       id="symbol-university"
+       viewBox="244.5 110 489 219.9">
+      <path
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
+         id="path4460"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 94,176 73,215"
+         id="path4462"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
+      <path
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
+         id="path4464"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
+         id="path4466"
+         ill="none"
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_x="0 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="12 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3826"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3855"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3909"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3950"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3972"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3994"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4016"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4837"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4971"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6216"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6764"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective6817"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <radialGradient
+       cx="180.2453"
+       cy="198.41902"
+       fx="180.2453"
+       fy="198.41902"
+       gradientTransform="scale(0.79354273,1.2601716)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient874"
+       r="101.58017"
+       xlink:href="#linearGradient829" />
+    <linearGradient
+       id="linearGradient829">
+      <stop
+         id="stop830"
+         offset="0.0000000"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0.341667;" />
+      <stop
+         id="stop831"
+         offset="1.0000000"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
+    </linearGradient>
+    <radialGradient
+       cx="360.85147"
+       cy="167.47372"
+       fx="360.85147"
+       fy="167.47372"
+       gradientTransform="scale(1.007004,0.99304475)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient832"
+       r="46.394722"
+       xlink:href="#linearGradient829" />
+    <linearGradient
+       id="linearGradient6826">
+      <stop
+         id="stop6828"
+         offset="0.0000000"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0.341667;" />
+      <stop
+         id="stop6830"
+         offset="1.0000000"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="scale(0.74491357,1.3424376)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient850"
+       spreadMethod="pad"
+       x1="465.29425"
+       x2="463.27057"
+       xlink:href="#linearGradient855"
+       y1="248.24467"
+       y2="405.76871" />
+    <linearGradient
+       id="linearGradient855">
+      <stop
+         id="stop856"
+         offset="0.0000000"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
+      <stop
+         id="stop857"
+         offset="1.0000000"
+         style="stop-color: rgb(255, 166, 23); stop-opacity: 0.733333;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="scale(1.4586159,0.68558144)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient854"
+       x1="157.80582"
+       x2="155.40575"
+       xlink:href="#linearGradient855"
+       y1="120.96176"
+       y2="231.6349" />
+    <linearGradient
+       id="linearGradient6837">
+      <stop
+         id="stop6839"
+         offset="0.0000000"
+         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
+      <stop
+         id="stop6841"
+         offset="1.0000000"
+         style="stop-color: rgb(255, 166, 23); stop-opacity: 0.733333;" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective6928"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective10781"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective10806"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective10878"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective10919"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipoutline2">
+      <path
+         d="m 55.8,12 0.76,0.16 c 8.84,-2.94 28.68,8.64 24.26,18.96 -1.12,1.62 -0.93,4.5 0.42,6.31 L 56.43,62.25 c -1.39,-1.39 -4.48,-1.36 -5.9,0 L 9.5,101.63 c -3.74,3.59 -0.8,6.64 0.78,8.25 l 7.36,7.36 c 1.61,1.6 5.86,3.76 8.88,0.56 L 65.24,76.99 c 1.35,-1.42 1.36,-4.47 0,-5.87 0,0 0.01,-0.02 0,-0.02 L 90.15,46.2 c 2.63,2.37 5.113827,2.574854 7.47,1.93 4.55057,-1.245432 7.08725,3.206643 9.81,6.46 l -1.23,1.21 c -1.82,1.84 -1.65,4.94 0.39,6.98 2.04,2.04 5.15,2.21 6.97,0.39 l 8.14,-8.13 c 1.82,-1.84 1.65,-4.94 -0.4,-6.97 -1.84,-1.85 -4.51,-2.09 -6.37,-0.77 -5.58,-6.26 -2.65,-7.2 -10.01,-15.35 L 91.13,17.86 C 81.2,8.12 68.3,8.13 55.8,12 Z"
+         id="outline2"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+  </defs>
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-536.27327,44.693248)">
+    <rect
+       height="10"
+       id="rect4134"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="10"
+       x="1"
+       y="1" />
+    <rect
+       height="8"
+       id="rect4136"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="8"
+       x="2"
+       y="2" />
+  </g>
+  <g
+     id="g3580"
+     transform="matrix(0.20696688,0,0,0.20696125,0.82613317,0.26991825)">
+    <path
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path6571-7"
+       d="M 30.297326,-0.67870233 C 20.887916,-1.4709923 12.347136,2.8423937 3.4812955,5.2064847 c -3.01285997,1.474741 -8.71361,2.39573 -6.46326,6.7339533 1.07393,4.852506 3.20975003,9.495353 6.47656,13.267578 2.07021,0.168239 6.36828,-4.392087 5.09457,0.343739 l 0.0714,21.378917 c 4.1738105,0.568355 8.3493305,1.156085 12.5527305,1.460938 -6.82927,2.971618 -13.6782105,6.887186 -20.58594047,8.773438 -2.92626003,4.432141 -0.39336,10.358595 -2.19531003,15.189453 8.62399,13.646409 15.8589175,18.819142 25.0999175,31.996219 5.360182,-2.77792 3.416705,-1.76827 8.140313,-3.90247 5.7835,-1.751962 10.35651,-5.816133 16.19532,-7.468749 3.6663,-1.357825 5.76877,-5.401227 4.94922,-9.025391 0.78463,-1.51623 0.9105,-3.581477 0.91796,-5.029297 2.35778,7.836145 6.13544,17.667777 14.81641,20.048828 3.44209,0.891963 6.46283,-2.44828 9.54688,-0.154297 7.441329,1.714826 12.929939,-5.061229 15.568349,-11.109375 4.74983,-7.516422 5.66875,-19.360063 -2.87304,-24.583984 4.66327,-3.327508 6.93151,-8.925677 8.30273,-14.292969 -5.7186,-2.034634 -12.94804,-1.172658 -17.730469,1.039062 -0.005,-2.464489 -5.17696,-2.797073 -2.03013,-4.788359 C 86.762555,36.170464 94.192205,27.259373 101.61759,18.344735 96.716155,13.811402 93.075075,4.2593337 84.752355,6.2548907 c -8.263379,1.178486 -17.779739,-1.876678 -25.361329,1.72461 -0.93114,1.357444 -2.75902,3.4635273 -3.67187,4.0488283 -0.10967,-2.6865923 -0.65845,-6.1084113 -2.91016,-7.6210943 -2.09951,-0.536017 -4.13947,2.53341 -5.79492,0.146484 -5.63391,-1.531225 -11.1176,-3.67972403 -16.7168,-5.23242103 z M 52.475066,21.010751 c 6.88434,8.164693 14.37961,16.514665 20.90039,24.847656 -2.92449,2.744386 -5.20463,-1.449858 -8.5918,-1.554688 -3.36536,-0.825684 -10.19056,-1.569352 -9.27539,3.880859 1.08608,5.635457 4.78008,11.270186 10.69922,12.556641 -6.74574,0.838307 -12.53985,6.813106 -13.00195,13.623047 L 33.807096,48.397469 c 3.36433,-0.692588 8.75494,-0.168044 10.41908,-2.545107 -0.31757,-6.900583 0.71663,-14.002136 -0.53822,-20.75958 0.74543,-2.252287 4.82044,0.236099 6.5957,-1.703125 0.90724,-0.556427 1.66587,-1.735429 2.19141,-2.378906 z m 25.80273,40.832031 c 3.27787,5.433808 -4.10017,1.987473 0,0 z m -3.15429,10.205078 c 1.2391,1.745054 -2.63242,0.333205 0,0 z"
+       style="fill:#ffffff;stroke:#ffffff" />
+    <g
+       transform="matrix(0.25518838,-0.04452145,0.04452145,0.25518838,-38.70778,-12.747456)"
+       id="g3338" />
+    <g
+       transform="matrix(0.35704279,0,0,0.35704279,18.83897,-28.663938)"
+       id="g4238">
+      <path
+         style="fill:#ad30c0"
+         inkscape:connector-curvature="0"
+         id="path6571"
+         d="m 209.74503,225.79765 c 0,0 -10.56174,35.79543 -41.59499,25.12539 -0.005,0.0224 3.7446,-31.18541 41.59499,-25.12539 z" />
+      <path
+         style="fill:#ad30c0"
+         inkscape:connector-curvature="0"
+         id="path6573"
+         d="m 157.72652,270.07711 c 5.36274,-5.30508 12.68607,-8.50543 20.81666,-8.50543 16.40541,0 29.75463,13.29154 29.75463,29.72577 0,0.60547 0,1.12444 -0.0288,1.75875 l -0.0576,0 c -0.51898,6.42953 -2.56606,14.41598 -7.40985,24.33419 0,0 -8.33244,15.94407 -15.02146,23.2674 l -0.60547,0.57664 c -3.22916,3.25801 -7.78462,5.30508 -12.71487,5.30508 -6.05474,0 -11.41748,-2.94086 -14.67549,-7.49631 l -0.0865,0 c -3.25802,4.55545 -8.62076,7.49631 -14.67547,7.49631 -4.98794,0 -9.48572,-2.01824 -12.74374,-5.30508 l -0.60546,-0.57664 c -6.63136,-7.32333 -15.02146,-23.2674 -15.02146,-23.2674 -4.84377,-9.91821 -6.89084,-17.96232 -7.35216,-24.33419 l -0.14415,0 c -0.0865,-0.60547 -0.0865,-1.12445 -0.0865,-1.75875 0,-16.43423 13.34921,-29.72577 29.81226,-29.72577 8.10178,0 15.42511,3.20035 20.84552,8.50543" />
+      <path
+         style="fill:#ad30c0"
+         inkscape:connector-curvature="0"
+         id="path10957"
+         d="m 113.68291,214.69051 c 0,0 6.27532,31.27326 33.50285,24.54444 0.003,0.0195 -0.82177,-26.83164 -33.50285,-24.54444 z" />
+      <path
+         style="fill:#ad30c0;fill-opacity:1;stroke:#ad30c0;stroke-width:1.3514632;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         id="path10959"
+         d="m 156.85947,263.78173 c 0,0 -0.30241,-32.11059 -3.62889,-40.48726 -3.32648,-8.37667 11.18908,0 11.18908,0 l -7.56019,40.48726 z" />
+    </g>
+    <g
+       transform="matrix(0.18262598,0,0,0.18262598,-4.543203,-3.2174298)"
+       id="g4015">
+      <path
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:5.49104214;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         id="path3470"
+         d="M 56.491347,345.3433 171.48706,496.40865 296.26258,436.03365 184.37297,286.25628 56.491347,345.3433 Z" />
+      <path
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:5.49104214;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         id="path3474"
+         d="M 42.478704,360.31161 155.50474,509.10418 152.24539,562.17255 38.177673,413.03907 42.478704,360.31161 Z" />
+      <path
+         style="opacity:0.75;fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:9.04777431;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path3476"
+         d="m 293.27333,464.43786 -117.69458,58.1195 -0.20367,1.73897 117.59638,-58.07887 0.30188,-1.7796 z" />
+      <path
+         style="opacity:0.75;fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:9.04777431;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path3505"
+         d="m 290.98944,496.39729 -117.69457,58.1195 -0.20368,1.73898 117.59639,-58.07887 0.30187,-1.77961 z" />
+    </g>
+    <g
+       transform="matrix(0.08450466,0,0,0.08450466,51.329827,1.0127534)"
+       id="g3753">
+      <g
+         transform="matrix(31.921892,0,0,31.921892,35.399153,14.948442)"
+         style="fill:none;stroke:#ffffff;stroke-width:1.00000334;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="g3709">
+        <path
+           style="stroke:#ad30c0;stroke-width:1.00000334;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:connector-curvature="0"
+           id="path3700"
+           d="M 8,15 0.5,6 15.5,6 Z" />
+        <path
+           style="stroke:#ad30c0;stroke-width:1.00000334;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:connector-curvature="0"
+           id="path3702"
+           d="M 0.5,6 3,3 13,3 15.5,6 Z" />
+        <path
+           style="stroke:#ad30c0;stroke-width:1.00000334;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:connector-curvature="0"
+           id="path3706"
+           d="M 4.5,3 8,15 11.5,3" />
+      </g>
+      <path
+         style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:31.92199898;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         id="path3700-3"
+         d="M 290.77429,493.77682 51.360099,206.4798 l 478.828381,0 z" />
+      <path
+         style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:31.92199898;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0"
+         id="path3702-2"
+         d="m 51.360099,206.4798 79.804731,-95.76568 319.21892,0 79.80473,95.76568 z" />
+    </g>
+    <g
+       transform="matrix(0.32046669,0,0,0.32046669,-20.956869,-172.04202)"
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
+       id="g3219">
+      <path
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path2427"
+         d="m 67.613793,570.41735 c 24.468075,-13.10042 45.356037,-11.77452 66.041377,-23.06206 11.09637,2.43104 19.357,1.4592 26.99311,-0.26207 23.42862,10.78637 44.02825,12.51579 66.04138,23.5862 -1.82964,11.55946 -5.85886,21.54778 -12.57932,29.6138 -8.15361,-4.36994 -15.86829,-6.10632 -23.32413,-6.28966 l -0.52414,78.62069 c -32.1215,5.98273 -59.34716,3.39775 -85.95862,-0.26207 l -0.26207,-78.09655 c -9.370679,-0.2722 -16.500436,3.19047 -23.848277,6.28966 -7.067215,-9.63539 -10.36885,-19.80873 -12.57931,-30.13794 z" />
+      <path
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3199"
+         d="m 71.282759,569.10701 c 2.214678,10.74851 6.083496,20.78686 13.627586,29.35172" />
+      <path
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3203"
+         d="m 105.35172,668.16908 c 28.12874,4.60443 56.25747,5.59295 84.38621,-0.26207" />
+      <path
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="czc"
+         inkscape:connector-curvature="0"
+         id="path3205"
+         d="m 133.3931,547.61736 c -0.22816,2.3247 1.69237,12.73282 13.88965,13.36551 11.93593,0.61914 14.27527,-11.53603 13.88966,-13.10345" />
+      <path
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="czc"
+         inkscape:connector-curvature="0"
+         id="path3207"
+         d="m 128.21194,550.41871 c -0.22816,2.3247 4.57424,15.11165 18.34482,15.46206 14.03248,0.35707 19.77872,-14.68086 19.39311,-16.24828" />
+      <path
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3209"
+         d="m 134.52279,552.33459 c 8.53814,2.23324 16.08174,1.75419 25.31809,-0.20185" />
+      <path
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3213"
+         d="m 104.16182,558.28077 c 2.57594,9.88539 6.83803,21.48891 -0.26207,35.37931" />
+      <path
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3215"
+         d="m 190.37521,558.48262 c -2.57594,9.88539 -6.83803,21.48891 0.26207,35.37931" />
+      <path
+         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3217"
+         d="m 223.28276,568.84494 c -2.21468,10.74851 -6.0835,20.78686 -13.62759,29.35172" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/shop_grocery.svg b/navit/icons/shop_grocery.svg
new file mode 100644
index 000000000..660a71b39
--- /dev/null
+++ b/navit/icons/shop_grocery.svg
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg1875"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="shop_grocery.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs1877">
+    <linearGradient
+       id="linearGradient3158">
+      <stop
+         style="stop-color:#060606;stop-opacity:1;"
+         offset="0"
+         id="stop3160" />
+      <stop
+         id="stop3166"
+         offset="1"
+         style="stop-color:#fcc82d;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3165">
+      <stop
+         style="stop-color:#1f1f1f;stop-opacity:1;"
+         offset="0"
+         id="stop3167" />
+      <stop
+         style="stop-color:#ed4600;stop-opacity:1;"
+         offset="1"
+         id="stop3169" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 73.285255 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="146.84756 : 73.285255 : 1"
+       inkscape:persp3d-origin="73.423782 : 48.856837 : 1"
+       id="perspective12" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3158"
+       id="linearGradient2921"
+       gradientUnits="userSpaceOnUse"
+       x1="-825.11871"
+       y1="46.53587"
+       x2="-694.49249"
+       y2="46.53587" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ff00ff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.1414086"
+     inkscape:cx="48.225758"
+     inkscape:cy="64.228299"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1094"
+     inkscape:window-height="778"
+     inkscape:window-x="113"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata1880">
+    <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>Symbol Shop</dc:title>
+        <dc:date>07. Oct. 2006</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Stefan Fussan</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>Map; Symbol; Wikivoyage; Shop</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:description>Symbol for Wikivoyage maps:Shop
+jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Hintergrund"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(836.281,-16.5055)">
+    <g
+       id="g8382"
+       transform="matrix(0.20882075,0,0,0.20882238,-660.94107,13.448177)">
+      <g
+         transform="translate(-112.27017,6.6041275)"
+         id="g7940">
+        <path
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.12622356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -676.2832,14.099609 c -10.91379,-0.694096 -22.42599,6.011362 -24.32618,17.38086 -1.52315,3.127226 0.84999,9.409768 -4.42742,7.764103 -6.64864,0.20385 -14.10665,-1.662132 -20.22101,1.341366 -0.74473,11.167786 4.38857,21.846503 6.08398,32.796874 3.14883,12.204786 4.28876,25.470444 9.49926,36.978838 12.26766,1.70788 25.4842,0.53356 38.11791,0.88093 10.06429,-0.39181 20.38591,0.60854 30.29104,-0.54141 5.75503,-5.85225 4.21281,-15.053879 7.11326,-22.209274 3.22434,-15.444965 8.35556,-30.778139 10.04572,-46.37931 -4.57531,-5.751064 -13.12799,-1.505565 -19.40117,-2.678992 -2.07532,-0.123574 -7.54311,1.61922 -5.89844,-2.53711 -0.78584,-10.650254 -7.87341,-22.429793 -19.73242,-22.402343 -2.36552,-0.327027 -4.75775,-0.445925 -7.14453,-0.394532 z"
+           id="path7896"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.12622356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -677.22852,21.394531 c -11.19184,-0.388234 -19.30778,12.34929 -15.29882,22.429688 3.46566,4.680124 10.05944,0.882522 14.88622,2.091435 6.63052,-0.246153 14.02181,1.248236 20.12745,-1.626592 3.08303,-9.843817 -3.43285,-23.141451 -14.77539,-22.732421 -1.64302,-0.154991 -3.29297,-0.09939 -4.93946,-0.16211 z m -12.33789,20.611328 c -3.24235,0.413425 -3.75475,-4.668795 0,0 z"
+           id="path2386-4"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:4.12622356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -656.1875,52.283203 c -1.46981,4.129485 2.74405,7.6208 6.7168,6.583985 3.45364,-0.185245 7.00406,-1.430519 10.36718,-0.01953 2.02465,-3.453647 0.6724,-9.087822 -4.12304,-8.707031 -4.20805,-0.301285 -8.52717,1.831544 -12.57422,-0.07813 -0.12891,0.740234 -0.25781,1.480469 -0.38672,2.220703 z"
+           id="path3190-5"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:4.12622356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -659.02148,63.59375 c -1.47037,4.132175 2.74515,7.618901 6.71875,6.583984 3.4519,-0.182689 7.00142,-1.434182 10.36328,-0.02148 2.02486,-3.453764 0.67216,-9.08712 -4.12305,-8.707031 -4.20674,-0.306479 -8.52295,1.835552 -12.57227,-0.07617 -0.1289,0.740234 -0.25781,1.480469 -0.38671,2.220703 z"
+           id="path3192-0"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:4.12622356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -661.32617,74.476562 c -1.47048,4.132276 2.74708,7.620624 6.7207,6.583985 3.45187,-0.183165 7.00145,-1.433883 10.36328,-0.02148 2.02465,-3.453647 0.67239,-9.087822 -4.12304,-8.707031 -4.20738,-0.306539 -8.52429,1.835563 -12.57422,-0.07617 -0.12891,0.740235 -0.25782,1.480469 -0.38672,2.220703 z"
+           id="path3194-3"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:4.12622356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -663.09766,85.572266 c -1.46966,4.12877 2.7422,7.620252 6.71485,6.583984 3.45368,-0.184736 7.00403,-1.430827 10.36719,-0.01953 2.02454,-3.453471 0.67254,-9.087949 -4.12305,-8.707031 -4.20742,-0.299945 -8.5259,1.830659 -12.57227,-0.07813 -0.1289,0.740235 -0.25781,1.480469 -0.38672,2.220704 z"
+           id="path3196-6"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:4.12622356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -676.38672,51.855469 c -1.46981,4.129484 2.74405,7.6208 6.7168,6.583984 3.45364,-0.185244 7.00406,-1.430518 10.36719,-0.01953 2.02465,-3.453647 0.67239,-9.087822 -4.12305,-8.707031 -4.20805,-0.301286 -8.52716,1.831543 -12.57422,-0.07813 -0.12891,0.740234 -0.25781,1.480468 -0.38672,2.220703 z"
+           id="path3198-1"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:4.12622356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -679.2207,63.166016 c -1.46966,4.12877 2.74219,7.620252 6.71484,6.583984 3.45368,-0.184736 7.00403,-1.430827 10.36719,-0.01953 2.02454,-3.453471 0.67254,-9.087949 -4.12305,-8.707031 -4.20742,-0.299945 -8.5259,1.830659 -12.57226,-0.07813 -0.12891,0.740235 -0.25782,1.480469 -0.38672,2.220704 z"
+           id="path3200-0"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:4.12622356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -681.52539,74.048828 c -1.46982,4.129485 2.74405,7.6208 6.7168,6.583984 3.45364,-0.185244 7.00406,-1.430518 10.36718,-0.01953 2.02465,-3.453647 0.6724,-9.087822 -4.12304,-8.707031 -4.20805,-0.301285 -8.52717,1.831544 -12.57422,-0.07813 -0.12891,0.740234 -0.25781,1.480469 -0.38672,2.220703 z"
+           id="path3202-6"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:4.12622356;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -683.29688,85.146484 c -1.47047,4.132276 2.74709,7.620624 6.72071,6.583985 3.45187,-0.183165 7.00145,-1.433884 10.36328,-0.02148 2.02465,-3.453647 0.67239,-9.087822 -4.12305,-8.707031 -4.20737,-0.306539 -8.52428,1.835563 -12.57422,-0.07617 -0.1289,0.740235 -0.25781,1.480469 -0.38672,2.220703 z"
+           id="path3204-3"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0.75197468,0,0,0.90565399,-215.60791,26.715467)"
+         id="g2910">
+        <path
+           inkscape:connector-curvature="0"
+           id="path2386"
+           style="fill:url(#linearGradient2921);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -803.29162,95.74954 86.30555,0 19.99357,-70.643923 -33.98906,0.333226 c 0,0 1.38124,-12.66178 -7.6642,-22.6593734 -6.3313,-6.997747 -35.98842,-7.6642 -43.98584,0.333226 -10.66324,10.6632344 -6.3313,21.9929214 -7.6642,21.9929214 -1.33291,0 -32.32293,-0.333226 -32.32293,-0.333226 l 19.32711,70.977149 z m 62.22067,-72.096063 c 0,0 0.8948,-8.202596 -4.96505,-14.6792694 -4.10156,-4.5333031 -23.31414,-4.9650469 -28.49505,0.2158716 -6.90789,6.9078908 -3.86593,14.4831518 -4.72942,14.4831518 l 38.18952,-0.01975 z"
+           sodipodi:nodetypes="ccccssscccsscc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M 122.05448,66.928784 103.91125,67.16441"
+           id="path3190"
+           transform="translate(-836.281,-29.4945)" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3192"
+           d="m -717.99654,49.922484 -18.14323,0.235626"
+           style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -721.05968,61.939431 -18.14323,0.235626"
+           id="path3194" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3196"
+           d="m -723.41594,74.192004 -18.14323,0.235626"
+           style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3198"
+           d="m -741.08793,36.963031 -18.14323,0.235626"
+           style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -744.85795,49.451231 -18.14323,0.235626"
+           id="path3200" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3202"
+           d="m -747.92109,61.468178 -18.14323,0.235626"
+           style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -750.27735,73.720751 -18.14323,0.235626"
+           id="path3204" />
+      </g>
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Symbol"
+     transform="translate(0,-46)" />
+</svg>
diff --git a/navit/icons/shopping.svg b/navit/icons/shopping.svg
new file mode 100644
index 000000000..c0fda19b8
--- /dev/null
+++ b/navit/icons/shopping.svg
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="shopping.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/projets/navit/icons/png/shopping.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3160">
+      <stop
+         style="stop-color:#208420;stop-opacity:1;"
+         offset="0"
+         id="stop3162" />
+      <stop
+         style="stop-color:#15d715;stop-opacity:1;"
+         offset="1"
+         id="stop3164" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2390"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3160"
+       id="linearGradient3166"
+       x1="13.520976"
+       y1="11.795792"
+       x2="5.2298675"
+       y2="4.3404341"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0830036,0,0,1.0830036,-8.771668,-79.951561)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#22a638"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.959798"
+     inkscape:cx="93.933983"
+     inkscape:cy="51.401504"
+     inkscape:document-units="px"
+     inkscape:current-layer="g3414"
+     showgrid="true"
+     inkscape:window-width="1432"
+     inkscape:window-height="789"
+     inkscape:window-x="0"
+     inkscape:window-y="82"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g3414"
+       transform="matrix(0.93610894,0,0,0.93610894,7.8958841,-3.3657302)">
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccc"
+         id="path3169-9"
+         d="m 10.638032,-59.889666 -12.5687752,0.04834 2.34574727,-4.873472"
+         style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.43274236;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.08300364;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+         d="m 11.0578,-77.058146 c -5.3075387,0.212819 -10.72468093,-0.101168 -16.0219702,0.184905 -1.4016148,1.194857 -0.07161,3.062337 -0.1510017,4.555794 0.4938237,2.844513 0.7335472,5.787154 1.3825173,8.571754 1.4067138,1.170337 3.18998557,-0.191237 4.7510646,-0.239055 3.9253663,-0.897197 7.9495833,-1.567729 11.81401,-2.604663 1.120226,-1.503298 0.29309,-3.537512 0.534271,-5.267835 -0.104326,-1.575813 0.433655,-3.377955 -0.354939,-4.810821 -0.589305,-0.338461 -1.287255,-0.404958 -1.953952,-0.390079 z"
+         id="rect3166-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.22773118;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+         d="m -0.51468093,-60.791379 c -2.19311727,-0.149009 -2.86799867,3.390229 -0.82908267,4.120956 1.89810067,0.995751 3.959052,-1.724684 2.5744305,-3.313667 -0.43233173,-0.499638 -1.07641933,-0.828749 -1.74534783,-0.807289 z"
+         id="path3171-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.22773118;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+         d="m -6.4481463,-79.611671 c -2.2371842,-0.07424 -2.5970758,3.663282 -0.3856286,4.021324 2.0656403,0.695879 3.5378951,-2.665546 1.6034575,-3.693071 -0.3574628,-0.235044 -0.7909263,-0.350187 -1.2178289,-0.328253 z"
+         id="path3179-6"
+         inkscape:connector-curvature="0" />
+      <path
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.22773118;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+         d="m 7.7210053,-60.6744 c -2.191842,-0.14919 -2.868212,3.387422 -0.83131,4.119622 1.897716,0.998912 3.9619827,-1.722646 2.576656,-3.312333 -0.432332,-0.499638 -1.076417,-0.828749 -1.745346,-0.807289 z"
+         id="path2393-2"
+         inkscape:connector-curvature="0" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2391"
+         d="m -6.3764561,-77.585409 c 0,0 2.4734049,1.12888 2.3585254,2.218223"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.08300364px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc"
+         id="rect3166"
+         d="m -4.8520716,-76.043954 17.2545266,-0.05268 -0.044,8.75885 -15.4144439,3.279264 -1.7960847,-11.985432 z"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3166);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.08300364;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccc"
+         id="path3169"
+         d="m 10.797952,-59.877317 -12.5687753,0.04835 2.34574707,-4.873473"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.08300364px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <ellipse
+         ry="1.2353702"
+         rx="1.2357539"
+         cy="-58.633984"
+         cx="-0.57045335"
+         id="path3171"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#262626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3175"
+         d="m 10.722396,-72.91376 -13.2523922,0"
+         style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.08300364px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path3177"
+         d="m 8.6427143,-68.581327 -9.54844633,0"
+         style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.08300364px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <ellipse
+         ry="1.1291027"
+         rx="1.1294535"
+         cy="-77.562889"
+         cx="-6.442029"
+         id="path3179"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#262626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc"
+         id="path2389"
+         d="m 10.435101,-70.823459 -12.1893862,0"
+         style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.08300364px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <ellipse
+         ry="1.2353702"
+         rx="1.2357539"
+         cy="-58.51709"
+         cx="7.6651673"
+         id="path2393"
+         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#262626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/xpm/sikh.svg b/navit/icons/sikh.svg
index f80093f61..f80093f61 100644
--- a/navit/xpm/sikh.svg
+++ b/navit/icons/sikh.svg
diff --git a/navit/xpm/skiing.svg b/navit/icons/skiing.svg
index 86ef5577a..86ef5577a 100644
--- a/navit/xpm/skiing.svg
+++ b/navit/icons/skiing.svg
diff --git a/navit/icons/sport.svg b/navit/icons/sport.svg
new file mode 100644
index 000000000..6332de752
--- /dev/null
+++ b/navit/icons/sport.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg:svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="sport.svg"
+   version="1.0"
+   width="22">
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1"
+     gridtolerance="10"
+     guidetolerance="10"
+     id="namedview12"
+     inkscape:current-layer="svg2"
+     inkscape:cx="1.7318645"
+     inkscape:cy="30.589243"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="874"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1440"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:zoom="3.613793"
+     objecttolerance="10"
+     pagecolor="#54ffff"
+     showgrid="false" />
+  <svg:metadata
+     id="metadata2975">
+    <RDF>
+      <Work
+         about="">
+        <format>image/svg+xml</format>
+        <type
+           resource="http://purl.org/dc/dcmitype/StillImage" />
+        <license
+           resource="http://web.resource.org/cc/PublicDomain" />
+        <language>en</language>
+      </Work>
+    </RDF>
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </svg:metadata>
+  <svg:defs
+     id="defs4" />
+  <svg:g
+     id="g4180"
+     transform="matrix(0.21479959,0,0,0.21479959,0.36045122,0.2190279)">
+    <svg:circle
+       style="fill:none;stroke:#ffffff;stroke-width:12;stroke-miterlimit:4;stroke-dasharray:none"
+       r="45.210526"
+       id="circle2046-6"
+       cy="50.190842"
+       cx="49.532444" />
+    <svg:g
+       transform="translate(182.35688,-75.543895)"
+       style="fill:#ffffff;stroke:#ffffff"
+       id="g3376">
+      <svg:path
+         style="fill:#ffffff;stroke:#ffffff"
+         d="m -150.41992,88.931641 c -7.24101,-0.163712 -10.41337,10.184483 -4.8418,14.499999 4.03761,5.75094 10.38227,11.31439 8.49414,19.10547 1.34345,12.43423 -8.27336,22.80014 -8.51562,34.86719 1.56736,7.54467 14.14952,7.76115 15.41495,-0.14079 2.36049,-5.69666 4.1509,-13.36333 6.84872,-17.89437 6.16578,5.35842 9.50921,13.7559 16.73633,17.86914 6.50095,3.32357 13.74121,-5.11433 9.78125,-11.16016 -4.78506,-7.54734 -12.52809,-12.87528 -17.20899,-20.55468 -3.9374,-6.95799 4.96442,-12.56226 9.38867,-16.52344 4.30704,-3.30185 9.56638,-9.746174 4.83008,-14.863281 -3.64669,-4.502773 -10.63601,-3.429697 -13.70312,1.15625 -3.7076,2.758614 -6.30183,8.704531 -11.21094,9.017581 -5.87747,-3.7493 -6.87043,-13.153157 -14.21289,-15.230472 -0.58971,-0.12888 -1.19796,-0.17397 -1.80078,-0.148437 z"
+         id="path2044-3"
+         inkscape:connector-curvature="0" />
+      <svg:path
+         style="fill:#ffffff;stroke:#ffffff"
+         d="m -133.73633,88.488281 c -9.57475,0.111068 -13.18964,14.974959 -4.6289,19.374999 7.76045,5.62194 19.50427,-4.32455 15.14453,-12.888671 -1.62381,-4.163624 -6.08918,-6.826084 -10.51563,-6.486328 z"
+         id="circle2048-7"
+         inkscape:connector-curvature="0" />
+    </svg:g>
+    <svg:path
+       style="fill:#39ac39"
+       inkscape:connector-curvature="0"
+       id="path2044"
+       d="M 71.543949,72.065737 55.14311,53.080262 c -0.188198,-0.29938 -2.21722,-3.582177 -2.21722,-6.068186 0,-2.581687 2.149194,-7.392579 2.190859,-7.485493 0.03638,-0.0315 0.07431,-0.06047 0.109671,-0.09384 l 13.816382,-13.20175 c 1.469481,-1.394083 1.530687,-3.715465 0.136601,-5.184946 l -0.28039,-0.295338 c -1.39407,-1.469461 -3.715451,-1.53085 -5.184933,-0.136776 L 50.742033,33.008764 c -0.250887,-0.0645 -0.506784,-0.09902 -0.765803,-0.09902 l -5.196559,0 -10.147933,-13.977695 c -1.171012,-1.65271 -3.460131,-2.043539 -5.112862,-0.872708 l -0.332205,0.235402 c -1.652915,1.170844 -2.043561,3.459964 -0.872731,5.11288 l 10.601807,14.602651 0,17.375328 -8.346609,23.324609 c -0.682477,1.906954 0.310453,4.00637 2.217406,4.68885 l 0.383455,0.137179 c 1.907139,0.682481 4.006373,-0.310604 4.688853,-2.217407 l 8.120778,-22.693561 3.722652,0 15.982722,18.501545 c 1.324025,1.532716 3.640247,1.70177 5.172963,0.377728 l 0.308252,-0.266194 c 1.53253,-1.323474 1.701581,-3.64006 0.37773,-5.172594 z" />
+    <svg:circle
+       style="fill:none;stroke:#39ac39;stroke-width:3.68707275"
+       r="45.210526"
+       id="circle2046"
+       cy="49.639103"
+       cx="49.837967" />
+    <svg:circle
+       style="fill:#39ac39"
+       r="6.4523773"
+       id="circle2048"
+       cy="23.398026"
+       cx="48.945694" />
+  </svg:g>
+</svg:svg>
diff --git a/navit/xpm/stadium.svg b/navit/icons/stadium.svg
index b89a7f69b..101a3d5df 100644
--- a/navit/xpm/stadium.svg
+++ b/navit/icons/stadium.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -12,7 +13,7 @@
    height="22"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.91 r13725"
    version="1.0"
    sodipodi:docname="stadium.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -24,67 +25,72 @@
     <marker
        inkscape:stockid="TriangleInS"
        orient="auto"
-       refY="0.0"
-       refX="0.0"
+       refY="0"
+       refX="0"
        id="TriangleInS"
        style="overflow:visible">
       <path
          id="path3332"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(-0.2)" />
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(-0.2,-0.2)"
+         inkscape:connector-curvature="0" />
     </marker>
     <marker
        inkscape:stockid="TriangleInL"
        orient="auto"
-       refY="0.0"
-       refX="0.0"
+       refY="0"
+       refX="0"
        id="TriangleInL"
        style="overflow:visible">
       <path
          id="path3326"
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(-0.8)" />
+         d="m 5.77,0 -8.65,5 0,-10 8.65,5 z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="scale(-0.8,-0.8)"
+         inkscape:connector-curvature="0" />
     </marker>
     <marker
        inkscape:stockid="Arrow2Sstart"
        orient="auto"
-       refY="0.0"
-       refX="0.0"
+       refY="0"
+       refX="0"
        id="Arrow2Sstart"
        style="overflow:visible">
       <path
          id="path3222"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(0.3) translate(-2.3,0)" />
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="matrix(0.3,0,0,0.3,-0.69,0)"
+         inkscape:connector-curvature="0" />
     </marker>
     <marker
        inkscape:stockid="Arrow2Mstart"
        orient="auto"
-       refY="0.0"
-       refX="0.0"
+       refY="0"
+       refX="0"
        id="Arrow2Mstart"
        style="overflow:visible">
       <path
          id="path3216"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(0.6) translate(0,0)" />
+         style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(0.6,0.6)"
+         inkscape:connector-curvature="0" />
     </marker>
     <marker
        inkscape:stockid="Arrow1Lstart"
        orient="auto"
-       refY="0.0"
-       refX="0.0"
+       refY="0"
+       refX="0"
        id="Arrow1Lstart"
        style="overflow:visible">
       <path
          id="path3192"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
+         transform="matrix(0.8,0,0,0.8,10,0)"
+         inkscape:connector-curvature="0" />
     </marker>
     <linearGradient
        id="linearGradient3160">
@@ -135,14 +141,14 @@
   </defs>
   <sodipodi:namedview
      id="base"
-     pagecolor="#22a638"
+     pagecolor="#227500"
      bordercolor="#666666"
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="0.21908724"
-     inkscape:cy="12.781983"
+     inkscape:zoom="3.959798"
+     inkscape:cx="45.075654"
+     inkscape:cy="56.516231"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -151,7 +157,8 @@
      inkscape:window-x="222"
      inkscape:window-y="61"
      showguides="true"
-     inkscape:guide-bbox="true">
+     inkscape:guide-bbox="true"
+     inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
        id="grid2380"
@@ -166,42 +173,63 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
       </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
      inkscape:label="Calque 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(0,78)">
     <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#feffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2.01554966;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 10.491545,-76.438787 c -5.3565355,0.114312 -10.10953667,5.254177 -9.4139555,10.651565 0.439917,5.397187 6.0307014,9.554843 11.3289425,8.653021 5.333851,-0.589328 9.599085,-6.176382 8.366351,-11.486147 -0.903416,-4.685198 -5.552229,-8.125493 -10.281338,-7.818439 z"
+       id="path2432-3"
+       inkscape:connector-curvature="0" />
+    <ellipse
+       style="opacity:1;fill:#feffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.01554966;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path2432"
-       sodipodi:cx="9.9464283"
-       sodipodi:cy="10.616072"
-       sodipodi:rx="9.0535717"
-       sodipodi:ry="8.7946424"
-       d="M 19,10.616072 A 9.0535717,8.7946424 0 1 1 0.8928566,10.616072 A 9.0535717,8.7946424 0 1 1 19,10.616072 z"
-       transform="translate(1.3392857,0.4464286)" />
+       cx="10.993381"
+       cy="-66.75209"
+       rx="9.1239681"
+       ry="8.8629408" />
     <path
        style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 4.9323786,6.3750001 L 7.61095,4.857143 L 9.7538071,7.4464287 L 8.0216643,11 L 4.5752357,10.482143 L 4.3966643,6.8214287 L 4.9323786,6.3750001 z"
-       id="path2436" />
+       d="m 4.5906442,-71.475991 2.6993985,-1.529645 2.159519,2.609394 -1.7456109,3.581168 -3.4732266,-0.521879 -0.1799599,-3.689143 0.5398799,-0.449895 z"
+       id="path2436"
+       inkscape:connector-curvature="0" />
     <path
        style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 17.589285,6.0025382 L 14.017857,5.1096811 L 12.321428,7.7882525 L 15,10.913252 L 18.303571,9.7525382 L 17.589285,6.0025382 z"
-       id="path3238" />
+       d="m 17.345965,-71.851346 -3.599198,-0.899791 -1.709619,2.699373 2.699398,3.149268 3.329259,-1.169728 -0.71984,-3.779122 z"
+       id="path3238"
+       inkscape:connector-curvature="0" />
     <path
        style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 8.8392856,13.428571 L 13.303571,13.428571 L 15.089285,16.910714 L 11.696428,19 L 7.5892856,16.642857 L 8.8392856,13.428571 z"
-       id="path3240" />
+       d="m 8.5279294,-64.367643 4.4989976,0 1.7996,3.509185 -3.419239,2.105512 -4.1390779,-2.375449 1.2597193,-3.239248 z"
+       id="path3240"
+       inkscape:connector-curvature="0" />
     <path
        style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 19.196428,14.053571 L 17.5,13.517857 L 18.482143,16.375 L 19.196428,14.053571 z"
-       id="path3242" />
+       d="m 18.965604,-63.737789 -1.709619,-0.539875 0.98978,2.879332 0.719839,-2.339457 z"
+       id="path3242"
+       inkscape:connector-curvature="0" />
     <path
        style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 4.9107142,14.232143 L 4.5535714,16.375 L 3.1249999,14.142857 L 4.9107142,14.232143 z"
-       id="path3244" />
+       d="m 4.5688114,-63.55783 -0.35992,2.159498 -1.4396793,-2.249478 1.7995993,0.08999 z"
+       id="path3244"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/navit/xpm/status_calculating_bk.svg b/navit/icons/status_calculating_bk.svg
index 6617ce8d4..6617ce8d4 100644
--- a/navit/xpm/status_calculating_bk.svg
+++ b/navit/icons/status_calculating_bk.svg
diff --git a/navit/xpm/status_calculating_wh.svg b/navit/icons/status_calculating_wh.svg
index fcdf60960..fcdf60960 100644
--- a/navit/xpm/status_calculating_wh.svg
+++ b/navit/icons/status_calculating_wh.svg
diff --git a/navit/xpm/status_no_destination_bk.svg b/navit/icons/status_no_destination_bk.svg
index 271af0075..271af0075 100644
--- a/navit/xpm/status_no_destination_bk.svg
+++ b/navit/icons/status_no_destination_bk.svg
diff --git a/navit/xpm/status_no_destination_wh.svg b/navit/icons/status_no_destination_wh.svg
index ecad90f6a..ecad90f6a 100644
--- a/navit/xpm/status_no_destination_wh.svg
+++ b/navit/icons/status_no_destination_wh.svg
diff --git a/navit/xpm/status_no_route_bk.svg b/navit/icons/status_no_route_bk.svg
index 6862cfdc2..6862cfdc2 100644
--- a/navit/xpm/status_no_route_bk.svg
+++ b/navit/icons/status_no_route_bk.svg
diff --git a/navit/xpm/status_no_route_wh.svg b/navit/icons/status_no_route_wh.svg
index 7c7544916..7c7544916 100644
--- a/navit/xpm/status_no_route_wh.svg
+++ b/navit/icons/status_no_route_wh.svg
diff --git a/navit/xpm/status_position_wait_bk.svg b/navit/icons/status_position_wait_bk.svg
index 9d1b7ca33..9d1b7ca33 100644
--- a/navit/xpm/status_position_wait_bk.svg
+++ b/navit/icons/status_position_wait_bk.svg
diff --git a/navit/xpm/status_position_wait_wh.svg b/navit/icons/status_position_wait_wh.svg
index 8bce336df..8bce336df 100644
--- a/navit/xpm/status_position_wait_wh.svg
+++ b/navit/icons/status_position_wait_wh.svg
diff --git a/navit/xpm/status_recalculating_bk.svg b/navit/icons/status_recalculating_bk.svg
index 937937e2b..937937e2b 100644
--- a/navit/xpm/status_recalculating_bk.svg
+++ b/navit/icons/status_recalculating_bk.svg
diff --git a/navit/xpm/status_recalculating_wh.svg b/navit/icons/status_recalculating_wh.svg
index 728055baa..728055baa 100644
--- a/navit/xpm/status_recalculating_wh.svg
+++ b/navit/icons/status_recalculating_wh.svg
diff --git a/navit/xpm/status_routing_bk.svg b/navit/icons/status_routing_bk.svg
index 307b26434..307b26434 100644
--- a/navit/xpm/status_routing_bk.svg
+++ b/navit/icons/status_routing_bk.svg
diff --git a/navit/xpm/status_routing_wh.svg b/navit/icons/status_routing_wh.svg
index 32cfecd7b..32cfecd7b 100644
--- a/navit/xpm/status_routing_wh.svg
+++ b/navit/icons/status_routing_wh.svg
diff --git a/navit/xpm/swimming.svg b/navit/icons/swimming.svg
index b6733de34..b6733de34 100644
--- a/navit/xpm/swimming.svg
+++ b/navit/icons/swimming.svg
diff --git a/navit/xpm/taoist.svg b/navit/icons/taoist.svg
index 170831fb3..170831fb3 100644
--- a/navit/xpm/taoist.svg
+++ b/navit/icons/taoist.svg
diff --git a/navit/icons/taxi.svg b/navit/icons/taxi.svg
new file mode 100644
index 000000000..ba982fbfb
--- /dev/null
+++ b/navit/icons/taxi.svg
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="taxi.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ff00ff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="62.077596"
+     inkscape:cy="-4.9533923"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="3"
+     fit-margin-left="3"
+     fit-margin-right="3"
+     fit-margin-bottom="3"
+     inkscape:window-width="1056"
+     inkscape:window-height="697"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-23.765375,54.287223)">
+    <g
+       id="g8405"
+       transform="matrix(0.20485588,0,0,0.20485588,19.908904,-42.569818)">
+      <g
+         transform="translate(189.22177,45.254834)"
+         id="g8026">
+        <path
+           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff"
+           d="m -169.89648,-99.953125 c 0,34.797526 0,69.595052 0,104.3925781 35.20442,0 70.40885,0 105.613277,0 0,-35.4641931 0,-70.9283851 0,-106.3925731 -35.204427,0 -70.408857,-1e-5 -105.613277,0 l 0,1 0,0.999995 z"
+           id="rect3005-2"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff"
+           d="m -164.9043,-93.896484 c 0,30.620442 0,61.240885 0,91.8613278 31.87631,0 63.75261,-1e-7 95.628909,0 0,-31.2871098 0,-62.5742188 0,-93.8613278 -31.876299,0 -63.752599,0 -95.628909,0 l 0,1 0,1 z"
+           id="rect3003-0"
+           inkscape:connector-curvature="0" />
+        <path
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:113.22457123px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff"
+           d="m -95.851562,-91.023438 c -4.590438,0.399807 -12.611478,-2.379191 -13.978938,4.345684 -4.78912,12.085213 -9.57648,24.171126 -14.36677,36.255879 5.89322,-1.657006 14.26497,2.633359 18.25977,-3.582031 0.0775,-6.01085 11.953594,-4.35369 10.081467,1.698667 0.659341,2.218938 5.624343,1.069591 8.175798,1.774353 3.548144,0.957918 9.720167,-1.172827 7.393126,-5.744505 -5.320124,-11.343647 -9.16396,-23.436644 -13.921875,-35.066406 l -0.981731,0.190276 -0.660847,0.128083 z m -28.591798,-0.302734 c -8.29645,1.043471 -16.52773,-0.07534 -24.81445,0.207031 -6.87863,1.180686 -6.08226,13.469253 1.20117,13.5 2.55671,0.806904 7.23408,-1.464487 5.69141,3.109375 0,7.91211 0,15.824219 0,23.736328 5.13132,-0.328397 13.64554,2.413739 16.09765,-3.990234 -0.17203,-7.480546 -0.66879,-15.119534 -0.40039,-22.716797 4.84001,0.993571 12.15082,-1.064583 11.1543,-7.298828 0.1701,-5.127266 -4.53658,-6.937193 -8.92969,-6.546875 z"
+           id="text3057-6"
+           inkscape:connector-curvature="0" />
+        <path
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:47.17690277px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff"
+           d="m -113.24023,-51.708984 c -5.47536,0.792128 -13.92461,-2.890501 -16.8711,3.923828 -0.6265,4.652906 -2.99778,2.676262 -4.07812,-0.611328 -0.95335,-5.180827 -6.63859,-2.315935 -10.4668,-3.527344 -3.02742,-0.799301 -9.16706,0.446936 -7.04883,4.753906 3.51968,5.15361 7.05809,10.305598 10.57813,15.462891 -4.94925,7.080707 -9.89778,14.161921 -14.84766,21.242187 6.49118,-3.382244 14.81068,2.2215413 20.51953,-2.90625 1.66599,-1.120668 1.57274,-6.060947 3.63086,-5.318359 2.28224,3.042208 3.37743,7.503748 8.00195,7.25 3.90923,0.10997 10.6458,1.8813595 12.43555,-2.828125 -1.73029,-5.912496 -7.36535,-10.34139 -10.27216,-15.794409 -2.34868,-4.979749 5.99189,-9.953758 7.90991,-14.931215 1.49105,-3.576756 10.03963,-10.118329 0.50874,-6.715782 z"
+           id="text3061-6"
+           inkscape:connector-curvature="0" />
+        <path
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:47.17690277px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#ffffff"
+           d="m -91.310547,-51.695312 c -4.045322,0.753173 -12.122193,-2.665989 -13.244143,3.515624 0.009,12.238234 10e-4,24.476571 0.004,36.714844 5.131502,-0.321951 13.629534,2.4146777 16.095702,-3.976562 -0.547388,-12.13627 -0.407715,-24.560809 -0.398438,-36.830078 -0.81901,0.192057 -1.63802,0.384114 -2.457031,0.576172 z"
+           id="text3065-3"
+           inkscape:connector-curvature="0" />
+      </g>
+      <rect
+         y="-52.659229"
+         x="23.842041"
+         height="98.392708"
+         width="97.612862"
+         id="rect3005"
+         style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <rect
+         y="-46.603138"
+         x="28.833611"
+         height="85.861809"
+         width="87.629738"
+         id="rect3003"
+         style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text3045"
+         y="-38.790665"
+         x="33.774303"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:53.6074028px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="-38.790665"
+           x="33.774303"
+           id="tspan3047"
+           sodipodi:role="line" /></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text3049"
+         y="-62.020538"
+         x="32.43412"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:107.2148056px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="-62.020538"
+           x="32.43412"
+           id="tspan3051"
+           sodipodi:role="line" /></text>
+      <text
+         sodipodi:linespacing="125%"
+         id="text3053"
+         y="-32.983196"
+         x="35.561218"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:107.2148056px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="-32.983196"
+           x="35.561218"
+           id="tspan3055"
+           sodipodi:role="line" /></text>
+      <text
+         transform="scale(1.0560535,0.94692174)"
+         sodipodi:linespacing="125%"
+         id="text3057"
+         y="-9.8282604"
+         x="36.911568"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:113.22457123px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           style="font-size:47.17690277px"
+           y="-9.8282604"
+           x="36.911568"
+           id="tspan3059"
+           sodipodi:role="line">TA</tspan></text>
+      <text
+         transform="scale(1.0560535,0.94692174)"
+         sodipodi:linespacing="125%"
+         id="text3061"
+         y="31.687429"
+         x="38.798649"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:47.17690277px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="31.687429"
+           x="38.798649"
+           id="tspan3063"
+           sodipodi:role="line">X</tspan></text>
+      <text
+         transform="scale(1.0560535,0.94692174)"
+         sodipodi:linespacing="125%"
+         id="text3065"
+         y="31.687429"
+         x="80.786095"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:47.17690277px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
+         xml:space="preserve"><tspan
+           y="31.687429"
+           x="80.786095"
+           id="tspan3067"
+           sodipodi:role="line">I</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/tec_common.svg b/navit/icons/tec_common.svg
new file mode 100644
index 000000000..d8c5c0594
--- /dev/null
+++ b/navit/icons/tec_common.svg
@@ -0,0 +1,3601 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="22"
+   height="22"
+   id="svg1961"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="tec_common.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/nt/tec_common.png"
+   inkscape:export-xdpi="9.0592957"
+   inkscape:export-ydpi="9.0592957">
+  <metadata
+     id="metadata3253">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>traffic light by http://commons.wikimedia.org/wiki/User:Manuel_Strehl
+camera by KDE e.V.</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="742"
+     inkscape:window-width="1018"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffff61"
+     id="base"
+     showgrid="false"
+     inkscape:zoom="2.828427"
+     inkscape:cx="44.187918"
+     inkscape:cy="55.425562"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:current-layer="svg1961"
+     inkscape:window-maximized="0" />
+  <defs
+     id="defs1963">
+    <linearGradient
+       id="linearGradient4522">
+      <stop
+         style="stop-color:#ffff00;stop-opacity:1;"
+         offset="0"
+         id="stop4524" />
+      <stop
+         style="stop-color:#ffff00;stop-opacity:0.67357516;"
+         offset="1"
+         id="stop4526" />
+    </linearGradient>
+    <linearGradient
+       y2="60.029999"
+       x2="77.031303"
+       y1="120.132"
+       x1="77.031303"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_37_">
+      <stop
+         id="stop2827"
+         style="stop-color:rgb(158,158,158)"
+         offset="0" />
+      <stop
+         id="stop2829"
+         style="stop-color:rgb(97,97,97)"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#9E9E9E"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#9E9E9E"
+         offset="0.5" />
+      <a:midPointStop
+         style="stop-color:#616161"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="126.982"
+       x2="76.830101"
+       y1="57.847698"
+       x1="76.830101"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_36_">
+      <stop
+         id="stop2820"
+         style="stop-color:rgb(255,255,255)"
+         offset="4.02299%" />
+      <stop
+         id="stop2822"
+         style="stop-opacity:0;stop-color:rgb(255,255,255)"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="130.181"
+       x2="120.423"
+       y1="68.1436"
+       x1="64.068398"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_35_">
+      <stop
+         id="stop2813"
+         style="stop-color:rgb(255,255,255)"
+         offset="0.0337" />
+      <stop
+         id="stop2815"
+         style="stop-color:rgb(135,135,135)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="82.084198"
+       x2="87.5625"
+       y1="75.327103"
+       x1="87.5625"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_34_">
+      <stop
+         id="stop2806"
+         style="stop-color:rgb(255,255,255)"
+         offset="7.47126%" />
+      <stop
+         id="stop2808"
+         style="stop-opacity:0;stop-color:rgb(255,255,255)"
+         offset="100%" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       fy="88.976601"
+       fx="87.766602"
+       r="11.4148"
+       cy="88.976601"
+       cx="87.766602"
+       id="XMLID_33_">
+      <stop
+         id="stop2799"
+         style="stop-color:rgb(187,235,255)"
+         offset="0" />
+      <stop
+         id="stop2801"
+         style="stop-color:rgb(0,61,215)"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#BBEBFF"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#BBEBFF"
+         offset="0.5" />
+      <a:midPointStop
+         style="stop-color:#003DD7"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       y2="84.349197"
+       x2="87.561501"
+       y1="97.340797"
+       x1="87.561501"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_32_">
+      <stop
+         id="stop2790"
+         style="stop-color:rgb(255,255,255)"
+         offset="4.5977%" />
+      <stop
+         id="stop2792"
+         style="stop-opacity:0;stop-color:rgb(255,255,255)"
+         offset="100%" />
+    </linearGradient>
+    <linearGradient
+       y2="84.569901"
+       x2="87.560501"
+       y1="98.801804"
+       x1="87.560501"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_31_">
+      <stop
+         id="stop2783"
+         style="stop-color:rgb(255,255,255)"
+         offset="0.1685" />
+      <stop
+         id="stop2785"
+         style="stop-color:rgb(54,54,54)"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#FFFFFF"
+         offset="0.1685" />
+      <a:midPointStop
+         style="stop-color:#FFFFFF"
+         offset="0.5" />
+      <a:midPointStop
+         style="stop-color:#363636"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="82.123001"
+       x2="105.431"
+       y1="81.969704"
+       x1="75.442398"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_30_">
+      <stop
+         id="stop2776"
+         style="stop-color:rgb(255,255,255)"
+         offset="0.0337" />
+      <stop
+         id="stop2778"
+         style="stop-color:rgb(171,171,171)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="80.375298"
+       x2="89.966499"
+       y1="95.804703"
+       x1="67.565399"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_29_">
+      <stop
+         id="stop2769"
+         style="stop-color:rgb(255,255,255)"
+         offset="0.0337" />
+      <stop
+         id="stop2771"
+         style="stop-color:rgb(153,153,153)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="69.688904"
+       x2="87.561501"
+       y1="102.759"
+       x1="87.561501"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_28_">
+      <stop
+         id="stop2762"
+         style="stop-color:rgb(158,158,158)"
+         offset="0" />
+      <stop
+         id="stop2764"
+         style="stop-color:rgb(97,97,97)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="82.155403"
+       x2="111.821"
+       y1="81.947304"
+       x1="71.107399"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_27_">
+      <stop
+         id="stop2755"
+         style="stop-color:rgb(255,255,255)"
+         offset="0.0337" />
+      <stop
+         id="stop2757"
+         style="stop-color:rgb(171,171,171)"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#FFFFFF"
+         offset="0.0337" />
+      <a:midPointStop
+         style="stop-color:#FFFFFF"
+         offset="0.5" />
+      <a:midPointStop
+         style="stop-color:#ABABAB"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="64.263496"
+       x2="87.561501"
+       y1="111.869"
+       x1="87.561501"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_26_">
+      <stop
+         id="stop2748"
+         style="stop-color:rgb(158,158,158)"
+         offset="0" />
+      <stop
+         id="stop2750"
+         style="stop-color:rgb(97,97,97)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="105.281"
+       x2="108.682"
+       y1="68.8125"
+       x1="75.553703"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_25_">
+      <stop
+         id="stop2741"
+         style="stop-color:rgb(255,255,255)"
+         offset="0.0337" />
+      <stop
+         id="stop2743"
+         style="stop-color:rgb(171,171,171)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0,1,-1,0,-256.622,-352.346)"
+       y2="-326.67001"
+       x2="465.18799"
+       y1="-360.35999"
+       x1="431.49799"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_24_">
+      <stop
+         id="stop2732"
+         style="stop-color:rgb(158,158,158)"
+         offset="0" />
+      <stop
+         id="stop2734"
+         style="stop-color:rgb(97,97,97)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="90.118896"
+       x2="55.990799"
+       y1="77.249001"
+       x1="43.121101"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_23_">
+      <stop
+         id="stop2723"
+         style="stop-color:rgb(158,158,158)"
+         offset="0" />
+      <stop
+         id="stop2725"
+         style="stop-color:rgb(97,97,97)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="100.333"
+       x2="83.369102"
+       y1="54.6782"
+       x1="37.715302"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_22_">
+      <stop
+         id="stop2714"
+         style="stop-color:rgb(158,158,158)"
+         offset="0" />
+      <stop
+         id="stop2716"
+         style="stop-color:rgb(97,97,97)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="82.428001"
+       x2="101.62"
+       y1="82.064499"
+       x1="30.5054"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_21_">
+      <stop
+         id="stop2707"
+         style="stop-color:rgb(255,255,255)"
+         offset="0.0337" />
+      <stop
+         id="stop2709"
+         style="stop-color:rgb(171,171,171)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-780.801,1657.79)"
+       y2="-1597.9399"
+       x2="885.13098"
+       y1="-1599.67"
+       x1="885.13098"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_20_">
+      <stop
+         id="stop2700"
+         style="stop-color:rgb(255,255,255)"
+         offset="0" />
+      <stop
+         id="stop2702"
+         style="stop-color:rgb(207,207,207)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="57.958099"
+       x2="104.381"
+       y1="61.433601"
+       x1="104.381"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_19_">
+      <stop
+         id="stop2693"
+         style="stop-color:rgb(158,158,158)"
+         offset="0" />
+      <stop
+         id="stop2695"
+         style="stop-color:rgb(97,97,97)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-780.801,1657.79)"
+       y2="-1598.62"
+       x2="885.18103"
+       y1="-1596.5601"
+       x1="885.18103"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_18_">
+      <stop
+         id="stop2686"
+         style="stop-color:rgb(255,255,255)"
+         offset="0" />
+      <stop
+         id="stop2688"
+         style="stop-color:rgb(189,189,189)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(1,15.5)"
+       y2="42.4576"
+       x2="103.381"
+       y1="45.933601"
+       x1="103.381"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_15_">
+      <stop
+         id="stop2673"
+         style="stop-color:rgb(158,158,158)"
+         offset="0" />
+      <stop
+         id="stop2675"
+         style="stop-color:rgb(97,97,97)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="57.596199"
+       x2="102.565"
+       y1="60.411098"
+       x1="105.643"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_14_">
+      <stop
+         id="stop2662"
+         style="stop-color:rgb(255,255,255)"
+         offset="0.0337" />
+      <stop
+         id="stop2664"
+         style="stop-color:rgb(171,171,171)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="62.2383"
+       x2="114.477"
+       y1="56.5625"
+       x1="114.477"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_13_">
+      <stop
+         id="stop2653"
+         style="stop-color:rgb(255,255,255)"
+         offset="0%" />
+      <stop
+         id="stop2655"
+         style="stop-opacity:0;stop-color:rgb(255,255,255)"
+         offset="100%" />
+    </linearGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
+       fy="129.33299"
+       fx="114.137"
+       r="6.4330001"
+       cy="129.33299"
+       cx="114.137"
+       id="XMLID_12_">
+      <stop
+         id="stop2646"
+         style="stop-color:rgb(133,202,255)"
+         offset="0" />
+      <stop
+         id="stop2648"
+         style="stop-color:rgb(0,61,169)"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       y2="53.6199"
+       x2="108.185"
+       y1="63.373001"
+       x1="118.848"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_11_">
+      <stop
+         id="stop2639"
+         style="stop-color:rgb(255,255,255)"
+         offset="0.0337" />
+      <stop
+         id="stop2641"
+         style="stop-color:rgb(171,171,171)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="132.177"
+       x2="122.192"
+       y1="55.616199"
+       x1="52.644501"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_10_">
+      <stop
+         id="stop2630"
+         style="stop-color:rgb(255,255,255)"
+         offset="0.0337" />
+      <stop
+         id="stop2632"
+         style="stop-color:rgb(171,171,171)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="52.224201"
+       x2="45.014198"
+       y1="57.756302"
+       x1="45.014198"
+       gradientUnits="userSpaceOnUse"
+       id="XMLID_9_">
+      <stop
+         id="stop2623"
+         style="stop-color:rgb(158,158,158)"
+         offset="0" />
+      <stop
+         id="stop2625"
+         style="stop-color:rgb(97,97,97)"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="0"
+       y1="0"
+       x2="0"
+       y2="1.05"
+       id="rg">
+      <stop
+         stop-color="#fff"
+         stop-opacity="0.9"
+         offset="0"
+         id="stop3387" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0.2"
+         offset="0.7"
+         id="stop3389" />
+      <stop
+         stop-color="#fff"
+         stop-opacity="0.3"
+         offset="1"
+         id="stop3391" />
+    </linearGradient>
+    <radialGradient
+       cx="65"
+       cy="265"
+       r="44"
+       fx="65"
+       fy="265"
+       id="g"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#74fc94"
+         offset="0"
+         id="stop3373" />
+      <stop
+         stop-color="#3ad55e"
+         offset="0.7"
+         id="stop3375" />
+      <stop
+         stop-color="#00af29"
+         offset="1"
+         id="stop3377" />
+    </radialGradient>
+    <radialGradient
+       cx="65"
+       cy="165"
+       r="44"
+       fx="65"
+       fy="165"
+       id="y"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fcfc74"
+         offset="0"
+         id="stop3366" />
+      <stop
+         stop-color="#d4d53a"
+         offset="0.7"
+         id="stop3368" />
+      <stop
+         stop-color="#afa500"
+         offset="1"
+         id="stop3370" />
+    </radialGradient>
+    <radialGradient
+       cx="65"
+       cy="65"
+       r="44"
+       fx="65"
+       fy="65"
+       id="r"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fc7474"
+         offset="0"
+         id="stop3359" />
+      <stop
+         stop-color="#d53a3a"
+         offset="0.7"
+         id="stop3361" />
+      <stop
+         stop-color="#af0000"
+         offset="1"
+         id="stop3363" />
+    </radialGradient>
+    <linearGradient
+       id="back"
+       x1="0"
+       y1="0"
+       x2="82.849258"
+       y2="186.41083"
+       gradientTransform="matrix(0.6276459,0,0,1.593255,737.14592,106.67382)"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#5c656c"
+         offset="0"
+         id="stop3354" />
+      <stop
+         stop-color="#aab2b7"
+         offset="1"
+         id="stop3356" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 300 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="600 : 300 : 1"
+       inkscape:persp3d-origin="300 : 200 : 1"
+       id="perspective3255" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#r"
+       id="radialGradient3456"
+       gradientUnits="userSpaceOnUse"
+       cx="65"
+       cy="65"
+       fx="65"
+       fy="65"
+       r="44" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#y"
+       id="radialGradient3458"
+       gradientUnits="userSpaceOnUse"
+       cx="65"
+       cy="165"
+       fx="65"
+       fy="165"
+       r="44" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="radialGradient3460"
+       gradientUnits="userSpaceOnUse"
+       cx="65"
+       cy="265"
+       fx="65"
+       fy="265"
+       r="44" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_12_"
+       id="radialGradient3698"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
+       cx="114.137"
+       cy="129.33299"
+       fx="114.137"
+       fy="129.33299"
+       r="6.4330001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_15_"
+       id="linearGradient3706"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,15.5)"
+       x1="103.381"
+       y1="45.933601"
+       x2="103.381"
+       y2="42.4576" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_15_"
+       id="linearGradient3708"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,15.5)"
+       x1="103.381"
+       y1="45.933601"
+       x2="103.381"
+       y2="42.4576" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_33_"
+       id="radialGradient3740"
+       gradientUnits="userSpaceOnUse"
+       cx="87.766602"
+       cy="88.976601"
+       fx="87.766602"
+       fy="88.976601"
+       r="11.4148" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_9_"
+       id="linearGradient2781"
+       gradientUnits="userSpaceOnUse"
+       x1="45.014198"
+       y1="57.756302"
+       x2="45.014198"
+       y2="52.224201" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_10_"
+       id="linearGradient2783"
+       gradientUnits="userSpaceOnUse"
+       x1="52.644501"
+       y1="55.616199"
+       x2="122.192"
+       y2="132.177" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_11_"
+       id="linearGradient2785"
+       gradientUnits="userSpaceOnUse"
+       x1="118.848"
+       y1="63.373001"
+       x2="108.185"
+       y2="53.6199" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_12_"
+       id="radialGradient2787"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
+       cx="114.137"
+       cy="129.33299"
+       fx="114.137"
+       fy="129.33299"
+       r="6.4330001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_13_"
+       id="linearGradient2789"
+       gradientUnits="userSpaceOnUse"
+       x1="114.477"
+       y1="56.5625"
+       x2="114.477"
+       y2="62.2383" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_14_"
+       id="linearGradient2791"
+       gradientUnits="userSpaceOnUse"
+       x1="105.643"
+       y1="60.411098"
+       x2="102.565"
+       y2="57.596199" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_15_"
+       id="linearGradient2793"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,15.5)"
+       x1="103.381"
+       y1="45.933601"
+       x2="103.381"
+       y2="42.4576" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_15_"
+       id="linearGradient2795"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,15.5)"
+       x1="103.381"
+       y1="45.933601"
+       x2="103.381"
+       y2="42.4576" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_15_"
+       id="linearGradient2797"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,15.5)"
+       x1="103.381"
+       y1="45.933601"
+       x2="103.381"
+       y2="42.4576" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_18_"
+       id="linearGradient2799"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-780.801,1657.79)"
+       x1="885.18103"
+       y1="-1596.5601"
+       x2="885.18103"
+       y2="-1598.62" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_19_"
+       id="linearGradient2801"
+       gradientUnits="userSpaceOnUse"
+       x1="104.381"
+       y1="61.433601"
+       x2="104.381"
+       y2="57.958099" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_20_"
+       id="linearGradient2803"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-780.801,1657.79)"
+       x1="885.13098"
+       y1="-1599.67"
+       x2="885.13098"
+       y2="-1597.9399" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_21_"
+       id="linearGradient2805"
+       gradientUnits="userSpaceOnUse"
+       x1="30.5054"
+       y1="82.064499"
+       x2="101.62"
+       y2="82.428001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_22_"
+       id="linearGradient2807"
+       gradientUnits="userSpaceOnUse"
+       x1="37.715302"
+       y1="54.6782"
+       x2="83.369102"
+       y2="100.333" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_23_"
+       id="linearGradient2809"
+       gradientUnits="userSpaceOnUse"
+       x1="43.121101"
+       y1="77.249001"
+       x2="55.990799"
+       y2="90.118896" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_24_"
+       id="linearGradient2811"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,-256.622,-352.346)"
+       x1="431.49799"
+       y1="-360.35999"
+       x2="465.18799"
+       y2="-326.67001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_25_"
+       id="linearGradient2813"
+       gradientUnits="userSpaceOnUse"
+       x1="75.553703"
+       y1="68.8125"
+       x2="108.682"
+       y2="105.281" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_26_"
+       id="linearGradient2815"
+       gradientUnits="userSpaceOnUse"
+       x1="87.561501"
+       y1="111.869"
+       x2="87.561501"
+       y2="64.263496" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_27_"
+       id="linearGradient2817"
+       gradientUnits="userSpaceOnUse"
+       x1="71.107399"
+       y1="81.947304"
+       x2="111.821"
+       y2="82.155403" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_28_"
+       id="linearGradient2819"
+       gradientUnits="userSpaceOnUse"
+       x1="87.561501"
+       y1="102.759"
+       x2="87.561501"
+       y2="69.688904" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_29_"
+       id="linearGradient2821"
+       gradientUnits="userSpaceOnUse"
+       x1="67.565399"
+       y1="95.804703"
+       x2="89.966499"
+       y2="80.375298" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_30_"
+       id="linearGradient2823"
+       gradientUnits="userSpaceOnUse"
+       x1="75.442398"
+       y1="81.969704"
+       x2="105.431"
+       y2="82.123001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_31_"
+       id="linearGradient2825"
+       gradientUnits="userSpaceOnUse"
+       x1="87.560501"
+       y1="98.801804"
+       x2="87.560501"
+       y2="84.569901" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_32_"
+       id="linearGradient2827"
+       gradientUnits="userSpaceOnUse"
+       x1="87.561501"
+       y1="97.340797"
+       x2="87.561501"
+       y2="84.349197" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_33_"
+       id="radialGradient2829"
+       gradientUnits="userSpaceOnUse"
+       cx="87.766602"
+       cy="88.976601"
+       fx="87.766602"
+       fy="88.976601"
+       r="11.4148" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_34_"
+       id="linearGradient2831"
+       gradientUnits="userSpaceOnUse"
+       x1="87.5625"
+       y1="75.327103"
+       x2="87.5625"
+       y2="82.084198" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_35_"
+       id="linearGradient2833"
+       gradientUnits="userSpaceOnUse"
+       x1="64.068398"
+       y1="68.1436"
+       x2="120.423"
+       y2="130.181" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_36_"
+       id="linearGradient2835"
+       gradientUnits="userSpaceOnUse"
+       x1="76.830101"
+       y1="57.847698"
+       x2="76.830101"
+       y2="126.982" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_37_"
+       id="linearGradient2837"
+       gradientUnits="userSpaceOnUse"
+       x1="77.031303"
+       y1="120.132"
+       x2="77.031303"
+       y2="60.029999" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4522"
+       id="radialGradient2839"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7696866,0.07789056,-0.06803583,1.5457853,-418.97793,-202.43104)"
+       cx="569.94421"
+       cy="289.56024"
+       fx="569.94421"
+       fy="289.56024"
+       r="130.18762" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#back"
+       id="linearGradient2938"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6276459,0,0,1.593255,737.14592,106.67382)"
+       x1="0"
+       y1="0"
+       x2="82.849258"
+       y2="186.41083" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#r"
+       id="radialGradient2940"
+       gradientUnits="userSpaceOnUse"
+       cx="65"
+       cy="65"
+       fx="65"
+       fy="65"
+       r="44" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#y"
+       id="radialGradient2942"
+       gradientUnits="userSpaceOnUse"
+       cx="65"
+       cy="165"
+       fx="65"
+       fy="165"
+       r="44" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="radialGradient2944"
+       gradientUnits="userSpaceOnUse"
+       cx="65"
+       cy="265"
+       fx="65"
+       fy="265"
+       r="44" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_9_"
+       id="linearGradient2946"
+       gradientUnits="userSpaceOnUse"
+       x1="45.014198"
+       y1="57.756302"
+       x2="45.014198"
+       y2="52.224201" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_10_"
+       id="linearGradient2948"
+       gradientUnits="userSpaceOnUse"
+       x1="52.644501"
+       y1="55.616199"
+       x2="122.192"
+       y2="132.177" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_11_"
+       id="linearGradient2950"
+       gradientUnits="userSpaceOnUse"
+       x1="118.848"
+       y1="63.373001"
+       x2="108.185"
+       y2="53.6199" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_12_"
+       id="radialGradient2952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
+       cx="114.137"
+       cy="129.33299"
+       fx="114.137"
+       fy="129.33299"
+       r="6.4330001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_13_"
+       id="linearGradient2954"
+       gradientUnits="userSpaceOnUse"
+       x1="114.477"
+       y1="56.5625"
+       x2="114.477"
+       y2="62.2383" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_14_"
+       id="linearGradient2956"
+       gradientUnits="userSpaceOnUse"
+       x1="105.643"
+       y1="60.411098"
+       x2="102.565"
+       y2="57.596199" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_15_"
+       id="linearGradient2958"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,15.5)"
+       x1="103.381"
+       y1="45.933601"
+       x2="103.381"
+       y2="42.4576" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_15_"
+       id="linearGradient2960"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,15.5)"
+       x1="103.381"
+       y1="45.933601"
+       x2="103.381"
+       y2="42.4576" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_15_"
+       id="linearGradient2962"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,15.5)"
+       x1="103.381"
+       y1="45.933601"
+       x2="103.381"
+       y2="42.4576" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_18_"
+       id="linearGradient2964"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-780.801,1657.79)"
+       x1="885.18103"
+       y1="-1596.5601"
+       x2="885.18103"
+       y2="-1598.62" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_19_"
+       id="linearGradient2966"
+       gradientUnits="userSpaceOnUse"
+       x1="104.381"
+       y1="61.433601"
+       x2="104.381"
+       y2="57.958099" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_20_"
+       id="linearGradient2968"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-780.801,1657.79)"
+       x1="885.13098"
+       y1="-1599.67"
+       x2="885.13098"
+       y2="-1597.9399" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_21_"
+       id="linearGradient2970"
+       gradientUnits="userSpaceOnUse"
+       x1="30.5054"
+       y1="82.064499"
+       x2="101.62"
+       y2="82.428001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_22_"
+       id="linearGradient2972"
+       gradientUnits="userSpaceOnUse"
+       x1="37.715302"
+       y1="54.6782"
+       x2="83.369102"
+       y2="100.333" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_23_"
+       id="linearGradient2974"
+       gradientUnits="userSpaceOnUse"
+       x1="43.121101"
+       y1="77.249001"
+       x2="55.990799"
+       y2="90.118896" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_24_"
+       id="linearGradient2976"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,-256.622,-352.346)"
+       x1="431.49799"
+       y1="-360.35999"
+       x2="465.18799"
+       y2="-326.67001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_25_"
+       id="linearGradient2978"
+       gradientUnits="userSpaceOnUse"
+       x1="75.553703"
+       y1="68.8125"
+       x2="108.682"
+       y2="105.281" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_26_"
+       id="linearGradient2980"
+       gradientUnits="userSpaceOnUse"
+       x1="87.561501"
+       y1="111.869"
+       x2="87.561501"
+       y2="64.263496" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_27_"
+       id="linearGradient2982"
+       gradientUnits="userSpaceOnUse"
+       x1="71.107399"
+       y1="81.947304"
+       x2="111.821"
+       y2="82.155403" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_28_"
+       id="linearGradient2984"
+       gradientUnits="userSpaceOnUse"
+       x1="87.561501"
+       y1="102.759"
+       x2="87.561501"
+       y2="69.688904" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_29_"
+       id="linearGradient2986"
+       gradientUnits="userSpaceOnUse"
+       x1="67.565399"
+       y1="95.804703"
+       x2="89.966499"
+       y2="80.375298" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_30_"
+       id="linearGradient2988"
+       gradientUnits="userSpaceOnUse"
+       x1="75.442398"
+       y1="81.969704"
+       x2="105.431"
+       y2="82.123001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_31_"
+       id="linearGradient2990"
+       gradientUnits="userSpaceOnUse"
+       x1="87.560501"
+       y1="98.801804"
+       x2="87.560501"
+       y2="84.569901" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_32_"
+       id="linearGradient2992"
+       gradientUnits="userSpaceOnUse"
+       x1="87.561501"
+       y1="97.340797"
+       x2="87.561501"
+       y2="84.349197" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_33_"
+       id="radialGradient2994"
+       gradientUnits="userSpaceOnUse"
+       cx="87.766602"
+       cy="88.976601"
+       fx="87.766602"
+       fy="88.976601"
+       r="11.4148" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_34_"
+       id="linearGradient2996"
+       gradientUnits="userSpaceOnUse"
+       x1="87.5625"
+       y1="75.327103"
+       x2="87.5625"
+       y2="82.084198" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_35_"
+       id="linearGradient2998"
+       gradientUnits="userSpaceOnUse"
+       x1="64.068398"
+       y1="68.1436"
+       x2="120.423"
+       y2="130.181" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_36_"
+       id="linearGradient3000"
+       gradientUnits="userSpaceOnUse"
+       x1="76.830101"
+       y1="57.847698"
+       x2="76.830101"
+       y2="126.982" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_37_"
+       id="linearGradient3002"
+       gradientUnits="userSpaceOnUse"
+       x1="77.031303"
+       y1="120.132"
+       x2="77.031303"
+       y2="60.029999" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4522"
+       id="radialGradient3004"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7696866,0.07789056,-0.06803583,1.5457853,-418.97793,-202.43104)"
+       cx="569.94421"
+       cy="289.56024"
+       fx="569.94421"
+       fy="289.56024"
+       r="130.18762" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#back"
+       id="linearGradient3807"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6276459,0,0,1.593255,737.14592,106.67382)"
+       x1="0"
+       y1="0"
+       x2="82.849258"
+       y2="186.41083" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#r"
+       id="radialGradient3809"
+       gradientUnits="userSpaceOnUse"
+       cx="65"
+       cy="65"
+       fx="65"
+       fy="65"
+       r="44" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#y"
+       id="radialGradient3811"
+       gradientUnits="userSpaceOnUse"
+       cx="65"
+       cy="165"
+       fx="65"
+       fy="165"
+       r="44" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="radialGradient3813"
+       gradientUnits="userSpaceOnUse"
+       cx="65"
+       cy="265"
+       fx="65"
+       fy="265"
+       r="44" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_9_"
+       id="linearGradient3815"
+       gradientUnits="userSpaceOnUse"
+       x1="45.014198"
+       y1="57.756302"
+       x2="45.014198"
+       y2="52.224201" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_10_"
+       id="linearGradient3817"
+       gradientUnits="userSpaceOnUse"
+       x1="52.644501"
+       y1="55.616199"
+       x2="122.192"
+       y2="132.177" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_11_"
+       id="linearGradient3819"
+       gradientUnits="userSpaceOnUse"
+       x1="118.848"
+       y1="63.373001"
+       x2="108.185"
+       y2="53.6199" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_12_"
+       id="radialGradient3821"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
+       cx="114.137"
+       cy="129.33299"
+       fx="114.137"
+       fy="129.33299"
+       r="6.4330001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_13_"
+       id="linearGradient3823"
+       gradientUnits="userSpaceOnUse"
+       x1="114.477"
+       y1="56.5625"
+       x2="114.477"
+       y2="62.2383" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_14_"
+       id="linearGradient3825"
+       gradientUnits="userSpaceOnUse"
+       x1="105.643"
+       y1="60.411098"
+       x2="102.565"
+       y2="57.596199" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_15_"
+       id="linearGradient3827"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,15.5)"
+       x1="103.381"
+       y1="45.933601"
+       x2="103.381"
+       y2="42.4576" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_15_"
+       id="linearGradient3829"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,15.5)"
+       x1="103.381"
+       y1="45.933601"
+       x2="103.381"
+       y2="42.4576" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_15_"
+       id="linearGradient3831"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,15.5)"
+       x1="103.381"
+       y1="45.933601"
+       x2="103.381"
+       y2="42.4576" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_18_"
+       id="linearGradient3833"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-780.801,1657.79)"
+       x1="885.18103"
+       y1="-1596.5601"
+       x2="885.18103"
+       y2="-1598.62" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_19_"
+       id="linearGradient3835"
+       gradientUnits="userSpaceOnUse"
+       x1="104.381"
+       y1="61.433601"
+       x2="104.381"
+       y2="57.958099" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_20_"
+       id="linearGradient3837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-780.801,1657.79)"
+       x1="885.13098"
+       y1="-1599.67"
+       x2="885.13098"
+       y2="-1597.9399" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_21_"
+       id="linearGradient3839"
+       gradientUnits="userSpaceOnUse"
+       x1="30.5054"
+       y1="82.064499"
+       x2="101.62"
+       y2="82.428001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_22_"
+       id="linearGradient3841"
+       gradientUnits="userSpaceOnUse"
+       x1="37.715302"
+       y1="54.6782"
+       x2="83.369102"
+       y2="100.333" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_23_"
+       id="linearGradient3843"
+       gradientUnits="userSpaceOnUse"
+       x1="43.121101"
+       y1="77.249001"
+       x2="55.990799"
+       y2="90.118896" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_24_"
+       id="linearGradient3845"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,-256.622,-352.346)"
+       x1="431.49799"
+       y1="-360.35999"
+       x2="465.18799"
+       y2="-326.67001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_25_"
+       id="linearGradient3847"
+       gradientUnits="userSpaceOnUse"
+       x1="75.553703"
+       y1="68.8125"
+       x2="108.682"
+       y2="105.281" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_26_"
+       id="linearGradient3849"
+       gradientUnits="userSpaceOnUse"
+       x1="87.561501"
+       y1="111.869"
+       x2="87.561501"
+       y2="64.263496" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_27_"
+       id="linearGradient3851"
+       gradientUnits="userSpaceOnUse"
+       x1="71.107399"
+       y1="81.947304"
+       x2="111.821"
+       y2="82.155403" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_28_"
+       id="linearGradient3853"
+       gradientUnits="userSpaceOnUse"
+       x1="87.561501"
+       y1="102.759"
+       x2="87.561501"
+       y2="69.688904" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_29_"
+       id="linearGradient3855"
+       gradientUnits="userSpaceOnUse"
+       x1="67.565399"
+       y1="95.804703"
+       x2="89.966499"
+       y2="80.375298" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_30_"
+       id="linearGradient3857"
+       gradientUnits="userSpaceOnUse"
+       x1="75.442398"
+       y1="81.969704"
+       x2="105.431"
+       y2="82.123001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_31_"
+       id="linearGradient3859"
+       gradientUnits="userSpaceOnUse"
+       x1="87.560501"
+       y1="98.801804"
+       x2="87.560501"
+       y2="84.569901" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_32_"
+       id="linearGradient3861"
+       gradientUnits="userSpaceOnUse"
+       x1="87.561501"
+       y1="97.340797"
+       x2="87.561501"
+       y2="84.349197" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_33_"
+       id="radialGradient3863"
+       gradientUnits="userSpaceOnUse"
+       cx="87.766602"
+       cy="88.976601"
+       fx="87.766602"
+       fy="88.976601"
+       r="11.4148" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_34_"
+       id="linearGradient3865"
+       gradientUnits="userSpaceOnUse"
+       x1="87.5625"
+       y1="75.327103"
+       x2="87.5625"
+       y2="82.084198" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_35_"
+       id="linearGradient3867"
+       gradientUnits="userSpaceOnUse"
+       x1="64.068398"
+       y1="68.1436"
+       x2="120.423"
+       y2="130.181" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_36_"
+       id="linearGradient3869"
+       gradientUnits="userSpaceOnUse"
+       x1="76.830101"
+       y1="57.847698"
+       x2="76.830101"
+       y2="126.982" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_37_"
+       id="linearGradient3871"
+       gradientUnits="userSpaceOnUse"
+       x1="77.031303"
+       y1="120.132"
+       x2="77.031303"
+       y2="60.029999" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4522"
+       id="radialGradient3873"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.7696866,0.07789056,-0.06803583,1.5457853,-418.97793,-202.43104)"
+       cx="569.94421"
+       cy="289.56024"
+       fx="569.94421"
+       fy="289.56024"
+       r="130.18762" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#back"
+       id="linearGradient4006"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6276459,0,0,1.593255,737.14592,106.67382)"
+       x1="0"
+       y1="0"
+       x2="82.849258"
+       y2="186.41083" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#r"
+       id="radialGradient4008"
+       gradientUnits="userSpaceOnUse"
+       cx="65"
+       cy="65"
+       fx="65"
+       fy="65"
+       r="44" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#y"
+       id="radialGradient4010"
+       gradientUnits="userSpaceOnUse"
+       cx="65"
+       cy="165"
+       fx="65"
+       fy="165"
+       r="44" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#g"
+       id="radialGradient4012"
+       gradientUnits="userSpaceOnUse"
+       cx="65"
+       cy="265"
+       fx="65"
+       fy="265"
+       r="44" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_9_"
+       id="linearGradient4014"
+       gradientUnits="userSpaceOnUse"
+       x1="45.014198"
+       y1="57.756302"
+       x2="45.014198"
+       y2="52.224201" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_10_"
+       id="linearGradient4016"
+       gradientUnits="userSpaceOnUse"
+       x1="52.644501"
+       y1="55.616199"
+       x2="122.192"
+       y2="132.177" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_11_"
+       id="linearGradient4018"
+       gradientUnits="userSpaceOnUse"
+       x1="118.848"
+       y1="63.373001"
+       x2="108.185"
+       y2="53.6199" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_12_"
+       id="radialGradient4020"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
+       cx="114.137"
+       cy="129.33299"
+       fx="114.137"
+       fy="129.33299"
+       r="6.4330001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_13_"
+       id="linearGradient4022"
+       gradientUnits="userSpaceOnUse"
+       x1="114.477"
+       y1="56.5625"
+       x2="114.477"
+       y2="62.2383" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_14_"
+       id="linearGradient4024"
+       gradientUnits="userSpaceOnUse"
+       x1="105.643"
+       y1="60.411098"
+       x2="102.565"
+       y2="57.596199" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_15_"
+       id="linearGradient4026"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,15.5)"
+       x1="103.381"
+       y1="45.933601"
+       x2="103.381"
+       y2="42.4576" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_15_"
+       id="linearGradient4028"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,15.5)"
+       x1="103.381"
+       y1="45.933601"
+       x2="103.381"
+       y2="42.4576" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_15_"
+       id="linearGradient4030"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,15.5)"
+       x1="103.381"
+       y1="45.933601"
+       x2="103.381"
+       y2="42.4576" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_18_"
+       id="linearGradient4032"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-780.801,1657.79)"
+       x1="885.18103"
+       y1="-1596.5601"
+       x2="885.18103"
+       y2="-1598.62" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_19_"
+       id="linearGradient4034"
+       gradientUnits="userSpaceOnUse"
+       x1="104.381"
+       y1="61.433601"
+       x2="104.381"
+       y2="57.958099" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_20_"
+       id="linearGradient4036"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-780.801,1657.79)"
+       x1="885.13098"
+       y1="-1599.67"
+       x2="885.13098"
+       y2="-1597.9399" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_21_"
+       id="linearGradient4038"
+       gradientUnits="userSpaceOnUse"
+       x1="30.5054"
+       y1="82.064499"
+       x2="101.62"
+       y2="82.428001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_22_"
+       id="linearGradient4040"
+       gradientUnits="userSpaceOnUse"
+       x1="37.715302"
+       y1="54.6782"
+       x2="83.369102"
+       y2="100.333" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_23_"
+       id="linearGradient4042"
+       gradientUnits="userSpaceOnUse"
+       x1="43.121101"
+       y1="77.249001"
+       x2="55.990799"
+       y2="90.118896" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_24_"
+       id="linearGradient4044"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,-256.622,-352.346)"
+       x1="431.49799"
+       y1="-360.35999"
+       x2="465.18799"
+       y2="-326.67001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_25_"
+       id="linearGradient4046"
+       gradientUnits="userSpaceOnUse"
+       x1="75.553703"
+       y1="68.8125"
+       x2="108.682"
+       y2="105.281" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_26_"
+       id="linearGradient4048"
+       gradientUnits="userSpaceOnUse"
+       x1="87.561501"
+       y1="111.869"
+       x2="87.561501"
+       y2="64.263496" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_27_"
+       id="linearGradient4050"
+       gradientUnits="userSpaceOnUse"
+       x1="71.107399"
+       y1="81.947304"
+       x2="111.821"
+       y2="82.155403" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_28_"
+       id="linearGradient4052"
+       gradientUnits="userSpaceOnUse"
+       x1="87.561501"
+       y1="102.759"
+       x2="87.561501"
+       y2="69.688904" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_29_"
+       id="linearGradient4054"
+       gradientUnits="userSpaceOnUse"
+       x1="67.565399"
+       y1="95.804703"
+       x2="89.966499"
+       y2="80.375298" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_30_"
+       id="linearGradient4056"
+       gradientUnits="userSpaceOnUse"
+       x1="75.442398"
+       y1="81.969704"
+       x2="105.431"
+       y2="82.123001" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_31_"
+       id="linearGradient4058"
+       gradientUnits="userSpaceOnUse"
+       x1="87.560501"
+       y1="98.801804"
+       x2="87.560501"
+       y2="84.569901" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_32_"
+       id="linearGradient4060"
+       gradientUnits="userSpaceOnUse"
+       x1="87.561501"
+       y1="97.340797"
+       x2="87.561501"
+       y2="84.349197" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_33_"
+       id="radialGradient4062"
+       gradientUnits="userSpaceOnUse"
+       cx="87.766602"
+       cy="88.976601"
+       fx="87.766602"
+       fy="88.976601"
+       r="11.4148" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_34_"
+       id="linearGradient4064"
+       gradientUnits="userSpaceOnUse"
+       x1="87.5625"
+       y1="75.327103"
+       x2="87.5625"
+       y2="82.084198" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_35_"
+       id="linearGradient4066"
+       gradientUnits="userSpaceOnUse"
+       x1="64.068398"
+       y1="68.1436"
+       x2="120.423"
+       y2="130.181" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_36_"
+       id="linearGradient4068"
+       gradientUnits="userSpaceOnUse"
+       x1="76.830101"
+       y1="57.847698"
+       x2="76.830101"
+       y2="126.982" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#XMLID_37_"
+       id="linearGradient4070"
+       gradientUnits="userSpaceOnUse"
+       x1="77.031303"
+       y1="120.132"
+       x2="77.031303"
+       y2="60.029999" />
+    <radialGradient
+       cx="65"
+       cy="65"
+       r="44"
+       fx="65"
+       fy="65"
+       id="r-3"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fc7474"
+         offset="0"
+         id="stop3359-5" />
+      <stop
+         stop-color="#d53a3a"
+         offset="0.7"
+         id="stop3361-6" />
+      <stop
+         stop-color="#af0000"
+         offset="1"
+         id="stop3363-2" />
+    </radialGradient>
+    <radialGradient
+       cx="65"
+       cy="165"
+       r="44"
+       fx="65"
+       fy="165"
+       id="y-1"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#fcfc74"
+         offset="0"
+         id="stop3366-2" />
+      <stop
+         stop-color="#d4d53a"
+         offset="0.7"
+         id="stop3368-7" />
+      <stop
+         stop-color="#afa500"
+         offset="1"
+         id="stop3370-0" />
+    </radialGradient>
+    <radialGradient
+       cx="65"
+       cy="265"
+       r="44"
+       fx="65"
+       fy="265"
+       id="g-3"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         stop-color="#74fc94"
+         offset="0"
+         id="stop3373-6" />
+      <stop
+         stop-color="#3ad55e"
+         offset="0.7"
+         id="stop3375-0" />
+      <stop
+         stop-color="#00af29"
+         offset="1"
+         id="stop3377-6" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
+       fy="129.33299"
+       fx="114.137"
+       r="6.4330001"
+       cy="129.33299"
+       cx="114.137"
+       id="XMLID_12_-7">
+      <stop
+         id="stop2646-5"
+         style="stop-color:rgb(133,202,255)"
+         offset="0" />
+      <stop
+         id="stop2648-9"
+         style="stop-color:rgb(0,61,169)"
+         offset="1" />
+    </radialGradient>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       fy="88.976601"
+       fx="87.766602"
+       r="11.4148"
+       cy="88.976601"
+       cx="87.766602"
+       id="XMLID_33_-3">
+      <stop
+         id="stop2799-1"
+         style="stop-color:rgb(187,235,255)"
+         offset="0" />
+      <stop
+         id="stop2801-4"
+         style="stop-color:rgb(0,61,215)"
+         offset="1" />
+      <a:midPointStop
+         style="stop-color:#BBEBFF"
+         offset="0" />
+      <a:midPointStop
+         style="stop-color:#BBEBFF"
+         offset="0.5" />
+      <a:midPointStop
+         style="stop-color:#003DD7"
+         offset="1" />
+    </radialGradient>
+    <linearGradient
+       id="linearGradient4333"
+       gradientUnits="userSpaceOnUse"
+       x1="45.014198"
+       y1="57.756302"
+       x2="45.014198"
+       y2="52.224201">
+      <stop
+         offset="0"
+         style="stop-color:rgb(158,158,158)"
+         id="stop3494-5" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(97,97,97)"
+         id="stop3496-9" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4338"
+       gradientUnits="userSpaceOnUse"
+       x1="52.644501"
+       y1="55.616199"
+       x2="122.192"
+       y2="132.177">
+      <stop
+         offset="0.0337"
+         style="stop-color:rgb(255,255,255)"
+         id="stop3501-9" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(171,171,171)"
+         id="stop3503-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4389"
+       gradientUnits="userSpaceOnUse"
+       x1="30.5054"
+       y1="82.064499"
+       x2="101.62"
+       y2="82.428001">
+      <stop
+         offset="0.0337"
+         style="stop-color:rgb(255,255,255)"
+         id="stop3571-8" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(171,171,171)"
+         id="stop3573-5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4394"
+       gradientUnits="userSpaceOnUse"
+       x1="37.715302"
+       y1="54.6782"
+       x2="83.369102"
+       y2="100.333">
+      <stop
+         offset="0"
+         style="stop-color:rgb(158,158,158)"
+         id="stop3578-1" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(97,97,97)"
+         id="stop3580-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4400"
+       gradientUnits="userSpaceOnUse"
+       x1="43.121101"
+       y1="77.249001"
+       x2="55.990799"
+       y2="90.118896">
+      <stop
+         offset="0"
+         style="stop-color:rgb(158,158,158)"
+         id="stop3586-8" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(97,97,97)"
+         id="stop3588-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4406"
+       gradientUnits="userSpaceOnUse"
+       x1="431.49799"
+       y1="-360.35999"
+       x2="465.18799"
+       y2="-326.67001"
+       gradientTransform="matrix(0,1,-1,0,-256.622,-352.346)">
+      <stop
+         offset="0"
+         style="stop-color:rgb(158,158,158)"
+         id="stop3594-0" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(97,97,97)"
+         id="stop3596-3" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4462"
+       gradientUnits="userSpaceOnUse"
+       x1="64.068398"
+       y1="68.1436"
+       x2="120.423"
+       y2="130.181">
+      <stop
+         offset="0.0337"
+         style="stop-color:rgb(255,255,255)"
+         id="stop3673-4" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(135,135,135)"
+         id="stop3675-3" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4467"
+       gradientUnits="userSpaceOnUse"
+       x1="76.830101"
+       y1="57.847698"
+       x2="76.830101"
+       y2="126.982">
+      <stop
+         offset="4.02299%"
+         style="stop-color:rgb(255,255,255)"
+         id="stop3680-3" />
+      <stop
+         offset="100%"
+         style="stop-opacity:0;stop-color:rgb(255,255,255)"
+         id="stop3682-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4472"
+       gradientUnits="userSpaceOnUse"
+       x1="77.031303"
+       y1="120.132"
+       x2="77.031303"
+       y2="60.029999">
+      <stop
+         offset="0"
+         style="stop-color:rgb(158,158,158)"
+         id="stop3687-0" />
+      <stop
+         offset="1"
+         style="stop-color:rgb(97,97,97)"
+         id="stop3689-4" />
+      <a:midPointStop
+         offset="0"
+         style="stop-color:#9E9E9E" />
+      <a:midPointStop
+         offset="0.5"
+         style="stop-color:#9E9E9E" />
+      <a:midPointStop
+         offset="1"
+         style="stop-color:#616161" />
+    </linearGradient>
+  </defs>
+  <g
+     id="g4989"
+     transform="matrix(0.22,0,0,0.22,-29.483193,11.805007)" />
+  <g
+     id="g5306"
+     transform="matrix(0.19014285,0,0,0.19014277,0.75950753,1.2640333)">
+    <g
+       id="g5095"
+       transform="translate(-134.01451,53.204584)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path16-7"
+         d="m 189.33008,-53.65625 c -23.87575,-0.287795 -44.74616,22.615413 -42.27344,46.3828125 1.29746,23.2196375 24.06068,42.5559575 47.24609,39.6640625 22.18894,-1.753781 40.6859,-23.1556466 38.90039,-45.25 -0.85406,-22.371879 -21.34137,-41.858239 -43.87304,-40.796875 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path18-2"
+         d="m 189.5625,-43.369141 c -20.11368,-0.438427 -36.75304,21.027764 -31.42188,40.4257816 3.9827,18.6327954 26.13024,30.4369084 43.78516,23.0292974 17.6482,-6.42084 26.68208,-29.3939282 17.26758,-45.892579 -5.61857,-10.719107 -17.4657,-17.965159 -29.63086,-17.5625 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4893"
+         d="m 182.96875,-31.714844 c -3.93271,-0.03361 -8.53898,1.147967 -9.00586,5.861328 -4.52322,8.680626 -12.55507,18.8629386 -7.79492,29.0996098 4.5305,9.1947872 19.52694,9.7631362 24.04101,0.2753906 4.01193,-7.0131405 1.66079,-18.3242284 -6.79492,-20.6601564 1.72781,-3.912244 4.87636,-7.287765 6.01563,-11.314453 -0.23257,-3.096788 -4.09464,-3.362125 -6.46094,-3.261719 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4891"
+         d="m 177.70117,-13.382812 c -10.00215,0.129546 -11.12021,16.9801004 -1.5,18.867187 7.28428,2.0945609 13.19729,-6.44001677 10.36914,-12.9648438 -1.19297,-3.7880422 -4.91587,-6.2322902 -8.86914,-5.9023432 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4889"
+         d="m 201.50391,-31.683594 c -9.70273,-0.203292 -15.5541,10.660031 -13.35157,19.337891 -0.50134,7.6215276 -0.73701,17.7481989 7.49024,21.5214842 9.06442,4.7904018 21.17356,-3.5422505 19.73047,-13.7519531 -0.54003,-7.9990621 2.21125,-18.4561591 -5.16016,-24.1054691 -2.4449,-1.955656 -5.56912,-3.080255 -8.70898,-3.001953 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path20-7"
+         d="m 201.38477,-26.878906 c -7.87914,0.07587 -9.76802,9.64411 -8.52539,15.714844 -0.77313,6.2277595 -0.35293,15.722291 7.60742,16.7968745 7.61465,1.2900925 12.04787,-7.759782 9.92578,-14.1699219 0.47781,-6.0625916 1.4755,-15.7899766 -6.24219,-18.0117186 -0.89607,-0.257972 -1.83411,-0.36839 -2.76562,-0.330078 z"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="rect3394-2"
+         d="m 131.42383,-50.908203 c 0,31.809245 0,63.618489 0,95.427734 13.94857,0 27.89713,0 41.8457,0 0,-32.475911 0,-64.951823 0,-97.427734 -13.94857,0 -27.89713,0 -41.8457,0 l 0,1 0,1 z"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:2.80745268" />
+      <path
+         inkscape:connector-curvature="0"
+         id="redlight-6"
+         d="m 152.36133,-47.316406 c -11.27309,-0.571827 -19.30401,13.304535 -13.33399,22.830078 5.39711,9.571643 21.23236,10.079357 26.54297,0.105469 6.03423,-9.404541 -1.90331,-23.620375 -13.20898,-22.935547 z"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:2.24596214" />
+      <path
+         inkscape:connector-curvature="0"
+         id="yellight-1"
+         d="m 152.36719,-19.371094 c -11.27539,-0.577134 -19.31087,13.3034797 -13.33985,22.8300784 5.39859,9.5738906 21.2392,10.0787526 26.54688,0.099609 6.02548,-9.4030295 -1.90641,-23.6099884 -13.20703,-22.9296874 z"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:2.24596214" />
+      <path
+         inkscape:connector-curvature="0"
+         id="grelight-0"
+         d="m 152.36719,8.5742188 c -11.27338,-0.5770233 -19.30957,13.2996662 -13.3418,22.8261722 5.39499,9.578871 21.24056,10.083885 26.54883,0.103515 6.02587,-9.403009 -1.90693,-23.6093881 -13.20703,-22.9296872 z"
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:2.24596214" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2627-4"
+         d="m 158.73242,-12.521484 c -4.72119,-0.188085 -11.40827,4.2519179 -8.03906,9.4394528 5.20381,5.1716201 16.12627,5.3004129 20.33594,-1.1171876 2.2597,-7.1805562 -7.46106,-8.6642972 -12.29688,-8.3222652 z"
+         style="fill:#ffffff;stroke:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2634-9"
+         d="m 222.00586,-12.65625 c -11.04275,1.024556 -22.35272,-0.896115 -33.29883,0.644531 -2.45382,1.302606 -4.45985,3.8074753 -7.47204,2.4412998 -11.35806,0.7374853 -23.25221,-1.6641958 -34.29554,1.160263 -6.89111,4.8131147 -2.8911,14.1242334 -3.83789,20.9863282 0.60322,10.908775 -1.62332,22.357285 1.12305,32.951172 4.78678,6.90168 14.05609,2.837774 20.89251,3.893628 21.17081,-0.379099 42.528,0.846348 63.58796,-0.612378 7.62485,-3.467658 4.426,-13.088583 5.00586,-19.5 -0.76138,-12.532903 1.51965,-25.5244781 -1.12891,-37.7695315 -2.12436,-3.6962505 -6.67285,-4.4839795 -10.57617,-4.1953125 z"
+         style="fill:#ffffff;stroke:#ffffff" />
+      <g
+         style="fill:#ffffff;stroke:#ffffff"
+         transform="matrix(0.86829826,0,0,0.86829826,121.48311,-53.122765)"
+         id="g2636-1">
+        <linearGradient
+           y2="53.6199"
+           x2="108.185"
+           y1="63.373001"
+           x1="118.848"
+           gradientUnits="userSpaceOnUse"
+           id="linearGradient4344">
+          <stop
+             id="stop3509-7"
+             style="stop-color:rgb(255,255,255)"
+             offset="0.0337" />
+          <stop
+             id="stop3511-7"
+             style="stop-color:rgb(171,171,171)"
+             offset="1" />
+        </linearGradient>
+        <path
+           id="path2643-1"
+           style="fill:#ffffff;stroke:#ffffff"
+           d="m 119.698,62.499 c 0,0.391 -0.292,0.707 -0.652,0.707 l -9.141,0 c -0.361,0 -0.652,-0.316 -0.652,-0.707 l 0,-6.249 c 0,-0.391 0.291,-0.708 0.652,-0.708 l 9.141,0 c 0.36,0 0.652,0.316 0.652,0.708 l 0,6.249 z"
+           inkscape:connector-curvature="0" />
+        <radialGradient
+           gradientUnits="userSpaceOnUse"
+           gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
+           fy="129.33299"
+           fx="114.137"
+           r="6.4330001"
+           cy="129.33299"
+           cx="114.137"
+           id="radialGradient3514-1">
+          <stop
+             id="stop3516-5"
+             style="stop-color:rgb(133,202,255)"
+             offset="0" />
+          <stop
+             id="stop3518-9"
+             style="stop-color:rgb(0,61,169)"
+             offset="1" />
+        </radialGradient>
+        <path
+           id="path2650-7"
+           style="fill:#ffffff;stroke:#ffffff"
+           d="m 119.306,62.263 c 0,0.363 -0.27,0.655 -0.603,0.655 l -8.454,0 c -0.333,0 -0.604,-0.292 -0.604,-0.655 l 0,-5.776 c 0,-0.362 0.271,-0.655 0.604,-0.655 l 8.454,0 c 0.333,0 0.603,0.292 0.603,0.655 l 0,5.776 z"
+           inkscape:connector-curvature="0" />
+        <linearGradient
+           y2="62.2383"
+           x2="114.477"
+           y1="56.5625"
+           x1="114.477"
+           gradientUnits="userSpaceOnUse"
+           id="linearGradient4353">
+          <stop
+             id="stop3523-7"
+             style="stop-color:rgb(255,255,255)"
+             offset="0%" />
+          <stop
+             id="stop3525-6"
+             style="stop-opacity:0;stop-color:rgb(255,255,255)"
+             offset="100%" />
+        </linearGradient>
+        <path
+           id="path2657-7"
+           style="fill:#ffffff;stroke:#ffffff"
+           d="m 118.389,56.034 -7.825,0 c -0.311,0 -0.56,0.272 -0.56,0.605 l 0,4.459 c 0.97,0.107 2.675,0.021 4.403,-1.391 1.897,-1.547 3.683,-2.111 4.541,-2.305 l 0,-0.762 c 0,-0.334 -0.25,-0.606 -0.559,-0.606 z"
+           a:adobe-blending-mode="screen"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         style="fill:#ffffff;stroke:#ffffff"
+         transform="matrix(0.86829826,0,0,0.86829826,121.48311,-53.122765)"
+         id="g2659-3">
+        <linearGradient
+           y2="57.596199"
+           x2="102.565"
+           y1="60.411098"
+           x1="105.643"
+           gradientUnits="userSpaceOnUse"
+           id="linearGradient4359">
+          <stop
+             id="stop3531-6"
+             style="stop-color:rgb(255,255,255)"
+             offset="0.0337" />
+          <stop
+             id="stop3533-5"
+             style="stop-color:rgb(171,171,171)"
+             offset="1" />
+        </linearGradient>
+        <path
+           id="path2666-6"
+           style="fill:#ffffff;stroke:#ffffff"
+           d="m 104.38,57.077 c -1.286,0 -2.331,0.978 -2.331,2.18 0,1.202 1.045,2.178 2.331,2.178 1.287,0 2.334,-0.977 2.334,-2.178 0,-1.201 -1.047,-2.18 -2.334,-2.18 z"
+           inkscape:connector-curvature="0" />
+        <g
+           style="fill:#ffffff;stroke:#ffffff"
+           id="g2668-3">
+          <g
+             style="fill:#ffffff;stroke:#ffffff"
+             id="g2670-9">
+            <linearGradient
+               gradientTransform="translate(1,15.5)"
+               y2="42.4576"
+               x2="103.381"
+               y1="45.933601"
+               x1="103.381"
+               gradientUnits="userSpaceOnUse"
+               id="linearGradient4366">
+              <stop
+                 id="stop3540-4"
+                 style="stop-color:rgb(158,158,158)"
+                 offset="0" />
+              <stop
+                 id="stop3542-8"
+                 style="stop-color:rgb(97,97,97)"
+                 offset="1" />
+            </linearGradient>
+            <path
+               id="path2677-1"
+               style="fill:#ffffff;stroke:#ffffff"
+               d="m 106.24,59.256 c 0,0.959 -0.834,1.737 -1.86,1.737 -1.025,0 -1.858,-0.777 -1.858,-1.737 0,-0.96 0.833,-1.737 1.858,-1.736 1.027,0 1.86,0.776 1.86,1.736 z"
+               inkscape:connector-curvature="0" />
+            <path
+               id="path2679-2"
+               style="fill:#ffffff;stroke:#ffffff"
+               d="m 102.435,59.256 c 0,1.003 0.873,1.819 1.945,1.819 1.075,0 1.949,-0.815 1.948,-1.819 10e-4,-1.003 -0.873,-1.821 -1.948,-1.821 -1.072,0 -1.946,0.818 -1.945,1.821 z m 0.175,0 c 0,-0.912 0.794,-1.655 1.77,-1.655 0.978,0 1.771,0.743 1.771,1.654 0,0.912 -0.793,1.654 -1.771,1.654 -0.976,0 -1.77,-0.742 -1.77,-1.653 z"
+               inkscape:connector-curvature="0" />
+            <path
+               id="path2681-9"
+               style="fill:#ffffff;stroke:#ffffff"
+               d="m 104.389,59.305 c 0.647,-0.447 1.254,-0.598 1.522,-0.647 -0.257,-0.541 -0.836,-0.917 -1.51,-0.917 -0.913,0 -1.652,0.691 -1.652,1.542 0,0.134 0.018,0.263 0.051,0.388 0.268,0.047 0.924,0.094 1.589,-0.366 z"
+               inkscape:connector-curvature="0" />
+          </g>
+          <g
+             style="fill:#ffffff;stroke:#ffffff"
+             id="g2683-3">
+            <linearGradient
+               gradientTransform="translate(-780.801,1657.79)"
+               y2="-1598.62"
+               x2="885.18103"
+               y1="-1596.5601"
+               x1="885.18103"
+               gradientUnits="userSpaceOnUse"
+               id="linearGradient4374">
+              <stop
+                 id="stop3550-9"
+                 style="stop-color:rgb(255,255,255)"
+                 offset="0" />
+              <stop
+                 id="stop3552-0"
+                 style="stop-color:rgb(189,189,189)"
+                 offset="1" />
+            </linearGradient>
+            <path
+               id="path2690-8"
+               style="fill:#ffffff;stroke:#ffffff"
+               d="m 106.24,59.256 c 0,0.959 -0.834,1.737 -1.86,1.737 -1.025,0 -1.858,-0.777 -1.858,-1.737 0,-0.96 0.833,-1.737 1.858,-1.736 1.027,0 1.86,0.776 1.86,1.736 z"
+               inkscape:connector-curvature="0" />
+            <linearGradient
+               y2="57.958099"
+               x2="104.381"
+               y1="61.433601"
+               x1="104.381"
+               gradientUnits="userSpaceOnUse"
+               id="linearGradient4379">
+              <stop
+                 id="stop3557-8"
+                 style="stop-color:rgb(158,158,158)"
+                 offset="0" />
+              <stop
+                 id="stop3559-5"
+                 style="stop-color:rgb(97,97,97)"
+                 offset="1" />
+            </linearGradient>
+            <path
+               id="path2697-0"
+               style="fill:#ffffff;stroke:#ffffff"
+               d="m 102.435,59.256 c 0,1.003 0.873,1.819 1.945,1.819 1.075,0 1.949,-0.815 1.948,-1.819 10e-4,-1.003 -0.873,-1.821 -1.948,-1.821 -1.072,0 -1.946,0.818 -1.945,1.821 z m 0.175,0 c 0,-0.912 0.794,-1.655 1.77,-1.655 0.978,0 1.771,0.743 1.771,1.654 0,0.912 -0.793,1.654 -1.771,1.654 -0.976,0 -1.77,-0.742 -1.77,-1.653 z"
+               inkscape:connector-curvature="0" />
+            <linearGradient
+               gradientTransform="translate(-780.801,1657.79)"
+               y2="-1597.9399"
+               x2="885.13098"
+               y1="-1599.67"
+               x1="885.13098"
+               gradientUnits="userSpaceOnUse"
+               id="linearGradient4384">
+              <stop
+                 id="stop3564-9"
+                 style="stop-color:rgb(255,255,255)"
+                 offset="0" />
+              <stop
+                 id="stop3566-6"
+                 style="stop-color:rgb(207,207,207)"
+                 offset="1" />
+            </linearGradient>
+            <path
+               id="path2704-3"
+               style="fill:#ffffff;stroke:#ffffff"
+               d="m 104.389,59.305 c 0.647,-0.447 1.254,-0.598 1.522,-0.647 -0.257,-0.541 -0.836,-0.917 -1.51,-0.917 -0.913,0 -1.652,0.691 -1.652,1.542 0,0.134 0.018,0.263 0.051,0.388 0.268,0.047 0.924,0.094 1.589,-0.366 z"
+               inkscape:connector-curvature="0" />
+          </g>
+        </g>
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path2711-6"
+         d="m 143.06055,-5.2363281 c 0,16.3320311 0,32.6640621 0,48.9960941 19.9095,0 39.81901,0 59.72851,0 0,-16.998698 0,-33.9973962 0,-50.9960941 -19.9095,0 -39.81901,0 -59.72851,0 l 0,1 0,1 z"
+         style="fill:#ffffff;stroke:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2718-5"
+         d="M 195.69922,2.6914062 C 178.36857,4.0070532 160.78876,2.8697101 143.36133,3.25 c 0,13.061849 0,26.123698 0,39.185547 29.972,0 59.94401,0 89.91601,0 0,-9.328125 0,-18.65625 0,-27.984375 -10.33476,-0.188323 -21.45786,0.373524 -31.30859,-0.275391 0.47766,-4.6408996 0.27822,-11.879335 -6.26953,-11.4843748 z"
+         style="opacity:0.7;fill:#ffffff;stroke:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2720-9"
+         d="m 170.30469,3.2109375 c -2.87017,-0.9311669 -7.51102,0.356897 -6.14844,4.2167969 0,11.5332036 0,23.0664066 0,34.5996096 3.98271,1.976397 9.51749,-0.395163 8.90039,-5.365235 -0.87404,-11.332804 0.0492,-22.699139 -0.26172,-34.0800778 -0.83008,0.2096355 -1.66015,0.4192709 -2.49023,0.6289063 z"
+         style="opacity:0.5;fill:#ffffff;stroke:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2727-8"
+         d="m 169.57422,3.2109375 c -2.8702,-0.9311814 -7.51316,0.356389 -6.15039,4.2167969 0,11.5332036 0,23.0664066 0,34.5996096 3.97836,1.972757 9.5137,-0.387095 8.90039,-5.355469 -0.86814,-11.335868 0.0487,-22.705692 -0.25977,-34.0898438 -0.83007,0.2096355 -1.66015,0.4192709 -2.49023,0.6289063 z"
+         style="opacity:0.7;fill:#ffffff;stroke:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2729-1"
+         d="m 226.81836,34.851562 c -18.25052,0.915071 -36.62822,-0.136741 -54.93945,0.253907 -9.60677,0 -19.21355,0 -28.82032,0 -1.4769,4.503654 1.61299,9.656604 6.60743,8.964843 17.73549,-1.094351 35.58478,0.110562 53.39257,-0.324218 10.1517,0 20.30339,0 30.45508,0 1.97276,-3.978362 -0.38709,-9.513706 -5.35547,-8.900391 -0.44557,-0.02431 -0.89421,-0.0052 -1.33984,0.0059 z"
+         style="opacity:0.5;fill:#ffffff;stroke:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2736-0"
+         d="m 226.81836,34.121094 c -18.25049,0.915066 -36.62821,-0.136738 -54.93945,0.253906 -9.60677,0 -19.21355,0 -28.82032,0 -1.47822,4.505129 1.6152,9.655233 6.60938,8.962891 17.73481,-1.09442 35.5835,0.110619 53.39062,-0.324219 10.1517,0 20.30339,0 30.45508,0 1.9764,-3.982711 -0.39516,-9.517489 -5.36523,-8.900391 -0.44311,-0.01257 -0.88713,-0.01147 -1.33008,0.0078 z"
+         style="opacity:0.7;fill:#ffffff;stroke:#ffffff" />
+      <g
+         style="fill:#ffffff;stroke:#ffffff"
+         transform="matrix(0.86829826,0,0,0.86829826,121.48311,-53.122765)"
+         id="g2738-4">
+        <linearGradient
+           y2="105.281"
+           x2="108.682"
+           y1="68.8125"
+           x1="75.553703"
+           gradientUnits="userSpaceOnUse"
+           id="linearGradient4412">
+          <stop
+             id="stop3602-4"
+             style="stop-color:rgb(255,255,255)"
+             offset="0.0337" />
+          <stop
+             id="stop3604-4"
+             style="stop-color:rgb(171,171,171)"
+             offset="1" />
+        </linearGradient>
+        <path
+           id="path2745-4"
+           style="fill:#ffffff;stroke:#ffffff"
+           d="m 112.278,82.032 c 0,13.65 -11.064,24.717 -24.717,24.717 -13.65,0 -24.716,-11.066 -24.716,-24.717 0,-13.651 11.066,-24.718 24.716,-24.718 13.653,0 24.717,11.067 24.717,24.718 z"
+           inkscape:connector-curvature="0" />
+        <linearGradient
+           y2="64.263496"
+           x2="87.561501"
+           y1="111.869"
+           x1="87.561501"
+           gradientUnits="userSpaceOnUse"
+           id="linearGradient4417">
+          <stop
+             id="stop3609-7"
+             style="stop-color:rgb(158,158,158)"
+             offset="0" />
+          <stop
+             id="stop3611-6"
+             style="stop-color:rgb(97,97,97)"
+             offset="1" />
+        </linearGradient>
+        <path
+           id="path2752-3"
+           style="fill:#ffffff;stroke:#ffffff"
+           d="m 62.635,82.032 c 0,13.744 11.182,24.927 24.927,24.927 13.744,0 24.927,-11.183 24.927,-24.927 0,-13.745 -11.183,-24.928 -24.927,-24.928 -13.746,0 -24.927,11.183 -24.927,24.928 z m 0.421,0 c 0,-13.514 10.993,-24.507 24.506,-24.507 13.513,0 24.506,10.994 24.506,24.507 0,13.513 -10.993,24.506 -24.506,24.506 -13.513,0 -24.506,-10.993 -24.506,-24.506 z"
+           inkscape:connector-curvature="0" />
+        <linearGradient
+           y2="82.155403"
+           x2="111.821"
+           y1="81.947304"
+           x1="71.107399"
+           gradientUnits="userSpaceOnUse"
+           id="linearGradient4422">
+          <stop
+             id="stop3616-1"
+             style="stop-color:rgb(255,255,255)"
+             offset="0.0337" />
+          <stop
+             id="stop3618-7"
+             style="stop-color:rgb(171,171,171)"
+             offset="1" />
+          <a:midPointStop
+             style="stop-color:#FFFFFF"
+             offset="0.0337" />
+          <a:midPointStop
+             style="stop-color:#FFFFFF"
+             offset="0.5" />
+          <a:midPointStop
+             style="stop-color:#ABABAB"
+             offset="1" />
+        </linearGradient>
+        <path
+           id="path2759-5"
+           style="fill:#ffffff;stroke:#ffffff"
+           d="m 104.687,82.032 c 0,9.458 -7.667,17.124 -17.125,17.124 -9.458,0 -17.126,-7.666 -17.126,-17.124 0,-9.459 7.668,-17.125 17.126,-17.125 9.458,0 17.125,7.666 17.125,17.125 z"
+           inkscape:connector-curvature="0" />
+        <linearGradient
+           y2="69.688904"
+           x2="87.561501"
+           y1="102.759"
+           x1="87.561501"
+           gradientUnits="userSpaceOnUse"
+           id="linearGradient4427">
+          <stop
+             id="stop3623-9"
+             style="stop-color:rgb(158,158,158)"
+             offset="0" />
+          <stop
+             id="stop3625-6"
+             style="stop-color:rgb(97,97,97)"
+             offset="1" />
+        </linearGradient>
+        <path
+           id="path2766-2"
+           style="fill:#ffffff;stroke:#ffffff"
+           d="m 70.246,82.032 c 0,9.548 7.768,17.315 17.315,17.315 9.549,0 17.315,-7.768 17.315,-17.315 0,-9.549 -7.767,-17.316 -17.315,-17.316 -9.547,0 -17.315,7.767 -17.315,17.316 z m 0.382,0 c 0,-9.338 7.597,-16.936 16.934,-16.936 9.338,0 16.934,7.598 16.934,16.936 0,9.338 -7.596,16.934 -16.934,16.934 -9.337,0 -16.934,-7.596 -16.934,-16.934 z"
+           inkscape:connector-curvature="0" />
+        <linearGradient
+           y2="80.375298"
+           x2="89.966499"
+           y1="95.804703"
+           x1="67.565399"
+           gradientUnits="userSpaceOnUse"
+           id="linearGradient4432">
+          <stop
+             id="stop3630-1"
+             style="stop-color:rgb(255,255,255)"
+             offset="0.0337" />
+          <stop
+             id="stop3632-7"
+             style="stop-color:rgb(153,153,153)"
+             offset="1" />
+        </linearGradient>
+        <path
+           id="path2773-8"
+           style="fill:#ffffff;stroke:#ffffff"
+           d="m 102.649,82.032 c 0,8.333 -6.755,15.087 -15.088,15.087 -8.333,0 -15.087,-6.754 -15.087,-15.087 0,-8.334 6.754,-15.088 15.087,-15.088 8.333,0 15.088,6.754 15.088,15.088 z"
+           inkscape:connector-curvature="0" />
+        <linearGradient
+           y2="82.123001"
+           x2="105.431"
+           y1="81.969704"
+           x1="75.442398"
+           gradientUnits="userSpaceOnUse"
+           id="linearGradient4437">
+          <stop
+             id="stop3637-5"
+             style="stop-color:rgb(255,255,255)"
+             offset="0.0337" />
+          <stop
+             id="stop3639-7"
+             style="stop-color:rgb(171,171,171)"
+             offset="1" />
+        </linearGradient>
+        <path
+           id="path2780-4"
+           style="fill:#ffffff;stroke:#ffffff"
+           d="m 100.176,82.032 c 0,6.967 -5.647,12.614 -12.614,12.614 -6.966,0 -12.614,-5.647 -12.614,-12.614 0,-6.967 5.648,-12.615 12.614,-12.615 6.966,0 12.614,5.648 12.614,12.615 z"
+           inkscape:connector-curvature="0" />
+        <linearGradient
+           y2="84.569901"
+           x2="87.560501"
+           y1="98.801804"
+           x1="87.560501"
+           gradientUnits="userSpaceOnUse"
+           id="linearGradient4442">
+          <stop
+             id="stop3644-1"
+             style="stop-color:rgb(255,255,255)"
+             offset="0.1685" />
+          <stop
+             id="stop3646-8"
+             style="stop-color:rgb(54,54,54)"
+             offset="1" />
+          <a:midPointStop
+             style="stop-color:#FFFFFF"
+             offset="0.1685" />
+          <a:midPointStop
+             style="stop-color:#FFFFFF"
+             offset="0.5" />
+          <a:midPointStop
+             style="stop-color:#363636"
+             offset="1" />
+        </linearGradient>
+        <path
+           id="path2787-5"
+           style="fill:#ffffff;stroke:#ffffff"
+           d="m 97.999,82.032 c 0,5.766 -4.671,10.438 -10.438,10.438 -5.766,0 -10.438,-4.672 -10.438,-10.438 0,-5.766 4.673,-10.439 10.438,-10.439 5.767,0 10.438,4.674 10.438,10.439 z"
+           inkscape:connector-curvature="0" />
+        <linearGradient
+           y2="84.349197"
+           x2="87.561501"
+           y1="97.340797"
+           x1="87.561501"
+           gradientUnits="userSpaceOnUse"
+           id="linearGradient4447">
+          <stop
+             id="stop3651-9"
+             style="stop-color:rgb(255,255,255)"
+             offset="4.5977%" />
+          <stop
+             id="stop3653-7"
+             style="stop-opacity:0;stop-color:rgb(255,255,255)"
+             offset="100%" />
+        </linearGradient>
+        <path
+           id="path2794-5"
+           style="fill:#ffffff;stroke:#ffffff"
+           d="m 97.09,82.032 c 0,5.263 -4.264,9.528 -9.528,9.528 -5.264,0 -9.528,-4.266 -9.528,-9.528 0,-5.264 4.265,-9.529 9.528,-9.529 5.264,0 9.528,4.266 9.528,9.529 z"
+           inkscape:connector-curvature="0" />
+        <g
+           style="fill:#ffffff;stroke:#ffffff"
+           id="g2796-3">
+          <radialGradient
+             gradientUnits="userSpaceOnUse"
+             fy="88.976601"
+             fx="87.766602"
+             r="11.4148"
+             cy="88.976601"
+             cx="87.766602"
+             id="radialGradient3657-8">
+            <stop
+               id="stop3659-8"
+               style="stop-color:rgb(187,235,255)"
+               offset="0" />
+            <stop
+               id="stop3661-3"
+               style="stop-color:rgb(0,61,215)"
+               offset="1" />
+            <a:midPointStop
+               style="stop-color:#BBEBFF"
+               offset="0" />
+            <a:midPointStop
+               style="stop-color:#BBEBFF"
+               offset="0.5" />
+            <a:midPointStop
+               style="stop-color:#003DD7"
+               offset="1" />
+          </radialGradient>
+          <path
+             id="path2803-1"
+             style="fill:#ffffff;stroke:#ffffff"
+             d="m 93.685,82.032 c 0,3.382 -2.741,6.123 -6.124,6.123 -3.38,0 -6.124,-2.741 -6.124,-6.123 0,-3.383 2.744,-6.124 6.124,-6.124 3.382,0 6.124,2.741 6.124,6.124 z"
+             inkscape:connector-curvature="0" />
+          <linearGradient
+             y2="82.084198"
+             x2="87.5625"
+             y1="75.327103"
+             x1="87.5625"
+             gradientUnits="userSpaceOnUse"
+             id="linearGradient4457">
+            <stop
+               id="stop3666-8"
+               style="stop-color:rgb(255,255,255)"
+               offset="7.47126%" />
+            <stop
+               id="stop3668-9"
+               style="stop-opacity:0;stop-color:rgb(255,255,255)"
+               offset="100%" />
+          </linearGradient>
+          <path
+             id="path2810-6"
+             style="fill:#ffffff;stroke:#ffffff"
+             d="m 92.081,79.905 c 0,2.006 -2.024,3.632 -4.521,3.632 -2.495,0 -4.518,-1.626 -4.518,-3.632 0,-2.007 2.022,-3.634 4.518,-3.634 2.497,0 4.521,1.627 4.521,3.634 z"
+             a:adobe-blending-mode="screen"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path2817-3"
+         d="m 221.99219,-10.927734 c 2.00417,12.7373145 0.71811,25.962835 1.04883,38.902343 -0.86903,3.272795 1.37576,9.021069 -1.41016,10.837891 -24.86691,-0.63265 -50.06423,0.842197 -74.82813,-0.626953 -3.74488,-1.915273 -5.67619,3.198333 -3.47656,5.792969 3.37785,7.818116 13.47567,5.452994 20.12305,5.248046 21.71058,0.05714 43.64917,0.943566 65.26562,-0.419921 7.61316,-3.478731 4.41247,-13.089118 4.99414,-19.5 -0.77663,-12.559234 1.52957,-25.5285778 -1.10351,-37.837891 -2.41349,-3.993592 -7.61001,-4.418734 -11.5625,-5.914062 0.3164,1.172526 0.63281,2.345052 0.94922,3.517578 z"
+         style="opacity:0.5;fill:#ffffff;stroke:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2824-6"
+         d="m 224.94336,-12.648438 c -11.99118,0.860995 -24.27607,-0.77212 -36.17578,0.613282 -2.49108,1.26983 -4.4923,3.8519622 -7.53259,2.4647368 -11.35806,0.7374853 -23.25221,-1.6641958 -34.29554,1.160263 -6.8918,4.8098184 -2.88586,14.1158218 -3.84375,20.9746092 0.59597,10.93307 -1.57358,22.3422 1.0918,32.990235 3.06773,4.440356 5.90296,1.481769 9.99023,4.640624 -7.02635,-10.435662 -0.3248,-19.47123 -0.99609,-31.08789 0.33984,-6.12565 -0.94141,-12.3949874 0.32617,-18.32226575 9.20737,-0.93904122 18.4415,0.0808367 27.67188,-0.4140625 4.53405,0.72369475 9.74927,0.80666445 13.02148,-2.87499995 9.469,0.4168704 19.03757,0.2483747 28.58594,-0.1230469 4.85844,-0.051073 9.46258,1.66927493 13.74023,3.8320312 -1.32791,-5.8857087 -4.24859,-13.9242491 -11.58398,-13.8535161 z"
+         style="fill:#ffffff;stroke:#ffffff"
+         sodipodi:nodetypes="cccccccccccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4861"
+         d="m 221.62891,-13.035156 c -10.79735,1.083912 -22.11621,-0.890704 -32.97461,0.648437 -2.49489,1.319291 -4.53185,3.8481795 -7.58145,2.4502164 -11.32225,0.7209184 -23.15471,-1.6266324 -34.18027,1.129862 -7.24455,4.7303902 -3.25456,14.4012188 -4.19111,21.3508626 0.7739,10.95265 -1.72341,22.49638 1.19111,33.131559 5.06656,7.342366 14.99422,2.959606 22.22648,4.111164 20.9673,-0.473779 42.19906,1.044191 63.00789,-0.767414 7.47337,-3.644571 4.41918,-13.252434 4.94727,-19.714843 -0.79123,-12.549721 1.55396,-25.5639764 -1.11524,-37.8417974 -2.2503,-3.9835116 -7.14068,-4.8336246 -11.33007,-4.4980466 z"
+         style="fill:#ffffff;stroke:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2831-8"
+         d="m 223.08984,-12.335938 c -11.38558,1.091333 -23.03688,-0.832356 -34.32812,0.689454 -2.4331,1.329482 -4.29526,3.9447663 -7.31586,2.4393128 -11.36058,0.7030039 -23.23084,-1.5816938 -34.29352,1.0977962 -6.76693,4.7624611 -2.67848,13.9575255 -3.68945,20.677734 0.61157,10.861635 -1.61095,22.283265 1.11523,32.820313 4.78401,6.684628 13.843,2.552952 20.53901,3.669968 21.03448,-0.278628 42.18142,0.643172 63.14849,-0.459031 7.46028,-3.089643 4.76022,-12.263084 4.97657,-18.435547 -0.47288,-12.711604 1.44234,-25.867161 -0.91797,-38.3378901 -1.83467,-3.2504879 -5.73232,-4.3187569 -9.23438,-4.1621099 z"
+         style="fill:#ffffff;stroke:#ffffff" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3750-8"
+         d="m 214.83984,-29.207031 c -3.77815,1.055544 -2.84238,6.499095 -4.07422,9.53125 -0.27146,4.182464 -1.34243,9.29785 -6.2539,9.988281 -3.3071,2.1873796 -10.61294,2.5072889 -10.31836,7.7480469 2.51758,4.4200829 8.92718,4.5113586 12.38867,8.1523437 5.21853,4.2875324 -0.36151,13.4540554 5.55664,17.4628904 6.51194,1.187638 7.95202,-8.409253 14.09571,-9.253906 5.55133,-2.156866 12.20011,5.768872 16.75195,0.351563 2.45462,-6.9392483 -8.11569,-12.1166853 -3.52735,-19.0253911 1.03124,-4.2846567 7.71263,-7.7735709 5.21094,-12.5039059 -4.88514,-3.610444 -11.50397,0.763794 -16.83984,-0.347657 -5.20982,-2.772531 -7.55166,-9.9236 -12.99024,-12.103515 z"
+         style="fill:#ffffff;fill-opacity:0.87121217;stroke:#ffffff" />
+    </g>
+    <g
+       transform="matrix(2.2180201,0,0,2.2180201,0.10052038,-2.561435)"
+       id="g4074">
+      <use
+         xlink:href="#reflex"
+         id="use3399"
+         transform="matrix(0.8331005,0,0,0.8331005,614.11663,-360.69592)"
+         x="0"
+         y="0"
+         width="600"
+         height="600" />
+      <use
+         xlink:href="#reflex"
+         transform="matrix(0.8331005,0,0,0.8331005,614.11663,-277.38587)"
+         id="use3401"
+         x="0"
+         y="0"
+         width="600"
+         height="600" />
+      <use
+         xlink:href="#reflex"
+         transform="matrix(0.8331005,0,0,0.8331005,614.11663,-194.07582)"
+         id="use3403"
+         x="0"
+         y="0"
+         width="600"
+         height="600" />
+      <g
+         id="g4538"
+         transform="matrix(0.07034453,0,0,0.07034453,-0.2582579,2.8565392)">
+        <path
+           inkscape:connector-curvature="0"
+           d="M 112.60846,250.59757 C 112.19594,124.33283 206.65435,17.92223 331.72332,2.0110029 474.76675,-16.138613 604.57352,90.733 613.07847,234.94719 622.43271,379.23416 507.44593,501.2648 363.02544,501.00397 225.13231,501.4104 112.04429,388.588 112.60846,250.59757"
+           style="fill:#cc0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           id="path16" />
+        <path
+           inkscape:connector-curvature="0"
+           d="M 178.5674,250.52998 C 178.28835,157.95605 248.14182,78.466576 340.17371,67.456704 445.3998,53.91728 541.01081,133.02461 547.2773,238.88318 553.98057,345.65772 469.7014,434.54957 363.10433,435.05912 260.7112,434.24626 179.0345,353.31308 178.5674,250.52998"
+           style="fill:#fffefe;fill-rule:evenodd;stroke:none"
+           id="path18" />
+        <path
+           inkscape:connector-curvature="0"
+           d="m 291.59905,142.76359 34.57794,0 -46.22523,92.08258 c 24.38047,-9.02021 48.97932,-0.78253 62.60425,21.47378 12.43591,22.89934 9.46343,69.26213 -12.73924,86.98712 -27.01324,24.57356 -65.88612,21.80137 -89.90261,-5.45943 -11.7565,-15.27431 -14.80784,-29.96627 -13.83118,-48.77102 l 0,-2.9117 0.36399,-5.82341 1.09193,-5.45944 1.45591,-5.45946 2.18387,-5.45943 1.09193,-2.54774 59.32844,-118.65185 z m -34.9419,146.31303 c -5.50819,50.11162 59.20712,53.30234 61.51231,9.46303 6.12697,-50.88806 -59.29204,-53.33267 -61.51231,-9.46303 z m 119.38484,9.46303 c 6.43028,-58.07633 -25.86671,-141.44807 53.86879,-157.23193 36.49486,-4.34935 69.39243,24.07009 69.15585,61.14576 -6.41209,58.84671 25.86672,140.81113 -53.86877,157.23192 -37.04692,4.16737 -69.11946,-23.62727 -69.15587,-61.14575 z m 30.57417,0 0,-96.08617 0.36399,-2.18378 0.36396,-3.63963 0.72798,-3.63963 1.45589,-3.63962 1.81989,-3.63964 c 6.27864,-8.09817 11.9021,-12.16848 22.20268,-13.83058 18.73275,-2.37183 34.61432,11.79846 34.57792,30.57288 l 0,97.90599 -0.36397,4.00359 -1.09194,3.63962 -1.45591,3.63963 -1.81988,3.27566 c -4.59827,7.898 -13.27915,12.95102 -22.20267,14.19455 -8.95387,0.92204 -18.33237,-1.929 -24.75053,-8.37115 -7.78913,-7.44302 -8.7112,-12.11388 -9.82741,-22.20172"
+           style="fill:#000000;fill-rule:evenodd;stroke:none"
+           id="path20" />
+      </g>
+      <g
+         id="g3448"
+         transform="matrix(-0.1271574,0,0,0.1259947,110.2611,-10.872392)">
+        <rect
+           id="rect3394"
+           y="111.67382"
+           x="742.14594"
+           height="320"
+           width="120"
+           style="fill:url(#linearGradient4006);stroke:#000000;stroke-width:10" />
+        <circle
+           transform="translate(737.14592,106.67382)"
+           id="redlight"
+           r="40"
+           cy="65"
+           cx="65"
+           style="fill:url(#radialGradient4008);stroke:#000000;stroke-width:8" />
+        <circle
+           transform="translate(737.14592,106.67382)"
+           id="yellight"
+           r="40"
+           cy="165"
+           cx="65"
+           style="fill:url(#radialGradient4010);stroke:#000000;stroke-width:8" />
+        <circle
+           transform="translate(737.14592,106.67382)"
+           id="grelight"
+           r="40"
+           cy="265"
+           cx="65"
+           style="fill:url(#radialGradient4012);stroke:#000000;stroke-width:8" />
+      </g>
+      <g
+         id="g2682"
+         transform="matrix(0.07247238,0,0,0.07247238,-3.1185958,3.3125023)">
+        <g
+           id="g2620"
+           transform="matrix(5.4017057,0,0,5.4017057,-34.965592,-27.802653)">
+          <linearGradient
+             id="linearGradient3492"
+             gradientUnits="userSpaceOnUse"
+             x1="45.014198"
+             y1="57.756302"
+             x2="45.014198"
+             y2="52.224201">
+            <stop
+               offset="0"
+               style="stop-color:rgb(158,158,158)"
+               id="stop3494" />
+            <stop
+               offset="1"
+               style="stop-color:rgb(97,97,97)"
+               id="stop3496" />
+          </linearGradient>
+          <path
+             inkscape:connector-curvature="0"
+             d="m 45.014,57.186 c -4.356,0 -7.888,-1.297 -7.888,-2.896 0,-1.6 3.532,-2.897 7.888,-2.897 4.357,0 7.889,1.297 7.889,2.897 -10e-4,1.598 -3.532,2.896 -7.889,2.896 z"
+             style="fill:url(#linearGradient4014)"
+             id="path2627" />
+          <linearGradient
+             id="linearGradient3499"
+             gradientUnits="userSpaceOnUse"
+             x1="52.644501"
+             y1="55.616199"
+             x2="122.192"
+             y2="132.177">
+            <stop
+               offset="0.0337"
+               style="stop-color:rgb(255,255,255)"
+               id="stop3501" />
+            <stop
+               offset="1"
+               style="stop-color:rgb(171,171,171)"
+               id="stop3503" />
+          </linearGradient>
+          <path
+             inkscape:connector-curvature="0"
+             d="m 119.951,51.413 -39.378,0 c -2.108,0 -3.867,1.397 -4.46,3.31 l -42.002,0 c -2.591,0 -4.691,2.101 -4.691,4.692 l 0,49.404 c 0,2.592 2.1,4.691 4.691,4.691 l 85.84,0 c 2.593,0 4.692,-2.1 4.692,-4.691 l 0,-52.715 c 0.001,-2.59 -2.099,-4.691 -4.692,-4.691 z"
+             style="fill:url(#linearGradient4016)"
+             id="path2634" />
+          <g
+             id="g2636">
+            <linearGradient
+               id="linearGradient3507"
+               gradientUnits="userSpaceOnUse"
+               x1="118.848"
+               y1="63.373001"
+               x2="108.185"
+               y2="53.6199">
+              <stop
+                 offset="0.0337"
+                 style="stop-color:rgb(255,255,255)"
+                 id="stop3509" />
+              <stop
+                 offset="1"
+                 style="stop-color:rgb(171,171,171)"
+                 id="stop3511" />
+            </linearGradient>
+            <path
+               inkscape:connector-curvature="0"
+               d="m 119.698,62.499 c 0,0.391 -0.292,0.707 -0.652,0.707 l -9.141,0 c -0.361,0 -0.652,-0.316 -0.652,-0.707 l 0,-6.249 c 0,-0.391 0.291,-0.708 0.652,-0.708 l 9.141,0 c 0.36,0 0.652,0.316 0.652,0.708 l 0,6.249 z"
+               style="fill:url(#linearGradient4018)"
+               id="path2643" />
+            <radialGradient
+               id="radialGradient3514"
+               cx="114.137"
+               cy="129.33299"
+               r="6.4330001"
+               fx="114.137"
+               fy="129.33299"
+               gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
+               gradientUnits="userSpaceOnUse">
+              <stop
+                 offset="0"
+                 style="stop-color:rgb(133,202,255)"
+                 id="stop3516" />
+              <stop
+                 offset="1"
+                 style="stop-color:rgb(0,61,169)"
+                 id="stop3518" />
+            </radialGradient>
+            <path
+               inkscape:connector-curvature="0"
+               d="m 119.306,62.263 c 0,0.363 -0.27,0.655 -0.603,0.655 l -8.454,0 c -0.333,0 -0.604,-0.292 -0.604,-0.655 l 0,-5.776 c 0,-0.362 0.271,-0.655 0.604,-0.655 l 8.454,0 c 0.333,0 0.603,0.292 0.603,0.655 l 0,5.776 z"
+               style="fill:url(#radialGradient4020)"
+               id="path2650" />
+            <linearGradient
+               id="linearGradient3521"
+               gradientUnits="userSpaceOnUse"
+               x1="114.477"
+               y1="56.5625"
+               x2="114.477"
+               y2="62.2383">
+              <stop
+                 offset="0%"
+                 style="stop-color:rgb(255,255,255)"
+                 id="stop3523" />
+              <stop
+                 offset="100%"
+                 style="stop-opacity:0;stop-color:rgb(255,255,255)"
+                 id="stop3525" />
+            </linearGradient>
+            <path
+               inkscape:connector-curvature="0"
+               a:adobe-blending-mode="screen"
+               d="m 118.389,56.034 -7.825,0 c -0.311,0 -0.56,0.272 -0.56,0.605 l 0,4.459 c 0.97,0.107 2.675,0.021 4.403,-1.391 1.897,-1.547 3.683,-2.111 4.541,-2.305 l 0,-0.762 c 0,-0.334 -0.25,-0.606 -0.559,-0.606 z"
+               style="fill:url(#linearGradient4022)"
+               id="path2657" />
+          </g>
+          <g
+             id="g2659">
+            <linearGradient
+               id="linearGradient3529"
+               gradientUnits="userSpaceOnUse"
+               x1="105.643"
+               y1="60.411098"
+               x2="102.565"
+               y2="57.596199">
+              <stop
+                 offset="0.0337"
+                 style="stop-color:rgb(255,255,255)"
+                 id="stop3531" />
+              <stop
+                 offset="1"
+                 style="stop-color:rgb(171,171,171)"
+                 id="stop3533" />
+            </linearGradient>
+            <path
+               inkscape:connector-curvature="0"
+               d="m 104.38,57.077 c -1.286,0 -2.331,0.978 -2.331,2.18 0,1.202 1.045,2.178 2.331,2.178 1.287,0 2.334,-0.977 2.334,-2.178 0,-1.201 -1.047,-2.18 -2.334,-2.18 z"
+               style="fill:url(#linearGradient4024)"
+               id="path2666" />
+            <g
+               id="g2668">
+              <g
+                 id="g2670">
+                <linearGradient
+                   id="linearGradient3538"
+                   gradientUnits="userSpaceOnUse"
+                   x1="103.381"
+                   y1="45.933601"
+                   x2="103.381"
+                   y2="42.4576"
+                   gradientTransform="translate(1,15.5)">
+                  <stop
+                     offset="0"
+                     style="stop-color:rgb(158,158,158)"
+                     id="stop3540" />
+                  <stop
+                     offset="1"
+                     style="stop-color:rgb(97,97,97)"
+                     id="stop3542" />
+                </linearGradient>
+                <path
+                   inkscape:connector-curvature="0"
+                   d="m 106.24,59.256 c 0,0.959 -0.834,1.737 -1.86,1.737 -1.025,0 -1.858,-0.777 -1.858,-1.737 0,-0.96 0.833,-1.737 1.858,-1.736 1.027,0 1.86,0.776 1.86,1.736 z"
+                   style="fill:url(#linearGradient4026)"
+                   id="path2677" />
+                <path
+                   inkscape:connector-curvature="0"
+                   d="m 102.435,59.256 c 0,1.003 0.873,1.819 1.945,1.819 1.075,0 1.949,-0.815 1.948,-1.819 10e-4,-1.003 -0.873,-1.821 -1.948,-1.821 -1.072,0 -1.946,0.818 -1.945,1.821 z m 0.175,0 c 0,-0.912 0.794,-1.655 1.77,-1.655 0.978,0 1.771,0.743 1.771,1.654 0,0.912 -0.793,1.654 -1.771,1.654 -0.976,0 -1.77,-0.742 -1.77,-1.653 z"
+                   style="fill:url(#linearGradient4028)"
+                   id="path2679" />
+                <path
+                   inkscape:connector-curvature="0"
+                   d="m 104.389,59.305 c 0.647,-0.447 1.254,-0.598 1.522,-0.647 -0.257,-0.541 -0.836,-0.917 -1.51,-0.917 -0.913,0 -1.652,0.691 -1.652,1.542 0,0.134 0.018,0.263 0.051,0.388 0.268,0.047 0.924,0.094 1.589,-0.366 z"
+                   style="fill:url(#linearGradient4030)"
+                   id="path2681" />
+              </g>
+              <g
+                 id="g2683">
+                <linearGradient
+                   id="linearGradient3548"
+                   gradientUnits="userSpaceOnUse"
+                   x1="885.18103"
+                   y1="-1596.5601"
+                   x2="885.18103"
+                   y2="-1598.62"
+                   gradientTransform="translate(-780.801,1657.79)">
+                  <stop
+                     offset="0"
+                     style="stop-color:rgb(255,255,255)"
+                     id="stop3550" />
+                  <stop
+                     offset="1"
+                     style="stop-color:rgb(189,189,189)"
+                     id="stop3552" />
+                </linearGradient>
+                <path
+                   inkscape:connector-curvature="0"
+                   d="m 106.24,59.256 c 0,0.959 -0.834,1.737 -1.86,1.737 -1.025,0 -1.858,-0.777 -1.858,-1.737 0,-0.96 0.833,-1.737 1.858,-1.736 1.027,0 1.86,0.776 1.86,1.736 z"
+                   style="fill:url(#linearGradient4032)"
+                   id="path2690" />
+                <linearGradient
+                   id="linearGradient3555"
+                   gradientUnits="userSpaceOnUse"
+                   x1="104.381"
+                   y1="61.433601"
+                   x2="104.381"
+                   y2="57.958099">
+                  <stop
+                     offset="0"
+                     style="stop-color:rgb(158,158,158)"
+                     id="stop3557" />
+                  <stop
+                     offset="1"
+                     style="stop-color:rgb(97,97,97)"
+                     id="stop3559" />
+                </linearGradient>
+                <path
+                   inkscape:connector-curvature="0"
+                   d="m 102.435,59.256 c 0,1.003 0.873,1.819 1.945,1.819 1.075,0 1.949,-0.815 1.948,-1.819 10e-4,-1.003 -0.873,-1.821 -1.948,-1.821 -1.072,0 -1.946,0.818 -1.945,1.821 z m 0.175,0 c 0,-0.912 0.794,-1.655 1.77,-1.655 0.978,0 1.771,0.743 1.771,1.654 0,0.912 -0.793,1.654 -1.771,1.654 -0.976,0 -1.77,-0.742 -1.77,-1.653 z"
+                   style="fill:url(#linearGradient4034)"
+                   id="path2697" />
+                <linearGradient
+                   id="linearGradient3562"
+                   gradientUnits="userSpaceOnUse"
+                   x1="885.13098"
+                   y1="-1599.67"
+                   x2="885.13098"
+                   y2="-1597.9399"
+                   gradientTransform="translate(-780.801,1657.79)">
+                  <stop
+                     offset="0"
+                     style="stop-color:rgb(255,255,255)"
+                     id="stop3564" />
+                  <stop
+                     offset="1"
+                     style="stop-color:rgb(207,207,207)"
+                     id="stop3566" />
+                </linearGradient>
+                <path
+                   inkscape:connector-curvature="0"
+                   d="m 104.389,59.305 c 0.647,-0.447 1.254,-0.598 1.522,-0.647 -0.257,-0.541 -0.836,-0.917 -1.51,-0.917 -0.913,0 -1.652,0.691 -1.652,1.542 0,0.134 0.018,0.263 0.051,0.388 0.268,0.047 0.924,0.094 1.589,-0.366 z"
+                   style="fill:url(#linearGradient4036)"
+                   id="path2704" />
+              </g>
+            </g>
+          </g>
+          <linearGradient
+             id="linearGradient3569"
+             gradientUnits="userSpaceOnUse"
+             x1="30.5054"
+             y1="82.064499"
+             x2="101.62"
+             y2="82.428001">
+            <stop
+               offset="0.0337"
+               style="stop-color:rgb(255,255,255)"
+               id="stop3571" />
+            <stop
+               offset="1"
+               style="stop-color:rgb(171,171,171)"
+               id="stop3573" />
+          </linearGradient>
+          <path
+             inkscape:connector-curvature="0"
+             d="m 29.458,106.97 59.574,0 0,-49.517 -59.574,0 0,49.517 z"
+             style="fill:url(#linearGradient4038)"
+             id="path2711" />
+          <linearGradient
+             id="linearGradient3576"
+             gradientUnits="userSpaceOnUse"
+             x1="37.715302"
+             y1="54.6782"
+             x2="83.369102"
+             y2="100.333">
+            <stop
+               offset="0"
+               style="stop-color:rgb(158,158,158)"
+               id="stop3578" />
+            <stop
+               offset="1"
+               style="stop-color:rgb(97,97,97)"
+               id="stop3580" />
+          </linearGradient>
+          <path
+             inkscape:connector-curvature="0"
+             d="m 87.977,82.43 0,-12.899 -58.173,0 0,35.914 94.34,0 0,-23.015 -36.167,0 z"
+             style="opacity:0.7;fill:url(#linearGradient4040)"
+             id="path2718" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m 54.489,69.416 -0.737,0 0,35.981 0.737,0 0,-35.981 z"
+             style="opacity:0.5;fill:#ffffff"
+             id="path2720" />
+          <linearGradient
+             id="linearGradient3584"
+             gradientUnits="userSpaceOnUse"
+             x1="43.121101"
+             y1="77.249001"
+             x2="55.990799"
+             y2="90.118896">
+            <stop
+               offset="0"
+               style="stop-color:rgb(158,158,158)"
+               id="stop3586" />
+            <stop
+               offset="1"
+               style="stop-color:rgb(97,97,97)"
+               id="stop3588" />
+          </linearGradient>
+          <path
+             inkscape:connector-curvature="0"
+             d="m 53.647,69.416 -0.737,0 0,35.981 0.737,0 0,-35.981 z"
+             style="opacity:0.7;fill:url(#linearGradient4042)"
+             id="path2727" />
+          <path
+             inkscape:connector-curvature="0"
+             d="m 124.837,106.955 0,-0.737 -95.382,0 0,0.737 95.382,0 z"
+             style="opacity:0.5;fill:#ffffff"
+             id="path2729" />
+          <linearGradient
+             id="linearGradient3592"
+             gradientUnits="userSpaceOnUse"
+             x1="431.49799"
+             y1="-360.35999"
+             x2="465.18799"
+             y2="-326.67001"
+             gradientTransform="matrix(0,1,-1,0,-256.622,-352.346)">
+            <stop
+               offset="0"
+               style="stop-color:rgb(158,158,158)"
+               id="stop3594" />
+            <stop
+               offset="1"
+               style="stop-color:rgb(97,97,97)"
+               id="stop3596" />
+          </linearGradient>
+          <path
+             inkscape:connector-curvature="0"
+             d="m 124.837,106.112 0,-0.737 -95.382,0 0,0.737 95.382,0 z"
+             style="opacity:0.7;fill:url(#linearGradient4044)"
+             id="path2736" />
+          <g
+             id="g2738">
+            <linearGradient
+               id="linearGradient3600"
+               gradientUnits="userSpaceOnUse"
+               x1="75.553703"
+               y1="68.8125"
+               x2="108.682"
+               y2="105.281">
+              <stop
+                 offset="0.0337"
+                 style="stop-color:rgb(255,255,255)"
+                 id="stop3602" />
+              <stop
+                 offset="1"
+                 style="stop-color:rgb(171,171,171)"
+                 id="stop3604" />
+            </linearGradient>
+            <path
+               inkscape:connector-curvature="0"
+               d="m 112.278,82.032 c 0,13.65 -11.064,24.717 -24.717,24.717 -13.65,0 -24.716,-11.066 -24.716,-24.717 0,-13.651 11.066,-24.718 24.716,-24.718 13.653,0 24.717,11.067 24.717,24.718 z"
+               style="fill:url(#linearGradient4046)"
+               id="path2745" />
+            <linearGradient
+               id="linearGradient3607"
+               gradientUnits="userSpaceOnUse"
+               x1="87.561501"
+               y1="111.869"
+               x2="87.561501"
+               y2="64.263496">
+              <stop
+                 offset="0"
+                 style="stop-color:rgb(158,158,158)"
+                 id="stop3609" />
+              <stop
+                 offset="1"
+                 style="stop-color:rgb(97,97,97)"
+                 id="stop3611" />
+            </linearGradient>
+            <path
+               inkscape:connector-curvature="0"
+               d="m 62.635,82.032 c 0,13.744 11.182,24.927 24.927,24.927 13.744,0 24.927,-11.183 24.927,-24.927 0,-13.745 -11.183,-24.928 -24.927,-24.928 -13.746,0 -24.927,11.183 -24.927,24.928 z m 0.421,0 c 0,-13.514 10.993,-24.507 24.506,-24.507 13.513,0 24.506,10.994 24.506,24.507 0,13.513 -10.993,24.506 -24.506,24.506 -13.513,0 -24.506,-10.993 -24.506,-24.506 z"
+               style="fill:url(#linearGradient4048)"
+               id="path2752" />
+            <linearGradient
+               id="linearGradient3614"
+               gradientUnits="userSpaceOnUse"
+               x1="71.107399"
+               y1="81.947304"
+               x2="111.821"
+               y2="82.155403">
+              <stop
+                 offset="0.0337"
+                 style="stop-color:rgb(255,255,255)"
+                 id="stop3616" />
+              <stop
+                 offset="1"
+                 style="stop-color:rgb(171,171,171)"
+                 id="stop3618" />
+              <a:midPointStop
+                 offset="0.0337"
+                 style="stop-color:#FFFFFF" />
+              <a:midPointStop
+                 offset="0.5"
+                 style="stop-color:#FFFFFF" />
+              <a:midPointStop
+                 offset="1"
+                 style="stop-color:#ABABAB" />
+            </linearGradient>
+            <path
+               inkscape:connector-curvature="0"
+               d="m 104.687,82.032 c 0,9.458 -7.667,17.124 -17.125,17.124 -9.458,0 -17.126,-7.666 -17.126,-17.124 0,-9.459 7.668,-17.125 17.126,-17.125 9.458,0 17.125,7.666 17.125,17.125 z"
+               style="fill:url(#linearGradient4050)"
+               id="path2759" />
+            <linearGradient
+               id="linearGradient3621"
+               gradientUnits="userSpaceOnUse"
+               x1="87.561501"
+               y1="102.759"
+               x2="87.561501"
+               y2="69.688904">
+              <stop
+                 offset="0"
+                 style="stop-color:rgb(158,158,158)"
+                 id="stop3623" />
+              <stop
+                 offset="1"
+                 style="stop-color:rgb(97,97,97)"
+                 id="stop3625" />
+            </linearGradient>
+            <path
+               inkscape:connector-curvature="0"
+               d="m 70.246,82.032 c 0,9.548 7.768,17.315 17.315,17.315 9.549,0 17.315,-7.768 17.315,-17.315 0,-9.549 -7.767,-17.316 -17.315,-17.316 -9.547,0 -17.315,7.767 -17.315,17.316 z m 0.382,0 c 0,-9.338 7.597,-16.936 16.934,-16.936 9.338,0 16.934,7.598 16.934,16.936 0,9.338 -7.596,16.934 -16.934,16.934 -9.337,0 -16.934,-7.596 -16.934,-16.934 z"
+               style="fill:url(#linearGradient4052)"
+               id="path2766" />
+            <linearGradient
+               id="linearGradient3628"
+               gradientUnits="userSpaceOnUse"
+               x1="67.565399"
+               y1="95.804703"
+               x2="89.966499"
+               y2="80.375298">
+              <stop
+                 offset="0.0337"
+                 style="stop-color:rgb(255,255,255)"
+                 id="stop3630" />
+              <stop
+                 offset="1"
+                 style="stop-color:rgb(153,153,153)"
+                 id="stop3632" />
+            </linearGradient>
+            <path
+               inkscape:connector-curvature="0"
+               d="m 102.649,82.032 c 0,8.333 -6.755,15.087 -15.088,15.087 -8.333,0 -15.087,-6.754 -15.087,-15.087 0,-8.334 6.754,-15.088 15.087,-15.088 8.333,0 15.088,6.754 15.088,15.088 z"
+               style="fill:url(#linearGradient4054)"
+               id="path2773" />
+            <linearGradient
+               id="linearGradient3635"
+               gradientUnits="userSpaceOnUse"
+               x1="75.442398"
+               y1="81.969704"
+               x2="105.431"
+               y2="82.123001">
+              <stop
+                 offset="0.0337"
+                 style="stop-color:rgb(255,255,255)"
+                 id="stop3637" />
+              <stop
+                 offset="1"
+                 style="stop-color:rgb(171,171,171)"
+                 id="stop3639" />
+            </linearGradient>
+            <path
+               inkscape:connector-curvature="0"
+               d="m 100.176,82.032 c 0,6.967 -5.647,12.614 -12.614,12.614 -6.966,0 -12.614,-5.647 -12.614,-12.614 0,-6.967 5.648,-12.615 12.614,-12.615 6.966,0 12.614,5.648 12.614,12.615 z"
+               style="fill:url(#linearGradient4056)"
+               id="path2780" />
+            <linearGradient
+               id="linearGradient3642"
+               gradientUnits="userSpaceOnUse"
+               x1="87.560501"
+               y1="98.801804"
+               x2="87.560501"
+               y2="84.569901">
+              <stop
+                 offset="0.1685"
+                 style="stop-color:rgb(255,255,255)"
+                 id="stop3644" />
+              <stop
+                 offset="1"
+                 style="stop-color:rgb(54,54,54)"
+                 id="stop3646" />
+              <a:midPointStop
+                 offset="0.1685"
+                 style="stop-color:#FFFFFF" />
+              <a:midPointStop
+                 offset="0.5"
+                 style="stop-color:#FFFFFF" />
+              <a:midPointStop
+                 offset="1"
+                 style="stop-color:#363636" />
+            </linearGradient>
+            <path
+               inkscape:connector-curvature="0"
+               d="m 97.999,82.032 c 0,5.766 -4.671,10.438 -10.438,10.438 -5.766,0 -10.438,-4.672 -10.438,-10.438 0,-5.766 4.673,-10.439 10.438,-10.439 5.767,0 10.438,4.674 10.438,10.439 z"
+               style="fill:url(#linearGradient4058)"
+               id="path2787" />
+            <linearGradient
+               id="linearGradient3649"
+               gradientUnits="userSpaceOnUse"
+               x1="87.561501"
+               y1="97.340797"
+               x2="87.561501"
+               y2="84.349197">
+              <stop
+                 offset="4.5977%"
+                 style="stop-color:rgb(255,255,255)"
+                 id="stop3651" />
+              <stop
+                 offset="100%"
+                 style="stop-opacity:0;stop-color:rgb(255,255,255)"
+                 id="stop3653" />
+            </linearGradient>
+            <path
+               inkscape:connector-curvature="0"
+               d="m 97.09,82.032 c 0,5.263 -4.264,9.528 -9.528,9.528 -5.264,0 -9.528,-4.266 -9.528,-9.528 0,-5.264 4.265,-9.529 9.528,-9.529 5.264,0 9.528,4.266 9.528,9.529 z"
+               style="fill:url(#linearGradient4060)"
+               id="path2794" />
+            <g
+               id="g2796">
+              <radialGradient
+                 id="radialGradient3657"
+                 cx="87.766602"
+                 cy="88.976601"
+                 r="11.4148"
+                 fx="87.766602"
+                 fy="88.976601"
+                 gradientUnits="userSpaceOnUse">
+                <stop
+                   offset="0"
+                   style="stop-color:rgb(187,235,255)"
+                   id="stop3659" />
+                <stop
+                   offset="1"
+                   style="stop-color:rgb(0,61,215)"
+                   id="stop3661" />
+                <a:midPointStop
+                   offset="0"
+                   style="stop-color:#BBEBFF" />
+                <a:midPointStop
+                   offset="0.5"
+                   style="stop-color:#BBEBFF" />
+                <a:midPointStop
+                   offset="1"
+                   style="stop-color:#003DD7" />
+              </radialGradient>
+              <path
+                 inkscape:connector-curvature="0"
+                 d="m 93.685,82.032 c 0,3.382 -2.741,6.123 -6.124,6.123 -3.38,0 -6.124,-2.741 -6.124,-6.123 0,-3.383 2.744,-6.124 6.124,-6.124 3.382,0 6.124,2.741 6.124,6.124 z"
+                 style="fill:url(#radialGradient4062)"
+                 id="path2803" />
+              <linearGradient
+                 id="linearGradient3664"
+                 gradientUnits="userSpaceOnUse"
+                 x1="87.5625"
+                 y1="75.327103"
+                 x2="87.5625"
+                 y2="82.084198">
+                <stop
+                   offset="7.47126%"
+                   style="stop-color:rgb(255,255,255)"
+                   id="stop3666" />
+                <stop
+                   offset="100%"
+                   style="stop-opacity:0;stop-color:rgb(255,255,255)"
+                   id="stop3668" />
+              </linearGradient>
+              <path
+                 inkscape:connector-curvature="0"
+                 a:adobe-blending-mode="screen"
+                 d="m 92.081,79.905 c 0,2.006 -2.024,3.632 -4.521,3.632 -2.495,0 -4.518,-1.626 -4.518,-3.632 0,-2.007 2.022,-3.634 4.518,-3.634 2.497,0 4.521,1.627 4.521,3.634 z"
+                 style="fill:url(#linearGradient4064)"
+                 id="path2810" />
+            </g>
+          </g>
+          <linearGradient
+             id="linearGradient3671"
+             gradientUnits="userSpaceOnUse"
+             x1="64.068398"
+             y1="68.1436"
+             x2="120.423"
+             y2="130.181">
+            <stop
+               offset="0.0337"
+               style="stop-color:rgb(255,255,255)"
+               id="stop3673" />
+            <stop
+               offset="1"
+               style="stop-color:rgb(135,135,135)"
+               id="stop3675" />
+          </linearGradient>
+          <path
+             inkscape:connector-curvature="0"
+             a:adobe-blending-mode="multiply"
+             d="m 121.345,51.624 c 0.137,0.44 0.211,0.907 0.211,1.394 l 0,52.715 c 0,2.591 -2.1,4.691 -4.691,4.691 l -85.843,0 c -0.485,0 -0.952,-0.074 -1.393,-0.21 0.594,1.91 2.375,3.297 4.481,3.297 l 85.84,0 c 2.593,0 4.692,-2.1 4.692,-4.691 l 0,-52.716 c 0.002,-2.105 -1.385,-3.888 -3.297,-4.48 z"
+             style="opacity:0.5;fill:url(#linearGradient4066)"
+             id="path2817" />
+          <linearGradient
+             id="linearGradient3678"
+             gradientUnits="userSpaceOnUse"
+             x1="76.830101"
+             y1="57.847698"
+             x2="76.830101"
+             y2="126.982">
+            <stop
+               offset="4.02299%"
+               style="stop-color:rgb(255,255,255)"
+               id="stop3680" />
+            <stop
+               offset="100%"
+               style="stop-opacity:0;stop-color:rgb(255,255,255)"
+               id="stop3682" />
+          </linearGradient>
+          <path
+             inkscape:connector-curvature="0"
+             a:adobe-blending-mode="screen"
+             d="m 31.807,61.8 c 0,-2.59 2.1,-4.691 4.691,-4.691 l 42.002,0 C 79.092,55.197 80.853,53.8 82.96,53.8 l 39.379,0 c 0.677,0 1.318,0.145 1.9,0.403 -0.729,-1.642 -2.373,-2.79 -4.288,-2.79 l -39.378,0 c -2.108,0 -3.867,1.397 -4.46,3.31 l -42.002,0 c -2.591,0 -4.691,2.101 -4.691,4.692 l 0,49.404 c 0,1.915 1.148,3.559 2.792,4.287 -0.259,-0.581 -0.405,-1.224 -0.405,-1.899 l 0,-49.407 z"
+             style="fill:url(#linearGradient4068)"
+             id="path2824" />
+          <linearGradient
+             id="linearGradient3685"
+             gradientUnits="userSpaceOnUse"
+             x1="77.031303"
+             y1="120.132"
+             x2="77.031303"
+             y2="60.029999">
+            <stop
+               offset="0"
+               style="stop-color:rgb(158,158,158)"
+               id="stop3687" />
+            <stop
+               offset="1"
+               style="stop-color:rgb(97,97,97)"
+               id="stop3689" />
+            <a:midPointStop
+               offset="0"
+               style="stop-color:#9E9E9E" />
+            <a:midPointStop
+               offset="0.5"
+               style="stop-color:#9E9E9E" />
+            <a:midPointStop
+               offset="1"
+               style="stop-color:#616161" />
+          </linearGradient>
+          <path
+             inkscape:connector-curvature="0"
+             d="m 80.573,50.992 c -2.128,0 -3.961,1.331 -4.716,3.31 -0.506,0 -41.747,0 -41.747,0 -2.818,0 -5.112,2.293 -5.112,5.114 l 0,49.404 c 0,2.82 2.293,5.113 5.112,5.113 l 85.84,0 c 2.82,0 5.113,-2.293 5.113,-5.113 l 0,-52.716 c 0,-2.819 -2.293,-5.112 -5.113,-5.112 l -39.377,0 z m -50.732,57.827 0,-49.404 c 0,-2.355 1.916,-4.271 4.27,-4.271 l 42.314,0 0.092,-0.296 c 0.558,-1.802 2.188,-3.014 4.057,-3.014 l 39.378,0 c 2.356,0 4.271,1.917 4.271,4.271 l 0,52.715 c 0,2.355 -1.914,4.271 -4.271,4.271 l -85.84,0 c -2.355,0 -4.271,-1.916 -4.271,-4.272 z"
+             style="fill:url(#linearGradient4070)"
+             id="path2831" />
+        </g>
+        <path
+           transform="translate(7.0710115,-4.2372125e-6)"
+           d="m 690.1362,379.38269 -89.82448,-17.29388 -68.80954,60.2724 -11.30983,-90.77226 -78.58578,-46.81657 82.83461,-38.80646 20.24087,-89.20663 62.50444,66.78854 91.09532,-8.31616 -44.20475,80.08405 z"
+           inkscape:randomized="0"
+           inkscape:rounded="0"
+           inkscape:flatsided="false"
+           sodipodi:arg2="1.306219"
+           sodipodi:arg1="0.67790049"
+           sodipodi:r2="72.924919"
+           sodipodi:r1="139.80701"
+           sodipodi:cy="291.70145"
+           sodipodi:cx="581.24176"
+           sodipodi:sides="5"
+           id="path3750"
+           style="fill:#ffff00;fill-opacity:0.87121217;stroke:none"
+           sodipodi:type="star" />
+      </g>
+    </g>
+  </g>
+  <use
+     xlink:href="#reflex"
+     id="use3399-4"
+     transform="matrix(0.40652342,0,0,0.40652342,329.15164,-188.22696)"
+     x="0"
+     y="0"
+     width="600"
+     height="600" />
+  <use
+     xlink:href="#reflex"
+     transform="matrix(0.40652342,0,0,0.40652342,329.15164,-147.57462)"
+     id="use3401-8"
+     x="0"
+     y="0"
+     width="600"
+     height="600" />
+  <use
+     xlink:href="#reflex"
+     transform="matrix(0.40652342,0,0,0.40652342,329.15164,-106.92228)"
+     id="use3403-7"
+     x="0"
+     y="0"
+     width="600"
+     height="600" />
+</svg>
diff --git a/navit/xpm/telephone.svg b/navit/icons/telephone.svg
index e4e63ee7f..e4e63ee7f 100644
--- a/navit/xpm/telephone.svg
+++ b/navit/icons/telephone.svg
diff --git a/navit/icons/theater.svg b/navit/icons/theater.svg
new file mode 100644
index 000000000..0d403914b
--- /dev/null
+++ b/navit/icons/theater.svg
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="theater.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="25.45582"
+     inkscape:cy="47.86992"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="685"
+     inkscape:window-width="968"
+     inkscape:window-x="25"
+     inkscape:window-y="25"
+     inkscape:zoom="3.6867085"
+     objecttolerance="10.0"
+     pagecolor="#ff00ff"
+     showgrid="false"
+     inkscape:window-maximized="0" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       id="perspective2441"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_x="0 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="60 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       id="symbol-university"
+       viewBox="244.5 110 489 219.9">
+      <path
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
+         id="path4460"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 94,176 73,215"
+         id="path4462"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
+      <path
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
+         id="path4464"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
+         id="path4466"
+         ill="none"
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_x="0 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="12 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2543"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-536.27327,44.693248)">
+    <rect
+       height="10"
+       id="rect4134"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="10"
+       x="1"
+       y="1" />
+    <rect
+       height="8"
+       id="rect4136"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="8"
+       x="2"
+       y="2" />
+  </g>
+  <g
+     id="g8445"
+     transform="matrix(0.21449677,0,0,0.21449738,0.17393709,0.93116062)">
+    <g
+       transform="translate(153.52448,0)"
+       id="g8129">
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:3.68696237;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m -107.99023,10.640625 c -8.37278,1.913595 -12.80283,10.983446 -21.48047,12.457031 -6.83807,1.980753 -14.57658,-2.311797 -20.89063,0.679688 -5.10797,5.256149 0.30653,12.657186 1.17335,18.484463 5.26806,16.018607 10.90437,35.539329 27.4536,43.333896 7.88526,3.689775 17.68846,0.08512 21.31836,-7.810547 3.270503,-5.021646 2.464536,-11.180011 0.21875,-16.36914 -3.38873,-14.125917 -2.11681,-28.948941 -0.0508,-43.109375 -0.49239,-3.93997 -3.25905,-8.26155 -7.74218,-7.666016 z"
+         id="path3327-2"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.68696237;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m -99.056641,4.65625 c -6.502569,1.5036644 -5.357189,9.838507 -7.492189,14.646484 -3.52222,16.766236 -3.69175,34.923266 2.50586,51.058594 4.505067,8.351985 16.436547,10.056881 23.486329,3.916016 14.406765,-10.356297 18.341424,-28.91707 23.894532,-44.705078 1.10485,-4.140108 3.736954,-11.945037 -2.517579,-12.964844 -7.793573,0.469995 -16.251219,2.763693 -23.335937,-1.978516 -5.900549,-2.289469 -9.724731,-8.7628932 -15.939453,-9.9843748 -0.199205,0.024936 -0.403001,-0.027011 -0.601563,0.011719 z"
+         id="path8079"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.68696237;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m -87.904297,22.185547 c -5.858901,1.086835 -15.158483,2.294621 -15.292973,10.066406 -0.42452,8.137959 10.279316,11.080131 16.017582,6.820313 6.245902,-2.466038 9.181028,-12.394139 2.482422,-16.083985 -0.977168,-0.532707 -2.089871,-0.842195 -3.207031,-0.802734 z"
+         id="path8077"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.68696237;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m -76.71875,24.990234 c -8.314543,1.107961 -8.789652,12.606326 -4.117188,17.892578 3.433628,5.865964 14.801923,6.192383 15.664063,-1.710937 -0.363441,-6.589438 -3.20463,-16.572847 -11.546875,-16.181641 z"
+         id="path8075"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:3.68696237;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m -88.712891,45.238281 c -7.487261,-0.005 -16.349239,8.243582 -11.738279,15.783203 2.878401,4.857095 8.841337,1.124414 12.820311,2.517578 3.923208,6.259198 14.17702,2.213766 13.625,-4.851562 0.503561,-7.656325 -7.61511,-13.582474 -14.707032,-13.449219 z"
+         id="path3331-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:3.68696237;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m -98.943359,3.1132812 c -7.512651,0.8525345 -6.856401,9.9358688 -8.851561,15.2382808 -3.71987,17.113948 -3.85605,35.574972 2.17383,52.15625 4.32317,8.836122 16.638104,11.993356 24.509762,5.896485 15.348103,-9.72135 19.709157,-28.841239 25.330078,-44.853516 1.245499,-4.872412 4.615403,-12.551888 -0.882812,-15.90039 -6.871838,-2.248569 -14.308975,2.790636 -21.191407,-0.56836 -7.479173,-2.060192 -12.217609,-9.0638595 -19.173828,-11.8183591 -0.625411,-0.1285506 -1.276964,-0.2109292 -1.914062,-0.1503907 z"
+         id="path3354-4"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff"
+         d="m -110.47266,50.949219 c -6.45479,0.587059 -5.29965,11.601444 -12.35742,10.08789 -3.78136,-1.772326 -10.92342,0.04676 -9.06054,5.251953 3.95864,10.423128 20.07703,9.860621 24.86718,0.417969 2.61048,-4.572914 4.83229,-13.092764 -1.50976,-15.611328 -0.62203,-0.178828 -1.30115,-0.265745 -1.93946,-0.146484 z"
+         id="path8069"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff"
+         d="m -134.5957,34.808594 c -6.37442,-0.146102 -9.49706,9.795061 -3.32422,12.589844 3.77866,3.103966 11.00746,6.785298 14.36523,1.132812 4.11691,-7.117817 -4.69619,-13.434843 -11.04101,-13.722656 z"
+         id="path8067"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff"
+         d="m -113.46289,29.597656 c -9.10094,-0.923258 -13.08885,13.528795 -4.63477,17.15625 6.36107,1.902589 9.92919,-5.852325 10.64649,-10.980468 0.18671,-3.344105 -2.60938,-6.363493 -6.01172,-6.175782 z"
+         id="path3360-7"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#b26609;stroke-width:3.68696237;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3327"
+       d="m 46.262801,15.055173 c -1.711072,0.004 -3.615881,1.488872 -4.829063,2.729861 -5.186979,4.319695 -8.982548,7.414247 -17.651246,9.94749 -3.293497,1.07903 -10.000003,-0.234321 -16.5781207,-0.737962 -4.1999306,-0.710036 -0.6003568,7.425213 -0.038707,10.733449 3.7346097,12.685703 8.0318017,25.525526 15.6211597,36.160137 4.328187,5.224575 10.314256,9.778542 17.026178,9.695501 5.546431,-0.501616 10.124222,-5.33214 11.422696,-11.087429 0.112184,-0.388485 0.215786,-0.781841 0.309789,-1.175935 0.148811,-0.603395 0.292447,-1.205507 0.425953,-1.811914 -0.818575,-1.384293 -1.436718,-2.911505 -1.797763,-4.51177 -0.112184,-0.388485 -0.210256,-0.78184 -0.304259,-1.175935 C 46.852502,51.58937 47.038392,38.717267 48.34824,26.232601 c 0.381451,-2.003697 0.844563,-3.987315 1.344166,-5.957693 -0.347168,-1.251831 -0.691249,-2.506007 -1.023359,-3.761806 -0.665936,-1.060597 -1.50996,-1.460044 -2.406232,-1.457929 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#b26609;fill-opacity:1;fill-rule:evenodd;stroke:#b26609;stroke-width:3.68696237;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3331"
+       d="m 54.892053,9.1094812 c -1.373327,0.38269 -1.177501,2.3240758 -1.631814,3.4558218 -2.026037,7.024815 -4.061367,14.17293 -4.143147,21.598891 -0.623125,11.156084 -0.224147,22.680349 3.357665,33.232286 2.113948,4.759932 7.178515,8.197096 12.092014,6.851651 6.927977,-1.549529 12.450392,-7.202959 16.047094,-13.601301 6.743028,-11.427312 10.549221,-24.460099 14.000408,-37.402077 0.066,-0.688241 0.325094,-1.747201 -0.06087,-2.243884 -3.325846,0.250113 -6.674877,0.726625 -10.017675,1.043946 -3.642846,0.375834 -7.370032,0.0066 -10.781034,-1.439925 C 67.667857,18.417975 62.305534,14.48051 57.425513,10.039434 56.679522,9.4981475 55.805735,9.0731276 54.892053,9.1094812 Z M 65.778188,26.640577 c 2.886224,-0.100373 4.204791,4.374115 2.240287,6.419673 -2.646161,3.093746 -6.799815,5.171517 -10.709127,4.073788 C 54.908486,36.198011 53.550682,32.4443 55.378831,30.246392 58.258252,27.5338 62.393666,27.99256 65.778188,26.640577 Z m 11.677151,2.783861 c 3.029882,-0.09776 5.237735,3.008728 5.631134,6.017691 0.791299,2.071264 2.191167,4.399728 1.200354,6.68365 -0.727151,1.720273 -2.787962,2.036976 -4.275906,1.403929 -3.559512,-0.896904 -5.931766,-4.717757 -6.001752,-8.597555 -0.32359,-2.225552 0.640451,-5.079647 2.920666,-5.447722 0.173054,-0.03672 0.34854,-0.05622 0.525504,-0.05998 z M 65.700743,49.691389 c 3.739414,0.06622 7.157573,2.538999 9.348355,5.693707 1.392203,2.590645 0.728894,6.746152 -2.096465,7.805603 -1.940497,0.463882 -3.224408,-1.552551 -4.768213,-2.417875 -2.471954,-1.717142 -5.629786,-1.739454 -8.330549,-0.713964 -1.328816,0.451567 -3.129653,0.123553 -3.634241,-1.463923 -0.863554,-2.208441 0.366721,-4.764515 2.146249,-5.939698 2.097536,-1.754561 4.658184,-2.954529 7.334864,-2.96385 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#b26609;stroke-width:3.68696237;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ccccccccccc"
+       id="path3354"
+       d="M 49.866794,63.822542 C 46.849878,51.59125 47.0409,38.714542 48.350738,26.229876 c 1.11142,-5.837962 2.881385,-11.490897 4.39465,-17.2129465 1.937267,-3.085368 5.382941,-0.6218635 7.231594,1.2691635 5.186982,4.319695 8.985235,7.417051 17.653931,9.950294 3.293497,1.07903 9.997601,-0.236709 16.57572,-0.740355 4.199929,-0.710036 0.604249,7.425955 0.04291,10.734192 -3.73461,12.685707 -8.036725,25.521965 -15.626082,36.156576 -4.328188,5.224574 -10.311499,9.782275 -17.02342,9.699234 -5.546431,-0.501615 -10.125515,-5.334011 -11.423994,-11.0893 -0.112139,-0.388485 -0.214989,-0.780093 -0.308948,-1.174192 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#b26609;fill-opacity:1"
+       id="path3360"
+       d="m 32.284061,70.407487 c -2.759145,-0.415691 -5.394752,-2.190353 -6.721609,-4.886489 1.469318,-1.770641 3.567577,0.023 5.283053,0.192208 4.001109,0.54867 7.740407,-2.304824 9.68946,-5.928316 1.263499,-1.31343 1.428131,-4.895464 3.625581,-4.370226 1.584829,0.951337 1.286187,3.140301 0.899048,4.73059 -0.250587,2.12042 -1.200676,4.026832 -2.45655,5.643411 -0.989353,1.437235 -1.97178,3.081838 -3.68293,3.557827 -2.188225,0.441569 -4.365682,1.563305 -6.636053,1.060942 z m -9.77586,-23.200663 c -2.109166,-1.350351 -4.6515,-2.180683 -6.146615,-4.422249 -0.333469,-2.550243 2.632718,-4.213169 4.605772,-3.217166 2.323494,0.78848 4.520721,2.231599 5.991123,4.36908 0.975981,1.923249 -0.718064,4.960125 -2.825862,3.969515 -0.558972,-0.183232 -1.079856,-0.474654 -1.624418,-0.69918 z m 13.452304,-4.721438 c -1.475178,-2.101283 -1.489007,-5.758978 0.803485,-7.200686 1.505659,-1.07884 3.666375,-1.820328 5.266706,-0.546998 0.840034,1.87761 -0.639422,3.598494 -1.306994,5.222969 -0.403344,1.640803 -1.395215,3.483338 -3.123774,3.64677 -0.695976,0.01858 -1.313921,-0.482674 -1.639423,-1.122055 z" />
+  </g>
+</svg>
diff --git a/navit/xpm/toggle_fullscreen.svg b/navit/icons/toggle_fullscreen.svg
index 0d64d21d1..0d64d21d1 100644
--- a/navit/xpm/toggle_fullscreen.svg
+++ b/navit/icons/toggle_fullscreen.svg
diff --git a/navit/icons/toilets.svg b/navit/icons/toilets.svg
new file mode 100644
index 000000000..aa4406144
--- /dev/null
+++ b/navit/icons/toilets.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="toilets.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective14" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ff00ff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.679774"
+     inkscape:cx="25.206251"
+     inkscape:cy="58.478581"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1057"
+     inkscape:window-height="639"
+     inkscape:window-x="0"
+     inkscape:window-y="67"
+     inkscape:window-maximized="0"
+     inkscape:snap-grids="false"
+     inkscape:snap-to-guides="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2396"
+       visible="true"
+       enabled="true"
+       empspacing="5"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:date>26.06.2008</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Jakub Klawiter</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>toilet</rdf:li>
+            <rdf:li>sign</rdf:li>
+            <rdf:li>man</rdf:li>
+            <rdf:li>woman</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-235,60.63782)">
+    <g
+       id="g8461"
+       transform="matrix(0.21213643,0,0,0.21213478,185.86258,-49.386587)">
+      <g
+         transform="translate(112.69607,34.331253)"
+         id="g8181">
+        <path
+           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff"
+           d="m 182.95898,-76.861328 c -3.99939,0.168844 -9.19155,0.236483 -12.1914,2.302734 -6.0632,-4.404736 -14.02273,-0.924724 -20.85742,-2.12171 -8.37155,0.715905 -17.16211,-1.220479 -25.35157,0.701788 -7.18877,3.543846 -4.63042,12.909284 -4.86718,19.144532 0.29787,19.307542 -1.03067,38.826722 0.73047,58.0078121 3.42535,7.3088359 12.69363,4.446354 19.00976,4.9003907 10.21135,-0.8230182 21.16016,2.054591 30.98242,-1.5195313 1.54083,-1.5492216 3.79454,2.1508166 6.14453,1.5664063 11.69673,-0.2945186 23.32962,0.2936528 35.03321,0.00781 5.26696,0.4632921 10.52797,-3.0222264 10.4707,-8.6523437 -0.7337,-22.9570381 1.05472,-46.1431451 -0.78516,-69.0253901 -3.29077,-7.489457 -12.73115,-4.630557 -19.06836,-5.06836 -6.4301,0.335039 -12.79789,-0.365469 -19.25,-0.24414 z"
+           id="rect3188-4"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc"
+         id="rect3188"
+         d="m 241.70927,-38.562308 34.52946,0 c 4.31621,0 5.75495,1.438728 5.75495,5.754912 l 0,63.304031 c 0,4.316183 -1.43874,5.754911 -5.75495,5.754911 l -34.52946,0 c -4.31616,0 -5.7549,-1.438728 -5.7549,-5.754911 l 0,-63.304031 c 0,-4.316184 1.43874,-5.754912 5.7549,-5.754912 z"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2400"
+         d="m 258.68626,-34.242439 c -3.01787,0 -5.46719,2.449294 -5.46719,5.467169 0,3.017875 2.44932,5.467168 5.46719,5.467168 3.01786,0 5.46718,-2.449293 5.46718,-5.467168 0,-3.017875 -2.44932,-5.467169 -5.46718,-5.467169 z m -8.63238,11.509827 c -2.87743,0 -4.31616,1.438728 -4.31616,4.316184 l 0,20.142193 c 0,1.4387278 4.31616,1.4387278 4.31616,0 l 0,-14.387282 c 0,-0.575491 1.43874,-0.575491 1.43874,0 l 0,43.161842 c 0,2.877456 7.19364,2.877456 7.19364,0 l 0,-27.3358322 c 0,-0.5754949 1.43873,-0.5754949 1.43873,0 l 0,27.3358322 c 0,2.877456 7.19364,2.877456 7.19364,0 l 0,-43.161842 c 0,-0.575491 1.43874,-0.575491 1.43874,0 l 0,14.387282 c 0,1.4387278 4.31617,1.4387278 4.31617,0 l 0,-20.142193 c 0,-2.877456 -2.87743,-4.316184 -5.75491,-4.316184 l -17.26475,0 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:nodetypes="cssscccccccccccccccccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccc"
+         id="rect3190"
+         d="m 290.62601,-38.562308 33.95402,0 c 4.31616,0 5.7549,1.438728 5.7549,5.754912 l 0,63.304031 c 0,4.316183 -1.43874,5.754911 -5.7549,5.754911 l -33.95402,0 c -4.31617,0 -5.75491,-1.438728 -5.75491,-5.754911 l 0,-63.304031 c 0,-4.316184 1.43874,-5.754912 5.75491,-5.754912 z"
+         style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2408"
+         d="m 307.89024,-34.28642 c -3.01787,0 -5.46718,2.449293 -5.46718,5.467168 0,3.017875 2.44931,5.467169 5.46718,5.467169 3.01786,0 5.46718,-2.449294 5.46718,-5.467169 0,-3.017875 -2.44932,-5.467168 -5.46718,-5.467168 z m -7.19364,11.222079 c -2.01422,0 -4.31616,1.438728 -4.31616,2.877456 l -5.75495,18.7034657 c -1.15097,2.8774556 4.60393,4.3161833 5.75495,1.72647524 L 300.6966,-15.870702 c 1.15097,0 1.43874,0.575495 1.43874,1.438733 l -7.19364,24.458372 5.7549,0 0,20.142193 c 0,2.877456 6.33039,2.877456 6.33039,0 l 0,-20.142193 c 0,-0.863233 1.7265,-0.863233 1.7265,0 l 0,20.142193 c 0,2.877456 6.33039,2.877456 6.33039,0 l 0,-20.142193 5.7549,0 -7.19364,-24.458372 c 0,-0.863238 0.28786,-1.438733 1.43874,-1.438733 l 4.31621,15.82601049 c 1.15097,2.87745551 6.90587,1.43872781 5.7549,-1.43872779 l -5.7549,-18.7034657 c 0,-1.438728 -2.30199,-2.877456 -4.31621,-2.877456 l -14.38728,0 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+         sodipodi:nodetypes="cssscccccccccccccccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/tomtom_minus.svg b/navit/icons/tomtom_minus.svg
new file mode 100644
index 000000000..9453d687d
--- /dev/null
+++ b/navit/icons/tomtom_minus.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="64px" height="64px" viewBox="-100 -100 200 200" xmlns="http://www.w3.org/2000/svg" version="1.1">
+<rect x="-110" y="-110" width="220" height="220" fill="#000080" stroke="none" opacity="0.5"/>
+<path fill="none" stroke="#ffffff" stroke-width="20" stroke-linecap="round" d="M 60 0 L -60 0"/>
+</svg>
diff --git a/navit/icons/tomtom_plus.svg b/navit/icons/tomtom_plus.svg
new file mode 100644
index 000000000..bdf74c4f4
--- /dev/null
+++ b/navit/icons/tomtom_plus.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="64px" height="64px" viewBox="-100 -100 200 200" xmlns="http://www.w3.org/2000/svg" version="1.1">
+<rect x="-110" y="-110" width="220" height="220" fill="#000080" stroke="none" opacity="0.5"/>
+<path fill="none" stroke="#ffffff" stroke-width="20" stroke-linecap="round" d="M 0 60 L 0 -60 M 60 0 L -60 0"/>
+</svg>
diff --git a/navit/icons/tower.svg b/navit/icons/tower.svg
new file mode 100644
index 000000000..737da9c82
--- /dev/null
+++ b/navit/icons/tower.svg
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   viewBox="0 0 100 100"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="tower.svg">
+  <title
+     id="title3338">tower</title>
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ff00ff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2"
+     inkscape:cx="-38.147512"
+     inkscape:cy="70.594566"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer2"
+     showgrid="false"
+     inkscape:window-width="1109"
+     inkscape:window-height="775"
+     inkscape:window-x="218"
+     inkscape:window-y="60"
+     inkscape:window-maximized="0"
+     units="px" />
+  <metadata
+     id="metadata7">
+    <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>tower</dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>jfitie@gmail.com</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="Layer 2"
+     style="display:inline"
+     transform="translate(0,80)">
+    <rect
+       style="display:inline;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3335-6-1"
+       width="17.971903"
+       height="77.364769"
+       x="39.82584"
+       y="-58.843311" />
+    <ellipse
+       style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
+       id="path4137-3-2"
+       cx="48.81179"
+       cy="-62.452667"
+       rx="15.072455"
+       ry="14.718902" />
+    <rect
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="rect3335-7"
+       width="9.9390745"
+       height="74.543053"
+       x="43.842255"
+       y="-59.535473" />
+    <circle
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="path4137-0"
+       cx="48.81179"
+       cy="-62.452667"
+       r="9.9390745" />
+  </g>
+</svg>
diff --git a/navit/icons/townhall.svg b/navit/icons/townhall.svg
new file mode 100644
index 000000000..2aaff669a
--- /dev/null
+++ b/navit/icons/townhall.svg
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="townhall.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="89.423501"
+     inkscape:cy="30.315431"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="660"
+     inkscape:window-maximized="0"
+     inkscape:window-width="955"
+     inkscape:window-x="25"
+     inkscape:window-y="25"
+     inkscape:zoom="2.8284271"
+     objecttolerance="10.0"
+     pagecolor="#ff00ff"
+     showgrid="false" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       id="perspective2441"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_x="0 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="60 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       id="symbol-university"
+       viewBox="244.5 110 489 219.9">
+      <path
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
+         id="path4460"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 94,176 73,215"
+         id="path4462"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
+      <path
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
+         id="path4464"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
+         id="path4466"
+         ill="none"
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_x="0 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="12 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4904"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-536.27327,44.693248)">
+    <rect
+       height="10"
+       id="rect4134"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="10"
+       x="1"
+       y="1" />
+    <rect
+       height="8"
+       id="rect4136"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="8"
+       x="2"
+       y="2" />
+  </g>
+  <g
+     id="g8488"
+     transform="matrix(0.22401036,0,0,0.22401084,0.9957527,-0.45221551)">
+    <g
+       transform="translate(-122.5,7)"
+       id="g8306">
+      <g
+         id="g8479">
+        <path
+           inkscape:connector-curvature="0"
+           id="path3198-0"
+           d="m 166.63672,-3.3496094 c -7.55245,4.14373865 -13.55641,11.1766725 -20.63753,16.2413204 -7.26018,6.542102 -15.96694,12.112802 -21.85466,19.813367 0.31041,5.356943 7.87669,2.967154 7.92774,9.117188 -0.62271,15.413051 -0.69877,31.086845 0.0332,46.578125 3.7471,5.081298 11.62447,2.513602 17.13281,2.822265 16.94753,-0.206235 34.23107,1.187592 50.98172,-0.731232 3.0768,-6.393323 2.01434,-14.549549 2.0925,-22.118377 0.10516,-10.170468 -0.2088,-20.798845 0.1543,-30.6875 5.16487,1.346018 9.06531,-5.125877 5.09179,-8.855469 C 193.91046,18.72785 181.65342,6.4747999 167.63281,-3.234375 c -0.32025,-0.1043577 -0.66093,-0.1357916 -0.99609,-0.1152344 z"
+           style="font-size:12px;fill:#ffffff;stroke:#ffffff;stroke-width:3.25114584;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           sodipodi:nodetypes="cccccccccccc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path7610-6"
+           d="m 158.11914,50.888672 c -6.49706,0.220043 -14.17842,-0.826557 -18.29687,5.376953 -3.47267,2.307623 -4.70985,9.212683 0.8164,9.441406 18.50863,-0.508414 37.34755,1.147935 55.66189,-0.853504 4.0568,-4.637173 -2.26222,-10.500553 -6.5115,-12.539074 -7.28448,-3.020584 -15.63168,-0.321783 -23.2946,-1.409964 -2.7916,-0.03755 -5.5836,-0.045 -8.37532,-0.01582 z"
+           style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.62557304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path7612-8"
+           d="m 190.59961,61.244141 c -17.37855,1.233119 -35.43916,-1.138453 -52.86133,1.09375 -2.73639,5.772815 -1.72595,13.185487 -1.28516,19.617187 0.0561,6.541773 8.43748,3.608924 12.70899,4.525391 15.49207,0.0375 31.23029,0.471117 46.56641,-0.462891 5.51695,-5.424367 1.47568,-13.727275 2.54882,-20.419922 -0.57728,-3.561917 -4.55162,-4.66061 -7.67773,-4.353515 z"
+           style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.62557304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path8263"
+           d="m 154.83008,18.404297 c -10.42248,-0.415024 -12.73587,16.640647 -3.02149,19.59375 8.75131,3.720631 16.54586,-8.207645 11.33985,-15.425781 -1.81192,-2.671801 -5.09815,-4.301701 -8.31836,-4.167969 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.22577433;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path8791-2-9"
+           d="m 156.60156,31.798828 c -5.32831,-0.07564 -12.69007,-0.739213 -15.03711,5.59961 -2.14474,5.128569 -0.4389,10.78985 -0.66797,16.138671 1.30724,5.79634 7.83899,2.010498 11.67774,2.488282 5.07183,-0.561752 12.36,1.868363 15.80273,-2.566407 0.58902,-7.026486 2.72112,-17.667561 -5.64257,-20.99414 -1.96331,-0.683335 -4.07528,-0.74475 -6.13282,-0.666016 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.22577433;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path8259"
+           d="m 179.02344,18.404297 c -10.42262,-0.420646 -12.73502,16.646418 -3.01953,19.59375 8.75746,3.717744 16.55052,-8.222318 11.33203,-15.439453 -1.81982,-2.659897 -5.0955,-4.287747 -8.3125,-4.154297 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.22577433;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path21180-2"
+           d="m 180.6543,31.820312 c -5.30229,-0.227034 -12.39284,-0.323778 -14.26758,5.958985 -1.5812,4.563863 -1.04779,9.543186 -0.94727,14.195312 3.47108,7.047722 12.61485,2.985956 18.64453,4.22461 3.71921,0.642121 9.5832,1.405144 9.45899,-3.904297 0.002,-6.401068 2.14992,-15.229705 -4.32813,-19.150391 -2.61783,-1.376354 -5.6788,-1.400714 -8.56054,-1.324219 z"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0.22577433;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+      </g>
+    </g>
+    <g
+       transform="matrix(0.15528597,0,0,0.17016909,-25.510075,11.012502)"
+       id="g4372" />
+    <path
+       inkscape:connector-curvature="0"
+       style="font-size:12px;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.20180178;stroke-opacity:1"
+       sodipodi:nodetypes="cccccccccccc"
+       id="path645"
+       d="M 44.9022,9.6481365 5.7609108,42.304849 l 7.8282062,0 0,52.388431 23.484828,0 16.193344,0 22.947998,0 0,-52.388431 7.828261,0 L 44.9022,9.6481365 l 0,0 0,0 z" />
+    <g
+       transform="matrix(0.15528597,0,0,0.17016909,0.34381936,2.1604288)"
+       id="g7376">
+      <path
+         inkscape:connector-curvature="0"
+         style="font-size:12px;fill:none;stroke:#734a08;stroke-width:20;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:nodetypes="cccccccccccc"
+         id="path3198"
+         d="M 286.94406,34.001595 34.884618,225.90902 l 50.411556,0 0,317.86099 151.236006,0 104.28079,0 147.77899,0 0,-317.86099 50.4119,0 -252.0598,-191.907425 0,0 0,0 z" />
+    </g>
+    <path
+       style="opacity:0.5;fill:#734a08;fill-opacity:1;stroke:#734a08;stroke-width:1.62557304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path7610"
+       d="m 25.20436,62.279642 39.948749,0 7.152052,6.76824 -54.329403,0 z" />
+    <path
+       style="opacity:0.5;fill:#734a08;fill-opacity:1;stroke:#734a08;stroke-width:1.62557304;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path7612"
+       d="m 18.061207,89.847032 54.235051,0 0.0091,-17.055431 -54.329411,0 z" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#734a08;fill-opacity:1;stroke:#734a08;stroke-width:0.22577433;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       sodipodi:nodetypes="cccscccsccccccccsccccccsccc"
+       inkscape:connector-curvature="0"
+       id="path8791-2"
+       d="m 32.847109,29.722502 c -1.484843,6.2e-5 -2.772566,0.585345 -3.872442,1.760186 -1.099776,1.174956 -1.654714,2.605465 -1.654766,4.291452 5.2e-5,1.68794 0.55499,3.121921 1.654766,4.296769 1.099876,1.174952 2.387599,1.760236 3.872442,1.76019 0.05475,0 0.110834,-0.0038 0.164992,-0.0054 0.05477,0.0017 0.109617,0.0054 0.164991,0.0054 1.484843,4.6e-5 2.777423,-0.585238 3.877295,-1.76019 1.099781,-1.174848 1.645011,-2.608829 1.645063,-4.296769 -4.9e-5,-1.685987 -0.545282,-3.116496 -1.64506,-4.291452 -1.099872,-1.174841 -2.392451,-1.760124 -3.877297,-1.760186 -0.05536,4e-6 -0.110239,-0.0015 -0.164992,0 -0.05414,-0.0014 -0.110259,0 -0.164991,0 z m -4.202425,13.464631 c -0.335854,8e-6 -0.63998,0.03682 -0.912305,0.117002 -0.17898,-0.01862 -0.358924,-0.02524 -0.538648,-0.02151 -1.232169,0.03269 -2.44454,0.620471 -3.295165,1.597896 -0.850624,0.977429 -1.329046,2.332375 -1.300329,3.682666 l 0.10191,12.039462 c -7e-6,0.0054 -7e-6,0.01117 0,0.01572 0.500205,-0.393499 1.02277,-0.752149 1.586829,-1.05291 6.156226,-0.198135 12.320847,-0.214478 18.488734,-0.19677 L 42.68353,48.467361 c 0.0039,-1.301935 -0.462265,-2.598743 -1.275281,-3.548294 -0.813017,-0.949556 -1.964352,-1.541761 -3.15038,-1.620449 -0.262136,-0.07273 -0.54894,-0.111666 -0.868631,-0.111666 z" />
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#734a08;fill-opacity:1;stroke:#734a08;stroke-width:0.22577433;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       sodipodi:nodetypes="cccscccsccccccccsccccccsccc"
+       inkscape:connector-curvature="0"
+       id="path21180"
+       d="m 57.371363,29.722502 c 1.484848,6.2e-5 2.772571,0.585345 3.872447,1.760186 1.099773,1.174956 1.654714,2.605465 1.654767,4.291452 -5.3e-5,1.68794 -0.554994,3.121921 -1.654767,4.296769 -1.099876,1.174952 -2.387599,1.760236 -3.872447,1.76019 -0.0547,0 -0.11088,-0.0038 -0.164996,-0.0054 -0.05474,0.0017 -0.109597,0.0054 -0.164995,0.0054 -1.48484,4.6e-5 -2.777416,-0.585238 -3.877292,-1.76019 -1.099778,-1.174848 -1.645004,-2.608829 -1.645062,-4.296769 5e-5,-1.685987 0.545284,-3.116496 1.645062,-4.291452 1.099876,-1.174841 2.392452,-1.760124 3.877292,-1.760186 0.05536,4e-6 0.110259,-0.0015 0.164995,0 0.05416,-0.0014 0.110301,0 0.164996,0 z m 4.202422,13.464631 c 0.335866,8e-6 0.639982,0.03682 0.912312,0.117002 0.178897,-0.01862 0.358911,-0.02524 0.538643,-0.02151 1.232171,0.03269 2.444541,0.620471 3.29517,1.597896 0.850621,0.977434 1.329038,2.332379 1.300329,3.68267 l -0.101902,12.039462 c 4e-6,0.0054 4e-6,0.01117 0,0.01572 -0.500204,-0.393499 -1.02277,-0.752145 -1.586828,-1.05291 -6.156225,-0.198135 -12.320845,-0.214478 -18.488733,-0.196729 l 0.09222,-10.901456 c -0.0039,-1.302071 0.462249,-2.598879 1.275261,-3.548435 0.813025,-0.94956 1.964353,-1.541761 3.150389,-1.620452 0.262098,-0.07273 0.548937,-0.111666 0.868631,-0.111666 z" />
+  </g>
+</svg>
diff --git a/navit/icons/traffic_signals.svg b/navit/icons/traffic_signals.svg
new file mode 100644
index 000000000..9d949a4e2
--- /dev/null
+++ b/navit/icons/traffic_signals.svg
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   viewBox="0 0 100 100"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   version="1.0"
+   sodipodi:docname="traffic_signals.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/jeff/navit/icons/png/traffic_signals.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#f4ca00"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.0000002"
+     inkscape:cx="64.367334"
+     inkscape:cy="41.598374"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1024"
+     inkscape:window-height="699"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2380"
+       visible="true"
+       enabled="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g3491"
+       transform="matrix(0.94965505,0,0,0.94965505,16.985221,-2.6781128)">
+      <g
+         transform="translate(104.9018,17.427669)"
+         id="g3482">
+        <path
+           style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m -47.103516,-86.582031 c -18.109432,0.957375 -36.781291,-0.35172 -54.937504,1.005859 -5.8096,5.202071 1.28098,12.075346 2.173832,17.802734 0.485227,6.920523 6.755308,14.240873 14.207032,11.251954 13.296223,-0.853455 27.094813,1.274402 40.079484,-1.601389 3.750763,-7.76608 7.487698,-16.243027 9.309188,-24.908377 -0.93202,-4.197457 -7.516907,-3.265482 -10.832032,-3.550781 z"
+           id="rect3158-6"
+           inkscape:connector-curvature="0" />
+        <path
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m -61.046875,-95.716797 c -9.410548,1.514022 -19.587262,-1.728964 -28.589844,1.849609 -7.923369,4.224624 -8.410298,14.148292 -7.378906,21.96875 0.433775,23.383188 -1.138298,46.959251 0.851563,70.2207036 3.286061,8.967064 14.22905,10.1919081 22.392578,8.6914063 9.226178,0.063023 22.468229,3.0794801 28.146484,-6.74609378 4.190237,-9.04301742 0.821039,-19.30601612 1.864832,-28.87302112 -0.397512,-19.32179 1.173234,-38.859655 -0.890223,-58.042995 -2.38559,-6.574326 -9.884384,-9.393549 -16.396484,-9.068359 z"
+           id="rect2386-0"
+           inkscape:connector-curvature="0" />
+        <use
+           x="0"
+           y="0"
+           xlink:href="#rect3158-6"
+           id="use3161-6"
+           transform="translate(0,24.906976)"
+           width="22"
+           height="22"
+           style="fill:#ffffff;stroke:#ffffff" />
+        <use
+           x="0"
+           y="0"
+           xlink:href="#use3161-6"
+           id="use3163-2"
+           transform="translate(0,25.623524)"
+           width="22"
+           height="22"
+           style="fill:#ffffff;stroke:#ffffff" />
+        <path
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m -70.507812,-87.517578 c -14.727009,-0.901596 -23.717815,19.788837 -13.050782,29.935547 8.989599,11.270127 29.912795,4.762082 30.900391,-9.650391 1.683712,-10.355793 -7.36127,-20.634626 -17.849609,-20.285156 z"
+           id="path3169-6"
+           inkscape:connector-curvature="0" />
+        <path
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m -70.507812,-59.830078 c -14.721537,-0.900802 -23.711355,19.771455 -13.0625,29.925781 8.988163,11.279853 29.921728,4.778935 30.912109,-9.640625 1.683239,-10.357013 -7.359399,-20.63489 -17.849609,-20.285156 z"
+           id="path3175-1"
+           inkscape:connector-curvature="0" />
+        <path
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m -70.507812,-32.142578 c -14.72733,-0.903768 -23.717664,19.787487 -13.050782,29.9335936 8.988269,11.2717326 29.910497,4.7624341 30.900391,-9.6484376 1.683124,-10.355849 -7.359493,-20.636866 -17.849609,-20.285156 z"
+           id="path3177-8"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         id="g3410">
+        <path
+           style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           d="m 4.901204,-64.146027 60.761027,-0.43178 -8.201603,21.574567 -44.79812,0.440297 -7.761304,-21.583084 z"
+           id="rect3158"
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0" />
+        <rect
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           id="rect2386"
+           width="45.350616"
+           height="94.663918"
+           x="12.606408"
+           y="-73.547798"
+           rx="9.9627905"
+           ry="9.9627905" />
+        <use
+           x="0"
+           y="0"
+           xlink:href="#rect3158"
+           id="use3161"
+           transform="translate(0,24.906976)"
+           width="22"
+           height="22" />
+        <use
+           x="0"
+           y="0"
+           xlink:href="#use3161"
+           id="use3163"
+           transform="translate(0,25.623524)"
+           width="22"
+           height="22" />
+        <circle
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f30000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           id="path3169"
+           cx="35.281719"
+           cy="-51.753082"
+           r="13.869364" />
+        <circle
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#f3ea00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           id="path3175"
+           cx="35.281719"
+           cy="-24.066198"
+           r="13.869364" />
+        <circle
+           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#47b400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
+           id="path3177"
+           cx="35.281719"
+           cy="3.6206872"
+           r="13.869364" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/navit/xpm/trailerpark.xpm b/navit/icons/trailerpark.xpm
index 6864ea8f4..6864ea8f4 100644
--- a/navit/xpm/trailerpark.xpm
+++ b/navit/icons/trailerpark.xpm
diff --git a/navit/icons/unknown.svg b/navit/icons/unknown.svg
new file mode 100644
index 000000000..0299629e9
--- /dev/null
+++ b/navit/icons/unknown.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.2"
+   width="22"
+   height="22"
+   id="svg3094"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="unknown.svg">
+  <sodipodi:namedview
+     pagecolor="#ff2aff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="4.3385901"
+     inkscape:cx="36.296208"
+     inkscape:cy="56.425428"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg3094" />
+  <defs
+     id="defs3096" />
+  <metadata
+     id="metadata3099">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.16560781"
+     d="M 12.305956,2.091083 C 9.975143,2.232789 7.37186,1.707702 5.323905,3.155242 3.084158,4.534757 1.816143,7.226655 2.13496,9.833894 c -0.07859,2.561541 -0.2989926,5.498092 1.534138,7.562241 1.614653,2.03148 4.357647,2.726984 6.849757,2.469879 2.420783,0.109541 5.16359,0.0769 7.030917,-1.712914 1.950905,-1.672056 2.526415,-4.390223 2.284878,-6.84908 C 19.948192,8.921877 19.87419,6.235782 18.120019,4.402153 16.68805,2.764682 14.446961,1.993193 12.305956,2.091083 Z"
+     id="rect3874-3"
+     inkscape:connector-curvature="0" />
+  <rect
+     style="opacity:0.72699998;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="rect3874"
+     y="2.6689682"
+     x="2.7735891"
+     height="16.409807"
+     width="16.382191"
+     ry="6.1455121" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:310px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffff00;fill-opacity:1;stroke:none"
+     id="path3986"
+     d="M 6.518286,8.665502 C 6.530626,7.878231 6.635548,7.187848 6.833046,6.59435 7.042883,6.000873 7.295925,5.540617 7.592173,5.213582 7.900758,4.874458 8.264892,4.601938 8.684574,4.396022 9.10425,4.19013 9.493071,4.056899 9.851038,3.996326 c 0.3703,-0.07266 0.759121,-0.108995 1.166463,-0.109008 1.357781,1.3e-5 2.462525,0.387597 3.314237,1.162752 0.864037,0.775179 1.29606,1.780474 1.296071,3.015887 -1.1e-5,0.763065 -0.154305,1.392888 -0.462883,1.889472 -0.308598,0.4966 -0.894915,1.041639 -1.758952,1.63512 -0.555466,0.38759 -0.901085,0.696446 -1.036856,0.926568 -0.135786,0.230133 -0.203676,0.64194 -0.203668,1.235425 l -2.295897,0 0,-0.254352 c -5e-6,-0.605596 0.104915,-1.132468 0.31476,-1.580616 0.222178,-0.46025 0.487564,-0.829666 0.796157,-1.108248 0.308582,-0.27857 0.61717,-0.538977 0.925765,-0.781224 C 12.214816,9.785869 12.474029,9.507294 12.683878,9.192374 12.906053,8.87747 13.017145,8.520167 13.017153,8.120461 13.017145,7.526984 12.831992,7.030392 12.461694,6.630686 12.091381,6.231001 11.628499,6.031152 11.073047,6.031142 10.492896,6.031152 10.005327,6.261281 9.610339,6.721526 9.227685,7.181792 9.036361,7.763167 9.036365,8.465653 l 0,0.163513 0,0.03633 -2.518079,0" />
+  <path
+     inkscape:connector-curvature="0"
+     style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:310px;line-height:125%;font-family:FreeSans;-inkscape-font-specification:'FreeSans Bold';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffff00;fill-opacity:1;stroke:none"
+     id="path3981"
+     d="m 12.461694,14.751782 0,2.652528 -2.777294,0 0,-2.652528 2.777294,0" />
+</svg>
diff --git a/navit/icons/viewpoint.svg b/navit/icons/viewpoint.svg
new file mode 100644
index 000000000..f110f94f6
--- /dev/null
+++ b/navit/icons/viewpoint.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="22"
+   height="22"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="viewpoint.svg">
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ff00ff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="863"
+     inkscape:window-height="754"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="3.6875"
+     inkscape:cx="23.319342"
+     inkscape:cy="37.716858"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs6" />
+  <path
+     style="fill:#ffffff;stroke:#ffffff;stroke-width:0.22201096"
+     d="M 10.500616,0.14643299 C 9.1447596,0.05429299 7.4333155,1.166495 8.0038133,2.695183 8.3721231,3.978462 8.9079679,5.532207 8.9578135,6.711918 7.8223681,4.657272 6.8700076,2.124987 4.6450777,1.006307 2.9515933,0.68562699 1.2108155,2.112457 0.77983244,3.702574 0.87032344,5.79764 3.126023,6.700495 4.5190489,7.869942 5.6906812,8.694241 7.3103973,9.988296 8.7644212,9.149312 9.530196,8.756584 9.1636367,7.191581 9.1421,7.144239 c 0.6682241,1.324371 2.749182,1.147927 3.510114,0.346032 -0.219322,1.078089 0.832486,2.011117 1.764814,1.826853 -1.134738,1.040504 -0.41601,2.866981 0.811728,3.490666 -0.92893,-0.525391 -2.445383,-0.238102 -2.471607,1.02335 0.0044,1.84717 1.371835,3.349112 2.2045,4.906444 0.855644,1.266628 2.274245,2.950689 3.976683,2.119115 1.320857,-0.635901 2.924534,-2.207068 1.986825,-3.756909 -1.098879,-1.558451 -2.996367,-2.563047 -4.378645,-3.630725 1.343781,0.334311 2.834536,0.881887 4.204331,0.483055 1.476992,-0.895775 1.157835,-2.940369 0.981269,-4.392167 -0.16076,-1.315645 -1.634481,-2.037013 -2.80939,-1.447867 -1.105871,0.2866 -2.179713,0.7557 -3.334066,0.808707 C 17.307372,7.820732 19.328771,6.996677 20.619892,5.361616 21.81867,3.670304 20.233691,1.49756 18.581033,0.84846799 16.957783,0.52513699 15.799916,2.211115 14.977326,3.363605 c -0.636398,0.764052 -1.403934,2.157104 -1.844232,2.625897 0.0087,-1.66023 1.724508,-3.542498 0.471773,-5.10374201 -0.803525,-0.810246 -2.061184,-0.703069 -3.104251,-0.739327 z M 2.1431184,7.985902 c -1.79111992,-0.03765 -2.16636069,2.121693 -1.99376235,3.503673 -0.1933571,1.479407 1.22837385,3.075459 2.76126115,2.444334 1.8109505,-0.472775 3.918339,-0.84759 5.2289646,-2.267849 C 8.7832043,10.297816 7.1101751,9.274959 5.9914525,9.014889 4.7511467,8.542877 3.4838491,8.050675 2.1431184,7.985902 Z M 8.0415848,12.73841 C 5.5104534,13.1902 3.3387279,14.827029 1.457573,16.484913 0.50117408,17.64353 1.0077515,19.274323 2.0165028,20.2093 c 0.8369965,1.124113 2.6954608,1.461141 3.5500068,0.155671 1.6211763,-1.765602 3.3049372,-3.730474 3.9025363,-6.09804 0.066714,-0.811859 -0.5800284,-1.594397 -1.4274611,-1.528521 z m 2.8228342,0.991695 c -1.8507922,0.623047 -1.9243481,2.943697 -2.5956198,4.469784 -0.5575965,1.268504 -0.3881604,3.326161 1.3216585,3.507145 1.4259113,0.295491 3.5821283,0.418631 4.2832503,-1.156039 0.518855,-1.872214 -0.736761,-3.647017 -1.213255,-5.397305 -0.276156,-0.749087 -0.918303,-1.530511 -1.796034,-1.423585 z"
+     id="path3335-6"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#0000ff"
+     d="m 2.5366678,19.241383 c -1.2170452,-1.466475 -0.9166297,-2.19009 1.5915292,-3.833528 5.0647285,-3.318597 5.939102,-2.197851 2.1391128,2.741854 -1.9083258,2.480679 -2.4470585,2.638325 -3.730642,1.091674 z m 6.7100008,-1.188579 c 0.9762774,-3.176134 1.5878954,-4.072821 2.2655144,-3.321445 0.257418,0.285437 0.855671,1.780087 1.329452,3.321445 0.707003,2.300102 0.384788,2.80247 -1.797483,2.80247 -2.1822704,0 -2.5044861,-0.502368 -1.7974834,-2.80247 z M 15.560986,17.80702 c -3.318538,-5.06482 -2.197812,-5.93921 2.741802,-2.139152 2.480636,1.908361 2.638278,2.447105 1.091656,3.730711 -1.46645,1.217066 -2.19005,0.916644 -3.833458,-1.591559 z M 1.0799997,10.89094 c 0,-2.182311 0.5023588,-2.504531 2.8024177,-1.797515 3.1760761,0.976293 4.0727477,1.587924 3.3213844,2.265555 -0.285432,0.257422 -1.7800546,0.855686 -3.3213844,1.329476 -2.3000589,0.707015 -2.8024177,0.384795 -2.8024177,-1.797516 z m 15.8803663,1.6325 C 14.713701,11.936313 13.88904,9.645399 15.924361,9.645399 c 0.629007,0 2.030215,-0.340214 3.113797,-0.756031 1.412355,-0.541981 1.970145,-0.01303 1.970145,1.868313 0,2.671716 -0.21776,2.766707 -4.047937,1.765759 z M 3.785516,6.114011 C 1.3048806,4.205652 1.1472366,3.666909 2.6938585,2.383302 4.1603089,1.166234 4.8839094,1.466655 6.5273181,3.97486 9.8458551,9.039681 8.7251298,9.914069 3.785516,6.114011 Z m 9.777369,1.35169 c 0.01523,-0.513786 1.031381,-2.238874 2.258109,-3.83353 1.908325,-2.48068 2.447058,-2.63832501 3.730641,-1.091675 1.217045,1.466476 0.91663,2.19009 -1.591529,3.833529 -3.41599,2.238283 -4.438743,2.492196 -4.397221,1.091676 z M 9.7986325,6.010644 c 0,-0.62902 -0.3402071,-2.030254 -0.756016,-3.113854 -0.5490958,-1.430947 -0.00125,-1.97018201 2.0015355,-1.97018201 2.002814,0 2.550631,0.53923501 2.001535,1.97018201 -0.415809,1.0836 -0.756016,2.484834 -0.756016,3.113854 0,0.629019 -0.560484,1.143671 -1.245519,1.143671 -0.685036,0 -1.2455195,-0.514652 -1.2455195,-1.143671 z"
+     id="path3335"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/navit/icons/wifi.svg b/navit/icons/wifi.svg
new file mode 100644
index 000000000..0712fe91f
--- /dev/null
+++ b/navit/icons/wifi.svg
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="22"
+   height="22"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="wifi.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective2451" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffff6a"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10000"
+     objecttolerance="10000"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.2068773"
+     inkscape:cx="88.953428"
+     inkscape:cy="54.165141"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:object-bbox="true"
+     inkscape:object-points="true"
+     inkscape:object-nodes="true"
+     inkscape:grid-points="true"
+     inkscape:guide-points="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     width="48px"
+     height="48px"
+     inkscape:window-maximized="1"
+     inkscape:snap-grids="false"
+     inkscape:snap-to-guides="true"
+     inkscape:pagecheckerboard="true" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,78)">
+    <g
+       id="g3519"
+       transform="matrix(0.21376017,0,0,0.21376017,2.3242187,-60.916306)">
+      <g
+         transform="translate(95.641022,-33.507806)"
+         id="g3509">
+        <path
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:2.44137859;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5;stroke-opacity:1"
+           d="m -65.666016,-31.679688 c -13.88467,5.039757 -18.611889,24.1731364 -11.521484,36.4941411 3.126495,4.6106101 7.986395,11.5612909 14.419922,9.8242189 4.404708,-3.469673 0.695444,-10.0555695 1.787109,-14.76562512 -0.467187,-10.02744888 0.722446,-20.51183888 -1.486328,-30.27148488 -0.765287,-0.937323 -2.022858,-1.32258 -3.199219,-1.28125 z"
+           id="path5112-7"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:2.44137859;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5;stroke-opacity:1"
+           d="m -42.853516,-31.447266 c -5.84596,2.014533 -2.3087,10.24703 -3.549022,15.155328 0.0068,9.7372969 -1.138014,19.8528514 0.430407,29.36323 4.303045,4.680376 10.271075,-1.651872 12.905181,-5.2227929 10.21135,-11.8646573 5.839874,-34.5938401 -9.786566,-39.2957651 z"
+           id="path5107-5"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:3.22261977;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5;stroke-opacity:1"
+           d="m -70.767578,-37.634766 c -19.655596,10.040308 -22.903765,40.7103509 -5.550781,54.515625 2.471947,3.305343 10.515095,7.328086 11.648437,1.083985 1.113725,-16.7601118 -0.735709,-33.479753 -0.205078,-50.197266 -0.398757,-2.766751 -2.555286,-6.645213 -5.892578,-5.402344 z"
+           id="path3437"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:3.22261977;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5;stroke-opacity:1"
+           d="m -38.539062,-37.603516 c -6.479843,1.044593 -2.874326,10.11526 -4.032371,14.601506 -0.06745,14.032212 -1.422931,28.4356331 0.153672,42.256039 4.131062,4.663813 10.010197,-1.381626 12.919714,-4.607545 15.146341,-14.367076 10.785131,-43.839257 -8.494141,-52.230468 -0.181478,-0.02043 -0.364448,-0.02477 -0.546874,-0.01953 z"
+           id="path3439"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:4.02320433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5;stroke-opacity:1"
+           d="m -73.037109,-44.396484 c -12.829148,5.086347 -20.628072,19.192001 -21.900391,32.55664 -1.700952,15.8645625 7.270248,33.020232 22.056641,39.455078 5.97184,1.335986 5.465944,-7.297914 5.173749,-11.303876 -1.157345,-19.5927704 0.308233,-39.418099 -1.804609,-58.930499 -0.649763,-1.276567 -2.162546,-1.833098 -3.52539,-1.777343 z"
+           id="path3443"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:4.02320433;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5;stroke-opacity:1"
+           d="m -34.582031,-43.796875 c -6.460083,0.838958 -3.08908,9.554881 -4.083709,14.038052 -0.463163,18.155386 -0.994353,36.3195455 -0.592072,54.481479 3.063174,5.819905 10.000033,0.39339 12.845703,-2.867187 19.1721811,-15.8304052 17.3131078,-49.297414 -3.078125,-63.339844 -1.432519,-1.202018 -3.133666,-2.380267 -5.091797,-2.3125 z"
+           id="path3445"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:3.81616664;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -52.953125,-10.785156 c -5.745429,0.110028 -5.452576,7.4048038 -4.640625,11.42187475 0.0063,17.75125025 -0.122467,35.64552525 -0.05859,53.45703125 3.976838,1.680534 8.943176,-1.045553 8.31836,-5.695312 -1.044412,-18.603485 0.09213,-37.34228 -0.31836,-56.0253911 0.576166,-3.3372089 -0.698345,-3.0234959 -3.300781,-3.1582029 z"
+           id="path5737-6"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff"
+           d="m -54.484375,-18.408203 c -12.627496,0.477109 -10.520734,21.5972395 1.964844,19.4511718 7.841059,-0.83120696 11.802462,-11.9260898 5.365234,-16.9628908 -1.977358,-1.797308 -4.677124,-2.654187 -7.330078,-2.488281 z"
+           id="path5739-2"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(2.0344821,0,0,2.0344821,-6.3328481,-77.496071)"
+         id="g3276">
+        <g
+           id="g5114"
+           transform="matrix(0.3751487,0,0,0.3751487,-107.75554,-142.5569)"
+           style="stroke:#000000;stroke-width:3.19873166;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+          <path
+             inkscape:connector-curvature="0"
+             id="path5112"
+             d="m 335.96898,451.5699 c -9.21494,-4.99381 -15.47717,-14.75085 -15.47717,-25.96163 1e-5,-10.85329 5.86922,-20.34408 14.60475,-25.46948"
+             style="fill:none;stroke:#000000;stroke-width:3.19873166;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5;stroke-opacity:1" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path5107"
+             d="m 365.4672,400.47806 c 8.42337,5.19804 14.04101,14.51208 14.04101,25.13021 l 10e-6,10e-6 c -10e-6,10.97562 -6.00228,20.55786 -14.90125,25.64113"
+             style="fill:none;stroke:#000000;stroke-width:3.19873166;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5;stroke-opacity:1" />
+        </g>
+        <use
+           x="0"
+           y="0"
+           xlink:href="#g5114"
+           id="use5733"
+           transform="matrix(1.32,0,0,1.32,-7.5348846,-5.5045785)"
+           width="744.09448"
+           height="1052.3622" />
+        <use
+           x="0"
+           y="0"
+           xlink:href="#g5114"
+           id="use5735"
+           transform="matrix(1.6479232,0,0,1.6479232,-15.256347,-11.145436)"
+           width="744.09448"
+           height="1052.3622" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#000000;stroke-width:1.87574351;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 23.731006,16.933363 0,30.011896"
+           id="path5737" />
+        <circle
+           r="7.5"
+           cy="429.86218"
+           cx="372.5"
+           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           id="path5739"
+           transform="matrix(0.3751487,0,0,0.3751487,-116.01189,-144.32888)" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/navit/icons/worship.svg b/navit/icons/worship.svg
new file mode 100644
index 000000000..11afc7d98
--- /dev/null
+++ b/navit/icons/worship.svg
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="22"
+   id="svg2"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="worship.svg"
+   sodipodi:version="0.32"
+   version="1.0"
+   width="22">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+        <dc:language>en</dc:language>
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10.0"
+     guidetolerance="10.0"
+     id="base"
+     inkscape:current-layer="svg2"
+     inkscape:cx="82.710284"
+     inkscape:cy="31.193279"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-height="700"
+     inkscape:window-maximized="0"
+     inkscape:window-width="915"
+     inkscape:window-x="50"
+     inkscape:window-y="50"
+     inkscape:zoom="3.6203868"
+     objecttolerance="10.0"
+     pagecolor="#ff00ff"
+     showgrid="false" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       id="perspective2441"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_x="0 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="60 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       id="symbol-university"
+       viewBox="244.5 110 489 219.9">
+      <path
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
+         id="path4460"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 94,176 73,215"
+         id="path4462"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
+      <path
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
+         id="path4464"
+         inkscape:connector-curvature="0" />
+      <path
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
+         id="path4466"
+         ill="none"
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_x="0 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="12 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2893"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3898"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4011"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-536.27327,44.693248)">
+    <rect
+       height="10"
+       id="rect4134"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="10"
+       x="1"
+       y="1" />
+    <rect
+       height="8"
+       id="rect4136"
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       width="8"
+       x="2"
+       y="2" />
+  </g>
+  <g
+     id="g3519"
+     transform="matrix(0.26019156,0,0,0.26019255,-0.07368931,-3.8475348)">
+    <g
+       id="g3500"
+       transform="translate(-69.605823,-5.8004852)">
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:19.9469471;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 121.9043,50.982422 c -4.61886,-0.08318 -5.49473,4.64403 -3.33628,8.215919 2.29921,5.123997 1.28481,13.090517 5.82329,16.388981 5.3074,0.270773 6.55004,-6.159768 4.29424,-9.95451 -2.91464,-4.302675 -1.06872,-10.807486 -5.02149,-14.291015 -0.54189,-0.273254 -1.15595,-0.383086 -1.75976,-0.359375 z"
+         id="path4817-7"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:8.76375294;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 86.841797,35.783203 c -3.975909,6.473842 4.289665,11.031173 7.580078,15.53125 3.400621,7.474876 12.881725,4.73149 19.013675,3.230469 3.85739,0.555106 11.29168,-0.631017 9.17773,-6.1875 -3.46644,-6.175946 -11.92234,-4.324289 -17.27791,-7.8452 -5.954858,-1.846195 -12.195118,-5.502641 -18.493573,-4.729019 z"
+         id="path5329-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:11.10254669;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 107.22656,91.083984 c -4.95262,2.204229 -0.704,9.827636 4.17188,8.302735 7.66891,-1.862648 15.92784,1.348571 23.27929,-1.660157 4.07342,-3.255342 -1.38236,-9.079548 -5.65601,-6.878567 -7.26505,0.07866 -14.53011,0.157326 -21.79516,0.235989 z"
+         id="path5331-3"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:12.12408829;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 128.08984,72.546875 c -7.77903,6.33219 -16.9604,11.435941 -23.85937,18.539063 0.40577,4.868767 6.78378,6.048421 9.63476,2.365234 5.15283,-5.688259 12.37982,-8.625659 17.92188,-13.751953 2.3993,-2.616928 0.0131,-8.442334 -3.69727,-7.152344 z"
+         id="path5333-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:12.12408829;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 112.52734,26.666016 c -8.10023,0.191362 -7.79152,14.134623 0.41407,13.738281 8.28085,1.030917 9.655,-13.029691 1.35742,-13.664063 -0.58494,-0.102927 -1.18062,-0.08853 -1.77149,-0.07422 z"
+         id="path5339-6"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:12.12408829;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 124.83008,71.753906 c -6.70927,6.698937 -15.00018,12.260264 -20.75391,19.646485 1.06987,4.910111 7.69398,4.936069 10.17774,1.078125 4.53017,-6.433312 12.68839,-9.554457 16.47851,-16.449219 0.97681,-3.225296 -3.2835,-5.623388 -5.90234,-4.275391 z"
+         id="path4057-2"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:8.76375294;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 86.992188,35.683594 c -4.229798,6.216826 3.79253,11.044245 7.199218,15.283203 3.591945,8.127618 13.345304,5.110514 20.105474,4.583984 3.87788,1.359961 10.81862,-0.998065 8.11523,-6.091797 -3.78664,-5.766061 -11.90751,-4.532742 -17.20899,-8.261718 -5.831294,-2.10866 -11.925589,-6.000453 -18.210932,-5.513672 z"
+         id="path4059-9"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#d53b3b;fill-opacity:1;stroke:#5e8019;stroke-width:19.9469471;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cc"
+       id="path4817"
+       d="M 51.066955,47.20516 56.10861,66.965367" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#5e8019;stroke-width:8.76375294;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ccc"
+       id="path5329"
+       d="M 49.692325,43.659168 30.31754,46.422817 18.964087,32.9044" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#5e8019;stroke-width:11.10254669;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cc"
+       id="path5331"
+       d="M 63.924514,88.634343 37.129507,88.924181" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#5e8019;stroke-width:12.12408829;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cc"
+       id="path5333"
+       d="M 60.332625,69.600951 37.274877,86.69232" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#5e8019;fill-opacity:1;stroke:#5e8019;stroke-width:12.12408829;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path5339"
+       d="m 42.806257,24.508469 c -2.535483,0.115025 -3.53372,3.771841 -1.436545,5.166513 1.910137,1.5755 5.072084,-0.333963 4.553262,-2.772273 -0.228992,-1.461448 -1.640483,-2.559233 -3.116717,-2.39424 z" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#5e8019;stroke-width:12.12408829;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="cc"
+       id="path4057"
+       d="M 58.111543,67.892431 37.274877,86.69232" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:none;stroke:#5e8019;stroke-width:8.76375294;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:nodetypes="ccc"
+       id="path4059"
+       d="M 49.692325,45.205546 30.31754,46.422817 18.964087,32.9044" />
+  </g>
+</svg>
diff --git a/navit/xpm/zipcode.svg b/navit/icons/zipcode.svg
index 1b16ebf04..1b16ebf04 100644
--- a/navit/xpm/zipcode.svg
+++ b/navit/icons/zipcode.svg
diff --git a/navit/icons/zoo.svg b/navit/icons/zoo.svg
new file mode 100644
index 000000000..73b0cbfd3
--- /dev/null
+++ b/navit/icons/zoo.svg
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="22"
+   height="22"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="zoo.svg">
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:description>jfitie@gmail.com</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ff3dff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="874"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="10.429825"
+     inkscape:cx="35.146017"
+     inkscape:cy="27.691799"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs6" />
+  <path
+     style="fill:#ffffff;stroke:#ffffff;stroke-width:0.07777303;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 9.3862449,2.9712792 C 7.6031713,3.114594 5.9487991,4.0126234 4.1665566,4.0721966 2.5037719,4.9223061 2.000941,6.9689898 1.6127257,8.6437203 1.3080715,10.335867 1.5628967,12.211022 1.9370338,13.773488 0.66748619,13.258437 -0.55293699,15.02055 0.35081056,16.049375 1.4306249,18.062501 4.8669449,17.280569 5.1497338,15.08707 5.3212764,13.884255 4.1561121,12.338849 5.3358124,11.442155 c 0.4048383,0.09045 1.0474319,-0.741101 0.9676076,-0.06722 0.028708,1.725505 -0.4552027,3.463657 -0.9611519,5.068625 -1.1175965,0.642583 -0.5375071,2.769823 0.8327957,2.44754 0.8461826,0.133004 2.1167568,-0.07892 2.161927,-1.153326 0.2813373,-0.902838 0.6322978,-2.111172 0.9919116,-2.784002 0.2302211,0.826067 0.5320327,1.678184 0.165192,2.489311 -0.1408565,0.94119 0.7940306,1.701048 1.6906546,1.450294 0.823908,0.163901 2.117978,-0.26663 1.838379,-1.326114 -0.230424,-1.459842 -0.238315,-2.976497 -0.02848,-4.461012 0.283291,0.198825 1.091365,-0.02609 0.803554,0.541912 -0.190606,1.222392 0.03507,2.513357 -0.584437,3.602383 -0.255469,0.938939 0.612347,1.890171 1.577488,1.650427 0.903915,0.178125 2.074825,-0.316359 1.95981,-1.392916 0.0831,-0.613262 0.195658,-1.84985 0.47288,-0.604989 -0.524028,0.971447 0.387506,2.333041 1.516729,2.009676 0.875214,0.154845 2.172369,-0.414378 1.793188,-1.489789 -0.181755,-1.118573 -0.556728,-2.4997 -0.486462,-3.469846 0.92395,0.781872 2.400336,-0.482185 1.756732,-1.531562 C 20.98629,10.345903 21.700646,7.8200123 20.299933,5.9147763 19.190443,3.7199798 16.54063,2.7945998 14.212059,3.2386184 12.73957,3.4575407 11.229367,3.3664209 9.7925803,2.9773504 9.6571261,2.9729503 9.521859,2.9649001 9.3862459,2.9712502 Z M 4.3864328,7.7672393 c -0.7735164,0.4573878 -0.8742661,0.3054369 0,0 z"
+     id="path3793-6"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;stroke:none;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 9.3798352,3.8728347 c -0.075634,0.002 -0.1534341,0.009 -0.2362804,0.015 C 8.8638026,3.9082054 8.6699218,3.938196 7.7483739,4.19538 7.6049493,4.2354008 7.3932143,4.3122442 7.245809,4.3679043 6.1121174,4.7959876 5.2155439,4.8319903 4.7067303,4.8517247 4.4127175,4.8631249 4.0989251,5.0483575 3.9228789,5.2455314 3.7233704,5.4689827 3.5392732,5.7757436 3.3978112,6.0406468 3.2900741,6.2423967 3.1208611,6.4575199 3.0452656,6.6519856 2.7555522,7.3972591 2.6772918,7.5188774 2.478942,8.320978 2.428707,8.5241219 2.320984,9.5004009 2.2726654,9.6936766 c -0.062865,0.2514619 -0.00475,0.8818154 -0.0075,1.1476664 -0.00983,0.948606 0.1402839,1.666577 0.3187912,2.355345 0.071326,0.281236 0.1228654,0.55238 0.2137777,0.82512 0.038737,0.116213 0.1566598,0.304963 0.1950252,0.420061 0.063818,0.191451 0.100991,0.510339 -0.052507,0.66384 -0.057146,0.05715 -0.2132273,0.225032 -0.3112898,0.225032 -0.1086627,0 -0.2007404,-0.0089 -0.3000391,-0.03375 -0.081625,-0.02041 -0.3796952,-0.210122 -0.4950653,-0.468819 -0.078424,-0.17585 -0.2061411,-0.18791 -0.3750484,-0.213774 -0.1831734,-0.02805 -0.52260226,0.229569 -0.56632343,0.307545 -0.17923914,0.319664 -0.0527679,0.604153 0.16127103,0.88137 0.3570951,0.462499 0.5486543,0.648131 1.0501359,0.750109 0.085513,0.01738 0.6012493,0.04255 0.6863389,0 0.1607184,-0.08035 0.4911865,-0.152169 0.641333,-0.247535 0.3573682,-0.226979 0.6179355,-0.370518 0.8138552,-0.761354 0.079222,-0.158042 0.094015,-0.395579 0.1200157,-0.577586 0.038606,-0.270254 -0.088361,-0.538469 -0.1200157,-0.795114 -0.048839,-0.395973 -0.1522952,-0.65742 -0.1800234,-0.982644 -0.013653,-0.160139 -0.047602,-0.637868 -0.045006,-0.806372 0.00358,-0.232207 0.078391,-0.485091 0.1200155,-0.600084 0.2361289,-0.566306 0.5015109,-0.823432 0.9826271,-0.993894 0.1086504,-0.0385 0.2439281,-0.0038 0.3225418,-0.05626 0.056045,-0.03736 0.2957287,-0.123209 0.3337935,-0.161273 0.038045,-0.03805 0.06964,-0.06723 0.1050133,-0.09376 0.055075,-0.04131 0.2143136,-0.184425 0.3000388,-0.258787 0.039375,-0.03415 0.4030875,-0.2879008 0.4838127,-0.247536 0.3434372,0.072391 0.2583196,0.239586 0.2887872,0.461316 0.065546,0.420339 0.1088219,0.971365 0.1162652,1.200175 0.00605,0.18585 0.026172,0.401633 -0.018753,0.581335 -0.053982,1.168587 -0.3128731,2.2709 -0.6225808,3.352988 -0.1178496,0.411757 -0.2558253,0.97262 -0.3037892,1.263927 -0.07687,0.466867 -0.4313325,0.23629 -0.5438207,0.600088 -0.081462,0.263462 -0.1252911,0.690461 0.1312672,0.761363 0.2030748,0.05612 1.0235097,0.06717 1.3726776,0.01874 0.1124147,-0.01559 0.2490244,0.02567 0.3300429,-0.105014 0.050813,-0.08196 0.4563308,-1.385674 0.5025647,-1.541468 0.3241146,-1.092158 0.4416364,-1.239204 0.6863391,-1.909032 0.2807323,-0.680391 0.7602769,-1.573621 0.8138552,-2.816656 0.056379,0.310518 0.1603929,1.081276 0.2775359,1.432709 0.1566959,0.470098 0.1858602,0.794961 0.3000388,1.320192 0.2143177,0.985872 0.6991727,2.578118 0.5250687,2.636627 -0.362539,0.121843 -0.238142,0.608849 -0.213778,0.802616 0.02481,0.19737 0.289751,0.191284 0.720093,0.191284 0.118448,0 0.916992,0.01896 1.08014,-0.04126 0.235713,-0.08698 0.135386,-0.303404 0.131267,-0.386299 -0.02034,-0.409382 4.84e-4,-0.165889 -0.08626,-0.697604 -0.04858,-0.297762 -0.12128,-1.335697 -0.108764,-1.980285 0.01584,-0.816025 0.06376,-1.239036 0.213777,-2.134068 0,-0.128586 0.0434,-0.449523 -0.138768,-0.888875 1.007273,0.396481 1.478227,0.556692 2.614088,0.663843 -0.08482,0.694205 -0.218029,1.474788 -0.277536,2.134067 -0.02544,0.281849 -0.07416,0.818459 -0.07126,1.357696 0.0035,0.653075 -0.06646,0.941416 -0.138768,0.952639 -0.338802,0.05257 -0.316356,0.440141 -0.228779,0.870126 0.03823,0.187709 0.671969,0.155531 0.866362,0.161267 0.226084,0.0067 0.734788,0.03145 0.922619,-0.09376 0.08722,-0.05815 0.118965,-0.310223 0.127517,-0.397557 0.20759,-1.477344 0.49941,-2.966315 0.922619,-4.189366 0.02265,0.102411 0.235884,0.964846 0.300039,1.136422 0.20729,0.55436 0.247833,0.891621 0.491314,1.380199 0.123365,0.247549 0.103612,0.180953 0.195025,0.375056 0.131989,0.280252 0.134331,0.387462 0.191275,0.472569 0.171481,0.256249 -0.116507,0.363819 -0.15002,0.58883 -0.07501,0.503651 0.08573,0.644563 0.22503,0.708857 0.191526,0.08839 0.705659,0.01845 1.031383,0 0.325726,-0.01845 0.334612,0.02771 0.457559,-0.03376 0.06579,-0.0329 0.08715,-0.11643 0.161271,-0.150023 -0.0056,-0.627365 -0.02062,-0.729382 -0.09376,-0.97514 -0.322419,-1.083313 -0.701574,-3.24509 -0.225029,-5.464541 0.03356,-0.156301 0.252012,-1.012475 0.266284,-1.984036 0.294953,1.263381 0.05925,2.374151 0.750097,3.825551 0.112863,0.263953 0.71975,-0.04366 0.716342,-0.24378 -0.0021,-0.122442 -0.18367,-0.475761 -0.255032,-0.686355 C 20.56416,11.452507 20.562274,10.54786 20.522527,9.3186254 20.506434,8.8208267 20.39361,8.1538148 20.106222,7.4133494 19.758491,6.517399 19.18903,5.7906219 18.61728,5.1705239 18.305734,4.8326313 17.808716,4.5229853 16.922061,4.2403889 16.1153,4.0183085 15.413051,4.0633814 14.285469,4.1128704 c -0.420014,0.01843 -1.222875,0.1752324 -1.939,0.1687753 -0.215971,-0.0019 -0.474539,-0.02079 -0.697591,-0.026251 -0.772838,-0.01894 -1.13453,-0.413011 -2.2690428,-0.3825564 z"
+     id="path3793"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccssssssssscsscscssssccsssssscsscssccccssssccsccssccscssscccssccccccssscscsscsscccsssscscsc" />
+</svg>
diff --git a/navit/xpm/zoom_in.svg b/navit/icons/zoom_in.svg
index 18ff2dac8..18ff2dac8 100644
--- a/navit/xpm/zoom_in.svg
+++ b/navit/icons/zoom_in.svg
diff --git a/navit/xpm/zoom_out.svg b/navit/icons/zoom_out.svg
index 1d794efd2..1d794efd2 100644
--- a/navit/xpm/zoom_out.svg
+++ b/navit/icons/zoom_out.svg
diff --git a/navit/item_def.h b/navit/item_def.h
index c679cbe76..231891d12 100644
--- a/navit/item_def.h
+++ b/navit/item_def.h
@@ -621,4 +621,11 @@ ITEM(poly_place5)
 ITEM(poly_place6)
 ITEM(poly_water_tiled)
 ITEM(poly_meadow)
+ITEM(poly_depot)
+ITEM(poly_garages)
+ITEM(poly_greenhouse)
+ITEM(poly_orchard)
+ITEM(poly_plantnursery)
+ITEM(poly_port)
+ITEM(poly_saltpond)
 ITEM2(0xffffffff,last)
diff --git a/navit/maptool/maptool.c b/navit/maptool/maptool.c
index 311b1f940..729eebfa0 100644
--- a/navit/maptool/maptool.c
+++ b/navit/maptool/maptool.c
@@ -552,7 +552,7 @@ start_phase(struct maptool_params *p, char *str)
 
 static void
 exit_with_error(char* error_message) {
-	fprintf(stderr, error_message);
+	fprintf(stderr, "%s", error_message);
 	exit(1);
 }
 
diff --git a/navit/maptool/osm.c b/navit/maptool/osm.c
index ac8dc3e89..8d6e863bd 100644
--- a/navit/maptool/osm.c
+++ b/navit/maptool/osm.c
@@ -34,6 +34,7 @@
 #include "file.h"
 #include "profile.h"
 #include "types.h"
+#include "transform.h"
 
 #ifndef M_PI
 #define M_PI       3.14159265358979323846
@@ -685,6 +686,13 @@ static char *attrmap={
 	"w	landuse=retail		poly_retail\n"
 	"w	landuse=village_green	poly_village_green\n"
 	"w	landuse=vineyard	poly_farm\n"
+	"w	landuse=depot		poly_depot\n"
+	"w	landuse=garages		poly_garages\n"
+	"w	landuse=greenhouse_horticulture	poly_greenhouse\n"
+	"w	landuse=orchard		poly_orchard\n"
+	"w	landuse=plant_nursery	poly_plantnursery\n"
+	"w	landuse=port		poly_port\n"
+	"w	landuse=salt_pond	poly_saltpond\n"
 	"w	leisure=common		poly_common\n"
 	"w	leisure=fishing		poly_fishing\n"
 	"w	leisure=garden		poly_garden\n"
@@ -878,26 +886,60 @@ build_countrytable(void)
 	}
 }
 
+static void
+osm_logv(char *prefix, char *objtype, osmid id, int cont, struct coord_geo *geo, char *fmt, va_list ap)
+{
+	char str[4096];
+	vsnprintf(str, sizeof(str), fmt, ap);
+	if(cont)
+		prefix="";
+	if(objtype)
+		fprintf(stderr,"%shttp://www.openstreetmap.org/%s/"OSMID_FMT" %s", prefix, objtype, id, str);
+	else if(geo)
+		fprintf(stderr,"%shttp://www.openstreetmap.org/#map=19/%.5f/%.5f %s",prefix, geo->lat, geo->lng, str);
+	else
+		fprintf(stderr,"%s[no osm object info] %s",prefix, str);
+}
+
 void
 osm_warning(char *type, osmid id, int cont, char *fmt, ...)
 {
-	char str[4096];
 	va_list ap;
 	va_start(ap, fmt);
-	vsnprintf(str, sizeof(str), fmt, ap);
+	osm_logv("OSM Warning:", type, id, cont, NULL, fmt, ap);
 	va_end(ap);
-	fprintf(stderr,"%shttp://www.openstreetmap.org/browse/%s/"OSMID_FMT" %s",cont ? "":"OSM Warning:",type,id,str);
 }
 
 void
 osm_info(char *type, osmid id, int cont, char *fmt, ...)
 {
-	char str[4096];
 	va_list ap;
 	va_start(ap, fmt);
-	vsnprintf(str, sizeof(str), fmt, ap);
+	osm_logv("OSM Info:", type, id, cont, NULL, fmt, ap);
+	va_end(ap);
+}
+
+void
+itembin_warning(struct item_bin *ib, int cont, char *fmt, ...)
+{
+	char *type=NULL;
+	osmid id;
+	struct coord_geo geo;
+	va_list ap;
+	if(0!=(id=item_bin_get_nodeid(ib))) {
+		type="node";
+	} else if(0!=(id=item_bin_get_wayid(ib))) {
+		type="way";
+	} else if(0!=(id=item_bin_get_relationid(ib))) {
+		type="relation";
+	} else {
+		struct coord *c=(struct coord *)(ib+1);
+		transform_to_geo(projection_mg, c, &geo);
+	}
+
+	va_start(ap, fmt);
+	osm_logv("OSM Warning:", type, id, cont, &geo, fmt, ap);
 	va_end(ap);
-	fprintf(stderr,"%shttp://www.openstreetmap.org/browse/%s/"OSMID_FMT" %s",cont ? "":"OSM Info:",type,id,str);
 }
 
 static void
@@ -1006,8 +1048,10 @@ osm_add_tag(char *k, char *v)
 		relation_add_tag(k,v);
 		return;
 	}
-	if (! strcmp(k,"ele"))
+	if (! strcmp(k,"ele")){
+		attr_strings_save(attr_string_label, v);
 		level=9;
+	}
 	if (! strcmp(k,"time"))
 		level=9;
 	if (! strcmp(k,"created_by"))
@@ -1704,7 +1748,7 @@ relation_add_tag(char *k, char *v)
 		if (!strcmp(v,"administrative") || !strcmp(v,"postal_code")) {
 			boundary=1;
 		}
-	} else if (!strcmp(k,"ISO3166-1")) {
+	} else if (!strcmp(k,"ISO3166-1") || !strcmp(k,"ISO3166-1:alpha2")) {
 		g_strlcpy(iso_code, v, sizeof(iso_code));
 	}
 	if (add_tag) {
@@ -1915,145 +1959,239 @@ osm_end_node(struct maptool_osm *osm)
 	attr_longest_match_clear();
 }
 
-static struct country_table *
+#define MAX_TOWN_ADMIN_LEVELS 11
+
+struct town_country {
+	/* attrs[0] is reserved for postal code */
+	/* attrs[1..] are for osm admin levels 3.. (admin_level=2 is always a country boundary)*/
+	struct attr attrs[MAX_TOWN_ADMIN_LEVELS];
+	struct country_table *country;
+};
+
+static struct town_country *
+town_country_new(struct country_table *country)
+{
+	struct town_country *ret=g_malloc0(sizeof(struct town_country));
+	ret->country=country;
+	return ret;
+}
+
+static void
+town_country_destroy(struct town_country *tc)
+{
+	g_free(tc);
+}
+
+/**
+ * Insert a new record into the list of town info structures, if there's no such entry.
+ *
+ * @param in/out town_country_list pointer to GList* of town_country structures.
+ * @param in country country to add the town to
+ * @returns refernce to then new town_country structure added to the list, or NULL if GList already had an entry for the country given
+ */
+static struct town_country *
+town_country_list_insert_if_new(GList **town_country_list, struct country_table *country)
+{
+	GList *l;
+	struct town_country *ret;
+
+	if(!country)
+		return NULL;
+
+	for(l=*town_country_list; l; l=g_list_next(l)) {
+		if(((struct town_country*)l->data)->country==country)
+			return NULL;
+	}
+
+	ret=town_country_new(country);
+	*town_country_list=g_list_prepend(*town_country_list, ret);
+	return ret;
+}
+
+static GList *
 osm_process_town_unknown_country(void)
 {
 	static struct country_table *unknown;
 	if (!unknown)
 		unknown=country_from_countryid(999);
 
-	return unknown;
+	return g_list_prepend(NULL, town_country_new(unknown));
 }
 
-static struct country_table *
-osm_process_town_by_is_in(struct item_bin *ib,char *is_in, struct attr *attrs, GHashTable *town_hash)
-{
-	struct country_table *result=NULL, *lookup;
-	char *tok,*dup=g_strdup(is_in),*buf=dup;
-	int conflict=0;
 
-	int find_town_name = 0;
+/**
+ * Get town name from district is_in attribute if possible.
+ *
+ * @param in ib pointer to item_bin structure holding district information
+ * @param in town_hash hash of all town names
+ * @returns refernce to a list of struct town_country* the town belongs to
+ */
+static char *
+osm_process_town_get_town_name_from_is_in(struct item_bin *ib, GHashTable *town_hash)
+{
+	char *is_in=item_bin_get_attr(ib, attr_osm_is_in, NULL);
+	char *tok,*dup,*buf;
+	char *town=NULL;
 
 	if(!is_in)
 		return NULL;
 
-	if (item_is_district(*ib))
-		find_town_name = 1;
-
-	while ((tok=strtok(buf, ",;"))) {
+	dup=g_strdup(is_in);
+	buf=dup;
+	while (!town && (tok=strtok(buf, ",;"))) {
 		while (*tok==' ')
 			tok++;
-		if (find_town_name && g_hash_table_lookup(town_hash, tok)) {
-			attrs[10].type = attr_town_name;
-			attrs[10].u.str = g_strdup(tok);
-			find_town_name = 0;
-		}
-		lookup=g_hash_table_lookup(country_table_hash,tok);
-		if (lookup) {
-			if (result && result->countryid != lookup->countryid) {
-				conflict=1;
-			}
-			result=lookup;
-		}
+		town=g_hash_table_lookup(town_hash, tok);
 		buf=NULL;
 	}
 	g_free(dup);
 
-	if(conflict) {
-		char *label=item_bin_get_attr(ib, attr_town_name, NULL);
-		osm_warning("node",item_bin_get_nodeid(ib),0,"Country conflict for %s is_in=%s, choosen country %d (%s)\n", label, is_in, result->countryid, result->names);
+	return town;
+}
+
+
+/**
+ * Find list of countries which town or district belongs to.
+ * @param in ib pointer to item_bin structure holding town information
+ * @returns refernce to a list of struct town_country* the town belongs to
+ */
+static GList *
+osm_process_town_by_is_in(struct item_bin *ib)
+{
+	struct country_table *country;
+	char *is_in=item_bin_get_attr(ib, attr_osm_is_in, NULL);
+	char *tok,*dup,*buf;
+	GList *town_country_list=NULL;
+
+	if(!is_in)
+		return NULL;
+
+	dup=g_strdup(is_in);
+	buf=dup;
+	while ((tok=strtok(buf, ",;"))) {
+		while (*tok==' ')
+			tok++;
+		country=g_hash_table_lookup(country_table_hash,tok);
+		town_country_list_insert_if_new(&town_country_list, country);
+		buf=NULL;
 	}
 
-	return result;
+	g_free(dup);
+
+	return town_country_list;
 }
 
-static struct country_table *
-osm_process_town_by_boundary(GList *bl, struct item_bin *ib, struct coord *c, struct attr *attrs)
+/**
+ * Update town attributes based on its administrative parents.
+ *
+ * @param in town town initial item_bin data
+ * @param in/out tc town_country structure holding country information and town attributes to add to town item_bin
+ * @param in matches list of administrative boundaries the town belongs to (data is struct boundary *)
+ * @returns nothing
+ */
+static void
+osm_process_town_by_boundary_update_attrs(struct item_bin *town, struct town_country *tc, GList *matches)
 {
-	GList *l,*matches=boundary_find_matches(bl, c);
-	struct boundary *match=NULL;
+	long long *nodeid;
+	long long node_id=0;
+	int max_possible_adm_level=-1;
+	int max_adm_level=0;
+	GList *l;
+	int a;
+
+	if(tc->country->admin_levels)
+		max_possible_adm_level=strlen(tc->country->admin_levels)+3;
 	
-	l=matches;
-	while (l) {
+	nodeid=item_bin_get_attr(town, attr_osm_nodeid, NULL);
+	if(nodeid)
+		node_id=*nodeid;
+
+	for(l=matches;l;l=g_list_next(l)) {
 		struct boundary *b=l->data;
-		if (b->country) {
-			if (match && match->country->countryid!=b->country->countryid) {
-				osm_warning("node",item_bin_get_nodeid(ib),0,"node (0x%x,0x%x) country conflict: ", c->x, c->y);
-				osm_warning("relation",boundary_relid(match),1,"replacing country %d (%s) with ",match->country->countryid, match->country->names);
-				osm_warning("relation",boundary_relid(b),1,"country %d (%s)\n",b->country->countryid, b->country->names);
+		char *boundary_admin_level_string;
+		char *name;
+		char *postal=osm_tag_value(b->ib, "postal_code");
+
+		if (postal) {
+			tc->attrs[0].type=attr_town_postal;
+			tc->attrs[0].u.str=postal;
+		}
+
+		if(max_possible_adm_level==-1)
+			continue;
+
+		boundary_admin_level_string=osm_tag_value(b->ib, "admin_level");
+
+		if (!boundary_admin_level_string)
+			continue;
+
+		a=atoi(boundary_admin_level_string);
+		if (a > 2 && a < max_possible_adm_level) {
+			enum attr_type attr_type=attr_none;
+			switch(tc->country->admin_levels[a-3]) {
+			case 's':
+				attr_type=attr_state_name;
+				break;
+			case 'c':
+				attr_type=attr_county_name;
+				break;
+			case 'M':
+				/* Here we patch the boundary itself to convert it to town polygon later*/
+				b->ib->type=type_poly_place6;
+			case 'm':
+				attr_type=attr_municipality_name;
+				break;
+			case 'T':
+				/* Here we patch the boundary itself to convert it to town polygon later*/
+				b->ib->type=type_poly_place6;
+				break;
+			}
+			name=osm_tag_value(b->ib, "name");
+			if (name && attr_type != attr_none) {
+				tc->attrs[a-2].type=attr_type;
+				tc->attrs[a-2].u.str=name;
+			}
+		}
+		if(b->admin_centre && b->admin_centre==node_id) {
+			if(!max_adm_level || max_adm_level<a) {
+				max_adm_level=a;
 			}
-			match=b;
 		}
-		l=g_list_next(l);
 	}
 
-	if (match) {
-		if (match && match->country && match->country->admin_levels) {
-			long long *nodeid=item_bin_get_attr(ib, attr_osm_nodeid, NULL);
-			long long node_id=0;
-			int end=strlen(match->country->admin_levels)+3;
-			int a;
-			int max_adm_level=0;
-
-			if(nodeid)
-				node_id=*nodeid;
-
-			l=matches;
-			while (l) {
-				struct boundary *b=l->data;
-				char *boundary_admin_level_string=osm_tag_value(b->ib, "admin_level");
-				char *postal=osm_tag_value(b->ib, "postal_code");
-				if (boundary_admin_level_string) {
-					char *name;
-					a=atoi(boundary_admin_level_string);
-					if (a > 2 && a < end) {
-						enum attr_type attr_type=attr_none;
-						switch(match->country->admin_levels[a-3]) {
-						case 's':
-							attr_type=attr_state_name;
-							break;
-						case 'c':
-							attr_type=attr_county_name;
-							break;
-						case 'M':
-							b->ib->type=type_poly_place6;
-						case 'm':
-							attr_type=attr_municipality_name;
-							break;
-						case 'T':
-							b->ib->type=type_poly_place6;
-							break;
-						}
-						name=osm_tag_value(b->ib, "name");
-						if (name && attr_type != attr_none) {
-							attrs[a-2].type=attr_type;
-							attrs[a-2].u.str=name;
-						}
-					}
-					if(b->admin_centre && b->admin_centre==node_id) {
-						if(!max_adm_level || max_adm_level<a){
-							max_adm_level=a;
-						}
-					}
-				}
-				if (postal) {
-					attrs[0].type=attr_town_postal;
-					attrs[0].u.str=postal;
-				}
-				l=g_list_next(l);
-			}
+	/* Administrative centres are not to be contained in their own districts. */
+	if(max_adm_level>0)
+		for(a=max_possible_adm_level-1;a>max_adm_level && a>2;a--)
+			tc->attrs[a-2].type=type_none;
+}
 
-			/* Administrative centres are not to be contained in their own districts. */
-			if(max_adm_level>0)
-				for(a=end-1;a>max_adm_level && a>2;a--)
-					attrs[a-2].type=type_none;
+/**
+ * Find country which town belongs to. Find town administrative hierarchy attributes.
+ *
+ * @param in bl list of administrative boundaries (data is struct boundary *)
+ * @param in town item_bin structure holding town information
+ * @param in c town center coordinates
+ * @returns refernce to the list of town_country structures
+ */
+static GList *
+osm_process_town_by_boundary(GList *bl, struct item_bin *town, struct coord *c)
+{
+	GList *matches=boundary_find_matches(bl, c);
+	GList *town_country_list=NULL;
+	GList *l;
+
+	for (l=matches;l;l=g_list_next(l)) {
+		struct boundary *match=l->data;
+		if (match->country) {
+			struct town_country *tc=town_country_list_insert_if_new(&town_country_list, match->country);
+			if(tc)
+				osm_process_town_by_boundary_update_attrs(town, tc, matches);
 		}
-		g_list_free(matches);	
-		return match->country; 
-	} else {
-		g_list_free(matches);	
-		return NULL;
 	}
+
+	g_list_free(matches);
+
+	return town_country_list;
 }
 
 static void 
@@ -2092,7 +2230,6 @@ osm_process_towns(FILE *in, FILE *boundaries, FILE *ways, char *suffix)
 	struct item_bin *ib;
 	GList *bl;
 	GHashTable *town_hash;
-	struct attr attrs[11];
 	FILE *towns_poly;
 
 	processed_nodes=processed_nodes_out=processed_ways=processed_relations=processed_tiles=0;
@@ -2108,7 +2245,8 @@ osm_process_towns(FILE *in, FILE *boundaries, FILE *ways, char *suffix)
 		if (!item_is_district(*ib))
 		{
 			char *townname=item_bin_get_attr(ib, attr_town_name, NULL);
-			g_hash_table_insert(town_hash, strdup(townname), (gpointer)1);
+			char *dup=strdup(townname);
+			g_hash_table_replace(town_hash, dup, dup);
 		}
 	}
 	fseek(in, 0, SEEK_SET);
@@ -2117,63 +2255,95 @@ osm_process_towns(FILE *in, FILE *boundaries, FILE *ways, char *suffix)
 
 	while ((ib=read_item(in)))  {
 		struct coord *c=(struct coord *)(ib+1);
-		struct country_table *result=NULL;
-		char *is_in=item_bin_get_attr(ib, attr_osm_is_in, NULL);
-		int i;
-		
+		GList *tc_list, *l;
+		struct item_bin *ib_copy=NULL;
+
 		processed_nodes++;
 
-		memset(attrs, 0, sizeof(attrs));
-		result=osm_process_town_by_boundary(bl, ib, c, attrs);
-		if (!result)
-			result=osm_process_town_by_is_in(ib, is_in, attrs, town_hash);
-		else if (item_is_district(*ib)) // just for the town name
-			osm_process_town_by_is_in(ib, is_in, attrs, town_hash);
+		tc_list=osm_process_town_by_boundary(bl, ib, c);
+		if (!tc_list)
+			tc_list=osm_process_town_by_is_in(ib);
+
+		if (!tc_list && unknown_country)
+			tc_list=osm_process_town_unknown_country();
+
+		if (!tc_list) {
+			itembin_warning(ib, 0, "Lost town %s %s\n", item_bin_get_attr(ib, attr_town_name, NULL), item_bin_get_attr(ib, attr_district_name, NULL));
+		}
+
+		if(tc_list && g_list_next(tc_list))
+			ib_copy=item_bin_dup(ib);
+
+		l=tc_list;
+		while(l) {
+			struct town_country *tc=l->data;
+			char *is_in;
+			long long *nodeid;
+			char *town_name=NULL;
+			int i;
 
-		// treat a district like a town, if we could not find the town it belongs to
-		if (!item_bin_get_attr(ib, attr_town_name, NULL) && attrs[10].type != attr_town_name) {
-			char *district_name = item_bin_get_attr(ib, attr_district_name, NULL);
+			if (!tc->country->file) {
+				char *name=g_strdup_printf("country_%d.unsorted.tmp", tc->country->countryid);
+				tc->country->file=fopen(name,"wb");
+				g_free(name);
+			}
 
-			if (district_name) {
+			if (item_is_district(*ib) && NULL!=(town_name=osm_process_town_get_town_name_from_is_in(ib, town_hash))) {
 				struct attr attr_new_town_name;
 				attr_new_town_name.type = attr_town_name;
-				attr_new_town_name.u.str = district_name;
-
+				attr_new_town_name.u.str = town_name;
 				item_bin_add_attr(ib, &attr_new_town_name);
-				item_bin_remove_attr(ib, district_name);
 			}
-		}
 
-		if (!result && unknown_country)
-			result=osm_process_town_unknown_country();
-		if (result) {
-			if (!result->file) {
-				char *name=g_strdup_printf("country_%d.unsorted.tmp", result->countryid);
-				result->file=fopen(name,"wb");
-				g_free(name);
-			}
-			if (result->file) {
-				long long *nodeid;
-				if (is_in)
-					item_bin_remove_attr(ib, is_in);
-				nodeid=item_bin_get_attr(ib, attr_osm_nodeid, NULL);
-				if (nodeid)
-					item_bin_remove_attr(ib, nodeid);
-				if (attrs[0].type != attr_none) {
-					char *postal=item_bin_get_attr(ib, attr_town_postal, NULL);
-					if (postal)
-						item_bin_remove_attr(ib, postal);
-				}
-				for (i = 0 ; i < 11 ; i++) {
-					if (attrs[i].type != attr_none)
-						item_bin_add_attr(ib, &attrs[i]);
+			if ((is_in=item_bin_get_attr(ib, attr_osm_is_in, NULL))!=NULL)
+				item_bin_remove_attr(ib, is_in);
+
+			nodeid=item_bin_get_attr(ib, attr_osm_nodeid, NULL);
+
+			if (nodeid)
+				item_bin_remove_attr(ib, nodeid);
+
+			/* Treat district like a town, if we did not find the town it belongs to */
+			if (!item_bin_get_attr(ib, attr_town_name, NULL)) {
+				char *district_name = item_bin_get_attr(ib, attr_district_name, NULL);
+
+				if (district_name) {
+					struct attr attr_new_town_name;
+					attr_new_town_name.type = attr_town_name;
+					attr_new_town_name.u.str = district_name;
+
+					item_bin_add_attr(ib, &attr_new_town_name);
+					item_bin_remove_attr(ib, district_name);
 				}
-				if(item_bin_get_attr(ib, attr_district_name, NULL))
-					item_bin_write_match(ib, attr_district_name, attr_district_name_match, 5, result->file);
-				else
-					item_bin_write_match(ib, attr_town_name, attr_town_name_match, 5, result->file);
 			}
+
+			/* FIXME: preserved from old code, but we'll have to reconsider if we really should drop attribute
+			 * explicitely set on the town osm node and use an attribute derived from one of its surrounding boundaries. Thus we would
+			 * use town central district' postal code instead of town one. */
+			if (tc->attrs[0].type != attr_none) {
+				char *postal=item_bin_get_attr(ib, attr_town_postal, NULL);
+				if (postal)
+					item_bin_remove_attr(ib, postal);
+			}
+
+			for (i = 0 ; i < MAX_TOWN_ADMIN_LEVELS ; i++) {
+				if (tc->attrs[i].type != attr_none)
+					item_bin_add_attr(ib, &tc->attrs[i]);
+			}
+
+			if(item_bin_get_attr(ib, attr_district_name, NULL))
+				item_bin_write_match(ib, attr_district_name, attr_district_name_match, 5, tc->country->file);
+			else
+				item_bin_write_match(ib, attr_town_name, attr_town_name_match, 5, tc->country->file);
+
+			town_country_destroy(tc);
+			processed_nodes_out++;
+			l=g_list_next(l);
+			if(l!=NULL)
+				memcpy(ib, ib_copy, (ib_copy->len+1)*4);
 		}
+		g_free(ib_copy);
+		g_list_free(tc_list);
 	}
 
 	towns_poly=tempfile(suffix,"towns_poly",1);
diff --git a/navit/navit.c b/navit/navit.c
index 42fb74dab..fa2db9926 100644
--- a/navit/navit.c
+++ b/navit/navit.c
@@ -2596,7 +2596,7 @@ navit_set_attr_do(struct navit *this_, struct attr *attr, int init)
 	case attr_pitch:
 		attr_updated=(this_->pitch != attr->u.num);
 		this_->pitch=attr->u.num;
-		transform_set_pitch(this_->trans, this_->pitch);
+		transform_set_pitch(this_->trans, round(this_->pitch*sqrt(240*320)/sqrt(this_->w*this_->h))); // Pitch corrected for window resolution
 		if (!init && attr_updated && this_->ready == 3)
 			navit_draw(this_);
 		break;
@@ -2836,7 +2836,7 @@ navit_get_attr(struct navit *this_, enum attr_type type, struct attr *attr, stru
 		attr->u.num=this_->osd_configuration;
 		break;
 	case attr_pitch:
-		attr->u.num=transform_get_pitch(this_->trans);
+		attr->u.num=round(transform_get_pitch(this_->trans)*sqrt(this_->w*this_->h)/sqrt(240*320)); // Pitch corrected for window resolution
 		break;
 	case attr_projection:
 		if(this_->trans) {
diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml
index d3785c645..680308df0 100644
--- a/navit/navit_shipped.xml
+++ b/navit/navit_shipped.xml
@@ -19,8 +19,6 @@
 	<debug name="global" dbg_level="error"/>
 	<!-- Example of setting the debug level for a single function.  -->
 	<debug name="navit:do_draw" dbg_level="error"/>
-	<!-- This is here so one can copy&paste the contents of popup menus --> 
-	<debug name="navit:popup_printf_cb" dbg_level="debug"/>
 	<!-- Example for logging timing/profiling information. Note the prefix "profile:".
 	<debug name="profile:navit:do_draw" dbg_level="debug"/>
 	-->
@@ -97,6 +95,7 @@ Navigation</text></img>
 				<img src='gui_tools' onclick='network_info()'><text>Network info</text></img>
 			</a>
 			<a name='Route'><text>Route</text>
+				<img cond='navit.route.route_status&amp;1' src='gui_zoom_route' onclick='navit.zoom_to_route();redraw_map();back_to_map()'><text>Zoom to route</text></img>
 				<img src='gui_actions' onclick='route_description()'><text>Description</text></img>
 				<img src='gui_heightprofile' onclick='route_height_profile()'><text>Height Profile</text></img>
 				<img cond='navit.waypoints_flag &amp;&amp; (navit.route.route_status&amp;1)' src='cursor_still' onclick='waypoints()'><text>Waypoints</text></img>
@@ -185,7 +184,7 @@ Waypoint</text></img>
 		<vehicle name="Local GPS" profilename="car" enabled="yes" active="1" source="gpsd://localhost" gpsd_query="w+xj">
 		<!-- Vehicle with GPS enabled for direct communication on windows. Remove the line above if you use this. -->
 		<!-- <vehicle name="Local GPS" profilename="car" follow="1" enabled="yes" active="1" 
-				source="serial:COM4 baud=4800 parity=N data=8 stop=1" > -->
+				source="serial:COM4 baudrate=4800 parity=N data=8 stop=1" > -->
 
 			<!-- Navit can write a tracklog in several formats (gpx, nmea or textfile): -->
 			<log enabled="no" type="gpx" attr_types="position_time_iso8601,position_direction,position_speed,profilename,position_radius" data="track_%Y%m%d-%%i.gpx" flush_size="1000" flush_time="30"/>
@@ -423,23 +422,69 @@ Waypoint</text></img>
 
 		<layout name="Car" nightlayout="Car-dark" color="#ffefb7" font="Liberation Sans">
 
-			<cursor w="26" h="26">
-				<itemgra>
-					<circle color="#0000ff" radius="24" width="2">
-						<coord x="0" y="0"/>
-					</circle>
-				</itemgra>
+			<cursor w="57" h="57">
 				<itemgra speed_range="-2">
-					<polyline color="#0000ff" width="2">
-						<coord x="0" y="0"/>
-						<coord x="0" y="0"/>
+					<polyline color="#00BC00" radius="0" width="4">
+						<coord x="0" y="0" />
 					</polyline>
+					<circle color="#008500" radius="9" width="3">
+						<coord x="0" y="0" />
+					</circle>
+					<circle color="#00BC00" radius="13" width="3">
+						<coord x="0" y="0" />
+					</circle>
+					<circle color="#008500" radius="18" width="3">
+						<coord x="0" y="0" />
+					</circle>
 				</itemgra>
 				<itemgra speed_range="3-">
-					<polyline color="#0000ff" width="2">
-						<coord x="-7" y="-10"/>
-						<coord x="0" y="12"/>
-						<coord x="7" y="-10"/>
+					<polygon color="#008500">
+						<coord x="-21" y="-18" />
+						<coord x="0" y="21" />
+						<coord x="0" y="-3" />
+						<coord x="-21" y="-18" />
+					</polygon>
+					<polygon color="#00BC00">
+						<coord x="21" y="-18" />
+						<coord x="0" y="21" />
+						<coord x="0" y="-3" />
+						<coord x="21" y="-18" />
+					</polygon>
+					<polygon color="#009C00">
+						<coord x="-21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="-21" y="-18" />
+					</polygon>
+					<polygon color="#006500">
+						<coord x="21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="21" y="-18" />
+					</polygon>
+					<polyline color="#008500" width="1">
+						<coord x="-21" y="-18" />
+						<coord x="0" y="21" />
+						<coord x="0" y="-3" />
+						<coord x="-21" y="-18" />
+					</polyline>
+					<polyline color="#008500" width="1">
+						<coord x="21" y="-18" />
+						<coord x="0" y="21" />
+						<coord x="0" y="-3" />
+						<coord x="21" y="-18" />
+					</polyline>
+					<polyline color="#008500" width="1">
+						<coord x="-21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="-21" y="-18" />
+					</polyline>
+					<polyline color="#008500" width="1">
+						<coord x="21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="21" y="-18" />
 					</polyline>
 				</itemgra>
 			</cursor>
@@ -448,57 +493,194 @@ Waypoint</text></img>
 				<itemgra item_types="image" order="0-">
 					<image/>
 				</itemgra>
-				<itemgra item_types="poly_nature_reserve" order="10-"><polygon color="#cedec6"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_glacier" order="10-"><polygon color="#ddecec"/><text text_size="5"/></itemgra>
+				<itemgra item_types="poly_nature_reserve" order="10-">
+					<polygon color="#cedec6"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_glacier" order="10-">
+					<polygon color="#ddecec"/>
+					<text text_size="5"/>
+				</itemgra>
 				<itemgra item_types="poly_town" order="0-">
 					<polygon color="#ffc895"/>
 					<polyline color="#ebb481"/>
 				</itemgra>
-				<itemgra item_types="poly_naval_base" order="10-"><polygon color="#6a9993"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_airfield" order="10-"><polygon color="#ecd3cf"/><text text_size="5"/></itemgra>
+				<itemgra item_types="poly_naval_base" order="10-">
+					<polygon color="#6a9993"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_airfield" order="10-">
+					<polygon color="#ecd3cf"/>
+					<text text_size="5"/>
+				</itemgra>
 				<itemgra item_types="poly_university" order="8-">
 					<polygon color="#d68fb8"/>
 					<polyline color="#881155"/>
 				</itemgra>
-				<itemgra item_types="poly_college" order="10-"><polygon color="#f4f4f4"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_attraction" order="10-"><polygon color="#01a36c"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_theme_park" order="10-"><polygon color="#01a36c"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_water_park" order="10-"><polygon color="#8cc1c8"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_zoo" order="10-"><polygon color="#ccbda5"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_railway" order="10-"><polygon color="#b3b9c5"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_marina" order="10-"><polygon color="#aac4d2"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_commercial" order="10-"><polygon color="#eaeed3"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_retail" order="10-"><polygon color="#d6b690"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_plaza" order="10-"><polygon color="#cac4bc"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_battlefield" order="10-"><polygon color="#373d1c"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_archaeological_site" order="10-"><polygon color="#d9cfb6"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_ruins" order="10-"><polygon color="#d9cfb6"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_camp_site" order="10-"><polygon color="#339900"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_caravan_site" order="10-"><polygon color="#8d9723"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_golf_course" order="10-"><polygon color="#419a22"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_marsh" order="10-"><polygon color="#553f23"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_fell" order="10-"><polygon color="#bbb56b"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_greenfield" order="10-"><polygon color="#f1eee8"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_brownfield" order="10-"><polygon color="#b6b690"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_heath" order="10-"><polygon color="#d6d99f"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_scree" order="10-"><polygon color="#eee5dc"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_quarry" order="10-"><polygon color="#e4caad"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_landfill" order="10-"><polygon color="#999893"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_construction" order="10-"><polygon color="#f47216"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_range" order="10-"><polygon color="#6d6b63"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_danger_area" order="10-"><polygon color="#f2ba1b"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_common" order="10-"><polygon color="#7bab36"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_recreation_ground" order="10-"><polygon color="#8fa400"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_playground" order="10-"><polygon color="#b4c479"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_fishing" order="10-"><polygon color="#713907"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_allotments" order="10-"><polygon color="#eecfb3"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_garden" order="10-"><polygon color="#cfeca8"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_village_green" order="10-"><polygon color="#93ac47"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_picnic_site" order="10-"><polygon color="#797548"/><text text_size="5"/></itemgra>
+				<itemgra item_types="poly_college" order="10-">
+					<polygon color="#f4f4f4"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_attraction" order="10-">
+					<polygon color="#01a36c"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_theme_park" order="10-">
+					<polygon color="#01a36c"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_water_park" order="10-">
+					<polygon color="#8cc1c8"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_zoo" order="10-">
+					<polygon color="#ccbda5"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_depot" order="10-">
+					<polygon color="#c2b098"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_railway" order="10-">
+					<polygon color="#b3b9c5"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_port" order="10-">
+					<polygon color="#8188a0"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_marina" order="10-">
+					<polygon color="#aac4d2"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_commercial" order="10-">
+					<polygon color="#eaeed3"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_retail" order="10-">
+					<polygon color="#d6b690"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_plaza" order="10-">
+					<polygon color="#cac4bc"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_battlefield" order="10-">
+					<polygon color="#373d1c"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_archaeological_site" order="10-">
+					<polygon color="#d9cfb6"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_ruins" order="10-">
+					<polygon color="#d9cfb6"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_camp_site" order="10-">
+					<polygon color="#339900"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_caravan_site" order="10-">
+					<polygon color="#8d9723"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_golf_course" order="10-">
+					<polygon color="#419a22"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_marsh" order="10-">
+					<polygon color="#553f23"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_fell" order="10-">
+					<polygon color="#bbb56b"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_greenfield" order="10-">
+					<polygon color="#f1eee8"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_brownfield" order="10-">
+					<polygon color="#b6b690"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_heath" order="10-">
+					<polygon color="#d6d99f"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_scree" order="10-">
+					<polygon color="#eee5dc"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_quarry" order="10-">
+					<polygon color="#e4caad"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_landfill" order="10-">
+					<polygon color="#999893"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_construction" order="10-">
+					<polygon color="#f47216"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_range" order="10-">
+					<polygon color="#6d6b63"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_danger_area" order="10-">
+					<polygon color="#f2ba1b"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_common" order="10-">
+					<polygon color="#7bab36"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_recreation_ground" order="10-">
+					<polygon color="#8fa400"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_playground" order="10-">
+					<polygon color="#b4c479"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_fishing" order="10-">
+					<polygon color="#713907"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_allotments" order="10-">
+					<polygon color="#eecfb3"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_garden" order="10-">
+					<polygon color="#cfeca8"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_village_green" order="10-">
+					<polygon color="#93ac47"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_picnic_site" order="10-">
+					<polygon color="#797548"/>
+					<text text_size="5"/>
+				</itemgra>
 				<itemgra item_types="poly_wood" order="0-">
 					<polygon color="#8ec78d"/>
 					<text text_size="5"/>
 				</itemgra>
+				<itemgra item_types="poly_greenhouse" order="10-">
+					<polygon color="#f9e8cb"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_orchard" order="10-">
+					<polygon color="#9edc90"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_plantnursery" order="10-">
+					<polygon color="#addea2"/>
+					<text text_size="5"/>
+				</itemgra>
 				<itemgra item_types="poly_farm" order="0-">
 					<polygon color="#c7f1a3"/>
 					<polyline color="#79c691"/>
@@ -626,6 +808,10 @@ Waypoint</text></img>
 					<polygon color="#ffff00"/>
 					<polyline color="#a0a0a0" width="3"/>
 				</itemgra>
+				<itemgra item_types="poly_saltpond" order="10-">
+					<polygon color="#d7804a"/>
+					<text text_size="5"/>
+				</itemgra>
 				<itemgra item_types="poly_water,poly_basin,poly_reservoir" order="0-">
 					<polygon color="#82c8ea"/>
 					<polyline color="#5096b8"/>
@@ -691,10 +877,26 @@ Waypoint</text></img>
 				<itemgra item_types="poly_car_parking" order="1-">
 					<polygon color="#e7cf87"/>
 				</itemgra>
-				<itemgra item_types="poly_artwork" order="10-"><polygon color="#fefbc5"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_sports_stadium" order="10-"><polygon color="#6eb85d"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_sports_track" order="10-"><polygon color="#b6554e"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_barracks" order="10-"><polygon color="#b6a6a6"/><text text_size="5"/></itemgra>
+				<itemgra item_types="poly_artwork" order="10-">
+					<polygon color="#fefbc5"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_sports_stadium" order="10-">
+					<polygon color="#6eb85d"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_sports_track" order="10-">
+					<polygon color="#b6554e"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_barracks" order="10-">
+					<polygon color="#b6a6a6"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_garages" order="10-">
+					<polygon color="#deddcc"/>
+					<text text_size="5"/>
+				</itemgra>
 				<itemgra item_types="poly_building" order="0-">
 					<polygon color="#b6a6a6"/>
 				</itemgra>
@@ -2238,80 +2440,263 @@ Waypoint</text></img>
 
 		<layout name="Car-dark" daylayout="Car" color="#011001">
 
-			<cursor w="26" h="26">
-				<itemgra>
-					<circle color="#00ff00" radius="24" width="2">
-						<coord x="0" y="0"/>
-					</circle>
-				</itemgra>
+			<cursor w="57" h="57">
 				<itemgra speed_range="-2">
-					<polyline color="#00ff00" width="2">
-						<coord x="0" y="0"/>
-						<coord x="0" y="0"/>
+					<polyline color="#0000BC" radius="0" width="4">
+						<coord x="0" y="0" />
 					</polyline>
+					<circle color="#000085" radius="9" width="3">
+						<coord x="0" y="0" />
+					</circle>
+					<circle color="#0000BC" radius="13" width="3">
+						<coord x="0" y="0" />
+					</circle>
+					<circle color="#000085" radius="18" width="3">
+						<coord x="0" y="0" />
+					</circle>
 				</itemgra>
 				<itemgra speed_range="3-">
-					<polyline color="#00ff00" width="2">
-						<coord x="-7" y="-10"/>
-						<coord x="0" y="12"/>
-						<coord x="7" y="-10"/>
+					<polygon color="#000085">
+						<coord x="-21" y="-18" />
+						<coord x="0" y="21" />
+						<coord x="0" y="-3" />
+						<coord x="-21" y="-18" />
+					</polygon>
+					<polygon color="#0000BC">
+						<coord x="21" y="-18" />
+						<coord x="0" y="21" />
+						<coord x="0" y="-3" />
+						<coord x="21" y="-18" />
+					</polygon>
+					<polygon color="#00009C">
+						<coord x="-21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="-21" y="-18" />
+					</polygon>
+					<polygon color="#000065">
+						<coord x="21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="21" y="-18" />
+					</polygon>
+					<polyline color="#000085" width="1">
+						<coord x="-21" y="-18" />
+						<coord x="0" y="21" />
+						<coord x="0" y="-3" />
+						<coord x="-21" y="-18" />
+					</polyline>
+					<polyline color="#000085" width="1">
+						<coord x="21" y="-18" />
+						<coord x="0" y="21" />
+						<coord x="0" y="-3" />
+						<coord x="21" y="-18" />
+					</polyline>
+					<polyline color="#000085" width="1">
+						<coord x="-21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="-21" y="-18" />
+					</polyline>
+					<polyline color="#000085" width="1">
+						<coord x="21" y="-18" />
+						<coord x="0" y="-3" />
+						<coord x="0" y="-9" />
+						<coord x="21" y="-18" />
 					</polyline>
 				</itemgra>
 			</cursor>
 
-			<layer name="polygons">
+			<layer name="polygons"><!-- Colors based on Car layout; R/34 G/8 B/9 -->
 				<itemgra item_types="image" order="0-">
 					<image/>
 				</itemgra>
-				<itemgra item_types="poly_nature_reserve" order="10-"><polygon color="#061d15"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_glacier" order="10-"><polygon color="#071e19"/><text text_size="5"/></itemgra>
+				<itemgra item_types="poly_nature_reserve" order="10-">
+					<polygon color="#061d15"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_glacier" order="10-">
+					<polygon color="#071e19"/>
+					<text text_size="5"/>
+				</itemgra>
 				<itemgra item_types="poly_town" order="0-">
 					<polygon color="#191711"/>
 				</itemgra>
-				<itemgra item_types="poly_naval_base" order="10-"><polygon color="#03140f"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_airfield" order="10-"><polygon color="#071b16"/><text text_size="5"/></itemgra>
+				<itemgra item_types="poly_naval_base" order="10-">
+					<polygon color="#03140f"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_airfield" order="10-">
+					<polygon color="#071b16"/>
+					<text text_size="5"/>
+				</itemgra>
 				<itemgra item_types="poly_university" order="8-">
 					<polygon color="#140f14"/>
 				</itemgra>
-				<itemgra item_types="poly_college" order="10-"><polygon color="#071f1a"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_attraction" order="10-"><polygon color="#00150b"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_theme_park" order="10-"><polygon color="#00150b"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_water_park" order="10-"><polygon color="#041915"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_zoo" order="10-"><polygon color="#061811"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_railway" order="10-"><polygon color="#051815"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_marina" order="10-"><polygon color="#051916"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_commercial" order="10-"><polygon color="#071f16"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_retail" order="10-"><polygon color="#06170f"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_plaza" order="10-"><polygon color="#061914"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_battlefield" order="10-"><polygon color="#010703"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_archaeological_site" order="10-"><polygon color="#061b13"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_ruins" order="10-"><polygon color="#061b13"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_camp_site" order="10-"><polygon color="#011400"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_caravan_site" order="10-"><polygon color="#041303"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_golf_course" order="10-"><polygon color="#021403"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_marsh" order="10-"><polygon color="#020803"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_fell" order="10-"><polygon color="#05170b"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_greenfield" order="10-"><polygon color="#071f19"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_brownfield" order="10-"><polygon color="#05170f"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_heath" order="10-"><polygon color="#061c11"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_scree" order="10-"><polygon color="#071d17"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_quarry" order="10-"><polygon color="#071a12"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_landfill" order="10-"><polygon color="#04130f"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_construction" order="10-"><polygon color="#070e02"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_range" order="10-"><polygon color="#030d0a"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_danger_area" order="10-"><polygon color="#071802"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_common" order="10-"><polygon color="#031605"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_recreation_ground" order="10-"><polygon color="#041500"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_playground" order="10-"><polygon color="#05190d"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_fishing" order="10-"><polygon color="#030700"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_allotments" order="10-"><polygon color="#071b13"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_garden" order="10-"><polygon color="#061e12"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_village_green" order="10-"><polygon color="#041607"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_picnic_site" order="10-"><polygon color="#030f07"/><text text_size="5"/></itemgra>
+				<itemgra item_types="poly_college" order="10-">
+					<polygon color="#071f1a"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_attraction" order="10-">
+					<polygon color="#00150b"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_theme_park" order="10-">
+					<polygon color="#00150b"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_water_park" order="10-">
+					<polygon color="#041915"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_zoo" order="10-">
+					<polygon color="#061811"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_depot" order="10-">
+					<polygon color="#051610"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_railway" order="10-">
+					<polygon color="#051815"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_port" order="10-">
+					<polygon color="#031111"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_marina" order="10-">
+					<polygon color="#051916"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_commercial" order="10-">
+					<polygon color="#071f16"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_retail" order="10-">
+					<polygon color="#06170f"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_plaza" order="10-">
+					<polygon color="#061914"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_battlefield" order="10-">
+					<polygon color="#010703"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_archaeological_site" order="10-">
+					<polygon color="#061b13"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_ruins" order="10-">
+					<polygon color="#061b13"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_camp_site" order="10-">
+					<polygon color="#011400"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_caravan_site" order="10-">
+					<polygon color="#041303"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_golf_course" order="10-">
+					<polygon color="#021403"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_marsh" order="10-">
+					<polygon color="#020803"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_fell" order="10-">
+					<polygon color="#05170b"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_greenfield" order="10-">
+					<polygon color="#071f19"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_brownfield" order="10-">
+					<polygon color="#05170f"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_heath" order="10-">
+					<polygon color="#061c11"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_scree" order="10-">
+					<polygon color="#071d17"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_quarry" order="10-">
+					<polygon color="#071a12"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_landfill" order="10-">
+					<polygon color="#04130f"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_construction" order="10-">
+					<polygon color="#070e02"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_range" order="10-">
+					<polygon color="#030d0a"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_danger_area" order="10-">
+					<polygon color="#071802"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_common" order="10-">
+					<polygon color="#031605"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_recreation_ground" order="10-">
+					<polygon color="#041500"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_playground" order="10-">
+					<polygon color="#05190d"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_fishing" order="10-">
+					<polygon color="#030700"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_allotments" order="10-">
+					<polygon color="#071b13"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_garden" order="10-">
+					<polygon color="#061e12"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_village_green" order="10-">
+					<polygon color="#041607"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_picnic_site" order="10-">
+					<polygon color="#030f07"/>
+					<text text_size="5"/>
+				</itemgra>
 				<itemgra item_types="poly_wood" order="0-">
 					<polygon color="#041a06"/>
 					<text color="#55c4bd" background_color="#000000" text_size="5"/>
 				</itemgra>
+				<itemgra item_types="poly_greenhouse" order="10-">
+					<polygon color="#071d16"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_orchard" order="10-">
+					<polygon color="#041b10"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_plantnursery" order="10-">
+					<polygon color="#051b12"/>
+					<text text_size="5"/>
+				</itemgra>
 				<itemgra item_types="poly_farm" order="0-">
 					<polygon color="#041a06"/>
 					<text color="#55c4bd" background_color="#000000" text_size="5"/>
@@ -2420,6 +2805,10 @@ Waypoint</text></img>
 					<polygon color="#c5c300"/>
 					<polyline color="#a0a0a0" width="3"/>
 				</itemgra>
+				<itemgra item_types="poly_saltpond" order="10-">
+					<polygon color="#061008"/>
+					<text text_size="5"/>
+				</itemgra>
 				<itemgra item_types="poly_water,poly_basin,poly_reservoir" order="0-">
 					<polygon color="#010321"/>
 					<text color="#55c4bd" background_color="#000000" text_size="5"/>
@@ -2484,10 +2873,26 @@ Waypoint</text></img>
 				<itemgra item_types="poly_car_parking" order="8-">
 					<polygon color="#1a170f"/>
 				</itemgra>
-				<itemgra item_types="poly_artwork" order="10-"><polygon color="#082015"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_sports_stadium" order="10-"><polygon color="#03180a"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_sports_track" order="10-"><polygon color="#050b08"/><text text_size="5"/></itemgra>
-				<itemgra item_types="poly_barracks" order="10-"><polygon color="#051511"/><text text_size="5"/></itemgra>
+				<itemgra item_types="poly_artwork" order="10-">
+					<polygon color="#082015"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_sports_stadium" order="10-">
+					<polygon color="#03180a"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_sports_track" order="10-">
+					<polygon color="#050b08"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_barracks" order="10-">
+					<polygon color="#051511"/>
+					<text text_size="5"/>
+				</itemgra>
+				<itemgra item_types="poly_garages" order="10-">
+					<polygon color="#061b16"/>
+					<text text_size="5"/>
+				</itemgra>
 				<itemgra item_types="poly_building" order="8-">
 					<polygon color="#282424"/>
 				</itemgra>
@@ -3761,7 +4166,7 @@ Waypoint</text></img>
 		</layout>
 
     <layout name="Car-Android" color="#fef9ee" font="Liberation Sans">
-      <cursor w="49" h="49">
+      <cursor w="57" h="57">
         <itemgra speed_range="-2">
           <polyline color="#00BC00" radius="0" width="4">
             <coord x="0" y="0" />
diff --git a/navit/script/cabify.sh b/navit/script/cabify.sh
index 18401a53b..4536ff330 100755
--- a/navit/script/cabify.sh
+++ b/navit/script/cabify.sh
@@ -49,10 +49,10 @@ do
 	echo "$i $BASEDIR/$d" >> $CABLIST.$$
 done
 
-for i in $SRCDIR/navit/xpm/*.xpm
+for i in $SRCDIR/navit/icons/*.xpm
 do
 	bn="`basename "$i"`"
-	echo "$i $BASEDIR/xpm/" >> $CABLIST.$$
+	echo "$i $BASEDIR/icons/" >> $CABLIST.$$
 done
 
 echo "$SRCDIR/navit/navit.exe $BASEDIR/" >> $CABLIST.$$
diff --git a/navit/support/shapefile/dbfopen.c b/navit/support/shapefile/dbfopen.c
index 51944fc53..148e593a4 100644
--- a/navit/support/shapefile/dbfopen.c
+++ b/navit/support/shapefile/dbfopen.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: dbfopen.c,v 1.83 2008/11/12 14:28:15 fwarmerdam Exp $
+ * $Id: dbfopen.c,v 1.92 2016-12-05 18:44:08 erouault Exp $
  *
  * Project:  Shapelib
  * Purpose:  Implementation of .dbf access API documented in dbf_api.html.
@@ -7,13 +7,14 @@
  *
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
+ * Copyright (c) 2012-2013, Even Rouault <even dot rouault at mines-paris dot org>
  *
  * This software is available under the following "MIT Style" license,
- * or at the option of the licensee under the LGPL (see LICENSE.LGPL).  This
+ * or at the option of the licensee under the LGPL (see COPYING).  This
  * option is discussed in more detail in shapelib.html.
  *
  * --
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
@@ -34,6 +35,51 @@
  ******************************************************************************
  *
  * $Log: dbfopen.c,v $
+ * Revision 1.92  2016-12-05 18:44:08  erouault
+ * * dbfopen.c, shapefil.h: write DBF end-of-file character 0x1A by default.
+ * This behaviour can be controlled with the DBFSetWriteEndOfFileChar()
+ * function.
+ *
+ * Revision 1.91  2016-12-05 12:44:05  erouault
+ * * Major overhaul of Makefile build system to use autoconf/automake.
+ *
+ * * Warning fixes in contrib/
+ *
+ * Revision 1.90  2016-12-04 15:30:15  erouault
+ * * shpopen.c, dbfopen.c, shptree.c, shapefil.h: resync with
+ * GDAL Shapefile driver. Mostly cleanups. SHPObject and DBFInfo
+ * structures extended with new members. New functions:
+ * DBFSetLastModifiedDate, SHPOpenLLEx, SHPRestoreSHX,
+ * SHPSetFastModeReadObject
+ *
+ * * sbnsearch.c: new file to implement original ESRI .sbn spatial
+ * index reading. (no write support). New functions:
+ * SBNOpenDiskTree, SBNCloseDiskTree, SBNSearchDiskTree,
+ * SBNSearchDiskTreeInteger, SBNSearchFreeIds
+ *
+ * * Makefile, makefile.vc, CMakeLists.txt, shapelib.def: updates
+ * with new file and symbols.
+ *
+ * * commit: helper script to cvs commit
+ *
+ * Revision 1.89  2011-07-24 05:59:25  fwarmerdam
+ * minimize use of CPLError in favor of SAHooks.Error()
+ *
+ * Revision 1.88  2011-05-13 17:35:17  fwarmerdam
+ * added DBFReorderFields() and DBFAlterFields() functions (from Even)
+ *
+ * Revision 1.87  2011-05-07 22:41:02  fwarmerdam
+ * ensure pending record is flushed when adding a native field (GDAL #4073)
+ *
+ * Revision 1.86  2011-04-17 15:15:29  fwarmerdam
+ * Removed unused variable.
+ *
+ * Revision 1.85  2010-12-06 16:09:34  fwarmerdam
+ * fix buffer read overrun fetching code page (bug 2276)
+ *
+ * Revision 1.84  2009-10-29 19:59:48  fwarmerdam
+ * avoid crash on truncated header (gdal #3093)
+ *
  * Revision 1.83  2008/11/12 14:28:15  fwarmerdam
  * DBFCreateField() now works on files with records
  *
@@ -57,8 +103,8 @@
  *
  * Revision 1.77  2007/12/15 20:25:21  bram
  * dbfopen.c now reads the Code Page information from the DBF file, and exports
- * this information as a string through the DBFGetCodePage function.  This is 
- * either the number from the LDID header field ("LDID/<number>") or as the 
+ * this information as a string through the DBFGetCodePage function.  This is
+ * either the number from the LDID header field ("LDID/<number>") or as the
  * content of an accompanying .CPG file.  When creating a DBF file, the code can
  * be set using DBFCreateEx.
  *
@@ -145,11 +191,45 @@
 #include <ctype.h>
 #include <string.h>
 
+#ifdef USE_CPL
+#include "cpl_string.h"
+#else
+
+#if defined(_MSC_VER)
+# if _MSC_VER < 1900
+#     define snprintf _snprintf
+# endif
+#elif defined(WIN32) || defined(_WIN32)
+#  ifndef snprintf
+#     define snprintf _snprintf
+#  endif
+#endif
+
+#define CPLsprintf sprintf
+#define CPLsnprintf snprintf
+#endif
+
+SHP_CVSID("$Id: dbfopen.c,v 1.92 2016-12-05 18:44:08 erouault Exp $")
+
 #ifndef FALSE
 #  define FALSE		0
 #  define TRUE		1
 #endif
 
+/* File header size */
+#define XBASE_FILEHDR_SZ         32
+
+#define HEADER_RECORD_TERMINATOR 0x0D
+
+/* See http://www.manmrk.net/tutorials/database/xbase/dbf.html */
+#define END_OF_FILE_CHARACTER    0x1A
+
+#ifdef USE_CPL
+CPL_INLINE static void CPL_IGNORE_RET_VAL_INT(CPL_UNUSED int unused) {}
+#else
+#define CPL_IGNORE_RET_VAL_INT(x) x
+#endif
+
 /************************************************************************/
 /*                             SfRealloc()                              */
 /*                                                                      */
@@ -178,8 +258,7 @@ static void * SfRealloc( void * pMem, int nNewSize )
 static void DBFWriteHeader(DBFHandle psDBF)
 
 {
-    unsigned char	abyHeader[XBASE_FLDHDR_SZ];
-    int		i;
+    unsigned char	abyHeader[XBASE_FILEHDR_SZ] = { 0 };
 
     if( !psDBF->bNoHeader )
         return;
@@ -189,21 +268,18 @@ static void DBFWriteHeader(DBFHandle psDBF)
 /* -------------------------------------------------------------------- */
 /*	Initialize the file header information.				*/
 /* -------------------------------------------------------------------- */
-    for( i = 0; i < XBASE_FLDHDR_SZ; i++ )
-        abyHeader[i] = 0;
-
     abyHeader[0] = 0x03;		/* memo field? - just copying 	*/
 
-    /* write out a dummy date */
-    abyHeader[1] = 95;			/* YY */
-    abyHeader[2] = 7;			/* MM */
-    abyHeader[3] = 26;			/* DD */
+    /* write out update date */
+    abyHeader[1] = (unsigned char) psDBF->nUpdateYearSince1900;
+    abyHeader[2] = (unsigned char) psDBF->nUpdateMonth;
+    abyHeader[3] = (unsigned char) psDBF->nUpdateDay;
 
     /* record count preset at zero */
 
     abyHeader[8] = (unsigned char) (psDBF->nHeaderLength % 256);
     abyHeader[9] = (unsigned char) (psDBF->nHeaderLength / 256);
-    
+
     abyHeader[10] = (unsigned char) (psDBF->nRecordLength % 256);
     abyHeader[11] = (unsigned char) (psDBF->nRecordLength / 256);
 
@@ -214,20 +290,31 @@ static void DBFWriteHeader(DBFHandle psDBF)
 /*      descriptions.                                     		*/
 /* -------------------------------------------------------------------- */
     psDBF->sHooks.FSeek( psDBF->fp, 0, 0 );
-    psDBF->sHooks.FWrite( abyHeader, XBASE_FLDHDR_SZ, 1, psDBF->fp );
-    psDBF->sHooks.FWrite( psDBF->pszHeader, XBASE_FLDHDR_SZ, psDBF->nFields, 
+    psDBF->sHooks.FWrite( abyHeader, XBASE_FILEHDR_SZ, 1, psDBF->fp );
+    psDBF->sHooks.FWrite( psDBF->pszHeader, XBASE_FLDHDR_SZ, psDBF->nFields,
                           psDBF->fp );
 
 /* -------------------------------------------------------------------- */
 /*      Write out the newline character if there is room for it.        */
 /* -------------------------------------------------------------------- */
-    if( psDBF->nHeaderLength > 32*psDBF->nFields + 32 )
+    if( psDBF->nHeaderLength > XBASE_FLDHDR_SZ*psDBF->nFields +
+                               XBASE_FLDHDR_SZ )
     {
         char	cNewline;
 
-        cNewline = 0x0d;
+        cNewline = HEADER_RECORD_TERMINATOR;
         psDBF->sHooks.FWrite( &cNewline, 1, 1, psDBF->fp );
     }
+
+/* -------------------------------------------------------------------- */
+/*      If the file is new, add a EOF character.                        */
+/* -------------------------------------------------------------------- */
+    if( psDBF->nRecords == 0 && psDBF->bWriteEndOfFileChar )
+    {
+        char ch = END_OF_FILE_CHARACTER;
+
+        psDBF->sHooks.FWrite( &ch, 1, 1, psDBF->fp );
+    }
 }
 
 /************************************************************************/
@@ -245,25 +332,30 @@ static int DBFFlushRecord( DBFHandle psDBF )
     {
 	psDBF->bCurrentRecordModified = FALSE;
 
-	nRecordOffset = 
-            psDBF->nRecordLength * (SAOffset) psDBF->nCurrentRecord 
+	nRecordOffset =
+            psDBF->nRecordLength * (SAOffset) psDBF->nCurrentRecord
             + psDBF->nHeaderLength;
 
-	if( psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 ) != 0 
-            || psDBF->sHooks.FWrite( psDBF->pszCurrentRecord, 
-                                     psDBF->nRecordLength, 
+	if( psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 ) != 0
+            || psDBF->sHooks.FWrite( psDBF->pszCurrentRecord,
+                                     psDBF->nRecordLength,
                                      1, psDBF->fp ) != 1 )
         {
-#ifdef USE_CPL
-            CPLError( CE_Failure, CPLE_FileIO, 
-                      "Failure writing DBF record %d.", 
-                      psDBF->nCurrentRecord );
-#else           
-            fprintf( stderr, "Failure writing DBF record %d.", 
+            char szMessage[128];
+            snprintf( szMessage, sizeof(szMessage), "Failure writing DBF record %d.",
                      psDBF->nCurrentRecord );
-#endif
+            psDBF->sHooks.Error( szMessage );
             return FALSE;
         }
+
+        if( psDBF->nCurrentRecord == psDBF->nRecords - 1 )
+        {
+            if( psDBF->bWriteEndOfFileChar )
+            {
+                char ch = END_OF_FILE_CHARACTER;
+                psDBF->sHooks.FWrite( &ch, 1, 1, psDBF->fp );
+            }
+        }
     }
 
     return TRUE;
@@ -283,33 +375,25 @@ static int DBFLoadRecord( DBFHandle psDBF, int iRecord )
 	if( !DBFFlushRecord( psDBF ) )
             return FALSE;
 
-	nRecordOffset = 
+	nRecordOffset =
             psDBF->nRecordLength * (SAOffset) iRecord + psDBF->nHeaderLength;
 
 	if( psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, SEEK_SET ) != 0 )
         {
-#ifdef USE_CPL
-            CPLError( CE_Failure, CPLE_FileIO,
-                      "fseek(%ld) failed on DBF file.\n",
-                      (long) nRecordOffset );
-#else
-            fprintf( stderr, "fseek(%ld) failed on DBF file.\n",
+            char szMessage[128];
+            snprintf( szMessage, sizeof(szMessage), "fseek(%ld) failed on DBF file.",
                      (long) nRecordOffset );
-#endif
+            psDBF->sHooks.Error( szMessage );
             return FALSE;
         }
 
-	if( psDBF->sHooks.FRead( psDBF->pszCurrentRecord, 
+	if( psDBF->sHooks.FRead( psDBF->pszCurrentRecord,
                                  psDBF->nRecordLength, 1, psDBF->fp ) != 1 )
         {
-#ifdef USE_CPL
-            CPLError( CE_Failure, CPLE_FileIO, 
-                      "fread(%d) failed on DBF file.\n",
-                      psDBF->nRecordLength );
-#else
-            fprintf( stderr, "fread(%d) failed on DBF file.\n",
+            char szMessage[128];
+            snprintf( szMessage, sizeof(szMessage), "fread(%d) failed on DBF file.",
                      psDBF->nRecordLength );
-#endif
+            psDBF->sHooks.Error( szMessage );
             return FALSE;
         }
 
@@ -327,33 +411,49 @@ void SHPAPI_CALL
 DBFUpdateHeader( DBFHandle psDBF )
 
 {
-    unsigned char		abyFileHeader[32];
+    unsigned char		abyFileHeader[XBASE_FILEHDR_SZ];
 
     if( psDBF->bNoHeader )
         DBFWriteHeader( psDBF );
 
-    DBFFlushRecord( psDBF );
+    if( !DBFFlushRecord( psDBF ) )
+        return;
 
     psDBF->sHooks.FSeek( psDBF->fp, 0, 0 );
-    psDBF->sHooks.FRead( abyFileHeader, 32, 1, psDBF->fp );
-    
+    psDBF->sHooks.FRead( abyFileHeader, sizeof(abyFileHeader), 1, psDBF->fp );
+
+    abyFileHeader[1] = (unsigned char) psDBF->nUpdateYearSince1900;
+    abyFileHeader[2] = (unsigned char) psDBF->nUpdateMonth;
+    abyFileHeader[3] = (unsigned char) psDBF->nUpdateDay;
     abyFileHeader[4] = (unsigned char) (psDBF->nRecords % 256);
     abyFileHeader[5] = (unsigned char) ((psDBF->nRecords/256) % 256);
     abyFileHeader[6] = (unsigned char) ((psDBF->nRecords/(256*256)) % 256);
     abyFileHeader[7] = (unsigned char) ((psDBF->nRecords/(256*256*256)) % 256);
-    
+
     psDBF->sHooks.FSeek( psDBF->fp, 0, 0 );
-    psDBF->sHooks.FWrite( abyFileHeader, 32, 1, psDBF->fp );
+    psDBF->sHooks.FWrite( abyFileHeader, sizeof(abyFileHeader), 1, psDBF->fp );
 
     psDBF->sHooks.FFlush( psDBF->fp );
 }
 
 /************************************************************************/
+/*                       DBFSetLastModifiedDate()                       */
+/************************************************************************/
+
+void SHPAPI_CALL
+DBFSetLastModifiedDate( DBFHandle psDBF, int nYYSince1900, int nMM, int nDD )
+{
+    psDBF->nUpdateYearSince1900 = nYYSince1900;
+    psDBF->nUpdateMonth = nMM;
+    psDBF->nUpdateDay = nDD;
+}
+
+/************************************************************************/
 /*                              DBFOpen()                               */
 /*                                                                      */
 /*      Open a .dbf file.                                               */
 /************************************************************************/
-   
+
 DBFHandle SHPAPI_CALL
 DBFOpen( const char * pszFilename, const char * pszAccess )
 
@@ -370,7 +470,7 @@ DBFOpen( const char * pszFilename, const char * pszAccess )
 /*                                                                      */
 /*      Open a .dbf file.                                               */
 /************************************************************************/
-   
+
 DBFHandle SHPAPI_CALL
 DBFOpenLL( const char * pszFilename, const char * pszAccess, SAHooks *psHooks )
 
@@ -381,18 +481,19 @@ DBFOpenLL( const char * pszFilename, const char * pszAccess, SAHooks *psHooks )
     int			nFields, nHeadLen, iField, i;
     char		*pszBasename, *pszFullname;
     int                 nBufSize = 500;
+    size_t              nFullnameLen;
 
 /* -------------------------------------------------------------------- */
 /*      We only allow the access strings "rb" and "r+".                  */
 /* -------------------------------------------------------------------- */
-    if( strcmp(pszAccess,"r") != 0 && strcmp(pszAccess,"r+") != 0 
+    if( strcmp(pszAccess,"r") != 0 && strcmp(pszAccess,"r+") != 0
         && strcmp(pszAccess,"rb") != 0 && strcmp(pszAccess,"rb+") != 0
         && strcmp(pszAccess,"r+b") != 0 )
         return( NULL );
 
     if( strcmp(pszAccess,"r") == 0 )
         pszAccess = "rb";
- 
+
     if( strcmp(pszAccess,"r+") == 0 )
         pszAccess = "rb+";
 
@@ -402,7 +503,7 @@ DBFOpenLL( const char * pszFilename, const char * pszAccess, SAHooks *psHooks )
 /* -------------------------------------------------------------------- */
     pszBasename = (char *) malloc(strlen(pszFilename)+5);
     strcpy( pszBasename, pszFilename );
-    for( i = strlen(pszBasename)-1; 
+    for( i = (int)strlen(pszBasename)-1;
 	 i > 0 && pszBasename[i] != '.' && pszBasename[i] != '/'
 	       && pszBasename[i] != '\\';
 	 i-- ) {}
@@ -410,30 +511,31 @@ DBFOpenLL( const char * pszFilename, const char * pszAccess, SAHooks *psHooks )
     if( pszBasename[i] == '.' )
         pszBasename[i] = '\0';
 
-    pszFullname = (char *) malloc(strlen(pszBasename) + 5);
-    sprintf( pszFullname, "%s.dbf", pszBasename );
-        
+    nFullnameLen = strlen(pszBasename) + 5;
+    pszFullname = (char *) malloc(nFullnameLen);
+    snprintf( pszFullname, nFullnameLen, "%s.dbf", pszBasename );
+
     psDBF = (DBFHandle) calloc( 1, sizeof(DBFInfo) );
     psDBF->fp = psHooks->FOpen( pszFullname, pszAccess );
     memcpy( &(psDBF->sHooks), psHooks, sizeof(SAHooks) );
 
     if( psDBF->fp == NULL )
     {
-        sprintf( pszFullname, "%s.DBF", pszBasename );
+        snprintf( pszFullname, nFullnameLen, "%s.DBF", pszBasename );
         psDBF->fp = psDBF->sHooks.FOpen(pszFullname, pszAccess );
     }
 
-    sprintf( pszFullname, "%s.cpg", pszBasename );
+    snprintf( pszFullname, nFullnameLen, "%s.cpg", pszBasename );
     pfCPG = psHooks->FOpen( pszFullname, "r" );
     if( pfCPG == NULL )
     {
-        sprintf( pszFullname, "%s.CPG", pszBasename );
+        snprintf( pszFullname, nFullnameLen, "%s.CPG", pszBasename );
         pfCPG = psHooks->FOpen( pszFullname, "r" );
     }
 
     free( pszBasename );
     free( pszFullname );
-    
+
     if( psDBF->fp == NULL )
     {
         free( psDBF );
@@ -449,7 +551,7 @@ DBFOpenLL( const char * pszFilename, const char * pszAccess, SAHooks *psHooks )
 /*  Read Table Header info                                              */
 /* -------------------------------------------------------------------- */
     pabyBuf = (unsigned char *) malloc(nBufSize);
-    if( psDBF->sHooks.FRead( pabyBuf, 32, 1, psDBF->fp ) != 1 )
+    if( psDBF->sHooks.FRead( pabyBuf, XBASE_FILEHDR_SZ, 1, psDBF->fp ) != 1 )
     {
         psDBF->sHooks.FClose( psDBF->fp );
         if( pfCPG ) psDBF->sHooks.FClose( pfCPG );
@@ -458,14 +560,25 @@ DBFOpenLL( const char * pszFilename, const char * pszAccess, SAHooks *psHooks )
         return NULL;
     }
 
-    psDBF->nRecords = 
-     pabyBuf[4] + pabyBuf[5]*256 + pabyBuf[6]*256*256 + pabyBuf[7]*256*256*256;
+    DBFSetLastModifiedDate(psDBF, pabyBuf[1], pabyBuf[2], pabyBuf[3]);
+
+    psDBF->nRecords =
+     pabyBuf[4] + pabyBuf[5]*256 + pabyBuf[6]*256*256 + (pabyBuf[7] & 0x7f) *256*256*256;
 
     psDBF->nHeaderLength = nHeadLen = pabyBuf[8] + pabyBuf[9]*256;
     psDBF->nRecordLength = pabyBuf[10] + pabyBuf[11]*256;
     psDBF->iLanguageDriver = pabyBuf[29];
 
-    psDBF->nFields = nFields = (nHeadLen - 32) / 32;
+    if (psDBF->nRecordLength == 0 || nHeadLen < XBASE_FILEHDR_SZ)
+    {
+        psDBF->sHooks.FClose( psDBF->fp );
+        if( pfCPG ) psDBF->sHooks.FClose( pfCPG );
+        free( pabyBuf );
+        free( psDBF );
+        return NULL;
+    }
+
+    psDBF->nFields = nFields = (nHeadLen - XBASE_FILEHDR_SZ) / XBASE_FLDHDR_SZ;
 
     psDBF->pszCurrentRecord = (char *) malloc(psDBF->nRecordLength);
 
@@ -477,8 +590,7 @@ DBFOpenLL( const char * pszFilename, const char * pszAccess, SAHooks *psHooks )
     if( pfCPG )
     {
         size_t n;
-        char *buffer = (char *) pabyBuf;
-        buffer[0] = '\0';
+        memset( pabyBuf, 0, nBufSize);
         psDBF->sHooks.FRead( pabyBuf, nBufSize - 1, 1, pfCPG );
         n = strcspn( (char *) pabyBuf, "\n\r" );
         if( n > 0 )
@@ -491,7 +603,7 @@ DBFOpenLL( const char * pszFilename, const char * pszAccess, SAHooks *psHooks )
     }
     if( psDBF->pszCodePage == NULL && pabyBuf[29] != 0 )
     {
-        sprintf( (char *) pabyBuf, "LDID/%d", psDBF->iLanguageDriver );
+        snprintf( (char *) pabyBuf, nBufSize, "LDID/%d", psDBF->iLanguageDriver );
         psDBF->pszCodePage = (char *) malloc(strlen((char*)pabyBuf) + 1);
         strcpy( psDBF->pszCodePage, (char *) pabyBuf );
     }
@@ -499,12 +611,13 @@ DBFOpenLL( const char * pszFilename, const char * pszAccess, SAHooks *psHooks )
 /* -------------------------------------------------------------------- */
 /*  Read in Field Definitions                                           */
 /* -------------------------------------------------------------------- */
-    
+
     pabyBuf = (unsigned char *) SfRealloc(pabyBuf,nHeadLen);
     psDBF->pszHeader = (char *) pabyBuf;
 
-    psDBF->sHooks.FSeek( psDBF->fp, 32, 0 );
-    if( psDBF->sHooks.FRead( pabyBuf, nHeadLen-32, 1, psDBF->fp ) != 1 )
+    psDBF->sHooks.FSeek( psDBF->fp, XBASE_FILEHDR_SZ, 0 );
+    if( psDBF->sHooks.FRead( pabyBuf, nHeadLen-XBASE_FILEHDR_SZ, 1,
+                             psDBF->fp ) != 1 )
     {
         psDBF->sHooks.FClose( psDBF->fp );
         free( pabyBuf );
@@ -522,7 +635,7 @@ DBFOpenLL( const char * pszFilename, const char * pszAccess, SAHooks *psHooks )
     {
 	unsigned char		*pabyFInfo;
 
-	pabyFInfo = pabyBuf+iField*32;
+	pabyFInfo = pabyBuf+iField*XBASE_FLDHDR_SZ;
 
 	if( pabyFInfo[11] == 'N' || pabyFInfo[11] == 'F' )
 	{
@@ -548,10 +661,12 @@ DBFOpenLL( const char * pszFilename, const char * pszAccess, SAHooks *psHooks )
 	if( iField == 0 )
 	    psDBF->panFieldOffset[iField] = 1;
 	else
-	    psDBF->panFieldOffset[iField] = 
+	    psDBF->panFieldOffset[iField] =
 	      psDBF->panFieldOffset[iField-1] + psDBF->panFieldSize[iField-1];
     }
 
+    DBFSetWriteEndOfFileChar( psDBF, TRUE );
+
     return( psDBF );
 }
 
@@ -571,7 +686,7 @@ DBFClose(DBFHandle psDBF)
     if( psDBF->bNoHeader )
         DBFWriteHeader( psDBF );
 
-    DBFFlushRecord( psDBF );
+    CPL_IGNORE_RET_VAL_INT(DBFFlushRecord( psDBF ));
 
 /* -------------------------------------------------------------------- */
 /*      Update last access date, and number of records if we have	*/
@@ -648,6 +763,7 @@ DBFCreateLL( const char * pszFilename, const char * pszCodePage, SAHooks *psHook
     char	*pszFullname, *pszBasename;
     int		i, ldid = -1;
     char chZero = '\0';
+    size_t      nFullnameLen;
 
 /* -------------------------------------------------------------------- */
 /*	Compute the base (layer) name.  If there is any extension	*/
@@ -655,7 +771,7 @@ DBFCreateLL( const char * pszFilename, const char * pszCodePage, SAHooks *psHook
 /* -------------------------------------------------------------------- */
     pszBasename = (char *) malloc(strlen(pszFilename)+5);
     strcpy( pszBasename, pszFilename );
-    for( i = strlen(pszBasename)-1; 
+    for( i = (int)strlen(pszBasename)-1;
 	 i > 0 && pszBasename[i] != '.' && pszBasename[i] != '/'
 	       && pszBasename[i] != '\\';
 	 i-- ) {}
@@ -663,25 +779,33 @@ DBFCreateLL( const char * pszFilename, const char * pszCodePage, SAHooks *psHook
     if( pszBasename[i] == '.' )
         pszBasename[i] = '\0';
 
-    pszFullname = (char *) malloc(strlen(pszBasename) + 5);
-    sprintf( pszFullname, "%s.dbf", pszBasename );
+    nFullnameLen = strlen(pszBasename) + 5;
+    pszFullname = (char *) malloc(nFullnameLen);
+    snprintf( pszFullname, nFullnameLen, "%s.dbf", pszBasename );
 
 /* -------------------------------------------------------------------- */
 /*      Create the file.                                                */
 /* -------------------------------------------------------------------- */
     fp = psHooks->FOpen( pszFullname, "wb" );
     if( fp == NULL )
+    {
+        free( pszBasename );
+        free( pszFullname );
         return( NULL );
-    
+    }
+
     psHooks->FWrite( &chZero, 1, 1, fp );
     psHooks->FClose( fp );
 
     fp = psHooks->FOpen( pszFullname, "rb+" );
     if( fp == NULL )
+    {
+        free( pszBasename );
+        free( pszFullname );
         return( NULL );
+    }
 
-
-    sprintf( pszFullname, "%s.cpg", pszBasename );
+    snprintf( pszFullname, nFullnameLen, "%s.cpg", pszBasename );
     if( pszCodePage != NULL )
     {
         if( strncmp( pszCodePage, "LDID/", 5 ) == 0 )
@@ -715,8 +839,8 @@ DBFCreateLL( const char * pszFilename, const char * pszCodePage, SAHooks *psHook
     psDBF->nRecords = 0;
     psDBF->nFields = 0;
     psDBF->nRecordLength = 1;
-    psDBF->nHeaderLength = 33;
-    
+    psDBF->nHeaderLength = XBASE_FILEHDR_SZ + 1; /* + 1 for HEADER_RECORD_TERMINATOR */
+
     psDBF->panFieldOffset = NULL;
     psDBF->panFieldSize = NULL;
     psDBF->panFieldDecimals = NULL;
@@ -736,6 +860,9 @@ DBFCreateLL( const char * pszFilename, const char * pszCodePage, SAHooks *psHook
         psDBF->pszCodePage = (char * ) malloc( strlen(pszCodePage) + 1 );
         strcpy( psDBF->pszCodePage, pszCodePage );
     }
+    DBFSetLastModifiedDate(psDBF, 95, 7, 26); /* dummy date */
+
+    DBFSetWriteEndOfFileChar(psDBF, TRUE);
 
     return( psDBF );
 }
@@ -747,7 +874,7 @@ DBFCreateLL( const char * pszFilename, const char * pszCodePage, SAHooks *psHook
 /************************************************************************/
 
 int SHPAPI_CALL
-DBFAddField(DBFHandle psDBF, const char * pszFieldName, 
+DBFAddField(DBFHandle psDBF, const char * pszFieldName,
             DBFFieldType eType, int nWidth, int nDecimals )
 
 {
@@ -760,11 +887,31 @@ DBFAddField(DBFHandle psDBF, const char * pszFieldName,
     else
         chNativeType = 'N';
 
-    return DBFAddNativeFieldType( psDBF, pszFieldName, chNativeType, 
+    return DBFAddNativeFieldType( psDBF, pszFieldName, chNativeType,
                                   nWidth, nDecimals );
 }
 
 /************************************************************************/
+/*                        DBFGetNullCharacter()                         */
+/************************************************************************/
+
+static char DBFGetNullCharacter(char chType)
+{
+    switch (chType)
+    {
+      case 'N':
+      case 'F':
+        return '*';
+      case 'D':
+        return '0';
+      case 'L':
+       return '?';
+      default:
+       return ' ';
+    }
+}
+
+/************************************************************************/
 /*                            DBFAddField()                             */
 /*                                                                      */
 /*      Add a field to a newly created .dbf file before any records     */
@@ -772,7 +919,7 @@ DBFAddField(DBFHandle psDBF, const char * pszFieldName,
 /************************************************************************/
 
 int SHPAPI_CALL
-DBFAddNativeFieldType(DBFHandle psDBF, const char * pszFieldName, 
+DBFAddNativeFieldType(DBFHandle psDBF, const char * pszFieldName,
                       char chType, int nWidth, int nDecimals )
 
 {
@@ -783,14 +930,40 @@ DBFAddNativeFieldType(DBFHandle psDBF, const char * pszFieldName,
     char        chFieldFill;
     SAOffset    nRecordOffset;
 
+    /* make sure that everything is written in .dbf */
+    if( !DBFFlushRecord( psDBF ) )
+        return -1;
+
+    if( psDBF->nHeaderLength + XBASE_FLDHDR_SZ > 65535 )
+    {
+        char szMessage[128];
+        snprintf( szMessage, sizeof(szMessage),
+                  "Cannot add field %s. Header length limit reached "
+                  "(max 65535 bytes, 2046 fields).",
+                  pszFieldName );
+        psDBF->sHooks.Error( szMessage );
+        return -1;
+    }
+
 /* -------------------------------------------------------------------- */
 /*      Do some checking to ensure we can add records to this file.     */
 /* -------------------------------------------------------------------- */
     if( nWidth < 1 )
         return -1;
 
-    if( nWidth > 255 )
-        nWidth = 255;
+    if( nWidth > XBASE_FLD_MAX_WIDTH )
+        nWidth = XBASE_FLD_MAX_WIDTH;
+
+    if( psDBF->nRecordLength + nWidth > 65535 )
+    {
+        char szMessage[128];
+        snprintf( szMessage, sizeof(szMessage),
+                  "Cannot add field %s. Record length limit reached "
+                  "(max 65535 bytes).",
+                  pszFieldName );
+        psDBF->sHooks.Error( szMessage );
+        return -1;
+    }
 
     nOldRecordLength = psDBF->nRecordLength;
     nOldHeaderLength = psDBF->nHeaderLength;
@@ -801,16 +974,16 @@ DBFAddNativeFieldType(DBFHandle psDBF, const char * pszFieldName,
 /* -------------------------------------------------------------------- */
     psDBF->nFields++;
 
-    psDBF->panFieldOffset = (int *) 
+    psDBF->panFieldOffset = (int *)
         SfRealloc( psDBF->panFieldOffset, sizeof(int) * psDBF->nFields );
 
-    psDBF->panFieldSize = (int *) 
+    psDBF->panFieldSize = (int *)
         SfRealloc( psDBF->panFieldSize, sizeof(int) * psDBF->nFields );
 
-    psDBF->panFieldDecimals = (int *) 
+    psDBF->panFieldDecimals = (int *)
         SfRealloc( psDBF->panFieldDecimals, sizeof(int) * psDBF->nFields );
 
-    psDBF->pachFieldType = (char *) 
+    psDBF->pachFieldType = (char *)
         SfRealloc( psDBF->pachFieldType, sizeof(char) * psDBF->nFields );
 
 /* -------------------------------------------------------------------- */
@@ -825,20 +998,18 @@ DBFAddNativeFieldType(DBFHandle psDBF, const char * pszFieldName,
 /* -------------------------------------------------------------------- */
 /*      Extend the required header information.                         */
 /* -------------------------------------------------------------------- */
-    psDBF->nHeaderLength += 32;
+    psDBF->nHeaderLength += XBASE_FLDHDR_SZ;
     psDBF->bUpdated = FALSE;
 
-    psDBF->pszHeader = (char *) SfRealloc(psDBF->pszHeader,psDBF->nFields*32);
+    psDBF->pszHeader = (char *) SfRealloc(psDBF->pszHeader,
+                                          psDBF->nFields*XBASE_FLDHDR_SZ);
 
-    pszFInfo = psDBF->pszHeader + 32 * (psDBF->nFields-1);
+    pszFInfo = psDBF->pszHeader + XBASE_FLDHDR_SZ * (psDBF->nFields-1);
 
-    for( i = 0; i < 32; i++ )
+    for( i = 0; i < XBASE_FLDHDR_SZ; i++ )
         pszFInfo[i] = '\0';
 
-    if( (int) strlen(pszFieldName) < 10 )
-        strncpy( pszFInfo, pszFieldName, strlen(pszFieldName));
-    else
-        strncpy( pszFInfo, pszFieldName, 10);
+    strncpy( pszFInfo, pszFieldName, XBASE_FLDNAME_LEN_WRITE );
 
     pszFInfo[11] = psDBF->pachFieldType[psDBF->nFields-1];
 
@@ -852,7 +1023,7 @@ DBFAddNativeFieldType(DBFHandle psDBF, const char * pszFieldName,
         pszFInfo[16] = (unsigned char) nWidth;
         pszFInfo[17] = (unsigned char) nDecimals;
     }
-    
+
 /* -------------------------------------------------------------------- */
 /*      Make the current record buffer appropriately larger.            */
 /* -------------------------------------------------------------------- */
@@ -870,22 +1041,7 @@ DBFAddNativeFieldType(DBFHandle psDBF, const char * pszFieldName,
     /* alloc record */
     pszRecord = (char *) malloc(sizeof(char) * psDBF->nRecordLength);
 
-    switch (chType)
-    {
-      case 'N':
-      case 'F':
-        chFieldFill = '*';
-        break;
-      case 'D':
-        chFieldFill = '0';
-        break;
-      case 'L':
-       chFieldFill = '?';
-       break;
-      default:
-       chFieldFill = ' ';
-       break;
-    }
+    chFieldFill = DBFGetNullCharacter(chType);
 
     for (i = psDBF->nRecords-1; i >= 0; --i)
     {
@@ -905,6 +1061,17 @@ DBFAddNativeFieldType(DBFHandle psDBF, const char * pszFieldName,
         psDBF->sHooks.FWrite( pszRecord, psDBF->nRecordLength, 1, psDBF->fp );
     }
 
+    if( psDBF->bWriteEndOfFileChar )
+    {
+        char ch = END_OF_FILE_CHARACTER;
+
+        nRecordOffset =
+            psDBF->nRecordLength * (SAOffset) psDBF->nRecords + psDBF->nHeaderLength;
+
+        psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 );
+        psDBF->sHooks.FWrite( &ch, 1, 1, psDBF->fp );
+    }
+
     /* free record */
     free(pszRecord);
 
@@ -912,6 +1079,10 @@ DBFAddNativeFieldType(DBFHandle psDBF, const char * pszFieldName,
     psDBF->bNoHeader = TRUE;
     DBFUpdateHeader( psDBF );
 
+    psDBF->nCurrentRecord = -1;
+    psDBF->bCurrentRecordModified = FALSE;
+    psDBF->bUpdated = TRUE;
+
     return( psDBF->nFields-1 );
 }
 
@@ -961,7 +1132,7 @@ static void *DBFReadAttribute(DBFHandle psDBF, int hEntity, int iField,
 /* -------------------------------------------------------------------- */
 /*	Extract the requested field.					*/
 /* -------------------------------------------------------------------- */
-    strncpy( psDBF->pszWorkField,
+    memcpy( psDBF->pszWorkField,
 	     ((const char *) pabyRec) + psDBF->panFieldOffset[iField],
 	     psDBF->panFieldSize[iField] );
     psDBF->pszWorkField[psDBF->panFieldSize[iField]] = '\0';
@@ -971,11 +1142,17 @@ static void *DBFReadAttribute(DBFHandle psDBF, int hEntity, int iField,
 /* -------------------------------------------------------------------- */
 /*      Decode the field.                                               */
 /* -------------------------------------------------------------------- */
-    if( chReqType == 'N' )
+    if( chReqType == 'I' )
+    {
+        psDBF->fieldValue.nIntField = atoi(psDBF->pszWorkField);
+
+        pReturnField = &(psDBF->fieldValue.nIntField);
+    }
+    else if( chReqType == 'N' )
     {
-        psDBF->dfDoubleField = psDBF->sHooks.Atof(psDBF->pszWorkField);
+        psDBF->fieldValue.dfDoubleField = psDBF->sHooks.Atof(psDBF->pszWorkField);
 
-	pReturnField = &(psDBF->dfDoubleField);
+        pReturnField = &(psDBF->fieldValue.dfDoubleField);
     }
 
 /* -------------------------------------------------------------------- */
@@ -998,7 +1175,7 @@ static void *DBFReadAttribute(DBFHandle psDBF, int hEntity, int iField,
             *pchDst = '\0';
     }
 #endif
-    
+
     return( pReturnField );
 }
 
@@ -1012,14 +1189,14 @@ int SHPAPI_CALL
 DBFReadIntegerAttribute( DBFHandle psDBF, int iRecord, int iField )
 
 {
-    double	*pdValue;
+    int	*pnValue;
 
-    pdValue = (double *) DBFReadAttribute( psDBF, iRecord, iField, 'N' );
+    pnValue = (int *) DBFReadAttribute( psDBF, iRecord, iField, 'I' );
 
-    if( pdValue == NULL )
+    if( pnValue == NULL )
         return 0;
     else
-        return( (int) *pdValue );
+        return( *pnValue );
 }
 
 /************************************************************************/
@@ -1068,34 +1245,28 @@ DBFReadLogicalAttribute( DBFHandle psDBF, int iRecord, int iField )
     return( (const char *) DBFReadAttribute( psDBF, iRecord, iField, 'L' ) );
 }
 
+
 /************************************************************************/
-/*                         DBFIsAttributeNULL()                         */
-/*                                                                      */
-/*      Return TRUE if value for field is NULL.                         */
+/*                         DBFIsValueNULL()                             */
 /*                                                                      */
-/*      Contributed by Jim Matthews.                                    */
+/*      Return TRUE if the passed string is NULL.                       */
 /************************************************************************/
 
-int SHPAPI_CALL
-DBFIsAttributeNULL( DBFHandle psDBF, int iRecord, int iField )
-
+static int DBFIsValueNULL( char chType, const char* pszValue )
 {
-    const char	*pszValue;
     int i;
 
-    pszValue = DBFReadStringAttribute( psDBF, iRecord, iField );
-
     if( pszValue == NULL )
         return TRUE;
 
-    switch(psDBF->pachFieldType[iField])
+    switch(chType)
     {
       case 'N':
       case 'F':
         /*
-        ** We accept all asterisks or all blanks as NULL 
-        ** though according to the spec I think it should be all 
-        ** asterisks. 
+        ** We accept all asterisks or all blanks as NULL
+        ** though according to the spec I think it should be all
+        ** asterisks.
         */
         if( pszValue[0] == '*' )
             return TRUE;
@@ -1112,7 +1283,7 @@ DBFIsAttributeNULL( DBFHandle psDBF, int iRecord, int iField )
         return strncmp(pszValue,"00000000",8) == 0;
 
       case 'L':
-        /* NULL boolean fields have value "?" */ 
+        /* NULL boolean fields have value "?" */
         return pszValue[0] == '?';
 
       default:
@@ -1122,6 +1293,28 @@ DBFIsAttributeNULL( DBFHandle psDBF, int iRecord, int iField )
 }
 
 /************************************************************************/
+/*                         DBFIsAttributeNULL()                         */
+/*                                                                      */
+/*      Return TRUE if value for field is NULL.                         */
+/*                                                                      */
+/*      Contributed by Jim Matthews.                                    */
+/************************************************************************/
+
+int SHPAPI_CALL
+DBFIsAttributeNULL( DBFHandle psDBF, int iRecord, int iField )
+
+{
+    const char	*pszValue;
+
+    pszValue = DBFReadStringAttribute( psDBF, iRecord, iField );
+
+    if( pszValue == NULL )
+        return TRUE;
+
+    return DBFIsValueNULL( psDBF->pachFieldType[iField], pszValue );
+}
+
+/************************************************************************/
 /*                          DBFGetFieldCount()                          */
 /*                                                                      */
 /*      Return the number of fields in this table.                      */
@@ -1151,6 +1344,8 @@ DBFGetRecordCount( DBFHandle psDBF )
 /*                          DBFGetFieldInfo()                           */
 /*                                                                      */
 /*      Return any requested information about the field.               */
+/*      pszFieldName must be at least XBASE_FLDNAME_LEN_READ+1 (=12)    */
+/*      bytes long.                                                     */
 /************************************************************************/
 
 DBFFieldType SHPAPI_CALL
@@ -1171,20 +1366,21 @@ DBFGetFieldInfo( DBFHandle psDBF, int iField, char * pszFieldName,
     {
 	int	i;
 
-	strncpy( pszFieldName, (char *) psDBF->pszHeader+iField*32, 11 );
-	pszFieldName[11] = '\0';
-	for( i = 10; i > 0 && pszFieldName[i] == ' '; i-- )
+	strncpy( pszFieldName, (char *) psDBF->pszHeader+iField*XBASE_FLDHDR_SZ,
+                 XBASE_FLDNAME_LEN_READ );
+	pszFieldName[XBASE_FLDNAME_LEN_READ] = '\0';
+	for( i = XBASE_FLDNAME_LEN_READ - 1; i > 0 && pszFieldName[i] == ' '; i-- )
 	    pszFieldName[i] = '\0';
     }
 
     if ( psDBF->pachFieldType[iField] == 'L' )
 	return( FTLogical);
 
-    else if( psDBF->pachFieldType[iField] == 'N' 
+    else if( psDBF->pachFieldType[iField] == 'N'
              || psDBF->pachFieldType[iField] == 'F' )
     {
-	if( psDBF->panFieldDecimals[iField] > 0 
-            || psDBF->panFieldSize[iField] > 10 )
+	if( psDBF->panFieldDecimals[iField] > 0
+            || psDBF->panFieldSize[iField] >= 10 )
 	    return( FTDouble );
 	else
 	    return( FTInteger );
@@ -1207,7 +1403,7 @@ static int DBFWriteAttribute(DBFHandle psDBF, int hEntity, int iField,
 {
     int	       	i, j, nRetResult = TRUE;
     unsigned char	*pabyRec;
-    char	szSField[400], szFormat[20];
+    char	szSField[XBASE_FLD_MAX_WIDTH+1], szFormat[20];
 
 /* -------------------------------------------------------------------- */
 /*	Is this a valid record?						*/
@@ -1252,33 +1448,9 @@ static int DBFWriteAttribute(DBFHandle psDBF, int hEntity, int iField,
 /* -------------------------------------------------------------------- */
     if( pValue == NULL )
     {
-        switch(psDBF->pachFieldType[iField])
-        {
-          case 'N':
-          case 'F':
-	    /* NULL numeric fields have value "****************" */
-            memset( (char *) (pabyRec+psDBF->panFieldOffset[iField]), '*', 
-                    psDBF->panFieldSize[iField] );
-            break;
-
-          case 'D':
-	    /* NULL date fields have value "00000000" */
-            memset( (char *) (pabyRec+psDBF->panFieldOffset[iField]), '0', 
-                    psDBF->panFieldSize[iField] );
-            break;
-
-          case 'L':
-	    /* NULL boolean fields have value "?" */ 
-            memset( (char *) (pabyRec+psDBF->panFieldOffset[iField]), '?', 
-                    psDBF->panFieldSize[iField] );
-            break;
-
-          default:
-            /* empty string fields are considered NULL */
-            memset( (char *) (pabyRec+psDBF->panFieldOffset[iField]), ' ', 
-                    psDBF->panFieldSize[iField] );
-            break;
-        }
+        memset( (char *) (pabyRec+psDBF->panFieldOffset[iField]),
+                DBFGetNullCharacter(psDBF->pachFieldType[iField]),
+                psDBF->panFieldSize[iField] );
         return TRUE;
     }
 
@@ -1290,46 +1462,27 @@ static int DBFWriteAttribute(DBFHandle psDBF, int hEntity, int iField,
       case 'D':
       case 'N':
       case 'F':
-	if( psDBF->panFieldDecimals[iField] == 0 )
-	{
-            int		nWidth = psDBF->panFieldSize[iField];
+      {
+        int		nWidth = psDBF->panFieldSize[iField];
 
-            if( (int) sizeof(szSField)-2 < nWidth )
-                nWidth = sizeof(szSField)-2;
+        if( (int) sizeof(szSField)-2 < nWidth )
+            nWidth = sizeof(szSField)-2;
 
-	    sprintf( szFormat, "%%%dd", nWidth );
-	    sprintf(szSField, szFormat, (int) *((double *) pValue) );
-	    if( (int)strlen(szSField) > psDBF->panFieldSize[iField] )
-            {
-	        szSField[psDBF->panFieldSize[iField]] = '\0';
-                nRetResult = FALSE;
-            }
-
-	    strncpy((char *) (pabyRec+psDBF->panFieldOffset[iField]),
-		    szSField, strlen(szSField) );
-	}
-	else
-	{
-            int		nWidth = psDBF->panFieldSize[iField];
-
-            if( (int) sizeof(szSField)-2 < nWidth )
-                nWidth = sizeof(szSField)-2;
-
-	    sprintf( szFormat, "%%%d.%df", 
-                     nWidth, psDBF->panFieldDecimals[iField] );
-	    sprintf(szSField, szFormat, *((double *) pValue) );
-	    if( (int) strlen(szSField) > psDBF->panFieldSize[iField] )
-            {
-	        szSField[psDBF->panFieldSize[iField]] = '\0';
-                nRetResult = FALSE;
-            }
-	    strncpy((char *) (pabyRec+psDBF->panFieldOffset[iField]),
-		    szSField, strlen(szSField) );
-	}
-	break;
+        snprintf( szFormat, sizeof(szFormat), "%%%d.%df",
+                    nWidth, psDBF->panFieldDecimals[iField] );
+        CPLsnprintf(szSField, sizeof(szSField), szFormat, *((double *) pValue) );
+        if( (int) strlen(szSField) > psDBF->panFieldSize[iField] )
+        {
+            szSField[psDBF->panFieldSize[iField]] = '\0';
+            nRetResult = FALSE;
+        }
+        strncpy((char *) (pabyRec+psDBF->panFieldOffset[iField]),
+            szSField, strlen(szSField) );
+        break;
+      }
 
       case 'L':
-        if (psDBF->panFieldSize[iField] >= 1  && 
+        if (psDBF->panFieldSize[iField] >= 1  &&
             (*(char*)pValue == 'F' || *(char*)pValue == 'T'))
             *(pabyRec+psDBF->panFieldOffset[iField]) = *(char*)pValue;
         break;
@@ -1344,7 +1497,7 @@ static int DBFWriteAttribute(DBFHandle psDBF, int hEntity, int iField,
         {
             memset( pabyRec+psDBF->panFieldOffset[iField], ' ',
                     psDBF->panFieldSize[iField] );
-	    j = strlen((char *) pValue);
+	    j = (int)strlen((char *) pValue);
         }
 
 	strncpy((char *) (pabyRec+psDBF->panFieldOffset[iField]),
@@ -1413,7 +1566,7 @@ DBFWriteAttributeDirectly(DBFHandle psDBF, int hEntity, int iField,
     {
         memset( pabyRec+psDBF->panFieldOffset[iField], ' ',
                 psDBF->panFieldSize[iField] );
-        j = strlen((char *) pValue);
+        j = (int)strlen((char *) pValue);
     }
 
     strncpy((char *) (pabyRec+psDBF->panFieldOffset[iField]),
@@ -1577,21 +1730,24 @@ DBFReadTuple(DBFHandle psDBF, int hEntity )
 /************************************************************************/
 
 DBFHandle SHPAPI_CALL
-DBFCloneEmpty(DBFHandle psDBF, const char * pszFilename ) 
+DBFCloneEmpty(DBFHandle psDBF, const char * pszFilename )
 {
     DBFHandle	newDBF;
 
    newDBF = DBFCreateEx ( pszFilename, psDBF->pszCodePage );
-   if ( newDBF == NULL ) return ( NULL ); 
-   
+   if ( newDBF == NULL ) return ( NULL );
+
    newDBF->nFields = psDBF->nFields;
    newDBF->nRecordLength = psDBF->nRecordLength;
    newDBF->nHeaderLength = psDBF->nHeaderLength;
-    
-   newDBF->pszHeader = (char *) malloc ( newDBF->nHeaderLength );
-   memcpy ( newDBF->pszHeader, psDBF->pszHeader, newDBF->nHeaderLength );
-   
-   newDBF->panFieldOffset = (int *) malloc ( sizeof(int) * psDBF->nFields ); 
+
+   if( psDBF->pszHeader )
+   {
+        newDBF->pszHeader = (char *) malloc ( XBASE_FLDHDR_SZ * psDBF->nFields );
+        memcpy ( newDBF->pszHeader, psDBF->pszHeader, XBASE_FLDHDR_SZ * psDBF->nFields );
+   }
+
+   newDBF->panFieldOffset = (int *) malloc ( sizeof(int) * psDBF->nFields );
    memcpy ( newDBF->panFieldOffset, psDBF->panFieldOffset, sizeof(int) * psDBF->nFields );
    newDBF->panFieldSize = (int *) malloc ( sizeof(int) * psDBF->nFields );
    memcpy ( newDBF->panFieldSize, psDBF->panFieldSize, sizeof(int) * psDBF->nFields );
@@ -1602,11 +1758,13 @@ DBFCloneEmpty(DBFHandle psDBF, const char * pszFilename )
 
    newDBF->bNoHeader = TRUE;
    newDBF->bUpdated = TRUE;
-   
+   newDBF->bWriteEndOfFileChar = psDBF->bWriteEndOfFileChar;
+
    DBFWriteHeader ( newDBF );
    DBFClose ( newDBF );
-   
+
    newDBF = DBFOpen ( pszFilename, "rb+" );
+   newDBF->bWriteEndOfFileChar = psDBF->bWriteEndOfFileChar;
 
    return ( newDBF );
 }
@@ -1639,9 +1797,9 @@ DBFGetNativeFieldType( DBFHandle psDBF, int iField )
 static void str_to_upper (char *string)
 {
     int len;
-    short i = -1;
+    int i = -1;
 
-    len = strlen (string);
+    len = (int)strlen (string);
 
     while (++i < len)
         if (isalpha(string[i]) && islower(string[i]))
@@ -1660,20 +1818,23 @@ int SHPAPI_CALL
 DBFGetFieldIndex(DBFHandle psDBF, const char *pszFieldName)
 
 {
-    char          name[12], name1[12], name2[12];
+    char          name[XBASE_FLDNAME_LEN_READ+1],
+                  name1[XBASE_FLDNAME_LEN_READ+1],
+                  name2[XBASE_FLDNAME_LEN_READ+1];
     int           i;
 
-    strncpy(name1, pszFieldName,11);
-    name1[11] = '\0';
+    strncpy(name1, pszFieldName,XBASE_FLDNAME_LEN_READ);
+    name1[XBASE_FLDNAME_LEN_READ] = '\0';
     str_to_upper(name1);
 
     for( i = 0; i < DBFGetFieldCount(psDBF); i++ )
     {
         DBFGetFieldInfo( psDBF, i, name, NULL, NULL );
-        strncpy(name2,name,11);
+        strncpy(name2,name,XBASE_FLDNAME_LEN_READ);
+        name2[XBASE_FLDNAME_LEN_READ] = '\0';
         str_to_upper(name2);
 
-        if(!strncmp(name1,name2,10))
+        if(!strcmp(name1,name2))
             return(i);
     }
     return(-1);
@@ -1711,7 +1872,7 @@ int SHPAPI_CALL DBFIsRecordDeleted( DBFHandle psDBF, int iShape )
 /*                        DBFMarkRecordDeleted()                        */
 /************************************************************************/
 
-int SHPAPI_CALL DBFMarkRecordDeleted( DBFHandle psDBF, int iShape, 
+int SHPAPI_CALL DBFMarkRecordDeleted( DBFHandle psDBF, int iShape,
                                       int bIsDeleted )
 
 {
@@ -1735,7 +1896,7 @@ int SHPAPI_CALL DBFMarkRecordDeleted( DBFHandle psDBF, int iShape,
 /* -------------------------------------------------------------------- */
     if( bIsDeleted )
         chNewFlag = '*';
-    else 
+    else
         chNewFlag = ' ';
 
     if( psDBF->pszCurrentRecord[0] != chNewFlag )
@@ -1800,28 +1961,29 @@ DBFDeleteField(DBFHandle psDBF, int iField)
     /* resize fields arrays */
     psDBF->nFields--;
 
-    psDBF->panFieldOffset = (int *) 
+    psDBF->panFieldOffset = (int *)
         SfRealloc( psDBF->panFieldOffset, sizeof(int) * psDBF->nFields );
 
-    psDBF->panFieldSize = (int *) 
+    psDBF->panFieldSize = (int *)
         SfRealloc( psDBF->panFieldSize, sizeof(int) * psDBF->nFields );
 
-    psDBF->panFieldDecimals = (int *) 
+    psDBF->panFieldDecimals = (int *)
         SfRealloc( psDBF->panFieldDecimals, sizeof(int) * psDBF->nFields );
 
-    psDBF->pachFieldType = (char *) 
+    psDBF->pachFieldType = (char *)
         SfRealloc( psDBF->pachFieldType, sizeof(char) * psDBF->nFields );
 
     /* update header information */
-    psDBF->nHeaderLength -= 32;
+    psDBF->nHeaderLength -= XBASE_FLDHDR_SZ;
     psDBF->nRecordLength -= nDeletedFieldSize;
 
     /* overwrite field information in header */
-    memcpy(psDBF->pszHeader + iField*32,
-           psDBF->pszHeader + (iField+1)*32,
-           sizeof(char) * (psDBF->nFields - iField)*32);
+    memmove(psDBF->pszHeader + iField*XBASE_FLDHDR_SZ,
+           psDBF->pszHeader + (iField+1)*XBASE_FLDHDR_SZ,
+           sizeof(char) * (psDBF->nFields - iField)*XBASE_FLDHDR_SZ);
 
-    psDBF->pszHeader = (char *) SfRealloc(psDBF->pszHeader,psDBF->nFields*32);
+    psDBF->pszHeader = (char *) SfRealloc(psDBF->pszHeader,
+                                          psDBF->nFields*XBASE_FLDHDR_SZ);
 
     /* update size of current record appropriately */
     psDBF->pszCurrentRecord = (char *) SfRealloc(psDBF->pszCurrentRecord,
@@ -1841,14 +2003,14 @@ DBFDeleteField(DBFHandle psDBF, int iField)
     /* shift records to their new positions */
     for (iRecord = 0; iRecord < psDBF->nRecords; iRecord++)
     {
-        nRecordOffset = 
+        nRecordOffset =
             nOldRecordLength * (SAOffset) iRecord + nOldHeaderLength;
 
         /* load record */
         psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 );
         psDBF->sHooks.FRead( pszRecord, nOldRecordLength, 1, psDBF->fp );
 
-        nRecordOffset = 
+        nRecordOffset =
             psDBF->nRecordLength * (SAOffset) iRecord + psDBF->nHeaderLength;
 
         /* move record in two steps */
@@ -1860,10 +2022,384 @@ DBFDeleteField(DBFHandle psDBF, int iField)
 
     }
 
+    if( psDBF->bWriteEndOfFileChar )
+    {
+        char ch = END_OF_FILE_CHARACTER;
+        psDBF->sHooks.FWrite( &ch, 1, 1, psDBF->fp );
+    }
+
     /* TODO: truncate file */
 
     /* free record */
     free(pszRecord);
 
+    psDBF->nCurrentRecord = -1;
+    psDBF->bCurrentRecordModified = FALSE;
+    psDBF->bUpdated = TRUE;
+
+    return TRUE;
+}
+
+/************************************************************************/
+/*                          DBFReorderFields()                          */
+/*                                                                      */
+/*      Reorder the fields of a .dbf file                               */
+/*                                                                      */
+/* panMap must be exactly psDBF->nFields long and be a permutation      */
+/* of [0, psDBF->nFields-1]. This assumption will not be asserted in the*/
+/* code of DBFReorderFields.                                            */
+/************************************************************************/
+
+int SHPAPI_CALL
+DBFReorderFields( DBFHandle psDBF, int* panMap )
+{
+    SAOffset nRecordOffset;
+    int      i, iRecord;
+    int     *panFieldOffsetNew;
+    int     *panFieldSizeNew;
+    int     *panFieldDecimalsNew;
+    char    *pachFieldTypeNew;
+    char    *pszHeaderNew;
+    char    *pszRecord;
+    char    *pszRecordNew;
+
+    if ( psDBF->nFields == 0 )
+        return TRUE;
+
+    /* make sure that everything is written in .dbf */
+    if( !DBFFlushRecord( psDBF ) )
+        return FALSE;
+
+    /* a simple malloc() would be enough, but calloc() helps clang static analyzer */
+    panFieldOffsetNew = (int *) calloc(sizeof(int), psDBF->nFields);
+    panFieldSizeNew = (int *) calloc(sizeof(int),  psDBF->nFields);
+    panFieldDecimalsNew = (int *) calloc(sizeof(int), psDBF->nFields);
+    pachFieldTypeNew = (char *) calloc(sizeof(char), psDBF->nFields);
+    pszHeaderNew = (char*) malloc(sizeof(char) * XBASE_FLDHDR_SZ * 
+                                  psDBF->nFields);
+
+    /* shuffle fields definitions */
+    for(i=0; i < psDBF->nFields; i++)
+    {
+        panFieldSizeNew[i] = psDBF->panFieldSize[panMap[i]];
+        panFieldDecimalsNew[i] = psDBF->panFieldDecimals[panMap[i]];
+        pachFieldTypeNew[i] = psDBF->pachFieldType[panMap[i]];
+        memcpy(pszHeaderNew + i * XBASE_FLDHDR_SZ,
+               psDBF->pszHeader + panMap[i] * XBASE_FLDHDR_SZ, XBASE_FLDHDR_SZ);
+    }
+    panFieldOffsetNew[0] = 1;
+    for(i=1; i < psDBF->nFields; i++)
+    {
+        panFieldOffsetNew[i] = panFieldOffsetNew[i - 1] + panFieldSizeNew[i - 1];
+    }
+
+    free(psDBF->pszHeader);
+    psDBF->pszHeader = pszHeaderNew;
+
+    /* we're done if we're dealing with not yet created .dbf */
+    if ( !(psDBF->bNoHeader && psDBF->nRecords == 0) )
+    {
+        /* force update of header with new header and record length */
+        psDBF->bNoHeader = TRUE;
+        DBFUpdateHeader( psDBF );
+
+        /* alloc record */
+        pszRecord = (char *) malloc(sizeof(char) * psDBF->nRecordLength);
+        pszRecordNew = (char *) malloc(sizeof(char) * psDBF->nRecordLength);
+
+        /* shuffle fields in records */
+        for (iRecord = 0; iRecord < psDBF->nRecords; iRecord++)
+        {
+            nRecordOffset =
+                psDBF->nRecordLength * (SAOffset) iRecord + psDBF->nHeaderLength;
+
+            /* load record */
+            psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 );
+            psDBF->sHooks.FRead( pszRecord, psDBF->nRecordLength, 1, psDBF->fp );
+
+            pszRecordNew[0] = pszRecord[0];
+
+            for(i=0; i < psDBF->nFields; i++)
+            {
+                memcpy(pszRecordNew + panFieldOffsetNew[i],
+                       pszRecord + psDBF->panFieldOffset[panMap[i]],
+                       psDBF->panFieldSize[panMap[i]]);
+            }
+
+            /* write record */
+            psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 );
+            psDBF->sHooks.FWrite( pszRecordNew, psDBF->nRecordLength, 1, psDBF->fp );
+        }
+
+        /* free record */
+        free(pszRecord);
+        free(pszRecordNew);
+    }
+
+    free(psDBF->panFieldOffset);
+    free(psDBF->panFieldSize);
+    free(psDBF->panFieldDecimals);
+    free(psDBF->pachFieldType);
+
+    psDBF->panFieldOffset = panFieldOffsetNew;
+    psDBF->panFieldSize = panFieldSizeNew;
+    psDBF->panFieldDecimals =panFieldDecimalsNew;
+    psDBF->pachFieldType = pachFieldTypeNew;
+
+    psDBF->nCurrentRecord = -1;
+    psDBF->bCurrentRecordModified = FALSE;
+    psDBF->bUpdated = TRUE;
+
     return TRUE;
 }
+
+
+/************************************************************************/
+/*                          DBFAlterFieldDefn()                         */
+/*                                                                      */
+/*      Alter a field definition in a .dbf file                         */
+/************************************************************************/
+
+int SHPAPI_CALL
+DBFAlterFieldDefn( DBFHandle psDBF, int iField, const char * pszFieldName,
+                    char chType, int nWidth, int nDecimals )
+{
+    int   i;
+    int   iRecord;
+    int   nOffset;
+    int   nOldWidth;
+    int   nOldRecordLength;
+    SAOffset  nRecordOffset;
+    char* pszFInfo;
+    char  chOldType;
+    int   bIsNULL;
+    char chFieldFill;
+
+    if (iField < 0 || iField >= psDBF->nFields)
+        return FALSE;
+
+    /* make sure that everything is written in .dbf */
+    if( !DBFFlushRecord( psDBF ) )
+        return FALSE;
+
+    chFieldFill = DBFGetNullCharacter(chType);
+
+    chOldType = psDBF->pachFieldType[iField];
+    nOffset = psDBF->panFieldOffset[iField];
+    nOldWidth = psDBF->panFieldSize[iField];
+    nOldRecordLength = psDBF->nRecordLength;
+
+/* -------------------------------------------------------------------- */
+/*      Do some checking to ensure we can add records to this file.     */
+/* -------------------------------------------------------------------- */
+    if( nWidth < 1 )
+        return -1;
+
+    if( nWidth > XBASE_FLD_MAX_WIDTH )
+        nWidth = XBASE_FLD_MAX_WIDTH;
+
+/* -------------------------------------------------------------------- */
+/*      Assign the new field information fields.                        */
+/* -------------------------------------------------------------------- */
+    psDBF->panFieldSize[iField] = nWidth;
+    psDBF->panFieldDecimals[iField] = nDecimals;
+    psDBF->pachFieldType[iField] = chType;
+
+/* -------------------------------------------------------------------- */
+/*      Update the header information.                                  */
+/* -------------------------------------------------------------------- */
+    pszFInfo = psDBF->pszHeader + XBASE_FLDHDR_SZ * iField;
+
+    for( i = 0; i < XBASE_FLDHDR_SZ; i++ )
+        pszFInfo[i] = '\0';
+
+    strncpy( pszFInfo, pszFieldName, XBASE_FLDNAME_LEN_WRITE );
+
+    pszFInfo[11] = psDBF->pachFieldType[iField];
+
+    if( chType == 'C' )
+    {
+        pszFInfo[16] = (unsigned char) (nWidth % 256);
+        pszFInfo[17] = (unsigned char) (nWidth / 256);
+    }
+    else
+    {
+        pszFInfo[16] = (unsigned char) nWidth;
+        pszFInfo[17] = (unsigned char) nDecimals;
+    }
+
+/* -------------------------------------------------------------------- */
+/*      Update offsets                                                  */
+/* -------------------------------------------------------------------- */
+    if (nWidth != nOldWidth)
+    {
+        for (i = iField + 1; i < psDBF->nFields; i++)
+             psDBF->panFieldOffset[i] += nWidth - nOldWidth;
+        psDBF->nRecordLength += nWidth - nOldWidth;
+
+        psDBF->pszCurrentRecord = (char *) SfRealloc(psDBF->pszCurrentRecord,
+                                                     psDBF->nRecordLength);
+    }
+
+    /* we're done if we're dealing with not yet created .dbf */
+    if ( psDBF->bNoHeader && psDBF->nRecords == 0 )
+        return TRUE;
+
+    /* force update of header with new header and record length */
+    psDBF->bNoHeader = TRUE;
+    DBFUpdateHeader( psDBF );
+
+    if (nWidth < nOldWidth || (nWidth == nOldWidth && chType != chOldType))
+    {
+        char* pszRecord = (char *) malloc(sizeof(char) * nOldRecordLength);
+        char* pszOldField = (char *) malloc(sizeof(char) * (nOldWidth + 1));
+
+        /* cppcheck-suppress uninitdata */
+        pszOldField[nOldWidth] = 0;
+
+        /* move records to their new positions */
+        for (iRecord = 0; iRecord < psDBF->nRecords; iRecord++)
+        {
+            nRecordOffset =
+                nOldRecordLength * (SAOffset) iRecord + psDBF->nHeaderLength;
+
+            /* load record */
+            psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 );
+            psDBF->sHooks.FRead( pszRecord, nOldRecordLength, 1, psDBF->fp );
+
+            memcpy(pszOldField, pszRecord + nOffset, nOldWidth);
+            bIsNULL = DBFIsValueNULL( chOldType, pszOldField );
+
+            if (nWidth != nOldWidth)
+            {
+                if ((chOldType == 'N' || chOldType == 'F') && pszOldField[0] == ' ')
+                {
+                    /* Strip leading spaces when truncating a numeric field */
+                    memmove( pszRecord + nOffset,
+                            pszRecord + nOffset + nOldWidth - nWidth,
+                            nWidth );
+                }
+                if (nOffset + nOldWidth < nOldRecordLength)
+                {
+                    memmove( pszRecord + nOffset + nWidth,
+                            pszRecord + nOffset + nOldWidth,
+                            nOldRecordLength - (nOffset + nOldWidth));
+                }
+            }
+
+            /* Convert null value to the appropriate value of the new type */
+            if (bIsNULL)
+            {
+                memset( pszRecord + nOffset, chFieldFill, nWidth);
+            }
+
+            nRecordOffset =
+                psDBF->nRecordLength * (SAOffset) iRecord + psDBF->nHeaderLength;
+
+            /* write record */
+            psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 );
+            psDBF->sHooks.FWrite( pszRecord, psDBF->nRecordLength, 1, psDBF->fp );
+        }
+
+        if( psDBF->bWriteEndOfFileChar )
+        {
+            char ch = END_OF_FILE_CHARACTER;
+
+            nRecordOffset =
+                psDBF->nRecordLength * (SAOffset) psDBF->nRecords + psDBF->nHeaderLength;
+
+            psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 );
+            psDBF->sHooks.FWrite( &ch, 1, 1, psDBF->fp );
+        }
+        /* TODO: truncate file */
+
+        free(pszRecord);
+        free(pszOldField);
+    }
+    else if (nWidth > nOldWidth)
+    {
+        char* pszRecord = (char *) malloc(sizeof(char) * psDBF->nRecordLength);
+        char* pszOldField = (char *) malloc(sizeof(char) * (nOldWidth + 1));
+
+        /* cppcheck-suppress uninitdata */
+        pszOldField[nOldWidth] = 0;
+
+        /* move records to their new positions */
+        for (iRecord = psDBF->nRecords - 1; iRecord >= 0; iRecord--)
+        {
+            nRecordOffset =
+                nOldRecordLength * (SAOffset) iRecord + psDBF->nHeaderLength;
+
+            /* load record */
+            psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 );
+            psDBF->sHooks.FRead( pszRecord, nOldRecordLength, 1, psDBF->fp );
+
+            memcpy(pszOldField, pszRecord + nOffset, nOldWidth);
+            bIsNULL = DBFIsValueNULL( chOldType, pszOldField );
+
+            if (nOffset + nOldWidth < nOldRecordLength)
+            {
+                memmove( pszRecord + nOffset + nWidth,
+                         pszRecord + nOffset + nOldWidth,
+                         nOldRecordLength - (nOffset + nOldWidth));
+            }
+
+            /* Convert null value to the appropriate value of the new type */
+            if (bIsNULL)
+            {
+                memset( pszRecord + nOffset, chFieldFill, nWidth);
+            }
+            else
+            {
+                if ((chOldType == 'N' || chOldType == 'F'))
+                {
+                    /* Add leading spaces when expanding a numeric field */
+                    memmove( pszRecord + nOffset + nWidth - nOldWidth,
+                             pszRecord + nOffset, nOldWidth );
+                    memset( pszRecord + nOffset, ' ', nWidth - nOldWidth );
+                }
+                else
+                {
+                    /* Add trailing spaces */
+                    memset(pszRecord + nOffset + nOldWidth, ' ', nWidth - nOldWidth);
+                }
+            }
+
+            nRecordOffset =
+                psDBF->nRecordLength * (SAOffset) iRecord + psDBF->nHeaderLength;
+
+            /* write record */
+            psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 );
+            psDBF->sHooks.FWrite( pszRecord, psDBF->nRecordLength, 1, psDBF->fp );
+        }
+
+        if( psDBF->bWriteEndOfFileChar )
+        {
+            char ch = END_OF_FILE_CHARACTER;
+
+            nRecordOffset =
+                psDBF->nRecordLength * (SAOffset) psDBF->nRecords + psDBF->nHeaderLength;
+
+            psDBF->sHooks.FSeek( psDBF->fp, nRecordOffset, 0 );
+            psDBF->sHooks.FWrite( &ch, 1, 1, psDBF->fp );
+        }
+
+        free(pszRecord);
+        free(pszOldField);
+    }
+
+    psDBF->nCurrentRecord = -1;
+    psDBF->bCurrentRecordModified = FALSE;
+    psDBF->bUpdated = TRUE;
+
+    return TRUE;
+}
+
+/************************************************************************/
+/*                    DBFSetWriteEndOfFileChar()                        */
+/************************************************************************/
+
+void SHPAPI_CALL DBFSetWriteEndOfFileChar( DBFHandle psDBF, int bWriteFlag )
+{
+    psDBF->bWriteEndOfFileChar = bWriteFlag;
+}
diff --git a/navit/support/shapefile/shapefil.h b/navit/support/shapefile/shapefil.h
index 059244b03..08c645996 100644
--- a/navit/support/shapefile/shapefil.h
+++ b/navit/support/shapefile/shapefil.h
@@ -2,7 +2,7 @@
 #define SHAPEFILE_H_INCLUDED
 
 /******************************************************************************
- * $Id: shapefil.h 15715 2008-11-12 15:15:21Z warmerdam $
+ * $Id: shapefil.h,v 1.55 2016-12-05 18:44:08 erouault Exp $
  *
  * Project:  Shapelib
  * Purpose:  Primary include file for Shapelib.
@@ -10,13 +10,14 @@
  *
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
+ * Copyright (c) 2012-2016, Even Rouault <even dot rouault at mines-paris dot org>
  *
  * This software is available under the following "MIT Style" license,
- * or at the option of the licensee under the LGPL (see LICENSE.LGPL).  This
+ * or at the option of the licensee under the LGPL (see COPYING).  This
  * option is discussed in more detail in shapelib.html.
  *
  * --
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
@@ -37,7 +38,52 @@
  ******************************************************************************
  *
  * $Log: shapefil.h,v $
- * Revision 1.46  2008/11/12 14:28:15  fwarmerdam
+ * Revision 1.55  2016-12-05 18:44:08  erouault
+ * * dbfopen.c, shapefil.h: write DBF end-of-file character 0x1A by default.
+ * This behaviour can be controlled with the DBFSetWriteEndOfFileChar()
+ * function.
+ *
+ * Revision 1.54  2016-12-05 12:44:05  erouault
+ * * Major overhaul of Makefile build system to use autoconf/automake.
+ *
+ * * Warning fixes in contrib/
+ *
+ * Revision 1.53  2016-12-04 15:30:15  erouault
+ * * shpopen.c, dbfopen.c, shptree.c, shapefil.h: resync with
+ * GDAL Shapefile driver. Mostly cleanups. SHPObject and DBFInfo
+ * structures extended with new members. New functions:
+ * DBFSetLastModifiedDate, SHPOpenLLEx, SHPRestoreSHX,
+ * SHPSetFastModeReadObject
+ *
+ * * sbnsearch.c: new file to implement original ESRI .sbn spatial
+ * index reading. (no write support). New functions:
+ * SBNOpenDiskTree, SBNCloseDiskTree, SBNSearchDiskTree,
+ * SBNSearchDiskTreeInteger, SBNSearchFreeIds
+ *
+ * * Makefile, makefile.vc, CMakeLists.txt, shapelib.def: updates
+ * with new file and symbols.
+ *
+ * * commit: helper script to cvs commit
+ *
+ * Revision 1.52  2011-12-11 22:26:46  fwarmerdam
+ * upgrade .qix access code to use SAHooks (gdal #3365)
+ *
+ * Revision 1.51  2011-07-24 05:59:25  fwarmerdam
+ * minimize use of CPLError in favor of SAHooks.Error()
+ *
+ * Revision 1.50  2011-05-13 17:35:17  fwarmerdam
+ * added DBFReorderFields() and DBFAlterFields() functions (from Even)
+ *
+ * Revision 1.49  2011-04-16 14:38:21  fwarmerdam
+ * avoid warnings with gcc on SHP_CVSID
+ *
+ * Revision 1.48  2010-08-27 23:42:52  fwarmerdam
+ * add SHPAPI_CALL attribute in code
+ *
+ * Revision 1.47  2010-01-28 11:34:34  fwarmerdam
+ * handle the shape file length limits more gracefully (#3236)
+ *
+ * Revision 1.46  2008-11-12 14:28:15  fwarmerdam
  * DBFCreateField() now works on files with records
  *
  * Revision 1.45  2008/11/11 17:47:10  fwarmerdam
@@ -129,8 +175,7 @@
 #endif
 
 #ifdef USE_CPL
-#include "cpl_error.h"
-#include "cpl_vsi.h"
+#include "cpl_conv.h"
 #endif
 
 #ifdef __cplusplus
@@ -153,7 +198,7 @@ extern "C" {
 /*      is disabled.                                                    */
 /* -------------------------------------------------------------------- */
 #define DISABLE_MULTIPATCH_MEASURE
-    
+
 /* -------------------------------------------------------------------- */
 /*      SHPAPI_CALL                                                     */
 /*                                                                      */
@@ -177,7 +222,7 @@ extern "C" {
 /*        #define SHPAPI_CALL __declspec(dllexport) __stdcall           */
 /*        #define SHPAPI_CALL1 __declspec(dllexport) * __stdcall        */
 /*                                                                      */
-/*      The complexity of the situtation is partly caused by the        */
+/*      The complexity of the situation is partly caused by the        */
 /*      peculiar requirement of Visual C++ that __stdcall appear        */
 /*      after any "*"'s in the return value of a function while the     */
 /*      __declspec(dllexport) must appear before them.                  */
@@ -200,14 +245,18 @@ extern "C" {
 #ifndef SHPAPI_CALL1
 #  define SHPAPI_CALL1(x)      x SHPAPI_CALL
 #endif
-    
+
 /* -------------------------------------------------------------------- */
 /*      Macros for controlling CVSID and ensuring they don't appear     */
 /*      as unreferenced variables resulting in lots of warnings.        */
 /* -------------------------------------------------------------------- */
 #ifndef DISABLE_CVSID
-#  define SHP_CVSID(string)     static char cpl_cvsid[] = string; \
-static char *cvsid_aw() { return( cvsid_aw() ? ((char *) NULL) : cpl_cvsid ); }
+#  if defined(__GNUC__) && __GNUC__ >= 4
+#    define SHP_CVSID(string)     static const char cpl_cvsid[] __attribute__((used)) = string;
+#  else
+#    define SHP_CVSID(string)     static const char cpl_cvsid[] = string; \
+static const char *cvsid_aw() { return( cvsid_aw() ? NULL : cpl_cvsid ); }
+#  endif
 #else
 #  define SHP_CVSID(string)
 #endif
@@ -217,8 +266,8 @@ static char *cvsid_aw() { return( cvsid_aw() ? ((char *) NULL) : cpl_cvsid ); }
 /*      UTF-8 encoded filenames Unicode filenames                       */
 /* -------------------------------------------------------------------- */
 #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
-#	define SHPAPI_WINDOWS
-#	define SHPAPI_UTF8_HOOKS
+#  define SHPAPI_WINDOWS
+#  define SHPAPI_UTF8_HOOKS
 #endif
 
 /* -------------------------------------------------------------------- */
@@ -252,29 +301,36 @@ void SHPAPI_CALL SASetupUtf8Hooks( SAHooks *psHooks );
 /************************************************************************/
 /*                             SHP Support.                             */
 /************************************************************************/
-typedef	struct
+typedef struct tagSHPObject SHPObject;
+
+typedef struct
 {
     SAHooks sHooks;
 
     SAFile      fpSHP;
-    SAFile 	fpSHX;
+    SAFile      fpSHX;
+
+    int         nShapeType;  /* SHPT_* */
 
-    int		nShapeType;				/* SHPT_* */
-    
-    int		nFileSize;				/* SHP file */
+    unsigned int nFileSize;  /* SHP file */
 
     int         nRecords;
-    int		nMaxRecords;
-    int		*panRecOffset;
-    int		*panRecSize;
+    int         nMaxRecords;
+    unsigned int*panRecOffset;
+    unsigned int *panRecSize;
 
-    double	adBoundsMin[4];
-    double	adBoundsMax[4];
+    double      adBoundsMin[4];
+    double      adBoundsMax[4];
 
-    int		bUpdated;
+    int         bUpdated;
 
     unsigned char *pabyRec;
     int         nBufSize;
+
+    int            bFastModeReadObject;
+    unsigned char *pabyObjectBuf;
+    int            nObjectBufSize;
+    SHPObject*     psCachedObject;
 } SHPInfo;
 
 typedef SHPInfo * SHPHandle;
@@ -282,66 +338,66 @@ typedef SHPInfo * SHPHandle;
 /* -------------------------------------------------------------------- */
 /*      Shape types (nSHPType)                                          */
 /* -------------------------------------------------------------------- */
-#define SHPT_NULL	0
-#define SHPT_POINT	1
-#define SHPT_ARC	3
-#define SHPT_POLYGON	5
-#define SHPT_MULTIPOINT	8
-#define SHPT_POINTZ	11
-#define SHPT_ARCZ	13
-#define SHPT_POLYGONZ	15
+#define SHPT_NULL       0
+#define SHPT_POINT      1
+#define SHPT_ARC        3
+#define SHPT_POLYGON    5
+#define SHPT_MULTIPOINT 8
+#define SHPT_POINTZ     11
+#define SHPT_ARCZ       13
+#define SHPT_POLYGONZ   15
 #define SHPT_MULTIPOINTZ 18
-#define SHPT_POINTM	21
-#define SHPT_ARCM	23
-#define SHPT_POLYGONM	25
+#define SHPT_POINTM     21
+#define SHPT_ARCM       23
+#define SHPT_POLYGONM   25
 #define SHPT_MULTIPOINTM 28
 #define SHPT_MULTIPATCH 31
 
-
 /* -------------------------------------------------------------------- */
 /*      Part types - everything but SHPT_MULTIPATCH just uses           */
 /*      SHPP_RING.                                                      */
 /* -------------------------------------------------------------------- */
 
-#define SHPP_TRISTRIP	0
-#define SHPP_TRIFAN	1
-#define SHPP_OUTERRING	2
-#define SHPP_INNERRING	3
-#define SHPP_FIRSTRING	4
-#define SHPP_RING	5
+#define SHPP_TRISTRIP   0
+#define SHPP_TRIFAN     1
+#define SHPP_OUTERRING  2
+#define SHPP_INNERRING  3
+#define SHPP_FIRSTRING  4
+#define SHPP_RING       5
 
 /* -------------------------------------------------------------------- */
 /*      SHPObject - represents on shape (without attributes) read       */
 /*      from the .shp file.                                             */
 /* -------------------------------------------------------------------- */
-typedef struct
+struct tagSHPObject
 {
-    int		nSHPType;
+    int    nSHPType;
 
-    int		nShapeId; /* -1 is unknown/unassigned */
+    int    nShapeId;  /* -1 is unknown/unassigned */
 
-    int		nParts;
-    int		*panPartStart;
-    int		*panPartType;
-    
-    int		nVertices;
-    double	*padfX;
-    double	*padfY;
-    double	*padfZ;
-    double	*padfM;
+    int    nParts;
+    int    *panPartStart;
+    int    *panPartType;
 
-    double	dfXMin;
-    double	dfYMin;
-    double	dfZMin;
-    double	dfMMin;
+    int    nVertices;
+    double *padfX;
+    double *padfY;
+    double *padfZ;
+    double *padfM;
 
-    double	dfXMax;
-    double	dfYMax;
-    double	dfZMax;
-    double	dfMMax;
+    double dfXMin;
+    double dfYMin;
+    double dfZMin;
+    double dfMMin;
 
-    int		bMeasureIsUsed;
-} SHPObject;
+    double dfXMax;
+    double dfYMax;
+    double dfZMax;
+    double dfMMax;
+
+    int    bMeasureIsUsed;
+    int    bFastModeReadObject;
+};
 
 /* -------------------------------------------------------------------- */
 /*      SHP API Prototypes                                              */
@@ -352,9 +408,23 @@ typedef struct
 SHPHandle SHPAPI_CALL
       SHPOpen( const char * pszShapeFile, const char * pszAccess );
 SHPHandle SHPAPI_CALL
-      SHPOpenLL( const char *pszShapeFile, const char *pszAccess, 
+      SHPOpenLL( const char *pszShapeFile, const char *pszAccess,
                  SAHooks *psHooks );
 SHPHandle SHPAPI_CALL
+      SHPOpenLLEx( const char *pszShapeFile, const char *pszAccess,
+                  SAHooks *psHooks, int bRestoreSHX );
+
+int SHPAPI_CALL
+      SHPRestoreSHX( const char *pszShapeFile, const char *pszAccess,
+                  SAHooks *psHooks );
+
+/* If setting bFastMode = TRUE, the content of SHPReadObject() is owned by the SHPHandle. */
+/* So you cannot have 2 valid instances of SHPReadObject() simultaneously. */
+/* The SHPObject padfZ and padfM members may be NULL depending on the geometry */
+/* type. It is illegal to free at hand any of the pointer members of the SHPObject structure */
+void SHPAPI_CALL SHPSetFastModeReadObject( SHPHandle hSHP, int bFastMode );
+
+SHPHandle SHPAPI_CALL
       SHPCreate( const char * pszShapeFile, int nShapeType );
 SHPHandle SHPAPI_CALL
       SHPCreateLL( const char * pszShapeFile, int nShapeType,
@@ -373,15 +443,15 @@ void SHPAPI_CALL
 void SHPAPI_CALL
       SHPComputeExtents( SHPObject * psObject );
 SHPObject SHPAPI_CALL1(*)
-      SHPCreateObject( int nSHPType, int nShapeId, int nParts, 
+      SHPCreateObject( int nSHPType, int nShapeId, int nParts,
                        const int * panPartStart, const int * panPartType,
-                       int nVertices, 
+                       int nVertices,
                        const double * padfX, const double * padfY,
                        const double * padfZ, const double * padfM );
 SHPObject SHPAPI_CALL1(*)
       SHPCreateSimpleObject( int nSHPType, int nVertices,
-                             const double * padfX, 
-                             const double * padfY, 
+                             const double * padfX,
+                             const double * padfY,
                              const double * padfZ );
 
 int SHPAPI_CALL
@@ -400,7 +470,7 @@ const char SHPAPI_CALL1(*)
 /* -------------------------------------------------------------------- */
 
 /* this can be two or four for binary or quad tree */
-#define MAX_SUBNODE	4
+#define MAX_SUBNODE 4
 
 /* upper limit of tree levels for automatic estimation */
 #define MAX_DEFAULT_TREE_DEPTH 12
@@ -408,100 +478,150 @@ const char SHPAPI_CALL1(*)
 typedef struct shape_tree_node
 {
     /* region covered by this node */
-    double	adfBoundsMin[4];
-    double	adfBoundsMax[4];
+    double      adfBoundsMin[4];
+    double      adfBoundsMax[4];
 
     /* list of shapes stored at this node.  The papsShapeObj pointers
        or the whole list can be NULL */
-    int		nShapeCount;
-    int		*panShapeIds;
+    int         nShapeCount;
+    int         *panShapeIds;
     SHPObject   **papsShapeObj;
 
-    int		nSubNodes;
+    int         nSubNodes;
     struct shape_tree_node *apsSubNode[MAX_SUBNODE];
-    
+
 } SHPTreeNode;
 
 typedef struct
 {
     SHPHandle   hSHP;
-    
-    int		nMaxDepth;
-    int		nDimension;
+
+    int         nMaxDepth;
+    int         nDimension;
     int         nTotalCount;
-    
-    SHPTreeNode	*psRoot;
+
+    SHPTreeNode *psRoot;
 } SHPTree;
 
 SHPTree SHPAPI_CALL1(*)
       SHPCreateTree( SHPHandle hSHP, int nDimension, int nMaxDepth,
                      double *padfBoundsMin, double *padfBoundsMax );
-void    SHPAPI_CALL
+void SHPAPI_CALL
       SHPDestroyTree( SHPTree * hTree );
 
-int	SHPAPI_CALL
+int SHPAPI_CALL
       SHPWriteTree( SHPTree *hTree, const char * pszFilename );
-SHPTree SHPAPI_CALL
-      SHPReadTree( const char * pszFilename );
 
-int	SHPAPI_CALL
-      SHPTreeAddObject( SHPTree * hTree, SHPObject * psObject );
-int	SHPAPI_CALL
+int SHPAPI_CALL
       SHPTreeAddShapeId( SHPTree * hTree, SHPObject * psObject );
-int	SHPAPI_CALL
+int SHPAPI_CALL
       SHPTreeRemoveShapeId( SHPTree * hTree, int nShapeId );
 
-void 	SHPAPI_CALL
+void SHPAPI_CALL
       SHPTreeTrimExtraNodes( SHPTree * hTree );
 
-int    SHPAPI_CALL1(*)
+int SHPAPI_CALL1(*)
       SHPTreeFindLikelyShapes( SHPTree * hTree,
                                double * padfBoundsMin,
                                double * padfBoundsMax,
                                int * );
-int     SHPAPI_CALL
+int SHPAPI_CALL
       SHPCheckBoundsOverlap( double *, double *, double *, double *, int );
 
-int SHPAPI_CALL1(*) 
-SHPSearchDiskTree( FILE *fp, 
+int SHPAPI_CALL1(*)
+SHPSearchDiskTree( FILE *fp,
                    double *padfBoundsMin, double *padfBoundsMax,
                    int *pnShapeCount );
 
+typedef struct SHPDiskTreeInfo* SHPTreeDiskHandle;
+
+SHPTreeDiskHandle SHPAPI_CALL
+    SHPOpenDiskTree( const char* pszQIXFilename,
+                     SAHooks *psHooks );
+
+void SHPAPI_CALL
+    SHPCloseDiskTree( SHPTreeDiskHandle hDiskTree );
+
+int SHPAPI_CALL1(*)
+SHPSearchDiskTreeEx( SHPTreeDiskHandle hDiskTree,
+                     double *padfBoundsMin, double *padfBoundsMax,
+                     int *pnShapeCount );
+
+int SHPAPI_CALL
+    SHPWriteTreeLL(SHPTree *hTree, const char *pszFilename, SAHooks *psHooks );
+
+/* -------------------------------------------------------------------- */
+/*      SBN Search API                                                  */
+/* -------------------------------------------------------------------- */
+
+typedef struct SBNSearchInfo* SBNSearchHandle;
+
+SBNSearchHandle SHPAPI_CALL
+    SBNOpenDiskTree( const char* pszSBNFilename,
+                 SAHooks *psHooks );
+
+void SHPAPI_CALL
+    SBNCloseDiskTree( SBNSearchHandle hSBN );
+
+int SHPAPI_CALL1(*)
+SBNSearchDiskTree( SBNSearchHandle hSBN,
+                   double *padfBoundsMin, double *padfBoundsMax,
+                   int *pnShapeCount );
+
+int SHPAPI_CALL1(*)
+SBNSearchDiskTreeInteger( SBNSearchHandle hSBN,
+                          int bMinX, int bMinY, int bMaxX, int bMaxY,
+                          int *pnShapeCount );
+
+void SHPAPI_CALL SBNSearchFreeIds( int* panShapeId );
+
 /************************************************************************/
 /*                             DBF Support.                             */
 /************************************************************************/
-typedef	struct
+typedef struct
 {
     SAHooks sHooks;
 
-    SAFile	fp;
+    SAFile      fp;
 
     int         nRecords;
 
-    int		nRecordLength;
-    int		nHeaderLength;
-    int		nFields;
-    int		*panFieldOffset;
-    int		*panFieldSize;
-    int		*panFieldDecimals;
-    char	*pachFieldType;
+    int         nRecordLength; /* Must fit on uint16 */
+    int         nHeaderLength; /* File header length (32) + field
+                                  descriptor length + spare space.
+                                  Must fit on uint16 */
+    int         nFields;
+    int         *panFieldOffset;
+    int         *panFieldSize;
+    int         *panFieldDecimals;
+    char        *pachFieldType;
 
-    char	*pszHeader;
+    char        *pszHeader; /* Field descriptors */
 
-    int		nCurrentRecord;
-    int		bCurrentRecordModified;
-    char	*pszCurrentRecord;
+    int         nCurrentRecord;
+    int         bCurrentRecordModified;
+    char        *pszCurrentRecord;
 
     int         nWorkFieldLength;
     char        *pszWorkField;
-    
-    int		bNoHeader;
-    int		bUpdated;
 
-    double      dfDoubleField;
+    int         bNoHeader;
+    int         bUpdated;
+
+    union
+    {
+        double      dfDoubleField;
+        int         nIntField;
+    } fieldValue;
 
     int         iLanguageDriver;
     char        *pszCodePage;
+
+    int         nUpdateYearSince1900; /* 0-255 */
+    int         nUpdateMonth; /* 1-12 */
+    int         nUpdateDay; /* 1-31 */
+
+    int         bWriteEndOfFileChar; /* defaults to TRUE */
 } DBFInfo;
 
 typedef DBFInfo * DBFHandle;
@@ -514,8 +634,14 @@ typedef enum {
   FTInvalid
 } DBFFieldType;
 
-#define XBASE_FLDHDR_SZ       32
-
+/* Field descriptor/header size */
+#define XBASE_FLDHDR_SZ         32
+/* Shapelib read up to 11 characters, even if only 10 should normally be used */
+#define XBASE_FLDNAME_LEN_READ  11
+/* On writing, we limit to 10 characters */
+#define XBASE_FLDNAME_LEN_WRITE 10
+/* Normally only 254 characters should be used. We tolerate 255 historically */
+#define XBASE_FLD_MAX_WIDTH     255
 
 DBFHandle SHPAPI_CALL
       DBFOpen( const char * pszDBFFile, const char * pszAccess );
@@ -529,41 +655,48 @@ DBFHandle SHPAPI_CALL
 DBFHandle SHPAPI_CALL
       DBFCreateLL( const char * pszDBFFile, const char * pszCodePage, SAHooks *psHooks );
 
-int	SHPAPI_CALL
+int SHPAPI_CALL
       DBFGetFieldCount( DBFHandle psDBF );
-int	SHPAPI_CALL
+int SHPAPI_CALL
       DBFGetRecordCount( DBFHandle psDBF );
-int	SHPAPI_CALL
+int SHPAPI_CALL
       DBFAddField( DBFHandle hDBF, const char * pszFieldName,
                    DBFFieldType eType, int nWidth, int nDecimals );
 
-int	SHPAPI_CALL
+int SHPAPI_CALL
       DBFAddNativeFieldType( DBFHandle hDBF, const char * pszFieldName,
                              char chType, int nWidth, int nDecimals );
 
-int	SHPAPI_CALL
+int SHPAPI_CALL
       DBFDeleteField( DBFHandle hDBF, int iField );
 
+int SHPAPI_CALL
+      DBFReorderFields( DBFHandle psDBF, int* panMap );
+
+int SHPAPI_CALL
+      DBFAlterFieldDefn( DBFHandle psDBF, int iField, const char * pszFieldName,
+                         char chType, int nWidth, int nDecimals );
+
 DBFFieldType SHPAPI_CALL
-      DBFGetFieldInfo( DBFHandle psDBF, int iField, 
+      DBFGetFieldInfo( DBFHandle psDBF, int iField,
                        char * pszFieldName, int * pnWidth, int * pnDecimals );
 
 int SHPAPI_CALL
       DBFGetFieldIndex(DBFHandle psDBF, const char *pszFieldName);
 
-int 	SHPAPI_CALL
+int SHPAPI_CALL
       DBFReadIntegerAttribute( DBFHandle hDBF, int iShape, int iField );
-double 	SHPAPI_CALL
+double SHPAPI_CALL
       DBFReadDoubleAttribute( DBFHandle hDBF, int iShape, int iField );
 const char SHPAPI_CALL1(*)
       DBFReadStringAttribute( DBFHandle hDBF, int iShape, int iField );
 const char SHPAPI_CALL1(*)
       DBFReadLogicalAttribute( DBFHandle hDBF, int iShape, int iField );
-int     SHPAPI_CALL
+int SHPAPI_CALL
       DBFIsAttributeNULL( DBFHandle hDBF, int iShape, int iField );
 
 int SHPAPI_CALL
-      DBFWriteIntegerAttribute( DBFHandle hDBF, int iShape, int iField, 
+      DBFWriteIntegerAttribute( DBFHandle hDBF, int iShape, int iField,
                                 int nFieldValue );
 int SHPAPI_CALL
       DBFWriteDoubleAttribute( DBFHandle hDBF, int iShape, int iField,
@@ -576,7 +709,7 @@ int SHPAPI_CALL
 
 int SHPAPI_CALL
      DBFWriteLogicalAttribute( DBFHandle hDBF, int iShape, int iField,
-			       const char lFieldValue);
+                               const char lFieldValue);
 int SHPAPI_CALL
      DBFWriteAttributeDirectly(DBFHandle psDBF, int hEntity, int iField,
                                void * pValue );
@@ -586,22 +719,27 @@ int SHPAPI_CALL
       DBFWriteTuple(DBFHandle psDBF, int hEntity, void * pRawTuple );
 
 int SHPAPI_CALL DBFIsRecordDeleted( DBFHandle psDBF, int iShape );
-int SHPAPI_CALL DBFMarkRecordDeleted( DBFHandle psDBF, int iShape, 
+int SHPAPI_CALL DBFMarkRecordDeleted( DBFHandle psDBF, int iShape,
                                       int bIsDeleted );
 
 DBFHandle SHPAPI_CALL
       DBFCloneEmpty(DBFHandle psDBF, const char * pszFilename );
- 
-void	SHPAPI_CALL
+
+void SHPAPI_CALL
       DBFClose( DBFHandle hDBF );
 void    SHPAPI_CALL
       DBFUpdateHeader( DBFHandle hDBF );
-char    SHPAPI_CALL
+char SHPAPI_CALL
       DBFGetNativeFieldType( DBFHandle hDBF, int iField );
 
 const char SHPAPI_CALL1(*)
       DBFGetCodePage(DBFHandle psDBF );
 
+void SHPAPI_CALL
+    DBFSetLastModifiedDate( DBFHandle psDBF, int nYYSince1900, int nMM, int nDD );
+
+void SHPAPI_CALL DBFSetWriteEndOfFileChar( DBFHandle psDBF, int bWriteFlag );
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/navit/support/shapefile/shpopen.c b/navit/support/shapefile/shpopen.c
index da5365281..2ace6843b 100644
--- a/navit/support/shapefile/shpopen.c
+++ b/navit/support/shapefile/shpopen.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: shpopen.c,v 1.59 2008/03/14 05:25:31 fwarmerdam Exp $
+ * $Id: shpopen.c,v 1.75 2016-12-05 12:44:05 erouault Exp $
  *
  * Project:  Shapelib
  * Purpose:  Implementation of core Shapefile read/write functions.
@@ -7,13 +7,14 @@
  *
  ******************************************************************************
  * Copyright (c) 1999, 2001, Frank Warmerdam
+ * Copyright (c) 2011-2013, Even Rouault <even dot rouault at mines-paris dot org>
  *
  * This software is available under the following "MIT Style" license,
- * or at the option of the licensee under the LGPL (see LICENSE.LGPL).  This
+ * or at the option of the licensee under the LGPL (see COPYING).  This
  * option is discussed in more detail in shapelib.html.
  *
  * --
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
@@ -34,7 +35,71 @@
  ******************************************************************************
  *
  * $Log: shpopen.c,v $
- * Revision 1.59  2008/03/14 05:25:31  fwarmerdam
+ * Revision 1.75  2016-12-05 12:44:05  erouault
+ * * Major overhaul of Makefile build system to use autoconf/automake.
+ *
+ * * Warning fixes in contrib/
+ *
+ * Revision 1.74  2016-12-04 15:30:15  erouault
+ * * shpopen.c, dbfopen.c, shptree.c, shapefil.h: resync with
+ * GDAL Shapefile driver. Mostly cleanups. SHPObject and DBFInfo
+ * structures extended with new members. New functions:
+ * DBFSetLastModifiedDate, SHPOpenLLEx, SHPRestoreSHX,
+ * SHPSetFastModeReadObject
+ *
+ * * sbnsearch.c: new file to implement original ESRI .sbn spatial
+ * index reading. (no write support). New functions:
+ * SBNOpenDiskTree, SBNCloseDiskTree, SBNSearchDiskTree,
+ * SBNSearchDiskTreeInteger, SBNSearchFreeIds
+ *
+ * * Makefile, makefile.vc, CMakeLists.txt, shapelib.def: updates
+ * with new file and symbols.
+ *
+ * * commit: helper script to cvs commit
+ *
+ * Revision 1.73  2012-01-24 22:33:01  fwarmerdam
+ * fix memory leak on failure to open .shp (gdal #4410)
+ *
+ * Revision 1.72  2011-12-11 22:45:28  fwarmerdam
+ * fix failure return from SHPOpenLL.
+ *
+ * Revision 1.71  2011-09-15 03:33:58  fwarmerdam
+ * fix missing cast (#2344)
+ *
+ * Revision 1.70  2011-07-24 05:59:25  fwarmerdam
+ * minimize use of CPLError in favor of SAHooks.Error()
+ *
+ * Revision 1.69  2011-07-24 03:24:22  fwarmerdam
+ * fix memory leaks in error cases creating shapefiles (#2061)
+ *
+ * Revision 1.68  2010-08-27 23:42:52  fwarmerdam
+ * add SHPAPI_CALL attribute in code
+ *
+ * Revision 1.67  2010-07-01 08:15:48  fwarmerdam
+ * do not error out on an object with zero vertices
+ *
+ * Revision 1.66  2010-07-01 07:58:57  fwarmerdam
+ * minor cleanup of error handling
+ *
+ * Revision 1.65  2010-07-01 07:27:13  fwarmerdam
+ * white space formatting adjustments
+ *
+ * Revision 1.64  2010-01-28 11:34:34  fwarmerdam
+ * handle the shape file length limits more gracefully (#3236)
+ *
+ * Revision 1.63  2010-01-28 04:04:40  fwarmerdam
+ * improve numerical accuracy of SHPRewind() algs (gdal #3363)
+ *
+ * Revision 1.62  2010-01-17 05:34:13  fwarmerdam
+ * Remove asserts on x/y being null (#2148).
+ *
+ * Revision 1.61  2010-01-16 05:07:42  fwarmerdam
+ * allow 0/nulls in shpcreateobject (#2148)
+ *
+ * Revision 1.60  2009-09-17 20:50:02  bram
+ * on Win32, define snprintf as alias to _snprintf
+ *
+ * Revision 1.59  2008-03-14 05:25:31  fwarmerdam
  * Correct crash on buggy geometries (gdal #2218)
  *
  * Revision 1.58  2008/01/08 23:28:26  bram
@@ -117,7 +182,7 @@
  * move pabyRec into SHPInfo for thread safety
  *
  * Revision 1.33  2001/07/03 12:18:15  warmerda
- * Improved cleanup if SHX not found, provied by Riccardo Cohen.
+ * Improved cleanup if SHX not found, provided by Riccardo Cohen.
  *
  * Revision 1.32  2001/06/22 01:58:07  warmerda
  * be more careful about establishing initial bounds in face of NULL shapes
@@ -230,14 +295,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <glib.h>
+#include <errno.h>
+
+SHP_CVSID("$Id: shpopen.c,v 1.75 2016-12-05 12:44:05 erouault Exp $")
 
 typedef unsigned char uchar;
 
 #if UINT_MAX == 65535
-typedef long	      int32;
+typedef unsigned long	      int32;
 #else
-typedef int	      int32;
+typedef unsigned int	      int32;
 #endif
 
 #ifndef FALSE
@@ -251,8 +318,33 @@ typedef int	      int32;
 #  define MAX(a,b)      ((a>b) ? a : b)
 #endif
 
-static int 	bBigEndian;
+#ifndef USE_CPL
+#if defined(_MSC_VER)
+# if _MSC_VER < 1900
+#     define snprintf _snprintf
+# endif
+#elif defined(WIN32) || defined(_WIN32)
+#  ifndef snprintf
+#     define snprintf _snprintf
+#  endif
+#endif
+#endif
 
+#ifndef CPL_UNUSED
+#if defined(__GNUC__) && __GNUC__ >= 4
+#  define CPL_UNUSED __attribute((__unused__))
+#else
+#  define CPL_UNUSED
+#endif
+#endif  
+
+#if defined(CPL_LSB)
+#define bBigEndian FALSE
+#elif defined(CPL_MSB)
+#define bBigEndian TRUE
+#else
+static int 	bBigEndian;
+#endif
 
 /************************************************************************/
 /*                              SwapWord()                              */
@@ -297,15 +389,15 @@ static void * SfRealloc( void * pMem, int nNewSize )
 /*	contents of the index (.shx) file.				*/
 /************************************************************************/
 
-void SHPWriteHeader( SHPHandle psSHP )
+void SHPAPI_CALL SHPWriteHeader( SHPHandle psSHP )
 
 {
-    uchar     	abyHeader[100];
+    uchar     	abyHeader[100] = { 0 };
     int		i;
     int32	i32;
     double	dValue;
     int32	*panSHX;
-    
+
     if (psSHP->fpSHX == NULL)
     {
         psSHP->sHooks.Error( "SHPWriteHeader failed : SHX file is closed");
@@ -315,8 +407,6 @@ void SHPWriteHeader( SHPHandle psSHP )
 /* -------------------------------------------------------------------- */
 /*      Prepare header block for .shp file.                             */
 /* -------------------------------------------------------------------- */
-    for( i = 0; i < 100; i++ )
-      abyHeader[i] = 0;
 
     abyHeader[2] = 0x27;				/* magic cookie */
     abyHeader[3] = 0x0a;
@@ -324,11 +414,11 @@ void SHPWriteHeader( SHPHandle psSHP )
     i32 = psSHP->nFileSize/2;				/* file size */
     ByteCopy( &i32, abyHeader+24, 4 );
     if( !bBigEndian ) SwapWord( 4, abyHeader+24 );
-    
+
     i32 = 1000;						/* version */
     ByteCopy( &i32, abyHeader+28, 4 );
     if( bBigEndian ) SwapWord( 4, abyHeader+28 );
-    
+
     i32 = psSHP->nShapeType;				/* shape type */
     ByteCopy( &i32, abyHeader+32, 4 );
     if( bBigEndian ) SwapWord( 4, abyHeader+32 );
@@ -368,10 +458,14 @@ void SHPWriteHeader( SHPHandle psSHP )
 /* -------------------------------------------------------------------- */
 /*      Write .shp file header.                                         */
 /* -------------------------------------------------------------------- */
-    if( psSHP->sHooks.FSeek( psSHP->fpSHP, 0, 0 ) != 0 
+    if( psSHP->sHooks.FSeek( psSHP->fpSHP, 0, 0 ) != 0
         || psSHP->sHooks.FWrite( abyHeader, 100, 1, psSHP->fpSHP ) != 1 )
     {
-        psSHP->sHooks.Error( "Failure writing .shp header" );
+        char szError[200];
+
+        snprintf( szError, sizeof(szError),
+                 "Failure writing .shp header: %s", strerror(errno) );
+        psSHP->sHooks.Error( szError );
         return;
     }
 
@@ -381,11 +475,16 @@ void SHPWriteHeader( SHPHandle psSHP )
     i32 = (psSHP->nRecords * 2 * sizeof(int32) + 100)/2;   /* file size */
     ByteCopy( &i32, abyHeader+24, 4 );
     if( !bBigEndian ) SwapWord( 4, abyHeader+24 );
-    
-    if( psSHP->sHooks.FSeek( psSHP->fpSHX, 0, 0 ) != 0 
+
+    if( psSHP->sHooks.FSeek( psSHP->fpSHX, 0, 0 ) != 0
         || psSHP->sHooks.FWrite( abyHeader, 100, 1, psSHP->fpSHX ) != 1 )
     {
-        psSHP->sHooks.Error( "Failure writing .shx header" );
+        char szError[200];
+
+        snprintf( szError, sizeof(szError),
+                 "Failure writing .shx header: %s", strerror(errno) );
+        psSHP->sHooks.Error( szError );
+
         return;
     }
 
@@ -393,19 +492,28 @@ void SHPWriteHeader( SHPHandle psSHP )
 /*      Write out the .shx contents.                                    */
 /* -------------------------------------------------------------------- */
     panSHX = (int32 *) malloc(sizeof(int32) * 2 * psSHP->nRecords);
+    if( panSHX == NULL )
+    {
+        psSHP->sHooks.Error( "Failure allocatin panSHX" );
+        return;
+    }
 
     for( i = 0; i < psSHP->nRecords; i++ )
     {
-	panSHX[i*2  ] = psSHP->panRecOffset[i]/2;
-	panSHX[i*2+1] = psSHP->panRecSize[i]/2;
-	if( !bBigEndian ) SwapWord( 4, panSHX+i*2 );
-	if( !bBigEndian ) SwapWord( 4, panSHX+i*2+1 );
+        panSHX[i*2  ] = psSHP->panRecOffset[i]/2;
+        panSHX[i*2+1] = psSHP->panRecSize[i]/2;
+        if( !bBigEndian ) SwapWord( 4, panSHX+i*2 );
+        if( !bBigEndian ) SwapWord( 4, panSHX+i*2+1 );
     }
 
-    if( (int)psSHP->sHooks.FWrite( panSHX, sizeof(int32)*2, psSHP->nRecords, psSHP->fpSHX ) 
+    if( (int)psSHP->sHooks.FWrite( panSHX, sizeof(int32)*2, psSHP->nRecords, psSHP->fpSHX )
         != psSHP->nRecords )
     {
-        psSHP->sHooks.Error( "Failure writing .shx contents" );
+        char szError[200];
+
+        snprintf( szError, sizeof(szError),
+                 "Failure writing .shx contents: %s", strerror(errno) );
+        psSHP->sHooks.Error( szError );
     }
 
     free( panSHX );
@@ -438,18 +546,20 @@ SHPOpen( const char * pszLayer, const char * pszAccess )
 /*      Open the .shp and .shx files based on the basename of the       */
 /*      files or either file name.                                      */
 /************************************************************************/
-   
+
 SHPHandle SHPAPI_CALL
 SHPOpenLL( const char * pszLayer, const char * pszAccess, SAHooks *psHooks )
 
 {
-    char		*pszFullname, *pszBasename;
-    SHPHandle		psSHP;
-    
-    uchar		*pabyBuf;
-    int			i;
-    double		dValue;
-    
+    char        *pszFullname, *pszBasename;
+    SHPHandle       psSHP;
+
+    uchar       *pabyBuf;
+    int         i;
+    double      dValue;
+    int         bLazySHXLoading = FALSE;
+    size_t nFullnameLen;
+
 /* -------------------------------------------------------------------- */
 /*      Ensure the access string is one of the legal ones.  We          */
 /*      ensure the result string indicates binary to avoid common       */
@@ -459,19 +569,24 @@ SHPOpenLL( const char * pszLayer, const char * pszAccess, SAHooks *psHooks )
         || strcmp(pszAccess,"r+") == 0 )
         pszAccess = "r+b";
     else
+    {
+        bLazySHXLoading = strchr(pszAccess, 'l') != NULL;
         pszAccess = "rb";
-    
+    }
+
 /* -------------------------------------------------------------------- */
-/*	Establish the byte order on this machine.			*/
+/*  Establish the byte order on this machine.           */
 /* -------------------------------------------------------------------- */
+#if !defined(bBigEndian)
     i = 1;
     if( *((uchar *) &i) == 1 )
         bBigEndian = FALSE;
     else
         bBigEndian = TRUE;
+#endif
 
 /* -------------------------------------------------------------------- */
-/*	Initialize the info structure.					*/
+/*  Initialize the info structure.                  */
 /* -------------------------------------------------------------------- */
     psSHP = (SHPHandle) calloc(sizeof(SHPInfo),1);
 
@@ -479,60 +594,67 @@ SHPOpenLL( const char * pszLayer, const char * pszAccess, SAHooks *psHooks )
     memcpy( &(psSHP->sHooks), psHooks, sizeof(SAHooks) );
 
 /* -------------------------------------------------------------------- */
-/*	Compute the base (layer) name.  If there is any extension	*/
-/*	on the passed in filename we will strip it off.			*/
+/*  Compute the base (layer) name.  If there is any extension   */
+/*  on the passed in filename we will strip it off.         */
 /* -------------------------------------------------------------------- */
     pszBasename = (char *) malloc(strlen(pszLayer)+5);
     strcpy( pszBasename, pszLayer );
-    for( i = strlen(pszBasename)-1; 
-	 i > 0 && pszBasename[i] != '.' && pszBasename[i] != '/'
-	       && pszBasename[i] != '\\';
-	 i-- ) {}
+    for( i = (int)strlen(pszBasename)-1;
+         i > 0 && pszBasename[i] != '.' && pszBasename[i] != '/'
+             && pszBasename[i] != '\\';
+         i-- ) {}
 
     if( pszBasename[i] == '.' )
         pszBasename[i] = '\0';
 
 /* -------------------------------------------------------------------- */
-/*	Open the .shp and .shx files.  Note that files pulled from	*/
-/*	a PC to Unix with upper case filenames won't work!		*/
+/*  Open the .shp and .shx files.  Note that files pulled from  */
+/*  a PC to Unix with upper case filenames won't work!      */
 /* -------------------------------------------------------------------- */
-    pszFullname = (char *) malloc(strlen(pszBasename) + 5);
-    sprintf( pszFullname, "%s.shp", pszBasename ) ;
+    nFullnameLen = strlen(pszBasename) + 5;
+    pszFullname = (char *) malloc(nFullnameLen);
+    snprintf( pszFullname, nFullnameLen, "%s.shp", pszBasename ) ;
     psSHP->fpSHP = psSHP->sHooks.FOpen(pszFullname, pszAccess );
     if( psSHP->fpSHP == NULL )
     {
-        sprintf( pszFullname, "%s.SHP", pszBasename );
+        snprintf( pszFullname, nFullnameLen, "%s.SHP", pszBasename );
         psSHP->fpSHP = psSHP->sHooks.FOpen(pszFullname, pszAccess );
     }
-    
+
     if( psSHP->fpSHP == NULL )
     {
-#ifdef USE_CPL
-        CPLError( CE_Failure, CPLE_OpenFailed, 
-                  "Unable to open %s.shp or %s.SHP.", 
+        size_t nMessageLen = strlen(pszBasename)*2+256;
+        char *pszMessage = (char *) malloc(nMessageLen);
+        snprintf( pszMessage, nMessageLen, "Unable to open %s.shp or %s.SHP.",
                   pszBasename, pszBasename );
-#endif
+        psHooks->Error( pszMessage );
+        free( pszMessage );
+
         free( psSHP );
         free( pszBasename );
         free( pszFullname );
-        return( NULL );
+
+        return NULL;
     }
 
-    sprintf( pszFullname, "%s.shx", pszBasename );
+    snprintf( pszFullname, nFullnameLen, "%s.shx", pszBasename );
     psSHP->fpSHX =  psSHP->sHooks.FOpen(pszFullname, pszAccess );
     if( psSHP->fpSHX == NULL )
     {
-        sprintf( pszFullname, "%s.SHX", pszBasename );
+        snprintf( pszFullname, nFullnameLen, "%s.SHX", pszBasename );
         psSHP->fpSHX = psSHP->sHooks.FOpen(pszFullname, pszAccess );
     }
-    
+
     if( psSHP->fpSHX == NULL )
     {
-#ifdef USE_CPL
-        CPLError( CE_Failure, CPLE_OpenFailed, 
-                  "Unable to open %s.shx or %s.SHX.", 
+        size_t nMessageLen = strlen(pszBasename)*2+256;
+        char *pszMessage = (char *) malloc(nMessageLen);
+        snprintf( pszMessage, nMessageLen, "Unable to open %s.shx or %s.SHX."
+                  "Try --config SHAPE_RESTORE_SHX true to restore or create it",
                   pszBasename, pszBasename );
-#endif
+        psHooks->Error( pszMessage );
+        free( pszMessage );
+
         psSHP->sHooks.FClose( psSHP->fpSHP );
         free( psSHP );
         free( pszBasename );
@@ -544,54 +666,73 @@ SHPOpenLL( const char * pszLayer, const char * pszAccess, SAHooks *psHooks )
     free( pszBasename );
 
 /* -------------------------------------------------------------------- */
-/*  Read the file size from the SHP file.				*/
+/*  Read the file size from the SHP file.               */
 /* -------------------------------------------------------------------- */
     pabyBuf = (uchar *) malloc(100);
     psSHP->sHooks.FRead( pabyBuf, 100, 1, psSHP->fpSHP );
 
-    psSHP->nFileSize = (pabyBuf[24] * 256 * 256 * 256
-			+ pabyBuf[25] * 256 * 256
-			+ pabyBuf[26] * 256
-			+ pabyBuf[27]) * 2;
+    psSHP->nFileSize = ((unsigned int)pabyBuf[24] * 256 * 256 * 256
+                        + (unsigned int)pabyBuf[25] * 256 * 256
+                        + (unsigned int)pabyBuf[26] * 256
+                        + (unsigned int)pabyBuf[27]);
+    if( psSHP->nFileSize < 0xFFFFFFFFU / 2 )
+        psSHP->nFileSize *= 2;
+    else
+        psSHP->nFileSize = 0xFFFFFFFEU;
 
 /* -------------------------------------------------------------------- */
 /*  Read SHX file Header info                                           */
 /* -------------------------------------------------------------------- */
-    if( psSHP->sHooks.FRead( pabyBuf, 100, 1, psSHP->fpSHX ) != 1 
-        || pabyBuf[0] != 0 
-        || pabyBuf[1] != 0 
-        || pabyBuf[2] != 0x27 
+    if( psSHP->sHooks.FRead( pabyBuf, 100, 1, psSHP->fpSHX ) != 1
+        || pabyBuf[0] != 0
+        || pabyBuf[1] != 0
+        || pabyBuf[2] != 0x27
         || (pabyBuf[3] != 0x0a && pabyBuf[3] != 0x0d) )
     {
         psSHP->sHooks.Error( ".shx file is unreadable, or corrupt." );
-	psSHP->sHooks.FClose( psSHP->fpSHP );
-	psSHP->sHooks.FClose( psSHP->fpSHX );
-	free( psSHP );
+        psSHP->sHooks.FClose( psSHP->fpSHP );
+        psSHP->sHooks.FClose( psSHP->fpSHX );
+        free( psSHP );
 
-	return( NULL );
+        return( NULL );
     }
 
     psSHP->nRecords = pabyBuf[27] + pabyBuf[26] * 256
-      + pabyBuf[25] * 256 * 256 + pabyBuf[24] * 256 * 256 * 256;
-    psSHP->nRecords = (psSHP->nRecords*2 - 100) / 8;
+        + pabyBuf[25] * 256 * 256 + (pabyBuf[24] & 0x7F) * 256 * 256 * 256;
+    psSHP->nRecords = (psSHP->nRecords - 50) / 4;
 
     psSHP->nShapeType = pabyBuf[32];
 
     if( psSHP->nRecords < 0 || psSHP->nRecords > 256000000 )
     {
         char szError[200];
-        
-        sprintf( szError, 
+
+        snprintf( szError, sizeof(szError),
                  "Record count in .shp header is %d, which seems\n"
                  "unreasonable.  Assuming header is corrupt.",
-                  psSHP->nRecords );
-        psSHP->sHooks.Error( szError );				       
-	psSHP->sHooks.FClose( psSHP->fpSHP );
-	psSHP->sHooks.FClose( psSHP->fpSHX );
-	free( psSHP );
+                 psSHP->nRecords );
+        psSHP->sHooks.Error( szError );
+        psSHP->sHooks.FClose( psSHP->fpSHP );
+        psSHP->sHooks.FClose( psSHP->fpSHX );
+        free( psSHP );
         free(pabyBuf);
 
-	return( NULL );
+        return( NULL );
+    }
+
+    /* If a lot of records are advertized, check that the file is big enough */
+    /* to hold them */
+    if( psSHP->nRecords >= 1024 * 1024 )
+    {
+        SAOffset nFileSize;
+        psSHP->sHooks.FSeek( psSHP->fpSHX, 0, 2 );
+        nFileSize = psSHP->sHooks.FTell( psSHP->fpSHX );
+        if( nFileSize > 100 &&
+            nFileSize/2 < (SAOffset)(psSHP->nRecords * 4 + 50) )
+        {
+            psSHP->nRecords = (int)((nFileSize - 100) / 8);
+        }
+        psSHP->sHooks.FSeek( psSHP->fpSHX, 100, 0 );
     }
 
 /* -------------------------------------------------------------------- */
@@ -613,15 +754,15 @@ SHPOpenLL( const char * pszLayer, const char * pszAccess, SAHooks *psHooks )
     memcpy( &dValue, pabyBuf+60, 8 );
     psSHP->adBoundsMax[1] = dValue;
 
-    if( bBigEndian ) SwapWord( 8, pabyBuf+68 );		/* z */
+    if( bBigEndian ) SwapWord( 8, pabyBuf+68 );     /* z */
     memcpy( &dValue, pabyBuf+68, 8 );
     psSHP->adBoundsMin[2] = dValue;
-    
+
     if( bBigEndian ) SwapWord( 8, pabyBuf+76 );
     memcpy( &dValue, pabyBuf+76, 8 );
     psSHP->adBoundsMax[2] = dValue;
-    
-    if( bBigEndian ) SwapWord( 8, pabyBuf+84 );		/* z */
+
+    if( bBigEndian ) SwapWord( 8, pabyBuf+84 );     /* z */
     memcpy( &dValue, pabyBuf+84, 8 );
     psSHP->adBoundsMin[3] = dValue;
 
@@ -632,30 +773,33 @@ SHPOpenLL( const char * pszLayer, const char * pszAccess, SAHooks *psHooks )
     free( pabyBuf );
 
 /* -------------------------------------------------------------------- */
-/*	Read the .shx file to get the offsets to each record in 	*/
-/*	the .shp file.							*/
+/*  Read the .shx file to get the offsets to each record in     */
+/*  the .shp file.                          */
 /* -------------------------------------------------------------------- */
     psSHP->nMaxRecords = psSHP->nRecords;
 
-    psSHP->panRecOffset =
-        (int *) malloc(sizeof(int) * MAX(1,psSHP->nMaxRecords) );
-    psSHP->panRecSize =
-        (int *) malloc(sizeof(int) * MAX(1,psSHP->nMaxRecords) );
-    pabyBuf = (uchar *) malloc(8 * MAX(1,psSHP->nRecords) );
+    psSHP->panRecOffset = (unsigned int *)
+        malloc(sizeof(unsigned int) * MAX(1,psSHP->nMaxRecords) );
+    psSHP->panRecSize = (unsigned int *)
+        malloc(sizeof(unsigned int) * MAX(1,psSHP->nMaxRecords) );
+    if( bLazySHXLoading )
+        pabyBuf = NULL;
+    else
+        pabyBuf = (uchar *) malloc(8 * MAX(1,psSHP->nRecords) );
 
     if (psSHP->panRecOffset == NULL ||
         psSHP->panRecSize == NULL ||
-        pabyBuf == NULL)
+        (!bLazySHXLoading && pabyBuf == NULL))
     {
         char szError[200];
 
-        sprintf(szError, 
+        snprintf( szError, sizeof(szError),
                 "Not enough memory to allocate requested memory (nRecords=%d).\n"
-                "Probably broken SHP file", 
+                "Probably broken SHP file",
                 psSHP->nRecords );
         psSHP->sHooks.Error( szError );
-	psSHP->sHooks.FClose( psSHP->fpSHP );
-	psSHP->sHooks.FClose( psSHP->fpSHX );
+        psSHP->sHooks.FClose( psSHP->fpSHP );
+        psSHP->sHooks.FClose( psSHP->fpSHX );
         if (psSHP->panRecOffset) free( psSHP->panRecOffset );
         if (psSHP->panRecSize) free( psSHP->panRecSize );
         if (pabyBuf) free( pabyBuf );
@@ -663,27 +807,34 @@ SHPOpenLL( const char * pszLayer, const char * pszAccess, SAHooks *psHooks )
         return( NULL );
     }
 
-    if( (int) psSHP->sHooks.FRead( pabyBuf, 8, psSHP->nRecords, psSHP->fpSHX ) 
-			!= psSHP->nRecords )
+    if( bLazySHXLoading )
+    {
+        memset(psSHP->panRecOffset, 0, sizeof(unsigned int) * MAX(1,psSHP->nMaxRecords) );
+        memset(psSHP->panRecSize, 0, sizeof(unsigned int) * MAX(1,psSHP->nMaxRecords) );
+        return( psSHP );
+    }
+
+    if( (int) psSHP->sHooks.FRead( pabyBuf, 8, psSHP->nRecords, psSHP->fpSHX )
+        != psSHP->nRecords )
     {
         char szError[200];
 
-        sprintf( szError, 
-                 "Failed to read all values for %d records in .shx file.",
-                 psSHP->nRecords );
+        snprintf( szError, sizeof(szError),
+                 "Failed to read all values for %d records in .shx file: %s.",
+                 psSHP->nRecords, strerror(errno) );
         psSHP->sHooks.Error( szError );
 
         /* SHX is short or unreadable for some reason. */
-	psSHP->sHooks.FClose( psSHP->fpSHP );
-	psSHP->sHooks.FClose( psSHP->fpSHX );
+        psSHP->sHooks.FClose( psSHP->fpSHP );
+        psSHP->sHooks.FClose( psSHP->fpSHX );
         free( psSHP->panRecOffset );
         free( psSHP->panRecSize );
         free( pabyBuf );
-	free( psSHP );
+        free( psSHP );
 
-	return( NULL );
+        return( NULL );
     }
-    
+
     /* In read-only mode, we can close the SHX now */
     if (strcmp(pszAccess, "rb") == 0)
     {
@@ -693,16 +844,38 @@ SHPOpenLL( const char * pszLayer, const char * pszAccess, SAHooks *psHooks )
 
     for( i = 0; i < psSHP->nRecords; i++ )
     {
-	int32		nOffset, nLength;
+        unsigned int        nOffset, nLength;
+
+        memcpy( &nOffset, pabyBuf + i * 8, 4 );
+        if( !bBigEndian ) SwapWord( 4, &nOffset );
 
-	memcpy( &nOffset, pabyBuf + i * 8, 4 );
-	if( !bBigEndian ) SwapWord( 4, &nOffset );
+        memcpy( &nLength, pabyBuf + i * 8 + 4, 4 );
+        if( !bBigEndian ) SwapWord( 4, &nLength );
 
-	memcpy( &nLength, pabyBuf + i * 8 + 4, 4 );
-	if( !bBigEndian ) SwapWord( 4, &nLength );
+        if( nOffset > (unsigned int)INT_MAX )
+        {
+            char str[128];
+            snprintf( str, sizeof(str),
+                    "Invalid offset for entity %d", i);
 
-	psSHP->panRecOffset[i] = nOffset*2;
-	psSHP->panRecSize[i] = nLength*2;
+            psSHP->sHooks.Error( str );
+            SHPClose(psSHP);
+            free( pabyBuf );
+            return NULL;
+        }
+        if( nLength > (unsigned int)(INT_MAX / 2 - 4) )
+        {
+            char str[128];
+            snprintf( str, sizeof(str),
+                    "Invalid length for entity %d", i);
+
+            psSHP->sHooks.Error( str );
+            SHPClose(psSHP);
+            free( pabyBuf );
+            return NULL;
+        }
+        psSHP->panRecOffset[i] = nOffset*2;
+        psSHP->panRecSize[i] = nLength*2;
     }
     free( pabyBuf );
 
@@ -710,6 +883,231 @@ SHPOpenLL( const char * pszLayer, const char * pszAccess, SAHooks *psHooks )
 }
 
 /************************************************************************/
+/*                              SHPOpenLLEx()                           */
+/*                                                                      */
+/*      Open the .shp and .shx files based on the basename of the       */
+/*      files or either file name. It generally invokes SHPRestoreSHX() */
+/*      in case when bRestoreSHX equals true.                           */
+/************************************************************************/
+
+SHPHandle SHPAPI_CALL
+SHPOpenLLEx( const char * pszLayer, const char * pszAccess, SAHooks *psHooks,
+            int bRestoreSHX )
+
+{
+    if ( !bRestoreSHX ) return SHPOpenLL ( pszLayer, pszAccess, psHooks );
+    else
+    {
+        if ( SHPRestoreSHX ( pszLayer, pszAccess, psHooks ) )
+        {
+            return SHPOpenLL ( pszLayer, pszAccess, psHooks );
+        }
+    }
+
+    return( NULL );
+}
+
+/************************************************************************/
+/*                              SHPRestoreSHX()                         */
+/*                                                                      */
+/*      Restore .SHX file using associated .SHP file.                   */
+/*                                                                      */
+/************************************************************************/
+
+int       SHPAPI_CALL
+SHPRestoreSHX ( const char * pszLayer, const char * pszAccess, SAHooks *psHooks )
+
+{
+    char            *pszFullname, *pszBasename;
+    SAFile          fpSHP, fpSHX;
+
+
+    uchar           *pabyBuf;
+    int             i;
+    size_t          nFullnameLen;
+    unsigned int    nSHPFilesize;
+
+    size_t          nMessageLen;
+    char            *pszMessage;
+
+    unsigned int    nCurrentRecordOffset = 0;
+    unsigned int    nCurrentSHPOffset = 100;
+    size_t          nRealSHXContentSize = 100;
+
+    const char      pszSHXAccess[] = "w+b";
+    char            *pabySHXHeader;
+    char            abyReadedRecord[8];
+    unsigned int    niRecord = 0;
+    unsigned int    nRecordLength = 0;
+    unsigned int    nRecordOffset = 50;
+
+/* -------------------------------------------------------------------- */
+/*      Ensure the access string is one of the legal ones.  We          */
+/*      ensure the result string indicates binary to avoid common       */
+/*      problems on Windows.                                            */
+/* -------------------------------------------------------------------- */
+    if( strcmp(pszAccess,"rb+") == 0 || strcmp(pszAccess,"r+b") == 0
+        || strcmp(pszAccess,"r+") == 0 )
+        pszAccess = "r+b";
+    else
+    {
+        pszAccess = "rb";
+    }
+
+/* -------------------------------------------------------------------- */
+/*  Establish the byte order on this machine.                           */
+/* -------------------------------------------------------------------- */
+#if !defined(bBigEndian)
+    i = 1;
+    if( *((uchar *) &i) == 1 )
+        bBigEndian = FALSE;
+    else
+        bBigEndian = TRUE;
+#endif
+
+/* -------------------------------------------------------------------- */
+/*  Compute the base (layer) name.  If there is any extension           */
+/*  on the passed in filename we will strip it off.                     */
+/* -------------------------------------------------------------------- */
+    pszBasename = (char *) malloc(strlen(pszLayer)+5);
+    strcpy( pszBasename, pszLayer );
+    for( i = (int)strlen(pszBasename)-1;
+         i > 0 && pszBasename[i] != '.' && pszBasename[i] != '/'
+             && pszBasename[i] != '\\';
+         i-- ) {}
+
+    if( pszBasename[i] == '.' )
+        pszBasename[i] = '\0';
+
+/* -------------------------------------------------------------------- */
+/*  Open the .shp file.  Note that files pulled from                    */
+/*  a PC to Unix with upper case filenames won't work!                  */
+/* -------------------------------------------------------------------- */
+    nFullnameLen = strlen(pszBasename) + 5;
+    pszFullname = (char *) malloc(nFullnameLen);
+    snprintf( pszFullname, nFullnameLen, "%s.shp", pszBasename ) ;
+    fpSHP = psHooks->FOpen(pszFullname, pszAccess );
+    if( fpSHP == NULL )
+    {
+        snprintf( pszFullname, nFullnameLen, "%s.SHP", pszBasename );
+        fpSHP = psHooks->FOpen(pszFullname, pszAccess );
+    }
+
+    if( fpSHP == NULL )
+    {
+        nMessageLen = strlen(pszBasename)*2+256;
+        pszMessage = (char *) malloc(nMessageLen);
+        snprintf( pszMessage, nMessageLen, "Unable to open %s.shp or %s.SHP.",
+                  pszBasename, pszBasename );
+        psHooks->Error( pszMessage );
+        free( pszMessage );
+
+        free( pszBasename );
+        free( pszFullname );
+
+        return( 0 );
+    }
+
+/* -------------------------------------------------------------------- */
+/*  Read the file size from the SHP file.                               */
+/* -------------------------------------------------------------------- */
+    pabyBuf = (uchar *) malloc(100);
+    psHooks->FRead( pabyBuf, 100, 1, fpSHP );
+
+    nSHPFilesize = ((unsigned int)pabyBuf[24] * 256 * 256 * 256
+                        + (unsigned int)pabyBuf[25] * 256 * 256
+                        + (unsigned int)pabyBuf[26] * 256
+                        + (unsigned int)pabyBuf[27]);
+    if( nSHPFilesize < 0xFFFFFFFFU / 2 )
+        nSHPFilesize *= 2;
+    else
+        nSHPFilesize = 0xFFFFFFFEU;
+
+    snprintf( pszFullname, nFullnameLen, "%s.shx", pszBasename );
+    fpSHX = psHooks->FOpen( pszFullname, pszSHXAccess );
+
+    if( fpSHX == NULL )
+    {
+        nMessageLen = strlen( pszBasename ) * 2 + 256;
+        pszMessage = (char *) malloc( nMessageLen );
+        snprintf( pszMessage, nMessageLen, "Error opening file %s.shx for writing",
+                 pszBasename );
+        psHooks->Error( pszMessage );
+        free( pszMessage );
+
+        psHooks->FClose( fpSHX );
+
+        free( pabyBuf );
+        free( pszBasename );
+        free( pszFullname );
+
+        return( 0 );
+    }
+
+/* -------------------------------------------------------------------- */
+/*  Open SHX and create it using SHP file content.                      */
+/* -------------------------------------------------------------------- */
+    psHooks->FSeek( fpSHP, 100, 0 );
+    pabySHXHeader = (char *) malloc ( 100 );
+    memcpy( pabySHXHeader, pabyBuf, 100 );
+    psHooks->FWrite( pabySHXHeader, 100, 1, fpSHX );
+
+    while( nCurrentSHPOffset < nSHPFilesize )
+    {
+        if( psHooks->FRead( &niRecord, 4, 1, fpSHP ) == 1 &&
+            psHooks->FRead( &nRecordLength, 4, 1, fpSHP ) == 1)
+        {
+            if( !bBigEndian ) SwapWord( 4, &nRecordOffset );
+            memcpy( abyReadedRecord, &nRecordOffset, 4 );
+            memcpy( abyReadedRecord + 4, &nRecordLength, 4 );
+
+            psHooks->FWrite( abyReadedRecord, 8, 1, fpSHX );
+
+            if ( !bBigEndian ) SwapWord( 4, &nRecordOffset );
+            if ( !bBigEndian ) SwapWord( 4, &nRecordLength );
+            nRecordOffset += nRecordLength + 4;
+            nCurrentRecordOffset += 8;
+            nCurrentSHPOffset += 8 + nRecordLength * 2;
+
+            psHooks->FSeek( fpSHP, nCurrentSHPOffset, 0 );
+            nRealSHXContentSize += 8;
+        }
+        else
+        {
+            nMessageLen = strlen( pszBasename ) * 2 + 256;
+            pszMessage = (char *) malloc( nMessageLen );
+            snprintf( pszMessage, nMessageLen, "Error parsing .shp to restore .shx" );
+            psHooks->Error( pszMessage );
+            free( pszMessage );
+
+            psHooks->FClose( fpSHX );
+            psHooks->FClose( fpSHP );
+
+            free( pabySHXHeader );
+            free( pszBasename );
+            free( pszFullname );
+
+            return( 0 );
+        }
+    }
+
+    nRealSHXContentSize /= 2; // Bytes counted -> WORDs
+    if( !bBigEndian ) SwapWord( 4, &nRealSHXContentSize );
+    psHooks->FSeek( fpSHX, 24, 0 );
+    psHooks->FWrite( &nRealSHXContentSize, 4, 1, fpSHX );
+
+    psHooks->FClose( fpSHP );
+    psHooks->FClose( fpSHX );
+
+    free ( pabyBuf );
+    free ( pszFullname );
+    free ( pszBasename );
+    free ( pabySHXHeader );
+
+    return( 1 );
+}
+
+/************************************************************************/
 /*                              SHPClose()                              */
 /*								       	*/
 /*	Close the .shp and .shx files.					*/
@@ -742,11 +1140,42 @@ SHPClose(SHPHandle psSHP )
     {
         free( psSHP->pabyRec );
     }
-    
+
+    if( psSHP->pabyObjectBuf != NULL )
+    {
+        free( psSHP->pabyObjectBuf );
+    }
+    if( psSHP->psCachedObject != NULL )
+    {
+        free( psSHP->psCachedObject );
+    }
+
     free( psSHP );
 }
 
 /************************************************************************/
+/*                    SHPSetFastModeReadObject()                        */
+/************************************************************************/
+
+/* If setting bFastMode = TRUE, the content of SHPReadObject() is owned by the SHPHandle. */
+/* So you cannot have 2 valid instances of SHPReadObject() simultaneously. */
+/* The SHPObject padfZ and padfM members may be NULL depending on the geometry */
+/* type. It is illegal to free at hand any of the pointer members of the SHPObject structure */
+void SHPAPI_CALL SHPSetFastModeReadObject( SHPHandle hSHP, int bFastMode )
+{
+    if( bFastMode )
+    {
+        if( hSHP->psCachedObject == NULL )
+        {
+            hSHP->psCachedObject = (SHPObject*) calloc(1, sizeof(SHPObject));
+            assert( hSHP->psCachedObject != NULL );
+        }
+    }
+
+    hSHP->bFastModeReadObject = bFastMode;
+}
+
+/************************************************************************/
 /*                             SHPGetInfo()                             */
 /*                                                                      */
 /*      Fetch general information about the shape file.                 */
@@ -761,7 +1190,7 @@ SHPGetInfo(SHPHandle psSHP, int * pnEntities, int * pnShapeType,
 
     if( psSHP == NULL )
         return;
-    
+
     if( pnEntities != NULL )
         *pnEntities = psSHP->nRecords;
 
@@ -806,21 +1235,24 @@ SHPHandle SHPAPI_CALL
 SHPCreateLL( const char * pszLayer, int nShapeType, SAHooks *psHooks )
 
 {
-    char	*pszBasename, *pszFullname;
+    char	*pszBasename = NULL, *pszFullname = NULL;
     int		i;
-    SAFile	fpSHP, fpSHX;
+    SAFile	fpSHP = NULL, fpSHX = NULL;
     uchar     	abyHeader[100];
     int32	i32;
     double	dValue;
-    
+    size_t      nFullnameLen;
+
 /* -------------------------------------------------------------------- */
 /*      Establish the byte order on this system.                        */
 /* -------------------------------------------------------------------- */
+#if !defined(bBigEndian)
     i = 1;
     if( *((uchar *) &i) == 1 )
         bBigEndian = FALSE;
     else
         bBigEndian = TRUE;
+#endif
 
 /* -------------------------------------------------------------------- */
 /*	Compute the base (layer) name.  If there is any extension	*/
@@ -828,10 +1260,10 @@ SHPCreateLL( const char * pszLayer, int nShapeType, SAHooks *psHooks )
 /* -------------------------------------------------------------------- */
     pszBasename = (char *) malloc(strlen(pszLayer)+5);
     strcpy( pszBasename, pszLayer );
-    for( i = strlen(pszBasename)-1; 
-	 i > 0 && pszBasename[i] != '.' && pszBasename[i] != '/'
-	       && pszBasename[i] != '\\';
-	 i-- ) {}
+    for( i = (int)strlen(pszBasename)-1;
+         i > 0 && pszBasename[i] != '.' && pszBasename[i] != '/'
+             && pszBasename[i] != '\\';
+         i-- ) {}
 
     if( pszBasename[i] == '.' )
         pszBasename[i] = '\0';
@@ -839,31 +1271,31 @@ SHPCreateLL( const char * pszLayer, int nShapeType, SAHooks *psHooks )
 /* -------------------------------------------------------------------- */
 /*      Open the two files so we can write their headers.               */
 /* -------------------------------------------------------------------- */
-    pszFullname = (char *) malloc(strlen(pszBasename) + 5);
-    sprintf( pszFullname, "%s.shp", pszBasename );
+    nFullnameLen = strlen(pszBasename) + 5;
+    pszFullname = (char *) malloc(nFullnameLen);
+    snprintf( pszFullname, nFullnameLen, "%s.shp", pszBasename );
     fpSHP = psHooks->FOpen(pszFullname, "wb" );
     if( fpSHP == NULL )
     {
         psHooks->Error( "Failed to create file .shp file." );
-        return( NULL );
+        goto error;
     }
 
-    sprintf( pszFullname, "%s.shx", pszBasename );
+    snprintf( pszFullname, nFullnameLen, "%s.shx", pszBasename );
     fpSHX = psHooks->FOpen(pszFullname, "wb" );
     if( fpSHX == NULL )
     {
         psHooks->Error( "Failed to create file .shx file." );
-        return( NULL );
+        goto error;
     }
 
-    free( pszFullname );
-    free( pszBasename );
+    free( pszFullname ); pszFullname = NULL;
+    free( pszBasename ); pszBasename = NULL;
 
 /* -------------------------------------------------------------------- */
 /*      Prepare header block for .shp file.                             */
 /* -------------------------------------------------------------------- */
-    for( i = 0; i < 100; i++ )
-      abyHeader[i] = 0;
+    memset( abyHeader, 0, sizeof(abyHeader) );
 
     abyHeader[2] = 0x27;				/* magic cookie */
     abyHeader[3] = 0x0a;
@@ -871,11 +1303,11 @@ SHPCreateLL( const char * pszLayer, int nShapeType, SAHooks *psHooks )
     i32 = 50;						/* file size */
     ByteCopy( &i32, abyHeader+24, 4 );
     if( !bBigEndian ) SwapWord( 4, abyHeader+24 );
-    
+
     i32 = 1000;						/* version */
     ByteCopy( &i32, abyHeader+28, 4 );
     if( bBigEndian ) SwapWord( 4, abyHeader+28 );
-    
+
     i32 = nShapeType;					/* shape type */
     ByteCopy( &i32, abyHeader+32, 4 );
     if( bBigEndian ) SwapWord( 4, abyHeader+32 );
@@ -891,8 +1323,13 @@ SHPCreateLL( const char * pszLayer, int nShapeType, SAHooks *psHooks )
 /* -------------------------------------------------------------------- */
     if( psHooks->FWrite( abyHeader, 100, 1, fpSHP ) != 1 )
     {
-        psHooks->Error( "Failed to write .shp header." );
-        return NULL;
+        char szError[200];
+
+        snprintf( szError, sizeof(szError),
+                 "Failed to write .shp header: %s", strerror(errno) );
+        psHooks->Error( szError );
+
+        goto error;
     }
 
 /* -------------------------------------------------------------------- */
@@ -901,11 +1338,16 @@ SHPCreateLL( const char * pszLayer, int nShapeType, SAHooks *psHooks )
     i32 = 50;						/* file size */
     ByteCopy( &i32, abyHeader+24, 4 );
     if( !bBigEndian ) SwapWord( 4, abyHeader+24 );
-    
+
     if( psHooks->FWrite( abyHeader, 100, 1, fpSHX ) != 1 )
     {
-        psHooks->Error( "Failed to write .shx header." );
-        return NULL;
+        char szError[200];
+
+        snprintf( szError, sizeof(szError),
+                 "Failure writing .shx header: %s", strerror(errno) );
+        psHooks->Error( szError );
+
+        goto error;
     }
 
 /* -------------------------------------------------------------------- */
@@ -915,6 +1357,13 @@ SHPCreateLL( const char * pszLayer, int nShapeType, SAHooks *psHooks )
     psHooks->FClose( fpSHX );
 
     return( SHPOpenLL( pszLayer, "r+b", psHooks ) );
+
+error:
+    if (pszFullname) free(pszFullname);
+    if (pszBasename) free(pszBasename);
+    if (fpSHP) psHooks->FClose( fpSHP );
+    if (fpSHX) psHooks->FClose( fpSHX );
+    return NULL;
 }
 
 /************************************************************************/
@@ -953,7 +1402,7 @@ SHPComputeExtents( SHPObject * psObject )
 
 {
     int		i;
-    
+
 /* -------------------------------------------------------------------- */
 /*      Build extents for this object.                                  */
 /* -------------------------------------------------------------------- */
@@ -964,7 +1413,7 @@ SHPComputeExtents( SHPObject * psObject )
         psObject->dfZMin = psObject->dfZMax = psObject->padfZ[0];
         psObject->dfMMin = psObject->dfMMax = psObject->padfM[0];
     }
-    
+
     for( i = 0; i < psObject->nVertices; i++ )
     {
         psObject->dfXMin = MIN(psObject->dfXMin, psObject->padfX[i]);
@@ -1039,16 +1488,17 @@ SHPCreateObject( int nSHPType, int nShapeId, int nParts,
         psObject->nParts = MAX(1,nParts);
 
         psObject->panPartStart = (int *)
-            malloc(sizeof(int) * psObject->nParts);
+            calloc(sizeof(int), psObject->nParts);
         psObject->panPartType = (int *)
             malloc(sizeof(int) * psObject->nParts);
 
         psObject->panPartStart[0] = 0;
         psObject->panPartType[0] = SHPP_RING;
-        
+
         for( i = 0; i < nParts; i++ )
         {
-            psObject->panPartStart[i] = panPartStart[i];
+            if( panPartStart != NULL )
+                psObject->panPartStart[i] = panPartStart[i];
 
             if( panPartType != NULL )
                 psObject->panPartType[i] = panPartType[i];
@@ -1061,8 +1511,7 @@ SHPCreateObject( int nSHPType, int nShapeId, int nParts,
     }
 
 /* -------------------------------------------------------------------- */
-/*      Capture vertices.  Note that Z and M are optional, but X and    */
-/*      Y are not.                                                      */
+/*      Capture vertices.  Note that X, Y, Z and M are optional.        */
 /* -------------------------------------------------------------------- */
     if( nVertices > 0 )
     {
@@ -1071,13 +1520,12 @@ SHPCreateObject( int nSHPType, int nShapeId, int nParts,
         psObject->padfZ = (double *) calloc(sizeof(double),nVertices);
         psObject->padfM = (double *) calloc(sizeof(double),nVertices);
 
-        assert( padfX != NULL );
-        assert( padfY != NULL );
-    
         for( i = 0; i < nVertices; i++ )
         {
-            psObject->padfX[i] = padfX[i];
-            psObject->padfY[i] = padfY[i];
+            if( padfX != NULL )
+                psObject->padfX[i] = padfX[i];
+            if( padfY != NULL )
+                psObject->padfY[i] = padfY[i];
             if( padfZ != NULL && bHasZ )
                 psObject->padfZ[i] = padfZ[i];
             if( padfM != NULL && bHasM )
@@ -1112,7 +1560,7 @@ SHPCreateSimpleObject( int nSHPType, int nVertices,
     return( SHPCreateObject( nSHPType, -1, 0, NULL, NULL,
                              nVertices, padfX, padfY, padfZ, NULL ) );
 }
-                                  
+
 /************************************************************************/
 /*                           SHPWriteObject()                           */
 /*                                                                      */
@@ -1122,11 +1570,13 @@ SHPCreateSimpleObject( int nSHPType, int nVertices,
 
 int SHPAPI_CALL
 SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
-		      
+
 {
-    int	       	nRecordOffset, i, nRecordSize=0;
+    unsigned int	       	nRecordOffset, nRecordSize=0;
+    int i;
     uchar	*pabyRec;
     int32	i32;
+    int     bExtendFile = FALSE;
 
     psSHP->bUpdated = TRUE;
 
@@ -1134,7 +1584,7 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
 /*      Ensure that shape object matches the type of the file it is     */
 /*      being written to.                                               */
 /* -------------------------------------------------------------------- */
-    assert( psObject->nSHPType == psSHP->nShapeType 
+    assert( psObject->nSHPType == psSHP->nShapeType
             || psObject->nSHPType == SHPT_NULL );
 
 /* -------------------------------------------------------------------- */
@@ -1142,7 +1592,7 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
 /*      assertion, or if they are disabled, set the shapeid to -1       */
 /*      for appends.                                                    */
 /* -------------------------------------------------------------------- */
-    assert( nShapeId == -1 
+    assert( nShapeId == -1
             || (nShapeId >= 0 && nShapeId < psSHP->nRecords) );
 
     if( nShapeId != -1 && nShapeId >= psSHP->nRecords )
@@ -1153,57 +1603,69 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
 /* -------------------------------------------------------------------- */
     if( nShapeId == -1 && psSHP->nRecords+1 > psSHP->nMaxRecords )
     {
-	psSHP->nMaxRecords =(int) ( psSHP->nMaxRecords * 1.3 + 100);
-
-	psSHP->panRecOffset = (int *) 
-            SfRealloc(psSHP->panRecOffset,sizeof(int) * psSHP->nMaxRecords );
-	psSHP->panRecSize = (int *) 
-            SfRealloc(psSHP->panRecSize,sizeof(int) * psSHP->nMaxRecords );
+        int nNewMaxRecords = psSHP->nMaxRecords + psSHP->nMaxRecords / 3 + 100;
+        unsigned int* panRecOffsetNew;
+        unsigned int* panRecSizeNew;
+
+        panRecOffsetNew = (unsigned int *)
+            SfRealloc(psSHP->panRecOffset,sizeof(unsigned int) * nNewMaxRecords );
+        if( panRecOffsetNew == NULL )
+            return -1;
+        psSHP->panRecOffset = panRecOffsetNew;
+
+        panRecSizeNew = (unsigned int *)
+            SfRealloc(psSHP->panRecSize,sizeof(unsigned int) * nNewMaxRecords );
+        if( panRecSizeNew == NULL )
+            return -1;
+        psSHP->panRecSize = panRecSizeNew;
+
+        psSHP->nMaxRecords = nNewMaxRecords;
     }
 
 /* -------------------------------------------------------------------- */
 /*      Initialize record.                                              */
 /* -------------------------------------------------------------------- */
-    pabyRec = (uchar *) malloc(psObject->nVertices * 4 * sizeof(double) 
-			       + psObject->nParts * 8 + 128);
-    
+    pabyRec = (uchar *) malloc(psObject->nVertices * 4 * sizeof(double)
+                               + psObject->nParts * 8 + 128);
+    if( pabyRec == NULL )
+        return -1;
+
 /* -------------------------------------------------------------------- */
 /*  Extract vertices for a Polygon or Arc.				*/
 /* -------------------------------------------------------------------- */
     if( psObject->nSHPType == SHPT_POLYGON
         || psObject->nSHPType == SHPT_POLYGONZ
         || psObject->nSHPType == SHPT_POLYGONM
-        || psObject->nSHPType == SHPT_ARC 
+        || psObject->nSHPType == SHPT_ARC
         || psObject->nSHPType == SHPT_ARCZ
         || psObject->nSHPType == SHPT_ARCM
         || psObject->nSHPType == SHPT_MULTIPATCH )
     {
-	int32		nPoints, nParts;
-	int    		i;
+        int32		nPoints, nParts;
 
-	nPoints = psObject->nVertices;
-	nParts = psObject->nParts;
+        nPoints = psObject->nVertices;
+        nParts = psObject->nParts;
 
-	_SHPSetBounds( pabyRec + 12, psObject );
+        _SHPSetBounds( pabyRec + 12, psObject );
 
-	if( bBigEndian ) SwapWord( 4, &nPoints );
-	if( bBigEndian ) SwapWord( 4, &nParts );
+        if( bBigEndian ) SwapWord( 4, &nPoints );
+        if( bBigEndian ) SwapWord( 4, &nParts );
 
-	ByteCopy( &nPoints, pabyRec + 40 + 8, 4 );
-	ByteCopy( &nParts, pabyRec + 36 + 8, 4 );
+        ByteCopy( &nPoints, pabyRec + 40 + 8, 4 );
+        ByteCopy( &nParts, pabyRec + 36 + 8, 4 );
 
         nRecordSize = 52;
 
         /*
          * Write part start positions.
          */
-	ByteCopy( psObject->panPartStart, pabyRec + 44 + 8,
+        ByteCopy( psObject->panPartStart, pabyRec + 44 + 8,
                   4 * psObject->nParts );
-	for( i = 0; i < psObject->nParts; i++ )
-	{
-	    if( bBigEndian ) SwapWord( 4, pabyRec + 44 + 8 + 4*i );
+        for( i = 0; i < psObject->nParts; i++ )
+        {
+            if( bBigEndian ) SwapWord( 4, pabyRec + 44 + 8 + 4*i );
             nRecordSize += 4;
-	}
+        }
 
         /*
          * Write multipatch part types if needed.
@@ -1222,19 +1684,19 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
         /*
          * Write the (x,y) vertex values.
          */
-	for( i = 0; i < psObject->nVertices; i++ )
-	{
-	    ByteCopy( psObject->padfX + i, pabyRec + nRecordSize, 8 );
-	    ByteCopy( psObject->padfY + i, pabyRec + nRecordSize + 8, 8 );
+        for( i = 0; i < psObject->nVertices; i++ )
+        {
+            ByteCopy( psObject->padfX + i, pabyRec + nRecordSize, 8 );
+            ByteCopy( psObject->padfY + i, pabyRec + nRecordSize + 8, 8 );
 
-	    if( bBigEndian )
+            if( bBigEndian )
                 SwapWord( 8, pabyRec + nRecordSize );
-            
-	    if( bBigEndian )
+
+            if( bBigEndian )
                 SwapWord( 8, pabyRec + nRecordSize + 8 );
 
             nRecordSize += 2 * 8;
-	}
+        }
 
         /*
          * Write the Z coordinates (if any).
@@ -1246,7 +1708,7 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
             ByteCopy( &(psObject->dfZMin), pabyRec + nRecordSize, 8 );
             if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize );
             nRecordSize += 8;
-            
+
             ByteCopy( &(psObject->dfZMax), pabyRec + nRecordSize, 8 );
             if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize );
             nRecordSize += 8;
@@ -1264,17 +1726,17 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
          */
         if( psObject->bMeasureIsUsed
             && (psObject->nSHPType == SHPT_POLYGONM
-            || psObject->nSHPType == SHPT_ARCM
-#ifndef DISABLE_MULTIPATCH_MEASURE            
-            || psObject->nSHPType == SHPT_MULTIPATCH
-#endif            
-            || psObject->nSHPType == SHPT_POLYGONZ
-            || psObject->nSHPType == SHPT_ARCZ) )
+                || psObject->nSHPType == SHPT_ARCM
+#ifndef DISABLE_MULTIPATCH_MEASURE
+                || psObject->nSHPType == SHPT_MULTIPATCH
+#endif
+                || psObject->nSHPType == SHPT_POLYGONZ
+                || psObject->nSHPType == SHPT_ARCZ) )
         {
             ByteCopy( &(psObject->dfMMin), pabyRec + nRecordSize, 8 );
             if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize );
             nRecordSize += 8;
-            
+
             ByteCopy( &(psObject->dfMMax), pabyRec + nRecordSize, 8 );
             if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize );
             nRecordSize += 8;
@@ -1295,26 +1757,25 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
              || psObject->nSHPType == SHPT_MULTIPOINTZ
              || psObject->nSHPType == SHPT_MULTIPOINTM )
     {
-	int32		nPoints;
-	int    		i;
+        int32		nPoints;
 
-	nPoints = psObject->nVertices;
+        nPoints = psObject->nVertices;
 
         _SHPSetBounds( pabyRec + 12, psObject );
 
-	if( bBigEndian ) SwapWord( 4, &nPoints );
-	ByteCopy( &nPoints, pabyRec + 44, 4 );
-	
-	for( i = 0; i < psObject->nVertices; i++ )
-	{
-	    ByteCopy( psObject->padfX + i, pabyRec + 48 + i*16, 8 );
-	    ByteCopy( psObject->padfY + i, pabyRec + 48 + i*16 + 8, 8 );
+        if( bBigEndian ) SwapWord( 4, &nPoints );
+        ByteCopy( &nPoints, pabyRec + 44, 4 );
 
-	    if( bBigEndian ) SwapWord( 8, pabyRec + 48 + i*16 );
-	    if( bBigEndian ) SwapWord( 8, pabyRec + 48 + i*16 + 8 );
-	}
+        for( i = 0; i < psObject->nVertices; i++ )
+        {
+            ByteCopy( psObject->padfX + i, pabyRec + 48 + i*16, 8 );
+            ByteCopy( psObject->padfY + i, pabyRec + 48 + i*16 + 8, 8 );
+
+            if( bBigEndian ) SwapWord( 8, pabyRec + 48 + i*16 );
+            if( bBigEndian ) SwapWord( 8, pabyRec + 48 + i*16 + 8 );
+        }
 
-	nRecordSize = 48 + 16 * psObject->nVertices;
+        nRecordSize = 48 + 16 * psObject->nVertices;
 
         if( psObject->nSHPType == SHPT_MULTIPOINTZ )
         {
@@ -1325,7 +1786,7 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
             ByteCopy( &(psObject->dfZMax), pabyRec + nRecordSize, 8 );
             if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize );
             nRecordSize += 8;
-            
+
             for( i = 0; i < psObject->nVertices; i++ )
             {
                 ByteCopy( psObject->padfZ + i, pabyRec + nRecordSize, 8 );
@@ -1336,7 +1797,7 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
 
         if( psObject->bMeasureIsUsed
             && (psObject->nSHPType == SHPT_MULTIPOINTZ
-            || psObject->nSHPType == SHPT_MULTIPOINTM) )
+                || psObject->nSHPType == SHPT_MULTIPOINTM) )
         {
             ByteCopy( &(psObject->dfMMin), pabyRec + nRecordSize, 8 );
             if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize );
@@ -1345,7 +1806,7 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
             ByteCopy( &(psObject->dfMMax), pabyRec + nRecordSize, 8 );
             if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize );
             nRecordSize += 8;
-            
+
             for( i = 0; i < psObject->nVertices; i++ )
             {
                 ByteCopy( psObject->padfM + i, pabyRec + nRecordSize, 8 );
@@ -1362,24 +1823,24 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
              || psObject->nSHPType == SHPT_POINTZ
              || psObject->nSHPType == SHPT_POINTM )
     {
-	ByteCopy( psObject->padfX, pabyRec + 12, 8 );
-	ByteCopy( psObject->padfY, pabyRec + 20, 8 );
+        ByteCopy( psObject->padfX, pabyRec + 12, 8 );
+        ByteCopy( psObject->padfY, pabyRec + 20, 8 );
 
-	if( bBigEndian ) SwapWord( 8, pabyRec + 12 );
-	if( bBigEndian ) SwapWord( 8, pabyRec + 20 );
+        if( bBigEndian ) SwapWord( 8, pabyRec + 12 );
+        if( bBigEndian ) SwapWord( 8, pabyRec + 20 );
 
         nRecordSize = 28;
-        
+
         if( psObject->nSHPType == SHPT_POINTZ )
         {
             ByteCopy( psObject->padfZ, pabyRec + nRecordSize, 8 );
             if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize );
             nRecordSize += 8;
         }
-        
+
         if( psObject->bMeasureIsUsed
             && (psObject->nSHPType == SHPT_POINTZ
-            || psObject->nSHPType == SHPT_POINTM) )
+                || psObject->nSHPType == SHPT_POINTM) )
         {
             ByteCopy( psObject->padfM, pabyRec + nRecordSize, 8 );
             if( bBigEndian ) SwapWord( 8, pabyRec + nRecordSize );
@@ -1408,23 +1869,30 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
 /* -------------------------------------------------------------------- */
     if( nShapeId == -1 || psSHP->panRecSize[nShapeId] < nRecordSize-8 )
     {
-        if( nShapeId == -1 )
-            nShapeId = psSHP->nRecords++;
+        unsigned int nExpectedSize = psSHP->nFileSize + nRecordSize;
+        if( nExpectedSize < psSHP->nFileSize ) // due to unsigned int overflow
+        {
+            char str[128];
+            snprintf( str, sizeof(str), "Failed to write shape object. "
+                     "File size cannot reach %u + %u.",
+                     psSHP->nFileSize, nRecordSize );
+            psSHP->sHooks.Error( str );
+            free( pabyRec );
+            return -1;
+        }
 
-        psSHP->panRecOffset[nShapeId] = nRecordOffset = psSHP->nFileSize;
-        psSHP->panRecSize[nShapeId] = nRecordSize-8;
-        psSHP->nFileSize += nRecordSize;
+        bExtendFile = TRUE;
+        nRecordOffset = psSHP->nFileSize;
     }
     else
     {
         nRecordOffset = psSHP->panRecOffset[nShapeId];
-        psSHP->panRecSize[nShapeId] = nRecordSize-8;
     }
-    
+
 /* -------------------------------------------------------------------- */
 /*      Set the shape type, record number, and record size.             */
 /* -------------------------------------------------------------------- */
-    i32 = nShapeId+1;					/* record # */
+    i32 = (nShapeId < 0) ? psSHP->nRecords+1 : nShapeId+1;					/* record # */
     if( !bBigEndian ) SwapWord( 4, &i32 );
     ByteCopy( &i32, pabyRec, 4 );
 
@@ -1439,16 +1907,43 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
 /* -------------------------------------------------------------------- */
 /*      Write out record.                                               */
 /* -------------------------------------------------------------------- */
-    if( psSHP->sHooks.FSeek( psSHP->fpSHP, nRecordOffset, 0 ) != 0
-        || psSHP->sHooks.FWrite( pabyRec, nRecordSize, 1, psSHP->fpSHP ) < 1 )
+    if( psSHP->sHooks.FSeek( psSHP->fpSHP, nRecordOffset, 0 ) != 0 )
     {
-        psSHP->sHooks.Error( "Error in psSHP->sHooks.FSeek() or fwrite() writing object to .shp file." );
+        char szError[200];
+
+        snprintf( szError, sizeof(szError),
+                 "Error in psSHP->sHooks.FSeek() while writing object to .shp file: %s",
+                  strerror(errno) );
+        psSHP->sHooks.Error( szError );
+
+        free( pabyRec );
+        return -1;
+    }
+    if( psSHP->sHooks.FWrite( pabyRec, nRecordSize, 1, psSHP->fpSHP ) < 1 )
+    {
+        char szError[200];
+
+        snprintf( szError, sizeof(szError),
+                 "Error in psSHP->sHooks.FWrite() while writing object of %u bytes to .shp file: %s",
+                  nRecordSize, strerror(errno) );
+        psSHP->sHooks.Error( szError );
+
         free( pabyRec );
         return -1;
     }
-    
+
     free( pabyRec );
 
+    if( bExtendFile )
+    {
+        if( nShapeId == -1 )
+            nShapeId = psSHP->nRecords++;
+
+        psSHP->panRecOffset[nShapeId] = psSHP->nFileSize;
+        psSHP->nFileSize += nRecordSize;
+    }
+    psSHP->panRecSize[nShapeId] = nRecordSize-8;
+
 /* -------------------------------------------------------------------- */
 /*	Expand file wide bounds based on this shape.			*/
 /* -------------------------------------------------------------------- */
@@ -1468,27 +1963,78 @@ SHPWriteObject(SHPHandle psSHP, int nShapeId, SHPObject * psObject )
         {
             psSHP->adBoundsMin[0] = psSHP->adBoundsMax[0] = psObject->padfX[0];
             psSHP->adBoundsMin[1] = psSHP->adBoundsMax[1] = psObject->padfY[0];
-            psSHP->adBoundsMin[2] = psSHP->adBoundsMax[2] = psObject->padfZ[0];
-            psSHP->adBoundsMin[3] = psSHP->adBoundsMax[3] = psObject->padfM[0];
+            psSHP->adBoundsMin[2] = psSHP->adBoundsMax[2] = psObject->padfZ ? psObject->padfZ[0] : 0.0;
+            psSHP->adBoundsMin[3] = psSHP->adBoundsMax[3] = psObject->padfM ? psObject->padfM[0] : 0.0;
         }
     }
 
     for( i = 0; i < psObject->nVertices; i++ )
     {
-	psSHP->adBoundsMin[0] = MIN(psSHP->adBoundsMin[0],psObject->padfX[i]);
-	psSHP->adBoundsMin[1] = MIN(psSHP->adBoundsMin[1],psObject->padfY[i]);
-	psSHP->adBoundsMin[2] = MIN(psSHP->adBoundsMin[2],psObject->padfZ[i]);
-	psSHP->adBoundsMin[3] = MIN(psSHP->adBoundsMin[3],psObject->padfM[i]);
-	psSHP->adBoundsMax[0] = MAX(psSHP->adBoundsMax[0],psObject->padfX[i]);
-	psSHP->adBoundsMax[1] = MAX(psSHP->adBoundsMax[1],psObject->padfY[i]);
-	psSHP->adBoundsMax[2] = MAX(psSHP->adBoundsMax[2],psObject->padfZ[i]);
-	psSHP->adBoundsMax[3] = MAX(psSHP->adBoundsMax[3],psObject->padfM[i]);
+        psSHP->adBoundsMin[0] = MIN(psSHP->adBoundsMin[0],psObject->padfX[i]);
+        psSHP->adBoundsMin[1] = MIN(psSHP->adBoundsMin[1],psObject->padfY[i]);
+        psSHP->adBoundsMax[0] = MAX(psSHP->adBoundsMax[0],psObject->padfX[i]);
+        psSHP->adBoundsMax[1] = MAX(psSHP->adBoundsMax[1],psObject->padfY[i]);
+        if( psObject->padfZ )
+        {
+            psSHP->adBoundsMin[2] = MIN(psSHP->adBoundsMin[2],psObject->padfZ[i]);
+            psSHP->adBoundsMax[2] = MAX(psSHP->adBoundsMax[2],psObject->padfZ[i]);
+        }
+        if( psObject->padfM )
+        {
+            psSHP->adBoundsMin[3] = MIN(psSHP->adBoundsMin[3],psObject->padfM[i]);
+            psSHP->adBoundsMax[3] = MAX(psSHP->adBoundsMax[3],psObject->padfM[i]);
+        }
     }
 
     return( nShapeId  );
 }
 
 /************************************************************************/
+/*                         SHPAllocBuffer()                             */
+/************************************************************************/
+
+static void* SHPAllocBuffer(unsigned char** pBuffer, int nSize)
+{
+    unsigned char* pRet;
+
+    if( pBuffer == NULL )
+        return calloc(1, nSize);
+
+    pRet = *pBuffer;
+    if( pRet == NULL )
+        return NULL;
+
+    (*pBuffer) += nSize;
+    return pRet;
+}
+
+/************************************************************************/
+/*                    SHPReallocObjectBufIfNecessary()                  */
+/************************************************************************/
+
+static unsigned char* SHPReallocObjectBufIfNecessary ( SHPHandle psSHP,
+                                                       int nObjectBufSize )
+{
+    unsigned char* pBuffer;
+    if( nObjectBufSize == 0 )
+    {
+        nObjectBufSize = 4 * sizeof(double);
+    }
+    if( nObjectBufSize > psSHP->nObjectBufSize )
+    {
+        pBuffer = (unsigned char*) realloc( psSHP->pabyObjectBuf, nObjectBufSize );
+        if( pBuffer != NULL )
+        {
+            psSHP->pabyObjectBuf = pBuffer;
+            psSHP->nObjectBufSize = nObjectBufSize;
+        }
+    }
+    else
+        pBuffer = psSHP->pabyObjectBuf;
+    return pBuffer;
+}
+
+/************************************************************************/
 /*                          SHPReadObject()                             */
 /*                                                                      */
 /*      Read the vertices, parts, and other non-attribute information	*/
@@ -1500,8 +2046,10 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
 
 {
     int                  nEntitySize, nRequiredSize;
-    SHPObject		*psShape;
-    char                 pszErrorMsg[128];
+    SHPObject           *psShape;
+    char                 szErrorMsg[128];
+    int                  nSHPType;
+    int                  nBytesRead;
 
 /* -------------------------------------------------------------------- */
 /*      Validate the record/entity number.                              */
@@ -1510,28 +2058,105 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
         return( NULL );
 
 /* -------------------------------------------------------------------- */
+/*      Read offset/length from SHX loading if necessary.               */
+/* -------------------------------------------------------------------- */
+    if( psSHP->panRecOffset[hEntity] == 0 && psSHP->fpSHX != NULL )
+    {
+        unsigned int       nOffset, nLength;
+
+        if( psSHP->sHooks.FSeek( psSHP->fpSHX, 100 + 8 * hEntity, 0 ) != 0 ||
+            psSHP->sHooks.FRead( &nOffset, 1, 4, psSHP->fpSHX ) != 4 ||
+            psSHP->sHooks.FRead( &nLength, 1, 4, psSHP->fpSHX ) != 4 )
+        {
+            char str[128];
+            snprintf( str, sizeof(str),
+                    "Error in fseek()/fread() reading object from .shx file at offset %d",
+                    100 + 8 * hEntity);
+
+            psSHP->sHooks.Error( str );
+            return NULL;
+        }
+        if( !bBigEndian ) SwapWord( 4, &nOffset );
+        if( !bBigEndian ) SwapWord( 4, &nLength );
+
+        if( nOffset > (unsigned int)INT_MAX )
+        {
+            char str[128];
+            snprintf( str, sizeof(str),
+                    "Invalid offset for entity %d", hEntity);
+
+            psSHP->sHooks.Error( str );
+            return NULL;
+        }
+        if( nLength > (unsigned int)(INT_MAX / 2 - 4) )
+        {
+            char str[128];
+            snprintf( str, sizeof(str),
+                    "Invalid length for entity %d", hEntity);
+
+            psSHP->sHooks.Error( str );
+            return NULL;
+        }
+
+        psSHP->panRecOffset[hEntity] = nOffset*2;
+        psSHP->panRecSize[hEntity] = nLength*2;
+    }
+
+/* -------------------------------------------------------------------- */
 /*      Ensure our record buffer is large enough.                       */
 /* -------------------------------------------------------------------- */
     nEntitySize = psSHP->panRecSize[hEntity]+8;
     if( nEntitySize > psSHP->nBufSize )
     {
-	psSHP->pabyRec = (uchar *) SfRealloc(psSHP->pabyRec,nEntitySize);
-        if (psSHP->pabyRec == NULL)
+        uchar* pabyRecNew;
+        int nNewBufSize = nEntitySize;
+        if( nNewBufSize < INT_MAX - nNewBufSize / 3 )
+            nNewBufSize += nNewBufSize / 3;
+        else
+            nNewBufSize = INT_MAX;
+
+        /* Before allocating too much memory, check that the file is big enough */
+        if( nEntitySize >= 10 * 1024 * 1024 &&
+            (psSHP->panRecOffset[hEntity] >= psSHP->nFileSize ||
+             (unsigned int)nEntitySize > psSHP->nFileSize - psSHP->panRecOffset[hEntity]) )
         {
-            char szError[200];
+            /* We do as is we didn't trust the file size in the header */
+            SAOffset nFileSize;
+            psSHP->sHooks.FSeek( psSHP->fpSHP, 0, 2 );
+            nFileSize = psSHP->sHooks.FTell(psSHP->fpSHP);
+            if( nFileSize >= 0xFFFFFFFFU )
+                psSHP->nFileSize = 0xFFFFFFFFU;
+            else
+                psSHP->nFileSize = (unsigned int)nFileSize;
+
+            if( psSHP->panRecOffset[hEntity] >= psSHP->nFileSize ||
+                (unsigned int)nEntitySize > psSHP->nFileSize - psSHP->panRecOffset[hEntity] )
+            {
+                char str[128];
+                snprintf( str, sizeof(str),
+                         "Error in fread() reading object of size %d at offset %u from .shp file",
+                         nEntitySize, psSHP->panRecOffset[hEntity] );
+
+                psSHP->sHooks.Error( str );
+                return NULL;
+            }
+        }
 
-            /* Reallocate previous successfull size for following features */
-            psSHP->pabyRec = malloc(psSHP->nBufSize);
+        pabyRecNew = (uchar *) SfRealloc(psSHP->pabyRec,nNewBufSize);
+        if (pabyRecNew == NULL)
+        {
+            char szError[200];
 
-            sprintf( szError, 
-                     "Not enough memory to allocate requested memory (nBufSize=%d). "
-                     "Probably broken SHP file", psSHP->nBufSize );
+            snprintf( szError, sizeof(szError),
+                     "Not enough memory to allocate requested memory (nNewBufSize=%d). "
+                     "Probably broken SHP file", nNewBufSize);
             psSHP->sHooks.Error( szError );
             return NULL;
         }
 
-        /* Only set new buffer size after successfull alloc */
-	psSHP->nBufSize = nEntitySize;
+        /* Only set new buffer size after successful alloc */
+        psSHP->pabyRec = pabyRecNew;
+        psSHP->nBufSize = nNewBufSize;
     }
 
     /* In case we were not able to reallocate the buffer on a previous step */
@@ -1543,37 +2168,96 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
 /* -------------------------------------------------------------------- */
 /*      Read the record.                                                */
 /* -------------------------------------------------------------------- */
-    if( psSHP->sHooks.FSeek( psSHP->fpSHP, psSHP->panRecOffset[hEntity], 0 ) != 0 
-        || psSHP->sHooks.FRead( psSHP->pabyRec, nEntitySize, 1, 
-                  psSHP->fpSHP ) != 1 )
+    if( psSHP->sHooks.FSeek( psSHP->fpSHP, psSHP->panRecOffset[hEntity], 0 ) != 0 )
     {
         /*
          * TODO - mloskot: Consider detailed diagnostics of shape file,
          * for example to detect if file is truncated.
          */
+        char str[128];
+        snprintf( str, sizeof(str),
+                 "Error in fseek() reading object from .shp file at offset %u",
+                 psSHP->panRecOffset[hEntity]);
 
-        psSHP->sHooks.Error( "Error in fseek() or fread() reading object from .shp file." );
+        psSHP->sHooks.Error( str );
         return NULL;
     }
 
-/* -------------------------------------------------------------------- */
-/*	Allocate and minimally initialize the object.			*/
-/* -------------------------------------------------------------------- */
-    psShape = (SHPObject *) calloc(1,sizeof(SHPObject));
-    psShape->nShapeId = hEntity;
-    psShape->bMeasureIsUsed = FALSE;
+    nBytesRead = (int)psSHP->sHooks.FRead( psSHP->pabyRec, 1, nEntitySize, psSHP->fpSHP );
+
+    /* Special case for a shapefile whose .shx content length field is not equal */
+    /* to the content length field of the .shp, which is a violation of "The */
+    /* content length stored in the index record is the same as the value stored in the main */
+    /* file record header." (http://www.esri.com/library/whitepapers/pdfs/shapefile.pdf, page 24) */
+    /* Actually in that case the .shx content length is equal to the .shp content length + */
+    /* 4 (16 bit words), representing the 8 bytes of the record header... */
+    if( nBytesRead >= 8 && nBytesRead == nEntitySize - 8 )
+    {
+        /* Do a sanity check */
+        int nSHPContentLength;
+        memcpy( &nSHPContentLength, psSHP->pabyRec + 4, 4 );
+        if( !bBigEndian ) SwapWord( 4, &(nSHPContentLength) );
+        if( nSHPContentLength < 0 ||
+            nSHPContentLength > INT_MAX / 2 - 4 ||
+            2 * nSHPContentLength + 8 != nBytesRead )
+        {
+            char str[128];
+            snprintf( str, sizeof(str),
+                    "Sanity check failed when trying to recover from inconsistent .shx/.shp with shape %d",
+                    hEntity );
+
+            psSHP->sHooks.Error( str );
+            return NULL;
+        }
+    }
+    else if( nBytesRead != nEntitySize )
+    {
+        /*
+         * TODO - mloskot: Consider detailed diagnostics of shape file,
+         * for example to detect if file is truncated.
+         */
+        char str[128];
+        snprintf( str, sizeof(str),
+                 "Error in fread() reading object of size %d at offset %u from .shp file",
+                 nEntitySize, psSHP->panRecOffset[hEntity] );
+
+        psSHP->sHooks.Error( str );
+        return NULL;
+    }
 
     if ( 8 + 4 > nEntitySize )
     {
-        g_snprintf(pszErrorMsg, 128, "Corrupted .shp file : shape %d : nEntitySize = %d",
-                    hEntity, nEntitySize); 
-        psSHP->sHooks.Error( pszErrorMsg );
-        SHPDestroyObject(psShape);
+        snprintf(szErrorMsg, sizeof(szErrorMsg),
+                 "Corrupted .shp file : shape %d : nEntitySize = %d",
+                 hEntity, nEntitySize);
+        psSHP->sHooks.Error( szErrorMsg );
         return NULL;
     }
-    memcpy( &psShape->nSHPType, psSHP->pabyRec + 8, 4 );
+    memcpy( &nSHPType, psSHP->pabyRec + 8, 4 );
+
+    if( bBigEndian ) SwapWord( 4, &(nSHPType) );
+
+/* -------------------------------------------------------------------- */
+/*	Allocate and minimally initialize the object.			*/
+/* -------------------------------------------------------------------- */
+    if( psSHP->bFastModeReadObject )
+    {
+        if( psSHP->psCachedObject->bFastModeReadObject )
+        {
+            psSHP->sHooks.Error( "Invalid read pattern in fast read mode. "
+                                 "SHPDestroyObject() should be called." );
+            return NULL;
+        }
 
-    if( bBigEndian ) SwapWord( 4, &(psShape->nSHPType) );
+        psShape = psSHP->psCachedObject;
+        memset(psShape, 0, sizeof(SHPObject));
+    }
+    else
+        psShape = (SHPObject *) calloc(1,sizeof(SHPObject));
+    psShape->nShapeId = hEntity;
+    psShape->nSHPType = nSHPType;
+    psShape->bMeasureIsUsed = FALSE;
+    psShape->bFastModeReadObject = psSHP->bFastModeReadObject;
 
 /* ==================================================================== */
 /*  Extract vertices for a Polygon or Arc.				*/
@@ -1585,14 +2269,17 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
         || psShape->nSHPType == SHPT_ARCM
         || psShape->nSHPType == SHPT_MULTIPATCH )
     {
-	int32		nPoints, nParts;
-	int    		i, nOffset;
+        int32		nPoints, nParts;
+        int    		i, nOffset;
+        unsigned char* pBuffer = NULL;
+        unsigned char** ppBuffer = NULL;
 
         if ( 40 + 8 + 4 > nEntitySize )
         {
-            g_snprintf(pszErrorMsg, 128, "Corrupted .shp file : shape %d : nEntitySize = %d",
-                     hEntity, nEntitySize); 
-            psSHP->sHooks.Error( pszErrorMsg );
+            snprintf(szErrorMsg, sizeof(szErrorMsg),
+                     "Corrupted .shp file : shape %d : nEntitySize = %d",
+                     hEntity, nEntitySize);
+            psSHP->sHooks.Error( szErrorMsg );
             SHPDestroyObject(psShape);
             return NULL;
         }
@@ -1604,38 +2291,40 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
         memcpy( &(psShape->dfXMax), psSHP->pabyRec + 8 + 20, 8 );
         memcpy( &(psShape->dfYMax), psSHP->pabyRec + 8 + 28, 8 );
 
-	if( bBigEndian ) SwapWord( 8, &(psShape->dfXMin) );
-	if( bBigEndian ) SwapWord( 8, &(psShape->dfYMin) );
-	if( bBigEndian ) SwapWord( 8, &(psShape->dfXMax) );
-	if( bBigEndian ) SwapWord( 8, &(psShape->dfYMax) );
+        if( bBigEndian ) SwapWord( 8, &(psShape->dfXMin) );
+        if( bBigEndian ) SwapWord( 8, &(psShape->dfYMin) );
+        if( bBigEndian ) SwapWord( 8, &(psShape->dfXMax) );
+        if( bBigEndian ) SwapWord( 8, &(psShape->dfYMax) );
 
 /* -------------------------------------------------------------------- */
 /*      Extract part/point count, and build vertex and part arrays      */
 /*      to proper size.                                                 */
 /* -------------------------------------------------------------------- */
-	memcpy( &nPoints, psSHP->pabyRec + 40 + 8, 4 );
-	memcpy( &nParts, psSHP->pabyRec + 36 + 8, 4 );
+        memcpy( &nPoints, psSHP->pabyRec + 40 + 8, 4 );
+        memcpy( &nParts, psSHP->pabyRec + 36 + 8, 4 );
 
-	if( bBigEndian ) SwapWord( 4, &nPoints );
-	if( bBigEndian ) SwapWord( 4, &nParts );
+        if( bBigEndian ) SwapWord( 4, &nPoints );
+        if( bBigEndian ) SwapWord( 4, &nParts );
 
-        if (nPoints < 0 || nParts < 0 ||
+        /* nPoints and nParts are unsigned */
+        if (/* nPoints < 0 || nParts < 0 || */
             nPoints > 50 * 1000 * 1000 || nParts > 10 * 1000 * 1000)
         {
-            g_snprintf(pszErrorMsg, 128, "Corrupted .shp file : shape %d, nPoints=%d, nParts=%d.",
-                        hEntity, nPoints, nParts);
-            psSHP->sHooks.Error( pszErrorMsg );
+            snprintf(szErrorMsg, sizeof(szErrorMsg),
+                     "Corrupted .shp file : shape %d, nPoints=%u, nParts=%u.",
+                     hEntity, nPoints, nParts);
+            psSHP->sHooks.Error( szErrorMsg );
             SHPDestroyObject(psShape);
             return NULL;
         }
-        
+
         /* With the previous checks on nPoints and nParts, */
         /* we should not overflow here and after */
         /* since 50 M * (16 + 8 + 8) = 1 600 MB */
         nRequiredSize = 44 + 8 + 4 * nParts + 16 * nPoints;
         if ( psShape->nSHPType == SHPT_POLYGONZ
-            || psShape->nSHPType == SHPT_ARCZ
-            || psShape->nSHPType == SHPT_MULTIPATCH )
+             || psShape->nSHPType == SHPT_ARCZ
+             || psShape->nSHPType == SHPT_MULTIPATCH )
         {
             nRequiredSize += 16 + 8 * nPoints;
         }
@@ -1645,23 +2334,31 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
         }
         if (nRequiredSize > nEntitySize)
         {
-            g_snprintf(pszErrorMsg, 128, "Corrupted .shp file : shape %d, nPoints=%d, nParts=%d, nEntitySize=%d.",
-                        hEntity, nPoints, nParts, nEntitySize);
-            psSHP->sHooks.Error( pszErrorMsg );
+            snprintf(szErrorMsg, sizeof(szErrorMsg),
+                     "Corrupted .shp file : shape %d, nPoints=%u, nParts=%u, nEntitySize=%d.",
+                     hEntity, nPoints, nParts, nEntitySize);
+            psSHP->sHooks.Error( szErrorMsg );
             SHPDestroyObject(psShape);
             return NULL;
         }
 
-	psShape->nVertices = nPoints;
-        psShape->padfX = (double *) calloc(nPoints,sizeof(double));
-        psShape->padfY = (double *) calloc(nPoints,sizeof(double));
-        psShape->padfZ = (double *) calloc(nPoints,sizeof(double));
-        psShape->padfM = (double *) calloc(nPoints,sizeof(double));
+        if( psShape->bFastModeReadObject )
+        {
+            int nObjectBufSize = 4 * sizeof(double) * nPoints + 2 * sizeof(int) * nParts;
+            pBuffer = SHPReallocObjectBufIfNecessary(psSHP, nObjectBufSize);
+            ppBuffer = &pBuffer;
+        }
+
+        psShape->nVertices = nPoints;
+        psShape->padfX = (double *) SHPAllocBuffer(ppBuffer, sizeof(double) * nPoints);
+        psShape->padfY = (double *) SHPAllocBuffer(ppBuffer, sizeof(double) * nPoints);
+        psShape->padfZ = (double *) SHPAllocBuffer(ppBuffer, sizeof(double) * nPoints);
+        psShape->padfM = (double *) SHPAllocBuffer(ppBuffer, sizeof(double) * nPoints);
+
+        psShape->nParts = nParts;
+        psShape->panPartStart = (int *) SHPAllocBuffer(ppBuffer, nParts * sizeof(int));
+        psShape->panPartType = (int *) SHPAllocBuffer(ppBuffer, nParts * sizeof(int));
 
-	psShape->nParts = nParts;
-        psShape->panPartStart = (int *) calloc(nParts,sizeof(int));
-        psShape->panPartType = (int *) calloc(nParts,sizeof(int));
-        
         if (psShape->padfX == NULL ||
             psShape->padfY == NULL ||
             psShape->padfZ == NULL ||
@@ -1669,46 +2366,50 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
             psShape->panPartStart == NULL ||
             psShape->panPartType == NULL)
         {
-            g_snprintf(pszErrorMsg, 128,
-                     "Not enough memory to allocate requested memory (nPoints=%d, nParts=%d) for shape %d. "
-                     "Probably broken SHP file", hEntity, nPoints, nParts );
-            psSHP->sHooks.Error( pszErrorMsg );
+            snprintf(szErrorMsg, sizeof(szErrorMsg),
+                    "Not enough memory to allocate requested memory (nPoints=%u, nParts=%u) for shape %d. "
+                    "Probably broken SHP file", nPoints, nParts, hEntity );
+            psSHP->sHooks.Error( szErrorMsg );
             SHPDestroyObject(psShape);
             return NULL;
         }
 
-        for( i = 0; i < nParts; i++ )
+        for( i = 0; (int32)i < nParts; i++ )
             psShape->panPartType[i] = SHPP_RING;
 
 /* -------------------------------------------------------------------- */
 /*      Copy out the part array from the record.                        */
 /* -------------------------------------------------------------------- */
-	memcpy( psShape->panPartStart, psSHP->pabyRec + 44 + 8, 4 * nParts );
-	for( i = 0; i < nParts; i++ )
-	{
-	    if( bBigEndian ) SwapWord( 4, psShape->panPartStart+i );
+        memcpy( psShape->panPartStart, psSHP->pabyRec + 44 + 8, 4 * nParts );
+        for( i = 0; (int32)i < nParts; i++ )
+        {
+            if( bBigEndian ) SwapWord( 4, psShape->panPartStart+i );
 
             /* We check that the offset is inside the vertex array */
-            if (psShape->panPartStart[i] < 0 ||
-                psShape->panPartStart[i] >= psShape->nVertices)
+            if (psShape->panPartStart[i] < 0
+                || (psShape->panPartStart[i] >= psShape->nVertices
+                    && psShape->nVertices > 0)
+                || (psShape->panPartStart[i] > 0 && psShape->nVertices == 0) )
             {
-                g_snprintf(pszErrorMsg, 128, "Corrupted .shp file : shape %d : panPartStart[%d] = %d, nVertices = %d",
-                         hEntity, i, psShape->panPartStart[i], psShape->nVertices); 
-                psSHP->sHooks.Error( pszErrorMsg );
+                snprintf(szErrorMsg, sizeof(szErrorMsg),
+                         "Corrupted .shp file : shape %d : panPartStart[%d] = %d, nVertices = %d",
+                         hEntity, i, psShape->panPartStart[i], psShape->nVertices);
+                psSHP->sHooks.Error( szErrorMsg );
                 SHPDestroyObject(psShape);
                 return NULL;
             }
             if (i > 0 && psShape->panPartStart[i] <= psShape->panPartStart[i-1])
             {
-                g_snprintf(pszErrorMsg, 128, "Corrupted .shp file : shape %d : panPartStart[%d] = %d, panPartStart[%d] = %d",
-                         hEntity, i, psShape->panPartStart[i], i - 1, psShape->panPartStart[i - 1]); 
-                psSHP->sHooks.Error( pszErrorMsg );
+                snprintf(szErrorMsg, sizeof(szErrorMsg),
+                         "Corrupted .shp file : shape %d : panPartStart[%d] = %d, panPartStart[%d] = %d",
+                         hEntity, i, psShape->panPartStart[i], i - 1, psShape->panPartStart[i - 1]);
+                psSHP->sHooks.Error( szErrorMsg );
                 SHPDestroyObject(psShape);
                 return NULL;
             }
-	}
+        }
 
-	nOffset = 44 + 8 + 4*nParts;
+        nOffset = 44 + 8 + 4*nParts;
 
 /* -------------------------------------------------------------------- */
 /*      If this is a multipatch, we will also have parts types.         */
@@ -1716,33 +2417,33 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
         if( psShape->nSHPType == SHPT_MULTIPATCH )
         {
             memcpy( psShape->panPartType, psSHP->pabyRec + nOffset, 4*nParts );
-            for( i = 0; i < nParts; i++ )
+            for( i = 0; (int32)i < nParts; i++ )
             {
                 if( bBigEndian ) SwapWord( 4, psShape->panPartType+i );
             }
 
             nOffset += 4*nParts;
         }
-        
+
 /* -------------------------------------------------------------------- */
 /*      Copy out the vertices from the record.                          */
 /* -------------------------------------------------------------------- */
-	for( i = 0; i < nPoints; i++ )
-	{
-	    memcpy(psShape->padfX + i,
-		   psSHP->pabyRec + nOffset + i * 16,
-		   8 );
+        for( i = 0; (int32)i < nPoints; i++ )
+        {
+            memcpy(psShape->padfX + i,
+                   psSHP->pabyRec + nOffset + i * 16,
+                   8 );
 
-	    memcpy(psShape->padfY + i,
-		   psSHP->pabyRec + nOffset + i * 16 + 8,
-		   8 );
+            memcpy(psShape->padfY + i,
+                   psSHP->pabyRec + nOffset + i * 16 + 8,
+                   8 );
 
-	    if( bBigEndian ) SwapWord( 8, psShape->padfX + i );
-	    if( bBigEndian ) SwapWord( 8, psShape->padfY + i );
-	}
+            if( bBigEndian ) SwapWord( 8, psShape->padfX + i );
+            if( bBigEndian ) SwapWord( 8, psShape->padfY + i );
+        }
 
         nOffset += 16*nPoints;
-        
+
 /* -------------------------------------------------------------------- */
 /*      If we have a Z coordinate, collect that now.                    */
 /* -------------------------------------------------------------------- */
@@ -1752,11 +2453,11 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
         {
             memcpy( &(psShape->dfZMin), psSHP->pabyRec + nOffset, 8 );
             memcpy( &(psShape->dfZMax), psSHP->pabyRec + nOffset + 8, 8 );
-            
+
             if( bBigEndian ) SwapWord( 8, &(psShape->dfZMin) );
             if( bBigEndian ) SwapWord( 8, &(psShape->dfZMax) );
-            
-            for( i = 0; i < nPoints; i++ )
+
+            for( i = 0; (int32)i < nPoints; i++ )
             {
                 memcpy( psShape->padfZ + i,
                         psSHP->pabyRec + nOffset + 16 + i*8, 8 );
@@ -1765,6 +2466,10 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
 
             nOffset += 16 + 8*nPoints;
         }
+        else if( psShape->bFastModeReadObject )
+        {
+            psShape->padfZ = NULL;
+        }
 
 /* -------------------------------------------------------------------- */
 /*      If we have a M measure value, then read it now.  We assume      */
@@ -1772,15 +2477,15 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
 /*      big enough, but really it will only occur for the Z shapes      */
 /*      (options), and the M shapes.                                    */
 /* -------------------------------------------------------------------- */
-        if( nEntitySize >= nOffset + 16 + 8*nPoints )
+        if( nEntitySize >= (int)(nOffset + 16 + 8*nPoints) )
         {
             memcpy( &(psShape->dfMMin), psSHP->pabyRec + nOffset, 8 );
             memcpy( &(psShape->dfMMax), psSHP->pabyRec + nOffset + 8, 8 );
-            
+
             if( bBigEndian ) SwapWord( 8, &(psShape->dfMMin) );
             if( bBigEndian ) SwapWord( 8, &(psShape->dfMMax) );
-            
-            for( i = 0; i < nPoints; i++ )
+
+            for( i = 0; (int32)i < nPoints; i++ )
             {
                 memcpy( psShape->padfM + i,
                         psSHP->pabyRec + nOffset + 16 + i*8, 8 );
@@ -1788,6 +2493,10 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
             }
             psShape->bMeasureIsUsed = TRUE;
         }
+        else if( psShape->bFastModeReadObject )
+        {
+            psShape->padfM = NULL;
+        }
     }
 
 /* ==================================================================== */
@@ -1797,26 +2506,31 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
              || psShape->nSHPType == SHPT_MULTIPOINTM
              || psShape->nSHPType == SHPT_MULTIPOINTZ )
     {
-	int32		nPoints;
-	int    		i, nOffset;
+        int32		nPoints;
+        int    		i, nOffset;
+        unsigned char* pBuffer = NULL;
+        unsigned char** ppBuffer = NULL;
 
         if ( 44 + 4 > nEntitySize )
         {
-            g_snprintf(pszErrorMsg, 128, "Corrupted .shp file : shape %d : nEntitySize = %d",
-                     hEntity, nEntitySize); 
-            psSHP->sHooks.Error( pszErrorMsg );
+            snprintf(szErrorMsg, sizeof(szErrorMsg),
+                     "Corrupted .shp file : shape %d : nEntitySize = %d",
+                     hEntity, nEntitySize);
+            psSHP->sHooks.Error( szErrorMsg );
             SHPDestroyObject(psShape);
             return NULL;
         }
-	memcpy( &nPoints, psSHP->pabyRec + 44, 4 );
+        memcpy( &nPoints, psSHP->pabyRec + 44, 4 );
 
-	if( bBigEndian ) SwapWord( 4, &nPoints );
+        if( bBigEndian ) SwapWord( 4, &nPoints );
 
-        if (nPoints < 0 || nPoints > 50 * 1000 * 1000)
+        /* nPoints is unsigned */
+        if (/* nPoints < 0 || */ nPoints > 50 * 1000 * 1000)
         {
-            g_snprintf(pszErrorMsg, 128, "Corrupted .shp file : shape %d : nPoints = %d",
-                     hEntity, nPoints); 
-            psSHP->sHooks.Error( pszErrorMsg );
+            snprintf(szErrorMsg, sizeof(szErrorMsg),
+                     "Corrupted .shp file : shape %d : nPoints = %u",
+                     hEntity, nPoints);
+            psSHP->sHooks.Error( szErrorMsg );
             SHPDestroyObject(psShape);
             return NULL;
         }
@@ -1828,43 +2542,52 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
         }
         if (nRequiredSize > nEntitySize)
         {
-            g_snprintf(pszErrorMsg, 128, "Corrupted .shp file : shape %d : nPoints = %d, nEntitySize = %d",
-                     hEntity, nPoints, nEntitySize); 
-            psSHP->sHooks.Error( pszErrorMsg );
+            snprintf(szErrorMsg, sizeof(szErrorMsg),
+                     "Corrupted .shp file : shape %d : nPoints = %u, nEntitySize = %d",
+                     hEntity, nPoints, nEntitySize);
+            psSHP->sHooks.Error( szErrorMsg );
             SHPDestroyObject(psShape);
             return NULL;
         }
-        
-	psShape->nVertices = nPoints;
-        psShape->padfX = (double *) calloc(nPoints,sizeof(double));
-        psShape->padfY = (double *) calloc(nPoints,sizeof(double));
-        psShape->padfZ = (double *) calloc(nPoints,sizeof(double));
-        psShape->padfM = (double *) calloc(nPoints,sizeof(double));
+
+        if( psShape->bFastModeReadObject )
+        {
+            int nObjectBufSize = 4 * sizeof(double) * nPoints;
+            pBuffer = SHPReallocObjectBufIfNecessary(psSHP, nObjectBufSize);
+            ppBuffer = &pBuffer;
+        }
+
+        psShape->nVertices = nPoints;
+
+        psShape->padfX = (double *) SHPAllocBuffer(ppBuffer, sizeof(double) * nPoints);
+        psShape->padfY = (double *) SHPAllocBuffer(ppBuffer, sizeof(double) * nPoints);
+        psShape->padfZ = (double *) SHPAllocBuffer(ppBuffer, sizeof(double) * nPoints);
+        psShape->padfM = (double *) SHPAllocBuffer(ppBuffer, sizeof(double) * nPoints);
 
         if (psShape->padfX == NULL ||
             psShape->padfY == NULL ||
             psShape->padfZ == NULL ||
             psShape->padfM == NULL)
         {
-            g_snprintf(pszErrorMsg, 128,
-                     "Not enough memory to allocate requested memory (nPoints=%d) for shape %d. "
-                     "Probably broken SHP file", hEntity, nPoints );
-            psSHP->sHooks.Error( pszErrorMsg );
+            snprintf(szErrorMsg, sizeof(szErrorMsg),
+                     "Not enough memory to allocate requested memory (nPoints=%u) for shape %d. "
+                     "Probably broken SHP file", nPoints, hEntity );
+            psSHP->sHooks.Error( szErrorMsg );
             SHPDestroyObject(psShape);
             return NULL;
         }
 
-	for( i = 0; i < nPoints; i++ )
-	{
-	    memcpy(psShape->padfX+i, psSHP->pabyRec + 48 + 16 * i, 8 );
-	    memcpy(psShape->padfY+i, psSHP->pabyRec + 48 + 16 * i + 8, 8 );
+        for( i = 0; (int32)i < nPoints; i++ )
+        {
+            memcpy(psShape->padfX+i, psSHP->pabyRec + 48 + 16 * i, 8 );
+            memcpy(psShape->padfY+i, psSHP->pabyRec + 48 + 16 * i + 8, 8 );
 
-	    if( bBigEndian ) SwapWord( 8, psShape->padfX + i );
-	    if( bBigEndian ) SwapWord( 8, psShape->padfY + i );
-	}
+            if( bBigEndian ) SwapWord( 8, psShape->padfX + i );
+            if( bBigEndian ) SwapWord( 8, psShape->padfY + i );
+        }
 
         nOffset = 48 + 16*nPoints;
-        
+
 /* -------------------------------------------------------------------- */
 /*	Get the X/Y bounds.						*/
 /* -------------------------------------------------------------------- */
@@ -1873,10 +2596,10 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
         memcpy( &(psShape->dfXMax), psSHP->pabyRec + 8 + 20, 8 );
         memcpy( &(psShape->dfYMax), psSHP->pabyRec + 8 + 28, 8 );
 
-	if( bBigEndian ) SwapWord( 8, &(psShape->dfXMin) );
-	if( bBigEndian ) SwapWord( 8, &(psShape->dfYMin) );
-	if( bBigEndian ) SwapWord( 8, &(psShape->dfXMax) );
-	if( bBigEndian ) SwapWord( 8, &(psShape->dfYMax) );
+        if( bBigEndian ) SwapWord( 8, &(psShape->dfXMin) );
+        if( bBigEndian ) SwapWord( 8, &(psShape->dfYMin) );
+        if( bBigEndian ) SwapWord( 8, &(psShape->dfXMax) );
+        if( bBigEndian ) SwapWord( 8, &(psShape->dfYMax) );
 
 /* -------------------------------------------------------------------- */
 /*      If we have a Z coordinate, collect that now.                    */
@@ -1885,11 +2608,11 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
         {
             memcpy( &(psShape->dfZMin), psSHP->pabyRec + nOffset, 8 );
             memcpy( &(psShape->dfZMax), psSHP->pabyRec + nOffset + 8, 8 );
-            
+
             if( bBigEndian ) SwapWord( 8, &(psShape->dfZMin) );
             if( bBigEndian ) SwapWord( 8, &(psShape->dfZMax) );
-            
-            for( i = 0; i < nPoints; i++ )
+
+            for( i = 0; (int32)i < nPoints; i++ )
             {
                 memcpy( psShape->padfZ + i,
                         psSHP->pabyRec + nOffset + 16 + i*8, 8 );
@@ -1898,6 +2621,8 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
 
             nOffset += 16 + 8*nPoints;
         }
+        else if( psShape->bFastModeReadObject )
+            psShape->padfZ = NULL;
 
 /* -------------------------------------------------------------------- */
 /*      If we have a M measure value, then read it now.  We assume      */
@@ -1905,15 +2630,15 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
 /*      big enough, but really it will only occur for the Z shapes      */
 /*      (options), and the M shapes.                                    */
 /* -------------------------------------------------------------------- */
-        if( nEntitySize >= nOffset + 16 + 8*nPoints )
+        if( nEntitySize >= (int)(nOffset + 16 + 8*nPoints) )
         {
             memcpy( &(psShape->dfMMin), psSHP->pabyRec + nOffset, 8 );
             memcpy( &(psShape->dfMMax), psSHP->pabyRec + nOffset + 8, 8 );
-            
+
             if( bBigEndian ) SwapWord( 8, &(psShape->dfMMin) );
             if( bBigEndian ) SwapWord( 8, &(psShape->dfMMax) );
-            
-            for( i = 0; i < nPoints; i++ )
+
+            for( i = 0; (int32)i < nPoints; i++ )
             {
                 memcpy( psShape->padfM + i,
                         psSHP->pabyRec + nOffset + 16 + i*8, 8 );
@@ -1921,6 +2646,8 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
             }
             psShape->bMeasureIsUsed = TRUE;
         }
+        else if( psShape->bFastModeReadObject )
+            psShape->padfM = NULL;
     }
 
 /* ==================================================================== */
@@ -1931,38 +2658,51 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
              || psShape->nSHPType == SHPT_POINTZ )
     {
         int	nOffset;
-        
-	psShape->nVertices = 1;
-        psShape->padfX = (double *) calloc(1,sizeof(double));
-        psShape->padfY = (double *) calloc(1,sizeof(double));
-        psShape->padfZ = (double *) calloc(1,sizeof(double));
-        psShape->padfM = (double *) calloc(1,sizeof(double));
+
+        psShape->nVertices = 1;
+        if( psShape->bFastModeReadObject )
+        {
+            psShape->padfX = &(psShape->dfXMin);
+            psShape->padfY = &(psShape->dfYMin);
+            psShape->padfZ = &(psShape->dfZMin);
+            psShape->padfM = &(psShape->dfMMin);
+            psShape->padfZ[0] = 0.0;
+            psShape->padfM[0] = 0.0;
+        }
+        else
+        {
+            psShape->padfX = (double *) calloc(1,sizeof(double));
+            psShape->padfY = (double *) calloc(1,sizeof(double));
+            psShape->padfZ = (double *) calloc(1,sizeof(double));
+            psShape->padfM = (double *) calloc(1,sizeof(double));
+        }
 
         if (20 + 8 + (( psShape->nSHPType == SHPT_POINTZ ) ? 8 : 0)> nEntitySize)
         {
-            g_snprintf(pszErrorMsg, 128, "Corrupted .shp file : shape %d : nEntitySize = %d",
-                     hEntity, nEntitySize); 
-            psSHP->sHooks.Error( pszErrorMsg );
+            snprintf(szErrorMsg, sizeof(szErrorMsg),
+                     "Corrupted .shp file : shape %d : nEntitySize = %d",
+                     hEntity, nEntitySize);
+            psSHP->sHooks.Error( szErrorMsg );
             SHPDestroyObject(psShape);
             return NULL;
         }
-	memcpy( psShape->padfX, psSHP->pabyRec + 12, 8 );
-	memcpy( psShape->padfY, psSHP->pabyRec + 20, 8 );
+        memcpy( psShape->padfX, psSHP->pabyRec + 12, 8 );
+        memcpy( psShape->padfY, psSHP->pabyRec + 20, 8 );
 
-	if( bBigEndian ) SwapWord( 8, psShape->padfX );
-	if( bBigEndian ) SwapWord( 8, psShape->padfY );
+        if( bBigEndian ) SwapWord( 8, psShape->padfX );
+        if( bBigEndian ) SwapWord( 8, psShape->padfY );
 
         nOffset = 20 + 8;
-        
+
 /* -------------------------------------------------------------------- */
 /*      If we have a Z coordinate, collect that now.                    */
 /* -------------------------------------------------------------------- */
         if( psShape->nSHPType == SHPT_POINTZ )
         {
             memcpy( psShape->padfZ, psSHP->pabyRec + nOffset, 8 );
-        
+
             if( bBigEndian ) SwapWord( 8, psShape->padfZ );
-            
+
             nOffset += 8;
         }
 
@@ -1975,7 +2715,7 @@ SHPReadObject( SHPHandle psSHP, int hEntity )
         if( nEntitySize >= nOffset + 8 )
         {
             memcpy( psShape->padfM, psSHP->pabyRec + nOffset, 8 );
-        
+
             if( bBigEndian ) SwapWord( 8, psShape->padfM );
             psShape->bMeasureIsUsed = TRUE;
         }
@@ -2017,7 +2757,7 @@ SHPTypeName( int nSHPType )
 
       case SHPT_MULTIPOINT:
         return "MultiPoint";
-        
+
       case SHPT_POINTZ:
         return "PointZ";
 
@@ -2029,7 +2769,7 @@ SHPTypeName( int nSHPType )
 
       case SHPT_MULTIPOINTZ:
         return "MultiPointZ";
-        
+
       case SHPT_POINTM:
         return "PointM";
 
@@ -2062,7 +2802,7 @@ SHPPartTypeName( int nPartType )
     {
       case SHPP_TRISTRIP:
         return "TriangleStrip";
-        
+
       case SHPP_TRIFAN:
         return "TriangleFan";
 
@@ -2093,7 +2833,13 @@ SHPDestroyObject( SHPObject * psShape )
 {
     if( psShape == NULL )
         return;
-    
+
+    if( psShape->bFastModeReadObject )
+    {
+        psShape->bFastModeReadObject = FALSE;
+        return;
+    }
+
     if( psShape->padfX != NULL )
         free( psShape->padfX );
     if( psShape->padfY != NULL )
@@ -2119,8 +2865,8 @@ SHPDestroyObject( SHPObject * psShape )
 /************************************************************************/
 
 int SHPAPI_CALL
-SHPRewindObject( SHPHandle hSHP, SHPObject * psObject )
-
+SHPRewindObject( CPL_UNUSED SHPHandle hSHP,
+                 SHPObject * psObject )
 {
     int  iOpRing, bAltered = 0;
 
@@ -2167,14 +2913,14 @@ SHPRewindObject( SHPHandle hSHP, SHPObject * psObject )
 
             if( iCheckRing == iOpRing )
                 continue;
-            
+
             nVertStart = psObject->panPartStart[iCheckRing];
 
             if( iCheckRing == psObject->nParts-1 )
-                nVertCount = psObject->nVertices 
+                nVertCount = psObject->nVertices
                     - psObject->panPartStart[iCheckRing];
             else
-                nVertCount = psObject->panPartStart[iCheckRing+1] 
+                nVertCount = psObject->panPartStart[iCheckRing+1]
                     - psObject->panPartStart[iCheckRing];
 
             for( iEdge = 0; iEdge < nVertCount; iEdge++ )
@@ -2188,19 +2934,19 @@ SHPRewindObject( SHPHandle hSHP, SHPObject * psObject )
 
                 /* Rule #1:
                  * Test whether the edge 'straddles' the horizontal ray from the test point (dfTestY,dfTestY)
-                 * The rule #1 also excludes edges collinear with the ray.
+                 * The rule #1 also excludes edges colinear with the ray.
                  */
                 if ( ( psObject->padfY[iEdge+nVertStart] < dfTestY
                        && dfTestY <= psObject->padfY[iNext+nVertStart] )
-                    || ( psObject->padfY[iNext+nVertStart] < dfTestY
-                         && dfTestY <= psObject->padfY[iEdge+nVertStart] ) )
+                     || ( psObject->padfY[iNext+nVertStart] < dfTestY
+                          && dfTestY <= psObject->padfY[iEdge+nVertStart] ) )
                 {
                     /* Rule #2:
-                    * Test if edge-ray intersection is on the right from the test point (dfTestY,dfTestY)
-                    */
-                    double const intersect = 
+                     * Test if edge-ray intersection is on the right from the test point (dfTestY,dfTestY)
+                     */
+                    double const intersect =
                         ( psObject->padfX[iEdge+nVertStart]
-                          + ( dfTestY - psObject->padfY[iEdge+nVertStart] ) 
+                          + ( dfTestY - psObject->padfY[iEdge+nVertStart] )
                           / ( psObject->padfY[iNext+nVertStart] - psObject->padfY[iEdge+nVertStart] )
                           * ( psObject->padfX[iNext+nVertStart] - psObject->padfX[iEdge+nVertStart] ) );
 
@@ -2208,7 +2954,7 @@ SHPRewindObject( SHPHandle hSHP, SHPObject * psObject )
                     {
                         bInner = !bInner;
                     }
-                }    
+                }
             }
         } /* for iCheckRing */
 
@@ -2221,18 +2967,19 @@ SHPRewindObject( SHPHandle hSHP, SHPObject * psObject )
         if( iOpRing == psObject->nParts-1 )
             nVertCount = psObject->nVertices - psObject->panPartStart[iOpRing];
         else
-            nVertCount = psObject->panPartStart[iOpRing+1] 
+            nVertCount = psObject->panPartStart[iOpRing+1]
                 - psObject->panPartStart[iOpRing];
 
-        dfSum = 0.0;
-        for( iVert = nVertStart; iVert < nVertStart+nVertCount-1; iVert++ )
+        if (nVertCount < 2)
+            continue;
+
+        dfSum = psObject->padfX[nVertStart] * (psObject->padfY[nVertStart+1] - psObject->padfY[nVertStart+nVertCount-1]);
+        for( iVert = nVertStart + 1; iVert < nVertStart+nVertCount-1; iVert++ )
         {
-            dfSum += psObject->padfX[iVert] * psObject->padfY[iVert+1]
-                - psObject->padfY[iVert] * psObject->padfX[iVert+1];
+            dfSum += psObject->padfX[iVert] * (psObject->padfY[iVert+1] - psObject->padfY[iVert-1]);
         }
 
-        dfSum += psObject->padfX[iVert] * psObject->padfY[nVertStart]
-               - psObject->padfY[iVert] * psObject->padfX[nVertStart];
+        dfSum += psObject->padfX[iVert] * (psObject->padfY[nVertStart] - psObject->padfY[iVert-1]);
 
 /* -------------------------------------------------------------------- */
 /*      Reverse if necessary.                                           */
@@ -2248,13 +2995,13 @@ SHPRewindObject( SHPHandle hSHP, SHPObject * psObject )
 
                 /* Swap X */
                 dfSaved = psObject->padfX[nVertStart+i];
-                psObject->padfX[nVertStart+i] = 
+                psObject->padfX[nVertStart+i] =
                     psObject->padfX[nVertStart+nVertCount-i-1];
                 psObject->padfX[nVertStart+nVertCount-i-1] = dfSaved;
 
                 /* Swap Y */
                 dfSaved = psObject->padfY[nVertStart+i];
-                psObject->padfY[nVertStart+i] = 
+                psObject->padfY[nVertStart+i] =
                     psObject->padfY[nVertStart+nVertCount-i-1];
                 psObject->padfY[nVertStart+nVertCount-i-1] = dfSaved;
 
@@ -2262,7 +3009,7 @@ SHPRewindObject( SHPHandle hSHP, SHPObject * psObject )
                 if( psObject->padfZ )
                 {
                     dfSaved = psObject->padfZ[nVertStart+i];
-                    psObject->padfZ[nVertStart+i] = 
+                    psObject->padfZ[nVertStart+i] =
                         psObject->padfZ[nVertStart+nVertCount-i-1];
                     psObject->padfZ[nVertStart+nVertCount-i-1] = dfSaved;
                 }
@@ -2271,7 +3018,7 @@ SHPRewindObject( SHPHandle hSHP, SHPObject * psObject )
                 if( psObject->padfM )
                 {
                     dfSaved = psObject->padfM[nVertStart+i];
-                    psObject->padfM[nVertStart+i] = 
+                    psObject->padfM[nVertStart+i] =
                         psObject->padfM[nVertStart+nVertCount-i-1];
                     psObject->padfM[nVertStart+nVertCount-i-1] = dfSaved;
                 }
diff --git a/navit/support/shapefile/shptree.c b/navit/support/shapefile/shptree.c
index 56d33b227..d81533c95 100644
--- a/navit/support/shapefile/shptree.c
+++ b/navit/support/shapefile/shptree.c
@@ -1,5 +1,5 @@
 /******************************************************************************
- * $Id: shptree.c,v 1.12 2008/11/12 15:39:50 fwarmerdam Exp $
+ * $Id: shptree.c,v 1.19 2016-12-05 12:44:06 erouault Exp $
  *
  * Project:  Shapelib
  * Purpose:  Implementation of quadtree building and searching functions.
@@ -7,13 +7,14 @@
  *
  ******************************************************************************
  * Copyright (c) 1999, Frank Warmerdam
+ * Copyright (c) 2012, Even Rouault <even dot rouault at mines-paris dot org>
  *
  * This software is available under the following "MIT Style" license,
- * or at the option of the licensee under the LGPL (see LICENSE.LGPL).  This
+ * or at the option of the licensee under the LGPL (see COPYING).  This
  * option is discussed in more detail in shapelib.html.
  *
  * --
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
@@ -34,7 +35,44 @@
  ******************************************************************************
  *
  * $Log: shptree.c,v $
- * Revision 1.12  2008/11/12 15:39:50  fwarmerdam
+ * Revision 1.19  2016-12-05 12:44:06  erouault
+ * * Major overhaul of Makefile build system to use autoconf/automake.
+ *
+ * * Warning fixes in contrib/
+ *
+ * Revision 1.18  2016-12-04 15:30:15  erouault
+ * * shpopen.c, dbfopen.c, shptree.c, shapefil.h: resync with
+ * GDAL Shapefile driver. Mostly cleanups. SHPObject and DBFInfo
+ * structures extended with new members. New functions:
+ * DBFSetLastModifiedDate, SHPOpenLLEx, SHPRestoreSHX,
+ * SHPSetFastModeReadObject
+ *
+ * * sbnsearch.c: new file to implement original ESRI .sbn spatial
+ * index reading. (no write support). New functions:
+ * SBNOpenDiskTree, SBNCloseDiskTree, SBNSearchDiskTree,
+ * SBNSearchDiskTreeInteger, SBNSearchFreeIds
+ *
+ * * Makefile, makefile.vc, CMakeLists.txt, shapelib.def: updates
+ * with new file and symbols.
+ *
+ * * commit: helper script to cvs commit
+ *
+ * Revision 1.17  2012-01-27 21:09:26  fwarmerdam
+ * optimize .qix output (gdal #4472)
+ *
+ * Revision 1.16  2011-12-11 22:26:46  fwarmerdam
+ * upgrade .qix access code to use SAHooks (gdal #3365)
+ *
+ * Revision 1.15  2011-07-24 05:59:25  fwarmerdam
+ * minimize use of CPLError in favor of SAHooks.Error()
+ *
+ * Revision 1.14  2010-08-27 23:43:27  fwarmerdam
+ * add SHPAPI_CALL attribute in code
+ *
+ * Revision 1.13  2010-06-29 05:50:15  fwarmerdam
+ * fix sign of Z/M comparisons in SHPCheckObjectContained (#2223)
+ *
+ * Revision 1.12  2008-11-12 15:39:50  fwarmerdam
  * improve safety in face of buggy .shp file.
  *
  * Revision 1.11  2007/10/27 03:31:14  fwarmerdam
@@ -78,13 +116,13 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
+
 #ifdef USE_CPL
-#include <cpl_error.h>
+#include "cpl_error.h"
 #endif
 
-#if 0
-SHP_CVSID("$Id: shptree.c,v 1.12 2008/11/12 15:39:50 fwarmerdam Exp $")
-#endif
+SHP_CVSID("$Id: shptree.c,v 1.19 2016-12-05 12:44:06 erouault Exp $")
 
 #ifndef TRUE
 #  define TRUE 1
@@ -93,9 +131,6 @@ SHP_CVSID("$Id: shptree.c,v 1.12 2008/11/12 15:39:50 fwarmerdam Exp $")
 
 static int bBigEndian = 0;
 
-void SHPAPI_CALL SHPTreeSplitBounds( double *padfBoundsMinIn, double *padfBoundsMaxIn, double *padfBoundsMin1, double * padfBoundsMax1, double *padfBoundsMin2, double * padfBoundsMax2 );
-void SHPAPI_CALL SHPTreeCollectShapeIds( SHPTree *hTree, SHPTreeNode * psTreeNode, double * padfBoundsMin, double * padfBoundsMax, int * pnShapeCount, int * pnMaxShapes, int ** ppanShapeList );
-
 
 /* -------------------------------------------------------------------- */
 /*      If the following is 0.5, nodes will be split in half.  If it    */
@@ -136,13 +171,8 @@ static SHPTreeNode *SHPTreeNodeCreate( double * padfBoundsMin,
     SHPTreeNode	*psTreeNode;
 
     psTreeNode = (SHPTreeNode *) malloc(sizeof(SHPTreeNode));
-	if( NULL == psTreeNode )
-	{
-#ifdef USE_CPL
-		CPLError( CE_Fatal, CPLE_OutOfMemory, "Memory allocation failure");
-#endif
-		return NULL;
-	}
+    if( NULL == psTreeNode )
+        return NULL;
 
     psTreeNode->nShapeCount = 0;
     psTreeNode->panShapeIds = NULL;
@@ -165,8 +195,8 @@ static SHPTreeNode *SHPTreeNodeCreate( double * padfBoundsMin,
 /************************************************************************/
 
 SHPTree SHPAPI_CALL1(*)
-SHPCreateTree( SHPHandle hSHP, int nDimension, int nMaxDepth,
-               double *padfBoundsMin, double *padfBoundsMax )
+    SHPCreateTree( SHPHandle hSHP, int nDimension, int nMaxDepth,
+                   double *padfBoundsMin, double *padfBoundsMax )
 
 {
     SHPTree	*psTree;
@@ -178,13 +208,10 @@ SHPCreateTree( SHPHandle hSHP, int nDimension, int nMaxDepth,
 /*      Allocate the tree object                                        */
 /* -------------------------------------------------------------------- */
     psTree = (SHPTree *) malloc(sizeof(SHPTree));
-	if( NULL == psTree )
-	{
-#ifdef USE_CPL
-		CPLError( CE_Fatal, CPLE_OutOfMemory, "Memory allocation failure");
-#endif
-		return NULL;
-	}
+    if( NULL == psTree )
+    {
+        return NULL;
+    }
 
     psTree->hSHP = hSHP;
     psTree->nMaxDepth = nMaxDepth;
@@ -222,9 +249,9 @@ SHPCreateTree( SHPHandle hSHP, int nDimension, int nMaxDepth,
             psTree->nMaxDepth = MAX_DEFAULT_TREE_DEPTH;
 
 #ifdef USE_CPL
-        CPLDebug( "Shape",
-                  "Falling back to max number of allowed index tree levels (%d).",
-                  MAX_DEFAULT_TREE_DEPTH );
+            CPLDebug( "Shape",
+                      "Falling back to max number of allowed index tree levels (%d).",
+                      MAX_DEFAULT_TREE_DEPTH );
 #endif
         }
     }
@@ -233,23 +260,21 @@ SHPCreateTree( SHPHandle hSHP, int nDimension, int nMaxDepth,
 /*      Allocate the root node.                                         */
 /* -------------------------------------------------------------------- */
     psTree->psRoot = SHPTreeNodeCreate( padfBoundsMin, padfBoundsMax );
-	if( NULL == psTree->psRoot )
-	{
-		return NULL;
-	}
+    if( NULL == psTree->psRoot )
+    {
+        free( psTree );
+        return NULL;
+    }
 
 /* -------------------------------------------------------------------- */
 /*      Assign the bounds to the root node.  If none are passed in,     */
 /*      use the bounds of the provided file otherwise the create        */
 /*      function will have already set the bounds.                      */
 /* -------------------------------------------------------------------- */
-	assert( NULL != psTree );
-	assert( NULL != psTree->psRoot );
-	
-	if( padfBoundsMin == NULL )
+    if( padfBoundsMin == NULL )
     {
         SHPGetInfo( hSHP, NULL, NULL,
-                    psTree->psRoot->adfBoundsMin, 
+                    psTree->psRoot->adfBoundsMin,
                     psTree->psRoot->adfBoundsMax );
     }
 
@@ -259,13 +284,13 @@ SHPCreateTree( SHPHandle hSHP, int nDimension, int nMaxDepth,
     if( hSHP != NULL )
     {
         int	iShape, nShapeCount;
-        
+
         SHPGetInfo( hSHP, &nShapeCount, NULL, NULL, NULL );
 
         for( iShape = 0; iShape < nShapeCount; iShape++ )
         {
             SHPObject	*psShape;
-            
+
             psShape = SHPReadObject( hSHP, iShape );
             if( psShape != NULL )
             {
@@ -273,7 +298,7 @@ SHPCreateTree( SHPHandle hSHP, int nDimension, int nMaxDepth,
                 SHPDestroyObject( psShape );
             }
         }
-    }        
+    }
 
     return psTree;
 }
@@ -286,7 +311,7 @@ static void SHPDestroyTreeNode( SHPTreeNode * psTreeNode )
 
 {
     int		i;
-    
+
 	assert( NULL != psTreeNode );
 
     for( i = 0; i < psTreeNode->nSubNodes; i++ )
@@ -294,7 +319,7 @@ static void SHPDestroyTreeNode( SHPTreeNode * psTreeNode )
         if( psTreeNode->apsSubNode[i] != NULL )
             SHPDestroyTreeNode( psTreeNode->apsSubNode[i] );
     }
-    
+
     if( psTreeNode->panShapeIds != NULL )
         free( psTreeNode->panShapeIds );
 
@@ -342,7 +367,7 @@ SHPCheckBoundsOverlap( double * padfBox1Min, double * padfBox1Max,
     {
         if( padfBox2Max[iDim] < padfBox1Min[iDim] )
             return FALSE;
-        
+
         if( padfBox1Max[iDim] < padfBox2Min[iDim] )
             return FALSE;
     }
@@ -363,23 +388,23 @@ static int SHPCheckObjectContained( SHPObject * psObject, int nDimension,
     if( psObject->dfXMin < padfBoundsMin[0]
         || psObject->dfXMax > padfBoundsMax[0] )
         return FALSE;
-    
+
     if( psObject->dfYMin < padfBoundsMin[1]
         || psObject->dfYMax > padfBoundsMax[1] )
         return FALSE;
 
     if( nDimension == 2 )
         return TRUE;
-    
+
     if( psObject->dfZMin < padfBoundsMin[2]
-        || psObject->dfZMax < padfBoundsMax[2] )
+        || psObject->dfZMax > padfBoundsMax[2] )
         return FALSE;
-        
+
     if( nDimension == 3 )
         return TRUE;
 
     if( psObject->dfMMin < padfBoundsMin[3]
-        || psObject->dfMMax < padfBoundsMax[3] )
+        || psObject->dfMMax > padfBoundsMax[3] )
         return FALSE;
 
     return TRUE;
@@ -392,7 +417,7 @@ static int SHPCheckObjectContained( SHPObject * psObject, int nDimension,
 /*      longest dimension.                                              */
 /************************************************************************/
 
-void SHPAPI_CALL
+static void
 SHPTreeSplitBounds( double *padfBoundsMinIn, double *padfBoundsMaxIn,
                     double *padfBoundsMin1, double * padfBoundsMax1,
                     double *padfBoundsMin2, double * padfBoundsMax2 )
@@ -406,7 +431,7 @@ SHPTreeSplitBounds( double *padfBoundsMinIn, double *padfBoundsMaxIn,
     memcpy( padfBoundsMax1, padfBoundsMaxIn, sizeof(double) * 4 );
     memcpy( padfBoundsMin2, padfBoundsMinIn, sizeof(double) * 4 );
     memcpy( padfBoundsMax2, padfBoundsMaxIn, sizeof(double) * 4 );
-    
+
 /* -------------------------------------------------------------------- */
 /*      Split in X direction.                                           */
 /* -------------------------------------------------------------------- */
@@ -441,9 +466,9 @@ SHPTreeNodeAddShapeId( SHPTreeNode * psTreeNode, SHPObject * psObject,
 
 {
     int		i;
-    
+
 /* -------------------------------------------------------------------- */
-/*      If there are subnodes, then consider wiether this object        */
+/*      If there are subnodes, then consider whether this object        */
 /*      will fit in them.                                               */
 /* -------------------------------------------------------------------- */
     if( nMaxDepth > 1 && psTreeNode->nSubNodes > 0 )
@@ -560,7 +585,7 @@ SHPTreeNodeAddShapeId( SHPTreeNode * psTreeNode, SHPObject * psObject,
 /* -------------------------------------------------------------------- */
     psTreeNode->nShapeCount++;
 
-    psTreeNode->panShapeIds = (int *) 
+    psTreeNode->panShapeIds = (int *)
         SfRealloc( psTreeNode->panShapeIds,
                    sizeof(int) * psTreeNode->nShapeCount );
     psTreeNode->panShapeIds[psTreeNode->nShapeCount-1] = psObject->nShapeId;
@@ -600,7 +625,7 @@ SHPTreeAddShapeId( SHPTree * psTree, SHPObject * psObject )
 /*      tree node by tree node basis.                                   */
 /************************************************************************/
 
-void SHPAPI_CALL
+static void
 SHPTreeCollectShapeIds( SHPTree *hTree, SHPTreeNode * psTreeNode,
                         double * padfBoundsMin, double * padfBoundsMax,
                         int * pnShapeCount, int * pnMaxShapes,
@@ -608,7 +633,7 @@ SHPTreeCollectShapeIds( SHPTree *hTree, SHPTreeNode * psTreeNode,
 
 {
     int		i;
-    
+
 /* -------------------------------------------------------------------- */
 /*      Does this node overlap the area of interest at all?  If not,    */
 /*      return without adding to the list at all.                       */
@@ -637,7 +662,7 @@ SHPTreeCollectShapeIds( SHPTree *hTree, SHPTreeNode * psTreeNode,
     {
         (*ppanShapeList)[(*pnShapeCount)++] = psTreeNode->panShapeIds[i];
     }
-    
+
 /* -------------------------------------------------------------------- */
 /*      Recurse to subnodes if they exist.                              */
 /* -------------------------------------------------------------------- */
@@ -690,7 +715,8 @@ SHPTreeFindLikelyShapes( SHPTree * hTree,
 /*      Sort the id array                                               */
 /* -------------------------------------------------------------------- */
 
-    qsort(panShapeList, *pnShapeCount, sizeof(int), compare_ints);
+    if( panShapeList != NULL )
+        qsort(panShapeList, *pnShapeCount, sizeof(int), compare_ints);
 
     return panShapeList;
 }
@@ -698,7 +724,7 @@ SHPTreeFindLikelyShapes( SHPTree * hTree,
 /************************************************************************/
 /*                          SHPTreeNodeTrim()                           */
 /*                                                                      */
-/*      This is the recurve version of SHPTreeTrimExtraNodes() that     */
+/*      This is the recursive version of SHPTreeTrimExtraNodes() that   */
 /*      walks the tree cleaning it up.                                  */
 /************************************************************************/
 
@@ -726,6 +752,29 @@ static int SHPTreeNodeTrim( SHPTreeNode * psTreeNode )
     }
 
 /* -------------------------------------------------------------------- */
+/*      If the current node has 1 subnode and no shapes, promote that   */
+/*      subnode to the current node position.                           */
+/* -------------------------------------------------------------------- */
+    if( psTreeNode->nSubNodes == 1 && psTreeNode->nShapeCount == 0)
+    {
+        SHPTreeNode* psSubNode = psTreeNode->apsSubNode[0];
+
+        memcpy(psTreeNode->adfBoundsMin, psSubNode->adfBoundsMin,
+               sizeof(psSubNode->adfBoundsMin));
+        memcpy(psTreeNode->adfBoundsMax, psSubNode->adfBoundsMax,
+               sizeof(psSubNode->adfBoundsMax));
+        psTreeNode->nShapeCount = psSubNode->nShapeCount;
+        assert(psTreeNode->panShapeIds == NULL);
+        psTreeNode->panShapeIds = psSubNode->panShapeIds;
+        assert(psTreeNode->papsShapeObj == NULL);
+        psTreeNode->papsShapeObj = psSubNode->papsShapeObj;
+        psTreeNode->nSubNodes = psSubNode->nSubNodes;
+        for( i = 0; i < psSubNode->nSubNodes; i++ )
+            psTreeNode->apsSubNode[i] = psSubNode->apsSubNode[i];
+        free(psSubNode);
+    }
+
+/* -------------------------------------------------------------------- */
 /*      We should be trimmed if we have no subnodes, and no shapes.     */
 /* -------------------------------------------------------------------- */
     return( psTreeNode->nSubNodes == 0 && psTreeNode->nShapeCount == 0 );
@@ -765,29 +814,76 @@ static void SwapWord( int length, void * wordP )
     }
 }
 
+
+struct SHPDiskTreeInfo
+{
+    SAHooks sHooks;
+    SAFile  fpQIX;
+};
+
+/************************************************************************/
+/*                         SHPOpenDiskTree()                            */
+/************************************************************************/
+
+SHPTreeDiskHandle SHPOpenDiskTree( const char* pszQIXFilename,
+                                   SAHooks *psHooks )
+{
+    SHPTreeDiskHandle hDiskTree;
+
+    hDiskTree = (SHPTreeDiskHandle) calloc(sizeof(struct SHPDiskTreeInfo),1);
+
+    if (psHooks == NULL)
+        SASetupDefaultHooks( &(hDiskTree->sHooks) );
+    else
+        memcpy( &(hDiskTree->sHooks), psHooks, sizeof(SAHooks) );
+
+    hDiskTree->fpQIX = hDiskTree->sHooks.FOpen(pszQIXFilename, "rb");
+    if (hDiskTree->fpQIX == NULL)
+    {
+        free(hDiskTree);
+        return NULL;
+    }
+
+    return hDiskTree;
+}
+
+/***********************************************************************/
+/*                         SHPCloseDiskTree()                           */
+/************************************************************************/
+
+void SHPCloseDiskTree( SHPTreeDiskHandle hDiskTree )
+{
+    if (hDiskTree == NULL)
+        return;
+
+    hDiskTree->sHooks.FClose(hDiskTree->fpQIX);
+    free(hDiskTree);
+}
+
 /************************************************************************/
 /*                       SHPSearchDiskTreeNode()                        */
 /************************************************************************/
 
 static int
-SHPSearchDiskTreeNode( FILE *fp, double *padfBoundsMin, double *padfBoundsMax,
-                       int **ppanResultBuffer, int *pnBufferMax, 
-                       int *pnResultCount, int bNeedSwap )
+SHPSearchDiskTreeNode( SHPTreeDiskHandle hDiskTree, double *padfBoundsMin, double *padfBoundsMax,
+                       int **ppanResultBuffer, int *pnBufferMax,
+                       int *pnResultCount, int bNeedSwap, int nRecLevel )
 
 {
-    int i;
-    int offset;
-    int numshapes, numsubnodes;
+    unsigned int i;
+    unsigned int offset;
+    unsigned int numshapes, numsubnodes;
     double adfNodeBoundsMin[2], adfNodeBoundsMax[2];
+    int nFReadAcc;
 
 /* -------------------------------------------------------------------- */
 /*      Read and unswap first part of node info.                        */
 /* -------------------------------------------------------------------- */
-    fread( &offset, 4, 1, fp );
+    nFReadAcc = (int)hDiskTree->sHooks.FRead( &offset, 4, 1, hDiskTree->fpQIX );
     if ( bNeedSwap ) SwapWord ( 4, &offset );
 
-    fread( adfNodeBoundsMin, sizeof(double), 2, fp );
-    fread( adfNodeBoundsMax, sizeof(double), 2, fp );
+    nFReadAcc += (int)hDiskTree->sHooks.FRead( adfNodeBoundsMin, sizeof(double), 2, hDiskTree->fpQIX );
+    nFReadAcc += (int)hDiskTree->sHooks.FRead( adfNodeBoundsMax, sizeof(double), 2, hDiskTree->fpQIX );
     if ( bNeedSwap )
     {
         SwapWord( 8, adfNodeBoundsMin + 0 );
@@ -795,36 +891,75 @@ SHPSearchDiskTreeNode( FILE *fp, double *padfBoundsMin, double *padfBoundsMax,
         SwapWord( 8, adfNodeBoundsMax + 0 );
         SwapWord( 8, adfNodeBoundsMax + 1 );
     }
-      
-    fread( &numshapes, 4, 1, fp );
+
+    nFReadAcc += (int)hDiskTree->sHooks.FRead( &numshapes, 4, 1, hDiskTree->fpQIX );
     if ( bNeedSwap ) SwapWord ( 4, &numshapes );
 
+    /* Check that we could read all previous values */
+    if( nFReadAcc != 1 + 2 + 2 + 1 )
+    {
+        hDiskTree->sHooks.Error("I/O error");
+        return FALSE;
+    }
+
+    /* Sanity checks to avoid int overflows in later computation */
+    if( offset > INT_MAX - sizeof(int) )
+    {
+        hDiskTree->sHooks.Error("Invalid value for offset");
+        return FALSE;
+    }
+
+    if( numshapes > (INT_MAX - offset - sizeof(int)) / sizeof(int) ||
+        numshapes > INT_MAX / sizeof(int) - *pnResultCount )
+    {
+        hDiskTree->sHooks.Error("Invalid value for numshapes");
+        return FALSE;
+    }
+
 /* -------------------------------------------------------------------- */
 /*      If we don't overlap this node at all, we can just fseek()       */
 /*      pass this node info and all subnodes.                           */
 /* -------------------------------------------------------------------- */
-    if( !SHPCheckBoundsOverlap( adfNodeBoundsMin, adfNodeBoundsMax, 
+    if( !SHPCheckBoundsOverlap( adfNodeBoundsMin, adfNodeBoundsMax,
                                 padfBoundsMin, padfBoundsMax, 2 ) )
     {
         offset += numshapes*sizeof(int) + sizeof(int);
-        fseek(fp, offset, SEEK_CUR);
+        hDiskTree->sHooks.FSeek(hDiskTree->fpQIX, offset, SEEK_CUR);
         return TRUE;
     }
 
 /* -------------------------------------------------------------------- */
 /*      Add all the shapeids at this node to our list.                  */
 /* -------------------------------------------------------------------- */
-    if(numshapes > 0) 
+    if(numshapes > 0)
     {
-        if( *pnResultCount + numshapes > *pnBufferMax )
+        if( *pnResultCount + numshapes > (unsigned int)*pnBufferMax )
         {
-            *pnBufferMax = (int) ((*pnResultCount + numshapes + 100) * 1.25);
-            *ppanResultBuffer = (int *) 
+            int* pNewBuffer;
+
+            *pnBufferMax = (*pnResultCount + numshapes + 100) * 5 / 4;
+
+            if( (size_t)*pnBufferMax > INT_MAX / sizeof(int) )
+                *pnBufferMax = *pnResultCount + numshapes;
+
+            pNewBuffer = (int *)
                 SfRealloc( *ppanResultBuffer, *pnBufferMax * sizeof(int) );
+
+            if( pNewBuffer == NULL )
+            {
+                hDiskTree->sHooks.Error("Out of memory error");
+                return FALSE;
+            }
+
+            *ppanResultBuffer = pNewBuffer;
         }
 
-        fread( *ppanResultBuffer + *pnResultCount, 
-               sizeof(int), numshapes, fp );
+        if( hDiskTree->sHooks.FRead( *ppanResultBuffer + *pnResultCount,
+                    sizeof(int), numshapes, hDiskTree->fpQIX ) != numshapes )
+        {
+            hDiskTree->sHooks.Error("I/O error");
+            return FALSE;
+        }
 
         if (bNeedSwap )
         {
@@ -832,20 +967,29 @@ SHPSearchDiskTreeNode( FILE *fp, double *padfBoundsMin, double *padfBoundsMax,
                 SwapWord( 4, *ppanResultBuffer + *pnResultCount + i );
         }
 
-        *pnResultCount += numshapes; 
-    } 
+        *pnResultCount += numshapes;
+    }
 
 /* -------------------------------------------------------------------- */
 /*      Process the subnodes.                                           */
 /* -------------------------------------------------------------------- */
-    fread( &numsubnodes, 4, 1, fp );
+    if( hDiskTree->sHooks.FRead( &numsubnodes, 4, 1, hDiskTree->fpQIX ) != 1 )
+    {
+        hDiskTree->sHooks.Error("I/O error");
+        return FALSE;
+    }
     if ( bNeedSwap  ) SwapWord ( 4, &numsubnodes );
+    if( numsubnodes > 0 && nRecLevel == 32 )
+    {
+        hDiskTree->sHooks.Error("Shape tree is too deep");
+        return FALSE;
+    }
 
     for(i=0; i<numsubnodes; i++)
     {
-        if( !SHPSearchDiskTreeNode( fp, padfBoundsMin, padfBoundsMax, 
-                                    ppanResultBuffer, pnBufferMax, 
-                                    pnResultCount, bNeedSwap ) )
+        if( !SHPSearchDiskTreeNode( hDiskTree, padfBoundsMin, padfBoundsMax,
+                                    ppanResultBuffer, pnBufferMax,
+                                    pnResultCount, bNeedSwap, nRecLevel + 1 ) )
             return FALSE;
     }
 
@@ -853,13 +997,58 @@ SHPSearchDiskTreeNode( FILE *fp, double *padfBoundsMin, double *padfBoundsMax,
 }
 
 /************************************************************************/
+/*                          SHPTreeReadLibc()                           */
+/************************************************************************/
+
+static
+SAOffset SHPTreeReadLibc( void *p, SAOffset size, SAOffset nmemb, SAFile file )
+
+{
+    return (SAOffset) fread( p, (size_t) size, (size_t) nmemb,
+                                 (FILE *) file );
+}
+
+/************************************************************************/
+/*                          SHPTreeSeekLibc()                           */
+/************************************************************************/
+
+static
+SAOffset SHPTreeSeekLibc( SAFile file, SAOffset offset, int whence )
+
+{
+    return (SAOffset) fseek( (FILE *) file, (long) offset, whence );
+}
+
+/************************************************************************/
 /*                         SHPSearchDiskTree()                          */
 /************************************************************************/
 
-int SHPAPI_CALL1(*) 
-SHPSearchDiskTree( FILE *fp, 
+int SHPAPI_CALL1(*)
+SHPSearchDiskTree( FILE *fp,
                    double *padfBoundsMin, double *padfBoundsMax,
                    int *pnShapeCount )
+{
+    struct SHPDiskTreeInfo sDiskTree;
+    memset(&sDiskTree.sHooks, 0, sizeof(sDiskTree.sHooks));
+
+    /* We do not use SASetupDefaultHooks() because the FILE* */
+    /* is a libc FILE* */
+    sDiskTree.sHooks.FSeek = SHPTreeSeekLibc;
+    sDiskTree.sHooks.FRead = SHPTreeReadLibc;
+
+    sDiskTree.fpQIX = (SAFile)fp;
+
+    return SHPSearchDiskTreeEx( &sDiskTree, padfBoundsMin, padfBoundsMax,
+                                 pnShapeCount );
+}
+
+/***********************************************************************/
+/*                       SHPSearchDiskTreeEx()                         */
+/************************************************************************/
+
+int* SHPSearchDiskTreeEx( SHPTreeDiskHandle hDiskTree,
+                          double *padfBoundsMin, double *padfBoundsMax,
+                          int *pnShapeCount )
 
 {
     int i, bNeedSwap, nBufferMax = 0;
@@ -880,8 +1069,8 @@ SHPSearchDiskTree( FILE *fp,
 /* -------------------------------------------------------------------- */
 /*      Read the header.                                                */
 /* -------------------------------------------------------------------- */
-    fseek( fp, 0, SEEK_SET );
-    fread( abyBuf, 16, 1, fp );
+    hDiskTree->sHooks.FSeek( hDiskTree->fpQIX, 0, SEEK_SET );
+    hDiskTree->sHooks.FRead( abyBuf, 16, 1, hDiskTree->fpQIX );
 
     if( memcmp( abyBuf, "SQT", 3 ) != 0 )
         return NULL;
@@ -893,11 +1082,11 @@ SHPSearchDiskTree( FILE *fp,
         bNeedSwap = TRUE;
 
 /* -------------------------------------------------------------------- */
-/*      Search through root node and it's decendents.                   */
+/*      Search through root node and it's descendants.                  */
 /* -------------------------------------------------------------------- */
-    if( !SHPSearchDiskTreeNode( fp, padfBoundsMin, padfBoundsMax, 
-                                &panResultBuffer, &nBufferMax, 
-                                pnShapeCount, bNeedSwap ) )
+    if( !SHPSearchDiskTreeNode( hDiskTree, padfBoundsMin, padfBoundsMax,
+                                &panResultBuffer, &nBufferMax,
+                                pnShapeCount, bNeedSwap, 0 ) )
     {
         if( panResultBuffer != NULL )
             free( panResultBuffer );
@@ -907,8 +1096,14 @@ SHPSearchDiskTree( FILE *fp,
 /* -------------------------------------------------------------------- */
 /*      Sort the id array                                               */
 /* -------------------------------------------------------------------- */
-    qsort(panResultBuffer, *pnShapeCount, sizeof(int), compare_ints);
-    
+
+    /* To distinguish between empty intersection from error case */
+    if( panResultBuffer == NULL )
+        panResultBuffer = (int*) calloc(1, sizeof(int));
+    else
+        qsort(panResultBuffer, *pnShapeCount, sizeof(int), compare_ints);
+
+
     return panResultBuffer;
 }
 
@@ -920,16 +1115,16 @@ SHPSearchDiskTree( FILE *fp,
 /*      seek past them all efficiently.                                 */
 /************************************************************************/
 
-static int SHPGetSubNodeOffset( SHPTreeNode *node) 
+static int SHPGetSubNodeOffset( SHPTreeNode *node)
 {
     int i;
-    long offset=0;
+    int offset=0;
 
-    for(i=0; i<node->nSubNodes; i++ ) 
+    for(i=0; i<node->nSubNodes; i++ )
     {
-        if(node->apsSubNode[i]) 
+        if(node->apsSubNode[i])
         {
-            offset += 4*sizeof(double) 
+            offset += 4*sizeof(double)
                 + (node->apsSubNode[i]->nShapeCount+3)*sizeof(int);
             offset += SHPGetSubNodeOffset(node->apsSubNode[i]);
         }
@@ -942,26 +1137,26 @@ static int SHPGetSubNodeOffset( SHPTreeNode *node)
 /*                          SHPWriteTreeNode()                          */
 /************************************************************************/
 
-static void SHPWriteTreeNode( FILE *fp, SHPTreeNode *node) 
+static void SHPWriteTreeNode( SAFile fp, SHPTreeNode *node, SAHooks* psHooks)
 {
     int i,j;
     int offset;
     unsigned char *pabyRec = NULL;
-	assert( NULL != node );
+    assert( NULL != node );
 
     offset = SHPGetSubNodeOffset(node);
-  
-    pabyRec = (unsigned char *) 
+
+    pabyRec = (unsigned char *)
         malloc(sizeof(double) * 4
                + (3 * sizeof(int)) + (node->nShapeCount * sizeof(int)) );
-	if( NULL == pabyRec )
-	{
+    if( NULL == pabyRec )
+    {
 #ifdef USE_CPL
-		CPLError( CE_Fatal, CPLE_OutOfMemory, "Memory allocation failure");
+        CPLError( CE_Fatal, CPLE_OutOfMemory, "Memory allocation failure");
 #endif
-		assert( 0 );
-	}
-	assert( NULL != pabyRec );
+        assert( 0 );
+        return;
+    }
 
     memcpy( pabyRec, &offset, 4);
 
@@ -973,16 +1168,17 @@ static void SHPWriteTreeNode( FILE *fp, SHPTreeNode *node)
 
     memcpy( pabyRec+36, &node->nShapeCount, 4);
     j = node->nShapeCount * sizeof(int);
-    memcpy( pabyRec+40, node->panShapeIds, j);
+    if( j )
+        memcpy( pabyRec+40, node->panShapeIds, j);
     memcpy( pabyRec+j+40, &node->nSubNodes, 4);
 
-    fwrite( pabyRec, 44+j, 1, fp );
+    psHooks->FWrite( pabyRec, 44+j, 1, fp );
     free (pabyRec);
-  
-    for(i=0; i<node->nSubNodes; i++ ) 
+
+    for(i=0; i<node->nSubNodes; i++ )
     {
         if(node->apsSubNode[i])
-            SHPWriteTreeNode( fp, node->apsSubNode[i]);
+            SHPWriteTreeNode( fp, node->apsSubNode[i], psHooks);
     }
 }
 
@@ -990,18 +1186,38 @@ static void SHPWriteTreeNode( FILE *fp, SHPTreeNode *node)
 /*                            SHPWriteTree()                            */
 /************************************************************************/
 
-int SHPWriteTree(SHPTree *tree, const char *filename )
+int SHPAPI_CALL SHPWriteTree(SHPTree *tree, const char *filename )
+{
+    SAHooks sHooks;
+
+    SASetupDefaultHooks( &sHooks );
+
+    return SHPWriteTreeLL(tree, filename, &sHooks);
+}
+
+/************************************************************************/
+/*                           SHPWriteTreeLL()                           */
+/************************************************************************/
+
+int SHPWriteTreeLL(SHPTree *tree, const char *filename, SAHooks* psHooks )
 {
     char		signature[4] = "SQT";
     int		        i;
     char		abyBuf[32];
-    FILE                *fp;
-  
+    SAFile              fp;
+
+    SAHooks sHooks;
+    if (psHooks == NULL)
+    {
+        SASetupDefaultHooks( &sHooks );
+        psHooks = &sHooks;
+    }
+
 /* -------------------------------------------------------------------- */
 /*      Open the output file.                                           */
 /* -------------------------------------------------------------------- */
-    fp = fopen(filename, "wb");
-    if( fp == NULL ) 
+    fp = psHooks->FOpen(filename, "wb");
+    if( fp == NULL )
     {
         return FALSE;
     }
@@ -1014,12 +1230,12 @@ int SHPWriteTree(SHPTree *tree, const char *filename )
         bBigEndian = FALSE;
     else
         bBigEndian = TRUE;
-  
+
 /* -------------------------------------------------------------------- */
 /*      Write the header.                                               */
 /* -------------------------------------------------------------------- */
     memcpy( abyBuf+0, signature, 3 );
-    
+
     if( bBigEndian )
         abyBuf[3] = 2; /* New MSB */
     else
@@ -1030,21 +1246,21 @@ int SHPWriteTree(SHPTree *tree, const char *filename )
     abyBuf[6] = 0;
     abyBuf[7] = 0;
 
-    fwrite( abyBuf, 8, 1, fp );
+    psHooks->FWrite( abyBuf, 8, 1, fp );
 
-    fwrite( &(tree->nTotalCount), 4, 1, fp );
+    psHooks->FWrite( &(tree->nTotalCount), 4, 1, fp );
 
     /* write maxdepth */
 
-    fwrite( &(tree->nMaxDepth), 4, 1, fp );
+    psHooks->FWrite( &(tree->nMaxDepth), 4, 1, fp );
 
 /* -------------------------------------------------------------------- */
 /*      Write all the nodes "in order".                                 */
 /* -------------------------------------------------------------------- */
 
-    SHPWriteTreeNode( fp, tree->psRoot );  
-    
-    fclose( fp );
+    SHPWriteTreeNode( fp, tree->psRoot, psHooks );
+
+    psHooks->FClose( fp );
 
     return TRUE;
 }
diff --git a/navit/util.h b/navit/util.h
index 5beceb7b1..b7b60b533 100644
--- a/navit/util.h
+++ b/navit/util.h
@@ -23,9 +23,6 @@
 #include <ctype.h>
 #include "config.h"
 
-#define max(a,b) ((a) > (b) ? (a) : (b))
-#define min(a,b) ((a) < (b) ? (a) : (b))
-
 void strtoupper(char *dest, const char *src);
 void strtolower(char *dest, const char *src);
 int navit_utf8_strcasecmp(const char *s1, const char *s2);
diff --git a/navit/xpm/atm.svg b/navit/xpm/atm.svg
deleted file mode 100644
index a08a4d969..000000000
--- a/navit/xpm/atm.svg
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="bank.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/projets/navit/icons/png/bank.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3173">
-      <stop
-         style="stop-color:#33b400;stop-opacity:1;"
-         offset="0"
-         id="stop3175" />
-      <stop
-         style="stop-color:#93cb00;stop-opacity:1;"
-         offset="1"
-         id="stop3177" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2390"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3173"
-       id="linearGradient3179"
-       x1="1.0178572"
-       y1="6.2410717"
-       x2="8.7142859"
-       y2="6.2410717"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3173"
-       id="linearGradient3182"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect"
-       x1="1.0178572"
-       y1="6.2410717"
-       x2="8.7142859"
-       y2="6.2410717"
-       gradientTransform="matrix(1.0605835,0,0,1.0620282,-0.5527848,0.1776314)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#22a638"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="10.796387"
-     inkscape:cy="15.570919"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="0"
-     inkscape:window-y="25">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.98289597;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2382"
-       width="21.056721"
-       height="21.056721"
-       x="0.48869637"
-       y="0.4886966" />
-    <path
-       style="fill:url(#linearGradient3182);fill-opacity:1;fill-rule:evenodd;stroke:#0d4300;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 2.193369,8.2755965 C 4.6236295,5.398295 7.8351628,5.6503419 11,5.7153499 C 13.825482,6.0742653 16.729468,5.5684517 19.806631,3.1551033 L 19.806631,10.456547 C 17.082066,12.683193 14.226857,14.059491 11,13.016794 C 8.0644563,12.535247 5.1289127,13.033062 2.193369,15.577041 L 2.193369,8.2755965 z"
-       id="rect3171"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:1.32791519;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3186"
-       sodipodi:cx="4.375"
-       sodipodi:cy="12"
-       sodipodi:rx="3.125"
-       sodipodi:ry="3.125"
-       d="M 7.5,12 A 3.125,3.125 0 1 1 1.25,12 A 3.125,3.125 0 1 1 7.5,12 z"
-       transform="matrix(1,0,0,0.5670996,10.910714,7.6190477)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:1.32791519;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2395"
-       sodipodi:cx="4.375"
-       sodipodi:cy="12"
-       sodipodi:rx="3.125"
-       sodipodi:ry="3.125"
-       d="M 7.5,12 A 3.125,3.125 0 1 1 1.25,12 A 3.125,3.125 0 1 1 7.5,12 z"
-       transform="matrix(1,0,0,0.5670996,2.5,10.654762)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:1.32791519;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3184"
-       sodipodi:cx="4.375"
-       sodipodi:cy="12"
-       sodipodi:rx="3.125"
-       sodipodi:ry="3.125"
-       d="M 7.5,12 A 3.125,3.125 0 1 1 1.25,12 A 3.125,3.125 0 1 1 7.5,12 z"
-       transform="matrix(1,0,0,0.5670996,12.410714,11.011905)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:1.32791519;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3169"
-       sodipodi:cx="4.375"
-       sodipodi:cy="12"
-       sodipodi:rx="3.125"
-       sodipodi:ry="3.125"
-       d="M 7.5,12 A 3.125,3.125 0 1 1 1.25,12 A 3.125,3.125 0 1 1 7.5,12 z"
-       transform="matrix(1,0,0,0.5670996,8.5,10.654762)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:1.32791519;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3167"
-       sodipodi:cx="4.375"
-       sodipodi:cy="12"
-       sodipodi:rx="3.125"
-       sodipodi:ry="3.125"
-       d="M 7.5,12 A 3.125,3.125 0 1 1 1.25,12 A 3.125,3.125 0 1 1 7.5,12 z"
-       transform="matrix(1,0,0,0.5670996,6.5,9.5205628)" />
-    <text
-       xml:space="preserve"
-       style="font-size:7.2734828px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="8.6464329"
-       y="11.712525"
-       id="text2394"><tspan
-         sodipodi:role="line"
-         id="tspan2396"
-         x="8.6464329"
-         y="11.712525">$</tspan></text>
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:1.32791519;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3188"
-       sodipodi:cx="4.375"
-       sodipodi:cy="12"
-       sodipodi:rx="3.125"
-       sodipodi:ry="3.125"
-       d="M 7.5,12 A 3.125,3.125 0 1 1 1.25,12 A 3.125,3.125 0 1 1 7.5,12 z"
-       transform="matrix(1,0,0,0.5670996,6.1428569,7.1948048)" />
-  </g>
-</svg>
diff --git a/navit/xpm/attraction.svg b/navit/xpm/attraction.svg
deleted file mode 100644
index 86ed5a4ab..000000000
--- a/navit/xpm/attraction.svg
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="attraction.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/projets/navit/icons/png/attraction.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3151">
-      <stop
-         style="stop-color:#6cff81;stop-opacity:1;"
-         offset="0"
-         id="stop3153" />
-      <stop
-         style="stop-color:#109026;stop-opacity:1;"
-         offset="1"
-         id="stop3155" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3151"
-       id="linearGradient3157"
-       x1="5.8379931"
-       y1="5.0950255"
-       x2="11.171147"
-       y2="8.0432262"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f4ca00"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="18.158254"
-     inkscape:cy="11.17505"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="-4"
-     inkscape:window-y="24">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       sodipodi:type="star"
-       style="opacity:1;fill:url(#linearGradient3157);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.69094230999999995;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2383"
-       sodipodi:sides="5"
-       sodipodi:cx="8.3928576"
-       sodipodi:cy="8.2321424"
-       sodipodi:r1="6.8401251"
-       sodipodi:r2="3.4200625"
-       sodipodi:arg1="0.94295973"
-       sodipodi:arg2="1.5712783"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 12.410715,13.767857 L 8.3912092,11.652205 L 4.3696665,13.763982 L 5.1396758,9.2874321 L 1.8885314,6.1152927 L 6.383929,5.4642852 L 8.396154,1.3920182 L 10.404453,5.4662229 L 14.899221,6.1215629 L 11.645021,9.2905675 L 12.410715,13.767857 z"
-       transform="matrix(1.4115471,0,0,1.4839561,-0.8483516,-0.2482945)" />
-  </g>
-</svg>
diff --git a/navit/xpm/bank.svg b/navit/xpm/bank.svg
deleted file mode 100644
index a08a4d969..000000000
--- a/navit/xpm/bank.svg
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="bank.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/projets/navit/icons/png/bank.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3173">
-      <stop
-         style="stop-color:#33b400;stop-opacity:1;"
-         offset="0"
-         id="stop3175" />
-      <stop
-         style="stop-color:#93cb00;stop-opacity:1;"
-         offset="1"
-         id="stop3177" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2390"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3173"
-       id="linearGradient3179"
-       x1="1.0178572"
-       y1="6.2410717"
-       x2="8.7142859"
-       y2="6.2410717"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3173"
-       id="linearGradient3182"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect"
-       x1="1.0178572"
-       y1="6.2410717"
-       x2="8.7142859"
-       y2="6.2410717"
-       gradientTransform="matrix(1.0605835,0,0,1.0620282,-0.5527848,0.1776314)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#22a638"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="10.796387"
-     inkscape:cy="15.570919"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="0"
-     inkscape:window-y="25">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.98289597;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2382"
-       width="21.056721"
-       height="21.056721"
-       x="0.48869637"
-       y="0.4886966" />
-    <path
-       style="fill:url(#linearGradient3182);fill-opacity:1;fill-rule:evenodd;stroke:#0d4300;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 2.193369,8.2755965 C 4.6236295,5.398295 7.8351628,5.6503419 11,5.7153499 C 13.825482,6.0742653 16.729468,5.5684517 19.806631,3.1551033 L 19.806631,10.456547 C 17.082066,12.683193 14.226857,14.059491 11,13.016794 C 8.0644563,12.535247 5.1289127,13.033062 2.193369,15.577041 L 2.193369,8.2755965 z"
-       id="rect3171"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:1.32791519;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3186"
-       sodipodi:cx="4.375"
-       sodipodi:cy="12"
-       sodipodi:rx="3.125"
-       sodipodi:ry="3.125"
-       d="M 7.5,12 A 3.125,3.125 0 1 1 1.25,12 A 3.125,3.125 0 1 1 7.5,12 z"
-       transform="matrix(1,0,0,0.5670996,10.910714,7.6190477)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:1.32791519;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2395"
-       sodipodi:cx="4.375"
-       sodipodi:cy="12"
-       sodipodi:rx="3.125"
-       sodipodi:ry="3.125"
-       d="M 7.5,12 A 3.125,3.125 0 1 1 1.25,12 A 3.125,3.125 0 1 1 7.5,12 z"
-       transform="matrix(1,0,0,0.5670996,2.5,10.654762)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:1.32791519;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3184"
-       sodipodi:cx="4.375"
-       sodipodi:cy="12"
-       sodipodi:rx="3.125"
-       sodipodi:ry="3.125"
-       d="M 7.5,12 A 3.125,3.125 0 1 1 1.25,12 A 3.125,3.125 0 1 1 7.5,12 z"
-       transform="matrix(1,0,0,0.5670996,12.410714,11.011905)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:1.32791519;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3169"
-       sodipodi:cx="4.375"
-       sodipodi:cy="12"
-       sodipodi:rx="3.125"
-       sodipodi:ry="3.125"
-       d="M 7.5,12 A 3.125,3.125 0 1 1 1.25,12 A 3.125,3.125 0 1 1 7.5,12 z"
-       transform="matrix(1,0,0,0.5670996,8.5,10.654762)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:1.32791519;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3167"
-       sodipodi:cx="4.375"
-       sodipodi:cy="12"
-       sodipodi:rx="3.125"
-       sodipodi:ry="3.125"
-       d="M 7.5,12 A 3.125,3.125 0 1 1 1.25,12 A 3.125,3.125 0 1 1 7.5,12 z"
-       transform="matrix(1,0,0,0.5670996,6.5,9.5205628)" />
-    <text
-       xml:space="preserve"
-       style="font-size:7.2734828px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="8.6464329"
-       y="11.712525"
-       id="text2394"><tspan
-         sodipodi:role="line"
-         id="tspan2396"
-         x="8.6464329"
-         y="11.712525">$</tspan></text>
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#b4a300;fill-opacity:1;fill-rule:evenodd;stroke:#433800;stroke-width:1.32791519;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3188"
-       sodipodi:cx="4.375"
-       sodipodi:cy="12"
-       sodipodi:rx="3.125"
-       sodipodi:ry="3.125"
-       d="M 7.5,12 A 3.125,3.125 0 1 1 1.25,12 A 3.125,3.125 0 1 1 7.5,12 z"
-       transform="matrix(1,0,0,0.5670996,6.1428569,7.1948048)" />
-  </g>
-</svg>
diff --git a/navit/xpm/bar.svg b/navit/xpm/bar.svg
deleted file mode 100644
index 44c6083dc..000000000
--- a/navit/xpm/bar.svg
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="bar.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/navit/icons/png/bar.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f4ca00"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="18.00973"
-     inkscape:cy="10.084813"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="-4"
-     inkscape:window-y="24"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#e5ff39;fill-opacity:1;fill-rule:evenodd;stroke:#aaaf00;stroke-width:0.74631548;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3157"
-       sodipodi:cx="6.3639612"
-       sodipodi:cy="0.9739809"
-       sodipodi:rx="2.9168155"
-       sodipodi:ry="2.9168155"
-       d="M 9.2807767,0.9739809 A 2.9168155,2.9168155 0 1 1 3.4471457,0.9739809 A 2.9168155,2.9168155 0 1 1 9.2807767,0.9739809 z"
-       transform="matrix(1.3416456,0,0,1.3381885,2.0831091,3.1319181)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#e5ff39;fill-opacity:1;fill-rule:evenodd;stroke:#aaaf00;stroke-width:0.74631548;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3155"
-       sodipodi:cx="6.3639612"
-       sodipodi:cy="0.9739809"
-       sodipodi:rx="2.9168155"
-       sodipodi:ry="2.9168155"
-       d="M 9.2807767,0.9739809 A 2.9168155,2.9168155 0 1 1 3.4471457,0.9739809 A 2.9168155,2.9168155 0 1 1 9.2807767,0.9739809 z"
-       transform="matrix(1.3416456,0,0,1.3381885,-1.5337588,4.3147209)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#e5ff39;fill-opacity:1;fill-rule:evenodd;stroke:#aaaf00;stroke-width:0.74631548;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3159"
-       sodipodi:cx="6.3639612"
-       sodipodi:cy="0.9739809"
-       sodipodi:rx="2.9168155"
-       sodipodi:ry="2.9168155"
-       d="M 9.2807767,0.9739809 A 2.9168155,2.9168155 0 1 1 3.4471457,0.9739809 A 2.9168155,2.9168155 0 1 1 9.2807767,0.9739809 z"
-       transform="matrix(1.3416456,0,0,1.3381885,4.8698763,4.7287019)" />
-    <path
-       style="fill:#b9d500;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 2.5802671,4.5048738 L 16.055717,4.6231541 L 16.277778,20.502853 L 2.5953769,20.561993 L 2.5802671,4.5048738 z"
-       id="rect2381"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.059205,7.3933677 C 20.204787,7.4385313 20.4421,15.229925 16.237084,15.295003"
-       id="path3158"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 5.586164,7.0643331 L 5.586164,17.827838"
-       id="path3161"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 7.6444553,7.0643331 L 7.6444553,17.827838"
-       id="path3163"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 9.515246,7.0643331 L 9.515246,17.827838"
-       id="path3165"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 11.515246,7.0643331 L 11.515246,17.827838"
-       id="path3160"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 13.515246,7.0643331 L 13.515246,17.827838"
-       id="path3162"
-       sodipodi:nodetypes="cc" />
-  </g>
-</svg>
diff --git a/navit/xpm/beer.svg b/navit/xpm/beer.svg
deleted file mode 100644
index 44c6083dc..000000000
--- a/navit/xpm/beer.svg
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="bar.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/navit/icons/png/bar.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f4ca00"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="18.00973"
-     inkscape:cy="10.084813"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="-4"
-     inkscape:window-y="24"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#e5ff39;fill-opacity:1;fill-rule:evenodd;stroke:#aaaf00;stroke-width:0.74631548;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3157"
-       sodipodi:cx="6.3639612"
-       sodipodi:cy="0.9739809"
-       sodipodi:rx="2.9168155"
-       sodipodi:ry="2.9168155"
-       d="M 9.2807767,0.9739809 A 2.9168155,2.9168155 0 1 1 3.4471457,0.9739809 A 2.9168155,2.9168155 0 1 1 9.2807767,0.9739809 z"
-       transform="matrix(1.3416456,0,0,1.3381885,2.0831091,3.1319181)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#e5ff39;fill-opacity:1;fill-rule:evenodd;stroke:#aaaf00;stroke-width:0.74631548;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3155"
-       sodipodi:cx="6.3639612"
-       sodipodi:cy="0.9739809"
-       sodipodi:rx="2.9168155"
-       sodipodi:ry="2.9168155"
-       d="M 9.2807767,0.9739809 A 2.9168155,2.9168155 0 1 1 3.4471457,0.9739809 A 2.9168155,2.9168155 0 1 1 9.2807767,0.9739809 z"
-       transform="matrix(1.3416456,0,0,1.3381885,-1.5337588,4.3147209)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#e5ff39;fill-opacity:1;fill-rule:evenodd;stroke:#aaaf00;stroke-width:0.74631548;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3159"
-       sodipodi:cx="6.3639612"
-       sodipodi:cy="0.9739809"
-       sodipodi:rx="2.9168155"
-       sodipodi:ry="2.9168155"
-       d="M 9.2807767,0.9739809 A 2.9168155,2.9168155 0 1 1 3.4471457,0.9739809 A 2.9168155,2.9168155 0 1 1 9.2807767,0.9739809 z"
-       transform="matrix(1.3416456,0,0,1.3381885,4.8698763,4.7287019)" />
-    <path
-       style="fill:#b9d500;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 2.5802671,4.5048738 L 16.055717,4.6231541 L 16.277778,20.502853 L 2.5953769,20.561993 L 2.5802671,4.5048738 z"
-       id="rect2381"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 16.059205,7.3933677 C 20.204787,7.4385313 20.4421,15.229925 16.237084,15.295003"
-       id="path3158"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 5.586164,7.0643331 L 5.586164,17.827838"
-       id="path3161"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 7.6444553,7.0643331 L 7.6444553,17.827838"
-       id="path3163"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 9.515246,7.0643331 L 9.515246,17.827838"
-       id="path3165"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 11.515246,7.0643331 L 11.515246,17.827838"
-       id="path3160"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 13.515246,7.0643331 L 13.515246,17.827838"
-       id="path3162"
-       sodipodi:nodetypes="cc" />
-  </g>
-</svg>
diff --git a/navit/xpm/bench.svg b/navit/xpm/bench.svg
deleted file mode 100644
index 032b41a89..000000000
--- a/navit/xpm/bench.svg
+++ /dev/null
@@ -1,469 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="bench.svg"
-   inkscape:version="0.47 r22583"
-   xml:space="preserve"
-   id="Layer_1"
-   viewBox="12.5 44.907 57.375 31.795826"
-   width="22"
-   height="22"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   version="1.0"><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1285"
-   inkscape:window-height="902"
-   id="namedview77"
-   showgrid="false"
-   inkscape:zoom="23.344297"
-   inkscape:cx="10.057857"
-   inkscape:cy="8.8871287"
-   inkscape:window-x="182"
-   inkscape:window-y="46"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="Layer_1" /><metadata
-   id="metadata79"><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>bench g.aoi</dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs150"><inkscape:perspective
-     sodipodi:type="inkscape:persp3d"
-     inkscape:vp_x="0 : 103.9075 : 1"
-     inkscape:vp_y="0 : 1000 : 0"
-     inkscape:vp_z="375 : 103.9075 : 1"
-     inkscape:persp3d-origin="187.5 : 69.271667 : 1"
-     id="perspective81" /></defs>
-<title
-   id="title3">bench g.aoi</title>
-
-
-
-<g
-   id="g2884"
-   transform="matrix(0.18181818,0,0,0.18181818,4.8918683,33.683234)"><g
-     transform="matrix(0.765,0,0,0.765,47,34.971508)"
-     id="g5">
-	<line
-   style="fill:#a05a2c"
-   id="line7"
-   y2="174.907"
-   x2="138.5"
-   y1="174.907"
-   x1="138.5" />
-	<line
-   style="fill:#a05a2c"
-   id="line9"
-   y2="130.907"
-   x2="95.5"
-   y1="130.907"
-   x1="95.5" />
-	<line
-   style="fill:#a05a2c"
-   id="line11"
-   y2="130.907"
-   x2="95.5"
-   y1="130.907"
-   x1="95.5" />
-	<line
-   style="fill:#a05a2c"
-   id="line13"
-   y2="130.907"
-   x2="95.5"
-   y1="130.907"
-   x1="95.5" />
-	<line
-   style="fill:#a05a2c"
-   id="line15"
-   y2="130.907"
-   x2="95.5"
-   y1="130.907"
-   x1="95.5" />
-	<path
-   style="fill:#a05a2c"
-   id="path17"
-   d="m 127.5,168.907 c -6.442,-6.442 -11.455,-13.773 -16.889,-21.019 -1.376,-1.834 -2.935,-3.627 -3.963,-5.686 -0.853,-1.705 -2.595,-3.791 -3.898,-5.546 -1.303,-1.755 -1.645,-2.785 -2.75,-3.75 -0.795,-0.694 -1.57,-1.023 -3,-1.5 3.313,0.663 6.627,1.325 9.94,1.987 1.968,0.395 4.569,1.885 5.477,3.013 3.679,4.567 6.857,9.262 9.917,14.361 1.54,2.567 3.916,4.638 5.583,7.139 1.613,2.419 3.571,5.571 5.607,7.607 3.75,3.75 6.258,9.552 11.476,11.393 -6.521,-1.715 -12.845,-2.764 -17.5,-7.999" />
-	<line
-   style="fill:#a05a2c"
-   id="line19"
-   y2="133.407"
-   x2="106"
-   y1="133.407"
-   x1="106" />
-	<line
-   style="fill:#a05a2c"
-   id="line21"
-   y2="133.407"
-   x2="106"
-   y1="133.407"
-   x1="106" />
-	<line
-   style="fill:#a05a2c"
-   id="line23"
-   y2="133.407"
-   x2="106"
-   y1="133.407"
-   x1="106" />
-	<path
-   style="fill:#a05a2c"
-   id="path25"
-   d="m 60.5,193.907 c 1.128,-10.202 2.024,-21.12 4.068,-31.34 0.529,-2.646 0.792,-5.319 1.235,-7.979 0.456,-2.734 1.474,-5.291 2.145,-7.973 0.28,-1.121 0.323,-2.295 0.604,-3.416 0.396,-1.585 0.089,-1.877 1.625,-1.512 3.108,0.74 6.215,1.48 9.323,2.22 -1.24,4.961 -1.211,9.771 -2.055,14.834 -0.842,5.056 -2.685,10.246 -3.797,15.25 -1.163,5.233 0.336,10.517 -0.534,15.735 -0.511,3.066 1.09,7.727 0.386,12.181 -4.45,-1.271 -13.527,-1.663 -13,-8" />
-	<line
-   style="fill:#a05a2c"
-   id="line27"
-   y2="144.407"
-   x2="79"
-   y1="144.407"
-   x1="79" />
-	<line
-   style="fill:#a05a2c"
-   id="line29"
-   y2="144.407"
-   x2="79"
-   y1="144.407"
-   x1="79" />
-	<line
-   style="fill:#a05a2c"
-   id="line31"
-   y2="146.907"
-   x2="77"
-   y1="146.907"
-   x1="77" />
-	<path
-   style="fill:#a05a2c"
-   id="path33"
-   d="m 60.5,146.407 c -2.115,-1.918 -1.717,-6.561 0.156,-8.656 1.979,-2.214 4.022,-4.269 6.344,-6.344 2.43,-2.173 5.67,-3.585 8.5,-5 3.396,-1.698 6.771,-3.091 10.405,-4.302 3.328,-1.109 7.438,-1.054 10.927,-1.49 3.847,-0.48 7.011,0.412 10.775,0.95 1.152,0.165 3.285,1.136 4.393,0.842 1.054,-0.279 1.609,-1.609 2.25,-2.25 1.617,-1.617 2.58,-6.981 3.25,-9.25 1.719,-5.817 1.784,-11.923 2.963,-17.815 1.206,-6.028 1.823,-12.187 2.695,-18.292 0.91,-6.373 3.054,-12.529 5.092,-18.643 0.461,-1.384 1.436,-2.778 2.25,-4 0.243,-0.365 2.609,-1.787 3.058,-1.744 3.481,0.331 6.981,0.907 10.462,1.239 -2.425,1.788 -4.787,4.559 -5.77,7.505 -0.623,1.867 -1.381,3.035 -1.723,5.084 -0.315,1.891 0.324,3.624 0.048,5.559 -1.014,7.096 -3.658,14.288 -3.658,21.513 0,1.635 -1.967,3.342 -2.287,4.946 -0.315,1.575 -0.306,3.353 -0.682,4.856 -0.429,1.713 -0.317,3.398 -0.87,5.058 -0.521,1.565 -0.884,3.265 -1.208,4.883 -0.791,3.956 -2.032,15.089 -8.036,13.296 -10.734,-3.205 -23.224,-1.46 -32.912,4.354 -5.507,3.304 -24.716,14.34 -14.422,21.202 -3.91,-0.931 -8.787,-1.359 -12,-3.501" />
-	<line
-   style="fill:#a05a2c"
-   id="line35"
-   y2="216.907"
-   x2="310"
-   y1="216.907"
-   x1="310" />
-	<line
-   style="fill:#a05a2c"
-   id="line37"
-   y2="216.907"
-   x2="310"
-   y1="216.907"
-   x1="310" />
-	<line
-   style="fill:#a05a2c"
-   id="line39"
-   y2="216.907"
-   x2="309.5"
-   y1="216.907"
-   x1="309.5" />
-	<line
-   style="fill:#a05a2c"
-   id="line41"
-   y2="216.907"
-   x2="309.5"
-   y1="216.907"
-   x1="309.5" />
-	<line
-   style="fill:#a05a2c"
-   id="line43"
-   y2="183.407"
-   x2="247"
-   y1="183.407"
-   x1="247" />
-	<line
-   style="fill:#a05a2c"
-   id="line45"
-   y2="183.407"
-   x2="247"
-   y1="183.407"
-   x1="247" />
-	<path
-   style="fill:#a05a2c"
-   id="path47"
-   d="m 322.5,220.407 c -4.032,-1.046 -8.064,-2.091 -12.096,-3.136 -2.597,-0.674 -5.271,-1.232 -7.248,-3.208 -4.501,-4.501 -8.535,-10.195 -11.725,-15.776 -3.527,-6.173 -7.109,-12.235 -10.283,-18.584 -0.71,-1.419 -1.463,-2.967 -2.148,-4.296 -0.502,-0.975 -2,-2.241 -2,-3.25 0,-0.515 -1.5,-0.985 -1.5,-1.5 0,-0.837 -2.469,-0.575 -3,-1.25 3.895,0.835 7.789,1.669 11.684,2.504 2.046,0.438 4.99,1.077 6.316,2.496 0.068,0.073 1.418,0.642 1.418,0.75 0,0.649 0.322,-0.072 0.5,0.25 0.288,0.525 0.375,1.375 0.75,1.75 1.033,1.034 1.711,2.635 2.172,4.016 1.001,3.005 2.934,6.708 4.828,9.234 1.004,1.339 1.538,2.841 2.198,4.38 0.608,1.422 1.794,2.67 2.569,4.027 1.783,3.119 2.299,6.15 4.147,9.231 3.121,5.202 7.264,10.824 13.418,12.362" />
-	<line
-   style="fill:#a05a2c"
-   id="line49"
-   y2="174.907"
-   x2="278"
-   y1="174.907"
-   x1="278" />
-	<path
-   style="fill:#a05a2c"
-   id="path51"
-   d="m 253.418,240.407 c 1.932,-11.594 1.344,-23.31 3.65,-34.84 1.113,-5.569 3.353,-11.171 5.15,-16.565 0.154,-0.462 -0.605,-3.066 -0.762,-3.105 -1.331,-0.333 -2.662,-0.666 -3.994,-0.998 -3.321,-0.83 -6.643,-1.661 -9.963,-2.491 -0.004,3.052 -1.598,6.083 -2.1,9.095 -0.6,3.604 -1.62,7.005 -2.332,10.565 -1.48,7.399 -1.824,14.991 -3.465,22.372 -1.324,5.961 -2.104,13.127 -2.104,19.202 0,1.795 0.064,2.894 0.87,4.507 0.438,0.877 2.484,1.146 3.317,1.384 3.938,1.125 8.021,2.015 11.959,3.14 -3.9,-2.234 -0.683,-9.53 -0.226,-12.266 z" />
-	<path
-   style="fill:#a05a2c"
-   id="path53"
-   d="m 254.418,183.907 c 0.866,-2.599 1.995,-5.913 3.926,-7.844 2.174,-2.173 4.536,-4.19 7.008,-6.045 6.09,-4.567 12.298,-5.95 19.602,-8.038 1.459,-0.416 3.049,-1.448 4.552,-1.637 2.612,-0.326 3.927,-0.312 6.448,0.407 1.586,0.453 8.465,2.329 8.465,-0.594 0,-0.835 -0.276,-2.33 0.082,-3.25 0.701,-1.8 1.49,-3.454 1.87,-5.353 0.696,-3.48 2.634,-6.993 3.495,-10.439 1.31,-5.237 1.963,-10.676 2.855,-16.027 0.945,-5.674 0.549,-11.336 1.262,-17.043 0.695,-5.562 3.052,-11.488 4.828,-16.818 1.562,-4.686 1.664,-11.073 6.362,-13.422 -4.21,-0.601 -8.593,-1.601 -12.803,-2.202 -3.57,-0.51 -4.546,3.007 -5.87,5.554 -1.477,2.843 -2.3,6.8 -3.156,9.797 -1.038,3.634 -1.561,7.322 -2.47,10.958 -1.819,7.278 -2.611,14.918 -3.847,22.329 -0.285,1.712 -0.685,4.593 -0.771,5.642 -0.087,1.05 -0.396,2.186 -0.756,4.209 -0.359,2.024 -1.215,7.101 -1.803,10.635 -0.292,1.749 -0.656,3.395 -1.148,5.166 -0.491,1.771 -0.909,3.235 -1.679,4.773 -1.062,2.126 -1.603,4.241 -4.13,4.241 -1.643,0 -3.137,-0.925 -4.777,-1.13 -2.146,-0.268 -4.147,-0.37 -6.312,-0.37 -3.608,0 -7.438,0.909 -10.709,2.311 -6.271,2.688 -12.705,5.452 -17.598,10.346 -4.357,4.357 -9.344,8.944 -9.344,15.578 0,2.972 2.251,4.212 4.816,4.762 3.895,0.835 7.789,1.669 11.684,2.504 -3.857,-1.343 -1.021,-6.184 -0.082,-9 z" />
-</g><g
-     transform="matrix(0.765,0,0,0.765,47,34.971508)"
-     id="g55">
-	<line
-   style="fill:#784421"
-   id="line57"
-   y2="122.407"
-   x2="110.5"
-   y1="122.407"
-   x1="110.5" />
-	<path
-   style="fill:#784421"
-   id="path59"
-   d="m 147,166.407 c -1.478,-0.961 -4.314,-3.204 -6.75,-6 -2.436,-2.796 -4.633,-5.96 -6.75,-8.5 -2.438,-2.927 -4.527,-6.038 -6.74,-9.136 -0.943,-1.32 -1.702,-2.777 -2.604,-4.13 -0.734,-1.101 -1.688,-2.87 -2.656,-3.734 0.451,0.056 2.644,-0.61 3.12,-0.878 0.802,-0.45 3.097,-2.64 3.576,-3.107 0.802,-0.781 1.531,-1.698 1.882,-2.749 0.568,-1.704 1.278,-3.335 1.844,-5.031 1.122,-3.366 2.52,-6.384 3.105,-9.9 0.616,-3.695 1.161,-7.43 1.973,-11.084 1.634,-7.352 1.596,-15.134 3.417,-22.418 0.862,-3.449 1.09,-6.924 2.083,-10.332 0.275,-0.944 0.932,-3.501 1.25,-4.25 0.466,-1.097 0.211,-2.127 1,-3.5 1.392,-2.422 2.89,-5.737 1.25,-8.25 -2.705,-4.145 -4.736,0.104 -6.5,2.75 -2.008,3.012 -2.484,6.701 -3.606,10.069 -1.151,3.455 -1.799,7.518 -2.315,11.134 -0.493,3.451 -1.145,6.879 -1.828,10.297 -0.699,3.493 -0.691,7.015 -1.574,10.546 -0.815,3.262 -0.794,6.678 -1.624,9.996 -0.823,3.295 -1.227,6.733 -2.302,9.958 -0.766,2.297 -1.917,5.884 -4.25,6.25 -1.557,0.245 -2.959,-0.319 -4.405,-0.802 -1.647,-0.549 -3.513,-0.5 -5.232,-0.715 -6.816,-0.853 -15.613,0.392 -21.812,3.491 -5.975,2.987 -11.813,5.788 -16.551,10.525 -1.896,1.896 -4.5,4.833 -4.5,7.734 0,2.376 1.517,5.921 4.5,5.266 1.082,-0.237 2.354,-1.708 2.87,-2.741 0.638,-1.273 1.536,-2.164 2.63,-3.259 -0.857,3.431 -1.699,6.796 -2.552,10.208 -0.898,3.592 -1.001,7.278 -1.8,10.876 -1.625,7.313 -3.26,17.835 -3.776,25.28 -0.217,3.127 -0.439,3.74 -0.372,6.87 0.076,3.509 2.599,6.667 5.656,3.609 1.021,-1.021 2.344,-1.983 2.344,-3.578 0,-1.938 0.152,-3.681 0.473,-5.6 0.571,-3.431 0.654,-6.927 1.226,-10.355 1.254,-7.524 2.018,-15.108 3.274,-22.645 0.53,-3.181 1.657,-6.624 2.527,-9.666 0.437,-1.524 0.656,-2.812 1.37,-4.241 0.292,-0.584 0.35,-1.173 0.63,-1.759 0.308,-0.644 0.795,-1.091 1.13,-1.759 2.521,-5.045 8.594,-7.741 14.12,-7.741 2.669,0 4.874,0.101 6.75,2 0.463,0.47 1.256,1.597 2,2.5 0.83,1.007 2.031,2.562 2.604,3.708 1.281,2.562 3.193,4.787 4.693,7.287 1.645,2.742 3.81,4.949 5.703,7.505 3.522,4.759 6.815,9.815 11,14 2.482,2.482 8.861,8.763 12.5,6.5 2.066,-1.285 2.5,-4.063 2.5,-6.25 0,-1.063 -0.625,-2.573 -1.5,-3.25 -0.766,-0.592 -1.523,-0.038 -3.001,-0.999 z" />
-	<path
-   style="fill:#784421"
-   id="path61"
-   d="m 290.5,174.407 c 0.248,0.413 2.725,5.181 3.5,7 1.437,3.372 4.75,9.184 5.438,10.354 0.688,1.17 1.039,2.361 1.875,3.615 1.223,1.835 2.341,3.675 3.436,5.589 1.793,3.139 3.805,6.197 5.669,9.304 1.982,3.305 9.233,12.048 13.083,9.639 2.642,-1.653 3.19,-5.136 3,-8 -0.229,-3.439 -3.128,-2.628 -5.156,-4.656 -9.326,-9.327 -15.088,-22.332 -20.844,-33.844 1.017,0.228 2.337,-0.919 3.24,-1.37 1.279,-0.64 1.998,-1.536 3.008,-2.546 0.326,-0.326 1.179,-2.198 1.404,-2.661 0.396,-0.811 0.969,-1.721 1.258,-2.588 0.59,-1.771 0.725,-2.865 1.434,-4.601 0.636,-1.556 0.815,-3.225 1.156,-4.734 0.451,-2.001 1.062,-3.874 1.4,-5.905 0.589,-3.529 1.498,-7.04 2.1,-10.595 2.479,-14.647 4.342,-29.37 7.948,-43.792 0.714,-2.859 2.065,-5.248 2.974,-7.974 0.82,-2.46 2.439,-7.054 -0.662,-8.604 -1.565,-0.783 -2.223,0.016 -3.26,1.37 -1.131,1.476 -1.994,2.983 -2.578,4.734 -1.182,3.546 -2.588,6.931 -3.505,10.598 -3.503,14.012 -4.342,28.793 -7.167,42.918 -0.709,3.544 -1.627,7.012 -2.223,10.584 -0.586,3.521 -1.768,6.382 -3.027,9.666 -0.4,1.044 -0.767,2.094 -1.5,3 -1.047,1.294 -1.451,0.849 -3,0.5 -1.824,-0.41 -3.588,-0.668 -5.393,-1.184 -1.803,-0.515 -3.415,0.184 -5.258,0.184 -7.541,0 -14.375,3.615 -20.711,7.417 -2.703,1.621 -5.238,4.117 -7.639,6.083 -2.402,1.968 -4.49,4.481 -5.871,7.241 -0.906,1.812 -2.629,3.707 -2.629,5.993 0,2.057 0.061,5.039 2,5.766 1.888,0.707 3.586,-0.673 4.371,-2.241 0.859,-1.719 2.049,-3.138 3.129,-4.759 -0.727,3.632 -1.632,7.396 -2.802,10.905 -1.171,3.513 -1.384,7.525 -2.111,11.159 -1.45,7.253 -2.3,14.642 -3.216,21.973 -0.462,3.688 -0.859,7.392 -1.471,11.058 -0.491,2.951 -1.674,6.859 -0.271,9.664 2.033,4.065 4.919,1.365 6.371,-1.759 0.688,-1.481 0.553,-3.211 0.948,-4.792 0.437,-1.746 0.589,-3.582 0.768,-5.368 1.478,-14.769 3.511,-29.743 7.108,-44.136 1.492,-5.967 2.527,-11.512 6.676,-16.204 1.311,-1.483 2.652,-3.128 5.26,-4 2.606,-0.872 3.732,-1.257 4.506,-1.422 0.774,-0.165 1.291,-0.204 1.994,-0.208 0.702,-0.003 1.109,0.035 1.99,0.13 0.881,0.095 3.002,1.086 3.25,1.499 z" />
-</g><g
-     transform="matrix(0.765,0,0,0.765,47,34.971508)"
-     id="g63">
-	<line
-   style="fill:#a05a2c"
-   id="line65"
-   y2="45.907001"
-   x2="86"
-   y1="45.907001"
-   x1="86" />
-	<line
-   style="fill:#a05a2c"
-   id="line67"
-   y2="45.907001"
-   x2="86"
-   y1="45.907001"
-   x1="86" />
-	<line
-   style="fill:#a05a2c"
-   id="line69"
-   y2="45.907001"
-   x2="86"
-   y1="45.907001"
-   x1="86" />
-	<line
-   style="fill:#a05a2c"
-   id="line71"
-   y2="45.907001"
-   x2="86"
-   y1="45.907001"
-   x1="86" />
-	<line
-   style="fill:#a05a2c"
-   id="line73"
-   y2="45.907001"
-   x2="86"
-   y1="45.907001"
-   x1="86" />
-	<polygon
-   style="fill:#a05a2c"
-   id="polygon75"
-   points="383.267,100.97 383.13,101.463 382.938,102.012 382.5,102.407 81,55.407 80.392,54.979 80,54.407 79.834,53.694 79.742,53.131 79.75,52.288 79.868,51.595 80.307,50.451 80.5,49.907 81,48.907 81.294,48.326 81.794,47.326 82.132,46.634 82.621,45.803 83.263,45.248 84,44.907 84.5,44.907 84.5,44.907 387,88.407 387.5,88.907 387.5,89.407 387,90.407 386,92.407 385.5,93.907 384.803,95.65 384.303,97.65 383.815,99.188 383.5,99.907 383.295,100.559 " />
-	<polygon
-   style="fill:#a05a2c"
-   id="polygon77"
-   points="71.5,104.407 371,163.907 371.53,163.795 371.753,162.947 372,161.407 372.342,159.94 372.729,158.457 373,156.791 373.257,155.389 373.5,154.407 373.684,153.397 373.866,152.382 374,151.407 374.09,150.086 374,149.407 74.5,92.907 74,92.907 73.33,93.159 72.498,93.741 72,94.407 71.707,95.219 71.5,95.907 71.354,96.363 71.249,96.779 71.249,96.779 71.083,97.175 70.937,97.674 70.792,98.236 70.688,98.694 70.625,99.214 70.5,99.907 70.5,100.407 70.5,101.407 70.5,102.407 70.667,103.105 71,103.907 " />
-	<line
-   style="fill:#a05a2c"
-   id="line79"
-   y2="87.406998"
-   x2="75.5"
-   y1="87.406998"
-   x1="75.5" />
-	<line
-   style="fill:#a05a2c"
-   id="line81"
-   y2="87.906998"
-   x2="75.5"
-   y1="87.906998"
-   x1="75.5" />
-	<line
-   style="fill:#a05a2c"
-   id="line83"
-   y2="87.906998"
-   x2="75.5"
-   y1="87.906998"
-   x1="75.5" />
-	<polygon
-   style="fill:#a05a2c"
-   id="polygon85"
-   points="73.5,84.407 73.5,85.407 73.5,86.407 73.697,86.963 74,87.407 74.827,88.094 75.5,88.407 375,143.407 375.5,143.407 375.672,142.819 375.727,142.113 375.821,141.025 376,139.907 376.412,137.445 376.741,135.389 377,133.407 377.5,130.907 377.619,129.302 377.5,128.407 77,76.407 77,76.407 76.443,76.557 75.797,76.896 75,77.407 74.555,77.853 74.278,78.593 73.987,79.579 73.809,80.37 73.68,81.243 73.5,81.907 73.5,82.907 73.5,83.907 " />
-	<polygon
-   style="fill:#a05a2c"
-   id="polygon87"
-   points="76,69.907 76,68.907 76,67.907 76,66.907 76,66.407 76.188,65.268 76.347,64.391 76.5,63.907 76.746,62.876 77,61.907 77.444,61.242 77.882,60.764 78.5,60.407 79.277,60.325 80,60.407 80,60.407 381.5,107.907 381,109.907 380.5,112.907 380,115.407 379.5,117.907 379,120.407 378.5,122.907 78,71.907 77.264,71.684 76.487,71.066 76.125,70.532 " />
-	<line
-   style="fill:#a05a2c"
-   id="line89"
-   y2="170.407"
-   x2="366.5"
-   y1="170.407"
-   x1="366.5" />
-	<polygon
-   style="fill:#a05a2c"
-   id="polygon91"
-   points="64.107,112.758 64.446,112.903 64.967,113.002 65.394,113.102 65.724,113.223 66.5,113.407 366,175.407 366.23,175.334 366.746,175.099 367,174.907 367.311,174.629 367.5,174.407 367.817,174.135 368,173.907 368.251,173.441 368.5,172.907 368.768,172.443 369,171.907 369.367,171.15 369.5,170.407 369.438,169.939 368.994,169.297 368.5,168.907 69.5,108.407 69,108.407 68.291,108.684 67.784,109.125 67.5,109.407 67.123,109.709 67.123,109.709 66.869,109.841 66.5,109.741 66.226,109.588 65.349,109.643 64.777,109.797 64.377,110.006 63.73,110.523 63.014,111.24 62.855,112.093 63.19,112.496 63.682,112.67 " />
-	<line
-   style="fill:#a05a2c"
-   id="line93"
-   y2="173.907"
-   x2="352"
-   y1="173.907"
-   x1="352" />
-	<line
-   style="fill:#a05a2c"
-   id="line95"
-   y2="173.907"
-   x2="352"
-   y1="173.907"
-   x1="352" />
-	<polygon
-   style="fill:#a05a2c"
-   id="polygon97"
-   points="359,169.407 58,107.907 57.472,107.833 56.928,107.764 55.893,107.68 55.379,107.651 54.893,107.68 53.928,107.764 53.472,107.833 53,107.907 52,108.407 51.5,108.907 51,109.407 50.5,110.407 50.5,111.407 50.5,111.407 352,174.407 353.151,174.441 354.807,174.394 356.276,174.3 357.688,174.14 358.803,174.041 359.895,173.83 360,172.907 360,171.407 359.725,170.414 359.5,169.907 " />
-	<line
-   style="fill:#a05a2c"
-   id="line99"
-   y2="172.715"
-   x2="343.40799"
-   y1="172.715"
-   x1="343.40799" />
-	<line
-   style="fill:#a05a2c"
-   id="line101"
-   y2="172.407"
-   x2="344"
-   y1="172.407"
-   x1="344" />
-	<line
-   style="fill:#a05a2c"
-   id="line103"
-   y2="171.907"
-   x2="345"
-   y1="171.907"
-   x1="345" />
-	<line
-   style="fill:#a05a2c"
-   id="line105"
-   y2="171.69901"
-   x2="345.26001"
-   y1="171.69901"
-   x1="345.26001" />
-	<polygon
-   style="fill:#a05a2c"
-   id="polygon107"
-   points="348.484,175.193 348.86,174.828 348.723,173.832 348.5,172.907 348,171.907 347.5,171.407 45.5,108.907 44.494,108.826 43.931,108.77 43.431,108.77 42.931,108.77 42.431,108.77 41.846,108.797 41.273,108.983 40.658,109.152 40.17,109.276 39.761,109.43 39,109.907 38.5,110.407 37.884,111.258 37.5,111.907 37.276,113.049 37.5,113.907 37.5,113.907 340.5,178.407 341,178.407 342.059,178.013 342.691,177.625 343.332,177.355 344.053,176.99 344.699,176.686 345.5,176.407 346.11,176.133 346.651,175.957 347.59,175.639 " />
-	<polygon
-   style="fill:#a05a2c"
-   id="polygon109"
-   points="336.5,178.907 336,177.907 32.5,113.407 31.626,112.97 31,112.907 30.046,113.194 29.5,113.407 28.824,113.729 28.038,114.079 27.5,114.407 26.845,114.823 26,115.407 25.5,115.907 25,116.407 24.289,117.238 24,117.907 24,118.907 24.5,119.907 24.5,119.907 328.5,187.407 329.281,187.105 329.781,186.605 330.281,186.105 331.281,185.105 332.701,183.96 333.5,183.407 334.629,182.479 336,181.407 337,180.407 337,179.907 " />
-	<line
-   style="fill:#a05a2c"
-   id="line111"
-   y2="132.407"
-   x2="14"
-   y1="132.407"
-   x1="14" />
-	<line
-   style="fill:#a05a2c"
-   id="line113"
-   y2="131.907"
-   x2="13.5"
-   y1="131.907"
-   x1="13.5" />
-	<line
-   style="fill:#a05a2c"
-   id="line115"
-   y2="131.907"
-   x2="13.5"
-   y1="131.907"
-   x1="13.5" />
-	<line
-   style="fill:#a05a2c"
-   id="line117"
-   y2="122.407"
-   x2="20.5"
-   y1="122.407"
-   x1="20.5" />
-	<line
-   style="fill:#a05a2c"
-   id="line119"
-   y2="122.407"
-   x2="20.5"
-   y1="122.407"
-   x1="20.5" />
-	<line
-   style="fill:#a05a2c"
-   id="line121"
-   y2="122.407"
-   x2="20.5"
-   y1="122.407"
-   x1="20.5" />
-	<line
-   style="fill:#a05a2c"
-   id="line123"
-   y2="122.407"
-   x2="20.5"
-   y1="122.407"
-   x1="20.5" />
-	<polygon
-   style="fill:#a05a2c"
-   id="polygon125"
-   points="323.57,192.998 324.57,191.998 325,191.407 325.085,190.895 325,190.407 324,189.407 19.5,121.407 19,121.407 18,121.407 17.5,121.907 16.5,122.407 16,122.907 15.5,123.407 14.5,124.407 14,124.907 13.5,125.907 13,126.907 12.5,127.907 12.5,128.407 12.5,129.407 12.5,130.407 13,131.407 13.5,131.907 14,132.407 14,132.407 319,203.907 319.257,203.586 319.316,202.588 319.316,201.588 319.557,200.56 319.727,199.978 320,199.407 320.5,197.907 321.5,196.407 322,195.407 322.747,194.243 " />
-</g><g
-     transform="matrix(0.765,0,0,0.765,47,34.971508)"
-     id="g127">
-	<polygon
-   style="fill:#784421"
-   id="polygon129"
-   points="387,90.407 387.5,89.407 387.5,88.907 387,88.407 386.5,88.407 386,88.407 385,88.907 384.5,89.407 384,90.407 383.612,91.568 383.27,92.356 383,93.407 382.5,94.407 382.207,95.44 382,96.407 381.693,97.737 381.5,98.907 381.5,99.907 381.624,100.753 381.761,101.404 382.172,101.987 382.172,101.987 382.5,102.407 382.938,102.012 383.13,101.463 383.267,100.97 383.295,100.559 383.5,99.907 383.815,99.188 384.303,97.65 384.803,95.65 385.5,93.907 386,92.407 " />
-	<polygon
-   style="fill:#784421"
-   id="polygon131"
-   points="371,163.907 371.53,163.795 371.753,162.947 372,161.407 372.342,159.94 372.729,158.457 373,156.791 373.257,155.389 373.5,154.407 373.684,153.397 373.866,152.382 374,151.407 374.09,150.086 374,149.407 373.452,149.455 373,149.907 372.5,150.407 372,151.407 371.5,152.407 371.225,153.018 371.071,153.479 370.855,153.957 370.67,154.496 370.67,154.496 370.547,155.05 370.393,155.589 370.254,156.112 370.177,156.574 370.039,157.684 370.039,158.184 370,158.907 370,160.407 370,161.407 370,162.407 370.27,163.473 " />
-	<polygon
-   style="fill:#784421"
-   id="polygon133"
-   points="376.895,128.689 376.346,129.238 376,129.907 375.5,130.907 375,131.907 374.5,132.907 374.221,133.928 374.016,134.961 373.844,135.887 373.639,136.841 373.467,137.807 373.467,138.801 373.5,139.907 373.5,140.907 373.844,142.021 374.344,143.021 375,143.407 375,143.407 375.5,143.407 375.672,142.819 375.727,142.113 375.821,141.025 376,139.907 376.412,137.445 376.741,135.389 377,133.407 377.5,130.907 377.619,129.302 377.5,128.407 " />
-	<polygon
-   style="fill:#784421"
-   id="polygon135"
-   points="378.5,110.907 378.197,111.825 377.785,112.956 377.536,113.964 377.305,114.979 377.076,115.975 377.066,116.897 377,117.907 377,118.907 377,120.407 377.168,121.25 377.5,121.907 378,122.407 378.5,122.907 378.5,122.907 379,120.407 379.5,117.907 380,115.407 380.5,112.907 381,109.907 381.5,107.907 381,107.907 380.5,107.907 380,108.407 379.5,108.907 379,109.907 " />
-	<line
-   style="fill:#784421"
-   id="line137"
-   y2="170.407"
-   x2="366.5"
-   y1="170.407"
-   x1="366.5" />
-	<polygon
-   style="fill:#784421"
-   id="polygon139"
-   points="363.5,172.407 363,173.407 363.076,174.256 363.33,174.594 363.686,174.729 364,174.907 364.428,175.082 364.85,175.169 365.37,175.277 366,175.407 366.23,175.334 366.746,175.099 367,174.907 367.311,174.629 367.5,174.407 367.817,174.135 368,173.907 368.251,173.441 368.5,172.907 368.768,172.443 369,171.907 369.367,171.15 369.5,170.407 369.438,169.939 369.438,169.939 368.994,169.297 368.5,168.907 367.883,169.025 367.5,169.407 367,169.907 367,170.407 366.733,171.09 366.004,171.175 365.471,171.074 364.5,170.907 364,171.407 " />
-	<polygon
-   style="fill:#784421"
-   id="polygon141"
-   points="355,169.407 354.141,169.703 353.411,170.041 352.871,170.854 352.5,171.907 352.16,172.885 352,173.907 352,174.407 353.151,174.441 354.807,174.394 356.276,174.3 357.688,174.14 358.803,174.041 359.895,173.83 359.895,173.83 360,172.907 360,171.407 359.725,170.414 359.5,169.907 359,169.407 358.5,169.407 357.5,169.407 357,169.407 356.5,169.407 356,169.407 355.5,169.407 " />
-	<polygon
-   style="fill:#784421"
-   id="polygon143"
-   points="348.86,174.828 348.723,173.832 348.5,172.907 348,171.907 347.5,171.407 347,171.365 346.5,171.351 346,171.407 345.676,171.547 345.26,171.699 345,171.907 344.44,172.174 344,172.407 343.408,172.715 343,172.907 342.393,173.273 341.5,173.907 341,174.907 340.683,175.932 340.5,177.407 340.5,178.407 340.5,178.407 341,178.407 342.059,178.013 342.691,177.625 343.332,177.355 344.053,176.99 344.699,176.686 345.5,176.407 346.11,176.133 346.651,175.957 347.59,175.639 348.484,175.193 " />
-	<polygon
-   style="fill:#784421"
-   id="polygon145"
-   points="330.5,180.907 329.909,181.77 329.409,182.77 328.817,183.903 328.174,185.748 328.174,186.51 328.5,187.407 329.281,187.105 330.281,186.105 331.281,185.105 332.701,183.96 333.5,183.407 334.629,182.479 336,181.407 337,180.407 337,180.407 337,179.907 336.5,178.907 336,177.907 335.465,177.864 335,177.907 334,178.407 333.59,178.59 333,178.907 332.253,179.385 331.5,179.907 331,180.407 " />
-	<polygon
-   style="fill:#784421"
-   id="polygon147"
-   points="318,196.907 317.576,198.021 317.5,199.407 317.5,200.407 317.5,201.407 317.561,202.387 318,203.407 318.389,203.674 319,203.907 319.257,203.586 319.316,202.588 319.316,201.588 319.557,200.56 319.727,199.978 320,199.407 320.5,197.907 321.5,196.407 322,195.407 322.747,194.243 323.57,192.998 324.57,191.998 325,191.407 325.085,190.895 325.085,190.895 325,190.407 324,189.407 323.5,189.407 323.01,189.559 322.5,189.907 321.606,190.963 321,191.907 320.243,192.84 319.743,193.84 319,194.907 318.5,195.907 " />
-</g></g>
-</svg>
\ No newline at end of file
diff --git a/navit/xpm/bicycle_shop.svg b/navit/xpm/bicycle_shop.svg
deleted file mode 100644
index 61dc8118f..000000000
--- a/navit/xpm/bicycle_shop.svg
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   id="svg2"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="car_dealer.svg"
-   sodipodi:version="0.32"
-   version="1.0"
-   width="22">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10.0"
-     guidetolerance="10.0"
-     id="base"
-     inkscape:current-layer="svg2"
-     inkscape:cx="12.998345"
-     inkscape:cy="8.2449461"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="692"
-     inkscape:window-width="1360"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:zoom="16"
-     objecttolerance="10.0"
-     pagecolor="#ffffff"
-     showgrid="false"
-     inkscape:window-maximized="1" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective12"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <style
-       id="style6"
-       type="text/css">
-    .fil0 {fill:#EF7900}
-  </style>
-    <inkscape:perspective
-       id="perspective6807"
-       inkscape:persp3d-origin="29.116032 : 19.410688 : 1"
-       inkscape:vp_x="0 : 29.116032 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="58.232063 : 29.116032 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6954"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       id="ArrowStart"
-       markerHeight="3"
-       markerUnits="strokeWidth"
-       markerWidth="4"
-       orient="auto"
-       refX="10"
-       refY="5"
-       viewBox="0 0 10 10">
-      <path
-         d="M 10 0 L 0 5 L 10 10 z"
-         id="path2295" />
-    </marker>
-    <marker
-       id="ArrowEnd"
-       markerHeight="3"
-       markerUnits="strokeWidth"
-       markerWidth="4"
-       orient="auto"
-       refX="0"
-       refY="5"
-       viewBox="0 0 10 10">
-      <path
-         d="M 0 0 L 10 5 L 0 10 z"
-         id="path2292" />
-    </marker>
-    <inkscape:perspective
-       id="perspective7597"
-       inkscape:persp3d-origin="178.5405 : 158.483 : 1"
-       inkscape:vp_x="0 : 237.7245 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="357.08099 : 237.7245 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <g
-     id="g1327"
-     transform="matrix(0.04255774,0,0,0.04255774,-1.4142136,-1.7673414)">
-    <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.894,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.316 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
-       id="path1329"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="g2319"
-     transform="matrix(0.04255774,0,0,0.04255774,36.006437,-0.20099864)">
-    <path
-       d=""
-       id="path2323"
-       style="fill:#ad30c0;stroke:none"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="g2325"
-     transform="matrix(0.04255774,0,0,0.04255774,36.006437,-0.20099864)">
-    <path
-       d=""
-       id="path2329"
-       style="fill:#ad30c0;stroke:none"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="g3787"
-     transform="matrix(1.0781825,0,0,1.0471574,265.35317,-299.49867)">
-    <g
-       inkscape:export-ydpi="4.2362185"
-       inkscape:export-xdpi="4.2362185"
-       transform="matrix(-0.03470696,0,0,0.04139347,-219.73719,282.04237)"
-       id="g3138">
-      <circle
-         sodipodi:ry="161"
-         sodipodi:rx="161"
-         sodipodi:cy="409"
-         sodipodi:cx="215"
-         id="FrontWheel"
-         style="fill:none;stroke:#ad30c0;stroke-width:40px;stroke-opacity:1"
-         cx="215"
-         cy="409"
-         r="161"
-         transform="matrix(0.612193,0,0,0.612193,156.40859,178.29391)"
-         d="m 376,409 c 0,88.91784 -72.08216,161 -161,161 -88.91784,0 -161,-72.08216 -161,-161 0,-88.91784 72.08216,-161 161,-161 88.91784,0 161,72.08216 161,161 z" />
-      <circle
-         sodipodi:ry="161"
-         sodipodi:rx="161"
-         sodipodi:cy="406"
-         sodipodi:cx="790"
-         id="RearWheel"
-         style="fill:none;stroke:#ad30c0;stroke-width:40px;stroke-opacity:1"
-         cx="790"
-         cy="406"
-         r="161"
-         transform="matrix(0.612193,0,0,0.612193,156.40859,178.29391)"
-         d="m 951,406 c 0,88.91784 -72.08216,161 -161,161 -88.91784,0 -161,-72.08216 -161,-161 0,-88.91784 72.08216,-161 161,-161 88.91784,0 161,72.08216 161,161 z" />
-      <path
-         d="m 419.33591,187.76277 c -81.15626,0.791 -67.39292,-8.38456 -111.05594,131.93826 -35.56995,112.11783 -31.69552,99.89097 -31.88155,107.75543 -0.13037,6.10982 4.80163,10.95404 10.99923,11.36869 12.88887,-1.30322 7.46752,1.39395 52.15306,-137.36977 163.27931,172.24394 102.021,144.31296 189.89195,147.81092 115.48553,-1.10739 124.87203,6.01158 126.24309,-10.91575 -0.1582,-5.74792 -2.84759,-9.17557 -82.10546,-185.56784 l 7.59356,-20.88232 26.1029,-0.4746 -0.9492,-21.83151 -97.2926,0 c -8.5955,11.75949 3.48039,11.70675 46.98521,21.35692 l -7.59357,21.3569 -194.11061,0.47461 c 13.07781,-45.66688 5.69518,-42.8193 64.54534,-42.71383 l 0.47459,-22.30611 z m -70.62884,88.427 189.94107,-0.33678 -54.89431,147.50742 -135.04676,-147.17064 z m 212.84176,8.75614 -53.88399,141.44548 117.87123,0.33677 -63.98724,-141.78225 z"
-         id="Frame"
-         style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.61219299;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/navit/xpm/biergarten.xpm b/navit/xpm/biergarten.xpm
deleted file mode 100644
index 91d2e491b..000000000
--- a/navit/xpm/biergarten.xpm
+++ /dev/null
@@ -1,111 +0,0 @@
-/* XPM */
-static char *dummy[]={
-"16 16 92 2",
-"Qt c None",
-"#p c #745f2b",
-"#q c #775713",
-"#h c #776741",
-"#i c #785309",
-"#a c #7d653c",
-"#o c #7f795f",
-"#b c #804d02",
-"#r c #805f10",
-".3 c #806238",
-"#j c #815401",
-".V c #846031",
-".U c #868884",
-"#s c #876d1c",
-".4 c #884e02",
-".N c #885f2a",
-"#t c #897a3c",
-"#c c #8a5400",
-"#k c #8a5f01",
-"#z c #8f876b",
-".F c #916825",
-".W c #925101",
-".M c #92928d",
-".5 c #935600",
-"#l c #947207",
-"#d c #956300",
-"#m c #957b18",
-".# c #95948f",
-".w c #967327",
-"#w c #998a6d",
-".E c #999790",
-".O c #9a5700",
-"#y c #9b8d6b",
-".u c #9c9b93",
-"#x c #9d8d69",
-".X c #9e5c00",
-".6 c #9f6701",
-"#e c #9f7406",
-"#g c #9f8d52",
-"#v c #9f9a8a",
-"#u c #9f9b7e",
-"#n c #a19663",
-".2 c #a2a3a0",
-".n c #a3915f",
-"#f c #a47f15",
-".v c #a5a5a1",
-".P c #a66200",
-".G c #a66400",
-".g c #a6a49b",
-".D c #a8a6a0",
-".Y c #a96d00",
-".7 c #aa7604",
-".9 c #ab975c",
-".x c #af7404",
-".8 c #b08515",
-".Q c #b26f00",
-"#. c #b3b3ac",
-".H c #b46f00",
-".Z c #b57d07",
-".1 c #b7a062",
-".y c #ba7e05",
-".T c #baa059",
-".f c #babab6",
-".0 c #bb8916",
-".R c #bf8205",
-".L c #bfa457",
-"## c #bfc0be",
-".I c #c07b00",
-".a c #c0beba",
-".S c #c18c0f",
-".C c #c1aa60",
-".t c #c1b382",
-".m c #c2c1b8",
-".o c #c5a660",
-".e c #c5c4c0",
-".z c #c68a08",
-".J c #c98c08",
-".K c #c9930d",
-".c c #cdcbc7",
-".d c #ceccc9",
-".b c #cfcdca",
-".p c #d0b067",
-".A c #d39e22",
-".B c #d4a72f",
-".q c #d6b86c",
-".r c #dec077",
-".s c #dec37a",
-".h c #e1dcd4",
-".j c #e8e2d8",
-".i c #e9e4db",
-".l c #ece7df",
-".k c #ede7df",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQt.#.a.b.c.d.e.fQtQtQtQtQt",
-"QtQtQtQt.g.h.i.j.k.l.mQtQtQtQtQt",
-"QtQtQtQt.n.o.p.q.r.s.t.u.vQtQtQt",
-"QtQtQtQt.w.x.y.z.A.B.CQt.D.EQtQt",
-"QtQtQtQt.F.G.H.I.J.K.LQtQt.MQtQt",
-"QtQtQtQt.N.O.P.Q.R.S.TQtQt.UQtQt",
-"QtQtQtQt.V.W.X.Y.Z.0.1QtQt.2QtQt",
-"QtQtQtQt.3.4.5.6.7.8.9#.##QtQtQt",
-"QtQtQtQt#a#b#c#d#e#f#gQtQtQtQtQt",
-"QtQtQtQt#h#i#j#k#l#m#nQtQtQtQtQt",
-"QtQtQtQt#o#p#q#r#s#t#uQtQtQtQtQt",
-"QtQtQtQtQt#v#w#x#y#zQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt",
-"QtQtQtQtQtQtQtQtQtQtQtQtQtQtQtQt"};
diff --git a/navit/xpm/boat_ramp.svg b/navit/xpm/boat_ramp.svg
deleted file mode 100644
index 1ccc88b7b..000000000
--- a/navit/xpm/boat_ramp.svg
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="boat_ramp.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/navit/icons/png/boat_ramp.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f4ca00"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="15.902761"
-     inkscape:cy="9.2438685"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="38"
-     inkscape:window-y="24"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#3d6b98;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 0.65911209,15.560037 L 20.545958,15.515843 L 19.597655,21.589701 L 3.4774734,21.545507 L 0.65911209,15.560037 z"
-       id="rect2381"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#9fbcd9;fill-opacity:1;fill-rule:evenodd;stroke:#4d618c;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 6.4053422,0.51263443 L 10.619456,0.51263443 L 10.57834,13.451186 L 0.54037468,13.49538 L 6.4053422,0.51263443 z"
-       id="path3154"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#9fbcd9;fill-opacity:1;fill-rule:evenodd;stroke:#4d618c;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-dasharray:none"
-       d="M 15.547394,3.454693 L 12.467784,3.4104988 L 12.491839,13.416625 L 20.557566,13.416625 L 15.547394,3.454693 z"
-       id="path3156"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 11.545578,0.0090946102 L 11.545578,15.053346"
-       id="path3158"
-       sodipodi:nodetypes="cc" />
-  </g>
-</svg>
diff --git a/navit/xpm/bus.svg b/navit/xpm/bus.svg
deleted file mode 100644
index 8ef93e642..000000000
--- a/navit/xpm/bus.svg
+++ /dev/null
@@ -1,198 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="bus.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/navit/icons/png/bus.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3181">
-      <stop
-         id="stop3183"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-      <stop
-         id="stop3185"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3169">
-      <stop
-         style="stop-color:#d2d2d2;stop-opacity:1;"
-         offset="0"
-         id="stop3171" />
-      <stop
-         style="stop-color:#656565;stop-opacity:1;"
-         offset="1"
-         id="stop3173" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3169"
-       id="linearGradient3175"
-       x1="13.119969"
-       y1="12.919525"
-       x2="13.280306"
-       y2="4.8899608"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3181"
-       id="linearGradient3179"
-       gradientUnits="userSpaceOnUse"
-       x1="13.069741"
-       y1="8.9047422"
-       x2="13.129622"
-       y2="-6.9136248"
-       gradientTransform="matrix(0.8888038,0,0,0.8888038,1.2344919,0.9901737)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#0083f4"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.4"
-     inkscape:cx="10.658503"
-     inkscape:cy="11.00096"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1024"
-     inkscape:window-height="699"
-     inkscape:window-x="0"
-     inkscape:window-y="25">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3159"
-       width="3.0357144"
-       height="5.3571458"
-       x="3.0357141"
-       y="15.669642"
-       rx="1"
-       ry="1" />
-    <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3163"
-       width="3.0357144"
-       height="5.3571458"
-       x="16.107141"
-       y="15.758928"
-       rx="1"
-       ry="1" />
-    <path
-       style="fill:#516280;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 1.1964286,1.0625 C 7.0673776,0.17836005 14.927626,-0.024420878 21.035716,1.1071428 L 21.07143,11.084821 L 21.07143,19.062499 L 1.1160715,19.062499 L 1.1160715,11.084821 L 1.1964286,1.0625 z"
-       id="rect2386"
-       sodipodi:nodetypes="ccccccc" />
-    <rect
-       style="opacity:1;fill:#babd00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3165"
-       width="17.723225"
-       height="3.2500007"
-       x="2.3035712"
-       y="2"
-       rx="1"
-       ry="0.95535707" />
-    <path
-       style="fill:url(#linearGradient3175);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 2.155573,3 L 20,3.0446429 L 19.826461,12.919525 L 2.0485408,12.919525 L 2.155573,3 z"
-       id="path3167"
-       sodipodi:nodetypes="ccccc" />
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3187"
-       width="2.9017856"
-       height="1.8749995"
-       x="2.0535715"
-       y="15.035714" />
-    <rect
-       style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3415"
-       width="2.9017856"
-       height="1.8749995"
-       x="15.125"
-       y="15" />
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3413"
-       width="2.9017856"
-       height="1.8749995"
-       x="17.125"
-       y="15" />
-    <rect
-       style="opacity:0.5;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3417"
-       width="2.9017856"
-       height="1.8749995"
-       x="3.9642856"
-       y="15" />
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 14.373479,8.5271747 L 15.676062,8.5271747 C 16.372813,8.5271747 16.933736,9.0630558 16.933736,9.7287019 L 16.933736,11.884714 L 16.953387,13.002022 L 13.138263,13.016058 L 13.115805,11.884714 L 13.115805,9.7287019 C 13.115805,9.0630558 13.676728,8.5271747 14.373479,8.5271747 z"
-       id="rect3419"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3421"
-       sodipodi:cx="17.901785"
-       sodipodi:cy="6.1071429"
-       sodipodi:rx="1.1071428"
-       sodipodi:ry="1.1071428"
-       d="M 19.008928,6.1071429 A 1.1071428,1.1071428 0 1 1 16.794642,6.1071429 A 1.1071428,1.1071428 0 1 1 19.008928,6.1071429 z"
-       transform="matrix(1.2576734,0,0,1.2576734,-7.4785958,-0.6807912)" />
-    <path
-       style="fill:url(#linearGradient3179);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 4.0927349,3.5854032 L 18.121763,3.5060325 C 18.795114,5.9461485 18.919421,10.138186 18.856325,12.473096 L 3.3329939,12.473096 C 3.335812,10.305907 3.3579912,6.2753972 4.0927349,3.5854032 z"
-       id="path3177"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
diff --git a/navit/xpm/bus_stop.svg b/navit/xpm/bus_stop.svg
deleted file mode 100644
index b8dfaffbd..000000000
--- a/navit/xpm/bus_stop.svg
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   id="svg2"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="bus_stop.svg"
-   sodipodi:version="0.32"
-   version="1.0"
-   width="22">
-  <metadata
-     id="metadata1976">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10.0"
-     guidetolerance="10.0"
-     id="base"
-     inkscape:current-layer="svg2"
-     inkscape:cx="53.760581"
-     inkscape:cy="3.3320865"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="725"
-     inkscape:window-width="1024"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:zoom="5.2137932"
-     objecttolerance="10.0"
-     pagecolor="#ffffff"
-     showgrid="false"
-     inkscape:window-maximized="0" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective3653"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       id="ArrowStart"
-       markerHeight="3"
-       markerUnits="strokeWidth"
-       markerWidth="4"
-       orient="auto"
-       refX="10"
-       refY="5"
-       viewBox="0 0 10 10">
-      <path
-         d="M 10 0 L 0 5 L 10 10 z"
-         id="path2111" />
-    </marker>
-    <marker
-       id="ArrowEnd"
-       markerHeight="3"
-       markerUnits="strokeWidth"
-       markerWidth="4"
-       orient="auto"
-       refX="0"
-       refY="5"
-       viewBox="0 0 10 10">
-      <path
-         d="M 0 0 L 10 5 L 0 10 z"
-         id="path2108" />
-    </marker>
-    <inkscape:perspective
-       id="perspective2512"
-       inkscape:persp3d-origin="177.51199 : 145.02 : 1"
-       inkscape:vp_x="0 : 217.53 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="355.02399 : 217.53 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <g
-     id="g1327"
-     transform="matrix(0.0385034,0,0,0.0385034,0,4.2733549e-4)">
-    <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.896,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.314 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-       id="path1329"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="g2117"
-     style="fill:#000000"
-     transform="matrix(0.04610796,0,0,0.04610796,3.0852084,1.3317145)">
-    <g
-       id="g2119"
-       style="fill:#000000">
-      <g
-         id="g2121"
-         style="fill:#000000">
-        <path
-           d=""
-           id="path2125"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         id="g2127"
-         style="fill:#000000">
-        <path
-           d=""
-           id="path2131"
-           style="fill:#000000;stroke:none"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
-  </g>
-  <path
-     d="m 11.382891,2.0411182 c 0.01245,0 0.02537,4.731e-4 0.03795,5.772e-4 0.01267,-1.041e-4 0.02542,-5.772e-4 0.03795,-5.772e-4 l -0.0759,0 z m 0.03795,5.772e-4 c -0.883707,0.007 -2.0810063,0.2558264 -2.5807453,0.464051 C 8.3331996,2.7169549 7.9951651,2.9282649 7.889571,3.456275 l -0.3800962,2.9274901 0,4.0332779 0.6549623,0 0,0.632535 c 0,0.771237 1.1282136,0.771237 1.1282136,0 l 0,-0.632535 2.0839183,0 0.0063,0 2.166147,0 0,0.632535 c 0,0.771237 1.128788,0.771237 1.128788,0 l 0,-0.632535 0.654962,0 0,-4.0332779 L 14.952719,3.456275 C 14.847104,2.9282649 14.509069,2.7169549 14.002169,2.5057464 13.502381,2.2975016 12.30458,2.0486505 11.420847,2.0416954 z m -1.6089403,0.7389167 1.5709893,0 1.647467,0 c 0.316824,0 0.316824,0.4749767 0,0.4749767 l -1.650918,0 -1.5675383,0 c -0.3168233,0 -0.3168233,-0.4749767 0,-0.4749767 z m -0.7004842,0.9551287 2.2680225,0 2.273821,0 c 0.334672,0 0.422268,0.1698792 0.462901,0.4278243 l 0.296141,2.1230197 c 0.02759,0.2034963 -0.03167,0.4053978 -0.312817,0.4053978 l -2.716595,0 -2.717699,0 c -0.2811483,0 -0.3398307,-0.2019019 -0.3122428,-0.4053978 L 8.6490946,4.163563 C 8.6897271,3.9056179 8.7767477,3.7357388 9.1114205,3.7357388 z m -0.3823021,4.257013 c 0.2989753,-8e-7 0.6181128,0.319712 0.6181128,0.6186873 0,0.2989753 -0.3191375,0.6181121 -0.6181128,0.6181121 -0.2989753,7e-7 -0.6186873,-0.3191375 -0.6186873,-0.6181121 0,-0.2989753 0.319712,-0.6186873 0.6186873,-0.6186873 z m 5.3840296,0 c 0.298974,0 0.618112,0.319712 0.618112,0.6186873 0,0.2989746 -0.319138,0.6181128 -0.618112,0.6181121 -0.298976,0 -0.618689,-0.3191368 -0.618688,-0.6181121 0,-0.2989753 0.319712,-0.6186881 0.618688,-0.6186873 z"
-     id="path2115"
-     sodipodi:nodetypes="cscccsccccccccccccccccsccccccccccccccccccccsssccsssc"
-     style="fill:#0089cd;stroke:none"
-     inkscape:connector-curvature="0" />
-  <rect
-     height="12.438084"
-     id="rect3653"
-     ry="0.77344877"
-     style="fill:none;stroke:#0089cd;stroke-width:0.57755101;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     width="11.373988"
-     x="5.6446185"
-     y="0.59913504" />
-  <path
-     d="m 11.343224,13.060768 0,8.653797"
-     id="path4184"
-     style="fill:none;stroke:#0089cd;stroke-width:1.10887802;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 14.769315,21.227006 -6.9703409,0"
-     id="path4186"
-     style="fill:none;stroke:#0089cd;stroke-width:1.15510201;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/navit/xpm/car_dealer.svg b/navit/xpm/car_dealer.svg
deleted file mode 100644
index a3afb3525..000000000
--- a/navit/xpm/car_dealer.svg
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   id="svg2"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="car_dealer.svg"
-   sodipodi:version="0.32"
-   version="1.0"
-   width="22">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10.0"
-     guidetolerance="10.0"
-     id="base"
-     inkscape:current-layer="svg2"
-     inkscape:cx="-28.16038"
-     inkscape:cy="2.5297942"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="725"
-     inkscape:window-width="1024"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:zoom="5.6568542"
-     objecttolerance="10.0"
-     pagecolor="#ffffff"
-     showgrid="false"
-     inkscape:window-maximized="0" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective12"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <style
-       id="style6"
-       type="text/css">
-    .fil0 {fill:#EF7900}
-  </style>
-    <inkscape:perspective
-       id="perspective6807"
-       inkscape:persp3d-origin="29.116032 : 19.410688 : 1"
-       inkscape:vp_x="0 : 29.116032 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="58.232063 : 29.116032 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6954"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       id="ArrowStart"
-       markerHeight="3"
-       markerUnits="strokeWidth"
-       markerWidth="4"
-       orient="auto"
-       refX="10"
-       refY="5"
-       viewBox="0 0 10 10">
-      <path
-         d="M 10 0 L 0 5 L 10 10 z"
-         id="path2295" />
-    </marker>
-    <marker
-       id="ArrowEnd"
-       markerHeight="3"
-       markerUnits="strokeWidth"
-       markerWidth="4"
-       orient="auto"
-       refX="0"
-       refY="5"
-       viewBox="0 0 10 10">
-      <path
-         d="M 0 0 L 10 5 L 0 10 z"
-         id="path2292" />
-    </marker>
-    <inkscape:perspective
-       id="perspective7597"
-       inkscape:persp3d-origin="178.5405 : 158.483 : 1"
-       inkscape:vp_x="0 : 237.7245 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="357.08099 : 237.7245 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <g
-     id="g1327"
-     transform="matrix(0.04255774,0,0,0.04255774,-1.4142136,-1.7673414)">
-    <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.894,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.316 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.522,-65.036 -0.003,0 -448.494,-0.143 -448.352,0 z"
-       id="path1329"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-       inkscape:connector-curvature="0" />
-  </g>
-  <path
-     d="m 6.3944746,2.0462016 c -1.3503363,0 -2.0666597,0.7371955 -2.3973581,1.6001099 L 2.2416743,8.1790208 C 1.5457851,8.2682521 0.31218496,9.0850971 0.31218496,10.632523 l 0,5.764138 1.70865554,0 0,1.843404 c 0,2.267925 3.2095769,2.241215 3.2095773,0 l 0,-1.843404 5.7734982,0 0.0019,0 5.773494,0 0,1.843404 c 0,2.241215 3.209562,2.267925 3.20958,0 l 0,-1.843404 1.708653,0 0,-5.764138 c 0,-1.5474249 -1.233592,-2.3642709 -1.929493,-2.4535022 L 18.010713,3.6463115 C 17.680016,2.7833971 16.963699,2.0462016 15.613353,2.0462016 l -2.481569,0 -4.2257949,0 -2.5115145,0 z m -0.020586,1.6506399 4.6262844,0 0.0038,0 0.0019,0 4.628152,0 c 0.578688,0.00539 0.826533,0.367287 0.99188,0.8683627 l 1.323129,3.5670299 -6.943161,0 -0.0019,0 -0.0038,0 -6.9412971,0 1.3231312,-3.5670299 C 5.5473564,4.0641285 5.7951381,3.7022303 6.3738882,3.6968415 z M 3.6770951,9.8670903 c 0.8188373,0 1.482207,0.6831927 1.482207,1.5271217 -4e-7,0.843991 -0.6633697,1.528995 -1.482207,1.528995 -0.8187774,0 -1.4822075,-0.685005 -1.4822075,-1.528995 0,-0.843927 0.6634301,-1.5271217 1.4822075,-1.5271217 z m 14.6555119,0 c 0.818837,0 1.482212,0.6831947 1.482207,1.5271217 0,0.84399 -0.66337,1.528995 -1.482207,1.528995 -0.818777,0 -1.484083,-0.685004 -1.484083,-1.528995 0,-0.843929 0.665306,-1.5271217 1.484083,-1.5271217 z"
-     id="path2301"
-     style="fill:#ad30c0;stroke:none"
-     inkscape:connector-curvature="0" />
-  <g
-     id="g2319"
-     transform="matrix(0.04255774,0,0,0.04255774,36.006437,-0.20099864)">
-    <path
-       d=""
-       id="path2323"
-       style="fill:#ad30c0;stroke:none"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="g2325"
-     transform="matrix(0.04255774,0,0,0.04255774,36.006437,-0.20099864)">
-    <path
-       d=""
-       id="path2329"
-       style="fill:#ad30c0;stroke:none"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/navit/xpm/castle.svg b/navit/xpm/castle.svg
deleted file mode 100644
index b12a4cb78..000000000
--- a/navit/xpm/castle.svg
+++ /dev/null
@@ -1,425 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   id="svg2"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="castle.svg"
-   sodipodi:version="0.32"
-   version="1.0"
-   width="22">
-  <metadata
-     id="metadata2975">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10.0"
-     guidetolerance="10.0"
-     id="base"
-     inkscape:current-layer="svg2"
-     inkscape:cx="4.7854105"
-     inkscape:cy="5.2884587"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="725"
-     inkscape:window-maximized="1"
-     inkscape:window-width="1024"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:zoom="14.746834"
-     objecttolerance="10.0"
-     pagecolor="#ffffff"
-     showgrid="false" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective2441"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3452"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       inkscape:vp_x="0 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="60 : 30 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <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
-         d="M94,176l-21,39"
-         fill="none"
-         id="path4462"
-         stroke="#000000"
-         stroke-width="20" />
-      <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
-         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
-         id="path4466"
-         ill="none"
-         stroke="#000000"
-         stroke-width="20" />
-    </symbol>
-    <inkscape:perspective
-       id="perspective4471"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4668"
-       inkscape:persp3d-origin="6 : 4 : 1"
-       inkscape:vp_x="0 : 6 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="12 : 6 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4904"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       id="Arrow2Lend"
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible;">
-      <path
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         id="path4137"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <marker
-       id="Arrow1Mend"
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible;">
-      <path
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path4125"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.4) rotate(180) translate(10,0)" />
-    </marker>
-    <marker
-       id="TriangleOutL"
-       inkscape:stockid="TriangleOutL"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path4214"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8)" />
-    </marker>
-    <marker
-       id="Arrow1Lend"
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible;">
-      <path
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path4119"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.8) rotate(180) translate(12.5,0)" />
-    </marker>
-    <marker
-       id="Tail"
-       inkscape:stockid="Tail"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <g
-         id="g4152"
-         transform="scale(-1.2)">
-        <path
-           d="M -3.8048674,-3.9585227 L 0.54352094,0"
-           id="path4154"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-        <path
-           d="M -1.2866832,-3.9585227 L 3.0617053,0"
-           id="path4156"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-        <path
-           d="M 1.3053582,-3.9585227 L 5.6537466,0"
-           id="path4158"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-        <path
-           d="M -3.8048674,4.1775838 L 0.54352094,0.21974226"
-           id="path4160"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-        <path
-           d="M -1.2866832,4.1775838 L 3.0617053,0.21974226"
-           id="path4162"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-        <path
-           d="M 1.3053582,4.1775838 L 5.6537466,0.21974226"
-           id="path4164"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-      </g>
-    </marker>
-    <marker
-       id="Arrow1Sstart"
-       inkscape:stockid="Arrow1Sstart"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path4128"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.2) translate(6,0)" />
-    </marker>
-    <marker
-       id="Arrow1Send"
-       inkscape:stockid="Arrow1Send"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible;">
-      <path
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path4131"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.2) rotate(180) translate(6,0)" />
-    </marker>
-    <marker
-       id="SemiCircleOut"
-       inkscape:stockid="SemiCircleOut"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z "
-         id="path4235"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;marker-end:none"
-         transform="scale(0.6) translate(7.125493,0.763446)" />
-    </marker>
-    <marker
-       id="Arrow2Send"
-       inkscape:stockid="Arrow2Send"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible;">
-      <path
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         id="path4149"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         transform="scale(0.3) rotate(180) translate(-2.3,0)" />
-    </marker>
-    <marker
-       id="TriangleOutS"
-       inkscape:stockid="TriangleOutS"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path4220"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.2)" />
-    </marker>
-    <marker
-       id="CurveIn"
-       inkscape:stockid="CurveIn"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074"
-         id="path4238"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;marker-end:none;fill:none"
-         transform="scale(0.6)" />
-    </marker>
-    <marker
-       id="InfiniteLineStart"
-       inkscape:stockid="InfiniteLineStart"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <g
-         id="g4298"
-         transform="translate(-13,0)">
-        <circle
-           cx="3"
-           cy="0"
-           d="M 3.8,0 C 3.8,0.44182781 3.4418278,0.80000001 3,0.80000001 2.5581722,0.80000001 2.2,0.44182781 2.2,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.4418278,0 0.8,0.3581722 0.8,0.80000001 z"
-           id="circle4300"
-           r="0.8" />
-        <circle
-           cx="6.5"
-           cy="0"
-           d="M 7.3,0 C 7.3,0.44182781 6.9418278,0.80000001 6.5,0.80000001 6.0581722,0.80000001 5.7,0.44182781 5.7,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.4418278,0 0.8,0.3581722 0.8,0.80000001 z"
-           id="circle4302"
-           r="0.8" />
-        <circle
-           cx="10"
-           cy="0"
-           d="M 10.8,0 C 10.8,0.44182781 10.441828,0.80000001 10,0.80000001 9.5581722,0.80000001 9.2,0.44182781 9.2,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.441828,0 0.8,0.3581722 0.8,0.80000001 z"
-           id="circle4304"
-           r="0.8" />
-      </g>
-    </marker>
-    <marker
-       id="StopS"
-       inkscape:stockid="StopS"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 0.0,5.65 L 0.0,-5.65"
-         id="path4229"
-         style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
-         transform="scale(0.2)" />
-    </marker>
-    <marker
-       id="Arrow2Sstart"
-       inkscape:stockid="Arrow2Sstart"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         id="path4146"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         transform="scale(0.3) translate(-2.3,0)" />
-    </marker>
-    <marker
-       id="DiamondS"
-       inkscape:stockid="DiamondS"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z "
-         id="path4202"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.2)" />
-    </marker>
-    <marker
-       id="RazorWire"
-       inkscape:stockid="RazorWire"
-       orient="auto"
-       refX="0"
-       refY="0">
-       style=&quot;overflow:visible&quot;&gt;
-      <path
-   d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z "
-   id="path4286"
-   style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1pt"
-   transform="scale(0.8,0.8)" />
-</marker>
-    <inkscape:perspective
-       id="perspective5233"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5412"
-       inkscape:persp3d-origin="250 : 166.66667 : 1"
-       inkscape:vp_x="0 : 250 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="500 : 250 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective8631"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <g
-     id="g1327"
-     transform="matrix(0.04462909,0,0,0.04462909,-1.9665238,-2.0339103)">
-    <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-       id="path1329"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="layer3"
-     inkscape:label="Layout"
-     style="display:none;stroke:#757575;stroke-opacity:1"
-     transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
-    <rect
-       height="10"
-       id="rect4134"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="10"
-       x="1"
-       y="1" />
-    <rect
-       height="8"
-       id="rect4136"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="8"
-       x="2"
-       y="2" />
-  </g>
-  <path
-     d="m 0.23381607,8.3519325 0.0157882,-4.3155411 1.43530313,0 0,1.4353173 1.4353028,0 0,-1.4353173 1.4353032,0 0,1.4353173 1.4353034,0 0,-1.4353173 1.4353034,0 0,4.3059673 -1.4353034,0 0,2.8705053 1.4353034,0 0,-1.4351883 1.4353039,0 0,1.4351883 1.4353019,0 0,-1.4351883 1.435304,0 0,1.4351883 0,1.435317 0,1.435318 0.171344,0 0,0.542736 -3.0419499,0 0,3.763217 -7.1765167,0 0,-10.0470933 -1.45116327,0.012916 7.142e-5,-0.00329 3.5e-7,-9e-7 z"
-     id="path2958"
-     sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc"
-     style="font-size:20.57779694px;font-style:normal;font-weight:normal;fill:#b26609;fill-opacity:1;stroke:#b26609;stroke-width:0.26777455;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 21.787003,8.3519325 -0.01564,-4.3155411 -1.433336,0 0,1.4353173 -1.433323,0 0,-1.4353173 -1.433322,0 0,1.4353173 -1.433323,0 0,-1.4353173 -1.433323,0 0,4.3059673 1.433323,0 0,2.8706343 -1.433323,0 0,-1.4353173 -1.433322,0 0,1.4353173 -1.433322,0 0,-1.4353173 -1.433323,0 0,1.4353173 0,1.435188 0,1.435318 0.719257,0 0,0.542736 2.147388,0 0,3.763217 7.166613,0 0,-10.0470933 1.449168,0.012916 -1.78e-4,-0.00329 -9e-6,-9e-7 z"
-     id="path2958-0"
-     sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc"
-     style="font-size:20.57779694px;font-style:normal;font-weight:normal;fill:#b26609;fill-opacity:1;stroke:#b26609;stroke-width:0.26777455;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Bitstream Vera Sans"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/navit/xpm/cemetery.xpm b/navit/xpm/cemetery.xpm
deleted file mode 100644
index 5722e8f3f..000000000
--- a/navit/xpm/cemetery.xpm
+++ /dev/null
@@ -1,27 +0,0 @@
-/* XPM */
-static char * cemetery_xpm[] = {
-"14 16 8 1",
-" 	c None",
-".	c #8E8E8E",
-"+	c #8D8D8D",
-"@	c #404040",
-"#	c #8E8D8E",
-"$	c #8C8C8C",
-"%	c #8F8F8F",
-"&	c #898989",
-"              ",
-"              ",
-"              ",
-"    .++.      ",
-"   .++++++    ",
-"  +.++++++.   ",
-"  ++++++++.   ",
-"  .+@@+++++   ",
-"  .+++@@+++   ",
-"  #+@@++++.   ",
-"  #.++@@+++   ",
-"   .+++++++   ",
-"     $%....   ",
-"       $%.&   ",
-"              ",
-"              "};
diff --git a/navit/xpm/cinema.svg b/navit/xpm/cinema.svg
deleted file mode 100644
index dbfa6b60c..000000000
--- a/navit/xpm/cinema.svg
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="cinema.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/projets/navit/icons/png/cinema.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3156">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3158" />
-      <stop
-         id="stop3166"
-         offset="0.41698599"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3164"
-         offset="0.41698599"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#3d3d3d;stop-opacity:1;"
-         offset="1"
-         id="stop3160" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3156"
-       id="linearGradient3162"
-       x1="0.875"
-       y1="3.59375"
-       x2="2.0625"
-       y2="4.65625"
-       gradientUnits="userSpaceOnUse"
-       spreadMethod="reflect" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#22a638"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="10.642241"
-     inkscape:cy="12.077112"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="-4"
-     inkscape:window-y="24">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#5a5a5a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 1.4375,6.5625 L 19.625,7.6875 L 19.625,19.6875 L 3.3125,20.5625 L 1.4375,6.5625 z"
-       id="rect2381"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:url(#linearGradient3162);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 1.5,3.5625 L 19.6875,1.5625 L 19.8125,4.5 L 1.375,5.625 L 1.5,3.5625 z"
-       id="path3154"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 4.331029,9.2720779 L 17,9.8907964"
-       id="path3168" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 5.1265242,13.537243 L 16.955806,13.581436"
-       id="path3170"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 5.7010484,18.023379 L 17.027728,17.581437"
-       id="path3172"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.45597485"
-       d="M 12.52167,13.831883 L 12.521671,17.441048"
-       id="path3174"
-       sodipodi:nodetypes="cc" />
-  </g>
-</svg>
diff --git a/navit/xpm/drinking_water.svg b/navit/xpm/drinking_water.svg
deleted file mode 100644
index 1a6ca6dc5..000000000
--- a/navit/xpm/drinking_water.svg
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   id="svg2"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="drinking_water.svg"
-   sodipodi:version="0.32"
-   version="1.0"
-   width="22">
-  <metadata
-     id="metadata2975">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10.0"
-     guidetolerance="10.0"
-     id="base"
-     inkscape:current-layer="svg2"
-     inkscape:cx="22.509758"
-     inkscape:cy="11.611089"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="725"
-     inkscape:window-width="1024"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:zoom="10.427586"
-     objecttolerance="10.0"
-     pagecolor="#ffffff"
-     showgrid="false"
-     inkscape:window-maximized="0" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective2441"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3452"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       inkscape:vp_x="0 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="60 : 30 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <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
-         d="M94,176l-21,39"
-         fill="none"
-         id="path4462"
-         stroke="#000000"
-         stroke-width="20" />
-      <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
-         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
-         id="path4466"
-         ill="none"
-         stroke="#000000"
-         stroke-width="20" />
-    </symbol>
-    <inkscape:perspective
-       id="perspective4471"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4668"
-       inkscape:persp3d-origin="6 : 4 : 1"
-       inkscape:vp_x="0 : 6 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="12 : 6 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2562"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective12"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <g
-     id="g1327"
-     transform="matrix(0.04264448,0,0,0.04264448,-3.3564815,-1.1503681)">
-    <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-       id="path1329"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="layer3"
-     inkscape:label="Layout"
-     style="display:none;stroke:#757575;stroke-opacity:1"
-     transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
-    <rect
-       height="10"
-       id="rect4134"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="10"
-       x="1"
-       y="1" />
-    <rect
-       height="8"
-       id="rect4136"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="8"
-       x="2"
-       y="2" />
-  </g>
-  <g
-     id="g3353"
-     transform="matrix(0.04264448,0,0,0.04264448,-2.5035919,-0.6386344)">
-    <path
-       d="m 391.67731,24.490931 c -11.66352,4.361614 -27.64526,10.849786 -33.63434,10.849786 -5.98908,0 -10.84979,-4.860704 -10.84979,-10.849786 0,-5.989083 4.86071,-10.849787 10.84979,-10.849787 5.70837,0.219191 22.30594,6.964662 33.63434,10.849787 z"
-       id="path3340"
-       sodipodi:nodetypes="csscc"
-       style="opacity:0.98512196;fill:#c02727;fill-opacity:1;stroke:#c02727;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       transform="translate(15.189701,15.189701)"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 396.38288,39.680632 c 11.66352,4.361614 27.64526,10.849786 33.63434,10.849786 5.98908,0 10.84979,-4.860704 10.84979,-10.849786 0,-5.989083 -4.86071,-10.849787 -10.84979,-10.849787 -5.70837,0.219191 -22.30594,6.964662 -33.63434,10.849787 z"
-       id="path3345"
-       sodipodi:nodetypes="csscc"
-       style="opacity:0.98512196;fill:#c02727;fill-opacity:1;stroke:#c02727;stroke-width:15;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 401.4421,39.138141 0,66.183699 0.81374,25.76824"
-       id="path3347"
-       style="fill:none;stroke:#c02727;stroke-width:30;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 424.22666,125.39394 c 0,25.16712 -10.20099,45.56911 -22.78455,45.56911 -12.58356,0 -22.78455,-20.40199 -22.78455,-45.56911 0,-25.16712 10.20099,-45.569099 22.78455,-45.569099 12.58356,0 22.78455,20.401979 22.78455,45.569099 z"
-       id="path3349"
-       sodipodi:cx="401.44211"
-       sodipodi:cy="125.39394"
-       sodipodi:rx="22.784552"
-       sodipodi:ry="45.569103"
-       sodipodi:type="arc"
-       style="opacity:0.98512196;fill:#c02727;fill-opacity:1;stroke:#c02727;stroke-width:30;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-    <path
-       d="m 522.95971,130.81884 -177.93695,-1.00529 -14.10427,-0.0797 c -69.43863,-1.08498 -65.09872,64.01374 -65.09872,64.01374"
-       id="path3351"
-       sodipodi:nodetypes="cccc"
-       style="fill:none;stroke:#c02727;stroke-width:50;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-  </g>
-  <path
-     d="m 13.752627,10.13614 -0.0067,0 c 0.0077,-0.0066 0.01192,-0.01335 0.01192,-0.0201 0,-0.1591217 -2.172739,-0.2881178 -4.8529976,-0.2881178 -2.6802317,0 -4.8529983,0.1289961 -4.8529983,0.2881178 0,0.0067 0.00424,0.01346 0.011952,0.0201 l -0.011952,0 1.514622,11.549638 0.00684,0 c -0.013402,0.0072 -0.020503,0.01459 -0.020503,0.022 0,0.10994 1.5007924,0.199003 3.3520986,0.199003 1.8513323,0 3.3520983,-0.08906 3.3520983,-0.199003 0,-0.0074 -0.0071,-0.01479 -0.0205,-0.022 l 1.51615,-11.549638 z m -2.488623,10.705235 c -0.07759,0.0718 -4.6796087,0.03815 -4.7572001,-0.03365 L 5.0680257,10.835457 c 2.4557074,0.0082 4.2241807,0.130244 7.5623843,-0.06729 l -1.366406,10.073212 z"
-     id="path2209"
-     sodipodi:nodetypes="ccsssccccsssccccccc"
-     style="fill:#c02727"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 4.6688428,10.646944 8.3108722,0.06729 -1.34589,10.641899 -5.6863864,0.06729 -1.2785958,-10.776489 z"
-     id="path2381"
-     sodipodi:nodetypes="ccccc"
-     style="opacity:0.1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/navit/xpm/emergency.svg b/navit/xpm/emergency.svg
deleted file mode 100644
index 1d635cf48..000000000
--- a/navit/xpm/emergency.svg
+++ /dev/null
@@ -1,445 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   id="svg2"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="emergency.svg"
-   sodipodi:version="0.32"
-   version="1.0"
-   width="22">
-  <metadata
-     id="metadata2975">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10.0"
-     guidetolerance="10.0"
-     id="base"
-     inkscape:current-layer="svg2"
-     inkscape:cx="38.458366"
-     inkscape:cy="15.508574"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="725"
-     inkscape:window-width="1024"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:zoom="7.3734169"
-     objecttolerance="10.0"
-     pagecolor="#ffffff"
-     showgrid="false"
-     inkscape:snap-global="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-grids="false"
-     inkscape:snap-to-guides="false"
-     inkscape:window-maximized="0" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective2441"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3452"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       inkscape:vp_x="0 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="60 : 30 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <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
-         d="M94,176l-21,39"
-         fill="none"
-         id="path4462"
-         stroke="#000000"
-         stroke-width="20" />
-      <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
-         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
-         id="path4466"
-         ill="none"
-         stroke="#000000"
-         stroke-width="20" />
-    </symbol>
-    <inkscape:perspective
-       id="perspective4471"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4668"
-       inkscape:persp3d-origin="6 : 4 : 1"
-       inkscape:vp_x="0 : 6 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="12 : 6 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4904"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       id="Arrow2Lend"
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible;">
-      <path
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         id="path4137"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <marker
-       id="Arrow1Mend"
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible;">
-      <path
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path4125"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.4) rotate(180) translate(10,0)" />
-    </marker>
-    <marker
-       id="TriangleOutL"
-       inkscape:stockid="TriangleOutL"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path4214"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8)" />
-    </marker>
-    <marker
-       id="Arrow1Lend"
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible;">
-      <path
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path4119"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.8) rotate(180) translate(12.5,0)" />
-    </marker>
-    <marker
-       id="Tail"
-       inkscape:stockid="Tail"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <g
-         id="g4152"
-         transform="scale(-1.2)">
-        <path
-           d="M -3.8048674,-3.9585227 L 0.54352094,0"
-           id="path4154"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-        <path
-           d="M -1.2866832,-3.9585227 L 3.0617053,0"
-           id="path4156"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-        <path
-           d="M 1.3053582,-3.9585227 L 5.6537466,0"
-           id="path4158"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-        <path
-           d="M -3.8048674,4.1775838 L 0.54352094,0.21974226"
-           id="path4160"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-        <path
-           d="M -1.2866832,4.1775838 L 3.0617053,0.21974226"
-           id="path4162"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-        <path
-           d="M 1.3053582,4.1775838 L 5.6537466,0.21974226"
-           id="path4164"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-      </g>
-    </marker>
-    <marker
-       id="Arrow1Sstart"
-       inkscape:stockid="Arrow1Sstart"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path4128"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.2) translate(6,0)" />
-    </marker>
-    <marker
-       id="Arrow1Send"
-       inkscape:stockid="Arrow1Send"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible;">
-      <path
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path4131"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.2) rotate(180) translate(6,0)" />
-    </marker>
-    <marker
-       id="SemiCircleOut"
-       inkscape:stockid="SemiCircleOut"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z "
-         id="path4235"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;marker-end:none"
-         transform="scale(0.6) translate(7.125493,0.763446)" />
-    </marker>
-    <marker
-       id="Arrow2Send"
-       inkscape:stockid="Arrow2Send"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible;">
-      <path
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         id="path4149"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         transform="scale(0.3) rotate(180) translate(-2.3,0)" />
-    </marker>
-    <marker
-       id="TriangleOutS"
-       inkscape:stockid="TriangleOutS"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path4220"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.2)" />
-    </marker>
-    <marker
-       id="CurveIn"
-       inkscape:stockid="CurveIn"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074"
-         id="path4238"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;marker-end:none;fill:none"
-         transform="scale(0.6)" />
-    </marker>
-    <marker
-       id="InfiniteLineStart"
-       inkscape:stockid="InfiniteLineStart"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <g
-         id="g4298"
-         transform="translate(-13,0)">
-        <circle
-           cx="3"
-           cy="0"
-           id="circle4300"
-           r="0.8"
-           d="M 3.8,0 C 3.8,0.44182781 3.4418278,0.80000001 3,0.80000001 2.5581722,0.80000001 2.2,0.44182781 2.2,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.4418278,0 0.8,0.3581722 0.8,0.80000001 z" />
-        <circle
-           cx="6.5"
-           cy="0"
-           id="circle4302"
-           r="0.8"
-           d="M 7.3,0 C 7.3,0.44182781 6.9418278,0.80000001 6.5,0.80000001 6.0581722,0.80000001 5.7,0.44182781 5.7,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.4418278,0 0.8,0.3581722 0.8,0.80000001 z" />
-        <circle
-           cx="10"
-           cy="0"
-           id="circle4304"
-           r="0.8"
-           d="M 10.8,0 C 10.8,0.44182781 10.441828,0.80000001 10,0.80000001 9.5581722,0.80000001 9.2,0.44182781 9.2,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.441828,0 0.8,0.3581722 0.8,0.80000001 z" />
-      </g>
-    </marker>
-    <marker
-       id="StopS"
-       inkscape:stockid="StopS"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 0.0,5.65 L 0.0,-5.65"
-         id="path4229"
-         style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
-         transform="scale(0.2)" />
-    </marker>
-    <marker
-       id="Arrow2Sstart"
-       inkscape:stockid="Arrow2Sstart"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         id="path4146"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         transform="scale(0.3) translate(-2.3,0)" />
-    </marker>
-    <marker
-       id="DiamondS"
-       inkscape:stockid="DiamondS"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z "
-         id="path4202"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.2)" />
-    </marker>
-    <marker
-       id="RazorWire"
-       inkscape:stockid="RazorWire"
-       orient="auto"
-       refX="0"
-       refY="0">
-       style=&quot;overflow:visible&quot;&gt;
-      <path
-   d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z "
-   id="path4286"
-   style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1pt"
-   transform="scale(0.8,0.8)" />
-</marker>
-    <inkscape:perspective
-       id="perspective5233"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5412"
-       inkscape:persp3d-origin="250 : 166.66667 : 1"
-       inkscape:vp_x="0 : 250 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="500 : 250 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <g
-     id="g1327"
-     transform="matrix(0.04014077,0,0,0.04014077,-0.6781117,-0.54206272)">
-    <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-       id="path1329"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="layer3"
-     inkscape:label="Layout"
-     style="display:none;stroke:#757575;stroke-opacity:1"
-     transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
-    <rect
-       height="10"
-       id="rect4134"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="10"
-       x="1"
-       y="1" />
-    <rect
-       height="8"
-       id="rect4136"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="8"
-       x="2"
-       y="2" />
-  </g>
-  <path
-     d="m 505.71429,305.71429 a 288.57144,288.57144 0 1 1 -577.142879,0 288.57144,288.57144 0 1 1 577.142879,0 z"
-     id="path2207"
-     sodipodi:cx="217.14285"
-     sodipodi:cy="305.71429"
-     sodipodi:rx="288.57144"
-     sodipodi:ry="288.57144"
-     sodipodi:type="arc"
-     style="fill:none;stroke:#da0092;stroke-width:25.1376152;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     transform="matrix(0.03080682,0,0,0.03080682,4.2539348,1.6795003)" />
-  <rect
-     height="3.1871722"
-     id="rect3180"
-     style="fill:#da0092;fill-opacity:1;stroke:#da0092;stroke-width:0.38946208;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     transform="scale(-1,-1)"
-     width="14.109169"
-     x="-17.998001"
-     y="-12.691175" />
-  <rect
-     height="3.1871722"
-     id="rect3182"
-     style="fill:#da0092;fill-opacity:1;stroke:#da0092;stroke-width:0.38946208;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     transform="matrix(0,-1,1,0,0,0)"
-     width="14.109169"
-     x="-18.152172"
-     y="9.3498316" />
-  <path
-     d="m 505.71429,305.71429 a 288.57144,288.57144 0 1 1 -577.142879,0 288.57144,288.57144 0 1 1 577.142879,0 z"
-     id="path2438"
-     sodipodi:cx="217.14285"
-     sodipodi:cy="305.71429"
-     sodipodi:rx="288.57144"
-     sodipodi:ry="288.57144"
-     sodipodi:type="arc"
-     style="fill:none;stroke:#da0092;stroke-width:21.69851685;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-     transform="matrix(0.03568954,0,0,0.03568954,3.1936881,0.18678406)" />
-</svg>
diff --git a/navit/xpm/exit.svg b/navit/xpm/exit.svg
deleted file mode 100644
index 8fd6d8635..000000000
--- a/navit/xpm/exit.svg
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="exit.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/projets/navit/icons/png/exit.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <marker
-       inkscape:stockid="TriangleOutS"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="TriangleOutS"
-       style="overflow:visible">
-      <path
-         id="path3310"
-         d="M 5.77,0 L -2.88,5 L -2.88,-5 L 5.77,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="scale(0.2,0.2)" />
-    </marker>
-    <marker
-       inkscape:stockid="Tail"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Tail"
-       style="overflow:visible">
-      <g
-         id="g3197"
-         transform="scale(-1.2,-1.2)">
-        <path
-           id="path3199"
-           d="M -3.8048674,-3.9585227 L 0.54352094,0"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none" />
-        <path
-           id="path3201"
-           d="M -1.2866832,-3.9585227 L 3.0617053,0"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none" />
-        <path
-           id="path3203"
-           d="M 1.3053582,-3.9585227 L 5.6537466,0"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none" />
-        <path
-           id="path3205"
-           d="M -3.8048674,4.1775838 L 0.54352094,0.21974226"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none" />
-        <path
-           id="path3207"
-           d="M -1.2866832,4.1775838 L 3.0617053,0.21974226"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none" />
-        <path
-           id="path3209"
-           d="M 1.3053582,4.1775838 L 5.6537466,0.21974226"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;marker-start:none;marker-end:none" />
-      </g>
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Send"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Send"
-       style="overflow:visible">
-      <path
-         id="path3176"
-         d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.2,0,0,-0.2,-1.2,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lend"
-       style="overflow:visible">
-      <path
-         id="path3164"
-         d="M 0,0 L 5,-5 L -12.5,0 L 5,5 L 0,0 z"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none"
-         transform="matrix(-0.8,0,0,-0.8,-10,0)" />
-    </marker>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#0083f4"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="9.0421129"
-     inkscape:cy="7.8731905"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="-5"
-     inkscape:window-y="24">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="opacity:0.80000000000000004;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#TriangleOutS);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 8.573647,21.264649 C 8.573647,21.264649 6.5031479,11.06486 16.162607,6.1851002"
-       id="path3156"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:#3f3f3f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 3.0843991,0.26423648 L 10,0.35295939 L 10,21.88409 L 3.0843991,21.795367 L 3.0843991,0.26423648 z"
-       id="rect2383"
-       sodipodi:nodetypes="ccccc" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.98289597;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2382"
-       width="21.141155"
-       height="21.141155"
-       x="0.49144804"
-       y="0.49144825" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#fdff03;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.00000002, 2.00000002;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 6.4586472,1.9742322 L 6.4586472,21.227102"
-       id="path5565" />
-  </g>
-</svg>
diff --git a/navit/xpm/fastfood.svg b/navit/xpm/fastfood.svg
deleted file mode 100644
index a10bc4bb8..000000000
--- a/navit/xpm/fastfood.svg
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="fastfood.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/projets/navit/icons/png/fastfood.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3179">
-      <stop
-         style="stop-color:#b45d00;stop-opacity:1;"
-         offset="0"
-         id="stop3181" />
-      <stop
-         style="stop-color:#502900;stop-opacity:1;"
-         offset="1"
-         id="stop3183" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3163">
-      <stop
-         style="stop-color:#ffe639;stop-opacity:1;"
-         offset="0"
-         id="stop3165" />
-      <stop
-         style="stop-color:#cd7f00;stop-opacity:1;"
-         offset="1"
-         id="stop3167" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3163"
-       id="linearGradient3169"
-       x1="1.2863814"
-       y1="7.4118396"
-       x2="20.524135"
-       y2="7.4118396"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3163"
-       id="linearGradient3177"
-       x1="1.8652222"
-       y1="17.49683"
-       x2="19.974939"
-       y2="17.49683"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3179"
-       id="linearGradient3185"
-       x1="2.9744897"
-       y1="13.444727"
-       x2="19.051228"
-       y2="13.444727"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f4ca00"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="10.16782"
-     inkscape:cy="11.973272"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="-4"
-     inkscape:window-y="24"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:url(#linearGradient3177);fill-opacity:1.0;fill-rule:evenodd;stroke:#947c38;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2388"
-       width="17.109716"
-       height="4.0315895"
-       x="2.3652222"
-       y="15.481035" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient3185);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3160"
-       width="16.076738"
-       height="3.1512756"
-       x="2.9744897"
-       y="11.869089" />
-    <path
-       style="fill:url(#linearGradient3169);fill-opacity:1;fill-rule:evenodd;stroke:#947c38;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 2.367162,5.5740819 C 7.6734217,2.8017603 13.343139,2.5027573 19.508128,5.5740819 C 20.309525,7.8309316 20.072627,9.698134 19.508128,11.442397 L 2.367162,11.442397 C 1.7828457,9.551264 1.4233243,7.6351346 2.367162,5.5740819 z"
-       id="rect3162"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#4bb216;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 12.116824,13.468571 L 17.787518,13.404084"
-       id="path3167"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#4bb216;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 13.569035,13.515262 L 13.569035,15.987082"
-       id="path3169"
-       sodipodi:nodetypes="cc" />
-    <g
-       id="g2388"
-       transform="translate(-0.84375,-0.75)">
-      <path
-         sodipodi:nodetypes="cc"
-         id="path3165"
-         d="M 5.2691033,13.237358 L 10.939798,13.172871"
-         style="fill:none;fill-rule:evenodd;stroke:#4bb216;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cc"
-         id="path3171"
-         d="M 8.4382877,13.240339 L 8.4070377,15.743408"
-         style="fill:none;fill-rule:evenodd;stroke:#4bb216;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    </g>
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#68480a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2420"
-       sodipodi:cx="0"
-       sodipodi:cy="12.1875"
-       sodipodi:rx="0.9375"
-       sodipodi:ry="0.9375"
-       d="M 0.9375,12.1875 A 0.9375,0.9375 0 1 1 -0.9375,12.1875 A 0.9375,0.9375 0 1 1 0.9375,12.1875 z"
-       transform="translate(5.0625,-3.28125)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#68480a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3192"
-       sodipodi:cx="0"
-       sodipodi:cy="12.1875"
-       sodipodi:rx="0.9375"
-       sodipodi:ry="0.9375"
-       d="M 0.9375,12.1875 A 0.9375,0.9375 0 1 1 -0.9375,12.1875 A 0.9375,0.9375 0 1 1 0.9375,12.1875 z"
-       transform="translate(9.125,-5.25)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#68480a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3194"
-       sodipodi:cx="0"
-       sodipodi:cy="12.1875"
-       sodipodi:rx="0.9375"
-       sodipodi:ry="0.9375"
-       d="M 0.9375,12.1875 A 0.9375,0.9375 0 1 1 -0.9375,12.1875 A 0.9375,0.9375 0 1 1 0.9375,12.1875 z"
-       transform="translate(13.09375,-3.28125)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#68480a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3196"
-       sodipodi:cx="0"
-       sodipodi:cy="12.1875"
-       sodipodi:rx="0.9375"
-       sodipodi:ry="0.9375"
-       d="M 0.9375,12.1875 A 0.9375,0.9375 0 1 1 -0.9375,12.1875 A 0.9375,0.9375 0 1 1 0.9375,12.1875 z"
-       transform="translate(16.09375,-4.09375)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#68480a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3198"
-       sodipodi:cx="0"
-       sodipodi:cy="12.1875"
-       sodipodi:rx="0.9375"
-       sodipodi:ry="0.9375"
-       d="M 0.9375,12.1875 A 0.9375,0.9375 0 1 1 -0.9375,12.1875 A 0.9375,0.9375 0 1 1 0.9375,12.1875 z"
-       transform="translate(13.15625,-6.15625)" />
-  </g>
-</svg>
diff --git a/navit/xpm/firebrigade.svg b/navit/xpm/firebrigade.svg
deleted file mode 100644
index 93fd91aa7..000000000
--- a/navit/xpm/firebrigade.svg
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="firebrigade.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/projets/navit/icons/png/firebrigade.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3153">
-      <stop
-         style="stop-color:#e20000;stop-opacity:1;"
-         offset="0"
-         id="stop3155" />
-      <stop
-         style="stop-color:#e20000;stop-opacity:0;"
-         offset="1"
-         id="stop3157" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3153"
-       id="linearGradient3159"
-       x1="11.552056"
-       y1="20.566092"
-       x2="11.552056"
-       y2="-2.348809"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f4ca00"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="14.068915"
-     inkscape:cy="13.61603"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="-4"
-     inkscape:window-y="24">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       id="path3157"
-       style="fill:url(#linearGradient3159);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:24.80315017999999938;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 18.025271,14.578301 C 18.025271,17.882841 15.343326,20.564785 12.038786,20.564785 C 8.7342469,20.564785 6.0523019,17.882841 6.0523019,14.578301 C 6.0523019,11.27376 9.9229438,7.7482342 11.799328,1.7911694 C 12.956702,6.5973338 18.025271,11.27376 18.025271,14.578301 z M 13.443087,14.980042 C 13.443087,17.578337 11.334326,19.687097 8.7360317,19.687097 C 6.1377367,19.687097 4.0289759,17.578337 4.0289759,14.980042 C 4.0289759,12.381746 7.0723859,9.6096933 8.5477499,4.9257695 C 9.4577708,8.7047629 13.443087,12.381746 13.443087,14.980042 z" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.98289609;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2382"
-       width="21.088533"
-       height="21.088533"
-       x="0.49144801"
-       y="0.49144825" />
-    <path
-       style="fill:#e1e23e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24.80315018;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 15.494816,15.311309 C 15.494816,17.468201 13.744296,19.218721 11.587404,19.218721 C 9.4305121,19.218721 7.6799911,17.468201 7.6799911,15.311309 C 7.6799911,13.154416 10.206382,10.853284 11.431108,6.9650742 C 12.186533,10.102086 15.494816,13.154416 15.494816,15.311309 z"
-       id="path2385"
-       sodipodi:nodetypes="csscc" />
-  </g>
-</svg>
diff --git a/navit/xpm/fountain.svg b/navit/xpm/fountain.svg
deleted file mode 100644
index 5b0d91599..000000000
--- a/navit/xpm/fountain.svg
+++ /dev/null
@@ -1,452 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
-   version="1.0"
-   sodipodi:docname="fountain.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   style="display:inline">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 64 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="128 : 64 : 1"
-       inkscape:persp3d-origin="64 : 42.666667 : 1"
-       id="perspective79" />
-    <linearGradient
-       id="linearGradient2338">
-      <stop
-         style="stop-color:#b1b1b1;stop-opacity:1;"
-         offset="0"
-         id="stop2340" />
-      <stop
-         style="stop-color:#e4e4e4;stop-opacity:1;"
-         offset="1"
-         id="stop2342" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2888">
-      <stop
-         id="stop2890"
-         offset="0"
-         style="stop-color:#007dff;stop-opacity:1;" />
-      <stop
-         id="stop2892"
-         offset="1"
-         style="stop-color:#58abff;stop-opacity:1;" />
-    </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter3197"
-       x="-0.078178316"
-       width="1.1563566"
-       y="-0.10603384"
-       height="1.2120677"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.49535895"
-         id="feGaussianBlur3199" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter3201"
-       color-interpolation-filters="sRGB">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.80813571"
-         id="feGaussianBlur3203" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2338"
-       id="linearGradient3115"
-       gradientUnits="userSpaceOnUse"
-       x1="95.135132"
-       y1="57.574238"
-       x2="101.53513"
-       y2="69.595856"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2338"
-       id="linearGradient3118"
-       gradientUnits="userSpaceOnUse"
-       x1="40.302704"
-       y1="59.286484"
-       x2="44.194595"
-       y2="65.599998"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2338"
-       id="linearGradient3127"
-       gradientUnits="userSpaceOnUse"
-       x1="63.74054"
-       y1="90.37838"
-       x2="96.086487"
-       y2="113.03784"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2338"
-       id="linearGradient3134"
-       gradientUnits="userSpaceOnUse"
-       x1="56.653049"
-       y1="98.429657"
-       x2="58.692608"
-       y2="123.99252"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2338"
-       id="linearGradient3423"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="64.951347"
-       y1="76.627029"
-       x2="78.875679"
-       y2="79.827026" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2338"
-       id="linearGradient3425"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="67.286484"
-       y1="70.443245"
-       x2="94.875679"
-       y2="75.027023" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2338"
-       id="linearGradient3427"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="62.616215"
-       y1="73.081078"
-       x2="66.162163"
-       y2="37.535133" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2888"
-       id="linearGradient3429"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="58.118919"
-       y1="51.382431"
-       x2="80.432434"
-       y2="65.739189" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2338"
-       id="linearGradient3431"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="53.571938"
-       y1="51.219669"
-       x2="55.039661"
-       y2="53.665878" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2338"
-       id="linearGradient3433"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="81.886787"
-       y1="50.118877"
-       x2="85.066856"
-       y2="54.399742" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2338"
-       id="linearGradient3435"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="65.741821"
-       y1="58.435982"
-       x2="74.181236"
-       y2="62.105293" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2338"
-       id="linearGradient3437"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="65.619507"
-       y1="54.522049"
-       x2="77.605927"
-       y2="56.417858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2338"
-       id="linearGradient3439"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="67.087234"
-       y1="55.317066"
-       x2="65.252579"
-       y2="39.294411" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2888"
-       id="linearGradient3441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="61.460957"
-       y1="46.602451"
-       x2="71.612717"
-       y2="52.595661" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2338"
-       id="linearGradient3443"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="68.126869"
-       y1="43.911625"
-       x2="70.94001"
-       y2="48.131332" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2338"
-       id="linearGradient3445"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="67.087227"
-       y1="45.440506"
-       x2="71.184631"
-       y2="49.109818" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2338"
-       id="linearGradient3447"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="68.310341"
-       y1="45.318195"
-       x2="66.90377"
-       y2="41.893505" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2888"
-       id="linearGradient3449"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="67.087234"
-       y1="42.74968"
-       x2="68.738426"
-       y2="44.462025" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2888"
-       id="linearGradient3451"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="62.439438"
-       y1="36.573006"
-       x2="67.759941"
-       y2="41.343109" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2888"
-       id="linearGradient3453"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.81375293,0,20.05073)"
-       x1="69.013618"
-       y1="37.03167"
-       x2="74.0895"
-       y2="49.170971" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="23.532919"
-     inkscape:cx="13.955723"
-     inkscape:cy="10.454959"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3176"
-     showgrid="false"
-     width="744.09px"
-     inkscape:window-width="1248"
-     inkscape:window-height="975"
-     inkscape:window-x="266"
-     inkscape:window-y="46"
-     showguides="false"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="color"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline" />
-  <g
-     id="g3176"
-     inkscape:groupmode="layer"
-     inkscape:label="outline"
-     style="display:inline">
-    <g
-       id="g3393"
-       transform="matrix(0.37386129,0,0,0.37386129,-13.764978,-14.646603)">
-      <path
-         transform="matrix(1,0,0,0.81375293,0,20.05073)"
-         sodipodi:nodetypes="ccsssc"
-         id="path3113"
-         d="M 57,79.75 C 56.021626,75.74683 54.079113,75.600214 52.5,74 c 0,0 -9.302192,-3.444116 -10.25,-5.5 -3.648955,-7.914925 4.342914,-11.76181 10.25,-11.25 5.73395,0.496809 15.5,4 16,7.25 C 69,67.75 58,79.75 57,79.75 z"
-         style="fill:#000000;fill-opacity:0.58823529;fill-rule:evenodd;stroke:none;display:inline;filter:url(#filter3201)" />
-      <path
-         id="path3028"
-         d="M 56.908108,84.728693 57.6,82.054305 l 4.497297,1.196436 5.621622,0.351893 4.497297,-0.49265 5.448649,-1.126058 0.605405,3.096659 -3.2,1.689088 -5.535135,1.126058 -4.92973,0.140757 -4.151351,-1.126058 -2.681081,-1.266816 -0.864865,-0.914921 z"
-         style="fill:url(#linearGradient3423);fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         id="path3032"
-         d="m 43.935135,67.345171 -0.864865,2.322494 0.172973,1.970602 0.864865,2.040981 2.248649,2.604009 6.054054,3.870824 5.448648,2.181739 6.227028,0.914921 5.189189,0.211136 6.4,-0.844544 4.151351,-1.196436 5.708108,-2.533631 4.843243,-3.518932 1.98919,-2.674387 0.518919,-1.970602 -0.778379,-3.026282 -0.605405,2.252117 -1.470271,2.815145 -1.729729,1.900223 -3.286487,2.111359 -5.189189,2.181738 -6.486486,1.196436 -4.670271,0.703787 -2.767567,-0.07038 -4.756757,-0.633405 -4.583784,-1.055679 -5.102703,-1.759466 -3.372972,-2.111359 -1.98919,-1.900223 -1.47027,-2.463252 -0.605405,-1.337194 -0.08649,-2.181737 z"
-         style="fill:url(#linearGradient3425);fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         id="path3036"
-         d="m 56.994595,58.407084 -5.016217,1.970602 -3.459459,1.337194 -2.075676,1.900223 -1.989189,2.322495 -0.691892,2.674388 0.605406,2.111359 1.816216,2.885524 2.767567,2.463252 7.005406,2.885524 3.372973,0.914922 5.275675,0.844543 3.632433,0.211137 4.410811,-0.492651 5.275675,-0.9853 4.843244,-1.548331 2.594594,-1.337193 1.72973,-0.985301 1.643243,-1.266816 1.989189,-2.53363 1.124325,-3.448553 -1.124325,-3.307796 -2.594594,-2.885524 -5.448649,-2.533631 -4.67027,-1.126058 -21.016216,-0.07038 z"
-         style="fill:url(#linearGradient3427);fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         sodipodi:nodetypes="cccccccccscccccccccc"
-         id="path3042"
-         d="m 56.648649,61.151851 -4.410811,1.829845 -1.72973,1.196436 -2.162162,1.829845 -1.368945,2.976516 1.195972,2.86491 3.891892,2.885524 3.978378,1.54833 5.362162,1.055679 c 0,0 4.670271,0.140758 6.140541,0.49265 1.47027,0.351894 7.005405,-0.49265 7.005405,-0.49265 L 79.827027,76.1425 84.843243,73.890383 87.091892,71.779025 88.994595,68.611986 87.524324,66.219112 86.4,64.741161 83.372973,62.840938 79.567568,61.362987 56.648649,61.151851 z"
-         style="fill:url(#linearGradient3429);fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         id="path3046"
-         d="m 46.539093,68.026186 0.978483,-2.338965 1.406569,-1.940843 3.057759,-2.388731 4.342018,-1.492956 0,1.443191 -2.507363,0.746479 -2.507362,1.34366 -1.834655,1.542721 -1.40657,1.542722 -1.039638,2.48826 -0.489241,-0.945538 z"
-         style="fill:url(#linearGradient3431);fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         id="path3050"
-         d="m 79.31827,59.715395 3.852776,1.592487 2.874294,1.891078 2.079276,2.239435 0.917328,2.687321 -1.712345,-2.139904 -1.773501,-1.891078 -2.813138,-1.492956 -3.30238,-1.194366 -0.12231,-1.692017 z"
-         style="fill:url(#linearGradient3433);fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         transform="matrix(1,0,0,0.81375293,0,20.05073)"
-         sodipodi:nodetypes="ccsssc"
-         id="path3115"
-         d="m 60.75,60 -2.5,-3.5 c 0,0 -3.75,-0.75 -3.75,-2.75 0,-2 5.75,-5.75 9.5,-4.75 3.75,1 6.5,5.75 5.5,6.75 -1,1 -8,4.75 -8.75,4.25 z"
-         style="fill:#000000;fill-opacity:0.54901961;fill-rule:evenodd;stroke:none;display:inline;filter:url(#filter3197)" />
-      <path
-         id="path3054"
-         d="m 60.482474,69.021489 0.856173,-2.48826 1.956965,0.746478 3.485846,0.497653 2.690828,0 5.565121,-1.592487 0.428087,2.58779 -1.712346,1.343661 -4.770104,1.293896 -2.813138,-0.149296 c 0,0 -1.834655,-0.298591 -2.140431,-0.398122 -0.305776,-0.09953 -3.485846,-1.791547 -3.547001,-1.841313 z"
-         style="fill:url(#linearGradient3435);fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         id="path3058"
-         d="m 56.507387,59.864691 -0.24462,0.846009 0.12231,0.945539 0.856173,2.040374 1.89581,1.791547 2.018121,0.995304 c 0,0 3.30238,0.846009 3.913932,1.04507 0.611552,0.19906 3.852776,0.298591 3.852776,0.298591 l 2.385052,-0.348356 4.342018,-1.542722 2.629673,-2.040374 1.039638,-1.940843 0.06115,-1.443191 -0.611552,-1.393426 -22.260486,0.746478 z"
-         style="fill:url(#linearGradient3437);fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         style="fill:#000000;fill-opacity:0.15686275;fill-rule:evenodd;stroke:none;display:inline"
-         d="m 56.507387,59.864691 -0.24462,0.846009 0.12231,0.945539 0.856173,2.040374 1.89581,1.791547 2.018121,0.995304 c 0,0 3.30238,0.846009 3.913932,1.04507 0.611552,0.19906 3.852776,0.298591 3.852776,0.298591 l 2.385052,-0.348356 4.342018,-1.542722 2.629673,-2.040374 1.039638,-1.940843 0.06115,-1.443191 -0.611552,-1.393426 -22.260486,0.746478 z"
-         id="path3109" />
-      <path
-         id="path3063"
-         d="m 56.568543,58.919152 0.06115,1.443192 0.795017,1.642252 1.406569,1.094834 1.895811,1.045069 4.097397,1.194365 2.323897,0.199061 2.568517,-0.149296 4.464329,-1.094834 3.118914,-1.592487 1.590035,-3.085443 -1.40657,-2.338965 -2.751983,-1.940843 -3.363535,-1.194365 -6.115518,-0.09953 -4.770104,1.24413 -2.751983,1.791548 -1.161948,2.090138 0,-0.248826 z"
-         style="fill:url(#linearGradient3439);fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         sodipodi:nodetypes="cccccccccccccc"
-         id="path3067"
-         d="m 58.953595,59.466569 0.428086,1.891078 2.262742,1.393426 1.956965,0.597182 4.097398,0.398123 4.036241,-0.398123 2.996604,-1.293894 1.284259,-1.244131 0.305776,-0.796243 C 75.788761,59.139511 75.049948,58.600152 74.3647,57.973613 L 71.06232,57.028075 63.723699,57.2769 c -1.365799,-0.05825 -2.731598,0.732978 -4.097397,1.443192 l -0.672707,0.746477 z"
-         style="fill:url(#linearGradient3441);fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         id="path3097"
-         d="m 61.55269,58.670326 -0.856173,0.07465 -0.305776,0.199061 -0.12231,0.373239 0.825595,1.020186 0.611552,0.09953 0.978483,0.09953 0.947905,-0.223944 0.366931,-0.223943 0.06115,-0.497652 -0.24462,-0.646947 -0.428087,-0.223944 -1.834655,-0.04977 z"
-         style="fill:#ffffff;fill-opacity:0.1254902;fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         sodipodi:nodetypes="ccccccccccccc"
-         id="path3071"
-         d="m 58.403198,59.167978 1.406569,-2.040373 3.791621,-1.443191 7.277467,-0.199061 4.403173,1.542721 1.223104,1.692018 -0.244621,1.343661 c -0.387798,-0.7615 -0.796661,-1.454432 -1.345414,-1.692018 l -3.118914,-1.24413 -7.460932,-0.199061 -3.852777,1.045069 -1.65119,1.542722 -0.428086,-0.348357 z"
-         style="fill:url(#linearGradient3443);fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         id="path3099"
-         d="m 71.765605,60.188165 -0.366931,0.273709 -0.12231,0.298591 -0.275199,0.522534 0.214043,0.323474 0.489242,0.323475 0.88675,0.248826 0.947905,0 0.519819,-0.223944 0.550397,-0.398122 0.244621,-0.497652 -0.336354,-0.373239 -0.856172,-0.248826 -1.895811,-0.248826 z"
-         style="fill:#ffffff;fill-opacity:0.1254902;fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         style="fill:#000000;fill-opacity:0.15686275;fill-rule:evenodd;stroke:none;display:inline"
-         d="m 58.403198,59.167978 1.406569,-2.040373 3.791621,-1.443191 7.277467,-0.199061 4.403173,1.542721 1.223104,1.692018 -0.244621,1.343661 c -0.387798,-0.7615 -0.796661,-1.454432 -1.345414,-1.692018 l -3.118914,-1.24413 -7.460932,-0.199061 -3.852777,1.045069 -1.65119,1.542722 -0.428086,-0.348357 z"
-         id="path3075"
-         sodipodi:nodetypes="ccccccccccccc" />
-      <path
-         sodipodi:nodetypes="ccccccccc"
-         id="path3077"
-         d="m 64.457561,59.466569 0.672707,-4.478868 c 0.06584,1.028925 0.838613,1.29083 1.345414,1.841313 1.581883,0.321817 2.738311,0.124313 3.669311,-0.348357 0.811086,-0.333173 0.555379,-1.013588 0.611552,-1.592486 l 0.428086,4.777459 -2.690828,0.895774 -3.057759,-0.497651 -0.978483,-0.597184 z"
-         style="fill:url(#linearGradient3445);fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         id="path3081"
-         d="m 66.720303,56.829014 -1.65119,-1.1446 -0.06115,-0.547417 1.406569,-0.796244 2.813138,-0.199061 1.712345,0.945539 -0.366931,0.846008 -1.406569,0.995305 -2.446207,-0.09953 z"
-         style="fill:url(#linearGradient3447);fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         id="path3085"
-         d="m 67.698786,54.838406 -1.345414,0.248825 0.428086,0.895774 1.406569,0.248826 1.406569,-0.646948 -0.489241,-0.547417 -1.406569,-0.19906 z"
-         style="fill:url(#linearGradient3449);fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccccccccccccc"
-         id="path3089"
-         d="m 67.39301,55.286292 0.366931,-0.597182 -0.183466,-0.995305 0.03058,-2.090138 -0.611552,-1.965726 -0.825595,-1.119717 -1.314836,-0.696713 -1.498302,-0.174178 -1.100794,0.398121 -0.88675,0.796244 -0.519819,1.567604 -0.214043,1.293895 0.09173,1.791548 0.580974,3.906568 0.244621,1.318779 0.12231,0.572299 0.305776,0.298591 0.550397,0.149296 0.580974,-0.07465 0.305776,-0.298591 -0.366931,-2.438496 -0.366931,-2.811734 -0.06115,-1.592486 0.428086,-1.517839 0.978483,-1.069952 0.978483,-0.298592 0.489241,0.646948 0.305776,0.945539 0.366931,1.293896 0.275198,1.542721 0.489242,1.020186 c 0.15586,0.314841 0.221866,0.345268 0.458664,0.199062 z"
-         style="fill:url(#linearGradient3451);fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccc"
-         id="path3093"
-         d="m 67.912829,55.336057 -0.122311,-0.87089 -0.24462,-0.547418 0.152888,-1.766665 0.428086,-1.592486 0.458664,-0.821127 0.519819,-0.423004 0.733862,-0.348356 0.947905,-0.149295 0.978483,0.19906 0.856173,0.348357 0.764439,0.572299 0.305776,0.423004 0.428087,0.821127 0.336353,0.945538 0.183466,0.895774 0.06115,1.468074 -0.336354,2.911264 -0.458664,2.38873 -0.24462,0.920657 -0.152888,0.472769 -0.214043,0.149296 -0.451563,0.111347 -0.679808,-0.13623 -0.275199,-0.622065 0.703285,-3.433799 0.152888,-2.264317 -0.183466,-1.891078 -0.88675,-1.567604 -1.284258,-0.995304 -0.397509,0.398122 -0.305776,0.746477 -0.366931,1.368544 -0.183466,1.119717 -0.183465,0.995304 -0.183466,0.447887 -0.275198,0.09953 c 0,0 -0.611552,0.348357 -0.580974,-0.373239 z"
-         style="fill:url(#linearGradient3453);fill-opacity:1;fill-rule:evenodd;stroke:none;display:inline" />
-      <path
-         style="fill:#000000;fill-opacity:0.15686275;fill-rule:evenodd;stroke:none;display:inline"
-         d="M 56.908108,84.728693 57.6,82.054305 l 4.497297,1.196436 5.621622,0.351893 4.497297,-0.49265 5.448649,-1.126058 0.605405,3.096659 -3.2,1.689088 -5.535135,1.126058 -4.92973,0.140757 -4.151351,-1.126058 -2.681081,-1.266816 -0.864865,-0.914921 z"
-         id="path3103" />
-      <path
-         style="fill:#000000;fill-opacity:0.15686275;fill-rule:evenodd;stroke:none;display:inline"
-         d="m 43.935135,67.345171 -0.864865,2.322494 0.172973,1.970602 0.864865,2.040981 2.248649,2.604009 6.054054,3.870824 5.448648,2.181739 6.227028,0.914921 5.189189,0.211136 6.4,-0.844544 4.151351,-1.196436 5.708108,-2.533631 4.843243,-3.518932 1.98919,-2.674387 0.518919,-1.970602 -0.778379,-3.026282 -0.605405,2.252117 -1.470271,2.815145 -1.729729,1.900223 -3.286487,2.111359 -5.189189,2.181738 -6.486486,1.196436 -4.670271,0.703787 -2.767567,-0.07038 -4.756757,-0.633405 -4.583784,-1.055679 -5.102703,-1.759466 -3.372972,-2.111359 -1.98919,-1.900223 -1.47027,-2.463252 -0.605405,-1.337194 -0.08649,-2.181737 z"
-         id="path3105" />
-      <path
-         style="fill:#000000;fill-opacity:0.15686275;fill-rule:evenodd;stroke:none;display:inline"
-         d="m 60.482474,69.021489 0.856173,-2.48826 1.956965,0.746478 3.485846,0.497653 2.690828,0 5.565121,-1.592487 0.428087,2.58779 -1.712346,1.343661 -4.770104,1.293896 -2.813138,-0.149296 c 0,0 -1.834655,-0.298591 -2.140431,-0.398122 -0.305776,-0.09953 -3.485846,-1.791547 -3.547001,-1.841313 z"
-         id="path3107" />
-      <path
-         style="fill:#ffffff;fill-opacity:0.1254902;fill-rule:evenodd;stroke:none"
-         d="m 61.55269,58.670326 -0.856173,0.07465 -0.305776,0.199061 -0.12231,0.373239 0.825595,1.020186 0.611552,0.09953 0.978483,0.09953 0.947905,-0.223944 0.366931,-0.223943 0.06115,-0.497652 -0.24462,-0.646947 -0.428087,-0.223944 -1.834655,-0.04977 z"
-         id="path3204" />
-      <path
-         style="fill:#ffffff;fill-opacity:0.1254902;fill-rule:evenodd;stroke:none"
-         d="m 71.765605,60.188165 -0.366931,0.273709 -0.12231,0.298591 -0.275199,0.522534 0.214043,0.323474 0.489242,0.323475 0.88675,0.248826 0.947905,0 0.519819,-0.223944 0.550397,-0.398122 0.244621,-0.497652 -0.336354,-0.373239 -0.856172,-0.248826 -1.895811,-0.248826 z"
-         id="path3208" />
-      <path
-         style="fill:#000000;fill-opacity:1;stroke:none"
-         d="m 63.46875,47.616611 c -0.530955,0.06098 -1.090186,0.263292 -1.6875,0.610314 -1.500665,2.015843 -1.332222,4.419766 -0.96875,6.738892 -1.783887,0.710549 -3.273753,1.788818 -4.1875,3.35673 -3.40625,1.619029 -4.881214,0.800423 -10.09116,4.474319 -5.721929,5.846641 -4.371746,11.150071 1.148324,14.662442 6.71372,4.27188 13.104289,6.491897 21.082883,6.263143 2.155563,-0.0618 10.721389,-0.912305 17.055028,-4.680939 6.16136,-3.666126 10.041722,-8.741322 3.94327,-15.865346 -2.805371,-2.625549 -6.893072,-3.755643 -11.044595,-4.904478 -0.810551,-1.54621 -2.229824,-2.589648 -3.9375,-3.280442 0.08206,-1.609877 -0.136048,-3.279017 -1.1875,-4.958806 -1.592838,-1.330436 -2.818706,-1.519719 -4.34375,-0.864613 -1.200473,0.761444 -1.494222,1.808452 -1.5625,3.077003 -0.04197,-1.410599 -0.270836,-2.641294 -1.5625,-3.789037 -0.953152,-0.651818 -1.771325,-0.940824 -2.65625,-0.839182 z m 0.46875,0.127147 c 0.672278,0.0217 1.378301,0.264618 2.15625,0.762895 1.33321,1.483603 1.590318,3.33793 1.4375,5.111385 -0.05344,0.620189 0.494388,0.903485 -0.28125,1.805515 0.19296,-0.111428 0.327773,-0.233038 0.40625,-0.381447 0.04167,0.21604 0.181874,0.408355 0.375,0.610315 -0.02916,-0.09306 0.02403,-0.165128 0.03125,-0.330587 -0.744512,-1.092728 -0.32582,-5.348364 1.25,-6.103147 0.388974,-0.150227 0.764815,-0.246275 1.125,-0.279728 0.135069,-0.01255 0.275087,-0.029 0.40625,-0.02543 0.918141,0.02499 1.737764,0.449444 2.53125,1.14434 1.976988,2.87952 1.082741,5.799202 0.6875,8.366398 -0.099,0.488965 -0.206111,1.436767 -0.4375,2.085241 -0.02429,0.226342 -0.104365,0.517411 -0.21875,0.712034 -0.669275,0.529097 -1.833089,-0.09043 -1.34375,-0.610314 0.120793,-1.263751 0.868283,-3.136555 0.8125,-4.450212 -0.117159,-1.975722 0.248435,-4.301852 -2.4375,-5.67084 -1.018227,0.323014 -0.663324,0.925307 -1.28125,2.568407 0.0613,0.413277 -0.218987,2.537989 -0.59375,2.568408 -0.0444,0.05251 -0.04157,0.04211 -0.0625,0.101719 0.3181,-0.07636 0.310701,-0.206373 0.4375,-0.483166 0.09308,0.02781 0.178351,0.06171 0.28125,0.101719 -0.694977,1.116961 -2.449588,0.5405 -2.59375,-0.101719 0.06499,-0.03363 0.126023,-0.05331 0.1875,-0.07629 0.04986,0.04276 0.09741,0.08961 0.15625,0.127149 7.61e-4,-0.06781 0,-0.135698 0,-0.203438 -0.363439,-0.355868 -0.807332,-2.323601 -0.75,-2.695557 -0.617925,-1.800234 -0.263023,-2.317055 -1.28125,-2.898995 -2.685934,0.685982 -2.320341,3.089167 -2.4375,5.035096 -0.05578,1.299473 0.691707,3.384613 0.8125,4.67908 0.239068,0.417748 -1.055566,0.730328 -1.5625,0.178008 -0.117252,-0.12775 0.114802,-0.327646 0.03125,-0.559455 -0.259838,-0.720897 -0.364049,-1.79577 -0.46875,-2.33954 -0.39524,-2.667701 -1.258238,-5.811598 0.71875,-8.188388 0.604561,-0.375712 1.233972,-0.581151 1.90625,-0.559456 z m 1.09375,2.034384 c 0.843026,1.040957 0.951923,2.746895 1.21875,4.043335 -1.149064,0.07978 -2.268806,0.258429 -3.34375,0.508595 -0.45096,-1.880969 0.02835,-4.150141 2.125,-4.55193 z m 5.3125,0.991761 c 1.537773,0.68573 2.205883,2.153577 2.28125,3.585599 -1.078354,-0.247153 -2.209275,-0.422501 -3.34375,-0.508596 0.192068,-1.118973 0.364663,-2.392773 1.0625,-3.077003 z m -4.75,3.687318 c -0.294984,0.149395 -0.590835,0.324012 -0.875,0.559455 -0.0032,0.04545 5.22e-4,0.08388 0,0.127149 L 64.6875,55.321834 C 64.118092,55.390042 63.558345,55.473259 63,55.576131 62.97622,55.35325 62.97432,55.13939 62.96875,54.914957 c 0.796554,-0.190019 1.665971,-0.333531 2.625,-0.457736 z m 3.5625,0 c 0.619918,0.149324 1.168071,0.409945 1.5625,0.813753 -0.361493,0.734147 -1.274735,1.358597 -2.15625,1.576646 -1.580078,0.177909 -2.813593,-0.620391 -3.34375,-1.703795 0.354256,-0.242187 0.774774,-0.416415 1.21875,-0.559455 0.03988,0.107415 0.06703,0.212471 0.125,0.305157 L 66,55.042106 c 0.241282,1.340047 1.070789,1.322678 2.5625,1.246059 0.895776,-0.06005 0.745053,-0.477995 1.25,-0.915472 -0.28443,-0.31969 -0.495406,-0.491093 -0.71875,-0.610315 0.0237,-0.09271 0.04148,-0.205881 0.0625,-0.305157 z m 1.4375,0 c 0.700903,0.09548 1.37181,0.256112 2.03125,0.432306 -0.01389,0.263508 -0.04147,0.514765 -0.09375,0.762894 -0.413032,-0.08504 -0.830164,-0.166309 -1.25,-0.228868 -0.0042,-0.490477 -0.270598,-0.780567 -0.6875,-0.966332 z m -9.6875,1.093481 c 0.03381,0.202247 0.05996,0.410309 0.09375,0.610314 -1.576723,0.670156 -2.452722,1.755856 -2.8125,3.305872 0.722836,3.718307 5.39012,4.282007 9.34375,4.399351 3.800427,0.01541 7.388446,-0.641658 8.78125,-3.40759 0.127281,-0.307294 0.22652,-0.628697 0.34375,-0.940902 -0.09468,-1.479702 -0.873495,-2.502706 -2,-3.153292 0.03452,-0.248086 0.06928,-0.486504 0.09375,-0.737464 1.778554,0.84664 3.164832,2.137371 3.78125,4.017905 -1.206809,4.402314 -6.248174,5.256896 -11.0625,5.74713 -10.946636,-0.659611 -14.096563,-6.981375 -6.5625,-9.841324 z m 3.75,0.152578 -0.125,1.017191 c -0.447171,0.05333 -0.882822,0.143445 -1.3125,0.228868 -0.05081,-0.302317 -0.109348,-0.586966 -0.15625,-0.915472 0.541154,-0.125888 1.070126,-0.246923 1.59375,-0.330587 z M 71.25,55.855859 c 0.395168,0.08943 0.791481,0.188924 1.1875,0.305157 0.0049,0.295723 -0.0012,0.5784 -0.03125,0.864613 -0.363448,-0.09216 -0.739692,-0.169388 -1.125,-0.228868 L 71.25,55.855859 z m -0.4375,0.02543 0.03125,3.585599 c -2.102545,1.063231 -4.071687,1.03593 -6.0625,-0.10172 l 0.5,-3.026143 c 0.752367,0.538912 2.008933,1.077446 3.28125,1.017191 1.052824,0.03859 1.977194,-0.795031 2.25,-1.474927 z m -9.71875,0.788323 c 0.05188,0.264282 0.09058,0.540176 0.125,0.813753 -0.912627,0.353108 -1.684002,0.825548 -2.1875,1.474927 0.249505,-1.102573 0.986349,-1.781367 2.0625,-2.28868 z m 13.46875,0.305157 c 0.953435,0.54243 1.664905,1.340664 1.75,2.542978 -0.03174,0.132855 -0.08111,0.257219 -0.125,0.381447 -0.392488,-0.932809 -1.007971,-1.581483 -1.78125,-2.059812 0.05073,-0.286899 0.108888,-0.572967 0.15625,-0.864613 z m -3.28125,0.330588 c 0.360332,0.0479 0.716345,0.105594 1.0625,0.178008 -0.0977,0.665563 -0.265145,1.283894 -0.3125,1.805514 -0.03479,0.251595 -0.08333,0.518637 -0.125,0.788323 -0.402591,0.140175 -0.502775,0.180124 -0.8125,0.813753 -0.205919,0.281438 -0.334182,0.557332 -0.03125,0.762894 0.843434,0.470244 1.584285,0.72778 2.65625,0.584884 0.747579,-0.559184 1.631871,-0.783717 1.0625,-1.551216 -0.354446,-0.06551 -0.553525,-0.241236 -0.8125,-0.254298 0.152491,-0.544772 0.189413,-1.209817 0.3125,-1.805514 0.02529,-0.148692 0.03602,-0.307592 0.0625,-0.457736 0.824372,0.422357 1.4813,1.00436 1.8125,1.830944 -1.092023,2.834075 -5.31208,3.387259 -8.625,3.48388 -3.477224,-0.02017 -7.115518,-0.752474 -8.34375,-3.50931 l 0.03125,0 c 0.02287,-0.90438 0.888847,-1.527265 2.09375,-1.958093 0.03346,0.217908 0.06988,0.413499 0.125,0.610315 -0.318694,-0.113652 -0.573119,0.06785 -1,0.07629 -0.744614,0.660739 0.09055,1.009937 0.6875,1.678366 1.01608,0.31255 1.808959,0.198104 2.75,-0.127149 0.346895,-0.152761 0.289721,-0.45388 0.15625,-0.762894 -0.148025,-0.663671 -0.243026,-0.71864 -0.59375,-0.915472 -0.04066,-0.230154 -0.06497,-0.471137 -0.09375,-0.686604 -0.0093,-0.104277 -0.04722,-0.243242 -0.0625,-0.356017 0.391701,-0.0746 0.786064,-0.153901 1.1875,-0.203438 l -0.25,2.28868 c 2.491513,1.570065 4.612191,1.382075 7.125,0.228868 l -0.0625,-2.542978 z m -10.25,1.449521 c 0.156588,-0.0026 0.319766,0.02427 0.46875,0.07629 -0.01084,0.849361 0.667217,0.934271 1.75,0.890042 0.253515,-0.324851 0.268864,-0.522632 0.21875,-0.915472 0.120242,0.08019 0.243926,0.143949 0.34375,0.203439 -0.04877,0.128002 0.300953,0.735875 -0.03125,1.09348 -0.974255,0.618598 -2.107501,0.363936 -2.65625,0.05086 -1.156611,-0.946253 -0.701313,-1.388566 -0.09375,-1.398638 z M 79,58.805713 c 6.003125,1.374871 11.359863,4.069898 12.46875,9.434448 -0.235929,8.679744 -14.640555,12.018203 -24,12.460592 -9.330146,-0.253805 -23.362071,-4.174355 -23.25,-12.460592 0.413007,-4.917308 6.064604,-7.270144 12.09375,-9.307299 -0.227608,0.269693 -0.274906,0.660794 -0.34375,0.940902 -4.965792,0.708578 -8.169841,3.998309 -9.65625,8.137529 1.319599,8.023397 13.185965,9.764856 21.375,10.070193 8.238609,-0.194912 19.999007,-2.125581 21.375,-10.070193 -0.443048,-4.440812 -4.973645,-6.881717 -9.625,-8.442686 C 79.391174,59.081146 79.160769,59.086054 79,58.805713 z m -22.875,1.246059 c 0.0075,0.335011 0.05765,0.649312 0.09375,0.966332 -5.274491,1.635862 -8.623216,4.237531 -9.125,7.425496 C 47.05988,68.29939 47.02603,68.159863 47,68.011293 c 0.47767,-4.122841 4.728364,-6.553669 9.125,-7.959521 z m 23.4375,0.05086 c 4.23362,1.315236 7.666627,3.598881 8.84375,7.171198 -1.166139,-3.200254 -4.917896,-4.716925 -8.8125,-6.026858 0.04461,-0.377723 0.0353,-0.755311 -0.03125,-1.14434 z m -0.4375,0.05086 c 0.363948,2.136112 -0.793688,3.40805 -3.03125,5.085956 -5.135628,3.253726 -11.812232,2.965272 -16.78125,-0.05086 -1.403478,-1.37779 -3.010131,-2.615295 -2.90625,-4.399352 1.490699,3.479201 6.880373,4.685298 11.0625,4.882518 4.463056,-0.137525 10.485337,-1.556722 11.65625,-5.518262 z m -7.25,0.127149 c -0.02987,0.342812 -0.007,0.695973 0.21875,1.042621 1.120101,0.330221 1.579698,-0.05374 1.8125,-0.686604 0.724924,-0.01579 1.443477,0.520389 -0.125,1.373208 -0.613986,0.218603 -1.820286,0.279978 -2.625,-0.483165 -0.238755,-0.403995 0.26671,-0.934729 0.25,-1.068051 0.130802,-0.04921 0.315377,-0.109928 0.46875,-0.178009 z M 56.28125,61.47584 c 0.271947,1.57752 0.996468,2.957331 2.78125,4.246774 0.631245,0.356382 1.272542,0.671241 1.9375,0.940902 l -0.625,2.33954 c 3.851234,3.625298 11.384897,3.378327 15.25,-0.07629 L 75.25,66.383787 c 0.02115,-0.06855 0.93688,-0.514124 1.28125,-0.686604 1.66215,-1.305671 2.738644,-2.674644 3.03125,-4.119624 4.088329,1.302151 8.083908,3.442307 8.96875,7.044049 -1.733604,7.214978 -13.251379,8.763002 -20.84375,9.053001 -7.316921,-0.204575 -18.090578,-1.904083 -20.375,-8.468116 0.155043,-3.146352 3.517379,-6.038571 8.96875,-7.730653 z M 44.1875,66.282068 c 0,0 0,0 0,0 z m 11.65625,-1.220629 c -4.33524,1.308225 -3.527218,3.012963 -0.0625,4.60279 l 0.0625,-0.254298 c -3.03832,-1.081252 -2.967211,-2.952132 0,-4.094194 l 0,-0.254298 z m 19.03125,1.424068 0.25,2.314109 c -4.070237,3.128027 -10.899658,3.120421 -14.3125,0.127149 l 0.65625,-2.034382 c 3.031026,1.363498 9.068411,1.640161 13.40625,-0.406876 z m 4.40625,0.991761 -0.3125,0.101719 c 3.698079,2.327191 -2.179446,3.342051 -4.5,3.534739 l 0.125,0.254298 c 3.808142,0.01249 8.757323,-1.910295 4.6875,-3.890756 z M 92.125,68.36731 c 1.330371,3.994211 -1.027345,7.187839 -7.573838,10.990091 C 74.134938,84.86038 61.375611,84.615212 51.0625,79.073247 46.797793,76.662328 42.02896,73.404031 43.625,68.977625 45.626806,77.595831 58.038809,80.474886 67.46875,80.929621 77.204669,80.632787 90.392731,77.419071 92.125,68.36731 z m 0.240936,2.828435 C 90.41207,81.106688 70.934867,83.595244 66.917624,83.527518 63.935169,83.477238 63.019595,83.043442 57.768871,82.045717 l -1.050785,2.901809 c 6.223715,5.155712 16.101693,3.782148 21.813164,0.254298 l -0.625,-3.000714 c 2.375154,-0.682836 4.707489,-1.563505 6.9375,-2.644697 3.833867,-2.606392 7.263824,-4.118796 7.522186,-8.360668 z m -36.897186,1.062321 0,0.203439 c 4.60588,3.436756 10.082482,4.128386 15.8125,2.26325 l 0,-0.305157 c -5.376299,1.82499 -11.440797,0.858385 -15.8125,-2.161532 z m -10.84375,2.822706 0,0 z m 33.15625,7.145772 -0.1875,0.330583 0.5625,2.415829 c -5.631002,3.499566 -16.192942,3.916652 -21.0625,-0.178009 l 0.881474,-2.658513 c 6.527189,1.90005 13.200404,1.967658 19.806026,0.09011 z"
-         id="path3228"
-         sodipodi:nodetypes="cccccsssccccccccccscccccsscccccccccccccsscccccssccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccccsccccccccccccsccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccsccccccccccccccccccc" />
-    </g>
-  </g>
-</svg>
diff --git a/navit/xpm/fuel.svg b/navit/xpm/fuel.svg
deleted file mode 100644
index f653454d6..000000000
--- a/navit/xpm/fuel.svg
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="fuel.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/projets/navit/icons/png/fuel.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3172">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3174" />
-      <stop
-         id="stop3184"
-         offset="0.98979592"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3176" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3179">
-      <stop
-         style="stop-color:#e5a80d;stop-opacity:1;"
-         offset="0"
-         id="stop3181" />
-      <stop
-         style="stop-color:#a11708;stop-opacity:1;"
-         offset="1"
-         id="stop3183" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3171">
-      <stop
-         style="stop-color:#7f7f7f;stop-opacity:1;"
-         offset="0"
-         id="stop3173" />
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="1"
-         id="stop3175" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2394"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3171"
-       id="linearGradient3177"
-       x1="8.4442434"
-       y1="3.2490435"
-       x2="9.3754778"
-       y2="7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(3.1567267e-2,-0.1329269)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3179"
-       id="linearGradient3185"
-       x1="6.9290147"
-       y1="9.9886541"
-       x2="9.8439093"
-       y2="17.43853"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3172"
-       id="radialGradient3180"
-       cx="11.616755"
-       cy="10.509515"
-       fx="11.616755"
-       fy="10.509515"
-       r="10.038391"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#4eadff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="14.505912"
-     inkscape:cy="10.559476"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1022"
-     inkscape:window-height="682"
-     inkscape:window-x="4"
-     inkscape:window-y="60">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.98289591;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2382"
-       width="21.191694"
-       height="21.186056"
-       x="0.38812447"
-       y="0.38821825"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90" />
-    <g
-       id="g3162"
-       transform="matrix(0.4728684,0,0,0.4727426,-10.754663,5.4085291)">
-      <g
-         transform="translate(-16.071429,-0.3571429)"
-         id="g2383">
-        <path
-           style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24.80315018;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M 12.262964,10.421364 C 12.262964,12.774521 10.353156,14.684328 8,14.684328 C 5.6468437,14.684328 3.7370358,12.774521 3.7370358,10.421364 C 3.7370358,8.0682074 6.4933125,5.5576867 7.8294819,1.3156722 C 8.653646,4.7381328 12.262964,8.0682074 12.262964,10.421364 z"
-           id="path3157"
-           sodipodi:nodetypes="csscc" />
-        <path
-           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24.80315018;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M 11,10.267678 C 11,12.167782 9.4578876,13.709894 7.557785,13.709894 C 5.6576821,13.709894 8.9137943,13.304204 8.9137943,11.4041 C 8.9137943,9.503997 8.0458126,9.7496704 9.3772672,7.5239276 C 10.042755,8.5196945 10.810596,8.9989207 11,10.267678 z"
-           id="path2382"
-           sodipodi:nodetypes="csscc" />
-      </g>
-    </g>
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 28.61162,8.2823375 L 33.233596,6.6308363 L 37.896949,14.689771 L 33.062506,18.452094 L 28.61162,8.2823375 z"
-       id="rect2387"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 25.718614,2.538311 L 36,2.4123473 L 39.830319,7.9547562 C 39.830319,7.9547562 41.795878,11.607708 40.913896,14.252949 C 40.031914,16.898189 44.230666,19.885739 44.230666,19.885739"
-       id="path3159"
-       sodipodi:nodetypes="cccsc" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient3185);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2400"
-       width="8.0496521"
-       height="16.951622"
-       x="4.5141191"
-       y="2.5229964" />
-    <rect
-       style="opacity:1;fill:url(#linearGradient3177);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3172"
-       width="5.0507622"
-       height="5.0191951"
-       x="5.9662132"
-       y="4" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 12.690042,8.4633565 C 12.690042,8.4633565 14.457808,7.9209989 14.363106,13.382136 C 14.304244,16.796151 15.641514,18.432909 16.983189,18.464467 C 18.325236,18.496033 19.603273,17.26491 19.63484,15.244605 C 19.666418,13.22356 18.719389,13.539972 18.719389,11.519667 C 18.719389,9.4991155 19.508571,8.4225807 18.119611,5.7112903 C 16.730651,3 15.278557,2.4282946 15.278557,2.4282946 C 15.278557,2.4282946 18.37215,3.9907915 19.445437,5.9006939"
-       id="path3174"
-       sodipodi:nodetypes="cszzzscc" />
-  </g>
-</svg>
diff --git a/navit/xpm/golf.svg b/navit/xpm/golf.svg
deleted file mode 100644
index 45c11b602..000000000
--- a/navit/xpm/golf.svg
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 15.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   x="0px"
-   y="0px"
-   width="22"
-   height="22"
-   viewBox="0 0 22 22"
-   enable-background="new 0 0 500 500"
-   xml:space="preserve"
-   id="svg3541"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="golf.svg"><metadata
-   id="metadata3581"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-   id="defs3579"><inkscape:perspective
-     sodipodi:type="inkscape:persp3d"
-     inkscape:vp_x="0 : 250 : 1"
-     inkscape:vp_y="0 : 1000 : 0"
-     inkscape:vp_z="500 : 250 : 1"
-     inkscape:persp3d-origin="250 : 166.66667 : 1"
-     id="perspective3583" /><linearGradient
-     inkscape:collect="always"
-     xlink:href="#SVGID_1_"
-     id="linearGradient3616"
-     gradientUnits="userSpaceOnUse"
-     x1="272.74319"
-     y1="121.6006"
-     x2="316.9014"
-     y2="121.6006" /><linearGradient
-     inkscape:collect="always"
-     xlink:href="#SVGID_2_"
-     id="linearGradient3618"
-     gradientUnits="userSpaceOnUse"
-     x1="181.84621"
-     y1="343.44531"
-     x2="311.8457"
-     y2="343.44531" /></defs><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1148"
-   inkscape:window-height="830"
-   id="namedview3577"
-   showgrid="false"
-   inkscape:zoom="14.299999"
-   inkscape:cx="17.922622"
-   inkscape:cy="10.682682"
-   inkscape:window-x="97"
-   inkscape:window-y="46"
-   inkscape:window-maximized="0"
-   inkscape:current-layer="svg3541" />
-
-<g
-   id="g3585"
-   transform="matrix(0.04235666,0,0,0.04235666,0.30506917,0.27481899)"><g
-     id="Image_x5F_Ref">
-	
-		<image
-   transform="matrix(0.7567,0,0,0.7567,176.0098,14)"
-   xlink:href="data:image/jpeg;base64,/9j/4AAQSkZJRgABAgEAXwBfAAD/7AARRHVja3kAAQAEAAAAHgAA/+4AIUFkb2JlAGTAAAAAAQMA EAMCAwYAAApXAAAUzAAANp//2wCEABALCwsMCxAMDBAXDw0PFxsUEBAUGx8XFxcXFx8eFxoaGhoX Hh4jJSclIx4vLzMzLy9AQEBAQEBAQEBAQEBAQEABEQ8PERMRFRISFRQRFBEUGhQWFhQaJhoaHBoa JjAjHh4eHiMwKy4nJycuKzU1MDA1NUBAP0BAQEBAQEBAQEBAQP/CABEIAnAAvgMBIgACEQEDEQH/ xADEAAACAwEBAQAAAAAAAAAAAAAAAQQFBgMCBwEBAQEBAQAAAAAAAAAAAAAAAAIDAQQQAAICAQMB BwQCAgICAwAAAAECAwQFABEGEjBAITEyExQQICIVQjNBIyQWQyU0RCYRAAIBAwIEBAIIBQQBBQEA AAECEQASAyExQVEiBGFxMhNAgRCRobHBQlIjIGIzFAUw0eFy8PGCkqIkQxIAAgAFAwQCAgIDAAAA AAAAAAEQMBEhMXGBAiBBUWGRodGCsRLhQmL/2gAMAwEAAhEDEQAAAPoAAJoYAmAAhgAAJkImQsdV bXr6qp46Xfc68Ljtnu3H0kT82IIAaGIGJgIAaDA7z5tranxNNrpW2HGzziHKiSp54odJirr6aCwy YgYmJgCaGIGCOfzr6TgNr46nIbSq9c+kTOJPTyud4Y3V43Wvq4HnyTAAAEwAAAE0Ossg+Xa6qfp1 vOXv3lPtd/PGNi+5u+n0BM8uAIGAAgYgYACBoDG8Z9N6ddL0XLKZ8WXC4xmhz2y2q9GvNkwBADAE NDTQ0MQBRZ3UZPfXXVt1URNhE9N3G/R/nX0q3phhmAAAIAGgYgGAgZX4X6BgdtNrXzvMc5HOT3uS +hfO/olG08cwEMABMABMQ0MQBz+cfSvmm2m08+3POHbwncl9E+c/QqSRPHMABMAEAwAATQMBfP8A 6Dh9LtLCunEaXT3LuN22J39u4GGYAAAmAmAAhiYmIeL2eLuul3QXt3EkQ7PjK7TEbRMxp5QJgAhg hgCYgaAYgxO3ymlRNJn9B26a8o7tzG7fJaDq4AxzTTAEMEDAAAAExBk9bmLrjeZ3S9qmuae3cyd/ TW9dvWLHMaBghiYCAGAAAgeY0+TvvLRUVxVQLapteMndw5Nd0SaxzaaGJgmCaYmAAACHjthhNKuJ nKQ7Auam05zP9eUW62wGOYwAAAQwAAAATQHzjeYfbTXr1yjnCypbPqFUX+Srv0cFjmwAAAEDAAAA AEZatkdvRrbeZHPKYfuTW9WGP2tDXdih45gAAhgACGAJgABn6XbfPdtL7zR7dyDC1OSlPo4lrpWx A8+QAAAAhgAAAAhgqq2O9+d6yo6aXpMfrMtzl5cVlnyQCOAAmAAAAAAAAACAx50563pMzp8rxpbG tsZlgTwBDAAAAAAAATTBNGR89u2lz6K7pTQ2NTbc4mESAACGAAAAAAAIaYZRe+Ot3NNd03OWd1Q3 oMM5AAAAAAAAAABMEwzNdawNdLqrtIPOdb/O6IYGcAAJoYAAAIBoBgAIpKe3ptb01faVk8i6jLar vQDOAAAAAAEMAAABDAKnNabL63roVhFjlRrclrb6AZQIYmgYmAAAAAJiGmFVk9jjtb2vNdInOa/H bG6YGUAmAAAACGAAAhgJog43b4jW9fJ4SY5i91g95fWIyhiYJoYAAAgBgCYJgRMVuMLrewnQZ2fM Nu8Fu9O+xmUJiGAAmAmCYAAmmAg8YLeYTS9hOrLSJwe0xev1ua0Y5sTAAAQxADQ00DAADlhN3hNd NhPhTc4w2ozWi0u1E8swTBDAQA0MEAMAABHPE7jEa3q50GdnOKvM7f63eA8c0LMV29r8X62vSxqV 1V3KzsU2kvCdp5vpPz3tM7wx9vHLk8e4lYjcYvS9RMhzInF2tXN1vTDocs6Cr56P07VNlpZ2c5ew 5X88yvrULjJxdgd7jTUeOsbF3kKu5bQcK+u6qkhSec1kquscM8XJ4ettdX8z1WWTc7GN3zlrs55Q X2dubrqHWJ4qQHM9vnPJ6Bc/fPvYvCxfXOSE8yPiRC20jSafZ9XcSZwxh9eHfjPWUGy0sUwiI/OZ FPPTv5OPnp4d99I/MnKHIc7CfOZyvuqPXSo+jfN/pPedgWMR33jd7C9cndyec3pEV/ubz72P7OZJ I/TiS4jck+OXQ890ucqMtI57aQvpHzX6A5OQYwDRBjTedVyc+OePSDv1rziw5w5TnMkeyL07cDri Y60uxsrKZznzu+9ZvSvo3qFK8+fsBzzXWlT2rD1xbkhxES+S985zO47HfLL32xzLvtdIOs698cxo meGL3lXdZjV5fnpe36Z+yyifTWCO/rz6mR+IPVgUFJdazNVz0059rfRTyuuGZZg1zjR5PYmVlHrl VfPee0g63W8+nPpxJEjva/jf2c8xtjs+kzSWvV5yCfOCAAYCZ//aAAgBAgABBQD7wN9CE6EajXTH r207CEfk7bFm1/lPT98J2Mvn5tpfL7wdtMAUGt9bgL2A2KDQ0/Yx+gee2pD+XYReQ8NHzfbr7CE+ P8j5yDx7CL1H1MNSersI/W/qbT+XYReuT1Seb77dhH6n9Tac/h2EfrfxdtMfw7CEbuTu7b6I/wBf YQj6ODuvjF2A8IyRsBvpD4dhGeoPuoUs2vxXsQdi35CP1fz7EeiP1fz7EHZE/sPr7H/xL/Yf7OxH 9Y9bevsV/rX1t/Z2MfoB/Jv7Oxj9J9Tf2djEfA+b+vsYvJvN/V2MWm838+xi03m/l2MfkfNh+OlU sRANe2mvbQ6MI17OjGw+kR0fNh+ABJ3Cq0pOmO2uvQfXuaEuj0NrpVQ3m3oiXwduo76fXh9njrdt HR/rb8UGjptttx9fHWx+o/rl+nhrw23Gtzr8tbHW2vD6AEJL9R5bnX5a214a8PoqdIL/AJetPoNe OtteH0VWOtlTTNv9EfpLKGJUjQ3B0ATpYmOhGq6aUaJJ+xXI0JVOgV1ug0ZVGjM2iSft/9oACAED AAEFAOwEZ10jXSuuhewTzJ20W8BobbffGfFvPzOgOxOxHhvrfYdgPTtr/Ddinp/z/hvPsE8tb6b1 dhHrfxOm8+wj8/NiNN2Keo+babsU82J0xO7divmdHTeXYL5nzOj5dgnq8yd9H09gg+jbjQ9PYAfi fLQJ7FTuDuNA9WvAdiDto/kF8Dv+XYj0rvv/AJ7H+I9X8ux/gvqPq7H+A9RH5diPSPUfX2K+n+RP 59inkfM+rsU03qb1dih03qbz7FNHzYdlHpvNvLsU0fNgdtAE69vXQuii66Br2zoqR9E8z5n0jXpB ffTEDXXrqGgw0G1sG0AF0fM+lBpjudNrw14fXx1udHR9B8FGj5tttuPpvrx1sx1tt9P4P9PDWw28 NbnX562bW2vDXhoA9Dj6jy31+WttbDXhrfSprr1t1L9Br8tba8NeGgpOtgumO/0VttEAnp0NwfoE J0qAaZwNE7/YrbaDqdEDR6RrrXXuaJJ+3//aAAgBAQABBQDuBIAlzWJhWzyyF9PyGJZBy+0pTl+T jkTmtvpTmNow9vlMpWxtfJZY2dPJacR46eWr7Ep0mKlEcNGexI9DIRhZ8q7dsSAM9ar28rSq/KnE EUyxYGg2op8ZAtPJYKdrLNWr25ElomSn8jtpSBFP/uXFRSSXJIpa+mhymfhhxdXHpG1m7OUWU2tj XVICvbWVZ68vSUwEaTZYvdMvH41WDJouSvdbzH21fTSzM6dPX222+uSUIsfexfVNdrNXqnEe5Vns GT96qe0JiTBbyK0sdG3h2+fxJytBDdxdnD5FcrF+wsCezAYOQv8AKea8LFmLO2eopHB0dw5BU/5H HlYzXHeo9hJpc90SBFRI0lf3spVqSmHuHJm2sYdjWzWfmKVpyv7mSO3PJbd4a9OKSRK9ZY+K9w5P WTVCUvkcpH763HMlCSGWWxaUTQY2JWriCIcV7hykOtOpIP2tP3pY0kc8bklX9ZIXWvTjV5vbX4Xc OShP18MErZChE1evX6VxqTLPTeT2okMgzH5+z3DOxGXEvA0dqy7TSiBhkqSxjEsXm1B+Gb/j3DJD qoWTIJabIIuroy9KFWw5VI4XkK5Df8e4WU669ouusa0llZIy2XxyqKl0ys1yZhf9w/H7g+5S6kqL idlpZIiG9RREam0qLZiJt9Q/Xdx5AhivYidnXORq1WGXdKgDLXiRsj7k/wCp7jysKuQ40vxsdcXa nNaiSVUjId3N/wD+p3HmyoL+EEdqtkumOjR9yKSuR8mdAmcDxmp3HnXUL3GTHI8wlGLYrNLXWSNb phXKCeE47uPMUm+Zx2ImvKxWrjoHe0URVnrqMoIovg9x5k5deLMogmVRjcW0v7LxllyLt+7XIBsN 3HltaKCrxJWSmG6IK7FMkArS5raLMqB/1/uPNV3h46D8OXY0/aMdxW+OeQRpFkUeE8c7jzX+nj1d 5oMg0TUlaSXI9QZ+SV2gmRSeOdx5xsBxhPj47IK0WLkjR82hZzy1GKosf6LuPNpN7PHa7NTzcqtU kWX/ALDWTfXLVYFD/wDne48unD5PFBYMPkSwSoqSZyezGuuTTu1ZHQcZ7gx2GQle7fpmOpCki2cn jY1aZqosa5WqLjxNCnHu4ZWf2KKSCO/XQTNT/FKt2CjXoZeLIRcmiWXFmVnx3cOUZENPho5Z7Rkl r0ocnjsbVxl3CWLFf48meycPy68dawIe4clq2IJMPN/wmlgZamDxla1KuPDLdxaTVkQQfBjGc7hy ajYsxYK9XqQX7ViKjUxuemhjwDyRYbH1K2RbIRtIb5N3uE0Mc8WWq2cZkbN2wkGEeR8TrkN1aV2t HlLcicTviv3HO0DZgyEXt0qWTjgwFaaSaPkMKrc4vGqYjufN4EXWNSc4kzSG1ywJ83j3V+p7nzf3 TJjJS1aOqRkeXda28CiJjO581jLSqbMXH6kiyz8ullW7gEZMV3Pm6N7lQM3HOP2pLNTl4AvYJ3bG 9z5t4Dh8aHE8afehzJ5Bb46yih3Pmm4bh79TcfYmHmgHyeMlPidz5pvtwxGWbAu71uZlg/FOj4fc +ZqWh4fIDkcGwEnNhHtxYIkXc+Xhfj8Ul6MlhY+m1zVFalxd2kXufKw/wOKLOchj4Y0t8wQPj+IF gnc+XIDi+NRrHk6jObfL9/gcSdmHc+Tr1YfBMYLuNU9fLlQ4nh7Mp7nyUKcNiIYY7ePGw5KhfE8R K905MCcJj4I5J8YAK2cjaTFcQcCXuedZkxGNEzyYZ94cu/RjeJ9KT9zzilsRQ6FTFN/syIU0eM+E /c8mIjj6w9iPFrsLqddTjySPd7nlEaTHUa7GviXLGYkRYNx+x6h09yyEZko0mdaeFPVBMC0WKaQZ Hw9nuUx2hqhGr4Yl6remkHfL7j9f3KwN4MeCYOP7Co3lEUXObP8Aq+5WSFr1y3tYdR7B8pJmizfU f0/crBAggjUyYuIRRavBYc8rA4fuVn/48AVpcUQ0Gs7C0eci9o4nuUoJijUCfDFGoHyzUYjyMMv/ AKz7LGWx1bUPLsTKZOZ/n/2vITGHlGWj1X5NdcNyiOOKHkWKljXJ0GIIP2uCVRJPl4l1eifLkTGS 5Akf6z6SSRxJyjLQyRB60KsHn0VxoLGZpSlho0yGxXIyELcimdo4yy3LUCVeR5GBavKcdOYp4Z1+ iRub2JZTSPlyLr+dBNIcfpiFGdzst63VqXbbQQNFNVoxKxcyzSHJ6kTNwortPJNjMXIXw+GJTj9G RpuO5SFpsbma6C4Rqrckh1Q5FdMcXJKLJBOxbFnehrkYjNuCt/6rXJ8utSuqzWrOMxHuHGYuria7 sqJVVPlbjXgde2mjWUNJUrTJLhaEwOBrhhjb8As0L+9nC1mUY3Yxy26YpYyO5UwL2Wx+uRJH8yJl GFt2UqV8jbe3ZxOOeUVK61K00HvuZeqGn+FkpHss9VA9yvHoW1ZWsShw05G0+iHJCba6F01SswsY SpOK/H4qNjH15q8OuTVk+fBN1YfmV2IQ1Yvcnw1N69ScSOEJOnUMk3+ktjq8jx1YE10KPowJCMSv 1Mka6NuLTWOg/Jh6gQRrk6dNyqU/R8on9/KcXo2Xv6n+QGql2rnyt2oa8dTJVvjvkUGvm2GUT2tS T2PcPztkjtF3qzGQ0GfXwoOoQxhiitoRRjQAA1ykye5WjQYmaNrF/jtBEi1YRwtZ9tEbiREiq48x PH9ZYktyqAqtYgUm9UAkydSOMZSsxfJy9UUmVnf47llUKNci3CQbmhVDtNSqw0630mV4RBbSVbbI AuUp1wcnMyz5C+RPWydh/wBfZLNiYXb9XV3+FV2+HU26VB00iKDZrjTXYFXXJZlhrxQ296kEby1Y zHX+tiksps1HGUrV7YRIrDIkUaaeSOMG5VGhlKTE5mDrORlaT3rbFhd9z4kjBKFdVWrXVFjRBLLH DHlslPnJ0hJSo7q0Miyp9mSCiX5MNR2my0rnH35QuLHUmJorGKdUKFUaZ1UNbrqr5Osoa5K2mfJM kS2ul3SKPLZO5n7VVE9liBRlSeKxhpJZMd9mTVzTCouRknijD5WjGxyROjav9RXNyaGOtui4dTIl CqmlgiU63G9y7VpRZbM389Nj8fPPPi8VWxdfWYiq1LXD5po16v8Ab9ZI1ljgRpjJUglMUEMQ2H0J A09utGWuxAGecqXuspgncZLM47FvIbWYmoYuzYgxtaGCt9OQY2F5ast2G5BbiyNaKVZV+rmOC4ch ASbFhgRkmX4c8mjTrMyQQpoAAEhRNlacQy3ILFwxVEikqYaay9apHCv1vVxYrXoL5s4282Mnhnhv JDOkv1vUIBfSONR9hZVFzL1Kmshnrc5lnll1RqO0mLwPxyqKv3ZfFixDBFJG7zS17FTPV7g929C0 d2F2vL1RxN1R6kkjiSbN0o9WuTQx6uZy3YMpncxVbLS4/jVyU0qFShF9rKS30yODp3RcqzxNNTW4 qtMmlyDTtHl6qj9laSA5O+zlLLK6xKqJDJqthcpZ1S4xRiWtUrVE7No43Nnj+Pn1JxeQalwMTa/S RIUxszagwWUnki4YZDW4zh6+o4YYR2f/2gAIAQICBj8A66Iu6HkwjG9ZDfgXyUbdfB+b3OUhryVz bA36rDl7tIqJ9z9WaSthbr5hxX/Sk/Jo0bnCS0ND1OO0ljoNnCTsbmpx2ko3KnF+lJRubHFyUbi0 OMlG4tDi5KK+xL0hepL5DKofpuSqXLjycuPqT/R6ipS4+NclK35Wk1E9TY/aUjY/aUn7PB+0z9lL QtVK5C2FqpXIWqFqpXKC1UrkocdVKe0OO0p7DOO0p7DONvEpjFBJF2zHyzCO5ZmK6QYxFEWsWVhW MI77My97l6P6Lq432+UPURV/7fwU7QT6sxpX1HBjrYrwvDBY79LTy+wn0WULuGIf25NI9VPed4uG Y2VCtb+fxG5VZ+i9o2PBVspx/wAFX0eS6O+w60LfgsqfZd9P/9oACAEDAgY/AJNpjr8FxyKQeNxD X3JTNiprK1hxl09ikuDr5FJceLk7RVpKNIKVvBSVFSUITKyUVgpLY33lqkO9xqTSFHsUrd2lIwV9 ykbG8paw3mUmKUxClOCfuU4LWU4KUxilOC1lOCtKcFtG7PzDuWZiLFCxgsi6qdzPydmYg4VjmQtC nRgxDH0dzMVC8MFkdy7+zMLdVlC7MmDBVtQ8vpyoYPBV3caMrx6r0LdN7l8wvSFkZ6f/2gAIAQEB Bj8A+Ak6AUWfu8UAxowbWJ/LNT25bHigNeV6z4BDS5Pe7vIym60tbiJPOGk+UUy3MbtjCwmkaSCT 86kkZcY/UAJHmFq5cMmZIdrgF8LMaVkythXRQUhGtvuAILX8jy+AOXMeo+jGN2NM3c9w+Qnbt06c JUnkePnrQCgIo0VdBI5Gn7osiLi/qBiZ12iox9TRIGtx5QNaV2zYsbFboYEwZi1rbj9lPhXILsYB ZUQ2Ak6AwNKOQugB0MuFY6x6TE603aMWOTEtqLA0uInXlB/15OwrNnLN7WNVxhlAg2t9u9ZMeNXY FSZkLGvqa6eFL2/ai9Af3e41ChhqAOflQzZO6XLhR4Zixx2nQtq1DKk90+K72FxKzljG4MQxilx4 sbnus72kZUtYOeDkcLqHZooYupLljJvETaTxHCi2dMtpWw42sKqVHrBLqPtpWUt6GD5Q0n8sMeA/ 13JEgKZHyr3UEI6khYhIm6AdBpXtWhMbD9yADavgXn8Kw9jgFy9wC7MuPGFheLAbzzkmrf28Hb42 tCyQQAWUkDWdBxo953br+0qkEFlC2AzJLdU+IpP8xnjF2iT/AGuIEopB1D5Tu2o5Url3UAF3dXlL fCRx+VPixD237tSmI2gqARvAOn103ahmuH7ZP5pLhfT/AK+VUNrFSAeRjzFBcwK+3dFutxniZ2rG rhDiIZnJUZICjjcpA8696LM3cOceP3AvRgjcBXJrMwAH7hTQzIUk3T43Vi/xpY+1ijLnVSv5dQGE 3a+VXIHCpKDAVBy6bGVIgf8AZqCZYONdcziFvfYLFxI/GnfADj7rOluPA+S0Y8S6XjGZU/KnT3Df db7sD1e4Ndufh8v9eDRgKMWVr1QSpIO+sW6GseNF6iSBaQGIIjqhkuFT764e0wThVNLSxPDlrWfs 88lmc5ceQraGU8BoP+KyJgvXLkQLetrSq6/mm0a8KWMfWekFm/cUahnLSdKf+2Y+1g0N5JuP/d2j 66zZO5yR3OWfZ9oAsQdjKgrHjWV5/cgP7mkzerT+n4BsCMqZh1Y3YTBGsfOr1FufETGmh56HehjK 2p2pGTMTJlvUIJA4zXbZcgBHc5vaxKEOicSSQpG3jXvI5VMmIl1JJUz6tB5CrFIHc5QA1jSuPFO8 OnGnxYMuP2u3ALOSrFmHO2AK7ftmLBkBZlRwUg/mgDj4U5BI6YIM2nUaDjPwL5JGLK2SILEAg7aE jfwFdx/jyGS4B3UOPbI2651PhFdkQWz5cudVAKz08dYG0VjTKpGK02ldmWLofQjcUxfHHcZjYL4J s5XLsIoouScWJf3HlixJEb8aZsk5FDBbmkHQwAbl4eNd7qQVKANA9s/uIv3Hn8CzBwQGtOLp1kDe 7z3FZcWP91GRVe0f07reczHE1/cHH7va4XAy4pCF/J+rjG1djmChb06SRJgqRFw00nnTy3tsCRiB m0rpqQG1rIMRQZEQ23m5i/MdZ0FZbW9sGW61lDbrq6n8K7rOLQ2YIxeZxm1l1C8Pgc2VzB6Sgcki 4/ptIjasSvkKuwVIt9u+YjUTWTtAQMeDDe21xI2Fx+2v8d36ks2Jk9XTPMkCOVB8iY2CCfcG4HKC fwruO5Rj+1jYYsfrUEg6kETTnJtbYLmOhJnpFHGBksOGT1dczPq5fh8CcisqroGkSx4VgOJWuXGC bhxUXSDJrM7/ANTKCZMAhQOnnWQdy1z4spDBYMAtI9IHOsYGPI/v41Le2YcFgNd1+ym7fC+ZyUJy EBZSBsSf96VFfS4C+62ADrPOvbnp9uJ+W/wJJhWkBWPOdtjvWEXTs+5mOMc6Y53Nrem7S1dgNhX+ Sw6nHjzM6XDdWM/hWN8Id0VRjCLoOkRTDIgx5ngOw1Fo2bSJpMTQXbOAGxwIltCtbm+3fjMfA9yo gEIWBbaRrXZyYRxICkzo22nOk7TGyKigHMG1hSNI1Ff5XAW/bfAGxLwURH31hAyBWN0gnQ9Wu9ZF ykWwZYTaVjQaag1gOMtYcgMqtxmdhOtfL5/A9wN5xtp8q7Us6riBtY66GZ6o1+qkdwrPkEuVm0xM Dr1isyG0+5hYhp6ht0xXtZSAwyQAfALoBTqcZLOP2lViwM8uNdssshuRpmNjB/mJ86meEz8DkT9S kfZWFgbbDEEADfSBry1oZsrB2W0s8aMDsBTzavv4XCTFx0GwrIrZPaf3iyayfSsisfbdrjlVF7tI Fs8RMaxWLITcMRU/uAxvPjAr3YE2XROkxO/wLAbwYpsumQ48jXqfSOqNeGtY0TCMRZb3VdrjtqYr ssoMF3GJj4N41kYwQMjBJ16prPnzY1TNlJTGZm6AZYSNqVmYZQLWYFoMcZYj8Kv/AC+zO/C3n8F3 GILK+7JY8nAO81hws10mdGDT0/gKxOzlfayoZGp1MH767rHHS2SFYGPnII11pzPTiQqIIbqb/wA5 VhXMjZBKrqQokbFtKutHuWxE6RNu/l8FlKrbkKgtJHUvlWRyFXJlAYrtJ2HlWPI+hL3ZJJbWIrM5 xuAWtB0220NwiaXD2+VsSYRJ3csSNizE0jNjubI/QEUT6tJFbH0baXbbcp+C7cmZfG0wDICkcduN Y8UxqFFpKnfUk86OHGspjgfOdBT4WUlVgAnUCROoPnWPFdfJGgEnQbtpWR2DBMWRmb2mAPqncxRb qtHiLpnnt8F2cek48kmdtVigWUqO1UuGHpLnQCsmTISXLh+oa7gxFSuU4zksJygXDQQwj5UrKGnK QqLIIUDdvqruVTIwcuxSdYYnUHcUz+8TjCQcvECIn4JMuXH0EFMb8hpQUZB7mQwoDG6BvMGsmMCR iQlgRIOmgmijOTYAdBsJJ1ps7amLcXODWTEqm8ZWFslJHOd6OPSw49pPLnv8FiONjalwyDhwNOw1 LNarbkEjQgcKbtw/7r4zLRJ14keFZMebIGyOiqFi0FVM9QA/GkVNUVoA1AAG/CsxYgsTGOFn6xxp +5B6Ux+2RAm/RZjbj8EiC7I2bKXDO0lNPSvhWfKzlQNQpAiOc8abNozZVFix1BQPtrEcuREx5ccB ierpMW6+dRjuV3FobXpXn86ZkDE6LKnQCI6jzpiEUaQw1gm4CZ/8HwXakRIdgJ39Jp1YBcd/WBBM TtEzrWXMNDYQkToAI20rtpQMjY7iY1EHhvS5GJJylceNSZgHwmlZVBVpOVrt/k2nGsnWfYWBfdwv XjP2fL4LtTOzkx8qCrk9Th3CkGF8eFdxjU640JaOGm1dvhuGNFx3tuGt6qL23CLMVpPzmseJpclm htCDOsHasuAovTiECBGv4/j8F2jBZaWAM7CKPfZjZ1FRpoNtTTdUu5BZhJkk8KxNjX989spdiSIB mle2CuirxmNyKVjBONgSA1pgiNKyJD+37I4mfUDvF3wXa44EKrNPHXSsCmURZdkIBlW21rQFh7uN TbwNwrKisCq4F14gDhprS5mM9ICAGdKvVlJVlMNoRodqd/fBAwTfIgG5WstifD4K2+5VS0LGxJ1E 12+LH/UyhSo4iTE7Vg7eSxLL1mNwRXcZsbhi3STEMAI3200r+4lrMJtAGlzNpGtKrKWYsGLAghN4 GlPaRcUlmmTN48dNvgSeQonISoOS0FtwJPgKw4ELOSoXGhjaPUfOhbquFSfmN/trNmRIzM5x36mF mTypEMjBj1OgAcjUNx40hTpFw1A3jaaPblTdlWQJ06XE/Kfgcrg2sRCnxNYCVGW4yA0njw8dKLML HcEKRuq/hXee0hPthlvOpJHAUmTMxXJmZiMfHYCZpsfaqVz4oGRMgiKYSekqABxM0vb2gNhu1nUh 2Uf8/Ajs0IIxiWGoNzaR9VXnGSuPpV46VWPGs3cOQGZSMc6AcJ+dYsefJOTMSzKvUZ4kgbCiqqWd SWVsgkKZY/Ksmbti5vQ+6T6AYjT6qPb4yJALYzcASw2bWsqtPvkhVT811wG3wPvPreWCtM+o1g7S QhdixI1mN9fIVORQ2J+jGjalo4xypu9K39zk/M5kKDwUGshyZEBBJAUWkecViTscbr3LzcV01PEh t6GbKfeaTaSNeVX+6TjLXbaDjHlPwJf3IwqBao4NOs13GHPccpIXFAk2/mE1/fY8RBw/0kkXWnpm PnSd1kzgXIrojm4iRPDjrU9xlZXZRKpw02B3o5Wj+6h7VdibVnkaZg1uDFpjt2Y8QTyNDLcbhLRO kXen4FsOQSjiCKOJSVXITY38p03r2GBy9u02kNFrQIhuMcq7Vspuf2xJ5xp9F+J78jAqV0hQdNxr xplwY3zKTDBRCAnWsmZnQ9wUATDrANwJ6vL4L3caDI+OTbGp8jSOxCoXAOIgglvzVg7w49LQqY03 YzaB86V3xNhLLLI26nkazqFXHfaXY6kwdCpO3jWMrqWJJb9R5/CdtmURLFckeI0Nf45sSKMS5ZKw dULcuJrHjUNoD7hA6Prq4L1i0nc1guFumi6aD5fCYAPRBJ12I4/bX+MxIjopzAgkliQGDNMaAGsn cFyVKgBOAJoGOh4E3cfKsITaBJmZMCfhO1YKD6pmky4kIOPMLip3UkAwazuhlOnTx51H5BEaTuKw KwIMAwfED4TtitwLggMNhFZseVXfL2zSrORaJ16beApjlsLo1pbH6TWJwSbIJRgbZPiPurFfqQIn 5D4Tt9+oNIHhEVlhrr3a5GAkGBT4iCGxZXVpEcZrCgaUMEoDBJoYR6sYF2s7jefl8J25lRIIF3ME HTlXcKYXIVu0M6bEgcpruQSz252HuPu2g/Gu0JAgzLHbTnTBEKAWggmddfs+E7eVUrDySNZ02ruH ZVAstBkXTN0RWa9ixGdwATNo00rCC49ttSkbFfzUCp3UaaczvHwmDYqskg/IU6ooQOrXED1EbDwi u8wky6ZZI8GmPurtbmsZiyg8PnTDZmAI5MNJI+EwkmDJAPDbjT4RALqSwHpMDdeNf5BrrrsogcgL v96xEkAhxGkk+VY3cyfbtU6bAx+HwiFNw2vlBoNkjKthIcaFOGvOu9yIAHdlvA8LoNLKhoYanSNd 6RYIWGERA33n4QMQCFyLM8jppWNmZ19wGxFBKn/sa7oGLAVtAEcDOvGhrEsBESSZ0pQVJK3Bn3Hg By+Ezb9JVpHCCKwfuEh2UCGuBEztXcuSTdkiDwgmmZwxCsCLRMHnXtnQSxH8wjf4TuC0QADqSBof 5awZnKl1caqwQCRH5onyrKZuDOSGmZ1rKJIGkwJkT4Uovlld4mPTG3P4Tuiq3FUuAIn0mdq7fJ3A UKpu6ZFx34f7UQBqGMkEGTvuK7lUMNYYJj8acEY5DAHIvqYkeJ+74TumXhjM+XHak9jIxg3FBo8D fUzWZCSTjykSTJiBXcMQSAhkAxWRAAglCqaA8tWOvwndgccTfdWJ8pBYZFhYJ1P/AF0NdxikNYVM xB6gd/qrOGBIsMgb7Uc+RDYWRRkHMN+aJj4TuRmBbEcbXhYkiOEwKEEFVYH2mcL06bMONZWtChiI hrvwFZkBgsjCflTqWYERseIbUwAeXwncokXNjYCdpimvCjPetnUDEGNp1iu4U/lYa8JO8CnI1IUx 9VZH1xtDXsphRDfy1dOkTPwefGsS2NgJ22p+4DYlKuAApIeJ1tiKd5JubYiI8NacDcqY+qnw2qVN 1zFQBpvrwrfS3fwj4NzEwp056VkchhiLK3SdUIOmgoufUzax5Cj5Vl6iATkJ1PUCY5GvVp7UXf8A tj4PINuk6/Ks6lhjgReBG2/VOnyorc7NIYl99R50ayDBqGdo2iSLmqLOuybI8Z5/B5SRICmR8qzt 28BVMkgekz5mi03XBdZBO3PjRo3WXs3tmVEfNaJtMgRGv6t/L4PJMRadwSNuQrMrkFcchAml2pI9 M1ERcFY6zqRr9BYHRnknL0geIpxcekxdI/UDM8tfg8nDpOsT9ld2LoyWMVIFuoMarP3UraXlEmAR sI4/QM+RIBIK26yOZFZ0AaFcEjjJZT9/wbAbkHwrvLy6rLAqVuBBM6sdawuhBuRZijRtyq0GXuUy uvjv513GS9TJQzGg6o8v4SM2dQV3A6iPO2YpxGVAgm5kgNrHTrUY+3ASDqzi6RMaRV2OxNR0gXdP maYZsIzPsq+nXTeOQovk7ZbJgWk7edDLl7bIq/mIMhdfKhkGa0EA9QI34UgGdJf061of4SAYJG4r uWyC2Lg0TLdUag1itFsKBERtp+FGkiFD6lgZ2020rucciIQFo1gN+n/n6S+RgiLuzEAD5msfa9n3 DLlDhmbGxCssHpMb0LVdu4kTJME0r5f20ggC03Ry4UpTDkYyI1JuAHVMHzNI/bdtYkOFUDVpEN6p kCDVx7VlUKACD1GBM/VTglgCBC8o57UDdIH5dPxoJnxY9It0KyflRyAbndX0nhVmDLlU2gSfHgDQ bMwzpxEdZiguQPhaATcJA+Yq/C4deamfp78JcqSWGSNDLDh51jCraAokRBnifoxQkZw0qNLWjYgT Xc4pb3lxK1+k6sum/wBBZjAGpJ5UD2+Rsfb4erEu1xiC3juaf2cZYxc77BE11Ph00RY75cUlnAaQ ZiBA8DS9z3Xb5coDGQ6khmMjWRtWLHg7OLM7suNVCz09SknzpT2vbqGRbAjWiJml9zskcuQosgxO 44RTY8/aBCYawiZEyszV+TsjjINs4x6m8tN69eXCpNqhp9XDTWox9+cIaPbXIVhiPVyot2uZM6L/ AFYMFeNLkftm0GjY+rQ84qzKsGNZFrVGDOUA1111FC4rlK6dW7eOkGaHvThc7g6x9Vd0+BhlW4lW B11MnTWsPA26/WfoZSoDggSSAIbxk13Df25Ue2E1OjC5DIP27/Qe1xN+88FwNxjOn10ExErH5o9I 5mKydv27Zl7bIAufKOk5J6WBmNBB2oYkNxJ1yNFzEmfxpnb0KCSfAViKu2O5jkJgQxIkwBz4/Rzr 0jTwosusiLD6aKsgIP2eVIMmIX4wbXXpOp8KDqzK/FgYYjlNAdt3RKaymTXeeNKubDi7ufU7LEGR BFM2Ts2xZF1yNhbU/LY1HbZWmLpYWsANqP8Ad4kzY9iMiybf+3Ku5y/4/L/b5VNwx66je0+FY17g C5JW4fmjj9GR3DQsCA3QZ5qeXhWZjsVEGD+tKfPk1VOA3JJgD6zTZX1dzLAgg3eRrH2qYfbOTTu8 gc3gDbp/L5VjwKSwQRJ3PHhSOchCKD0jiTsTPKsi4BcUBU3ErqPEisAzKQFOmRmEnpiNdDXVGms0 VXIgCkggMNDOv20bm202O9XLjcj/AK0YxxjA0JmSfIDSjKBTAtMz/tUSu+8cKMNA0gVqSSaOkzvR D4wwO8iaKvJxto6EyCBynamz9jkbH7gtfGxuW3kJ14UyZiGYuzAjkfo9wvYSAWUndR4V3A1GPGiy 0aG5lHp3pO0LWk9Ub67DY6R40CzK+hdisxprAHM7Ur54OfKAWIW2FHoT5TRUGwXKLgdxPCKJBldg KZSJBBBHOlKh1wvkKkKs2vaRtw2oZDPpgCdIMn8aaMYFxJPHeth9BAMHga13Gh+X8HUwEaGTzo2S 8GCFHGluUgNAnUkE8wBTKTDJqRxjnFAjY6j6FYZRj9xBcDqSBPA+dd6lw9voUZNZ9aa0eu5EEAhd AZ2HjTghUwoVfMLRcGQ/thTut2vmPozQq5FsD4VOn7i62k8tKxlwA5UXhdruMeFGkc5GDrkPq4XE dLUiuQrqOpAQSBMLtzqFRjMQSColiBGo3otj7d4gEBhB1PjWuDTmCNdOVKSEx/pR21bSW25Uxxqs tqpBgeZ05UrOyqPzwJJ8NeFZHTOyjIpFp1APAjlS+5ncwCGjS7SBNXsCxIjUk1cBqdfCoIn/AIow o6t9N6gbD6MAxqphWJMXGJGkcq7toEtYxy/l0ZTtFOqg5GJYsVIMAC5ibGYQvnR71cjM2cBck3ks cZKjXIFMfLyMfRfigMDLkiTAHDbWggH7ZBbGyghYmQPqNEV3KhAn7obMMnUjG0HQz0jSjCBXQ7bk SOBImNf4EZlXJixEkK0GWIiYKmgo0A0A2AFQ2RAeRYTRPuqY3A1P1ChkuJUxBAjfQatAq1LmYGCq iSPlNMuLtcrRIBdMiSfP22EV1InbY4mSL2PhqVj5rRZ8znXRQQoH1CoE666kn7/oxFXbGROqyAfB isGPnXdGcfTZ0Wcbxpddt86LYnxKQzLbktxq52CqefIiIpMGFAiLraCW6jqxuOpk8fpfPhFxALHE B1OQNAP/AEpbx7eQ74zqVPIxXd4dQuQLlDIqMDA19RImRpIr3HyOwOIOQw6rF9TkCPnFMMPaZWeC UuV0RgObFND4fbSjte262ZVGPKRdB1ZmCMbQBRPuLjxgyqk7aD9I1+uj/wDptSQQFDT47OBXuZMj NlOhfpBP/wBeFA9WkH1ETHlUHEpHiJ386UHDjIUysqDBiJHyqYE8+P0SzADxrXKugu3G3Oi0kwQI AMmeX0YnadXgREajxIP1VmYuypaGGMyLh7inQHfnAMVc49xgRbhZSbpO/SGAjlueE1jQksQokkQS fI/wF8be1lO7qN42mCJ3rGEx4nVsbBWZIZLRv/Ny8OVLhQolhbH7xCG3coQtq63Rp+NRmyi4qAxx i2G4lZmgQouAi6NfHWpdgoJABJA1Owon3VMbwZjWNYohX1AkAgrPldE06LjyGxQ11otYHXTWgmHD e2hILAEA8do+2ksxi0mGbeOfGiVa5CNBoLT5EA/bQGTKxIMyNOHjNQ0uSIJJO3KAYihjXGAg1A+c 1CKFA2gAU2XKwTGgLMx2AFT2qx2eGVDuCFE/nY7eQ3rJiEDEuMBsloEyV1CRqJ/3p8AzthLMmQ48 Szly2G7pYgRaJ/MKDqZQ6q3MRv8Aw9nkZygGYLAAk3A6Xbjbh867hiubM3u3K79QvYRagOqgDwir 8OP20USEdl6jG3p2+dD3e5KtMsUZh4xoVq58zM0RcIDf/KKOPLjGeQATlAc6a8dt6C+0pUGQCJg/ OpAA4acqJJiNTQcuLW0BGuvlvQKywOnIz5Gj7OIkRoWkaxQC48avxJYx9UGozOpYgdSLEHjoSaL5 GAVBLM0DQcTQ7LsFY9mjiTAW6NLmLsNBwFD/AB/ZYG/bM9yS09Y0uYLdxH6TSZAq/wBsVKswPTdd HV0/q/l3oBQLzqsi0xq3rJ4jjWJspLMR6mMsw57D5fwuyZPabGVcPw0OsiROlSNBmVWLAkBmA0A0 g84mpdwsEA/OrcmUIdfVpt560BjwOztNqHQ+HyPOgB2wNx1Fx6dOLRBpuvFiBEpA1n9JPV91D3+8 y3wR0GBqI/KF+6g+XLeFAVemGgcLiTRtxgXST86uVACNvoAnU7Uc3c5FxqNrjBY8lHE1/b9vjOPt kMhJ35O7QI+uv7DtAeo//p7oLHTyDchXsYJYky+RtWY+P0WLiz3l2GZWhcWRASFtHqnSdorL2OTH YgAfGwYsk/mAnY8Y+yrTOo05fwNjcSrgqR4GsSuzwAyHYekxruNaDOssBAbYgeBFEY1ABNx4yeev 06mKh8qg8pk/UKlVdxxIUgfW0CrkwNtsxC/dNG3GisCACSSDz/TQ9zORzGMBPvuNArf3fdgtEu8K fnIo9537W4x//W2Qo/QooG58H+Mi5HEDPmIMBQqn76T2MXsKQJUgXkj9caT9KkxjbOSAVRNTGglz vd99Y82DEy9wrjRcSMUUQHtuH6GjfjvxoZ+0cq6E9Ji4NqLXGoqQRcNHWZKnkf4HOUKLct65Ga2E dZbXXjOnGlXHOUuYFgkDzqcPbnjHuEJt9derFjJA0Ekg8dT/ALUpzZmkeoIzKDrp6baudA5G1/VH lNCxAsCBA4VAEDwoljAGpJpjeGIEqqkS4/l11r+3wsUBLKcaC4NwFzCZ+Ve53je5lY248bdUudpE N9VDN3SKUWBj7cBgo5XAp0/KgbVuGgjZQNgs/wADJaC69WMkAw41BF1O2LPjXKxKumK5JtBkMiaX E/8AkUe9R/2XKr3fbKtzGLuqdz4GaXuezcq2749AxgxDjXiCKIGjro6zNp5T9K9y65cgIDFQVOMN jO5GRxuDyqUULOugA/hljA8aZS1+RIlQRpcYEkmpfKMeEGDhxabz6mNxbTlFNjxqWU6skFcdp47z rSr2GI5+5u/qb40McXiBTZu9KZs7GQLZVByBajaAJ1MfxHL2yKO4Vgx36wLtIG56pHjRyHE3Z9yC FfDao9xFOpVmuiY4fbQbscZwdx7imAS37R62mLdA2nlQXukOHO5KLkxgyYAMxqYJ041ChO5xLAMM VyAjU6dWsHb7aVDKuxKhTqdBPCY240CoBZSYJJgSOQ1PlSNN1wBuHGRv9ByZGCIupY6AVGMtmeQL VEb+LQKYe5jTa1RORiOOqSAaBxX2CblfaOHRx+ug2fKExtHRYFJ8hp9ppVw4pO8qhZ99Nl4+FH+9 jDgP5Af3TyJIJXeva7XGMakyxA1Zv1MeJ/iVgxAWSRzkR9LZFRMXdaW5wssIN32mre6jFlJhe7xB sVxkY5awDfTmPupv7Z2fNB9wAAIzSQbWEXDxoLlwNbjN7HESCJ6L5TT06Dwo+7jOTDNq9uCuNyCS ZDi1tqZcXaMj3Bf2sp9R06ugfKN6JwkpcOkl20HTItkTvR9vLlxrwQOx+0Nx4TV2bou1N7y3P80d Nfvd2OrW1JIu8PSBQPa9q2dxvkaY15r1A0r2uE/OrRiWf5Ok/dV3dKO4yni35f5RzqztsS4lO9o3 8z/qAuoYqZUkAwfClKL7Lr+bHoToQJ8ppincnOG09vMBaOG4BO2lAnsMiNFh9j3ROhloIgHX507v 23fsTpjRJtUCfU3t3E/Kgi/4vO4WP6jOEnadUTzOtf0h2qgeoFgSdjvzpW73uy5B6lRdxw6mM0f2 feJ45uv7NqjFjXGOSgL93+p//9k="
-   id="cliparts_6_xA0_Image_2_"
-   height="624"
-   width="190"
-   overflow="visible"
-   style="overflow:visible">
-	</image>
-</g><g
-     id="Art">
-	<g
-   id="Outlines">
-		<path
-   id="path3547"
-   d="m 268,24.461 c 0,0 27.691,-18.461 56.923,-4.615 5.385,14.615 -1.066,29.23 -5.148,36.154 -4.082,13.846 -4.852,14.615 -4.852,32.308 0,17.693 -0.297,98.462 4.852,106.923 5.149,8.461 3.312,20.769 0,22.308 -3.312,1.539 -8.697,3.846 -8.697,3.846 0,0 -1.836,37.692 8.697,215.384 -17.159,18.462 -70.236,66.154 -123.313,43.077 -23.846,-10.77 -20.452,-33.847 -20.452,-55.385 0,-21.538 18.145,-37.693 23.529,-40.77 5.384,-3.077 32.861,-6.153 48.354,-1.538 15.493,4.615 43.954,13.077 43.954,13.077 0,0 -0.769,-139.231 -3.076,-165.385 -6.924,-6.923 -16.154,-20 -15.385,-27.692 4.615,-13.846 6.922,-11.539 8.461,-31.539 1.539,-20 -3.847,-97.692 -6.155,-110.769 C 271.077,53.691 260.308,42.923 268,24.461 z"
-   style="fill:#050606" />
-	</g>
-	<g
-   id="Color">
-		<linearGradient
-   y2="121.6006"
-   x2="316.9014"
-   y1="121.6006"
-   x1="272.74319"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_1_">
-			<stop
-   id="stop3551"
-   style="stop-color:#2B2B2B"
-   offset="0.2184" />
-			<stop
-   id="stop3553"
-   style="stop-color:#222222"
-   offset="0.5415" />
-			<stop
-   id="stop3555"
-   style="stop-color:#0D0D0D"
-   offset="1" />
-		</linearGradient>
-		<path
-   id="path3557"
-   d="m 314.154,25.999 c 0,0 -24.616,-6.154 -39.231,3.846 -3.846,7.692 -3.076,19.23 6.154,25.384 0.769,10.77 14.615,123.077 -0.77,149.231 1.538,6.154 2.308,11.538 7.692,14.615 0,-7.692 0,-7.692 0,-7.692 l 21.538,-7.692 v 10.769 c 0,0 12.309,4.616 4.616,-18.461 -2.309,-12.308 -6.924,-115.384 -4.616,-138.461 3.077,-6.923 7.146,-11.539 7.146,-11.539 0,0 1.318,-14.615 -2.529,-20 z"
-   style="fill:url(#linearGradient3616)" />
-		<linearGradient
-   y2="343.44531"
-   x2="311.8457"
-   y1="343.44531"
-   x1="181.84621"
-   gradientUnits="userSpaceOnUse"
-   id="SVGID_2_">
-			<stop
-   id="stop3560"
-   style="stop-color:#7D7D7D"
-   offset="0" />
-			<stop
-   id="stop3562"
-   style="stop-color:#A6A6A6"
-   offset="0.977" />
-		</linearGradient>
-		<path
-   id="path3564"
-   d="m 311.846,431.383 c 0,0 -33.076,47.693 -87.692,45.385 -27.692,1.538 -42.308,-20 -42.308,-36.154 0,-16.154 7.693,-48.461 29.231,-52.308 21.538,-3.847 66.688,6.923 87.692,19.23 0,-22.308 -7.103,-194.87 -7.103,-194.87 0,0 8.129,-3.667 13,-2.333 0.668,8.334 7.18,221.05 7.18,221.05 z"
-   style="fill:url(#linearGradient3618)" />
-	</g>
-	<g
-   id="Iron_x5F_Lines">
-		
-			<line
-   id="line3567"
-   y2="466.62601"
-   x2="217.688"
-   y1="396.87399"
-   x1="212.312"
-   stroke-miterlimit="10"
-   style="fill:#726658;stroke:#414042;stroke-width:8;stroke-miterlimit:10" />
-		<line
-   id="line3569"
-   y2="412.228"
-   x2="286"
-   y1="407.29901"
-   x1="215.15601"
-   stroke-miterlimit="10"
-   style="fill:none;stroke:#414042;stroke-width:4;stroke-miterlimit:10" />
-		
-			<line
-   id="line3571"
-   y2="421.13699"
-   x2="286.21301"
-   y1="425.80301"
-   x1="215.57201"
-   stroke-miterlimit="10"
-   style="fill:none;stroke:#414042;stroke-width:4;stroke-miterlimit:10" />
-		<line
-   id="line3573"
-   y2="428.5"
-   x2="286.21301"
-   y1="443"
-   x1="217.688"
-   stroke-miterlimit="10"
-   style="fill:none;stroke:#414042;stroke-width:4;stroke-miterlimit:10" />
-		<line
-   id="line3575"
-   y2="435.75"
-   x2="289.5"
-   y1="458"
-   x1="217.688"
-   stroke-miterlimit="10"
-   style="fill:none;stroke:#414042;stroke-width:4;stroke-miterlimit:10" />
-	</g>
-</g></g>
-</svg>
\ No newline at end of file
diff --git a/navit/xpm/heliport.svg b/navit/xpm/heliport.svg
deleted file mode 100644
index 57b2cd5cf..000000000
--- a/navit/xpm/heliport.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   width="16"
-   height="16"
-   id="svg2">
-  <defs
-     id="defs6" />
-  <image
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABmJLR0T///////8JWPfcAAAACXBI WXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAACcUlEQVRIx92UO4viYBSG328N 3gov4A20kwFtrMR0GrWxF+YvBPwJIohgYz1YaGclpDKksxICwUoLtROEqY2F1yLI2SIr36AIszsD C/M2pzjJOc93bsAf0Z3wRM1ms9lsPvf/rZiiKIqiEK1Wq9Vq9fzDyWQymUwASZIkSQJarVar1WLs qwACALy82AFfX3nAdrvdbreJ5vP5fD4HQqFQKBQCwuFwOBwGRFEURZEoEolEIhFgv9/v93tgt9vt djvAsizLsniiQCAQCASA6XQ6nU55HlYoFApvb0S5XC73/s4TBIPBYDAIHI/H4/H4oWSMMcaAVCqV SqUATdM0TQMqlUqlUgE6nU6n03kE8Pv9fr8fGI/H4/H4A0C32+2qKpFhGIaiAKZpmqYJlEqlUqnE ge51mxRd13VdB2az2exwAGKxWOxwADwej8fjAUaj0Wg0et4qViwWi8UiUT6fz+fzQL/f7/f7wPl8 Pp/PgNvtdrvdz3t489st4S1wOBwOh4P7VVVVVfURhPV6vV6vx3ttGIZhGMB6vV6v1xzkmdLpdDqd BgaDwWAw4P8LgiAIAnA6nU6nE3C9Xq/XK1Cv1+v1Ogf5JcuyLMuMeb1er9cL3CoxHA6HwyFQLpfL 5TIQj8fj8fgjwOVyuVwuwGKxWCwWwGaz2Ww23LpcLpfLBSyXy+VyCWy32+12+w9rXKvVarUaUTab zWaztwBEdqmJfD6fz+cjsh/CrT39RNFoNBqNEjUajUaj8YU7Uq1Wq9UqB/isdTqdTqeTKJPJZDKZ bzhkiUQikUh8HsBe2++7oP9P9zPwWWtvBVEymUwmkz+hEj9GvwGnbmf5oo+qSAAAACV0RVh0ZGF0 ZTpjcmVhdGUAMjAxMC0wNi0xMlQwMToyOTo1OCswMjowME9KefoAAAAldEVYdGRhdGU6bW9kaWZ5 ADIwMTAtMDYtMTJUMDE6Mjk6NTgrMDI6MDA+F8FGAAAAAElFTkSuQmCC "
-     x="0"
-     y="0"
-     width="16"
-     height="16"
-     id="image12" />
-</svg>
diff --git a/navit/xpm/hospital.svg b/navit/xpm/hospital.svg
deleted file mode 100644
index 9d549d79c..000000000
--- a/navit/xpm/hospital.svg
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="rb_hospital.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/navit/icons/png/hospital.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f4ca00"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="18.168031"
-     inkscape:cy="13.483879"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="73"
-     inkscape:window-y="59">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.98289609000000000;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2382"
-       width="21.088533"
-       height="21.088533"
-       x="0.49144801"
-       y="0.49144825" />
-    <g
-       id="g2457"
-       transform="translate(-0.5810398,4.4649541e-3)">
-      <rect
-         y="3"
-         x="9.6569328"
-         height="16.0625"
-         width="3.9196427"
-         id="rect3195"
-         style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         transform="matrix(0,1,-1,0,0,0)"
-         y="-19.648005"
-         x="9.0714283"
-         height="16.0625"
-         width="3.9196427"
-         id="rect2455"
-         style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
-  </g>
-</svg>
diff --git a/navit/xpm/hotel.svg b/navit/xpm/hotel.svg
deleted file mode 100644
index 25877b278..000000000
--- a/navit/xpm/hotel.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="hotel.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/projets/navit/icons/png/shopping.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3160">
-      <stop
-         style="stop-color:#208420;stop-opacity:1;"
-         offset="0"
-         id="stop3162" />
-      <stop
-         style="stop-color:#15d715;stop-opacity:1;"
-         offset="1"
-         id="stop3164" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2390"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2421"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#22a638"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="-14.86463"
-     inkscape:cy="7.8421296"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="167"
-     inkscape:window-y="48"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#0000ff;stroke-width:2.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2427"
-       width="19.553555"
-       height="19.553551"
-       x="1.3392956"
-       y="1.3750099" />
-    <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.61975801;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3199"
-       width="0.076670602"
-       height="8.3802423"
-       x="4.9233294"
-       y="6.5598783" />
-    <rect
-       y="9.7529821"
-       x="16.978817"
-       height="5.1190357"
-       width="0.11903559"
-       id="rect3201"
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.57739305;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.65998864;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3203"
-       width="11.304297"
-       height="0.036439985"
-       x="5.3835654"
-       y="13" />
-    <rect
-       y="11.298698"
-       x="6.5394058"
-       height="0.046188168"
-       width="8.814045"
-       id="rect3205"
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#3b3b3b;stroke-width:1.65024042;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#3b3b3b;stroke-width:1.36752617;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3207"
-       width="0.078902118"
-       height="3.5431881"
-       x="6.3980484"
-       y="7.9430561" />
-    <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#3b3b3b;stroke-width:1.73047805;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3209"
-       width="0.41237912"
-       height="1.0373791"
-       x="7.3830962"
-       y="9.7402391" />
-  </g>
-</svg>
diff --git a/navit/xpm/level_crossing.xpm b/navit/xpm/level_crossing.xpm
deleted file mode 100644
index e01a48568..000000000
--- a/navit/xpm/level_crossing.xpm
+++ /dev/null
@@ -1,46 +0,0 @@
-/* XPM */
-static char *dummy[]={
-"16 16 27 1",
-". c None",
-"a c #cb0000",
-"# c #cc0000",
-"w c #cf1818",
-"b c #d01a1a",
-"y c #d85151",
-"d c #db5656",
-"x c #df7676",
-"c c #e07b7b",
-"s c #e19090",
-"e c #e49898",
-"v c #ecb8b8",
-"j c #ecbcbc",
-"p c #f0f0f0",
-"r c #f4f4f4",
-"o c #f5f5f5",
-"q c #f6f6f6",
-"l c #f7f7f7",
-"h c #f8f8f8",
-"k c #f9f9f9",
-"t c #faefef",
-"u c #fbfbfb",
-"f c #fcf3f3",
-"g c #fcfcfc",
-"m c #fdfdfd",
-"n c #fefefe",
-"i c #ffffff",
-"....#......#....",
-"...a#.....###...",
-"...a##...###....",
-"....#bc..d##....",
-"....efg.hij.....",
-".....kilmno.....",
-"......niig......",
-"......gin.......",
-"......gin.......",
-".....pniih......",
-".....kiqgir.....",
-"....stu.hnv.....",
-"....#wx..ya#....",
-"...###...###....",
-"...##.....a##...",
-"....a......#...."};
diff --git a/navit/xpm/library.svg b/navit/xpm/library.svg
deleted file mode 100644
index 5b57157ea..000000000
--- a/navit/xpm/library.svg
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   id="svg2"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="library.svg"
-   sodipodi:version="0.32"
-   version="1.0"
-   width="22">
-  <metadata
-     id="metadata2975">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10.0"
-     guidetolerance="10.0"
-     id="base"
-     inkscape:current-layer="svg2"
-     inkscape:cx="43.327665"
-     inkscape:cy="17.078967"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="725"
-     inkscape:window-width="1024"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:zoom="7.3734169"
-     objecttolerance="10.0"
-     pagecolor="#ffffff"
-     showgrid="false"
-     fit-margin-top="1"
-     units="cm"
-     fit-margin-left="1"
-     fit-margin-right="1"
-     fit-margin-bottom="1"
-     inkscape:window-maximized="0" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective2441"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2466"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3333"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3401"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3464"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <g
-     id="g1327"
-     transform="matrix(0.0419522,0,0,0.0419522,-1.4918457,-1.0845417)">
-    <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-       id="path1329"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-       inkscape:connector-curvature="0" />
-  </g>
-  <path
-     d="M 1.609737,5.6231247 11.195878,16.509079 20.375826,11.228578 11.033405,0.42386294 1.609737,5.6231247 z"
-     id="path3470"
-     style="fill:#734a08;fill-opacity:1;fill-rule:evenodd;stroke:#734a08;stroke-width:0.41952193;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 1.0946498,6.8276692 10.51831,17.551148 10.55894,21.61307 1.0540336,10.869283 1.0946536,6.8276692 z"
-     id="path3474"
-     style="fill:#734a08;fill-opacity:1;fill-rule:evenodd;stroke:#734a08;stroke-width:0.41952193;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 20.302711,12.639577 -8.652616,5.070052 -0.006,0.133631 8.645354,-5.066422 0.01331,-0.137261 z"
-     id="path3476"
-     sodipodi:nodetypes="ccccc"
-     style="opacity:0.75;fill:#734a08;fill-opacity:1;fill-rule:evenodd;stroke:#734a08;stroke-width:0.6912604;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 20.302711,14.317664 -8.652616,5.070052 -0.006,0.133632 8.645354,-5.066423 0.01331,-0.137261 z"
-     id="path3505"
-     sodipodi:nodetypes="ccccc"
-     style="opacity:0.75;fill:#734a08;fill-opacity:1;fill-rule:evenodd;stroke:#734a08;stroke-width:0.6912604;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 20.302711,15.995752 -8.652616,5.070052 -0.006,0.133631 8.645354,-5.066422 0.01331,-0.137261 z"
-     id="path3507"
-     sodipodi:nodetypes="ccccc"
-     style="opacity:0.75;fill:#734a08;fill-opacity:1;fill-rule:evenodd;stroke:#734a08;stroke-width:0.6912604;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/navit/xpm/library.xpm b/navit/xpm/library.xpm
deleted file mode 100644
index db70334ff..000000000
--- a/navit/xpm/library.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char *library[] = {
-/* columns rows colors chars-per-pixel */
-"8 16 12 1",
-"  c black",
-". c #404040",
-"X c #464646",
-"o c #808080",
-"O c #8F8F8F",
-"+ c #BCBCBC",
-"@ c #BFBFBF",
-"# c #DCDCDC",
-"$ c #FBFBFB",
-"% c #FCFCFC",
-"& c #FFFFFF",
-"* c None",
-/* pixels */
-"***   * ",
-"** X&X  ",
-"* @&&.o ",
-" @&@ @& ",
-" .. &@@ ",
-" && @.& ",
-" && &o@ ",
-" && O@@ ",
-" && @.@ ",
-" && #&& ",
-" && &&& ",
-" && &&. ",
-" && &X *",
-" && X **",
-" &&  ***",
-".   ****"
-};
diff --git a/navit/xpm/memorial.svg b/navit/xpm/memorial.svg
deleted file mode 100644
index a464643c8..000000000
--- a/navit/xpm/memorial.svg
+++ /dev/null
@@ -1,417 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   id="svg2"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="memorial.svg"
-   sodipodi:version="0.32"
-   version="1.0"
-   width="22">
-  <metadata
-     id="metadata2975">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10.0"
-     guidetolerance="10.0"
-     id="base"
-     inkscape:current-layer="svg2"
-     inkscape:cx="66.34964"
-     inkscape:cy="5.9279101"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="725"
-     inkscape:window-maximized="0"
-     inkscape:window-width="1024"
-     inkscape:window-x="11"
-     inkscape:window-y="13"
-     inkscape:zoom="5.2137931"
-     objecttolerance="10.0"
-     pagecolor="#ffffff"
-     showgrid="false" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective2441"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3452"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       inkscape:vp_x="0 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="60 : 30 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <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
-         d="M94,176l-21,39"
-         fill="none"
-         id="path4462"
-         stroke="#000000"
-         stroke-width="20" />
-      <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
-         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
-         id="path4466"
-         ill="none"
-         stroke="#000000"
-         stroke-width="20" />
-    </symbol>
-    <inkscape:perspective
-       id="perspective4471"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4668"
-       inkscape:persp3d-origin="6 : 4 : 1"
-       inkscape:vp_x="0 : 6 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="12 : 6 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4904"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <marker
-       id="Arrow2Lend"
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible;">
-      <path
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         id="path4137"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <marker
-       id="Arrow1Mend"
-       inkscape:stockid="Arrow1Mend"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible;">
-      <path
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path4125"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.4) rotate(180) translate(10,0)" />
-    </marker>
-    <marker
-       id="TriangleOutL"
-       inkscape:stockid="TriangleOutL"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path4214"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8)" />
-    </marker>
-    <marker
-       id="Arrow1Lend"
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible;">
-      <path
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path4119"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.8) rotate(180) translate(12.5,0)" />
-    </marker>
-    <marker
-       id="Tail"
-       inkscape:stockid="Tail"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <g
-         id="g4152"
-         transform="scale(-1.2)">
-        <path
-           d="M -3.8048674,-3.9585227 L 0.54352094,0"
-           id="path4154"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-        <path
-           d="M -1.2866832,-3.9585227 L 3.0617053,0"
-           id="path4156"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-        <path
-           d="M 1.3053582,-3.9585227 L 5.6537466,0"
-           id="path4158"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-        <path
-           d="M -3.8048674,4.1775838 L 0.54352094,0.21974226"
-           id="path4160"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-        <path
-           d="M -1.2866832,4.1775838 L 3.0617053,0.21974226"
-           id="path4162"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-        <path
-           d="M 1.3053582,4.1775838 L 5.6537466,0.21974226"
-           id="path4164"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;marker-start:none;marker-end:none;stroke-linecap:round" />
-      </g>
-    </marker>
-    <marker
-       id="Arrow1Sstart"
-       inkscape:stockid="Arrow1Sstart"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path4128"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.2) translate(6,0)" />
-    </marker>
-    <marker
-       id="Arrow1Send"
-       inkscape:stockid="Arrow1Send"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible;">
-      <path
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path4131"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
-         transform="scale(0.2) rotate(180) translate(6,0)" />
-    </marker>
-    <marker
-       id="SemiCircleOut"
-       inkscape:stockid="SemiCircleOut"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M -2.5,-0.80913858 C -2.5,1.9508614 -4.7400000,4.1908614 -7.5,4.1908614 L -7.5,-5.8091386 C -4.7400000,-5.8091386 -2.5,-3.5691386 -2.5,-0.80913858 z "
-         id="path4235"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;marker-end:none"
-         transform="scale(0.6) translate(7.125493,0.763446)" />
-    </marker>
-    <marker
-       id="Arrow2Send"
-       inkscape:stockid="Arrow2Send"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible;">
-      <path
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         id="path4149"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         transform="scale(0.3) rotate(180) translate(-2.3,0)" />
-    </marker>
-    <marker
-       id="TriangleOutS"
-       inkscape:stockid="TriangleOutS"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 5.77,0.0 L -2.88,5.0 L -2.88,-5.0 L 5.77,0.0 z "
-         id="path4220"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.2)" />
-    </marker>
-    <marker
-       id="CurveIn"
-       inkscape:stockid="CurveIn"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 4.6254930,-5.0456926 C 1.8654930,-5.0456926 -0.37450702,-2.8056926 -0.37450702,-0.045692580 C -0.37450702,2.7143074 1.8654930,4.9543074 4.6254930,4.9543074"
-         id="path4238"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;marker-end:none;fill:none"
-         transform="scale(0.6)" />
-    </marker>
-    <marker
-       id="InfiniteLineStart"
-       inkscape:stockid="InfiniteLineStart"
-       orient="auto"
-       refX="0"
-       refY="0"
-       style="overflow:visible">
-      <g
-         id="g4298"
-         transform="translate(-13,0)">
-        <circle
-           cx="3"
-           cy="0"
-           d="M 3.8,0 C 3.8,0.44182781 3.4418278,0.80000001 3,0.80000001 2.5581722,0.80000001 2.2,0.44182781 2.2,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.4418278,0 0.8,0.3581722 0.8,0.80000001 z"
-           id="circle4300"
-           r="0.8" />
-        <circle
-           cx="6.5"
-           cy="0"
-           d="M 7.3,0 C 7.3,0.44182781 6.9418278,0.80000001 6.5,0.80000001 6.0581722,0.80000001 5.7,0.44182781 5.7,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.4418278,0 0.8,0.3581722 0.8,0.80000001 z"
-           id="circle4302"
-           r="0.8" />
-        <circle
-           cx="10"
-           cy="0"
-           d="M 10.8,0 C 10.8,0.44182781 10.441828,0.80000001 10,0.80000001 9.5581722,0.80000001 9.2,0.44182781 9.2,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.441828,0 0.8,0.3581722 0.8,0.80000001 z"
-           id="circle4304"
-           r="0.8" />
-      </g>
-    </marker>
-    <marker
-       id="StopS"
-       inkscape:stockid="StopS"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 0.0,5.65 L 0.0,-5.65"
-         id="path4229"
-         style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
-         transform="scale(0.2)" />
-    </marker>
-    <marker
-       id="Arrow2Sstart"
-       inkscape:stockid="Arrow2Sstart"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         id="path4146"
-         style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round"
-         transform="scale(0.3) translate(-2.3,0)" />
-    </marker>
-    <marker
-       id="DiamondS"
-       inkscape:stockid="DiamondS"
-       orient="auto"
-       refX="0.0"
-       refY="0.0"
-       style="overflow:visible">
-      <path
-         d="M 0,-7.0710768 L -7.0710894,0 L 0,7.0710589 L 7.0710462,0 L 0,-7.0710768 z "
-         id="path4202"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.2)" />
-    </marker>
-    <marker
-       id="RazorWire"
-       inkscape:stockid="RazorWire"
-       orient="auto"
-       refX="0"
-       refY="0">
-       style=&quot;overflow:visible&quot;&gt;
-      <path
-   d="M 0.022727273,-0.74009011 L 0.022727273,0.69740989 L -7.7585227,3.0099099 L 10.678977,3.0099099 L 3.4914773,0.69740989 L 3.4914773,-0.74009011 L 10.741477,-2.8963401 L -7.7272727,-2.8963401 L 0.022727273,-0.74009011 z "
-   id="path4286"
-   style="fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.1pt"
-   transform="scale(0.8,0.8)" />
-</marker>
-    <inkscape:perspective
-       id="perspective5233"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5412"
-       inkscape:persp3d-origin="250 : 166.66667 : 1"
-       inkscape:vp_x="0 : 250 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="500 : 250 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5571"
-       inkscape:persp3d-origin="202.85715 : 136.19048 : 1"
-       inkscape:vp_x="0 : 204.28572 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="405.71429 : 204.28572 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6552"
-       inkscape:persp3d-origin="64 : 42.666667 : 1"
-       inkscape:vp_x="0 : 64 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="128 : 64 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <g
-     id="g1327"
-     transform="matrix(0.04107611,0,0,0.04107611,-1.1507936,-0.95856852)">
-    <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-       id="path1329"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-       inkscape:connector-curvature="0" />
-  </g>
-  <path
-     d="m 5.3982783,0.30195449 c -0.6296125,0 -1.1642509,0.5359219 -1.1642509,1.16553461 l 0,15.2803119 c 0.0024,0.05934 13.4585196,0.03227 13.4562766,0 l 0,-15.2803119 c 0,-0.62961271 -0.535923,-1.16553461 -1.165535,-1.16553461 l -11.1264907,0 z M 7.6934056,1.395606 c 0.047219,1.5e-6 0.087824,0.017493 0.1206611,0.052629 0.032837,0.035139 0.048777,0.08198 0.048777,0.141199 0,0.059222 -0.015939,0.1054933 -0.048777,0.1399156 -0.032837,0.034423 -0.073445,0.05263 -0.1206611,0.052629 -0.047248,1.3e-6 -0.086558,-0.018205 -0.1193774,-0.052629 -0.032816,-0.034422 -0.05006,-0.080694 -0.05006,-0.1399156 0,-0.059219 0.017244,-0.1060603 0.05006,-0.141199 0.032823,-0.035136 0.072127,-0.052627 0.1193774,-0.052629 z m 2.6904854,0.00257 c 0.04721,1.5e-6 0.08654,0.017493 0.119377,0.052629 0.03284,0.035139 0.05006,0.08198 0.05006,0.1411992 0,0.059222 -0.01722,0.1067769 -0.05006,0.1411991 -0.03284,0.034423 -0.07216,0.051346 -0.119377,0.051346 -0.04725,1.3e-6 -0.08784,-0.016921 -0.120661,-0.051346 -0.02289,-0.02401 -0.03672,-0.055062 -0.04364,-0.091138 -0.0033,0.012095 -0.0072,0.024235 -0.01284,0.038509 -0.01383,0.035117 -0.03204,0.070629 -0.05391,0.1078248 -0.01842,-0.012398 -0.04179,-0.025436 -0.0706,-0.038509 -0.02881,-0.01307 -0.06043,-0.019253 -0.09499,-0.019255 -0.02995,1.3e-6 -0.05501,0.00966 -0.07573,0.02824 -0.02073,0.018578 -0.03209,0.047317 -0.03209,0.087287 l 0,0.050062 0.2567246,0 0,0.3080708 -0.2567246,0 0,0.6893085 -0.342729,0 0,-0.9871102 c 0,-0.017904 -5.67e-4,-0.04278 0,-0.07445 5.62e-4,-0.031669 0.0028,-0.057725 0.0051,-0.077018 0.01498,-0.1115475 0.05417,-0.1956082 0.118094,-0.2541584 0.06393,-0.058547 0.152945,-0.088569 0.266995,-0.08857 0.02306,1.4e-6 0.04725,0.00169 0.07317,0.00514 0.02591,0.00345 0.05155,0.00851 0.07573,0.015403 0.04148,0.012401 0.07659,0.031683 0.106541,0.05648 0.01734,0.014354 0.02864,0.032432 0.03594,0.053912 0.0068,-0.03693 0.0217,-0.067552 0.04493,-0.092421 0.03282,-0.035136 0.07341,-0.052627 0.120661,-0.052629 z m -0.165589,0.14505 c -0.0028,0.015251 -0.0038,0.03147 -0.0038,0.048778 0,0.017914 0.0022,0.034417 0.0051,0.050062 0.0048,-0.017661 0.0077,-0.033962 0.0077,-0.04621 0,-0.01972 -0.0037,-0.036997 -0.009,-0.052629 z M 8.4160888,1.4071586 c 0.023065,1.5e-6 0.048538,0.00169 0.07445,0.00514 0.025906,0.00345 0.050262,0.00851 0.074451,0.015403 0.041485,0.0124 0.07787,0.0304 0.1078248,0.055196 0.029952,0.024799 0.044925,0.061004 0.044925,0.1078248 -7e-7,0.020638 -0.00671,0.048321 -0.020541,0.083436 -0.013833,0.035117 -0.032044,0.071912 -0.053912,0.1091084 -0.01842,-0.012399 -0.041788,-0.025436 -0.070601,-0.038509 -0.028813,-0.01307 -0.060432,-0.019253 -0.094988,-0.019255 -0.029953,1.3e-6 -0.056292,0.00838 -0.077018,0.026957 -0.020728,0.018578 -0.030804,0.0486 -0.030804,0.08857 l 0,0.048778 0.2554417,0 0,0.3080708 -0.2554417,0 0,0.6905921 -0.3440127,0 0,-0.9883939 c 0,-0.017904 7.147e-4,-0.041496 0.0013,-0.073167 5.626e-4,-0.031669 0.00151,-0.057725 0.00382,-0.077018 0.01498,-0.1115474 0.054157,-0.1968921 0.1180943,-0.2554419 0.06393,-0.058547 0.1529447,-0.087285 0.2669944,-0.087287 z m 0.4377176,0.01412 c 0.02767,1.5e-6 0.05496,0.00278 0.08087,0.00899 0.02591,0.0062 0.04845,0.01753 0.06803,0.033374 0.01958,0.015847 0.0354,0.037222 0.04749,0.065465 0.0121,0.028245 0.01797,0.065062 0.01797,0.1091084 l 0,1.2387014 c -0.04722,0.017905 -0.08892,0.026956 -0.125796,0.026956 -0.05298,0 -0.093854,-0.00795 -0.1232277,-0.023105 -0.029376,-0.015151 -0.05107,-0.034248 -0.065466,-0.059047 -0.014396,-0.024798 -0.022791,-0.05364 -0.025676,-0.086003 -0.00288,-0.032363 -0.00512,-0.066881 -0.00512,-0.1026903 l 0,-1.1976252 c 0.013819,-0.00138 0.028669,-0.00369 0.043641,-0.00642 0.012657,-0.00277 0.026801,-0.00503 0.042358,-0.00642 0.015557,-0.00138 0.029953,-0.00128 0.044925,-0.00128 z m -2.2540518,0.026957 c 0.027666,1.4e-6 0.053674,0.00278 0.079585,0.00899 0.025914,0.0062 0.048452,0.01753 0.068033,0.033374 0.019581,0.015847 0.036682,0.037221 0.048777,0.065465 0.012095,0.028245 0.017973,0.065062 0.017973,0.1091084 l 0,0.6649194 c 0.00577,-0.030262 0.01428,-0.060243 0.02696,-0.089854 0.012672,-0.029611 0.029195,-0.058328 0.048777,-0.087287 l 0.093705,-0.1424827 c 0.021868,-0.033036 0.045372,-0.061898 0.071885,-0.086003 0.026505,-0.024104 0.06305,-0.035941 0.1091086,-0.035942 0.026505,6e-7 0.052952,0.00389 0.078301,0.012836 0.025344,0.00895 0.047168,0.018512 0.06675,0.029523 0.021868,0.0124 0.042033,0.027188 0.061614,0.04236 L 7.135035,2.3698805 7.4148658,2.879481 c -0.076045,0.037155 -0.1458796,0.05648 -0.2092314,0.05648 -0.054142,0 -0.095966,-0.012531 -0.1270793,-0.035942 -0.031114,-0.023411 -0.059126,-0.052699 -0.082152,-0.089854 L 6.8860035,2.6253219 c -0.019581,-0.031649 -0.034676,-0.061019 -0.046209,-0.08857 -0.011532,-0.02755 -0.019906,-0.057997 -0.025676,-0.092421 l 0,0.4685243 -0.3465795,0 0,-1.4505 c 0.013819,-0.00138 0.028669,-0.00369 0.043641,-0.00642 0.012657,-0.00277 0.026801,-0.00374 0.042358,-0.00514 0.015557,-0.00138 0.031236,-0.00257 0.046209,-0.00257 z m -0.5147349,0.017971 c 0.027666,1.4e-6 0.053674,0.00407 0.079584,0.010269 0.025914,0.0062 0.049736,0.016246 0.069317,0.032091 0.019581,0.015847 0.035398,0.038505 0.047493,0.066749 0.012095,0.028245 0.017973,0.063779 0.017973,0.1078248 l 0,1.239985 c -0.047219,0.017905 -0.0902,0.026956 -0.1270794,0.026956 -0.052981,0 -0.093855,-0.00795 -0.1232281,-0.023105 -0.029374,-0.015151 -0.051069,-0.034248 -0.065465,-0.059047 -0.014396,-0.024798 -0.02279,-0.05364 -0.025673,-0.086003 -0.00288,-0.032363 -0.00385,-0.066881 -0.00385,-0.1026903 l 0,-1.1976253 c 0.013816,-0.00138 0.027383,-0.00369 0.04236,-0.00642 0.012656,-0.00277 0.026803,-0.00503 0.04236,-0.00642 0.015557,-0.00138 0.031233,-0.00257 0.046211,-0.00257 z m 6.6684483,0.00257 c 0.02307,1.5e-6 0.04726,0.00169 0.07317,0.00514 0.02591,0.00345 0.05155,0.00851 0.07573,0.015403 0.04148,0.0124 0.07659,0.031683 0.106542,0.05648 0.02247,0.0186 0.03674,0.04218 0.04236,0.073167 l 0,-0.1168102 c 0.01382,-0.00138 0.02867,-0.00369 0.04364,-0.00642 0.01266,-0.00277 0.0268,-0.00503 0.04236,-0.00642 0.01556,-0.00138 0.03124,-0.00257 0.04621,-0.00257 0.02767,1.5e-6 0.05367,0.00278 0.07959,0.00899 0.02591,0.0062 0.04845,0.01753 0.06803,0.033374 0.01958,0.015847 0.0354,0.038506 0.04749,0.066749 0.0121,0.028245 0.01797,0.063779 0.01797,0.1078249 l 0,1.239985 c -0.04722,0.017905 -0.08892,0.026956 -0.125796,0.026956 -0.05298,0 -0.09385,-0.00795 -0.123229,-0.023105 -0.02937,-0.015151 -0.05107,-0.035532 -0.06546,-0.060331 -0.0144,-0.024798 -0.02279,-0.052356 -0.02568,-0.084719 -0.0029,-0.032363 -0.0051,-0.066881 -0.0051,-0.1026903 l 0,-1.0243354 c -0.003,0.017055 -0.0087,0.036744 -0.01797,0.060331 -0.01383,0.035117 -0.03204,0.071913 -0.05391,0.1091084 -0.01842,-0.012398 -0.04179,-0.025436 -0.0706,-0.038509 -0.02881,-0.01307 -0.06043,-0.019253 -0.09499,-0.019255 -0.02995,1.3e-6 -0.05501,0.00966 -0.07573,0.02824 -0.02073,0.018578 -0.03081,0.047317 -0.03081,0.087287 l 0,0.050062 0.255442,0 0,0.3067872 -0.255442,0 0,0.690592 -0.344013,0 0,-0.9871102 c 0,-0.017904 -5.67e-4,-0.04278 0,-0.07445 5.63e-4,-0.031669 0.0028,-0.057725 0.0051,-0.077018 0.01498,-0.1115475 0.05416,-0.1968921 0.118094,-0.255442 0.06393,-0.058547 0.152945,-0.087285 0.266994,-0.087287 z m 0.297802,0.2066642 c 0.0015,-0.00834 0.0026,-0.01633 0.0026,-0.023105 0,-0.011705 -6.93e-4,-0.023045 -0.0026,-0.033374 l 0,0.05648 z m 1.906188,-0.2053806 c 0.02306,1.5e-6 0.04725,0.00169 0.07317,0.00514 0.02591,0.00345 0.05155,0.00851 0.07573,0.015403 0.04149,0.0124 0.07659,0.031683 0.106541,0.05648 0.02995,0.024799 0.04492,0.061004 0.04492,0.1078248 -10e-7,0.020638 -0.0067,0.048321 -0.02054,0.083436 -0.01383,0.035117 -0.03204,0.070629 -0.05391,0.1078247 -0.01842,-0.012398 -0.04179,-0.024152 -0.0706,-0.037225 -0.02881,-0.01307 -0.06043,-0.020537 -0.09499,-0.020538 -0.02995,1.3e-6 -0.05501,0.00966 -0.07573,0.02824 -0.02073,0.018578 -0.03081,0.047317 -0.03081,0.087287 l 0,0.050062 0.255442,0 0,0.3080708 -0.255442,0 0,0.6893084 -0.344012,0 0,-0.9871102 c 0,-0.017904 -5.67e-4,-0.04278 0,-0.074451 5.63e-4,-0.031669 0.0028,-0.056441 0.0051,-0.075734 0.01498,-0.1115474 0.05416,-0.1968921 0.118093,-0.2554419 0.06393,-0.058547 0.152945,-0.088569 0.266995,-0.08857 z m -2.924105,0.00257 c 0.02763,1.5e-6 0.05494,0.00278 0.08087,0.00899 0.02593,0.0062 0.04845,0.01753 0.06803,0.033374 0.01958,0.015847 0.0354,0.037222 0.04749,0.065465 0.0121,0.028245 0.01797,0.065062 0.01797,0.1091085 l 0,1.2476867 -0.259293,0 c -0.0173,0 -0.0324,-0.00576 -0.04621,-0.015403 -0.01382,-0.00965 -0.02054,-0.029965 -0.02054,-0.061614 -0.01614,0.024756 -0.04188,0.048047 -0.07702,0.068033 -0.03514,0.019985 -0.07923,0.029523 -0.132213,0.029523 -0.03916,0 -0.07751,-0.00795 -0.115527,-0.023105 -0.03802,-0.015152 -0.07217,-0.041716 -0.10269,-0.079585 -0.03051,-0.037869 -0.05543,-0.089899 -0.07445,-0.155319 -0.01902,-0.06542 -0.02824,-0.1472648 -0.02824,-0.2464567 0,-0.099149 0.0078,-0.1827234 0.02568,-0.2515911 0.01786,-0.068866 0.04193,-0.1254729 0.07188,-0.1681554 0.02995,-0.042681 0.06481,-0.073128 0.103974,-0.092421 0.03916,-0.019291 0.08058,-0.029523 0.123228,-0.029523 0.02763,6e-7 0.05256,0.00466 0.07445,0.011553 0.02188,0.00689 0.03964,0.014154 0.05519,0.023105 0.01556,0.00895 0.02872,0.018004 0.03851,0.026957 0.0098,0.00895 0.01581,0.015136 0.01926,0.019255 l 0,-0.5057496 c 0.01386,-0.00138 0.02871,-0.00369 0.04364,-0.00642 0.01269,-0.00277 0.0261,-0.00503 0.04107,-0.00642 0.01498,-0.00138 0.02995,-0.00128 0.04492,-0.00128 z m 1.631492,0.01412 c 0.02767,1.5e-6 0.05496,0.00278 0.08087,0.00899 0.02591,0.0062 0.04845,0.01753 0.06803,0.033374 0.01958,0.015847 0.0354,0.038506 0.04749,0.066749 0.01209,0.028245 0.01797,0.063779 0.01797,0.1078248 l 0,0.6649195 c 0.0058,-0.030262 0.01557,-0.060243 0.02824,-0.089854 0.01267,-0.029611 0.0292,-0.058328 0.04878,-0.087287 l 0.09242,-0.1424828 c 0.02187,-0.033035 0.04666,-0.061898 0.07317,-0.086003 0.0265,-0.024104 0.06305,-0.035941 0.109109,-0.035942 0.02651,7e-7 0.05167,0.00517 0.07702,0.01412 0.02534,0.00895 0.04845,0.018513 0.06803,0.029523 0.02187,0.0124 0.04203,0.025904 0.06161,0.041076 l -0.236187,0.3966412 0.27983,0.510884 c -0.07605,0.037155 -0.145879,0.055196 -0.209231,0.055196 -0.05414,0 -0.09725,-0.011247 -0.128363,-0.034658 -0.03111,-0.023411 -0.05784,-0.053983 -0.08087,-0.091138 l -0.110398,-0.18356 c -0.01958,-0.031648 -0.03468,-0.062302 -0.04621,-0.089854 -0.01153,-0.02755 -0.02119,-0.057998 -0.02696,-0.092421 l 0,0.4685243 -0.345296,0 0,-1.4492164 c 0.01382,-0.00138 0.02867,-0.00369 0.04364,-0.00642 0.01266,-0.00277 0.0268,-0.00503 0.04236,-0.00642 0.01556,-0.00138 0.02995,-0.00257 0.04492,-0.00257 z m 2.210407,0 c 0.02763,1.5e-6 0.05494,0.00278 0.08087,0.00899 0.02593,0.0062 0.04845,0.01753 0.06803,0.033374 0.01958,0.015847 0.0354,0.038506 0.04749,0.066749 0.01209,0.028245 0.01797,0.063778 0.01797,0.1078248 l 0,1.2476868 -0.259293,0 c -0.0173,0 -0.0324,-0.00447 -0.04621,-0.01412 -0.01382,-0.00965 -0.02054,-0.029965 -0.02054,-0.061614 -0.01614,0.024756 -0.04188,0.046764 -0.07702,0.066749 -0.03514,0.019985 -0.07923,0.029523 -0.132214,0.029523 -0.03916,0 -0.0775,-0.00667 -0.115526,-0.021821 -0.03802,-0.015152 -0.07217,-0.041716 -0.102691,-0.079585 -0.03052,-0.037869 -0.05543,-0.089899 -0.07445,-0.155319 -0.01902,-0.06542 -0.02824,-0.1472648 -0.02824,-0.2464567 0,-0.099149 0.0078,-0.184007 0.02568,-0.2528747 0.01786,-0.068866 0.04193,-0.1241893 0.07188,-0.1668718 0.02995,-0.042681 0.06481,-0.073128 0.103974,-0.092421 0.03916,-0.019291 0.08058,-0.029523 0.123228,-0.029523 0.02763,6e-7 0.05256,0.00338 0.07445,0.010269 0.02188,0.00689 0.03964,0.015438 0.0552,0.024389 0.01556,0.00895 0.02872,0.018004 0.03851,0.026956 0.0098,0.00895 0.01581,0.015136 0.01926,0.019255 l 0,-0.5057496 c 0.01385,-0.00138 0.0287,-0.00369 0.04364,-0.00642 0.01269,-0.00277 0.0261,-0.00503 0.04107,-0.00642 0.01497,-0.00138 0.02995,-0.00257 0.04492,-0.00257 z m -4.880354,0.4030593 c 0.09447,7e-7 0.177461,0.016923 0.24774,0.051345 0.03108,0.015173 0.05685,0.033846 0.07702,0.055196 0.02017,0.021352 0.02952,0.046818 0.02953,0.075734 0,0.024758 -0.006,0.054127 -0.01926,0.08857 -0.01323,0.034445 -0.03048,0.067149 -0.05006,0.098839 -0.0346,-0.031691 -0.06982,-0.057053 -0.107825,-0.077018 -0.038,-0.019964 -0.07765,-0.029522 -0.116809,-0.029523 -0.04953,1.3e-6 -0.07445,0.016923 -0.07445,0.051345 0,0.022025 0.0098,0.038356 0.02824,0.050062 0.01842,0.011705 0.04167,0.021265 0.06932,0.029523 0.02765,0.00826 0.0576,0.017901 0.08985,0.02824 0.03225,0.01034 0.0622,0.025554 0.08985,0.04621 0.02765,0.020659 0.05087,0.048911 0.06932,0.084719 0.01844,0.03581 0.02696,0.083366 0.02696,0.1411991 -10e-7,0.1102038 -0.03246,0.1977236 -0.09756,0.2631438 -0.06509,0.06542 -0.159262,0.098839 -0.283682,0.098839 -0.07144,0 -0.127127,-0.00745 -0.166872,-0.020538 -0.03975,-0.013092 -0.07196,-0.026006 -0.09499,-0.039792 -0.02995,-0.017905 -0.0501,-0.037696 -0.06161,-0.059047 -0.01151,-0.02135 -0.01669,-0.043338 -0.01669,-0.066749 0,-0.03581 0.0061,-0.070834 0.02054,-0.1052575 0.01439,-0.034422 0.03164,-0.06837 0.05006,-0.1014067 0.01382,0.015131 0.02964,0.029267 0.04749,0.04236 0.01786,0.013092 0.03702,0.02493 0.05776,0.035942 0.02074,0.011012 0.04229,0.019473 0.06418,0.025673 0.02188,0.0062 0.04215,0.00899 0.0629,0.00899 0.02995,7e-7 0.05151,-0.00498 0.06418,-0.016687 0.01267,-0.011705 0.01926,-0.027021 0.01926,-0.044927 0,-0.020678 -0.0092,-0.037662 -0.02824,-0.050062 -0.01902,-0.012398 -0.04295,-0.022465 -0.0706,-0.032091 -0.02765,-0.00962 -0.05774,-0.020975 -0.09114,-0.033374 -0.0334,-0.012399 -0.06349,-0.029993 -0.09114,-0.051345 -0.02765,-0.021351 -0.0516,-0.049603 -0.0706,-0.084719 -0.019,-0.035116 -0.02824,-0.080859 -0.02824,-0.1373482 0,-0.055058 0.0099,-0.1024496 0.02953,-0.1437664 0.01958,-0.041315 0.04548,-0.075832 0.0783,-0.1026903 0.03282,-0.026856 0.07033,-0.047237 0.112959,-0.060331 0.04263,-0.013092 0.08753,-0.019254 0.134782,-0.019255 z m -3.3322989,0.00128 c 0.027666,6e-7 0.054957,0.00279 0.080868,0.00899 0.025914,0.0062 0.048452,0.017551 0.068033,0.033374 0.019581,0.015825 0.035398,0.037222 0.047493,0.065465 0.012095,0.028245 0.017973,0.065062 0.017973,0.1091085 l 0,0.7316681 c 0,0.030305 -0.00151,0.066913 -0.00382,0.1116757 -0.00231,0.044762 -0.00735,0.084851 -0.015405,0.1206611 -0.012694,0.055101 -0.032556,0.101455 -0.059047,0.1386318 -0.026491,0.037176 -0.055736,0.067115 -0.088571,0.089854 -0.032837,0.022738 -0.065437,0.039153 -0.098839,0.048778 -0.0334,0.00962 -0.0631,0.014119 -0.087286,0.01412 -0.049534,-8e-7 -0.084779,-0.010658 -0.1078248,-0.033374 -0.023043,-0.022718 -0.039444,-0.056034 -0.047493,-0.100123 -0.00346,-0.017905 -0.00599,-0.036516 -0.0077,-0.05648 -0.00173,-0.019964 -0.00411,-0.047729 -0.00642,-0.082152 0.036884,-0.00412 0.066807,-0.01199 0.089854,-0.024389 0.023043,-0.012399 0.04124,-0.028202 0.053912,-0.047494 0.012672,-0.019292 0.021067,-0.042562 0.025676,-0.068033 0.00462,-0.02547 0.0077,-0.053132 0.0077,-0.083436 l 0,-0.9627213 c 0.013819,-0.00139 0.027385,-0.00369 0.042358,-0.00642 0.012657,-0.00277 0.026801,-0.00505 0.042358,-0.00642 0.015557,-0.00136 0.031236,-0.00128 0.046209,-0.00128 z m 2.6904849,0.00257 c 0.02767,6e-7 0.05367,0.00279 0.07958,0.00899 0.02591,0.0062 0.04845,0.017551 0.06803,0.033374 0.01958,0.015825 0.0354,0.038506 0.04749,0.066749 0.0121,0.028245 0.01926,0.063778 0.01926,0.1078248 l 0,0.7316681 c -10e-7,0.030304 -0.0015,0.068197 -0.0038,0.1129593 -0.0023,0.044762 -0.0073,0.084851 -0.01541,0.1206611 -0.01269,0.055101 -0.03256,0.1014551 -0.05905,0.1386319 -0.02649,0.037176 -0.05574,0.067115 -0.08857,0.089854 -0.03284,0.022737 -0.06673,0.03787 -0.100124,0.047494 -0.0334,0.00962 -0.06182,0.015403 -0.086,0.015403 -0.04953,-8e-7 -0.08606,-0.011941 -0.109109,-0.034658 -0.02304,-0.022718 -0.03816,-0.056033 -0.04621,-0.100123 -0.0035,-0.017905 -0.006,-0.036516 -0.0077,-0.05648 -0.0017,-0.019964 -0.0041,-0.047729 -0.0064,-0.082152 0.03688,-0.00412 0.06681,-0.01199 0.08985,-0.024389 0.02304,-0.012399 0.04124,-0.028202 0.05391,-0.047494 0.01267,-0.019292 0.02107,-0.041279 0.02568,-0.066749 0.0046,-0.02547 0.0064,-0.054415 0.0064,-0.084719 l 0,-0.9627213 c 0.01382,-0.00139 0.02867,-0.0024 0.04364,-0.00514 0.01266,-0.00277 0.0268,-0.00505 0.04236,-0.00642 0.01556,-0.00136 0.03124,-0.00257 0.04621,-0.00257 z m 1.49286,0.3221906 c -0.03916,7e-7 -0.06648,0.0203 -0.08087,0.061614 -0.0144,0.041317 -0.02183,0.09782 -0.02183,0.169439 0,0.033037 0.0017,0.064177 0.0051,0.092421 0.0035,0.028245 0.0093,0.053099 0.01797,0.07445 0.0086,0.021351 0.02084,0.037663 0.03466,0.050062 0.01382,0.012399 0.0306,0.019255 0.05134,0.019255 0.01382,0 0.02531,-0.00177 0.03337,-0.00385 0.0081,-0.00208 0.01321,-0.00374 0.01669,-0.00514 l 0,-0.4441354 c -0.0069,-0.0055 -0.016,-0.00949 -0.02696,-0.011553 -0.01096,-0.00206 -0.02032,-0.00257 -0.02953,-0.00257 z m 3.827779,0.015403 c -0.03156,0.00452 -0.05415,0.025464 -0.06675,0.061614 -0.0144,0.041317 -0.02182,0.09782 -0.02182,0.169439 0,0.033036 0.0017,0.062894 0.0051,0.091138 0.0035,0.028245 0.0093,0.053099 0.01797,0.07445 0.0086,0.021351 0.02084,0.038946 0.03466,0.051345 0.01382,0.012399 0.0306,0.017971 0.05134,0.017971 0.01382,0 0.02531,-4.807e-4 0.03337,-0.00257 0.0081,-0.00208 0.01321,-0.00374 0.01669,-0.00514 l 0,-0.4441355 c -0.0069,-0.0055 -0.016,-0.00949 -0.02696,-0.011553 -0.01096,-0.00206 -0.02031,-0.00257 -0.02952,-0.00257 -0.0049,10e-8 -0.0096,-6.457e-4 -0.01412,0 z M 8.4533141,3.4802184 c 0.027666,2e-6 0.053674,0.00408 0.079584,0.010269 0.025914,0.0062 0.049736,0.016247 0.069317,0.032091 0.019581,0.015847 0.035398,0.038505 0.047493,0.066749 0.012095,0.028245 0.017973,0.063778 0.017973,0.1078248 l 0,1.2399849 c -0.047219,0.017905 -0.0902,0.026956 -0.1270793,0.026956 -0.052981,0 -0.093855,-0.00795 -0.123228,-0.023105 -0.029376,-0.015151 -0.05107,-0.034249 -0.065466,-0.059047 -0.014396,-0.024798 -0.022791,-0.05364 -0.025676,-0.086003 -0.00288,-0.032363 -0.00512,-0.066881 -0.00512,-0.1026902 l 0,-1.1976253 c 0.013819,-0.00138 0.028669,-0.00368 0.043641,-0.00642 0.012657,-0.00277 0.026801,-0.00503 0.042358,-0.00642 0.015557,-0.00138 0.031236,-0.00257 0.046209,-0.00257 z m 0.4826443,0 c 0.02767,2e-6 0.05496,0.00408 0.08087,0.010269 0.02591,0.0062 0.04845,0.016247 0.06803,0.032091 0.01958,0.015847 0.0354,0.038505 0.04749,0.066749 0.0121,0.028245 0.01797,0.063778 0.01797,0.1078248 l 0,0.6649194 c 0.0058,-0.030262 0.01556,-0.058959 0.02824,-0.08857 0.01267,-0.02961 0.02919,-0.05961 0.04878,-0.08857 l 0.09242,-0.1424827 c 0.02187,-0.033034 0.04666,-0.061897 0.07317,-0.086003 0.02651,-0.024103 0.06305,-0.035941 0.109108,-0.035942 0.02651,8e-7 0.05167,0.00517 0.07702,0.01412 0.02534,0.00895 0.04845,0.018512 0.06803,0.029523 0.02187,0.0124 0.04203,0.025904 0.06162,0.041076 l -0.236188,0.3966412 0.279831,0.510884 c -0.07605,0.037155 -0.145879,0.055196 -0.209231,0.055196 -0.05414,0 -0.09725,-0.011247 -0.128363,-0.034658 -0.03111,-0.023411 -0.05784,-0.053982 -0.08087,-0.091138 L 9.2234904,4.6585893 c -0.01958,-0.031648 -0.03468,-0.062302 -0.04621,-0.089854 -0.01153,-0.02755 -0.02119,-0.057997 -0.02696,-0.092421 l 0,0.4685244 -0.3452958,0 0,-1.4492165 c 0.013819,-0.00138 0.028669,-0.00368 0.043641,-0.00642 0.012657,-0.00277 0.0268,-0.00503 0.042357,-0.00642 0.01556,-0.00138 0.02995,-0.00257 0.04492,-0.00257 z m -0.9832597,0.010269 c 0.02763,2.1e-6 0.053652,0.00279 0.079585,0.00899 0.025928,0.0062 0.048452,0.01753 0.068033,0.033374 0.019581,0.015847 0.035398,0.038505 0.047493,0.066749 0.012095,0.028245 0.019257,0.063778 0.019257,0.1078248 l 0,1.2476868 -0.2592924,0 c -0.017295,0 -0.033681,-0.00448 -0.047493,-0.01412 C 7.8464623,4.931342 7.8397403,4.911027 7.8397403,4.879378 7.8235993,4.904133 7.7978583,4.926142 7.7627223,4.946127 7.7275843,4.966112 7.6834903,4.97565 7.6305086,4.97565 c -0.039163,0 -0.077504,-0.00667 -0.1155268,-0.021821 -0.038022,-0.015158 -0.072173,-0.041721 -0.1026893,-0.07959 -0.030515,-0.03787 -0.055434,-0.089898 -0.07445,-0.1553191 -0.019019,-0.06542 -0.028243,-0.1472648 -0.028243,-0.2464566 0,-0.099149 0.00909,-0.184007 0.02696,-0.2528748 0.017857,-0.068866 0.041932,-0.1241891 0.071885,-0.1668717 0.029953,-0.042681 0.063526,-0.073129 0.1026903,-0.092421 0.039163,-0.019291 0.080583,-0.029523 0.1232281,-0.029523 0.02763,8e-7 0.052563,0.00338 0.074451,0.010269 0.021882,0.00689 0.040922,0.015438 0.056479,0.024389 0.015557,0.00895 0.027436,0.016721 0.037223,0.025673 0.00979,0.00895 0.017093,0.016419 0.020541,0.020538 l 0,-0.5070332 c 0.013855,-0.00138 0.027421,-0.0024 0.042358,-0.00514 0.012694,-0.00277 0.027385,-0.00503 0.042358,-0.00642 0.01498,-0.00138 0.029953,-0.00257 0.044925,-0.00257 z m -0.9486016,0.00128 c 0.023065,1.3e-6 0.047255,0.00169 0.073167,0.00514 0.025914,0.00345 0.051546,0.00851 0.075734,0.015403 0.041485,0.0124 0.076586,0.031683 0.106541,0.05648 0.029953,0.024799 0.044925,0.059721 0.044925,0.1065412 0,0.020638 -0.00671,0.04832 -0.02054,0.083436 -0.013833,0.035117 -0.032044,0.071912 -0.053912,0.1091085 -0.01842,-0.012399 -0.041788,-0.025436 -0.070601,-0.038509 -0.028813,-0.01307 -0.060432,-0.019253 -0.094989,-0.019255 -0.029953,1.2e-6 -0.055008,0.00966 -0.075734,0.02824 -0.020728,0.018578 -0.030804,0.047317 -0.030804,0.087287 l 0,0.050062 0.2554425,0 0,0.3067872 -0.2554425,0 0,0.690592 -0.344012,0 0,-0.9871102 c 0,-0.017904 7.147e-4,-0.042779 0.0013,-0.07445 5.633e-4,-0.031669 0.00151,-0.057725 0.00382,-0.077018 C 6.6339721,3.7229546 6.6731561,3.6376096 6.7370857,3.57906 6.8010157,3.520513 6.8900311,3.491775 7.0040808,3.491773 z m 8.2832539,0.025673 c 0.04722,1.2e-6 0.08782,0.017493 0.120661,0.052629 0.03284,0.035139 0.04878,0.083263 0.04878,0.1424827 0,0.059222 -0.01594,0.1054934 -0.04878,0.1399156 -0.03284,0.034423 -0.07345,0.051346 -0.120661,0.051345 -0.04725,1.2e-6 -0.08656,-0.016921 -0.119378,-0.051345 -0.03282,-0.034422 -0.04878,-0.080694 -0.04878,-0.1399156 0,-0.05922 0.01596,-0.1073441 0.04878,-0.1424827 0.03282,-0.035136 0.07213,-0.052628 0.119378,-0.052629 z m -4.477296,0.00128 c 0.02767,2.1e-6 0.05496,0.00279 0.08087,0.00899 0.02591,0.0062 0.04845,0.01753 0.06803,0.033374 0.01958,0.015848 0.0354,0.037222 0.04749,0.065465 0.0121,0.028245 0.01797,0.065062 0.01797,0.1091084 l 0,0.6649195 c 0.0058,-0.030261 0.01428,-0.060243 0.02696,-0.089854 0.01267,-0.02961 0.02919,-0.058327 0.04878,-0.087287 l 0.0937,-0.1424873 c 0.02187,-0.033034 0.04537,-0.061897 0.07188,-0.086003 0.02651,-0.024103 0.06305,-0.035941 0.109109,-0.035942 0.02651,8e-7 0.05295,0.00389 0.0783,0.012836 0.02534,0.00895 0.04717,0.019796 0.06675,0.030807 0.02187,0.0124 0.04332,0.025904 0.0629,0.041076 l -0.237471,0.3966412 0.279831,0.5096004 c -0.07605,0.037155 -0.144595,0.05648 -0.207948,0.05648 -0.05414,0 -0.09725,-0.012531 -0.128362,-0.035942 -0.03111,-0.023411 -0.05784,-0.052699 -0.08087,-0.089854 L 11.096305,4.6958103 c -0.01958,-0.031648 -0.03468,-0.061019 -0.04621,-0.08857 -0.01153,-0.02755 -0.01991,-0.057997 -0.02568,-0.092421 l 0,0.4685244 -0.345297,0 0,-1.4505 c 0.01382,-0.00138 0.02739,-0.00368 0.04236,-0.00642 0.01266,-0.00277 0.0268,-0.00374 0.04236,-0.00514 0.01556,-0.00138 0.03124,-0.00257 0.04621,-0.00257 z m 1.255389,0.00514 c 0.02306,1.2e-6 0.04725,0.00169 0.07317,0.00514 0.02591,0.00345 0.05155,0.00851 0.07573,0.015403 0.04148,0.0124 0.07659,0.0304 0.106541,0.055196 0.02995,0.024799 0.04493,0.061004 0.04493,0.1078249 -10e-7,0.020638 -0.0067,0.04832 -0.02054,0.083436 -0.01383,0.035117 -0.03076,0.071913 -0.05263,0.1091084 -0.01842,-0.012399 -0.04307,-0.025436 -0.07188,-0.038509 -0.02881,-0.01307 -0.06043,-0.019253 -0.09499,-0.019254 -0.02995,1.2e-6 -0.05501,0.00838 -0.07573,0.026956 -0.02073,0.018578 -0.03081,0.048601 -0.03081,0.08857 l 0,0.048778 0.255441,0 0,0.3080708 -0.255441,0 0,0.690592 -0.344013,0 0,-0.9883938 c 0,-0.017904 7.15e-4,-0.04278 0.0013,-0.07445 5.63e-4,-0.031669 0.0015,-0.056442 0.0038,-0.075734 0.01498,-0.1115475 0.05416,-0.1968926 0.118093,-0.2554421 0.06393,-0.058547 0.152946,-0.087286 0.266995,-0.087287 z m 1.675134,0.029523 c 0.02764,2e-6 0.05494,0.00279 0.08087,0.00899 0.02593,0.0062 0.04845,0.01753 0.06803,0.033374 0.01958,0.015848 0.0354,0.037222 0.04749,0.065465 0.0121,0.028245 0.01797,0.065062 0.01797,0.1091084 l 0,1.2476868 -0.259293,0 c -0.01729,0 -0.0324,-0.00576 -0.04621,-0.015403 -0.01382,-0.00965 -0.02054,-0.029965 -0.02054,-0.061614 -0.01614,0.024756 -0.04187,0.046764 -0.07702,0.066749 -0.03514,0.019985 -0.07923,0.030807 -0.132214,0.030807 -0.03916,0 -0.0775,-0.00795 -0.115526,-0.023105 -0.03802,-0.015152 -0.07218,-0.041716 -0.102691,-0.079585 -0.03052,-0.03787 -0.05543,-0.089898 -0.07445,-0.1553191 -0.01902,-0.065419 -0.02824,-0.1472648 -0.02824,-0.2464566 0,-0.099149 0.0078,-0.1827234 0.02568,-0.2515912 0.01786,-0.068866 0.04193,-0.1254727 0.07188,-0.1681553 0.02995,-0.042681 0.06481,-0.073129 0.103974,-0.092421 0.03916,-0.019291 0.08058,-0.029523 0.123228,-0.029523 0.02763,8e-7 0.05256,0.00466 0.07445,0.011553 0.02188,0.00689 0.03964,0.014154 0.0552,0.023105 0.01556,0.00895 0.02872,0.018005 0.03851,0.026956 0.0098,0.00895 0.01581,0.015136 0.01926,0.019255 l 0,-0.5057496 c 0.01385,-0.00138 0.0287,-0.00368 0.04364,-0.00642 0.01269,-0.00277 0.0261,-0.00503 0.04107,-0.00642 0.01498,-0.00138 0.02995,-0.00128 0.04492,-0.00128 z m 0.483929,0 c 0.02767,2e-6 0.05367,0.00279 0.07958,0.00899 0.02591,0.0062 0.04845,0.01753 0.06803,0.033374 0.01958,0.015848 0.0354,0.037222 0.04749,0.065465 0.0121,0.028245 0.01926,0.065062 0.01926,0.1091084 l 0,0.6649194 c 0.0058,-0.030261 0.01428,-0.060243 0.02696,-0.089854 0.01267,-0.02961 0.0292,-0.059611 0.04878,-0.08857 l 0.0937,-0.1424786 c 0.02187,-0.033034 0.04537,-0.060613 0.07188,-0.08472 0.02651,-0.024103 0.06305,-0.037225 0.109108,-0.037225 0.02651,8e-7 0.05167,0.00517 0.07702,0.01412 0.02534,0.00895 0.04845,0.018512 0.06803,0.029523 0.02187,0.0124 0.04203,0.025904 0.06162,0.041076 l -0.236188,0.3966412 0.279831,0.5108841 c -0.07605,0.037155 -0.145879,0.055196 -0.209231,0.055196 -0.05414,0 -0.09597,-0.011247 -0.127079,-0.034658 -0.03111,-0.023411 -0.05913,-0.053982 -0.08215,-0.091138 L 14.510756,4.7304725 c -0.01958,-0.031648 -0.03468,-0.061019 -0.04621,-0.088571 -0.01153,-0.02755 -0.01991,-0.059281 -0.02568,-0.093705 l 0,0.469808 -0.346579,0 0,-1.4505001 c 0.01382,-0.00138 0.02867,-0.00368 0.04364,-0.00642 0.01266,-0.00277 0.0268,-0.00503 0.04236,-0.00642 0.01556,-0.00138 0.03124,-0.00128 0.04621,-0.00128 z m -4.024175,0.3838048 c 0.134791,9e-7 0.23063,0.031629 0.288816,0.094989 0.05818,0.063362 0.08729,0.1639199 0.08729,0.3016526 l 0,0.4030593 c 0,0.034423 0.0031,0.072316 0.0077,0.1129593 0.0046,0.040643 0.0112,0.076237 0.01926,0.1065412 -0.01613,0.00551 -0.03098,0.00939 -0.04364,0.012836 -0.01266,0.00345 -0.02511,0.00692 -0.03722,0.00899 -0.01211,0.00206 -0.02527,0.00316 -0.03851,0.00385 -0.01323,6.901e-4 -0.02751,0.00128 -0.04364,0.00128 -0.09331,0 -0.148044,-0.031606 -0.163021,-0.094989 -0.01958,0.023411 -0.04798,0.044889 -0.086,0.064181 -0.03802,0.019291 -0.08618,0.02824 -0.143767,0.02824 -0.03572,0 -0.06985,-0.00568 -0.1026896,-0.016687 -0.03284,-0.011012 -0.06194,-0.028524 -0.08729,-0.052629 -0.02535,-0.024104 -0.04535,-0.055732 -0.06033,-0.094989 -0.01498,-0.039256 -0.02182,-0.087277 -0.02182,-0.1437663 0,-0.079857 0.01749,-0.1437451 0.05263,-0.1912607 0.03514,-0.047514 0.07696,-0.083026 0.127079,-0.1078248 0.05012,-0.024797 0.1030406,-0.040622 0.1566026,-0.047494 0.05356,-0.00687 0.09931,-0.010268 0.137348,-0.010269 l 0,-0.029523 c -10e-7,-0.019291 -0.0032,-0.034504 -0.009,-0.04621 -0.0058,-0.011705 -0.01331,-0.020756 -0.02311,-0.026957 -0.0098,-0.0062 -0.02141,-0.00949 -0.03465,-0.011553 -0.01326,-0.00206 -0.02739,-0.00385 -0.04236,-0.00385 -0.04029,8e-7 -0.08019,0.00619 -0.119377,0.019255 -0.03918,0.013072 -0.08255,0.034043 -0.1309296,0.061614 -0.0219,-0.03169 -0.03913,-0.0634 -0.05006,-0.093705 -0.01093,-0.030304 -0.01669,-0.052901 -0.01669,-0.068033 0,-0.020678 0.0065,-0.040469 0.01797,-0.059047 0.01151,-0.018577 0.03488,-0.037083 0.0706,-0.057763 0.03111,-0.019291 0.07281,-0.035198 0.1257956,-0.04621 0.05298,-0.011011 0.107718,-0.016686 0.163021,-0.016687 z m 2.468417,0.053917 c 0.09447,8e-7 0.176177,0.016924 0.246457,0.051345 0.03108,0.015174 0.05685,0.033845 0.07702,0.055196 0.02016,0.021352 0.0308,0.045535 0.0308,0.07445 0,0.024758 -0.0073,0.054127 -0.02054,0.08857 -0.01323,0.034445 -0.0292,0.068433 -0.04878,0.100123 -0.0346,-0.03169 -0.07111,-0.058336 -0.109109,-0.078301 -0.038,-0.019964 -0.07636,-0.029522 -0.115527,-0.029523 -0.04953,1.2e-6 -0.07445,0.016923 -0.07445,0.051346 0,0.022025 0.0085,0.03964 0.02696,0.051345 0.01842,0.011705 0.04167,0.021265 0.06932,0.029523 0.02765,0.00826 0.0576,0.0179 0.08985,0.02824 0.03225,0.01034 0.06221,0.025554 0.08985,0.04621 0.02765,0.020659 0.05087,0.04891 0.06932,0.08472 0.01844,0.03581 0.02824,0.082082 0.02824,0.1399155 0,0.1102039 -0.03246,0.1990072 -0.09755,0.2644274 -0.06509,0.06542 -0.160546,0.097556 -0.284966,0.097556 -0.07144,0 -0.127127,-0.00616 -0.166872,-0.019255 -0.03975,-0.013092 -0.07068,-0.02729 -0.0937,-0.041076 -0.02995,-0.017904 -0.05139,-0.037696 -0.0629,-0.059047 -0.01151,-0.021351 -0.01669,-0.043338 -0.01669,-0.066749 0,-0.03581 0.0074,-0.070834 0.02183,-0.1052575 0.01439,-0.034422 0.03036,-0.06837 0.04878,-0.1014066 0.01382,0.015131 0.02964,0.029267 0.04749,0.04236 0.01786,0.013092 0.03702,0.02493 0.05776,0.035941 0.02074,0.011013 0.04229,0.019473 0.06418,0.025673 0.02188,0.0062 0.04344,0.01027 0.06418,0.010269 0.02995,9e-7 0.05151,-0.00627 0.06418,-0.017971 0.01267,-0.011705 0.01926,-0.027022 0.01926,-0.044927 0,-0.020678 -0.0105,-0.036378 -0.02953,-0.048778 -0.01902,-0.012399 -0.04167,-0.023749 -0.06932,-0.033374 -0.02765,-0.00962 -0.05903,-0.020975 -0.09242,-0.033374 -0.0334,-0.012399 -0.06349,-0.02871 -0.09114,-0.050062 -0.02765,-0.021351 -0.05031,-0.049603 -0.06932,-0.08472 -0.019,-0.035116 -0.02953,-0.080859 -0.02953,-0.1373482 -1e-6,-0.055059 0.0099,-0.1037332 0.02953,-0.14505 0.01958,-0.041315 0.04548,-0.074549 0.0783,-0.1014067 0.03282,-0.026856 0.07162,-0.047237 0.114243,-0.060331 0.04262,-0.013092 0.08753,-0.019254 0.134781,-0.019255 z m 2.587795,0.023105 c 0.02767,1.2e-6 0.05496,0.00279 0.08087,0.00899 0.02591,0.0062 0.04845,0.01755 0.06803,0.033374 0.01958,0.015825 0.0354,0.037222 0.04749,0.065465 0.01209,0.028245 0.01797,0.065062 0.01797,0.1091085 l 0,0.7303845 c 0,0.030304 -0.0015,0.068197 -0.0038,0.1129593 -0.0023,0.044762 -0.0073,0.08485 -0.01541,0.120661 -0.01269,0.055101 -0.03127,0.101456 -0.05776,0.1386319 -0.02649,0.037176 -0.05702,0.067115 -0.08985,0.089854 -0.03284,0.022737 -0.06544,0.039153 -0.09884,0.048778 -0.0334,0.00962 -0.06182,0.014119 -0.086,0.01412 -0.04953,-8e-7 -0.08606,-0.011941 -0.109108,-0.034658 -0.02304,-0.022718 -0.03944,-0.056033 -0.04749,-0.100123 -0.0035,-0.017905 -0.006,-0.036516 -0.0077,-0.05648 -0.0017,-0.019964 -0.0028,-0.046446 -0.0051,-0.080869 0.03688,-0.00412 0.06681,-0.013274 0.08985,-0.025673 0.02304,-0.012399 0.03996,-0.028202 0.05263,-0.047494 0.01267,-0.019292 0.02235,-0.041278 0.02696,-0.066749 0.0046,-0.025471 0.0064,-0.053131 0.0064,-0.083436 l 0,-0.9627213 c 0.01382,-0.00138 0.02867,-0.00369 0.04364,-0.00642 0.01266,-0.00277 0.0268,-0.00506 0.04236,-0.00642 0.01556,-0.00136 0.02995,-0.00128 0.04493,-0.00128 z m -7.5066585,0.220779 c -0.031561,0.00452 -0.05415,0.025464 -0.06675,0.061614 -0.014396,0.041317 -0.02054,0.09782 -0.02054,0.169439 -7e-7,0.033037 0.00166,0.062894 0.00512,0.091138 0.00346,0.028245 0.00932,0.053099 0.017973,0.07445 0.00865,0.021351 0.01956,0.038946 0.033371,0.051345 0.013819,0.012399 0.030602,0.017971 0.051344,0.017971 0.013819,0 0.025308,-4.806e-4 0.033371,-0.00257 0.00807,-0.00208 0.013206,-0.00374 0.016689,-0.00514 l 0,-0.4441354 c -0.00692,-0.0055 -0.01472,-0.00949 -0.025676,-0.011553 -0.010948,-0.00206 -0.021593,-0.00257 -0.030804,-0.00257 -0.0049,0 -0.00961,-6.448e-4 -0.014122,0 z m 5.8032835,0.061614 c -0.03916,9e-7 -0.06648,0.0203 -0.08087,0.061614 -0.0144,0.041317 -0.02182,0.09782 -0.02182,0.1694389 -10e-7,0.033036 0.0017,0.064178 0.0051,0.092421 0.0035,0.028245 0.0093,0.053099 0.01797,0.07445 0.0086,0.021351 0.02084,0.037662 0.03465,0.050062 0.01382,0.012399 0.0306,0.019255 0.05134,0.019255 0.01382,0 0.02531,-0.00176 0.03337,-0.00385 0.0081,-0.00208 0.0132,-0.00374 0.01669,-0.00514 l 0,-0.4441354 c -0.0069,-0.0055 -0.016,-0.00949 -0.02696,-0.011553 -0.01096,-0.00206 -0.02031,-0.00257 -0.02952,-0.00257 z m -3.298925,0.2028133 c -0.02187,0.00278 -0.0433,0.00733 -0.0629,0.012836 -0.0196,0.00551 -0.03695,0.012788 -0.05134,0.023105 -0.0144,0.010319 -0.02475,0.024538 -0.03337,0.041076 -0.0086,0.01654 -0.01412,0.038038 -0.01412,0.064181 0,0.031691 0.0074,0.055956 0.02182,0.073167 0.0144,0.017211 0.03498,0.025673 0.06033,0.025673 0.02074,0 0.03908,-0.00568 0.0552,-0.016687 0.01612,-0.011011 0.02439,-0.027995 0.02439,-0.050062 l 0,-0.1732899 z m 2.340055,3.1500241 c 0.04721,1.4e-6 0.08782,0.01749 0.120661,0.052628 0.03284,0.035138 0.04878,0.08198 0.04878,0.1411995 0,0.05922 -0.01594,0.1067768 -0.04878,0.1411988 -0.03284,0.034424 -0.07345,0.051344 -0.120661,0.051344 -0.04725,1.4e-6 -0.08656,-0.01692 -0.119378,-0.051344 -0.03282,-0.034424 -0.05006,-0.081977 -0.05006,-0.1411988 0,-0.05922 0.01725,-0.1060607 0.05006,-0.1411995 0.03282,-0.035138 0.07213,-0.052628 0.119378,-0.052628 z m -3.6634756,0.019257 c 0.02307,7e-7 0.04854,0.00166 0.07445,0.00512 0.02591,0.00346 0.05026,0.00851 0.07445,0.015405 0.04148,0.012398 0.07787,0.0304 0.107825,0.055195 0.02995,0.024803 0.04492,0.061001 0.04492,0.1078248 -10e-7,0.020634 -0.008,0.048322 -0.02182,0.083436 -0.01383,0.035117 -0.03076,0.07063 -0.05263,0.1078248 -0.01842,-0.012398 -0.04179,-0.024154 -0.0706,-0.037223 -0.02881,-0.013069 -0.06171,-0.020533 -0.09627,-0.02054 -0.02995,1.4e-6 -0.05501,0.00966 -0.07573,0.028236 -0.02073,0.018579 -0.03081,0.048603 -0.03081,0.08857 l 0,0.048777 0.255442,0 0,0.3080711 -0.255442,0 0,0.6905923 -0.3440125,0 0,-0.9883938 c 0,-0.017901 7.147e-4,-0.042783 0.0013,-0.074451 5.625e-4,-0.031669 0.00151,-0.056443 0.00382,-0.075734 0.014973,-0.1115477 0.054157,-0.1968926 0.1180936,-0.2554425 0.06393,-0.058549 0.1529447,-0.087286 0.2669942,-0.087286 z m 4.3746056,0 c 0.02306,7e-7 0.04725,0.00166 0.07317,0.00512 0.02591,0.00346 0.05155,0.00851 0.07573,0.015405 0.04148,0.012398 0.07659,0.0304 0.106541,0.055195 0.02995,0.024803 0.04493,0.061001 0.04493,0.1078248 -2e-6,0.020634 -0.0067,0.048322 -0.02054,0.083436 -0.01383,0.035117 -0.03204,0.07063 -0.05391,0.1078248 -0.01842,-0.012398 -0.04179,-0.024154 -0.0706,-0.037223 -0.02881,-0.013069 -0.06043,-0.020533 -0.09499,-0.02054 -0.02995,1.4e-6 -0.05501,0.00966 -0.07573,0.028236 -0.02073,0.018579 -0.03081,0.048603 -0.0308,0.08857 l 0,0.048777 0.255442,0 0,0.3080711 -0.255442,0 0,0.6905923 -0.344013,0 0,-0.9883938 c 0,-0.017901 -5.67e-4,-0.042783 0,-0.074451 5.63e-4,-0.031669 0.0028,-0.056443 0.0051,-0.075734 0.01498,-0.1115477 0.05416,-0.1968926 0.118094,-0.2554425 0.06393,-0.058549 0.152945,-0.087286 0.266994,-0.087286 z m -3.161577,0.015405 c 0.02767,2.2e-6 0.05367,0.00404 0.07958,0.01027 0.02591,0.0062 0.04974,0.016249 0.06932,0.032095 0.01958,0.015845 0.0354,0.038506 0.04749,0.066749 0.0121,0.028243 0.01797,0.063778 0.01797,0.1078248 l 0,1.2399845 c -0.04722,0.01791 -0.0902,0.02696 -0.12708,0.02696 -0.05298,0 -0.09385,-0.008 -0.123228,-0.02311 -0.02937,-0.01515 -0.05107,-0.03425 -0.06547,-0.05905 -0.01439,-0.0248 -0.02279,-0.053638 -0.02567,-0.086003 -0.0029,-0.032362 -0.0038,-0.066879 -0.0038,-0.1026904 l 0,-1.1976251 c 0.01382,-0.00137 0.02738,-0.00368 0.04236,-0.00642 0.01266,-0.00274 0.0268,-0.00505 0.04236,-0.00642 0.01556,-0.00137 0.03124,-0.0026 0.04621,-0.0026 z m 0.482644,0 c 0.02767,2.2e-6 0.05367,0.00404 0.07958,0.01027 0.02591,0.0062 0.04974,0.016249 0.06932,0.032095 0.01958,0.015845 0.0354,0.038506 0.04749,0.066749 0.0121,0.028243 0.01797,0.063778 0.01797,0.1078248 l 0,0.6662033 c 0.0058,-0.030263 0.01428,-0.060244 0.02696,-0.089854 0.01267,-0.029614 0.02919,-0.059609 0.04878,-0.08857 l 0.0937,-0.1424833 c 0.02187,-0.033032 0.04537,-0.061896 0.07188,-0.086003 0.0265,-0.024103 0.06305,-0.035939 0.109109,-0.035939 0.02651,8e-7 0.05295,0.00519 0.0783,0.014122 0.02534,0.00895 0.04717,0.018514 0.06675,0.02952 0.02187,0.012398 0.04332,0.025907 0.0629,0.041074 l -0.237471,0.3966406 0.279831,0.5108842 c -0.07605,0.03716 -0.14588,0.05519 -0.209232,0.05519 -0.05414,0 -0.09597,-0.01124 -0.127079,-0.03465 -0.03111,-0.02341 -0.05913,-0.05398 -0.08215,-0.09114 L 10.912752,8.8624835 c -0.01958,-0.031647 -0.03468,-0.061016 -0.04621,-0.088571 -0.01153,-0.027551 -0.01991,-0.059285 -0.02568,-0.093705 l 0,0.4698083 -0.346579,0 0,-1.4505001 c 0.01382,-0.00137 0.02867,-0.00368 0.04364,-0.00642 0.01266,-0.00274 0.0268,-0.00505 0.04236,-0.00642 0.01556,-0.00137 0.03124,-0.0026 0.04621,-0.0026 z M 9.5520994,8.1243875 c 0.09447,7e-7 0.177461,0.01692 0.247741,0.051344 0.03108,0.015175 0.05685,0.033847 0.07702,0.055195 0.02017,0.021356 0.02953,0.046815 0.02953,0.075734 0,0.02476 -0.006,0.054128 -0.01926,0.088571 -0.01323,0.034446 -0.03048,0.067146 -0.05006,0.098839 -0.0346,-0.031691 -0.07111,-0.057049 -0.109108,-0.077018 -0.038,-0.019964 -0.07636,-0.02952 -0.115527,-0.02952 -0.04953,7e-7 -0.07445,0.01692 -0.07445,0.051344 -1e-6,0.022026 0.0098,0.038355 0.02824,0.05006 0.01842,0.011706 0.04167,0.022546 0.06932,0.030804 0.02765,0.00826 0.0576,0.016617 0.08985,0.026959 0.03225,0.010342 0.06221,0.026837 0.08985,0.047493 0.02765,0.020656 0.05087,0.048914 0.06932,0.08472 0.01844,0.035809 0.02695,0.082083 0.02695,0.1399158 0,0.1102041 -0.03246,0.1977235 -0.09755,0.2631433 -0.06509,0.06542 -0.159262,0.09884 -0.283682,0.09884 -0.07144,0 -0.127127,-0.0074 -0.166872,-0.02054 -0.03975,-0.01309 -0.07196,-0.02601 -0.09499,-0.03979 -0.02995,-0.01791 -0.0501,-0.0377 -0.06161,-0.05905 -0.01151,-0.021348 -0.01797,-0.043338 -0.01797,-0.066749 0,-0.035809 0.0074,-0.070832 0.02182,-0.105258 0.0144,-0.034424 0.03164,-0.068372 0.05006,-0.1014065 0.01382,0.015131 0.02964,0.029267 0.04749,0.042358 0.01786,0.01309 0.03702,0.024926 0.05776,0.035939 0.02074,0.011013 0.0423,0.019473 0.06418,0.025676 0.02188,0.0062 0.04216,0.00899 0.0629,0.00899 0.02995,0 0.05151,-0.00498 0.06418,-0.016689 0.01267,-0.011706 0.01926,-0.027024 0.01926,-0.044925 0,-0.020678 -0.0092,-0.037662 -0.02824,-0.05006 -0.01902,-0.012398 -0.04295,-0.022466 -0.0706,-0.032094 -0.02765,-0.00962 -0.05774,-0.020973 -0.09114,-0.033371 -0.0334,-0.012398 -0.06349,-0.028712 -0.09114,-0.05006 -0.02765,-0.021348 -0.0516,-0.049599 -0.0706,-0.08472 -0.019,-0.035116 -0.02824,-0.080859 -0.02824,-0.1373481 0,-0.055058 0.0099,-0.1037333 0.02952,-0.1450502 0.01958,-0.041312 0.04548,-0.075832 0.0783,-0.1026903 0.03282,-0.026858 0.07033,-0.045957 0.11296,-0.059047 0.04262,-0.01309 0.08753,-0.020541 0.13478,-0.020541 z m 2.3657276,0 c 0.13479,7e-7 0.231914,0.031626 0.290099,0.094988 0.05818,0.06336 0.08729,0.1639196 0.08729,0.3016529 l 0,0.4030587 c 0,0.034424 0.0018,0.072316 0.0064,0.1129592 0.0046,0.040641 0.0112,0.076237 0.01926,0.1065415 -0.01614,0.0055 -0.03098,0.0094 -0.04364,0.01284 -0.01266,0.0035 -0.02511,0.0069 -0.03722,0.009 -0.01211,0.0021 -0.02399,0.0032 -0.03722,0.0038 -0.01323,6.9e-4 -0.02879,0.0013 -0.04493,0.0013 -0.09331,0 -0.146762,-0.0316 -0.161738,-0.09499 -0.01958,0.02341 -0.04798,0.04361 -0.086,0.0629 -0.03802,0.01929 -0.08618,0.02952 -0.143766,0.02952 -0.03572,0 -0.06985,-0.0057 -0.102691,-0.01669 -0.03284,-0.01101 -0.06194,-0.02853 -0.08729,-0.05263 -0.02535,-0.0241 -0.04536,-0.05573 -0.06033,-0.094989 -0.01498,-0.039256 -0.02311,-0.087276 -0.02311,-0.1437664 0,-0.079857 0.01749,-0.1437447 0.05263,-0.1912606 0.03514,-0.047514 0.07825,-0.083026 0.128362,-0.1078248 0.05012,-0.024796 0.101758,-0.040619 0.155319,-0.047493 0.05356,-0.00685 0.09931,-0.01027 0.137349,-0.01027 l 0,-0.029527 c 0,-0.019293 -0.0032,-0.034503 -0.009,-0.046209 -0.0058,-0.011705 -0.01331,-0.020757 -0.02311,-0.02696 -0.0098,-0.0062 -0.02141,-0.010775 -0.03466,-0.012838 -0.01326,-0.00209 -0.02738,-0.0026 -0.04236,-0.0026 -0.04029,7e-7 -0.0802,0.0062 -0.119378,0.019257 -0.03918,0.013076 -0.08255,0.034042 -0.130931,0.061614 -0.0219,-0.031691 -0.03784,-0.063403 -0.04878,-0.093705 -0.01093,-0.030299 -0.01669,-0.052895 -0.01669,-0.068026 0,-0.020677 0.0052,-0.040468 0.01669,-0.059047 0.01151,-0.018579 0.03488,-0.037085 0.0706,-0.057763 0.03111,-0.019293 0.0741,-0.035196 0.127079,-0.046209 0.05298,-0.011013 0.106435,-0.016689 0.161737,-0.016689 z m 0.645665,0.020541 c 0.02767,1.4e-6 0.05496,0.00411 0.08087,0.01027 0.02591,0.0062 0.04845,0.016264 0.06803,0.032087 0.01958,0.015824 0.0354,0.038506 0.04749,0.06675 0.0121,0.028243 0.01797,0.063778 0.01797,0.1078248 l 0,0.7316683 c 0,0.03031 -0.0015,0.0682 -0.0038,0.112959 -0.0023,0.04476 -0.0074,0.08485 -0.0154,0.120661 -0.01269,0.0551 -0.03256,0.101456 -0.05905,0.138632 -0.02649,0.03717 -0.05574,0.06712 -0.08857,0.08985 -0.03284,0.02274 -0.06544,0.03916 -0.09884,0.04878 -0.0334,0.0096 -0.0631,0.01412 -0.08729,0.01412 -0.04953,0 -0.08478,-0.01194 -0.107825,-0.03465 -0.02304,-0.02272 -0.03944,-0.05603 -0.04749,-0.100122 -0.0035,-0.01791 -0.006,-0.03652 -0.0077,-0.05648 -0.0017,-0.01996 -0.0041,-0.04773 -0.0064,-0.08215 0.03688,-0.0041 0.06681,-0.01199 0.08985,-0.02439 0.02304,-0.0124 0.04124,-0.0282 0.05391,-0.04749 0.01267,-0.01929 0.02107,-0.04128 0.02568,-0.06675 0.0046,-0.02547 0.0077,-0.05313 0.0077,-0.08344 l 0,-0.9627205 c 0.01382,-0.00137 0.02739,-0.00368 0.04236,-0.00642 0.01266,-0.00274 0.0268,-0.00505 0.04236,-0.00642 0.01556,-0.00137 0.03124,-0.0026 0.04621,-0.0026 z M 11.971739,8.68662 c -0.02187,0.00274 -0.04201,0.00733 -0.06161,0.012838 -0.0196,0.00548 -0.03695,0.012787 -0.05134,0.023108 -0.0144,0.010321 -0.02603,0.024536 -0.03466,0.041074 -0.0086,0.016538 -0.01284,0.036754 -0.01284,0.062898 0,0.031691 0.0074,0.057237 0.02182,0.07445 0.0144,0.017208 0.0337,0.025676 0.05905,0.025676 0.02074,0 0.03908,-0.0057 0.05519,-0.016689 0.01612,-0.011013 0.02439,-0.027998 0.02439,-0.05006 l 0,-0.1732897 z M 9.2465964,9.7148083 c 0.04722,2e-6 0.08782,0.01877 0.120661,0.05391 0.03284,0.03514 0.04878,0.08198 0.04878,0.141199 0,0.05922 -0.01594,0.1054937 -0.04878,0.1399147 -0.03284,0.03442 -0.07345,0.05134 -0.120661,0.05134 -0.04725,10e-7 -0.08784,-0.01692 -0.120662,-0.05134 -0.03282,-0.03442 -0.04878,-0.08069 -0.04878,-0.1399147 0,-0.05922 0.01596,-0.10606 0.04878,-0.141199 0.03282,-0.03514 0.07341,-0.05391 0.120662,-0.05391 z m 3.7738666,0 c 0.04721,2e-6 0.08654,0.01877 0.119378,0.05391 0.03284,0.03514 0.04878,0.08198 0.04878,0.141199 0,0.05922 -0.01594,0.1054937 -0.04878,0.1399147 -0.03284,0.03442 -0.07216,0.05134 -0.119378,0.05134 -0.04725,10e-7 -0.08784,-0.01692 -0.120661,-0.05134 -0.02635,-0.02764 -0.04102,-0.06292 -0.04621,-0.1065407 -0.0032,0.01657 -0.0091,0.03524 -0.01797,0.05776 -0.01383,0.03512 -0.03076,0.07191 -0.05263,0.109108 -0.01842,-0.0124 -0.04307,-0.02544 -0.07188,-0.03851 -0.02881,-0.01307 -0.06043,-0.01926 -0.09499,-0.01926 -0.02995,2e-6 -0.05501,0.0097 -0.07573,0.02824 -0.02073,0.01858 -0.03081,0.04732 -0.03081,0.08729 l 0,0.05006 0.255442,0 0,0.306787 -0.255442,0 0,0.690593 -0.344013,0 0,-0.98711 c 0,-0.0179 7.15e-4,-0.04278 0.0013,-0.07445 5.63e-4,-0.03167 0.0015,-0.05773 0.0038,-0.07702 0.01498,-0.1115477 0.05416,-0.1968917 0.118093,-0.2554417 0.06393,-0.05855 0.152945,-0.08728 0.266995,-0.08729 0.02307,2e-6 0.04725,0.0017 0.07317,0.0051 0.02591,0.0035 0.05155,0.0085 0.07573,0.0154 0.04148,0.0124 0.07659,0.03168 0.106541,0.05648 0.02175,0.018 0.03512,0.04099 0.04107,0.0706 0.0045,-0.04601 0.02014,-0.08367 0.04749,-0.112959 0.03282,-0.03514 0.07341,-0.05391 0.120661,-0.05391 z m -0.168155,0.166873 c -9.37e-4,0.0092 -0.0013,0.01838 -0.0013,0.02824 0,0.01168 0.0013,0.02266 0.0026,0.03337 0.0018,-0.0093 0.0026,-0.01828 0.0026,-0.02567 -1e-6,-0.01283 -0.0016,-0.02477 -0.0038,-0.03594 z m 1.658448,-0.147618 c 0.02307,10e-7 0.04725,0.0017 0.07317,0.0051 0.02591,0.0035 0.05026,0.0085 0.07445,0.01541 0.04148,0.0124 0.07787,0.03168 0.107825,0.05648 0.02995,0.0248 0.04492,0.05972 0.04492,0.106542 -10e-7,0.02063 -0.0067,0.04832 -0.02054,0.08344 -0.01383,0.03512 -0.03204,0.07191 -0.05391,0.109107 -0.01842,-0.0124 -0.04179,-0.02544 -0.0706,-0.03851 -0.02881,-0.01307 -0.06043,-0.01926 -0.09499,-0.01926 -0.02995,2e-6 -0.05501,0.0097 -0.07573,0.02824 -0.02073,0.01858 -0.03209,0.04732 -0.03209,0.08729 l 0,0.05006 0.256726,0 0,0.306787 -0.256726,0 0,0.690593 -0.344013,0 0,-0.98711 c 0,-0.0179 7.15e-4,-0.04278 0.0013,-0.07445 5.63e-4,-0.03167 0.0015,-0.05773 0.0038,-0.07702 0.01498,-0.1115467 0.05545,-0.1968917 0.119377,-0.2554407 0.06393,-0.05855 0.152945,-0.08729 0.266995,-0.08729 z m -6.5580573,0.01669 c 0.02763,2e-6 0.054943,0.0028 0.080869,0.009 0.025928,0.0062 0.048452,0.01753 0.068033,0.03337 0.019581,0.01585 0.035398,0.03722 0.047493,0.06546 0.012095,0.02824 0.017973,0.06506 0.017973,0.109109 l 0,1.2476867 -0.2592924,0 c -0.017295,0 -0.032398,-0.0045 -0.046209,-0.01412 -0.013819,-0.0096 -0.02054,-0.03125 -0.02054,-0.0629 -0.016141,0.02475 -0.041882,0.04805 -0.077018,0.06803 -0.035138,0.01999 -0.079233,0.02952 -0.1322137,0.02952 -0.039163,0 -0.078788,-0.008 -0.1168106,-0.02311 -0.038023,-0.01515 -0.072175,-0.04172 -0.1026903,-0.07958 -0.030515,-0.03787 -0.055433,-0.08862 -0.07445,-0.154036 -0.019019,-0.06542 -0.028243,-0.148548 -0.028243,-0.24774 0,-0.09915 0.00909,-0.182724 0.02696,-0.251591 0.017857,-0.06887 0.041932,-0.12419 0.071885,-0.166872 0.029953,-0.04268 0.064809,-0.07441 0.1039741,-0.0937 0.039163,-0.01929 0.079299,-0.02824 0.1219443,-0.02824 0.02763,1e-6 0.052563,0.0034 0.074451,0.01027 0.021882,0.0069 0.040922,0.01415 0.056479,0.02311 0.015557,0.009 0.028719,0.018 0.038506,0.02696 0.00979,0.009 0.015809,0.01514 0.019257,0.01926 l 0,-0.5057497 c 0.013848,-0.0014 0.028698,-0.0037 0.043641,-0.0064 0.012693,-0.0027 0.026101,-0.005 0.041074,-0.0064 0.014973,-0.0014 0.029953,-0.0013 0.044925,-0.0013 z m 0.6713376,0.4402847 c 0.094466,10e-7 0.1774606,0.01693 0.2477401,0.05134 0.03108,0.01518 0.05686,0.03385 0.07702,0.05519 0.02016,0.02136 0.02952,0.04554 0.02952,0.07445 -1e-6,0.02475 -0.006,0.05413 -0.01926,0.08857 -0.01323,0.03445 -0.03048,0.06843 -0.05006,0.100123 -0.0346,-0.03169 -0.071106,-0.05833 -0.1091088,-0.0783 -0.038009,-0.01996 -0.076362,-0.02952 -0.1155267,-0.02952 -0.049534,1e-6 -0.074451,0.01692 -0.07445,0.05134 -7e-7,0.02203 0.00982,0.03964 0.028236,0.05134 0.01842,0.01171 0.041665,0.02126 0.069317,0.02952 0.027652,0.0083 0.057597,0.0179 0.089854,0.02824 0.032253,0.01034 0.062205,0.02555 0.089854,0.04621 0.02765,0.02066 0.05088,0.04891 0.06932,0.08472 0.01844,0.03581 0.02695,0.08208 0.02695,0.139915 0,0.110204 -0.03246,0.199007 -0.09756,0.264427 -0.065091,0.06542 -0.1592621,0.09756 -0.2836816,0.09756 -0.071438,0 -0.1271269,-0.0061 -0.1668716,-0.01926 -0.039747,-0.01309 -0.071964,-0.02729 -0.094989,-0.04107 -0.029953,-0.0179 -0.050104,-0.03641 -0.061614,-0.05776 -0.011511,-0.02136 -0.017973,-0.04462 -0.017973,-0.06803 0,-0.03581 0.00742,-0.07083 0.021824,-0.105258 0.014396,-0.03442 0.03164,-0.06837 0.05006,-0.101406 0.013819,0.01513 0.029635,0.02927 0.047493,0.04236 0.017857,0.01309 0.03702,0.02493 0.057763,0.03594 0.020742,0.01101 0.0423,0.02076 0.064182,0.02696 0.021889,0.0062 0.042156,0.009 0.062898,0.009 0.029952,0 0.05151,-0.0063 0.064182,-0.01797 0.012672,-0.0117 0.019257,-0.02574 0.019257,-0.04364 0,-0.02068 -0.00922,-0.03766 -0.028243,-0.05006 -0.019019,-0.0124 -0.042949,-0.02375 -0.070601,-0.03337 -0.027652,-0.0096 -0.057741,-0.02097 -0.091138,-0.03338 -0.0334,-0.0124 -0.063489,-0.02871 -0.091138,-0.05006 -0.027652,-0.02135 -0.051597,-0.0496 -0.070601,-0.08472 -0.019004,-0.03512 -0.028243,-0.08086 -0.028243,-0.137348 0,-0.05506 0.00994,-0.103734 0.029527,-0.145051 0.019581,-0.04131 0.045481,-0.07455 0.078301,-0.101406 0.032823,-0.02686 0.070334,-0.04724 0.11296,-0.06033 0.042624,-0.01309 0.087529,-0.01926 0.1347806,-0.01926 z m 1.3413911,0 c 0.07028,10e-7 0.1301716,0.01243 0.1797076,0.03722 0.04953,0.0248 0.09013,0.05753 0.120662,0.09884 0.03054,0.04132 0.05293,0.08997 0.06675,0.145051 0.01382,0.05508 0.02054,0.112682 0.02054,0.173289 l 0,0.02696 c -1e-6,0.01171 -6.95e-4,0.02482 -0.0013,0.03722 -5.79e-4,0.0124 -7.21e-4,0.02365 -0.0013,0.03466 -5.62e-4,0.01101 -0.0014,0.01888 -0.0026,0.02439 l -0.4621066,0 c 0.0058,0.05232 0.02229,0.09699 0.04878,0.133497 0.02649,0.0365 0.06961,0.0552 0.1283626,0.0552 0.04609,0 0.08443,-0.0092 0.115526,-0.02568 0.0311,-0.01652 0.06259,-0.03789 0.0937,-0.06547 0.01497,0.02757 0.02995,0.05918 0.04493,0.09499 0.01497,0.03581 0.02182,0.06746 0.02182,0.09499 -10e-7,0.02341 -0.005,0.04609 -0.0154,0.06675 -0.01037,0.02066 -0.02873,0.03975 -0.0552,0.05905 -0.02535,0.0179 -0.05948,0.03381 -0.10269,0.04621 -0.04321,0.0124 -0.09722,0.01797 -0.161737,0.01797 -0.04722,0 -0.09731,-0.0068 -0.1514676,-0.02054 -0.05416,-0.01378 -0.105396,-0.04094 -0.151468,-0.08087 -0.04607,-0.03993 -0.08371,-0.09584 -0.114243,-0.168155 -0.03054,-0.07231 -0.04621,-0.166627 -0.04621,-0.283682 0,-0.08679 0.01246,-0.162578 0.03722,-0.225919 0.02477,-0.06334 0.05781,-0.115286 0.09755,-0.156602 0.03975,-0.04131 0.08479,-0.07185 0.136066,-0.09114 0.05128,-0.01929 0.102212,-0.02824 0.154035,-0.02824 z m 0.9126596,0 c 0.07949,10e-7 0.146228,0.01352 0.20153,0.04107 0.0553,0.02755 0.100221,0.06485 0.134781,0.111675 0.03456,0.04682 0.06018,0.101639 0.07573,0.164305 0.01556,0.06267 0.02311,0.12873 0.02311,0.198962 -10e-7,0.07023 -0.0083,0.138678 -0.02439,0.204097 -0.01614,0.06542 -0.0419,0.122432 -0.07702,0.172006 -0.03512,0.04958 -0.08018,0.08846 -0.136065,0.118094 -0.05588,0.02963 -0.12473,0.04493 -0.20538,0.04493 -0.07949,0 -0.146246,-0.01471 -0.20153,-0.04364 -0.05528,-0.02894 -0.100925,-0.06793 -0.136064,-0.11681 -0.03514,-0.04889 -0.06088,-0.105385 -0.07702,-0.169439 -0.01614,-0.06405 -0.02439,-0.131193 -0.02439,-0.202813 0,-0.07162 0.0098,-0.140063 0.02824,-0.204097 0.01844,-0.06403 0.04599,-0.118766 0.08343,-0.165589 0.03744,-0.04682 0.08463,-0.08412 0.139916,-0.111675 0.05528,-0.02755 0.120226,-0.04107 0.195111,-0.04107 z m 1.066696,0 c 0.01729,10e-7 0.03465,10e-4 0.05134,0.0051 0.0167,0.0041 0.03111,0.01158 0.04492,0.02054 0.01382,0.009 0.02601,0.02079 0.03466,0.03594 0.0086,0.01515 0.01284,0.03317 0.01284,0.05519 0,0.02203 -0.0031,0.047 -0.0077,0.07317 -0.0046,0.02617 -0.01048,0.05204 -0.01797,0.07958 -0.0075,0.02755 -0.01516,0.05471 -0.02439,0.08087 -0.0092,0.02617 -0.01903,0.04992 -0.02824,0.0706 -0.02419,-0.02341 -0.04685,-0.04092 -0.06932,-0.05263 -0.02247,-0.01171 -0.04798,-0.01797 -0.07445,-0.01797 -0.02995,1e-6 -0.05189,0.0091 -0.06803,0.02696 -0.01614,0.01791 -0.02439,0.04168 -0.02439,0.0706 l 0,0.576349 -0.347863,0 0,-0.98711 c 0.01037,-0.0027 0.02213,-0.0063 0.03594,-0.009 0.01266,-0.0027 0.02751,-0.005 0.04364,-0.0064 0.01613,-0.0014 0.03445,-0.0013 0.0552,-0.0013 0.103678,10e-7 0.168479,0.03385 0.193828,0.10269 0.0057,-0.0124 0.01484,-0.02534 0.02696,-0.03979 0.01211,-0.01446 0.02624,-0.02868 0.04236,-0.04107 0.01612,-0.0124 0.03445,-0.02255 0.0552,-0.03081 0.02074,-0.0083 0.04244,-0.01155 0.06547,-0.01155 z m 1.714927,0 c 0.09447,10e-7 0.177461,0.01693 0.247741,0.05134 0.03108,0.01518 0.05557,0.03385 0.07573,0.05519 0.02016,0.02136 0.0308,0.04554 0.0308,0.07445 -10e-7,0.02475 -0.006,0.05413 -0.01926,0.08857 -0.01323,0.03445 -0.03048,0.06843 -0.05006,0.100123 -0.0346,-0.03169 -0.07111,-0.05833 -0.109108,-0.0783 -0.03801,-0.01996 -0.07636,-0.02952 -0.115527,-0.02952 -0.04953,1e-6 -0.07445,0.01692 -0.07445,0.05134 0,0.02203 0.0098,0.03964 0.02824,0.05134 0.01842,0.01171 0.04167,0.02126 0.06932,0.02952 0.02765,0.0083 0.0576,0.0179 0.08985,0.02824 0.03225,0.01034 0.06221,0.02555 0.08985,0.04621 0.02765,0.02066 0.05087,0.04891 0.06932,0.08472 0.01844,0.03581 0.02695,0.08208 0.02695,0.139915 -1e-6,0.110204 -0.03246,0.199007 -0.09756,0.264427 -0.06509,0.06542 -0.159262,0.09756 -0.283681,0.09756 -0.07144,0 -0.127127,-0.0061 -0.166872,-0.01926 -0.03975,-0.01309 -0.07196,-0.02729 -0.09499,-0.04107 -0.02995,-0.0179 -0.0501,-0.03641 -0.06161,-0.05776 -0.01151,-0.02136 -0.01797,-0.04462 -0.01797,-0.06803 0,-0.03581 0.0074,-0.07083 0.02182,-0.105258 0.0144,-0.03442 0.03164,-0.06837 0.05006,-0.101406 0.01382,0.01513 0.02964,0.02927 0.04749,0.04236 0.01786,0.01309 0.03702,0.02493 0.05776,0.03594 0.02074,0.01101 0.04101,0.02076 0.0629,0.02696 0.02188,0.0062 0.04344,0.009 0.06418,0.009 0.02995,0 0.0515,-0.0063 0.06418,-0.01797 0.01267,-0.0117 0.01926,-0.02574 0.01926,-0.04364 -10e-7,-0.02068 -0.0092,-0.03766 -0.02824,-0.05006 -0.01902,-0.0124 -0.04295,-0.02375 -0.0706,-0.03337 -0.02765,-0.0096 -0.05774,-0.02097 -0.09114,-0.03338 -0.0334,-0.0124 -0.06477,-0.02871 -0.09242,-0.05006 -0.02765,-0.02135 -0.05031,-0.0496 -0.06932,-0.08472 -0.019,-0.03512 -0.02824,-0.08086 -0.02824,-0.137348 0,-0.05506 0.0099,-0.103734 0.02953,-0.145051 0.01958,-0.04131 0.04548,-0.07455 0.0783,-0.101406 0.03282,-0.02686 0.07033,-0.04724 0.11296,-0.06033 0.04262,-0.01309 0.08753,-0.01926 0.134781,-0.01926 z m -4.4439216,0.02054 c 0.02767,2e-6 0.05367,0.0028 0.07959,0.009 0.02591,0.0062 0.04974,0.01755 0.06932,0.03337 0.01958,0.01582 0.0354,0.03722 0.04749,0.06547 0.0121,0.02824 0.01797,0.06506 0.01797,0.109108 l 0,0.730385 c 0,0.03031 -0.0015,0.0682 -0.0038,0.11296 -0.0023,0.04476 -0.0073,0.08485 -0.01541,0.12066 -0.01269,0.0551 -0.03256,0.101456 -0.05905,0.138632 -0.02649,0.03718 -0.05574,0.06712 -0.08857,0.08985 -0.03284,0.02274 -0.06672,0.03915 -0.100123,0.04878 -0.0334,0.0096 -0.06182,0.01412 -0.086,0.01412 -0.04953,-1e-6 -0.08606,-0.01066 -0.109108,-0.03338 -0.02304,-0.02272 -0.03816,-0.05603 -0.04621,-0.100123 -0.0035,-0.01791 -0.006,-0.0378 -0.0077,-0.05776 -0.0017,-0.01996 -0.0041,-0.04645 -0.0064,-0.08087 0.03688,-0.0041 0.06681,-0.01199 0.08985,-0.02439 0.02304,-0.0124 0.04124,-0.02948 0.05391,-0.04878 0.01267,-0.01929 0.02107,-0.04128 0.02567,-0.06675 0.0046,-0.02547 0.0064,-0.05313 0.0064,-0.08344 l 0,-0.962721 c 0.01382,-0.0014 0.02867,-0.0037 0.04364,-0.0064 0.01266,-0.0027 0.0268,-0.005 0.04236,-0.0064 0.01556,-0.0014 0.03124,-0.0013 0.04621,-0.0013 z m 3.7725836,0 c 0.02767,2e-6 0.05496,0.0028 0.08087,0.009 0.02591,0.0062 0.04845,0.01755 0.06803,0.03337 0.01958,0.01582 0.0354,0.03722 0.04749,0.06547 0.0121,0.02824 0.01797,0.06506 0.01797,0.109108 l 0,0.730385 c 0,0.03031 -2.46e-4,0.0682 -0.0026,0.11296 -0.0023,0.04476 -0.0086,0.08485 -0.01669,0.12066 -0.01269,0.0551 -0.03127,0.101456 -0.05776,0.138632 -0.02649,0.03718 -0.05702,0.06712 -0.08985,0.08985 -0.03284,0.02274 -0.06544,0.03915 -0.09884,0.04878 -0.0334,0.0096 -0.06182,0.01412 -0.086,0.01412 -0.04953,-1e-6 -0.08606,-0.01066 -0.109109,-0.03338 -0.02304,-0.02272 -0.03944,-0.05603 -0.04749,-0.100123 -0.0035,-0.01791 -0.006,-0.0378 -0.0077,-0.05776 -0.0017,-0.01996 -0.0028,-0.04645 -0.0051,-0.08087 0.03688,-0.0041 0.06681,-0.01199 0.08985,-0.02439 0.02304,-0.0124 0.03996,-0.02948 0.05263,-0.04878 0.01267,-0.01929 0.02235,-0.04128 0.02696,-0.06675 0.0046,-0.02547 0.0064,-0.05313 0.0064,-0.08344 l 0,-0.962721 c 0.01382,-0.0014 0.02867,-0.0037 0.04364,-0.0064 0.01266,-0.0027 0.0268,-0.005 0.04236,-0.0064 0.01556,-0.0014 0.02995,-0.0013 0.04493,-0.0013 z M 9.9628614,10.44905 c -0.05418,1e-6 -0.08215,0.04975 -0.08215,0.148901 l 0.1668716,0 c -10e-7,-0.05644 -0.0073,-0.09546 -0.02054,-0.11681 -0.01323,-0.02135 -0.03423,-0.03209 -0.06418,-0.03209 z m -2.1988557,0.04492 c -0.039163,2e-6 -0.065192,0.02159 -0.079585,0.0629 -0.014396,0.04132 -0.021824,0.09654 -0.021824,0.168156 l 0,0.0013 c -7e-7,0.03304 0.00166,0.06289 0.00512,0.09114 0.00346,0.02824 0.00933,0.0531 0.017973,0.07445 0.00865,0.02135 0.01956,0.03895 0.033371,0.05134 0.013819,0.0124 0.031885,0.01797 0.052628,0.01797 0.013819,0 0.024024,-4.89e-4 0.032095,-0.0026 0.00807,-0.0021 0.014489,-0.0038 0.017973,-0.0051 l 0,-0.44542 c -0.00692,-0.0055 -0.016004,-0.0082 -0.026959,-0.01027 -0.010955,-0.0021 -0.021593,-0.0038 -0.030804,-0.0038 z m 3.1102313,0.0026 c -0.01958,0 -0.03611,0.0056 -0.04878,0.01797 -0.01267,0.0124 -0.02274,0.0294 -0.03081,0.05006 -0.0081,0.02066 -0.0138,0.04443 -0.01669,0.0706 -0.0029,0.02617 -0.0038,0.05206 -0.0038,0.07958 0,0.03031 9.37e-4,0.05974 0.0038,0.08729 0.0029,0.02755 0.0086,0.05181 0.01669,0.07317 0.0081,0.02136 0.01872,0.03897 0.03081,0.05134 0.01209,0.01238 0.02791,0.01797 0.04749,0.01797 0.01958,1e-6 0.03482,-0.0062 0.04749,-0.01926 0.01267,-0.01307 0.02262,-0.03 0.02953,-0.05134 0.0069,-0.02135 0.01252,-0.0469 0.01541,-0.07445 0.0029,-0.02755 0.0038,-0.0557 0.0038,-0.086 -1e-6,-0.06056 -0.0067,-0.112026 -0.02054,-0.154036 -0.01382,-0.04201 -0.03873,-0.0629 -0.07445,-0.0629 z m -2.8714766,1.284912 c 0.047211,10e-7 0.087824,0.01749 0.1206612,0.05263 0.032837,0.03514 0.048776,0.08198 0.048776,0.141199 0,0.05922 -0.015939,0.106777 -0.048776,0.141199 -0.032837,0.03442 -0.073446,0.05134 -0.1206612,0.05134 -0.047255,2e-6 -0.086559,-0.01692 -0.1193773,-0.05134 -0.032823,-0.03442 -0.05006,-0.08198 -0.05006,-0.141199 0,-0.05922 0.017245,-0.106061 0.05006,-0.141199 0.032816,-0.03514 0.072126,-0.05263 0.1193773,-0.05263 z M 6.50605,11.799452 c 0.023065,10e-7 0.047255,0.0017 0.073166,0.0051 0.025914,0.0035 0.051546,0.0085 0.075734,0.0154 0.041485,0.0124 0.076586,0.03168 0.106541,0.05648 0.029953,0.0248 0.044925,0.061 0.044925,0.107825 0,0.02063 -0.00671,0.04832 -0.020541,0.08344 -0.013833,0.03512 -0.03076,0.07063 -0.052628,0.107825 -0.01842,-0.0124 -0.043072,-0.02415 -0.071885,-0.03722 -0.028813,-0.01307 -0.060432,-0.02054 -0.094989,-0.02054 -0.029953,10e-7 -0.055008,0.0097 -0.075734,0.02824 -0.020728,0.01858 -0.030804,0.04732 -0.030804,0.08729 l 0,0.05006 0.2554425,0 0,0.30807 -0.2554425,0 0,0.689308 -0.344012,0 0,-0.98711 c 0,-0.0179 7.148e-4,-0.04278 0.0013,-0.07445 5.626e-4,-0.03167 0.00151,-0.05644 0.00382,-0.07573 0.01498,-0.111548 0.054164,-0.196893 0.1180936,-0.255442 0.063929,-0.05855 0.1529454,-0.08857 0.2669951,-0.08857 z m 3.65834,0 c 0.02306,10e-7 0.04854,0.0017 0.07445,0.0051 0.02591,0.0035 0.05026,0.0085 0.07445,0.0154 0.04148,0.0124 0.07787,0.03168 0.107825,0.05648 0.02995,0.0248 0.04492,0.061 0.04492,0.107825 -10e-7,0.02063 -0.008,0.04832 -0.02182,0.08344 -0.01383,0.03512 -0.03076,0.07063 -0.05263,0.107825 -0.01842,-0.0124 -0.04179,-0.02415 -0.0706,-0.03722 -0.02881,-0.01307 -0.06172,-0.02054 -0.09627,-0.02054 -0.02995,10e-7 -0.05501,0.0097 -0.07573,0.02824 -0.02073,0.01858 -0.03081,0.04732 -0.03081,0.08729 l 0,0.05006 0.255442,0 0,0.30807 -0.255442,0 0,0.689308 -0.3440126,0 0,-0.98711 c 0,-0.0179 7.15e-4,-0.04278 0.0013,-0.07445 5.63e-4,-0.03167 0.0015,-0.05644 0.0038,-0.07573 0.01498,-0.111548 0.05416,-0.196893 0.118094,-0.255442 0.06393,-0.05855 0.1529446,-0.08857 0.2669936,-0.08857 z m -3.2257579,0.01669 c 0.027666,2e-6 0.054958,0.0028 0.080869,0.009 0.025914,0.0062 0.048452,0.01753 0.068033,0.03338 0.019581,0.01584 0.035398,0.03851 0.047493,0.06675 0.012095,0.02824 0.017973,0.06378 0.017973,0.107825 l 0,0.66492 c 0.00577,-0.03026 0.015564,-0.06024 0.028243,-0.08985 0.012672,-0.02961 0.027911,-0.05833 0.047493,-0.08729 l 0.093705,-0.142483 c 0.021868,-0.03303 0.046656,-0.0619 0.073167,-0.086 0.026505,-0.0241 0.061766,-0.03594 0.1078248,-0.03594 0.026505,1e-6 0.052952,0.0052 0.078301,0.01412 0.025344,0.009 0.048452,0.01851 0.068033,0.02953 0.021868,0.0124 0.042033,0.02591 0.061614,0.04107 L 7.4751937,12.737816 7.7550245,13.2487 c -0.076046,0.03716 -0.1458796,0.0552 -0.2092314,0.0552 -0.054142,0 -0.097249,-0.01125 -0.1283631,-0.03466 C 7.386316,13.24583 7.359588,13.21526 7.336562,13.1781 L 7.2261699,12.994523 c -0.019581,-0.03165 -0.03596,-0.0623 -0.047493,-0.08985 -0.011532,-0.02755 -0.019906,-0.05799 -0.025676,-0.09242 l 0,0.468524 -0.3452965,0 0,-1.449216 c 0.013819,-0.0014 0.028669,-0.0037 0.043641,-0.0064 0.012658,-0.0027 0.026801,-0.005 0.042358,-0.0064 0.015557,-0.0014 0.029952,-0.0026 0.044925,-0.0026 z m 1.5159651,0 c 0.027666,2e-6 0.053674,0.0028 0.079585,0.009 0.025914,0.0062 0.049736,0.01753 0.069317,0.03338 0.019581,0.01584 0.035398,0.03851 0.047493,0.06675 0.012095,0.02824 0.017973,0.06378 0.017973,0.107825 l 0,1.239985 c -0.047219,0.01791 -0.0902,0.02696 -0.1270793,0.02696 -0.052981,0 -0.093855,-0.008 -0.1232288,-0.02311 -0.029376,-0.01515 -0.05107,-0.03553 -0.065466,-0.06033 -0.014396,-0.0248 -0.022791,-0.05235 -0.025668,-0.08472 -0.00288,-0.03236 -0.00382,-0.06688 -0.00382,-0.10269 l 0,-1.197625 c 0.013819,-0.0014 0.027385,-0.0037 0.042358,-0.0064 0.012657,-0.0027 0.026801,-0.005 0.042358,-0.0064 0.015557,-0.0014 0.031236,-0.0026 0.046209,-0.0026 z m 0.9678562,0 c 0.02763,2e-6 0.05494,0.0028 0.08087,0.009 0.02593,0.0062 0.04845,0.01753 0.06803,0.03338 0.01958,0.01584 0.0354,0.03851 0.04749,0.06675 0.0121,0.02824 0.01797,0.06378 0.01797,0.107825 l 0,1.247686 -0.259293,0 c -0.0173,0 -0.0324,-0.0045 -0.04621,-0.01412 -0.01382,-0.0096 -0.02054,-0.02997 -0.02054,-0.06162 -0.01614,0.02475 -0.04188,0.04677 -0.07702,0.06675 -0.03514,0.01999 -0.07923,0.02953 -0.132214,0.02953 -0.03916,0 -0.0775,-0.0066 -0.115526,-0.02182 -0.03802,-0.01515 -0.07346,-0.04172 -0.103974,-0.07959 -0.03051,-0.03787 -0.054149,-0.0899 -0.073167,-0.155319 -0.019019,-0.06542 -0.02952,-0.147265 -0.02952,-0.246456 0,-0.09915 0.00909,-0.184007 0.026959,-0.252875 0.017858,-0.06886 0.041932,-0.124189 0.071885,-0.166872 0.02995,-0.04268 0.06481,-0.07313 0.103973,-0.09242 0.03916,-0.01929 0.0793,-0.02952 0.121945,-0.02953 0.02763,10e-7 0.05256,0.0034 0.07445,0.01027 0.02188,0.0069 0.04092,0.01543 0.05648,0.02439 0.01556,0.009 0.02872,0.018 0.03851,0.02695 0.0098,0.009 0.01581,0.01514 0.01926,0.01926 l 0,-0.50575 c 0.01385,-0.0014 0.0287,-0.0037 0.04364,-0.0064 0.01269,-0.0027 0.0261,-0.005 0.04107,-0.0064 0.01498,-0.0014 0.02995,-0.0026 0.04492,-0.0026 z m 4.4991166,0.0783 c 0.08061,3e-6 0.149059,0.01582 0.206665,0.04749 0.0576,0.03167 0.104336,0.07864 0.141198,0.139915 0.03686,0.06128 0.06415,0.135888 0.08087,0.223352 0.01672,0.08747 0.02567,0.186254 0.02568,0.297801 -10e-7,0.227259 -0.03737,0.402423 -0.111675,0.525005 -0.0743,0.122581 -0.191293,0.183558 -0.349147,0.183558 -0.15898,0 -0.274984,-0.05868 -0.350431,-0.17714 -0.07545,-0.118462 -0.114243,-0.295926 -0.114243,-0.531423 0,-0.108815 0.0098,-0.206506 0.02824,-0.29395 0.01842,-0.08744 0.0467,-0.16207 0.08472,-0.223351 0.03802,-0.06128 0.08701,-0.108142 0.146334,-0.1412 0.05933,-0.03305 0.129988,-0.05006 0.211798,-0.05006 z m 1.002514,0 c 0.07488,3e-6 0.141937,0.01473 0.198963,0.04364 0.05703,0.02892 0.104476,0.0708 0.142482,0.124512 0.038,0.05372 0.0657,0.119271 0.08472,0.196395 0.01902,0.07713 0.02952,0.162876 0.02953,0.259293 -2e-6,0.141853 -0.01735,0.264015 -0.05134,0.364551 -0.034,0.100537 -0.07878,0.181833 -0.133498,0.245173 -0.05472,0.06334 -0.117008,0.110284 -0.186126,0.139915 -0.06912,0.02963 -0.13767,0.04364 -0.207948,0.04364 -0.04029,0 -0.07279,-0.0034 -0.09756,-0.01027 -0.02477,-0.0069 -0.04535,-0.01702 -0.06033,-0.03081 -0.01498,-0.01378 -0.02562,-0.0301 -0.03081,-0.05006 -0.0052,-0.01996 -0.0077,-0.04436 -0.0077,-0.07188 0,-0.02068 0.0023,-0.04495 0.0051,-0.07317 0.0029,-0.02822 0.0054,-0.05249 0.0077,-0.07317 0.02303,0.0055 0.04151,0.0089 0.05648,0.01027 0.01498,0.0014 0.03305,0.0026 0.05263,0.0026 0.0265,0 0.05251,-0.004 0.07958,-0.01027 0.02707,-0.0062 0.05283,-0.01566 0.07702,-0.0308 0.02419,-0.01515 0.04729,-0.03614 0.06803,-0.06161 0.02074,-0.02547 0.03752,-0.05769 0.05134,-0.09627 -0.02535,0.01929 -0.05447,0.03351 -0.08729,0.04107 -0.03282,0.0076 -0.06206,0.01027 -0.08857,0.01027 -0.0553,0 -0.103583,-0.01245 -0.14505,-0.03722 -0.04147,-0.02477 -0.07632,-0.05691 -0.103974,-0.09756 -0.02765,-0.04064 -0.04907,-0.08751 -0.0629,-0.1412 -0.01383,-0.0537 -0.02054,-0.110279 -0.02054,-0.168155 0,-0.08952 0.01147,-0.166243 0.03337,-0.232337 0.0219,-0.06609 0.05197,-0.121497 0.09114,-0.165588 0.03916,-0.04409 0.08551,-0.07751 0.137348,-0.09884 0.05184,-0.02133 0.107088,-0.03209 0.168156,-0.03209 z m -1.006365,0.317057 c -0.02074,10e-7 -0.03882,0.0061 -0.05263,0.01926 -0.01382,0.01309 -0.02472,0.03449 -0.03338,0.06547 -0.0086,0.03098 -0.01453,0.07168 -0.01797,0.121944 -0.0035,0.05027 -0.0051,0.111837 -0.0051,0.184843 0,0.144627 0.0083,0.246976 0.02439,0.305504 0.01612,0.05853 0.04439,0.08729 0.08472,0.08729 0.01958,0 0.03552,-0.0061 0.04878,-0.01926 0.01326,-0.01309 0.02474,-0.03577 0.03337,-0.06675 0.0086,-0.03098 0.01521,-0.07167 0.01926,-0.121944 0.004,-0.05027 0.0051,-0.111836 0.0051,-0.184843 0,-0.07301 -0.0011,-0.134573 -0.0051,-0.184843 -0.004,-0.05027 -0.01062,-0.09097 -0.01926,-0.121944 -0.0086,-0.03098 -0.02012,-0.05237 -0.03337,-0.06547 -0.01326,-0.01309 -0.0292,-0.01926 -0.04878,-0.01926 z m 1.008933,0.0013 c -0.02303,10e-7 -0.04221,0.01701 -0.05776,0.05006 -0.01556,0.03306 -0.02311,0.08279 -0.02311,0.148902 0,0.06746 0.0085,0.11662 0.02696,0.147617 0.01844,0.031 0.0449,0.04621 0.0783,0.04621 0.02651,0 0.04986,-0.0034 0.0706,-0.01027 0.0023,-0.02063 0.004,-0.04154 0.0051,-0.0629 0.0012,-0.02135 0.0013,-0.04334 0.0013,-0.06675 -10e-7,-0.03308 -9.38e-4,-0.06469 -0.0038,-0.09499 -0.0029,-0.03031 -0.0086,-0.05746 -0.01669,-0.08087 -0.0081,-0.02341 -0.01813,-0.04271 -0.0308,-0.05648 -0.01267,-0.01376 -0.02932,-0.02054 -0.05006,-0.02054 z m -3.796973,0.04364 c 0.09447,2e-6 0.177461,0.01692 0.24774,0.05134 0.03108,0.01517 0.05685,0.03385 0.07702,0.0552 0.02016,0.02135 0.02952,0.04681 0.02953,0.07573 -2e-6,0.02476 -0.006,0.05413 -0.01926,0.08857 -0.01323,0.03445 -0.02919,0.06715 -0.04878,0.09884 -0.0346,-0.03169 -0.07111,-0.05705 -0.109107,-0.07702 -0.03801,-0.01996 -0.07636,-0.0308 -0.115527,-0.0308 -0.04953,10e-7 -0.07445,0.0182 -0.07445,0.05263 0,0.02203 0.0085,0.03835 0.02696,0.05006 0.01842,0.0117 0.04167,0.02126 0.06932,0.02953 0.02765,0.0083 0.0576,0.0179 0.08985,0.02824 0.03225,0.01034 0.0622,0.02555 0.08985,0.04621 0.02765,0.02066 0.05088,0.04891 0.06932,0.08472 0.01844,0.03581 0.02696,0.08337 0.02696,0.1412 0,0.110203 -0.03246,0.197724 -0.09756,0.263144 -0.06509,0.06542 -0.159262,0.09755 -0.283681,0.09755 -0.07144,0 -0.127127,-0.0061 -0.166872,-0.01926 -0.03975,-0.01309 -0.07068,-0.02601 -0.0937,-0.03979 -0.02995,-0.0179 -0.05139,-0.0377 -0.0629,-0.05905 -0.01151,-0.02135 -0.01669,-0.04334 -0.01669,-0.06675 0,-0.03581 0.0074,-0.07083 0.02182,-0.105257 0.0144,-0.03443 0.03036,-0.06837 0.04878,-0.101407 0.01382,0.01513 0.02964,0.02927 0.04749,0.04236 0.01786,0.01309 0.03702,0.02493 0.05776,0.03594 0.02074,0.01101 0.0423,0.01947 0.06418,0.02568 0.02189,0.0062 0.04344,0.009 0.06418,0.009 0.02995,0 0.05023,-0.005 0.0629,-0.01669 0.01267,-0.0117 0.01926,-0.02702 0.01926,-0.04492 -10e-7,-0.02068 -0.0092,-0.03766 -0.02824,-0.05006 -0.01902,-0.0124 -0.04295,-0.02247 -0.0706,-0.03209 -0.02765,-0.0096 -0.05774,-0.02097 -0.09114,-0.03337 -0.0334,-0.0124 -0.06349,-0.03 -0.09114,-0.05134 -0.02765,-0.02135 -0.0516,-0.0496 -0.0706,-0.08472 -0.019,-0.03512 -0.02824,-0.08086 -0.02824,-0.137348 0,-0.05506 0.0099,-0.102449 0.02952,-0.143766 0.01958,-0.04131 0.04548,-0.07583 0.0783,-0.10269 0.03282,-0.02686 0.07033,-0.04724 0.11296,-0.06033 0.04263,-0.01309 0.08753,-0.01926 0.134781,-0.01926 z m 0.851045,0 c 0.134792,2e-6 0.230632,0.03163 0.288817,0.09499 0.05818,0.06336 0.08728,0.16392 0.08729,0.301653 l 0,0.403059 c -10e-7,0.03442 0.0031,0.07232 0.0077,0.112959 0.0046,0.04064 0.0112,0.07624 0.01926,0.106541 -0.01614,0.0055 -0.03099,0.0094 -0.04364,0.01284 -0.01266,0.0035 -0.02511,0.0056 -0.03722,0.0077 -0.01211,0.0021 -0.02527,0.0045 -0.03851,0.0051 -0.01323,6.91e-4 -0.02751,0 -0.04364,0 -0.09331,0 -0.146761,-0.0316 -0.161737,-0.09499 -0.01958,0.02341 -0.04927,0.04489 -0.08729,0.06418 -0.03802,0.01929 -0.08618,0.02953 -0.143766,0.02953 -0.03572,0 -0.06986,-0.0057 -0.10269,-0.01669 -0.03284,-0.01101 -0.06194,-0.02853 -0.08729,-0.05263 -0.02535,-0.0241 -0.04535,-0.05574 -0.06033,-0.09499 -0.01498,-0.03926 -0.02182,-0.08728 -0.02182,-0.143766 -1e-6,-0.07986 0.01749,-0.143745 0.05263,-0.19126 0.03514,-0.04752 0.07696,-0.08303 0.12708,-0.107825 0.05012,-0.0248 0.10304,-0.04062 0.156603,-0.04749 0.05356,-0.0069 0.09931,-0.01027 0.137348,-0.01027 l 0,-0.02953 c -1e-6,-0.01929 -0.0032,-0.0345 -0.009,-0.04621 -0.0058,-0.01171 -0.01331,-0.02076 -0.02311,-0.02696 -0.0098,-0.0062 -0.02141,-0.01077 -0.03466,-0.01284 -0.01326,-0.0021 -0.02739,-0.0026 -0.04236,-0.0026 -0.04029,2e-6 -0.0802,0.0062 -0.119378,0.01926 -0.03918,0.01308 -0.08255,0.03404 -0.13093,0.06161 -0.0219,-0.03169 -0.03913,-0.0634 -0.05006,-0.0937 -0.01093,-0.03031 -0.01669,-0.0529 -0.01669,-0.06803 0,-0.02068 0.0065,-0.04047 0.01797,-0.05905 0.01152,-0.01858 0.03488,-0.03837 0.0706,-0.05905 0.03111,-0.01929 0.07281,-0.03391 0.125795,-0.04492 0.05298,-0.01101 0.107718,-0.01669 0.163021,-0.01669 z m 1.065412,0 c 0.03572,2e-6 0.07168,0.0085 0.109108,0.02439 0.03743,0.01585 0.07216,0.04172 0.10269,0.07958 0.03053,0.03787 0.05545,0.08872 0.07445,0.152752 0.019,0.06403 0.02824,0.143725 0.02824,0.238755 -10e-7,0.111591 -0.0099,0.203098 -0.02953,0.274696 -0.01958,0.0716 -0.04604,0.128713 -0.0783,0.170723 -0.03225,0.04201 -0.06808,0.07144 -0.107825,0.08729 -0.03975,0.01585 -0.07905,0.02311 -0.119377,0.02311 -0.03108,0 -0.05841,-0.004 -0.08087,-0.01155 -0.02247,-0.0076 -0.04092,-0.01662 -0.05648,-0.02696 -0.01556,-0.01033 -0.0286,-0.01928 -0.03722,-0.02824 -0.0086,-0.009 -0.01296,-0.01514 -0.01412,-0.01926 l 0,0.5096 -0.342729,0 0,-1.437664 c 0.01037,-0.0027 0.02341,-0.005 0.03722,-0.0077 0.01266,-0.0027 0.02622,-0.005 0.04236,-0.0064 0.01614,-0.0014 0.03445,-0.0026 0.05519,-0.0026 0.104838,2e-6 0.16964,0.03273 0.193828,0.09884 0.01958,-0.03169 0.04701,-0.05933 0.08215,-0.08344 0.03514,-0.0241 0.08245,-0.03594 0.141199,-0.03594 z m -5.0741827,0.02054 c 0.027666,10e-7 0.053674,0.0028 0.079585,0.009 0.025914,0.0062 0.049736,0.01755 0.069317,0.03337 0.019581,0.01582 0.035398,0.03851 0.047493,0.06675 0.012095,0.02824 0.017973,0.06378 0.017973,0.107825 l 0,0.731668 c 0,0.03031 -0.00151,0.0682 -0.00382,0.112959 -0.00231,0.04476 -0.00736,0.08485 -0.015405,0.120661 -0.012694,0.0551 -0.032556,0.101456 -0.059047,0.138632 -0.026491,0.03717 -0.055736,0.06712 -0.08857,0.08985 -0.032837,0.02274 -0.066721,0.03787 -0.1001228,0.04749 -0.0334,0.0096 -0.061816,0.0154 -0.086003,0.0154 -0.049534,0 -0.086063,-0.01194 -0.1091086,-0.03465 -0.023043,-0.02272 -0.03816,-0.05603 -0.046209,-0.100122 -0.00346,-0.01791 -0.00599,-0.03652 -0.0077,-0.05648 -0.00173,-0.01996 -0.00411,-0.04773 -0.00642,-0.08215 0.036876,-0.0041 0.066807,-0.01199 0.089854,-0.02439 0.023043,-0.0124 0.04124,-0.0282 0.053912,-0.04749 0.012672,-0.01929 0.021067,-0.04128 0.025676,-0.06675 0.00462,-0.02547 0.0077,-0.05442 0.0077,-0.08472 l 0,-0.962721 c 0.013819,-0.0014 0.027385,-0.0024 0.042358,-0.0051 0.012658,-0.0027 0.026801,-0.005 0.042358,-0.0064 0.015557,-0.0014 0.031236,-0.0026 0.046209,-0.0026 z m 4.9188637,0.274696 c -0.01385,1e-6 -0.02532,0.0018 -0.03337,0.0038 -0.008,0.0021 -0.0132,0.0038 -0.01669,0.0051 l 0,0.417179 c 0.0069,0.0055 0.01472,0.0095 0.02568,0.01155 0.01095,0.0021 0.02159,0.0026 0.03081,0.0026 0.03916,0 0.06647,-0.02201 0.08087,-0.06675 0.01439,-0.04474 0.02054,-0.102953 0.02054,-0.174573 0,-0.062 -0.0076,-0.111216 -0.02311,-0.146334 -0.01556,-0.03512 -0.04327,-0.05263 -0.08472,-0.05263 z m -3.6711766,0.009 c -0.03156,0.0045 -0.05287,0.02547 -0.06547,0.06161 -0.0144,0.04132 -0.02182,0.09782 -0.02182,0.169439 0,0.03304 0.0017,0.06418 0.0051,0.09242 0.0035,0.02824 0.0093,0.05181 0.01797,0.07317 0.0086,0.02135 0.01956,0.03895 0.03338,0.05134 0.01382,0.0124 0.03189,0.01797 0.05263,0.01797 0.01382,0 0.02402,-4.81e-4 0.03209,-0.0026 0.0081,-0.0021 0.01449,-0.0038 0.01797,-0.0051 l 0,-0.444136 c -0.0069,-0.0055 -0.016,-0.0095 -0.02696,-0.01155 -0.01095,-0.0021 -0.02159,-0.0026 -0.0308,-0.0026 -0.0049,0 -0.0096,-6.45e-4 -0.01412,0 z m 2.8149966,0.258011 c -0.02187,0.0027 -0.0433,0.0073 -0.0629,0.01284 -0.0196,0.0055 -0.03695,0.01279 -0.05134,0.02311 -0.01439,0.01032 -0.02474,0.02325 -0.03337,0.03979 -0.0086,0.01654 -0.01412,0.03804 -0.01412,0.06418 0,0.03169 0.0074,0.05595 0.02182,0.07317 0.0144,0.01721 0.03498,0.02696 0.06033,0.02696 0.02074,0 0.03908,-0.0057 0.0552,-0.01669 0.01612,-0.01101 0.02439,-0.028 0.02439,-0.05006 l 0,-0.17329 z m 3.667326,0.109108 c 0.04837,0 0.08756,0.01751 0.118094,0.05263 0.03053,0.03512 0.04621,0.0809 0.04621,0.137348 -1e-6,0.05649 -0.01485,0.103412 -0.04364,0.139915 -0.02879,0.0365 -0.06881,0.05391 -0.120662,0.05391 -0.0507,0 -0.09129,-0.01741 -0.120661,-0.05391 -0.02937,-0.0365 -0.04364,-0.08343 -0.04364,-0.139915 0,-0.05645 0.01638,-0.102232 0.04749,-0.137348 0.03111,-0.03512 0.06959,-0.05263 0.116809,-0.05263 z m -5.8610466,0.919078 c 0.04721,2e-6 0.08654,0.01749 0.119377,0.05263 0.03284,0.03514 0.05006,0.08326 0.05006,0.142483 0,0.05922 -0.01722,0.105493 -0.05006,0.139915 -0.03284,0.03442 -0.07216,0.05134 -0.119377,0.05134 -0.04725,10e-7 -0.08784,-0.01692 -0.120662,-0.05134 -0.03281,-0.03442 -0.04878,-0.08069 -0.04878,-0.139915 0,-0.05922 0.01596,-0.107344 0.04878,-0.142483 0.03282,-0.03514 0.07341,-0.05263 0.120662,-0.05263 z m -1.355512,0.01926 c 0.023065,10e-7 0.048538,0.0017 0.074451,0.0051 0.025914,0.0035 0.050262,0.0085 0.07445,0.01541 0.041485,0.0124 0.07787,0.0304 0.1078248,0.05519 0.029953,0.0248 0.044925,0.061 0.044925,0.107825 -7e-7,0.02064 -0.00799,0.04832 -0.021824,0.08344 -0.013833,0.03512 -0.03076,0.07191 -0.052628,0.109108 -0.01842,-0.0124 -0.043072,-0.02544 -0.071885,-0.03851 -0.028813,-0.01307 -0.060432,-0.01926 -0.094988,-0.01926 -0.029953,10e-7 -0.055008,0.0084 -0.075734,0.02696 -0.020728,0.01858 -0.030811,0.0486 -0.030804,0.08857 l 0,0.04878 0.2554418,0 0,0.308071 -0.2554418,0 0,0.690592 -0.3440127,0 0,-0.988394 c 0,-0.0179 7.148e-4,-0.0415 0.0013,-0.07317 5.633e-4,-0.03167 0.00151,-0.05773 0.00382,-0.07702 0.01498,-0.111548 0.054157,-0.196893 0.1180936,-0.255443 0.06393,-0.05855 0.1529454,-0.08729 0.2669951,-0.08729 z m 2.0653576,0 c 0.02307,10e-7 0.04854,0.0017 0.07445,0.0051 0.02591,0.0035 0.05026,0.0085 0.07445,0.01541 0.04148,0.0124 0.07787,0.0304 0.107825,0.05519 0.02995,0.0248 0.04492,0.061 0.04492,0.107825 0,0.02064 -0.0067,0.04832 -0.02054,0.08344 -0.01383,0.03512 -0.03204,0.07191 -0.05391,0.109108 -0.01842,-0.0124 -0.04179,-0.02544 -0.0706,-0.03851 -0.02881,-0.01307 -0.06043,-0.01926 -0.09499,-0.01926 -0.02995,10e-7 -0.05629,0.0084 -0.07702,0.02696 -0.02073,0.01858 -0.03081,0.0486 -0.03081,0.08857 l 0,0.04878 0.255442,0 0,0.308071 -0.255442,0 0,0.690592 -0.344012,0 0,-0.988394 c 0,-0.0179 7.14e-4,-0.0415 0.0013,-0.07317 5.62e-4,-0.03167 0.0015,-0.05773 0.0038,-0.07702 0.01498,-0.111548 0.05416,-0.196893 0.118095,-0.255443 0.06393,-0.05855 0.152944,-0.08729 0.266994,-0.08729 z m 2.117987,0.01669 c 0.02767,2e-6 0.05367,0.0028 0.07958,0.009 0.02591,0.0062 0.04845,0.01753 0.06803,0.03337 0.01958,0.01585 0.0354,0.03722 0.04749,0.06546 0.0121,0.02824 0.01797,0.06506 0.01797,0.109109 l 0,0.664919 c 0.0058,-0.03026 0.01556,-0.06024 0.02824,-0.08985 0.01267,-0.02961 0.02919,-0.05961 0.04878,-0.08857 l 0.09242,-0.142483 c 0.02187,-0.03303 0.04666,-0.06061 0.07317,-0.08472 0.02651,-0.0241 0.06305,-0.03722 0.109109,-0.03722 0.02651,0 0.05167,0.0052 0.07702,0.01412 0.02534,0.009 0.04845,0.01851 0.06803,0.02953 0.02187,0.0124 0.04203,0.02591 0.06161,0.04107 l -0.236188,0.396641 0.279831,0.510884 c -0.07605,0.03716 -0.145879,0.0552 -0.209231,0.0552 -0.05414,0 -0.09725,-0.01124 -0.128363,-0.03466 -0.03111,-0.02341 -0.05784,-0.05398 -0.08087,-0.09114 l -0.110391,-0.183559 c -0.01958,-0.03165 -0.03468,-0.06102 -0.04621,-0.08857 -0.01153,-0.02755 -0.02119,-0.05929 -0.02696,-0.0937 l 0,0.469809 -0.345296,0 0,-1.4505 c 0.01382,-0.0014 0.02867,-0.0037 0.04364,-0.0064 0.01266,-0.0027 0.0268,-0.005 0.04236,-0.0064 0.01556,-0.0014 0.03124,-0.0013 0.04621,-0.0013 z m 1.032037,0 c 0.02767,2e-6 0.05496,0.0028 0.08087,0.009 0.02591,0.0062 0.04845,0.01753 0.06803,0.03337 0.01958,0.01585 0.0354,0.03722 0.04749,0.06546 0.0121,0.02824 0.01797,0.06506 0.01797,0.109109 l 0,1.238701 c -0.04722,0.01791 -0.08892,0.02696 -0.125796,0.02696 -0.05298,0 -0.09385,-0.0066 -0.123228,-0.02182 -0.02937,-0.01515 -0.05235,-0.03554 -0.06675,-0.06033 -0.0144,-0.0248 -0.02279,-0.05364 -0.02568,-0.086 -0.0029,-0.03236 -0.0038,-0.06688 -0.0038,-0.10269 l 0,-1.197626 c 0.01382,-0.0014 0.02738,-0.0037 0.04236,-0.0064 0.01266,-0.0027 0.0268,-0.005 0.04236,-0.0064 0.01556,-0.0014 0.03124,-0.0013 0.04621,-0.0013 z m -4.5145206,0.439001 c 0.07028,10e-7 0.130171,0.01243 0.179708,0.03722 0.04953,0.02479 0.09013,0.05881 0.120661,0.100122 0.03054,0.04132 0.05165,0.08869 0.06547,0.143767 0.01382,0.05508 0.02182,0.113966 0.02182,0.174573 -10e-7,0.0069 -10e-7,0.01525 0,0.02696 -10e-7,0.0117 -6.9e-4,0.02354 -0.0013,0.03594 -5.84e-4,0.0124 -7.21e-4,0.02493 -0.0013,0.03594 -5.63e-4,0.01101 -0.0014,0.01888 -0.0026,0.02439 l -0.462106,0 c 0.0058,0.05232 0.02229,0.09699 0.04878,0.133498 0.02649,0.0365 0.06833,0.05519 0.127079,0.05519 0.04609,0 0.08571,-0.0092 0.11681,-0.02568 0.0311,-0.01652 0.0613,-0.03789 0.09242,-0.06546 0.01498,0.02757 0.02995,0.05918 0.04493,0.09499 0.01497,0.03581 0.0231,0.06746 0.02311,0.09499 -2e-6,0.02341 -0.005,0.04481 -0.01541,0.06547 -0.01037,0.02066 -0.02873,0.04104 -0.05519,0.06033 -0.02535,0.0179 -0.05948,0.03253 -0.10269,0.04493 -0.04321,0.0124 -0.09722,0.01926 -0.161737,0.01926 -0.04722,0 -0.09859,-0.0068 -0.152752,-0.02054 -0.05416,-0.01379 -0.104111,-0.04094 -0.150185,-0.08087 -0.04607,-0.03993 -0.083709,-0.09584 -0.1142427,-0.168155 -0.030537,-0.07231 -0.046209,-0.166627 -0.046209,-0.283682 0,-0.08679 0.012456,-0.162578 0.037223,-0.225919 0.024767,-0.06334 0.056529,-0.115286 0.096272,-0.156602 0.03975,-0.04131 0.08607,-0.07185 0.137348,-0.09114 0.05127,-0.01929 0.102213,-0.02952 0.154035,-0.02952 z m 2.0563726,0 c 0.134791,10e-7 0.231915,0.03291 0.2901,0.09627 0.05818,0.06336 0.08729,0.162636 0.08729,0.300369 l 0,0.403059 c 0,0.03442 0.0018,0.07232 0.0064,0.112959 0.0046,0.04064 0.0112,0.07624 0.01926,0.106542 -0.01614,0.0055 -0.03099,0.0094 -0.04364,0.01284 -0.01266,0.0035 -0.02383,0.0069 -0.03594,0.009 -0.01211,0.0021 -0.02527,0.0032 -0.03851,0.0038 -0.01323,6.89e-4 -0.02751,0.0013 -0.04364,0.0013 -0.09331,0 -0.148044,-0.0316 -0.163021,-0.09499 -0.01958,0.02341 -0.04798,0.04489 -0.086,0.06418 -0.03802,0.01929 -0.08618,0.02824 -0.143767,0.02824 -0.03572,0 -0.06986,-0.0057 -0.10269,-0.01669 -0.03284,-0.01101 -0.06194,-0.02852 -0.08729,-0.05263 -0.02535,-0.0241 -0.04535,-0.05573 -0.06033,-0.09499 -0.01498,-0.03926 -0.02311,-0.08728 -0.02311,-0.143766 0,-0.07986 0.01749,-0.142461 0.05263,-0.189977 0.03514,-0.04751 0.07825,-0.08431 0.128363,-0.109109 0.05012,-0.0248 0.101757,-0.04062 0.155319,-0.04749 0.05356,-0.0069 0.09931,-0.01027 0.137348,-0.01027 l 0,-0.02953 c 0,-0.01929 -0.0032,-0.0345 -0.009,-0.04621 -0.0058,-0.01171 -0.01331,-0.02076 -0.02311,-0.02695 -0.0098,-0.0062 -0.02141,-0.0095 -0.03465,-0.01155 -0.01326,-0.0021 -0.02739,-0.0038 -0.04236,-0.0038 -0.04029,10e-7 -0.08019,0.0075 -0.119377,0.02054 -0.03918,0.01308 -0.08256,0.03276 -0.13093,0.06033 -0.0219,-0.03169 -0.03784,-0.06212 -0.04878,-0.09242 -0.01093,-0.03031 -0.01669,-0.05419 -0.01669,-0.06932 0,-0.02068 0.0052,-0.03918 0.01669,-0.05776 0.01152,-0.01858 0.03616,-0.03837 0.07188,-0.05905 0.03111,-0.01929 0.07281,-0.0352 0.125796,-0.04621 0.05298,-0.01101 0.106434,-0.01668 0.161737,-0.01669 z m 0.834358,0 c 0.09447,10e-7 0.176177,0.0182 0.246457,0.05263 0.03108,0.01518 0.05685,0.03256 0.07702,0.05391 0.02016,0.02135 0.0308,0.04681 0.03081,0.07573 0,0.02476 -0.0073,0.05413 -0.02054,0.08857 -0.01323,0.03445 -0.02919,0.06843 -0.04878,0.100123 -0.0346,-0.03169 -0.0711,-0.05833 -0.109107,-0.0783 -0.03801,-0.01996 -0.07636,-0.02952 -0.115527,-0.02952 -0.04953,1e-6 -0.07445,0.01692 -0.07445,0.05134 0,0.02203 0.0098,0.03964 0.02824,0.05134 0.01842,0.01171 0.04167,0.02126 0.06932,0.02953 0.02765,0.0083 0.0576,0.0179 0.08985,0.02824 0.03225,0.01034 0.06221,0.02555 0.08985,0.04621 0.02765,0.02066 0.04959,0.04891 0.06803,0.08472 0.01844,0.03581 0.02824,0.08208 0.02824,0.139915 0,0.110205 -0.03246,0.197725 -0.09756,0.263144 -0.06509,0.06542 -0.160545,0.09884 -0.284965,0.09884 -0.07144,0 -0.127127,-0.0061 -0.166872,-0.01926 -0.03975,-0.01309 -0.07068,-0.02729 -0.0937,-0.04107 -0.02995,-0.01791 -0.0501,-0.0377 -0.06161,-0.05905 -0.01151,-0.02135 -0.01797,-0.04334 -0.01797,-0.06675 0,-0.03581 0.0074,-0.07083 0.02182,-0.105258 0.0144,-0.03442 0.03036,-0.06837 0.04878,-0.101406 0.01382,0.01513 0.02963,0.02927 0.04749,0.04236 0.01786,0.01309 0.0383,0.02493 0.05905,0.03594 0.02074,0.01101 0.04102,0.01947 0.0629,0.02568 0.02188,0.0062 0.04344,0.01027 0.06418,0.01027 0.02995,0 0.05151,-0.0063 0.06418,-0.01797 0.01267,-0.01171 0.01926,-0.02702 0.01926,-0.04493 -1e-6,-0.02068 -0.0092,-0.03638 -0.02824,-0.04878 -0.01902,-0.0124 -0.04295,-0.02375 -0.0706,-0.03338 -0.02765,-0.0096 -0.05774,-0.02097 -0.09114,-0.03337 -0.0334,-0.0124 -0.06477,-0.02871 -0.09242,-0.05006 -0.02765,-0.02135 -0.05031,-0.0496 -0.06932,-0.08472 -0.019,-0.03512 -0.02824,-0.08086 -0.02824,-0.137348 0,-0.05506 0.0087,-0.103733 0.02824,-0.14505 0.01958,-0.04131 0.04676,-0.07583 0.07958,-0.102691 0.03282,-0.02686 0.07033,-0.04596 0.11296,-0.05905 0.04262,-0.01309 0.08753,-0.02054 0.134781,-0.02054 z m -2.2668876,0.02182 c 0.02767,2e-6 0.05367,0.0028 0.07959,0.009 0.02591,0.0062 0.04845,0.01755 0.06803,0.03337 0.01958,0.01582 0.0354,0.03722 0.04749,0.06547 0.01209,0.02824 0.01797,0.06506 0.01797,0.109108 l 0,0.730385 c -10e-7,0.03031 -2.47e-4,0.0682 -0.0026,0.112959 -0.0023,0.04476 -0.0073,0.08485 -0.01541,0.120661 -0.01269,0.0551 -0.03256,0.101456 -0.05905,0.138632 -0.02649,0.03717 -0.05574,0.06712 -0.08857,0.08985 -0.03284,0.02274 -0.06672,0.03916 -0.100123,0.04878 -0.0334,0.0096 -0.06182,0.01412 -0.086,0.01412 -0.04953,-10e-7 -0.08606,-0.01066 -0.109108,-0.03337 -0.02304,-0.02272 -0.03816,-0.05732 -0.04621,-0.101407 -0.0035,-0.01791 -0.006,-0.03652 -0.0077,-0.05648 -0.0017,-0.01996 -0.0041,-0.04645 -0.0064,-0.08087 0.03688,-0.0041 0.06681,-0.01328 0.08985,-0.02568 0.02304,-0.0124 0.04124,-0.0282 0.05391,-0.04749 0.01267,-0.01929 0.02107,-0.04128 0.02567,-0.06675 0.0046,-0.02547 0.0064,-0.05313 0.0064,-0.08344 l 0,-0.962721 c 0.01382,-0.0014 0.02867,-0.0037 0.04364,-0.0064 0.01266,-0.0027 0.0268,-0.005 0.04236,-0.0064 0.01556,-0.0014 0.03124,-0.0013 0.04621,-0.0013 z m -0.627694,0.237462 c -0.05418,2e-6 -0.08087,0.04975 -0.08087,0.148902 l 0.165589,0 c -1e-6,-0.05645 -0.006,-0.09546 -0.01926,-0.116811 -0.01323,-0.02135 -0.03551,-0.03209 -0.06547,-0.03209 z m 2.1141356,0.302937 c -0.02187,0.0027 -0.04201,0.0073 -0.06161,0.01284 -0.0196,0.0055 -0.03695,0.01279 -0.05134,0.02311 -0.0144,0.01032 -0.02603,0.02454 -0.03466,0.04107 -0.0086,0.01654 -0.01284,0.03804 -0.01284,0.06418 -1e-6,0.03169 0.0074,0.05595 0.02182,0.07317 0.0144,0.01721 0.0337,0.02567 0.05905,0.02567 0.02074,0 0.03908,-0.0057 0.0552,-0.01669 0.01612,-0.01101 0.02439,-0.028 0.02439,-0.05006 l 0,-0.17329 z"
-     id="rect3812"
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.75;color:#000000;fill:#b26609;fill-opacity:1;stroke:none;stroke-width:35;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 4.1836061,17.471233 13.4417839,0 0.74997,1.038421 -14.932688,0 0.7409341,-1.038421 z"
-     id="path4453"
-     sodipodi:nodetypes="ccccc"
-     style="opacity:0.75;fill:#b26609;fill-opacity:1;stroke:#b26609;stroke-width:0.53171611;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 3.2693308,21.313096 15.2703332,0 1e-6,-1.788391 -15.2612975,0 -0.00904,1.788391 z"
-     id="path4457"
-     sodipodi:nodetypes="ccccc"
-     style="opacity:0.75;fill:#b26609;fill-opacity:1;stroke:#b26609;stroke-width:0.53171611;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/navit/xpm/memorial.xpm b/navit/xpm/memorial.xpm
deleted file mode 100644
index c05e01909..000000000
--- a/navit/xpm/memorial.xpm
+++ /dev/null
@@ -1,51 +0,0 @@
-/* XPM */
-static char *dummy[]={
-"16 16 32 1",
-". c None",
-"m c #625112",
-"f c #646464",
-"a c #707070",
-"l c #736118",
-"i c #957d1d",
-"# c #999999",
-"b c #9c9b95",
-"e c #9f9c92",
-"h c #a08723",
-"o c #a5a08b",
-"r c #aaa386",
-"A c #aba384",
-"z c #aca383",
-"g c #afa580",
-"D c #b0a67e",
-"s c #b1a77e",
-"u c #b2a77d",
-"w c #b2a77e",
-"k c #b3a87c",
-"j c #b4a97b",
-"t c #b5a97a",
-"B c #b7aa77",
-"n c #b8ab76",
-"y c #baac74",
-"x c #c4b269",
-"C c #c5b368",
-"v c #c6b368",
-"q c #d9b830",
-"p c #dab934",
-"c c #ddc04e",
-"d c #e2c349",
-".......##.......",
-".....######.....",
-"....#######a....",
-"....##bcde#f....",
-"....##ghij#f....",
-"....##klmn#f....",
-"....##opqr#f....",
-"....###st##f....",
-"....#######f....",
-"....#uvwxyzf....",
-"....#######f....",
-"....#ABCDvtf....",
-"....#######f....",
-"....#######f....",
-"....#######f....",
-"....#######f...."};
diff --git a/navit/xpm/menu.xpm b/navit/xpm/menu.xpm
deleted file mode 100644
index 067a9077d..000000000
--- a/navit/xpm/menu.xpm
+++ /dev/null
@@ -1,101 +0,0 @@
-/* XPM */
-static char *dummy[]={
-"96 96 2 1",
-". c None",
-"# c #808080",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"...........................................####.................................................",
-"..........................................######................................................",
-"..........................................######................................................",
-"..........................................######................................................",
-"..........................................######................................................",
-"..........................................######................................................",
-"..........................................######................................................",
-"..........................................######................................................",
-"..........................................######................................................",
-"..........................................######................................................",
-"..........................................######................................................",
-"..........................................######................................................",
-"..........................................######................................................",
-"..........................................######................................................",
-"..........................................######................................................",
-"..........................................######................................................",
-"..........................................######................................................",
-"..........................######################................................................",
-".........................#######################................................................",
-".........................#######################................................................",
-".........................#######################................................................",
-".........................#######################................................................",
-"..........................######################................................................",
-"................................................######################..........................",
-"................................................#######################.........................",
-"................................................#######################.........................",
-"................................................#######################.........................",
-"................................................#######################.........................",
-"................................................######################..........................",
-"................................................######..........................................",
-"................................................######..........................................",
-"................................................######..........................................",
-"................................................######..........................................",
-"................................................######..........................................",
-"................................................######..........................................",
-"................................................######..........................................",
-"................................................######..........................................",
-"................................................######..........................................",
-"................................................######..........................................",
-"................................................######..........................................",
-"................................................######..........................................",
-"................................................######..........................................",
-"................................................######..........................................",
-"................................................######..........................................",
-"................................................######..........................................",
-".................................................####...........................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................"};
diff --git a/navit/xpm/peak.svg b/navit/xpm/peak.svg
deleted file mode 100644
index a8c05231d..000000000
--- a/navit/xpm/peak.svg
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="peak.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/projets/navit/icons/png/peak.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3156">
-      <stop
-         style="stop-color:#22a638;stop-opacity:1;"
-         offset="0"
-         id="stop3159" />
-      <stop
-         style="stop-color:#11571d;stop-opacity:1;"
-         offset="1"
-         id="stop3161" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3154">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3156" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3158" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3154"
-       id="linearGradient3160"
-       x1="12"
-       y1="7.5346489"
-       x2="12.048141"
-       y2="16.097149"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-0.125)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3156"
-       id="linearGradient3163"
-       x1="6.6808548"
-       y1="7.8981066"
-       x2="12.644531"
-       y2="8.9276867"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f4ca00"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="14.179676"
-     inkscape:cy="17.133893"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="-4"
-     inkscape:window-y="24">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       transform="matrix(1.4115471,0,0,1.4839561,-0.8483516,-0.2482945)"
-       style="fill:url(#linearGradient3163);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.69094228999999996;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 1.8015623,13.384928 L 4.5242674,5.8854567 L 7.7319891,1.4762525 L 10.404453,5.4662229 L 12.508227,3.6366511 L 15.187234,13.291697 C 10.749842,15.038029 6.3562797,14.205412 1.8015623,13.384928 z"
-       id="path2383"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       style="fill:url(#linearGradient3160);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 5.6709911,9.720456 L 6.1042619,8.5740083 L 10,2.875 L 13.836782,8.5770705 L 16.535086,6.1186473 L 18.425291,13.623844 C 17.33201,14.07626 16.518773,10.986647 15.468751,10.771957 C 14.418728,10.557267 13.506921,12.030002 12.466501,11.482114 C 11.42608,10.934227 9.4445466,13.678217 8.3800711,13.13104 C 7.3155956,12.583862 6.7931784,9.933016 5.6709911,9.720456 z"
-       id="path3152"
-       sodipodi:nodetypes="ccccccsssc" />
-  </g>
-</svg>
diff --git a/navit/xpm/pharmacy.svg b/navit/xpm/pharmacy.svg
deleted file mode 100644
index 740df6315..000000000
--- a/navit/xpm/pharmacy.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="pharmacy.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/projets/navit/icons/png/police.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f4ca00"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="-15.95198"
-     inkscape:cy="11.805047"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="242"
-     inkscape:window-y="27"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:#00c300;fill-opacity:1;stroke:none;stroke-width:0.10000000000000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2402"
-       width="22.053572"
-       height="21.916471"
-       x="2.1543853e-09"
-       y="0.083529949" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.68457568;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3174"
-       width="18.76638"
-       height="18.892651"
-       x="1.6969202"
-       y="1.5998334" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2.19641232;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3176"
-       width="13.203781"
-       height="1.8490809"
-       x="4.5480123"
-       y="9.8471451" />
-    <rect
-       y="10.315658"
-       x="-17.452475"
-       height="2.1232688"
-       width="13.059461"
-       id="rect3178"
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2.34073305;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       transform="matrix(0,-1,1,0,0,0)" />
-  </g>
-</svg>
diff --git a/navit/xpm/picnic.svg b/navit/xpm/picnic.svg
deleted file mode 100644
index c927229c9..000000000
--- a/navit/xpm/picnic.svg
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   id="svg2"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="picnic.svg"
-   sodipodi:version="0.32"
-   version="1.0"
-   width="22">
-  <metadata
-     id="metadata2975">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10.0"
-     guidetolerance="10.0"
-     id="base"
-     inkscape:current-layer="svg2"
-     inkscape:cx="7.5375917"
-     inkscape:cy="10.398785"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="725"
-     inkscape:window-width="1024"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:zoom="14.746834"
-     objecttolerance="10.0"
-     pagecolor="#ffffff"
-     showgrid="false"
-     inkscape:window-maximized="1" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective2441"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3452"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       inkscape:vp_x="0 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="60 : 30 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <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
-         d="M94,176l-21,39"
-         fill="none"
-         id="path4462"
-         stroke="#000000"
-         stroke-width="20" />
-      <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
-         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
-         id="path4466"
-         ill="none"
-         stroke="#000000"
-         stroke-width="20" />
-    </symbol>
-    <inkscape:perspective
-       id="perspective4471"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4668"
-       inkscape:persp3d-origin="6 : 4 : 1"
-       inkscape:vp_x="0 : 6 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="12 : 6 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <g
-     id="g1327"
-     transform="matrix(0.04411003,0,0,0.04411003,-1.7630903,-2.4407772)">
-    <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-       id="path1329"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="layer3"
-     inkscape:label="Layout"
-     style="display:none;stroke:#757575;stroke-opacity:1"
-     transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
-    <rect
-       height="10"
-       id="rect4134"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="10"
-       x="1"
-       y="1" />
-    <rect
-       height="8"
-       id="rect4136"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="8"
-       x="2"
-       y="2" />
-  </g>
-  <path
-     d="m 7.5746037,10.107448 2.0986832,-5.1565636 2.1508751,0 2.098683,5.1565636 -6.3482413,0 z m 6.8408883,-5.1565636 3.497543,0 0,-1.9175996 -13.8628608,0 0,1.9175996 3.4722387,0 -2.098684,5.1565636 -5.1304682,0 0,1.916808 4.3531486,0 -2.4094536,6.012169 2.3580538,0 2.4355491,-6.012169 7.8767864,0 2.43555,6.012169 2.384148,0 -2.435548,-6.012169 4.379244,0 0,-1.916808 -5.156563,0 -2.098684,-5.1565636 z"
-     id="flowRoot3192"
-     style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#b26609;fill-opacity:1;stroke:none;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/navit/xpm/police.svg b/navit/xpm/police.svg
deleted file mode 100644
index f5af848e2..000000000
--- a/navit/xpm/police.svg
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="police.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/projets/navit/icons/png/police.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f4ca00"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="4.228318"
-     inkscape:cy="2.9575573"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="-4"
-     inkscape:window-y="24">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.98289609;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2382"
-       width="21.088533"
-       height="21.088533"
-       x="0.49144801"
-       y="0.49144825" />
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 1.9642857,4.0446429 L 4.4955383,2.5580358 C 7.2473615,5.9567783 9.3016752,5.5646255 11.026791,3.0714286 C 13.727083,6.351945 15.740052,5.3710182 17.535719,2.5580386 L 20.044648,4.0446486 C 15.053284,7.0531313 22.014992,15.341425 10.892857,20.125006 C -0.39160289,14.860382 6.3806583,7.2279063 1.9642857,4.0446429 z"
-       id="rect2383"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       sodipodi:type="star"
-       style="opacity:1;fill:#f4f400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.19999990000000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:0.40000001000000002;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3162"
-       sodipodi:sides="5"
-       sodipodi:cx="11.237947"
-       sodipodi:cy="10.067573"
-       sodipodi:r1="6.6567273"
-       sodipodi:r2="3.3283637"
-       sodipodi:arg1="0.95385444"
-       sodipodi:arg2="1.582173"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 15.089154,15.497142 L 11.200083,13.395721 L 7.264208,15.408117 L 8.0609895,11.060015 L 4.930835,7.9386407 L 9.3123443,7.3527877 L 11.313677,3.4112761 L 13.224817,7.3973005 L 17.591863,8.082687 L 14.391504,11.132039 L 15.089154,15.497142 z"
-       transform="translate(-0.3915037,1.0101525)" />
-  </g>
-</svg>
diff --git a/navit/xpm/post.svg b/navit/xpm/post.svg
deleted file mode 100644
index 437bd2a69..000000000
--- a/navit/xpm/post.svg
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="post.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/navit/icons/png/post.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f4ca00"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="12.393787"
-     inkscape:cy="25.782283"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="0"
-     inkscape:window-y="25">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:#d8d8d8;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2381"
-       width="19"
-       height="13.0625"
-       x="1.5"
-       y="4.375" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#787878;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 2.5,16.4375 L 11.0625,9.625 L 19.4375,16.4375"
-       id="path3158"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 1.5,4.375 L 20.5,4.375 L 11,12.625 L 1.5,4.375 z"
-       id="rect3153"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
diff --git a/navit/xpm/public_office.xpm b/navit/xpm/public_office.xpm
deleted file mode 100644
index da3554b25..000000000
--- a/navit/xpm/public_office.xpm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* XPM */
-static char * public_office_xpm[] = {
-"16 16 13 1",
-" 	c None",
-".	c #888888",
-"+	c #FFFFFF",
-"@	c #D5D5D5",
-"#	c #5A5A5A",
-"$	c #E4E4E4",
-"%	c #676767",
-"&	c #000000",
-"*	c #737373",
-"=	c #C4C4C4",
-"-	c #555555",
-";	c #C9C9C9",
-">	c #C1C1C1",
-"         .      ",
-"        .+.     ",
-"       .+++.    ",
-"      .+@#$+.   ",
-"      .+%&*+.   ",
-"      .+=-;+....",
-". . . .++++++++.",
-"..+.. .+>>>+>>+.",
-".+++. .+>>>+>>+.",
-".+>+. .++++++++.",
-".+>+...+>>>+>>+.",
-".++++++++++++++.",
-".+>>>>+>>>>+>>+.",
-".+>>>>+>>>>+>>+.",
-".+++++++++++>>+.",
-"................"};
diff --git a/navit/xpm/restaurant.svg b/navit/xpm/restaurant.svg
deleted file mode 100644
index 9566d66cc..000000000
--- a/navit/xpm/restaurant.svg
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="restaurant.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/projets/navit/icons/png/police.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2411"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2424"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f4ca00"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.839192"
-     inkscape:cx="13.028723"
-     inkscape:cy="10.321226"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1278"
-     inkscape:window-height="682"
-     inkscape:window-x="0"
-     inkscape:window-y="39"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#0000a9;stroke-width:2.64169335;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect3210"
-       width="19.235533"
-       height="19.235533"
-       x="1.3360755"
-       y="1.4283922" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 5.9346462,4.7555282 L 13.668627,12.110702 L 17.361997,15.677803 C 17.361997,15.677803 17.708606,16.39417 17.298863,16.940493 C 16.825353,17.571839 15.973037,17.3193 15.973037,17.3193 L 12.184965,13.341825 C 12.184965,13.341825 12.015475,13.122769 11.806158,13.152421 C 11.302183,13.223814 11.048544,13.089287 11.048544,13.089287 L 5.42957,7.2809096 C 5.42957,7.2809096 5.1999493,6.9813178 5.2243828,6.0340025 C 5.2396325,5.442752 5.265468,4.3923122 5.9346462,4.7555282 z"
-       id="path2430"
-       sodipodi:nodetypes="cccsccsccsc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 9.4070456,11.447789 L 4.4194174,15.614668 C 4.4194174,15.614668 3.9459084,16.359911 4.5141192,16.991256 C 5.08233,17.622602 5.9346462,17.129897 5.9346462,17.129897 C 5.9346462,17.129897 10.338512,12.659627 10.480333,12.521076"
-       id="path2432"
-       sodipodi:nodetypes="ccscc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 11.411567,9.8965542 C 11.411567,9.8965542 12.263883,9.2380802 12.137614,8.8592729 C 12.011345,8.4804657 11.990189,8.1618356 12.232315,7.6597168 C 12.514645,7.0742235 15.183855,5.0080663 15.183855,5.0080663 C 15.183855,5.0080663 15.461119,4.8416355 15.641581,5.0080663 C 15.84834,5.1987499 15.688932,5.5289263 15.688932,5.5289263 L 13.195118,7.7860688 C 13.195118,7.7860688 13.354105,7.9090122 13.558141,8.1332258 C 14.105658,7.5710979 16.099306,5.8130317 16.099306,5.8130317 C 16.099306,5.8130317 16.423421,5.5995132 16.589625,5.797248 C 16.68885,5.9152963 16.687504,6.1129207 16.582808,6.2470815 C 16.057693,6.7243248 14.047365,8.6540856 14.047434,8.6540856 C 14.047434,8.6540856 14.186815,8.7946501 14.442025,9.0328929 C 14.973622,8.5036933 17.03054,6.6337806 17.03054,6.6337806 C 17.03054,6.6337806 17.287676,6.4889041 17.472482,6.6653478 C 17.682983,6.8663237 17.527352,7.1259728 17.507436,7.1787194 C 16.840392,7.8470278 15.041057,9.7963065 14.520943,10.027262 C 13.978981,10.267919 13.747462,10.13845 13.100416,10.090396 C 12.741483,10.063739 12.279667,10.690174 12.279667,10.690174"
-       id="path2434"
-       sodipodi:nodetypes="csscsccccsccccscssc" />
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 11.817155,13 C 11.817155,13 12.360879,12.784651 12.721609,12.489509 C 13.068849,12.205403 13.352954,11.83342 13.352954,11.83342 L 17.393564,15.740937 L 17.519833,16.372282 L 17.204161,17.09833 L 16.604383,17.350868 L 15.878335,17.3193 L 11.817155,13 z"
-       id="path3208"
-       sodipodi:nodetypes="csccccccc" />
-  </g>
-</svg>
diff --git a/navit/xpm/school.svg b/navit/xpm/school.svg
deleted file mode 100644
index be94ce858..000000000
--- a/navit/xpm/school.svg
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="school.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/projets/navit/icons/png/police.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3155">
-      <stop
-         id="stop3163"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0000ff;stop-opacity:0.74901962;"
-         offset="1"
-         id="stop3171" />
-      <stop
-         style="stop-color:#0000ff;stop-opacity:0.49803922;"
-         offset="1"
-         id="stop3165" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective3181"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3155"
-       id="linearGradient3173"
-       x1="1.6414979"
-       y1="10.983024"
-       x2="19.824244"
-       y2="10.983024"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f4ca00"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.2"
-     inkscape:cx="-0.077714857"
-     inkscape:cy="20.517857"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="272"
-     inkscape:window-y="42"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:url(#linearGradient3173);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-       d="M 1.6414979,8.3629406 L 11.806158,4.5748686 L 19.824244,6.0900974 L 17.172593,9.4993623 L 18.24588,11.582802 L 18.877226,14.61326 L 14.773481,17.26491 L 8.7125657,17.391179 L 4.4194174,15.118336 L 4.7982246,12.719223 L 6.1240498,10.130708 L 1.6414979,8.3629406 z"
-       id="path3197" />
-    <path
-       id="path3187"
-       style="fill:none;fill-rule:nonzero;stroke:#000000;stroke-width:1.302;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;marker-start:none"
-       d="M 6.1610364,10.267475 C 6.1610364,10.267475 5.5168892,10.670067 4.7117053,13.0051 C 4.2624077,14.308063 4.7117053,15.340134 4.7117053,15.340134 C 4.7117053,15.340134 7.2065946,17.468216 10.267474,17.51413 C 16.628427,17.610752 18.560869,14.615468 18.560869,14.615468 C 18.560869,14.615468 18.813726,13.757504 18.238795,11.636288 C 17.646688,9.4516998 17.272574,9.5428088 17.272574,9.5428088 M 1.5714881,8.5926922 L 13.890802,12.924581 L 20.332273,6 L 11.732909,4.3091138 L 1.5714881,8.5926922 z M 15.501169,11.636288 C 15.501169,11.636288 16.979895,12.602929 17.594648,14.857023 C 18.319313,17.51413 17.651583,18.206976 17.651583,18.206976 C 17.651583,18.206976 18.939877,19.108783 18.778841,20.155522 M 17.32951,20.380973 C 17.32951,20.380973 18.295731,19.253716 17.651583,17.884903 C 17.651583,17.884903 16.8464,18.609569 16.443807,20.155522"
-       sodipodi:nodetypes="cscscscccccccsccccc" />
-  </g>
-</svg>
diff --git a/navit/xpm/shop_computer.svg b/navit/xpm/shop_computer.svg
deleted file mode 100644
index ef1000b79..000000000
--- a/navit/xpm/shop_computer.svg
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   id="svg2"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="shop_computer.svg"
-   sodipodi:version="0.32"
-   version="1.0"
-   width="22">
-  <metadata
-     id="metadata2975">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10.0"
-     guidetolerance="10.0"
-     id="base"
-     inkscape:current-layer="svg2"
-     inkscape:cx="54.319367"
-     inkscape:cy="1.3750313"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="725"
-     inkscape:window-maximized="1"
-     inkscape:window-width="1024"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:zoom="7.3734169"
-     objecttolerance="10.0"
-     pagecolor="#ffffff"
-     showgrid="false" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective2441"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3452"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       inkscape:vp_x="0 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="60 : 30 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <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
-         d="M94,176l-21,39"
-         fill="none"
-         id="path4462"
-         stroke="#000000"
-         stroke-width="20" />
-      <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
-         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
-         id="path4466"
-         ill="none"
-         stroke="#000000"
-         stroke-width="20" />
-    </symbol>
-    <inkscape:perspective
-       id="perspective4471"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4668"
-       inkscape:persp3d-origin="6 : 4 : 1"
-       inkscape:vp_x="0 : 6 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="12 : 6 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4725"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6330"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6376"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6376-2"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6407"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <g
-     id="g1327"
-     transform="matrix(0.04191547,0,0,0.04191547,-1.2206009,-1.2201752)">
-    <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-       id="path1329"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="layer3"
-     inkscape:label="Layout"
-     style="display:none;stroke:#757575;stroke-opacity:1"
-     transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
-    <rect
-       height="10"
-       id="rect4134"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="10"
-       x="1"
-       y="1" />
-    <rect
-       height="8"
-       id="rect4136"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="8"
-       x="2"
-       y="2" />
-  </g>
-  <g
-     id="g3626"
-     transform="matrix(1.313665,0,0,1.313665,0.50349614,3.3902163)">
-    <path
-       d="m 2.4483515,8.2362225 11.1032965,0 c 0.30455,0 0.412539,0.2781433 0.549729,0.550351 l 1.4905,2.9574075 c 0.13719,0.272208 -0.245178,0.550352 -0.549728,0.550352 l -14.08429756,0 c -0.30454944,0 -0.68691783,-0.278144 -0.54972816,-0.550352 L 1.8986234,8.7865735 C 2.0358129,8.5143659 2.1438021,8.2362225 2.4483515,8.2362225 z"
-       id="rect4428"
-       sodipodi:nodetypes="ccssccssc"
-       style="fill:none;stroke:#ad30c0;stroke-width:1.03200889;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 1.4764801,9.2012489 13.0299889,0"
-       id="path4432"
-       sodipodi:nodetypes="cc"
-       style="fill:none;stroke:#ad30c0;stroke-width:0.25799972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 1.0932552,9.8745606 13.7430548,0"
-       id="path4434"
-       sodipodi:nodetypes="cc"
-       style="fill:none;stroke:#ad30c0;stroke-width:0.25799972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 0.79760876,10.637491 14.41115024,0"
-       id="path4436"
-       sodipodi:nodetypes="cc"
-       style="fill:none;stroke:#ad30c0;stroke-width:0.25799972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-  </g>
-  <rect
-     height="11.072239"
-     id="rect4426"
-     rx="0.67181033"
-     ry="0.67181033"
-     style="fill:none;stroke:#ad30c0;stroke-width:1.35571396;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     width="15.010219"
-     x="3.5077097"
-     y="2.1739063" />
-  <g
-     id="g3658"
-     transform="matrix(1.4821886,0,0,1.4821886,-1.3097401,2.5924595)">
-    <path
-       d="m 6.445849,0.54307086 0,4.60246824 1.679497,-1.453411 2.034775,-0.7105565 -3.714272,-2.43850074 z"
-       id="path3619"
-       sodipodi:nodetypes="ccccc"
-       style="fill:#ad30c0;fill-opacity:1;stroke:none"
-       inkscape:connector-curvature="0" />
-    <rect
-       height="1.1156085"
-       id="rect3649"
-       rx="0"
-       ry="0"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       transform="matrix(-0.5,-0.8660254,0.8660254,-0.5,0,0)"
-       width="3.1568718"
-       x="-9.5682249"
-       y="4.6760492" />
-  </g>
-  <rect
-     height="11.072239"
-     id="rect4426-3"
-     rx="0.67181033"
-     ry="0.67181033"
-     style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:1.35571396;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     width="15.010219"
-     x="3.5077097"
-     y="2.1739063" />
-  <g
-     id="g3626-4"
-     style="opacity:0.1;fill:#ffffff;fill-opacity:1"
-     transform="matrix(1.313665,0,0,1.313665,0.50349614,3.3902163)">
-    <path
-       d="m 2.4483515,8.2362225 11.1032965,0 c 0.30455,0 0.412539,0.2781433 0.549729,0.550351 l 1.4905,2.9574075 c 0.13719,0.272208 -0.245178,0.550352 -0.549728,0.550352 l -14.08429756,0 c -0.30454944,0 -0.68691783,-0.278144 -0.54972816,-0.550352 L 1.8986234,8.7865735 C 2.0358129,8.5143659 2.1438021,8.2362225 2.4483515,8.2362225 z"
-       id="rect4428-2"
-       sodipodi:nodetypes="ccssccssc"
-       style="fill:#ad30c0;fill-opacity:1;stroke:#ad30c0;stroke-width:1.03200889;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 1.4764801,9.2012489 13.0299889,0"
-       id="path4432-0"
-       sodipodi:nodetypes="cc"
-       style="fill:#ad30c0;fill-opacity:1;stroke:#ad30c0;stroke-width:0.25799972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 1.0932552,9.8745606 13.7430548,0"
-       id="path4434-5"
-       sodipodi:nodetypes="cc"
-       style="fill:#ad30c0;fill-opacity:1;stroke:#ad30c0;stroke-width:0.25799972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 0.79760876,10.637491 14.41115024,0"
-       id="path4436-9"
-       sodipodi:nodetypes="cc"
-       style="fill:#ad30c0;fill-opacity:1;stroke:#ad30c0;stroke-width:0.25799972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/navit/xpm/shop_department.svg b/navit/xpm/shop_department.svg
deleted file mode 100644
index fe069d126..000000000
--- a/navit/xpm/shop_department.svg
+++ /dev/null
@@ -1,496 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   id="svg2"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="shop_department.svg"
-   sodipodi:version="0.32"
-   version="1.0"
-   width="22">
-  <metadata
-     id="metadata2975">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10.0"
-     guidetolerance="10.0"
-     id="base"
-     inkscape:current-layer="svg2"
-     inkscape:cx="31.570822"
-     inkscape:cy="-5.8544315"
-     inkscape:guide-bbox="true"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="725"
-     inkscape:window-maximized="0"
-     inkscape:window-width="1024"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:zoom="7.3734168"
-     objecttolerance="10.0"
-     pagecolor="#ffffff"
-     showgrid="false"
-     showguides="true" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective2441"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="6.1230318e-14 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3452"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       inkscape:vp_x="0 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="60 : 30 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <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
-         d="M94,176l-21,39"
-         fill="none"
-         id="path4462"
-         stroke="#000000"
-         stroke-width="20" />
-      <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
-         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
-         id="path4466"
-         ill="none"
-         stroke="#000000"
-         stroke-width="20" />
-    </symbol>
-    <inkscape:perspective
-       id="perspective4471"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4668"
-       inkscape:persp3d-origin="6 : 4 : 1"
-       inkscape:vp_x="0 : 6 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="12 : 6 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3826"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3855"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3909"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3950"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3972"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3994"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4016"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4837"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4971"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6216"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6764"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective6817"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       cx="180.2453"
-       cy="198.41902"
-       fx="180.2453"
-       fy="198.41902"
-       gradientTransform="scale(0.79354273,1.2601716)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient874"
-       r="101.58017"
-       xlink:href="#linearGradient829" />
-    <linearGradient
-       id="linearGradient829">
-      <stop
-         id="stop830"
-         offset="0.0000000"
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0.341667;" />
-      <stop
-         id="stop831"
-         offset="1.0000000"
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
-    </linearGradient>
-    <radialGradient
-       cx="360.85146"
-       cy="167.47372"
-       fx="360.85146"
-       fy="167.47372"
-       gradientTransform="scale(1.007004,0.99304475)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient832"
-       r="46.394721"
-       xlink:href="#linearGradient829" />
-    <linearGradient
-       id="linearGradient6826">
-      <stop
-         id="stop6828"
-         offset="0.0000000"
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0.341667;" />
-      <stop
-         id="stop6830"
-         offset="1.0000000"
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="scale(0.74491357,1.3424376)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient850"
-       spreadMethod="pad"
-       x1="465.29425"
-       x2="463.27056"
-       xlink:href="#linearGradient855"
-       y1="248.24467"
-       y2="405.7687" />
-    <linearGradient
-       id="linearGradient855">
-      <stop
-         id="stop856"
-         offset="0.0000000"
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
-      <stop
-         id="stop857"
-         offset="1.0000000"
-         style="stop-color: rgb(255, 166, 23); stop-opacity: 0.733333;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="scale(1.4586159,0.68558144)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient854"
-       x1="157.80581"
-       x2="155.40575"
-       xlink:href="#linearGradient855"
-       y1="120.96176"
-       y2="231.63491" />
-    <linearGradient
-       id="linearGradient6837">
-      <stop
-         id="stop6839"
-         offset="0.0000000"
-         style="stop-color: rgb(255, 255, 255); stop-opacity: 0;" />
-      <stop
-         id="stop6841"
-         offset="1.0000000"
-         style="stop-color: rgb(255, 166, 23); stop-opacity: 0.733333;" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective6928"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective10781"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective10806"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective10878"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective10919"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipoutline2">
-      <path
-         d="m 55.8,12 0.76,0.16 c 8.84,-2.94 28.68,8.64 24.26,18.96 -1.12,1.62 -0.93,4.5 0.42,6.31 L 56.43,62.25 c -1.39,-1.39 -4.48,-1.36 -5.9,0 L 9.5,101.63 c -3.74,3.59 -0.8,6.64 0.78,8.25 l 7.36,7.36 c 1.61,1.6 5.86,3.76 8.88,0.56 L 65.24,76.99 c 1.35,-1.42 1.36,-4.47 0,-5.87 0,0 0.01,-0.02 0,-0.02 L 90.15,46.2 c 2.63,2.37 5.113827,2.574854 7.47,1.93 4.55057,-1.245432 7.08725,3.206643 9.81,6.46 l -1.23,1.21 c -1.82,1.84 -1.65,4.94 0.39,6.98 2.04,2.04 5.15,2.21 6.97,0.39 l 8.14,-8.13 c 1.82,-1.84 1.65,-4.94 -0.4,-6.97 -1.84,-1.85 -4.51,-2.09 -6.37,-0.77 -5.58,-6.26 -2.65,-7.2 -10.01,-15.35 L 91.13,17.86 C 81.2,8.12 68.3,8.13 55.8,12 z"
-         id="outline2"
-         inkscape:connector-curvature="0" />
-    </clipPath>
-  </defs>
-  <g
-     id="g1327"
-     transform="matrix(0.04034262,0,0,0.04034262,-0.81373403,-0.67768516)">
-    <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-       id="path1329"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="layer3"
-     inkscape:label="Layout"
-     style="display:none;stroke:#757575;stroke-opacity:1"
-     transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
-    <rect
-       height="10"
-       id="rect4134"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="10"
-       x="1"
-       y="1" />
-    <rect
-       height="8"
-       id="rect4136"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="8"
-       x="2"
-       y="2" />
-  </g>
-  <g
-     id="g3338"
-     transform="matrix(0.05637187,-0.00983492,0.00983492,0.05637187,-8.2801049,-2.944267)" />
-  <g
-     id="g4238"
-     transform="matrix(0.07887181,0,0,0.07887181,4.4321426,-6.4602646)">
-    <path
-       d="m 209.74503,225.79765 c 0,0 -10.56174,35.79543 -41.59499,25.12539 -0.005,0.0224 3.7446,-31.18541 41.59499,-25.12539 z"
-       id="path6571"
-       inkscape:connector-curvature="0"
-       style="fill:#ad30c0" />
-    <path
-       d="m 157.72652,270.07711 c 5.36274,-5.30508 12.68607,-8.50543 20.81666,-8.50543 16.40541,0 29.75463,13.29154 29.75463,29.72577 0,0.60547 0,1.12444 -0.0288,1.75875 h -0.0576 c -0.51898,6.42953 -2.56606,14.41598 -7.40985,24.33419 0,0 -8.33244,15.94407 -15.02146,23.2674 l -0.60547,0.57664 c -3.22916,3.25801 -7.78462,5.30508 -12.71487,5.30508 -6.05474,0 -11.41748,-2.94086 -14.67549,-7.49631 h -0.0865 c -3.25802,4.55545 -8.62076,7.49631 -14.67547,7.49631 -4.98794,0 -9.48572,-2.01824 -12.74374,-5.30508 l -0.60546,-0.57664 c -6.63136,-7.32333 -15.02146,-23.2674 -15.02146,-23.2674 -4.84377,-9.91821 -6.89084,-17.96232 -7.35216,-24.33419 h -0.14415 c -0.0865,-0.60547 -0.0865,-1.12445 -0.0865,-1.75875 0,-16.43423 13.34921,-29.72577 29.81226,-29.72577 8.10178,0 15.42511,3.20035 20.84552,8.50543"
-       id="path6573"
-       inkscape:connector-curvature="0"
-       style="fill:#ad30c0" />
-    <path
-       d="m 113.68291,214.69051 c 0,0 6.27532,31.27326 33.50285,24.54444 0.003,0.0195 -0.82177,-26.83164 -33.50285,-24.54444 z"
-       id="path10957"
-       inkscape:connector-curvature="0"
-       style="fill:#ad30c0" />
-    <path
-       d="m 156.85947,263.78173 c 0,0 -0.30241,-32.11059 -3.62889,-40.48726 -3.32648,-8.37667 11.18908,0 11.18908,0 l -7.56019,40.48726 z"
-       id="path10959"
-       inkscape:connector-curvature="0"
-       style="fill:#ad30c0;fill-opacity:1;stroke:#ad30c0;stroke-width:1.3514632;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  </g>
-  <g
-     id="g4015"
-     transform="matrix(0.04034262,0,0,0.04034262,-0.73304873,-0.83905564)">
-    <path
-       d="M 56.491347,345.3433 171.48706,496.40865 296.26258,436.03365 184.37297,286.25628 56.491347,345.3433 z"
-       id="path3470"
-       inkscape:connector-curvature="0"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:5.49104214;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       d="M 42.478704,360.31161 155.50474,509.10418 152.24539,562.17255 38.177673,413.03907 42.478704,360.31161 z"
-       id="path3474"
-       inkscape:connector-curvature="0"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:5.49104214;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       d="m 293.27333,464.43786 -117.69458,58.1195 -0.20367,1.73897 117.59638,-58.07887 0.30188,-1.7796 z"
-       id="path3476"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       style="opacity:0.75;fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:9.04777431;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       d="m 290.98944,496.39729 -117.69457,58.1195 -0.20368,1.73898 117.59639,-58.07887 0.30187,-1.77961 z"
-       id="path3505"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       style="opacity:0.75;fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:9.04777431;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  </g>
-  <g
-     id="g3753"
-     transform="matrix(0.01866733,0,0,0.01866733,11.609469,0.09540403)">
-    <g
-       id="g3709"
-       style="fill:none;stroke:#ffffff;stroke-width:1.00000334;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       transform="matrix(31.921892,0,0,31.921892,35.399153,14.948442)">
-      <path
-         d="M 8,15 0.5,6 15.5,6 z"
-         id="path3700"
-         inkscape:connector-curvature="0"
-         style="stroke:#ad30c0;stroke-width:1.00000334;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         d="M 0.5,6 3,3 13,3 15.5,6 z"
-         id="path3702"
-         inkscape:connector-curvature="0"
-         style="stroke:#ad30c0;stroke-width:1.00000334;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         d="M 4.5,3 8,15 11.5,3"
-         id="path3706"
-         inkscape:connector-curvature="0"
-         style="stroke:#ad30c0;stroke-width:1.00000334;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-    <path
-       d="M 290.77429,493.77682 51.360099,206.4798 l 478.828381,0 z"
-       id="path3700-3"
-       inkscape:connector-curvature="0"
-       style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:31.92199898;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       d="m 51.360099,206.4798 79.804731,-95.76568 319.21892,0 79.80473,95.76568 z"
-       id="path3702-2"
-       inkscape:connector-curvature="0"
-       style="opacity:0.1;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:31.92199898;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  </g>
-  <g
-     id="g3219"
-     style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1"
-     transform="matrix(0.07079204,0,0,0.07079204,-4.3588762,-38.132907)">
-    <path
-       d="m 67.613793,570.41735 c 24.468075,-13.10042 45.356037,-11.77452 66.041377,-23.06206 11.09637,2.43104 19.357,1.4592 26.99311,-0.26207 23.42862,10.78637 44.02825,12.51579 66.04138,23.5862 -1.82964,11.55946 -5.85886,21.54778 -12.57932,29.6138 -8.15361,-4.36994 -15.86829,-6.10632 -23.32413,-6.28966 l -0.52414,78.62069 c -32.1215,5.98273 -59.34716,3.39775 -85.95862,-0.26207 l -0.26207,-78.09655 c -9.370679,-0.2722 -16.500436,3.19047 -23.848277,6.28966 -7.067215,-9.63539 -10.36885,-19.80873 -12.57931,-30.13794 z"
-       id="path2427"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       d="m 71.282759,569.10701 c 2.214678,10.74851 6.083496,20.78686 13.627586,29.35172"
-       id="path3199"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="m 105.35172,668.16908 c 28.12874,4.60443 56.25747,5.59295 84.38621,-0.26207"
-       id="path3203"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="m 133.3931,547.61736 c -0.22816,2.3247 1.69237,12.73282 13.88965,13.36551 11.93593,0.61914 14.27527,-11.53603 13.88966,-13.10345"
-       id="path3205"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="czc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="m 128.21194,550.41871 c -0.22816,2.3247 4.57424,15.11165 18.34482,15.46206 14.03248,0.35707 19.77872,-14.68086 19.39311,-16.24828"
-       id="path3207"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="czc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="m 134.52279,552.33459 c 8.53814,2.23324 16.08174,1.75419 25.31809,-0.20185"
-       id="path3209"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="m 104.16182,558.28077 c 2.57594,9.88539 6.83803,21.48891 -0.26207,35.37931"
-       id="path3213"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="m 190.37521,558.48262 c -2.57594,9.88539 -6.83803,21.48891 0.26207,35.37931"
-       id="path3215"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       d="m 223.28276,568.84494 c -2.21468,10.74851 -6.0835,20.78686 -13.62759,29.35172"
-       id="path3217"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       style="fill:#ad30c0;fill-opacity:1;fill-rule:evenodd;stroke:#ad30c0;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-  </g>
-</svg>
diff --git a/navit/xpm/shop_grocery.svg b/navit/xpm/shop_grocery.svg
deleted file mode 100644
index 6e462dc5e..000000000
--- a/navit/xpm/shop_grocery.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="22" height="22" id="svg1875" sodipodi:version="0.32" inkscape:version="0.47 r22583" version="1.0" sodipodi:docname="shop_grocery.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs id="defs1877">
-    <linearGradient id="linearGradient3158">
-      <stop style="stop-color:#060606;stop-opacity:1;" offset="0" id="stop3160" />
-      <stop id="stop3166" offset="1" style="stop-color:#fcc82d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient id="linearGradient3165">
-      <stop style="stop-color:#1f1f1f;stop-opacity:1;" offset="0" id="stop3167" />
-      <stop style="stop-color:#ed4600;stop-opacity:1;" offset="1" id="stop3169" />
-    </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 73.285255 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="146.84756 : 73.285255 : 1" inkscape:persp3d-origin="73.423782 : 48.856837 : 1" id="perspective12" />
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3158" id="linearGradient3164" x1="-825.11871" y1="46.53587" x2="-694.49249" y2="46.53587" gradientUnits="userSpaceOnUse" />
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3158" id="linearGradient2921" gradientUnits="userSpaceOnUse" x1="-825.11871" y1="46.53587" x2="-694.49249" y2="46.53587" />
-  </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="24.227273" inkscape:cx="11" inkscape:cy="11" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" inkscape:window-width="1094" inkscape:window-height="778" inkscape:window-x="113" inkscape:window-y="-2" inkscape:window-maximized="0" />
-  <metadata id="metadata1880">
-    <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>Symbol Shop</dc:title>
-        <dc:date>07. Oct. 2006</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Stefan Fussan</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>Map; Symbol; Wikivoyage; Shop</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description>Symbol for Wikivoyage maps:Shop</dc:description>
-        <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/2.5/" />
-      </cc:Work>
-      <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/2.5/">
-        <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g inkscape:label="Hintergrund" inkscape:groupmode="layer" id="layer1" transform="translate(836.281,-94.5055)">
-    <g id="g2910" transform="matrix(0.16527013,0,0,0.199046,-699.70878,96.139377)">
-      <path sodipodi:nodetypes="ccccssscccsscc" d="m -803.29162,95.74954 86.30555,0 19.99357,-70.643923 -33.98906,0.333226 c 0,0 1.38124,-12.66178 -7.6642,-22.6593734 -6.3313,-6.997747 -35.98842,-7.6642 -43.98584,0.333226 -10.66324,10.6632344 -6.3313,21.9929214 -7.6642,21.9929214 -1.33291,0 -32.32293,-0.333226 -32.32293,-0.333226 l 19.32711,70.977149 z m 62.22067,-72.096063 c 0,0 0.8948,-8.202596 -4.96505,-14.6792694 -4.10156,-4.5333031 -23.31414,-4.9650469 -28.49505,0.2158716 -6.90789,6.9078908 -3.86593,14.4831518 -4.72942,14.4831518 l 38.18952,-0.01975 z" style="fill:url(#linearGradient2921);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path2386" />
-      <path transform="translate(-836.281,-29.4945)" id="path3190" d="M 122.05448,66.928784 103.91125,67.16441" style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -717.99654,49.922484 -18.14323,0.235626" id="path3192" />
-      <path id="path3194" d="m -721.05968,61.939431 -18.14323,0.235626" style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -723.41594,74.192004 -18.14323,0.235626" id="path3196" />
-      <path style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -741.08793,36.963031 -18.14323,0.235626" id="path3198" />
-      <path id="path3200" d="m -744.85795,49.451231 -18.14323,0.235626" style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m -747.92109,61.468178 -18.14323,0.235626" id="path3202" />
-      <path id="path3204" d="m -750.27735,73.720751 -18.14323,0.235626" style="fill:none;stroke:#0093bd;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
-  </g>
-  <g inkscape:groupmode="layer" id="layer2" inkscape:label="Symbol" transform="translate(0,-124)" />
-</svg>
diff --git a/navit/xpm/shopping.svg b/navit/xpm/shopping.svg
deleted file mode 100644
index 3d15dee44..000000000
--- a/navit/xpm/shopping.svg
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="shopping.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/projets/navit/icons/png/shopping.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       id="linearGradient3160">
-      <stop
-         style="stop-color:#208420;stop-opacity:1;"
-         offset="0"
-         id="stop3162" />
-      <stop
-         style="stop-color:#15d715;stop-opacity:1;"
-         offset="1"
-         id="stop3164" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective2390"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3160"
-       id="linearGradient3166"
-       x1="13.520976"
-       y1="11.795792"
-       x2="5.2298675"
-       y2="4.3404341"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#22a638"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="4.8716811"
-     inkscape:cy="-23.42011"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="943"
-     inkscape:window-height="682"
-     inkscape:window-x="0"
-     inkscape:window-y="25">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 2.2116381,2.1848051 C 2.2116381,2.1848051 4.4954762,3.2271654 4.3894012,4.2330193"
-       id="path2391" />
-    <path
-       style="fill:url(#linearGradient3166);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 3.6191906,3.60812 L 19.551296,3.5594758 L 19.51067,11.64703 L 5.2776197,14.674965 L 3.6191906,3.60812 z"
-       id="rect3166"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="M 18.069765,18.535714 L 6.4642857,18.580357 L 8.6302502,14.080397"
-       id="path3169"
-       sodipodi:nodetypes="ccc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#262626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3171"
-       sodipodi:cx="5.5357141"
-       sodipodi:cy="13.790178"
-       sodipodi:rx="1.0267857"
-       sodipodi:ry="1.0267857"
-       d="M 6.5624999,13.790178 A 1.0267857,1.0267857 0 1 1 4.5089284,13.790178 A 1.0267857,1.0267857 0 1 1 6.5624999,13.790178 z"
-       transform="matrix(1.1112769,0,0,1.1109318,1.4209457,4.3638057)" />
-    <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 18,6.4984099 L 5.7632975,6.4984099"
-       id="path3175"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 16.079709,10.498797 L 7.2630748,10.498797"
-       id="path3177"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#262626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3179"
-       sodipodi:cx="5.5357141"
-       sodipodi:cy="13.790178"
-       sodipodi:rx="0.67656642"
-       sodipodi:ry="0.67656642"
-       d="M 6.2122806,13.790178 A 0.67656642,0.67656642 0 1 1 4.8591477,13.790178 A 0.67656642,0.67656642 0 1 1 6.2122806,13.790178 z"
-       transform="matrix(1.5414449,0,0,1.5409662,-6.3819076,-19.044603)" />
-    <path
-       style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 17.734724,8.4285066 L 6.4795564,8.4285066"
-       id="path2389"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#262626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:bevel;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2393"
-       sodipodi:cx="5.5357141"
-       sodipodi:cy="13.790178"
-       sodipodi:rx="1.0267857"
-       sodipodi:ry="1.0267857"
-       d="M 6.5624999,13.790178 A 1.0267857,1.0267857 0 1 1 4.5089284,13.790178 A 1.0267857,1.0267857 0 1 1 6.5624999,13.790178 z"
-       transform="matrix(1.1112769,0,0,1.1109318,9.0253722,4.4717409)" />
-  </g>
-</svg>
diff --git a/navit/xpm/sport.svg b/navit/xpm/sport.svg
deleted file mode 100644
index 321bd4258..000000000
--- a/navit/xpm/sport.svg
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg:svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   id="svg2"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="sport.svg"
-   version="1.0"
-   width="22">
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1"
-     gridtolerance="10"
-     guidetolerance="10"
-     id="namedview12"
-     inkscape:current-layer="svg2"
-     inkscape:cx="21.683839"
-     inkscape:cy="2.2961172"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="725"
-     inkscape:window-maximized="1"
-     inkscape:window-width="1024"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:zoom="10.22135"
-     objecttolerance="10"
-     pagecolor="#ffffff"
-     showgrid="false" />
-  <svg:metadata
-     id="metadata2975">
-    <RDF>
-      <Work
-         about="">
-        <format>image/svg+xml</format>
-        <type
-           resource="http://purl.org/dc/dcmitype/StillImage" />
-        <license
-           resource="http://web.resource.org/cc/PublicDomain" />
-        <language>en</language>
-      </Work>
-    </RDF>
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </svg:metadata>
-  <svg:defs
-     id="defs4" />
-  <svg:g
-     id="g1327"
-     transform="matrix(0.04155328,0,0,0.04155328,-0.9783443,-0.88008389)">
-    <svg:path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,86.804 l 0,450.123 c 0,20.844 20.896,42.229 62.192,42.229 l 452.024,0 c 41.307,0 62.229,-20.313 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-       id="path1329"
-       inkscape:connector-curvature="0"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0" />
-  </svg:g>
-  <svg:path
-     d="M 15.975726,16.070371 12.27898,11.791048 c -0.04242,-0.06748 -0.499761,-0.807422 -0.499761,-1.367768 0,-0.5819119 0.484428,-1.666286 0.493819,-1.6872294 0.0082,-0.00711 0.01675,-0.013631 0.02472,-0.021154 l 3.11421,-2.9756716 c 0.331221,-0.3142259 0.345017,-0.8374648 0.03079,-1.168686 L 15.379558,4.50397 C 15.065335,4.1727531 14.542096,4.1589159 14.210875,4.4731417 L 11.286978,7.266935 C 11.230428,7.25239 11.172749,7.244618 11.114366,7.244618 l -1.1713033,0 L 7.6557201,4.0940481 C 7.3917742,3.7215261 6.8758073,3.6334331 6.5032819,3.897338 L 6.4284029,3.950401 C 6.0558362,4.2143064 5.9677847,4.7302735 6.2316896,5.1028402 l 2.3896456,3.2914348 0,3.916396 -1.8813243,5.257363 c -0.1538303,0.429827 0.069976,0.903035 0.4998027,1.056866 l 0.086431,0.03092 c 0.4298687,0.153831 0.9030357,-0.07001 1.0568664,-0.499803 l 1.830422,-5.115125 0.839085,0 3.602503,4.170245 c 0.298435,0.345474 0.820511,0.383579 1.165985,0.08514 l 0.06948,-0.06 c 0.345432,-0.298311 0.383536,-0.820469 0.08514,-1.165902 z"
-     id="path2044"
-     inkscape:connector-curvature="0"
-     style="fill:#39ac39" />
-  <svg:circle
-     cx="290.267"
-     cy="286.271"
-     id="circle2046"
-     r="245.23801"
-     sodipodi:cx="290.267"
-     sodipodi:cy="286.271"
-     sodipodi:rx="245.23801"
-     sodipodi:ry="245.23801"
-     style="fill:none;stroke:#39ac39;stroke-width:20"
-     transform="matrix(0.04155328,0,0,0.04155328,-0.9783443,-0.88008389)" />
-  <svg:circle
-     cx="285.427"
-     cy="143.92999"
-     id="circle2048"
-     r="35"
-     sodipodi:cx="285.427"
-     sodipodi:cy="143.92999"
-     sodipodi:rx="35"
-     sodipodi:ry="35"
-     style="fill:#39ac39"
-     transform="matrix(0.04155328,0,0,0.04155328,-0.9783443,-0.88008389)" />
-</svg:svg>
diff --git a/navit/xpm/sport.xpm b/navit/xpm/sport.xpm
deleted file mode 100644
index 3d4f06941..000000000
--- a/navit/xpm/sport.xpm
+++ /dev/null
@@ -1,75 +0,0 @@
-/* XPM */
-static char *dummy[]={
-"16 16 56 1",
-". c None",
-"v c #000000",
-"V c #0c0c0c",
-"o c #121212",
-"Y c #131313",
-"C c #141414",
-"u c #191919",
-"F c #1e1e1e",
-"D c #232323",
-"c c #292929",
-"T c #2b2b2b",
-"1 c #2d2d2d",
-"g c #2e2e2e",
-"b c #2f2f2f",
-"K c #303030",
-"y c #343434",
-"d c #363636",
-"a c #393939",
-"B c #3b3b3b",
-"L c #3d3d3d",
-"k c #404040",
-"m c #414141",
-"f c #444444",
-"p c #454545",
-"U c #474747",
-"t c #494949",
-"n c #4d4d4d",
-"J c #4e4e4e",
-"j c #525252",
-"e c #575757",
-"# c #5a5a5a",
-"E c #5b5b5b",
-"w c #5d5d5d",
-"l c #676767",
-"x c #6d6d6d",
-"z c #6f6f6f",
-"r c #757575",
-"O c #787878",
-"Q c #7f7f7f",
-"G c #808080",
-"N c #878787",
-"R c #888888",
-"Z c #8a8a8a",
-"X c #8c8c8c",
-"W c #a7a7a7",
-"H c #adadad",
-"0 c #b3b3b3",
-"h c #b6b6b6",
-"I c #c5c5c5",
-"P c #c8c8c8",
-"S c #d6d6d6",
-"M c #dadada",
-"A c #dfdfdf",
-"i c #e8e8e8",
-"s c #fcfcfc",
-"q c #fefefe",
-"................",
-"................",
-"................",
-".....#abcde.....",
-"....fghijklm....",
-"...nopqqrsqlt...",
-"...uvwxyvzABC...",
-"...DEqqFvvGxv...",
-"...HGqIJKLqMB...",
-"...NkBOqqOPQR...",
-"...BvvySspvTU...",
-"...#uVWhXvvY....",
-"....#LZ0hc1.....",
-"................",
-"................",
-"................"};
diff --git a/navit/xpm/taxi.svg b/navit/xpm/taxi.svg
deleted file mode 100644
index 9246ad42f..000000000
--- a/navit/xpm/taxi.svg
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="taxi.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10"
-     inkscape:cx="30.870884"
-     inkscape:cy="19.453805"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="3"
-     fit-margin-left="3"
-     fit-margin-right="3"
-     fit-margin-bottom="3"
-     inkscape:window-width="1056"
-     inkscape:window-height="697"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-23.765375,-23.712777)">
-    <rect
-       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3005"
-       width="21.850609"
-       height="22.025177"
-       x="23.842041"
-       y="23.708303" />
-    <rect
-       style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       id="rect3003"
-       width="19.615889"
-       height="19.220139"
-       x="24.959402"
-       y="25.063957" />
-    <text
-       xml:space="preserve"
-       style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:Sans Bold"
-       x="2.3"
-       y="3.0999999"
-       id="text3045"
-       sodipodi:linespacing="125%"
-       transform="translate(23.765375,23.712777)"><tspan
-         sodipodi:role="line"
-         id="tspan3047"
-         x="2.3"
-         y="3.0999999" /></text>
-    <text
-       xml:space="preserve"
-       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:Sans Bold"
-       x="2"
-       y="-2.0999999"
-       id="text3049"
-       sodipodi:linespacing="125%"
-       transform="translate(23.765375,23.712777)"><tspan
-         sodipodi:role="line"
-         id="tspan3051"
-         x="2"
-         y="-2.0999999" /></text>
-    <text
-       xml:space="preserve"
-       style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:Sans Bold"
-       x="2.7"
-       y="4.4000001"
-       id="text3053"
-       sodipodi:linespacing="125%"
-       transform="translate(23.765375,23.712777)"><tspan
-         sodipodi:role="line"
-         id="tspan3055"
-         x="2.7"
-         y="4.4000001" /></text>
-    <text
-       xml:space="preserve"
-       style="font-size:25.34528351px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:Sans Bold"
-       x="25.785437"
-       y="35.285679"
-       id="text3057"
-       sodipodi:linespacing="125%"
-       transform="scale(1.0560535,0.94692176)"><tspan
-         sodipodi:role="line"
-         id="tspan3059"
-         x="25.785437"
-         y="35.285679"
-         style="font-size:10.56053448px">TA</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:10.56053448px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:Sans Bold"
-       x="26.207859"
-       y="44.578953"
-       id="text3061"
-       sodipodi:linespacing="125%"
-       transform="scale(1.0560535,0.94692176)"><tspan
-         sodipodi:role="line"
-         id="tspan3063"
-         x="26.207859"
-         y="44.578953">X</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:10.56053448px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:Sans Bold"
-       x="35.606735"
-       y="44.578953"
-       id="text3065"
-       sodipodi:linespacing="125%"
-       transform="scale(1.0560535,0.94692176)"><tspan
-         sodipodi:role="line"
-         id="tspan3067"
-         x="35.606735"
-         y="44.578953">I</tspan></text>
-  </g>
-</svg>
diff --git a/navit/xpm/tec_common.svg b/navit/xpm/tec_common.svg
deleted file mode 100644
index d2973a133..000000000
--- a/navit/xpm/tec_common.svg
+++ /dev/null
@@ -1,2993 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.0"
-   width="22"
-   height="22"
-   id="svg1961"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="tec_common.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/nt/tec_common.png"
-   inkscape:export-xdpi="9.0592957"
-   inkscape:export-ydpi="9.0592957">
-  <metadata
-     id="metadata3253">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>traffic light by http://commons.wikimedia.org/wiki/User:Manuel_Strehl
-camera by KDE e.V.</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     inkscape:window-height="742"
-     inkscape:window-width="1018"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="11.313708"
-     inkscape:cx="27.776647"
-     inkscape:cy="8.1975426"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:current-layer="svg1961"
-     inkscape:window-maximized="0" />
-  <defs
-     id="defs1963">
-    <linearGradient
-       id="linearGradient4522">
-      <stop
-         style="stop-color:#ffff00;stop-opacity:1;"
-         offset="0"
-         id="stop4524" />
-      <stop
-         style="stop-color:#ffff00;stop-opacity:0.67357516;"
-         offset="1"
-         id="stop4526" />
-    </linearGradient>
-    <linearGradient
-       y2="60.029999"
-       x2="77.031303"
-       y1="120.132"
-       x1="77.031303"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_37_">
-      <stop
-         id="stop2827"
-         style="stop-color:rgb(158,158,158)"
-         offset="0" />
-      <stop
-         id="stop2829"
-         style="stop-color:rgb(97,97,97)"
-         offset="1" />
-      <a:midPointStop
-         style="stop-color:#9E9E9E"
-         offset="0" />
-      <a:midPointStop
-         style="stop-color:#9E9E9E"
-         offset="0.5" />
-      <a:midPointStop
-         style="stop-color:#616161"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="126.982"
-       x2="76.830101"
-       y1="57.847698"
-       x1="76.830101"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_36_">
-      <stop
-         id="stop2820"
-         style="stop-color:rgb(255,255,255)"
-         offset="4.02299%" />
-      <stop
-         id="stop2822"
-         style="stop-opacity:0;stop-color:rgb(255,255,255)"
-         offset="100%" />
-    </linearGradient>
-    <linearGradient
-       y2="130.181"
-       x2="120.423"
-       y1="68.1436"
-       x1="64.068398"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_35_">
-      <stop
-         id="stop2813"
-         style="stop-color:rgb(255,255,255)"
-         offset="0.0337" />
-      <stop
-         id="stop2815"
-         style="stop-color:rgb(135,135,135)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="82.084198"
-       x2="87.5625"
-       y1="75.327103"
-       x1="87.5625"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_34_">
-      <stop
-         id="stop2806"
-         style="stop-color:rgb(255,255,255)"
-         offset="7.47126%" />
-      <stop
-         id="stop2808"
-         style="stop-opacity:0;stop-color:rgb(255,255,255)"
-         offset="100%" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="88.976601"
-       fx="87.766602"
-       r="11.4148"
-       cy="88.976601"
-       cx="87.766602"
-       id="XMLID_33_">
-      <stop
-         id="stop2799"
-         style="stop-color:rgb(187,235,255)"
-         offset="0" />
-      <stop
-         id="stop2801"
-         style="stop-color:rgb(0,61,215)"
-         offset="1" />
-      <a:midPointStop
-         style="stop-color:#BBEBFF"
-         offset="0" />
-      <a:midPointStop
-         style="stop-color:#BBEBFF"
-         offset="0.5" />
-      <a:midPointStop
-         style="stop-color:#003DD7"
-         offset="1" />
-    </radialGradient>
-    <linearGradient
-       y2="84.349197"
-       x2="87.561501"
-       y1="97.340797"
-       x1="87.561501"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_32_">
-      <stop
-         id="stop2790"
-         style="stop-color:rgb(255,255,255)"
-         offset="4.5977%" />
-      <stop
-         id="stop2792"
-         style="stop-opacity:0;stop-color:rgb(255,255,255)"
-         offset="100%" />
-    </linearGradient>
-    <linearGradient
-       y2="84.569901"
-       x2="87.560501"
-       y1="98.801804"
-       x1="87.560501"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_31_">
-      <stop
-         id="stop2783"
-         style="stop-color:rgb(255,255,255)"
-         offset="0.1685" />
-      <stop
-         id="stop2785"
-         style="stop-color:rgb(54,54,54)"
-         offset="1" />
-      <a:midPointStop
-         style="stop-color:#FFFFFF"
-         offset="0.1685" />
-      <a:midPointStop
-         style="stop-color:#FFFFFF"
-         offset="0.5" />
-      <a:midPointStop
-         style="stop-color:#363636"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="82.123001"
-       x2="105.431"
-       y1="81.969704"
-       x1="75.442398"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_30_">
-      <stop
-         id="stop2776"
-         style="stop-color:rgb(255,255,255)"
-         offset="0.0337" />
-      <stop
-         id="stop2778"
-         style="stop-color:rgb(171,171,171)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="80.375298"
-       x2="89.966499"
-       y1="95.804703"
-       x1="67.565399"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_29_">
-      <stop
-         id="stop2769"
-         style="stop-color:rgb(255,255,255)"
-         offset="0.0337" />
-      <stop
-         id="stop2771"
-         style="stop-color:rgb(153,153,153)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="69.688904"
-       x2="87.561501"
-       y1="102.759"
-       x1="87.561501"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_28_">
-      <stop
-         id="stop2762"
-         style="stop-color:rgb(158,158,158)"
-         offset="0" />
-      <stop
-         id="stop2764"
-         style="stop-color:rgb(97,97,97)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="82.155403"
-       x2="111.821"
-       y1="81.947304"
-       x1="71.107399"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_27_">
-      <stop
-         id="stop2755"
-         style="stop-color:rgb(255,255,255)"
-         offset="0.0337" />
-      <stop
-         id="stop2757"
-         style="stop-color:rgb(171,171,171)"
-         offset="1" />
-      <a:midPointStop
-         style="stop-color:#FFFFFF"
-         offset="0.0337" />
-      <a:midPointStop
-         style="stop-color:#FFFFFF"
-         offset="0.5" />
-      <a:midPointStop
-         style="stop-color:#ABABAB"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="64.263496"
-       x2="87.561501"
-       y1="111.869"
-       x1="87.561501"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_26_">
-      <stop
-         id="stop2748"
-         style="stop-color:rgb(158,158,158)"
-         offset="0" />
-      <stop
-         id="stop2750"
-         style="stop-color:rgb(97,97,97)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="105.281"
-       x2="108.682"
-       y1="68.8125"
-       x1="75.553703"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_25_">
-      <stop
-         id="stop2741"
-         style="stop-color:rgb(255,255,255)"
-         offset="0.0337" />
-      <stop
-         id="stop2743"
-         style="stop-color:rgb(171,171,171)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,-256.622,-352.346)"
-       y2="-326.67001"
-       x2="465.18799"
-       y1="-360.35999"
-       x1="431.49799"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_24_">
-      <stop
-         id="stop2732"
-         style="stop-color:rgb(158,158,158)"
-         offset="0" />
-      <stop
-         id="stop2734"
-         style="stop-color:rgb(97,97,97)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="90.118896"
-       x2="55.990799"
-       y1="77.249001"
-       x1="43.121101"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_23_">
-      <stop
-         id="stop2723"
-         style="stop-color:rgb(158,158,158)"
-         offset="0" />
-      <stop
-         id="stop2725"
-         style="stop-color:rgb(97,97,97)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="100.333"
-       x2="83.369102"
-       y1="54.6782"
-       x1="37.715302"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_22_">
-      <stop
-         id="stop2714"
-         style="stop-color:rgb(158,158,158)"
-         offset="0" />
-      <stop
-         id="stop2716"
-         style="stop-color:rgb(97,97,97)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="82.428001"
-       x2="101.62"
-       y1="82.064499"
-       x1="30.5054"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_21_">
-      <stop
-         id="stop2707"
-         style="stop-color:rgb(255,255,255)"
-         offset="0.0337" />
-      <stop
-         id="stop2709"
-         style="stop-color:rgb(171,171,171)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-780.801,1657.79)"
-       y2="-1597.9399"
-       x2="885.13098"
-       y1="-1599.67"
-       x1="885.13098"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_20_">
-      <stop
-         id="stop2700"
-         style="stop-color:rgb(255,255,255)"
-         offset="0" />
-      <stop
-         id="stop2702"
-         style="stop-color:rgb(207,207,207)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="57.958099"
-       x2="104.381"
-       y1="61.433601"
-       x1="104.381"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_19_">
-      <stop
-         id="stop2693"
-         style="stop-color:rgb(158,158,158)"
-         offset="0" />
-      <stop
-         id="stop2695"
-         style="stop-color:rgb(97,97,97)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-780.801,1657.79)"
-       y2="-1598.62"
-       x2="885.18103"
-       y1="-1596.5601"
-       x1="885.18103"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_18_">
-      <stop
-         id="stop2686"
-         style="stop-color:rgb(255,255,255)"
-         offset="0" />
-      <stop
-         id="stop2688"
-         style="stop-color:rgb(189,189,189)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(1,15.5)"
-       y2="42.4576"
-       x2="103.381"
-       y1="45.933601"
-       x1="103.381"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_15_">
-      <stop
-         id="stop2673"
-         style="stop-color:rgb(158,158,158)"
-         offset="0" />
-      <stop
-         id="stop2675"
-         style="stop-color:rgb(97,97,97)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="57.596199"
-       x2="102.565"
-       y1="60.411098"
-       x1="105.643"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_14_">
-      <stop
-         id="stop2662"
-         style="stop-color:rgb(255,255,255)"
-         offset="0.0337" />
-      <stop
-         id="stop2664"
-         style="stop-color:rgb(171,171,171)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="62.2383"
-       x2="114.477"
-       y1="56.5625"
-       x1="114.477"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_13_">
-      <stop
-         id="stop2653"
-         style="stop-color:rgb(255,255,255)"
-         offset="0%" />
-      <stop
-         id="stop2655"
-         style="stop-opacity:0;stop-color:rgb(255,255,255)"
-         offset="100%" />
-    </linearGradient>
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
-       fy="129.33299"
-       fx="114.137"
-       r="6.4330001"
-       cy="129.33299"
-       cx="114.137"
-       id="XMLID_12_">
-      <stop
-         id="stop2646"
-         style="stop-color:rgb(133,202,255)"
-         offset="0" />
-      <stop
-         id="stop2648"
-         style="stop-color:rgb(0,61,169)"
-         offset="1" />
-    </radialGradient>
-    <linearGradient
-       y2="53.6199"
-       x2="108.185"
-       y1="63.373001"
-       x1="118.848"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_11_">
-      <stop
-         id="stop2639"
-         style="stop-color:rgb(255,255,255)"
-         offset="0.0337" />
-      <stop
-         id="stop2641"
-         style="stop-color:rgb(171,171,171)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="132.177"
-       x2="122.192"
-       y1="55.616199"
-       x1="52.644501"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_10_">
-      <stop
-         id="stop2630"
-         style="stop-color:rgb(255,255,255)"
-         offset="0.0337" />
-      <stop
-         id="stop2632"
-         style="stop-color:rgb(171,171,171)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="52.224201"
-       x2="45.014198"
-       y1="57.756302"
-       x1="45.014198"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_9_">
-      <stop
-         id="stop2623"
-         style="stop-color:rgb(158,158,158)"
-         offset="0" />
-      <stop
-         id="stop2625"
-         style="stop-color:rgb(97,97,97)"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="0"
-       y1="0"
-       x2="0"
-       y2="1.05"
-       id="rg">
-      <stop
-         stop-color="#fff"
-         stop-opacity="0.9"
-         offset="0"
-         id="stop3387" />
-      <stop
-         stop-color="#fff"
-         stop-opacity="0.2"
-         offset="0.7"
-         id="stop3389" />
-      <stop
-         stop-color="#fff"
-         stop-opacity="0.3"
-         offset="1"
-         id="stop3391" />
-    </linearGradient>
-    <radialGradient
-       cx="65"
-       cy="265"
-       r="44"
-       fx="65"
-       fy="265"
-       id="g"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#74fc94"
-         offset="0"
-         id="stop3373" />
-      <stop
-         stop-color="#3ad55e"
-         offset="0.7"
-         id="stop3375" />
-      <stop
-         stop-color="#00af29"
-         offset="1"
-         id="stop3377" />
-    </radialGradient>
-    <radialGradient
-       cx="65"
-       cy="165"
-       r="44"
-       fx="65"
-       fy="165"
-       id="y"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#fcfc74"
-         offset="0"
-         id="stop3366" />
-      <stop
-         stop-color="#d4d53a"
-         offset="0.7"
-         id="stop3368" />
-      <stop
-         stop-color="#afa500"
-         offset="1"
-         id="stop3370" />
-    </radialGradient>
-    <radialGradient
-       cx="65"
-       cy="65"
-       r="44"
-       fx="65"
-       fy="65"
-       id="r"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#fc7474"
-         offset="0"
-         id="stop3359" />
-      <stop
-         stop-color="#d53a3a"
-         offset="0.7"
-         id="stop3361" />
-      <stop
-         stop-color="#af0000"
-         offset="1"
-         id="stop3363" />
-    </radialGradient>
-    <linearGradient
-       id="back"
-       x1="0"
-       y1="0"
-       x2="82.849258"
-       y2="186.41083"
-       gradientTransform="matrix(0.6276459,0,0,1.593255,737.14592,106.67382)"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         stop-color="#5c656c"
-         offset="0"
-         id="stop3354" />
-      <stop
-         stop-color="#aab2b7"
-         offset="1"
-         id="stop3356" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 300 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="600 : 300 : 1"
-       inkscape:persp3d-origin="300 : 200 : 1"
-       id="perspective3255" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#back"
-       id="linearGradient3454"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6276459,0,0,1.593255,737.14592,106.67382)"
-       x1="0"
-       y1="0"
-       x2="82.849258"
-       y2="186.41083" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#r"
-       id="radialGradient3456"
-       gradientUnits="userSpaceOnUse"
-       cx="65"
-       cy="65"
-       fx="65"
-       fy="65"
-       r="44" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#y"
-       id="radialGradient3458"
-       gradientUnits="userSpaceOnUse"
-       cx="65"
-       cy="165"
-       fx="65"
-       fy="165"
-       r="44" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#g"
-       id="radialGradient3460"
-       gradientUnits="userSpaceOnUse"
-       cx="65"
-       cy="265"
-       fx="65"
-       fy="265"
-       r="44" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_9_"
-       id="linearGradient3692"
-       gradientUnits="userSpaceOnUse"
-       x1="45.014198"
-       y1="57.756302"
-       x2="45.014198"
-       y2="52.224201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_10_"
-       id="linearGradient3694"
-       gradientUnits="userSpaceOnUse"
-       x1="52.644501"
-       y1="55.616199"
-       x2="122.192"
-       y2="132.177" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_11_"
-       id="linearGradient3696"
-       gradientUnits="userSpaceOnUse"
-       x1="118.848"
-       y1="63.373001"
-       x2="108.185"
-       y2="53.6199" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_12_"
-       id="radialGradient3698"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
-       cx="114.137"
-       cy="129.33299"
-       fx="114.137"
-       fy="129.33299"
-       r="6.4330001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_13_"
-       id="linearGradient3700"
-       gradientUnits="userSpaceOnUse"
-       x1="114.477"
-       y1="56.5625"
-       x2="114.477"
-       y2="62.2383" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_14_"
-       id="linearGradient3702"
-       gradientUnits="userSpaceOnUse"
-       x1="105.643"
-       y1="60.411098"
-       x2="102.565"
-       y2="57.596199" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_15_"
-       id="linearGradient3704"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,15.5)"
-       x1="103.381"
-       y1="45.933601"
-       x2="103.381"
-       y2="42.4576" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_15_"
-       id="linearGradient3706"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,15.5)"
-       x1="103.381"
-       y1="45.933601"
-       x2="103.381"
-       y2="42.4576" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_15_"
-       id="linearGradient3708"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,15.5)"
-       x1="103.381"
-       y1="45.933601"
-       x2="103.381"
-       y2="42.4576" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_18_"
-       id="linearGradient3710"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-780.801,1657.79)"
-       x1="885.18103"
-       y1="-1596.5601"
-       x2="885.18103"
-       y2="-1598.62" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_19_"
-       id="linearGradient3712"
-       gradientUnits="userSpaceOnUse"
-       x1="104.381"
-       y1="61.433601"
-       x2="104.381"
-       y2="57.958099" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_20_"
-       id="linearGradient3714"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-780.801,1657.79)"
-       x1="885.13098"
-       y1="-1599.67"
-       x2="885.13098"
-       y2="-1597.9399" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_21_"
-       id="linearGradient3716"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5054"
-       y1="82.064499"
-       x2="101.62"
-       y2="82.428001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_22_"
-       id="linearGradient3718"
-       gradientUnits="userSpaceOnUse"
-       x1="37.715302"
-       y1="54.6782"
-       x2="83.369102"
-       y2="100.333" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_23_"
-       id="linearGradient3720"
-       gradientUnits="userSpaceOnUse"
-       x1="43.121101"
-       y1="77.249001"
-       x2="55.990799"
-       y2="90.118896" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_24_"
-       id="linearGradient3722"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,-256.622,-352.346)"
-       x1="431.49799"
-       y1="-360.35999"
-       x2="465.18799"
-       y2="-326.67001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_25_"
-       id="linearGradient3724"
-       gradientUnits="userSpaceOnUse"
-       x1="75.553703"
-       y1="68.8125"
-       x2="108.682"
-       y2="105.281" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_26_"
-       id="linearGradient3726"
-       gradientUnits="userSpaceOnUse"
-       x1="87.561501"
-       y1="111.869"
-       x2="87.561501"
-       y2="64.263496" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_27_"
-       id="linearGradient3728"
-       gradientUnits="userSpaceOnUse"
-       x1="71.107399"
-       y1="81.947304"
-       x2="111.821"
-       y2="82.155403" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_28_"
-       id="linearGradient3730"
-       gradientUnits="userSpaceOnUse"
-       x1="87.561501"
-       y1="102.759"
-       x2="87.561501"
-       y2="69.688904" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_29_"
-       id="linearGradient3732"
-       gradientUnits="userSpaceOnUse"
-       x1="67.565399"
-       y1="95.804703"
-       x2="89.966499"
-       y2="80.375298" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_30_"
-       id="linearGradient3734"
-       gradientUnits="userSpaceOnUse"
-       x1="75.442398"
-       y1="81.969704"
-       x2="105.431"
-       y2="82.123001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_31_"
-       id="linearGradient3736"
-       gradientUnits="userSpaceOnUse"
-       x1="87.560501"
-       y1="98.801804"
-       x2="87.560501"
-       y2="84.569901" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_32_"
-       id="linearGradient3738"
-       gradientUnits="userSpaceOnUse"
-       x1="87.561501"
-       y1="97.340797"
-       x2="87.561501"
-       y2="84.349197" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_33_"
-       id="radialGradient3740"
-       gradientUnits="userSpaceOnUse"
-       cx="87.766602"
-       cy="88.976601"
-       fx="87.766602"
-       fy="88.976601"
-       r="11.4148" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_34_"
-       id="linearGradient3742"
-       gradientUnits="userSpaceOnUse"
-       x1="87.5625"
-       y1="75.327103"
-       x2="87.5625"
-       y2="82.084198" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_35_"
-       id="linearGradient3744"
-       gradientUnits="userSpaceOnUse"
-       x1="64.068398"
-       y1="68.1436"
-       x2="120.423"
-       y2="130.181" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_36_"
-       id="linearGradient3746"
-       gradientUnits="userSpaceOnUse"
-       x1="76.830101"
-       y1="57.847698"
-       x2="76.830101"
-       y2="126.982" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_37_"
-       id="linearGradient3748"
-       gradientUnits="userSpaceOnUse"
-       x1="77.031303"
-       y1="120.132"
-       x2="77.031303"
-       y2="60.029999" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_9_"
-       id="linearGradient2781"
-       gradientUnits="userSpaceOnUse"
-       x1="45.014198"
-       y1="57.756302"
-       x2="45.014198"
-       y2="52.224201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_10_"
-       id="linearGradient2783"
-       gradientUnits="userSpaceOnUse"
-       x1="52.644501"
-       y1="55.616199"
-       x2="122.192"
-       y2="132.177" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_11_"
-       id="linearGradient2785"
-       gradientUnits="userSpaceOnUse"
-       x1="118.848"
-       y1="63.373001"
-       x2="108.185"
-       y2="53.6199" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_12_"
-       id="radialGradient2787"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
-       cx="114.137"
-       cy="129.33299"
-       fx="114.137"
-       fy="129.33299"
-       r="6.4330001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_13_"
-       id="linearGradient2789"
-       gradientUnits="userSpaceOnUse"
-       x1="114.477"
-       y1="56.5625"
-       x2="114.477"
-       y2="62.2383" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_14_"
-       id="linearGradient2791"
-       gradientUnits="userSpaceOnUse"
-       x1="105.643"
-       y1="60.411098"
-       x2="102.565"
-       y2="57.596199" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_15_"
-       id="linearGradient2793"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,15.5)"
-       x1="103.381"
-       y1="45.933601"
-       x2="103.381"
-       y2="42.4576" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_15_"
-       id="linearGradient2795"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,15.5)"
-       x1="103.381"
-       y1="45.933601"
-       x2="103.381"
-       y2="42.4576" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_15_"
-       id="linearGradient2797"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,15.5)"
-       x1="103.381"
-       y1="45.933601"
-       x2="103.381"
-       y2="42.4576" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_18_"
-       id="linearGradient2799"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-780.801,1657.79)"
-       x1="885.18103"
-       y1="-1596.5601"
-       x2="885.18103"
-       y2="-1598.62" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_19_"
-       id="linearGradient2801"
-       gradientUnits="userSpaceOnUse"
-       x1="104.381"
-       y1="61.433601"
-       x2="104.381"
-       y2="57.958099" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_20_"
-       id="linearGradient2803"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-780.801,1657.79)"
-       x1="885.13098"
-       y1="-1599.67"
-       x2="885.13098"
-       y2="-1597.9399" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_21_"
-       id="linearGradient2805"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5054"
-       y1="82.064499"
-       x2="101.62"
-       y2="82.428001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_22_"
-       id="linearGradient2807"
-       gradientUnits="userSpaceOnUse"
-       x1="37.715302"
-       y1="54.6782"
-       x2="83.369102"
-       y2="100.333" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_23_"
-       id="linearGradient2809"
-       gradientUnits="userSpaceOnUse"
-       x1="43.121101"
-       y1="77.249001"
-       x2="55.990799"
-       y2="90.118896" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_24_"
-       id="linearGradient2811"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,-256.622,-352.346)"
-       x1="431.49799"
-       y1="-360.35999"
-       x2="465.18799"
-       y2="-326.67001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_25_"
-       id="linearGradient2813"
-       gradientUnits="userSpaceOnUse"
-       x1="75.553703"
-       y1="68.8125"
-       x2="108.682"
-       y2="105.281" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_26_"
-       id="linearGradient2815"
-       gradientUnits="userSpaceOnUse"
-       x1="87.561501"
-       y1="111.869"
-       x2="87.561501"
-       y2="64.263496" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_27_"
-       id="linearGradient2817"
-       gradientUnits="userSpaceOnUse"
-       x1="71.107399"
-       y1="81.947304"
-       x2="111.821"
-       y2="82.155403" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_28_"
-       id="linearGradient2819"
-       gradientUnits="userSpaceOnUse"
-       x1="87.561501"
-       y1="102.759"
-       x2="87.561501"
-       y2="69.688904" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_29_"
-       id="linearGradient2821"
-       gradientUnits="userSpaceOnUse"
-       x1="67.565399"
-       y1="95.804703"
-       x2="89.966499"
-       y2="80.375298" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_30_"
-       id="linearGradient2823"
-       gradientUnits="userSpaceOnUse"
-       x1="75.442398"
-       y1="81.969704"
-       x2="105.431"
-       y2="82.123001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_31_"
-       id="linearGradient2825"
-       gradientUnits="userSpaceOnUse"
-       x1="87.560501"
-       y1="98.801804"
-       x2="87.560501"
-       y2="84.569901" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_32_"
-       id="linearGradient2827"
-       gradientUnits="userSpaceOnUse"
-       x1="87.561501"
-       y1="97.340797"
-       x2="87.561501"
-       y2="84.349197" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_33_"
-       id="radialGradient2829"
-       gradientUnits="userSpaceOnUse"
-       cx="87.766602"
-       cy="88.976601"
-       fx="87.766602"
-       fy="88.976601"
-       r="11.4148" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_34_"
-       id="linearGradient2831"
-       gradientUnits="userSpaceOnUse"
-       x1="87.5625"
-       y1="75.327103"
-       x2="87.5625"
-       y2="82.084198" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_35_"
-       id="linearGradient2833"
-       gradientUnits="userSpaceOnUse"
-       x1="64.068398"
-       y1="68.1436"
-       x2="120.423"
-       y2="130.181" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_36_"
-       id="linearGradient2835"
-       gradientUnits="userSpaceOnUse"
-       x1="76.830101"
-       y1="57.847698"
-       x2="76.830101"
-       y2="126.982" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_37_"
-       id="linearGradient2837"
-       gradientUnits="userSpaceOnUse"
-       x1="77.031303"
-       y1="120.132"
-       x2="77.031303"
-       y2="60.029999" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4522"
-       id="radialGradient2839"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7696866,0.07789056,-0.06803583,1.5457853,-418.97793,-202.43104)"
-       cx="569.94421"
-       cy="289.56024"
-       fx="569.94421"
-       fy="289.56024"
-       r="130.18762" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#back"
-       id="linearGradient2938"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6276459,0,0,1.593255,737.14592,106.67382)"
-       x1="0"
-       y1="0"
-       x2="82.849258"
-       y2="186.41083" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#r"
-       id="radialGradient2940"
-       gradientUnits="userSpaceOnUse"
-       cx="65"
-       cy="65"
-       fx="65"
-       fy="65"
-       r="44" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#y"
-       id="radialGradient2942"
-       gradientUnits="userSpaceOnUse"
-       cx="65"
-       cy="165"
-       fx="65"
-       fy="165"
-       r="44" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#g"
-       id="radialGradient2944"
-       gradientUnits="userSpaceOnUse"
-       cx="65"
-       cy="265"
-       fx="65"
-       fy="265"
-       r="44" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_9_"
-       id="linearGradient2946"
-       gradientUnits="userSpaceOnUse"
-       x1="45.014198"
-       y1="57.756302"
-       x2="45.014198"
-       y2="52.224201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_10_"
-       id="linearGradient2948"
-       gradientUnits="userSpaceOnUse"
-       x1="52.644501"
-       y1="55.616199"
-       x2="122.192"
-       y2="132.177" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_11_"
-       id="linearGradient2950"
-       gradientUnits="userSpaceOnUse"
-       x1="118.848"
-       y1="63.373001"
-       x2="108.185"
-       y2="53.6199" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_12_"
-       id="radialGradient2952"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
-       cx="114.137"
-       cy="129.33299"
-       fx="114.137"
-       fy="129.33299"
-       r="6.4330001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_13_"
-       id="linearGradient2954"
-       gradientUnits="userSpaceOnUse"
-       x1="114.477"
-       y1="56.5625"
-       x2="114.477"
-       y2="62.2383" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_14_"
-       id="linearGradient2956"
-       gradientUnits="userSpaceOnUse"
-       x1="105.643"
-       y1="60.411098"
-       x2="102.565"
-       y2="57.596199" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_15_"
-       id="linearGradient2958"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,15.5)"
-       x1="103.381"
-       y1="45.933601"
-       x2="103.381"
-       y2="42.4576" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_15_"
-       id="linearGradient2960"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,15.5)"
-       x1="103.381"
-       y1="45.933601"
-       x2="103.381"
-       y2="42.4576" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_15_"
-       id="linearGradient2962"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,15.5)"
-       x1="103.381"
-       y1="45.933601"
-       x2="103.381"
-       y2="42.4576" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_18_"
-       id="linearGradient2964"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-780.801,1657.79)"
-       x1="885.18103"
-       y1="-1596.5601"
-       x2="885.18103"
-       y2="-1598.62" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_19_"
-       id="linearGradient2966"
-       gradientUnits="userSpaceOnUse"
-       x1="104.381"
-       y1="61.433601"
-       x2="104.381"
-       y2="57.958099" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_20_"
-       id="linearGradient2968"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-780.801,1657.79)"
-       x1="885.13098"
-       y1="-1599.67"
-       x2="885.13098"
-       y2="-1597.9399" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_21_"
-       id="linearGradient2970"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5054"
-       y1="82.064499"
-       x2="101.62"
-       y2="82.428001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_22_"
-       id="linearGradient2972"
-       gradientUnits="userSpaceOnUse"
-       x1="37.715302"
-       y1="54.6782"
-       x2="83.369102"
-       y2="100.333" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_23_"
-       id="linearGradient2974"
-       gradientUnits="userSpaceOnUse"
-       x1="43.121101"
-       y1="77.249001"
-       x2="55.990799"
-       y2="90.118896" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_24_"
-       id="linearGradient2976"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,-256.622,-352.346)"
-       x1="431.49799"
-       y1="-360.35999"
-       x2="465.18799"
-       y2="-326.67001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_25_"
-       id="linearGradient2978"
-       gradientUnits="userSpaceOnUse"
-       x1="75.553703"
-       y1="68.8125"
-       x2="108.682"
-       y2="105.281" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_26_"
-       id="linearGradient2980"
-       gradientUnits="userSpaceOnUse"
-       x1="87.561501"
-       y1="111.869"
-       x2="87.561501"
-       y2="64.263496" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_27_"
-       id="linearGradient2982"
-       gradientUnits="userSpaceOnUse"
-       x1="71.107399"
-       y1="81.947304"
-       x2="111.821"
-       y2="82.155403" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_28_"
-       id="linearGradient2984"
-       gradientUnits="userSpaceOnUse"
-       x1="87.561501"
-       y1="102.759"
-       x2="87.561501"
-       y2="69.688904" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_29_"
-       id="linearGradient2986"
-       gradientUnits="userSpaceOnUse"
-       x1="67.565399"
-       y1="95.804703"
-       x2="89.966499"
-       y2="80.375298" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_30_"
-       id="linearGradient2988"
-       gradientUnits="userSpaceOnUse"
-       x1="75.442398"
-       y1="81.969704"
-       x2="105.431"
-       y2="82.123001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_31_"
-       id="linearGradient2990"
-       gradientUnits="userSpaceOnUse"
-       x1="87.560501"
-       y1="98.801804"
-       x2="87.560501"
-       y2="84.569901" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_32_"
-       id="linearGradient2992"
-       gradientUnits="userSpaceOnUse"
-       x1="87.561501"
-       y1="97.340797"
-       x2="87.561501"
-       y2="84.349197" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_33_"
-       id="radialGradient2994"
-       gradientUnits="userSpaceOnUse"
-       cx="87.766602"
-       cy="88.976601"
-       fx="87.766602"
-       fy="88.976601"
-       r="11.4148" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_34_"
-       id="linearGradient2996"
-       gradientUnits="userSpaceOnUse"
-       x1="87.5625"
-       y1="75.327103"
-       x2="87.5625"
-       y2="82.084198" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_35_"
-       id="linearGradient2998"
-       gradientUnits="userSpaceOnUse"
-       x1="64.068398"
-       y1="68.1436"
-       x2="120.423"
-       y2="130.181" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_36_"
-       id="linearGradient3000"
-       gradientUnits="userSpaceOnUse"
-       x1="76.830101"
-       y1="57.847698"
-       x2="76.830101"
-       y2="126.982" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_37_"
-       id="linearGradient3002"
-       gradientUnits="userSpaceOnUse"
-       x1="77.031303"
-       y1="120.132"
-       x2="77.031303"
-       y2="60.029999" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4522"
-       id="radialGradient3004"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7696866,0.07789056,-0.06803583,1.5457853,-418.97793,-202.43104)"
-       cx="569.94421"
-       cy="289.56024"
-       fx="569.94421"
-       fy="289.56024"
-       r="130.18762" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#back"
-       id="linearGradient3807"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6276459,0,0,1.593255,737.14592,106.67382)"
-       x1="0"
-       y1="0"
-       x2="82.849258"
-       y2="186.41083" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#r"
-       id="radialGradient3809"
-       gradientUnits="userSpaceOnUse"
-       cx="65"
-       cy="65"
-       fx="65"
-       fy="65"
-       r="44" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#y"
-       id="radialGradient3811"
-       gradientUnits="userSpaceOnUse"
-       cx="65"
-       cy="165"
-       fx="65"
-       fy="165"
-       r="44" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#g"
-       id="radialGradient3813"
-       gradientUnits="userSpaceOnUse"
-       cx="65"
-       cy="265"
-       fx="65"
-       fy="265"
-       r="44" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_9_"
-       id="linearGradient3815"
-       gradientUnits="userSpaceOnUse"
-       x1="45.014198"
-       y1="57.756302"
-       x2="45.014198"
-       y2="52.224201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_10_"
-       id="linearGradient3817"
-       gradientUnits="userSpaceOnUse"
-       x1="52.644501"
-       y1="55.616199"
-       x2="122.192"
-       y2="132.177" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_11_"
-       id="linearGradient3819"
-       gradientUnits="userSpaceOnUse"
-       x1="118.848"
-       y1="63.373001"
-       x2="108.185"
-       y2="53.6199" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_12_"
-       id="radialGradient3821"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
-       cx="114.137"
-       cy="129.33299"
-       fx="114.137"
-       fy="129.33299"
-       r="6.4330001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_13_"
-       id="linearGradient3823"
-       gradientUnits="userSpaceOnUse"
-       x1="114.477"
-       y1="56.5625"
-       x2="114.477"
-       y2="62.2383" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_14_"
-       id="linearGradient3825"
-       gradientUnits="userSpaceOnUse"
-       x1="105.643"
-       y1="60.411098"
-       x2="102.565"
-       y2="57.596199" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_15_"
-       id="linearGradient3827"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,15.5)"
-       x1="103.381"
-       y1="45.933601"
-       x2="103.381"
-       y2="42.4576" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_15_"
-       id="linearGradient3829"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,15.5)"
-       x1="103.381"
-       y1="45.933601"
-       x2="103.381"
-       y2="42.4576" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_15_"
-       id="linearGradient3831"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,15.5)"
-       x1="103.381"
-       y1="45.933601"
-       x2="103.381"
-       y2="42.4576" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_18_"
-       id="linearGradient3833"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-780.801,1657.79)"
-       x1="885.18103"
-       y1="-1596.5601"
-       x2="885.18103"
-       y2="-1598.62" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_19_"
-       id="linearGradient3835"
-       gradientUnits="userSpaceOnUse"
-       x1="104.381"
-       y1="61.433601"
-       x2="104.381"
-       y2="57.958099" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_20_"
-       id="linearGradient3837"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-780.801,1657.79)"
-       x1="885.13098"
-       y1="-1599.67"
-       x2="885.13098"
-       y2="-1597.9399" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_21_"
-       id="linearGradient3839"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5054"
-       y1="82.064499"
-       x2="101.62"
-       y2="82.428001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_22_"
-       id="linearGradient3841"
-       gradientUnits="userSpaceOnUse"
-       x1="37.715302"
-       y1="54.6782"
-       x2="83.369102"
-       y2="100.333" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_23_"
-       id="linearGradient3843"
-       gradientUnits="userSpaceOnUse"
-       x1="43.121101"
-       y1="77.249001"
-       x2="55.990799"
-       y2="90.118896" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_24_"
-       id="linearGradient3845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,-256.622,-352.346)"
-       x1="431.49799"
-       y1="-360.35999"
-       x2="465.18799"
-       y2="-326.67001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_25_"
-       id="linearGradient3847"
-       gradientUnits="userSpaceOnUse"
-       x1="75.553703"
-       y1="68.8125"
-       x2="108.682"
-       y2="105.281" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_26_"
-       id="linearGradient3849"
-       gradientUnits="userSpaceOnUse"
-       x1="87.561501"
-       y1="111.869"
-       x2="87.561501"
-       y2="64.263496" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_27_"
-       id="linearGradient3851"
-       gradientUnits="userSpaceOnUse"
-       x1="71.107399"
-       y1="81.947304"
-       x2="111.821"
-       y2="82.155403" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_28_"
-       id="linearGradient3853"
-       gradientUnits="userSpaceOnUse"
-       x1="87.561501"
-       y1="102.759"
-       x2="87.561501"
-       y2="69.688904" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_29_"
-       id="linearGradient3855"
-       gradientUnits="userSpaceOnUse"
-       x1="67.565399"
-       y1="95.804703"
-       x2="89.966499"
-       y2="80.375298" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_30_"
-       id="linearGradient3857"
-       gradientUnits="userSpaceOnUse"
-       x1="75.442398"
-       y1="81.969704"
-       x2="105.431"
-       y2="82.123001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_31_"
-       id="linearGradient3859"
-       gradientUnits="userSpaceOnUse"
-       x1="87.560501"
-       y1="98.801804"
-       x2="87.560501"
-       y2="84.569901" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_32_"
-       id="linearGradient3861"
-       gradientUnits="userSpaceOnUse"
-       x1="87.561501"
-       y1="97.340797"
-       x2="87.561501"
-       y2="84.349197" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_33_"
-       id="radialGradient3863"
-       gradientUnits="userSpaceOnUse"
-       cx="87.766602"
-       cy="88.976601"
-       fx="87.766602"
-       fy="88.976601"
-       r="11.4148" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_34_"
-       id="linearGradient3865"
-       gradientUnits="userSpaceOnUse"
-       x1="87.5625"
-       y1="75.327103"
-       x2="87.5625"
-       y2="82.084198" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_35_"
-       id="linearGradient3867"
-       gradientUnits="userSpaceOnUse"
-       x1="64.068398"
-       y1="68.1436"
-       x2="120.423"
-       y2="130.181" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_36_"
-       id="linearGradient3869"
-       gradientUnits="userSpaceOnUse"
-       x1="76.830101"
-       y1="57.847698"
-       x2="76.830101"
-       y2="126.982" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_37_"
-       id="linearGradient3871"
-       gradientUnits="userSpaceOnUse"
-       x1="77.031303"
-       y1="120.132"
-       x2="77.031303"
-       y2="60.029999" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4522"
-       id="radialGradient3873"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.7696866,0.07789056,-0.06803583,1.5457853,-418.97793,-202.43104)"
-       cx="569.94421"
-       cy="289.56024"
-       fx="569.94421"
-       fy="289.56024"
-       r="130.18762" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#back"
-       id="linearGradient4006"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6276459,0,0,1.593255,737.14592,106.67382)"
-       x1="0"
-       y1="0"
-       x2="82.849258"
-       y2="186.41083" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#r"
-       id="radialGradient4008"
-       gradientUnits="userSpaceOnUse"
-       cx="65"
-       cy="65"
-       fx="65"
-       fy="65"
-       r="44" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#y"
-       id="radialGradient4010"
-       gradientUnits="userSpaceOnUse"
-       cx="65"
-       cy="165"
-       fx="65"
-       fy="165"
-       r="44" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#g"
-       id="radialGradient4012"
-       gradientUnits="userSpaceOnUse"
-       cx="65"
-       cy="265"
-       fx="65"
-       fy="265"
-       r="44" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_9_"
-       id="linearGradient4014"
-       gradientUnits="userSpaceOnUse"
-       x1="45.014198"
-       y1="57.756302"
-       x2="45.014198"
-       y2="52.224201" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_10_"
-       id="linearGradient4016"
-       gradientUnits="userSpaceOnUse"
-       x1="52.644501"
-       y1="55.616199"
-       x2="122.192"
-       y2="132.177" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_11_"
-       id="linearGradient4018"
-       gradientUnits="userSpaceOnUse"
-       x1="118.848"
-       y1="63.373001"
-       x2="108.185"
-       y2="53.6199" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_12_"
-       id="radialGradient4020"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
-       cx="114.137"
-       cy="129.33299"
-       fx="114.137"
-       fy="129.33299"
-       r="6.4330001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_13_"
-       id="linearGradient4022"
-       gradientUnits="userSpaceOnUse"
-       x1="114.477"
-       y1="56.5625"
-       x2="114.477"
-       y2="62.2383" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_14_"
-       id="linearGradient4024"
-       gradientUnits="userSpaceOnUse"
-       x1="105.643"
-       y1="60.411098"
-       x2="102.565"
-       y2="57.596199" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_15_"
-       id="linearGradient4026"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,15.5)"
-       x1="103.381"
-       y1="45.933601"
-       x2="103.381"
-       y2="42.4576" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_15_"
-       id="linearGradient4028"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,15.5)"
-       x1="103.381"
-       y1="45.933601"
-       x2="103.381"
-       y2="42.4576" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_15_"
-       id="linearGradient4030"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,15.5)"
-       x1="103.381"
-       y1="45.933601"
-       x2="103.381"
-       y2="42.4576" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_18_"
-       id="linearGradient4032"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-780.801,1657.79)"
-       x1="885.18103"
-       y1="-1596.5601"
-       x2="885.18103"
-       y2="-1598.62" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_19_"
-       id="linearGradient4034"
-       gradientUnits="userSpaceOnUse"
-       x1="104.381"
-       y1="61.433601"
-       x2="104.381"
-       y2="57.958099" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_20_"
-       id="linearGradient4036"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-780.801,1657.79)"
-       x1="885.13098"
-       y1="-1599.67"
-       x2="885.13098"
-       y2="-1597.9399" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_21_"
-       id="linearGradient4038"
-       gradientUnits="userSpaceOnUse"
-       x1="30.5054"
-       y1="82.064499"
-       x2="101.62"
-       y2="82.428001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_22_"
-       id="linearGradient4040"
-       gradientUnits="userSpaceOnUse"
-       x1="37.715302"
-       y1="54.6782"
-       x2="83.369102"
-       y2="100.333" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_23_"
-       id="linearGradient4042"
-       gradientUnits="userSpaceOnUse"
-       x1="43.121101"
-       y1="77.249001"
-       x2="55.990799"
-       y2="90.118896" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_24_"
-       id="linearGradient4044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1,-1,0,-256.622,-352.346)"
-       x1="431.49799"
-       y1="-360.35999"
-       x2="465.18799"
-       y2="-326.67001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_25_"
-       id="linearGradient4046"
-       gradientUnits="userSpaceOnUse"
-       x1="75.553703"
-       y1="68.8125"
-       x2="108.682"
-       y2="105.281" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_26_"
-       id="linearGradient4048"
-       gradientUnits="userSpaceOnUse"
-       x1="87.561501"
-       y1="111.869"
-       x2="87.561501"
-       y2="64.263496" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_27_"
-       id="linearGradient4050"
-       gradientUnits="userSpaceOnUse"
-       x1="71.107399"
-       y1="81.947304"
-       x2="111.821"
-       y2="82.155403" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_28_"
-       id="linearGradient4052"
-       gradientUnits="userSpaceOnUse"
-       x1="87.561501"
-       y1="102.759"
-       x2="87.561501"
-       y2="69.688904" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_29_"
-       id="linearGradient4054"
-       gradientUnits="userSpaceOnUse"
-       x1="67.565399"
-       y1="95.804703"
-       x2="89.966499"
-       y2="80.375298" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_30_"
-       id="linearGradient4056"
-       gradientUnits="userSpaceOnUse"
-       x1="75.442398"
-       y1="81.969704"
-       x2="105.431"
-       y2="82.123001" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_31_"
-       id="linearGradient4058"
-       gradientUnits="userSpaceOnUse"
-       x1="87.560501"
-       y1="98.801804"
-       x2="87.560501"
-       y2="84.569901" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_32_"
-       id="linearGradient4060"
-       gradientUnits="userSpaceOnUse"
-       x1="87.561501"
-       y1="97.340797"
-       x2="87.561501"
-       y2="84.349197" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_33_"
-       id="radialGradient4062"
-       gradientUnits="userSpaceOnUse"
-       cx="87.766602"
-       cy="88.976601"
-       fx="87.766602"
-       fy="88.976601"
-       r="11.4148" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_34_"
-       id="linearGradient4064"
-       gradientUnits="userSpaceOnUse"
-       x1="87.5625"
-       y1="75.327103"
-       x2="87.5625"
-       y2="82.084198" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_35_"
-       id="linearGradient4066"
-       gradientUnits="userSpaceOnUse"
-       x1="64.068398"
-       y1="68.1436"
-       x2="120.423"
-       y2="130.181" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_36_"
-       id="linearGradient4068"
-       gradientUnits="userSpaceOnUse"
-       x1="76.830101"
-       y1="57.847698"
-       x2="76.830101"
-       y2="126.982" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#XMLID_37_"
-       id="linearGradient4070"
-       gradientUnits="userSpaceOnUse"
-       x1="77.031303"
-       y1="120.132"
-       x2="77.031303"
-       y2="60.029999" />
-  </defs>
-  <g
-     id="g4074"
-     transform="matrix(0.45833,0,0,0.45833,0.09537765,0.20735403)">
-    <use
-       height="600"
-       width="600"
-       y="0"
-       x="0"
-       transform="matrix(0.8331005,0,0,0.8331005,614.11663,-360.69592)"
-       id="use3399"
-       xlink:href="#reflex" />
-    <use
-       height="600"
-       width="600"
-       y="0"
-       x="0"
-       id="use3401"
-       transform="matrix(0.8331005,0,0,0.8331005,614.11663,-277.38587)"
-       xlink:href="#reflex" />
-    <use
-       height="600"
-       width="600"
-       y="0"
-       x="0"
-       id="use3403"
-       transform="matrix(0.8331005,0,0,0.8331005,614.11663,-194.07582)"
-       xlink:href="#reflex" />
-    <g
-       transform="matrix(0.07034453,0,0,0.07034453,-0.2582579,2.8565392)"
-       id="g4538">
-      <path
-         id="path16"
-         style="fill:#cc0000;fill-opacity:1;fill-rule:evenodd;stroke:none"
-         d="M 112.60846,250.59757 C 112.19594,124.33283 206.65435,17.92223 331.72332,2.0110029 474.76675,-16.138613 604.57352,90.733 613.07847,234.94719 622.43271,379.23416 507.44593,501.2648 363.02544,501.00397 225.13231,501.4104 112.04429,388.588 112.60846,250.59757"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path18"
-         style="fill:#fffefe;fill-rule:evenodd;stroke:none"
-         d="M 178.5674,250.52998 C 178.28835,157.95605 248.14182,78.466576 340.17371,67.456704 445.3998,53.91728 541.01081,133.02461 547.2773,238.88318 553.98057,345.65772 469.7014,434.54957 363.10433,435.05912 260.7112,434.24626 179.0345,353.31308 178.5674,250.52998"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path20"
-         style="fill:#000000;fill-rule:evenodd;stroke:none"
-         d="m 291.59905,142.76359 34.57794,0 -46.22523,92.08258 c 24.38047,-9.02021 48.97932,-0.78253 62.60425,21.47378 12.43591,22.89934 9.46343,69.26213 -12.73924,86.98712 -27.01324,24.57356 -65.88612,21.80137 -89.90261,-5.45943 -11.7565,-15.27431 -14.80784,-29.96627 -13.83118,-48.77102 l 0,-2.9117 0.36399,-5.82341 1.09193,-5.45944 1.45591,-5.45946 2.18387,-5.45943 1.09193,-2.54774 59.32844,-118.65185 z m -34.9419,146.31303 c -5.50819,50.11162 59.20712,53.30234 61.51231,9.46303 6.12697,-50.88806 -59.29204,-53.33267 -61.51231,-9.46303 z m 119.38484,9.46303 c 6.43028,-58.07633 -25.86671,-141.44807 53.86879,-157.23193 36.49486,-4.34935 69.39243,24.07009 69.15585,61.14576 -6.41209,58.84671 25.86672,140.81113 -53.86877,157.23192 -37.04692,4.16737 -69.11946,-23.62727 -69.15587,-61.14575 z m 30.57417,0 0,-96.08617 0.36399,-2.18378 0.36396,-3.63963 0.72798,-3.63963 1.45589,-3.63962 1.81989,-3.63964 c 6.27864,-8.09817 11.9021,-12.16848 22.20268,-13.83058 18.73275,-2.37183 34.61432,11.79846 34.57792,30.57288 l 0,97.90599 -0.36397,4.00359 -1.09194,3.63962 -1.45591,3.63963 -1.81988,3.27566 c -4.59827,7.898 -13.27915,12.95102 -22.20267,14.19455 -8.95387,0.92204 -18.33237,-1.929 -24.75053,-8.37115 -7.78913,-7.44302 -8.7112,-12.11388 -9.82741,-22.20172"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       transform="matrix(-0.1271574,0,0,0.1259947,110.2611,-10.872392)"
-       id="g3448">
-      <rect
-         style="fill:url(#linearGradient4006);stroke:#000000;stroke-width:10"
-         width="120"
-         height="320"
-         x="742.14594"
-         y="111.67382"
-         id="rect3394" />
-      <circle
-         style="fill:url(#radialGradient4008);stroke:#000000;stroke-width:8"
-         cx="65"
-         cy="65"
-         r="40"
-         id="redlight"
-         sodipodi:cx="65"
-         sodipodi:cy="65"
-         sodipodi:rx="40"
-         sodipodi:ry="40"
-         transform="translate(737.14592,106.67382)"
-         d="M 105,65 C 105,87.09139 87.09139,105 65,105 42.90861,105 25,87.09139 25,65 25,42.90861 42.90861,25 65,25 c 22.09139,0 40,17.90861 40,40 z" />
-      <circle
-         style="fill:url(#radialGradient4010);stroke:#000000;stroke-width:8"
-         cx="65"
-         cy="165"
-         r="40"
-         id="yellight"
-         sodipodi:cx="65"
-         sodipodi:cy="165"
-         sodipodi:rx="40"
-         sodipodi:ry="40"
-         transform="translate(737.14592,106.67382)"
-         d="m 105,165 c 0,22.09139 -17.90861,40 -40,40 -22.09139,0 -40,-17.90861 -40,-40 0,-22.09139 17.90861,-40 40,-40 22.09139,0 40,17.90861 40,40 z" />
-      <circle
-         style="fill:url(#radialGradient4012);stroke:#000000;stroke-width:8"
-         cx="65"
-         cy="265"
-         r="40"
-         id="grelight"
-         sodipodi:cx="65"
-         sodipodi:cy="265"
-         sodipodi:rx="40"
-         sodipodi:ry="40"
-         transform="translate(737.14592,106.67382)"
-         d="m 105,265 c 0,22.09139 -17.90861,40 -40,40 -22.09139,0 -40,-17.90861 -40,-40 0,-22.09139 17.90861,-40 40,-40 22.09139,0 40,17.90861 40,40 z" />
-    </g>
-    <g
-       transform="matrix(0.07247238,0,0,0.07247238,-3.1185958,3.3125023)"
-       id="g2682">
-      <g
-         transform="matrix(5.4017057,0,0,5.4017057,-34.965592,-27.802653)"
-         id="g2620">
-        <linearGradient
-           y2="52.224201"
-           x2="45.014198"
-           y1="57.756302"
-           x1="45.014198"
-           gradientUnits="userSpaceOnUse"
-           id="linearGradient3492">
-          <stop
-             id="stop3494"
-             style="stop-color:rgb(158,158,158)"
-             offset="0" />
-          <stop
-             id="stop3496"
-             style="stop-color:rgb(97,97,97)"
-             offset="1" />
-        </linearGradient>
-        <path
-           id="path2627"
-           style="fill:url(#linearGradient4014)"
-           d="m 45.014,57.186 c -4.356,0 -7.888,-1.297 -7.888,-2.896 0,-1.6 3.532,-2.897 7.888,-2.897 4.357,0 7.889,1.297 7.889,2.897 -10e-4,1.598 -3.532,2.896 -7.889,2.896 z"
-           inkscape:connector-curvature="0" />
-        <linearGradient
-           y2="132.177"
-           x2="122.192"
-           y1="55.616199"
-           x1="52.644501"
-           gradientUnits="userSpaceOnUse"
-           id="linearGradient3499">
-          <stop
-             id="stop3501"
-             style="stop-color:rgb(255,255,255)"
-             offset="0.0337" />
-          <stop
-             id="stop3503"
-             style="stop-color:rgb(171,171,171)"
-             offset="1" />
-        </linearGradient>
-        <path
-           id="path2634"
-           style="fill:url(#linearGradient4016)"
-           d="m 119.951,51.413 -39.378,0 c -2.108,0 -3.867,1.397 -4.46,3.31 l -42.002,0 c -2.591,0 -4.691,2.101 -4.691,4.692 l 0,49.404 c 0,2.592 2.1,4.691 4.691,4.691 l 85.84,0 c 2.593,0 4.692,-2.1 4.692,-4.691 l 0,-52.715 c 0.001,-2.59 -2.099,-4.691 -4.692,-4.691 z"
-           inkscape:connector-curvature="0" />
-        <g
-           id="g2636">
-          <linearGradient
-             y2="53.6199"
-             x2="108.185"
-             y1="63.373001"
-             x1="118.848"
-             gradientUnits="userSpaceOnUse"
-             id="linearGradient3507">
-            <stop
-               id="stop3509"
-               style="stop-color:rgb(255,255,255)"
-               offset="0.0337" />
-            <stop
-               id="stop3511"
-               style="stop-color:rgb(171,171,171)"
-               offset="1" />
-          </linearGradient>
-          <path
-             id="path2643"
-             style="fill:url(#linearGradient4018)"
-             d="m 119.698,62.499 c 0,0.391 -0.292,0.707 -0.652,0.707 l -9.141,0 c -0.361,0 -0.652,-0.316 -0.652,-0.707 l 0,-6.249 c 0,-0.391 0.291,-0.708 0.652,-0.708 l 9.141,0 c 0.36,0 0.652,0.316 0.652,0.708 l 0,6.249 z"
-             inkscape:connector-curvature="0" />
-          <radialGradient
-             gradientUnits="userSpaceOnUse"
-             gradientTransform="matrix(1,0,0,1.0845,0,-75.5965)"
-             fy="129.33299"
-             fx="114.137"
-             r="6.4330001"
-             cy="129.33299"
-             cx="114.137"
-             id="radialGradient3514">
-            <stop
-               id="stop3516"
-               style="stop-color:rgb(133,202,255)"
-               offset="0" />
-            <stop
-               id="stop3518"
-               style="stop-color:rgb(0,61,169)"
-               offset="1" />
-          </radialGradient>
-          <path
-             id="path2650"
-             style="fill:url(#radialGradient4020)"
-             d="m 119.306,62.263 c 0,0.363 -0.27,0.655 -0.603,0.655 l -8.454,0 c -0.333,0 -0.604,-0.292 -0.604,-0.655 l 0,-5.776 c 0,-0.362 0.271,-0.655 0.604,-0.655 l 8.454,0 c 0.333,0 0.603,0.292 0.603,0.655 l 0,5.776 z"
-             inkscape:connector-curvature="0" />
-          <linearGradient
-             y2="62.2383"
-             x2="114.477"
-             y1="56.5625"
-             x1="114.477"
-             gradientUnits="userSpaceOnUse"
-             id="linearGradient3521">
-            <stop
-               id="stop3523"
-               style="stop-color:rgb(255,255,255)"
-               offset="0%" />
-            <stop
-               id="stop3525"
-               style="stop-opacity:0;stop-color:rgb(255,255,255)"
-               offset="100%" />
-          </linearGradient>
-          <path
-             id="path2657"
-             style="fill:url(#linearGradient4022)"
-             d="m 118.389,56.034 -7.825,0 c -0.311,0 -0.56,0.272 -0.56,0.605 l 0,4.459 c 0.97,0.107 2.675,0.021 4.403,-1.391 1.897,-1.547 3.683,-2.111 4.541,-2.305 l 0,-0.762 c 0,-0.334 -0.25,-0.606 -0.559,-0.606 z"
-             a:adobe-blending-mode="screen"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           id="g2659">
-          <linearGradient
-             y2="57.596199"
-             x2="102.565"
-             y1="60.411098"
-             x1="105.643"
-             gradientUnits="userSpaceOnUse"
-             id="linearGradient3529">
-            <stop
-               id="stop3531"
-               style="stop-color:rgb(255,255,255)"
-               offset="0.0337" />
-            <stop
-               id="stop3533"
-               style="stop-color:rgb(171,171,171)"
-               offset="1" />
-          </linearGradient>
-          <path
-             id="path2666"
-             style="fill:url(#linearGradient4024)"
-             d="m 104.38,57.077 c -1.286,0 -2.331,0.978 -2.331,2.18 0,1.202 1.045,2.178 2.331,2.178 1.287,0 2.334,-0.977 2.334,-2.178 0,-1.201 -1.047,-2.18 -2.334,-2.18 z"
-             inkscape:connector-curvature="0" />
-          <g
-             id="g2668">
-            <g
-               id="g2670">
-              <linearGradient
-                 gradientTransform="translate(1,15.5)"
-                 y2="42.4576"
-                 x2="103.381"
-                 y1="45.933601"
-                 x1="103.381"
-                 gradientUnits="userSpaceOnUse"
-                 id="linearGradient3538">
-                <stop
-                   id="stop3540"
-                   style="stop-color:rgb(158,158,158)"
-                   offset="0" />
-                <stop
-                   id="stop3542"
-                   style="stop-color:rgb(97,97,97)"
-                   offset="1" />
-              </linearGradient>
-              <path
-                 id="path2677"
-                 style="fill:url(#linearGradient4026)"
-                 d="m 106.24,59.256 c 0,0.959 -0.834,1.737 -1.86,1.737 -1.025,0 -1.858,-0.777 -1.858,-1.737 0,-0.96 0.833,-1.737 1.858,-1.736 1.027,0 1.86,0.776 1.86,1.736 z"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path2679"
-                 style="fill:url(#linearGradient4028)"
-                 d="m 102.435,59.256 c 0,1.003 0.873,1.819 1.945,1.819 1.075,0 1.949,-0.815 1.948,-1.819 10e-4,-1.003 -0.873,-1.821 -1.948,-1.821 -1.072,0 -1.946,0.818 -1.945,1.821 z m 0.175,0 c 0,-0.912 0.794,-1.655 1.77,-1.655 0.978,0 1.771,0.743 1.771,1.654 0,0.912 -0.793,1.654 -1.771,1.654 -0.976,0 -1.77,-0.742 -1.77,-1.653 z"
-                 inkscape:connector-curvature="0" />
-              <path
-                 id="path2681"
-                 style="fill:url(#linearGradient4030)"
-                 d="m 104.389,59.305 c 0.647,-0.447 1.254,-0.598 1.522,-0.647 -0.257,-0.541 -0.836,-0.917 -1.51,-0.917 -0.913,0 -1.652,0.691 -1.652,1.542 0,0.134 0.018,0.263 0.051,0.388 0.268,0.047 0.924,0.094 1.589,-0.366 z"
-                 inkscape:connector-curvature="0" />
-            </g>
-            <g
-               id="g2683">
-              <linearGradient
-                 gradientTransform="translate(-780.801,1657.79)"
-                 y2="-1598.62"
-                 x2="885.18103"
-                 y1="-1596.5601"
-                 x1="885.18103"
-                 gradientUnits="userSpaceOnUse"
-                 id="linearGradient3548">
-                <stop
-                   id="stop3550"
-                   style="stop-color:rgb(255,255,255)"
-                   offset="0" />
-                <stop
-                   id="stop3552"
-                   style="stop-color:rgb(189,189,189)"
-                   offset="1" />
-              </linearGradient>
-              <path
-                 id="path2690"
-                 style="fill:url(#linearGradient4032)"
-                 d="m 106.24,59.256 c 0,0.959 -0.834,1.737 -1.86,1.737 -1.025,0 -1.858,-0.777 -1.858,-1.737 0,-0.96 0.833,-1.737 1.858,-1.736 1.027,0 1.86,0.776 1.86,1.736 z"
-                 inkscape:connector-curvature="0" />
-              <linearGradient
-                 y2="57.958099"
-                 x2="104.381"
-                 y1="61.433601"
-                 x1="104.381"
-                 gradientUnits="userSpaceOnUse"
-                 id="linearGradient3555">
-                <stop
-                   id="stop3557"
-                   style="stop-color:rgb(158,158,158)"
-                   offset="0" />
-                <stop
-                   id="stop3559"
-                   style="stop-color:rgb(97,97,97)"
-                   offset="1" />
-              </linearGradient>
-              <path
-                 id="path2697"
-                 style="fill:url(#linearGradient4034)"
-                 d="m 102.435,59.256 c 0,1.003 0.873,1.819 1.945,1.819 1.075,0 1.949,-0.815 1.948,-1.819 10e-4,-1.003 -0.873,-1.821 -1.948,-1.821 -1.072,0 -1.946,0.818 -1.945,1.821 z m 0.175,0 c 0,-0.912 0.794,-1.655 1.77,-1.655 0.978,0 1.771,0.743 1.771,1.654 0,0.912 -0.793,1.654 -1.771,1.654 -0.976,0 -1.77,-0.742 -1.77,-1.653 z"
-                 inkscape:connector-curvature="0" />
-              <linearGradient
-                 gradientTransform="translate(-780.801,1657.79)"
-                 y2="-1597.9399"
-                 x2="885.13098"
-                 y1="-1599.67"
-                 x1="885.13098"
-                 gradientUnits="userSpaceOnUse"
-                 id="linearGradient3562">
-                <stop
-                   id="stop3564"
-                   style="stop-color:rgb(255,255,255)"
-                   offset="0" />
-                <stop
-                   id="stop3566"
-                   style="stop-color:rgb(207,207,207)"
-                   offset="1" />
-              </linearGradient>
-              <path
-                 id="path2704"
-                 style="fill:url(#linearGradient4036)"
-                 d="m 104.389,59.305 c 0.647,-0.447 1.254,-0.598 1.522,-0.647 -0.257,-0.541 -0.836,-0.917 -1.51,-0.917 -0.913,0 -1.652,0.691 -1.652,1.542 0,0.134 0.018,0.263 0.051,0.388 0.268,0.047 0.924,0.094 1.589,-0.366 z"
-                 inkscape:connector-curvature="0" />
-            </g>
-          </g>
-        </g>
-        <linearGradient
-           y2="82.428001"
-           x2="101.62"
-           y1="82.064499"
-           x1="30.5054"
-           gradientUnits="userSpaceOnUse"
-           id="linearGradient3569">
-          <stop
-             id="stop3571"
-             style="stop-color:rgb(255,255,255)"
-             offset="0.0337" />
-          <stop
-             id="stop3573"
-             style="stop-color:rgb(171,171,171)"
-             offset="1" />
-        </linearGradient>
-        <path
-           id="path2711"
-           style="fill:url(#linearGradient4038)"
-           d="m 29.458,106.97 59.574,0 0,-49.517 -59.574,0 0,49.517 z"
-           inkscape:connector-curvature="0" />
-        <linearGradient
-           y2="100.333"
-           x2="83.369102"
-           y1="54.6782"
-           x1="37.715302"
-           gradientUnits="userSpaceOnUse"
-           id="linearGradient3576">
-          <stop
-             id="stop3578"
-             style="stop-color:rgb(158,158,158)"
-             offset="0" />
-          <stop
-             id="stop3580"
-             style="stop-color:rgb(97,97,97)"
-             offset="1" />
-        </linearGradient>
-        <path
-           id="path2718"
-           style="opacity:0.7;fill:url(#linearGradient4040)"
-           d="m 87.977,82.43 0,-12.899 -58.173,0 0,35.914 94.34,0 0,-23.015 -36.167,0 z"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path2720"
-           style="opacity:0.5;fill:#ffffff"
-           d="m 54.489,69.416 -0.737,0 0,35.981 0.737,0 0,-35.981 z"
-           inkscape:connector-curvature="0" />
-        <linearGradient
-           y2="90.118896"
-           x2="55.990799"
-           y1="77.249001"
-           x1="43.121101"
-           gradientUnits="userSpaceOnUse"
-           id="linearGradient3584">
-          <stop
-             id="stop3586"
-             style="stop-color:rgb(158,158,158)"
-             offset="0" />
-          <stop
-             id="stop3588"
-             style="stop-color:rgb(97,97,97)"
-             offset="1" />
-        </linearGradient>
-        <path
-           id="path2727"
-           style="opacity:0.7;fill:url(#linearGradient4042)"
-           d="m 53.647,69.416 -0.737,0 0,35.981 0.737,0 0,-35.981 z"
-           inkscape:connector-curvature="0" />
-        <path
-           id="path2729"
-           style="opacity:0.5;fill:#ffffff"
-           d="m 124.837,106.955 0,-0.737 -95.382,0 0,0.737 95.382,0 z"
-           inkscape:connector-curvature="0" />
-        <linearGradient
-           gradientTransform="matrix(0,1,-1,0,-256.622,-352.346)"
-           y2="-326.67001"
-           x2="465.18799"
-           y1="-360.35999"
-           x1="431.49799"
-           gradientUnits="userSpaceOnUse"
-           id="linearGradient3592">
-          <stop
-             id="stop3594"
-             style="stop-color:rgb(158,158,158)"
-             offset="0" />
-          <stop
-             id="stop3596"
-             style="stop-color:rgb(97,97,97)"
-             offset="1" />
-        </linearGradient>
-        <path
-           id="path2736"
-           style="opacity:0.7;fill:url(#linearGradient4044)"
-           d="m 124.837,106.112 0,-0.737 -95.382,0 0,0.737 95.382,0 z"
-           inkscape:connector-curvature="0" />
-        <g
-           id="g2738">
-          <linearGradient
-             y2="105.281"
-             x2="108.682"
-             y1="68.8125"
-             x1="75.553703"
-             gradientUnits="userSpaceOnUse"
-             id="linearGradient3600">
-            <stop
-               id="stop3602"
-               style="stop-color:rgb(255,255,255)"
-               offset="0.0337" />
-            <stop
-               id="stop3604"
-               style="stop-color:rgb(171,171,171)"
-               offset="1" />
-          </linearGradient>
-          <path
-             id="path2745"
-             style="fill:url(#linearGradient4046)"
-             d="m 112.278,82.032 c 0,13.65 -11.064,24.717 -24.717,24.717 -13.65,0 -24.716,-11.066 -24.716,-24.717 0,-13.651 11.066,-24.718 24.716,-24.718 13.653,0 24.717,11.067 24.717,24.718 z"
-             inkscape:connector-curvature="0" />
-          <linearGradient
-             y2="64.263496"
-             x2="87.561501"
-             y1="111.869"
-             x1="87.561501"
-             gradientUnits="userSpaceOnUse"
-             id="linearGradient3607">
-            <stop
-               id="stop3609"
-               style="stop-color:rgb(158,158,158)"
-               offset="0" />
-            <stop
-               id="stop3611"
-               style="stop-color:rgb(97,97,97)"
-               offset="1" />
-          </linearGradient>
-          <path
-             id="path2752"
-             style="fill:url(#linearGradient4048)"
-             d="m 62.635,82.032 c 0,13.744 11.182,24.927 24.927,24.927 13.744,0 24.927,-11.183 24.927,-24.927 0,-13.745 -11.183,-24.928 -24.927,-24.928 -13.746,0 -24.927,11.183 -24.927,24.928 z m 0.421,0 c 0,-13.514 10.993,-24.507 24.506,-24.507 13.513,0 24.506,10.994 24.506,24.507 0,13.513 -10.993,24.506 -24.506,24.506 -13.513,0 -24.506,-10.993 -24.506,-24.506 z"
-             inkscape:connector-curvature="0" />
-          <linearGradient
-             y2="82.155403"
-             x2="111.821"
-             y1="81.947304"
-             x1="71.107399"
-             gradientUnits="userSpaceOnUse"
-             id="linearGradient3614">
-            <stop
-               id="stop3616"
-               style="stop-color:rgb(255,255,255)"
-               offset="0.0337" />
-            <stop
-               id="stop3618"
-               style="stop-color:rgb(171,171,171)"
-               offset="1" />
-            <a:midPointStop
-               style="stop-color:#FFFFFF"
-               offset="0.0337" />
-            <a:midPointStop
-               style="stop-color:#FFFFFF"
-               offset="0.5" />
-            <a:midPointStop
-               style="stop-color:#ABABAB"
-               offset="1" />
-          </linearGradient>
-          <path
-             id="path2759"
-             style="fill:url(#linearGradient4050)"
-             d="m 104.687,82.032 c 0,9.458 -7.667,17.124 -17.125,17.124 -9.458,0 -17.126,-7.666 -17.126,-17.124 0,-9.459 7.668,-17.125 17.126,-17.125 9.458,0 17.125,7.666 17.125,17.125 z"
-             inkscape:connector-curvature="0" />
-          <linearGradient
-             y2="69.688904"
-             x2="87.561501"
-             y1="102.759"
-             x1="87.561501"
-             gradientUnits="userSpaceOnUse"
-             id="linearGradient3621">
-            <stop
-               id="stop3623"
-               style="stop-color:rgb(158,158,158)"
-               offset="0" />
-            <stop
-               id="stop3625"
-               style="stop-color:rgb(97,97,97)"
-               offset="1" />
-          </linearGradient>
-          <path
-             id="path2766"
-             style="fill:url(#linearGradient4052)"
-             d="m 70.246,82.032 c 0,9.548 7.768,17.315 17.315,17.315 9.549,0 17.315,-7.768 17.315,-17.315 0,-9.549 -7.767,-17.316 -17.315,-17.316 -9.547,0 -17.315,7.767 -17.315,17.316 z m 0.382,0 c 0,-9.338 7.597,-16.936 16.934,-16.936 9.338,0 16.934,7.598 16.934,16.936 0,9.338 -7.596,16.934 -16.934,16.934 -9.337,0 -16.934,-7.596 -16.934,-16.934 z"
-             inkscape:connector-curvature="0" />
-          <linearGradient
-             y2="80.375298"
-             x2="89.966499"
-             y1="95.804703"
-             x1="67.565399"
-             gradientUnits="userSpaceOnUse"
-             id="linearGradient3628">
-            <stop
-               id="stop3630"
-               style="stop-color:rgb(255,255,255)"
-               offset="0.0337" />
-            <stop
-               id="stop3632"
-               style="stop-color:rgb(153,153,153)"
-               offset="1" />
-          </linearGradient>
-          <path
-             id="path2773"
-             style="fill:url(#linearGradient4054)"
-             d="m 102.649,82.032 c 0,8.333 -6.755,15.087 -15.088,15.087 -8.333,0 -15.087,-6.754 -15.087,-15.087 0,-8.334 6.754,-15.088 15.087,-15.088 8.333,0 15.088,6.754 15.088,15.088 z"
-             inkscape:connector-curvature="0" />
-          <linearGradient
-             y2="82.123001"
-             x2="105.431"
-             y1="81.969704"
-             x1="75.442398"
-             gradientUnits="userSpaceOnUse"
-             id="linearGradient3635">
-            <stop
-               id="stop3637"
-               style="stop-color:rgb(255,255,255)"
-               offset="0.0337" />
-            <stop
-               id="stop3639"
-               style="stop-color:rgb(171,171,171)"
-               offset="1" />
-          </linearGradient>
-          <path
-             id="path2780"
-             style="fill:url(#linearGradient4056)"
-             d="m 100.176,82.032 c 0,6.967 -5.647,12.614 -12.614,12.614 -6.966,0 -12.614,-5.647 -12.614,-12.614 0,-6.967 5.648,-12.615 12.614,-12.615 6.966,0 12.614,5.648 12.614,12.615 z"
-             inkscape:connector-curvature="0" />
-          <linearGradient
-             y2="84.569901"
-             x2="87.560501"
-             y1="98.801804"
-             x1="87.560501"
-             gradientUnits="userSpaceOnUse"
-             id="linearGradient3642">
-            <stop
-               id="stop3644"
-               style="stop-color:rgb(255,255,255)"
-               offset="0.1685" />
-            <stop
-               id="stop3646"
-               style="stop-color:rgb(54,54,54)"
-               offset="1" />
-            <a:midPointStop
-               style="stop-color:#FFFFFF"
-               offset="0.1685" />
-            <a:midPointStop
-               style="stop-color:#FFFFFF"
-               offset="0.5" />
-            <a:midPointStop
-               style="stop-color:#363636"
-               offset="1" />
-          </linearGradient>
-          <path
-             id="path2787"
-             style="fill:url(#linearGradient4058)"
-             d="m 97.999,82.032 c 0,5.766 -4.671,10.438 -10.438,10.438 -5.766,0 -10.438,-4.672 -10.438,-10.438 0,-5.766 4.673,-10.439 10.438,-10.439 5.767,0 10.438,4.674 10.438,10.439 z"
-             inkscape:connector-curvature="0" />
-          <linearGradient
-             y2="84.349197"
-             x2="87.561501"
-             y1="97.340797"
-             x1="87.561501"
-             gradientUnits="userSpaceOnUse"
-             id="linearGradient3649">
-            <stop
-               id="stop3651"
-               style="stop-color:rgb(255,255,255)"
-               offset="4.5977%" />
-            <stop
-               id="stop3653"
-               style="stop-opacity:0;stop-color:rgb(255,255,255)"
-               offset="100%" />
-          </linearGradient>
-          <path
-             id="path2794"
-             style="fill:url(#linearGradient4060)"
-             d="m 97.09,82.032 c 0,5.263 -4.264,9.528 -9.528,9.528 -5.264,0 -9.528,-4.266 -9.528,-9.528 0,-5.264 4.265,-9.529 9.528,-9.529 5.264,0 9.528,4.266 9.528,9.529 z"
-             inkscape:connector-curvature="0" />
-          <g
-             id="g2796">
-            <radialGradient
-               gradientUnits="userSpaceOnUse"
-               fy="88.976601"
-               fx="87.766602"
-               r="11.4148"
-               cy="88.976601"
-               cx="87.766602"
-               id="radialGradient3657">
-              <stop
-                 id="stop3659"
-                 style="stop-color:rgb(187,235,255)"
-                 offset="0" />
-              <stop
-                 id="stop3661"
-                 style="stop-color:rgb(0,61,215)"
-                 offset="1" />
-              <a:midPointStop
-                 style="stop-color:#BBEBFF"
-                 offset="0" />
-              <a:midPointStop
-                 style="stop-color:#BBEBFF"
-                 offset="0.5" />
-              <a:midPointStop
-                 style="stop-color:#003DD7"
-                 offset="1" />
-            </radialGradient>
-            <path
-               id="path2803"
-               style="fill:url(#radialGradient4062)"
-               d="m 93.685,82.032 c 0,3.382 -2.741,6.123 -6.124,6.123 -3.38,0 -6.124,-2.741 -6.124,-6.123 0,-3.383 2.744,-6.124 6.124,-6.124 3.382,0 6.124,2.741 6.124,6.124 z"
-               inkscape:connector-curvature="0" />
-            <linearGradient
-               y2="82.084198"
-               x2="87.5625"
-               y1="75.327103"
-               x1="87.5625"
-               gradientUnits="userSpaceOnUse"
-               id="linearGradient3664">
-              <stop
-                 id="stop3666"
-                 style="stop-color:rgb(255,255,255)"
-                 offset="7.47126%" />
-              <stop
-                 id="stop3668"
-                 style="stop-opacity:0;stop-color:rgb(255,255,255)"
-                 offset="100%" />
-            </linearGradient>
-            <path
-               id="path2810"
-               style="fill:url(#linearGradient4064)"
-               d="m 92.081,79.905 c 0,2.006 -2.024,3.632 -4.521,3.632 -2.495,0 -4.518,-1.626 -4.518,-3.632 0,-2.007 2.022,-3.634 4.518,-3.634 2.497,0 4.521,1.627 4.521,3.634 z"
-               a:adobe-blending-mode="screen"
-               inkscape:connector-curvature="0" />
-          </g>
-        </g>
-        <linearGradient
-           y2="130.181"
-           x2="120.423"
-           y1="68.1436"
-           x1="64.068398"
-           gradientUnits="userSpaceOnUse"
-           id="linearGradient3671">
-          <stop
-             id="stop3673"
-             style="stop-color:rgb(255,255,255)"
-             offset="0.0337" />
-          <stop
-             id="stop3675"
-             style="stop-color:rgb(135,135,135)"
-             offset="1" />
-        </linearGradient>
-        <path
-           id="path2817"
-           style="opacity:0.5;fill:url(#linearGradient4066)"
-           d="m 121.345,51.624 c 0.137,0.44 0.211,0.907 0.211,1.394 l 0,52.715 c 0,2.591 -2.1,4.691 -4.691,4.691 l -85.843,0 c -0.485,0 -0.952,-0.074 -1.393,-0.21 0.594,1.91 2.375,3.297 4.481,3.297 l 85.84,0 c 2.593,0 4.692,-2.1 4.692,-4.691 l 0,-52.716 c 0.002,-2.105 -1.385,-3.888 -3.297,-4.48 z"
-           a:adobe-blending-mode="multiply"
-           inkscape:connector-curvature="0" />
-        <linearGradient
-           y2="126.982"
-           x2="76.830101"
-           y1="57.847698"
-           x1="76.830101"
-           gradientUnits="userSpaceOnUse"
-           id="linearGradient3678">
-          <stop
-             id="stop3680"
-             style="stop-color:rgb(255,255,255)"
-             offset="4.02299%" />
-          <stop
-             id="stop3682"
-             style="stop-opacity:0;stop-color:rgb(255,255,255)"
-             offset="100%" />
-        </linearGradient>
-        <path
-           id="path2824"
-           style="fill:url(#linearGradient4068)"
-           d="m 31.807,61.8 c 0,-2.59 2.1,-4.691 4.691,-4.691 l 42.002,0 C 79.092,55.197 80.853,53.8 82.96,53.8 l 39.379,0 c 0.677,0 1.318,0.145 1.9,0.403 -0.729,-1.642 -2.373,-2.79 -4.288,-2.79 l -39.378,0 c -2.108,0 -3.867,1.397 -4.46,3.31 l -42.002,0 c -2.591,0 -4.691,2.101 -4.691,4.692 l 0,49.404 c 0,1.915 1.148,3.559 2.792,4.287 -0.259,-0.581 -0.405,-1.224 -0.405,-1.899 l 0,-49.407 z"
-           a:adobe-blending-mode="screen"
-           inkscape:connector-curvature="0" />
-        <linearGradient
-           y2="60.029999"
-           x2="77.031303"
-           y1="120.132"
-           x1="77.031303"
-           gradientUnits="userSpaceOnUse"
-           id="linearGradient3685">
-          <stop
-             id="stop3687"
-             style="stop-color:rgb(158,158,158)"
-             offset="0" />
-          <stop
-             id="stop3689"
-             style="stop-color:rgb(97,97,97)"
-             offset="1" />
-          <a:midPointStop
-             style="stop-color:#9E9E9E"
-             offset="0" />
-          <a:midPointStop
-             style="stop-color:#9E9E9E"
-             offset="0.5" />
-          <a:midPointStop
-             style="stop-color:#616161"
-             offset="1" />
-        </linearGradient>
-        <path
-           id="path2831"
-           style="fill:url(#linearGradient4070)"
-           d="m 80.573,50.992 c -2.128,0 -3.961,1.331 -4.716,3.31 -0.506,0 -41.747,0 -41.747,0 -2.818,0 -5.112,2.293 -5.112,5.114 l 0,49.404 c 0,2.82 2.293,5.113 5.112,5.113 l 85.84,0 c 2.82,0 5.113,-2.293 5.113,-5.113 l 0,-52.716 c 0,-2.819 -2.293,-5.112 -5.113,-5.112 l -39.377,0 z m -50.732,57.827 0,-49.404 c 0,-2.355 1.916,-4.271 4.27,-4.271 l 42.314,0 0.092,-0.296 c 0.558,-1.802 2.188,-3.014 4.057,-3.014 l 39.378,0 c 2.356,0 4.271,1.917 4.271,4.271 l 0,52.715 c 0,2.355 -1.914,4.271 -4.271,4.271 l -85.84,0 c -2.355,0 -4.271,-1.916 -4.271,-4.272 z"
-           inkscape:connector-curvature="0" />
-      </g>
-      <path
-         sodipodi:type="star"
-         style="fill:#ffff00;fill-opacity:0.87121217;stroke:none"
-         id="path3750"
-         sodipodi:sides="5"
-         sodipodi:cx="581.24176"
-         sodipodi:cy="291.70145"
-         sodipodi:r1="139.80701"
-         sodipodi:r2="72.924919"
-         sodipodi:arg1="0.67790049"
-         sodipodi:arg2="1.306219"
-         inkscape:flatsided="false"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="m 690.1362,379.38269 -89.82448,-17.29388 -68.80954,60.2724 -11.30983,-90.77226 -78.58578,-46.81657 82.83461,-38.80646 20.24087,-89.20663 62.50444,66.78854 91.09532,-8.31616 -44.20475,80.08405 z"
-         transform="translate(7.0710115,-4.2372125e-6)" />
-    </g>
-  </g>
-</svg>
diff --git a/navit/xpm/theater.svg b/navit/xpm/theater.svg
deleted file mode 100644
index 0a008eb80..000000000
--- a/navit/xpm/theater.svg
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   id="svg2"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="theater.svg"
-   sodipodi:version="0.32"
-   version="1.0"
-   width="22">
-  <metadata
-     id="metadata2975">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10.0"
-     guidetolerance="10.0"
-     id="base"
-     inkscape:current-layer="svg2"
-     inkscape:cx="52.689911"
-     inkscape:cy="2.5786943"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="725"
-     inkscape:window-width="1024"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:zoom="7.3734169"
-     objecttolerance="10.0"
-     pagecolor="#ffffff"
-     showgrid="false"
-     inkscape:window-maximized="1" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective2441"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3452"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       inkscape:vp_x="0 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="60 : 30 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <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
-         d="M94,176l-21,39"
-         fill="none"
-         id="path4462"
-         stroke="#000000"
-         stroke-width="20" />
-      <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
-         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
-         id="path4466"
-         ill="none"
-         stroke="#000000"
-         stroke-width="20" />
-    </symbol>
-    <inkscape:perspective
-       id="perspective4471"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4668"
-       inkscape:persp3d-origin="6 : 4 : 1"
-       inkscape:vp_x="0 : 6 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="12 : 6 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2543"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <g
-     id="g1327"
-     transform="matrix(0.04001453,0,0,0.04340084,-0.66152396,-1.7799405)">
-    <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-       id="path1329"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="layer3"
-     inkscape:label="Layout"
-     style="display:none;stroke:#757575;stroke-opacity:1"
-     transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
-    <rect
-       height="10"
-       id="rect4134"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="10"
-       x="1"
-       y="1" />
-    <rect
-       height="8"
-       id="rect4136"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="8"
-       x="2"
-       y="2" />
-  </g>
-  <path
-     d="M 9.9460778,3.9042124 C 9.5592769,3.905126 9.1286804,4.2407834 8.8544313,4.521318 7.681875,5.4978177 6.8238577,6.1973645 4.8642325,6.7700238 4.1197122,7.0139469 2.6036553,6.7170579 1.1166217,6.6032018 0.16719534,6.442693 0.98090647,8.2817281 1.1078685,9.0295797 1.9521055,11.89728 2.9235186,14.79982 4.6391508,17.203855 c 0.9784198,1.181055 2.3316163,2.210514 3.8488976,2.191742 1.253813,-0.113394 2.2886576,-1.205371 2.5821876,-2.506398 0.02536,-0.08782 0.04878,-0.176741 0.07003,-0.265829 0.03364,-0.136402 0.06611,-0.272514 0.09629,-0.409597 -0.185045,-0.31293 -0.324781,-0.658168 -0.406398,-1.01992 -0.02536,-0.08782 -0.04753,-0.176741 -0.06878,-0.265829 C 10.079381,12.163046 10.121403,9.253209 10.417504,6.4309548 10.503732,5.9780041 10.608424,5.5295919 10.721363,5.0841726 10.64288,4.8011874 10.565101,4.5176707 10.490025,4.2337876 10.339485,3.9940318 10.148687,3.9037342 9.9460778,3.9042124 z"
-     id="path3327"
-     style="fill:none;stroke:#b26609;stroke-width:0.83346599;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 11.896786,2.5601429 c -0.310451,0.086512 -0.266183,0.5253748 -0.368884,0.7812149 -0.458001,1.5880136 -0.918103,3.2038992 -0.93659,4.8825943 -0.140862,2.5219179 -0.05067,5.1270659 0.759026,7.5124119 0.477874,1.076019 1.622758,1.853016 2.733492,1.548868 1.566122,-0.350283 2.814506,-1.628284 3.627568,-3.074678 1.524313,-2.583231 2.384732,-5.5293918 3.164899,-8.4550247 0.01492,-0.155582 0.07349,-0.3949685 -0.01376,-0.5072472 -0.751833,0.056543 -1.508907,0.1642586 -2.264572,0.235992 -0.823493,0.084956 -1.666052,0.00145 -2.437135,-0.3255063 C 14.784854,4.6643985 13.57266,3.7743055 12.469494,2.7703656 12.300857,2.6480039 12.103331,2.5519249 11.896786,2.5601429 z m 2.460894,3.9630386 c 0.652453,-0.022689 0.950525,0.9888013 0.506434,1.4512158 -0.598185,0.6993649 -1.53715,1.1690611 -2.42088,0.9209107 C 11.900501,8.6837118 11.593559,7.8351571 12.006826,7.3383035 12.657741,6.7251013 13.592583,6.8288068 14.35768,6.5231815 z m 2.639709,0.6293122 c 0.684928,-0.022099 1.18403,0.6801464 1.272961,1.360345 0.178879,0.4682255 0.49533,0.9945926 0.271349,1.5108903 -0.164378,0.388881 -0.63024,0.460474 -0.966601,0.317369 -0.804655,-0.202752 -1.340921,-1.0664849 -1.356742,-1.9435428 -0.07315,-0.5031036 0.144779,-1.1482929 0.660239,-1.2314988 0.03912,-0.00825 0.07879,-0.012711 0.118794,-0.013563 z m -2.657216,4.5814993 c 0.845323,0.01497 1.618024,0.57396 2.113267,1.287106 0.314718,0.585635 0.164772,1.525019 -0.473922,1.764516 -0.438664,0.104864 -0.728902,-0.350966 -1.077891,-0.546579 -0.558804,-0.388173 -1.272656,-0.393217 -1.883184,-0.161397 -0.300389,0.10208 -0.707482,0.02793 -0.821548,-0.330931 -0.195213,-0.499235 0.0829,-1.077055 0.485176,-1.342714 0.474164,-0.396632 1.053018,-0.667894 1.658102,-0.670001 z"
-     id="path3331"
-     style="fill:#b26609;fill-opacity:1;fill-rule:evenodd;stroke:#b26609;stroke-width:0.83346599;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 10.760788,14.928448 c -0.681997,-2.764977 -0.638815,-5.6758546 -0.342716,-8.4981087 0.251245,-1.319716 0.651359,-2.597605 0.993444,-3.8911183 0.437934,-0.6974708 1.216855,-0.1405774 1.634757,0.2869039 1.172557,0.9764997 2.031181,1.676681 3.990806,2.2493402 0.74452,0.2439231 2.260034,-0.053507 3.747068,-0.1673632 0.949426,-0.1605088 0.136595,1.6786939 0.0097,2.4265458 -0.844237,2.8677013 -1.816763,5.7694353 -3.532395,8.1734703 -0.97842,1.181055 -2.330993,2.211358 -3.848274,2.192586 -1.253813,-0.113394 -2.28895,-1.205794 -2.582481,-2.506821 -0.02535,-0.08782 -0.0486,-0.176346 -0.06984,-0.265435 z"
-     id="path3354"
-     sodipodi:nodetypes="ccccccccccc"
-     style="fill:none;stroke:#b26609;stroke-width:0.83346599;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 6.7860769,16.417025 c -0.6237257,-0.09397 -1.2195249,-0.495146 -1.519471,-1.104628 0.3321506,-0.400267 0.8064781,0.0052 1.1942744,0.04345 0.9044813,0.124031 1.7497781,-0.521023 2.1903764,-1.340141 0.2856236,-0.296911 0.32284,-1.106657 0.8195904,-0.987923 0.3582626,0.215057 0.2907523,0.709889 0.2032366,1.069386 -0.056647,0.479337 -0.271422,0.910296 -0.5553218,1.275736 -0.2236508,0.324898 -0.4457361,0.696673 -0.8325546,0.804274 -0.4946649,0.09982 -0.9868957,0.353397 -1.5001304,0.239834 z M 4.5761692,11.172338 C 4.0993761,10.867081 3.5246622,10.679378 3.18668,10.172655 3.1112968,9.5961533 3.7818259,9.2202362 4.2278499,9.4453903 4.7530934,9.6236323 5.2497933,9.9498603 5.5821889,10.433054 5.802817,10.867819 5.4198651,11.554328 4.9433813,11.330393 4.8170215,11.288972 4.6992716,11.223094 4.5761692,11.172338 z M 7.6171651,10.105021 C 7.28369,9.6300103 7.2805637,8.8031598 7.798799,8.4772511 8.1391647,8.233371 8.6276111,8.0657521 8.9893782,8.3535975 9.1792744,8.7780456 8.8448319,9.1670647 8.6939222,9.5342903 8.6027432,9.9052063 8.3785232,10.321725 7.9877692,10.35867 7.8304385,10.36287 7.6907474,10.249558 7.6171651,10.105021 z"
-     id="path3360"
-     style="fill:#b26609;fill-opacity:1"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/navit/xpm/theater.xpm b/navit/xpm/theater.xpm
deleted file mode 100644
index 9581bc701..000000000
--- a/navit/xpm/theater.xpm
+++ /dev/null
@@ -1,72 +0,0 @@
-/* XPM */
-static char * theater_xpm[] = {
-"16 15 54 1",
-" 	c None",
-".	c #FFFFFF",
-"+	c #CFCFCF",
-"@	c #808080",
-"#	c #D8D8D8",
-"$	c #F7F7F7",
-"%	c #F5F5F5",
-"&	c #DEDEDE",
-"*	c #A2A2A2",
-"=	c #393939",
-"-	c #606060",
-";	c #9D9D9D",
-">	c #929292",
-",	c #E5E5E5",
-"'	c #4F4F4F",
-")	c #5A5A5A",
-"!	c #474747",
-"~	c #3F3F3F",
-"{	c #8B8B8B",
-"]	c #979797",
-"^	c #767676",
-"/	c #E9E9E9",
-"(	c #000000",
-"_	c #575757",
-":	c #494949",
-"<	c #232323",
-"[	c #050505",
-"}	c #2E2E2E",
-"|	c #333333",
-"1	c #EBEBEB",
-"2	c #7D7D7D",
-"3	c #BABABA",
-"4	c #BEBEBE",
-"5	c #666666",
-"6	c #1D1D1D",
-"7	c #AAAAAA",
-"8	c #2B2B2B",
-"9	c #505050",
-"0	c #B7B7B7",
-"a	c #272727",
-"b	c #121212",
-"c	c #161616",
-"d	c #D6D6D6",
-"e	c #9A9A9A",
-"f	c #C3C3C3",
-"g	c #6D6D6D",
-"h	c #0A0A0A",
-"i	c #343434",
-"j	c #454545",
-"k	c #6B6B6B",
-"l	c #EEEEEE",
-"m	c #787878",
-"n	c #0C0C0C",
-"o	c #CACACA",
-"      ...  ..++.",
-" ..  .+@#$%&*=-.",
-".;>. .,'')'!!)~%",
-".{]^$./!(_(=@==%",
-".{.*---:<][}}_|1",
-".23*4.,567!83#94",
-"&2/>&/0)a^:@bc'3",
-"def3@#g='(}](h9/",
-".g..),.$'}c]@ij%",
-".k70_l*1<:@>7mk.",
-".@7}fmk9{:2n8~+.",
-".#g8(|_o.m:9=@. ",
-" .-7k_7. .*>d$  ",
-" .+9^)$   ...   ",
-"  .%/%          "};
diff --git a/navit/xpm/toggle_fullscreen.xpm b/navit/xpm/toggle_fullscreen.xpm
deleted file mode 100644
index 9860e2a15..000000000
--- a/navit/xpm/toggle_fullscreen.xpm
+++ /dev/null
@@ -1,101 +0,0 @@
-/* XPM */
-static char *dummy[]={
-"96 96 2 1",
-". c None",
-"# c #808080",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"........................######################..................................................",
-"........................#######################.................................................",
-"........................#######################.................................................",
-"........................#######################.................................................",
-"........................#######################.................................................",
-"........................######################..................................................",
-"........................######..................................................................",
-"........................######..................................................................",
-"........................######..................................................................",
-"........................######..................................................................",
-"........................######..................................................................",
-"........................######..................................................................",
-"........................######..................................................................",
-"........................######..................................................................",
-"........................######..................................................................",
-"........................######..................................................................",
-"........................######..................................................................",
-"........................######..................................................................",
-"........................######..................................................................",
-"........................######..................................................................",
-"........................######..................................................................",
-"........................######..................................................................",
-".........................####...................................................................",
-"................................................................................................",
-"................................................................................................",
-"...................................................................####.........................",
-"..................................................................######........................",
-"..................................................................######........................",
-"..................................................................######........................",
-"..................................................................######........................",
-"..................................................................######........................",
-"..................................................................######........................",
-"..................................................................######........................",
-"..................................................................######........................",
-"..................................................................######........................",
-"..................................................................######........................",
-"..................................................................######........................",
-"..................................................................######........................",
-"..................................................................######........................",
-"..................................................................######........................",
-"..................................................................######........................",
-"..................................................................######........................",
-"..................................................######################........................",
-".................................................#######################........................",
-".................................................#######################........................",
-".................................................#######################........................",
-".................................................#######################........................",
-"..................................................######################........................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................",
-"................................................................................................"};
diff --git a/navit/xpm/toilets.svg b/navit/xpm/toilets.svg
deleted file mode 100644
index 0ff879cb2..000000000
--- a/navit/xpm/toilets.svg
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="toilets.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective14" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="30.318182"
-     inkscape:cx="11"
-     inkscape:cy="11"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="925"
-     inkscape:window-x="0"
-     inkscape:window-y="67"
-     inkscape:window-maximized="0"
-     inkscape:snap-grids="false"
-     inkscape:snap-to-guides="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2396"
-       visible="true"
-       enabled="true"
-       empspacing="5"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <dc:date>26.06.2008</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Klawiter</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>toilet</rdf:li>
-            <rdf:li>sign</rdf:li>
-            <rdf:li>man</rdf:li>
-            <rdf:li>woman</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:description />
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-235,-17.36218)">
-    <path
-       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 237.17388,20.397888 7.31707,0 c 0.91464,0 1.21952,0.304878 1.21952,1.219512 l 0,13.414634 c 0,0.914634 -0.30488,1.219512 -1.21952,1.219512 l -7.31707,0 c -0.91463,0 -1.21951,-0.304878 -1.21951,-1.219512 l 0,-13.414634 c 0,-0.914634 0.30488,-1.219512 1.21951,-1.219512 z"
-       id="rect3188"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       sodipodi:nodetypes="cssscccccccccccccccccccc"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 240.77144,21.313303 c -0.63951,0 -1.15854,0.519025 -1.15854,1.158537 0,0.639512 0.51903,1.158537 1.15854,1.158537 0.63951,0 1.15854,-0.519025 1.15854,-1.158537 0,-0.639512 -0.51903,-1.158537 -1.15854,-1.158537 z m -1.82927,2.439025 c -0.60975,0 -0.91463,0.304878 -0.91463,0.914634 l 0,4.268293 c 0,0.304878 0.91463,0.304878 0.91463,0 l 0,-3.048781 c 0,-0.121951 0.30488,-0.121951 0.30488,0 l 0,9.146342 c 0,0.609756 1.52439,0.609756 1.52439,0 l 0,-5.792683 c 0,-0.121952 0.30488,-0.121952 0.30488,0 l 0,5.792683 c 0,0.609756 1.52439,0.609756 1.52439,0 l 0,-9.146342 c 0,-0.121951 0.30488,-0.121951 0.30488,0 l 0,3.048781 c 0,0.304878 0.91463,0.304878 0.91463,0 l 0,-4.268293 c 0,-0.609756 -0.60975,-0.914634 -1.21951,-0.914634 l -3.65854,0 z"
-       id="path2400" />
-    <path
-       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 247.53973,20.397888 7.19513,0 c 0.91463,0 1.21951,0.304878 1.21951,1.219512 l 0,13.414634 c 0,0.914634 -0.30488,1.219512 -1.21951,1.219512 l -7.19513,0 c -0.91463,0 -1.21951,-0.304878 -1.21951,-1.219512 l 0,-13.414634 c 0,-0.914634 0.30488,-1.219512 1.21951,-1.219512 z"
-       id="rect3190"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       sodipodi:nodetypes="cssscccccccccccccccccccccccc"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="m 251.19816,21.303983 c -0.63951,0 -1.15854,0.519025 -1.15854,1.158537 0,0.639512 0.51903,1.158537 1.15854,1.158537 0.63951,0 1.15854,-0.519025 1.15854,-1.158537 0,-0.639512 -0.51903,-1.158537 -1.15854,-1.158537 z m -1.52439,2.378049 c -0.42683,0 -0.91463,0.304878 -0.91463,0.609756 l -1.21952,3.963415 c -0.2439,0.609756 0.97561,0.914634 1.21952,0.365854 l 0.91463,-3.414635 c 0.2439,0 0.30488,0.121952 0.30488,0.304879 l -1.52439,5.182926 1.21951,0 0,4.268293 c 0,0.609756 1.34146,0.609756 1.34146,0 l 0,-4.268293 c 0,-0.182926 0.36586,-0.182926 0.36586,0 l 0,4.268293 c 0,0.609756 1.34146,0.609756 1.34146,0 l 0,-4.268293 1.21951,0 -1.52439,-5.182926 c 0,-0.182927 0.061,-0.304879 0.30488,-0.304879 l 0.91464,3.353659 c 0.2439,0.609756 1.46341,0.304878 1.21951,-0.304878 l -1.21951,-3.963415 c 0,-0.304878 -0.48781,-0.609756 -0.91464,-0.609756 l -3.04878,0 z"
-       id="path2408" />
-  </g>
-</svg>
diff --git a/navit/xpm/tower.xpm b/navit/xpm/tower.xpm
deleted file mode 100644
index 2561c1ad1..000000000
--- a/navit/xpm/tower.xpm
+++ /dev/null
@@ -1,35 +0,0 @@
-/* XPM */
-static char *tower[] = {
-/* columns rows colors chars-per-pixel */
-"10 16 13 1",
-"  c black",
-". c #131313",
-"X c #141414",
-"o c #1B1B1B",
-"O c #1E1E1E",
-"+ c #252525",
-"@ c #262626",
-"# c #363636",
-"$ c #404040",
-"% c #797979",
-"& c #AEAEAE",
-"* c #D7D7D7",
-"= c #FFFFFF",
-/* pixels */
-"==========",
-"====%%====",
-"===&  &===",
-"===&oo&===",
-"===*  *===",
-"====  ====",
-"====  ====",
-"====##====",
-"====$#====",
-"====o@====",
-"====OO====",
-"====.X====",
-"====@@====",
-"====..====",
-"====  ====",
-"====  ===="
-};
diff --git a/navit/xpm/townhall.svg b/navit/xpm/townhall.svg
deleted file mode 100644
index fb89bb8c7..000000000
--- a/navit/xpm/townhall.svg
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   id="svg2"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="townhall.svg"
-   sodipodi:version="0.32"
-   version="1.0"
-   width="22">
-  <metadata
-     id="metadata2975">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10.0"
-     guidetolerance="10.0"
-     id="base"
-     inkscape:current-layer="svg2"
-     inkscape:cx="4.7854106"
-     inkscape:cy="9.4014824"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="725"
-     inkscape:window-maximized="1"
-     inkscape:window-width="1024"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:zoom="14.746834"
-     objecttolerance="10.0"
-     pagecolor="#ffffff"
-     showgrid="false" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective2441"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3452"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       inkscape:vp_x="0 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="60 : 30 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <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
-         d="M94,176l-21,39"
-         fill="none"
-         id="path4462"
-         stroke="#000000"
-         stroke-width="20" />
-      <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
-         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
-         id="path4466"
-         ill="none"
-         stroke="#000000"
-         stroke-width="20" />
-    </symbol>
-    <inkscape:perspective
-       id="perspective4471"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4668"
-       inkscape:persp3d-origin="6 : 4 : 1"
-       inkscape:vp_x="0 : 6 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="12 : 6 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4904"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <g
-     id="g1327"
-     transform="matrix(0.03753316,0,0,0.04113046,0.34381936,-0.88619548)">
-    <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-       id="path1329"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="layer3"
-     inkscape:label="Layout"
-     style="display:none;stroke:#757575;stroke-opacity:1"
-     transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
-    <rect
-       height="10"
-       id="rect4134"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="10"
-       x="1"
-       y="1" />
-    <rect
-       height="8"
-       id="rect4136"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="8"
-       x="2"
-       y="2" />
-  </g>
-  <g
-     id="g4372"
-     transform="matrix(0.03753316,0,0,0.04113046,-5.9051569,1.2533823)" />
-  <path
-     d="m 11.113735,0.9236104 -9.4605858,7.893241 1.8921047,0 0,12.6624656 5.6763646,0 3.9139875,0 5.546611,0 0,-12.6624656 1.892118,0 -9.4606,-7.893241 0,0 0,0 z"
-     id="path645"
-     sodipodi:nodetypes="cccccccccccc"
-     style="font-size:12px;opacity:0.2;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.04877619;stroke-opacity:1"
-     inkscape:connector-curvature="0" />
-  <g
-     id="g7376"
-     transform="matrix(0.03753316,0,0,0.04113046,0.34381936,-0.88619548)">
-    <path
-       d="M 286.94406,34.001595 34.884618,225.90902 l 50.411556,0 0,317.86099 151.236006,0 104.28079,0 147.77899,0 0,-317.86099 50.4119,0 -252.0598,-191.907425 0,0 0,0 z"
-       id="path3198"
-       sodipodi:nodetypes="cccccccccccc"
-       style="font-size:12px;fill:none;stroke:#734a08;stroke-width:20;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-  </g>
-  <path
-     d="m 6.3526986,13.644828 9.6557514,0 1.728676,1.635907 -13.1316057,0 z"
-     id="path7610"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc"
-     style="opacity:0.5;fill:#734a08;fill-opacity:1;stroke:#734a08;stroke-width:0.39290667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  <path
-     d="m 4.6261736,20.307962 13.1088004,0 0.0022,-4.122357 -13.1316075,0 z"
-     id="path7612"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccc"
-     style="opacity:0.5;fill:#734a08;fill-opacity:1;stroke:#734a08;stroke-width:0.39290667;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  <path
-     d="m 8.1999776,5.7756541 c -0.3588919,1.48e-5 -0.6701389,0.1414798 -0.9359828,0.4254433 -0.2658196,0.283991 -0.39995,0.6297496 -0.3999627,1.0372587 1.27e-5,0.4079807 0.1341431,0.7545791 0.3999627,1.0385442 0.2658439,0.2839894 0.5770909,0.4254548 0.9359828,0.4254436 0.013233,0 0.026789,-9.084e-4 0.039879,-0.00129 0.013239,4.117e-4 0.026495,0.00129 0.039879,0.00129 C 8.6386274,8.7023551 8.9510483,8.5608897 9.2168913,8.2769003 9.4827121,7.9929352 9.6144961,7.6463368 9.6145088,7.2383561 9.6144968,6.830847 9.4827121,6.4850884 9.2168921,6.2010974 8.9510492,5.9171339 8.6386283,5.7756689 8.2797357,5.7756541 c -0.013381,4e-7 -0.026645,-3.702e-4 -0.039879,0 -0.013087,-3.29e-4 -0.02665,0 -0.039879,0 z M 7.1842368,9.0301018 c -0.081177,2.4e-6 -0.1546855,0.00887 -0.2205074,0.028278 -0.04326,-0.00447 -0.086753,-0.00613 -0.130193,-0.00515 C 6.5357168,9.0610975 6.2426827,9.2031996 6.0370836,9.4394473 5.8314849,9.6756954 5.7158485,10.00319 5.7227896,10.32956 l 0.024632,2.90998 c -1.8e-6,0.0013 -1.8e-6,0.0027 0,0.0038 0.1209012,-0.09511 0.247207,-0.181797 0.383542,-0.254492 1.4879813,-0.04789 2.9779915,-0.05184 4.4687914,-0.04756 l -0.02228,-2.634889 C 10.578422,9.9917168 10.465744,9.6782744 10.269235,9.4487643 10.072726,9.219253 9.7944443,9.0761154 9.5077772,9.0570956 9.4444181,9.0395129 9.3750966,9.0301049 9.2978261,9.0301049 z"
-     id="path8791-2"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccscccsccccccccsccccccsccc"
-     style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#734a08;fill-opacity:1;stroke:#734a08;stroke-width:0.05457044;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3" />
-  <path
-     d="m 14.127575,5.7756541 c 0.358893,1.48e-5 0.67014,0.1414798 0.935984,0.4254433 0.265819,0.283991 0.39995,0.6297496 0.399963,1.0372587 -1.3e-5,0.4079807 -0.134144,0.7545791 -0.399963,1.0385442 -0.265844,0.2839894 -0.577091,0.4254548 -0.935984,0.4254436 -0.01322,0 -0.0268,-9.084e-4 -0.03988,-0.00129 -0.01323,4.117e-4 -0.02649,0.00129 -0.03988,0.00129 C 13.688924,8.7023551 13.376504,8.5608897 13.11066,8.2769003 12.84484,7.9929352 12.713057,7.6463368 12.713043,7.2383561 12.713055,6.830847 12.84484,6.4850884 13.11066,6.2010974 c 0.265844,-0.2839635 0.578264,-0.4254285 0.937155,-0.4254433 0.01338,4e-7 0.02665,-3.702e-4 0.03988,0 0.01309,-3.29e-4 0.02666,0 0.03988,0 z m 1.01574,3.2544477 c 0.08118,2.4e-6 0.154686,0.00887 0.220509,0.028278 0.04324,-0.00447 0.08675,-0.00613 0.130192,-0.00515 0.29782,0.00787 0.590854,0.14997 0.796454,0.3862177 0.205598,0.2362488 0.321233,0.5637435 0.314294,0.8901135 l -0.02463,2.90998 c 10e-7,0.0013 10e-7,0.0027 0,0.0038 -0.120901,-0.09511 -0.247207,-0.181796 -0.383542,-0.254492 -1.487981,-0.04789 -2.977991,-0.05184 -4.468791,-0.04755 l 0.02229,-2.63492 c -9.51e-4,-0.3147152 0.111727,-0.6281582 0.308235,-0.8576691 0.196511,-0.2295115 0.474791,-0.372649 0.76146,-0.3916688 0.06335,-0.017581 0.13268,-0.026991 0.209951,-0.026991 z"
-     id="path21180"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccscccsccccccccsccccccsccc"
-     style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#734a08;fill-opacity:1;stroke:#734a08;stroke-width:0.05457044;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3" />
-</svg>
diff --git a/navit/xpm/townhall.xpm b/navit/xpm/townhall.xpm
deleted file mode 100644
index 150b26f96..000000000
--- a/navit/xpm/townhall.xpm
+++ /dev/null
@@ -1,109 +0,0 @@
-/* XPM */
-static char * townhall_xpm[] = {
-"16 18 88 1",
-" 	c None",
-".	c #BF0000",
-"+	c #CE0000",
-"@	c #A80000",
-"#	c #C20000",
-"$	c #5C652F",
-"%	c #5D6630",
-"&	c #808C42",
-"*	c #818D42",
-"=	c #5B642F",
-"-	c #5D662F",
-";	c #808C41",
-">	c #5B632E",
-",	c #111208",
-"'	c #2B2F16",
-")	c #535A2A",
-"!	c #535B2B",
-"~	c #535C2A",
-"{	c #545C2B",
-"]	c #555C2B",
-"^	c #555D2B",
-"/	c #535B2A",
-"(	c #292D14",
-"_	c #454C23",
-":	c #565F2C",
-"<	c #5D6730",
-"[	c #5A632E",
-"}	c #424822",
-"|	c #363B1C",
-"1	c #414621",
-"2	c #4A5026",
-"3	c #484F25",
-"4	c #454B23",
-"5	c #495026",
-"6	c #484E25",
-"7	c #444922",
-"8	c #3A401D",
-"9	c #32361A",
-"0	c #484D2A",
-"a	c #888888",
-"b	c #66685F",
-"c	c #4E542D",
-"d	c #72736F",
-"e	c #6C6E66",
-"f	c #51582E",
-"g	c #6E6E68",
-"h	c #80807F",
-"i	c #4C512B",
-"j	c #272B14",
-"k	c #6B743E",
-"l	c #9E9E9E",
-"m	c #7D7E76",
-"n	c #75803C",
-"o	c #8F8F8F",
-"p	c #7E7E7A",
-"q	c #7F8B41",
-"r	c #81827E",
-"s	c #6A743C",
-"t	c #75716C",
-"u	c #68665D",
-"v	c #7C5A20",
-"w	c #6E531E",
-"x	c #33371E",
-"y	c #505730",
-"z	c #9A9A9A",
-"A	c #75766E",
-"B	c #58602D",
-"C	c #78571E",
-"D	c #684F1D",
-"E	c #5C6430",
-"F	c #7B7C78",
-"G	c #989898",
-"H	c #50572E",
-"I	c #4B5227",
-"J	c #5D6531",
-"K	c #67695B",
-"L	c #5A5D45",
-"M	c #59602E",
-"N	c #564A1F",
-"O	c #554B20",
-"P	c #5D6430",
-"Q	c #5F624E",
-"R	c #626454",
-"S	c #5C6431",
-"T	c #444A23",
-"U	c #373C1C",
-"V	c #434922",
-"W	c #393E1D",
-"        .+      ",
-"        @#      ",
-"                ",
-"       $%       ",
-"     $&**&=     ",
-"   -&******;>   ",
-",')!~~{{{{]^^/( ",
-"_:<<<<<<<<<<<<[}",
-"  |123456}3578  ",
-"  90abcdefghij  ",
-"   klmnopqrls   ",
-"   klmnopqrls   ",
-"   klmnopqrls   ",
-"   klmntuqrls   ",
-"   klmnvwqrls   ",
-"  xyzABCDEFGH   ",
-"  IJKLMNOPQRST  ",
-"UV_4444444444_VW"};
diff --git a/navit/xpm/traffic_signals.svg b/navit/xpm/traffic_signals.svg
deleted file mode 100644
index 35124e9a2..000000000
--- a/navit/xpm/traffic_signals.svg
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   version="1.0"
-   sodipodi:docname="traffic_signals.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jeff/navit/icons/png/traffic_signals.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#f4ca00"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313709"
-     inkscape:cx="6.2037362"
-     inkscape:cy="9.8911434"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1024"
-     inkscape:window-height="699"
-     inkscape:window-x="0"
-     inkscape:window-y="25">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2380"
-       visible="true"
-       enabled="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Calque 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 4.901204,4 L 17.098796,3.9133216 L 15.452349,8.2443505 L 6.4592622,8.3327388 L 4.901204,4 z"
-       id="rect3158"
-       sodipodi:nodetypes="ccccc" />
-    <rect
-       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2386"
-       width="9.1039991"
-       height="19.003494"
-       x="6.4480004"
-       y="2.1126227"
-       rx="2"
-       ry="2" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#rect3158"
-       id="use3161"
-       transform="translate(0,5)"
-       width="22"
-       height="22" />
-    <use
-       x="0"
-       y="0"
-       xlink:href="#use3161"
-       id="use3163"
-       transform="translate(0,5.1438447)"
-       width="22"
-       height="22" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#f30000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3169"
-       sodipodi:cx="11.004349"
-       sodipodi:cy="7.4601173"
-       sodipodi:rx="2.8726211"
-       sodipodi:ry="2.8726211"
-       d="M 13.87697,7.4601173 A 2.8726211,2.8726211 0 1 1 8.1317277,7.4601173 A 2.8726211,2.8726211 0 1 1 13.87697,7.4601173 z"
-       transform="matrix(0.9692308,0,0,0.9692308,0.3342463,-0.7427297)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#f3ea00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3175"
-       sodipodi:cx="11.004349"
-       sodipodi:cy="7.4601173"
-       sodipodi:rx="2.8726211"
-       sodipodi:ry="2.8726211"
-       d="M 13.87697,7.4601173 A 2.8726211,2.8726211 0 1 1 8.1317277,7.4601173 A 2.8726211,2.8726211 0 1 1 13.87697,7.4601173 z"
-       transform="matrix(0.9692308,0,0,0.9692308,0.3342463,4.8153286)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#47b400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path3177"
-       sodipodi:cx="11.004349"
-       sodipodi:cy="7.4601173"
-       sodipodi:rx="2.8726211"
-       sodipodi:ry="2.8726211"
-       d="M 13.87697,7.4601173 A 2.8726211,2.8726211 0 1 1 8.1317277,7.4601173 A 2.8726211,2.8726211 0 1 1 13.87697,7.4601173 z"
-       transform="matrix(0.9692308,0,0,0.9692308,0.3342463,10.373387)" />
-  </g>
-</svg>
diff --git a/navit/xpm/unknown.svg b/navit/xpm/unknown.svg
deleted file mode 100644
index 68960cb9e..000000000
--- a/navit/xpm/unknown.svg
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.2"
-   width="22"
-   height="22"
-   id="svg3094"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="unknown.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1024"
-     inkscape:window-height="725"
-     id="namedview10"
-     showgrid="false"
-     inkscape:zoom="12.271386"
-     inkscape:cx="10.188702"
-     inkscape:cy="10.351683"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3094" />
-  <defs
-     id="defs3096" />
-  <metadata
-     id="metadata3099">
-    <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="matrix(0.06611418,0,0,0.06487408,-17.37859,-23.684485)"
-     id="layer1">
-    <rect
-       width="332.4278"
-       height="339.07635"
-       x="262.85715"
-       y="363.79074"
-       id="rect3104"
-       style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <rect
-       width="274.28571"
-       height="280"
-       x="291.42856"
-       y="395.21933"
-       id="rect3874"
-       style="fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       d="m 354.12571,497.53789 c 0.20664,-13.43317 1.96331,-25.21316 5.27,-35.34 3.5133,-10.12647 7.74996,-17.9798 12.71,-23.56 5.16662,-5.78645 11.26328,-10.43645 18.29,-13.95 7.0266,-3.51311 13.53659,-5.78644 19.53,-6.82 6.19991,-1.23977 12.70991,-1.85977 19.53,-1.86 22.73321,2.3e-4 41.22986,6.61356 55.49,19.84 14.4665,13.22686 21.69982,30.38018 21.7,51.46 -1.8e-4,13.02014 -2.58351,23.7668 -7.75,32.24 -5.16683,8.47345 -14.98349,17.77344 -29.45,27.9 -9.30013,6.61342 -15.08679,11.88342 -17.36,15.81 -2.27345,3.92674 -3.41012,10.9534 -3.41,21.08 l -38.44,0 0,-4.34 c -8e-5,-10.33326 1.75658,-19.32325 5.27,-26.97 3.71991,-7.85323 8.16324,-14.15656 13.33,-18.91 5.16656,-4.75322 10.33322,-9.19655 15.5,-13.33 5.16655,-4.13321 9.50654,-8.88653 13.02,-14.26 3.71987,-5.37319 5.57987,-11.46985 5.58,-18.29 -1.3e-4,-10.1265 -3.10013,-18.59982 -9.3,-25.42 -6.20012,-6.81981 -13.95011,-10.22981 -23.25,-10.23 -9.71342,1.9e-4 -17.87675,3.92685 -24.49,11.78 -6.40674,7.85351 -9.61007,17.7735 -9.61,29.76 l 0,2.79 0,0.62 -42.16,0"
-       id="path3986"
-       style="font-size:310px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffff00;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
-       inkscape:connector-curvature="0" />
-    <path
-       d="m 453.63571,601.38789 0,45.26 -46.5,0 0,-45.26 46.5,0"
-       id="path3981"
-       style="font-size:310px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffff00;fill-opacity:1;stroke:none;font-family:FreeSans;-inkscape-font-specification:FreeSans Bold"
-       inkscape:connector-curvature="0" />
-  </g>
-</svg>
diff --git a/navit/xpm/viewpoint.svg b/navit/xpm/viewpoint.svg
deleted file mode 100644
index 94a510b3f..000000000
--- a/navit/xpm/viewpoint.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   width="16"
-   height="16"
-   id="svg2">
-  <defs
-     id="defs6" />
-  <image
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABmJLR0T///////8JWPfcAAAACXBI
-WXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAAjElEQVRIx8VU0Q7AMATE//+z
-PTVp1vYcnexeluCOYkQ2cHcXgOE/fSPeDEMBkSALpGuVRKqqGTsqzBhitRMRT6uJB+/tP9mrHVoK
-YTuRiYcv6cKcD7ZsqbawZFGMMUKd+H0EKULHEhojdJsI+ZUNFFlHE42O0aNOcXUnmENHneIdMWMP
-O3Cq+Ku/Aek+wKSnwuWcRmMAAAAldEVYdGRhdGU6Y3JlYXRlADIwMTAtMDYtMTFUMjM6MDQ6NDUr
-MDI6MDDnX+/BAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEwLTA2LTExVDIzOjA0OjQ1KzAyOjAwlgJX
-fQAAAABJRU5ErkJggg==
-"
-     x="0"
-     y="0"
-     width="16"
-     height="16"
-     id="image12" />
-</svg>
diff --git a/navit/xpm/wifi.svg b/navit/xpm/wifi.svg
deleted file mode 100644
index e220d7edf..000000000
--- a/navit/xpm/wifi.svg
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="22"
-   height="22"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="wifi.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective2451" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10000"
-     objecttolerance="10000"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="14.727273"
-     inkscape:cx="11"
-     inkscape:cy="13.021948"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:object-bbox="true"
-     inkscape:object-points="true"
-     inkscape:object-nodes="true"
-     inkscape:grid-points="true"
-     inkscape:guide-points="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="722"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     width="48px"
-     height="48px"
-     inkscape:window-maximized="1"
-     inkscape:snap-grids="false"
-     inkscape:snap-to-guides="true"
-     inkscape:pagecheckerboard="true" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g4549"
-       style="stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none"
-       transform="matrix(0.95652149,0,0,0.95652149,2.5708734,7.0559634)">
-      <g
-         style="fill:none;fill-opacity:1;stroke:#fafafa;stroke-width:12.67973042;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.15773206,0,0,0.15773206,-46.476318,-65.8113)"
-         id="g5114-4">
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:none;fill-opacity:1;stroke:#fafafa;stroke-width:12.67973042;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5;stroke-opacity:1"
-           d="m 335.96898,451.5699 c -9.21494,-4.99381 -15.47717,-14.75085 -15.47717,-25.96163 1e-5,-10.85329 5.86922,-20.34408 14.60475,-25.46948"
-           id="path5112-3" />
-        <path
-           inkscape:connector-curvature="0"
-           style="fill:none;fill-opacity:1;stroke:#fafafa;stroke-width:12.67973042;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5;stroke-opacity:1"
-           d="m 365.4672,400.47806 c 8.42337,5.19804 14.04101,14.51208 14.04101,25.13021 l 10e-6,10e-6 c -10e-6,10.97562 -6.00228,20.55786 -14.90125,25.64113"
-           id="path5107-8" />
-      </g>
-      <use
-         height="1052.3622"
-         width="744.09448"
-         transform="matrix(1.32,0,0,1.32,-2.7935709,-0.43506779)"
-         id="use5733-7"
-         xlink:href="#g5114-4"
-         y="0"
-         x="0"
-         style="fill:none;fill-opacity:1;stroke:#fafafa;stroke-width:1.5151515;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <use
-         height="1052.3622"
-         width="744.09448"
-         transform="matrix(1.6479232,0,0,1.6479232,-5.6563162,-0.88090156)"
-         id="use5735-5"
-         xlink:href="#g5114-4"
-         y="0"
-         x="0"
-         style="fill:none;fill-opacity:1;stroke:#fafafa;stroke-width:1.2136488;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path5737-2"
-         d="M 8.8074777,1.2467181 V 13.865283"
-         style="fill:none;fill-opacity:1;stroke:#fafafa;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         r="1.1829904"
-         cy="1.2467158"
-         cx="8.8074741"
-         id="path5739-3"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#fafafa;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <g
-       id="g3276"
-       transform="matrix(0.40217148,0,0,0.40217148,1.4514813,1.4383605)">
-      <g
-         style="stroke:#000000;stroke-width:3.19873166;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         transform="matrix(0.3751487,0,0,0.3751487,-107.75554,-142.5569)"
-         id="g5114">
-        <path
-           style="fill:none;stroke:#000000;stroke-width:3.19873166;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5;stroke-opacity:1"
-           d="m 335.96898,451.5699 c -9.21494,-4.99381 -15.47717,-14.75085 -15.47717,-25.96163 1e-5,-10.85329 5.86922,-20.34408 14.60475,-25.46948"
-           id="path5112"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:none;stroke:#000000;stroke-width:3.19873166;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:5;stroke-opacity:1"
-           d="m 365.4672,400.47806 c 8.42337,5.19804 14.04101,14.51208 14.04101,25.13021 l 10e-6,10e-6 c -10e-6,10.97562 -6.00228,20.55786 -14.90125,25.64113"
-           id="path5107"
-           inkscape:connector-curvature="0" />
-      </g>
-      <use
-         height="1052.3622"
-         width="744.09448"
-         transform="matrix(1.32,0,0,1.32,-7.5348846,-5.5045785)"
-         id="use5733"
-         xlink:href="#g5114"
-         y="0"
-         x="0" />
-      <use
-         height="1052.3622"
-         width="744.09448"
-         transform="matrix(1.6479232,0,0,1.6479232,-15.256347,-11.145436)"
-         id="use5735"
-         xlink:href="#g5114"
-         y="0"
-         x="0" />
-      <path
-         id="path5737"
-         d="M 23.731006,16.933363 V 46.945259"
-         style="fill:none;stroke:#000000;stroke-width:1.87574351;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <circle
-         transform="matrix(0.3751487,0,0,0.3751487,-116.01189,-144.32888)"
-         id="path5739"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
-         cx="372.5"
-         cy="429.86218"
-         r="7.5" />
-    </g>
-  </g>
-</svg>
diff --git a/navit/xpm/worship.svg b/navit/xpm/worship.svg
deleted file mode 100644
index c361a9adf..000000000
--- a/navit/xpm/worship.svg
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="22"
-   id="svg2"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="worship.svg"
-   sodipodi:version="0.32"
-   version="1.0"
-   width="22">
-  <metadata
-     id="metadata2975">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <cc:license
-           rdf:resource="http://web.resource.org/cc/PublicDomain" />
-        <dc:language>en</dc:language>
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10.0"
-     guidetolerance="10.0"
-     id="base"
-     inkscape:current-layer="svg2"
-     inkscape:cx="5.2760917"
-     inkscape:cy="9.9545993"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:window-height="725"
-     inkscape:window-maximized="1"
-     inkscape:window-width="1024"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:zoom="14.481547"
-     objecttolerance="10.0"
-     pagecolor="#ffffff"
-     showgrid="false" />
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       id="perspective2441"
-       inkscape:persp3d-origin="290 : 193.33333 : 1"
-       inkscape:vp_x="0 : 290 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="580 : 290 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3452"
-       inkscape:persp3d-origin="30 : 20 : 1"
-       inkscape:vp_x="0 : 30 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="60 : 30 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <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
-         d="M94,176l-21,39"
-         fill="none"
-         id="path4462"
-         stroke="#000000"
-         stroke-width="20" />
-      <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
-         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
-         id="path4466"
-         ill="none"
-         stroke="#000000"
-         stroke-width="20" />
-    </symbol>
-    <inkscape:perspective
-       id="perspective4471"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4668"
-       inkscape:persp3d-origin="6 : 4 : 1"
-       inkscape:vp_x="0 : 6 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="12 : 6 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective2893"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3898"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4011"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-  </defs>
-  <g
-     id="g1327"
-     transform="matrix(0.04384042,0,0,0.04384042,-0.89769414,-1.72591)">
-    <path
-       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 l 0,450.123 c 0,40.844 20.895,62.229 62.192,62.229 l 452.024,0 c 41.307,0 62.229,-20.315 62.229,-62.229 l 0,-450.123 c 0,-42.601 -20.922,-65.036 -63.521,-65.036 -0.004,0 -448.495,-0.143 -448.353,0 z"
-       id="path1329"
-       style="fill:#111111;fill-opacity:0;stroke:#eeeeee;stroke-width:3.40799999;stroke-opacity:0"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="layer3"
-     inkscape:label="Layout"
-     style="display:none;stroke:#757575;stroke-opacity:1"
-     transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
-    <rect
-       height="10"
-       id="rect4134"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="10"
-       x="1"
-       y="1" />
-    <rect
-       height="8"
-       id="rect4136"
-       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-       width="8"
-       x="2"
-       y="2" />
-  </g>
-  <path
-     d="m 13.834479,8.2786211 1.429328,5.6020929"
-     id="path4817"
-     sodipodi:nodetypes="cc"
-     style="fill:#d53b3b;fill-opacity:1;stroke:#5e8019;stroke-width:5.65503454;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 13.444766,7.2733188 7.9519419,8.0568238 4.7331953,4.2243025"
-     id="path5329"
-     sodipodi:nodetypes="ccc"
-     style="fill:none;stroke:#5e8019;stroke-width:2.48455691;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 17.479645,20.02395 9.88316,20.10612"
-     id="path5331"
-     sodipodi:nodetypes="cc"
-     style="fill:none;stroke:#5e8019;stroke-width:3.14761353;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 16.461331,14.627912 9.9243731,19.473379"
-     id="path5333"
-     sodipodi:nodetypes="cc"
-     style="fill:none;stroke:#5e8019;stroke-width:3.43722439;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     d="m 11.49254,1.8440237 c -0.718819,0.032613 -1.001823,1.0693311 -0.407266,1.4647264 0.541531,0.4466602 1.437955,-0.094683 1.290867,-0.7859506 C 12.311217,2.1084739 11.911058,1.7972478 11.49254,1.8440237 z"
-     id="path5339"
-     style="fill:#5e8019;fill-opacity:1;stroke:#5e8019;stroke-width:3.43722439;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 15.831646,14.14354 9.9243731,19.473379"
-     id="path4057"
-     sodipodi:nodetypes="cc"
-     style="fill:none;stroke:#5e8019;stroke-width:3.43722439;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-  <path
-     d="M 13.444766,7.7117229 7.9519419,8.0568238 4.7331953,4.2243025"
-     id="path4059"
-     sodipodi:nodetypes="ccc"
-     style="fill:none;stroke:#5e8019;stroke-width:2.48455691;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-     inkscape:connector-curvature="0" />
-</svg>
diff --git a/navit/xpm/zoo.svg b/navit/xpm/zoo.svg
deleted file mode 100644
index e7e2bdb00..000000000
--- a/navit/xpm/zoo.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   width="16"
-   height="16"
-   id="svg2">
-  <defs
-     id="defs6" />
-  <image
-     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAQAAADlauupAAAAAmJLR0T//xSrMc0AAAAJcEhZcwAA
-AEgAAABIAEbJaz4AAAAJdnBBZwAAABAAAAAQAFzGrcMAAAFNSURBVDjLtVK7rgFRFF3zwCQ+gYgo
-iEKjodfpJqL0AyofoJCQ8AEyWvR6nVqhQUJFqZJoJiaZzCzFCccMc+9t7qrWfpy1H2cD/4FCgbRt
-8i+5etgRi5H1OrDdAqQU8X1A0xTlR7V2mwTIWo1MJEjX5QvjsYiF36hPYlnkZCJ4owGUSoDrykTH
-AXQdSKUiRmu1nhXI+Zy83xmA55GbDZnPBwVeHWhasJphhFpVgXIZyOUiRnhHOg3YNrBYCHs6BS4X
-wZPJCAHHkc7rFRgOpe15wGgk+OkEFItf9rBek/G42IFpkr4vbuF4JG83Ye92pKp+/w0AQLUqF9np
-kPs92e0KAcsiDUPGn29eh9HrkeczMJtJwWwWME3Bl0vgcAiXDBwWmcm8VyAVRRyQ75ODQTD2ZYBw
-AtlsisR+n6xUfhUAVqtPkSjxjx0EO4mc8wMP0oIHat3Ubd0AAAAldEVYdGRhdGU6Y3JlYXRlADIw
-MTAtMDYtMTFUMjM6MDQ6NDUrMDI6MDDnX+/BAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDEwLTA2LTEx
-VDIzOjA0OjQ1KzAyOjAwlgJXfQAAAABJRU5ErkJggg==
-"
-     x="0"
-     y="0"
-     width="16"
-     height="16"
-     id="image12" />
-</svg>
diff --git a/navit/xslt/README-new-files.txt b/navit/xslt/README-new-files.txt
new file mode 100644
index 000000000..4997ac1c4
--- /dev/null
+++ b/navit/xslt/README-new-files.txt
@@ -0,0 +1,3 @@
+If you add new XSLT files to this directory (or delete existing files),
+you need to re-run cmake, otherwise changes to these files will not be
+picked up by cmake.
diff --git a/navit/xslt/android.xslt b/navit/xslt/android.xslt
index 19b0855f8..68e731be0 100644
--- a/navit/xslt/android.xslt
+++ b/navit/xslt/android.xslt
@@ -49,6 +49,7 @@
       <xsl:copy>
          <xsl:copy-of select="@*"/>
          <xsl:attribute name="zoom">32</xsl:attribute>
+         <xsl:attribute name="autozoom_active">1</xsl:attribute>
          <xsl:attribute name="timeout">86400</xsl:attribute>
          <xsl:attribute name="drag_bitmap">1</xsl:attribute>
          <xsl:apply-templates/>
@@ -112,7 +113,7 @@
    <xsl:template match="/config/navit/layout">
       <xsl:copy>
          <xsl:copy-of select="@*"/>
-         <xsl:if test="@name='Car-Android'">
+         <xsl:if test="@name='Car'">
 		<xsl:attribute name="active">1</xsl:attribute>
 	 </xsl:if>
          <xsl:if test="number($OSD_SIZE)>3">
diff --git a/navit/xslt/android_hdpi.xslt b/navit/xslt/android_hdpi.xslt
deleted file mode 100644
index a7880a96e..000000000
--- a/navit/xslt/android_hdpi.xslt
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xi="http://www.w3.org/2001/XInclude">
-        <xsl:output method="xml" doctype-system="navit.dtd" cdata-section-elements="gui"/>
-        <xsl:variable name="OSD_SIZE">1.33</xsl:variable>
-        <xsl:variable name="OSD_FACTOR">1.5</xsl:variable>
-        <xsl:variable name="CAR_FACTOR">2</xsl:variable>
-
-	<xsl:variable name="MENU_VALUE_FONTSIZE">470</xsl:variable>
-	<!-- icons_xs = selection icons (the green ones) -->
-	<!-- icons_s = topmenu and POI-selection-items -->
-	<!-- icons_l = menu items -->
-	<!-- spacing = spacing between menu items in pixels -->
-	<xsl:variable name="MENU_VALUE_ICONS_XS">32</xsl:variable>
-	<xsl:variable name="MENU_VALUE_ICONS_S">32</xsl:variable>
-	<xsl:variable name="MENU_VALUE_ICONS_L">64</xsl:variable>
-	<xsl:variable name="MENU_VALUE_SPACING">10</xsl:variable>
-
-	<xsl:variable name="LAYOUT_001_ORDER_DELTA_1">0</xsl:variable>
-
-	<xsl:include href="android_all_densities.xslt"/>
-</xsl:transform>
diff --git a/navit/xslt/android_ldpi.xslt b/navit/xslt/android_ldpi.xslt
deleted file mode 100644
index 3f88d2c40..000000000
--- a/navit/xslt/android_ldpi.xslt
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xi="http://www.w3.org/2001/XInclude">
-        <xsl:output method="xml" doctype-system="navit.dtd" cdata-section-elements="gui"/>
-        <xsl:variable name="OSD_SIZE">1.33</xsl:variable>
-        <xsl:variable name="OSD_FACTOR">0.7</xsl:variable>
-        <xsl:variable name="CAR_FACTOR">2</xsl:variable>
-
-	<xsl:variable name="MENU_VALUE_FONTSIZE">250</xsl:variable>
-	<!-- icons_xs = selection icons (the green ones) -->
-	<!-- icons_s = topmenu and POI-selection-items -->
-	<!-- icons_l = menu items -->
-	<!-- spacing = spacing between menu items in pixels -->
-	<xsl:variable name="MENU_VALUE_ICONS_XS">32</xsl:variable>
-	<xsl:variable name="MENU_VALUE_ICONS_S">48</xsl:variable>
-	<xsl:variable name="MENU_VALUE_ICONS_L">64</xsl:variable>
-	<xsl:variable name="MENU_VALUE_SPACING">2</xsl:variable>
-
-	<xsl:variable name="LAYOUT_001_ORDER_DELTA_1">-1</xsl:variable>
-
-	<xsl:include href="android_all_densities.xslt"/>
-</xsl:transform>
diff --git a/navit/xslt/android_mdpi.xslt b/navit/xslt/android_mdpi.xslt
deleted file mode 100644
index fce219dd3..000000000
--- a/navit/xslt/android_mdpi.xslt
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0"?>
-<xsl:transform version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xi="http://www.w3.org/2001/XInclude">
-        <xsl:output method="xml" doctype-system="navit.dtd" cdata-section-elements="gui"/>
-        <xsl:variable name="OSD_SIZE">1.33</xsl:variable>
-        <xsl:variable name="OSD_FACTOR">1</xsl:variable>
-        <xsl:variable name="CAR_FACTOR">2</xsl:variable>
-
-	<xsl:variable name="MENU_VALUE_FONTSIZE">200</xsl:variable>
-	<!-- icons_xs = selection icons (the green ones) -->
-	<!-- icons_s = topmenu and POI-selection-items -->
-	<!-- icons_l = menu items -->
-	<!-- spacing = spacing between menu items in pixels -->
-	<xsl:variable name="MENU_VALUE_ICONS_XS">32</xsl:variable>
-	<xsl:variable name="MENU_VALUE_ICONS_S">32</xsl:variable>
-	<xsl:variable name="MENU_VALUE_ICONS_L">64</xsl:variable>
-	<xsl:variable name="MENU_VALUE_SPACING">3</xsl:variable>
-
-	<xsl:variable name="LAYOUT_001_ORDER_DELTA_1">0</xsl:variable>
-
-	<xsl:include href="android_all_densities.xslt"/>
-</xsl:transform>
diff --git a/navit/xslt/osd_minimum.xslt b/navit/xslt/osd_minimum.xslt
index d392a7cce..5c9c8a0b3 100644
--- a/navit/xslt/osd_minimum.xslt
+++ b/navit/xslt/osd_minimum.xslt
@@ -15,9 +15,15 @@
       <xsl:text>&#x0A;        </xsl:text>
       <osd type="text" label="${{navigation.item[1].length[named]}}" x="0" y="{-$NEXT_TURN_TEXT_HIGHT}" w="{$NEXT_TURN_SIZE+$NEXT_TURN_TEXT_HIGHT}" h="{$NEXT_TURN_TEXT_HIGHT}" font_size="{round(200*number($OSD_SIZE))}" enable_expression="navigation.nav_status>=3"/>
       <xsl:text>&#x0A;        </xsl:text>
-      <osd type="button" src="gui_zoom_in_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="zoom_in()" x="0" y="0" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}"/>
+      <osd type="button" src="gui_zoom_manual_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="autozoom_active=0" x="0" y="0" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}" enable_expression="autozoom_active!=0"/>
       <xsl:text>&#x0A;        </xsl:text>
-      <osd type="button" src="gui_zoom_out_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="zoom_out()" x="0" y="{round(number($ICON_BIG)+8*number($OSD_SIZE))}" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}"/>
+      <osd type="button" src="gui_zoom_auto_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="autozoom_active=1" x="0" y="0" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}" enable_expression="autozoom_active==0"/>
+      <xsl:text>&#x0A;        </xsl:text>
+      <osd type="button" src="gui_zoom_in_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="zoom_in()" x="0" y="{round(number($ICON_BIG)+8*number($OSD_SIZE))}" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}"/>
+      <xsl:text>&#x0A;        </xsl:text>
+      <osd type="button" src="gui_zoom_out_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="zoom_out()" x="0" y="{round(2*(number($ICON_BIG)+8*number($OSD_SIZE)))}" osd_configuration="1" use_overlay="{$OSD_USE_OVERLAY}"/>
+      <xsl:text>&#x0A;        </xsl:text>
+      <osd type="cmd_interface" update_period="1" command="pitch=autozoom_active==0?pitch:(follow>1?0:20);orientation=autozoom_active==0?orientation:(follow>1?0:-1)" x="-1" y="-1" w="1" h="1"/>
       <xsl:text>&#x0A;        </xsl:text>
       <osd type="button" src="cursor_{number($ICON_BIG)}_{number($ICON_BIG)}.png" command="follow=0;set_center_cursor()" x="{round(number($ICON_BIG)+8*number($OSD_SIZE))}" y="0" enable_expression="follow>1" use_overlay="{$OSD_USE_OVERLAY}"/>
       <xsl:text>&#x0A;        </xsl:text>
diff --git a/navit/xslt/sailfish_cursor.xslt b/navit/xslt/sailfish_cursor.xslt
new file mode 100644
index 000000000..01029638c
--- /dev/null
+++ b/navit/xslt/sailfish_cursor.xslt
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+
+	<xsl:output method="xml" indent="yes" cdata-section-elements="gui" doctype-system="navit.dtd"/>
+
+   <!-- Default rule: copy all -->
+   <xsl:template match="node()|@*">
+      <xsl:copy>
+         <xsl:apply-templates select="node()|@*"/>
+      </xsl:copy>
+   </xsl:template>
+
+   <xsl:template match="/config/navit/layout[@name='Car' or @name='Car-dark']/cursor">
+      <cursor w="57" h="57">
+        <xsl:text>&#x0A;				</xsl:text>
+        <itemgra speed_range="-2">
+        <xsl:text>&#x0A;					</xsl:text>
+          <polyline color="#00BC00" radius="0" width="4">
+          <xsl:text>&#x0A;						</xsl:text>
+            <coord x="0" y="0"/>
+            <xsl:text>&#x0A;					</xsl:text>
+          </polyline>
+          <xsl:text>&#x0A;					</xsl:text>
+          <circle color="#008500" radius="9" width="3">
+          <xsl:text>&#x0A;						</xsl:text>
+            <coord x="0" y="0"/>
+            <xsl:text>&#x0A;					</xsl:text>
+          </circle>
+          <xsl:text>&#x0A;					</xsl:text>
+          <circle color="#00BC00" radius="13" width="3">
+          <xsl:text>&#x0A;						</xsl:text>
+            <coord x="0" y="0"/>
+            <xsl:text>&#x0A;					</xsl:text>
+          </circle>
+          <xsl:text>&#x0A;					</xsl:text>
+          <circle color="#008500" radius="18" width="3">
+          <xsl:text>&#x0A;						</xsl:text>
+            <coord x="0" y="0"/>
+            <xsl:text>&#x0A;					</xsl:text>
+       	  </circle>
+          <xsl:text>&#x0A;				</xsl:text>
+        </itemgra>
+        <xsl:text>&#x0A;				</xsl:text>
+        <itemgra speed_range="3-">
+        <xsl:text>&#x0A;					</xsl:text>
+          <polygon color="#00000066">
+          <xsl:text>&#x0A;						</xsl:text>
+            <coord x="-21" y="-27"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="0" y="12"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="21" y="-27"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="0" y="-12"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="-21" y="-27"/>
+            <xsl:text>&#x0A;					</xsl:text>
+          </polygon>
+          <xsl:text>&#x0A;					</xsl:text>
+          <polygon color="#008500">
+          <xsl:text>&#x0A;						</xsl:text>
+            <coord x="-21" y="-18"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="0" y="21"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="0" y="-3"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="-21" y="-18"/>
+            <xsl:text>&#x0A;					</xsl:text>
+          </polygon>
+          <xsl:text>&#x0A;					</xsl:text>
+          <polygon color="#00BC00">
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="21" y="-18"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="0" y="21"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="0" y="-3"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="21" y="-18"/>
+            <xsl:text>&#x0A;					</xsl:text>
+          </polygon>
+          <xsl:text>&#x0A;					</xsl:text>
+          <polyline color="#008500" width="1">
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="-21" y="-18"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="0" y="21"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="0" y="-3"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="-21" y="-18"/>
+            <xsl:text>&#x0A;					</xsl:text>
+          </polyline>
+          <xsl:text>&#x0A;					</xsl:text>
+          <polyline color="#008500" width="1">
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="21" y="-18"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="0" y="21"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="0" y="-3"/>
+            <xsl:text>&#x0A;						</xsl:text>
+            <coord x="21" y="-18"/>
+            <xsl:text>&#x0A;					</xsl:text>
+          </polyline>
+          <xsl:text>&#x0A;				</xsl:text>
+        </itemgra>
+        <xsl:text>&#x0A;			</xsl:text>
+      </cursor>
+   </xsl:template>
+</xsl:stylesheet>
diff --git a/navit/xslt/sailfish_disable.xslt b/navit/xslt/sailfish_disable.xslt
new file mode 100644
index 000000000..4f730b00e
--- /dev/null
+++ b/navit/xslt/sailfish_disable.xslt
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+
+	<xsl:output method="xml" indent="yes" cdata-section-elements="gui" doctype-system="navit.dtd"/>
+
+   <!-- Default rule: copy all -->
+   <xsl:template match="node()|@*">
+      <xsl:copy>
+         <xsl:apply-templates select="node()|@*"/>
+      </xsl:copy>
+   </xsl:template>
+
+   <!-- Disable all vehicles -->
+   <xsl:template match="vehicle">
+      <xsl:copy>
+         <xsl:apply-templates select="@*"/>
+         <xsl:attribute name="enabled">no</xsl:attribute>
+         <xsl:apply-templates select="node()"/>
+      </xsl:copy>
+   </xsl:template>
+   <!-- Disable all graphics -->
+   <xsl:template match="graphics">
+      <xsl:copy>
+         <xsl:apply-templates select="@*"/>
+         <xsl:attribute name="enabled">no</xsl:attribute>
+         <xsl:apply-templates select="node()"/>
+      </xsl:copy>
+   </xsl:template>
+   <!-- Disable all mapsets -->
+   <xsl:template match="mapset">
+      <xsl:copy>
+         <xsl:apply-templates select="@*"/>
+         <xsl:attribute name="enabled">no</xsl:attribute>
+         <xsl:apply-templates select="node()"/>
+      </xsl:copy>
+   </xsl:template>
+   <!-- Disable all osd -->
+   <xsl:template match="osd">
+      <xsl:copy>
+         <xsl:apply-templates select="@*"/>
+         <xsl:attribute name="enabled">no</xsl:attribute>
+         <xsl:apply-templates select="node()"/>
+      </xsl:copy>
+   </xsl:template>
+   <!-- Disable all speech -->
+   <xsl:template match="speech">
+      <xsl:copy>
+         <xsl:apply-templates select="@*"/>
+         <xsl:attribute name="enabled">no</xsl:attribute>
+         <xsl:apply-templates select="node()"/>
+      </xsl:copy>
+   </xsl:template>
+
+</xsl:stylesheet>
diff --git a/navit/xslt/sailfish_gui.xslt b/navit/xslt/sailfish_gui.xslt
new file mode 100644
index 000000000..2f2c8fd02
--- /dev/null
+++ b/navit/xslt/sailfish_gui.xslt
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+
+	<xsl:output method="xml" indent="yes" cdata-section-elements="gui" doctype-system="navit.dtd"/>
+
+   <!-- Default rule: copy all -->
+   <xsl:template match="node()|@*">
+      <xsl:copy>
+         <xsl:apply-templates select="node()|@*"/>
+      </xsl:copy>
+   </xsl:template>
+
+   <xsl:template match="/config/navit">
+      <xsl:copy>
+         <xsl:apply-templates select="@*"/>
+         <xsl:attribute name="drag_bitmap">1</xsl:attribute>
+         <xsl:apply-templates select="node()"/>
+      </xsl:copy>
+   </xsl:template>
+
+   <xsl:template match="/config/navit/gui[@type='internal']">
+      <xsl:copy>
+         <xsl:apply-templates select="@*"/>
+         <xsl:attribute name="font_size">350</xsl:attribute>
+         <xsl:attribute name="icon_xs">32</xsl:attribute>
+         <xsl:attribute name="icon_s">96</xsl:attribute>
+         <xsl:attribute name="icon_l">96</xsl:attribute>
+         <xsl:attribute name="enabled">yes</xsl:attribute>
+         <xsl:apply-templates select="node()"/>
+      </xsl:copy>
+   </xsl:template>
+
+</xsl:stylesheet>
diff --git a/navit/xslt/sailfish_mapset.xslt b/navit/xslt/sailfish_mapset.xslt
new file mode 100644
index 000000000..2febc81f4
--- /dev/null
+++ b/navit/xslt/sailfish_mapset.xslt
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+
+	<xsl:output method="xml" indent="yes" cdata-section-elements="gui" doctype-system="navit.dtd"/>
+
+   <!-- Default rule: copy all -->
+   <xsl:template match="node()|@*">
+      <xsl:copy>
+         <xsl:apply-templates select="node()|@*"/>
+      </xsl:copy>
+   </xsl:template>
+
+   <xsl:template match="/config/navit/mapset[1]">
+		<mapset enabled="yes">
+         <xsl:text>&#x0A; 			</xsl:text>
+			<map type="binfile" enabled="yes" active="no" data="/usr/share/harbour-navit/maps/osm_bbox_11.3,47.9,11.7,48.2.bin"/>
+         <xsl:text>&#x0A; 			</xsl:text>
+			<map type="binfile" enabled="yes" data="~/Maps/map.navit.bin"/>
+         <xsl:text>&#x0A; 			</xsl:text>
+			<map type="binfile" enabled="yes" active="no" name="map.navit.heightlines.bin" data="~/Maps/map.navit.heightlines.bin"/>
+         <xsl:text>&#x0A; 		</xsl:text>
+		</mapset>
+      <xsl:text>&#x0A; 		</xsl:text>
+      <xsl:copy>
+         <xsl:apply-templates select="@*"/>
+         <xsl:apply-templates select="node()"/>
+      </xsl:copy>
+   </xsl:template>
+
+</xsl:stylesheet>
diff --git a/navit/xslt/sailfish_osd.xslt b/navit/xslt/sailfish_osd.xslt
new file mode 100644
index 000000000..ca9925a49
--- /dev/null
+++ b/navit/xslt/sailfish_osd.xslt
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+
+	<xsl:output method="xml" indent="yes" cdata-section-elements="gui" doctype-system="navit.dtd"/>
+
+   <!-- Default rule: copy all -->
+   <xsl:template match="node()|@*">
+      <xsl:copy>
+         <xsl:apply-templates select="node()|@*"/>
+      </xsl:copy>
+   </xsl:template>
+
+   <xsl:template match="/config/navit/osd[1]">
+      <osd enabled="yes" type="gps_status" x="0" y="0" w="50" h="50"/>
+      <xsl:text>&#x0A; 		</xsl:text>
+      <osd enabled="no" type="text" label="${{vehicle.position_sats_used}}/${{vehicle.position_qual}}" x="0" y="0" w="50" h="50" background_color="#00000058" font_size="400"/>
+      <xsl:text>&#x0A; 		</xsl:text>
+      <osd enabled="yes" type="text" label="${{vehicle.position_speed}}" x="50" y="0" w="150" h="50" background_color="#00000058" font_size="400"/>
+      <xsl:text>&#x0A; 		</xsl:text>
+      <osd enabled="yes" type="text" label="${{navigation.item.destination_length[named]}}" x="200" y="0" w="240" h="50" background_color="#00000058" font_size="400"/>
+      <xsl:text>&#x0A; 		</xsl:text>
+      <osd enabled="yes" type="navigation_next_turn" x="-100" y="0" w="100" h="100" icon_w="90" icon_h="80" background_color="#00000058"/>
+      <xsl:text>&#x0A; 		</xsl:text>
+		<osd enabled="yes" type="button" x="-96" y="-96" w="96" h="96" command="zoom_in()" src="zoom_in" use_overlay="true"/>
+      <xsl:text>&#x0A; 		</xsl:text>
+      <osd enabled="yes" type="text" label="${{navigation.item[1].length[named]}}" x="-100" y="100" w="100" h="50" background_color="#00000058" font_size="400"/>
+      <xsl:text>&#x0A; 		</xsl:text>
+		<osd enabled="yes" type="button" x="0" y="-96" w="96" h="96" command="zoom_out()" src="zoom_out" use_overlay="true"/>
+      <xsl:text>&#x0A; 		</xsl:text>
+      <xsl:copy>
+         <xsl:apply-templates select="@*"/>
+         <xsl:apply-templates select="node()"/>
+      </xsl:copy>
+   </xsl:template>
+
+</xsl:stylesheet>
diff --git a/navit/xslt/sailfish_qt5.xslt b/navit/xslt/sailfish_qt5.xslt
new file mode 100644
index 000000000..5ee20e2e9
--- /dev/null
+++ b/navit/xslt/sailfish_qt5.xslt
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+
+	<xsl:output method="xml" indent="yes" cdata-section-elements="gui" doctype-system="navit.dtd"/>
+
+   <!-- Default rule: copy all -->
+   <xsl:template match="node()|@*">
+      <xsl:copy>
+         <xsl:apply-templates select="node()|@*"/>
+      </xsl:copy>
+   </xsl:template>
+
+   <xsl:template match="/config/navit/graphics[1]">
+      <graphics type="qt5" qt5_platform="wayland"/>
+      <xsl:text>&#x0A; 		</xsl:text>
+      <xsl:copy>
+         <xsl:apply-templates select="@*"/>
+         <xsl:apply-templates select="node()"/>
+      </xsl:copy>
+   </xsl:template>
+
+   <xsl:template match="/config/navit/vehicle[1]">
+		<vehicle name="Qt5" profilename="car" enabled="yes" active="1" source="qt5://"/>
+      <xsl:text>&#x0A; 		</xsl:text>
+      <xsl:copy>
+         <xsl:apply-templates select="@*"/>
+         <xsl:apply-templates select="node()"/>
+      </xsl:copy>
+   </xsl:template>
+
+   <xsl:template match="/config/navit/speech[1]">
+		<speech type="qt5_espeak" cps="15"/>
+      <xsl:text>&#x0A; 		</xsl:text>
+      <xsl:copy>
+         <xsl:apply-templates select="@*"/>
+         <xsl:apply-templates select="node()"/>
+      </xsl:copy>
+   </xsl:template>
+
+</xsl:stylesheet>
diff --git a/navit/xslt/sailfish_svg.xslt b/navit/xslt/sailfish_svg.xslt
new file mode 100644
index 000000000..7203ed34d
--- /dev/null
+++ b/navit/xslt/sailfish_svg.xslt
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xi="http://www.w3.org/2001/XInclude">
+
+	<xsl:output method="xml" indent="yes" cdata-section-elements="gui" doctype-system="navit.dtd"/>
+
+   <!-- Default rule: copy all -->
+   <xsl:template match="node()|@*">
+      <xsl:copy>
+         <xsl:apply-templates select="node()|@*"/>
+      </xsl:copy>
+   </xsl:template>
+
+   <!-- Force all png icons to svg and add w and h if not exist -->
+   <xsl:template match="icon">
+      <xsl:copy>
+         <xsl:apply-templates select="@*"/>
+         <xsl:if test="@src[substring(., string-length()-3)='.png']|@src[substring(., string-length()-3)='.xpm']">
+         <xsl:attribute name="src">
+            <xsl:value-of select="concat(substring(@src,1, string-length(@src)-3),'svg')"/>
+         </xsl:attribute>
+         </xsl:if>
+         <xsl:if test="not(@h)">
+            <xsl:attribute name="h">15</xsl:attribute>
+         </xsl:if>
+         <xsl:if test="not(@w)">
+            <xsl:attribute name="w">15</xsl:attribute>
+         </xsl:if>
+         <xsl:apply-templates select="node()"/>
+      </xsl:copy>
+   </xsl:template>
+
+</xsl:stylesheet>
diff --git a/po/pt.po.in b/po/pt.po.in
index c5ef693aa..418c05136 100644
--- a/po/pt.po.in
+++ b/po/pt.po.in
@@ -1,5 +1,5 @@
 # Portuguese translations for navit
-# Copyright (C) 2006-2016 The Navit Team
+# Copyright (C) 2006-2017 The Navit Team
 # This file is distributed under the same license as the navit package.
 # Many thanks to the contributors of this translation:
 # CaioNavas https://launchpad.net/~webmaster-caiomnavas
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: navit 0.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2016-10-11 10:00+0000\n"
+"PO-Revision-Date: 2017-06-26 15:54+0000\n"
 "Last-Translator: João Pirralha <joaopirralha@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -2000,6 +2000,9 @@ msgstr "Descrição da rota"
 msgid "Show Locale"
 msgstr "Exibir região e idioma"
 
+msgid "Network info"
+msgstr "Informação da rede"
+
 msgid "Former Destinations"
 msgstr "Destinos anteriores"
 
@@ -2539,9 +2542,18 @@ msgstr "Ecrã completo"
 msgid "Window Mode"
 msgstr "Modo de janela"
 
+msgid "Auto zoom"
+msgstr "Ampliação automática"
+
+msgid "Manual zoom"
+msgstr "Ampliação manual"
+
 msgid "Layers"
 msgstr "Camadas"
 
+msgid "Zoom to route"
+msgstr "Ampliar para a rota"
+
 msgid "Description"
 msgstr "Descrição"
 
@@ -2797,6 +2809,18 @@ msgstr ""
 "atualmente selecionado reporta não suportar o seu idioma. Pedir ao sistema "
 "para exibir o diálogo de transferência de voz?"
 
+#. Android resource: @strings/permissions_not_granted
+msgid ""
+"Navit needs permission to access GPS and read the map.\n"
+"If you change your mind please restart Navit and grant the permissions"
+msgstr ""
+"O Navit necessita de permissão para aceder ao GPS e ler o mapa.\n"
+"Se mudar de ideias por favor reinicie o Navit e conceda estas permissões."
+
+#. Android resource: @strings/permissions_info_box_title
+msgid "One or more ungranted permissions"
+msgstr "Uma ou mais permissões não concedidas"
+
 #, c-format
 #~ msgid "then leave the roundabout at the %1$s %2$s"
 #~ msgstr "e saia da rotunda na %1$s %2$s"