Moved xpm to icons (#307)

540 files changed, 38 insertions, 38 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b53c9342c..c7ac46b24 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}\"")
@@ -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)
diff --git a/ci/build_linux.sh b/ci/build_linux.sh
index 702709422..ff5550e65 100644
--- a/ci/build_linux.sh
+++ b/ci/build_linux.sh
@@ -32,7 +32,7 @@ else
 fi
 
 if [[ "$CIRCLE_ARTIFACTS" != "" ]]; then
-	cp -r navit/xpm $CIRCLE_ARTIFACTS
+	cp -r navit/icons $CIRCLE_ARTIFACTS
 fi
 
 
diff --git a/ci/build_tomtom_minimal.sh b/ci/build_tomtom_minimal.sh
index b522e6652..845224e05 100644
--- a/ci/build_tomtom_minimal.sh
+++ b/ci/build_tomtom_minimal.sh
@@ -190,14 +190,14 @@ cp -r ~/navit/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 ./
+mkdir icons
+cd icons
+cp $PREFIX/share/navit/icons/*16.png ./
+cp $PREFIX/share/navit/icons/*32.png ./
+cp $PREFIX/share/navit/icons/*48.png ./
+cp $PREFIX/share/navit/icons/*64.png ./
+cp $PREFIX/share/navit/icons/nav*.* ./
+cp $PREFIX/share/navit/icons/country*.png ./
 cd ..
 cp $PREFIX/share/navit/navit.xml ./tomtom480.xml
 mkdir -p maps
diff --git a/ci/build_tomtom_plugin.sh b/ci/build_tomtom_plugin.sh
index 3d0357989..08966ddb7 100644
--- a/ci/build_tomtom_plugin.sh
+++ b/ci/build_tomtom_plugin.sh
@@ -284,7 +284,7 @@ make install
 # in the end we only want Navit locale
 rm -r $PREFIX/share/locale
 
-cat > ~/navit/navit/xpm/tomtom_minus.svg << EOF
+cat > ~/navit/navit/icons/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">
@@ -293,7 +293,7 @@ cat > ~/navit/navit/xpm/tomtom_minus.svg << EOF
 </svg>
 EOF
 
-cat > ~/navit/navit/xpm/tomtom_plus.svg << EOF
+cat > ~/navit/navit/icons/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">
@@ -426,14 +426,14 @@ 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 ./
+mkdir icons
+cd icons
+cp $PREFIX/share/navit/icons/*16.png ./
+cp $PREFIX/share/navit/icons/*32.png ./
+cp $PREFIX/share/navit/icons/*48.png ./
+cp $PREFIX/share/navit/icons/*64.png ./
+cp $PREFIX/share/navit/icons/nav*.* ./
+cp $PREFIX/share/navit/icons/country*.png ./
 cd ..
 cp $PREFIX/share/navit/navit.xml ./tomtom480.xml
 mkdir -p maps
@@ -462,8 +462,8 @@ EOF
 
 
 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
+convert -background none ~/navit/navit/icons/tomtom_plus.svg -resize 80x80 $OUT_PATH/navit/share/icons/tomtom_plus_80_80.png
+convert -background none ~/navit/navit/icons/tomtom_minus.svg -resize 80x80 $OUT_PATH/navit/share/icons/tomtom_minus_80_80.png
 
 cat > $OUT_PATH/SDKRegistry/ts.cap << EOF
 Version|100|
diff --git a/contrib/sailfish/navit-sailfish.spec b/contrib/sailfish/navit-sailfish.spec
index 6beb84fab..d11a3fc70 100755
--- a/contrib/sailfish/navit-sailfish.spec
+++ b/contrib/sailfish/navit-sailfish.spec
@@ -79,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 \
@@ -107,7 +107,7 @@ cmake  -DCMAKE_INSTALL_PREFIX:PATH=/usr \
 %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
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/navit/CMakeLists.txt b/navit/CMakeLists.txt
index c860f123c..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})
@@ -166,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/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/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/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/gui/qt5_qml/backend.cpp b/navit/gui/qt5_qml/backend.cpp
index 14cdd4ddf..ac1eb21a5 100644
--- a/navit/gui/qt5_qml/backend.cpp
+++ b/navit/gui/qt5_qml/backend.cpp
@@ -258,12 +258,12 @@ void Backend::setActivePoi(int index) {
 }
 
 /**
- * @brief returns the icon (xpm) absolute path
+ * @brief returns the icon (icons) absolute path
  * @param none
- * @returns the icon (xpm) absolute path as a QString
+ * @returns the icon (icons) absolute path as a QString
  */ 
 QString Backend::get_icon_path(){
-        return QString(g_strjoin(NULL,"file://",getenv("NAVIT_SHAREDIR"),"/xpm/",NULL));
+        return QString(g_strjoin(NULL,"file://",getenv("NAVIT_SHAREDIR"),"/icons/",NULL));
 }
 
 /**
@@ -316,7 +316,7 @@ QString Backend::get_country_icon(char * country_iso_code){
 //        if ( country_iso_code == "" ) {
 //                country_iso_code = _country_iso2;
 //        }
-        return QString(g_strjoin(NULL,"file://",getenv("NAVIT_SHAREDIR"),"/xpm/",country_iso_code,".svg",NULL));
+        return QString(g_strjoin(NULL,"file://",getenv("NAVIT_SHAREDIR"),"/icons/",country_iso_code,".svg",NULL));
 }
 
 
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/xpm/atm.svg b/navit/icons/atm.svg
index 965aeb72a..965aeb72a 100644
--- a/navit/xpm/atm.svg
+++ b/navit/icons/atm.svg
diff --git a/navit/xpm/attraction.svg b/navit/icons/attraction.svg
index aa76cf906..aa76cf906 100644
--- a/navit/xpm/attraction.svg
+++ b/navit/icons/attraction.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/xpm/bank.svg b/navit/icons/bank.svg
index 965aeb72a..965aeb72a 100644
--- a/navit/xpm/bank.svg
+++ b/navit/icons/bank.svg
diff --git a/navit/xpm/bar.svg b/navit/icons/bar.svg
index e81ba6ca1..e81ba6ca1 100644
--- a/navit/xpm/bar.svg
+++ b/navit/icons/bar.svg
diff --git a/navit/xpm/beer.svg b/navit/icons/beer.svg
index e81ba6ca1..e81ba6ca1 100644
--- a/navit/xpm/beer.svg
+++ b/navit/icons/beer.svg
diff --git a/navit/xpm/bench.svg b/navit/icons/bench.svg
index 6f2b40ff3..6f2b40ff3 100644
--- a/navit/xpm/bench.svg
+++ b/navit/icons/bench.svg
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/xpm/bicycle_shop.svg b/navit/icons/bicycle_shop.svg
index 7d97366e4..7d97366e4 100644
--- a/navit/xpm/bicycle_shop.svg
+++ b/navit/icons/bicycle_shop.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/xpm/boat_ramp.svg b/navit/icons/boat_ramp.svg
index 2915d58bd..2915d58bd 100644
--- a/navit/xpm/boat_ramp.svg
+++ b/navit/icons/boat_ramp.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/xpm/bus.svg b/navit/icons/bus.svg
index 0730db313..0730db313 100644
--- a/navit/xpm/bus.svg
+++ b/navit/icons/bus.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/xpm/bus_stop.svg b/navit/icons/bus_stop.svg
index 1782c143f..1782c143f 100644
--- a/navit/xpm/bus_stop.svg
+++ b/navit/icons/bus_stop.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/xpm/car_dealer.svg b/navit/icons/car_dealer.svg
index 599f1ee7c..599f1ee7c 100644
--- a/navit/xpm/car_dealer.svg
+++ b/navit/icons/car_dealer.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/xpm/castle.svg b/navit/icons/castle.svg
index 843c1aa1d..843c1aa1d 100644
--- a/navit/xpm/castle.svg
+++ b/navit/icons/castle.svg
diff --git a/navit/xpm/cemetery.svg b/navit/icons/cemetery.svg
index 7070fcb04..7070fcb04 100644
--- a/navit/xpm/cemetery.svg
+++ b/navit/icons/cemetery.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/xpm/cinema.svg b/navit/icons/cinema.svg
index fc1611908..fc1611908 100644
--- a/navit/xpm/cinema.svg
+++ b/navit/icons/cinema.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/xpm/drinking_water.svg b/navit/icons/drinking_water.svg
index d81e92082..d81e92082 100644
--- a/navit/xpm/drinking_water.svg
+++ b/navit/icons/drinking_water.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/xpm/emergency.svg b/navit/icons/emergency.svg
index c88c6aaa0..c88c6aaa0 100644
--- a/navit/xpm/emergency.svg
+++ b/navit/icons/emergency.svg
diff --git a/navit/xpm/exit.svg b/navit/icons/exit.svg
index 30c7e1356..30c7e1356 100644
--- a/navit/xpm/exit.svg
+++ b/navit/icons/exit.svg
diff --git a/navit/xpm/fastfood.svg b/navit/icons/fastfood.svg
index d0792d476..d0792d476 100644
--- a/navit/xpm/fastfood.svg
+++ b/navit/icons/fastfood.svg
diff --git a/navit/xpm/firebrigade.svg b/navit/icons/firebrigade.svg
index aed6368bc..aed6368bc 100644
--- a/navit/xpm/firebrigade.svg
+++ b/navit/icons/firebrigade.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/xpm/fountain.svg b/navit/icons/fountain.svg
index a23776812..a23776812 100644
--- a/navit/xpm/fountain.svg
+++ b/navit/icons/fountain.svg
diff --git a/navit/xpm/fuel.svg b/navit/icons/fuel.svg
index d1b86d21e..d1b86d21e 100644
--- a/navit/xpm/fuel.svg
+++ b/navit/icons/fuel.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/xpm/golf.svg b/navit/icons/golf.svg
index c52eebeb2..c52eebeb2 100644
--- a/navit/xpm/golf.svg
+++ b/navit/icons/golf.svg
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/xpm/gui_zoom_route.svg b/navit/icons/gui_zoom_route.svg
index c7958a2f5..c7958a2f5 100644
--- a/navit/xpm/gui_zoom_route.svg
+++ b/navit/icons/gui_zoom_route.svg
diff --git a/navit/xpm/heliport.svg b/navit/icons/heliport.svg
index b80e2692f..b80e2692f 100644
--- a/navit/xpm/heliport.svg
+++ b/navit/icons/heliport.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/xpm/hospital.svg b/navit/icons/hospital.svg
index a9addccee..a9addccee 100644
--- a/navit/xpm/hospital.svg
+++ b/navit/icons/hospital.svg
diff --git a/navit/xpm/hotel.svg b/navit/icons/hotel.svg
index 50f213a3b..50f213a3b 100644
--- a/navit/xpm/hotel.svg
+++ b/navit/icons/hotel.svg
diff --git a/navit/xpm/hunting_stand.svg b/navit/icons/hunting_stand.svg
index 6a4edcd49..6a4edcd49 100644
--- a/navit/xpm/hunting_stand.svg
+++ b/navit/icons/hunting_stand.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 ffc57b159..ffc57b159 100644
--- a/navit/xpm/information.svg
+++ b/navit/icons/information.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 72fe1b24b..72fe1b24b 100644
--- a/navit/xpm/justice.svg
+++ b/navit/icons/justice.svg
diff --git a/navit/xpm/level_crossing.svg b/navit/icons/level_crossing.svg
index dbb3e4f27..dbb3e4f27 100644
--- a/navit/xpm/level_crossing.svg
+++ b/navit/icons/level_crossing.svg
diff --git a/navit/xpm/library.svg b/navit/icons/library.svg
index b3eabb3d3..b3eabb3d3 100644
--- a/navit/xpm/library.svg
+++ b/navit/icons/library.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/xpm/memorial.svg b/navit/icons/memorial.svg
index 2a1ab9f91..2a1ab9f91 100644
--- a/navit/xpm/memorial.svg
+++ b/navit/icons/memorial.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 bce2b7b95..bce2b7b95 100644
--- a/navit/xpm/military.svg
+++ b/navit/icons/military.svg
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 eab1adf4c..eab1adf4c 100644
--- a/navit/xpm/museum.svg
+++ b/navit/icons/museum.svg
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 7a7b60e40..7a7b60e40 100644
--- a/navit/xpm/parking.svg
+++ b/navit/icons/parking.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/xpm/peak.svg b/navit/icons/peak.svg
index 72855f9db..72855f9db 100644
--- a/navit/xpm/peak.svg
+++ b/navit/icons/peak.svg
diff --git a/navit/xpm/pharmacy.svg b/navit/icons/pharmacy.svg
index 14d4e5854..14d4e5854 100644
--- a/navit/xpm/pharmacy.svg
+++ b/navit/icons/pharmacy.svg
diff --git a/navit/xpm/picnic.svg b/navit/icons/picnic.svg
index b9af047f3..b9af047f3 100644
--- a/navit/xpm/picnic.svg
+++ b/navit/icons/picnic.svg
diff --git a/navit/xpm/playground.svg b/navit/icons/playground.svg
index 4373af6d8..4373af6d8 100644
--- a/navit/xpm/playground.svg
+++ b/navit/icons/playground.svg
diff --git a/navit/xpm/police.svg b/navit/icons/police.svg
index c73412391..c73412391 100644
--- a/navit/xpm/police.svg
+++ b/navit/icons/police.svg
diff --git a/navit/xpm/post.svg b/navit/icons/post.svg
index 7cb29ea06..7cb29ea06 100644
--- a/navit/xpm/post.svg
+++ b/navit/icons/post.svg
diff --git a/navit/xpm/public_office.svg b/navit/icons/public_office.svg
index cc58bdb0f..cc58bdb0f 100644
--- a/navit/xpm/public_office.svg
+++ b/navit/icons/public_office.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 1bf094979..1bf094979 100644
--- a/navit/xpm/repair_service.svg
+++ b/navit/icons/repair_service.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/xpm/restaurant.svg b/navit/icons/restaurant.svg
index d347eac46..d347eac46 100644
--- a/navit/xpm/restaurant.svg
+++ b/navit/icons/restaurant.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/xpm/school.svg b/navit/icons/school.svg
index 3c99eb64f..3c99eb64f 100644
--- a/navit/xpm/school.svg
+++ b/navit/icons/school.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 6ca708280..6ca708280 100644
--- a/navit/xpm/shop_apparel.svg
+++ b/navit/icons/shop_apparel.svg
diff --git a/navit/xpm/shop_computer.svg b/navit/icons/shop_computer.svg
index 6fd453bcb..6fd453bcb 100644
--- a/navit/xpm/shop_computer.svg
+++ b/navit/icons/shop_computer.svg
diff --git a/navit/xpm/shop_department.svg b/navit/icons/shop_department.svg
index f34b015c5..f34b015c5 100644
--- a/navit/xpm/shop_department.svg
+++ b/navit/icons/shop_department.svg
diff --git a/navit/xpm/shop_grocery.svg b/navit/icons/shop_grocery.svg
index 660a71b39..660a71b39 100644
--- a/navit/xpm/shop_grocery.svg
+++ b/navit/icons/shop_grocery.svg
diff --git a/navit/xpm/shopping.svg b/navit/icons/shopping.svg
index c0fda19b8..c0fda19b8 100644
--- a/navit/xpm/shopping.svg
+++ b/navit/icons/shopping.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/xpm/sport.svg b/navit/icons/sport.svg
index 6332de752..6332de752 100644
--- a/navit/xpm/sport.svg
+++ b/navit/icons/sport.svg
diff --git a/navit/xpm/stadium.svg b/navit/icons/stadium.svg
index 101a3d5df..101a3d5df 100644
--- a/navit/xpm/stadium.svg
+++ b/navit/icons/stadium.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/xpm/taxi.svg b/navit/icons/taxi.svg
index ba982fbfb..ba982fbfb 100644
--- a/navit/xpm/taxi.svg
+++ b/navit/icons/taxi.svg
diff --git a/navit/xpm/tec_common.svg b/navit/icons/tec_common.svg
index d8c5c0594..d8c5c0594 100644
--- a/navit/xpm/tec_common.svg
+++ b/navit/icons/tec_common.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/xpm/theater.svg b/navit/icons/theater.svg
index 0d403914b..0d403914b 100644
--- a/navit/xpm/theater.svg
+++ b/navit/icons/theater.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/xpm/toilets.svg b/navit/icons/toilets.svg
index aa4406144..aa4406144 100644
--- a/navit/xpm/toilets.svg
+++ b/navit/icons/toilets.svg
diff --git a/navit/xpm/tower.svg b/navit/icons/tower.svg
index 737da9c82..737da9c82 100644
--- a/navit/xpm/tower.svg
+++ b/navit/icons/tower.svg
diff --git a/navit/xpm/townhall.svg b/navit/icons/townhall.svg
index 2aaff669a..2aaff669a 100644
--- a/navit/xpm/townhall.svg
+++ b/navit/icons/townhall.svg
diff --git a/navit/xpm/traffic_signals.svg b/navit/icons/traffic_signals.svg
index 9d949a4e2..9d949a4e2 100644
--- a/navit/xpm/traffic_signals.svg
+++ b/navit/icons/traffic_signals.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/xpm/unknown.svg b/navit/icons/unknown.svg
index 0299629e9..0299629e9 100644
--- a/navit/xpm/unknown.svg
+++ b/navit/icons/unknown.svg
diff --git a/navit/xpm/viewpoint.svg b/navit/icons/viewpoint.svg
index f110f94f6..f110f94f6 100644
--- a/navit/xpm/viewpoint.svg
+++ b/navit/icons/viewpoint.svg
diff --git a/navit/xpm/wifi.svg b/navit/icons/wifi.svg
index 0712fe91f..0712fe91f 100644
--- a/navit/xpm/wifi.svg
+++ b/navit/icons/wifi.svg
diff --git a/navit/xpm/worship.svg b/navit/icons/worship.svg
index 11afc7d98..11afc7d98 100644
--- a/navit/xpm/worship.svg
+++ b/navit/icons/worship.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/xpm/zoo.svg b/navit/icons/zoo.svg
index 73b0cbfd3..73b0cbfd3 100644
--- a/navit/xpm/zoo.svg
+++ b/navit/icons/zoo.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/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.$$